Home Explore Help
Register Sign In
Omnimaga
/
SMF2.1
mirror of [email protected]:Omnimaga/SMF2.1.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

! Time for an option to grow up and become default. Fixes #1260

Signed-off-by: Peter Spicer <[email protected]>
Peter Spicer 10 years ago
parent
4cd69cbf47
commit
e96d8ffe6c
9 changed files with 11 additions and 15 deletions
Split View Show Diff Stats
  1. 0 1
      Sources/ManageSettings.php
  2. 2 2
      Themes/default/Display.template.php
  3. 2 2
      Themes/default/MessageIndex.template.php
  4. 4 4
      Themes/default/Recent.template.php
  5. 0 2
      Themes/default/languages/Help.english.php
  6. 0 1
      Themes/default/languages/ManageSettings.english.php
  7. 1 1
      other/upgrade_2-1_mysql.sql
  8. 1 1
      other/upgrade_2-1_postgresql.sql
  9. 1 1
      other/upgrade_2-1_sqlite.sql

+ 0 - 1
Sources/ManageSettings.php
View File 

@@ -237,7 +237,6 @@ function ModifyLayoutSettings($return_config = false)
 
 		'',
 
 			// Stuff that just is everywhere - today, search, online, etc.
 
 			array('select', 'todayMod', array($txt['today_disabled'], $txt['today_only'], $txt['yesterday_today'])),
 
-			array('check', 'topbottomEnable'),
 
 			array('check', 'onlineEnable'),
 
 			array('check', 'enableVBStyleLogin'),
 
 		'',

+ 2 - 2
Themes/default/Display.template.php
View File 

@@ -155,7 +155,7 @@ function template_main()
 
 	echo '
 
 			<div class="pagesection">
 
 				', template_button_strip($context['normal_buttons'], 'right'), '
 
-				', !empty($modSettings['topbottomEnable']) ? $context['menu_separator'] . '<a href="#bot" class="topbottom floatleft">' . $txt['go_down'] . '</a>' : '', '
 
+				', $context['menu_separator'], '<a href="#bot" class="topbottom floatleft">', $txt['go_down'], '</a>
 
 				<div class="pagelinks floatleft">
 
 					', $context['page_index'], '
 
 				</div>
 
@@ -206,7 +206,7 @@ function template_main()
 
 	echo '
 
 			<div class="pagesection">
 
 				', template_button_strip($context['normal_buttons'], 'right'), '
 
-				', !empty($modSettings['topbottomEnable']) ? $context['menu_separator'] . '<a href="#main_content_section" class="topbottom floatleft">' . $txt['go_up'] . '</a>' : '', '
 
+				', $context['menu_separator'], '<a href="#main_content_section" class="topbottom floatleft">', $txt['go_up'], '</a>
 
 				<div class="pagelinks floatleft">
 
 					', $context['page_index'], '
 
 				</div>

+ 2 - 2
Themes/default/MessageIndex.template.php
View File 

@@ -120,7 +120,7 @@ function template_main()
 
 	{
 
 		echo '
 
 	<div class="pagesection">
 
-		', !empty($modSettings['topbottomEnable']) ? $context['menu_separator'] . '<a href="#bot" class="topbottom floatleft">' . $txt['go_down'] . '</a>' : '', '
 
+		', $context['menu_separator'], '<a href="#bot" class="topbottom floatleft">', $txt['go_down'], '</a>
 
 		<div class="pagelinks floatleft">', $context['page_index'], '</div>
 
 		', template_button_strip($context['normal_buttons'], 'right'), '
 
 	</div>';
 
@@ -357,7 +357,7 @@ function template_main()
 
 		echo '
 
 	<div class="pagesection">
 
 		', template_button_strip($context['normal_buttons'], 'right'), '
 
-		', !empty($modSettings['topbottomEnable']) ? $context['menu_separator'] . '<a href="#main_content_section" class="topbottom floatleft">' . $txt['go_up'] . '</a>' : '', '
 
+		', $context['menu_separator'], '<a href="#main_content_section" class="topbottom floatleft">', $txt['go_up'], '</a>
 
 		<div class="pagelinks">', $context['page_index'], '</div>
 
 	</div>';
 
 	}

+ 4 - 4
Themes/default/Recent.template.php
View File 

@@ -96,7 +96,7 @@ function template_unread()
 
 	{
 
 		echo '
 
 			<div class="pagesection">
 
-				', !empty($modSettings['topbottomEnable']) ? $context['menu_separator'] . '<a href="#bot" class="topbottom floatleft">' . $txt['go_down'] . '</a>' : '', '
 
+				', $context['menu_separator'], '<a href="#bot" class="topbottom floatleft">', $txt['go_down'], '</a>
 
 				<div class="pagelinks floatleft">', $context['page_index'], '</div>
 
 				', !empty($context['recent_buttons']) ? template_button_strip($context['recent_buttons'], 'right') : '', '
 
 			</div>';
 
@@ -213,7 +213,7 @@ function template_unread()
 
 			</div>
 
 			<div class="pagesection">
 
 				', !empty($context['recent_buttons']) ? template_button_strip($context['recent_buttons'], 'right') : '', '
 
-				', !empty($modSettings['topbottomEnable']) ? $context['menu_separator'] . '<a href="#recent" class="topbottom floatleft">' . $txt['go_up'] . '</a>' : '', '
 
+				', $context['menu_separator'], '<a href="#recent" class="topbottom floatleft">', $txt['go_up'], '</a>
 
 				<div class="pagelinks">', $context['page_index'], '</div>
 
 			</div>';
 
 	}
 
