basic turbolinks integration #128

oslugr · May 18, 2016 · 3524da7 · 3524da7
1 parent a61aff0
commit 3524da7
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 23 deletions.
diff --git a/app/serverConfig.js b/app/serverConfig.js
@@ -40,15 +40,13 @@ var ejs = require('ejs');
 var expressLayouts = require('express-ejs-layouts');
 var htmlMinify = require('html-minifier').minify;
 var compress = require('compression');
-//var logger = require('morgan');
-//var debug = require('debug')('ugr-transparente-servidor:server');
+//var morgan = require('morgan');
 
 // #### Dependencias locales
 // * [**Configuración**](./config/config.html): Configuración del servidor
 var config = require('../config/config');
 
 
-
 // ### Configuración de servidor
 // Configura los middlewares y variables del servidor express
 module.exports = function(app) {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ugr-transparente-servidor",
-  "version": "0.9.9",
+  "version": "0.9.10",
   "author": "Oficina de Software Libre de la Universidad de Granada <osl@ugr.es> (http://osl.ugr.es/)",
   "contributors": [
     "Juan Julián Merelo Guervós <jjmerelo@gmail.com> (https://twitter.com/jjmerelo)",
@@ -40,7 +40,7 @@
     "express": "^4.13.4",
     "express-ejs-layouts": "^2.1.0",
     "html-minifier": "^2.1.3",
-    "node-sass": "^3.4.2",
+    "morgan": "^1.7.0",
     "serve-favicon": "^2.3.0"
   },
   "devDependencies": {
@@ -60,7 +60,6 @@
     "js-beautify": "^1.6.2",
     "jshint": "^2.9.1",
     "mocha": "^2.4.5",
-    "morgan": "^1.7.0",
     "pm2": "^1.0.2",
     "supertest": "^1.2.0",
     "underscore": "^1.8.3",
@@ -85,7 +84,6 @@
     "coveralls": "cat ./coverage/lcov.info | coveralls",
     "save": "pm2 save",
     "beautify": "js-beautify --indent-with-tabs --brace-style collapse -r *.json *.js app/*.js app/routes/*.js config/*.js config/*.json test/*.js test/*/*.js public/script/*.js",
-    "sass": "node-sass ./public/styles/*.scss -o ./public/styles/css",
     "jshint": "jshint *.json *.js app/*.js app/routes/*.js config/*.js config/*.json test/*.js public/script/*.js",
     "doc": "rm -rf doc;groc"
   }

diff --git a/public/script/turbolinks.js b/public/script/turbolinks.js
diff --git a/views/layouts/default.ejs b/views/layouts/default.ejs
@@ -29,34 +29,37 @@
         <meta name="description" content="Universidad de Granada - UGR transparente">
         <meta name="keywords" content="universidad, Granada, UGR transparente, ley de transparencia">
 
-        <link rel="shortcut icon" href="/img/general/favicon.ico" type="image/vnd.microsoft.icon" data-turbolinks-track="reload">
-        <link rel="icon" href="/img/general/favicon.ico" type="image/vnd.microsoft.icon" data-turbolinks-track="reload">
-        <link href="lib/fullcalendar/dist/fullcalendar.css" rel="stylesheet" data-turbolinks-track="reload">
-        <link href="lib/fullcalendar/dist/fullcalendar.print.css" rel="stylesheet" media="print" data-turbolinks-track="reload">
+        <meta name="turbolinks-cache-control" content="no-cache">
+
+
+        <link rel="shortcut icon" href="/img/general/favicon.ico" type="image/vnd.microsoft.icon" >
+        <link rel="icon" href="/img/general/favicon.ico" type="image/vnd.microsoft.icon" >
+        <link href="lib/fullcalendar/dist/fullcalendar.css" rel="stylesheet" >
+        <link href="lib/fullcalendar/dist/fullcalendar.print.css" rel="stylesheet" media="print" >
         <!-- <link rel="stylesheet" href="lib/jquery-ui/themes/smoothness/jquery-ui.min.css"> -->
-        <link rel="stylesheet" href="lib/lightbox2/dist/css/lightbox.min.css" data-turbolinks-track="reload">
-        <link rel="stylesheet" id="css-style" type="text/css" href="/css/style.css" media="all" data-turbolinks-track="reload">
-        <link rel="stylesheet" id="css-style2" type="text/css" href="/css/style2.css" media="all" data-turbolinks-track="reload">
+        <link rel="stylesheet" href="lib/lightbox2/dist/css/lightbox.min.css" >
+        <link rel="stylesheet" id="css-style" type="text/css" href="/css/style.css" media="all" >
+        <link rel="stylesheet" id="css-style2" type="text/css" href="/css/style2.css" media="all" >
 
-        <script type='text/javascript' src='/lib/jquery/dist/jquery.min.js' data-turbolinks-track="reload"></script>
+        <script type='text/javascript' src='/lib/jquery/dist/jquery.min.js' ></script>
 
         <%switch(seccion){
             case "Buscador":%>
             <script type='text/javascript' src='/script/buscar.js'></script>
             <%break;%>
             <%default:%>
-				<script type='text/javascript' src='/lib/jquery-ui/jquery-ui.min.js' data-turbolinks-track="reload"></script>
-				<script type='text/javascript' src='/lib/d3/d3.min.js' charset='utf-8' data-turbolinks-track="reload"></script>
-				<script type='text/javascript' src='https://www.google.com/jsapi' data-turbolinks-track="reload"></script>
+				<script type='text/javascript' src='/lib/jquery-ui/jquery-ui.min.js' ></script>
+				<script type='text/javascript' src='/lib/d3/d3.min.js' charset='utf-8' ></script>
+				<script type='text/javascript' src='https://www.google.com/jsapi' ></script>
 				<script type='text/javascript'>
 					//var tabla = $.noConflict(true);
                     var tabla=$;
                 </script>
-				<script type='text/javascript' src="/script/generar_tabla.js" data-turbolinks-track="reload"></script>
+				<script type='text/javascript' src="/script/generar_tabla.js" ></script>
             <%break;
             }%>
-        <script type="text/javascript" src="/script/menu.js" data-turbolinks-track="reload"></script>
-
+        <script type="text/javascript" src="/script/menu.js" ></script>
+        <script src="script/turbolinks.js"></script>
     </head>
 
     <body>

diff --git a/views/partials/footer.ejs b/views/partials/footer.ejs
@@ -13,5 +13,5 @@
             <a href="http://www.ugr.es"> Universidad de Granada</a>
         </p>
     </div>
-    <script src="script/turbolinks.js"></script>
+
 </div>