From 7216676c40d43bb270ef0435ee71c33fd20c4689 Mon Sep 17 00:00:00 2001 From: saurabhbhatia Date: Mon, 9 Sep 2013 10:17:24 +0800 Subject: [PATCH] Updated Sidebar and Preferences --- app/views/admin/assets/_sort_headers.html.erb | 7 ------- app/views/admin/designs/_sort_headers.html.erb | 5 ----- app/views/admin/items/_site_bar.html.erb | 2 +- app/views/admin/sites/_side_bar.html.erb | 2 +- app/views/admin/sites/preference.html.erb | 2 +- app/views/admin/users_new_interface/_sort_headers.html.erb | 7 ------- .../archive/back_end/archive_files/_sort_headers.html.erb | 6 ------ .../back_end/page_contexts/_sort_headers.html.erb | 4 ---- .../back_end/writing_books/_sort_headers.html.erb | 4 ---- .../plugin/writing_books/_sort_headers.html.erb | 3 --- .../back_end/writing_conferences/_sort_headers.html.erb | 4 ---- .../plugin/writing_conferences/_sort_headers.html.erb | 3 --- .../back_end/diplomas/_sort_headers.html.erb | 4 ---- .../plugin/diplomas/_sort_headers.html.erb | 3 --- 14 files changed, 3 insertions(+), 53 deletions(-) diff --git a/app/views/admin/assets/_sort_headers.html.erb b/app/views/admin/assets/_sort_headers.html.erb index 85cb5df5..e69de29b 100644 --- a/app/views/admin/assets/_sort_headers.html.erb +++ b/app/views/admin/assets/_sort_headers.html.erb @@ -1,7 +0,0 @@ -<%= render_sort_bar(true, delete_admin_assets_path(:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil, :sort_options => params[:sort_options]), - ['title', 'title','span4', :title], - ['description', 'description', 'span1-2', :data], - ['intro', 'intro', 'span1-2', :type], - ['intro', 'intro', 'span1-2', :size], - ['intro', 'intro', 'span1-2', :description], - ['intro', 'intro', 'span1-2', :tags]).html_safe %> diff --git a/app/views/admin/designs/_sort_headers.html.erb b/app/views/admin/designs/_sort_headers.html.erb index b66114c9..e69de29b 100644 --- a/app/views/admin/designs/_sort_headers.html.erb +++ b/app/views/admin/designs/_sort_headers.html.erb @@ -1,5 +0,0 @@ -<%=# render_sort_bar(true, delete_admin_designs_path(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]), - ['title', 'title','span2', :title], - ['', '', 'span1', :default], - ['intro', 'intro', 'span7', :intro], - ['author', 'author', 'span2', :author]).html_safe %> diff --git a/app/views/admin/items/_site_bar.html.erb b/app/views/admin/items/_site_bar.html.erb index eef5c323..0a83994b 100644 --- a/app/views/admin/items/_site_bar.html.erb +++ b/app/views/admin/items/_site_bar.html.erb @@ -20,7 +20,7 @@
  • <%= link_to admin_module_store_path, :class => active_for_action('module_store', 'index') do %><%end%>
  • -
  • <%= link_to admin_template_store_path, :class => active_for_action('template_store', 'index') do %><%end%>
  • +
  • <%= link_to admin_designs_path, :class => active_for_action('template_store', 'index') do %><%end%>
  • <%= link_to admin_site_site_info_path(@site), :class => active_for_action('sites', 'site_info') do %><%end%>
  • diff --git a/app/views/admin/sites/_side_bar.html.erb b/app/views/admin/sites/_side_bar.html.erb index f2a63ce1..5ddb07e5 100644 --- a/app/views/admin/sites/_side_bar.html.erb +++ b/app/views/admin/sites/_side_bar.html.erb @@ -9,7 +9,7 @@
  • <%= link_to admin_module_store_path, :class => active_for_action('module_store', 'index') do %><%end%>
  • -
  • <%= link_to admin_template_store_path, :class => active_for_action('template_store', 'index') do %><%end%>
  • +
  • <%= link_to admin_designs_path, :class => active_for_action('template_store', 'index') do %><%end%>
  • <%= link_to admin_site_site_info_path(@site), :class => active_for_action('sites', 'site_info') do %><%end%>
  • diff --git a/app/views/admin/sites/preference.html.erb b/app/views/admin/sites/preference.html.erb index 26c42793..015c6de7 100644 --- a/app/views/admin/sites/preference.html.erb +++ b/app/views/admin/sites/preference.html.erb @@ -130,7 +130,7 @@
    - <%= f.check_box :desktop_open , :class=>"toggle-check" %> + <%= f.check_box :desktop_closed , :class=>"toggle-check" %>
    diff --git a/app/views/admin/users_new_interface/_sort_headers.html.erb b/app/views/admin/users_new_interface/_sort_headers.html.erb index e7e4b462..e69de29b 100644 --- a/app/views/admin/users_new_interface/_sort_headers.html.erb +++ b/app/views/admin/users_new_interface/_sort_headers.html.erb @@ -1,7 +0,0 @@ -<%#= render_sort_bar(true, delete_admin_assets_path(:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil, :sort_options => params[:sort_options]), - ['title', 'title','span4', 'title'], - ['description', 'description', 'span1-2', 'data'], - ['intro', 'intro', 'span1-2', 'file_type'], - ['intro', 'intro', 'span1-2', 'file_length'], - ['intro', 'intro', 'span1-2', 'description'], - ['intro', 'intro', 'span1-2', 'tags']).html_safe %> diff --git a/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_sort_headers.html.erb b/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_sort_headers.html.erb index 34552e76..e69de29b 100644 --- a/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_sort_headers.html.erb +++ b/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_sort_headers.html.erb @@ -1,6 +0,0 @@ -<%= render_sort_bar(true, delete_panel_archive_back_end_archive_files_path(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]), - ['sort_number', 'sort_number', 'span1', :sort_number], - ['status', ['is_top', 'is_hot', 'is_hidden'], 'span1', :status], - ['category', 'archive_file_category', 'span2', :category], - ['title', 'title','span3', :title], - ['tags', 'tags', 'span2', :tags]).html_safe %> diff --git a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_sort_headers.html.erb b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_sort_headers.html.erb index 6ba238c1..e69de29b 100644 --- a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_sort_headers.html.erb +++ b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_sort_headers.html.erb @@ -1,4 +0,0 @@ -<%= render_sort_bar(false, nil, ['name', 'page','span7', :name], - ['version', 'version', 'span2', :version], - ['update_time', 'updated_at', 'span2', :update_at], - ['last_modified', 'update_user_id', 'span2', :last_modified]).html_safe %> diff --git a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_sort_headers.html.erb b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_sort_headers.html.erb index dcfb35c0..e69de29b 100644 --- a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_sort_headers.html.erb +++ b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_sort_headers.html.erb @@ -1,4 +0,0 @@ -<%= render_sort_bar(true, delete_panel_personal_book_back_end_writing_books_path(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]), - ['year', 'year', 'span1', 'writing_book.year'], - ['title', 'title','span3', 'writing_book.title'], - ['create_modified', 'create_user_id','span1-3', 'writing_book.create_modified']).html_safe %> \ No newline at end of file diff --git a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/plugin/writing_books/_sort_headers.html.erb b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/plugin/writing_books/_sort_headers.html.erb index 9f1aad8b..e69de29b 100644 --- a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/plugin/writing_books/_sort_headers.html.erb +++ b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/plugin/writing_books/_sort_headers.html.erb @@ -1,3 +0,0 @@ -<%= render_sort_bar(true, delete_panel_personal_book_back_end_writing_books_path(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]), - ['year', 'year', 'span1', 'writing_book.year'], - ['title', 'title','span3', 'writing_book.title']).html_safe %> \ No newline at end of file diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/_sort_headers.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/_sort_headers.html.erb index 29fb2056..e69de29b 100644 --- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/_sort_headers.html.erb +++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/_sort_headers.html.erb @@ -1,4 +0,0 @@ -<%= render_sort_bar(true, delete_panel_personal_conference_back_end_writing_conferences_path(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]), - ['year', 'year', 'span1', 'writing_conference.year'], - ['title', 'title','span3', 'writing_conference.title'], - ['create_modified', 'create_user_id','span1-3', 'writing_conference.create_modified']).html_safe %> diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/plugin/writing_conferences/_sort_headers.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/plugin/writing_conferences/_sort_headers.html.erb index 0951e9d8..e69de29b 100644 --- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/plugin/writing_conferences/_sort_headers.html.erb +++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/plugin/writing_conferences/_sort_headers.html.erb @@ -1,3 +0,0 @@ -<%= render_sort_bar(true, delete_panel_personal_conference_back_end_writing_conferences_path(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]), - ['year', 'year', 'span1', 'writing_conference.year'], - ['title', 'title','span3', 'writing_conference.title']).html_safe %> diff --git a/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/back_end/diplomas/_sort_headers.html.erb b/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/back_end/diplomas/_sort_headers.html.erb index 06abaaa7..e69de29b 100644 --- a/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/back_end/diplomas/_sort_headers.html.erb +++ b/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/back_end/diplomas/_sort_headers.html.erb @@ -1,4 +0,0 @@ -<%= render_sort_bar(true, delete_panel_personal_diploma_back_end_diplomas_path(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]), - ['date', 'date', 'span1', 'diploma.date'], - ['school_name', 'school_name', 'span3', 'diploma.school_name'], - ['create_modified', 'create_user_id','span1-3', 'diploma.create_modified']).html_safe %> \ No newline at end of file diff --git a/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/plugin/diplomas/_sort_headers.html.erb b/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/plugin/diplomas/_sort_headers.html.erb index 4a56b537..e69de29b 100644 --- a/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/plugin/diplomas/_sort_headers.html.erb +++ b/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/plugin/diplomas/_sort_headers.html.erb @@ -1,3 +0,0 @@ -<%= render_sort_bar(true, delete_panel_personal_diploma_back_end_diplomas_path(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]), - ['date', 'date', 'span1', 'diploma.date'], - ['school_name', 'school_name', 'span3', 'diploma.school_name']).html_safe %> \ No newline at end of file