diff options
Diffstat (limited to 'app')
10 files changed, 22 insertions, 22 deletions
diff --git a/app/controllers/admin_public_body_categories_controller.rb b/app/controllers/admin_public_body_categories_controller.rb index e9ca57434..fda09fa4a 100644 --- a/app/controllers/admin_public_body_categories_controller.rb +++ b/app/controllers/admin_public_body_categories_controller.rb @@ -65,7 +65,7 @@ class AdminPublicBodyCategoriesController < AdminController end end flash[:notice] = 'Category was successfully created.' - redirect_to categories_path + redirect_to admin_categories_path else render :action => 'new' end @@ -78,7 +78,7 @@ class AdminPublicBodyCategoriesController < AdminController category = PublicBodyCategory.find(params[:id]) category.destroy flash[:notice] = "Category was successfully destroyed." - redirect_to categories_path + redirect_to admin_categories_path end end end diff --git a/app/controllers/admin_public_body_headings_controller.rb b/app/controllers/admin_public_body_headings_controller.rb index 9cdd1321b..c7c80e802 100644 --- a/app/controllers/admin_public_body_headings_controller.rb +++ b/app/controllers/admin_public_body_headings_controller.rb @@ -43,7 +43,7 @@ class AdminPublicBodyHeadingsController < AdminController @heading = PublicBodyHeading.new(params[:public_body_heading]) if @heading.save flash[:notice] = 'Category heading was successfully created.' - redirect_to categories_url + redirect_to admin_categories_url else render :action => 'new' end @@ -57,13 +57,13 @@ class AdminPublicBodyHeadingsController < AdminController if heading.public_body_categories.count > 0 flash[:notice] = "There are categories associated with this heading, so can't destroy it" - redirect_to edit_heading_url(heading) + redirect_to edit_admin_heading_url(heading) return end heading.destroy flash[:notice] = "Category heading was successfully destroyed." - redirect_to categories_url + redirect_to admin_categories_url end end diff --git a/app/views/admin_general/_admin_navbar.html.erb b/app/views/admin_general/_admin_navbar.html.erb index e19a0ac5c..14fc06092 100644 --- a/app/views/admin_general/_admin_navbar.html.erb +++ b/app/views/admin_general/_admin_navbar.html.erb @@ -10,7 +10,7 @@ <li><%= link_to 'Stats', admin_stats_path %></li> <li><%= link_to 'Debug', admin_debug_path %></li> <li><%= link_to 'Authorities', admin_body_list_path %></li> - <li><%= link_to 'Categories', categories_path %></li> + <li><%= link_to 'Categories', admin_categories_path %></li> <li><%= link_to 'Requests', admin_request_list_path %></li> <li><%= link_to 'Users', admin_user_list_path %></li> <li><%= link_to 'Tracks', admin_track_list_path %></li> diff --git a/app/views/admin_public_body_categories/_category_list_item.html.erb b/app/views/admin_public_body_categories/_category_list_item.html.erb index 46f4f855c..056ab6148 100644 --- a/app/views/admin_public_body_categories/_category_list_item.html.erb +++ b/app/views/admin_public_body_categories/_category_list_item.html.erb @@ -1,5 +1,5 @@ <div class="category-list-item" <% if heading %> data-id="categories_<%= category.id %>"<% end %>> - <%= link_to(category.title, edit_category_path(category), :title => "view full details") %> + <%= link_to(category.title, edit_admin_category_path(category), :title => "view full details") %> </div> diff --git a/app/views/admin_public_body_categories/_heading_list.html.erb b/app/views/admin_public_body_categories/_heading_list.html.erb index 363ab5cf8..4bd8bdc90 100644 --- a/app/views/admin_public_body_categories/_heading_list.html.erb +++ b/app/views/admin_public_body_categories/_heading_list.html.erb @@ -4,7 +4,7 @@ <div class="accordion-heading accordion-toggle row"> <span class="item-title span6"> <a href="#heading_<%=heading.id%>_categories" data-toggle="collapse" data-parent="#categories" ><%= chevron_right %></a> - <strong><%= link_to(heading.name, edit_heading_path(heading), :title => "view full details") %></strong> + <strong><%= link_to(heading.name, edit_admin_heading_path(heading), :title => "view full details") %></strong> </span> </div> @@ -17,7 +17,7 @@ </div> <div class="form-actions save-panel"> - <%= link_to "Save", '#', :class => "btn btn-primary disabled save-order", "data-heading-id" => heading.id, "data-list-id" => "#heading_#{heading.id}_category_list", 'data-endpoint' => reorder_categories_heading_path(heading) %><p class="save-notice" data-unsaved-text="There are unsaved changes to the order of categories." data-success-text="Changes saved." data-error-text="There was an error saving your changes: ">Drag and drop to change the order of categories.</p> + <%= link_to "Save", '#', :class => "btn btn-primary disabled save-order", "data-heading-id" => heading.id, "data-list-id" => "#heading_#{heading.id}_category_list", 'data-endpoint' => reorder_categories_admin_heading_path(heading) %><p class="save-notice" data-unsaved-text="There are unsaved changes to the order of categories." data-success-text="Changes saved." data-error-text="There was an error saving your changes: ">Drag and drop to change the order of categories.</p> </div> </div> </div> diff --git a/app/views/admin_public_body_categories/edit.html.erb b/app/views/admin_public_body_categories/edit.html.erb index 206e610fc..95988d688 100644 --- a/app/views/admin_public_body_categories/edit.html.erb +++ b/app/views/admin_public_body_categories/edit.html.erb @@ -3,7 +3,7 @@ <div class="row"> <div class="span8"> <div id="public_body_category_form"> - <%= form_for @category, :url => category_path(@category), :html => { :class => "form form-horizontal" } do |f| %> + <%= form_for @category, :url => admin_category_path(@category), :html => { :class => "form form-horizontal" } do |f| %> <%= render :partial => 'form', :locals => {:f => f} %> <div class="form-actions"> <%= f.submit 'Save', :accesskey => 's', :class => "btn btn-success" %></p> @@ -14,14 +14,14 @@ <div class="row"> <div class="span8 well"> - <%= link_to 'List all', categories_path, :class => "btn" %> + <%= link_to 'List all', admin_categories_path, :class => "btn" %> </div> </div> <% if @tagged_public_bodies.empty? %> <div class="row"> <div class="span8"> - <%= form_tag(category_path(@category), :method => 'delete', :class => "form form-inline") do %> + <%= form_tag(admin_category_path(@category), :method => 'delete', :class => "form form-inline") do %> <%= hidden_field_tag(:public_body_id, { :value => @category.id } ) %> <%= submit_tag "Destroy #{@category.title}", :title => @category.title, :class => "btn btn-danger" %> (this is permanent!) <% end %> diff --git a/app/views/admin_public_body_categories/index.html.erb b/app/views/admin_public_body_categories/index.html.erb index 1373a3220..62ec4623d 100644 --- a/app/views/admin_public_body_categories/index.html.erb +++ b/app/views/admin_public_body_categories/index.html.erb @@ -4,10 +4,10 @@ <div class="btn-toolbar"> <div class="btn-group"> - <%= link_to 'New category', new_category_path, :class => "btn btn-primary" %> + <%= link_to 'New category', new_admin_category_path, :class => "btn btn-primary" %> </div> <div class="btn-group"> - <%= link_to 'New category heading', new_heading_path, :class => "btn" %> + <%= link_to 'New category heading', new_admin_heading_path, :class => "btn" %> </div> </div> @@ -24,5 +24,5 @@ <% end %> <% end %> <div class="form-actions save-panel"> -<%= link_to "Save", '#', :class => "btn btn-primary disabled save-order", "data-list-id" => '#category_list', 'data-endpoint' => reorder_headings_path %><p class="save-notice" data-unsaved-text="There are unsaved changes to the order of category headings." data-success-text="Changes saved." data-error-text="There was an error saving your changes: ">Drag and drop to change the order of category headings.</p> +<%= link_to "Save", '#', :class => "btn btn-primary disabled save-order", "data-list-id" => '#category_list', 'data-endpoint' => reorder_admin_headings_path %><p class="save-notice" data-unsaved-text="There are unsaved changes to the order of category headings." data-success-text="Changes saved." data-error-text="There was an error saving your changes: ">Drag and drop to change the order of category headings.</p> </div> diff --git a/app/views/admin_public_body_categories/new.html.erb b/app/views/admin_public_body_categories/new.html.erb index f91f5597c..8b1b1103f 100644 --- a/app/views/admin_public_body_categories/new.html.erb +++ b/app/views/admin_public_body_categories/new.html.erb @@ -4,7 +4,7 @@ <div class="row"> <div class="span8"> <div id="public_category_form"> - <%= form_for @category, :url => categories_path, :html => {:class => "form form-horizontal"} do |f| %> + <%= form_for @category, :url => admin_categories_path, :html => {:class => "form form-horizontal"} do |f| %> <%= render :partial => 'form', :locals => {:f => f} %> <div class="form-actions"> @@ -13,7 +13,7 @@ <% end %> <div class="row"> <div class="span8 well"> - <%= link_to 'List all', categories_path, :class => "btn" %> + <%= link_to 'List all', admin_categories_path, :class => "btn" %> </div> </div> </div> diff --git a/app/views/admin_public_body_headings/edit.html.erb b/app/views/admin_public_body_headings/edit.html.erb index 1c8416df3..eff89285a 100644 --- a/app/views/admin_public_body_headings/edit.html.erb +++ b/app/views/admin_public_body_headings/edit.html.erb @@ -3,7 +3,7 @@ <div class="row"> <div class="span8"> <div id="public_body_heading_form"> - <%= form_for @heading, :url => heading_path(@heading), :html => { :class => "form form-horizontal" } do |f| %> + <%= form_for @heading, :url => admin_heading_path(@heading), :html => { :class => "form form-horizontal" } do |f| %> <%= render :partial => 'form', :locals => {:f => f} %> <div class="form-actions"> <%= f.submit 'Save', :accesskey => 's', :class => "btn btn-success" %></p> @@ -14,14 +14,14 @@ <div class="row"> <div class="span8 well"> - <%= link_to 'List all', categories_path, :class => "btn" %> + <%= link_to 'List all', admin_categories_path, :class => "btn" %> </div> </div> <% if @heading.public_body_categories.empty? %> <div class="row"> <div class="span8"> - <%= form_tag(heading_path(@heading), :method => 'delete', :class => "form form-inline") do %> + <%= form_tag(admin_heading_path(@heading), :method => 'delete', :class => "form form-inline") do %> <%= hidden_field_tag(:public_body_heading_id, { :value => @heading.id } ) %> <%= submit_tag "Destroy #{@heading.name}", :name => @heading.name, :class => "btn btn-danger" %> (this is permanent!) <% end %> diff --git a/app/views/admin_public_body_headings/new.html.erb b/app/views/admin_public_body_headings/new.html.erb index b0066481f..91d5d4a9d 100644 --- a/app/views/admin_public_body_headings/new.html.erb +++ b/app/views/admin_public_body_headings/new.html.erb @@ -4,7 +4,7 @@ <div class="row"> <div class="span8"> <div id="public_heading_form"> - <%= form_for @heading, :url => headings_path, :html => {:class => "form form-horizontal"} do |f| %> + <%= form_for @heading, :url => admin_headings_path, :html => {:class => "form form-horizontal"} do |f| %> <%= render :partial => 'form', :locals => {:f => f} %> <div class="form-actions"> @@ -13,7 +13,7 @@ <% end %> <div class="row"> <div class="span8 well"> - <%= link_to 'List all', categories_path, :class => "btn" %> + <%= link_to 'List all', admin_categories_path, :class => "btn" %> </div> </div> </div> |