aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDennis Eriksen <dennis.se@gmail.com>2013-03-19 10:16:54 -0400
committerDennis Eriksen <dennis.se@gmail.com>2013-03-19 10:16:54 -0400
commit6992e66ea45e0f3e1db21f763f2eb4aa9bae2a34 (patch)
treec9f30d0471a7b5a73cf417cd5fa9d13642453f62
parentMade some changes to some templates, and changed the app name (diff)
downloadDivid-6992e66ea45e0f3e1db21f763f2eb4aa9bae2a34.tar.gz
done some UI work, added ejs templates
Diffstat
-rw-r--r--routes/index.js2
-rw-r--r--views/footer.ejs17
-rw-r--r--views/header.ejs19
-rw-r--r--views/index.ejs6
-rw-r--r--views/login.ejs86
5 files changed, 53 insertions, 77 deletions
diff --git a/routes/index.js b/routes/index.js
index f18f5ef..9e1f66e 100644
--- a/routes/index.js
+++ b/routes/index.js
@@ -18,5 +18,5 @@ exports.index = function(req, res){
*/
exports.login = function(req, res) {
- res.render('login', {title: 'Logg inn' });
+ res.render('login', { title: 'Logg inn' });
}
diff --git a/views/footer.ejs b/views/footer.ejs
new file mode 100644
index 0000000..d633ff7
--- /dev/null
+++ b/views/footer.ejs
@@ -0,0 +1,17 @@
+
+ <!--
+ Le javascript
+ ==================================================
+ Placed at the end of the document so the pages load faster
+ -->
+ <script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js"></script>
+ <script>window.jQuery || document.write('<script src="js/vendor/jquery-1.9.0.min.js"><\/script>')</script>
+ <script src="/js/bootstrap.min.js"></script>
+ <script>
+ var _gaq=[['_setAccount','UA-XXXXX-X'],['_trackPageview']];
+ (function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];
+ g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
+ s.parentNode.insertBefore(g,s)}(document,'script'));
+ </script>
+</body>
+</html>
diff --git a/views/header.ejs b/views/header.ejs
new file mode 100644
index 0000000..4d870de
--- /dev/null
+++ b/views/header.ejs
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <meta charset="utf-8" />
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
+
+ <title><%= title %></title>
+ <meta name="description" content="" />
+ <meta name="author" content="">
+
+ <meta name="viewport" content="width=device-width" />
+ <link rel='stylesheet' href='/css/bootstrap.min.css' />
+ <link rel='stylesheet' href='/css/bootstrap-responsive.min.css' />
+
+ <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
+ <!--[if lt IE 9]>
+ <script src="../assets/js/html5shiv.js"></script>
+ <![endif]-->
+
diff --git a/views/index.ejs b/views/index.ejs
index e84eb71..edb09f7 100644
--- a/views/index.ejs
+++ b/views/index.ejs
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+ <!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
@@ -18,8 +18,8 @@
<![endif]-->
- </head>
- <body>
+ </head>
+ <body>
<h1><%= title %></h1>
<p>Velkommen til <%= title %></p>
diff --git a/views/login.ejs b/views/login.ejs
index 90a2f93..db1476c 100644
--- a/views/login.ejs
+++ b/views/login.ejs
@@ -1,76 +1,18 @@
-
-<!DOCTYPE html>
-<html lang="en">
- <head>
- <meta charset="utf-8">
- <title>Sign in &middot; Twitter Bootstrap</title>
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
- <meta name="description" content="">
- <meta name="author" content="">
-
- <!-- Le styles -->
- <link href="../assets/css/bootstrap.css" rel="stylesheet">
- <style type="text/css">
- body {
- padding-top: 40px;
- padding-bottom: 40px;
- background-color: #f5f5f5;
- }
-
- .form-signin {
- max-width: 300px;
- padding: 19px 29px 29px;
- margin: 0 auto 20px;
- background-color: #fff;
- border: 1px solid #e5e5e5;
- -webkit-border-radius: 5px;
- -moz-border-radius: 5px;
- border-radius: 5px;
- -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.05);
- -moz-box-shadow: 0 1px 2px rgba(0,0,0,.05);
- box-shadow: 0 1px 2px rgba(0,0,0,.05);
- }
- .form-signin .form-signin-heading,
- .form-signin .checkbox {
- margin-bottom: 10px;
- }
- .form-signin input[type="text"],
- .form-signin input[type="password"] {
- font-size: 16px;
- height: auto;
- margin-bottom: 15px;
- padding: 7px 9px;
- }
-
- </style>
- <link href="../assets/css/bootstrap-responsive.css" rel="stylesheet">
-
- <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
- <!--[if lt IE 9]>
- <script src="../assets/js/html5shiv.js"></script>
- <![endif]-->
-
- <!-- Fav and touch icons -->
- <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../assets/ico/apple-touch-icon-114-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../assets/ico/apple-touch-icon-72-precomposed.png">
- <link rel="apple-touch-icon-precomposed" href="../assets/ico/apple-touch-icon-57-precomposed.png">
- <link rel="shortcut icon" href="../assets/ico/favicon.png">
- </head>
-
- <body>
+<% include header %>
+</head>
+<body>
<div class="container">
- <form class="form-signin">
- <h2 class="form-signin-heading">Please sign in</h2>
- <input type="text" class="input-block-level" placeholder="Email address">
- <input type="password" class="input-block-level" placeholder="Password">
- <label class="checkbox">
- <input type="checkbox" value="remember-me"> Remember me
- </label>
- <button class="btn btn-large btn-primary" type="submit">Sign in</button>
- </form>
+ <form class="form-signin">
+ <h2 class="form-signin-heading">Please sign in</h2>
+ <input type="text" class="input-block-level" placeholder="Email address">
+ <input type="password" class="input-block-level" placeholder="Password">
+ <label class="checkbox">
+ <input type="checkbox" value="remember-me"> Remember me
+ </label>
+ <button class="btn btn-large btn-primary" type="submit">Sign in</button>
+ </form>
</div> <!-- /container -->
@@ -91,6 +33,4 @@
<script src="../assets/js/bootstrap-carousel.js"></script>
<script src="../assets/js/bootstrap-typeahead.js"></script>
- </body>
-</html>
-
+<% include footer %>
generated by cgit, for Dennis Eriksen