From d37af74b9e56d30044b45913afb21a86c9ad2b79 Mon Sep 17 00:00:00 2001
From: Sebastian Silva <sebastian@sugarlabs.org>
Date: Fri, 18 Nov 2011 22:51:18 +0000
Subject: UI Tweaks

---
diff --git a/app/app.py b/app/app.py
index 40405cb..73c86e9 100644
--- a/app/app.py
+++ b/app/app.py
@@ -100,9 +100,9 @@ def chdir():
         #session['edit_history']=[]
         if os.path.isdir('app'):
             session['pwd']=session['project_home_dir']='app'
-            session['project_home']='/edit/app/app.py'
-        elif os.path.isfile('activity.py'):
-            session['project_home']='/edit/activity.py'
+            #session['project_home']='/edit/app/app.py'
+        #elif os.path.isfile('activity.py'):
+            #session['project_home']='/edit/activity.py'
     return vsplit(frame1=session['project_home'],
                   frame2='/files/%s' % session['pwd'])
 
diff --git a/app/static/css/sugar-theme/images/ui-bg_flat_100_c0c0c0_40x100.png b/app/static/css/sugar-theme/images/ui-bg_flat_100_c0c0c0_40x100.png
deleted file mode 100644
index 299f267..0000000
--- a/app/static/css/sugar-theme/images/ui-bg_flat_100_c0c0c0_40x100.png
+++ /dev/null
Binary files differ
diff --git a/app/static/css/sugar-theme/images/ui-bg_flat_100_e5e5e5_40x100.png b/app/static/css/sugar-theme/images/ui-bg_flat_100_e5e5e5_40x100.png
new file mode 100644
index 0000000..e6052b2
--- /dev/null
+++ b/app/static/css/sugar-theme/images/ui-bg_flat_100_e5e5e5_40x100.png
Binary files differ
diff --git a/app/static/doc/sugar-theme.html b/app/static/doc/sugar-theme.html
index c1c4e04..032eb76 100644
--- a/app/static/doc/sugar-theme.html
+++ b/app/static/doc/sugar-theme.html
@@ -80,7 +80,33 @@
     </p>	
 
 	<p style="font-weight: bold; margin: 2em 0 1em; font-size: 1.3em;">AVAILABLE COMPONENTS:</p>
-		
+
+    	<!-- Tabs -->
+		<h2 class="demoHeaders">Tabs</h2>
+		<div id="tabs">
+			<ul>
+				<li><a href="#tabs-1">First</a></li>
+				<li><a href="#tabs-2">Second</a></li>
+				<li><a href="#tabs-3">Third</a></li>
+			</ul>
+			<div id="tabs-1">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</div>
+			<div id="tabs-2">Phasellus mattis tincidunt nibh. Cras orci urna, blandit id, pretium vel, aliquet ornare, felis. Maecenas scelerisque sem non nisl. Fusce sed lorem in enim dictum bibendum.</div>
+			<div id="tabs-3">Nam dui erat, auctor a, dignissim quis, sollicitudin eu, felis. Pellentesque nisi urna, interdum eget, sagittis et, consequat vestibulum, lacus. Mauris porttitor ullamcorper augue.</div>
+		</div>
+	
+    	<!-- Slider -->
+		<h2 class="demoHeaders">Slider</h2>
+		<div id="slider"></div>
+	
+		<!-- Datepicker -->
+		<h2 class="demoHeaders">Datepicker</h2>
+		<div id="datepicker"></div>
+	
+		<!-- Progressbar -->
+		<h2 class="demoHeaders">Progressbar</h2>	
+		<div id="progressbar"></div>
+
+
 		<!-- Accordion -->
 		<h2 class="demoHeaders">Accordion</h2>
 		<div id="accordion">
@@ -98,19 +124,6 @@
 			</div>
 		</div>
 	
-		<!-- Tabs -->
-		<h2 class="demoHeaders">Tabs</h2>
-		<div id="tabs">
-			<ul>
-				<li><a href="#tabs-1">First</a></li>
-				<li><a href="#tabs-2">Second</a></li>
-				<li><a href="#tabs-3">Third</a></li>
-			</ul>
-			<div id="tabs-1">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</div>
-			<div id="tabs-2">Phasellus mattis tincidunt nibh. Cras orci urna, blandit id, pretium vel, aliquet ornare, felis. Maecenas scelerisque sem non nisl. Fusce sed lorem in enim dictum bibendum.</div>
-			<div id="tabs-3">Nam dui erat, auctor a, dignissim quis, sollicitudin eu, felis. Pellentesque nisi urna, interdum eget, sagittis et, consequat vestibulum, lacus. Mauris porttitor ullamcorper augue.</div>
-		</div>
-	
 		<!-- Dialog NOTE: Dialog is not generated by UI in this demo so it can be visually styled in themeroller-->
 		<h2 class="demoHeaders">Dialog</h2>
 		<p><a href="#" id="dialog_link" class="ui-state-default ui-corner-all"><span class="ui-icon ui-icon-newwin"></span>Open Dialog</a></p>
