developers
/
Orbit
2
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 19:10:22 +08:00
parent 698c750cd7 606050627e
commit 25de941df7
2 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/admin/assets/create.js.erb
View File

File diff suppressed because one or more lines are too long

14
app/views/admin/assets/file_upload.html.erb
View File

@ -12,30 +12,20 @@
<label for="title" class="control-label error"><%= t 'admin.title' %></label>
<div class="controls">
<%= f.fields_for :title, (@asset.new_record? ? @asset.build_title : @asset.title) do |f| %>
<% @site_valid_locales.each do |locale| %>
<%= content_tag :label do -%>
<div>
<%= I18nVariable.from_locale(locale) %>
<%= f.text_field locale, :class => "input-large" %>
<%= f.text_field I18n.locale, :class => "input-large" %>
</div>
<% end %>
<% end %>
<% end %>
</div>
</div>
<div class="control-group">
<label for="description" class="control-label error"><%= t 'admin.description' %></label>
<div class="controls">
<%= f.fields_for :description, (@asset.new_record? ? @asset.build_description : @asset.description) do |f| %>
<% @site_valid_locales.each do |locale| %>
<%= content_tag :label do -%>
<div>
<%= I18nVariable.from_locale(locale) %>
<%= f.text_field locale, :class => "input-large" %>
<%= f.text_field I18n.locale, :class => "input-large" %>
</div>
<% end %>
<% end %>
<% end %>
</div>
</div>
<div class="control-group">