developers
/
Orbit
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Conflicts:
	app/assets/javascripts/desktop/orbitdesktop.js
This commit is contained in:
Harry Bomrah 2013-08-13 17:00:44 +08:00 committed by saurabhbhatia
parent cb070cc537
commit 6d54dbd5f8
25 changed files with 182 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/desktop/orbitdesktop.js
View File

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

4
vendor/built_in_modules/personal_book/app/assets/javascripts/personal_book/desktop/personal_books.js vendored
View File

@ -63,8 +63,8 @@ orbitDesktop.prototype.initializePersonalBook = function(target,url,cache){ // t
var languageSelect = function(){ var languageSelect = function(){
$(".language_select a").click(function(event) { $(".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; return false;
}); });
} }

2
vendor/built_in_modules/personal_book/app/models/writing_book_file.rb vendored
View File

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

33
vendor/built_in_modules/personal_book/app/views/panel/personal_book/desktop/personal_books/_form_file.html.erb vendored
View File

@ -2,21 +2,32 @@
<td> <td>
<div> <div>
<% if form_file.new_record? %> <% 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 %> <% end %>
</div> </div>
</td> </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.fields_for :file_title_translations do |f| %>
<%= f.text_field locale, <%= f.text_field locale,
class: 's_grid_4', class: 's_grid_4',
value: (form_file.file_title_translations[locale] rescue nil) %> placeholder: I18nVariable.from_locale(locale),
<% end %> value: (form_file.file_title_translations[locale] rescue nil) %>
</td> <% 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> <td>
<span class="action"> <span class="action">
<% if form_file.new_record? %> <% if form_file.new_record? %>

4
vendor/built_in_modules/personal_conference/app/assets/javascripts/personal_conference/desktop/conference_pages.js vendored
View File

@ -63,8 +63,8 @@ orbitDesktop.prototype.initializeConferencePapers = function(target,url,cache){
var languageSelect = function(){ var languageSelect = function(){
$(".language_select a").click(function(event) { $(".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; return false;
}); });
} }

2
vendor/built_in_modules/personal_conference/app/models/writing_conference_file.rb vendored
View File

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

33
vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form_file.html.erb vendored
View File

@ -2,21 +2,32 @@
<td> <td>
<div> <div>
<% if form_file.new_record? %> <% 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 %> <% end %>
</div> </div>
</td> </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.fields_for :file_title_translations do |f| %>
<%= f.text_field locale, <%= f.text_field locale,
class: 's_grid_4 s_grid', class: 's_grid_4',
value: (form_file.file_title_translations[locale] rescue nil) %> placeholder: I18nVariable.from_locale(locale),
<% end %> value: (form_file.file_title_translations[locale] rescue nil) %>
</td> <% 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> <td>
<span class="action"> <span class="action">
<% if form_file.new_record? %> <% if form_file.new_record? %>

4
vendor/built_in_modules/personal_diploma/app/assets/javascripts/personal_diploma/desktop/personal_diploma.js vendored
View File

@ -63,8 +63,8 @@ orbitDesktop.prototype.initializePersonalDiploma = function(target,url,cache){ /
var languageSelect = function(){ var languageSelect = function(){
$(".language_select a").click(function(event) { $(".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; return false;
}); });
} }

4
vendor/built_in_modules/personal_experience/app/assets/javascripts/personal_experience/desktop/personal_experiences.js vendored
View File

@ -63,8 +63,8 @@ orbitDesktop.prototype.initializePersonalExperience = function(target,url,cache)
var languageSelect = function(){ var languageSelect = function(){
$(".language_select a").click(function(event) { $(".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; return false;
}); });
} }

4
vendor/built_in_modules/personal_honor/app/assets/javascripts/personal_honor/desktop/personal_honors.js vendored
View File

@ -63,8 +63,8 @@ orbitDesktop.prototype.initializePersonalHonor = function(target,url,cache){ //
var languageSelect = function(){ var languageSelect = function(){
$(".language_select a").click(function(event) { $(".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; return false;
}); });
} }

4
vendor/built_in_modules/personal_journal/app/assets/javascripts/personal_journal/desktop/journal_pages.js vendored
View File

@ -63,8 +63,8 @@ orbitDesktop.prototype.initializeJournalPapers = function(target,url,cache){ //
var languageSelect = function(){ var languageSelect = function(){
$(".language_select a").click(function(event) { $(".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; return false;
}); });
} }

2
vendor/built_in_modules/personal_journal/app/models/writing_journal_file.rb vendored
View File

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

33
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form_file.html.erb vendored
View File

@ -2,21 +2,32 @@
<td> <td>
<div> <div>
<% if form_file.new_record? %> <% 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 %> <% end %>
</div> </div>
</td> </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.fields_for :file_title_translations do |f| %>
<%= f.text_field locale, <%= f.text_field locale,
class: 's_grid_4', class: 's_grid_4',
value: (form_file.file_title_translations[locale] rescue nil) %> placeholder: I18nVariable.from_locale(locale),
<% end %> value: (form_file.file_title_translations[locale] rescue nil) %>
</td> <% 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> <td>
<span class="action"> <span class="action">
<% if form_file.new_record? %> <% if form_file.new_record? %>

