moving to blog

itechnology · Apr 11, 2014 · 43bdb49 · 43bdb49
1 parent 4b4bb4e
commit 43bdb49
Show file tree

Hide file tree

Showing 12 changed files with 619 additions and 58 deletions.
diff --git a/content/js/angular.min.js.map b/content/js/angular.min.js.map
diff --git a/index.html b/index.html
@@ -7,12 +7,22 @@
     itemtype="http://schema.org/WebPage">
     <head>
         <meta charset="utf-8" />
-        <title>Vapez.FR, la vap et ce qui l'entoure !</title>
+
+        <!-- Page -->
+        <title>Vapez.FR, la vap et ce qui l'entoure !</title>        
+        <meta itemprop="keywords" name="keywords" content="vap, vape, vapez, e-cigarette, e-liquide, diy" />
+        <meta itemprop="description" name="description" content="Site collaboratif autour de la vap (outils, bons plans, infos, tutoriaux, reviews, etc)." />
+
+        <!-- Mobile -->
         <meta name="viewport" content="width=device-width,initial-scale=1" />
         <meta http-equiv="cleartype" content="on" />
 
-        <meta itemprop="keywords" name="keywords" content="vap, vape, vapez, e-cigarette, e-liquide, diy" />
-        <meta itemprop="description" name="description" content="Site collaboratif autour de la vap (outils, bons plans, infos, tutoriaux, reviews, etc)." />
+        <!-- Icon
+        <link rel="apple-touch-icon" href="content/img/apple-touch-icon.png" />
+        <link rel="apple-touch-icon" sizes="76x76" href="content/img/apple-touch-icon-76x76.png" />
+        <link rel="apple-touch-icon" sizes="120x120" href="content/img/apple-touch-icon-120x120.png" />
+        <link rel="apple-touch-icon" sizes="152x152" href="content/img/apple-touch-icon-152x152.png" />
+         -->
 
         <!-- SNS -->
         <meta property="og:type" content="website" />
@@ -23,7 +33,7 @@
 
         <meta property="og:site_name" content="Vapez.FR" />
         <meta property="og:locale" content="fr" />
-        <meta property="fb:app_id" content="194169377448891"/>
+        <meta property="fb:app_id" content="194169377448891" />
         <meta property="fb:admins" content="1215975394" />
 
         <meta name="twitter:card" content="summary" />
@@ -32,45 +42,65 @@
         <!--<meta name="twitter:image" content="http://vapez.fr/apple-touch-icon-114x114.png" />-->
         <meta name="twitter:url" content="http://vapez.fr/" />
 
+        <!-- Search -->
         <meta name="wot-verification" content="8ede973261d99e58bb20"/>
         <meta name="msvalidate.01" content="27E91977FE742F003265A98342295E63" />
         <meta name="google-site-verification" content="TLVNcxkUmVkY96aTkZan5G4-hihQJS27RnvZKHukp5Q" />
         <link href="https://plus.google.com/116235043730153547066" rel="publisher" />
-        <!-- SNS -->
 
+        <!-- Style -->
         <link href="content/css/bootstrap.min.css" rel="stylesheet" />
         <link href="content/css/vapez.css" rel="stylesheet" />
+        <style>
+            .container {
+                max-width: 1600px;
+            }
+            .lala {
+                background-color: #F5F5F5;
+                border: 1px solid #E3E3E3;
+                box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05) inset;
+            }
+        </style>
     </head>
     <body>
         <nav class="navbar navbar-inverse" role="navigation">
-          <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="#">Vapez.FR</a>
-          </div>
+            <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="#">Vapez.FR</a>
+            </div>
 
-          <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
-              <ul class="nav navbar-nav">
-                  <li class="dropdown">
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Outils <b class="caret"></b></a>
-                    <ul class="dropdown-menu">
-                      <li><a href="tools/coil">Calculateur Micro-Coil</a></li>
-                      <li><a href="tools/consommation">Consommation E-Liquide</a></li>
-                    </ul>
-                  </li>                  
-              </ul>
+            <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+                <ul class="nav navbar-nav">
+                    <li class="dropdown">
+                        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Outils <b class="caret"></b></a>
+                        <ul class="dropdown-menu">
+                            <li><a href="tools/coil">Calculateur Micro-Coil</a></li>
+                            <li><a href="tools/consommation">Consommation E-Liquide</a></li>
+                        </ul>
+                    </li>                  
+                </ul>
 
