lolita 3.1.10 → 3.1.11

data/app/helpers/components/lolita/configuration/list_component.rb

@@ -1,11 +1,11 @@
-module Components
-  module Lolita
-    module Configuration
-      module ListComponent
-        def sort_options
-          params[:sort]
-        end
-      end
-    end
-  end
+module Components
+  module Lolita
+    module Configuration
+      module ListComponent
+        def sort_options
+          params[:sort]
+        end
+      end
+    end
+  end
 end

data/app/helpers/lolita_helper.rb

@@ -1,12 +1,12 @@
-module LolitaHelper
-	
-	# Classes for div block that is located to the right of menu
-	# This is helpful because different positionings within it exist depending on action
-  def content_classes
-    classes = []
-    if params[:action] == "edit" || params[:action] == "new"
-    	classes << "with-secondary"
-    end
-    classes.join(" ")
-  end
+module LolitaHelper
+	
+	# Classes for div block that is located to the right of menu
+	# This is helpful because different positionings within it exist depending on action
+  def content_classes
+    classes = []
+    if params[:action] == "edit" || params[:action] == "new"
+    	classes << "with-secondary"
+    end
+    classes.join(" ")
+  end
 end

data/app/views/components/lolita/configuration/column/_display.html.erb

@@ -1,4 +1,4 @@
-<td>
-  <% value=column.formatter.with(record.send(column.name.to_sym),record,self) %>
-  <%= value.to_s %>
-</td>
+<td>
+  <% value=column.formatter.with(record.send(column.name.to_sym),record,self) %>
+  <%= value.to_s %>
+</td>

data/app/views/components/lolita/configuration/column/_header.html.erb

@@ -1,7 +1,7 @@
-<th <%=column.currently_sorting?(params) ? "class='active'" : ""%> >
-  <% if column.sortable? %>
-    <%= render_component column, :sort %>
-  <% else %>
-    <%= column.title.to_s.capitalize %>
-  <% end %>
-</th>
+<th <%=column.currently_sorting?(params) ? "class='active'" : ""%> >
+  <% if column.sortable? %>
+    <%= render_component column, :sort %>
+  <% else %>
+    <%= column.title.to_s.capitalize %>
+  <% end %>
+</th>

data/app/views/components/lolita/configuration/column/_sort.html.erb

@@ -1,4 +1,4 @@
- <% param_options=params.reject{|k,v| [:controller,:action].include?(k)} %>
- <% options=param_options.merge(column.sort_options(params)) %>
- <% direction_indicator=column.currently_sorting?(params) && options[:sd].to_s=="desc" ? raw('&uArr;') : raw('&dArr;') %>
- <%= link_to raw("#{column.title.to_s.capitalize } #{direction_indicator}"), lolita_resources_path(options) %>
+ <% param_options=params.reject{|k,v| [:controller,:action].include?(k)} %>
+ <% options=param_options.merge(column.sort_options(params)) %>
+ <% direction_indicator=column.currently_sorting?(params) && options[:sd].to_s=="desc" ? raw('&uArr;') : raw('&dArr;') %>
+ <%= link_to raw("#{column.title.to_s.capitalize } #{direction_indicator}"), lolita_resources_path(options) %>

data/app/views/components/lolita/configuration/columns/_body.html.erb

@@ -1,5 +1,5 @@
-<tbody>
-  <% page.each_with_index do |record,index| %>
-    <%= render_component columns, :row, :record=>record,:index=>index%>
-  <% end %>
+<tbody>
+  <% page.each_with_index do |record,index| %>
+    <%= render_component columns, :row, :record=>record,:index=>index%>
+  <% end %>
 </tbody>

data/app/views/components/lolita/configuration/columns/_display.html.erb

@@ -1,2 +1,2 @@
-<%= render_component columns,:header %>
+<%= render_component columns,:header %>
 <%= render_component columns,:body,:page=>page %>

data/app/views/components/lolita/configuration/columns/_first.html.erb

@@ -1,3 +1,3 @@
-<td class="checkbox-cell">
-  <%= check_box_tag "#{resource_name}[id]", record.id %>
+<td class="checkbox-cell">
+  <%= check_box_tag "#{resource_name}[id]", record.id %>
 </td>

