Merge branch 'master' of github.com:wtg/concerto

wtg · Oct 24, 2010 · da65c4c · da65c4c
2 parents 782d089 + 662c969
commit da65c4c
Show file tree

Hide file tree

Showing 7 changed files with 1,539 additions and 898 deletions.
diff --git a/app/views/contents/form_elements/_duration.html b/app/views/contents/form_elements/_duration.html
@@ -0,0 +1,11 @@
+<% content_for :head do %>
+  <%= javascript_include_tag 'rangeinput' %>
+<% end %>
+<div class="field">
+        <%= form.label :duration %>
+        <div class="inputs">
+                <div class="leftseconds"><%= min %>s</div>
+                <%= form.range_field :duration, {:min =>min, :max=>max, :class=>"inputrange"} %>
+                <div class="rightseconds"><%= max %>s</div>
+        </div>
+</div>
diff --git a/app/views/contents/graphic/_form.html.erb b/app/views/contents/graphic/_form.html.erb
@@ -36,14 +36,7 @@ end
 		<%= form.text_field :name, :class => 'alert' %>
 	</div>
 </div>
-<div class="field">
-  	<%= form.label :duration %>
-    <div class="inputs">
-      <div class="leftseconds">4s</div>
-      <%= form.range_field :duration, {:min =>"4", :max=>"12", :value=>"8", :class=>"inputrange"} %>
-      <div class="rightseconds">12s</div>
-	</div>
-</div>
+<%= render :partial => 'contents/form_elements/duration', :locals => {:form => form, :min => 4, :max => 12} %>
 <%= render :partial => 'contents/form_elements/dates', :locals => {:form => form} %>
 <div class="field">
   	<%= form.label :user %>

diff --git a/app/views/contents/ticker/_form.html.erb b/app/views/contents/ticker/_form.html.erb
@@ -24,12 +24,7 @@
 		<%= form.text_field :name, :class => 'alert' %>
 	</div>
 </div>
-<div class="field">
-  	<%= form.label :duration %>
-  	<div class="inputs">
-		<%= form.text_field :duration %>
-	</div>
-</div>
+<%= render :partial => 'contents/form_elements/duration', :locals => {:form => form, :min => 4, :max => 12} %>
 <%= render :partial => 'contents/form_elements/dates', :locals => {:form => form} %>
 <div class="field">
   	<%= form.label :user %>

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -5,7 +5,6 @@
 
   <%= stylesheet_link_tag 'base' %>
   <%= javascript_include_tag :defaults %>
-  <%= javascript_include_tag 'rangeinput' %>
   <%= csrf_meta_tag %>
   <%= render :partial => 'elements/head' %>
   <%= render :partial => 'elements/javascript' %>

diff --git a/config/application.rb b/config/application.rb
@@ -31,7 +31,7 @@ class Application < Rails::Application
     # config.i18n.default_locale = :de
 
     # JavaScript files you want as :defaults (application.js is always included).
-    config.action_view.javascript_expansions[:defaults] = ['jquery-1.4.2', 'jquery-ujs/src/rails']
+    config.action_view.javascript_expansions[:defaults] = ['jquery-1.4.3', 'jquery-ujs/src/rails']
 
     # Configure the default encoding used in templates for Ruby 1.9.
     config.encoding = "utf-8"