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

isotope fixed for all plugins for list and form.

This commit is contained in:
Harry Bomrah 2013-10-01 14:29:39 +08:00 committed by saurabhbhatia
parent 9a0e9ddc82
commit caca264b50
27 changed files with 185 additions and 252 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/stylesheets/desktop/desktop-component.scss
View File

@ -23,8 +23,12 @@
textarea { textarea {
margin-bottom: 12px; margin-bottom: 12px;
} }
input { input[type="text"] {
margin-left: 0; margin-left: 0;
margin-top: 0;
}
input[type="text"] + input {
margin-top: 12px;
} }
} }
// fixed width column with 12px gutter // fixed width column with 12px gutter

3
vendor/built_in_modules/personal_book/app/helpers/panel/personal_book/desktop/personal_books_helper.rb vendored
View File

@ -4,11 +4,14 @@ module Panel::PersonalBook::Desktop::PersonalBooksHelper
"item" => "true", "item" => "true",
"data-id" => publication.id.to_s, "data-id" => publication.id.to_s,
:class => "list_t_item #{view.blank? ? '' : "#{view}_view" } #{publication.is_hidden? ? "private" : "public" }" do :class => "list_t_item #{view.blank? ? '' : "#{view}_view" } #{publication.is_hidden? ? "private" : "public" }" do
content_tag :div,
:class => "inner" do
marker(publication.id) + \ marker(publication.id) + \
content(publication, view) + \ content(publication, view) + \
edit_or_delete(publication) edit_or_delete(publication)
end end
end end
end
def marker id def marker id
content_tag :div, content_tag :div,

41
vendor/built_in_modules/personal_book/app/views/panel/personal_book/desktop/personal_books/_form.html.erb vendored
View File

