diff --git a/app/controllers/admin/page_parts_controller.rb b/app/controllers/admin/page_parts_controller.rb index 2fb35412b..f6c9d1c78 100644 --- a/app/controllers/admin/page_parts_controller.rb +++ b/app/controllers/admin/page_parts_controller.rb @@ -48,7 +48,7 @@ class Admin::PagePartsController < OrbitBackendController get_categories_and_tags get_frontend_data_count @app_frontend_urls = get_app_frontend_urls - @no_orbit_bar = true + @no_orbit_bar = @side_bar = @no_header = true end def reload_widgets diff --git a/app/views/admin/links/_form.html.erb b/app/views/admin/links/_form.html.erb index 9d9b585f4..8a2390ffc 100644 --- a/app/views/admin/links/_form.html.erb +++ b/app/views/admin/links/_form.html.erb @@ -2,15 +2,9 @@ <%= f.error_messages %> <%= f.hidden_field :parent, :value => (@item.parent.id rescue nil) %> - -<<<<<<< Updated upstream -<%= f.label :name, t(:name) %> -<%= f.text_field :name, class: 'input-xlarge', placeholder: t(:name) %> -======= <%= f.label :name, content_tag(:i, nil, :class => "icons-star") + t(:name) %> <%= f.text_field :name, class: 'input-xlarge', placeholder: t(:name) %> <%= I18n.t("front_page.name_field_helper") %> ->>>>>>> Stashed changes <%= f.label :url, t(:url) %> <%= f.text_field :url, :class => 'input-xlarge', placeholder: t(:url) %> diff --git a/app/views/layouts/structure.html.erb b/app/views/layouts/structure.html.erb index b40c49884..302cab49e 100644 --- a/app/views/layouts/structure.html.erb +++ b/app/views/layouts/structure.html.erb @@ -11,16 +11,18 @@ <%= render 'layouts/orbit_bar' unless @no_orbit_bar %> - <%= render 'site_bar' %> + <%= render 'admin/items/site_bar' unless @side_bar %>
-
- - <%= yield :right_nav %> -
+ <% unless @no_header %> +
+ + <%= yield :right_nav %> +
+ <% end %> <%= yield %>