foldscaf 0.0.3 → 0.0.4

data/lib/generators/fold/templates/controller.erb

@@ -1,6 +1,8 @@
 class Admin::<%= @classes %>Controller < Admin::AdminController
-  <%= "include Sortable" if @con_orden %>
   load_and_authorize_resource
+<%- if @con_orden -%>
+  include Sortable
+<%- end -%>
 
   def index
     @<%= @singular %> = <%= @class %>.new
@@ -13,8 +15,9 @@ class Admin::<%= @classes %>Controller < Admin::AdminController
     @<%= @singular %> = <%= @class %>.new params[:<%= @singular %>]
     @<%= @singular %>.save!
     notice = mensaje
+
     respond_to do |format|
-      format.html { redirect_to <%= @plural_path %>, notice: mensaje }
+      format.html { redirect_to <%= @plural_path %>, notice: notice }
       format.js { @elemento = @<%= @singular %> }
     end
   end
@@ -31,8 +34,9 @@ class Admin::<%= @classes %>Controller < Admin::AdminController
     @id = @<%= @singular %>.id
     @<%= @singular %>.eliminar!
     notice = mensaje
+
     respond_to do |format|
-      format.html { redirect_to <%= @plural_path %>, notice: mensaje }
+      format.html { redirect_to <%= @plural_path %>, notice: notice }
       format.js
     end
   end
@@ -42,9 +46,11 @@ class Admin::<%= @classes %>Controller < Admin::AdminController
   def mensaje
     flash.now.notice = t("notice.#{action_name}")
   end
-  <%- if @con_orden -%>
+<%- if @con_orden -%>
+
   def sort_coleccion
     <%= @class %>.all
   end
-  <%- end -%>
+<%- end -%>
+
 end

data/lib/generators/fold/templates/migration.erb

@@ -2,17 +2,17 @@ class Create<%= @classes %> < ActiveRecord::Migration
   def change
     create_table :<%= @plural %> do |t|
       <%- @atributos.each do |a| -%>
-      t.<%= a.clase %> :<%= a.nombre %> <%= ", :default => #{a.default}" if (a.default && a.ejemplo) %>
+      t.<%= a.clase %> :<%= a.nombre %><%= ", :default => #{a.default}" if (a.default && a.ejemplo) %>
       <%- end -%>
-        
+      
       <%- if @con_slug -%>
       t.string :slug
-      <%- end -%>    
+      <%- end -%>
       <%- if @con_orden -%>
       t.integer :orden
       <%- end -%>    
+
       t.boolean :es_activo, :default => true
-      
       t.timestamps
     end
     <%- if @con_slug -%>

data/lib/generators/fold/templates/model.erb

@@ -1,24 +1,16 @@
 class <%= @class %> < ActiveRecord::Base
-  <%= 'before_create :set_orden' if @con_orden %>
-  <%- if @con_slug -%>
+<%- if @con_slug -%>
   extend FriendlyId
-  friendly_id :<%= @identificador %>, use: :slugged
-  <%- end -%>
-  <%- atributos_con_referencia.each do |a| -%>
+  friendly_id
+<%- end -%>
+<%- atributos_con_referencia.each do |a| -%>
   belongs_to :<%= a.nombre %>
-  <%- end -%>
-   
+<%- end -%>
   default_scope where(:es_activo => true)<%= ".order('#{@plural}.orden')" if @con_orden %>
 
   def eliminar!
-    update_attributes :es_activo => false
+    update_attributes! :es_activo => false
   end
 
   alias_attribute :to_s, :<%= @identificador %>
-  <%- if @con_orden -%>  
-  private
-  def set_orden
-    self.orden = self.id
-  end
-  <%- end -%>
 end

data/lib/generators/fold/templates/views/_form.erb

@@ -1,6 +1,14 @@
-<%%= simple_form_for <%= @singular %>, :url => url, :html => { :class => 'form-vertical' } do |f| %>
+<div class="page-header">
+  <h1><%= @classes %></h1>
+</div>
+
+<%%= simple_form_for <%= @singular %>, :url => url, :html => { :class => 'form-horizontal' } do |f| %>
 <%- @atributos.each do |a| -%>
   <%%= f.<%= a.clase == :references ? :association : :input %> :<%= a.nombre %> %>
 <%- end -%>
-  <div class="controls"><%%= f.button :submit, :name => nil, :disable_with => t("espere") %></div>
-<%%- end -%>
+
+  <div class="controls">
+    <%%= f.button :submit, :name => nil, :disable_with => t("espere"), :class => 'btn btn-primary' %>
+    <%%= link_to "Cancelar", <%= @plural_path %>, :class => 'btn' %>
+  </div>
+<%% end %>

data/lib/generators/fold/templates/views/_mini_form.erb

@@ -1,4 +1,4 @@
 <%%= mini_form_for <%= @singular %>, :url => url, :remote => true do |f| %>
