Skip to content

Commit

Permalink
new version update
Browse files Browse the repository at this point in the history
  • Loading branch information
@miloszivojinovic
miloszivojinovic committed Sep 16, 2016
1 parent e2635d9 commit 87f53e8
Show file tree
Hide file tree
Showing 8 changed files with 925 additions and 223 deletions.
8 changes: 7 additions & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@ In the Secondary Area, widgets are displayed in full container width, but you ca

### Update Log

#### v1.2.1
- Implemented LESS modules for different widget layouts
- Fixed pagination style issue
- Modified back-office customization translation strings
- Additional small skin fixes

#### v1.2
- Search field script update and search disp layout fixes
- Disp threads layout update
Expand All @@ -24,4 +30,4 @@ In the Secondary Area, widgets are displayed in full container width, but you ca
- login display fixed (including the login form)
- removed hardcoded widgets positioning in the Main Page Area
- Scrolling issue fixed on mainscript.js
- small style fixes
- small style fixes
234 changes: 129 additions & 105 deletions _skin.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*/
class material_main_Skin extends Skin
{
var $version = '1.1';
var $version = '1.2.1';
/**
* Do we want to use style.min.css instead of style.css ?
*/
Expand Down Expand Up @@ -79,117 +79,141 @@ function get_api_version()
function get_param_definitions( $params )
{
$r = array_merge( array(
// Front page
'front_bg_image' => array(
'label' => T_('Front page background image'),
'defaultvalue' => 'shared/global/sunset/sunset.jpg',
'type' => 'text',
'size' => '50'
'1_start' => array(
'layout' => 'begin_fieldset',
'label' => T_('Image section')
),
'front_title_color' => array(
'label' => T_('Front page background text color'),
'note' => T_('E-g: #ff0000 for red'),
'defaultvalue' => '#FFFFFF',
'type' => 'color',
),
'front_text_color' => array(
'label' => T_('Front page text color'),
'note' => T_('E-g: #00ff00 for green'),
'defaultvalue' => '#666',
'type' => 'color',
),
'front_link_color' => array(
'label' => T_('Front page primary color'),
'note' => T_('E-g: #0000ff for blue'),
'defaultvalue' => '#448AFF',
'type' => 'color',
),
'front_icon_color' => array(
'label' => T_('Front page inverse icon color'),
'note' => T_('E-g: #00ff00 for green'),
'defaultvalue' => '#FFFFFF',
'type' => 'color',
),
'front_bg_color' => array(
'label' => T_('Front page main area background color'),
'note' => T_('E-g: #ff0000 for red'),
'defaultvalue' => '#F1F1F1',
'type' => 'color',
),
'front_bg_opacity' => array(
'label' => T_('Front page main area widget opacity'),
'note' => '%',
'size' => '2',
'maxlength' => '3',
'defaultvalue' => '100',
'type' => 'integer',
'valid_range' => array(
'min' => 0, // from 0%
'max' => 100, // to 100%
'front_bg_image' => array(
'label' => T_('Front page background image'),
'defaultvalue' => 'shared/global/sunset/sunset.jpg',
'type' => 'text',
'size' => '50'
),
'front_title_color' => array(
'label' => T_('Front page background text color'),
'note' => T_('Click to select a color.'),
'defaultvalue' => '#FFFFFF',
'type' => 'color',
),
'front_text_color' => array(
'label' => T_('Front page text color'),
'note' => T_('Click to select a color.'),
'defaultvalue' => '#666',
'type' => 'color',
),
'front_link_color' => array(
'label' => T_('Front page primary color'),
'note' => T_('Click to select a color.'),
'defaultvalue' => '#448AFF',
'type' => 'color',
),
'front_icon_color' => array(
'label' => T_('Front page inverse icon color'),
'note' => T_('Click to select a color.'),
'defaultvalue' => '#FFFFFF',
'type' => 'color',
),
'front_bg_color' => array(
'label' => T_('Front page main area background color'),
'note' => T_('Click to select a color.'),
'defaultvalue' => '#F1F1F1',
'type' => 'color',
),
'front_bg_opacity' => array(
'label' => T_('Front page main area widget opacity'),
'note' => '%.',
'size' => '7',
'maxlength' => '3',
'defaultvalue' => '100',
'type' => 'integer',
'valid_range' => array(
'min' => 0, // from 0%
'max' => 100, // to 100%
),
),
'1_end' => array(
'layout' => 'end_fieldset',
),
// Colorbox
'colorbox' => array(
'label' => T_('Colorbox Image Zoom'),
'note' => T_('Check to enable javascript zooming on images (using the colorbox script)'),
'defaultvalue' => 1,
'type' => 'checkbox',
),
'colorbox_vote_post' => array(
'label' => T_('Voting on Post Images'),
'note' => T_('Check this to enable AJAX voting buttons in the colorbox zoom view'),
'defaultvalue' => 1,
'type' => 'checkbox',
),
'colorbox_vote_post_numbers' => array(
'label' => T_('Display Votes'),
'note' => T_('Check to display number of likes and dislikes'),
'defaultvalue' => 1,
'type' => 'checkbox',
),
'colorbox_vote_comment' => array(
'label' => T_('Voting on Comment Images'),
'note' => T_('Check this to enable AJAX voting buttons in the colorbox zoom view'),
'defaultvalue' => 1,
'type' => 'checkbox',
),
'colorbox_vote_comment_numbers' => array(
'label' => T_('Display Votes'),
'note' => T_('Check to display number of likes and dislikes'),
'defaultvalue' => 1,
'type' => 'checkbox',
),
'colorbox_vote_user' => array(
'label' => T_('Voting on User Images'),
'note' => T_('Check this to enable AJAX voting buttons in the colorbox zoom view'),
'defaultvalue' => 1,
'type' => 'checkbox',
),
'colorbox_vote_user_numbers' => array(
'label' => T_('Display Votes'),
'note' => T_('Check to display number of likes and dislikes'),
'defaultvalue' => 1,
'type' => 'checkbox',


'section_colorbox_start' => array(
'layout' => 'begin_fieldset',
'label' => T_('Colorbox Image Zoom')
),
// Other settings
'gender_colored' => array(
'label' => T_('Display gender'),
'note' => T_('Use colored usernames to differentiate men & women.'),
'defaultvalue' => 0,
'type' => 'checkbox',
'colorbox' => array(
'label' => T_('Colorbox Image Zoom'),
'note' => T_('Check to enable javascript zooming on images (using the colorbox script)'),
'defaultvalue' => 1,
'type' => 'checkbox',
),
'colorbox_vote_post' => array(
'label' => T_('Voting on Post Images'),
'note' => T_('Check this to enable AJAX voting buttons in the colorbox zoom view'),
'defaultvalue' => 1,
'type' => 'checkbox',
),
'colorbox_vote_post_numbers' => array(
'label' => T_('Display Votes'),
'note' => T_('Check to display number of likes and dislikes'),
'defaultvalue' => 1,
'type' => 'checkbox',
),
'colorbox_vote_comment' => array(
'label' => T_('Voting on Comment Images'),
'note' => T_('Check this to enable AJAX voting buttons in the colorbox zoom view'),
'defaultvalue' => 1,
'type' => 'checkbox',
),
'colorbox_vote_comment_numbers' => array(
'label' => T_('Display Votes'),
'note' => T_('Check to display number of likes and dislikes'),
'defaultvalue' => 1,
'type' => 'checkbox',
),
'colorbox_vote_user' => array(
'label' => T_('Voting on User Images'),
'note' => T_('Check this to enable AJAX voting buttons in the colorbox zoom view'),
'defaultvalue' => 1,
'type' => 'checkbox',
),
'colorbox_vote_user_numbers' => array(
'label' => T_('Display Votes'),
'note' => T_('Check to display number of likes and dislikes'),
'defaultvalue' => 1,
'type' => 'checkbox',
),
'section_colorbox_end' => array(
'layout' => 'end_fieldset',
),
'bubbletip' => array(
'label' => T_('Username bubble tips'),
'note' => T_('Check to enable bubble tips on usernames'),
'defaultvalue' => 0,
'type' => 'checkbox',


'section_username_start' => array(
'layout' => 'begin_fieldset',
'label' => T_('Username options')
),
'autocomplete_usernames' => array(
'label' => T_('Autocomplete usernames'),
'note' => T_('Check to enable auto-completion of usernames entered after a "@" sign in the comment forms'),
'defaultvalue' => 1,
'type' => 'checkbox',
'gender_colored' => array(
'label' => T_('Display gender'),
'note' => T_('Use colored usernames to differentiate men & women.'),
'defaultvalue' => 0,
'type' => 'checkbox',
),
'bubbletip' => array(
'label' => T_('Username bubble tips'),
'note' => T_('Check to enable bubble tips on usernames'),
'defaultvalue' => 0,
'type' => 'checkbox',
),
'autocomplete_usernames' => array(
'label' => T_('Autocomplete usernames'),
'note' => T_('Check to enable auto-completion of usernames entered after a "@" sign in the comment forms'),
'defaultvalue' => 1,
'type' => 'checkbox',
),
'section_username_end' => array(
'layout' => 'end_fieldset',
),


), parent::get_param_definitions( $params ) );

return $r;
Expand Down
4 changes: 2 additions & 2 deletions access_denied.main.php
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?php
/**
* This file is the template that displays an access denied for non-members
* This file is the template that displays "access denied" for non-members.
*
* For a quick explanation of b2evo 2.0 skins, please start here:
* {@link http://b2evolution.net/man/skin-structure}
* {@link http://b2evolution.net/man/skin-development-primer}
*
* @package evoskins
* @subpackage bootstrap_main
Expand Down
4 changes: 2 additions & 2 deletions access_requires_login.main.php
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?php
/**
* This file is the template that displays an access denied for not logged in users
* This file is the template that displays "login required" for non logged-in users.
*
* For a quick explanation of b2evo 2.0 skins, please start here:
* {@link http://b2evolution.net/man/skin-structure}
* {@link http://b2evolution.net/man/skin-development-primer}
*
* @package evoskins
* @subpackage bootstrap_main
Expand Down
23 changes: 14 additions & 9 deletions index.main.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,11 +184,14 @@
{
// -------------------- PREV/NEXT PAGE LINKS (POST LIST MODE) --------------------
mainlist_page_links( array(
'block_start' => '<div class="center"><ul class="pagination">',
'block_end' => '</ul></div>',
'page_current_template' => '<span><b>$page_num$</b></span>',
'page_item_before' => '<li>',
'page_item_after' => '</li>',
'block_start' => '<div class="center"><ul class="pagination">',
'block_end' => '</ul></div>',
'page_current_template' => '<span class="current">$page_num$</span>',
'page_item_before' => '<li>',
'page_item_after' => '</li>','page_item_current_before' => '<li class="active">',
'page_item_current_after' => '</li>',
'prev_text' => '<i class="fa fa-angle-left"></i>',
'next_text' => '<i class="fa fa-angle-right"></i>',
) );
// ------------------------- END OF PREV/NEXT PAGE LINKS -------------------------
?>
Expand Down Expand Up @@ -216,9 +219,10 @@
mainlist_page_links(array(
'block_start' => '<div class="center"><ul class="pagination">',
'block_end' => '</ul></div>',
'page_current_template' => '<span><b>$page_num$</b></span>',
'page_current_template' => '<span class="current">$page_num$</span>',
'page_item_before' => '<li>',
'page_item_after' => '</li>',
'page_item_after' => '</li>','page_item_current_before' => '<li class="active">',
'page_item_current_after' => '</li>',
'prev_text' => '<i class="fa fa-angle-left"></i>',
'next_text' => '<i class="fa fa-angle-right"></i>',
));
Expand Down Expand Up @@ -247,9 +251,10 @@
'pagination' => array(
'block_start' => '<div class="center"><ul class="pagination">',
'block_end' => '</ul></div>',
'page_current_template' => '<span><b>$page_num$</b></span>',
'page_current_template' => '<span class="current">$page_num$</span>',
'page_item_before' => '<li>',
'page_item_after' => '</li>',
'page_item_after' => '</li>','page_item_current_before' => '<li class="active">',
'page_item_current_after' => '</li>',
'prev_text' => '<i class="fa fa-angle-left"></i>',
'next_text' => '<i class="fa fa-angle-right"></i>',
),
Expand Down
Loading

0 comments on commit 87f53e8

Please sign in to comment.