diff --git a/CHANGELOG.md b/CHANGELOG.md index 00796eea1..32c04bdea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - Used declensions for days in some cases [\#1310](https://github.com/torrentpier/torrentpier/pull/1310) ([belomaxorka](https://github.com/belomaxorka)) - Used datastore to show statistic for more performance [\#1309](https://github.com/torrentpier/torrentpier/pull/1309) ([belomaxorka](https://github.com/belomaxorka)) - Used `humn_size()` to count average of releases in tr_stats.php [\#1313](https://github.com/torrentpier/torrentpier/pull/1313) ([belomaxorka](https://github.com/belomaxorka)) +- Some enhancements in default template [\#1312](https://github.com/torrentpier/torrentpier/pull/1312) ([belomaxorka](https://github.com/belomaxorka)) - Minor improvements [\#1306](https://github.com/torrentpier/torrentpier/pull/1306), [\#1307](https://github.com/torrentpier/torrentpier/pull/1307), [\#1308](https://github.com/torrentpier/torrentpier/pull/1308) ([belomaxorka](https://github.com/belomaxorka)) - Updated deps [\#1304](https://github.com/torrentpier/torrentpier/pull/1304), [\#1305](https://github.com/torrentpier/torrentpier/pull/1305) ([belomaxorka](https://github.com/belomaxorka)) diff --git a/admin/admin_cron.php b/admin/admin_cron.php index 65bab3b8a..eba8954f8 100644 --- a/admin/admin_cron.php +++ b/admin/admin_cron.php @@ -159,7 +159,7 @@ switch ($mode) { 'S_MODE' => 'add', 'SCHEDULE' => build_select('schedule', $schedule, 'select', null, null), 'RUN_DAY' => build_select('run_day', $run_day, 0, null, null), - 'CRON_ID' => 'none', + 'CRON_ID' => '', 'CRON_ACTIVE' => 1, 'CRON_TITLE' => '', 'CRON_SCRIPT' => '', diff --git a/admin/admin_forums.php b/admin/admin_forums.php index 081637781..15d62be43 100644 --- a/admin/admin_forums.php +++ b/admin/admin_forums.php @@ -739,7 +739,7 @@ if (!$mode || $show_main_page) { 'FORUM_DESC' => htmlCHR($forum_rows[$j]['forum_desc']), 'NUM_TOPICS' => $forum_rows[$j]['forum_topics'], 'NUM_POSTS' => $forum_rows[$j]['forum_posts'], - 'PRUNE_DAYS' => !empty($forum_rows[$j]['prune_days']) ? delta_time((TIMENOW - 86400 * $forum_rows[$j]['prune_days']), TIMENOW, 'days') : '-', + 'PRUNE_DAYS' => !empty($forum_rows[$j]['prune_days']) ? delta_time((TIMENOW - 86400 * $forum_rows[$j]['prune_days']), TIMENOW, 'days') : $lang['DISABLED'], 'ORDER' => $forum_rows[$j]['forum_order'], 'FORUM_ID' => $forum_rows[$j]['forum_id'], diff --git a/styles/templates/admin/admin_attach_cp.tpl b/styles/templates/admin/admin_attach_cp.tpl index 1f446459c..1e7252cff 100644 --- a/styles/templates/admin/admin_attach_cp.tpl +++ b/styles/templates/admin/admin_attach_cp.tpl @@ -7,48 +7,45 @@
- - - - -
{L_VIEW}: {S_VIEW_SELECT}   - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{L_STATISTIC}{L_VALUE}
{L_NUMBER_OF_ATTACHMENTS}:{NUMBER_OF_ATTACHMENTS}
{L_TOTAL_FILESIZE}:{TOTAL_FILESIZE}
{L_ATTACH_QUOTA}:{ATTACH_QUOTA}
{L_NUMBER_POSTS_ATTACH}:{NUMBER_OF_POSTS}
{L_NUMBER_PMS_ATTACH}:{NUMBER_OF_PMS}
{L_NUMBER_TOPICS_ATTACH}:{NUMBER_OF_TOPICS}
{L_NUMBER_USERS_ATTACH}:{NUMBER_OF_USERS}
+ + + + +
{L_VIEW}: {S_VIEW_SELECT}  
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{L_STATISTIC}{L_VALUE}
{L_NUMBER_OF_ATTACHMENTS}:{NUMBER_OF_ATTACHMENTS}
{L_TOTAL_FILESIZE}:{TOTAL_FILESIZE}
{L_ATTACH_QUOTA}:{ATTACH_QUOTA}
{L_NUMBER_POSTS_ATTACH}:{NUMBER_OF_POSTS}
{L_NUMBER_PMS_ATTACH}:{NUMBER_OF_PMS}
{L_NUMBER_TOPICS_ATTACH}:{NUMBER_OF_TOPICS}
{L_NUMBER_USERS_ATTACH}:{NUMBER_OF_USERS}
@@ -58,69 +55,65 @@
- - - - -
{L_VIEW}: {S_VIEW_SELECT}   - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{L_ATTACH_SEARCH_QUERY}
{L_FILENAME}:
{L_SEARCH_WILDCARD_EXPLAIN}
{L_FILE_COMMENT}:
{L_SEARCH_WILDCARD_EXPLAIN}
{L_SEARCH_AUTHOR}:
{L_SEARCH_WILDCARD_EXPLAIN}
{L_SIZE_SMALLER_THAN}:
{L_SIZE_GREATER_THAN}:
{L_COUNT_SMALLER_THAN}:
{L_COUNT_GREATER_THAN}:
{L_MORE_DAYS_OLD}:
{L_SEARCH_OPTIONS}
{L_FORUM}:
{L_SORT_BY}: {S_SORT_OPTIONS}
{L_SORT}: {S_SORT_ORDER}
{S_HIDDEN_FIELDS}
- + + + + +
{L_VIEW}: {S_VIEW_SELECT}  
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{L_ATTACH_SEARCH_QUERY}
{L_FILENAME}:
{L_SEARCH_WILDCARD_EXPLAIN}
{L_FILE_COMMENT}:
{L_SEARCH_WILDCARD_EXPLAIN}
{L_SEARCH_AUTHOR}:
{L_SEARCH_WILDCARD_EXPLAIN}
{L_SIZE_SMALLER_THAN}:
{L_SIZE_GREATER_THAN}:
{L_COUNT_SMALLER_THAN}:
{L_COUNT_GREATER_THAN}:
{L_MORE_DAYS_OLD}:
{L_SEARCH_OPTIONS}
{L_FORUM}: 
{L_SORT_BY}: {S_SORT_OPTIONS}
{L_SORT}: {S_SORT_ORDER}
{S_HIDDEN_FIELDS}
@@ -130,38 +123,35 @@
- - - - -
- {L_VIEW}: {S_VIEW_SELECT}  {L_SORT_BY}: {S_MODE_SELECT}  {L_ORDER} {S_ORDER_SELECT}   - - -
- - - - - - - - - - - - - - - -
#{L_USERNAME}{L_ATTACHMENTS}{L_SIZE_IN_KB}
 {memberrow.ROW_NUMBER} {memberrow.USERNAME} {memberrow.TOTAL_ATTACHMENTS}  {memberrow.TOTAL_SIZE} 
- - - - - - -
{PAGE_NUMBER}{PAGINATION} 
+ + + + +
{L_VIEW}: {S_VIEW_SELECT} {L_SORT_BY}: {S_MODE_SELECT} {L_ORDER} {S_ORDER_SELECT}  
+ + + + + + + + + + + + + + + +
#{L_USERNAME}{L_ATTACHMENTS}{L_SIZE_IN_KB}
{memberrow.ROW_NUMBER} + {memberrow.USERNAME} + {memberrow.TOTAL_ATTACHMENTS}{memberrow.TOTAL_SIZE}
+ + + + + +
{PAGE_NUMBER}{PAGINATION} 
@@ -188,66 +178,60 @@
- - - - -
- {L_VIEW}: {S_VIEW_SELECT}  {L_SORT_BY}: {S_MODE_SELECT}  {L_ORDER} {S_ORDER_SELECT}   - - -
- - - - - - - - - - - - - - - - - - - - - - - - {attachrow.S_HIDDEN} - - - - - -
#{L_FILENAME}{L_FILE_COMMENT}{L_EXTENSION}{L_SIZE}{L_DOWNLOADS}{L_POST_TIME}{L_POSTED_IN_TOPIC}{L_DELETE}
 {attachrow.ROW_NUMBER} {attachrow.FILENAME}{attachrow.EXTENSION}{attachrow.SIZE}{attachrow.POST_TIME}{attachrow.POST_TITLE}{attachrow.S_DELETE_BOX}
- -   - -
- - + + + + +
{L_VIEW}: {S_VIEW_SELECT} {L_SORT_BY}: {S_MODE_SELECT} {L_ORDER} {S_ORDER_SELECT}  
+ + + + + + + + + + + + + + + + + + + + + + + + {attachrow.S_HIDDEN} + + + + + +
#{L_FILENAME}{L_FILE_COMMENT}{L_EXTENSION}{L_SIZE}{L_DOWNLOADS}{L_POST_TIME}{L_POSTED_IN_TOPIC}{L_DELETE}
 {attachrow.ROW_NUMBER} {attachrow.FILENAME} + {attachrow.EXTENSION}{attachrow.SIZE}{attachrow.POST_TIME}{attachrow.POST_TITLE}{attachrow.S_DELETE_BOX}
+ +   + +
+ {S_USER_HIDDEN} - - - - - - -
{L_MARK_ALL} :: {L_UNMARK_ALL}
- - - - - - -
{PAGE_NUMBER}{PAGINATION} 
+ + + + + +
{L_MARK_ALL} :: {L_UNMARK_ALL}
+ + + + + +
{PAGE_NUMBER}{PAGINATION} 
diff --git a/styles/templates/admin/admin_attachments.tpl b/styles/templates/admin/admin_attachments.tpl index abbeb62a2..a0c0dac42 100644 --- a/styles/templates/admin/admin_attachments.tpl +++ b/styles/templates/admin/admin_attachments.tpl @@ -51,90 +51,91 @@
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{L_ATTACH_SETTINGS}
{L_UPLOAD_DIRECTORY}
{L_UPLOAD_DIRECTORY_EXPLAIN}
{L_ATTACH_IMG_PATH}
{L_ATTACH_IMG_PATH_EXPLAIN}
{L_ATTACH_TOPIC_ICON}
{L_ATTACH_TOPIC_ICON_EXPLAIN}
{L_ATTACH_DISPLAY_ORDER}
{L_ATTACH_DISPLAY_ORDER_EXPLAIN}		 - - - - - - - -
{L_DESC}
{L_ASC}
{L_ATTACH_FILESIZE_SETTINGS}
{L_MAX_FILESIZE_ATTACH}
{L_MAX_FILESIZE_ATTACH_EXPLAIN}		 {S_FILESIZE}
{L_ATTACH_QUOTA}
{L_ATTACH_QUOTA_EXPLAIN}		 {S_FILESIZE_QUOTA}
{L_MAX_FILESIZE_PM}
{L_MAX_FILESIZE_PM_EXPLAIN}		 {S_FILESIZE_PM}
{L_DEFAULT_QUOTA_LIMIT}
{L_DEFAULT_QUOTA_LIMIT_EXPLAIN}		 - - - - - - - - - -
{S_DEFAULT_UPLOAD_LIMIT} {L_UPLOAD_QUOTA} 
{S_DEFAULT_PM_LIMIT} {L_PM_QUOTA} 
-
{L_ATTACH_NUMBER_SETTINGS}
{L_MAX_ATTACHMENTS}
{L_MAX_ATTACHMENTS_EXPLAIN}
{L_MAX_ATTACHMENTS_PM}
{L_MAX_ATTACHMENTS_PM_EXPLAIN}
{L_ATTACH_OPTIONS_SETTINGS}
{L_DISABLE_MOD}
{L_DISABLE_MOD_EXPLAIN}		 {L_YES}   {L_NO}
{L_PM_ATTACHMENTS}
{L_PM_ATTACHMENTS_EXPLAIN}		 {L_YES}   {L_NO}
{S_HIDDEN_FIELDS}    
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{L_ATTACH_SETTINGS}
{L_UPLOAD_DIRECTORY}
{L_UPLOAD_DIRECTORY_EXPLAIN}
{L_ATTACH_IMG_PATH}
{L_ATTACH_IMG_PATH_EXPLAIN}
{L_ATTACH_TOPIC_ICON}
{L_ATTACH_TOPIC_ICON_EXPLAIN}
{L_ATTACH_DISPLAY_ORDER}
{L_ATTACH_DISPLAY_ORDER_EXPLAIN}		 + + + + + + + +
{L_DESC}
{L_ASC}
+
{L_ATTACH_FILESIZE_SETTINGS}
{L_MAX_FILESIZE_ATTACH}
{L_MAX_FILESIZE_ATTACH_EXPLAIN}		{S_FILESIZE}
{L_ATTACH_QUOTA}
{L_ATTACH_QUOTA_EXPLAIN}		{S_FILESIZE_QUOTA}
{L_MAX_FILESIZE_PM}
{L_MAX_FILESIZE_PM_EXPLAIN}		{S_FILESIZE_PM}
{L_DEFAULT_QUOTA_LIMIT}
{L_DEFAULT_QUOTA_LIMIT_EXPLAIN}		 + + + + + + + + + +
{S_DEFAULT_UPLOAD_LIMIT}{L_UPLOAD_QUOTA}
{S_DEFAULT_PM_LIMIT}{L_PM_QUOTA}
+
{L_ATTACH_NUMBER_SETTINGS}
{L_MAX_ATTACHMENTS}
{L_MAX_ATTACHMENTS_EXPLAIN}
{L_MAX_ATTACHMENTS_PM}
{L_MAX_ATTACHMENTS_PM_EXPLAIN}
{L_ATTACH_OPTIONS_SETTINGS}
{L_DISABLE_MOD}
{L_DISABLE_MOD_EXPLAIN}		 {L_YES}   {L_NO}
{L_PM_ATTACHMENTS}
{L_PM_ATTACHMENTS_EXPLAIN}		 {L_YES}   {L_NO}
{S_HIDDEN_FIELDS}    
@@ -160,15 +161,15 @@ {L_ADD_NEW} - - {S_FILESIZE} - + + {S_FILESIZE} + - + {S_HIDDEN_FIELDS} - - + + @@ -178,23 +179,23 @@ - + - - + +
{L_VIEW}{L_VIEW}
- {limit_row.S_FILESIZE} - + {limit_row.S_FILESIZE} + - + - - + + @@ -204,7 +205,7 @@

{L_QUOTA_LIMIT_DESC}

- +
@@ -212,7 +213,7 @@ - - - - - + + - + - @@ -60,13 +60,13 @@ function toggle_cbox (cb_id, tr_id)
{L_ASSIGNED_USERS} - {L_UPLOAD_QUOTA}
+     + - - - - - - + + diff --git a/styles/templates/admin/index.tpl b/styles/templates/admin/index.tpl index 445348d45..21ad092ce 100644 --- a/styles/templates/admin/index.tpl +++ b/styles/templates/admin/index.tpl @@ -203,19 +203,19 @@ - - + + - + - - + + diff --git a/styles/templates/default/group.tpl b/styles/templates/default/group.tpl index 08ed74d9d..295c14f92 100644 --- a/styles/templates/default/group.tpl +++ b/styles/templates/default/group.tpl @@ -65,7 +65,7 @@ - - + @@ -168,7 +168,7 @@ - + @@ -301,7 +301,7 @@ - +
{L_ASSIGNED_GROUPS} - {L_UPLOAD_QUOTA}
+ {L_ASSIGNED_USERS} - {L_PM_QUOTA}
+     + - - - - - - - - - - - + + + + + + + + + + + diff --git a/styles/templates/admin/admin_forumauth_list.tpl b/styles/templates/admin/admin_forumauth_list.tpl index dc8f9190f..3679a8e27 100644 --- a/styles/templates/admin/admin_forumauth_list.tpl +++ b/styles/templates/admin/admin_forumauth_list.tpl @@ -54,9 +54,9 @@ - + - + @@ -75,7 +75,7 @@ - + diff --git a/styles/templates/admin/admin_forums.tpl b/styles/templates/admin/admin_forums.tpl index 3feba2b11..f59c320f8 100644 --- a/styles/templates/admin/admin_forums.tpl +++ b/styles/templates/admin/admin_forums.tpl @@ -32,15 +32,15 @@ function toggle_cat_list (val) - + - + - + @@ -199,27 +199,19 @@ function hl (id, on) {L_DELETE} - + - - + + - +
{L_ASSIGNED_GROUPS} - {L_PM_QUOTA}
+
{list.JOB_ID}{list.CRON_ACTIVE}{list.CRON_TITLE}{list.CRON_SCRIPT}{list.SCHEDULE}{list.LAST_RUN}{list.NEXT_RUN}{list.RUN_COUNT} + {list.JOB_ID}{list.CRON_ACTIVE}{list.CRON_TITLE}{list.CRON_SCRIPT}{list.SCHEDULE}{list.LAST_RUN}{list.NEXT_RUN}{list.RUN_COUNT} [Run] [Edit] [Del] @@ -136,10 +136,12 @@ tr.hl-tr:hover td { background-color: #CFC !important; }
{L_CRON_EDIT_HEAD_EDIT}

{L_CRON_ID}

 {CRON_ID}

{L_CRON_ACTIVE}

diff --git a/styles/templates/admin/admin_extensions.tpl b/styles/templates/admin/admin_extensions.tpl index 2abbd7592..348919a31 100644 --- a/styles/templates/admin/admin_extensions.tpl +++ b/styles/templates/admin/admin_extensions.tpl @@ -7,48 +7,48 @@
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{L_MANAGE_EXTENSIONS} -
 {L_EXPLANATION}  {L_EXTENSION}  {L_EXTENSION_GROUP}  {L_ADD_NEW} 
{S_ADD_GROUP_SELECT}
{S_HIDDEN_FIELDS}
 {L_EXPLANATION}  {L_EXTENSION}  {L_EXTENSION_GROUP}  {L_DELETE} 
{extension_row.EXTENSION}{extension_row.S_GROUP_SELECT}
- -
- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{L_MANAGE_EXTENSIONS} +
{L_EXPLANATION}{L_EXTENSION}{L_EXTENSION_GROUP}{L_ADD_NEW}
{S_ADD_GROUP_SELECT}
{S_HIDDEN_FIELDS}
{L_EXPLANATION}{L_EXTENSION}{L_EXTENSION_GROUP}{L_DELETE}
{extension_row.EXTENSION}{extension_row.S_GROUP_SELECT}
+ + +
@@ -65,92 +65,90 @@
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{L_MANAGE_EXTENSION_GROUPS} -
 {L_EXTENSION_GROUP}  {L_SPECIAL_CATEGORY}  {L_ALLOWED}  {L_DOWNLOAD_MODE}  {L_UPLOAD_ICON}  {L_MAX_FILESIZE_ATTACH}  {L_ALLOWED_FORUMS}  {L_ADD_NEW} 
- - - - - -
 
- 		{S_SELECT_CAT}{S_ADD_DOWNLOAD_MODE} {S_FILESIZE} 
 {L_EXTENSION_GROUP}  {L_SPECIAL_CATEGORY}  {L_ALLOWED}  {L_DOWNLOAD_MODE}  {L_UPLOAD_ICON}  {L_MAX_GROUPS_FILESIZE}  {L_ALLOWED_FORUMS}  {L_DELETE} 
- - - - - -
{grouprow.CAT_BOX}
- 		{grouprow.S_SELECT_CAT}{grouprow.S_DOWNLOAD_MODE} {grouprow.S_FILESIZE}{L_EXT_GROUP_PERMISSIONS}
{grouprow.extensionrow.EXTENSION}{grouprow.extensionrow.EXPLANATION}      
- -
- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{L_MANAGE_EXTENSION_GROUPS} +
{L_EXTENSION_GROUP}{L_SPECIAL_CATEGORY}{L_ALLOWED}{L_DOWNLOAD_MODE}{L_UPLOAD_ICON}{L_MAX_FILESIZE_ATTACH}{L_ALLOWED_FORUMS}{L_ADD_NEW}
+ + + + + +
 
+ 		{S_SELECT_CAT}{S_ADD_DOWNLOAD_MODE}{S_FILESIZE} 
{L_EXTENSION_GROUP}{L_SPECIAL_CATEGORY}{L_ALLOWED}{L_DOWNLOAD_MODE}{L_UPLOAD_ICON}{L_MAX_GROUPS_FILESIZE}{L_ALLOWED_FORUMS}{L_DELETE}
+ + + + + +
{grouprow.CAT_BOX}
+ 		{grouprow.S_SELECT_CAT}{grouprow.S_DOWNLOAD_MODE}{grouprow.S_FILESIZE}{L_EXT_GROUP_PERMISSIONS}
{grouprow.extensionrow.EXTENSION}{grouprow.extensionrow.EXPLANATION}      
+ + +
@@ -163,16 +161,17 @@

{L_GROUP_PERMISSIONS_EXPLAIN}


+ - @@ -195,17 +194,17 @@ - - - - + + + +
+
- - - - + + +
{L_ALLOWED_FORUMS}
+
 
 
{L_ADD_FORUMS}
- -
    + +
  
{cat_row.forum_row.FORUM_NAME}{cat_row.forum_row.FORUM_NAME} {cat_row.forum_row.forum_auth_data.CELL_VALUE}{cat_row.forum_row.forum_auth_data.CELL_VALUE}
{CAT_NAME} {forum_auth_data.S_AUTH_LEVELS_SELECT}{forum_auth_data.S_AUTH_LEVELS_SELECT}
{L_FORUM_NAME}
{L_FORUM_DESC}
{L_SF_PARENT_FORUM}
{L_CATEGORY} {L_PRUNE}{L_PRUNE}
 ↑  ↓  +sub  ↑  ↓  +sub  {c.f.FORUM_NAME} {L_TOPICS_SHORT}: {c.f.NUM_TOPICS} {L_POSTS_SHORT}: {c.f.NUM_POSTS} -   - {L_EDIT} -  ·  - {L_PERMISSIONS} -  ·  - {L_SYNC} -  ·  - {L_DELETE} -   + {L_EDIT}·{L_PERMISSIONS}·{L_SYNC}·{L_DELETE} {c.f.PRUNE_DAYS}{c.f.PRUNE_DAYS}
diff --git a/styles/templates/admin/admin_log.tpl b/styles/templates/admin/admin_log.tpl index 8add585a1..2bb57477e 100644 --- a/styles/templates/admin/admin_log.tpl +++ b/styles/templates/admin/admin_log.tpl @@ -58,7 +58,7 @@
+ - + - + - + - + - +
diff --git a/styles/templates/admin/admin_mass_email.tpl b/styles/templates/admin/admin_mass_email.tpl index e7139862d..ecc623f21 100644 --- a/styles/templates/admin/admin_mass_email.tpl +++ b/styles/templates/admin/admin_mass_email.tpl @@ -9,11 +9,11 @@ {L_COMPOSE}
{L_RECIPIENTS}{L_RECIPIENTS} {S_GROUP_SELECT}
{L_MASS_EMAIL_MESSAGE_TYPE}{L_MASS_EMAIL_MESSAGE_TYPE}
{L_REPLY_TO}{L_REPLY_TO}
{L_SUBJECT}{L_SUBJECT} - +
{L_MESSAGE}{L_MESSAGE} - +
- - + +
diff --git a/styles/templates/admin/admin_rebuild_search.tpl b/styles/templates/admin/admin_rebuild_search.tpl index 0a4a24f2a..1a68d8c87 100644 --- a/styles/templates/admin/admin_rebuild_search.tpl +++ b/styles/templates/admin/admin_rebuild_search.tpl @@ -194,39 +194,39 @@ function updateButton()
- - - - + + + + - + - + - + - + - + - + - + - + - - + diff --git a/styles/templates/admin/admin_ug_auth.tpl b/styles/templates/admin/admin_ug_auth.tpl index fb98941a9..33b338d9d 100644 --- a/styles/templates/admin/admin_ug_auth.tpl +++ b/styles/templates/admin/admin_ug_auth.tpl @@ -99,19 +99,15 @@ thead tr { - + - + - diff --git a/styles/templates/admin/admin_user_search.tpl b/styles/templates/admin/admin_user_search.tpl index 8d3fd0019..9a4618579 100644 --- a/styles/templates/admin/admin_user_search.tpl +++ b/styles/templates/admin/admin_user_search.tpl @@ -31,7 +31,7 @@ - + @@ -53,7 +53,7 @@ - + @@ -65,7 +65,7 @@ - + @@ -91,7 +91,7 @@ - + @@ -111,16 +111,16 @@
-
{L_PROCESSING_TIME_DETAILS}
{L_TIME_LAST_POSTS_ADMIN} {L_TIME_LAST_POSTS_ADMIN} {LAST_CYCLE_TIME}{L_TIME_FROM_THE_BEGINNING} {L_TIME_FROM_THE_BEGINNING} {SESSION_TIME}
{L_TIME_AVERAGE} {L_TIME_AVERAGE} {SESSION_AVERAGE_CYCLE_TIME}{L_TIME_ESTIMATED} {L_TIME_ESTIMATED} {SESSION_ESTIMATED_TIME}
{L_SIZE_SEARCH_TABLES} {L_SIZE_SEARCH_TABLES} {SEARCH_TABLES_SIZE}Data size Data size {SEARCH_DATA_SIZE}
{L_SIZE_ESTIMATED} {L_SIZE_ESTIMATED} {FINAL_SEARCH_TABLES_SIZE}Index size Index size {SEARCH_INDEX_SIZE}
+ {L_STARTING_POST_ID}: {START_POST}, {L_POSTS_LAST_CYCLE}: {POST_LIMIT}, {L_TIME_LIMIT}: {TIME_LIMIT} diff --git a/styles/templates/admin/admin_smilies.tpl b/styles/templates/admin/admin_smilies.tpl index a0422eb0c..d01f4d292 100644 --- a/styles/templates/admin/admin_smilies.tpl +++ b/styles/templates/admin/admin_smilies.tpl @@ -103,7 +103,7 @@ function update_smiley(newimage)
{L_SMILE_CONFLICTS}
{L_REPLACE_EXISTING}   {L_KEEP_EXISTING}		{L_SMILE_CONFLICTS}
{L_REPLACE_EXISTING}   {L_KEEP_EXISTING}
{L_FORUM}{L_MODERATOR_STATUS}{L_MODERATOR_STATUS} {acltype.ACL_TYPE_NAME}{acltype.ACL_TYPE_NAME}
+
 
{L_SEARCH_USERS_JOINED}  // 
{L_SEARCH_USERS_JOINED_EXPLAIN}		{L_SEARCH_USERS_JOINED}:  // 
{L_SEARCH_USERS_JOINED_EXPLAIN}
 
{L_POSTCOUNT}   
{L_SEARCH_USERS_POSTCOUNT_EXPLAIN}		{L_POSTCOUNT}:   
{L_SEARCH_USERS_POSTCOUNT_EXPLAIN}
  
{L_SEARCH_USERS_LASTVISITED}   
{L_SEARCH_USERS_LASTVISITED_EXPLAIN}		{L_SEARCH_USERS_LASTVISITED}:   
{L_SEARCH_USERS_LASTVISITED_EXPLAIN}
 
 
{L_SEARCH_USERS_MISC_EXPLAIN}		{L_ROLE}  
{L_SEARCH_USERS_MISC_EXPLAIN}
 
+
- +
{L_SORT_OPTIONS} {L_USERNAME} | {L_EMAIL_ADDRESS} | {L_POSTS} | {L_JOINED} | {L_LAST_VISIT}{L_SORT_OPTIONS} {L_USERNAME} | {L_EMAIL_ADDRESS} | {L_POSTS} | {L_JOINED} | {L_LAST_VISIT}

 

- +
- +
{PAGE_NUMBER}{PAGINATION}{PAGINATION}
@@ -137,24 +137,24 @@ - - - - - - - - - + + + + + + + + + - +
 {userrow.USER}  {userrow.EMAIL}  {userrow.JOINDATE}  {userrow.POSTS}  {userrow.LASTVISIT}  {L_MANAGE}  {L_PERMISSIONS}  {userrow.BAN}  {userrow.ABLED} {userrow.USER}{userrow.EMAIL}{userrow.JOINDATE}{userrow.POSTS}{userrow.LASTVISIT}{L_MANAGE}{L_PERMISSIONS}{userrow.BAN}{userrow.ABLED}
.
- +
diff --git a/styles/templates/admin/admin_words.tpl b/styles/templates/admin/admin_words.tpl index 6fe689f34..e6045624d 100644 --- a/styles/templates/admin/admin_words.tpl +++ b/styles/templates/admin/admin_words.tpl @@ -15,8 +15,8 @@
{words.WORD}{words.REPLACEMENT}{words.WORD}{words.REPLACEMENT} {L_EDIT} {L_DELETE}
{reg_user_row.USER}{L_LOGIN}: {reg_user_row.STARTED} | {L_LAST_UPDATED}: {reg_user_row.LASTUPDATE}{reg_user_row.USER}{L_LOGIN}: {reg_user_row.STARTED} | {L_LAST_UPDATED}: {reg_user_row.LASTUPDATE} {reg_user_row.IP_ADDRESS}
.
{L_GUEST}{guest_user_row.STARTED}-{guest_user_row.LASTUPDATE}{L_GUEST}{guest_user_row.STARTED}-{guest_user_row.LASTUPDATE} {guest_user_row.IP_ADDRESS}

{GROUP_NAME}
+ {GROUP_AVATAR} @@ -149,7 +149,7 @@
{ROW_NUMBER}{MOD_AVATAR}{MOD_AVATAR} {MOD_USER} {MOD_PM} {MOD_EMAIL}
{member.ROW_NUMBER}{member.AVATAR_IMG}{member.AVATAR_IMG} {member.USER} {member.PM} {member.EMAIL}
{L_MORE_RELEASES}{L_MORE_RELEASES}
diff --git a/styles/templates/default/login.tpl b/styles/templates/default/login.tpl index 04cbc2613..8c3b64eb1 100644 --- a/styles/templates/default/login.tpl +++ b/styles/templates/default/login.tpl @@ -19,12 +19,12 @@
- + - + @@ -34,14 +34,13 @@ - + - + - +
{L_USERNAME}:{L_USERNAME}: readonly style="color: gray" />
{L_PASSWORD}:{L_PASSWORD}:  
{L_AUTO_LOGIN}: disabled checked /> - {L_AUTO_LOGIN}: disabledchecked />
{L_FORGOTTEN_PASSWORD} · {L_REGISTER}{L_FORGOTTEN_PASSWORD} · {L_REGISTER}
diff --git a/styles/templates/default/memberlist.tpl b/styles/templates/default/memberlist.tpl index f21b98bbf..492ac0ad0 100644 --- a/styles/templates/default/memberlist.tpl +++ b/styles/templates/default/memberlist.tpl @@ -3,13 +3,13 @@
- + -
{L_SORT_BY}: {S_MODE_SELECT}  {L_ORDER}: {S_ORDER_SELECT}  {L_SORT_BY}: {S_MODE_SELECT} · {L_ORDER}: {S_ORDER_SELECT} 
- -   - + + +   +
diff --git a/styles/templates/default/modcp_split.tpl b/styles/templates/default/modcp_split.tpl index afb8e9338..299e250fe 100644 --- a/styles/templates/default/modcp_split.tpl +++ b/styles/templates/default/modcp_split.tpl @@ -33,26 +33,26 @@ function toggle_cbox (cb_id, tr_id)
{L_TOPIC_SPLIT}
+ {L_SPLIT_TOPIC_EXPLAIN}
{L_NEW_TOPIC_TITLE}{L_NEW_TOPIC_TITLE}
{L_FORUM_FOR_NEW_TOPIC}{L_FORUM_FOR_NEW_TOPIC} {S_FORUM_SELECT}
+ - + - +
 
- - - + + +
-
+
@@ -90,10 +90,10 @@ function toggle_cbox (cb_id, tr_id) diff --git a/styles/templates/default/page_header.tpl b/styles/templates/default/page_header.tpl index 4d574c94f..5064935e0 100644 --- a/styles/templates/default/page_header.tpl +++ b/styles/templates/default/page_header.tpl @@ -269,7 +269,7 @@ function go_to_page () {L_USERGROUPS}|{L_MEMBERLIST} - diff --git a/styles/templates/default/viewforum.tpl b/styles/templates/default/viewforum.tpl index ee4b58a0c..9d2d3b595 100644 --- a/styles/templates/default/viewforum.tpl +++ b/styles/templates/default/viewforum.tpl @@ -632,7 +632,7 @@ td.topic_id { cursor: pointer; }

{L_MARK_TOPICS_READ}

-

{L_AUTOCLEAN}: {PRUNE_DAYS} {L_DAYS}{L_DISABLED}

+

{L_AUTOCLEAN}: {PRUNE_DAYS}{L_DISABLED}

diff --git a/styles/templates/default/viewtopic.tpl b/styles/templates/default/viewtopic.tpl index b434f5649..0a84de789 100644 --- a/styles/templates/default/viewtopic.tpl +++ b/styles/templates/default/viewtopic.tpl @@ -515,7 +515,7 @@ function build_poll_add_form (src_el) -
- - - - + + + + {S_HIDDEN_FIELDS}
+ {L_PRIVATE_MESSAGES}: {PM_INFO} diff --git a/styles/templates/default/posting_smilies.tpl b/styles/templates/default/posting_smilies.tpl index c1c1419f9..272c8f6ef 100644 --- a/styles/templates/default/posting_smilies.tpl +++ b/styles/templates/default/posting_smilies.tpl @@ -23,14 +23,14 @@ function emoticon(text) { - + - + @@ -38,7 +38,7 @@ function emoticon(text) { - +
{smilies_row.smilies_col.SMILEY_DESC}
{L_MORE_EMOTICONS}

{L_CLOSE_WINDOW}
{L_CLOSE_WINDOW}
+ diff --git a/viewforum.php b/viewforum.php index 4a6e627d1..f4c18bc21 100644 --- a/viewforum.php +++ b/viewforum.php @@ -519,7 +519,7 @@ $template->assign_vars([ 'SESSION_ADMIN' => $userdata['session_admin'], 'MOD_REDIRECT_URL' => $mod_redirect_url, 'MODERATION_ON' => $moderation, - 'PRUNE_DAYS' => $forum_data['prune_days'], + 'PRUNE_DAYS' => !empty($forum_data['prune_days']) ? delta_time((TIMENOW - 86400 * $forum_data['prune_days']), TIMENOW, 'days') : false, 'CAT_ID' => $forum_data['cat_id'], 'CAT_TITLE' => $forums['cat_title_html'][$forum_data['cat_id']],