0
@@ -11,7 +11,10 @@ class AccountsController < ApplicationController
0
         session[:user_id] = self.current_user.id
0
 
0
         flash[:notice]  = _("Login successful")
0
-        redirect_back_or_default :controller => "admin/dashboard", :action => "index"
0
+        # We need to use it because if a user are not allowed to see a protected area, will be loggedout,
0
+        # if we store their location, when he re-try to login will be redirected to the protected page so 
0
+        # we make a redudant cycle.
0
+        redirect_to :controller => "admin/dashboard", :action => "index"
0
       else
0
         flash.now[:notice]  = _("Login unsuccessful")
0
         @login = params[:user_login]

0
@@ -25,8 +25,6 @@ class Admin::FeedbackController < Admin::BaseController
0
       :order => 'feedback.created_at desc',
0
       :conditions => conditions,
0
       :per_page => 40)
0
-
0
-    render :action => 'list'
0
   end
0
 
0
   def delete

0
@@ -1,21 +1,6 @@
0
-<<<<<<< HEAD:app/views/admin/settings/feedback.html.erb
0
 <% @page_heading = _('Feedback') %>
0
 <% subtabs_for(:settings) %>
0
 <% form_tag :action => 'feedback' do %>
0
-=======
0
-	<% @page_heading = _('Feedback') %>
0
-
0
-  <% content_for('tasks') do -%>
0
-	<%= subtab _("General settings"), "", {:controller => "settings"} %>
0
-	<%= subtab _("Read"), "", { :controller => 'settings', :action => 'read' } %>
0
-	<%= subtab _("Write"), "", { :controller => 'settings', :action => 'write' } %>
0
-	<%= subtab _("Feedback"), "current", { :controller => 'settings', :action => 'feedback' } %>
0
-	<%= subtab _("Spam"), "", { :controller => 'settings', :action => 'spam' } %>
0
-	<%= subtab _("Podcasts"), "", { :controller => 'settings', :action => 'podcast' } %>
0
-  <% end -%> 
0
-
0
-	<% form_tag :action => 'feedback' do %>
0
->>>>>>> coreteam/master:app/views/admin/settings/feedback.html.erb
0
 
0
 <div class="admin">
0
   <fieldset id="discuss" class="set">

0
@@ -1,7 +1,6 @@
0
-	<% @page_heading = _('General settings') %>
0
-  <% subtabs_for(:settings) %>
0
-  
0
-	<% form_tag :action => 'index' do %>
0
+<% @page_heading = _('General settings') %>
0
+<% subtabs_for(:settings) %>
0
+<% form_tag :action => 'index' do %>
0
 
0
 <div class="admin">
0
   <fieldset id="gensettings" class="set" style="margin-top:10px;">

0
@@ -1,18 +1,5 @@
0
 <% @page_heading = _('Podcast') %>
0
-<<<<<<< HEAD:app/views/admin/settings/podcast.html.erb
0
 <% subtabs_for(:settings) %>
0
-=======
0
-
0
-<% content_for('tasks') do -%>
0
-  <%= subtab _("General settings"), "", {:controller => "settings"} %>
0
-  <%= subtab _("Read"), "", { :controller => 'settings', :action => 'read' } %>
0
-	<%= subtab _("Write"), "", { :controller => 'settings', :action => 'write' } %>
0
-	<%= subtab _("Feedback"), "", { :controller => 'settings', :action => 'feedback' } %>			
0
-	<%= subtab _("Spam"), "", { :controller => 'settings', :action => 'spam' } %>
0
-	<%= subtab _("Podcasts"), "current", { :controller => 'settings', :action => 'podcast' } %>
0
-<% end -%> 
0
-
0
->>>>>>> coreteam/master:app/views/admin/settings/podcast.html.erb
0
 <% form_tag :action => 'podcast' do %>
0
 
0
 <div class="admin">

0
@@ -1,6 +1,7 @@
0
 <% @page_heading = _('Read') %>
0
 <% subtabs_for(:settings) %>
0
 <% form_tag :action => 'read' do %>
0
+
0
 <div class="admin">
0
   <fieldset id="read" class="set">
0
     <ul>

0
@@ -1,6 +1,7 @@
0
 <% @page_heading = _('Spam') %>
0
 <% subtabs_for(:settings) %>
0
 <% form_tag :action => 'spam' do %>
0
+
0
 <div class="admin">
0
   <fieldset id="spam" class="set">
0
     <ul>

0
@@ -1,4 +1,5 @@
0
   <% @page_heading = _('Text Filters') %>
0
+  <% subtabs_for(:sidebar) %>
0
 
0
   <% form_tag({ :action => "edit", :id => @textfilter }, :id => "textfilter_form") do %>
0
   <h3><%= _("Editing textfilter")%></h3>

0
@@ -1,3 +1,4 @@
0
 <% @page_heading = _("Macro Filter Help") + ": #{@macro.display_name}" %>
0
+  <% subtabs_for(:sidebar) %>
0
 
0
   <%= @help_text %>

0
@@ -1,7 +1,5 @@
0
   <% @page_heading = _('Create Text Filter') %>
0
-  <% content_for('tasks') do %>
0
-	<%= task_overview %>
0
-  <% end %>
0
+  <% subtabs_for(:sidebar) %>
0
 
0
   <% form_tag({ :action => "new" }, :id => "textfilter_form") do %>
0
 

0
@@ -1,9 +1,5 @@
0
   <% @page_heading = _("Text Filter Details") + ": #{@textfilter.description}" %>
0
-  
0
-  <% content_for('tasks') do %>
0
-    <%= task_edit _('Edit this filter'), @textfilter.id %>
0
-    <%= task_help 'See help text for this filter', @textfilter.id %>
0
-  <% end %> 
0
+  <% subtabs_for(:sidebar) %>
0
 
