activoate 0.7.2 → 0.7.5

data/README

@@ -1,4 +1,4 @@
-# Activoate 0.6.8 #
+# Activoate 0.7.2 #
 
 We're setting up this repository, more info soon!
 

data/app/helpers/activo_helper.rb

@@ -43,7 +43,7 @@ module ActivoHelper
   #
   # Returns an anchor tag
   def add_button(path)
-    button(path, t("activoated.add", :default => 'Add'), 'add')
+    button(path, t("activoate.add", :default => 'Add'), 'add')
   end
   
   # Wraps the button helper, creating a cancel button
@@ -55,7 +55,7 @@ module ActivoHelper
   #
   # Returns an anchor tag
   def cancel_button(path)
-    button(path, t("activoated.cancel", :default => 'Cancel'), 'cross')
+    button(path, t("activoate.cancel", :default => 'Cancel'), 'cross')
   end
 
   # Wraps the button helper, creating an edit button
@@ -69,7 +69,7 @@ module ActivoHelper
   #
   # Returns an anchor tag
   def edit_button(path, alternative_icon = false)
-    button(path, t("activoated.edit", :default => 'Edit'), alternative_icon ? 'edit' : 'application_edit')
+    button(path, t("activoate.edit", :default => 'Edit'), alternative_icon ? 'edit' : 'application_edit')
   end
 
   # Wraps the button helper, creating a delete button
@@ -84,10 +84,10 @@ module ActivoHelper
   # Returns an anchor tag
   def delete_button(path, alternative_icon = false)
     options = {
-        :confirm => t("activoated.confirm", :default => "Are you sure?"),
+        :confirm => t("activoate.confirm", :default => "Are you sure?"),
         :method => :delete
     }
-    button(path, t("activoated.delete", :default => 'Delete'), alternative_icon ? 'delete' : 'cross', options)
+    button(path, t("activoate.delete", :default => 'Delete'), alternative_icon ? 'delete' : 'cross', options)
   end
 
   # Displays a button
@@ -102,7 +102,7 @@ module ActivoHelper
   #
   # Returns an anchor tag
   def button(path, caption = 'click-me', icon = 'show', options = {})
-    default_options = { :class => "button", :confirm => false, :method => :get }
+    default_options = { :class => "button", :confirm => false }
     options = default_options.merge(options)
 
     link_to path, options do

data/lib/activoate/version.rb

@@ -1,3 +1,3 @@
 module Activoate
-  VERSION = "0.7.2"
+  VERSION = "0.7.5"
 end

data/lib/generators/activoate/activoated/activoated_generator.rb

@@ -98,18 +98,21 @@ module Activoate
     end
     
     def generate_views
+      form_file_name = options.formtastic ? 'view_form_formtastic.html.erb' : 'view_form.html.erb'
+      show_file_name = options.attrtastic ? 'view_show_attrtastic.html.erb' : 'view_show.html.erb'
+      
       views = {
         'crud' => {
           'view_tables.html.erb'  => File.join('app/views', @controller_file_path, "index.html.#{options.engine}"),
           'view_new.html.erb'     => File.join('app/views', @controller_file_path, "new.html.#{options.engine}"),
           'view_edit.html.erb'    => File.join('app/views', @controller_file_path, "edit.html.#{options.engine}"),
-          options.formtastic ? 'view_form_formtastic.html.erb' : 'view_form.html.erb' => File.join('app/views', @controller_file_path, "_form.html.#{options.engine}"),
-          options.attrtastic ? 'view_show_attrtastic.html.erb' : 'view_show.html.erb' => File.join('app/views', @controller_file_path, "show.html.#{options.engine}"),
-          'view_sidebar.html.erb' => File.join('app/views', @controller_file_path, "_sidebar.html.#{options.engine}")
+          form_file_name          => File.join('app/views', @controller_file_path, "_form.html.#{options.engine}"),
+          show_file_name          => File.join('app/views', @controller_file_path, "show.html.#{options.engine}"),
+          'view_sidebar.html.erb' => File.join('app/views', "shared", "_sidebar.html.#{options.engine}")
         },
         'text' => {
           'view_text.html.erb'    => File.join('app/views', @controller_file_path, "show.html.#{options.engine}"),
-          'view_sidebar.html.erb' => File.join('app/views', @controller_file_path, "_sidebar.html.#{options.engine}")
+          'view_sidebar.html.erb' => File.join('app/views', "shared", "_sidebar.html.#{options.engine}")
         }
       }
       selected_views = views[options.themed_type]

