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

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

Conflicts:
	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
This commit is contained in:
Christophe Vilayphiou 2012-08-10 15:30:33 +08:00
parent 53cd39f180 b31846f424
commit bebb8a1c1e
3 changed files with 12 additions and 9 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

@ -76,6 +76,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 -%>

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

@ -7,11 +7,6 @@ class ArchiveFile
PAYMENT_TYPES = @site_valid_locales PAYMENT_TYPES = @site_valid_locales
<<<<<<< HEAD
=======
PAYMENT_TYPES = @site_valid_locales
>>>>>>> archive checkbox
has_one :title, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy has_one :title, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy
has_and_belongs_to_many :tags, :class_name => "ArchiveTag" has_and_belongs_to_many :tags, :class_name => "ArchiveTag"

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

@ -72,7 +72,6 @@
</div> </div>
<div> <div>
<div id='archive_file_multiples' class="archive_file_multiples_block"> <div id='archive_file_multiples' class="archive_file_multiples_block">
@ -112,7 +111,6 @@
</div> </div>
</div> </div>
<!--Post End--> <!--Post End-->