pushing changes to the theme before I modify modules

author: Sean O'Brien <diggity@diggmobile.(none)> 2012-03-10 07:26:30 -0500
committer: James Vasile <james@jamesvasile.com> 2012-03-12 14:39:32 -0400
commit: 2f5c98dd6f8ae91a3800a48a549325a4130acce9 (patch)
tree: 4cad8e667de8706309b03e473f081a4cfa18356f /templates
parent: 7e6b424d857618ef3117112d7d39d3b2d28aaeb3 (diff)
3 files changed, 69 insertions, 41 deletions
diff --git a/templates/base.tmpl b/templates/base.tmpl
index 046218a..b6a2c23 100644
--- a/templates/base.tmpl
+++ b/templates/base.tmpl
@@ -25,7 +25,7 @@
 	-->
 	<meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
-	<!-- I believe that robots should only have faces if they truly need them -->
+	<!-- R2D2, you know better than to trust a strange computer! -->
 	<meta name="robots" content="noindex, nofollow, noarchive" />
 	<meta name="googlebot" content="noindex, nofollow, noarchive, nosnippet, noodp, noimageindex, notranslate" />
 	<meta name="msnbot" content="noindex, nofollow, noarchive, noodp" />
@@ -35,33 +35,60 @@
 	<meta name="description" content="Plinth administrative interface for the FreedomBox" />
 	<title>$default($title, "FreedomBox Dashboard")</title>
 
-	<link rel="shortcut icon" href="$basehref/static/theme/img/favicon.ico" />
 	<!-- This is the traditional favicon. Size: 16x16 or 32x32, transparency is OK -->
-		 
-	<link rel="apple-touch-icon" sizes="57x57" href="$basehref/static/theme/img/apple-touch-icon-57px-precomposed.png" />
-	<link rel="apple-touch-icon" sizes="72x72" href="$basehref/static/theme/img/apple-touch-icon-72px-precomposed.png" />
-	<link rel="apple-touch-icon" sizes="114x114" href="$basehref/static/theme/img/apple-touch-icon-114px-precomposed.png" />
+	<link rel="shortcut icon" href="$basehref/static/theme/img/favicon.ico" />
+	
 	<!-- The is the icon for iOS's Web Clip. Size: 57x57 for older iPhones, 72x72 for iPads, 114x114 for iPhone4
 	- To prevent iOS from applying its styles to the icon name it thusly: apple-touch-icon-precomposed.png
 	- Transparency is not recommended (iOS will put a black BG behind the icon) -->
-	
-	<link rel="stylesheet/less" href="$basehref/static/theme/less/style.less" />
-	<script type="text/javascript" src="$basehref/static/theme/js/libs/less-1.2.1.min.js"></script>	
-	<!-- Use SimpLESS (Win/Linux/Mac) or LESS.app (Mac) to compile your .less files
-	to style.css, and replace the 2 lines above with this one:
-	<link rel="stylesheet/less" href="$basehref/static/theme/less/style.css">
-	-->
+	<link rel="apple-touch-icon" sizes="57x57" href="$basehref/static/theme/img/apple-touch-icon-57px-precomposed.png" />
+	<link rel="apple-touch-icon" sizes="72x72" href="$basehref/static/theme/img/apple-touch-icon-72px-precomposed.png" />
+	<link rel="apple-touch-icon" sizes="114x114" href="$basehref/static/theme/img/apple-touch-icon-114px-precomposed.png" />
+
+	<!-- CSS from previous template, not sure what to keep yet -->
 	$css
+	<!-- Bootstrap CSS -->
 	<link rel="stylesheet" href="$basehref/static/theme/css/bootstrap.css" />
+	<link rel="stylesheet" href="$basehref/static/theme/css/bootstrap-responsive.css" />
+	<style type="text/css">
 	<style type="text/css">
