Removed About from More menu and show into settings

giorgioz · Jan 27, 2012 · 7600548 · 7600548
1 parent 62b8f04
commit 7600548
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/assets/www/index.html b/assets/www/index.html
@@ -70,8 +70,8 @@
 				</select>
 			</div>
 
-            <div class="item">
-                <label id="aboutPageLabel"><msg key="about-page-label"></msg></label>
+            <div id="aboutPageLabel" class="item">
+                <label><msg key="about-page-label"></msg></label>
 			</div>
 		</script>
 		<script type="text/html" id="saved-pages-template">
@@ -177,7 +177,7 @@
 		<header>
 			<div class="titlebar">
 				<div class="titlebarItem"><msg key="about-page-title">About</msg></div>
-				<button class="titlebarItem closeButton" title-msg="about-close"></button>
+				<button id="aboutclose" class="titlebarItem closeButton" title-msg="about-close"></button>
 			</div>
 		</header>
 		<div class="scroller">
@@ -273,7 +273,6 @@
 		<command type="command" id="forwardCmd" icon="optionForward.png" disabled="true" action="go-forward" />
 		<command type="command" id="selectTextCmd" disabled="false" action="select-text" />
 		<command type="command" id="settingsCmd" icon="optionSettings.png" disabled="false" action="view-settings" />
-		<command type="command" id="aboutCmd" disabled="false" action="view-about" />
 	</menu>
 
 </body>

diff --git a/assets/www/js/chrome.js b/assets/www/js/chrome.js
@@ -9,7 +9,6 @@ window.chrome = function() {
 		'go-forward': function() { goForward(); },
 		'select-text': function() { selectText(); },
 		'view-settings': function() { appSettings.showSettings(); },
-		'view-about': function() { aboutPage(); }
 	};
 
 	// List of functions to be called on a per-platform basis before initialize

diff --git a/assets/www/js/main.js b/assets/www/js/main.js
@@ -12,7 +12,11 @@ function homePage() {
 
 function aboutPage() {
 	chrome.hideOverlays();
-	chrome.hideContent();
 	$("#about-page-overlay").localize().show();
+	$("#aboutclose").unbind('click');
+	$("#aboutclose").bind('click', function(){
+		$("#about-page-overlay").hide();
+		appSettings.showSettings();
+	});
 	chrome.doFocusHack();
 }
diff --git a/assets/www/js/settings.js b/assets/www/js/settings.js
@@ -65,7 +65,6 @@ window.appSettings = function() {
 		chrome.hideContent();
 		$('#settings').localize().show();
 		chrome.doFocusHack();                                   
-		chrome.doScrollHack('#settings .scroller');
 	}
 
 	function onContentLanguageChanged() {