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

Merge branch 'design_team' into ldap

This commit is contained in:
Christophe Vilayphiou 2012-05-17 18:37:56 +08:00
parent 79f484300e 27fd2d0714
commit 698c750cd7
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/admin/assets/_asset.html.erb
View File

@ -1,6 +1,6 @@
<tr id="asset_<%= asset.id %>" class="with_action"> <tr id="asset_<%= asset.id %>" class="with_action">
<td><%= check_box_tag 'to_delete[]', asset.id, false, :class => "checkbox_in_list" %></td> <td><%= check_box_tag 'to_delete[]', asset.id, false, :class => "checkbox_in_list" %></td>
<td><%= asset.i18n_variable[I18n.locale] rescue nil %></td> <td><%= asset.title.i18n_variable[I18n.locale] rescue nil %></td>
<td> <td>
<i class="icons-picture img-peview" rel="popover" data-content="<img src='<%= asset.data.url %>' />" data-original-title="<%= asset.data.filename %>"></i> <i class="icons-picture img-peview" rel="popover" data-content="<img src='<%= asset.data.url %>' />" data-original-title="<%= asset.data.filename %>"></i>
<div class="quick-edit"> <div class="quick-edit">
@ -12,7 +12,7 @@
</td> </td>
<td><%= asset.data.file.content_type %></td> <td><%= asset.data.file.content_type %></td>
<td><%= number_to_human_size(asset.data.file.file_length) %></td> <td><%= number_to_human_size(asset.data.file.file_length) %></td>
<td><%= asset.category.i18n_variable[I18n.locale] rescue nil %></td> <td><%= asset.description.i18n_variable[I18n.locale] rescue nil %></td>
<td> <td>
<div class="label-group"> <div class="label-group">
<div class="label-td"> <div class="label-td">

2
app/views/admin/assets/_sort_headers.html.erb
View File

@ -2,5 +2,5 @@
['description', 'description', 'span1-2', 'admin.data'], ['description', 'description', 'span1-2', 'admin.data'],
['intro', 'intro', 'span1-2', 'admin.file_type'], ['intro', 'intro', 'span1-2', 'admin.file_type'],
['intro', 'intro', 'span1-2', 'admin.file_length'], ['intro', 'intro', 'span1-2', 'admin.file_length'],
['intro', 'intro', 'span1-2', 'admin.category'], ['intro', 'intro', 'span1-2', 'admin.description'],
['intro', 'intro', 'span1-2', 'admin.tags']).html_safe %> ['intro', 'intro', 'span1-2', 'admin.tags']).html_safe %>

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

@ -71,11 +71,11 @@
<% end -%> <% end -%>
<% end -%> <% end -%>
<%= content_tag :li, :class => active_for_controllers('assets', '/admin/asset_tags', 'asset_categories') do -%> <%#= content_tag :li, :class => active_for_controllers('assets', '/admin/asset_tags', 'asset_categories') do -%>
<%= link_to content_tag(:i, nil, :class => 'icons-link') + t('admin.asset'), admin_assets_path %> <%#= link_to content_tag(:i, nil, :class => 'icons-link') + t('admin.asset'), admin_assets_path %>
<%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('assets', '/admin/asset_tags', 'asset_categories')) do -%> <%#= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('assets', '/admin/asset_tags', 'asset_categories')) do -%>
<%= content_tag :li, link_to(t('admin.all_assets'), admin_assets_path), :class => active_for_action('assets', 'index') %> <%#= content_tag :li, link_to(t('admin.all_assets'), admin_assets_path), :class => active_for_action('assets', 'index') %>
<%= content_tag :li, link_to(t('admin.categories'), admin_asset_categories_path), :class => active_for_action('asset_categories', 'index') %> <%#= content_tag :li, link_to(t('admin.categories'), admin_asset_categories_path), :class => active_for_action('asset_categories', 'index') %>
<%= content_tag :li, link_to(t('admin.tags'), admin_asset_tags_path), :class => active_for_action('/admin/asset_tags', 'index') %> <%#= content_tag :li, link_to(t('admin.tags'), admin_asset_tags_path), :class => active_for_action('/admin/asset_tags', 'index') %>
<% end -%> <%# end -%>
<% end -%> <%# end -%>