-	body {
-        padding-top: 60px;
-        padding-bottom: 40px;
-        }
-        .sidebar-nav {
-        padding: 9px 0;
-        }
-        </style>
+	/* custom styles */
+	.super-hero {
+	margin-top:25px;
+	}
+	.logo-top {
+	float:left;
+	padding-right:5px;
+	}
+	.brand {
+	padding-top:8px;
+	}
+	.icon-top {
+	margin:0 5px 0 8px;
+	}
+	.icon-top-right {
+	margin:0 5px 0 10px;
+	}
+	.white {
+	color:#fff;
+	}
+	.nav-top-right {
+	color:#999;
+	}
+	.nav-top-right a:link {
+	color:#999;
+	text-decoration:none;
+	}
+	.nav-top-right a:hover {
+	color:#fff;
+	text-decoration:none;
+	}
+	.nav-top-right a:active {
+	color:#fff;
+	text-decoration:none;
+	}
+	</style>
+	<!-- JS from previous Plinth template, not sure what to keep yet -->
 	<script type="text/javascript" src="$basehref/static/theme/js/menu.js"></script>
 	<script type="text/javascript" src="$basehref/static/theme/js/plinth.js"></script>
 	$js
@@ -75,7 +102,7 @@
 </head>
 <body onload="javascript:onload_handler();">
 <!--[if lt IE 7]><p class=chromeframe>Your browser is <em>ancient!</em> <a href="http://browsehappy.com/">Upgrade to a different browser</a> or <a href="http://www.google.com/chromeframe/?redirect=true">install Google Chrome Frame</a> to experience this site.</p><![endif]-->
-<!-- ^ Freedombox needs a better version of "Browse Happy", with freedom and privacy-respecting browsers only -->
+<!-- ^ FreedomBox needs a better version of "Browse Happy", with freedom and privacy-respecting browsers only -->
 
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
@@ -85,7 +112,7 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </a>
-          <a href="$basehref/" style="float:left;padding-right:5px;"><img src="$basehref/static/theme/img/freedombox-logo-32px.png" /></a><a class="brand" href="$basehref/" style="padding-top:8px">FreedomBox Dashboard</a>
+          <a href="$basehref/" class="logo-top"><img src="$basehref/static/theme/img/freedombox-logo-32px.png" alt="FreedomBox" /></a><a class="brand" href="$basehref/">FreedomBox</a>
           <div class="nav-collapse">
 		<script type="text/javascript"> 
 		<!--
@@ -93,9 +120,9 @@
 		// --> 
 		</script>
             #if $username
-            <p class="navbar-text pull-right">Logged in as <a href="$username">$username</a>. <a href="$basehref/auth/logout" title="Log out">Log out</a>.</p>
+            <p class="navbar-text pull-right"><i class="icon-user icon-white icon-top-right"></i>Logged in as <a href="$username">$username</a>. <a href="$basehref/auth/logout" title="Log out">Log out</a>.</p>
             #else
-            <p class="navbar-text pull-right">Not logged in. <a href="$basehref/auth/login" title="Log in">Log in</a>.</p>
+            <p class="navbar-text pull-right">Not logged in. <i class="icon-user icon-white icon-top-right"></i><a href="$basehref/auth/login" title="Log in">Log in</a>.</p>
             #end if
           </div><!--/.nav-collapse -->
         </div>
@@ -103,7 +130,7 @@
     </div>
 
     <div class="container-fluid">
-      <div class="row-fluid" style="padding-top:25px;">
+      <div class="row-fluid super-hero">
         <div class="span3">
           <div class="well sidebar-nav">
 		#block nav_block
@@ -164,19 +191,19 @@
 	<script type="text/javascript" src="$basehref/static/theme/js/libs/modernizr-2.5.3-respond-1.1.0.min.js"></script>
 	<!-- Local copy of jQuery -->
 	<script type="text/javascript" src="$basehref/static/theme/js/libs/jquery-1.7.1.min.js"></script>
