web-app-theme 0.4.0 → 0.5.0

data/README.md

@@ -85,6 +85,21 @@ If you want to show form error messages inside the generated forms, use the foll
       end
     end
 
+If you want to have translated pages, simple create in your locale.yml the keys just like config/locales/en_us.yml example.
+	en_us:
+	  web-app-theme: 
+	    save: Save
+	    cancel: Cancel
+	    list: List
+	    edit: Edit
+	    new: New
+	    show: Show
+	    delete: Delete
+	    confirm: Are you sure?
+	    created_at: Created at
+	    all: All
+
+
 ![Web App Theme screenshot](http://img.skitch.com/20091109-c2k618qerx1ysw5ytxsighuf3f.jpg)
 
 Contributing
@@ -100,8 +115,10 @@ Links
 -----
 
 * Repository: git://github.com/pilu/web-app-theme.git
+* List: <http://groups.google.com/group/web-app-theme-generator>
 * Issues: <http://github.com/pilu/web-app-theme/issues>
 * Gem: <http://gemcutter.org/gems/web-app-theme>
+* Themes: <http://pilu.github.com/web-app-theme>
 
 Author
 ------
@@ -109,7 +126,7 @@ Author
 Andrea Franz - [http://gravityblast.com](http://gravityblast.com)
 
 Contributors
----
+------------
 
 * Nelson Fernandez
 * Giovanni Intini
@@ -121,4 +138,12 @@ Contributors
 * Garret Alfert
 * Mikkel Hoegh
 * Juan Maria Martinez Arce
-* Stas SUSHKOV
+* Stas SUSHKOV
+* Daniel Cukier
+* Roberto Klein
+
+Credits
+-------
+
+* Icons: FAMFAMFAM Silk icons <http://www.famfamfam.com/lab/icons/silk/>
+* Buttons: Particletree - Rediscovering the Button Element <http://particletree.com/features/rediscovering-the-button-element/>

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.5.0

data/config/locales/de_de.yml

@@ -0,0 +1,15 @@
+de:
+  web-app-theme:
+    save: Speichern
+    cancel: Abbrechen
+    list: Liste
+    edit: Bearbeiten
+    new: Neu
+    show: Anzeigen
+    delete: Löschen
+    confirm: Sind Sie sicher?
+    created_at: Erstellt am
+    all: Alle
+    profile: Benutzerkonto
+    settings: Einstellungen
+    logout: Abmelden

data/config/locales/pt_br.yml

@@ -0,0 +1,12 @@
+pt_br:
+  web-app-theme: 
+    save: Salvar
+    cancel: Cancelar
+    list: Listar
+    edit: Alterar
+    new: Novo
+    show: Exibir
+    delete: Excluir
+    confirm: Você tem certeza?
+    created_at: Criado em
+    all: Lista de

data/features/step_definitions/layout_steps.rb

@@ -30,6 +30,10 @@ Then /^I should have a stylesheet named "([^\"]*)"$/ do |filename|
   stylesheet_exists?(filename).should be_true    
 end
 
+Then /^I should have an image named "([^\"]*)"$/ do |filename|
+  image_exists?(filename).should be_true    
+end
+
 Given /^I generate a theme without layout choosing the "([^\"]*)" theme$/ do |theme_name|
   generate_layout(:theme => theme_name, :no_layout => true )
 end

data/features/support/env.rb

@@ -58,6 +58,10 @@ module GeneratorHelpers
     File.exists?(File.join(@app_root, "app", "views", view_path))
   end
   
+  def image_exists?(image_path)
+    File.exists?(File.join(@app_root, "public", "images", image_path))
+  end
+  
   def stylesheet_exists?(relative_path)
     File.exists?(File.join(@app_root, "public", "stylesheets", relative_path)).should be_true
   end

data/features/theme_generator.feature

@@ -12,6 +12,10 @@ Feature: Layout generation
     And I should have a stylesheet named "web_app_theme.css"
     And I should have a stylesheet named "web_app_theme_override.css"
     And I should have a stylesheet named "themes/default/style.css"
+    And I should have an image named "web-app-theme/cross.png"
+    And I should have an image named "web-app-theme/key.png"
+    And I should have an image named "web-app-theme/tick.png"
+    And I should have an image named "web-app-theme/application_edit.png"
   
   # script/generate theme admin
   Scenario: Generate a layout with a name

data/index.html

@@ -48,29 +48,27 @@
     <div id="header">
       <h1><a href="index.html">Web App Theme</a></h1>
       <div id="user-navigation">
-        <ul>
+        <ul class="wat-cf">
           <li><a href="#">Profile</a></li>
           <li><a href="#">Settings</a></li>
           <li><a class="logout" href="#">Logout</a></li>
         </ul>
-        <div class="clear"></div>
       </div>
       <div id="main-navigation">
-        <ul>
+        <ul class="wat-cf">
           <li class="first"><a href="#block-text">Main Page</a></li>
           <li class="active"><a href="#block-text">Active</a></li>
           <li><a href="#block-login">Login</a></li>
           <li><a href="#block-signup">Signup</a></li>
         </ul>
-        <div class="clear"></div>
       </div>
     </div>
-    <div id="wrapper">
+    <div id="wrapper" class="wat-cf">
       <div id="main">
 
         <div class="block" id="block-text">
           <div class="secondary-navigation">
-            <ul>
+            <ul class="wat-cf">
               <li class="active first"><a href="#block-text">Text</a></li>
               <li><a href="#block-tables">Tables</a></li>
               <li><a href="#block-forms">Forms</a></li>
@@ -78,7 +76,6 @@
               <li><a href="#block-forms-2">2 Columns Forms</a></li>
               <li><a href="#block-lists">Lists</a></li>
             </ul>
-            <div class="clear"></div>
           </div>
           <div class="content">
             <h2 class="title">Text</h2>
@@ -98,7 +95,7 @@
 
         <div class="block" id="block-tables">
           <div class="secondary-navigation">
-            <ul>
+            <ul class="wat-cf">
               <li class="first"><a href="#block-text">Text</a></li>
               <li class="active"><a href="#block-tables">Tables</a></li>
               <li><a href="#block-forms">Forms</a></li>
@@ -106,7 +103,6 @@
               <li><a href="#block-forms-2">2 Columns Forms</a></li>
               <li><a href="#block-lists">Lists</a></li>
             </ul>
-            <div class="clear"></div>
           </div>
           <div class="content">
             <h2 class="title">Tables</h2>
@@ -134,14 +130,15 @@
                     <td><input type="checkbox" class="checkbox" name="id" value="1" /></td><td>4</td><td>machoman</td><td>Macho Man</td><td>Randy Savage</td><td class="last"><a href="#">show</a> | <a href="#">edit</a> | <a href="#">destroy</a></td>
                   </tr>
                 </table>
-                <div class="actions-bar">
+                <div class="actions-bar wat-cf">
                   <div class="actions">
-                    <input type="submit" class="button" value="Delete" />
+                    <button class="button" type="submit">
+                      <img src="images/icons/cross.png" alt="Delete" /> Delete
+                    </button>
                   </div>
                   <div class="pagination">
                     <span class="disabled prev_page">« Previous</span><span class="current">1</span><a rel="next" href="#">2</a><a href="#">3</a><a href="#">4</a><a href="#">5</a><a href="#">6</a><a href="#">7</a><a href="#">8</a><a href="#">9</a><a href="#">10</a><a href="#">11</a><a rel="next" class="next_page" href="#">Next »</a>
                   </div>
-                  <div class="clear"></div>
                 </div>
               </form>
             </div>
@@ -150,7 +147,7 @@
 
         <div class="block" id="block-forms">
           <div class="secondary-navigation">
-            <ul>
+            <ul class="wat-cf">
               <li class="first"><a href="#block-text">Text</a></li>
               <li><a href="#block-tables">Tables</a></li>
               <li class="active"><a href="#block-forms">Forms</a></li>
@@ -158,7 +155,6 @@
               <li><a href="#block-forms-2">2 Columns Forms</a></li>
               <li><a href="#block-lists">Lists</a></li>
             </ul>
-            <div class="clear"></div>
           </div>
           <div class="content">
             <h2 class="title">Forms</h2>
@@ -182,8 +178,13 @@
                   <textarea class="text_area" rows="10" cols="80"></textarea>
                   <span class="description">Write here a long text</span>
                 </div>
-                <div class="group navform">
-                  <input type="submit" class="button" value="Save &rarr;" /> or <a href="#header">Cancel</a>
+                <div class="group navform wat-cf">
+                  <button class="button" type="submit">
+                    <img src="images/icons/tick.png" alt="Save" /> Save
+                  </button>
+                  <a href="#header" class="button">
+                    <img src="images/icons/cross.png" alt="Cancel"/> Cancel
+                  </a>
                 </div>
               </form>
             </div>
@@ -192,7 +193,7 @@
 
         <div class="block" id="block-messages">
           <div class="secondary-navigation">
-            <ul>
+            <ul class="wat-cf">
               <li class="first"><a href="#block-text">Text</a></li>
               <li><a href="#block-tables">Tables</a></li>
               <li><a href="#block-forms">Forms</a></li>
@@ -200,7 +201,6 @@
               <li><a href="#block-forms-2">2 Columns Forms</a></li>
               <li><a href="#block-lists">Lists</a></li>
             </ul>
-            <div class="clear"></div>
           </div>
           <div class="content">
             <h2 class="title">Messages</h2>
@@ -222,7 +222,7 @@
 
         <div class="block" id="block-forms-2">
           <div class="secondary-navigation">
-            <ul>
+            <ul class="wat-cf">
               <li class="first"><a href="#block-text">Text</a></li>
               <li><a href="#block-tables">Tables</a></li>
               <li><a href="#block-forms">Forms</a></li>
@@ -230,13 +230,12 @@
               <li class="active"><a href="#block-forms-2">2 Columns Forms</a></li>
               <li><a href="#block-lists">Lists</a></li>
             </ul>
-            <div class="clear"></div>
           </div>
           <div class="content">
             <h2 class="title">2 columns forms</h2>
             <div class="inner">
               <form action="#" method="get" class="form">
-                <div class="columns">
+                <div class="columns wat-cf">
                   <div class="column left">
                     <div class="group">
                       <label class="label">Text field</label>
@@ -272,9 +271,13 @@
                     </div>
                   </div>
                 </div>
-                <div class="clear"></div>
-                <div class="group navform">
-                  <input type="submit" class="button" value="Save &rarr;" /> or <a href="#">Cancel</a>
+                <div class="group navform wat-cf">
+                  <button class="button" type="submit">
+                    <img src="images/icons/tick.png" alt="Save" /> Save
+                  </button>
+                  <a href="#header" class="button">
+                    <img src="images/icons/cross.png" alt="Cancel"/> Cancel
+                  </a>
                 </div>
               </form>
             </div>
@@ -283,7 +286,7 @@
 
         <div class="block" id="block-lists">
           <div class="secondary-navigation">
-            <ul>
+            <ul class="wat-cf">
               <li class="first"><a href="#block-text">Text</a></li>
               <li><a href="#block-tables">Tables</a></li>
               <li><a href="#block-forms">Forms</a></li>
@@ -291,7 +294,6 @@
               <li><a href="#block-forms-2">2 Columns Forms</a></li>
               <li class="active"><a href="#block-lists">Lists</a></li>
             </ul>
-            <div class="clear"></div>
           </div>
           <div class="content">
             <h2 class="title">Lists</h2>
@@ -375,7 +377,6 @@
           </div>
         </div>
       </div>
-      <div class="clear"></div>
     </div>
     <div id="box">
       <h1>Web App Theme</h1>
@@ -388,29 +389,28 @@
             </div>
           </div>
           <form action="#" class="form login">
-            <div class="group">
+            <div class="group wat-cf">
               <div class="left">
                 <label class="label right">Login</label>
               </div>
               <div class="right">
                 <input type="text" class="text_field" />
               </div>
-              <div class="clear"></div>
             </div>
-            <div class="group">
+            <div class="group wat-cf">
               <div class="left">
                 <label class="label right">Password</label>
               </div>
               <div class="right">
                 <input type="password" class="text_field" />
               </div>
-              <div class="clear"></div>
             </div>
-            <div class="group navform">
+            <div class="group navform wat-cf">
               <div class="right">
-                <input type="submit" class="button" value="Login" />
+                <button class="button" type="submit">
+                  <img src="images/icons/key.png" alt="Save" /> Login
+                </button>
               </div>
-              <div class="clear"></div>
             </div>
           </form>
         </div>
@@ -420,7 +420,7 @@
         <h2>Sign up</h2>
         <div class="content">
           <form action="#" class="form">
-            <div class="group">
+            <div class="group wat-cf">
               <div class="left">
                 <label class="label">Login</label>
               </div>
@@ -428,9 +428,8 @@
                 <input type="text" class="text_field" />
                 <span class="description">Ex: web-app-theme</span>
               </div>
-              <div class="clear"></div>
             </div>
-            <div class="group">
+            <div class="group wat-cf">
               <div class="left">
                 <label class="label">Email</label>
               </div>
@@ -438,9 +437,8 @@
                 <input type="text" class="text_field" />
                 <span class="description">Ex: test@example.com</span>
               </div>
-              <div class="clear"></div>
             </div>
-            <div class="group">
+            <div class="group wat-cf">
               <div class="left">
                 <label class="label">Password</label>
               </div>
@@ -448,7 +446,6 @@
                 <input type="password" class="text_field" />
                 <span class="description">Must contains the word 'yeah'</span>
               </div>
-              <div class="clear"></div>
             </div>
 
             <div class="group">
@@ -461,8 +458,10 @@
               <input type="text" class="text_field" />
               <span class="description">Ex: a simple text</span>
             </div>
-            <div class="group navform">
-              <input type="submit" class="button" value="Sign up" />
+            <div class="group navform wat-cf">
+              <button class="button" type="submit">
+                <img src="images/icons/tick.png" alt="Save" /> Signup
+              </button>
             </div>
           </form>
         </div>

data/rails_generators/theme/templates/view_layout_administration.html.erb

@@ -3,26 +3,24 @@
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<title><%= options[:app_name] %></title>
-	<%%= stylesheet_link_tag 'web_app_theme', "themes/<%= options[:theme] %>/style" %>
+	<%%= stylesheet_link_tag "web_app_theme", "web_app_theme_override", "themes/<%= options[:theme] %>/style", :cache => true %>
 </head>
 <body>
   <div id="container">
     <div id="header">
       <h1><a href="/"><%= options[:app_name] %></a></h1>
       <div id="user-navigation">
-        <ul>
-          <li><a href="#">Profile</a></li>
-          <li><a href="#">Settings</a></li>
-          <li><a href="/logout" class="logout">Logout</a></li>
+        <ul class="wat-cf">
+          <li><a href="#"><%%= t("web-app-theme.profile", :default => "Profile") %></a></li>
+          <li><a href="#"><%%= t("web-app-theme.settings", :default => "Settings") %></a></li>
+          <li><a href="/logout" class="logout"><%%= t("web-app-theme.logout", :default => "Logout") %></a></li>
         </ul>
-        <div class="clear"></div>
       </div>      
       <div id="main-navigation">
-        <ul></ul>
-        <div class="clear"></div>
+        <ul class="wat-cf"></ul>
       </div>
     </div>    
-    <div id="wrapper">
+    <div id="wrapper" class="wat-cf">
       <div class="flash">
         <%% flash.each do |type, message| -%>
           <div class="message <%%= type %>">
@@ -41,7 +39,6 @@
       <div id="sidebar">
         <%%= yield :sidebar %>
       </div>
-      <div class="clear"></div>      
     </div>    
   </div>
 </body>

data/rails_generators/theme/theme_generator.rb

@@ -11,9 +11,13 @@ class ThemeGenerator < Rails::Generator::Base
   end
   
   def manifest
-    record do |m|            
+    record do |m|
       m.directory("app/views/layouts")
-      m.directory("public/stylesheets/themes/#{options[:theme]}/")      
+      m.directory("public/images/web-app-theme")      
+      %w(cross key tick application_edit).each do |icon|
+        m.file("../../../images/icons/#{icon}.png", "public/images/web-app-theme/#{icon}.png")
+      end            
+      m.directory("public/stylesheets/themes/#{options[:theme]}/")
       m.template("view_layout_#{options[:layout_type]}.html.erb", File.join("app/views/layouts", "#{@name}.html.erb")) unless options[:no_layout]
       m.template("../../../stylesheets/base.css",  File.join("public/stylesheets", "web_app_theme.css"))
       m.template("web_app_theme_override.css",  File.join("public/stylesheets", "web_app_theme_override.css"))

data/rails_generators/themed/templates/view_edit.html.erb

@@ -1,14 +1,13 @@
 <div class="block">
   <div class="secondary-navigation">
-    <ul>
-      <li class="first"><%%= link_to 'List', <%= controller_routing_path %>_path  %></li>
-      <li><%%= link_to 'New', new_<%= singular_controller_routing_path %>_path %></li>
-      <li class="active"><%%= link_to 'Edit', edit_<%= singular_controller_routing_path %>_path %></li>
+    <ul class="wat-cf">
+      <li class="first"><%%= 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>
+      <li class="active"><%%= link_to "#{t("web-app-theme.edit", :default => "Edit")}", edit_<%= singular_controller_routing_path %>_path %></li>
     </ul>
-    <div class="clear"></div>
   </div>          
   <div class="content">            
-    <h2 class="title">Edit <%= model_name %></h2>
+    <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| -%>
         <%%= render :partial => "form", :locals => {:f => f} %>

data/rails_generators/themed/templates/view_form.html.erb

@@ -1,10 +1,13 @@
 <% columns.each do |column| %>
   <div class="group">
-    <%%= f.label :<%= column.name %>, "<%= column.name.capitalize %>", :class => :label %>
+    <%%= f.label :<%= column.name.humanize %>, t("activerecord.attributes.<%= model_name.underscore %>.<%= column.name %>", :default => "<%= column.name.humanize %>"), :class => :label %>
     <%%= f.<%= column.field_type %> :<%= column.name %>, :class => '<%= column.field_type %>' %>
     <span class="description">Ex: a simple text</span>
   </div>
 <%- end -%>        
-<div class="group navform">
-  <input type="submit" class="button" value="Save &rarr;" /> or <%%= link_to 'Cancel', <%= controller_routing_path %>_path %>
+<div class="group navform wat-cf">
+  <button class="button" type="submit">
+    <%%= image_tag("web-app-theme/tick.png", :alt => "#{t("web-app-theme.save", :default => "Save")}") %> <%%= t("web-app-theme.save", :default => "Save") %>
+  </button>  
+  <%%= link_to "#{image_tag("web-app-theme/cross.png", :alt => "#{t("web-app-theme.cancel", :default => "Cancel")}")} #{t("web-app-theme.cancel", :default => "Cancel")}", <%= controller_routing_path %>_path, :class => "button" %> 
 </div>

data/rails_generators/themed/templates/view_new.html.erb

@@ -1,13 +1,12 @@
 <div class="block">
   <div class="secondary-navigation">
-    <ul>
-      <li class="first"><%%= link_to 'List', <%= controller_routing_path %>_path  %></li>
-      <li class="active"><%%= link_to 'New', new_<%= singular_controller_routing_path %>_path %></li>
+    <ul class="wat-cf">
+      <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 class="clear"></div>
   </div>          
   <div class="content">            
-    <h2 class="title">New <%= model_name %></h2>
+    <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| -%>
         <%%= render :partial => "form", :locals => {:f => f} %>

data/rails_generators/themed/templates/view_show.html.erb

@@ -1,21 +1,21 @@
 <div class="block">
   <div class="secondary-navigation">
-    <ul>
-      <li class="first"><%%= link_to 'List', <%= controller_routing_path %>_path  %></li>
-      <li><%%= link_to 'New', new_<%= singular_controller_routing_path %>_path %></li>
-      <li class="active"><%%= link_to 'Show', <%= singular_controller_routing_path %>_path %></li>
+    <ul class="wat-cf">
+      <li class="first"><%%= 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>
+      <li class="active"><%%= link_to "#{t("web-app-theme.show", :default => "Show")}", <%= singular_controller_routing_path %>_path %></li>
     </ul>
-    <div class="clear"></div>
   </div>          
   <div class="content">
     <div class="inner">
       <% columns.each do |column| %>
         <p>
-          <b><%= column.name.capitalize %>:</b>
+          <b><%%= t("activerecord.attributes.<%= singular_controller_routing_path %>.<%= column.name %>", :default => t("activerecord.labels.<%= column.name %>", :default => "<%= column.name.humanize %>")) %>:</b>
           <%%= @<%= resource_name %>.<%= column.name %> %>
         </p>
       <%- end -%>
-      <%%= link_to 'Edit', edit_<%= singular_controller_routing_path %>_path(@<%= resource_name %>) %>
+      <%%= link_to "#{image_tag("web-app-theme/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/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>

data/rails_generators/themed/templates/view_signin.html.erb

@@ -10,29 +10,26 @@
       <%% end -%>
     </div>
     <%% form_tag({:action => :create}, :class => 'form login') do -%>
-      <div class="group">
+      <div class="group wat-cf">
         <div class="left">
           <label class="label right">Login</label>
         </div>
         <div class="right">
           <%%= text_field_tag :login, @login, :class => 'text_field' %>
         </div>              
-        <div class="clear"></div>
       </div>
-      <div class="group">
+      <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 class="clear"></div>
       </div>
-      <div class="group navform">
+      <div class="group navform wat-cf">
         <div class="right">
           <input type="submit" class="button" value="Sign in" />
         </div>
-        <div class="clear"></div>
       </div>            
     <%% end -%>
   </div>

data/rails_generators/themed/templates/view_signup.html.erb

@@ -10,42 +10,38 @@
       <%% end -%>
     </div>
     <%% form_for :<%= resource_name %>, :url => <%= controller_routing_path %>_path, :html => { :class => 'form' } do |f| -%>
-      <div class="group">
+      <div class="group wat-cf">
         <div class="left">
           <label class="label">Login</label>
         </div>
         <div class="right">
           <%%= f.text_field :login, :class => 'text_field' %>
         </div>              
-        <div class="clear"></div>
       </div>
-      <div class="group">
+      <div class="group wat-cf">
         <div class="left">
           <label class="label">Email</label>                
         </div>
         <div class="right">
           <%%= f.text_field :email, :class => 'text_field' %>
         </div>              
-        <div class="clear"></div>
       </div>
-      <div class="group">
+      <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 class="clear"></div>
       </div>
       
       <div class="group">
-        <div class="left">
+        <div class="left wat-cf">
           <label class="label">Password</label>
         </div>
         <div class="right">
           <%%= f.password_field :password_confirmation, :class => 'text_field' %>
         </div>              
-        <div class="clear"></div>
       </div>
       
       <div class="group navform">

data/rails_generators/themed/templates/view_tables.html.erb

@@ -1,21 +1,22 @@
 <div class="block">
   <div class="secondary-navigation">
-    <ul>
-      <li class="first active"><%%= link_to 'List', <%= controller_routing_path %>_path %></li>
-      <li><%%= link_to 'New', new_<%= singular_controller_routing_path %>_path %></li>
+    <ul class="wat-cf">
+	    <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 class="clear"></div>
   </div>          
   <div class="content">          
-    <h2 class="title">All <%= plural_model_name %></h2>
+    <h2 class="title"><%%= t("web-app-theme.all", :default => "All")  %> <%= plural_model_name %></h2>
     <div class="inner">
       <table class="table">
         <tr>             
           <th class="first">ID</th>
 					<% unless columns.empty? -%>
-					<th><%= columns.first.name.capitalize %></th>
+					<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>Created at</th>
+          <th><%%= t("web-app-theme.created_at", :default => "Created at")  %></th>
           <th class="last">&nbsp;</th>
         </tr>
         <%% @<%= plural_resource_name %>.each do |<%= resource_name %>| -%>
@@ -32,20 +33,19 @@
             <%%= <%= resource_name %>.created_at %>
           </td>
           <td class="last">
-            <%%= link_to 'show', <%= singular_controller_routing_path %>_path(<%= resource_name %>) %> |
-            <%%= link_to 'edit', edit_<%= singular_controller_routing_path %>_path(<%= resource_name %>) %> |
-            <%%= link_to 'destroy', <%= singular_controller_routing_path %>_path(<%= resource_name %>), :method => :delete, :confirm => 'Are you sure?' %>
+            <%%= link_to "#{t("web-app-theme.show", :default => "Show")}", <%= singular_controller_routing_path %>_path(<%= resource_name %>) %> |
+            <%%= 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>          
         <%% end -%>
       </table>
-      <div class="actions-bar">
+      <div class="actions-bar wat-cf">
         <div class="actions">
         </div>
         <% if options[:will_paginate] %>
         <%%= will_paginate @<%= plural_resource_name %>  %>
         <% end %>
-        <div class="clear"></div>
       </div>
     </div>
   </div>

data/stylesheets/base.css

@@ -1,6 +1,21 @@
 * {margin:0;padding:0}
 .clear { clear: both; height: 0; }
 
+.wat-cf:after {
+     content: "."; 
+     display: block; 
+     height: 0; 
+     clear: both; 
+     visibility: hidden;
+}
+
+.wat-cf {display: inline-block;}
+
+/* Hides from IE-mac \*/
+* html .wat-cf {height: 1%;}
+.wat-cf {display: block;}
+/* End hide from IE-mac */
+
 h1 { margin: 15px 0; font-size: 22px; font-weight: normal; }
 h2 { font-size: 22px; margin: 15px 0; font-weight: normal;}
 h3 { font-size: 18px; margin: 10px 0; font-weight: normal;}
@@ -30,7 +45,7 @@ body {
 #header h1 {
   margin: 0;
   padding: 10px 0;  
-  font-size: 30px;
+  font-size: 26px;
 }
 
 #header h1 a:link, #header h1 a:active, #header h1 a:hover, #header h1 a:visited {
@@ -137,7 +152,8 @@ body {
 }
 
 #main-navigation ul li a {
-  font-size: 15px;
+  font-size: 14px;
+  line-height: 14px;
   display: block;
   padding: 8px 15px;
 }
@@ -333,4 +349,49 @@ ul.list li .item .avatar {
   padding: 10px 20px;
 }
 
+/*  Inspired by http://particletree.com/features/rediscovering-the-button-element */
+
+a.button:link, a.button:visited, a.button:hover, a.button:active, button.button {
+  color: #222;
+  display:block;
+  float:left;
+  margin:0 7px 0 0;
+  background-color: #eee;
+  border:1px solid #bfbfbf;
+  font-size: 1em;
+  line-height: 1.3em;
+  font-weight:bold;
+  cursor:pointer;
+  padding:5px 10px 6px 7px;
+  text-decoration: none;
+}
+
+button.button {
+  width:auto;
+  overflow:visible;
+  padding:4px 10px 3px 7px; /* IE6 */
+}
+button.button[type] {
+  padding:5px 10px 5px 7px; /* Firefox */
+  line-height:17px; /* Safari */
+}
+
+*:first-child+html button.button[type] {
+  padding:4px 10px 3px 7px; /* IE7 */
+}
+
+button.button img, a.button img {
+  margin:0 3px -3px 0 !important;
+  padding:0;
+  border:none;
+  width:16px;
+  height:16px;
+}
+
+button.button:hover, a.button:hover {
+  background-color:#dedede;
+}
 
+button.button:active, a.button:active {
+  background-color:#e5e5e5;
+}

data/stylesheets/themes/default/style.css

@@ -7,7 +7,7 @@ a { -moz-outline: none; }
 
 body {
   color: #222;
-  background: #f0f0ee;
+  background: #e5e5e5;
   font-family: helvetica, arial, sans-serif;
 }
 
@@ -21,7 +21,7 @@ hr {
 }
 
 #header h1 {
-  padding: 20px 0;
+  padding: 15px 0;
 }
 
 #header h1 a:link, #header h1 a:active, #header h1 a:hover, #header h1 a:visited {
