Index: trunk/CHANGELOG =================================================================== --- trunk/CHANGELOG (revision 1042) +++ trunk/CHANGELOG (revision 1043) @@ -12,6 +12,13 @@ ------------------------------------- 2.8.0 ------------------------------------- 08-July-2009 Dietrich Roland Pehlke +! admin -> addons -> index.php codechanges +! admin -> access -> index.php codechanges + Codechanges to get rid of the empty display(style) declaration "style='display: ;'", + and to avoid to generate (hidden) elements if the user isn't alowed to edit one. +! wb_theme|classic_theme|argos_theme -> templates -> addons.htt +! wb_theme|classic_theme|argos_theme -> templates -> access.htt + add block-comments # Bugfix inside wb/admin/groups/get_permissions.php - replacing wrong "AND" within "OR" in line 64 if one checkbox of "user" or "group" is selected (like in line 178; advanced settings). 07-July-2009 Matthias Gallas Index: trunk/wb/admin/access/index.php =================================================================== --- trunk/wb/admin/access/index.php (revision 1042) +++ trunk/wb/admin/access/index.php (revision 1043) @@ -30,34 +30,40 @@ // Setup template object $template = new Template(THEME_PATH.'/templates'); $template->set_file('page', 'access.htt'); + $template->set_block('page', 'main_block', 'main'); +$template->set_block('main_block', 'users_block', 'user'); +$template->set_block('main_block', 'groups_block', 'group'); // Insert values into the template object $template->set_var(array( - 'ADMIN_URL' => ADMIN_URL, - 'THEME_URL' => THEME_URL, - 'WB_URL' => WB_URL - ) - ); + 'ADMIN_URL' => ADMIN_URL, + 'THEME_URL' => THEME_URL, + 'WB_URL' => WB_URL + ) +); -// Insert permission values into the template object -if($admin->get_permission('users') != true) { - $template->set_var('DISPLAY_USERS', 'none'); -} -if($admin->get_permission('groups') != true) { - $template->set_var('DISPLAY_GROUPS', 'none'); -} +/** + * Insert permission values into the template object + * Deprecated - as we are using blocks. + */ +$display_none = "style=\"display: none;\""; +if($admin->get_permission('users') != true) $template->set_var('DISPLAY_USERS', $display_none); +if($admin->get_permission('groups') != true) $template->set_var('DISPLAY_GROUPS', $display_none); // Insert section names and descriptions $template->set_var(array( - 'USERS' => $MENU['USERS'], - 'GROUPS' => $MENU['GROUPS'], - 'ACCESS' => $MENU['ACCESS'], - 'USERS_OVERVIEW' => $OVERVIEW['USERS'], - 'GROUPS_OVERVIEW' => $OVERVIEW['GROUPS'], - ) - ); + 'USERS' => $MENU['USERS'], + 'GROUPS' => $MENU['GROUPS'], + 'ACCESS' => $MENU['ACCESS'], + 'USERS_OVERVIEW' => $OVERVIEW['USERS'], + 'GROUPS_OVERVIEW' => $OVERVIEW['GROUPS'], + ) +); +if ( $admin->get_permission('users') == true ) $template->parse('main_block', "users_block", true); +if ( $admin->get_permission('groups') == true ) $template->parse('main_block', "groups_block", true); + // Parse template object $template->parse('main', 'main_block', false); $template->pparse('output', 'page'); Index: trunk/wb/admin/addons/index.php =================================================================== --- trunk/wb/admin/addons/index.php (revision 1042) +++ trunk/wb/admin/addons/index.php (revision 1043) @@ -34,27 +34,34 @@ // Insert values into the template object $template->set_var(array( - 'ADMIN_URL' => ADMIN_URL, - 'THEME_URL' => THEME_URL, - 'WB_URL' => WB_URL - ) - ); + 'ADMIN_URL' => ADMIN_URL, + 'THEME_URL' => THEME_URL, + 'WB_URL' => WB_URL + ) +); -// Insert permission values into the template object -if($admin->get_permission('modules') != true) { - $template->set_var('DISPLAY_MODULES', 'none'); -} -if($admin->get_permission('templates') != true) { - $template->set_var('DISPLAY_TEMPLATES', 'none'); -} -if($admin->get_permission('languages') != true) { - $template->set_var('DISPLAY_LANGUAGES', 'none'); -} -if(!isset($_GET['advanced']) || $admin->get_permission('admintools') != true) { - $template->set_var('DISPLAY_RELOAD', 'none'); -} +/** + * Setting up the blocks + */ +$template->set_block('main_block', "modules_block", "modules"); +$template->set_block('main_block', "templates_block", "templates"); +$template->set_block('main_block', "languages_block", "languages"); +$template->set_block('main_block', "reload_block", "reload"); -// Insert section names and descriptions +/** + * Insert permission values into the template object + * Obsolete as we are using blocks ... see "parsing the blocks" section + */ +$display_none = "style=\"display: none;\""; +if($admin->get_permission('modules') != true) $template->set_var('DISPLAY_MODULES', $display_none); +if($admin->get_permission('templates') != true) $template->set_var('DISPLAY_TEMPLATES', $display_none); +if($admin->get_permission('languages') != true) $template->set_var('DISPLAY_LANGUAGES', $display_none); +if(!isset($_GET['advanced']) || $admin->get_permission('admintools') != true) + $template->set_var('DISPLAY_RELOAD', $display_none); + +/** + * Insert section names and descriptions + */ $template->set_var(array( 'ADDONS_OVERVIEW' => $MENU['ADDONS'], 'MODULES' => $MENU['MODULES'], @@ -72,11 +79,23 @@ ) ); -// Parse template object +/** + * Parsing the blocks ... + */ +if ( $admin->get_permission('modules') == true) $template->parse('main_block', "modules_block", true); +if ( $admin->get_permission('templates') == true) $template->parse('main_block', "templates_block", true); +if ( $admin->get_permission('languages') == true) $template->parse('main_block', "languages_block", true); +if ( isset($_GET['advanced']) AND $admin->get_permission('admintools') == true) $template->parse('main_block', "reload_block", true); + +/** + * Parse template object + */ $template->parse('main', 'main_block', false); $template->pparse('output', 'page'); -// Print admin footer +/** + * Print admin footer + */ $admin->print_footer(); ?> \ No newline at end of file Index: trunk/wb/templates/classic_theme/templates/access.htt =================================================================== --- trunk/wb/templates/classic_theme/templates/access.htt (revision 1042) +++ trunk/wb/templates/classic_theme/templates/access.htt (revision 1043) @@ -3,8 +3,8 @@
- - + +
@@ -21,9 +21,9 @@
- - - + + +
@@ -40,7 +40,7 @@
- +
Index: trunk/wb/templates/classic_theme/templates/addons.htt =================================================================== --- trunk/wb/templates/classic_theme/templates/addons.htt (revision 1042) +++ trunk/wb/templates/classic_theme/templates/addons.htt (revision 1043) @@ -1,93 +1,68 @@ - - - -
- {URL_ADVANCED} -
- - - - - -
- - - - - - - - - -
- - 0 - - - {MODULES} -
{MODULES_OVERVIEW}
- - - - - - - - - - -
- - {TEMPLATES} - - - {TEMPLATES} -
{TEMPLATES_OVERVIEW}
- - - - - - - - - - -
- - {LANGUAGES} - - - {LANGUAGES} -
{LANGUAGES_OVERVIEW}
- - - - - - - - - -
- {TXT_ADMIN_SETTINGS} - {TXT_ADMIN_SETTINGS}
-
- {MESSAGE_RELOAD_ADDONS}
- - - - - - - - - - - -
-
- -
- + +
+ {URL_ADVANCED} +
+ + + + + +
+ + + + + + + + + +
0{MODULES}
{MODULES_OVERVIEW}
+ + + + + + + + + + +
{TEMPLATES}{TEMPLATES}
{TEMPLATES_OVERVIEW}
+ + + + + + + + + + +
{LANGUAGES}{LANGUAGES}
{LANGUAGES_OVERVIEW}
+ + + + + + + + + + +
{TXT_ADMIN_SETTINGS}{TXT_ADMIN_SETTINGS}
+
+ {MESSAGE_RELOAD_ADDONS}
+ + + + + + + +
+
+ +
+ \ No newline at end of file Index: trunk/wb/templates/wb_theme/templates/access.htt =================================================================== --- trunk/wb/templates/wb_theme/templates/access.htt (revision 1042) +++ trunk/wb/templates/wb_theme/templates/access.htt (revision 1043) @@ -3,44 +3,28 @@
- - + +
- - + + - +
- - {USERS} - - - {USERS} - {USERS}{USERS}
- {USERS_OVERVIEW} - {USERS_OVERVIEW}
- - - + + +
- - + + - +
- - {GROUPS} - - - {GROUPS} - {GROUPS}{GROUPS}
- {GROUPS_OVERVIEW} - {GROUPS_OVERVIEW}
- +
Index: trunk/wb/templates/wb_theme/templates/addons.htt =================================================================== --- trunk/wb/templates/wb_theme/templates/addons.htt (revision 1042) +++ trunk/wb/templates/wb_theme/templates/addons.htt (revision 1043) @@ -1,93 +1,68 @@ - - - -
- {URL_ADVANCED} -
- - - - - -
- - - - - - - - - -
- - 0 - - - {MODULES} -
{MODULES_OVERVIEW}
- - - - - - - - - - -
- - {TEMPLATES} - - - {TEMPLATES} -
{TEMPLATES_OVERVIEW}
- - - - - - - - - - -
- - {LANGUAGES} - - - {LANGUAGES} -
{LANGUAGES_OVERVIEW}
- - - - - - - - - -
- {TXT_ADMIN_SETTINGS} - {TXT_ADMIN_SETTINGS}
-
- {MESSAGE_RELOAD_ADDONS}
- - - - - - - - - - - -
-
- -
- + +
+ {URL_ADVANCED} +
+ + + + + +
+ + + + + + + + + +
0{MODULES}
{MODULES_OVERVIEW}
+ + + + + + + + + + +
{TEMPLATES}{TEMPLATES}
{TEMPLATES_OVERVIEW}
+ + + + + + + + + + +
{LANGUAGES}{LANGUAGES}
{LANGUAGES_OVERVIEW}
+ + + + + + + + + + +
{TXT_ADMIN_SETTINGS}{TXT_ADMIN_SETTINGS}
+
+ {MESSAGE_RELOAD_ADDONS}
+ + + + + + + +
+
+ +
+ \ No newline at end of file Index: trunk/wb/templates/argos_theme/templates/access.htt =================================================================== --- trunk/wb/templates/argos_theme/templates/access.htt (revision 1042) +++ trunk/wb/templates/argos_theme/templates/access.htt (revision 1043) @@ -1,25 +1,29 @@