@ -21,14 +21,14 @@
<div class="sdm_t hh1"><span class="icon-question-sign"></span></div> <div class="sdm_t hh1"><span class="icon-question-sign"></span></div>
</div> </div>
</div> </div>
<div class="overview" content-layout="column" base-width="420"> <div class="overview" content-layout="simple" base-width="420">
<div column="true"> <ul class="s_form" isotope="true">
<div class="s_form"> <li class="s_grid_row" >
<ul>
<% @site_valid_locales.each_with_index do |locale, i| %> <% @site_valid_locales.each_with_index do |locale, i| %>
<% style = locale != I18n.locale.to_s ? 'style=display:none;' : "" %> <% style = locale != I18n.locale.to_s ? 'style=display:none;' : "" %>
<% data = "data-language=" + locale %> <% data = "data-language=" + locale %>
<li class="s_grid_row" <%= style %> <%= data %> >
<div class="form_fix" <%= style %> <%= data %>>
<%= f.fields_for :paper_title_translations do |f| %> <%= f.fields_for :paper_title_translations do |f| %>
<%= f.text_area locale, <%= f.text_area locale,
class: "s_grid_12 s_grid s_grid_h_3", class: "s_grid_12 s_grid s_grid_h_3",
@ -36,8 +36,7 @@
placeholder: t("personal_book.paper_title")+ "("+I18nVariable.from_locale(locale)+")", placeholder: t("personal_book.paper_title")+ "("+I18nVariable.from_locale(locale)+")",
value: (@personal_book.paper_title_translations[locale.to_s] rescue nil) %> value: (@personal_book.paper_title_translations[locale.to_s] rescue nil) %>
<% end %> <% end %>
</li>
<li class="s_grid_row" <%= style %> <%= data %> >
<%= f.fields_for :book_title_translations do |f| %> <%= f.fields_for :book_title_translations do |f| %>
<%= f.text_field locale, <%= f.text_field locale,
size: "20", size: "20",
@ -45,8 +44,7 @@
class: "s_grid_12 s_grid", class: "s_grid_12 s_grid",
value: (@personal_book.book_title_translations[locale.to_s] rescue nil) %> value: (@personal_book.book_title_translations[locale.to_s] rescue nil) %>
<% end %> <% end %>
</li>
<li class="s_grid_row" <%= style %> <%= data %> >
<%= f.fields_for :extracted_chapters_translations do |f| %> <%= f.fields_for :extracted_chapters_translations do |f| %>
<%= f.text_field locale, <%= f.text_field locale,
size: "20", size: "20",
@ -54,8 +52,7 @@
class: "s_grid_12 s_grid", class: "s_grid_12 s_grid",
value: (@personal_book.extracted_chapters_translations[locale.to_s] rescue nil) %> value: (@personal_book.extracted_chapters_translations[locale.to_s] rescue nil) %>
<% end %> <% end %>
</li>
<li class="s_grid_row" <%= style %> <%= data %> >
<%= f.fields_for :publishers_translations do |f| %> <%= f.fields_for :publishers_translations do |f| %>
<%= f.text_field locale, <%= f.text_field locale,
size: "20", size: "20",
@ -63,8 +60,9 @@
class: "s_grid_12 s_grid", class: "s_grid_12 s_grid",
value: (@personal_book.publishers_translations[locale.to_s] rescue nil) %> value: (@personal_book.publishers_translations[locale.to_s] rescue nil) %>
<% end %> <% end %>
</li> </div>
<% end %> <% end %>
</li>
<li class="s_grid_row"> <li class="s_grid_row">
<%= label_tag("", t("personal_book.book_paper_type"), class: "s_grid_4 s_grid") %> <%= label_tag("", t("personal_book.book_paper_type"), class: "s_grid_4 s_grid") %>
<%= f.select :book_paper_type_id, BookPaperType.all.collect {|t| [ t.title, t.id ]}, {:class => "s_grid s_grid_8"} %> <%= f.select :book_paper_type_id, BookPaperType.all.collect {|t| [ t.title, t.id ]}, {:class => "s_grid s_grid_8"} %>
@ -107,12 +105,7 @@
<%= label_tag("", t("personal_book.url"), class: "s_grid_4 s_grid") %><%= f.text_field :url, size: "20", class: "s_grid_8 s_grid"%> <%= label_tag("", t("personal_book.url"), class: "s_grid_4 s_grid") %><%= f.text_field :url, size: "20", class: "s_grid_8 s_grid"%>
</li> </li>
</ul>
</div>
</div>
<div column="true">
<div class="s_form">
<ul>
<li class="s_grid_row"> <li class="s_grid_row">
<%= f.text_area :keywords, size: "20x3", placeholder: t("personal_book.keywords"), class: "s_grid_12 s_grid_h_2 s_grid"%> <%= f.text_area :keywords, size: "20x3", placeholder: t("personal_book.keywords"), class: "s_grid_12 s_grid_h_2 s_grid"%>
</li> </li>
@ -127,14 +120,9 @@
<%= label_tag("", t("personal_book.isbn"), class: "s_grid_4 s_grid") %><%= f.text_field :isbn, size: "20", class: "s_grid_8 s_grid"%> <%= label_tag("", t("personal_book.isbn"), class: "s_grid_4 s_grid") %><%= f.text_field :isbn, size: "20", class: "s_grid_8 s_grid"%>
</li> </li>
<li class="s_grid_row"> <li class="s_grid_row">
<%= f.text_area :note, size: "20x3", placeholder: t("personal_book.note"), class: "s_grid_12 s_grid s_grid_h_5"%> <%= f.text_area :note, size: "20x3", placeholder: t("personal_book.note"), class: "s_grid_12 s_grid s_grid_h_5 s_grid_h_full"%>
</li> </li>
</ul>
</div>
</div>
<div column="true">
<div class="s_form">
<ul>
<li class="s_grid_row"> <li class="s_grid_row">
<table class="s_table"> <table class="s_table">
<thead> <thead>
@ -165,8 +153,7 @@
</table> </table>
</li> </li>
</ul> </ul>
</div>
</div>
</div> </div>
<script> <script>
var get_html = function(old_id,new_id){ var get_html = function(old_id,new_id){

4
vendor/built_in_modules/personal_book/app/views/panel/personal_book/desktop/personal_books/index.html.erb vendored
View File

@ -61,8 +61,10 @@
<div class="sdm_t hh1"><span class="icon-question-sign"></span></div> <div class="sdm_t hh1"><span class="icon-question-sign"></span></div>
</div> </div>
</div> </div>
<div class="overview" page-name="books_list" content-layout="datalist" base-width="300" per-column="<%= @per_column.to_s %>" pagination-var="view=<%= @view_by %>&page" > <div class="overview" page-name="books_list" content-layout="simple" base-width="300" per-column="<%= @per_column.to_s %>" pagination-var="view=<%= @view_by %>&page" >
<ul isotope="true">
<% @writing_books.each do |w| %> <% @writing_books.each do |w| %>
<%= publication_record w, @view_by%> <%= publication_record w, @view_by%>
<% end %> <% end %>
</ul>
</div> </div>

47
vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb vendored
View File

@ -29,14 +29,13 @@
</div> </div>
</div> </div>
<div class="viewport"> --> <div class="viewport"> -->
<div class="overview" content-layout="column" base-width="420"> <div class="overview" content-layout="simple" base-width="420">
<div column="true"> <ul class="s_form" isotope="true">
<div class="s_form"> <li class="s_grid_row" >
<ul>
<% @site_valid_locales.each_with_index do |locale, i| %> <% @site_valid_locales.each_with_index do |locale, i| %>
<% style = locale != I18n.locale.to_s ? 'style=display:none;' : "" %> <% style = locale != I18n.locale.to_s ? 'style=display:none;' : "" %>
<% data = "data-language=" + locale %> <% data = "data-language=" + locale %>
<li class="s_grid_row" <%= style %> <%= data %>> <div class="form_fix" <%= style %> <%= data %>>
<%= f.fields_for :paper_title_translations do |f| %> <%= f.fields_for :paper_title_translations do |f| %>
<%= f.text_area locale, <%= f.text_area locale,
class: "s_grid_12 s_grid_h_2 s_grid", class: "s_grid_12 s_grid_h_2 s_grid",
@ -44,8 +43,6 @@
placeholder: t("personal_conference.paper_title")+ "("+I18nVariable.from_locale(locale)+")", placeholder: t("personal_conference.paper_title")+ "("+I18nVariable.from_locale(locale)+")",
value: (@writing_conference.paper_title_translations[locale.to_s] rescue nil) %> value: (@writing_conference.paper_title_translations[locale.to_s] rescue nil) %>
<% end %> <% end %>
</li>
<li class="s_grid_row" <%= style %> <%= data %>>
<%= f.fields_for :conference_title_translations do |f| %> <%= f.fields_for :conference_title_translations do |f| %>
<%= f.text_field locale, <%= f.text_field locale,
size: "20", size: "20",
@ -53,8 +50,9 @@
class: "s_grid_12 s_grid", class: "s_grid_12 s_grid",
value: (@writing_conference.conference_title_translations[locale.to_s] rescue nil) %> value: (@writing_conference.conference_title_translations[locale.to_s] rescue nil) %>
<% end %> <% end %>
</li> </div>
<% end %> <% end %>
</li>
<li class="s_grid_row"> <li class="s_grid_row">
<div> <div>
<%= label_tag("", t("personal_conference.paper_type"), class: 's_grid s_grid_4') %> <%= label_tag("", t("personal_conference.paper_type"), class: 's_grid s_grid_4') %>
@ -99,11 +97,7 @@
<li class="s_grid_row"> <li class="s_grid_row">
<%= label_tag("", t("personal_conference.url"), class: "s_grid_4 s_grid") %><%= f.text_field :url, size: "20", placeholder: "www.sample.com", class: "s_grid_8 s_grid"%> <%= label_tag("", t("personal_conference.url"), class: "s_grid_4 s_grid") %><%= f.text_field :url, size: "20", placeholder: "www.sample.com", class: "s_grid_8 s_grid"%>
</li> </li>
</ul>
</div>
<div column="true">
<div class="s_form">
<ul>
<li class="s_grid_row"> <li class="s_grid_row">
<%= f.text_area :author_tokens, <%= f.text_area :author_tokens,
class: "s_grid_12 s_grid", class: "s_grid_12 s_grid",
@ -155,12 +149,7 @@
</li> </li>
<li class="s_grid_row"><input class="s_grid s_grid_12" type="text" placeholder=<%= t("personal_conference.tags") %>></li> <li class="s_grid_row"><input class="s_grid s_grid_12" type="text" placeholder=<%= t("personal_conference.tags") %>></li>
</ul>
</div>
</div>
<div column="true">
<div class="s_form">
<ul>
<li class="s_grid_row"> <li class="s_grid_row">
<table class="s_table"> <table class="s_table">
<thead> <thead>
@ -190,22 +179,16 @@
</tbody> </tbody>
</table> </table>
</li> </li>
</ul>
</div>
<div column="true">
<ul class="s_form">
<li class="s_grid_row"> <li class="s_grid_row">
<%= f.text_area :abstract, size: "20x22", placeholder: t("personal_conference.abstract"), class: "s_grid_12 s_grid_h_10 s_grid"%> <%= f.text_area :abstract, size: "20x22", placeholder: t("personal_conference.abstract"), class: "s_grid_12 s_grid_h_10 s_grid s_grid_h_full"%>
</li>
<li class="s_grid_row">
<%= f.text_area :note, size: "20x22", placeholder: t("personal_conference.note"), class: "s_grid_12 s_grid_h_10 s_grid s_grid_h_full"%>
</li> </li>
</ul> </ul>
</div>
<div column="true">
<ul class="s_form">
<li class="s_grid_row">
<%= f.text_area :note, size: "20x22", placeholder: t("personal_conference.note"), class: "s_grid_12 s_grid_h_10 s_grid"%>
</li>
</ul>
</div>
</div> </div>
<!-- </div> <!-- </div>
</div> --> </div> -->

3
vendor/built_in_modules/personal_diploma/app/helpers/panel/personal_diploma/desktop/personal_diplomas_helper.rb vendored
View File

@ -4,11 +4,14 @@ module Panel::PersonalDiploma::Desktop::PersonalDiplomasHelper
"item" => "true", "item" => "true",
"data-id" => publication.id.to_s, "data-id" => publication.id.to_s,
:class => "list_t_item #{view.blank? ? '' : "#{view}_view" } #{publication.is_hidden? ? "private" : "public" }" do :class => "list_t_item #{view.blank? ? '' : "#{view}_view" } #{publication.is_hidden? ? "private" : "public" }" do
content_tag :div,
:class => "inner" do
marker(publication.id) + \ marker(publication.id) + \
content(publication, view) + \ content(publication, view) + \
edit_or_delete(publication) edit_or_delete(publication)
end end
end end
end
def marker id def marker id
content_tag :div, content_tag :div,

33
vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/desktop/personal_diplomas/_form.html.erb vendored
View File

@ -21,10 +21,8 @@
<div class="sdm_t hh1"><span class="icon-question-sign"></span></div> <div class="sdm_t hh1"><span class="icon-question-sign"></span></div>
</div> </div>
</div> </div>
<div class="overview" content-layout="column" base-width="420"> <div class="overview" content-layout="simple" base-width="420">
<div column="true"> <ul class="s_form" isotope="true">
<div class="s_form">
<ul>
<li class="s_grid_row"> <li class="s_grid_row">
<%= label_tag("", t("personal_diploma.start_date"), class: "s_grid_4 s_grid") %> <%= label_tag("", t("personal_diploma.start_date"), class: "s_grid_4 s_grid") %>
<%= f.date_select :start_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1930, :order => [:year] }, {:class => 's_grid_4 s_grid'} %> <%= f.date_select :start_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1930, :order => [:year] }, {:class => 's_grid_4 s_grid'} %>
@ -35,10 +33,11 @@
<%= f.date_select :end_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1930, :order => [:year] }, {:class => 's_grid_4 s_grid'} %> <%= f.date_select :end_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1930, :order => [:year] }, {:class => 's_grid_4 s_grid'} %>
<%= f.date_select :end_date, {:use_month_numbers => true, :order => [:month, :day] }, {:class => 's_grid_2 s_grid'} %> <%= f.date_select :end_date, {:use_month_numbers => true, :order => [:month, :day] }, {:class => 's_grid_2 s_grid'} %>
</li> </li>
<li class="s_grid_row">
<% @site_valid_locales.each_with_index do |locale, i| %> <% @site_valid_locales.each_with_index do |locale, i| %>
<% style = locale != I18n.locale.to_s ? 'style=display:none;' : "" %> <% style = locale != I18n.locale.to_s ? 'style=display:none;' : "" %>
<% data = "data-language=" + locale %> <% data = "data-language=" + locale %>
<li class="s_grid_row" <%= style %> <%= data %>> <div class="form_fix" <%= style %> <%= data %>>
<%= f.fields_for :school_name_translations do |f| %> <%= f.fields_for :school_name_translations do |f| %>
<%= f.text_field locale, <%= f.text_field locale,
size: "20", size: "20",
@ -46,8 +45,7 @@
class: "s_grid_12 s_grid", class: "s_grid_12 s_grid",
value: (@diploma.school_name_translations[locale.to_s] rescue nil) %> value: (@diploma.school_name_translations[locale.to_s] rescue nil) %>
<% end %> <% end %>
</li>
<li class="s_grid_row" <%= style %> <%= data %>>
<%= f.fields_for :country_translations do |f| %> <%= f.fields_for :country_translations do |f| %>
<%= f.text_field locale, <%= f.text_field locale,
size: "20", size: "20",
@ -55,8 +53,7 @@
class: "s_grid_12 s_grid", class: "s_grid_12 s_grid",
value: (@diploma.country_translations[locale.to_s] rescue nil) %> value: (@diploma.country_translations[locale.to_s] rescue nil) %>
<% end %> <% end %>
</li>
<li class="s_grid_row" <%= style %> <%= data %>>
<%= f.fields_for :department_translations do |f| %> <%= f.fields_for :department_translations do |f| %>
<%= f.text_field locale, <%= f.text_field locale,
size: "20", size: "20",
@ -64,8 +61,7 @@
class: "s_grid_12 s_grid", class: "s_grid_12 s_grid",
value: (@diploma.department_translations[locale.to_s] rescue nil) %> value: (@diploma.department_translations[locale.to_s] rescue nil) %>
<% end %> <% end %>
</li>
<li class="s_grid_row" <%= style %> <%= data %>>
<%= f.fields_for :degree_translations do |f| %> <%= f.fields_for :degree_translations do |f| %>
<%= f.text_field locale, <%= f.text_field locale,
size: "20", size: "20",
@ -73,8 +69,9 @@
class: "s_grid_12 s_grid", class: "s_grid_12 s_grid",
value: (@diploma.degree_translations[locale.to_s] rescue nil) %> value: (@diploma.degree_translations[locale.to_s] rescue nil) %>
<% end %> <% end %>
</li> </div>
<% end %> <% end %>
</li>
<li class="s_grid_row"> <li class="s_grid_row">
<%= label_tag("", t("personal_diploma.url"), class: "s_grid_4 s_grid") %><%= f.text_field :url, size: "20", class: "s_grid_8 s_grid"%> <%= label_tag("", t("personal_diploma.url"), class: "s_grid_4 s_grid") %><%= f.text_field :url, size: "20", class: "s_grid_8 s_grid"%>
</li> </li>
@ -85,16 +82,10 @@
<%= f.label :language, t("personal_diploma.language"), :class => "s_grid s_grid_4" %> <%= f.label :language, t("personal_diploma.language"), :class => "s_grid s_grid_4" %>
<%= f.select :language, Diploma::LANGUAGE_TYPES,{} ,{:class => "s_grid s_grid_8"} %> <%= f.select :language, Diploma::LANGUAGE_TYPES,{} ,{:class => "s_grid s_grid_8"} %>
</li> </li>
</ul>
</div>
</div>
<div column="true">
<div class="s_form">
<ul>
<li class="s_grid_row"> <li class="s_grid_row">
<%= f.text_area :note, size: "20x3", placeholder: t("personal_diploma.note"), class: "s_grid_12 s_grid s_grid_h_5"%> <%= f.text_area :note, size: "20x3", placeholder: t("personal_diploma.note"), class: "s_grid_12 s_grid s_grid_h_10 s_grid_h_full"%>
</li> </li>
</ul> </ul>
</div>
</div>
</div> </div>