-	<!-- Bootstrap JS -->
-	<script type="text/javascript" src="$basehref/static/theme/js/libs/bootstrap/bootstrap-transition.js"></script>
-	<script type="text/javascript" src="$basehref/static/theme/js/libs/bootstrap/bootstrap-alert.js"></script>
-	<script type="text/javascript" src="$basehref/static/theme/js/libs/bootstrap/bootstrap-modal.js"></script>
-	<script type="text/javascript" src="$basehref/static/theme/js/libs/bootstrap/bootstrap-dropdown.js"></script>
-	<script type="text/javascript" src="$basehref/static/theme/js/libs/bootstrap/bootstrap-scrollspy.js"></script>
-	<script type="text/javascript" src="$basehref/static/theme/js/libs/bootstrap/bootstrap-tab.js"></script>
-	<script type="text/javascript" src="$basehref/static/theme/js/libs/bootstrap/bootstrap-tooltip.js"></script>
-	<script type="text/javascript" src="$basehref/static/theme/js/libs/bootstrap/bootstrap-popover.js"></script>
-	<script type="text/javascript" src="$basehref/static/theme/js/libs/bootstrap/bootstrap-button.js"></script>
-	<script type="text/javascript" src="$basehref/static/theme/js/libs/bootstrap/bootstrap-collapse.js"></script>
-	<script type="text/javascript" src="$basehref/static/theme/js/libs/bootstrap/bootstrap-carousel.js"></script>
-	<script type="text/javascript" src="$basehref/static/theme/js/libs/bootstrap/bootstrap-typeahead.js"></script>
+	<!-- Bootstrap JS, commented out until we know what we need -->
+	<!--<script type="text/javascript" src="js/bootstrap/bootstrap-transition.js"></script>-->
+	<!--<script type="text/javascript" src="js/bootstrap/bootstrap-alert.js"></script>-->
+	<!--<script type="text/javascript" src="js/bootstrap/bootstrap-modal.js"></script>-->
+	<!--<script type="text/javascript" src="js/bootstrap/bootstrap-dropdown.js"></script>-->
+	<!--<script type="text/javascript" src="js/bootstrap/bootstrap-scrollspy.js"></script>-->
+	<!--<script type="text/javascript" src="js/bootstrap/bootstrap-tab.js"></script>-->
+	<!--<script type="text/javascript" src="js/bootstrap/bootstrap-tooltip.js"></script>-->
+	<!--<script type="text/javascript" src="js/bootstrap/bootstrap-popover.js"></script>-->
+	<!--<script type="text/javascript" src="js/bootstrap/bootstrap-button.js"></script>-->
+	<!--<script type="text/javascript" src="js/bootstrap/bootstrap-collapse.js"></script>-->
+	<!--<script type="text/javascript" src="js/bootstrap/bootstrap-carousel.js"></script>-->
+	<!--<script type="text/javascript" src="js/bootstrap/bootstrap-typeahead.js"></script>-->
 	<!-- JS plugins -->
 	<script type="text/javascript" src="$basehref/static/theme/js/plugins.js"></script>
 	<!-- Additional JS -->
diff --git a/templates/err.tmpl b/templates/err.tmpl
index 1d3f6e1..dcb6243 100644
--- a/templates/err.tmpl
+++ b/templates/err.tmpl
@@ -1,7 +1,7 @@
 #extends templates.two_col
 
 #def title_block
-<span class="err">Error: $title</span>
+<span class="label label-important">Error: $title</span>
 <br />
 <br />
 #end def
diff --git a/templates/two_col.tmpl b/templates/two_col.tmpl
index 58b866e..6e292d2 100644
--- a/templates/two_col.tmpl
+++ b/templates/two_col.tmpl
@@ -1,5 +1,6 @@
 #extends templates.base
 
 #def css
-<link rel="stylesheet" href="$basehref/static/theme/style-plinth-2col.css" />
+<!-- CSS from previous template, not sure what to keep yet -->
+<!--<link rel="stylesheet" href="$basehref/static/theme/style-plinth-2col.css" />-->
 #end def
author	Sean O'Brien <diggity@diggmobile.(none)>	2012-03-10 07:26:30 -0500
committer	James Vasile <james@jamesvasile.com>	2012-03-12 14:39:32 -0400
commit	2f5c98dd6f8ae91a3800a48a549325a4130acce9 (patch)
tree	4cad8e667de8706309b03e473f081a4cfa18356f /templates
parent	7e6b424d857618ef3117112d7d39d3b2d28aaeb3 (diff)