developers
/
orbit-basic
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 16:41:11 +08:00
parent 1e2b146c21 29c54e6480
commit 5e93fe51a9
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/stylesheets/message.css
View File

@ -1,7 +1,7 @@
/*message*/
.error{
color:red;
color: #B94A48;
}
.notice, .message{

2
app/models/asset.rb
View File

@ -10,7 +10,7 @@ class Asset
has_one :i18n_variable, :as => :language_value, :autosave => true, :dependent => :destroy
validates_presence_of :filename, :data
validates_presence_of :filename, :data, :asset_category_id
belongs_to :asset_category
belongs_to :assetable, polymorphic: true

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

@ -9,7 +9,7 @@
</div>
<div class="modal-body form-horizontal">
<div class="control-group">
<label for="title" class="control-label"><%= t 'admin.title' %></label>
<label for="title" class="control-label error"><%= t 'admin.title' %></label>
<div class="controls">
<%= f.fields_for :i18n_variable, (@asset.new_record? ? @asset.build_i18n_variable : @asset.i18n_variable) do |f| %>
<% @site_valid_locales.each do |locale| %>
@ -23,8 +23,8 @@
<% end %>
</div>
</div>
<div class="control-group">
<label class="control-label"><%= f.label :category, t('admin.category') %></label>
<div class="control-group error">
<%= f.label :category, t('admin.category'), :class => "control-label" %>
<div class="controls">
<%= f.select :asset_category_id, @asset_categories.collect{|t| [ t.i18n_variable[I18n.locale], t.id ]}, {}, :class => "input-large" %>
</div>
@ -41,7 +41,7 @@
</div>
</div>
<div class="control-group">
<label class="control-label"><%= f.label :data, t('admin.data') %></label>
<%= f.label :data, t('admin.data'), :class => "control-label" %>
<div class="controls">
<%= f.file_field :data, :class => 'upload' %>
</div>