Merge branch 'master' of git://github.com/pilu/web-app-theme

gravityblast · Oct 10, 2011 · c7078ba · c7078ba
2 parents 813439b + 18b9c7c
commit c7078ba
Show file tree

Hide file tree

Showing 11 changed files with 51 additions and 36 deletions.
diff --git a/config/locales/es.yml b/config/locales/es.yml
@@ -0,0 +1,15 @@
+es:
+  web-app-theme:
+    save: Guardar
+    cancel: Cancelar
+    list: Lista
+    edit: Editar
+    new: Nuevo
+    show: Mostrar
+    delete: Borrar
+    confirm: "¿Estás seguro?"
+    created_at: Creado el
+    all: Todos
+    profile: Perfil
+    settings: "Configuración"
+    logout: Salir
diff --git a/lib/generators/web_app_theme/theme/templates/layout_admin.html.erb b/lib/generators/web_app_theme/theme/templates/layout_admin.html.erb
@@ -20,7 +20,7 @@
       <div id="main-navigation">
         <ul class="wat-cf"></ul>
       </div>
-    </div>    
+    </div>
     <div id="wrapper" class="wat-cf">
       <div class="flash">
         <%% flash.each do |type, message| -%>
@@ -34,13 +34,13 @@
         <div id="footer">
           <div class="block">
             <p>Copyright &copy; <%%= Time.now.year %> <%= options.app_name %>.</p>
-          </div>      
+          </div>
         </div>
       </div>
       <div id="sidebar">
         <%%= yield :sidebar %>
       </div>
-    </div>    
+    </div>
   </div>
 </body>
 </html>
diff --git a/lib/generators/web_app_theme/theme/templates/layout_sign.html.erb b/lib/generators/web_app_theme/theme/templates/layout_sign.html.erb
@@ -8,7 +8,7 @@
 <body>
   <div id="container">
     <div id="box">
-      <%%= yield %>            
+      <%%= yield %>
     </div>
   </div>
 </body>

diff --git a/lib/generators/web_app_theme/themed/templates/view_edit.html.erb b/lib/generators/web_app_theme/themed/templates/view_edit.html.erb
@@ -5,8 +5,8 @@
       <li><%%= link_to "#{t("web-app-theme.new", :default => "New")}", new_<%= singular_controller_routing_path %>_path %></li>
       <li class="active"><%%= link_to "#{t("web-app-theme.edit", :default => "Edit")}", edit_<%= singular_controller_routing_path %>_path %></li>
     </ul>
-  </div>          
-  <div class="content">            
+  </div>
+  <div class="content">
     <h2 class="title"><%%= t("web-app-theme.edit", :default => "Edit") %> <%= model_name %></h2>
     <div class="inner">
       <%%= form_for @<%= model_name.underscore  %>, :url => <%= singular_controller_routing_path %>_path(@<%= resource_name %>), :html => { :class => :form } do |f| -%>
@@ -16,4 +16,4 @@
   </div>
 </div>
 
-<%% content_for :sidebar, render(:partial => 'sidebar') -%>
+<%% content_for :sidebar, render(:partial => 'sidebar') -%>
diff --git a/lib/generators/web_app_theme/themed/templates/view_form.html.erb b/lib/generators/web_app_theme/themed/templates/view_form.html.erb
@@ -4,11 +4,11 @@
     <%%= f.<%= column.field_type %> :<%= column.name %>, :class => '<%= column.field_type %>' %>
     <span class="description">Ex: a simple text</span>
   </div>
-<%- end -%>        
+<%- end -%>
 <div class="group navform wat-cf">
   <button class="button" type="submit">
     <%%= image_tag("web-app-theme/icons/tick.png", :alt => "#{t("web-app-theme.save", :default => "Save")}") %> <%%= t("web-app-theme.save", :default => "Save") %>
   </button>
   <span class="text_button_padding"><%%= t("web-app-theme.or", :default => "or") %></span>
 	<%%= link_to t("web-app-theme.cancel", :default => "Cancel"), <%= controller_routing_path %>_path, :class => "text_button_padding link_button" %>