@@ -334,19 +347,6 @@
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-gripsmall-diagonal-se"><span class="ui-icon ui-icon-gripsmall-diagonal-se"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-grip-diagonal-se"><span class="ui-icon ui-icon-grip-diagonal-se"></span></li>
 		</ul>
-
-	
-		<!-- Slider -->
-		<h2 class="demoHeaders">Slider</h2>
-		<div id="slider"></div>
-	
-		<!-- Datepicker -->
-		<h2 class="demoHeaders">Datepicker</h2>
-		<div id="datepicker"></div>
-	
-		<!-- Progressbar -->
-		<h2 class="demoHeaders">Progressbar</h2>	
-		<div id="progressbar"></div>
 			
 		<!-- Highlight / Error -->
 		<h2 class="demoHeaders">Highlight / Error</h2>
diff --git a/app/templates/editor.html b/app/templates/editor.html
index 6e0e8df..73fbcf8 100644
--- a/app/templates/editor.html
+++ b/app/templates/editor.html
@@ -66,7 +66,7 @@
 document.ready = function() {
     var aceEditor = ace.edit("editor");
     aceEditor.setTheme("ace/theme/twilight");
-    document.getElementById('editor').style.fontSize='14pt';
+    document.getElementById('editor').style.fontSize='16px';
     aceEditor.getSession().setUseSoftTabs(true);
     // we can assume we're on unix
     aceEditor.getSession().setNewLineMode("unix");
diff --git a/app/templates/help.html b/app/templates/help.html
index b7043ef..bdd0e2b 100644
--- a/app/templates/help.html
+++ b/app/templates/help.html
@@ -15,15 +15,15 @@
 ${get_flashed_messages()}
     <div style="margin:0;padding-left:20px;padding-right:20px;margin-top:10px" id="content" class="bling">
     <section>
-        <div id="tabs">
+        <div id="tabs" style="height:280px">
     		<ul>
                 <li py:if="project_name != 'None'"><a href="#tabs-0">${project_name} Activity</a></li>
                 <li><a href="#tabs-1">Projects</a></li>
-				<li><a href="#tabs-2">Framework Documentation</a></li>
-				<li><a href="#tabs-3">Widgets Showcase</a></li>
-				<li><a href="#tabs-4">MYOSA</a></li>
+				<li><a href="#tabs-2">Web Framework</a></li>
+				<li><a href="#tabs-3">Widgets</a></li>
+				<li><a href="#tabs-4">Sugar</a></li>
 			</ul>
-            <div py:if="project_name != 'None'" id="tabs-0" style="height:280px">
+            <div py:if="project_name != 'None'" id="tabs-0">
                 <div style="text-align:right;">
                 <p>You are constructing <strong>$project_name Activity</strong>.</p>
                 <p py:if="edit_history==[]"><strong>Warning:</strong> If you modify Sugar Activities they may stop to work!
@@ -44,7 +44,7 @@ ${get_flashed_messages()}
                 </div>
                 </div>
             </div>
-            <div id="tabs-1" style="height:280px">
+            <div id="tabs-1">
                 <div style="text-align:right;">
                 <div class="rounded" style="background-color:white;float:left; padding: 35px;">
                 <img src="/static/images/activity-websdk.stroke.png" /></div>
@@ -62,13 +62,13 @@ ${get_flashed_messages()}
                 </form>
                 </div>
             </div>
-			<div id="tabs-2" style="height:280px">    		
+			<div id="tabs-2">    		
             <iframe width="100%" height="280" src="/static/doc/flask-docs/quickstart.html#quickstart" />
             </div>
-			<div id="tabs-3" style="height:280px">
+			<div id="tabs-3">
             <iframe width="100%" height="280" src="/static/doc/sugar-theme.html" />
             </div>
-			<div id="tabs-4" style="height:280px">
+			<div id="tabs-4">
             <iframe width="100%" height="280" src="/static/doc/myosa/ch000_table_of_contents.xhtml" />
             </div>
 		</div>
@@ -89,7 +89,9 @@ ${get_flashed_messages()}
         gecko anyway*/ 
         $('#beta').delay(1500).fadeIn("slow");
         $("#tabs").tabs({ header: "h3" });
-        }
+        /* $('#tabs').css("height", ((155 - $(window).height() + $(window).scrollTop() + "px"))); */
+        $('#tabs').css("height", $(window).height()-30+"px");
+    }
     </script>
 </body>
 </html>
--
cgit v0.9.1