4
vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/desktop/personal_diplomas/index.html.erb vendored
View File

@ -60,8 +60,10 @@
<div class="sdm_t hh1"><span class="icon-question-sign"></span></div> <div class="sdm_t hh1"><span class="icon-question-sign"></span></div>
</div> </div>
</div> </div>
<div class="overview" page-name="diploma_list" content-layout="datalist" base-width="300" per-column="<%= @per_column.to_s %>" pagination-var="view=<%= @view_by %>&page" > <div class="overview" page-name="diploma_list" content-layout="simple" base-width="300" per-column="<%= @per_column.to_s %>" pagination-var="view=<%= @view_by %>&page" >
<ul isotope="true">
<% @diplomas.each do |w| %> <% @diplomas.each do |w| %>
<%= publication_record w, @view_by%> <%= publication_record w, @view_by%>
<% end %> <% end %>
</ul>
</div> </div>

3
vendor/built_in_modules/personal_experience/app/helpers/panel/personal_experience/desktop/personal_experiences_helper.rb vendored
View File

@ -4,11 +4,14 @@ module Panel::PersonalExperience::Desktop::PersonalExperiencesHelper
"item" => "true", "item" => "true",
"data-id" => publication.id.to_s, "data-id" => publication.id.to_s,
:class => "list_t_item #{view.blank? ? '' : "#{view}_view" } #{publication.is_hidden? ? "private" : "public" }" do :class => "list_t_item #{view.blank? ? '' : "#{view}_view" } #{publication.is_hidden? ? "private" : "public" }" do
content_tag :div,
:class => "inner" do
marker(publication.id) + \ marker(publication.id) + \
content(publication, view) + \ content(publication, view) + \
edit_or_delete(publication) edit_or_delete(publication)
end end
end end
end
def marker id def marker id
content_tag :div, content_tag :div,