-  <%%= f.input :<%= @identificador %>, :placeholder => '<%= @identificador %>' %>
-  <%%= f.button :submit, :name => nil, :disable_with => t("espere") %>
-<%%- end -%>
+  <%%= f.input :<%= @identificador %>, :placeholder => '<%= @identificador.humanize %>' %>
+  <%%= f.button :submit, :name => nil, :disable_with => t("espere"), :class => 'btn btn-primary' %>
+<%% end %>

data/lib/generators/fold/templates/views/edit.erb

@@ -1,5 +1 @@
-<div class="page-header">
-  <h1>Editar <%= @singular %></h1>
-</div>
-<%%= link_to "Volver", <%=  @plural_path %> %> 
-<%%= render "form", :<%= @singular %> => @<%= @singular %>, :url => <%=  @singular_path %>(@<%= @singular %>)%>
+<%%= render "form", :<%= @singular %> => @<%= @singular %>, :url => <%=  @singular_path %>(@<%= @singular %>) %>

data/lib/generators/fold/templates/views/index.erb

@@ -3,17 +3,17 @@
 </div>
 
 <nav class="well">
-  <button class="btn" data-toggle="collapse" data-target="#mini"><%%= icono('zoom-in') %> Mostrar formulario</button>
-  <%%= link_to icono('plus', :blanco)+" Agregar <%= @singular %> ", <%= @new_path %>, :class => 'btn btn-primary' %>
+  <%%= button_tag icono('zoom-in') + " Mostrar formulario", :class => :btn, :data => { :toggle => :collapse, :target => '#mini'} %>
+  <%%= link_to icono('plus', :blanco) + " Agregar <%= @singular %>", <%= @new_path %>, :class => 'btn btn-primary' %>
 </nav>
 
 <%%= render "mini_form", :<%= @singular %> => @<%= @singular %>, :url => <%= @plural_path %> %>
 
-<table id="ordenable" class="table table-striped ordenable">
-  <%%= thead(:<%= @identificador %>) %>
-  <tbody>
-    <%%= render @<%= @plural %> %>
-  </tbody>
-</table>
+<%%= content_tag :table, :id => :listado, :class => [:table, :"table-striped", :ordenable] do %>
+  <%%= thead :<%= @identificador %> %>
+  <%%= content_tag :tbody, render(@<%= @plural %>) %>
+<%% end %>
 
-<%= "<%= hidden_field_tag :url, #{@reordenar_path} , :class => :url %\>" if @con_orden %>
+<%- if @con_orden -%>
+<%%= hidden_field_tag :url, <%= @reordenar_path %>, :class => :url %>
+<%- end -%>

data/lib/generators/fold/templates/views/new.erb

@@ -1,5 +1 @@
-<div class="page-header">
-  <h1>Crear <%= @singular %></h1>
-</div>
-<%%= link_to "Volver", <%=  @plural_path %> %> 
-<%%= render "form", :<%= @singular %> => @<%= @singular %>, :url => <%=  @plural_path %> %>
+<%%= render "form", :<%= @singular %> => @<%= @singular %>, :url => <%=  @plural_path %> %>

data/lib/generators/fold/templates/views/nombre.erb

@@ -1,9 +1,10 @@
-<%%- clase ||= 'elemento' -%>
-<%%= content_tag :tr, :class => clase, :id => "elementos_#{<%= @singular %>.id}" do %>
+<%%= content_tag :tr, :id => "elementos_#{<%= @singular %>.id}" do %>
   <td><%%= <%= @singular %>.<%= @identificador %> %></td>
-  <td style="text-align:right"> 
-  <%= "<%= content_tag :i, '',:class => 'handle icon-move', :title => 'Mantenga click y arrastre para reordenar' %\>" if @con_orden %>
-  <%%= link_to 'Editar'  , <%= @edit_path %>(<%= @singular %>), :class => 'btn btn-mini' if can? :editar, <%= @singular %> %>
-  <%%= link_to "Eliminar", <%= @singular_path %>(<%= @singular %>), :method => :delete, :confirm => t("confirmacion"), :remote => true, :class => 'btn btn-mini btn-danger' %>
+  <td>
+<%- if @con_orden -%>
+    <%%= content_tag :i, '', :class => [:handle, :"icon-move"], :title => 'Mantenga click y arrastre para reordenar' %>
+<%- end -%>
+    <%%= link_to 'Editar', <%= @edit_path %>(<%= @singular %>), :class => 'btn btn-mini' if can? :editar, <%= @singular %> %>
+    <%%= link_to "Eliminar", <%= @singular_path %>(<%= @singular %>), :method => :delete, :confirm => t("confirmacion"), :remote => true, :class => 'btn btn-mini btn-danger' if can? :destroy, <%= @singular %> %>
   </td>
-<%% end %> 
+<%% end %>

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Foldscaf
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foldscaf
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-10 00:00:00.000000000 Z
+date: 2012-03-20 00:00:00.000000000 Z
 dependencies: []
 description: Generadores adaptados a las necesidades de Xaver
 email: