From 387f8a4cab5c24e855286fa728c3a4f913d445bb Mon Sep 17 00:00:00 2001 From: Spuds Date: Mon, 25 Feb 2013 15:48:07 -0600 Subject: [PATCH 1/2] ! I think this is just a easter cleanup Signed-off-by: Spuds --- themes/default/Calendar.template.php | 293 --------------------------- 1 file changed, 293 deletions(-) diff --git a/themes/default/Calendar.template.php b/themes/default/Calendar.template.php index f45246d005..229be0779d 100644 --- a/themes/default/Calendar.template.php +++ b/themes/default/Calendar.template.php @@ -485,297 +485,4 @@ function template_show_week_grid($grid_name) echo ' '; } -} - -function template_bcd() -{ - global $context, $scripturl; - - echo ' - - - '; - - $alt = false; - foreach ($context['clockicons'] as $t => $v) - { - echo ' - '; - - $alt = !$alt; - } - - echo ' - -
BCD Clock
'; - - foreach ($v as $i) - echo ' -
'; - - echo ' -
-

Are you hardcore?

- - '; -} - -function template_hms() -{ - global $context, $scripturl; - - echo ' - - '; - $alt = false; - foreach ($context['clockicons'] as $t => $v) - { - echo ' - - '; - $alt = !$alt; - } - - echo ' - - -
Binary Clock
'; - foreach ($v as $i) - echo ' - '; - echo ' -
Too tough for you?
'; - - echo ' - '; -} - -function template_omfg() -{ - global $context, $scripturl; - - echo ' - - '; - $alt = false; - foreach ($context['clockicons'] as $t => $v) - { - echo ' - - '; - $alt = !$alt; - } - - echo ' - -
OMFG Binary Clock
'; - foreach ($v as $i) - echo ' - '; - echo ' -
'; - - echo ' - '; -} - -function template_thetime() -{ - global $context, $scripturl; - - echo ' - - '; - $alt = false; - foreach ($context['clockicons'] as $t => $v) - { - echo ' - - '; - $alt = !$alt; - } - - echo ' - -
The time you requested
'; - foreach ($v as $i) - echo ' - '; - echo ' -
'; - } \ No newline at end of file From 59ccb83eec243cf65a2ff529813dce11fec33f8a Mon Sep 17 00:00:00 2001 From: Spuds Date: Mon, 25 Feb 2013 16:25:32 -0600 Subject: [PATCH 2/2] ! dirty work of moving *some* tags which are invalid/depreciated in html5 markup. This does not change to html5, just helps pre should that path be taken ! width, align, border, cellspacing, etc etc ... some moved to class files some move to style tags ! cleaned up a few template errors along the way, should have committed them as individual errors but that did not happen ... besides the templates are a rich ground for more errors Signed-off-by: Spuds --- themes/default/Admin.template.php | 152 +++++------ themes/default/BadBehavior.template.php | 2 +- themes/default/BoardIndex.template.php | 2 +- themes/default/Errors.template.php | 4 +- themes/default/GenericList.template.php | 12 +- themes/default/ManageBans.template.php | 24 +- themes/default/ManageLanguages.template.php | 8 +- themes/default/ManageMaintenance.template.php | 5 +- .../default/ManageMembergroups.template.php | 12 +- themes/default/ManageMembers.template.php | 6 +- themes/default/ManagePaid.template.php | 12 +- themes/default/ManagePermissions.template.php | 255 +++++++++++------- themes/default/ManageSearch.template.php | 2 +- themes/default/Memberlist.template.php | 8 +- themes/default/MergeTopics.template.php | 10 +- themes/default/MessageIndex.template.php | 20 +- themes/default/Packages.template.php | 100 +++---- themes/default/PersonalMessage.template.php | 46 ++-- themes/default/Post.template.php | 24 +- themes/default/Profile.template.php | 82 +++--- themes/default/Recent.template.php | 20 +- themes/default/Register.template.php | 19 +- themes/default/Reports.template.php | 20 +- themes/default/Stats.template.php | 38 +-- themes/default/Themes.template.php | 8 +- themes/default/Who.template.php | 14 +- themes/default/Xml.template.php | 2 +- themes/default/css/admin.css | 4 + themes/default/css/index.css | 8 + 29 files changed, 508 insertions(+), 411 deletions(-) diff --git a/themes/default/Admin.template.php b/themes/default/Admin.template.php index fc9ff310e0..e1451498d6 100644 --- a/themes/default/Admin.template.php +++ b/themes/default/Admin.template.php @@ -333,16 +333,16 @@ function template_view_versions()
', $txt['version_check_desc'], '
- +
- - + - - @@ -379,20 +379,20 @@ function template_view_versions()
+
', $txt['admin_elkfile'], ' + ', $txt['dvc_your'], ' + ', $txt['dvc_current'], '
- +
'; // Loop through every source file displaying its version - using javascript. foreach ($context['file_versions'] as $filename => $version) echo ' - - - '; @@ -404,36 +404,36 @@ function template_view_versions() // List all the admin file versions, starting with the overall version (if all match!). echo ' -
+ ', $filename, ' + ', $version, ' + ??
+
- - -
+ ', $txt['dvc_admin'], ' + ?? + ??
- +
'; // Loop through every admin file displaying its version - using javascript. foreach ($context['file_versions_admin'] as $filename => $version) echo ' - - - '; @@ -445,36 +445,36 @@ function template_view_versions() // List all the controller file versions, starting with the overall version (if all match!). echo ' -
+ ', $filename, ' + ', $version, ' + ??
+
- - -
+ ', $txt['dvc_controllers'], ' + ?? + ??
- +
'; // Loop through every controller file displaying its version - using javascript. foreach ($context['file_versions_controllers'] as $filename => $version) echo ' - - - '; @@ -486,36 +486,36 @@ function template_view_versions() // List all the database file versions, starting with the overall version (if all match!). echo ' -
+ ', $filename, ' + ', $version, ' + ??
+
- - -
+ ', $txt['dvc_database'], ' + ?? + ??
- +
'; // Loop through every database file displaying its version - using javascript. foreach ($context['file_versions_database'] as $filename => $version) echo ' - - - '; @@ -527,36 +527,36 @@ function template_view_versions() // List all the subs file versions, starting with the overall version (if all match!). echo ' -
+ ', $filename, ' + ', $version, ' + ??
+
- - -
+ ', $txt['dvc_subs'], ' + ?? + ??
- +
'; // Loop through every subs file displaying its version - using javascript. foreach ($context['file_versions_subs'] as $filename => $version) echo ' - - - '; @@ -568,35 +568,35 @@ function template_view_versions() // Now the templates echo ' -
+ ', $filename, ' + ', $version, ' + ??
+
- - -
+ ', $txt['dvc_default'], ' + ?? + ??
- +
'; foreach ($context['default_template_versions'] as $filename => $version) echo ' - - - '; @@ -606,23 +606,23 @@ function template_view_versions()
+ ', $filename, ' + ', $version, ' + ??
- +
- - -
+ ', $txt['dvc_languages'], ' + ?? + ??
- +
'; foreach ($context['default_language_versions'] as $language => $files) @@ -630,13 +630,13 @@ function template_view_versions() foreach ($files as $filename => $version) echo ' - - - '; @@ -650,35 +650,35 @@ function template_view_versions() if (!empty($context['template_versions'])) { echo ' -
+ ', $filename, '.', $language, '.php + ', $version, ' + ??
+
- - -
+ ', $txt['dvc_templates'], ' + ?? + ??
- +
'; foreach ($context['template_versions'] as $filename => $version) echo ' - - - '; @@ -1707,12 +1707,12 @@ function template_php_info() foreach ($context['pinfo'] as $area => $php_area) { echo ' -
+ ', $filename, ' + ', $version, ' + ??
+
- - - + + + '; @@ -1731,21 +1731,21 @@ function template_php_info() // heading row for the settings section of this categorys settings echo ' - - - + + + '; $localmaster = false; } echo ' - '; + '; foreach ($setting as $key_lm => $value) { echo ' - '; + '; } echo ' '; @@ -1755,8 +1755,8 @@ function template_php_info() { echo ' - - + + '; } diff --git a/themes/default/BadBehavior.template.php b/themes/default/BadBehavior.template.php index b60fe7c087..b87635c4dd 100644 --- a/themes/default/BadBehavior.template.php +++ b/themes/default/BadBehavior.template.php @@ -28,7 +28,7 @@ function template_badbehavior_log() ', $context['page_index'], ' -
', $area, '', $area, '
', $txt['phpinfo_itemsettings'], '', $txt['phpinfo_localsettings'], '', $txt['phpinfo_defaultsettings'], '', $txt['phpinfo_itemsettings'], '', $txt['phpinfo_localsettings'], '', $txt['phpinfo_defaultsettings'], '
', $key, '', $key, '', $value, '', $value, '
', $key, '', $setting, '', $key, '', $setting, '
'; +
'; if ($context['has_filter']) echo ' diff --git a/themes/default/BoardIndex.template.php b/themes/default/BoardIndex.template.php index 216ff3acdb..0888ce7e16 100644 --- a/themes/default/BoardIndex.template.php +++ b/themes/default/BoardIndex.template.php @@ -33,7 +33,7 @@ function template_main()

- + ', $txt['news'], '

diff --git a/themes/default/Errors.template.php b/themes/default/Errors.template.php index 2c76055399..e3113fcbc5 100644 --- a/themes/default/Errors.template.php +++ b/themes/default/Errors.template.php @@ -62,7 +62,7 @@ function template_error_log() ', $context['page_index'], '
-
+
- + ==>' : '>', $line_num , ': '; } diff --git a/themes/default/GenericList.template.php b/themes/default/GenericList.template.php index f69ce219c3..65f7de08bf 100644 --- a/themes/default/GenericList.template.php +++ b/themes/default/GenericList.template.php @@ -76,7 +76,7 @@ function template_show_list($list_id = null) } echo ' -
  ', $txt['apply_filter_of_type'], ':'; @@ -203,7 +203,7 @@ function template_show_file() $is_target = $line_num == $context['file_data']['target']; echo '
==>' : '>', $line_num , ':', $line, '
'; +
'; // Show the column headers. $header_count = count($cur_list['headers']); @@ -112,7 +112,7 @@ function template_show_list($list_id = null) if (empty($cur_list['rows']) && !empty($cur_list['no_items_label'])) echo ' - + '; // Show the list rows. @@ -240,7 +240,7 @@ function template_create_list_menu($list_menu, $direction = 'top')
', $cur_list['no_items_label'], '
', $cur_list['no_items_label'], '
', $list_menu['position'] == 'right' ? ' ' : '', ' -
  + '; @@ -250,13 +250,13 @@ function template_create_list_menu($list_menu, $direction = 'top') if ($link['is_selected']) echo ' - '; else echo ' - '; } @@ -280,7 +280,7 @@ function template_create_list_menu($list_menu, $direction = 'top')
   + ', $link['label'], '   + ', $link['label'], '
', $list_menu['position'] == 'right' ? ' ' : '', ' -
  + diff --git a/themes/default/ManageBans.template.php b/themes/default/ManageBans.template.php index cedfe259b8..af3df0b5e1 100644 --- a/themes/default/ManageBans.template.php +++ b/themes/default/ManageBans.template.php @@ -178,13 +178,15 @@ function template_ban_edit() echo '
-
 
+
- - - - + + + + '; @@ -200,7 +202,7 @@ function template_ban_edit() foreach ($context['ban_items'] as $ban_item) { echo ' - + - - - + + + '; $alternate = !$alternate; } diff --git a/themes/default/ManageLanguages.template.php b/themes/default/ManageLanguages.template.php index 43893f8364..72d99bdeba 100644 --- a/themes/default/ManageLanguages.template.php +++ b/themes/default/ManageLanguages.template.php @@ -78,19 +78,19 @@ function template_download_language() ', $txt['languages_download_theme_files'], ' -
', $txt['ban_banned_entity'], '', $txt['ban_hits'], '', $txt['ban_actions'], '', $txt['ban_banned_entity'], '', $txt['ban_hits'], '', $txt['ban_actions'], ' + +
'; if ($ban_item['type'] == 'ip') echo ' ', $txt['ip'], ': ', $ban_item['ip']; @@ -212,9 +214,13 @@ function template_ban_edit() echo ' ', $txt['username'], ': ', $ban_item['user']['link']; echo ' ', $ban_item['hits'], '', $txt['ban_edit_trigger'], '', $ban_item['hits'], ' + ', $txt['ban_edit_trigger'], ' + + +
+
- - - diff --git a/themes/default/ManageMaintenance.template.php b/themes/default/ManageMaintenance.template.php index 53a96671a9..721a6417b1 100644 --- a/themes/default/ManageMaintenance.template.php +++ b/themes/default/ManageMaintenance.template.php @@ -74,9 +74,8 @@ function template_maintain_database()

-

- -

'; + + '; } echo ' diff --git a/themes/default/ManageMembergroups.template.php b/themes/default/ManageMembergroups.template.php index 8c4601bdb7..96d4527b09 100644 --- a/themes/default/ManageMembergroups.template.php +++ b/themes/default/ManageMembergroups.template.php @@ -516,7 +516,7 @@ function template_group_members()
', $context['page_index'], '
-
', $txt['languages_download_filename'], ' + ', $txt['languages_download_writable'], ' + ', $txt['languages_download_exists'], ' + ', $txt['languages_download_copy'], '
+
'; @@ -531,7 +531,7 @@ function template_group_members() '; if (!empty($context['group']['assignable'])) echo ' - '; + '; echo ' @@ -540,7 +540,7 @@ function template_group_members() if (empty($context['members'])) echo ' - + '; $alternate = false; @@ -553,7 +553,7 @@ function template_group_members() if ($context['can_send_email']) { echo ' - '; + '; // Is it totally hidden? if ($member['show_email'] == 'no') @@ -581,7 +581,9 @@ function template_group_members() ', $member['posts'], ''; if (!empty($context['group']['assignable'])) echo ' - '; + '; echo ' '; } diff --git a/themes/default/ManageMembers.template.php b/themes/default/ManageMembers.template.php index dee60ce989..d49bdcefd4 100644 --- a/themes/default/ManageMembers.template.php +++ b/themes/default/ManageMembers.template.php @@ -158,7 +158,7 @@ function template_search_members()

', $txt['member_part_of_these_membergroups'], '

-
', $txt['name'], $context['sort_by'] == 'name' ? ' ' : '', '', $txt['posts'], $context['sort_by'] == 'posts' ? ' ' : '','
', $txt['membergroups_members_no_members'], '', $txt['membergroups_members_no_members'], '
+ +
+
@@ -195,7 +195,7 @@ function template_search_members()
', $txt['membergroups'], '
- +
- '; diff --git a/themes/default/ManagePaid.template.php b/themes/default/ManagePaid.template.php index 6fa2d6af0d..5a617c9a17 100644 --- a/themes/default/ManagePaid.template.php +++ b/themes/default/ManagePaid.template.php @@ -485,13 +485,13 @@ function template_user_subscription()
', $txt['paid_current_desc'], '
-
@@ -212,7 +212,7 @@ function template_search_members() ', $postgroup['name'], ' +
+
- - - - + + + + '; @@ -499,7 +499,7 @@ function template_user_subscription() if (empty($context['current'])) echo ' - '; diff --git a/themes/default/ManagePermissions.template.php b/themes/default/ManagePermissions.template.php index 3b49571108..9b7209d3a9 100644 --- a/themes/default/ManagePermissions.template.php +++ b/themes/default/ManagePermissions.template.php @@ -45,19 +45,19 @@ function template_permission_index() - '; + '; if (empty($modSettings['permission_enable_deny'])) echo ' - '; + '; else echo ' - - '; + + '; echo ' - - + @@ -80,19 +80,19 @@ function template_permission_index() echo ' - '; + '; if (empty($modSettings['permission_enable_deny'])) echo ' - '; + '; else echo ' - - '; + + '; echo ' - - + + '; } @@ -290,7 +290,9 @@ function template_by_board() if (!$context['edit_all']) echo ' - ', $txt['permissions_board_all'], ''; + + ', $txt['permissions_board_all'], ' + '; echo ' @@ -381,15 +383,16 @@ function template_edit_profiles()

', $txt['permissions_profile_edit'], '

-
', $txt['paid_name'], '', $txt['paid_status'], '', $txt['start_date'], '', $txt['end_date'], '', $txt['paid_name'], '', $txt['paid_status'], '', $txt['start_date'], '', $txt['end_date'], '
+ ', $txt['paid_none_yet'], '
', $txt['membergroups_name'], '', $txt['membergroups_members_top'], '', $txt['membergroups_members_top'], '', $txt['membergroups_permissions'], '', $txt['membergroups_permissions'], '', $txt['permissions_allowed'], '', $txt['permissions_denied'], '', $txt['permissions_allowed'], '', $txt['permissions_denied'], '', $context['can_modify'] ? $txt['permissions_modify'] : $txt['permissions_view'], ' + ', $context['can_modify'] ? $txt['permissions_modify'] : $txt['permissions_view'], ' ', $context['can_modify'] ? '' : '', '
', $group['can_search'] ? $group['link'] : $group['num_members'], '', $group['can_search'] ? $group['link'] : $group['num_members'], '', $group['num_permissions']['allowed'], '', $group['num_permissions']['allowed'], '', $group['num_permissions']['allowed'], '', $group['num_permissions']['denied'], '', $group['num_permissions']['allowed'], '', $group['num_permissions']['denied'], '', $group['allow_modify'] ? '' . ($context['can_modify'] ? $txt['permissions_modify'] : $txt['permissions_view']). '' : '', '', $group['allow_modify'] && $context['can_modify'] ? '' : '', '', $group['allow_modify'] ? '' . ($context['can_modify'] ? $txt['permissions_modify'] : $txt['permissions_view']). '' : '', '', $group['allow_modify'] && $context['can_modify'] ? '' : '', '
+
', $txt['permissions_profile_used_by'], ' - + '; + $alternate = false; foreach ($context['profiles'] as $profile) { @@ -409,7 +412,7 @@ function template_edit_profiles() - '; @@ -499,11 +502,11 @@ function warnAboutDeny() echo '
- '; + '; if (!empty($modSettings['permission_enable_deny']) && $context['group']['id'] != -1) echo ' -
+
', $txt['permissions_option_desc'], '
'; @@ -533,11 +536,13 @@ function warnAboutDeny() else template_modify_group_classic($context['permission_type']); + echo ' +
'; + // If this is general permissions also show the default profile. if ($context['permission_type'] == 'membergroup') { echo ' -

', $txt['permissions_board'], '

@@ -567,7 +572,6 @@ function warnAboutDeny()
'; - } // A javascript enabled clean permissions view. @@ -582,19 +586,22 @@ function template_modify_group_simple($type) $disable_field = $context['profile']['can_modify'] ? '' : 'disabled="disabled" '; echo ' -
', $txt['permissions_profile_name'], '
', !empty($profile['boards_text']) ? $profile['boards_text'] : $txt['permissions_profile_used_by_none'], ' +
+
- '; + '; if (empty($modSettings['permission_enable_deny']) || $context['group']['id'] == -1) echo ' - '; + + + '; else echo ' - - - '; - echo ' + + + '; + + echo ' '; @@ -617,36 +624,38 @@ function template_modify_group_simple($type) { echo ' - '; + if (empty($modSettings['permission_enable_deny']) || $context['group']['id'] == -1) echo ' - '; else echo ' - - - '; - echo ' + + echo ' '; } } @@ -668,32 +677,41 @@ function template_modify_group_simple($type) { echo ' - - '; - - if (empty($modSettings['permission_enable_deny']) || $context['group']['id'] == -1) - echo ' - '; - else - echo ' - - - '; + '; + if (empty($modSettings['permission_enable_deny']) || $context['group']['id'] == -1) + echo ' + '; + else echo ' + + + '; + + echo ' '; } - $alternate = !$alternate; + $alternate = !$alternate; } if (!$permissionGroup['hidden'] && $has_display_content) echo ' - + '; } + echo '
  ', $txt['permissions_option_on'], '', $txt['permissions_option_off'], '', $txt['permissions_option_deny'], '', $txt['permissions_option_on'], '', $txt['permissions_option_off'], '', $txt['permissions_option_deny'], '
+ * ', $permissionGroup['name'], ' +
+
+
+
+ ', $permission['help_index'] ? '' . $txt['help'] . '' : '', ' ', $permission['name'], '', $permission['name'], ' + + + + + + + +
@@ -816,17 +834,19 @@ function determineGroupState(id_group, forceState) $perm_ids[] = "'$permission[id]'"; } } + // Declare this groups permissions into an array. if (!empty($perm_ids)) echo ' groupPermissions[\'', $id_group, '\'] = new Array(', count($perm_ids), ');'; + foreach ($perm_ids as $count => $id) echo ' groupPermissions[\'', $id_group, '\'][', $count, '] = ', $id, ';'; // Show the group as required. if ($has_display_content) - echo ' + echo ' determineGroupState(\'', $id_group, '\');'; } } @@ -836,7 +856,7 @@ function determineGroupState(id_group, forceState) // ]]>'; } -// The SMF 1.x way of looking at permissions. +// The classic way of looking at permissions. function template_modify_group_classic($type) { global $context, $settings, $scripturl, $txt, $modSettings; @@ -851,7 +871,7 @@ function template_modify_group_classic($type) foreach ($permission_type['columns'] as $column) { echo ' - '; +
'; foreach ($column as $permissionGroup) { @@ -871,15 +891,18 @@ function template_modify_group_classic($type) { echo ' - '; + '; + if (empty($modSettings['permission_enable_deny']) || $context['group']['id'] == -1) echo ' - '; + '; else echo ' - - - '; + + + '; echo ' '; } @@ -916,48 +939,66 @@ function template_modify_group_classic($type) { echo ' - '; if ($permission['has_own_any']) { echo ' - - '; + + + '; // Guests can't do their own thing. if ($context['group']['id'] != -1) { echo ' - '; + '; if (empty($modSettings['permission_enable_deny'])) echo ' - '; + '; else echo ' - - - '; + + + '; echo ' - '; + + '; } echo ' - '; + '; if (empty($modSettings['permission_enable_deny']) || $context['group']['id'] == -1) echo ' - '; + '; else echo ' - - - '; + + + '; echo ' '; @@ -965,16 +1006,24 @@ function template_modify_group_classic($type) else { echo ' - '; + '; if (empty($modSettings['permission_enable_deny']) || $context['group']['id'] == -1) echo ' - '; + '; else echo ' - - - '; + + + '; echo ' '; @@ -986,7 +1035,7 @@ function template_modify_group_classic($type) if (!$permissionGroup['hidden'] && $has_display_content) echo ' - + '; } echo ' @@ -1005,12 +1054,13 @@ function template_inline_permissions() echo '
', $txt['avatar_select_permission'], ''; + if (empty($modSettings['permission_enable_deny'])) echo '
    '; else echo ' -
    ', $txt['permissions_option_desc'], '
    +
    ', $txt['permissions_option_desc'], '
    ', $txt['permissions_option_on'], ' @@ -1019,6 +1069,7 @@ function template_inline_permissions()
    '; + foreach ($context['member_groups'] as $group) { if (!empty($modSettings['permission_enable_deny'])) @@ -1098,7 +1149,7 @@ function template_postmod_permissions() -
', $permissionGroup['name'], ' + ', $permissionGroup['name'], ' +
', $txt['permissions_option_on'], '
', $txt['permissions_option_off'], '
', $txt['permissions_option_deny'], '
', $txt['permissions_option_on'], '
', $txt['permissions_option_off'], '
', $txt['permissions_option_deny'], '
+ ', $permission['show_help'] ? '' . $txt['help'] . '' : '', ' ', $permission['name'], '
', $permission['name'], '
', $permission['own']['name'], ':', $permission['own']['name'], ': + + + + + + + +
', $permission['any']['name'], ':', $permission['any']['name'], ': + + + + + + + +
', $permission['name'], '', $permission['name'], ' + + + + + + + +
+
@@ -1116,21 +1167,21 @@ function template_postmod_permissions() - - - - - - - - - - - - - + + + + + + + + + + + + '; @@ -1139,7 +1190,7 @@ function template_postmod_permissions() { echo ' - - - - - - - - - - - - - + + + + + + + + + + + + '; } diff --git a/themes/default/ManageSearch.template.php b/themes/default/ManageSearch.template.php index c94f6cd9b2..e5e9a1015d 100644 --- a/themes/default/ManageSearch.template.php +++ b/themes/default/ManageSearch.template.php @@ -68,7 +68,7 @@ function template_modify_weights() ', $context['relative_weights']['search_weight_first_message'], '%
- ', $txt['help'], '
diff --git a/themes/default/Memberlist.template.php b/themes/default/Memberlist.template.php index d17f91e843..2f3fc49efa 100644 --- a/themes/default/Memberlist.template.php +++ b/themes/default/Memberlist.template.php @@ -37,7 +37,7 @@ function template_main() echo '
-
+ ', $txt['permissions_post_moderation_group'], ' ', $txt['permissions_post_moderation_allow'], '', $txt['permissions_post_moderation_moderate'], '', $txt['permissions_post_moderation_disallow'], '', $txt['permissions_post_moderation_allow'], '', $txt['permissions_post_moderation_moderate'], '', $txt['permissions_post_moderation_disallow'], '', $txt['permissions_post_moderation_allow'], '', $txt['permissions_post_moderation_moderate'], '', $txt['permissions_post_moderation_disallow'], '', $txt['permissions_post_moderation_allow'], '', $txt['permissions_post_moderation_moderate'], '', $txt['permissions_post_moderation_disallow'], '', $txt['permissions_post_moderation_allow'], '', $txt['permissions_post_moderation_moderate'], '', $txt['permissions_post_moderation_disallow'], '', $txt['permissions_post_moderation_allow'], '', $txt['permissions_post_moderation_moderate'], '', $txt['permissions_post_moderation_disallow'], '', $txt['permissions_post_moderation_allow'], '', $txt['permissions_post_moderation_moderate'], '', $txt['permissions_post_moderation_disallow'], '', $txt['permissions_post_moderation_allow'], '', $txt['permissions_post_moderation_moderate'], '', $txt['permissions_post_moderation_disallow'], '
+ ', $group['name'], ''; if (!empty($group['children'])) echo ' @@ -1147,18 +1198,18 @@ function template_postmod_permissions() echo '
+
'; @@ -56,7 +56,7 @@ function template_main() // This is just some column... show the link and be done with it. else echo ' - '; } echo ' @@ -92,8 +92,8 @@ function template_main() if (!isset($context['disabled_fields']['posts'])) { echo ' - - +
+ ', $column['link'], '', $member['posts'], ''; + ', $member['posts'], ''; if (!empty($member['post_percent'])) echo ' diff --git a/themes/default/MergeTopics.template.php b/themes/default/MergeTopics.template.php index 95f1ec7289..9188c499fd 100644 --- a/themes/default/MergeTopics.template.php +++ b/themes/default/MergeTopics.template.php @@ -142,21 +142,21 @@ function template_merge_extra_options()

', $txt['merge_topic_list'], '

- +
- + - + '; foreach ($context['topics'] as $topic) echo ' - - '; diff --git a/themes/default/MessageIndex.template.php b/themes/default/MessageIndex.template.php index b4616c2225..a1bb02e702 100644 --- a/themes/default/MessageIndex.template.php +++ b/themes/default/MessageIndex.template.php @@ -198,34 +198,34 @@ function template_main() if (!empty($context['topics'])) { echo ' - + - '; + '; // Show a "select all" box for quick moderation? if (empty($context['can_quick_mod'])) echo ' - '; + '; else echo ' - '; + '; // Show a "select all" box for quick moderation? if (!empty($context['can_quick_mod']) && $options['display_quick_mod'] == 1) echo ' - '; + '; // If it's on in "image" mode, don't show anything but the column. elseif (!empty($context['can_quick_mod'])) echo ' - '; + '; } // No topics.... just say, "sorry bub". else echo ' - + - '; + '; echo ' @@ -305,7 +305,7 @@ function template_main() if (!empty($context['can_quick_mod'])) { echo ' - -
', $txt['merge_check'], '', $txt['merge_check'], ' ', $txt['subject'], ' ', $txt['started_by'], ' ', $txt['last_post'], '' . $txt['merge_include_notifications'] . '' . $txt['merge_include_notifications'] . '
+ @@ -170,7 +170,7 @@ function template_merge_extra_options() ' . $topic['updated']['link'] . '
', $topic['updated']['time'], ' 		+
   ', $context['topics_headers']['subject'], ' / ', $context['topics_headers']['starter'], '', $context['topics_headers']['replies'], ' / ', $context['topics_headers']['views'], '', $context['topics_headers']['replies'], ' / ', $context['topics_headers']['views'], '', $context['topics_headers']['last_post'], '', $context['topics_headers']['last_post'], '', $context['topics_headers']['last_post'], '', $context['topics_headers']['last_post'], '     ', $txt['msg_alert_none'], '  
'; + '; if ($options['display_quick_mod'] == 1) echo ' @@ -341,7 +341,7 @@ function template_main() { echo '
+ +
- - + + - - + + '; @@ -175,7 +175,7 @@ function template_view_package() echo '
', $txt['package_install_type'], '', $txt['package_install_action'], '', $txt['package_install_desc'], '', $txt['package_install_action'], '', $txt['package_install_desc'], '
- '; +
'; // Show the operations. $alternate2 = true; @@ -187,12 +187,12 @@ function template_view_package() echo ' - - - - - - + + + + + + '; $operation_num++; @@ -228,7 +228,7 @@ function template_view_package()
', $txt['package_other_themes_desc'], '
-
', $operation_num, '.', $txt[$operation_text], '', $operation['action'], '', $operation['description'], !empty($operation['ignore_failure']) ? ' (' . $txt['operation_ignore'] . ')' : '', '', $operation_num, '.', $txt[$operation_text], '', $operation['action'], '', $operation['description'], !empty($operation['ignore_failure']) ? ' (' . $txt['operation_ignore'] . ')' : '', '
'; +
'; // Loop through each theme and display it's name, and then it's details. foreach ($context['theme_actions'] as $id => $theme) @@ -237,12 +237,14 @@ function template_view_package() $js_operations[$action_num] = !empty($theme['has_failure']); echo ' - + - @@ -256,12 +258,12 @@ function template_view_package() echo ' - - - + + '; // Is there water on the knee? Operation! @@ -270,7 +272,7 @@ function template_view_package() echo '
'; + '; + if (!empty($context['themes_locked'])) echo ' '; + echo '
', isset($packageaction['operations']) ? '' : '', ' + ', $action['type'], '', $action['action'], '', $action['description'], '', $action['action'], '', $action['description'], '
- '; +
'; $alternate2 = true; $operation_num = 1; @@ -281,12 +283,12 @@ function template_view_package() echo ' - - - - - - + + + + + + '; $operation_num++; $alternate2 = !$alternate2; @@ -1508,16 +1510,16 @@ function onNewFolderReceived(oXMLDoc) ', $txt['package_file_perms'], '', $txt['package_file_perms_new_status'], ' -
', $operation_num, '.', $txt[$operation_text], '', $operation['action'], '', $operation['description'], !empty($operation['ignore_failure']) ? ' (' . $txt['operation_ignore'] . ')' : '', '', $operation_num, '.', $txt[$operation_text], '', $operation['action'], '', $operation['description'], !empty($operation['ignore_failure']) ? ' (' . $txt['operation_ignore'] . ')' : '', '
+
- - - - - - - + + + + + + + '; @@ -1527,7 +1529,7 @@ function onNewFolderReceived(oXMLDoc) echo ' - - - - - - - + + + + + '; @@ -1627,14 +1629,14 @@ function template_permission_show_contents($ident, $contents, $level, $has_more echo '
 ', $txt['package_file_perms_name'], ' ', $txt['package_file_perms_status'], '', $txt['package_file_perms_status_read'], '', $txt['package_file_perms_status_write'], '', $txt['package_file_perms_status_execute'], '', $txt['package_file_perms_status_custom'], '', $txt['package_file_perms_status_no_change'], ' ', $txt['package_file_perms_name'], ' ', $txt['package_file_perms_status'], '', $txt['package_file_perms_status_read'], '', $txt['package_file_perms_status_write'], '', $txt['package_file_perms_status_execute'], '', $txt['package_file_perms_status_custom'], '', $txt['package_file_perms_status_no_change'], '
'; + '; if (!empty($dir['type']) && ($dir['type'] == 'dir' || $dir['type'] == 'dir_recursive')) echo ' @@ -1536,15 +1538,15 @@ function onNewFolderReceived(oXMLDoc) echo ' ', $name, ' + ', ($dir['perms']['chmod'] ? $txt['package_file_perms_writable'] : $txt['package_file_perms_not_writable']), ' ', ($dir['perms']['perms'] ? ' (' . $txt['package_file_perms_chmod'] . ': ' . substr(sprintf('%o', $dir['perms']['perms']), -4) . ')' : ''), '
- +
'; } $cur_ident = preg_replace('~[^A-Za-z0-9_\-=:]~', ':-:', $ident . '/' . $name); echo ' - - - - - - + + + + + '; @@ -1669,7 +1671,7 @@ function template_permission_show_contents($ident, $contents, $level, $has_more if ($has_more) echo ' - @@ -1691,7 +1693,7 @@ function template_permission_show_contents($ident, $contents, $level, $has_more
' . str_repeat(' ', $level * 5), ' + ' . str_repeat(' ', $level * 5), ' ', (!empty($dir['type']) && $dir['type'] == 'dir_recursive') || !empty($dir['list_contents']) ? '' : ''; if (!empty($dir['type']) && ($dir['type'] == 'dir' || $dir['type'] == 'dir_recursive')) @@ -1649,11 +1651,11 @@ function template_permission_show_contents($ident, $contents, $level, $has_more ', ($dir['perms']['chmod'] ? $txt['package_file_perms_writable'] : $txt['package_file_perms_not_writable']), ' ', ($dir['perms']['perms'] ? ' (' . $txt['package_file_perms_chmod'] . ': ' . substr(sprintf('%o', $dir['perms']['perms']), -4) . ')' : ''), '
' . str_repeat(' ', $level * 5), ' + ' . str_repeat(' ', $level * 5), ' « ', $txt['package_file_perms_more_files'], ' »
- +
'; } diff --git a/themes/default/PersonalMessage.template.php b/themes/default/PersonalMessage.template.php index 7ffd81c22d..863e99e6fc 100644 --- a/themes/default/PersonalMessage.template.php +++ b/themes/default/PersonalMessage.template.php @@ -377,7 +377,7 @@ function template_folder() } echo ' -
  • ', $txt['delete'], '
    • '; +
  • ', $txt['delete'], '
    • '; // Showing all then give a remove item checkbox if (empty($context['display_mode'])) @@ -515,22 +515,22 @@ function template_subject_list() global $context, $settings, $modSettings, $txt, $scripturl; echo ' -
    +
    - - - - @@ -548,7 +548,7 @@ function template_subject_list() { echo ' -
    + ', $txt['pm_change_view'], ' + ', $txt['date'], $context['sort_by'] == 'date' ? ' ' : '', ' + ', $txt['subject'], $context['sort_by'] == 'subject' ? ' ' : '', ' ', ($context['from_or_to'] == 'from' ? $txt['from'] : $txt['to']), $context['sort_by'] == 'name' ? ' ' : '', ' +
    +