-              <ul class="nav navbar-nav navbar-right">                  
-                  <li><a href="http://facebook.com/vapez">FaceBook</a></li>
-                  <li><a href="https://github.com/itechnology/vapez">GitHub</a></li>
-              </ul>
-          </div>
+                <ul class="nav navbar-nav navbar-right">                  
+                    <li><a href="http://facebook.com/vapez">FaceBook</a></li>
+                    <li><a href="https://github.com/itechnology/vapez">GitHub</a></li>
+                </ul>
+            </div>
         </nav>
 
+        <div class="panel affix lala" style="padding: 5px; margin: 0px 0 0 10px">
+                {% for post in site.posts  %}              
+                <p>
+                    <em>{{ post.date | date_to_string }}</em><br />
+                    * <a href="{{ post.url }}">{{ post.title }}</a>
+                </p>
+                {% endfor %}             
+        </div>        
+
         <div class="container">            
             <div class="row clearfix">
                 <div class="col-md-12">
@@ -176,7 +206,6 @@ <h4>Si ça vous dit de participer, on recherche:</h4>
             fbAsyncInit = function () {
                 FB.init({
                     appId               : '194169377448891',
-                    //channelUrl        : '//vapez.fr/social/channel',
                     status              : true,
                     cookie              : true,
                     xfbml               : true,

diff --git a/tools/coil/index.html b/tools/coil/index.html
@@ -1,23 +1,50 @@
 <!DOCTYPE html>
-<html manifest="/cache.manifest" ng-app="coil">
+<html
+    lang="fr"
+    itemscope="itemscope"
+    itemtype="http://schema.org/WebApplication"    
+    manifest="cache.manifest"
+    ng-app="coil">
     <head>
         <meta charset="utf-8" />
-        <title>Calculateur de Micro-Coil</title>
+        <!-- Page -->
+        <title>Calculateur de Micro-Coil</title>        
+        <meta itemprop="keywords" name="keywords" content="vap, vape, vapez, e-cigarette, e-liquide, coil" />
+        <meta itemprop="description" name="description" content="Calculateur pour bien réussir ses micro-coils" />
 
-        <!-- WebApp -->
+        <!-- Mobile -->
         <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" />
+        <meta http-equiv="cleartype" content="on" />
         <meta name="apple-mobile-web-app-capable" content="yes" />
         <meta name="apple-mobile-web-app-status-bar-style" content="default" />
         <meta name="apple-touch-fullscreen" content="yes" />
 
         <!-- Icon -->
         <link rel="apple-touch-icon" href="content/img/apple-touch-icon.png"/>
-        <link rel="apple-touch-icon" sizes="76x76" href="content/img/apple-touch-icon-76x76.png"/>
-        <link rel="apple-touch-icon" sizes="120x120" href="content/img/apple-touch-icon-120x120.png"/>
-        <link rel="apple-touch-icon" sizes="152x152" href="content/img/apple-touch-icon-152x152.png"/>
+        <link rel="apple-touch-icon" sizes="76x76" href="content/img/apple-touch-icon-76x76.png" />
+        <link rel="apple-touch-icon" sizes="120x120" href="content/img/apple-touch-icon-120x120.png" />
+        <link rel="apple-touch-icon" sizes="152x152" href="content/img/apple-touch-icon-152x152.png" />
 
-        <!-- Styles -->
-        <link href="../../content/css/bootstrap.min.css" rel="stylesheet" />
+        <!-- SNS -->
+        <meta property="og:type" content="website" />
+        <meta property="og:title" content="Vapez.FR, Calculateur de Micro-Coil" />
+        <meta property="og:description" content="Calculateur pour bien réussir ses micro-coils" />
+        <meta property="og:image" content="http://vapez.fr/tools/coil/content/img/apple-touch-icon-76x76.png" itemprop="image" />
+        <meta property="og:url" content="http://vapez.fr/tools/coil/" />
+
+        <meta property="og:site_name" content="Vapez.FR" />
+        <meta property="og:locale" content="fr" />
+        <meta property="fb:app_id" content="194169377448891" />
+        <meta property="fb:admins" content="1215975394" />
+
+        <meta name="twitter:card" content="summary" />
+        <meta name="twitter:title" content="Vapez.FR, Calculateur de Micro-Coil" />
+        <meta name="twitter:description" content="Calculateur pour bien réussir ses micro-coils" />
+        <meta name="twitter:image" content="http://vapez.fr/tools/coil/content/img/apple-touch-icon-76x76.png" />
+        <meta name="twitter:url" content="http://vapez.fr/tools/coil/" />              
+
+        <!-- Style -->
+        <link href="../content/css/bootstrap.min.css" rel="stylesheet" />
         <link href="content/css/app.css" rel="stylesheet" />
     </head>
     <body ng-controller="CoilCtrl">
@@ -29,17 +56,19 @@
               <span class="icon-bar"></span>
               <span class="icon-bar"></span>
             </button>
-            <a class="navbar-brand" href="/">Vapez.FR</a>
+            <a class="navbar-brand" href="http://vapez.fr">Vapez.FR</a>
           </div>
 
           <div class="collapse navbar-collapse" collapse="!isCollapsed" id="bs-example-navbar-collapse-1">
               <ul class="nav navbar-nav">
                   <li class="active"><a href="#">Caculateur Micro-Coil</a></li>
-                  <li><a href="../consommation">Consommation E-Liquide </a></li>
+                  <li><a href="../consommation/">Consommation E-Liquide </a></li>
               </ul>
 
               <ul class="nav navbar-nav navbar-right">                  
                   <li><a href="http://facebook.com/vapez">FaceBook</a></li>
+                  <li><a href="http://plus.google.com/+VapezFr">Google+</a></li>
+                  <li><a href="https://twitter.com/vapezfr">Twitter</a></li>
                   <li><a href="https://github.com/itechnology/vapez">GitHub</a></li>
               </ul>
           </div>
@@ -200,8 +229,8 @@
         </div>       
 
         <!-- scripts -->
-        <script src="../../content/js/angular.min.js"></script>
-        <script src="../../content/js/ui-bootstrap-custom-tpls-0.10.0.min.js"></script>
+        <script src="../content/js/angular.min.js"></script>
+        <script src="../content/js/ui-bootstrap-custom-tpls-0.10.0.min.js"></script>
         <script src="content/js/app.js"></script>
 
         <!-- Analytics -->

diff --git a/tools/consommation/index.html b/tools/consommation/index.html
@@ -1,23 +1,52 @@
 <!DOCTYPE html>
-<html  manifest="/cache.manifest" ng-app="consommation">
+<html
+    lang="fr"
+    itemscope="itemscope"
+    itemtype="http://schema.org/WebApplication"    
+    manifest="cache.manifest"
+    ng-app="consommation">
     <head>
         <meta charset="utf-8" />
-        <title>Consommation E-Liquide</title>
+
+        <!-- Page -->
+        <title>Consommation E-Liquide</title>        
+        <meta itemprop="keywords" name="keywords" content="vap, vape, vapez, e-cigarette, e-liquide, consommation" />
+        <meta itemprop="description" name="description" content="Calculez combien de e-liquide il faut consommer en fonction du nombre de cigarettes fumées auparavant." />
 
-        <!-- WebApp -->
+        <!-- Mobile -->
         <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" />
+        <meta http-equiv="cleartype" content="on" />
         <meta name="apple-mobile-web-app-capable" content="yes" />
         <meta name="apple-mobile-web-app-status-bar-style" content="default" />
         <meta name="apple-touch-fullscreen" content="yes" />
 
         <!-- Icon
-        <link rel="apple-touch-icon" href="content/img/apple-touch-icon.png"/>
-        <link rel="apple-touch-icon" sizes="76x76" href="content/img/apple-touch-icon-76x76.png"/>
-        <link rel="apple-touch-icon" sizes="120x120" href="content/img/apple-touch-icon-120x120.png"/>
-        <link rel="apple-touch-icon" sizes="152x152" href="content/img/apple-touch-icon-152x152.png"/>
+        <link rel="apple-touch-icon" href="content/img/apple-touch-icon.png" />
+        <link rel="apple-touch-icon" sizes="76x76" href="content/img/apple-touch-icon-76x76.png" />
+        <link rel="apple-touch-icon" sizes="120x120" href="content/img/apple-touch-icon-120x120.png" />
+        <link rel="apple-touch-icon" sizes="152x152" href="content/img/apple-touch-icon-152x152.png" />
          -->
-        <!-- Styles -->
-        <link href="../../content/css/bootstrap.min.css" rel="stylesheet" />
+
+        <!-- SNS -->
+        <meta property="og:type" content="website" />
+        <meta property="og:title" content="Vapez.FR, Consommation E-Liquide" />
+        <meta property="og:description" content="Calculez combien de e-liquide il faut consommer en fonction du nombre de cigarettes fumées auparavant." />
+        <!--<meta property="og:image" content="http://vapez.fr/apple-touch-icon-114x114.png" />-->
+        <meta property="og:url" content="http://vapez.fr/tools/consommation/" />
+
+        <meta property="og:site_name" content="Vapez.FR" />
+        <meta property="og:locale" content="fr" />
+        <meta property="fb:app_id" content="194169377448891" />
+        <meta property="fb:admins" content="1215975394" />
+
+        <meta name="twitter:card" content="summary" />
+        <meta name="twitter:title" content="Vapez.FR, Consommation E-Liquide" />
+        <meta name="twitter:description" content="Calculez combien de e-liquide il faut consommer en fonction du nombre de cigarettes fumées auparavant." />
+        <!--<meta name="twitter:image" content="http://vapez.fr/apple-touch-icon-114x114.png" />-->
+        <meta name="twitter:url" content="http://vapez.fr/tools/consommation/" />     
+
+        <!-- Style -->
+        <link href="../content/css/bootstrap.min.css" rel="stylesheet" />
         <link href="content/css/app.css" rel="stylesheet" />
     </head>
     <body ng-controller="ConsommationCtrl">
@@ -29,17 +58,19 @@
               <span class="icon-bar"></span>
               <span class="icon-bar"></span>
             </button>
-            <a class="navbar-brand" href="/">Vapez.FR</a>
+            <a class="navbar-brand" href="http://vapez.fr">Vapez.FR</a>
           </div>
 
           <div class="collapse navbar-collapse" collapse="!isCollapsed" id="bs-example-navbar-collapse-1">
               <ul class="nav navbar-nav">
-                  <li><a href="../coil">Caculateur Micro-Coil</a></li>
+                  <li><a href="../coil/">Caculateur Micro-Coil</a></li>
                   <li class="active"><a href="#">Consommation E-Liquide </a></li>
               </ul>
 
               <ul class="nav navbar-nav navbar-right">                  
                   <li><a href="http://facebook.com/vapez">FaceBook</a></li>
+                  <li><a href="http://plus.google.com/+VapezFr">Google+</a></li>
+                  <li><a href="https://twitter.com/vapezfr">Twitter</a></li>
                   <li><a href="https://github.com/itechnology/vapez">GitHub</a></li>
               </ul>
           </div>
@@ -49,7 +80,13 @@
             <br/>
             <div class="row">
                 <div class="col-xs-12">
-                    <label>Consommation Clopes/jour</label>
+
+
+
+                    <label>
+                        <span class="glyphicon glyphicon-question-sign"popover="Nombre de clops consommé actuellement" popover-placement="right" popover-trigger="mouseenter"></span>
+                        Consommation Clopes/jour
+                    </label>
                     <div class="input-group">
                         <span type="button" class="btn btn-default btn-lg input-group-addon" ng-click="down('cigarette', 'count', 1)"><span class="glyphicon glyphicon-minus"></span></span>
                         <span class="form-control center">{{ model.cigarette.count }}</span>
@@ -60,7 +97,10 @@
 
             <div class="row">
                 <div class="col-xs-12">
-                    <label>Taux Nicotine/clop</label>
+                    <label>
+                        <span class="glyphicon glyphicon-question-sign"popover="Taux de nicotine par clop. Figure sur le paquet." popover-placement="right" popover-trigger="mouseenter"></span>
+                        Taux Nicotine/clop
+                    </label>
                     <div class="input-group">
                         <span type="button" class="btn btn-default btn-lg input-group-addon" ng-click="down('cigarette','nicotine', 0.05)"><span class="glyphicon glyphicon-minus"></span></span>
                         <span class="form-control center">{{ model.cigarette.nicotine | number:2 }} mg</span>
@@ -80,7 +120,7 @@
                             <td>{{ result.cigarette.nicotine | number:2 }} mg</td>
                         </tr>
                         <tr>
-                            <td>Marge d'error</td>
+                            <td>Marge d'erreur</td>
                             <td>{{model.cigarette.assimilation}} %</td>
                         </tr>
                         <tr>
@@ -142,8 +182,8 @@
         </div>
 
         <!-- scripts -->
-        <script src="../../content/js/angular.min.js"></script>
-        <script src="../../content/js/ui-bootstrap-custom-tpls-0.10.0.min.js"></script>
+        <script src="../content/js/angular.min.js"></script>
+        <script src="../content/js/ui-bootstrap-custom-tpls-0.10.0.min.js"></script>
         <script src="content/js/app.js"></script>
 
         <!-- Analytics -->

diff --git a/tools/content/css/bootstrap.min.css b/tools/content/css/bootstrap.min.css
diff --git a/tools/content/fonts/glyphicons-halflings-regular.eot b/tools/content/fonts/glyphicons-halflings-regular.eot