From 2c0761aafbf23cbf8dcdcd32b24466e929a01920 Mon Sep 17 00:00:00 2001 From: saurabhbhatia Date: Wed, 28 Aug 2013 18:29:21 +0800 Subject: [PATCH] Updated Sitemap to New UI --- app/views/admin/sites/_side_bar.html.erb | 53 +++++++++------- app/views/admin/sites/_sitemap_block.html.erb | 22 +++---- app/views/admin/sites/sitemap.html.erb | 63 ++++++++++++++----- 3 files changed, 87 insertions(+), 51 deletions(-) diff --git a/app/views/admin/sites/_side_bar.html.erb b/app/views/admin/sites/_side_bar.html.erb index 2a564bd52..7c415a786 100644 --- a/app/views/admin/sites/_side_bar.html.erb +++ b/app/views/admin/sites/_side_bar.html.erb @@ -1,26 +1,35 @@ -<%= content_tag :li, :class => active_for_controllers('sites') do -%> - <%= link_to content_tag(:i, nil, :class => 'icons-cog') + content_tag(:span, t('site.settings')), admin_site_site_info_path(@site) %> + - <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('sites')) do -%> - <%= content_tag :li, link_to(t('site.info'), admin_site_site_info_path(@site)), :class => active_for_action('sites', 'site_info') %> - <%#= content_tag :li, link_to(t(:system_info), admin_site_system_info_path(@site)), :class => active_for_action('sites', 'system_info') %> - <%#= content_tag :li, link_to(t('site.language'), admin_site_language_path(@site)), :class => active_for_action('sites', 'language') %> - <%= content_tag :li, link_to(t('mail.setting'), admin_site_mail_setting_path(@site)), :class => active_for_action('sites', 'mail_setting') %> - <%#= content_tag :li, link_to(t(:theme), admin_site_ui_theme_path(@site)), :class => active_for_action('sites', 'ui_theme') %> - <%= content_tag :li, link_to(t('sitemap'), admin_site_sitemap_path(@site)), :class => active_for_action('sites', 'sitemap') %> - <%= content_tag :li, link_to(t('user_actions'), admin_user_actions_path), :class => active_for_action('user_actions', 'index') %> - <% end -%> + \ No newline at end of file diff --git a/app/views/admin/sites/_sitemap_block.html.erb b/app/views/admin/sites/_sitemap_block.html.erb index 5d1d5c3c2..4dab5b93f 100644 --- a/app/views/admin/sites/_sitemap_block.html.erb +++ b/app/views/admin/sites/_sitemap_block.html.erb @@ -1,16 +1,10 @@ -
-

- - <%= sitemap_block_counter + 1 %> <%= sitemap_block.title_translations[temp_locale] %> -

- -
diff --git a/app/views/admin/sites/sitemap.html.erb b/app/views/admin/sites/sitemap.html.erb index cdcbc59b8..483f136df 100644 --- a/app/views/admin/sites/sitemap.html.erb +++ b/app/views/admin/sites/sitemap.html.erb @@ -1,21 +1,23 @@ + + + + + + + <%= stylesheet_link_tag "lib/wrap-nav"%> + <%= stylesheet_link_tag "lib/filter"%> + <%= stylesheet_link_tag "lib/sitemap"%> + <%= stylesheet_link_tag "lib/togglebox"%> + + <%= javascript_include_tag 'lib/sitemap' %> + <%= javascript_include_tag 'lib/masonry.pkgd.min' %> + + + <% content_for :side_bar do %> <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('site.settings'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-cog', :side_bar_content => 'admin/sites/side_bar'} %> <% end %> - - -
- <% @site_valid_locales.each_with_index do |temp_locale, i| %> -
"> - <%= render :partial => 'sitemap_block', :collection => @items, :locals => {:temp_locale => temp_locale} %> -
- <% end %> -
- <% content_for :page_specific_javascript do %> <%= javascript_include_tag "lib/jquery.masonry.min.js" %> -<% end %> \ No newline at end of file +<% end %> + +
+
+ +
+ + <% @site_valid_locales.each_with_index do |temp_locale, i| %> +
+
+
    "> + <%= render :partial => 'sitemap_block', :collection => @items, :locals => {:temp_locale => temp_locale} %> +
+ <% end %> +


+ + + <% @site_valid_locales.each_with_index do |temp_locale, i| %> +
"> + <%= render :partial => 'sitemap_block', :collection => @items, :locals => {:temp_locale => temp_locale} %> +
+ <% end %> +
+ + +
+
+