29
vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/desktop/personal_experiences/_form.html.erb vendored
View File

@ -21,14 +21,13 @@
<div class="sdm_t hh1"><span class="icon-question-sign"></span></div> <div class="sdm_t hh1"><span class="icon-question-sign"></span></div>
</div> </div>
</div> </div>
<div class="overview" content-layout="column" base-width="420"> <div class="overview" content-layout="simple" base-width="420">
<div column="true"> <ul class="s_form" isotope="true">
<div class="s_form"> <li class="s_grid_row">
<ul>
<% @site_valid_locales.each_with_index do |locale, i| %> <% @site_valid_locales.each_with_index do |locale, i| %>
<% style = locale != I18n.locale.to_s ? 'style=display:none;' : "" %> <% style = locale != I18n.locale.to_s ? 'style=display:none;' : "" %>
<% data = "data-language=" + locale %> <% data = "data-language=" + locale %>
<li class="s_grid_row" <%= style %> <%= data %>> <div class="form_fix" <%= style %> <%= data %>>
<%= f.fields_for :organizationt_title_translations do |f| %> <%= f.fields_for :organizationt_title_translations do |f| %>
<%= f.text_field locale, <%= f.text_field locale,
size: "20", size: "20",
@ -36,8 +35,7 @@
class: "s_grid_12 s_grid", class: "s_grid_12 s_grid",
value: (@experience.organizationt_title_translations[locale.to_s] rescue nil) %> value: (@experience.organizationt_title_translations[locale.to_s] rescue nil) %>
<% end %> <% end %>
</li>
<li class="s_grid_row" <%= style %> <%= data %>>
<%= f.fields_for :department_translations do |f| %> <%= f.fields_for :department_translations do |f| %>
<%= f.text_field locale, <%= f.text_field locale,
size: "20", size: "20",
@ -45,8 +43,7 @@
class: "s_grid_12 s_grid", class: "s_grid_12 s_grid",
value: (@experience.department_translations[locale.to_s] rescue nil) %> value: (@experience.department_translations[locale.to_s] rescue nil) %>
<% end %> <% end %>
</li>
<li class="s_grid_row" <%= style %> <%= data %>>
<%= f.fields_for :job_title_translations do |f| %> <%= f.fields_for :job_title_translations do |f| %>
<%= f.text_field locale, <%= f.text_field locale,
size: "20", size: "20",
@ -54,8 +51,9 @@
class: "s_grid_12 s_grid", class: "s_grid_12 s_grid",
value: (@experience.job_title_translations[locale.to_s] rescue nil) %> value: (@experience.job_title_translations[locale.to_s] rescue nil) %>
<% end %> <% end %>
</li> </div>
<% end %> <% end %>
</li>
<li class="s_grid_row"> <li class="s_grid_row">
<%= label_tag("", t("personal_experience.experience_category"), class: "s_grid_4 s_grid") %> <%= label_tag("", t("personal_experience.experience_category"), class: "s_grid_4 s_grid") %>
<%= f.select :experience_category_id, ExperienceCategory.all.collect {|t| [ t.title, t.id ]}, {:class => "s_grid s_grid_8"} %> <%= f.select :experience_category_id, ExperienceCategory.all.collect {|t| [ t.title, t.id ]}, {:class => "s_grid s_grid_8"} %>
@ -80,16 +78,9 @@
<%= f.label :language, t("personal_experience.language"), :class => "s_grid s_grid_4" %> <%= f.label :language, t("personal_experience.language"), :class => "s_grid s_grid_4" %>
<%= f.select :language, Experience::LANGUAGE_TYPES,{} ,{:class => "s_grid s_grid_8"} %> <%= f.select :language, Experience::LANGUAGE_TYPES,{} ,{:class => "s_grid s_grid_8"} %>
</li> </li>
</ul>
</div>
</div>
<div column="true">
<div class="s_form">
<ul>
<li class="s_grid_row"> <li class="s_grid_row">
<%= f.text_area :note, size: "20x3", placeholder: t("personal_experience.note"), value: @experience.note , class: "s_grid_12 s_grid s_grid_h_3"%> <%= f.text_area :note, size: "20x3", placeholder: t("personal_experience.note"), value: @experience.note , class: "s_grid_12 s_grid s_grid_h_3 s_grid_h_full"%>
</li> </li>
</ul> </ul>
</div>
</div>
</div> </div>

4
vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/desktop/personal_experiences/index.html.erb vendored
View File

@ -61,8 +61,10 @@
<div class="sdm_t hh1"><span class="icon-question-sign"></span></div> <div class="sdm_t hh1"><span class="icon-question-sign"></span></div>
</div> </div>
</div> </div>
<div class="overview" page-name="experience_list" content-layout="datalist" base-width="300" per-column="<%= @per_column.to_s %>" pagination-var="view=<%= @view_by %>&page" > <div class="overview" page-name="experience_list" content-layout="simple" base-width="300" per-column="<%= @per_column.to_s %>" pagination-var="view=<%= @view_by %>&page" >
<ul isotope="true">
<% @experiences.each do |w| %> <% @experiences.each do |w| %>
<%= publication_record w, @view_by%> <%= publication_record w, @view_by%>
<% end %> <% end %>
</ul>
</div> </div>

3
vendor/built_in_modules/personal_honor/app/helpers/panel/personal_honor/desktop/personal_honors_helper.rb vendored
View File

@ -4,11 +4,14 @@ module Panel::PersonalHonor::Desktop::PersonalHonorsHelper
"item" => "true", "item" => "true",
"data-id" => publication.id.to_s, "data-id" => publication.id.to_s,
:class => "list_t_item #{view.blank? ? '' : "#{view}_view" } #{publication.is_hidden? ? "private" : "public" }" do :class => "list_t_item #{view.blank? ? '' : "#{view}_view" } #{publication.is_hidden? ? "private" : "public" }" do
content_tag :div,
:class => "inner" do
marker(publication.id) + \ marker(publication.id) + \
content(publication, view) + \ content(publication, view) + \
edit_or_delete(publication) edit_or_delete(publication)
end end
end end
end
def marker id def marker id
content_tag :div, content_tag :div,

20
vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/desktop/personal_honors/_form.html.erb vendored
View File

