--- a/lib/common.inc.php +++ b/lib/common.inc.php @@ -117,8 +117,9 @@ "http://www.w3.org/TR/html4/strict.dtd"> <html> <head> - <title>Contract Dashboard - <?php echo $title; ?></title> + <title><?php echo $title; ?> - Contract Dashboard</title> <link rel="stylesheet" type="text/css" href="bootstrap.min.css"> + <link rel="stylesheet" type="text/css" href="bootstrap-responsive.css"> <!-- Le HTML5 shim, for IE6-8 support of HTML elements --> <!--[if lt IE 9]> <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script> @@ -205,8 +206,8 @@ <link type="text/css" rel="stylesheet" href="style.css"> </head> <body> - <div class="topbar"> - <div class="topbar-inner"> + <div class="navbar"> + <div class="navbar-inner"> <div class="container-fluid"> <a class="brand" href="#">contract dashboard</a> <ul class="nav"> @@ -222,8 +223,6 @@ <li><a href="displayConsultancies.php">consultancies</a></li> <li><a href="displayAmendments.php">amendments</a></li> <li><a href="displayMap.php">geo</a></li> - <!-- </ul> - </li>--> </ul> @@ -246,16 +245,14 @@ var as_xml = new bsn.AutoSuggest('searchKeyword', options_xml); </script> <div class="container-fluid"> - <div class="sidebar"> - <div class="well"> - Filter by:<li> - <li>year - <li><li>2008</li> - </li> - </li> - </li> <br> - </div> </div> - <div class="content"> + <div class="row-fluid"> + <div class="span3"> + <div class="well sidebar-nav"> + <li class="nav-header">Filter by:</li> + <li>2008</li> + </div> + </div> + <div class="span9"> <?php $start = (float) array_sum(explode(' ', microtime())); } @@ -264,7 +261,7 @@ global $start; $end = (float) array_sum(explode(' ', microtime())); - echo ' <footer>' . "Processing time: " . sprintf("%.4f", ($end - $start)) . " seconds" . ' <footer>'; + echo '</div> <footer>' . "Processing time: " . sprintf("%.4f", ($end - $start)) . " seconds" . ' <footer>'; if (strpos($_SERVER['SERVER_NAME'], ".gs")) { ?> @@ -290,4 +287,5 @@ - + +