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

app/helpers/admin/asset_helper.rb

@@ -0,0 +1,11 @@
+module Admin::AssetHelper
+
+  def show_all_fields(asset, field)
+    a = []
+    @site_valid_locales.each do |locale|
+      a << asset.send(field)[locale] rescue nil
+    end 
+    a.join(' - ')
+  end
+
+end

app/views/admin/assets/file_upload.html.erb

@@ -13,7 +13,14 @@
             <div class="controls">
                 <%= f.fields_for :title, (@asset.new_record? ? @asset.build_title : @asset.title) do |f| %>
                     <div>
-                        <%= f.text_field I18n.locale, :class => "input-large" %>
+                    <% @site_valid_locales.each do |locale| %>
+                        <%= content_tag :label do -%>
+                            <div>
+                                <%= I18nVariable.from_locale(locale) %>
+                                <%= f.text_field locale, :class => "input-large" %>
+                            </div>
+                        <% end %>
+                      <% end %>
                     </div>
                 <% end %>
             </div>
@@ -23,7 +30,14 @@
             <div class="controls">
                 <%= f.fields_for :description, (@asset.new_record? ? @asset.build_description : @asset.description) do |f| %>
                     <div>
-                        <%= f.text_field I18n.locale, :class => "input-large" %>
+                    <% @site_valid_locales.each do |locale| %>
+                        <%= content_tag :label do -%>
+                            <div>
+                                <%= I18nVariable.from_locale(locale) %>
+                                <%= f.text_field locale, :class => "input-large" %>
+                            </div>
+                        <% end %>
+                      <% end %>
                     </div>
                 <% end %>
             </div>