From 5612a77af9fd9d4f022578967ed0004e55bbd49b Mon Sep 17 00:00:00 2001
From: Mokaddem <mokaddem.sami@gmail.com>
Date: Thu, 11 Aug 2016 10:55:51 +0200
Subject: [PATCH] Separated webpage header code from all webpage

---
 var/www/templates/Moduletrending.html         | 12 ++++--------
 var/www/templates/Trending.html               | 14 +++++---------
 var/www/templates/browse_important_paste.html | 14 +++++---------
 var/www/templates/header.html                 |  8 ++++++++
 var/www/templates/index.html                  | 16 +++++++---------
 5 files changed, 29 insertions(+), 35 deletions(-)
 create mode 100644 var/www/templates/header.html

diff --git a/var/www/templates/Moduletrending.html b/var/www/templates/Moduletrending.html
index 0e51f95e..a2635868 100644
--- a/var/www/templates/Moduletrending.html
+++ b/var/www/templates/Moduletrending.html
@@ -24,14 +24,7 @@
 
 	    <div id="wrapper">
 	      <nav class="navbar navbar-default navbar-static-top" role="navigation" style="margin-bottom: 0">
-		  <div class="navbar-header">
-		  <ul class="nav navbar-nav">
-		      <li><a href="{{ url_for('index') }}"><i class="fa fa-dashboard fa-fw"></i> Dashboard</a></li>
-                      <li><a href="{{ url_for('trending') }}"><i class="glyphicon glyphicon-stats"></i> Trending charts</a></li>
-                      <li class="active"><a href="{{ url_for('moduletrending') }}"><i class="glyphicon glyphicon-stats"></i> Modules statistics</a></li>
-                      <li><a href="{{ url_for('browseImportantPaste') }}"><i class="fa fa-search-plus "></i> Browse important pastes</a></li>
-                  </ul>
-          </div>
+              {% include 'header.html' %}
           <!-- /.navbar-top-links -->
           <div class="navbar-default sidebar" role="navigation">
               <div class="sidebar-collapse">
