mondo-generators 0.6.2 → 0.6.3

data/VERSION

@@ -1 +1 @@
-0.6.2
+0.6.3

data/mondo-generators.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mondo-generators}
-  s.version = "0.6.2"
+  s.version = "0.6.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Luca Tironi"]
-  s.date = %q{2010-02-04}
+  s.date = %q{2010-03-26}
   s.description = %q{A collection of useful generator scripts for Rails.}
   s.email = %q{luca.tironi@gmail.com}
   s.extra_rdoc_files = [
@@ -51,8 +51,10 @@ Gem::Specification.new do |s|
      "rails_generators/mondo_layout/templates/images/cancel.gif",
      "rails_generators/mondo_layout/templates/images/delete.gif",
      "rails_generators/mondo_layout/templates/images/edit.gif",
+     "rails_generators/mondo_layout/templates/images/en.gif",
      "rails_generators/mondo_layout/templates/images/error.gif",
      "rails_generators/mondo_layout/templates/images/help_triangle.gif",
+     "rails_generators/mondo_layout/templates/images/it.gif",
      "rails_generators/mondo_layout/templates/images/navbar_bkg.gif",
      "rails_generators/mondo_layout/templates/images/new.gif",
      "rails_generators/mondo_layout/templates/images/no.gif",
@@ -96,7 +98,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://gemcutter.org/gems/mondo-generators}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{A collection of useful generator scripts for Rails.}
 
   if s.respond_to? :specification_version then

data/rails_generators/mondo_authentication/lib/insert_commands.rb

@@ -11,6 +11,17 @@ Rails::Generator::Commands::Create.class_eval do
     end
   end
   
+  def route_resource_with_options(resource, route_options = {})
+    sentinel = 'ActionController::Routing::Routes.draw do |map|'
+    
+    logger.route "map.resource #{resource}, #{route_options}"
+    unless options[:pretend]
+      gsub_file 'config/routes.rb', /(#{Regexp.escape(sentinel)})/mi do |match|
+        "#{match}\n  map.resource #{resource}, #{route_options}\n"
+      end
+    end
+  end
+  
   def route_name(name, path, route_options = {})
     sentinel = 'ActionController::Routing::Routes.draw do |map|'
     
@@ -42,6 +53,14 @@ Rails::Generator::Commands::Destroy.class_eval do
     end
   end
   
+  def route_resource_with_options(resource, route_options = {})
+    look_for = "\n  map.resource #{resource}, #{route_options}\n"
+    logger.route "map.resource #{resource}, #{route_options}"
+    unless options[:pretend]
+      gsub_file 'config/routes.rb', /(#{look_for})/mi, ''
+    end
+  end
+  
   def route_name(name, path, route_options = {})
     look_for =   "\n  map.#{name} '#{path}', :controller => '#{route_options[:controller]}', :action => '#{route_options[:action]}'"
     logger.route "map.#{name} '#{path}',     :controller => '#{route_options[:controller]}', :action => '#{route_options[:action]}'"
@@ -64,6 +83,10 @@ Rails::Generator::Commands::List.class_eval do
     logger.route "map.resource #{resource_list}"
   end
   
+  def route_resource_with_options(resource, route_options = {})
+    logger.route "map.resource #{resource}, #{route_options}"
+  end
+  
   def route_name(name, path, options = {})
     logger.route "map.#{name} '#{path}', :controller => '{options[:controller]}', :action => '#{options[:action]}'"
   end

data/rails_generators/mondo_authentication/mondo_authentication_generator.rb

@@ -37,10 +37,11 @@ class MondoAuthenticationGenerator < Rails::Generator::Base
       m.template "authorization_rules.rb", "config/authorization_rules.rb"
       m.migration_template "migration.rb", "db/migrate", :migration_file_name => "create_#{user_plural_name}"
 
-      m.route_name :signup, 'signup', :controller => user_plural_name, :action => 'new'
-      m.route_name :logout, 'logout', :controller => session_plural_name, :action => 'destroy'
-      m.route_name :login, 'login', :controller => session_plural_name, :action => 'new'
+      m.route_name :signup, '/signup', :controller => user_plural_name, :action => 'new'
+      m.route_name :logout, '/logout', :controller => session_plural_name, :action => 'destroy'
+      m.route_name :login, '/login', :controller => session_plural_name, :action => 'new'
       m.route_resources session_plural_name
+      m.route_resources user_plural_name
       m.insert_into "config/routes.rb", 'map.resources :users, :collection => { :mass_new => :get, :mass_create => :post }'
 
       m.insert_into "app/controllers/#{application_controller_name}.rb", 'include Authentication'
@@ -96,7 +97,7 @@ protected
     <<-EOS
 Creates user model and controllers to handle registration and authentication.
 
-USAGE: #{$0} #{spec.name} [user_name] [sessions_controller_name]
+USAGE: #{$0} [user_name] [sessions_controller_name]
 EOS
   end
 end

data/rails_generators/mondo_authentication/templates/locales/en.yml

@@ -1,17 +1,26 @@
 en:
   label:
-    create: Create
-    update: Update
-    email: Email
-    password: Password
-    login: Login
-    signup: Signup
-    logout: Logout
-    show: Show
-    edit: Edit
-    destroy: Delete
-    back: Back
+    create: "Create"
+    update: "Update"
+    email: "Email"
+    password: "Password"
+    login: "Login"
+    signup: "Signup"
+    logout: "Logout"
+    show: "Show"
+    edit: "Edit"
+    destroy: "Delete"
+    back: "Back"
     welcome: "Welcome, "
+    continue_reading: "..."
+    close: "Close"
+    help: "Help"
+    faq: "Faq"
+    continue: "Continue"
+    you: "(you)"
+
+  navbar:
+    myprofile: "My Profile"
 
   confirm:
     logout: "Are you sure you want to logout?"
@@ -27,27 +36,21 @@ en:
     update:
       notice: "Account successfully updated."
 
-  roles:
-    index:
-      title: "Roles"
-      new_role_link: "Add new role"
-    new:
-      title: "New role"
-    create:
-      notice: "Role successfully created."
-    edit:
-      title: "Edit role"
-    update:
-      notice: "Role successfully updated."
-    destroy:
-      notice: "Role successfully deleted."
-
   users:
+    first_name: "First Name"
+    last_name: "Last Name"
+    language: "Language"
+    roles: "Roles"
     index:
       title: "Users"
       search: "Search"
       new_user_link: "Add new user"
       mass_new_users_link: "Mass add new Users"
+    show:
+      email_message: "We will use your email only for communications strictly related to HandShake."
+      current_game: "Current Game:"
+      goto_game: "Go to game"
+      profile_label: "Profile"
     new:
       title: "New user"
     create:
@@ -55,7 +58,7 @@ en:
     mass_new:
       title: "Mass add new Users"
       label: "Insert new users"
-      help: "Please insert users comma separated as <strong>First Name,Last Name,Email,Password</strong>"
+      help: "Please insert users comma separated as <strong>First Name,Last Name,Email,Password,Language('en' or 'it')</strong>"
     mass_create:
       notice: "Users successfully created."
       error: "You didn't insert any user!"

data/rails_generators/mondo_authentication/templates/locales/it.yml

@@ -1,17 +1,26 @@
 it:
   label:
-    create: Aggiungi
-    update: Aggiona
-    email: Email
-    password: Password
-    login: Login
-    signup: Registrati
-    logout: Logout
-    show: Vedi
-    edit: Modifica
-    destroy: Cancella
-    back: Indietro
-    welcome: "Ciao, "
+    create: "Aggiungi"
+    update: "Aggiorna"
+    email: "Email"
+    password: "Password"
+    login: "Entra"
+    signup: "Registrati"
+    logout: "Esci"
+    show: "Vedi"
+    edit: "Modifica"
+    destroy: "Cancella"
+    back: "Indietro"
+    welcome: "Benvenuto, "
+    continue_reading: "..."
+    close: "Chiudi"
+    help: "Aiuto"
+    faq: "Faq"
+    continue: "Continua"
+    you: "(tu)"
+
+  navbar:
+    myprofile: "Profilo"
 
   confirm:
     logout: "Sei sicuro di voler fare logout?"
@@ -28,11 +37,20 @@ it:
       notice: "Account modificato con successo."
 
   users:
+    first_name: "Nome"
+    last_name: "Cognome"
+    language: "Lingua"
+    roles: "Ruoli"
     index:
       title: "Utenti"
       search: "Cerca"
       new_user_link: "Aggiungi nuovo utente"
       mass_new_users_link: "Aggiungi utenti in massa"
+    show:
+      email_message: "Useremo la tua email solo per comunicazioni strettamente correlate ad HandShake."
+      current_game: "Partita Corrente:"
+      goto_game: "Vai alla partita"
+      profile_label: "Profilo"
     new:
       title: "Nuovo utente"
     create:
@@ -40,7 +58,7 @@ it:
     mass_new:
       title: "Aggiungi utenti in massa"
       label: "Inserisci nuovi utenti"
-      help: "Ti preghiamo di inserire gli utenti separati da virgole nell'ordine <strong>Nome,Cognome,Email,Password</strong>"
+      help: "Ti preghiamo di inserire gli utenti separati da virgole nell'ordine <strong>Nome,Cognome,Email,Password,Lingua('en' or 'it')</strong>"
     mass_create:
       notice: "Utenti creati con successo."
       error: "Non hai inserito nessun utente!"
@@ -51,17 +69,6 @@ it:
     destroy:
       notice: "Utente cancellato con successo."
 
-  user_sessions:
-    new:
-      title: "Login"
-      login: "Il tuo login"
-      email: "La tua email"
-      password: "La tua password"
-    create:
-      notice: "Login eseguito con successo."
-    destroy:
-      notice: "Logout eseguito con successo."
-
 # Italian translations for Ruby on Rails 
 # by Claudio Poli (masterkain@gmail.com)
 # maintained by Simone Carletti (weppos@weppos.net)

data/rails_generators/mondo_authentication/templates/migration.rb

@@ -12,6 +12,7 @@ class Create<%= user_plural_class_name %> < ActiveRecord::Migration
       t.string :perishable_token, :limit => 20
 
       t.integer :roles_mask, :default => 1
+      t.boolean :active, :default => false, :null => false
 
       t.integer   :login_count, :null => false, :default => 0
       t.integer   :failed_login_count, :null => false, :default => 0

data/rails_generators/mondo_authentication/templates/user.rb

@@ -1,20 +1,29 @@
 class <%= user_class_name %> < ActiveRecord::Base
   acts_as_authentic
 
-  attr_accessible :first_name, :last_name, :full_name, :email, :password, :password_confirmation, :language, :roles
+  attr_accessible :first_name, :last_name, :full_name, :email, :password, :password_confirmation, :language, :roles, :current_game_id, :active
 
+  default_scope :order => "LOWER(last_name) ASC"
   named_scope :with_role, lambda { |role| {:conditions => "roles_mask & #{2**ROLES.index(role.to_s)} > 0"} }
+  named_scope :active, :conditions => ["active=?", true]
+  named_scope :deleted, :conditions => ["active=?", false]
 
   ROLES = %w[<%= user_singular_name %> admin]
 
   def roles=(roles)
     self.roles_mask = (roles & ROLES).map { |r| 2**ROLES.index(r) }.sum
+    save
   end
 
   def roles
     ROLES.reject { |r| ((roles_mask || 0) & 2**ROLES.index(r)).zero? }
   end
 
+  def add_role(role)
+    r = self.roles.push(role)
+    self.roles = r
+  end
+
   def role_symbols
     roles.map(&:to_sym)
   end
@@ -26,4 +35,9 @@ class <%= user_class_name %> < ActiveRecord::Base
   def full_name
     "#{first_name} #{last_name}".strip
   end
+
+  def deactivate!
+    self.active = false
+    save
+  end
 end

data/rails_generators/mondo_authentication/templates/users_controller.rb

@@ -1,8 +1,12 @@
 class <%= user_plural_class_name %>Controller < ApplicationController
-  filter_access_to :all
+  filter_resource_access :additional_collection => [:mass_new, :mass_create]
 
   def index
-    @<%= user_plural_name %> = <%= user_class_name %>.paginate(:per_page => 20, :page => params[:page], :conditions => search_conditions)
+    unless params[:deleted]
+      @<%= user_plural_name %> = <%= user_class_name %>.active.paginate(:per_page => 20, :page => params[:page], :conditions => search_conditions)
+    else
+      @<%= user_plural_name %> = <%= user_class_name %>.deleted.paginate(:per_page => 20, :page => params[:page], :conditions => search_conditions)
+    end
   end
 
   def show
@@ -30,8 +34,8 @@ class <%= user_plural_class_name %>Controller < ApplicationController
     unless params[:text_area].blank?
       lines = params[:text_area].split("\r\n")
       for line in lines
-        first_name, last_name, email, password = line.split(",")
-        <%= user_class_name %>.create!(:first_name => first_name, :last_name => last_name, :email => email, :password => password, :password_confirmation => password)
+        first_name, last_name, email, password, lang = line.split(",")
+        <%= user_class_name %>.create!(:first_name => first_name, :last_name => last_name, :email => email, :password => password, :password_confirmation => password, :language => lang, :active => true)
       end
       flash[:success] = t("users.mass_create.notice")
       redirect_to <%= user_plural_name %>_url
@@ -58,7 +62,7 @@ class <%= user_plural_class_name %>Controller < ApplicationController
 
   def destroy
     @<%= user_singular_name %> = <%= user_class_name %>.find(params[:id])
-    @<%= user_singular_name %>.destroy
+    @<%= user_singular_name %>.deactivate!
     flash[:notice] = t("users.destroy.notice")
     redirect_to <%= user_plural_name %>_url
   end

data/rails_generators/mondo_authentication/templates/views/_form.html.haml

@@ -12,26 +12,31 @@
   = f.label :email
   %br
   = f.text_field :email, :disabled => disabled
-%p
-  = f.label :language
-  %br
-  = f.select :language, [["English", "en"], ["Italiano", "it"]]
-%p
-  = f.label :password
-  %br
-  = f.password_field :password
-%p
-  = f.label :password_confirmation
-  %br
-  = f.password_field :password_confirmation
 - if permitted_to? :manage, @<%= user_singular_name %>
   %p
-    = f.label :roles
+    = f.label :password
+    %br
+    = f.password_field :password
+  %p
+    = f.label :password_confirmation
+    %br
+    = f.password_field :password_confirmation
+  %p
+    = f.label :language, t("users.language")
+    %br
+    = f.select :language, [["English", "en"], ["Italiano", "it"]]
+  %p
+    = f.label :active
+    %br
+    = f.select :active, [["Active", true], ["Passive", false]]
+  %p
+    = f.label :roles, t("users.roles")
     %br
     - for role in User::ROLES
-      = check_box_tag "user[roles][]", role, @<%= user_singular_name %>.roles.include?(role), :disabled => (@<%= user_singular_name %> == @current_<%= user_singular_name %> ? true : false)
+      = check_box_tag "<%= user_singular_name %>[roles][]", role, @<%= user_singular_name %>.roles.include?(role), :disabled => (@<%= user_singular_name %> == @current_<%= user_singular_name %> ? true : false)
       =h role.humanize
       %br
 %p
   %button.button.positive{:type => "submit"}
+    = image_tag "icons/yes.gif"
     = submit_button

data/rails_generators/mondo_authentication/templates/views/edit.html.haml

@@ -1,5 +1,4 @@
 - title t("users.edit.title")
-- page "admin_page"
 
 - form_for @<%= user_singular_name %> do |f|
   = render :partial => "form", :locals => { :f => f, :submit_button => t("label.update") }

data/rails_generators/mondo_authentication/templates/views/index.html.haml

@@ -1,15 +1,17 @@
 - title t("users.index.title")
-- page "admin_page"
 
 %table
   %thead
     %tr
-      %td{:colspan => 2}
+      %td
+        = page_entries_info @<%= user_plural_name %>
         = will_paginate @<%= user_plural_name %>
-      %td{:style => "text-align:right;"}
+      %td{:colspan => 2, :style => "text-align:right;"}
         = link_to t("users.index.new_user_link"), new_<%= user_singular_name %>_path
         |
         = link_to t("users.index.mass_new_users_link"), mass_new_<%= user_plural_name %>_path
+        |
+        = params[:deleted] ? link_to(t("users.index.title"), <%= user_plural_name %>_path) : link_to("Zombies", <%= user_plural_name %>_path(:deleted => true))
       %td
         #search
           - form_tag <%= user_plural_name %>_path, :method => :get do
@@ -18,7 +20,7 @@
   %tbody
     %tr
       %th <%= user_class_name %>
-      %th Active
+      %th Lang
       %th Roles
       %th Actions
     - for user in @<%= user_plural_name %>
@@ -32,11 +34,12 @@
             %br
             = <%= user_singular_name %>.email
         %td
+          = image_tag "icons/#{<%= user_singular_name %>.language}.gif", :class => "icon"
         %td
           = <%= user_singular_name %>.roles.join(', ')
         %td
-          = link_to t("label.edit"), edit_<%= user_singular_name %>_path(<%= user_singular_name %>), :class => "button"
-          = link_to t("label.destroy"), <%= user_singular_name %>_path(<%= user_singular_name %>), :confirm => t("confirm.destroy"), :method => :delete, :class => "button negative" unless <%= user_singular_name %> == current_<%= user_singular_name %>
+          = link_to "#{image_tag("icons/edit.gif")} #{t("label.edit")}", edit_<%= user_singular_name %>_path(<%= user_singular_name %>), :class => "button"
+          = link_to "#{image_tag("icons/edit.gif")} #{t("label.destroy")}", <%= user_singular_name %>_path(<%= user_singular_name %>), :confirm => t("confirm.destroy"), :method => :delete, :class => "button negative" unless <%= user_singular_name %> == current_<%= user_singular_name %>
 
   %tfoot
     %tr

data/rails_generators/mondo_authentication/templates/views/login.html.haml

@@ -1,15 +1,22 @@
 - title t("user_sessions.new.title")
-- page "home_page"
 
 - form_for @<%= session_singular_name %> do |f|
   = f.error_messages
-  %p
+  %div.span-24.last
     = f.label :email, t("user_sessions.new.email")
-    %br
-    = f.text_field :email, :class => "bigfield span-8"
-  %p
+  %div.span-12
+    = f.text_field :email, :class => "bigfield span-23"
+  %div.span-11.last
+    %div.help
+      It should be a valid email.
+  %div.span-24.last
     = f.label :password, t("user_sessions.new.password")
-    %br
-    = f.password_field :password, :class => "bigfield span-8"
-  %button.button.positive{:type => "submit"}
-    = t("label.login")
+  %div.span-12
+    = f.password_field :password, :class => "bigfield span-23"
+  %div.span-11.last
+    %div.help
+      Remember to turn caps lock off!
+  %div.span-24.last
+    %button.button.positive{:type => "submit"}
+      = image_tag "icons/yes.gif"
+      = t("label.login")

data/rails_generators/mondo_authentication/templates/views/mass_new.html.haml

@@ -1,5 +1,4 @@
 - title t("users.mass_new.title")
-- page "admin_page"
 
 - form_tag mass_create_<%= user_plural_name %>_path, :method => :post do
   %p
@@ -9,5 +8,6 @@
     = text_area_tag "text_area", nil, :rows => 10, :class => "span-17"
   %p
     %button.button.positive{:type => "submit"}
+      = image_tag "icons/yes.gif"
       = t("label.create")
     = link_to t("label.back"), <%= user_plural_name %>_path, :class => "button"

data/rails_generators/mondo_authentication/templates/views/new.html.haml

@@ -1,5 +1,4 @@
 - title t("users.new.title")
-- page "admin_page"
 
 - form_for @<%= user_singular_name %> do |f|
   = render :partial => "form", :locals => { :f => f, :submit_button => t("label.create") }

data/rails_generators/mondo_authentication/templates/views/show.html.haml

@@ -1,5 +1,10 @@
 - title "#{@<%= user_singular_name %>.full_name}"
-- page "home_page"
 
+%p
+  %strong Email:
+  = @<%= user_singular_name %>.email
+  %br
+  %small= t("users.show.email_message")
 - if permitted_to? :update, @<%= user_singular_name %>
-  = link_to t("label.edit"), edit_<%= user_singular_name %>_path(@<%= user_singular_name %>)
+  %p.buttons
+    = link_to t("label.edit"), edit_<%= user_singular_name %>_path(@<%= user_singular_name %>)

data/rails_generators/mondo_layout/mondo_layout_generator.rb

@@ -41,6 +41,9 @@ class MondoLayoutGenerator < Rails::Generator::Base
       m.file "images/notice.gif", "public/images/icons/notice.gif"
       m.file "images/success.gif", "public/images/icons/success.gif"
       
+      m.file "images/en.gif", "public/images/icons/en.gif"
+      m.file "images/it.gif", "public/images/icons/it.gif"
+      
       m.file "images/yes.gif", "public/images/icons/yes.gif"
       m.file "images/no.gif", "public/images/icons/no.gif"
       m.file "images/accept.gif", "public/images/icons/accept.gif"

data/rails_generators/mondo_layout/templates/layout.html.haml

@@ -9,35 +9,43 @@
     /[if lt IE 8]
       = stylesheet_link_tag 'compiled/ie.css', :media => 'screen, projection'
     = javascript_include_tag :defaults
+    = yield(:head)
   %body{:id => yield(:page)}
     #wrap
       #header
-        %h1 <%= app_name %>
+        %h1
+          = link_to <%= app_name %>, root_path
+          %span.alt Subtitle
       #navbar
-        %ul
-          - if logged_in?
-            %li 
-              = t("label.welcome")
-              = link_to current_user.full_name, user_path(@current_user)
-            %li
-              = link_to "Home", root_path
-            %li
-              = link_to "Logout", logout_path
-          - else
-            %li
-              = link_to "Home", root_path
-            %li
-              = link_to "Login", login_path
+        #menu
+          %ul
+            - if logged_in?
+              %li== #{t("label.welcome")} #{current_user.full_name}
+              %li= link_to "Home", root_path
+              %li= link_to "Logout", logout_path
+            - else
+              %li= link_to "Home", root_path
+              %li= link_to "Login", login_path
       #flash_box{:onclick => "new Effect.Fade(this, {duration: 0.1, from: 0.7});", :style => "display: none;"}
         - flash_message
-      #content.container
-        %h2= yield(:title)
-        = yield
-      .push
+      #content
+        #title
+          %h2= yield(:title)
+        #main
+          = yield
 
     #footer
-      %p.right
-        Right Footer
-      %p.left
-        Left Footer
-        
+       #footer_content
+        .span-3.alignright
+          %h3
+            <%= app_name %>
+          %small
+            Subtitle
+        .span-3
+          %ul
+            %li= link_to "Home", root_path
+        .span-7
+          &nbsp;
+        .span-10.last.alignright
+          %p
+            = link_to "Credits", "http://www.rubyonrails.com", :popup => true

data/rails_generators/mondo_layout/templates/stylesheets/_colors.sass

@@ -1,12 +1,14 @@
-!body_background_color = #fff
-!header_background_color = #111
+!body_background_color = #eee
+!header_background_color = #222
 !navbar_background_color = #fff
 !content_background_color = #fff
-!footer_background_color = #fff
+!footer_background_color = #eee
 
 !font_color = #464646
+!headline_color = #333
 !link_color = #4183c4
 !link_hover_color = #08f
+!weak_color = #666
 
 !feedback_border_color ||= #DDD
 !success_color         ||= #264409

data/rails_generators/mondo_layout/templates/stylesheets/_mixins.sass

@@ -12,4 +12,6 @@
   :padding-right 24px
 =weak
   :font-size 90%
-  :color #888
+  :color = !weak_color
+=strong
+  :font-weight bold

data/rails_generators/mondo_layout/templates/stylesheets/partials/_base.sass

@@ -10,47 +10,43 @@ body
   :text-align left
 
 #wrap
-  :min-height 100%
-  :height auto !important
-  :height 100%
-  :margin-bottom = -!footer_height
-
-.push
-  :height = !footer_height
-
-.box
-  :background #efefef
-  :padding 1.5em 1.5em 0.1em 1.5em
-  :margin-bottom 1em
-
-.box_bordered
-  :border 2px dashed #999
-  :padding 1.5em 1.5em 0.1em 1.5em
-  :margin-bottom 1em
+  :min-width 950px
+  :background = !content_background_color
+  #main
+    :min-height 500px
+    :height auto !important
+    :height 500px
 
 a
   img
     :border 0
 
 img.icon
-  :vertical-align text-bottom
+  :vertical-align middle
 
 .float_left
   +float
 .float_right
   +float("right")
 
+.aligncenter
+  :text-align center
+.alignleft
+  :text-align left
+.alignright
+  :text-align right
+
 br.clear
   :clear both
 
 span.handle
   :cursor move
 
-span.hide_container
-  span.hide_element
+.hide_container
+  .hide_element
     :display none
-span.hide_container:hover
-  span.hide_element
+.hide_container:hover
+  .hide_element
     :display inline
 
 @import header.sass

data/rails_generators/mondo_layout/templates/stylesheets/partials/_content.sass

@@ -1,8 +1,8 @@
 .container
   :width 90%
-  :min-height 225px
 #content
-  :margin 1.5em 0 0 20px
-  :padding 0
+  +clearfix
+  :margin 1.5em 10% 0
+  :padding 0 0 1.5em
   :text-align left
   :background transparent

data/rails_generators/mondo_layout/templates/stylesheets/partials/_errors.sass

@@ -3,11 +3,11 @@
   label
     :color #cf0000
 #errorExplanation
-  :margin-bottom 1.5em
+  :margin-bottom 1.5em  
   :background-color #fff
   h2
     :margin 0
-    :padding 3px
+    :padding 3px 7px
     :text-align left
     :font-weight bold
     :color #fff
@@ -18,6 +18,5 @@
     :padding 1em 1em 0
   ul
     :margin 0
-    :padding 0.5em 0 1em 3em
-    :border-bottom 2px solid #cf0000
-    :list-style-type square
+    :padding 0.5em 0 1em 1em
+    :border-bottom 2px solid #cf0000

data/rails_generators/mondo_layout/templates/stylesheets/partials/_footer.sass

@@ -1,14 +1,24 @@
 #footer
   +clearfix
   :min-width 910px
-  :height = !footer_height
   :margin 0
-  :padding 0.4em 20px 0
+  :padding 1.5em 0 1.5em
   :border-top 1px solid #ccc
   :background = !footer_background_color
-  p
-    :margin 0
-  p.left
-    +float
-  p.right
-    +float("right")
+  #footer_content
+    +clearfix
+    :margin 0 10%
+    h3
+      :margin-bottom 0
+    p, ul
+      :color #aaa
+      :margin 0
+    ul
+      li
+        :background-image none
+        :padding-left 0
+    a, a:visited, a:focus, a:active
+      +strong
+      :color #aaa
+    a:hover
+      :color #666

data/rails_generators/mondo_layout/templates/stylesheets/partials/_header.sass

@@ -1,22 +1,26 @@
 #header
   +clearfix
-  :min-width 910px
-  :padding 0 20px
   :background = !header_background_color
+  :text-align left
   h1
     :margin-top 0.3em
+    :margin-left 10%
+    :margin-right 10%
     :font-size 2em
     :color #fff
     :font-family = !headline_fonts
+    a
+      :color #fff
+    a:hover
+      :color #eee
     .alt
       :margin-left 0.5em
       :font-size 70%
-      :color #aaa
+      :color #aca
 
 #navbar
   +clearfix
-  :min-width 910px
-  :padding 5px 20px
+  :padding 5px 0
   :background
     :color = !navbar_background_color
     :image url('../../images/navbar_bkg.gif')
@@ -25,22 +29,22 @@
   :border
     :top 1px solid #ccc
     :bottom 1px solid #ccc
-  ul
-    +float("right")
-    :margin 0
-    +no-bullets
-    +horizontal-list(1em)
-    :font-family = !headline_fonts
-    :border-left 1px solid #ccc
-    li
-      :background-image none
-      :border
-        :left 1px solid #fff
-        :right 1px solid #ccc
-      a
-        +link-colors(#464646,#000)
-        :text-decoration none
-        :font-weight bold
+  #menu
+    :margin 0 10%
+    ul
+      +float("right")
+      +horizontal-list(1em)
+      :font-family = !headline_fonts
+      :border-left 1px solid #ccc
+      li
+        :background-image none
+        :border
+          :left 1px solid #fff
+          :right 1px solid #ccc
+        a
+          +link-colors(#464646,#000)
+          :text-decoration none
+          :font-weight bold
 
 #flash_box
   :left 0

data/rails_generators/mondo_layout/templates/stylesheets/partials/_typography.sass

@@ -35,5 +35,20 @@ a:hover
   :text-decoration none
   :color = !link_hover_color
 
-.quiet, small
-  +weak
+.weak, .quiet, small
+  +weak
+.strong, .loud, strong
+  :font-weight bold
+.italic
+  :font-style italic
+
+.odd
+  :background-color #fafafa
+.even
+  :background-color #eee
+
+hr
+  :width 95%
+  :color #ccc
+  :background-color #ccc
+  :border 1px solid #ccc

data/rails_generators/mondo_layout/templates/stylesheets/partials/_users.sass

@@ -19,13 +19,14 @@
   +float
   :width 24px
   :height 24px
-  :margin-top 5px
+  :margin-top 0
   :margin-right 5px
   :margin-bottom 5px
   :background-color #C4CDE0
   img.fb_profile_pic_rendered
     :width 24px
     :height 24px
-
+.user_data
+  :line-height 1
 #search
   :text-align right

data/rails_generators/mondo_scaffold/templates/views/haml/_form.html.haml

@@ -6,4 +6,5 @@
   = f.<%= attribute.field_type %> :<%= attribute.name %>
 <%- end -%>
 %button.button.positive{:type => "submit"}
+  = image_tag "icons/yes.gif"
   = submit_button

data/rails_generators/mondo_scaffold/templates/views/haml/edit.html.haml

@@ -9,7 +9,7 @@
 
 <%- if actions? :show, :destroy, :index -%>
 <%- if action? :destroy -%>
-= link_to t("label.destroy"), <%= singular_name %>, :confirm => t("confirm.destroy"), :method => :delete, :class => "button negative"
+= link_to "#{image_tag("icons/delete.gif")} #{t("label.destroy")}", @<%= singular_name %>, :confirm => t("confirm.destroy"), :method => :delete, :class => "button negative"
 <%- end -%>
 <%- if action? :index -%>
 = link_to t("label.back"), <%= plural_name %>_path, :class => "button"

data/rails_generators/mondo_scaffold/templates/views/haml/index.html.haml

@@ -1,8 +1,8 @@
 - title "<%= plural_name.titleize %>"
 
 <%- if actions? :new -%>
-%p
-  = link_to "New <%= singular_name.titleize %>", new_<%= singular_name %>_path
+%p.buttons
+  = link_to "#{image_tag("icons/new.gif")} New <%= singular_name.titleize %>", new_<%= singular_name %>_path
 <%- end -%>
 
 %table
@@ -19,11 +19,11 @@
       <%- end -%>
       %td
       <%- if action? :show -%>
-        = link_to t("label.show"), <%= singular_name %>, :class => "button positive"
+        = link_to "#{image_tag("icons/go.gif")} t("label.show")}", <%= singular_name %>, :class => "button positive"
       <%- end -%>
       <%- if action? :edit -%>
-        = link_to t("label.edit"), edit_<%= singular_name %>_path(<%= singular_name %>), :class => "button"
+        = link_to "#{image_tag("icons/edit.gif")} t("label.edit")}", edit_<%= singular_name %>_path(<%= singular_name %>), :class => "button"
       <%- end -%>
       <%- if action? :destroy -%>
-        = link_to t("label.destroy"), <%= singular_name %>, :confirm => t("confirm.destroy"), :method => :delete, :class => "button negative"
+        = link_to "#{image_tag("icons/delete.gif")} t("label.destroy")}", <%= singular_name %>, :confirm => t("confirm.destroy"), :method => :delete, :class => "button negative"
       <%- end -%>

data/rails_generators/mondo_scaffold/templates/views/haml/new.html.haml

@@ -8,5 +8,5 @@
 <%- end -%>
 
 <%- if action? :index -%>
-= link_to "Back to List", <%= plural_name %>_path, :class => "button"
+= link_to "Back", <%= plural_name %>_path, :class => "button"
 <%- end -%>

data/rails_generators/mondo_scaffold/templates/views/haml/show.html.haml

@@ -8,7 +8,7 @@
 
 %p.buttons
   <%- if action? :edit -%>
-  = link_to t("label.edit"), edit_<%= singular_name %>_path(<%= singular_name %>), :class => "button positive"
+  = link_to "#{image_tag("icons/edit.gif")} t("label.edit")}", edit_<%= singular_name %>_path(<%= singular_name %>), :class => "button positive"
   <%- end -%>
   <%- if action? :index -%>
   = link_to t("label.back"), <%= plural_name %>_path, :class => "button"

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: mondo-generators
 version: !ruby/object:Gem::Version 
-  version: 0.6.2
+  prerelease: false
+  segments: 
+  - 0
+  - 6
+  - 3
+  version: 0.6.3
 platform: ruby
 authors: 
 - Luca Tironi
@@ -9,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-04 00:00:00 +01:00
+date: 2010-03-26 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -57,8 +62,10 @@ files:
 - rails_generators/mondo_layout/templates/images/cancel.gif
 - rails_generators/mondo_layout/templates/images/delete.gif
 - rails_generators/mondo_layout/templates/images/edit.gif
+- rails_generators/mondo_layout/templates/images/en.gif
 - rails_generators/mondo_layout/templates/images/error.gif
 - rails_generators/mondo_layout/templates/images/help_triangle.gif
+- rails_generators/mondo_layout/templates/images/it.gif
 - rails_generators/mondo_layout/templates/images/navbar_bkg.gif
 - rails_generators/mondo_layout/templates/images/new.gif
 - rails_generators/mondo_layout/templates/images/no.gif
@@ -111,18 +118,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A collection of useful generator scripts for Rails.