data/lib/generators/activoate/activoated/templates/view_edit.html.erb

@@ -1,15 +1,15 @@
 <div class="block">
 	<%%= secondary_navigation do |nav| %>
-		<%% nav.item t("activoated.list", :default => "List"), <%= controller_routing_path %>_path %>
-		<%% nav.item t("activoated.new", :default => "New"), new_<%= singular_controller_routing_path %>_path %>
-		<%% nav.item t("activoated.edit", :default => "Edit"), edit_<%= singular_controller_routing_path %>_path, :active => true %>
+		<%% nav.item t("activoate.list", :default => "List"), <%= controller_routing_path %>_path %>
+		<%% nav.item t("activoate.new", :default => "New"), new_<%= singular_controller_routing_path %>_path %>
+		<%% nav.item t("activoate.edit", :default => "Edit"), edit_<%= singular_controller_routing_path %>_path, :active => true %>
 	<%% end %>          
   <div class="content">            
-    <h2 class="title"><%%= t("activoated.edit", :default => "Edit") %> <%= model_name %></h2>
+    <h2 class="title"><%%= t("activoate.edit", :default => "Edit") %> <%= model_name %></h2>
     <div class="inner">
       <%%= render :partial => "form", :locals => { :url => <%= singular_controller_routing_path %>_path(@<%= resource_name %>) } %>
     </div>
   </div>
 </div>
 
-<%% content_for :sidebar, render(:partial => 'sidebar') -%>
+<%% content_for :sidebar, render(:partial => 'shared/sidebar') -%>

data/lib/generators/activoate/activoated/templates/view_form.html.erb

@@ -7,7 +7,7 @@
 	  </div>
 	<%- end -%>
 	<div class="group navform wat-cf">
-	  <%%= submit_button t("activoated.save", :default => "Save"), 'tick' %>
+	  <%%= submit_button t("activoate.save", :default => "Save"), 'tick' %>
 		<%%= cancel_button <%= controller_routing_path %>_path %>
 	</div>
 <%% end -%>

data/lib/generators/activoate/activoated/templates/view_form_formtastic.html.erb

@@ -6,7 +6,7 @@
   <%% end %>
 
   <div class="group navform wat-cf">
-		<%%= submit_button t("activoated.save", :default => "Save"), 'tick' %>
+		<%%= submit_button t("activoate.save", :default => "Save"), 'tick' %>
 		<%%= cancel_button <%= controller_routing_path %>_path %>
   </div>
 <%% end %>

data/lib/generators/activoate/activoated/templates/view_new.html.erb

@@ -1,16 +1,16 @@
 <div class="block">
   <div class="secondary-navigation">
     <ul class="wat-cf">
-      <li class="first"><%%= link_to "#{t("activoated.list", :default => "List")}", <%= controller_routing_path %>_path  %></li>
-      <li class="active"><%%= link_to "#{t("activoated.new", :default => "New")}", new_<%= singular_controller_routing_path %>_path %></li>
+      <li class="first"><%%= link_to "#{t("activoate.list", :default => "List")}", <%= controller_routing_path %>_path  %></li>
+      <li class="active"><%%= link_to "#{t("activoate.new", :default => "New")}", new_<%= singular_controller_routing_path %>_path %></li>
     </ul>
   </div>          
   <div class="content">            
-    <h2 class="title"><%%= t("activoated.new", :default => "New")%>  <%= model_name %></h2>
+    <h2 class="title"><%%= t("activoate.new", :default => "New")%>  <%= model_name %></h2>
     <div class="inner">
       <%%= render :partial => "form", :locals => { :url => <%= controller_routing_path %>_path } %>
     </div>
   </div>
 </div>
 
