Changing small things.

glebtv · Jan 15, 2011 · 541244b · 541244b
1 parent 7898a6e
commit 541244b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/lib/generators/core/layout/templates/core_helper.rb b/lib/generators/core/layout/templates/core_helper.rb
@@ -56,12 +56,12 @@ def action_links_for_current_action
 
   def action_link_to(name, url = nil)
     if crud_actions.include?(name)
-      resource_name = resource_class.human_name.titleize
+      resource_name = resource_class.human_name
       resource_name = resource_name.pluralize if name == "list"
     end
 
     url ||= url_for_name(name)
-    link = link_to(t("web-app-theme.#{name}" , :default => "#{name.humanize} #{resource_name}"), url)
+    link = link_to(t("core.#{name}" , :default => "#{name.humanize} #{resource_name}"), url)
     haml_tag :li, link
   end
 

diff --git a/lib/generators/core/layout/templates/stylesheets/override.sass b/lib/generators/core/layout/templates/stylesheets/override.sass
@@ -1 +1 @@
-/* Override here any style defined by web-app-theme */
+
diff --git a/lib/generators/core/layout/templates/views/haml/layout.html.haml b/lib/generators/core/layout/templates/views/haml/layout.html.haml
@@ -1,7 +1,7 @@
 !!!
 %html
   %head
-    %title Application
+    %title=APP_CONFIG.app_name
     = csrf_meta_tag
     = stylesheet_link_tag "<%= file_name %>/base", "<%= file_name %>/style", "<%= file_name %>/override", :cache => true
   %body
@@ -12,16 +12,14 @@
         #user-navigation
           %ul.wat-cf
             %li
-              %a{:href => "#"}= t("web-app-theme.profile", :default => "Profile")
+              %a{:href => "#"}= t("core.profile", :default => "Profile")
             %li
-              %a{:href => "#"}= t("web-app-theme.settings", :default => "Settings")
-            %li
-              %a.logout{:href => "/logout"}= t("web-app-theme.logout", :default => "Logout")
+              %a.logout{:href => "/logout"}= t("core.logout", :default => "Logout")
 
         #main-navigation
           %ul.wat-cf
             %li
-              %a{:href => "#"}= t("web-app-theme.home", :default => "Home")
+              %a{:href => "#"}= t("core.home", :default => "Home")
 
       #wrapper.wat-cf
         - flashes
@@ -32,7 +30,7 @@
           #footer
             .block
               %p
-                Copyright &copy; #{Time.now.year} Web App.
+                Copyright &copy; #{Time.now.year} #{APP_CONFIG.app_name}.
         #sidebar
           = yield :sidebar
 

diff --git a/lib/generators/core/scaffold/templates/views/haml/edit.html.haml b/lib/generators/core/scaffold/templates/views/haml/edit.html.haml
@@ -2,7 +2,7 @@
   .content
     %h2.title
       = t "core.edit"
-      <%= singular_name.pluralize %>  
+      <%= singular_name %>  
     .inner
       = render 'form'