developers
/
orbit-4-1
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard 

Conflicts:
	app/assets/javascripts/bulletin_form.js.erb
	app/views/layouts/_side_bar.html.erb
	vendor/built_in_modules/archive/app/models/archive_file.rb
	vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_form.html.erb
	vendor/built_in_modules/page_content/app/controllers/panel/page_content/back_end/page_contexts_controller.rb
	vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb
This commit is contained in:
chris 2012-08-31 14:31:54 +08:00
parent 0cb573946e 1bfae05242
commit dcdd730a01
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/views/layouts/_side_bar.html.erb
View File

@ -87,6 +87,16 @@
<%# end -%> <%# end -%>
<%# end -%> <%# end -%>
<%= content_tag :li, :class => active_for_controllers('archive_files', 'tags', 'archive_file_categorys') do -%>
<%= link_to content_tag(:i, nil, :class => 'icons-asset') + t('admin.archive'), panel_archive_back_end_archive_files_path %>
<%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('archive_files', 'tags', 'archive_file_categorys')) do -%>
<%= content_tag :li, link_to(t('admin.all_articles'), panel_archive_back_end_archive_files_path), :class => active_for_action('archive_file', 'index') %>
<%= content_tag :li, link_to(t('admin.add_new'), new_panel_archive_back_end_archive_file_path), :class => active_for_action('archive_file', 'new') %>
<%= content_tag :li, link_to(t('admin.categories'), panel_archive_back_end_archive_file_categorys_path), :class => active_for_action('archive_file_categorys', 'index') %>
<%= content_tag :li, link_to(t('admin.tags'), panel_archive_back_end_tags_path), :class => active_for_action('tags', 'index') %>
<% end -%>
<% end -%>
<%= content_tag :li, :class => active_for_controllers(nil) do -%> <%= content_tag :li, :class => active_for_controllers(nil) do -%>
<%= link_to content_tag(:i, nil, :class => 'icons-cog') + t('admin.site_settings'), nil %> <%= link_to content_tag(:i, nil, :class => 'icons-cog') + t('admin.site_settings'), nil %>
<% end -%> <% end -%>

2
vendor/built_in_modules/archive/app/models/archive_file.rb vendored
View File

@ -54,7 +54,7 @@ class ArchiveFile
def is_top? def is_top?
self.is_top self.is_top
end end
def save_archive_file_multiples def save_archive_file_multiples
self.archive_file_multiples.each do |t| self.archive_file_multiples.each do |t|
if t.should_destroy if t.should_destroy

1
vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_form.html.erb vendored
View File

@ -111,7 +111,6 @@
</div> </div>
</div> </div>
<!--Post End--> <!--Post End-->

2
vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb vendored
View File

@ -8,7 +8,7 @@ class Panel::WebResource::BackEnd::WebLinksController < OrbitBackendController
end end
def index def index
get_categorys("WebLinkCategory",params[:web_link_category_id]) get_categorys("WebLinkCategory",params[:web_link_category_id])
@filter = params[:filter] @filter = params[:filter]
new_filter = params[:new_filter] new_filter = params[:new_filter]