--- a/lib/common.inc.php +++ b/lib/common.inc.php @@ -10,12 +10,12 @@ die("A database error occurred.\n"); } -define('ROOT' , pathinfo(__FILE__, PATHINFO_DIRNAME)); +define('ROOT', pathinfo(__FILE__, PATHINFO_DIRNAME)); if (strstr($_SERVER['PHP_SELF'], "labs/")) { $basePath = "../"; } -require ROOT . DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'lib'.DIRECTORY_SEPARATOR.'openid.php'; +require ROOT . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'lib' . DIRECTORY_SEPARATOR . 'openid.php'; $openid = new LightOpenID($_SERVER['HTTP_HOST']); function login() { @@ -105,9 +105,11 @@ $standardQ = ' "childCN" is null '; // AND YEAR(contractStart) >= 2007 AND YEAR(contractStart) <= 2010'; $start = 0.0; + function local_url() { return "http://" . $_SERVER['HTTP_HOST'] . rtrim(dirname($_SERVER['PHP_SELF']), '/\\') . "/"; } + function include_header($title) { global $start; ?> @@ -115,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> @@ -148,7 +151,7 @@ { var sValidChars = "0123456789.-,"; var Char; - + /* Check the numeric part */ for ( i=1 ; i<sData.length ; i++ ) { @@ -158,7 +161,7 @@ return null; } } - + /* Check prefixed by currency */ if ( sData.charAt(0) == '$' || sData.charAt(0) == '£' ) { @@ -171,11 +174,11 @@ /* Remove any commas (assumes that if present all strings will have a fixed number of d.p) */ var x = a == "-" ? 0 : a.replace( /,/g, "" ); var y = b == "-" ? 0 : b.replace( /,/g, "" ); - + /* Remove the currency sign */ x = x.substring( 1 ); y = y.substring( 1 ); - + /* Parse and return */ x = parseFloat( x ); y = parseFloat( y ); @@ -186,11 +189,11 @@ /* Remove any commas (assumes that if present all strings will have a fixed number of d.p) */ var x = a == "-" ? 0 : a.replace( /,/g, "" ); var y = b == "-" ? 0 : b.replace( /,/g, "" ); - + /* Remove the currency sign */ x = x.substring( 1 ); y = y.substring( 1 ); - + /* Parse and return */ x = parseFloat( x ); y = parseFloat( y ); @@ -203,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"> @@ -220,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> @@ -235,7 +236,7 @@ </div><!-- /topbar --> </div><!-- /topbar-wrapper --> <script type="text/javascript"> - + var options_xml = { script: function (input) { return "search_autosuggest.php?input="+input; }, varname:"input", @@ -244,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())); } @@ -262,10 +261,31 @@ 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")) { + ?> + <script type="text/javascript"> + + var _gaq = _gaq || []; + _gaq.push(['_setAccount', 'UA-12341040-3']); + _gaq.push(['_trackPageview']); + + (function() { + var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; + ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; + var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); + })(); + + </script> + <?php + } echo '</div> </div></body> </html>'; } include ("graphs.inc.php"); - ?> + + + +