-<%% content_for :sidebar, render(:partial => 'sidebar') -%>
+<%% content_for :sidebar, render(:partial => 'shared/sidebar') -%>

data/lib/generators/activoate/activoated/templates/view_show.html.erb

@@ -1,13 +1,13 @@
 <div class="block">
   <div class="secondary-navigation">
     <ul class="wat-cf">
-      <li class="first"><%%= link_to "#{t("activoated.list", :default => "List")}", <%= controller_routing_path %>_path  %></li>
-      <li><%%= link_to "#{t("activoated.new", :default => "New")}", new_<%= singular_controller_routing_path %>_path %></li>
-      <li class="active"><%%= link_to "#{t("activoated.show", :default => "Show")}", <%= singular_controller_routing_path %>_path %></li>
+      <li class="first"><%%= link_to "#{t("activoate.list", :default => "List")}", <%= controller_routing_path %>_path  %></li>
+      <li><%%= link_to "#{t("activoate.new", :default => "New")}", new_<%= singular_controller_routing_path %>_path %></li>
+      <li class="active"><%%= link_to "#{t("activoate.show", :default => "Show")}", <%= singular_controller_routing_path %>_path %></li>
     </ul>
   </div>
   <div class="content">
-    <h2 class="title"><%%= t("activoated.show", :default => "Show")%>  <%= model_name %></h2>
+    <h2 class="title"><%%= t("activoate.show", :default => "Show")%>  <%= model_name %></h2>
 		<div class="inner">
       <% columns.each do |column| %>
         <p>
@@ -23,4 +23,4 @@
   </div>
 </div>
 
-<%% content_for :sidebar, render(:partial => 'sidebar') -%>
+<%% content_for :sidebar, render(:partial => 'shared/sidebar') -%>

data/lib/generators/activoate/activoated/templates/view_show_attrtastic.html.erb

@@ -1,18 +1,24 @@
 <div class="block">
   <div class="secondary-navigation">
     <ul class="wat-cf">
-      <li class="first"><%%= link_to "#{t("activoated.list", :default => "List")}", <%= controller_routing_path %>_path  %></li>
-      <li><%%= link_to "#{t("activoated.new", :default => "New")}", new_<%= singular_controller_routing_path %>_path %></li>
-      <li class="active"><%%= link_to "#{t("activoated.show", :default => "Show")}", <%= singular_controller_routing_path %>_path %></li>
+      <li class="first"><%%= link_to "#{t("activoate.list", :default => "List")}", <%= controller_routing_path %>_path  %></li>
+      <li><%%= link_to "#{t("activoate.new", :default => "New")}", new_<%= singular_controller_routing_path %>_path %></li>
+      <li class="active"><%%= link_to "#{t("activoate.show", :default => "Show")}", <%= singular_controller_routing_path %>_path %></li>
     </ul>
   </div>
   <div class="content">
-    <h2 class="title"><%%= t("activoated.show", :default => "Show")%>  <%= model_name %></h2>
+    <h2 class="title"><%%= t("activoate.show", :default => "Show")%>  <%= model_name %></h2>
     <div class="inner">
-			<%%= semantic_attributes_for @user do |attr| %>
+			<%%= semantic_attributes_for @<%= model_name.underscore %> do |attr| %>
 				<%%= attr.attributes do %>
 				<% columns.each do |column| %>
+					<% if column.type == :boolean %>
+					<%%= attr.attribute :<%= column.name %> do %>
+						<%%= @<%= model_name.underscore %>.<%= column.name %> ? t("activoate.yes", :default => "Yes") : t("activoate.no", :default => "No") %>
+					<%% end %>
+					<% else %>
 					<%%= attr.attribute :<%= column.name %> %>
+					<%- end -%>
 				<%- end %>
 				<%% end %>
 			<%% end %>
@@ -24,4 +30,4 @@
   </div>
 </div>
 
-<%% content_for :sidebar, render(:partial => 'sidebar') -%>
+<%% content_for :sidebar, render(:partial => 'shared/sidebar') -%>