0
   <h3><%=h @textfilter.description %></h3>
0
 

0
@@ -1,8 +1,4 @@
0
   <% @page_heading = _("Text Filter Help") + ": #{@textfilter.description}" %>
0
-  
0
-  <% content_for('tasks') do %>
0
-    <%= task_edit _('Edit this text filter'), @textfilter.id %>
0
-    <%= task_show _('Show this filter'), @textfilter.id %>
0
-  <% end %> 
0
+  <% subtabs_for(:sidebar) %>
0
 
0
   <%= @help_text %>

0
@@ -49,35 +49,26 @@ AccessControl.map :require => [ :admin, :publisher ]  do |map|
0
     project.submenu _("Typo documentation"), "http://typosphere.org/main_page"
0
   end
0
   
0
-  map.project_module :write, nil do |project|
0
+  map.project_module :write do |project|
0
     project.menu    _("Write"),                { :controller => "admin/content",    :action => "new" }
0
-    project.submenu _("Write a posts"),          { :controller => "admin/content",    :action => "new" }
0
-	  project.submenu _("Write a pages"),          { :controller => "admin/pages",       :action => "new" }
0
+    project.submenu _("Write a posts"),          { :controller => "admin/content",  :action => "new" }
0
+	  project.submenu _("Write a pages"),          { :controller => "admin/pages",    :action => "new" }
0
   end
0
 
0
-  map.project_module :content, nil do |project|
0
+  map.project_module :content do |project|
0
     project.menu    _("Manage"),                { :controller => "admin/content",    :action => "index" }
0
     project.submenu _("Manage posts"),          { :controller => "admin/content",    :action => "list" }
0
-	  project.submenu _("Manage pages"),          { :controller => "admin/pages",       :action => "list" }
0
+	  project.submenu _("Manage pages"),          { :controller => "admin/pages",      :action => "list" }
0
     project.submenu _("Manage categories"),     { :controller => "admin/categories", :action => "index" }
0
     project.submenu _("Manage uploads"),        { :controller => "admin/resources",  :action => "list" }
0
     project.submenu _("Manage tags"),           { :controller => "admin/tags",       :action => "list" }
0
   end
0
 
0
-  map.project_module :feedback, nil do |project|
0
-    project.menu    _("Feedback"),              { :controller => "admin/feedback",  :action     => "index" }
0
-    project.submenu _("Unapproved comments"),   { :controller => "admin/feedback",  :action     => "index" }    
0
-    project.submenu _("Limit to spam"),         { :controller => "admin/feedback",  :published  => "f" }
0
-    project.submenu _("Blacklist"),             { :controller => "admin/blacklist", :action => "index" }
0
-    project.submenu _(""),                      { :controller => "admin/comments", :action => "show" }
0
-    project.submenu _(""),                      { :controller => "admin/comments", :action => "new" }
0
-    project.submenu _(""),                      { :controller => "admin/comments", :action => "edit" }
0
-    project.submenu _(""),                      { :controller => "admin/comments", :action => "destroy" }
0
-    project.submenu _(""),             { :controller => "admin/trackbacks", :action => "show" }
0
-    project.submenu _(""),             { :controller => "admin/trackbacks", :action => "new" }
0
-    project.submenu _(""),             { :controller => "admin/trackbacks", :action => "edit" }
0
-    project.submenu _(""),             { :controller => "admin/trackbacks", :action => "destroy" }
0
-
0
+  map.project_module :feedback, ["admin/comments", "admin/trackbacks" ] do |project|
0
+    project.menu    _("Feedback"),              { :controller => "admin/feedback",   :action     => "index" }
0
+    project.submenu _("Unapproved comments"),   { :controller => "admin/feedback",   :action     => "index" }    
0
+    project.submenu _("Limit to spam"),         { :controller => "admin/feedback",   :published  => "f" }
0
+    project.submenu _("Blacklist"),             { :controller => "admin/blacklist",  :action => "index" }
0
   end
0
 
0
   map.project_module :themes, "admin/themes" do |project|
0
@@ -86,9 +77,9 @@ AccessControl.map :require => [ :admin, :publisher ]  do |map|
0
     project.submenu _("Theme editor"),          { :action     => "editor" }
0
   end
0
   
0
-  map.project_module :sidebar, "admin/sidebar" do |project|
0
-    project.menu    _("Sidebar"),               { :action     => "index" }
0
-    project.submenu _("Text Filters"),          { :controller => "textfilters", :action => "list" }
0
+  map.project_module :sidebar do |project|
0
+    project.menu    _("Sidebar"),               { :controller => "admin/sidebar", :action => "index" }
0
+    project.submenu _("Text Filters"),          { :controller => "admin/textfilters",   :action => "index" }
0
   end  
0
   
0
   map.project_module :users, "admin/users" do |project|
0
@@ -96,7 +87,7 @@ AccessControl.map :require => [ :admin, :publisher ]  do |map|
0
     project.submenu _("Users"),                 { :action => "index" }
0
   end  
0
   
0
-  map.project_module :settings, nil do |project|
0
+  map.project_module :settings do |project|
0
     project.menu    _("Settings"),              { :controller => "admin/settings", :action => "index" }
0
     project.submenu _("General settings"),      { :controller => "admin/settings", :action => "index" }
0
     project.submenu _("Read"),                  { :controller => "admin/settings", :action => "read" }

0
@@ -91,11 +91,10 @@ module AccessControl
0
       @controllers = []
0
     end
0
     
0
-    def project_module(name, controller)
0
+    def project_module(name, controller=nil)
0
       project_module = ProjectModule.new(name, controller)
0
       yield project_module
0
       @project_modules << project_module
0
-      #@controllers << controller
0
     end
0
     
0
     def permission(controller)