developers/orbit-basic
2
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Lots of Update

Browse Source 
1. CSS to SCSS
2. Journal Paper update

Conflicts:
	Gemfile.lock
	app/assets/javascripts/orbitdesktop.js
	app/assets/stylesheets/desktop/desktop-main.css
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/index.html.erb
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/index.html.erb
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/journal_type.html.erb
This commit is contained in:
devin authored and Matt K. Fu committed 2013-04-17 14:14:23 +08:00
1 parent 0f6f5aafce
commit c8aa50ee87
38 files changed
+3206 -1533
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_authors/_form.html.erb
Vendored
+6 -6
View File
@@ -7,8 +7,8 @@
<div id="new_co_author" class="s_grid_con s_form vp">
<ul>
<li class="s_grid_row">
<%= f.label :co_author, class: "s_grid s_grid_2" %>
<%= f.text_field :co_author, class: "s_grid_4 s_grid"%>
<%= f.label :co_author, class: "s_grid s_grid_4" %>
<%= f.text_field :co_author, class: "s_grid_8 s_grid"%>
<!--
<%#= f.fields_for :co_author_translations do |f| %>
<%#= f.text_field locale,
@@ -18,12 +18,12 @@
-->
</li>
<li class="s_grid_row">
<%= f.label :email, class: "s_grid s_grid_2"%>
<%= f.text_field :email, class: "s_grid s_grid_4" %>
<%= f.label :email, class: "s_grid s_grid_4"%>
<%= f.text_field :email, class: "s_grid s_grid_8" %>
</li>
<li class="s_grid_row">
<%= f.label :type, class: "s_grid s_grid_2"%>
<select name="conference_co_author[co_author_relations_id]" id="" class="s_grid s_grid_4">
<%= f.label :type, class: "s_grid s_grid_4"%>
<select name="conference_co_author[co_author_relations_id]" id="" class="s_grid s_grid_8">
<%= options_for_select(
@conference_co_author_relations.map do |relation|
[relation.relation, relation.id]
vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb
Vendored
+59 -57
View File
@@ -31,14 +31,14 @@
</div>
</div>
<div class="viewport"> -->
<div class="overview" content-layout="column" base-width="450">
<div class="overview" content-layout="column" base-width="420">
<div column="true">
<div class="s_form">
<ul>
<li class="s_grid_row">
<%= f.fields_for :paper_title_translations do |f| %>
<%= f.text_area locale,
class: "s_grid_6 s_grid",
class: "s_grid_12 s_grid_h_2 s_grid",
size: "20x2",
placeholder: t("personal_conference.paper_title"),
value: (@writing_conference.paper_title_translations[locale.to_s] rescue nil) %>
@@ -49,18 +49,19 @@
<%= f.text_field locale,
size: "20",
placeholder: t("personal_conference.conference_title"),
class: "s_grid_6 s_grid",
class: "s_grid_12 s_grid",
# "autocomplete-list" => "conference_title_autocomplete_list",
value: (@writing_conference.conference_title_translations[locale.to_s] rescue nil) %>
<% end %>
<span class="icon-plus input_append"></span>
</li>
<li class="s_grid_row">
<div>
<%= label_tag("", t("personal_conference.paper_type")) %>
<%= label_tag("", t("personal_conference.paper_type"), class: 's_grid s_grid_4') %>
<div class="check_box_g s_grid s_grid_8 s_grid_h_1">
<ul>
<% @paper_types.each_with_index do |paper_type, i| %>
<li class="s_grid_row">
<li>
<%= radio_button_tag "writing_conference[conference_paper_type_ids][]",
paper_type.id,
@writing_conference.conference_paper_type_ids.include?(paper_type.id),
@@ -70,34 +71,33 @@
<% end %>
</ul>
</div>
</li>
<li class="s_grid_row">
<%= f.text_field :keywords, size: "20", placeholder: t("personal_conference.keywords"), class: "s_grid_6 s_grid"%>
</li>
<li class="s_grid_row">
<div>
<%= label_tag("", t("personal_conference.conference_time")) %>
<ul>
<li class="s_grid_row">
<%= label_tag("", t("personal_conference.period_start_date"), class: "s_grid_1 s_grid") %>
<%= f.date_select :period_start_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1930, :order => [:year, :month, :day] }, {:class => 's_grid_1 s_grid'} %>
</li>
<li class="s_grid_row">
<%= label_tag("", t("personal_conference.period_end_date"), class: "s_grid_1 s_grid") %>
<%= f.date_select :period_end_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1930, :order => [:year, :month, :day] }, {:class => 's_grid_1 s_grid'} %>
</li>
</ul>
</div>
</li>
<li class="s_grid_row">
<%= label_tag("", t("personal_conference.sponsor"), class: "s_grid_2 s_grid") %><%= f.text_field :sponsor, size: "20", placeholder: "Sponsor", class: "s_grid_4 s_grid"%>
<%= f.text_field :keywords, size: "20", placeholder: t("personal_conference.keywords"), class: "s_grid_12 s_grid"%>
</li>
<li class="s_grid_row">
<%= label_tag("", t("personal_conference.location"), class: "s_grid_2 s_grid") %><%= f.text_field :location, size: "20", placeholder: "Location", class: "s_grid_4 s_grid"%>
<%= label_tag("", t("personal_conference.conference_time"), class: "s_grid s_grid_4") %>
<ul class="s_grid s_grid_8">
<li class="s_grid_row">
<%= label_tag("", t("personal_conference.period_start_date"), class: "s_grid_2 s_grid") %>
<%= f.date_select :period_start_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1930, :order => [:year, :month, :day] }, {:class => 's_grid_2 s_grid'} %>
</li>
<li class="s_grid_row">
<%= label_tag("", t("personal_conference.period_end_date"), class: "s_grid_2 s_grid") %>
<%= f.date_select :period_end_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1930, :order => [:year, :month, :day] }, {:class => 's_grid_2 s_grid'} %>
</li>
</ul>
</li>
<li class="s_grid_row">
<%= label_tag("", t("personal_conference.url"), class: "s_grid_2 s_grid") %><%= f.text_field :url, size: "20", placeholder: "www.sample.com", class: "s_grid_4 s_grid"%>
<%= label_tag("", t("personal_conference.sponsor"), class: "s_grid_4 s_grid") %><%= f.text_field :sponsor, size: "20", placeholder: "Sponsor", class: "s_grid_8 s_grid"%>
</li>
<li class="s_grid_row">
<%= label_tag("", t("personal_conference.location"), class: "s_grid_4 s_grid") %><%= f.text_field :location, size: "20", placeholder: "Location", class: "s_grid_8 s_grid"%>
</li>
<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"%>
</li>
</ul>
</div>
@@ -106,7 +106,7 @@
<ul>
<li class="s_grid_row">
<%= f.text_area :author_tokens,
class: "s_grid_6 s_grid",
class: "s_grid_12 s_grid",
size: "20x2",
placeholder: t("personal_conference.authors"),
"data-pre" => generate_authors_name(@writing_conference.conference_co_author_ids) %>
@@ -118,24 +118,24 @@
# "autocomplete-list" => "coauthor_autocomplete_list",
value: (@writing_conference.authors_translations[locale.to_s] rescue nil) %>
<%# end %>
<span class="icon-plus input_append"></span>
</li>
<li class="s_grid_row">
<select name="writing_conference[conference_author_type_ids][]" id="" class="s_grid s_grid_6">
<%= options_for_select(
[t("personal_conference.author_type")] +
@author_types.map do |author_type|
[author_type.title, author_type.id]
end
)
%>
<%= label_tag("", t("personal_conference.author_type"), class: "s_grid_4 s_grid") %>
<select name="writing_conference[conference_author_type_ids][]" id="" class="s_grid s_grid_8">
<%= options_for_select(
@author_types.map do |author_type|
[author_type.title, author_type.id]
end
)
%>
</select>
</li>
<li class="s_grid_row">
<select name="" id="" class="s_grid s_grid_6">
<option value="">Status</option>
<label for="" class="s_grid s_grid_4">Status</label>
<select name="" id="" class="s_grid s_grid_8">
<option value="">Published</option>
<option value="">Pending</option>
<option value="">Writing</option>
@@ -143,20 +143,16 @@
</li>
<li class="s_grid_row">
<%= label_tag("", t("personal_conference.publication_date"), class: "s_grid_3 s_grid") %>
<%= f.date_select :publication_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1930, :order => [:year, :month, :day] }, {:class => 's_grid_1 s_grid'} %>
<%= label_tag("", t("personal_conference.publication_date"), class: "s_grid_6 s_grid") %>
<%= f.date_select :publication_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1930, :order => [:year, :month, :day] }, {:class => 's_grid_2 s_grid'} %>
</li>
<li class="s_grid_row">
<%= f.label :year, t("personal_conference.year"), :class => "s_grid_2 s_grid" %>
<%= select_year((@writing_conference.year ? @writing_conference.year.to_i : DateTime.now.year), {:start_year => DateTime.now.year, :end_year => 1930}, {:name => 'writing_conference[year]', :class => "s_grid_4 s_grid"} ) %>
<%= f.label :year, t("personal_conference.year"), :class => "s_grid_4 s_grid" %>
<%= select_year((@writing_conference.year ? @writing_conference.year.to_i : DateTime.now.year), {:start_year => DateTime.now.year, :end_year => 1930}, {:name => 'writing_conference[year]', :class => "s_grid_8 s_grid"} ) %>
</li>
<li class="s_grid_row"><input class="s_grid s_grid_6" type="text" placeholder=<%= t("personal_conference.tags") %>><span class="icon-plus input_append"></li>
<li class="s_grid_row">
<%= f.text_area :abstract, size: "20x22", placeholder: t("personal_conference.abstract"), class: "s_grid_6 s_grid full_height"%>
</li>
<li class="s_grid_row"><input class="s_grid s_grid_12" type="text" placeholder=<%= t("personal_conference.tags") %>></li>
</ul>
</div>
</div>
@@ -168,13 +164,14 @@
<thead>
<tr>
<th class="s_grid_2"><%= t("personal_conference.file")%></th>
<th class="s_grid_3"><%= t("personal_conference.file_name")%></th>
<th class="s_grid_1"><%= t("personal_conference.description") %></th>
<th class="s_grid_4"><%= t("personal_conference.file_name")%></th>
<th class="s_grid_4"><%= t("personal_conference.description") %></th>
<th class="s_grid_2"></th>
</tr>
</thead>
<tfoot>
<tr>
<td colspan="3">
<td colspan="4">
<div id='add_plugin_file' class="info_input plugin_files_block s_action">
<%= hidden_field_tag 'plugin_file_field_count', @writing_conference.writing_conference_files.count %>
<a class="add setting_btn thmc1 thmtxt w1 hh1 hp" href=""><i class="icon-plus icon-white"></i> add</a>
@@ -194,13 +191,18 @@
</ul>
</div>
<div column="true">
<div class="s_form">
<li class="s_grid_row">
<ul>
<%= f.text_area :note, size: "20x22", placeholder: t("personal_conference.note"), class: "s_grid_6 s_grid full_height"%>
</ul>
<ul class="s_form">
<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"%>
</li>
</div>
</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>
vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form_file.html.erb
Vendored
+4 -2
View File
@@ -7,10 +7,12 @@
</div>
</td>
<td>
<%= f.text_field :title %>
<%= f.text_field :title, class: 's_grid_4 s_grid' %>
</td>
<td>
<%= f.fields_for :file_title_translations do |f| %>
<%= f.text_field locale,
class: 's_grid_3 s_grid',
class: 's_grid_4 s_grid',
value: (form_file.file_title_translations[locale] rescue nil) %>
<% end %>
</td>
vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/conference_type.html.erb
Vendored
-2
View File
@@ -18,7 +18,6 @@
<div class="viewport"> -->
<div class="overview" content-layout="datalist" per-column="5" base-width="300" pagination-var="page">
<% @conference_lists.each_with_index do |conference_list,i| %>
<div class="g_col">
<ul>
<li class="list_t_item" item="true">
<div class="list_item_action">
@@ -29,7 +28,6 @@
<div class="list_t_desc"><%= level.join(",") %></div>
</li>
</ul>
</div>
<% end %>
</div>
<!-- </div>
vendor/built_in_modules/personal_conference/config/locales/zh_tw.yml
Vendored
+1 -1
View File
@@ -7,7 +7,7 @@ zh_tw:
language : "語言"
paper_title : "論文名稱"
paper_type : "論文型態"
conference_title : " 會議名稱"
conference_title : "會議名稱"
conference_time: "會議時間"
period_start_date : "起"
period_end_date : "訖"
vendor/built_in_modules/personal_journal/app/assets/javascripts/personal_journal/desktop/journal_pages.js
Vendored
+7 -6
View File
@@ -65,8 +65,8 @@ orbitDesktop.prototype.initializeJournalPapers = function(target,url,cache){ //
var tokesplits = function(){
$("#writing_journal_author_tokens").select2({
multiple: true,
minimumInputLength: 1,
width: "300px;",
minimumInputLength: -1,
width: "off",
formatResult: function movieFormatResult(coAuthor) {
var markup = "";
if (coAuthor.text !== undefined && coAuthor.email !== undefined) {
@@ -104,7 +104,7 @@ orbitDesktop.prototype.initializeJournalPapers = function(target,url,cache){ //
var preData = function(){
$("#writing_journal_author_tokens").select2('data', JSON.parse($("#writing_journal_author_tokens").attr('data-pre')));
}
o.use_select2();
uploadFiles();
tokesplits();
preData();
@@ -130,16 +130,17 @@ orbitDesktop.prototype.initializeJournalPapers = function(target,url,cache){ //
});
}
console.log("hi");
// console.log("hi");
var bindHandlers = function(){
o.simple_drop_down();
o.use_select2();
}
var tokesplits = function(){
$("#writing_journal_author_tokens").select2({
multiple: true,
minimumInputLength: 1,
width: "300px;",
minimumInputLength: -1,
width: "off",
formatResult: function movieFormatResult(coAuthor, container, query, escapeMarkup) {
var markup = "";
if (coAuthor.text !== undefined && coAuthor.email !== undefined) {
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/_show_form.html.erb
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
<div class="overview" content-layout="datalist" per-column="5" base-width="300" pagination-var="page">
<ul>
<% @journal_co_author_relations.each_with_index do |journal_co_author_relation,i| %>
<li class="s_grid_row" item="true">
<li item="true">
<div class="form_space" id="form_space_<%= i.to_s %>"><%= journal_co_author_relation.relation %></div>
<div class="list_item_function">
<%= link_to t('edit'), edit_panel_personal_journal_desktop_journal_co_author_relation_path(journal_co_author_relation), :class => "bt-edit-type admbg2 admtxt", "content-holder"=>"#form_space_"+i.to_s, "ajax-remote"=>"get" %>
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/index.html.erb
Vendored
+3 -2
View File
@@ -15,7 +15,8 @@
<!-- <div id="co_author_relation_table" class="tinycanvas vp">
<div class="scrollbar sb_h vp"><div class="track"><div class="thumb thmc2"><div class="end"></div></div></div></div>
<div class="viewport"> -->
<div class="overview" page-name="journal_p_coauthor_relation" content-layout="datalist" per-column="5" base-width="300">
<%= render :partial => 'show_form'%>
<!-- </div>
</div>
</div>
<!-- </div>
-->
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/_form.html.erb
Vendored
+6 -6
View File
@@ -7,8 +7,8 @@
<div id="new_co_author" class="s_grid_con s_form vp">
<ul>
<li class="s_grid_row">
<%= f.label :co_author, class: "s_grid s_grid_2" %>
<%= f.text_field :co_author, class: "s_grid_4 s_grid"%>
<%= f.label :co_author, class: "s_grid s_grid_4" %>
<%= f.text_field :co_author, class: "s_grid_8 s_grid"%>
<!--
<%#= f.fields_for :co_author_translations do |f| %>
<%#= f.text_field locale,
@@ -18,12 +18,12 @@
-->
</li>
<li class="s_grid_row">
<%= f.label :email, class: "s_grid s_grid_2"%>
<%= f.text_field :email, class: "s_grid s_grid_4" %>
<%= f.label :email, class: "s_grid s_grid_4"%>
<%= f.text_field :email, class: "s_grid s_grid_8" %>
</li>
<li class="s_grid_row">
<%= f.label :type, class: "s_grid s_grid_2"%>
<select name="journal_co_author[co_author_relations_id]" id="" class="s_grid s_grid_4">
<%= f.label :type, class: "s_grid s_grid_4"%>
<select name="journal_co_author[co_author_relations_id]" id="" class="s_grid s_grid_8">
<%= options_for_select(
@journal_co_author_relations.map do |relation|
[relation.relation, relation.id]
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/index.html.erb
Vendored
+3 -2
View File
@@ -7,12 +7,13 @@
<!-- <div id="co_author" class="tinycanvas vp">
<div class="scrollbar sb_h vp"><div class="track"><div class="thumb thmc2"><div class="end"></div></div></div></div>
<div class="overview" content-layout="datalist" per-column="4" base-width="300" pagination-var="page">
<div class="viewport"> -->
<div class="overview" page-name="journal_p_coauthor" content-layout="datalist" per-column="4" base-width="300" pagination-var="page">
<ul>
<% @journal_co_authors.each_with_index do |co_author,i| %>
<li class="list_t_item" item="true">
<ul class="info">
<li><div class="name"><%= co_author.co_author %></div></li>
<li><div class="list_t_title name"><%= co_author.co_author %></div></li>
<li><div class="email"><i class="icon-envelope"></i> <%= co_author.email %></div></li>
<li><div class="relations"><i class="icon-user"></i> <%= @journal_co_author_relations.find(co_author.journal_co_author_relations_id).relation unless co_author.journal_co_author_relations_id.nil?%></div></li>
</ul>
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb
Vendored
+40 -38
View File
@@ -32,15 +32,15 @@
</div>
</div>
<div class="viewport"> -->
<div class="overview" content-layout="column" base-width="450">
<div class="overview" content-layout="column" base-width="420">
<div column="true">
<div class="s_form">
<ul>
<li class="s_grid_row">
<%= f.fields_for :paper_title_translations do |f| %>
<%= f.text_area locale,
class: "s_grid_6 s_grid",
size: "20x2",
class: "s_grid_12 s_grid s_grid_h_3",
size: "20x4",
placeholder: t("personal_journal.paper_title"),
value: (@writing_journal.paper_title_translations[locale.to_s] rescue nil) %>
<% end %>
@@ -50,15 +50,16 @@
<%= f.text_field locale,
size: "20",
placeholder: t("personal_journal.journal_title"),
class: "s_grid_6 s_grid",
class: "s_grid_12 s_grid",
"autocomplete-list" => "journal_title_autocomplete_list",
value: (@writing_journal.journal_title_translations[locale.to_s] rescue nil) %>
<% end %>
<span class="icon-plus input_append"></span>
</li>
<li class="s_grid_row">
<div class="check_box_g">
<%= label_tag("", t("personal_journal.level_type")) %>
<%= label_tag("", t("personal_journal.level_type"), :class => 's_grid s_grid_4') %>
<div class="check_box_g s_grid s_grid_8 s_grid_h_2">
<ul>
<% @level_types.each_with_index do |level_type, i| %>
<li>
@@ -74,23 +75,23 @@
</li>
<li class="s_grid_row">
<%= label_tag("", t("personal_journal.isbn"), class: "s_grid_2 s_grid") %><%= f.text_field :isbn, size: "20", placeholder: "829872987", class: "s_grid_4 s_grid"%>
<%= label_tag("", t("personal_journal.isbn"), class: "s_grid_4 s_grid") %><%= f.text_field :isbn, size: "20", placeholder: "829872987", class: "s_grid_8 s_grid"%>
</li>
<li class="s_grid_row">
<%= label_tag("", t("personal_journal.vol_no"), class: "s_grid_2 s_grid") %><%= f.text_field :vol_no, size: "20", placeholder: "829872987", class: "s_grid_4 s_grid"%>
<%= label_tag("", t("personal_journal.vol_no"), class: "s_grid_4 s_grid") %><%= f.text_field :vol_no, size: "20", placeholder: "829872987", class: "s_grid_8 s_grid"%>
</li>
<li class="s_grid_row">
<%= label_tag("", t("personal_journal.issue_no"), class: "s_grid_2 s_grid") %><%= f.text_field :issue_no, size: "20", placeholder:"829872987", class: "s_grid_4 s_grid"%>
<%= label_tag("", t("personal_journal.issue_no"), class: "s_grid_4 s_grid") %><%= f.text_field :issue_no, size: "20", placeholder:"829872987", class: "s_grid_8 s_grid"%>
</li>
<li class="s_grid_row">
<%= label_tag("", t("personal_journal.total_pages"), class: "s_grid_2 s_grid") %><%= f.text_field :total_pages, size: "20", placeholder:"20", class: "s_grid_4 s_grid"%>
</li>
<li class="s_grid_row">
<%= label_tag("", t("personal_journal.total_pages"), class: "s_grid_2 s_grid") %><%= label_tag("", t("personal_journal.from"), class: "s_grid_1 s_grid") %><%= f.text_field :form_to_start, size: "10", placeholder: "1", class: "s_grid_1 s_grid"%><%= label_tag("", t("personal_journal.to"), class: "s_grid_1 s_grid") %><%= f.text_field :form_to_end, size: "10", placeholder: "20", class: "s_grid_1 s_grid"%>
<%= label_tag("", t("personal_journal.total_pages"), class: "s_grid_4 s_grid") %>
<%= f.text_field :form_to_start, size: "10", placeholder: "1", class: "s_grid_2 s_grid"%>
<%= label_tag("", t("personal_journal.to"), class: "s_grid_1 s_grid") %>
<%= f.text_field :form_to_end, size: "10", placeholder: "20", class: "s_grid_2 s_grid"%>
<label class="s_grid_1 s_grid" for="">共</label>
<%= f.text_field :total_pages, size: "20", placeholder:"20", class: "s_grid_2 s_grid"%>
</li>
</ul>
</div>
@@ -100,7 +101,7 @@
<ul>
<li class="s_grid_row">
<%= f.text_area :author_tokens,
class: "s_grid_6 s_grid",
class: "s_grid_12 s_grid",
size: "20x2",
placeholder: t("personal_journal.authors"),
"data-pre" => generate_authors_name(@writing_journal.journal_co_author_ids) %>
@@ -112,11 +113,11 @@
"autocomplete-list" => "coauthor_autocomplete_list",
value: (@writing_journal.authors_translations[locale.to_s] rescue nil) %>
<%# end %>
<span class="icon-plus input_append"></span>
</li>
<li class="s_grid_row">
<select name="writing_journal[journal_author_type_ids][]" id="" class="s_grid s_grid_4">
<select name="writing_journal[journal_author_type_ids][]" id="" class="s_grid s_grid_8">
<%= options_for_select(
[t("personal_journal.author_type")] +
@author_types.map do |author_type|
@@ -125,7 +126,7 @@
)%>
</select>
<select name="writing_journal[journal_paper_type_ids][]" id="" class="s_grid s_grid_2">
<select name="writing_journal[journal_paper_type_ids][]" id="" class="s_grid s_grid_4">
<%= options_for_select(
[t("personal_journal.level_type")] +
@paper_types.map do |paper_type|
@@ -135,31 +136,31 @@
</select>
</li>
<li class="s_grid_row">
<%= label_tag("", t("personal_journal.publication_date"), class: "s_grid_3 s_grid") %>
<%= f.date_select :publication_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1930, :order => [:year, :month, :day] }, {:class => 's_grid_1 s_grid'} %>
<%= label_tag("", t("personal_journal.publication_date"), class: "s_grid_4 s_grid") %>
<%= f.date_select :publication_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1930, :order => [:year] }, {:class => 's_grid_4 s_grid'} %>
<%= f.date_select :publication_date, {:use_month_numbers => true, :order => [:month, :day] }, {:class => 's_grid_2 s_grid'} %>
</li>
<li class="s_grid_row">
<%= f.text_field :keywords, size: "20", placeholder: t("personal_journal.keywords"), class: "s_grid_6 s_grid"%>
<%= f.text_area :keywords, size: "20x3", placeholder: t("personal_journal.keywords"), class: "s_grid_12 s_grid_h_2 s_grid"%>
</li>
<li class="s_grid_row">
<%= f.label :year, t("personal_journal.year"), :class => "s_grid_2 s_grid" %>
<%= select_year((@writing_journal.year ? @writing_journal.year.to_i : DateTime.now.year), {:start_year => DateTime.now.year, :end_year => 1930}, {:name => 'writing_journal[year]', :class => "s_grid_4 s_grid"} ) %>
<%= f.label :year, t("personal_journal.year"), :class => "s_grid_4 s_grid" %>
<%= select_year((@writing_journal.year ? @writing_journal.year.to_i : DateTime.now.year), {:start_year => DateTime.now.year, :end_year => 1930}, {:name => 'writing_journal[year]', :class => "s_grid_8 s_grid"} ) %>
</li>
<li class="s_grid_row">
<%= f.label :language, t("personal_journal.language"),:class => "s_grid_2 s_grid" %>
<%= f.select :language,
WritingJournal::LANGUAGE_TYPES,
class: "s_grid s_grid_4" %>
<%= f.label :language, t("personal_journal.language"), :class => "s_grid s_grid_4" %>
<%= f.select :language, WritingJournal::LANGUAGE_TYPES,{} ,{:class => "s_grid s_grid_8"} %>
</li>
<li class="s_grid_row">
<input class="s_grid s_grid_6" type="text" placeholder=<%= t("personal_journal.tags") %>><span class="icon-plus input_append">
<span class="icon-plus input_append"></span>
<input class="s_grid s_grid_12" type="text" placeholder=<%= t("personal_journal.tags") %>>
</li>
<li class="s_grid_row">
<select name="" id="" class="s_grid s_grid_3">
<label for="" class="s_grid s_grid_4">Status</label>
<select name="" id="" class="s_grid s_grid_8">
<option value="">Status</option>
<option value="">Published</option>
<option value="">Pending</option>
@@ -167,7 +168,7 @@
</select>
</li>
<li class="s_grid_row">
<%= label_tag("", t("personal_journal.url"), class: "s_grid_2 s_grid") %><%= f.text_field :url, size: "20", placeholder: "www.sample.com", class: "s_grid_4 s_grid"%>
<%= label_tag("", t("personal_journal.url"), class: "s_grid_4 s_grid") %><%= f.text_field :url, size: "20", placeholder: "www.sample.com", class: "s_grid_8 s_grid"%>
</li>
</ul>
</div>
@@ -180,13 +181,14 @@
<thead>
<tr>
<th class="s_grid_2"><%= t("personal_journal.file")%></th>
<th class="s_grid_3"><%= t("personal_journal.file_name")%></th>
<th class="s_grid_1"><%= t("personal_journal.description") %></th>
<th class="s_grid_4"><%= t("personal_journal.file_name")%></th>
<th class="s_grid_4"><%= t("personal_journal.description") %></th>
<th class="s_grid_2"></th>
</tr>
</thead>
<tfoot>
<tr>
<td colspan="3">
<td colspan="4">
<div id='add_plugin_file' class="info_input plugin_files_block s_action">
<%= hidden_field_tag 'plugin_file_field_count', @writing_journal.writing_journal_files.count %>
<a class="add setting_btn thmc1 thmtxt w1 hh1 hp" href="#"><i class="icon-plus icon-white"></i> add</a>
@@ -210,7 +212,7 @@
<div class="s_form">
<ul>
<li class="s_grid_row">
<%= f.text_area :note, size: "20x22", placeholder: t("personal_journal.note"), class: "s_grid_6 s_grid full_height"%>
<%= f.text_area :note, size: "20x22", placeholder: t("personal_journal.note"), class: "s_grid_12 s_grid s_grid_h_10"%>
</li>
</ul>
</div>
@@ -219,7 +221,7 @@
<div class="s_form">
<ul>
<li class="s_grid_row">
<%= f.text_area :abstract, size: "20x22", placeholder: t("personal_journal.abstract"), class: "s_grid_6 s_grid full_height"%>
<%= f.text_area :abstract, size: "20x22", placeholder: t("personal_journal.abstract"), class: "s_grid_12 s_grid s_grid_h_10"%>
</li>
</ul>
</div>
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form_file.html.erb
Vendored
+5 -3
View File
@@ -2,15 +2,17 @@
<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" %>
<% end %>
</div>
</td>
<td>
<%= f.text_field :title %>
<%= f.text_field :title, :class => 's_grid_4' %>
</td>
<td>
<%= f.fields_for :file_title_translations do |f| %>
<%= f.text_field locale,
class: 's_grid_3 s_grid',
class: 's_grid_4',
value: (form_file.file_title_translations[locale] rescue nil) %>
<% end %>
</td>
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb
Vendored
-86
View File
@@ -1,86 +0,0 @@
<div class="toolbar hh1">
<div class="hh1 hp sdm">
<div class="sdm_t hh1"><span class="icon-check"></span></div>
<div class="admbg sdm_o">
<ul id="journal_selection_options">
<li><a class="hp hh1 admtxt" href="all" ajax-remote="false" callback-method="allnone">All</a></li>
<li><a class="hp hh1 admtxt" href="none" ajax-remote="false" callback-method="allnone">None</a></li>
</ul>
</div>
</div>
<div class="hh1 hp sdm">
<div class="sdm_t hh1">More</div>
<div class="admbg sdm_o">
<ul>
<li><a class="hp hh1 admtxt" href="">Delete</a></li>
<li><a class="hp hh1 admtxt" href="">Tag</a></li>
</ul>
</div>
</div>
<div class="hh1 hp sdm">
<div class="sdm_t hh1">Tag</div>
<div class="admbg sdm_o">
<ul>
<li><a class="hp hh1 admtxt" href="">All</a></li>
<li><a class="hp hh1 admtxt" href="">Starred</a></li>
<li><a class="hp hh1 admtxt" href="">MIT</a></li>
</ul>
</div>
</div>
<div class="hh1 hp sdm">
<div class="sdm_t hh1">Status</div>
<div class="admbg sdm_o">
<ul>
<li><a class="hp hh1 admtxt" href="">All</a></li>
<li><a class="hp hh1 admtxt" href="">Published</a></li>
<li><a class="hp hh1 admtxt" href="">Pending</a></li>
</ul>
</div>
</div>
<div class="hh1 hp sdm">
<div class="sdm_t hh1">View</div>
<div class="admbg sdm_o">
<ul id="journal_view_selection">
<li><%= link_to "Journal", panel_personal_journal_desktop_journal_pages_path + "?view=journal_title", :class => "hp hh1 admtxt", "ajax-remote" => "get" %></li>
<li><%= link_to "Title", panel_personal_journal_desktop_journal_pages_path + "?view=paper_title", :class => "hp hh1 admtxt", "ajax-remote" => "get" %></li>
<li><%= link_to "File", panel_personal_journal_desktop_journal_pages_path + "?view=file", :class => "hp hh1 admtxt", "ajax-remote" => "get" %></li>
<li><%= link_to "Keywords", panel_personal_journal_desktop_journal_pages_path + "?view=keywords", :class => "hp hh1 admtxt", "ajax-remote" => "get" %></li>
<li><%= link_to "Abstract", panel_personal_journal_desktop_journal_pages_path + "?view=abstract", :class => "hp hh1 admtxt", "ajax-remote" => "get" %></li>
</ul>
</div>
</div>
<div class="hh1 hp sdm">
<div class="sdm_t hh1">Share</div>
<div class="admbg sdm_o">
<ul>
<li><a class="hp hh1 admtxt" href="">Full</a></li>
<li><a class="hp hh1 admtxt" href="">Abstract</a></li>
<li><a class="hp hh1 admtxt" href="">Friends</a></li>
<li><a class="hp hh1 admtxt" href="">Private</a></li>
<li><a class="hp hh1 admtxt" href="">Group</a></li>
</ul>
</div>
</div>
<div class="hh1 hp sdm">
<div class="sdm_t hh1" id='ns'>New Share</div>
<div class="admbg sdm_o">
<ul>
<li><a class="hp hh1 admtxt remote_url" href="<%= panel_personal_journal_plugin_writing_journals_path %>">Full</a></li>
<li><a class="hp hh1 admtxt" href="">Abstract</a></li>
<li><a class="hp hh1 admtxt" href="">Friends</a></li>
<li><a class="hp hh1 admtxt" href="">Private</a></li>
<li><a class="hp hh1 admtxt" href="">Group</a></li>
</ul>
</div>
</div>
<div class="hh1 hp sdm">
<div class="sdm_t hh1"><span class="icon-question-sign"></span></div>
</div>
</div>
<div class="overview" content-layout="datalist" base-width="300" per-column="<%= @per_column.to_s %>" pagination-var="page" >
<% @writing_journals.each do |w| %>
<%= publication_record w, @view_by%>
<% end %>
</div>
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/journal_type.html.erb
Vendored
+4 -4
View File
@@ -13,14 +13,14 @@
<div class="sdm_t hh1"><span class="icon-question-sign"></span></div>
</div>
</div>
<div class="overview" content-layout="datalist" base-width="300" per-column="5" pagination-var="page">
<div class="overview" page-name="journal_p_journal" content-layout="datalist" base-width="400" per-column="5" pagination-var="page">
<% @journal_lists.each_with_index do |journal_list,i| %>
<div class="g_col">
<ul>
<li class="list_t_item" item="true">
<div class="list_item_action">
<i class="icon-file"></i>
</div>
<div class="list_item_action">
<i class="icon-file"></i>
</div>
<% title, level = journal_list %>
<div class="list_t_title"><%= title %></div>
<div class="list_t_desc"><%= level.join(",") %></div>