COED

colmexdev · Mar 6, 2019 · 1033189 · 1033189
1 parent 7839c24
commit 1033189
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 10 deletions.
diff --git a/Gemfile b/Gemfile
@@ -20,7 +20,7 @@ gem 'coffee-rails', '~> 4.1.0'
 # Use jquery as the JavaScript library
 gem 'jquery-rails'
 # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
-gem 'turbolinks'
+#gem 'turbolinks'
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
 gem 'jbuilder', '~> 2.0'
 # bundle exec rake doc:rails generates the API under doc/api.

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -201,9 +201,6 @@ GEM
     tilt (2.0.5)
     trix (0.11.0)
       rails (> 4.1, < 5.2)
-    turbolinks (5.0.1)
-      turbolinks-source (~> 5)
-    turbolinks-source (5.0.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     uglifier (3.0.4)
@@ -245,7 +242,6 @@ DEPENDENCIES
   sdoc (~> 0.4.0)
   spring
   trix
-  turbolinks
   uglifier (>= 1.3.0)
   web-console (~> 2.0)
   yt (~> 0.28.0)

diff --git a/Gemfile~ b/Gemfile~
@@ -32,7 +32,7 @@ gem 'remotipart'
 gem 'font-awesome-sass', '~> 4.7.0'
 gem 'paperclip'
 
-gem 'aouth2'
+gem 'oauth2'
 
 # Use ActiveModel has_secure_password
 # gem 'bcrypt', '~> 3.1.7'

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -13,7 +13,6 @@
 //= require jquery
 //= require jquery_ujs
 //= require jquery.remotipart
-//= require turbolinks
 //= require bootstrap-sprockets
 //= require sect_template
 //= require videos

diff --git a/app/assets/javascripts/application.js~ b/app/assets/javascripts/application.js~
@@ -15,6 +15,7 @@
 //= require jquery.remotipart
 //= require turbolinks
 //= require bootstrap-sprockets
+//= require sect_template
 //= require videos
 //= require principal
 //= require ajax

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>Videos</title>
-  <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true %>
-  <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
+  <title><%= (@title || "") + "Coordinación de Educación Digital" %></title>
+  <%= stylesheet_link_tag    'application', media: 'all' %>
+  <%= javascript_include_tag 'application' %>
   <%= csrf_meta_tags %>
 	<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
 	<script src="/js/jquery.nicescroll.min.js"></script>

diff --git a/app/views/layouts/application.html.erb~ b/app/views/layouts/application.html.erb~
@@ -17,6 +17,8 @@
 			$("html").niceScroll({cursorcolor: "#CCCCCC", cursorwidth: "8px"});
 			$("#produccion-digital").niceScroll({cursorcolor: "#CCCCCC", cursorwidth: "8px"});
 			$("#tecnologia-educativa").niceScroll({cursorcolor: "#CCCCCC", cursorwidth: "8px"});
+			$("#digital-design").niceScroll({cursorcolor: "#CCCCCC", cursorwidth: "8px"});
+			$("#coordinacion").niceScroll({cursorcolor: "#CCCCCC", cursorwidth: "8px"});
 		});
 	</script>
 </body>