about page

app/assets/javascripts/application.js

@@ -25,8 +25,10 @@
 $(function() {
   $(".stopwatch").fitText(0.5, { minFontSize: '20px'});
 
+  $('#gopro').popover();
+
   var stopwatch = new StopWatch(JSON.parse(timerData));
-  var timer_url_key = window.location.pathname.match(/^\/(timer\/)?([^\/]+)/)[2]
+  var timer_url_key = window.location.pathname.match(/^\/(timer\/)?([^\/]+)/)[2];
 
   var lastTweetID, tweets = [];
 

app/assets/stylesheets/application.css.scss

@@ -33,21 +33,27 @@ $navbarLinkColorHover:            $red;
 .logo{
   display: block;
   float: left;
-  background: image-url('logo_stopwatch.png') no-repeat 0 50%;
   width: 150px;
   height: 30px;
   margin-left: 10px;
-  margin-top: 6px;
+  margin-top: 10px;
 }
 .logo strong{
-  display: none;
+  text-transform: lowercase;
+  color: $black;
+  font-size: 30px;
+  font-weight: normal;
+  span{
+    color: $red;
+  }
 }
 .navbar-inner{
   text-transform: uppercase;
   background-color: $white;
   background-image: none;
   @include box-shadow(0 0px 0px rgba(0,0,0,0));
   li a{
+    padding: 1em 0.6em !important;
     cursor: pointer;
   }
 }

app/controllers/home_controller.rb

@@ -9,4 +9,8 @@ def presentation
 	def startup
 		render "startup", layout: false
 	end
+
+	def about
+		render "about"
+	end	
 end

app/views/home/about.html.erb

@@ -0,0 +1,17 @@
+<%= render partial: 'layouts/menu' %>
+
+<div class="about container">
+	<div class="row-fluid">
+		- explication tarifs -> offre pro coming soon
+		- inscription newsletter
+
+		- Contact (nos twitter, photo, agence, etc ...)
+
+		- brief
+		- Résultat (2ieme + photos + videos)
+		- Liens vers les présentations
+
+		- 
+
+	</div>
+</div>

app/views/layouts/_menu.html.erb

@@ -0,0 +1,24 @@
+<div class="navbar navbar-fixed-top">
+  <div class="navbar-inner">
+    <div class="container" style="width: auto;">
+      <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </a>
+      <a class="logo" href="/"><strong>stopwat<span>.</span>ch</strong></a>
+      <div class="nav-collapse">
+        <ul class="nav">
+          <li><a href="/about">about</a></li>
+        </ul>
+        <ul class="nav pull-right">
+          <li><a class="timer-event start"> start <i class="icon-play"></i></a></li>
+          <li><a class="timer-event stop"> stop <i class="icon-stop"></i></a></li>
+          <li><a class="timer-event reset"> reset <i class=" icon-repeat"></i></a></li>
+          <li class="divider-vertical"></li>
+          <li><a href="#configure" data-toggle="modal"> Admin <i class="icon-cog"></i></a></li>
+        </ul>
+      </div><!-- /.nav-collapse -->
+    </div>
+  </div><!-- /navbar-inner -->
+</div>

app/views/timer/show.html.erb

@@ -1,26 +1,4 @@
-
-
-<div class="navbar navbar-fixed-top">
-  <div class="navbar-inner">
-    <div class="container" style="width: auto;">
-      <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </a>
-      <a class="logo"><strong>stopwat.ch</strong></a>
-      <div class="nav-collapse">
-        <ul class="nav pull-right">
-          <li><a class="timer-event start"> start <i class="icon-play"></i></a></li>
-          <li><a class="timer-event stop"> stop <i class="icon-stop"></i></a></li>
-          <li><a class="timer-event reset"> reset <i class=" icon-repeat"></i></a></li>
-          <li class="divider-vertical"></li>
-          <li><a href="#configure" data-toggle="modal"> Admin <i class="icon-cog"></i></a></li>
-        </ul>
-      </div><!-- /.nav-collapse -->
-    </div>
-  </div><!-- /navbar-inner -->
-</div>
+<%= render partial: 'layouts/menu' %>
 
 
 <div class="stopwatch">
@@ -97,9 +75,9 @@
           </div>
         </div>  
         <div class="control-group">
-          <label class="control-label">Administration URL</label>
+          <label class="control-label">Administration URL </label>
           <div class="controls">
-            <a href="#" class="btn btn-primary">GO PRO</a>
+            <a href="/about" id="gopro" class="btn" rel="popover" data-content="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod." data-original-title="Pro account coming soon">GO PRO</a> <span class="label label-info">Coming soon</span> 
           </div>
         </div>  
       </fieldset>

config/routes.rb

@@ -1,5 +1,5 @@
 Stopwatch::Application.routes.draw do
-  match '/demo' => 'home#demo'
+  match '/about' => 'home#about'
   match '/presentation' => 'home#presentation'
   match '/startup' => 'home#startup'