Javascript files enabling Date/Time

wtg · Oct 25, 2010 · e7ba103 · e7ba103
1 parent 4b0d299
commit e7ba103
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/app/views/contents/form_elements/_dates.html.erb b/app/views/contents/form_elements/_dates.html.erb
@@ -1,12 +1,21 @@
+<% content_for :head do %>
+  <%= javascript_include_tag 'jquery-ui-1.8.5.custom.min.js' %>
+  <%= javascript_include_tag 'jquery-ui-timepicker-addon.js' %>
+<% end %>
+
 <div class="field">
   	<%= form.label :start_time %>
-  	<div class="fieldbox">
-		<%= form.text_field :start_time %>
-	</div>
+    <%= form.hidden_field :start_time %>   
+    <div class="fieldbox">
+      <%= text_field("start", "date", :maxlength => 20, :style=>"width:110px")%><%=image_tag('elements/date.png', :id=>'date',:align=>'top' , :style=>"padding-left:4px;padding-right:20px")%>
+      <%= text_field("start", "time", :maxlength => 20 ,:style=>"width:80px")%><%=image_tag('elements/time.png', :id=>'time',:align=>'top' , :style=>"padding-left:4px")%>
+  </div>
 </div>
 <div class="field">
   	<%= form.label :end_time %>
   	<div class="fieldbox">
-		<%= form.text_field :end_time %>
+      <%= form.hidden_field :end_time %>
+      <%= text_field("end", "date", :maxlength => 20, :style=>"width:110px")%><%=image_tag('elements/date.png', :id=>'date',:align=>'top' , :style=>"padding-left:4px;padding-right:20px")%>
+      <%= text_field("end", "time", :maxlength => 20 ,:style=>"width:80px")%><%=image_tag('elements/time.png', :id=>'time',:align=>'top' , :style=>"padding-left:4px")%>
 	</div>
-</div>
+</div>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -4,6 +4,8 @@
   <title><%= controller.action_name.titleize %> - <%= controller.controller_name.titleize %> - Concerto Signage Panel</title>
 
   <%= stylesheet_link_tag 'base' %>
+  <%= stylesheet_link_tag 'jquery-ui-1.8.5.custom' %>
+  <%= stylesheet_link_tag 'datetime' %>
   <%= javascript_include_tag :defaults %>
   <%= csrf_meta_tag %>
   <%= render :partial => 'elements/head' %>

diff --git a/public/javascripts/application.js b/public/javascripts/application.js
@@ -2,6 +2,10 @@
 // This file is automatically included by javascript_include_tag :defaults
 
 $(document).ready(function () {
+  $('#start_time').timepicker();
+  $("#end_time").timepicker();
+  $('#start_date').datepicker();
+  $('#end_date').datepicker();
 	//Content grid/table switching
 	$('a.update_holder').live('click', function(event){
 		event.preventDefault();