Navbar + footer added.

Profile settings page skeleton added.
pannuhuone · Jan 15, 2016 · 83a5ba1 · 83a5ba1
1 parent 174c8b3
commit 83a5ba1
Show file tree

Hide file tree

Showing 7 changed files with 107 additions and 44 deletions.
diff --git a/client/nav.html b/client/nav.html
@@ -1,34 +1,60 @@
 <template name="nav">
- <nav class="navbar navbar-default navbar-static-top" role="navigation">
- <div class=container>
- <div class="container-fluid">
- <div class="navbar-header">
- <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-8">
- <span class="sr-only">Toggle navigation</span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- </button>
- <span class="navbar-brand">
- <img alt="UserAccounts" width="25" height="25" src="/imgs/ua-logo.png">
- </span>
+ <nav id="myNavbar" class="navbar navbar-default navbar-fixed-top" role="navigation">
+ <!-- Brand and toggle get grouped for better mobile display -->
+ <div class="container">
+ <div class="navbar-header">
+ <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
+ <span class="sr-only">Toggle navigation</span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </button>
+ <a class="navbar-brand" href="#">Brand</a>
+ </div>
+ <!-- Collect the nav links, forms, and other content for toggling -->
+ <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+ <ul class="nav navbar-nav">
+ <li class="{{isActiveRoute regex='home'}}"><a href="{{pathFor 'home'}}">Home</a></li>
+ <li class="{{isActiveRoute regex='private'}}"><a href="{{pathFor 'private'}}">Private</a></li>
+ <li class="dropdown">
+ <a href="#" data-toggle="dropdown" class="dropdown-toggle">Messages <b class="caret"></b></a>
+ <ul class="dropdown-menu">
+ <li><a href="#">Inbox</a></li>
+ <li><a href="#">Drafts</a></li>
+ <li><a href="#">Sent Items</a></li>
+ <li class="divider"></li>
+ <li><a href="#">Trash</a></li>
+ </ul>
+ </li>
+ </ul>
+ <ul class="nav navbar-nav navbar-right">
+ {{#if currentUser}}
+ {{#if isAdmin}}
+ <li class="dropdown">
+ <a href="#" data-toggle="dropdown" class="dropdown-toggle">Admin <b class="caret"></b></a>
+ <ul class="dropdown-menu">
+ <li><a href="#">Dashboard</a></li>
+ <li><a href="#">Users</a></li>
+ <li><a href="#">Action 1</a></li>
+ </ul>
+ </li>
+ {{/if}}
+ <li class="dropdown">
+ <a href="#" data-toggle="dropdown" class="dropdown-toggle">Profile <b class="caret"></b></a>
+ <ul class="dropdown-menu">
+ <li><a href="#">Link 1</a></li>
+ <li><a href="#">Link 2</a></li>
+ <li class="divider"></li>
+ <li><a href="{{pathFor 'profile'}}">Settings</a></li>
+ </ul>
+ </li>
+ <li><a href="/sign-out">Log out</a></li>
+ {{else}}
+ <li><a href="/sign-in">Log in</a></li>
+ <li><a href="/sign-up">Sign up</a></li>
+ {{/if}}
+ </ul>
+ </div><!-- /.navbar-collapse -->
  </div>
-
- <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-8">
- <ul class="nav navbar-nav">
- <li class="{{isActiveRoute regex='home'}}"><a href="{{pathFor 'home'}}">Home</a></li>
- <li class="{{isActiveRoute regex='private'}}"><a href="{{pathFor 'private'}}">Private</a></li>
- </ul>
- <ul class="nav navbar-nav navbar-right">
- {{#if currentUser}}
- <li><a href="/sign-out">Log out</a></li>
- {{else}}
- <li><a href="/sign-in">Log in</a></li>
- <li><a href="/sign-up">Sign up</a></li>
- {{/if}}
- </ul>
- </div>
- </div>
- </div>
- </nav>
+ </nav>
 </template>
diff --git a/client/stylesheets/style.css b/client/stylesheets/style.css
@@ -4,30 +4,37 @@ html {
 }
 
 body {
- font-family: "Open Sans", "Helvetica Neue", "Helvetica", "Arial", sans-serif /*rtl:prepend:"Droid Arabic Kufi","Droid Sans", */;
- background: #fcfcfc url(/imgs/bg.jpg) repeat;
- margin: 0px;
- /* Margin bottom by footer height */
- margin-bottom: 70px;
- padding: 0px;
- color: #555555;
- min-width: 320px;
+ font-family: "Open Sans", "Helvetica Neue", "Helvetica", "Arial", sans-serif /*rtl:prepend:"Droid Arabic Kufi","Droid Sans", */;
+ /*background: #fcfcfc url(/imgs/bg.jpg) repeat;*/
+ background-color: #eeeeee;
+ margin: 0px;
+ /* Margin bottom by footer height */
+ /*margin-bottom: 60px;*/
+ padding: 0px;
+ color: #555555;
+ min-width: 320px;
 }
 #content {
  padding-top: 70px;
 }
+
 #footer {
- position: absolute;
- bottom: 20px;
- width: 100%;
- height: 70px;
+ position: relative;
+ bottom: 0px;
+ width: 100%;
+ height: 60px;
+ background-color: #eeeeee;
+ color: #47a747;
 }
 
 #footer > .container {
  padding-right: 15px;
  padding-left: 15px;
 }
 
+hr {
+ border-top: 1px solid #47a747;
+}
 
 .navbar-default {
  background-color: #4caf50;
@@ -98,4 +105,6 @@ body {
 }
 .navbar-default .navbar-toggle .icon-bar:hover {
  background-color: #c8e6c9; /* Changes toggle color on hover */
-}}
+}
+
+
diff --git a/client/views/private.html b/client/views/private.html
@@ -2,6 +2,17 @@
  <div class="container"> 
  <div class="text-center">
  <h1>This is private stuff!</h1>
+ <p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium. Integer tincidunt. Cras dapibus. Vivamus elementum semper nisi.</p>
+
+ <p>Aenean vulputate eleifend tellus. Aenean leo ligula, porttitor eu, consequat vitae, eleifend ac, enim. Aliquam lorem ante, dapibus in, viverra quis, feugiat a, tellus. Phasellus viverra nulla ut metus varius laoreet. Quisque rutrum. Aenean imperdiet. Etiam ultricies nisi vel augue. Curabitur ullamcorper ultricies nisi. Nam eget dui. Etiam rhoncus. Maecenas tempus, tellus eget condimentum rhoncus, sem quam semper libero, sit amet adipiscing sem neque sed ipsum. Nam quam nunc, blandit vel, luctus pulvinar, hendrerit id, lorem.</p>
+
+ <p>Maecenas nec odio et ante tincidunt tempus. Donec vitae sapien ut libero venenatis faucibus. Nullam quis ante. Etiam sit amet orci eget eros faucibus tincidunt. Duis leo. Sed fringilla mauris sit amet nibh. Donec sodales sagittis magna. Sed consequat, leo eget bibendum sodales, augue velit cursus nunc, quis gravida magna mi a libero. Fusce vulputate eleifend sapien. Vestibulum purus quam, scelerisque ut, mollis sed, nonummy id, metus. Nullam accumsan lorem in dui. Cras ultricies mi eu turpis hendrerit fringilla. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; In ac dui quis mi consectetuer lacinia. Nam pretium turpis et arcu. Duis arcu tortor, suscipit eget, imperdiet nec, imperdiet iaculis, ipsum. Sed aliquam ultrices mauris. Integer ante arcu, accumsan a, consectetuer eget, posuere ut, mauris. Praesent adipiscing. Phasellus ullamcorper ipsum rutrum nunc. Nunc nonummy metus. Vestibulum volutpat pretium libero. Cras id dui. Aenean ut</p>
+
+ <p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium. Integer tincidunt. Cras dapibus. Vivamus elementum semper nisi.</p>
+
+ <p>Aenean vulputate eleifend tellus. Aenean leo ligula, porttitor eu, consequat vitae, eleifend ac, enim. Aliquam lorem ante, dapibus in, viverra quis, feugiat a, tellus. Phasellus viverra nulla ut metus varius laoreet. Quisque rutrum. Aenean imperdiet. Etiam ultricies nisi vel augue. Curabitur ullamcorper ultricies nisi. Nam eget dui. Etiam rhoncus. Maecenas tempus, tellus eget condimentum rhoncus, sem quam semper libero, sit amet adipiscing sem neque sed ipsum. Nam quam nunc, blandit vel, luctus pulvinar, hendrerit id, lorem.</p>
+
+ <p>Maecenas nec odio et ante tincidunt tempus. Donec vitae sapien ut libero venenatis faucibus. Nullam quis ante. Etiam sit amet orci eget eros faucibus tincidunt. Duis leo. Sed fringilla mauris sit amet nibh. Donec sodales sagittis magna. Sed consequat, leo eget bibendum sodales, augue velit cursus nunc, quis gravida magna mi a libero. Fusce vulputate eleifend sapien. Vestibulum purus quam, scelerisque ut, mollis sed, nonummy id, metus. Nullam accumsan lorem in dui. Cras ultricies mi eu turpis hendrerit fringilla. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; In ac dui quis mi consectetuer lacinia. Nam pretium turpis et arcu. Duis arcu tortor, suscipit eget, imperdiet nec, imperdiet iaculis, ipsum. Sed aliquam ultrices mauris. Integer ante arcu, accumsan a, consectetuer eget, posuere ut, mauris. Praesent adipiscing. Phasellus ullamcorper ipsum rutrum nunc. Nunc nonummy metus. Vestibulum volutpat pretium libero. Cras id dui. Aenean ut</p>
  </div>
  </div>
 </template>
diff --git a/client/views/profile.html b/client/views/profile.html
@@ -0,0 +1,16 @@
+<template name="profile">
+ <div class="container">
+ <div class="row">
+ <div class="col-xs-12 col-sm-10 col-md-8 col-lg-6 col-xs-offset-0 col-sm-offset-1 col-md-offset-2 col-lg-offset-3 text-center">
+ <h2>Profile</h2>
+ <ul>
+ <li>Name</li>
+ <li>Country</li>
+ <li>Timezone</li>
+ <li>email</li>
+ <li></li>
+ </ul>
+ </div>
+ </div>
+ </div>
+</template>
diff --git a/lib/router/routes.js b/lib/router/routes.js
@@ -14,6 +14,7 @@ Router.map(function() {
  });
 
  this.route('private');
+ this.route('profile');
 });
 
 Router.plugin('ensureSignedIn', {

diff --git a/public/imgs/meteor.png b/public/imgs/meteor.png
diff --git a/public/imgs/meteor2.png b/public/imgs/meteor2.png