bilingual for files fixed and description added and also filename display after selecting filenames

Conflicts:
	app/assets/javascripts/desktop/orbitdesktop.js

app/assets/javascripts/desktop/orbitdesktop.js

@@ -418,7 +418,7 @@ var orbitDesktop = function(dom){
           total_width = (!isNaN(base_width)) ? (base_width + gutter*2 +1) * total_columns : null;
         break;
         case "column":
-          var column; x=0;
+         var column,x = 0;
           entries = column_container.find("div[column=true]");
           if(entries.length!=0){
             entries.each(function(i,ul){

vendor/built_in_modules/personal_book/app/assets/javascripts/personal_book/desktop/personal_books.js

@@ -63,8 +63,8 @@ orbitDesktop.prototype.initializePersonalBook = function(target,url,cache){ // t
 
   var languageSelect = function(){
     $(".language_select a").click(function(event) {
-        $("li[data-language]").hide();
+        $("*[data-language]").hide();
-        $("li[data-language="+$(this).data("lang")+"]").show();
+        $("*[data-language="+$(this).data("lang")+"]").show();
         return false;
     });
   }

vendor/built_in_modules/personal_book/app/models/writing_book_file.rb

@@ -5,7 +5,7 @@ class WritingBookFile
 
   mount_uploader :file, AssetUploader
 
-  # field :description, localize: true
+  field :description, localize: true
   field :should_destroy, :type => Boolean  
   field :title, localize: true
   

vendor/built_in_modules/personal_book/app/views/panel/personal_book/desktop/personal_books/_form_file.html.erb

@@ -2,21 +2,32 @@
   <td>
     <div>
       <% if form_file.new_record? %>
-        <%= f.file_field :file, class: "s_grid_2" %>
+        <%= f.file_field :file, class: "s_grid_2", onchange:"this.parentNode.getElementsByTagName('label')[0].innerHTML = this.value" %>
+        <label></label>
       <% end %>
     </div>
   </td>
-  <td>
+    <% @site_valid_locales.each_with_index do |locale, i| %>
-    <%= f.text_field :title, :class => 's_grid_4' %>
+        <% style = locale != I18n.locale.to_s ? 'style=display:none;' : "" %>
-  </td>
+        <% data = "data-language=" + locale  %>
-  <td>
+      <td  <%= style %> <%= data %>>
          <%= f.fields_for :file_title_translations do |f| %>
            <%= f.text_field locale, 
             class: 's_grid_4',
+            placeholder: I18nVariable.from_locale(locale),
             value: (form_file.file_title_translations[locale] rescue nil) %>
           <% end %>
       </td>
   
+      <td <%= style %> <%= data %>>
+          <%= f.fields_for :file_description_translations do |f| %>
+            <%= f.text_field locale,
+              class: 's_grid_4',
+              placeholder: I18nVariable.from_locale(locale),
+              value: (form_file.file_description_translations[locale] rescue nil) %>
+          <% end %>
+     </td>
+    <% end %>
   <td>
     <span class="action">
       <% if form_file.new_record? %>

vendor/built_in_modules/personal_conference/app/assets/javascripts/personal_conference/desktop/conference_pages.js

@@ -63,8 +63,8 @@ orbitDesktop.prototype.initializeConferencePapers = function(target,url,cache){
 
   var languageSelect = function(){
     $(".language_select a").click(function(event) {
-        $("li[data-language]").hide();
+        $("*[data-language]").hide();
-        $("li[data-language="+$(this).data("lang")+"]").show();
+        $("*[data-language="+$(this).data("lang")+"]").show();
         return false;
     });
   }

vendor/built_in_modules/personal_conference/app/models/writing_conference_file.rb

@@ -5,7 +5,7 @@ class WritingConferenceFile
 
   mount_uploader :file, AssetUploader
 
-  # field :description, localize: true
+  field :description, localize: true
   field :should_destroy, :type => Boolean  
   field :title, localize: true
   

vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form_file.html.erb

@@ -2,21 +2,32 @@
   <td>
     <div>
       <% if form_file.new_record? %>
-        <%= f.file_field :file, class: "s_grid_2 s_grid" %>
+        <%= f.file_field :file, class: "s_grid_2", onchange:"this.parentNode.getElementsByTagName('label')[0].innerHTML = this.value" %>
+        <label></label>
       <% end %>
     </div>
   </td>
-  <td>
+    <% @site_valid_locales.each_with_index do |locale, i| %>
-    <%= f.text_field :title, class: 's_grid_4 s_grid' %>
+        <% style = locale != I18n.locale.to_s ? 'style=display:none;' : "" %>
-  </td>
+        <% data = "data-language=" + locale  %>
-  <td>
+      <td  <%= style %> <%= data %>>
          <%= f.fields_for :file_title_translations do |f| %>
            <%= f.text_field locale, 
-        class: 's_grid_4 s_grid',
+            class: 's_grid_4',
+            placeholder: I18nVariable.from_locale(locale),
             value: (form_file.file_title_translations[locale] rescue nil) %>
           <% end %>
       </td>
   
+      <td <%= style %> <%= data %>>
+          <%= f.fields_for :file_description_translations do |f| %>
+            <%= f.text_field locale,
+              class: 's_grid_4',
+              placeholder: I18nVariable.from_locale(locale),
+              value: (form_file.file_description_translations[locale] rescue nil) %>
+          <% end %>
+     </td>
+    <% end %>
   <td>
     <span class="action">
       <% if form_file.new_record? %>

vendor/built_in_modules/personal_diploma/app/assets/javascripts/personal_diploma/desktop/personal_diploma.js

@@ -63,8 +63,8 @@ orbitDesktop.prototype.initializePersonalDiploma = function(target,url,cache){ /
 
   var languageSelect = function(){
     $(".language_select a").click(function(event) {
-        $("li[data-language]").hide();
+        $("*[data-language]").hide();
-        $("li[data-language="+$(this).data("lang")+"]").show();
+        $("*[data-language="+$(this).data("lang")+"]").show();
         return false;
     });
   }

vendor/built_in_modules/personal_experience/app/assets/javascripts/personal_experience/desktop/personal_experiences.js

@@ -63,8 +63,8 @@ orbitDesktop.prototype.initializePersonalExperience = function(target,url,cache)
 
   var languageSelect = function(){
     $(".language_select a").click(function(event) {
-        $("li[data-language]").hide();
+        $("*[data-language]").hide();
-        $("li[data-language="+$(this).data("lang")+"]").show();
+        $("*[data-language="+$(this).data("lang")+"]").show();
         return false;
     });
   }

vendor/built_in_modules/personal_honor/app/assets/javascripts/personal_honor/desktop/personal_honors.js

@@ -63,8 +63,8 @@ orbitDesktop.prototype.initializePersonalHonor = function(target,url,cache){ //
 
   var languageSelect = function(){
     $(".language_select a").click(function(event) {
-        $("li[data-language]").hide();
+        $("*[data-language]").hide();
-        $("li[data-language="+$(this).data("lang")+"]").show();
+        $("*[data-language="+$(this).data("lang")+"]").show();
         return false;
     });
   }

vendor/built_in_modules/personal_journal/app/assets/javascripts/personal_journal/desktop/journal_pages.js

@@ -63,8 +63,8 @@ orbitDesktop.prototype.initializeJournalPapers = function(target,url,cache){ //
 
   var languageSelect = function(){
     $(".language_select a").click(function(event) {
-        $("li[data-language]").hide();
+        $("*[data-language]").hide();
-        $("li[data-language="+$(this).data("lang")+"]").show();
+        $("*[data-language="+$(this).data("lang")+"]").show();
         return false;
     });
   }

vendor/built_in_modules/personal_journal/app/models/writing_journal_file.rb

@@ -5,7 +5,7 @@ class WritingJournalFile
 
   mount_uploader :file, AssetUploader
 
-  # field :description, localize: true
+  field :description, localize: true
   field :should_destroy, :type => Boolean
   field :title, localize: true
 

vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form_file.html.erb

@@ -2,21 +2,32 @@
   <td>
     <div>
       <% if form_file.new_record? %>
-        <%= f.file_field :file, class: "s_grid_2" %>
+        <%= f.file_field :file, class: "s_grid_2", onchange:"this.parentNode.getElementsByTagName('label')[0].innerHTML = this.value" %>
+        <label></label>
       <% end %>
     </div>
   </td>
-  <td>
+    <% @site_valid_locales.each_with_index do |locale, i| %>
-    <%= f.text_field :title, :class => 's_grid_4' %>
+        <% style = locale != I18n.locale.to_s ? 'style=display:none;' : "" %>
-  </td>
+        <% data = "data-language=" + locale  %>
-  <td>
+      <td  <%= style %> <%= data %>>
          <%= f.fields_for :file_title_translations do |f| %>
            <%= f.text_field locale, 
             class: 's_grid_4',
+            placeholder: I18nVariable.from_locale(locale),
             value: (form_file.file_title_translations[locale] rescue nil) %>
           <% end %>
       </td>
   
+      <td <%= style %> <%= data %>>
+          <%= f.fields_for :file_description_translations do |f| %>
+            <%= f.text_field locale,
+              class: 's_grid_4',
+              placeholder: I18nVariable.from_locale(locale),
+              value: (form_file.file_description_translations[locale] rescue nil) %>
+          <% end %>
+     </td>
+    <% end %>
   <td>
     <span class="action">
       <% if form_file.new_record? %>

vendor/built_in_modules/personal_lab/app/assets/javascripts/personal_lab/desktop/personal_lab.js

@@ -65,8 +65,8 @@ orbitDesktop.prototype.initializePersonalLab = function(target,url,cache){ // th
 
   var languageSelect = function(){
     $(".language_select a").click(function(event) {
-        $("li[data-language]").hide();
+        $("*[data-language]").hide();
-        $("li[data-language="+$(this).data("lang")+"]").show();
+        $("*[data-language="+$(this).data("lang")+"]").show();
         return false;
     });
   }

vendor/built_in_modules/personal_lab/app/models/lab_file.rb

@@ -5,7 +5,7 @@ class LabFile
 
   mount_uploader :file, AssetUploader
 
-  # field :description, localize: true
+  field :description, localize: true
   field :should_destroy, :type => Boolean  
   field :title, localize: true
   

vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/desktop/personal_labs/_form_file.html.erb

@@ -2,21 +2,32 @@
   <td>
     <div>
       <% if form_file.new_record? %>
-        <%= f.file_field :file, class: "s_grid_2" %>
+        <%= f.file_field :file, class: "s_grid_2", onchange:"this.parentNode.getElementsByTagName('label')[0].innerHTML = this.value" %>
+        <label></label>
       <% end %>
     </div>
   </td>
-  <td>
+    <% @site_valid_locales.each_with_index do |locale, i| %>
-    <%= f.text_field :title, :class => 's_grid_4' %>
+        <% style = locale != I18n.locale.to_s ? 'style=display:none;' : "" %>
-  </td>
+        <% data = "data-language=" + locale  %>
-  <td>
+      <td  <%= style %> <%= data %>>
          <%= f.fields_for :file_title_translations do |f| %>
            <%= f.text_field locale, 
             class: 's_grid_4',
+            placeholder: I18nVariable.from_locale(locale),
             value: (form_file.file_title_translations[locale] rescue nil) %>
           <% end %>
       </td>
   
+      <td <%= style %> <%= data %>>
+          <%= f.fields_for :file_description_translations do |f| %>
+            <%= f.text_field locale,
+              class: 's_grid_4',
+              placeholder: I18nVariable.from_locale(locale),
+              value: (form_file.file_description_translations[locale] rescue nil) %>
+          <% end %>
+     </td>
+    <% end %>
   <td>
     <span class="action">
       <% if form_file.new_record? %>

vendor/built_in_modules/personal_patent/app/assets/javascripts/personal_patent/desktop/personal_patent.js

@@ -63,8 +63,8 @@ orbitDesktop.prototype.initializePersonalPatent = function(target,url,cache){ //
 
   var languageSelect = function(){
     $(".language_select a").click(function(event) {
-        $("li[data-language]").hide();
+        $("*[data-language]").hide();
-        $("li[data-language="+$(this).data("lang")+"]").show();
+        $("*[data-language="+$(this).data("lang")+"]").show();
         return false;
     });
   }

vendor/built_in_modules/personal_patent/app/models/writing_patent_file.rb

@@ -5,7 +5,7 @@ class WritingPatentFile
 
   mount_uploader :file, AssetUploader
 
-  # field :description, localize: true
+  field :description, localize: true
   field :should_destroy, :type => Boolean  
   field :title, localize: true
   

vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/desktop/personal_patents/_form_file.html.erb

@@ -2,21 +2,32 @@
   <td>
     <div>
       <% if form_file.new_record? %>
-        <%= f.file_field :file, class: "s_grid_2" %>
+        <%= f.file_field :file, class: "s_grid_2", onchange:"this.parentNode.getElementsByTagName('label')[0].innerHTML = this.value" %>
+        <label></label>
       <% end %>
     </div>
   </td>
-  <td>
+    <% @site_valid_locales.each_with_index do |locale, i| %>
-    <%= f.text_field :title, :class => 's_grid_4' %>
+        <% style = locale != I18n.locale.to_s ? 'style=display:none;' : "" %>
-  </td>
+        <% data = "data-language=" + locale  %>
-  <td>
+      <td  <%= style %> <%= data %>>
          <%= f.fields_for :file_title_translations do |f| %>
            <%= f.text_field locale, 
             class: 's_grid_4',
+            placeholder: I18nVariable.from_locale(locale),
             value: (form_file.file_title_translations[locale] rescue nil) %>
           <% end %>
       </td>
   
+      <td <%= style %> <%= data %>>
+          <%= f.fields_for :file_description_translations do |f| %>
+            <%= f.text_field locale,
+              class: 's_grid_4',
+              placeholder: I18nVariable.from_locale(locale),
+              value: (form_file.file_description_translations[locale] rescue nil) %>
+          <% end %>
+     </td>
+    <% end %>
   <td>
     <span class="action">
       <% if form_file.new_record? %>

vendor/built_in_modules/personal_project/app/assets/javascripts/personal_project/desktop/personal_project.js

@@ -63,8 +63,8 @@ orbitDesktop.prototype.initializePersonalProject = function(target,url,cache){ /
 
   var languageSelect = function(){
     $(".language_select a").click(function(event) {
-        $("li[data-language]").hide();
+        $("*[data-language]").hide();
-        $("li[data-language="+$(this).data("lang")+"]").show();
+        $("*[data-language="+$(this).data("lang")+"]").show();
         return false;
     });
   }

vendor/built_in_modules/personal_project/app/models/project_file.rb

@@ -5,7 +5,7 @@ class ProjectFile
 
   mount_uploader :file, AssetUploader
 
-  # field :description, localize: true
+  field :description, localize: true
   field :should_destroy, :type => Boolean  
   field :title, localize: true
   

vendor/built_in_modules/personal_project/app/views/panel/personal_project/desktop/personal_projects/_form_file.html.erb

@@ -2,21 +2,32 @@
   <td>
     <div>
       <% if form_file.new_record? %>
-        <%= f.file_field :file, class: "s_grid_2" %>
+        <%= f.file_field :file, class: "s_grid_2", onchange:"this.parentNode.getElementsByTagName('label')[0].innerHTML = this.value" %>
+        <label></label>
       <% end %>
     </div>
   </td>
-  <td>
+    <% @site_valid_locales.each_with_index do |locale, i| %>
-    <%= f.text_field :title, :class => 's_grid_4' %>
+        <% style = locale != I18n.locale.to_s ? 'style=display:none;' : "" %>
-  </td>
+        <% data = "data-language=" + locale  %>
-  <td>
+      <td  <%= style %> <%= data %>>
          <%= f.fields_for :file_title_translations do |f| %>
            <%= f.text_field locale, 
             class: 's_grid_4',
+            placeholder: I18nVariable.from_locale(locale),
             value: (form_file.file_title_translations[locale] rescue nil) %>
           <% end %>
       </td>
   
+      <td <%= style %> <%= data %>>
+          <%= f.fields_for :file_description_translations do |f| %>
+            <%= f.text_field locale,
+              class: 's_grid_4',
+              placeholder: I18nVariable.from_locale(locale),
+              value: (form_file.file_description_translations[locale] rescue nil) %>
+          <% end %>
+     </td>
+    <% end %>
   <td>
     <span class="action">
       <% if form_file.new_record? %>

vendor/built_in_modules/personal_research/app/assets/javascripts/personal_research/desktop/personal_research.js

@@ -63,8 +63,8 @@ orbitDesktop.prototype.initializePersonalResearch = function(target,url,cache){
 
   var languageSelect = function(){
     $(".language_select a").click(function(event) {
-        $("li[data-language]").hide();
+        $("*[data-language]").hide();
-        $("li[data-language="+$(this).data("lang")+"]").show();
+        $("*[data-language="+$(this).data("lang")+"]").show();
         return false;
     });
   }

vendor/built_in_modules/personal_research/app/models/research_file.rb

@@ -5,7 +5,7 @@ class ResearchFile
 
   mount_uploader :file, AssetUploader
 
-  # field :description, localize: true
+  field :description, localize: true
   field :should_destroy, :type => Boolean  
   field :title, localize: true
   

vendor/built_in_modules/personal_research/app/views/panel/personal_research/desktop/personal_researchs/_form_file.html.erb

@@ -2,21 +2,32 @@
   <td>
     <div>
       <% if form_file.new_record? %>
-        <%= f.file_field :file, class: "s_grid_2" %>
+        <%= f.file_field :file, class: "s_grid_2", onchange:"this.parentNode.getElementsByTagName('label')[0].innerHTML = this.value" %>
+        <label></label>
       <% end %>
     </div>
   </td>
-  <td>
+    <% @site_valid_locales.each_with_index do |locale, i| %>
-    <%= f.text_field :title, :class => 's_grid_4' %>
+        <% style = locale != I18n.locale.to_s ? 'style=display:none;' : "" %>
-  </td>
+        <% data = "data-language=" + locale  %>
-  <td>
+      <td  <%= style %> <%= data %>>
          <%= f.fields_for :file_title_translations do |f| %>
            <%= f.text_field locale, 
             class: 's_grid_4',
+            placeholder: I18nVariable.from_locale(locale),
             value: (form_file.file_title_translations[locale] rescue nil) %>
           <% end %>
       </td>
   
+      <td <%= style %> <%= data %>>
+          <%= f.fields_for :file_description_translations do |f| %>
+            <%= f.text_field locale,
+              class: 's_grid_4',
+              placeholder: I18nVariable.from_locale(locale),
+              value: (form_file.file_description_translations[locale] rescue nil) %>
+          <% end %>
+     </td>
+    <% end %>
   <td>
     <span class="action">
       <% if form_file.new_record? %>