data/app/views/components/lolita/configuration/columns/_first_column_header.html.erb

@@ -1,3 +1,3 @@
-<th class="checkbox-header">
-  *
-</th>
+<th class="checkbox-header">
+  *
+</th>

data/app/views/components/lolita/configuration/columns/_header.html.erb

@@ -1,9 +1,9 @@
-<thead>
-  <tr>
-    <%= render_component columns,:first_column_header %>
-    <% columns.each do |column| %>
-      <%= render_component column,:header %>
-    <% end %>
-    <%= render_component columns,:last_column_header  %>
-  </tr>
+<thead>
+  <tr>
+    <%= render_component columns,:first_column_header %>
+    <% columns.each do |column| %>
+      <%= render_component column,:header %>
+    <% end %>
+    <%= render_component columns,:last_column_header  %>
+  </tr>
 </thead>

data/app/views/components/lolita/configuration/columns/_last.html.erb

@@ -1,4 +1,4 @@
-<td class="tool-cell">
-  <%= link_to ::I18n.t("lolita.shared.edit"),edit_lolita_resource_path(:id=>record.id) %>
-  <%= link_to ::I18n.t("lolita.shared.delete"), lolita_resource_path(:id=>record.id),:method=>:delete,:confirm=>I18n.t("lolita.list.confirm") %>
-</td>
+<td class="tool-cell">
+  <%= link_to ::I18n.t("lolita.shared.edit"),edit_lolita_resource_path(:id=>record.id) %>
+  <%= link_to ::I18n.t("lolita.shared.delete"), lolita_resource_path(:id=>record.id),:method=>:delete,:confirm=>I18n.t("lolita.list.confirm") %>
+</td>

data/app/views/components/lolita/configuration/columns/_last_column_header.html.erb

@@ -1,3 +1,3 @@
-<th class="tool-header">
-  -
+<th class="tool-header">
+  -
 </th>

data/app/views/components/lolita/configuration/columns/_row.html.erb

@@ -1,7 +1,7 @@
-<tr class="<%= index%2==0 ? "even" : "odd" %>">
-  <%= render_component columns,:first,:record=>record %>
-  <% columns.each do |column| %>
-    <%= render_component column, :record=>record %>
-  <% end %>
-  <%= render_component columns,:last,:record=>record %>
-</tr>
+<tr class="<%= index%2==0 ? "even" : "odd" %>">
+  <%= render_component columns,:first,:record=>record %>
+  <% columns.each do |column| %>
+    <%= render_component column, :record=>record %>
+  <% end %>
+  <%= render_component columns,:last,:record=>record %>
+</tr>

data/app/views/components/lolita/configuration/field/_display.html.erb

@@ -1,9 +1,9 @@
-<div class="field" id="field_<%=field.__id__%>">
-  <%= render_component *field.build(:name=>"/lolita/configuration/field", :state => :"label") %>
-  <div class="field-value" id="field_<%=field.__id__%>_value">
-    <%= render_component *field.build %>
-  </div>
-  <% unless resource.errors[field.name.to_s.gsub(/_id$/,"").to_sym].empty? %>
-    <p class="inline-errors"><%= raw resource.errors[field.name.to_s.gsub(/_id$/,"").to_sym].join("<br>") %></p>
-  <% end %>
-</div>
+<div class="field" id="field_<%=field.__id__%>">
+  <%= render_component *field.build(:name=>"/lolita/configuration/field", :state => :"label") %>
+  <div class="field-value" id="field_<%=field.__id__%>_value">
+    <%= render_component *field.build %>
+  </div>
+  <% unless resource.errors[field.name.to_s.gsub(/_id$/,"").to_sym].empty? %>
+    <p class="inline-errors"><%= raw resource.errors[field.name.to_s.gsub(/_id$/,"").to_sym].join("<br>") %></p>
+  <% end %>
+</div>

data/app/views/components/lolita/configuration/field/_label.html.erb

@@ -1 +1 @@
-<%= label resource_name, field.name, raw(field.title.to_s.capitalize), :id=>"field_#{field.__id__}_label" %>
+<%= label resource_name, field.name, raw(field.title.to_s.capitalize), :id=>"field_#{field.__id__}_label" %>