@@ -254,7 +254,7 @@ function template_replies()
 
 	{
 
 		echo '
 
 			<div class="pagesection">
 
-				', !empty($modSettings['topbottomEnable']) ? $context['menu_separator'] . '<a href="#bot" class="topbottom floatleft">' . $txt['go_down'] . '</a>' : '', '
 
+				', $context['menu_separator'], '<a href="#bot" class="topbottom floatleft">', $txt['go_down'], '</a>
 
 				<div class="pagelinks floatleft">', $context['page_index'], '</div>
 
 				', !empty($context['recent_buttons']) ? template_button_strip($context['recent_buttons'], 'right') : '', '
 
 			</div>';
 
@@ -367,7 +367,7 @@ function template_replies()
 
 			</div>
 
 			<div class="pagesection">
 
 				', !empty($context['recent_buttons']) ? template_button_strip($context['recent_buttons'], 'right') : '', '
 
-				', !empty($modSettings['topbottomEnable']) ? $context['menu_separator'] . '<a href="#recent" class="topbottom floatleft">' . $txt['go_up'] . '</a>' : '', '
 
+				', $context['menu_separator'], '<a href="#recent" class="topbottom floatleft">', $txt['go_up'], '</a>
 
 				<div class="pagelinks">', $context['page_index'], '</div>
 
 			</div>';
 
 	}

+ 0 - 2
Themes/default/languages/Help.english.php
View File 

@@ -255,8 +255,6 @@ $helptxt['trackStats'] = 'Stats:<br>This will allow users to see the latest post
 
 		Page views:<br>Adds another column to the stats page with the number of pageviews on your forum.';
 
 $helptxt['titlesEnable'] = 'Switching Custom Titles on will allow members with the relevant permission to create a special title for themselves.
 
 		This will be shown underneath the name.<br><em>For example:</em><br>Jeff<br>Cool Guy';
 
-$helptxt['topbottomEnable'] = 'This will add go up and go down buttons, so that member can go to the top and bottom of a page
 
-		without scrolling.';
 
 $helptxt['onlineEnable'] = 'This will show an image to indicate whether the member is online or offline';
 
 $helptxt['todayMod'] = 'This will show &quot;Today&quot; or &quot;Yesterday&quot; instead of the date.<br><br>
 
 		<strong>Examples:</strong><br><br>

+ 0 - 1
Themes/default/languages/ManageSettings.english.php
View File 

@@ -81,7 +81,6 @@ $txt['todayMod'] = 'Enable shorthand date display';
 
 $txt['today_disabled'] = 'Disabled';
 
 $txt['today_only'] = 'Only Today';
 
 $txt['yesterday_today'] = 'Today &amp; Yesterday';
 
-$txt['topbottomEnable'] = 'Enable Go Up/Go Down buttons';
 
 $txt['onlineEnable'] = 'Show online/offline in posts and PMs';
 
 $txt['enableVBStyleLogin'] = 'Show a quick login on every page';
 
 $txt['defaultMaxMembers'] = 'Members per page in member list';

+ 1 - 1
other/upgrade_2-1_mysql.sql
View File 

@@ -730,7 +730,7 @@ WHERE variable = 'avatar_action_too_large'
 
 
 ---# Cleaning up old settings.
 
 DELETE FROM {$db_prefix}settings
 
-WHERE variable IN ('enableStickyTopics', 'guest_hideContacts', 'notify_new_registration', 'attachmentEncryptFilenames', 'hotTopicPosts', 'hotTopicVeryPosts', 'fixLongWords', 'admin_features');
 
+WHERE variable IN ('enableStickyTopics', 'guest_hideContacts', 'notify_new_registration', 'attachmentEncryptFilenames', 'hotTopicPosts', 'hotTopicVeryPosts', 'fixLongWords', 'admin_features', 'topbottomEnable');
 
 ---#
 
 
 ---# Cleaning up old theme settings.

+ 1 - 1
other/upgrade_2-1_postgresql.sql
View File 

@@ -809,7 +809,7 @@ WHERE variable = 'avatar_action_too_large'
 
 
 ---# Cleaning up old settings.
 
 DELETE FROM {$db_prefix}settings
 
-WHERE variable IN ('enableStickyTopics', 'guest_hideContacts', 'notify_new_registration', 'attachmentEncryptFilenames', 'hotTopicPosts', 'hotTopicVeryPosts', 'fixLongWords', 'admin_features');
 
+WHERE variable IN ('enableStickyTopics', 'guest_hideContacts', 'notify_new_registration', 'attachmentEncryptFilenames', 'hotTopicPosts', 'hotTopicVeryPosts', 'fixLongWords', 'admin_features', 'topbottomEnable');
 
 ---#
 
 
 ---# Cleaning up old theme settings.

+ 1 - 1
other/upgrade_2-1_sqlite.sql
View File 

@@ -800,7 +800,7 @@ WHERE variable = 'avatar_action_too_large'
 
 
 ---# Cleaning up old settings.
 
 DELETE FROM {$db_prefix}settings
 
-WHERE variable IN ('enableStickyTopics', 'guest_hideContacts', 'notify_new_registration', 'attachmentEncryptFilenames', 'hotTopicPosts', 'hotTopicVeryPosts', 'fixLongWords', 'admin_features');
 
+WHERE variable IN ('enableStickyTopics', 'guest_hideContacts', 'notify_new_registration', 'attachmentEncryptFilenames', 'hotTopicPosts', 'hotTopicVeryPosts', 'fixLongWords', 'admin_features', 'topbottomEnable');
 
 ---#
 
 
 ---# Cleaning up old theme settings.