@ -21,11 +21,9 @@
<div class="sdm_t hh1"><span class="icon-question-sign"></span></div> <div class="sdm_t hh1"><span class="icon-question-sign"></span></div>
</div> </div>
</div> </div>
<div class="overview" content-layout="column" base-width="420"> <div class="overview" content-layout="simple" base-width="420">
<div column="true"> <ul class="s_form" isotope="true">
<div class="s_form"> <li class="s_grid_row" >
<ul>
<li class="s_grid_row">
<%= label_tag("", t("personal_honor.award_name"), class: "s_grid_4 s_grid") %><%= f.text_field :award_name, size: "20", class: "s_grid_8 s_grid"%> <%= label_tag("", t("personal_honor.award_name"), class: "s_grid_4 s_grid") %><%= f.text_field :award_name, size: "20", class: "s_grid_8 s_grid"%>
</li> </li>
<li class="s_grid_row"> <li class="s_grid_row">
@ -49,16 +47,10 @@
<%= f.label :language, t("personal_honor.language"), :class => "s_grid s_grid_4" %> <%= f.label :language, t("personal_honor.language"), :class => "s_grid s_grid_4" %>
<%= f.select :language, Honor::LANGUAGE_TYPES,{} ,{:class => "s_grid s_grid_8"} %> <%= f.select :language, Honor::LANGUAGE_TYPES,{} ,{:class => "s_grid s_grid_8"} %>
</li> </li>
</ul>
</div>
</div>
<div column="true">
<div class="s_form">
<ul>
<li class="s_grid_row"> <li class="s_grid_row">
<%= f.text_area :note, size: "20x3", placeholder: t("personal_honor.note"), class: "s_grid_12 s_grid s_grid_h_5"%> <%= f.text_area :note, size: "20x3", placeholder: t("personal_honor.note"), class: "s_grid_12 s_grid s_grid_h_5 s_grid_h_full"%>
</li> </li>
</ul> </ul>
</div>
</div>
</div> </div>

4
vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/desktop/personal_honors/index.html.erb vendored
View File

@ -59,8 +59,10 @@
<div class="sdm_t hh1"><span class="icon-question-sign"></span></div> <div class="sdm_t hh1"><span class="icon-question-sign"></span></div>
</div> </div>
</div> </div>
<div class="overview" page-name="honor_list" content-layout="datalist" base-width="300" per-column="<%= @per_column.to_s %>" pagination-var="view=<%= @view_by %>&page" > <div class="overview" page-name="honor_list" content-layout="simple" base-width="300" per-column="<%= @per_column.to_s %>" pagination-var="view=<%= @view_by %>&page" >
<ul isotope="true">
<% @honors.each do |w| %> <% @honors.each do |w| %>
<%= publication_record w, @view_by%> <%= publication_record w, @view_by%>
<% end %> <% end %>
</ul>
</div> </div>

2
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb vendored
View File

@ -44,7 +44,7 @@
placeholder: t("personal_journal.paper_title")+ "("+I18nVariable.from_locale(locale)+")", placeholder: t("personal_journal.paper_title")+ "("+I18nVariable.from_locale(locale)+")",
value: (@writing_journal.paper_title_translations[locale.to_s] rescue nil) %> value: (@writing_journal.paper_title_translations[locale.to_s] rescue nil) %>
<% end %> <% end %>
<p></p>
<%= f.fields_for :journal_title_translations do |f| %> <%= f.fields_for :journal_title_translations do |f| %>
<%= f.text_field locale, <%= f.text_field locale,
size: "20", size: "20",

3
vendor/built_in_modules/personal_lab/app/helpers/panel/personal_lab/desktop/personal_labs_helper.rb vendored
View File

@ -4,11 +4,14 @@ module Panel::PersonalLab::Desktop::PersonalLabsHelper
"item" => "true", "item" => "true",
"data-id" => publication.id.to_s, "data-id" => publication.id.to_s,
:class => "list_t_item #{view.blank? ? '' : "#{view}_view" } #{publication.is_hidden? ? "private" : "public" }" do :class => "list_t_item #{view.blank? ? '' : "#{view}_view" } #{publication.is_hidden? ? "private" : "public" }" do
content_tag :div,
:class => "inner" do
marker(publication.id) + \ marker(publication.id) + \
content(publication, view) + \ content(publication, view) + \
edit_or_delete(publication) edit_or_delete(publication)
end end
end end
end
def marker id def marker id
content_tag :div, content_tag :div,

41
vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/desktop/personal_labs/_form.html.erb vendored
View File