data/app/views/components/lolita/configuration/field/_object.html.erb

@@ -1 +1 @@
-<div class="object"></div>
+<div class="object"></div>

data/app/views/components/lolita/configuration/field/array/_display.html.erb

@@ -1,5 +1,5 @@
-<% if field.association_type == :one %>
-  <%= render_component :"lolita/configuration/field/array/select", :display, :field=>field %>
-<% else %>
-  <%= render_component :"lolita/configuration/field/array/habtm", :display, :field=>field %>
+<% if field.association_type == :one %>
+  <%= render_component :"lolita/configuration/field/array/select", :display, :field=>field %>
+<% else %>
+  <%= render_component :"lolita/configuration/field/array/habtm", :display, :field=>field %>
 <% end %>

data/app/views/components/lolita/configuration/field/array/habtm/_display.html.erb

@@ -1,26 +1,26 @@
-<% options = field.association_values.respond_to?(:call) ? field.association_values.call(self) : field.association_values %>
-<% values = self.instance_variable_get("@#{resource_name}").send("#{field.name}") %>
-<% subject_habtm_fieldname = "#{field.name.to_s.singularize}_ids" %>
-<% values.each{|value|%>
-  <%
-  option_tags = options.collect{|option|
-    option_tag_attributes = {:value=>option[1]}
-    option_tag_attributes[:selected] = "selected" if option[1] == value.id
-    content_tag :option, option[0], option_tag_attributes
-  }.join("").html_safe
-  %>
-  <div style="height:30px;">
-    <%= select_tag "#{resource_name}[#{subject_habtm_fieldname}][]", option_tags ,{:include_blank=>true} %>
-  </div>
-<%  } %>
-<% empty_fields = (values.size < 5) ? (5 - values.size) : 0 %>
-<%
-option_tags = options.collect{|option|
-  content_tag :option, option[0], {:value=>option[1]}
-}.join("").html_safe
-%>
-<% empty_fields.times{ %>
-  <div style="height:30px;">
-    <%= select_tag "#{resource_name}[#{subject_habtm_fieldname}][]", option_tags ,{:include_blank=>true} %>
-  </div>
-<% } %>
+<% options = field.association_values.respond_to?(:call) ? field.association_values.call(self) : field.association_values %>
+<% values = self.instance_variable_get("@#{resource_name}").send("#{field.name}") %>
+<% subject_habtm_fieldname = "#{field.name.to_s.singularize}_ids" %>
+<% values.each{|value|%>
+  <%
+  option_tags = options.collect{|option|
+    option_tag_attributes = {:value=>option[1]}
+    option_tag_attributes[:selected] = "selected" if option[1] == value.id
+    content_tag :option, option[0], option_tag_attributes
+  }.join("").html_safe
+  %>
+  <div style="height:30px;">
+    <%= select_tag "#{resource_name}[#{subject_habtm_fieldname}][]", option_tags ,{:include_blank=>true} %>
+  </div>
+<%  } %>
+<% empty_fields = (values.size < 5) ? (5 - values.size) : 0 %>
+<%
+option_tags = options.collect{|option|
+  content_tag :option, option[0], {:value=>option[1]}
+}.join("").html_safe
+%>
+<% empty_fields.times{ %>
+  <div style="height:30px;">
+    <%= select_tag "#{resource_name}[#{subject_habtm_fieldname}][]", option_tags ,{:include_blank=>true} %>
+  </div>
+<% } %>

data/app/views/components/lolita/configuration/field/array/select/_display.html.erb

@@ -1,5 +1,5 @@
-<%= select resource_name,
-            field.name,
-            (field.association_values.respond_to?(:call) ? field.association_values.call(self) : field.association_values),
-            {:include_blank => field.include_blank},
-            field.html_options || {} %>
+<%= select resource_name,
+            field.name,
+            (field.association_values.respond_to?(:call) ? field.association_values.call(self) : field.association_values),
+            {:include_blank => field.include_blank},
+            field.html_options || {} %>

data/app/views/components/lolita/configuration/field/boolean/filter/_display.html.erb

@@ -1,2 +1,2 @@
-<label for="<%= filter.field_name(field) %>"><%= field.title %></label>
+<label for="<%= filter.field_name(field) %>"><%= field.title %></label>
 <%= check_box_tag filter.field_name(field), 1, params[filter.field_name(field)], field.html_options || {} %>