4
vendor/built_in_modules/personal_lab/app/assets/javascripts/personal_lab/desktop/personal_lab.js vendored
View File

@ -65,8 +65,8 @@ orbitDesktop.prototype.initializePersonalLab = function(target,url,cache){ // th
var languageSelect = function(){ var languageSelect = function(){
$(".language_select a").click(function(event) { $(".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; return false;
}); });
} }

2
vendor/built_in_modules/personal_lab/app/models/lab_file.rb vendored
View File

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

33
vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/desktop/personal_labs/_form_file.html.erb vendored
View File

@ -2,21 +2,32 @@
<td> <td>
<div> <div>
<% if form_file.new_record? %> <% 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 %> <% end %>
</div> </div>
</td> </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.fields_for :file_title_translations do |f| %>
<%= f.text_field locale, <%= f.text_field locale,
class: 's_grid_4', class: 's_grid_4',
value: (form_file.file_title_translations[locale] rescue nil) %> placeholder: I18nVariable.from_locale(locale),
<% end %> value: (form_file.file_title_translations[locale] rescue nil) %>
</td> <% 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> <td>
<span class="action"> <span class="action">
<% if form_file.new_record? %> <% if form_file.new_record? %>

4
vendor/built_in_modules/personal_patent/app/assets/javascripts/personal_patent/desktop/personal_patent.js vendored
View File

@ -63,8 +63,8 @@ orbitDesktop.prototype.initializePersonalPatent = function(target,url,cache){ //
var languageSelect = function(){ var languageSelect = function(){
$(".language_select a").click(function(event) { $(".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; return false;
}); });
} }

2
vendor/built_in_modules/personal_patent/app/models/writing_patent_file.rb vendored
View File

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

33
vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/desktop/personal_patents/_form_file.html.erb vendored
View File

@ -2,21 +2,32 @@
<td> <td>
<div> <div>
<% if form_file.new_record? %> <% 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 %> <% end %>
</div> </div>
</td> </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.fields_for :file_title_translations do |f| %>
<%= f.text_field locale, <%= f.text_field locale,
class: 's_grid_4', class: 's_grid_4',
value: (form_file.file_title_translations[locale] rescue nil) %> placeholder: I18nVariable.from_locale(locale),
<% end %> value: (form_file.file_title_translations[locale] rescue nil) %>
</td> <% 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> <td>
<span class="action"> <span class="action">
<% if form_file.new_record? %> <% if form_file.new_record? %>

4
vendor/built_in_modules/personal_project/app/assets/javascripts/personal_project/desktop/personal_project.js vendored
View File

@ -63,8 +63,8 @@ orbitDesktop.prototype.initializePersonalProject = function(target,url,cache){ /
var languageSelect = function(){ var languageSelect = function(){
$(".language_select a").click(function(event) { $(".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; return false;
}); });
} }

2
vendor/built_in_modules/personal_project/app/models/project_file.rb vendored
View File

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

33
vendor/built_in_modules/personal_project/app/views/panel/personal_project/desktop/personal_projects/_form_file.html.erb vendored
View File

@ -2,21 +2,32 @@
<td> <td>
<div> <div>
<% if form_file.new_record? %> <% 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 %> <% end %>
</div> </div>
</td> </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.fields_for :file_title_translations do |f| %>
<%= f.text_field locale, <%= f.text_field locale,
class: 's_grid_4', class: 's_grid_4',
value: (form_file.file_title_translations[locale] rescue nil) %> placeholder: I18nVariable.from_locale(locale),
<% end %> value: (form_file.file_title_translations[locale] rescue nil) %>
</td> <% 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> <td>
<span class="action"> <span class="action">
<% if form_file.new_record? %> <% if form_file.new_record? %>

4
vendor/built_in_modules/personal_research/app/assets/javascripts/personal_research/desktop/personal_research.js vendored
View File

@ -63,8 +63,8 @@ orbitDesktop.prototype.initializePersonalResearch = function(target,url,cache){
var languageSelect = function(){ var languageSelect = function(){
$(".language_select a").click(function(event) { $(".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; return false;
}); });
} }

2
vendor/built_in_modules/personal_research/app/models/research_file.rb vendored
View File

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

33
vendor/built_in_modules/personal_research/app/views/panel/personal_research/desktop/personal_researchs/_form_file.html.erb vendored
View File

@ -2,21 +2,32 @@
<td> <td>
<div> <div>
<% if form_file.new_record? %> <% 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 %> <% end %>
</div> </div>
</td> </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.fields_for :file_title_translations do |f| %>
<%= f.text_field locale, <%= f.text_field locale,
class: 's_grid_4', class: 's_grid_4',
value: (form_file.file_title_translations[locale] rescue nil) %> placeholder: I18nVariable.from_locale(locale),
<% end %> value: (form_file.file_title_translations[locale] rescue nil) %>
</td> <% 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> <td>
<span class="action"> <span class="action">
<% if form_file.new_record? %> <% if form_file.new_record? %>