@@ -62,6 +55,9 @@
         <script src="{{ url_for('static', filename='js/moduleTrending.js') }}"></script>
         <script>
             $(document).ready(function(){
+                activePage = "page-modulestats"
+                $("#"+activePage).addClass("active");
+
                 $("[align]").css({padding: "2px", width: 'auto', 'background': "rgba(102, 102, 102, 0.15)" , 'border': "3px solid rgb(102, 102, 102)"})
 
                refreshPlot(true); 
diff --git a/var/www/templates/Trending.html b/var/www/templates/Trending.html
index 92c31e49..f4e49f3c 100644
--- a/var/www/templates/Trending.html
+++ b/var/www/templates/Trending.html
@@ -32,14 +32,7 @@
 
 	    <div id="wrapper">
 	      <nav class="navbar navbar-default navbar-static-top" role="navigation" style="margin-bottom: 0">
-		  <div class="navbar-header">
-		  <ul class="nav navbar-nav">
-		      <li><a href="{{ url_for('index') }}"><i class="fa fa-dashboard fa-fw"></i> Dashboard</a></li>
-                      <li class="active"><a href="{{ url_for('trending') }}"><i class="glyphicon glyphicon-stats"></i> Trending charts</a></li>
-                      <li><a href="{{ url_for('moduletrending') }}"><i class="glyphicon glyphicon-stats"></i> Modules statistics</a></li>
-                      <li><a href="{{ url_for('browseImportantPaste') }}"><i class="fa fa-search-plus "></i> Browse important pastes</a></li>
-                  </ul>
-          </div>
+                  {% include 'header.html' %}
           <!-- /.navbar-top-links -->
           <div class="navbar-default sidebar" role="navigation">
               <div class="sidebar-collapse">
@@ -58,7 +51,7 @@
         <div id="page-wrapper">
           <div class="row">
               <div class="col-lg-12">
-                  <h1 class="page-header">Trending charts</h1>
+                  <h1 class="page-header" data-page="page-trendingchart">Trending charts</h1>
               </div>
               <!-- /.col-lg-12 -->
           </div>
@@ -150,6 +143,9 @@ $SCRIPT_ROOT = {{ request.script_root|tojson|safe }};
 
         <script>
             $(document).ready(function(){
+                activePage = $('h1.page-header').attr('data-page');
+                $("#"+activePage).addClass("active");
+
                 $("[align]").css({padding: "2px", width: 'auto', 'background': "rgba(102, 102, 102, 0.15)" , 'border': "3px solid rgb(102, 102, 102)"})
 
                 // Create the graph when the page has just loaded
diff --git a/var/www/templates/browse_important_paste.html b/var/www/templates/browse_important_paste.html
index f332420e..2cbda569 100644
--- a/var/www/templates/browse_important_paste.html
+++ b/var/www/templates/browse_important_paste.html
@@ -40,14 +40,7 @@
 
     <div id="wrapper">
       <nav class="navbar navbar-default navbar-static-top" role="navigation" style="margin-bottom: 0">
-          <div class="navbar-header">
-              <ul class="nav navbar-nav">
-                  <li><a href="{{ url_for('index') }}"><i class="fa fa-dashboard fa-fw"></i> Dashboard</a></li>
-                  <li><a href="{{ url_for('trending') }}"><i class="glyphicon glyphicon-stats"></i> Trending charts</a></li>
-                  <li><a href="{{ url_for('moduletrending') }}"><i class="glyphicon glyphicon-stats"></i> Modules statistics</a></li>
-                  <li class="active"><a href="{{ url_for('browseImportantPaste') }}"><i class="fa fa-search-plus "></i> Browse important pastes</a></li>
-              </ul>
-          </div>
+      {% include 'header.html' %}
       <!-- /.navbar-top-links -->
           <div class="navbar-default sidebar" role="navigation">
               <div class="sidebar-collapse">
@@ -86,7 +79,7 @@
 <div id="page-wrapper">
   <div class="row">
       <div class="col-lg-12">
-          <h1 class="page-header">Browse important pastes</h1>
+          <h1 class="page-header" data-page="page-browse" >Browse important pastes</h1>
       </div>
       <!-- /.col-lg-12 -->
   </div>
@@ -136,6 +129,9 @@
 <!-- import graph function -->
 <script>
     $(document).ready(function(){
+        activePage = $('h1.page-header').attr('data-page');
+        $("#"+activePage).addClass("active");
+
         var dataPath = 'credential';
         $.get("{{ url_for('importantPasteByModule') }}"+"?moduleName="+dataPath, function(data, status){
             $('#'+dataPath+'-tab').html(data);
diff --git a/var/www/templates/header.html b/var/www/templates/header.html
new file mode 100644
index 00000000..25312c46
--- /dev/null
+++ b/var/www/templates/header.html
@@ -0,0 +1,8 @@
+<div class="navbar-header">
+    <ul class="nav navbar-nav">
+        <li id='page-index'><a href="{{ url_for('index') }}"><i class="fa fa-dashboard fa-fw"></i> Dashboard</a></li>
+        <li id='page-trendingchart'><a href="{{ url_for('trending') }}"><i class="glyphicon glyphicon-stats"></i> Trending charts</a></li>
+        <li id='page-modulestats'><a href="{{ url_for('moduletrending') }}"><i class="glyphicon glyphicon-stats"></i> Modules statistics</a></li>
+        <li id='page-browse'><a href="{{ url_for('browseImportantPaste') }}"><i class="fa fa-search-plus "></i> Browse important pastes</a></li>
+    </ul>
+</div>
diff --git a/var/www/templates/index.html b/var/www/templates/index.html
index b6426ea7..503757a0 100644
--- a/var/www/templates/index.html
+++ b/var/www/templates/index.html
@@ -34,14 +34,7 @@
 
     <div id="wrapper">
       <nav class="navbar navbar-default navbar-static-top" role="navigation" style="margin-bottom: 0">
-          <div class="navbar-header">
-           <ul class="nav navbar-nav">
-              <li class="active"><a href="{{ url_for('index') }}"><i class="fa fa-dashboard fa-fw"></i> Dashboard</a></li>
-              <li><a href="{{ url_for('trending') }}"><i class="glyphicon glyphicon-stats"></i> Trending charts</a></li>
-              <li><a href="{{ url_for('moduletrending') }}"><i class="glyphicon glyphicon-stats"></i> Modules statistics</a></li>
-              <li><a href="{{ url_for('browseImportantPaste') }}"><i class="fa fa-search-plus "></i> Browse important pastes</a></li>
-           </ul>
-        </div>
+          {% include 'header.html' %}
           <!-- /.navbar-top-links -->
           <div class="navbar-default sidebar" role="navigation">
               <div class="sidebar-collapse">
@@ -142,8 +135,13 @@
     </div>
     <script type="text/javascript" src="{{ url_for('static', filename='js/indexjavascript.js')}}"></script>
 
+    <script>
+        activePage = "page-index";
+        $("#"+activePage).addClass("active");
+    </script>
+
     <script type="text/javascript">
-    initfunc( "{{ url_for('static', filename='csv/wordstrendingdata.csv') }}", {{ request.script_root|tojson|safe }} );
+        initfunc( "{{ url_for('static', filename='csv/wordstrendingdata.csv') }}", {{ request.script_root|tojson|safe }} );
     </script>
 
     <script src="{{ url_for('static', filename='js/bootstrap.min.js') }}"></script>