tput navigation html into separate file - cosmo - front and backend for Markov-Chain Monte Carlo inversion of cosmogenic nuclide concentrations (HTM) git clone git://src.adamsgaard.dk/cosmo (DIR) Log (DIR) Files (DIR) Refs (DIR) README (DIR) LICENSE --- (DIR) commit e0fe6b821696868736c6d151eb4e6fba0a9c86c8 (DIR) parent 8e79e68c9d42c8064a36a739510ed9dc6af941b7 (HTM) Author: Anders Damsgaard <anders.damsgaard@geo.au.dk> Date: Wed, 21 Oct 2015 12:59:22 +0200 put navigation html into separate file Diffstat: M index.php | 36 ++++--------------------------- A navigation.html | 32 +++++++++++++++++++++++++++++++ M uploadhistory.php | 9 +++++---- 3 files changed, 41 insertions(+), 36 deletions(-) --- (DIR) diff --git a/index.php b/index.php t@@ -20,39 +20,9 @@ if (isset($_GET['wait_id']) && !empty($_GET['wait_id'])) { <meta http-equiv="refresh" content="5" > <?php } -?> - </head> - - <!--<body ng-controller="mainController">--> - <body ng-app="cosmoApp"> - <div ng-controller="mainController"> - - <!-- Navigation bar --> - <nav class="light-blue lighten-1" role="navigation"> - <div class="nav-wrapper container"><a id="logo-container" href="/#/" - class="brand-logo"><img src="img/logo.png" alt="logo" - height="92" width="220"></a> - - <ul class="right hide-on-med-and-down"> - <li><a href="#/">Calculator</a></li> - <li><a href="#/methods">Methods</a></li> - <!--<li><a href="#/about">About</a></li>--> - <li><a href="#/help">Help</a></li> - </ul> - - <ul id="nav-mobile" class="side-nav"> - <li><a href="#/">Calculator</a></li> - <li><a href="#/methods">Methods</a></li> - <!--<li><a href="#/about">About</a></li>--> - <li><a href="#/help">Help</a></li> - </ul> - - <a href="#" data-activates="nav-mobile" - class="button-collapse"><i - class="material-icons">menu</i></a> - </div> - </nav> +include('navigation.html'); +?> <main> <?php if (isset($_GET['wait_id']) && !empty($_GET['wait_id'])) { t@@ -216,3 +186,5 @@ if (isset($_GET['wait_id']) && !empty($_GET['wait_id'])) { </main> <?php include('foot.html'); ?> + + (DIR) diff --git a/navigation.html b/navigation.html t@@ -0,0 +1,32 @@ + </head> + + <!--<body ng-controller="mainController">--> + <body ng-app="cosmoApp"> + <div ng-controller="mainController"> + + <!-- Navigation bar --> + <nav class="light-blue lighten-1" role="navigation"> + <div class="nav-wrapper container"><a id="logo-container" href="/#/" + class="brand-logo"><img src="img/logo.png" alt="logo" + height="92" width="220"></a> + + <ul class="right hide-on-med-and-down"> + <li><a href="#/">Calculator</a></li> + <li><a href="#/methods">Methods</a></li> + <!--<li><a href="#/about">About</a></li>--> + <li><a href="#/help">Help</a></li> + </ul> + + <ul id="nav-mobile" class="side-nav"> + <li><a href="#/">Calculator</a></li> + <li><a href="#/methods">Methods</a></li> + <!--<li><a href="#/about">About</a></li>--> + <li><a href="#/help">Help</a></li> + </ul> + + <a href="#" data-activates="nav-mobile" + class="button-collapse"><i + class="material-icons">menu</i></a> + </div> + </nav> + (DIR) diff --git a/uploadhistory.php b/uploadhistory.php t@@ -102,8 +102,7 @@ if ((isset($_POST['ne_conc']) && $_POST['ne_conc'] != '') && if (count($missing_fields) > 0) { //$error_msg = '<html><body>' . //'<h2>Invalid input</h2>'; - $error_msg = '</head><body>' . - '<h2>Invalid input</h2>'; + $error_msg = '<main><h2>Invalid input</h2>'; // generate comma-separated list of missing field names for ($i = 0; $i < count($missing_fields); $i++) { t@@ -118,10 +117,12 @@ if (count($missing_fields) > 0) { $error_msg .= '<li>' . $missing_fields[$i] . '</li>'; } $error_msg .= '</ul></p><p>Please <a href="javascript:history.back()">go' . - ' back</a> and fill in the missing fields.</p></body></html>'; + ' back</a> and fill in the missing fields.</p></main>'; + //' back</a> and fill in the missing fields.</p></main></html>'; //die($error_msg); // end this script, print error include('head.html'); - echo($error_msg); // end this script, print error + include('navigation.html'); + echo($error_msg); include('foot.html'); die(); }