From 56381fe31855f1ce054ec14f66f6f36955064f04 Mon Sep 17 00:00:00 2001 From: Ken Johnson Date: Mon, 10 Jun 2013 15:27:21 -0400 Subject: [PATCH] fixed issue #25 --- app/assets/javascripts/application.js | 4 +++- app/views/dashboard/home.html.erb | 16 +++++++++------- app/views/layouts/application.html.erb | 6 ++++++ app/views/paid_time_off/index.html.erb | 3 --- 4 files changed, 18 insertions(+), 11 deletions(-) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index dc40c93..42684d8 100755 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -29,6 +29,8 @@ //= require jquery.easy-pie-chart.js function rubyCodeFormat() { + + $("pre.ruby").snippet("ruby",{style:"rand01",transparent:true,showNum:true}); // Finds
 elements with the class "js"
@@ -41,4 +43,4 @@ $("pre.ruby").snippet("ruby",{style:"rand01",transparent:true,showNum:true});
 
 $(document).ready(function(){
 	rubyCodeFormat()
-});
\ No newline at end of file
+});
diff --git a/app/views/dashboard/home.html.erb b/app/views/dashboard/home.html.erb
index 8d206b3..4cdbdbf 100755
--- a/app/views/dashboard/home.html.erb
+++ b/app/views/dashboard/home.html.erb
@@ -2,16 +2,18 @@
     
     
-
-
- <% if @user.paid_time_off %> - <%= render :partial => "layouts/dashboard/dashboard_stats"%> - <% end %> -
-
+
+
+ <% if @user.paid_time_off %> + <%= render :partial => "layouts/dashboard/dashboard_stats"%> + <% end %> +
+
+
+ diff --git a/app/views/paid_time_off/index.html.erb b/app/views/paid_time_off/index.html.erb index 8854089..45a235d 100644 --- a/app/views/paid_time_off/index.html.erb +++ b/app/views/paid_time_off/index.html.erb @@ -127,9 +127,6 @@ $('#calendar').fullCalendar({ }) - //Dropdown -$('.dropdown-toggle').dropdown(); - //Date picker $('.date_picker').daterangepicker({ opens: 'right'