{ACCESS}

- - - + + +
- - - - - -
{USERS}
{USERS}
 - {USERS_OVERVIEW} -
- - - - - -
{GROUPS}
{GROUPS}
 - {GROUPS_OVERVIEW} -
-
+ + + + + + +
{USERS}
{USERS}
 + {USERS_OVERVIEW} +
+ + + + + + + +
{GROUPS}
{GROUPS}
 + {GROUPS_OVERVIEW} +
+ +
Index: trunk/wb/templates/argos_theme/templates/addons.htt =================================================================== --- trunk/wb/templates/argos_theme/templates/addons.htt (revision 1042) +++ trunk/wb/templates/argos_theme/templates/addons.htt (revision 1043) @@ -1,58 +1,59 @@ - - +

{ADDONS_OVERVIEW}

 {URL_ADVANCED}
- - - + + +
- - - - - -
0
{MODULES}
 - {MODULES_OVERVIEW} -
- - - - - -
{TEMPLATES}
{TEMPLATES}
 - {TEMPLATES_OVERVIEW} -
- - - - - -
{LANGUAGES}
{LANGUAGES}
 - {LANGUAGES_OVERVIEW} -
- - - - - -
{TXT_ADMIN_SETTINGS}
{TXT_ADMIN_SETTINGS}
-
- {MESSAGE_RELOAD_ADDONS} -
- - - - - - - -
-
-
+ + + + + + +
0
{MODULES}
{MODULES_OVERVIEW}
+ + + + + + + +
{TEMPLATES}
{TEMPLATES}
{TEMPLATES_OVERVIEW}
+ + + + + + + +
{LANGUAGES}
{LANGUAGES}
{LANGUAGES_OVERVIEW}
+ + + + + + + +
{TXT_ADMIN_SETTINGS}
{TXT_ADMIN_SETTINGS}
+
+ {MESSAGE_RELOAD_ADDONS} +
+ + + + + + + +
+
+ +
- + \ No newline at end of file