Permalink
Browse files

Moving users out of settings

  • Loading branch information...
1 parent 38a0117 commit c19be92ac12d7f0aa4333fa9e89904a25fafa516 @fdv fdv committed Aug 10, 2012
Showing with 14 additions and 5 deletions.
  1. +9 −3 app/helpers/admin/base_helper.rb
  2. +5 −2 config/initializers/access_rules.rb
@@ -28,7 +28,7 @@ def cancel(url = {:action => 'index'})
end
def save(val = _("Store"))
- '<input type="submit" value="' + val + '" class="btn primary" />'
+ '<input type="submit" value="' + val + '" class="btn btn-primary" />'
end
def link_to_edit(label, record, controller = controller.controller_name)
@@ -86,6 +86,12 @@ def class_tab
''
end
+ def class_users
+ return class_selected_tab if controller.controller_name =~ /users/
+ class_tab
+
+ end
+
def class_selected_tab
'active'
end
@@ -122,7 +128,7 @@ def class_dashboard
end
def class_settings
- return class_selected_tab if controller.controller_name =~ /settings|users|cache|redirects/
+ return class_selected_tab if controller.controller_name =~ /settings|cache|redirects/
class_tab
end
@@ -263,6 +269,6 @@ def show_thumbnail_for_editor(image)
end
def save_settings
- "<div class='actions'>#{cancel} #{_("or")} #{save(_("Update settings"))}</div>".html_safe
+ "<div class='form-actions'>#{cancel} #{_("or")} #{save(_("Update settings"))}</div>".html_safe
end
end
@@ -89,13 +89,16 @@
map.project_module :settings, nil do |project|
project.menu "Settings", { :controller => "admin/settings", :action => "index" }
- project.menu "General settings", { :controller => "admin/settings", :action => "index" }
+ project.submenu "General settings", { :controller => "admin/settings", :action => "index" }
project.submenu "Write", { :controller => "admin/settings", :action => "write" }
project.submenu "Feedback", { :controller => "admin/settings", :action => "feedback" }
project.submenu "Cache", { :controller => "admin/cache", :action => "index" }
project.submenu "Users", { :controller => "admin/users", :action => "index" }
project.submenu "Error messages", { :controller => "admin/settings", :action => "errors" }
- project.submenu "", { :controller => "admin/redirects", :action => "new"}
+ end
+
+ map.project_module :users, nil do |project|
+ project.menu "Users", { :controller => "admin/users", :action => "index" }
end
map.project_module :seo, nil do |project|

0 comments on commit c19be92

Please sign in to comment.