data/app/views/components/lolita/configuration/field/date/_display.html.erb

@@ -1 +1 @@
-<%= date_select resource_name, field.name, field.options, field.html_options %>
+<%= date_select resource_name, field.name, field.options, field.html_options %>

data/app/views/components/lolita/configuration/field/date_time/date/_display.html.erb

@@ -1 +1 @@
-<%= date_select resource_name, field.name,field.options,field.html_options %>
+<%= date_select resource_name, field.name,field.options,field.html_options %>

data/app/views/components/lolita/configuration/field/integer/_display.html.erb

@@ -1 +1 @@
-<%= render_component :"lolita/configuration/field/string", :display,:field=>field %>
+<%= render_component :"lolita/configuration/field/string", :display,:field=>field %>

data/app/views/components/lolita/configuration/field/string/_display.html.erb

@@ -1,5 +1,5 @@
-<% if field.options[:native_type] == "text" %>
- <%= render_component :"lolita/configuration/field/string/text", :display, :field=>field %>
-<% else %>
-  <%= text_field resource_name, field.name, field.html_options %>
+<% if field.options[:native_type] == "text" %>
+ <%= render_component :"lolita/configuration/field/string/text", :display, :field=>field %>
+<% else %>
+  <%= text_field resource_name, field.name, field.html_options %>
 <% end %>

data/app/views/components/lolita/configuration/field/string/disabled/_display.html.erb

@@ -1 +1 @@
-<div class="disabled-field"><%= resource.send(field.name) %></div>
+<div class="disabled-field"><%= resource.send(field.name) %></div>

data/app/views/components/lolita/configuration/field/string/password/_display.html.erb

@@ -1,3 +1,3 @@
-<div class="field-value" id="field_<%=field.__id__%>_value">
-  <%= password_field resource_name, field.name,field.html_options %>
-</div>
+<div class="field-value" id="field_<%=field.__id__%>_value">
+  <%= password_field resource_name, field.name,field.html_options %>
+</div>

data/app/views/components/lolita/configuration/field/string/text/_display.html.erb

@@ -1,18 +1,18 @@
-<% if @textarea_component_include_tinymce_once.nil? %>
-  <% content_for :script do %>
-    <%= javascript_include_tag "tinymce/jquery.tinymce" %>
-		<%= javascript_include_tag "tinymce_config.js" %>
-  <% end %>
-<% end %>
-
-<%= text_area resource_name, field.name, :rows=>(field.rows || 20), :"data-simple"=>field.simple %>
-<% if @textarea_component_include_tinymce_once.nil? %>
-  <script type="text/javascript">
-    $(document).ready(
-     $(function(){
-        load_tinymce();
-      })
-    )
-  </script>
-<% end %>
-<% @textarea_component_include_tinymce_once = "done" %>
+<% if @textarea_component_include_tinymce_once.nil? %>
+  <% content_for :script do %>
+    <%= javascript_include_tag "tinymce/jquery.tinymce" %>
+		<%= javascript_include_tag "tinymce_config.js" %>
+  <% end %>
+<% end %>
+
+<%= text_area resource_name, field.name, :rows=>(field.rows || 20), :"data-simple"=>field.simple %>
+<% if @textarea_component_include_tinymce_once.nil? %>
+  <script type="text/javascript">
+    $(document).ready(
+     $(function(){
+        load_tinymce();
+      })
+    )
+  </script>
+<% end %>
+<% @textarea_component_include_tinymce_once = "done" %>

data/app/views/components/lolita/configuration/field_set/_display.html.erb

@@ -1,5 +1,5 @@
-<div class="fieldset" id="<%=field_set.name%>">
-  <% fields.each do |field| %>
-    <%= render_component *field.builder %>
-  <% end %>
-</div>
+<div class="fieldset" id="<%=field_set.name%>">
+  <% fields.each do |field| %>
+    <%= render_component *field.builder %>
+  <% end %>
+</div>

data/app/views/components/lolita/configuration/list/_display.html.erb