@ -21,14 +21,13 @@
<div class="sdm_t hh1"><span class="icon-question-sign"></span></div> <div class="sdm_t hh1"><span class="icon-question-sign"></span></div>
</div> </div>
</div> </div>
<div class="overview" content-layout="column" base-width="420"> <div class="overview" content-layout="simple" base-width="420">
<div column="true"> <ul class="s_form" isotope="true">
<div class="s_form"> <li class="s_grid_row">
<ul>
<% @site_valid_locales.each_with_index do |locale, i| %> <% @site_valid_locales.each_with_index do |locale, i| %>
<% style = locale != I18n.locale.to_s ? 'style=display:none;' : "" %> <% style = locale != I18n.locale.to_s ? 'style=display:none;' : "" %>
<% data = "data-language=" + locale %> <% data = "data-language=" + locale %>
<li class="s_grid_row" <%= style %> <%= data %>> <div class="form_fix" <%= style %> <%= data %>>
<%= f.fields_for :lab_title_translations do |f| %> <%= f.fields_for :lab_title_translations do |f| %>
<%= f.text_field locale, <%= f.text_field locale,
size: "20", size: "20",
@ -36,8 +35,7 @@
class: "s_grid_12 s_grid", class: "s_grid_12 s_grid",
value: (@lab.lab_title_translations[locale.to_s] rescue nil) %> value: (@lab.lab_title_translations[locale.to_s] rescue nil) %>
<% end %> <% end %>
</li>
<li class="s_grid_row" <%= style %> <%= data %>>
<%= f.fields_for :location_translations do |f| %> <%= f.fields_for :location_translations do |f| %>
<%= f.text_field locale, <%= f.text_field locale,
size: "20", size: "20",
@ -45,8 +43,7 @@
class: "s_grid_12 s_grid", class: "s_grid_12 s_grid",
value: (@lab.location_translations[locale.to_s] rescue nil) %> value: (@lab.location_translations[locale.to_s] rescue nil) %>
<% end %> <% end %>
</li>
<li class="s_grid_row" <%= style %> <%= data %>>
<%= f.fields_for :participating_professor_translations do |f| %> <%= f.fields_for :participating_professor_translations do |f| %>
<%= f.text_field locale, <%= f.text_field locale,
size: "20", size: "20",
@ -54,8 +51,7 @@
class: "s_grid_12 s_grid", class: "s_grid_12 s_grid",
value: (@lab.participating_professor_translations[locale.to_s] rescue nil) %> value: (@lab.participating_professor_translations[locale.to_s] rescue nil) %>
<% end %> <% end %>
</li>
<li class="s_grid_row" <%= style %> <%= data %>>
<%= f.fields_for :participating_student_translations do |f| %> <%= f.fields_for :participating_student_translations do |f| %>
<%= f.text_field locale, <%= f.text_field locale,
size: "20", size: "20",
@ -63,8 +59,9 @@
class: "s_grid_12 s_grid", class: "s_grid_12 s_grid",
value: (@lab.participating_student_translations[locale.to_s] rescue nil) %> value: (@lab.participating_student_translations[locale.to_s] rescue nil) %>
<% end %> <% end %>
</li> </div>
<% end %> <% end %>
</li>
<li class="s_grid_row"> <li class="s_grid_row">
<%= label_tag("", t("personal_lab.extension_no"), class: "s_grid_4 s_grid") %><%= f.text_field :extension_no, size: "20", class: "s_grid_8 s_grid"%> <%= label_tag("", t("personal_lab.extension_no"), class: "s_grid_4 s_grid") %><%= f.text_field :extension_no, size: "20", class: "s_grid_8 s_grid"%>
</li> </li>
@ -81,12 +78,7 @@
<li class="s_grid_row"> <li class="s_grid_row">
<%= f.text_area :keywords, size: "20x3", placeholder: t("personal_lab.keywords"), class: "s_grid_12 s_grid_h_2 s_grid"%> <%= f.text_area :keywords, size: "20x3", placeholder: t("personal_lab.keywords"), class: "s_grid_12 s_grid_h_2 s_grid"%>
</li> </li>
</ul>
</div>
</div>
<div column="true">
<div class="s_form">
<ul>
<li class="s_grid_row"> <li class="s_grid_row">
<%= label_tag("", t("personal_lab.url"), class: "s_grid_4 s_grid") %><%= f.text_field :url, size: "20", class: "s_grid_8 s_grid"%> <%= label_tag("", t("personal_lab.url"), class: "s_grid_4 s_grid") %><%= f.text_field :url, size: "20", class: "s_grid_8 s_grid"%>
</li> </li>
@ -95,14 +87,8 @@
<%= f.select :language, Lab::LANGUAGE_TYPES,{} ,{:class => "s_grid s_grid_8"} %> <%= f.select :language, Lab::LANGUAGE_TYPES,{} ,{:class => "s_grid s_grid_8"} %>
</li> </li>
<li class="s_grid_row"> <li class="s_grid_row">
<%= f.text_area :note, size: "20x3", placeholder: t("personal_lab.note"), class: "s_grid_12 s_grid s_grid_h_5"%> <%= f.text_area :note, size: "20x3", placeholder: t("personal_lab.note"), class: "s_grid_12 s_grid s_grid_h_5 s_grid_h_full"%>
</li>
</ul>
</div>
</div>
<div column="true">
<div class="s_form">
<ul>
<li class="s_grid_row"> <li class="s_grid_row">
<table class="s_table"> <table class="s_table">
<thead> <thead>
@ -133,8 +119,7 @@
</table> </table>
</li> </li>
</ul> </ul>
</div>
</div>
</div> </div>
<script> <script>
var get_html = function(old_id,new_id){ var get_html = function(old_id,new_id){

4
vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/desktop/personal_labs/index.html.erb vendored
View File

@ -61,8 +61,10 @@
<div class="sdm_t hh1"><span class="icon-question-sign"></span></div> <div class="sdm_t hh1"><span class="icon-question-sign"></span></div>
</div> </div>
</div> </div>
<div class="overview" page-name="lab_list" content-layout="datalist" base-width="300" per-column="<%= @per_column.to_s %>" pagination-var="view=<%= @view_by %>&page" > <div class="overview" page-name="lab_list" content-layout="simple" base-width="300" per-column="<%= @per_column.to_s %>" pagination-var="view=<%= @view_by %>&page" >
<ul isotope="true">
<% @labs.each do |w| %> <% @labs.each do |w| %>
<%= publication_record w, @view_by%> <%= publication_record w, @view_by%>
<% end %> <% end %>
</ul>
</div> </div>

3
vendor/built_in_modules/personal_patent/app/helpers/panel/personal_patent/desktop/personal_patents_helper.rb vendored
View File

@ -4,11 +4,14 @@ module Panel::PersonalPatent::Desktop::PersonalPatentsHelper
"item" => "true", "item" => "true",
"data-id" => publication.id.to_s, "data-id" => publication.id.to_s,
:class => "list_t_item #{view.blank? ? '' : "#{view}_view" } #{publication.is_hidden? ? "private" : "public" }" do :class => "list_t_item #{view.blank? ? '' : "#{view}_view" } #{publication.is_hidden? ? "private" : "public" }" do
content_tag :div,
:class => "inner" do
marker(publication.id) + \ marker(publication.id) + \
content(publication, view) + \ content(publication, view) + \
edit_or_delete(publication) edit_or_delete(publication)
end end
end end
end
def marker id def marker id
content_tag :div, content_tag :div,

32
vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/desktop/personal_patents/_form.html.erb vendored
View File

@ -21,14 +21,13 @@
<div class="sdm_t hh1"><span class="icon-question-sign"></span></div> <div class="sdm_t hh1"><span class="icon-question-sign"></span></div>
</div> </div>
</div> </div>
<div class="overview" content-layout="column" base-width="420"> <div class="overview" content-layout="simple" base-width="420">
<div column="true"> <ul class="s_form" isotope="true">
<div class="s_form"> <li class="s_grid_row">
<ul>
<% @site_valid_locales.each_with_index do |locale, i| %> <% @site_valid_locales.each_with_index do |locale, i| %>
<% style = locale != I18n.locale.to_s ? 'style=display:none;' : "" %> <% style = locale != I18n.locale.to_s ? 'style=display:none;' : "" %>
<% data = "data-language=" + locale %> <% data = "data-language=" + locale %>
<li class="s_grid_row" <%= style %> <%= data %>> <div class="form_fix" <%= style %> <%= data %>>
<%= f.fields_for :patent_title_translations do |f| %> <%= f.fields_for :patent_title_translations do |f| %>
<%= f.text_field locale, <%= f.text_field locale,
size: "20", size: "20",
@ -36,8 +35,9 @@
class: "s_grid_12 s_grid", class: "s_grid_12 s_grid",
value: (@patent.patent_title_translations[locale.to_s] rescue nil) %> value: (@patent.patent_title_translations[locale.to_s] rescue nil) %>
<% end %> <% end %>
</li> </div>
<% end %> <% end %>
</li>
<li class="s_grid_row"> <li class="s_grid_row">
<%= label_tag("", t("personal_patent.patent_no"), class: "s_grid_4 s_grid") %><%= f.text_field :patent_no, size: "20", class: "s_grid_8 s_grid"%> <%= label_tag("", t("personal_patent.patent_no"), class: "s_grid_4 s_grid") %><%= f.text_field :patent_no, size: "20", class: "s_grid_8 s_grid"%>
</li> </li>
@ -67,21 +67,10 @@
<%= f.label :language, t("personal_patent.language"), :class => "s_grid s_grid_4" %> <%= f.label :language, t("personal_patent.language"), :class => "s_grid s_grid_4" %>
<%= f.select :language, WritingPatent::LANGUAGE_TYPES,{} ,{:class => "s_grid s_grid_8"} %> <%= f.select :language, WritingPatent::LANGUAGE_TYPES,{} ,{:class => "s_grid s_grid_8"} %>
</li> </li>
</ul>
</div>
</div>
<div column="true">
<div class="s_form">
<ul>
<li class="s_grid_row"> <li class="s_grid_row">
<%= f.text_area :note, size: "20x3", placeholder: t("personal_patent.note"), class: "s_grid_12 s_grid s_grid_h_5"%> <%= f.text_area :note, size: "20x3", placeholder: t("personal_patent.note"), class: "s_grid_12 s_grid s_grid_h_5 s_grid_h_full"%>
</li>
</ul>
</div>
</div>
<div column="true">
<div class="s_form">
<ul>
<li class="s_grid_row"> <li class="s_grid_row">
<table class="s_table"> <table class="s_table">
<thead> <thead>
@ -112,8 +101,7 @@
</table> </table>
</li> </li>
</ul> </ul>
</div>
</div>
</div> </div>
<script> <script>
var get_html = function(old_id,new_id){ var get_html = function(old_id,new_id){

4
vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/desktop/personal_patents/index.html.erb vendored
View File

@ -60,8 +60,10 @@
<div class="sdm_t hh1"><span class="icon-question-sign"></span></div> <div class="sdm_t hh1"><span class="icon-question-sign"></span></div>
</div> </div>
</div> </div>
<div class="overview" page-name="patent_list" content-layout="datalist" base-width="300" per-column="<%= @per_column.to_s %>" pagination-var="view=<%= @view_by %>&page" > <div class="overview" page-name="patent_list" content-layout="simple" base-width="300" per-column="<%= @per_column.to_s %>" pagination-var="view=<%= @view_by %>&page" >
<ul isotope="true">
<% @patents.each do |w| %> <% @patents.each do |w| %>
<%= publication_record w, @view_by%> <%= publication_record w, @view_by%>
<% end %> <% end %>
</ul>
</div> </div>

3
vendor/built_in_modules/personal_project/app/helpers/panel/personal_project/desktop/personal_projects_helper.rb vendored
View File

@ -5,11 +5,14 @@ module Panel::PersonalProject::Desktop::PersonalProjectsHelper
"item" => "true", "item" => "true",
"data-id" => publication.id.to_s, "data-id" => publication.id.to_s,
:class => "list_t_item #{view.blank? ? '' : "#{view}_view" } #{publication.is_hidden? ? "private" : "public" }" do :class => "list_t_item #{view.blank? ? '' : "#{view}_view" } #{publication.is_hidden? ? "private" : "public" }" do
content_tag :div,
:class => "inner" do
marker(publication.id) + \ marker(publication.id) + \
content(publication, view) + \ content(publication, view) + \
edit_or_delete(publication) edit_or_delete(publication)
end end
end end
end
def marker id def marker id
content_tag :div, content_tag :div,

48
vendor/built_in_modules/personal_project/app/views/panel/personal_project/desktop/personal_projects/_form.html.erb vendored
View File

@ -21,14 +21,13 @@
<div class="sdm_t hh1"><span class="icon-question-sign"></span></div> <div class="sdm_t hh1"><span class="icon-question-sign"></span></div>
</div> </div>
</div> </div>
<div class="overview" content-layout="column" base-width="420"> <div class="overview" content-layout="simple" base-width="420">
<div column="true"> <ul class="s_form" isotope="true">
<div class="s_form"> <li class="s_grid_row">
<ul>
<% @site_valid_locales.each_with_index do |locale, i| %> <% @site_valid_locales.each_with_index do |locale, i| %>
<% style = locale != I18n.locale.to_s ? 'style=display:none;' : "" %> <% style = locale != I18n.locale.to_s ? 'style=display:none;' : "" %>
<% data = "data-language=" + locale %> <% data = "data-language=" + locale %>
<li class="s_grid_row" <%= style %> <%= data %>> <div class="form_fix" <%= style %> <%= data %>>
<%= f.fields_for :project_title_translations do |f| %> <%= f.fields_for :project_title_translations do |f| %>
<%= f.text_field locale, <%= f.text_field locale,
size: "20", size: "20",
@ -36,8 +35,7 @@
class: "s_grid_12 s_grid", class: "s_grid_12 s_grid",
value: (@project.project_title_translations[locale.to_s] rescue nil) %> value: (@project.project_title_translations[locale.to_s] rescue nil) %>
<% end %> <% end %>
</li>
<li class="s_grid_row" <%= style %> <%= data %>>
<%= f.fields_for :job_title_translations do |f| %> <%= f.fields_for :job_title_translations do |f| %>
<%= f.text_field locale, <%= f.text_field locale,
size: "20", size: "20",
@ -45,8 +43,7 @@
class: "s_grid_12 s_grid", class: "s_grid_12 s_grid",
value: (@project.job_title_translations[locale.to_s] rescue nil) %> value: (@project.job_title_translations[locale.to_s] rescue nil) %>
<% end %> <% end %>
</li>
<li class="s_grid_row" <%= style %> <%= data %>>
<%= f.fields_for :participator_translations do |f| %> <%= f.fields_for :participator_translations do |f| %>
<%= f.text_field locale, <%= f.text_field locale,
size: "20", size: "20",
@ -54,8 +51,7 @@
class: "s_grid_12 s_grid", class: "s_grid_12 s_grid",
value: (@project.participator_translations[locale.to_s] rescue nil) %> value: (@project.participator_translations[locale.to_s] rescue nil) %>
<% end %> <% end %>
</li>
<li class="s_grid_row" <%= style %> <%= data %>>
<%= f.fields_for :unit_translations do |f| %> <%= f.fields_for :unit_translations do |f| %>
<%= f.text_field locale, <%= f.text_field locale,
size: "20", size: "20",
@ -63,8 +59,9 @@
class: "s_grid_12 s_grid", class: "s_grid_12 s_grid",
value: (@project.unit_translations[locale.to_s] rescue nil) %> value: (@project.unit_translations[locale.to_s] rescue nil) %>
<% end %> <% end %>
</li> </div>
<% end %> <% end %>
</li>
<li class="s_grid_row"> <li class="s_grid_row">
<%= label_tag("", t("personal_project.start_date"), class: "s_grid_4 s_grid") %> <%= label_tag("", t("personal_project.start_date"), class: "s_grid_4 s_grid") %>
<%= f.date_select :period_start_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1930, :order => [:year] }, {:class => 's_grid_4 s_grid'} %> <%= f.date_select :period_start_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1930, :order => [:year] }, {:class => 's_grid_4 s_grid'} %>
@ -86,12 +83,7 @@
<li class="s_grid_row"> <li class="s_grid_row">
<%= label_tag("", t("personal_project.url"), class: "s_grid_4 s_grid") %><%= f.text_field :url, size: "20", class: "s_grid_8 s_grid"%> <%= label_tag("", t("personal_project.url"), class: "s_grid_4 s_grid") %><%= f.text_field :url, size: "20", class: "s_grid_8 s_grid"%>
</li> </li>
</ul>
</div>
</div>
<div column="true">
<div class="s_form">
<ul>
<li class="s_grid_row"> <li class="s_grid_row">
<%= f.text_area :keywords, size: "20x3", placeholder: t("personal_project.keywords"), class: "s_grid_12 s_grid_h_2 s_grid"%> <%= f.text_area :keywords, size: "20x3", placeholder: t("personal_project.keywords"), class: "s_grid_12 s_grid_h_2 s_grid"%>
</li> </li>
@ -100,23 +92,13 @@
<%= f.select :language, Project::LANGUAGE_TYPES,{} ,{:class => "s_grid s_grid_8"} %> <%= f.select :language, Project::LANGUAGE_TYPES,{} ,{:class => "s_grid s_grid_8"} %>
</li> </li>
<li class="s_grid_row"> <li class="s_grid_row">
<%= f.text_area :note, size: "20x3", placeholder: t("personal_project.note"), class: "s_grid_12 s_grid s_grid_h_7"%> <%= f.text_area :note, size: "20x3", placeholder: t("personal_project.note"), class: "s_grid_12 s_grid s_grid_h_7 s_grid_h_full"%>
</li> </li>
</ul>
</div>
</div>
<div column="true">
<div class="s_form">
<ul>
<li class="s_grid_row"> <li class="s_grid_row">
<%= f.text_area :abstract, size: "20x22", placeholder: t("personal_project.abstract"), class: "s_grid_12 s_grid s_grid_h_10"%> <%= f.text_area :abstract, size: "20x22", placeholder: t("personal_project.abstract"), class: "s_grid_12 s_grid s_grid_h_10 s_grid_h_full"%>
</li> </li>
</ul>
</div>
</div>
<div column="true">
<div class="s_form">
<ul>
<li class="s_grid_row"> <li class="s_grid_row">
<table class="s_table"> <table class="s_table">
<thead> <thead>
@ -147,8 +129,6 @@
</table> </table>
</li> </li>
</ul> </ul>
</div>
</div>
</div> </div>
<script> <script>
var get_html = function(old_id,new_id){ var get_html = function(old_id,new_id){

4
vendor/built_in_modules/personal_project/app/views/panel/personal_project/desktop/personal_projects/index.html.erb vendored
View File

@ -61,8 +61,10 @@
<div class="sdm_t hh1"><span class="icon-question-sign"></span></div> <div class="sdm_t hh1"><span class="icon-question-sign"></span></div>
</div> </div>
</div> </div>
<div class="overview" page-name="project_list" content-layout="datalist" base-width="300" per-column="<%= @per_column.to_s %>" pagination-var="view=<%= @view_by %>&page" > <div class="overview" page-name="project_list" content-layout="simple" base-width="300" per-column="<%= @per_column.to_s %>" pagination-var="view=<%= @view_by %>&page" >
<ul isotope="true">
<% @projects.each do |w| %> <% @projects.each do |w| %>
<%= publication_record w, @view_by%> <%= publication_record w, @view_by%>
<% end %> <% end %>
</ul>
</div> </div>

3
vendor/built_in_modules/personal_research/app/helpers/panel/personal_research/desktop/personal_researchs_helper.rb vendored
View File

@ -5,11 +5,14 @@ module Panel::PersonalResearch::Desktop::PersonalResearchsHelper
"item" => "true", "item" => "true",
"data-id" => publication.id.to_s, "data-id" => publication.id.to_s,
:class => "list_t_item #{view.blank? ? '' : "#{view}_view" } #{publication.is_hidden? ? "private" : "public" }" do :class => "list_t_item #{view.blank? ? '' : "#{view}_view" } #{publication.is_hidden? ? "private" : "public" }" do
content_tag :div,
:class => "inner" do
marker(publication.id) + \ marker(publication.id) + \
content(publication, view) + \ content(publication, view) + \
edit_or_delete(publication) edit_or_delete(publication)
end end
end end
end
def marker id def marker id
content_tag :div, content_tag :div,

26
vendor/built_in_modules/personal_research/app/views/panel/personal_research/desktop/personal_researchs/_form.html.erb vendored
View File

@ -21,14 +21,13 @@
<div class="sdm_t hh1"><span class="icon-question-sign"></span></div> <div class="sdm_t hh1"><span class="icon-question-sign"></span></div>
</div> </div>
</div> </div>
<div class="overview" content-layout="column" base-width="420"> <div class="overview" content-layout="simple" base-width="420">
<div column="true"> <ul class="s_form" isotope="true">
<div class="s_form"> <li class="s_grid_row">
<ul>
<% @site_valid_locales.each_with_index do |locale, i| %> <% @site_valid_locales.each_with_index do |locale, i| %>
<% style = locale != I18n.locale.to_s ? 'style=display:none;' : "" %> <% style = locale != I18n.locale.to_s ? 'style=display:none;' : "" %>
<% data = "data-language=" + locale %> <% data = "data-language=" + locale %>
<li class="s_grid_row" <%= style %> <%= data %>> <div class="form_fix" <%= style %> <%= data %>>
<%= f.fields_for :research_title_translations do |f| %> <%= f.fields_for :research_title_translations do |f| %>
<%= f.text_field locale, <%= f.text_field locale,
size: "20", size: "20",
@ -36,8 +35,7 @@
class: "s_grid_12 s_grid", class: "s_grid_12 s_grid",
value: (@research.research_title_translations[locale.to_s] rescue nil) %> value: (@research.research_title_translations[locale.to_s] rescue nil) %>
<% end %> <% end %>
</li>
<li class="s_grid_row" <%= style %> <%= data %>>
<%= f.fields_for :extracted_chapters_translations do |f| %> <%= f.fields_for :extracted_chapters_translations do |f| %>
<%= f.text_field locale, <%= f.text_field locale,
size: "20", size: "20",
@ -45,8 +43,9 @@
class: "s_grid_12 s_grid", class: "s_grid_12 s_grid",
value: (@research.extracted_chapters_translations[locale.to_s] rescue nil) %> value: (@research.extracted_chapters_translations[locale.to_s] rescue nil) %>
<% end %> <% end %>
</li> </div>
<% end %> <% end %>
</li>
<li class="s_grid_row"> <li class="s_grid_row">
<%= label_tag("", t("personal_research.publication_date"), class: "s_grid_4 s_grid") %> <%= label_tag("", t("personal_research.publication_date"), class: "s_grid_4 s_grid") %>
<%= f.date_select :publish_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1930, :order => [:year] }, {:class => 's_grid_4 s_grid'} %> <%= f.date_select :publish_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1930, :order => [:year] }, {:class => 's_grid_4 s_grid'} %>
@ -63,14 +62,9 @@
<%= f.select :language, Research::LANGUAGE_TYPES,{} ,{:class => "s_grid s_grid_8"} %> <%= f.select :language, Research::LANGUAGE_TYPES,{} ,{:class => "s_grid s_grid_8"} %>
</li> </li>
<li class="s_grid_row"> <li class="s_grid_row">
<%= f.text_area :note, size: "20x3", placeholder: t("personal_research.note"), class: "s_grid_12 s_grid s_grid_h_3"%> <%= f.text_area :note, size: "20x3", placeholder: t("personal_research.note"), class: "s_grid_12 s_grid s_grid_h_3 s_grid_h_full"%>
</li> </li>
</ul>
</div>
</div>
<div column="true">
<div class="s_form">
<ul>
<li class="s_grid_row"> <li class="s_grid_row">
<table class="s_table"> <table class="s_table">
<thead> <thead>
@ -101,8 +95,6 @@
</table> </table>
</li> </li>
</ul> </ul>
</div>
</div>
</div> </div>
<script> <script>
var get_html = function(old_id,new_id){ var get_html = function(old_id,new_id){

4
vendor/built_in_modules/personal_research/app/views/panel/personal_research/desktop/personal_researchs/index.html.erb vendored
View File

@ -61,8 +61,10 @@
<div class="sdm_t hh1"><span class="icon-question-sign"></span></div> <div class="sdm_t hh1"><span class="icon-question-sign"></span></div>
</div> </div>
</div> </div>
<div class="overview" page-name="research_list" content-layout="datalist" base-width="300" per-column="<%= @per_column.to_s %>" pagination-var="view=<%= @view_by %>&page" > <div class="overview" page-name="research_list" content-layout="simple" base-width="300" per-column="<%= @per_column.to_s %>" pagination-var="view=<%= @view_by %>&page" >
<ul isotope="true">
<% @researches.each do |w| %> <% @researches.each do |w| %>
<%= publication_record w, @view_by%> <%= publication_record w, @view_by%>
<% end %> <% end %>
</ul>
</div> </div>