-</div>
+</div>
diff --git a/lib/generators/web_app_theme/themed/templates/view_new.html.erb b/lib/generators/web_app_theme/themed/templates/view_new.html.erb
@@ -4,8 +4,8 @@
       <li class="first"><%%= link_to "#{t("web-app-theme.list", :default => "List")}", <%= controller_routing_path %>_path  %></li>
       <li class="active"><%%= link_to "#{t("web-app-theme.new", :default => "New")}", new_<%= singular_controller_routing_path %>_path %></li>
     </ul>
-  </div>          
-  <div class="content">            
+  </div>
+  <div class="content">
     <h2 class="title"><%%= t("web-app-theme.new", :default => "New")%>  <%= model_name %></h2>
     <div class="inner">
       <%%= form_for :<%= model_name.underscore  %>, :url => <%= controller_routing_path %>_path, :html => { :class => :form } do |f| -%>
@@ -15,4 +15,4 @@
   </div>
 </div>
 
-<%% content_for :sidebar, render(:partial => 'sidebar') -%>
+<%% content_for :sidebar, render(:partial => 'sidebar') -%>
diff --git a/lib/generators/web_app_theme/themed/templates/view_show.html.erb b/lib/generators/web_app_theme/themed/templates/view_show.html.erb
@@ -5,7 +5,7 @@
       <li><%%= link_to "#{t("web-app-theme.new", :default => "New")}", new_<%= singular_controller_routing_path %>_path %></li>
       <li class="active"><%%= link_to "#{t("web-app-theme.show", :default => "Show")}", <%= singular_controller_routing_path %>_path %></li>
     </ul>
-  </div>          
+  </div>
   <div class="content">
     <div class="inner">
       <% columns.each do |column| %>
@@ -15,11 +15,11 @@
         </p>
       <%- end -%>
       <div class="wat-cf">
-        <%%= link_to image_tag("web-app-theme/icons/application_edit.png", :alt => "#{t("web-app-theme.edit", :default=> "Edit")}") + " " + t("web-app-theme.edit", :default=> "Edit"), edit_<%= singular_controller_routing_path %>_path(@<%= resource_name %>), :class => "button" %> 
+        <%%= link_to image_tag("web-app-theme/icons/application_edit.png", :alt => "#{t("web-app-theme.edit", :default=> "Edit")}") + " " + t("web-app-theme.edit", :default=> "Edit"), edit_<%= singular_controller_routing_path %>_path(@<%= resource_name %>), :class => "button" %>
         <%%= link_to image_tag("web-app-theme/icons/cross.png", :alt => "#{t("web-app-theme.delete", :default=> "Delete")}") + " " + t("web-app-theme.delete", :default => "Delete"), <%= singular_controller_routing_path %>_path(@<%= resource_name %>), :method => "delete", :class => "button", :confirm => "#{t("web-app-theme.confirm", :default => "Are you sure?")}" %>
-      </div>      
+      </div>
     </div>
   </div>
 </div>
 
-<%% content_for :sidebar, render(:partial => 'sidebar') -%>
+<%% content_for :sidebar, render(:partial => 'sidebar') -%>
diff --git a/lib/generators/web_app_theme/themed/templates/view_signin.html.erb b/lib/generators/web_app_theme/themed/templates/view_signin.html.erb
@@ -1,6 +1,6 @@
 <h1><%= options[:app_name] %></h1>
 <div class="block" id="block-login">
-  <h2>Login Box</h2>        
+  <h2>Login Box</h2>
   <div class="content login">
     <div class="flash">
       <%% flash.each do |type, message| -%>
@@ -16,21 +16,21 @@
         </div>
         <div class="right">
           <%%= text_field_tag :login, @login, :class => 'text_field' %>
-        </div>              
+        </div>
       </div>
       <div class="group wat-cf">
         <div class="left">
           <label class="label right">Password</label>
         </div>
         <div class="right">
           <%%= password_field_tag :password, nil, :class => 'text_field' %>
