modified the footer. Only includes the related js file in all pages u…

…sing content_for helper method.
tekvision · Sep 21, 2013 · a8ac9e0 · a8ac9e0
1 parent 2f9813a
commit a8ac9e0
Show file tree

Hide file tree

Showing 15 changed files with 28 additions and 14 deletions.
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -14,11 +14,8 @@
 //= require jquery_ujs
 //= require bootstrap
 //= require mediaelement_rails
-//= require Acc.DC.API
-//= require calendar_generator.min
-//= require calendar_generator
-//= require setup
-//= require_directory .
+//= require jquery.cookie
+//= require home
 
   $(document).ready(function() {
     // add a click handler to a link

diff --git a/app/assets/stylesheets/_layout.scss b/app/assets/stylesheets/_layout.scss
@@ -35,7 +35,7 @@ body.textsize-1425 {font:142.5%/1.5 Arial, sans-serif;}
 }
 .main-container{
   margin-top: 20px;
-  min-height: 670px;
+  min-height: 660px;
 }
 
 .colored-block {
@@ -179,9 +179,13 @@ padding-bottom:150px; /* this needs to be bigger than footer height*/
 .footer{
     position: relative;
     margin-top: -150px; /* negative value of footer height */
-    height: 60px;
+    height: 75px;
     clear:both;
     color:#fff;
+
+    .nav > li > a {
+      display: inline;
+    }
 } 
 
 .score-wrapper {

diff --git a/app/views/application/_footer.html.haml b/app/views/application/_footer.html.haml
@@ -9,7 +9,7 @@
 .span6.pull-middle
   %ul.nav
     %li
-      %p Develop by
+      %p Developed by
     %li
       %a{:href => "http://techvision.net.in"}
         %img{:src =>'/images/techvision4.jpg', :alt => 'TechVision', :width => "125px"}

diff --git a/app/views/layouts/admin.html.haml b/app/views/layouts/admin.html.haml
@@ -35,4 +35,5 @@
     .container.main-container{role: 'application'}
       = yield
     = javascript_include_tag "application", 'admin/application'
+    =  yield(:javascript) if content_for?(:javascript)
 
diff --git a/app/views/levels/_form.html.haml b/app/views/levels/_form.html.haml
@@ -1,5 +1,5 @@
 - content_for :javascript do
-  = javascript_include_tag 'validations'
+  = javascript_include_tag 'validations', 'levels', 'nested_form'
 = simple_nested_form_for @level, html: {:class => 'form-horizontal'} do |f|
   = f.error_notification
   %p#errorcontainer

diff --git a/app/views/levels/index.html.haml b/app/views/levels/index.html.haml
@@ -1,3 +1,5 @@
+- content_for :javascript do
+  = javascript_include_tag 'levels', 'handle_aria_event'
 #grid-wrapper.lessons{:role => "application"}
   %h1 Select level
   #game-levels.no-focus{role: 'grid', tabindex: '0'}

diff --git a/app/views/levels/levels_list.html.haml b/app/views/levels/levels_list.html.haml
@@ -1,3 +1,5 @@
+- content_for :javascript do
+  = javascript_include_tag 'levels'
 %h1.delta Display levels
 %table.table
   %tr

diff --git a/app/views/levels/show.html.haml b/app/views/levels/show.html.haml
@@ -1,3 +1,5 @@
+- content_for :javascript do
+  = javascript_include_tag 'levels', 'handle_aria_event'
 .level
   .row
     .span6

diff --git a/app/views/topics/_form.html.haml b/app/views/topics/_form.html.haml
@@ -1,5 +1,5 @@
 - content_for :javascript do
-  = javascript_include_tag 'validations'
+  = javascript_include_tag 'validations', 'topics', 'nested_form'
 = simple_nested_form_for [@level, @topic], html:  {:class => 'form-horizontal'} do |f|
   = @topic.errors.full_messages
 

diff --git a/app/views/topics/index.html.haml b/app/views/topics/index.html.haml
@@ -1,3 +1,5 @@
+- content_for :javascript do
+  = javascript_include_tag 'topics'
 %h1.delta Topic Details for #{@level.level_name} level 
 %table.table
   %tr

diff --git a/app/views/topics/new.html.haml b/app/views/topics/new.html.haml
@@ -1,5 +1,3 @@
 %h1.delta New topic for #{@level.level_name} level 
 .content
   = render 'form'
-- content_for :javascript do
-  = javascript_include_tag 'nested_form'
diff --git a/app/views/topics/show.html.haml b/app/views/topics/show.html.haml
@@ -1,3 +1,5 @@
+- content_for :javascript do
+  = javascript_include_tag 'topics',  'mediaelement_rails', 'mediaelement-and-player.min', 'tabPanel'
 .topic
   .row
     .span8.offset2

diff --git a/app/views/users/_frmprofile.html.haml b/app/views/users/_frmprofile.html.haml
@@ -1,6 +1,6 @@
 - content_for :javascript do
   = javascript_include_tag 'global'
-  = javascript_include_tag 'validations'
+  = javascript_include_tag 'validations', 'Acc.DC.API', 'calendar_generator.min', 'calendar_generator', 'setup', 'users'
 
   = stylesheet_link_tag 'calendar'
 = simple_form_for @user, url: profile_path(@user), method: :post, html: {:class => 'form-horizontal'} do |u|

diff --git a/app/views/users/index.html.haml b/app/views/users/index.html.haml
@@ -1,3 +1,5 @@
+- content_for :javascript do
+  = javascript_include_tag 'users'
 %h1 link to profile
 %table
   %tr
@@ -7,4 +9,4 @@
     %tr
       %td= user.email
 
-= link_to 'create new profile', new_path(current_user)
+= link_to 'create new profile', new_path(current_user)
diff --git a/app/views/users/profile.html.haml b/app/views/users/profile.html.haml
@@ -1,3 +1,5 @@
+- content_for :javascript do
+  = javascript_include_tag 'users'
 %h1 Profile
 %h2 Personal information:
 %table.table