@@ -95,7 +95,7 @@ hr {
 }
 
 #main-navigation ul li.active {
-  background: #f0f0ee;
+  background: #e5e5e5;
 }
 
 #main-navigation ul li a:link, #main-navigation ul li a:visited, #main-navigation ul li a:hover, #main-navigation ul li a:active,
@@ -105,6 +105,13 @@ hr {
   color: #FFF;
 }
 
+#user-navigation a.logout {
+  background: #cc0000;
+  padding: 2px 6px;
+  -moz-border-radius: 4px;
+	-webkit-border-radius: 3px;
+}
+
 .secondary-navigation li a:hover {
   background: #470E0E;
 }

data/web-app-theme.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{web-app-theme}
-  s.version = "0.4.0"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrea Franz"]
-  s.date = %q{2009-11-10}
+  s.date = %q{2010-01-04}
   s.description = %q{Web app theme generator for rails projects}
   s.email = %q{andrea@gravityblast.com}
   s.extra_rdoc_files = [
@@ -22,12 +22,18 @@ Gem::Specification.new do |s|
      "README.md",
      "Rakefile",
      "VERSION",
+     "config/locales/de_de.yml",
+     "config/locales/pt_br.yml",
      "features/step_definitions/layout_steps.rb",
      "features/step_definitions/themed_steps.rb",
      "features/support/env.rb",
      "features/theme_generator.feature",
      "features/themed_generator.feature",
      "images/avatar.png",
+     "images/icons/application_edit.png",
+     "images/icons/cross.png",
+     "images/icons/key.png",
+     "images/icons/tick.png",
      "index.html",
      "javascripts/jquery-1.3.min.js",
      "javascripts/jquery.localscroll.js",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: web-app-theme
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Andrea Franz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-10 00:00:00 +01:00
+date: 2010-01-04 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -28,12 +28,18 @@ files:
 - README.md
 - Rakefile
 - VERSION
+- config/locales/de_de.yml
+- config/locales/pt_br.yml
 - features/step_definitions/layout_steps.rb
 - features/step_definitions/themed_steps.rb
 - features/support/env.rb
 - features/theme_generator.feature
 - features/themed_generator.feature
 - images/avatar.png
+- images/icons/application_edit.png
+- images/icons/cross.png
+- images/icons/key.png
+- images/icons/tick.png
 - index.html
 - javascripts/jquery-1.3.min.js
 - javascripts/jquery.localscroll.js