@@ -1,11 +1,11 @@
-<div class="box">
-  <%= render_component list, :title %>
-  <%= render_component list, :new_resource%>
-  <%= render_component list, :filter %>
-  <div class="list">
-    <table>
-      <%= render_component list.columns,:page=>page %>
-    </table>
-  </div>
-  <%= render_component list,:paginator,:page=>page %>
+<div class="box">
+  <%= render_component list, :title %>
+  <%= render_component list, :new_resource%>
+  <%= render_component list, :filter %>
+  <div class="list">
+    <table>
+      <%= render_component list.columns,:page=>page %>
+    </table>
+  </div>
+  <%= render_component list,:paginator,:page=>page %>
 </div>

data/app/views/components/lolita/configuration/list/_filter.html.erb

@@ -1,8 +1,8 @@
-<% if list.filter? -%>
-  <form action="" action="get" class="filter">
-    <% list.filter.fields.each do |field| %>
-      <%= render_component *field.build(:filter, :filter=>list.filter) %>
-    <% end %>
-    <button type="submit"><%= ::I18n.t "lolita.filter.apply_button" %></button>
-  </form>
+<% if list.filter? -%>
+  <form action="" action="get" class="filter">
+    <% list.filter.fields.each do |field| %>
+      <%= render_component *field.build(:filter, :filter=>list.filter) %>
+    <% end %>
+    <button type="submit"><%= ::I18n.t "lolita.filter.apply_button" %></button>
+  </form>
 <% end -%>

data/app/views/components/lolita/configuration/list/_new_resource.html.erb

@@ -1,4 +1,4 @@
-<a href="<%= new_lolita_resource_path%>" class="create">
-  <%= ::I18n.t("lolita.list.add_new",:name=>resource_class.model_name.human.downcase) %>
-  <%= image_tag "lolita/plus.png", :alt=>"+" %>
-</a>
+<a href="<%= new_lolita_resource_path%>" class="create">
+  <%= ::I18n.t("lolita.list.add_new",:name=>resource_class.model_name.human.downcase) %>
+  <%= image_tag "lolita/plus.png", :alt=>"+" %>
+</a>

data/app/views/components/lolita/configuration/list/_title.html.erb

@@ -1,5 +1,5 @@
-<div class="boxtitle">
-  <h1 class="black"><%= resource_class.model_name.human(:count=>2) %></h1>
-  <div class="arrow">
-  </div>
+<div class="boxtitle">
+  <h1 class="black"><%= resource_class.model_name.human(:count=>2) %></h1>
+  <div class="arrow">
+  </div>
 </div>

data/app/views/components/lolita/configuration/tab/_display.html.erb

@@ -1,17 +1,17 @@
-<div class="tab box" id="tab_<%=tab.__id__%>">
-  <div class="tab-title boxtitle black" data-closed="false">
-    <h1><%= tab.title %></h1>
-    <div class="arrow"></div> <%# FIXME more DRY solution is needed for .arrow within .boxtitle, maybe box helper %>
-  </div>
-  <% if resource.errors.any? %>
-    <p class="errorExplanation" id="errorExplanation">
-      <%= raw resource.errors.keys.collect{|k|
-        if error_tab = tab.fields.by_name(k)
-          "#{error_tab.title.humanize.capitalize}: "+
-            "#{resource.errors[k].collect{|m| m.capitalize}.join(" and ")}"
-        end
-      }.compact.join("<br>") %>
-    </p>
-  <% end %>
-  <%= render_component *tab.build %>
-</div>
+<div class="tab box" id="tab_<%=tab.__id__%>">
+  <div class="tab-title boxtitle black" data-closed="false">
+    <h1><%= tab.title %></h1>
+    <div class="arrow"></div> <%# FIXME more DRY solution is needed for .arrow within .boxtitle, maybe box helper %>
+  </div>
+  <% if resource.errors.any? %>
+    <p class="errorExplanation" id="errorExplanation">
+      <%= raw resource.errors.keys.collect{|k|
+        if error_tab = tab.fields.by_name(k)
+          "#{error_tab.title.humanize.capitalize}: "+
+            "#{resource.errors[k].collect{|m| m.capitalize}.join(" and ")}"
+        end
+      }.compact.join("<br>") %>
+    </p>
+  <% end %>
+  <%= render_component *tab.build %>
+</div>