saurabh
/
orbit-basic
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for structure

This commit is contained in:
chris 2013-07-29 18:46:38 +08:00
parent f332a3191a
commit ff59feb2e7
3 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/admin/page_parts_controller.rb
View File

@ -48,7 +48,7 @@ class Admin::PagePartsController < OrbitBackendController
get_categories_and_tags get_categories_and_tags
get_frontend_data_count get_frontend_data_count
@app_frontend_urls = get_app_frontend_urls @app_frontend_urls = get_app_frontend_urls
@no_orbit_bar = true @no_orbit_bar = @side_bar = @no_header = true
end end
def reload_widgets def reload_widgets

6
app/views/admin/links/_form.html.erb
View File

@ -2,15 +2,9 @@
<%= f.error_messages %> <%= f.error_messages %>
<%= f.hidden_field :parent, :value => (@item.parent.id rescue nil) %> <%= 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.label :name, content_tag(:i, nil, :class => "icons-star") + t(:name) %>
<%= f.text_field :name, class: 'input-xlarge', placeholder: t(:name) %> <%= f.text_field :name, class: 'input-xlarge', placeholder: t(:name) %>
<span class="help-block"><%= I18n.t("front_page.name_field_helper") %></span> <span class="help-block"><%= I18n.t("front_page.name_field_helper") %></span>
>>>>>>> Stashed changes
<%= f.label :url, t(:url) %> <%= f.label :url, t(:url) %>
<%= f.text_field :url, :class => 'input-xlarge', placeholder: t(:url) %> <%= f.text_field :url, :class => 'input-xlarge', placeholder: t(:url) %>

4
app/views/layouts/structure.html.erb
View File

@ -11,9 +11,10 @@
</head> </head>
<body id="sideset"> <body id="sideset">
<%= render 'layouts/orbit_bar' unless @no_orbit_bar %> <%= render 'layouts/orbit_bar' unless @no_orbit_bar %>
<%= render 'site_bar' %> <%= render 'admin/items/site_bar' unless @side_bar %>
<section id="main-wrap"> <section id="main-wrap">
<div class="wrap-inner"> <div class="wrap-inner">
<% unless @no_header %>
<div id="filter" class="topnav clearfix"> <div id="filter" class="topnav clearfix">
<ul class="breadcrumb text-info pull-left"> <ul class="breadcrumb text-info pull-left">
<li><a href="/orbit_4.0.1/admin/dashboards/dashboards.shtml">Dashboard</a> <span class="divider">/</span></li> <li><a href="/orbit_4.0.1/admin/dashboards/dashboards.shtml">Dashboard</a> <span class="divider">/</span></li>
@ -21,6 +22,7 @@
</ul> </ul>
<%= yield :right_nav %> <%= yield :right_nav %>
</div> </div>
<% end %>
<%= yield %> <%= yield %>
<div id="pageslide"> <div id="pageslide">
<div id="view-page" class="nano" style="display:none"> <div id="view-page" class="nano" style="display:none">