-        </div>              
+        </div>
       </div>
       <div class="group navform wat-cf">
         <div class="right">
           <input type="submit" class="button" value="Sign in" />
         </div>
-      </div>            
+      </div>
     <%% end -%>
   </div>
-</div>
+</div>
diff --git a/lib/generators/web_app_theme/themed/templates/view_signup.html.erb b/lib/generators/web_app_theme/themed/templates/view_signup.html.erb
@@ -1,6 +1,6 @@
 <h1><%= options[:app_name] %></h1>
 <div class="block" id="block-signup">
-  <h2>Sign up</h2>        
+  <h2>Sign up</h2>
   <div class="content">
     <div class="flash">
       <%% flash.each do |type, message| -%>
@@ -16,37 +16,37 @@
         </div>
         <div class="right">
           <%%= f.text_field :login, :class => 'text_field' %>
-        </div>              
+        </div>
       </div>
       <div class="group wat-cf">
         <div class="left">
-          <label class="label">Email</label>                
+          <label class="label">Email</label>
         </div>
         <div class="right">
           <%%= f.text_field :email, :class => 'text_field' %>
-        </div>              
+        </div>
       </div>
       <div class="group wat-cf">
         <div class="left">
           <label class="label">Password</label>
         </div>
         <div class="right">
           <%%= f.password_field :password, :class => 'text_field' %>
-        </div>              
+        </div>
       </div>
-      
+
       <div class="group">
         <div class="left wat-cf">
           <label class="label">Password</label>
         </div>
         <div class="right">
           <%%= f.password_field :password_confirmation, :class => 'text_field' %>
-        </div>              
+        </div>
       </div>
-      
+
       <div class="group navform">
         <input type="submit" class="button" value="Sign up" />
       </div>
     <%% end -%>
   </div>
-</div>
+</div>
diff --git a/lib/generators/web_app_theme/themed/templates/view_tables.html.erb b/lib/generators/web_app_theme/themed/templates/view_tables.html.erb
@@ -4,12 +4,12 @@
       <li class="first active"><%%= link_to "#{t("web-app-theme.list", :default => "List")}", <%= controller_routing_path %>_path  %></li>
       <li><%%= link_to "#{t("web-app-theme.new", :default => "New")}", new_<%= singular_controller_routing_path %>_path %></li>
     </ul>
-  </div>          
-  <div class="content">          
+  </div>
+  <div class="content">
     <h2 class="title"><%%= t("web-app-theme.all", :default => "All")  %> <%= plural_model_name %></h2>
     <div class="inner">
       <table class="table">
-        <tr>             
+        <tr>
           <th class="first">ID</th>
           <% unless columns.empty? -%>
           <th>
@@ -37,7 +37,7 @@
             <%%= link_to "#{t("web-app-theme.edit", :default => "Edit")}", edit_<%= singular_controller_routing_path %>_path(<%= resource_name %>) %> |
             <%%= link_to "#{t("web-app-theme.delete", :default => "Delete")}", <%= singular_controller_routing_path %>_path(<%= resource_name %>), :method => :delete, :confirm => "#{t("web-app-theme.confirm", :default => "Are you sure?")}" %>
           </td>
-        </tr>          
+        </tr>
         <%% end -%>
       </table>
       <div class="actions-bar wat-cf">

diff --git a/lib/generators/web_app_theme/themed/templates/view_text.html.erb b/lib/generators/web_app_theme/themed/templates/view_text.html.erb
@@ -1,4 +1,4 @@
-<div class="block" id="block-text">  
+<div class="block" id="block-text">
   <div class="content">
     <h2 class="title"><%= resource_name.capitalize %></h2>
     <div class="inner">
@@ -15,4 +15,4 @@
   </div>
 </div>
 
-<%% content_for :sidebar, render(:partial => 'sidebar') -%>
+<%% content_for :sidebar, render(:partial => 'sidebar') -%>