timprove routing, add sample form - 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 912012b26c11e57093e1ad7fcecd82f1020328bf
(DIR) parent d931f7620bf0ced8cbab7cee5eb0cb133474085d
(HTM) Author: Anders Damsgaard <anders.damsgaard@geo.au.dk>
Date: Fri, 7 Aug 2015 16:31:22 +0200
improve routing, add sample form
Diffstat:
M index.html | 8 ++++----
M js/init.js | 7 +++++--
M js/routing.js | 25 +++++++++++--------------
M pages/front.html | 4 ++--
M pages/help.html | 6 +++++-
M pages/methods.html | 5 +++--
6 files changed, 30 insertions(+), 25 deletions(-)
---
(DIR) diff --git a/index.html b/index.html
t@@ -37,16 +37,16 @@
height="92" width="220"></a>
<ul class="right hide-on-med-and-down">
- <li><a href="#/">Home</a></li>
+ <li><a href="#/">Calculator</a></li>
<li><a href="#/methods">Methods</a></li>
- <li><a href="#/about">About</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="#/">Home</a></li>
+ <li><a href="#/">Calculator</a></li>
<li><a href="#/methods">Methods</a></li>
- <li><a href="#/about">About</a></li>
+ <!--<li><a href="#/about">About</a></li>-->
<li><a href="#/help">Help</a></li>
</ul>
(DIR) diff --git a/js/init.js b/js/init.js
t@@ -4,4 +4,8 @@
$('.button-collapse').sideNav();
}); // end of document ready
-})(jQuery); // end of jQuery name space
-\ No newline at end of file
+
+ $(document).ready(function() {
+ $('select').material_select();
+ });
+})(jQuery); // end of jQuery name space
(DIR) diff --git a/js/routing.js b/js/routing.js
t@@ -6,28 +6,25 @@ var cosmoApp = angular.module('cosmoApp', ['ngRoute']);
cosmoApp.config(function($routeProvider) {
$routeProvider
.when('/', {
- templateUrl : 'pages/front.html'//,
- //controller : 'mainController'
+ templateUrl : 'pages/front.html'
})
.when('/methods', {
- templateUrl : 'pages/methods.html'//,
- //controller : 'methodsController'
+ templateUrl : 'pages/methods.html'
})
.when('/about', {
- templateUrl : 'pages/about.html'//,
- //controller : 'aboutController'
+ templateUrl : 'pages/about.html'
})
.when('/help', {
- templateUrl : 'pages/help.html'//,
- //controller : 'helpController'
+ templateUrl : 'pages/help.html'
+ })
+ .when('/exposure-age', {
+ templateUrl : 'pages/exposure-age.html'
+ })
+ .when('/erosion-rate', {
+ templateUrl : 'pages/erosion-rate.html'
});
});
// create the controller and inject Angular's $scope
-cosmoApp.controller('mainController', function($scope) {
-
- // message to display in content div
- $scope.content = 'Hello, world';
-
-});
+cosmoApp.controller('mainController', function($scope) { });
(DIR) diff --git a/pages/front.html b/pages/front.html
t@@ -11,13 +11,13 @@
statistical methods and uncertainty quantification
</h5> </div>
<div class="row center">
- <a href="#/"
+ <a href="#/exposure-age"
id="download-button" class="btn-large waves-effect
waves-light orange">
<i class="material-icons left">schedule</i>
Calculate <b>exposure age</b></a>
- <a href="#/"
+ <a href="#/erosion-rate"
id="download-button" class="btn-large waves-effect
waves-light orange">
<i class="material-icons left">call_missed</i>
(DIR) diff --git a/pages/help.html b/pages/help.html
t@@ -3,8 +3,12 @@
<br><br>
<!-- page header -->
<h1 class="header center orange-text">Help</h1>
- <br><br>
+ <!-- page subheader -->
+ <div class="row center">
+ <h5 class="header col s12 light">Using the MCMC cosmogenic nuclide
+ calculator
+ </h5> </div>
<p>
Some sample text
(DIR) diff --git a/pages/methods.html b/pages/methods.html
t@@ -17,8 +17,9 @@ difficult because it involves a large number of unknowns. The potential use of
cosmogenic nuclides in landscapes with a complex history of exposure and
erosion is therefore often quite limited. Here, we present a novel
multi-nuclide approach based on the Markov Chain Monte Carlo (MCMC) technique.
-The model framework currently incorporates any combination of the
-following nuclides 10Be, 26Al, 14C, and 21Ne, and is highly flexible.
+The model framework currently incorporates any combination of the following
+nuclides <sup>10</sup>Be, <sup>26</sup>Al, <sup>14</sup>C, and <sup>21</sup>Ne,
+and is highly flexible.
</p>
</div>
</div>