data/lib/generators/activoate/activoated/templates/view_tables.html.erb

@@ -1,7 +1,7 @@
 <div class="block">
   <%%= secondary_navigation do |nav| %>
-		<%% nav.item t("activoated.list", :default => "List"), <%= controller_routing_path %>_path, :active => true %>
-		<%% nav.item t("activoated.new", :default => "New"), new_<%= singular_controller_routing_path %>_path %>
+		<%% nav.item t("activoate.list", :default => "List"), <%= controller_routing_path %>_path, :active => true %>
+		<%% nav.item t("activoate.new", :default => "New"), new_<%= singular_controller_routing_path %>_path %>
 	<%% end %>
   <div class="content">
 		<% if options.mass_destroy %>
@@ -9,7 +9,7 @@
       <%% c.item delete_button(users_path(@user), true) %>
 		<%% end %>
 		<%- end -%>
-    <h2 class="title"><%%= t("activoated.all", :default => "All")  %> <%= plural_model_name %></h2>
+    <h2 class="title"><%%= t("activoate.all", :default => "All")  %> <%= plural_model_name %></h2>
     <div class="inner">
       <table class="table">
         <tr>             
@@ -22,7 +22,7 @@
           <% unless columns.empty? -%>
           <th><%%= t("activerecord.attributes.<%= singular_controller_routing_path %>.<%= columns.first.name %>", :default => t("activerecord.labels.<%= columns.first.name %>", :default => "<%= columns.first.name.capitalize %>")) %></th>
           <% end -%>
-          <th><%%= t("activoated.created_at", :default => "Created at")  %></th>
+          <th><%%= t("activoate.created_at", :default => "Created at")  %></th>
           <th class="last">&nbsp;</th>
         </tr>
         <%% @<%= plural_resource_name %>.each do |<%= resource_name %>| -%>
@@ -38,11 +38,11 @@
           <% end -%>
           <td><%%= <%= resource_name %>.created_at %></td>
           <td class="last">
-            <%%= link_to "#{t("activoated.show", :default => "Show")}", <%= singular_controller_routing_path %>_path(<%= resource_name %>) %>
+            <%%= link_to "#{t("activoate.show", :default => "Show")}", <%= singular_controller_routing_path %>_path(<%= resource_name %>) %>
             |
-            <%%= link_to "#{t("activoated.edit", :default => "Edit")}", edit_<%= singular_controller_routing_path %>_path(<%= resource_name %>) %>
+            <%%= link_to "#{t("activoate.edit", :default => "Edit")}", edit_<%= singular_controller_routing_path %>_path(<%= resource_name %>) %>
             |
-            <%%= link_to "#{t("activoated.delete", :default => "Delete")}", <%= singular_controller_routing_path %>_path(<%= resource_name %>), :method => :delete, :confirm => "#{t("activoated.confirm", :default => "Are you sure?")}" %>
+            <%%= link_to "#{t("activoate.delete", :default => "Delete")}", <%= singular_controller_routing_path %>_path(<%= resource_name %>), :method => :delete, :confirm => "#{t("activoate.confirm", :default => "Are you sure?")}" %>
           </td>
         </tr>          
         <%% end -%>
@@ -58,4 +58,4 @@
   </div>
 </div>
 
-<%% content_for :sidebar, render(:partial => 'sidebar') -%>
+<%% content_for :sidebar, render(:partial => 'shared/sidebar') -%>

data/lib/generators/activoate/activoated/templates/view_text.html.erb

@@ -15,4 +15,4 @@
   </div>
 </div>
 
-<%% content_for :sidebar, render(:partial => 'sidebar') -%>
+<%% content_for :sidebar, render(:partial => 'shared/sidebar') -%>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activoate
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.5
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-12-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70288578976680 !ruby/object:Gem::Requirement
+  requirement: &70164905980620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70288578976680
+  version_requirements: *70164905980620
 description: Helps to use Activo 2 theme on Rails 3 applications and provides handy
   helpers and generators to use with formtastic/attrtastic
 email: