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

using refine tiny scroll bar js for personal plugin

This commit is contained in:
Rueshyna 2013-03-04 16:35:09 +08:00
parent 8ade2c5949
commit a6ca308a5e
20 changed files with 511 additions and 422 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Gemfile.lock
View File

@ -141,6 +141,7 @@ GEM
jquery-rails jquery-rails
railties (>= 3.1.0) railties (>= 3.1.0)
json (1.7.7) json (1.7.7)
libv8 (3.11.8.13)
mail (2.4.4) mail (2.4.4)
i18n (>= 0.4.0) i18n (>= 0.4.0)
mime-types (~> 1.16) mime-types (~> 1.16)
@ -224,6 +225,7 @@ GEM
rdoc (~> 3.4) rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0) thor (>= 0.14.6, < 2.0)
rake (10.0.3) rake (10.0.3)
rb-readline (0.4.2)
rdoc (3.12.1) rdoc (3.12.1)
json (~> 1.4) json (~> 1.4)
redis (3.0.2) redis (3.0.2)
@ -233,6 +235,7 @@ GEM
chinese_pinyin (>= 0.3.0) chinese_pinyin (>= 0.3.0)
redis (>= 2.1.1) redis (>= 2.1.1)
redis-namespace (>= 1.0.2) redis-namespace (>= 1.0.2)
ref (1.0.2)
resque (1.23.0) resque (1.23.0)
multi_json (~> 1.0) multi_json (~> 1.0)
redis-namespace (~> 1.0) redis-namespace (~> 1.0)
@ -313,6 +316,9 @@ GEM
sunspot (= 1.3.3) sunspot (= 1.3.3)
sunspot_solr (1.3.3) sunspot_solr (1.3.3)
terminal-table (1.4.5) terminal-table (1.4.5)
therubyracer (0.11.3)
libv8 (~> 3.11.8.12)
ref
thor (0.17.0) thor (0.17.0)
tilt (1.3.3) tilt (1.3.3)
tinymce-rails (3.5.8) tinymce-rails (3.5.8)
@ -357,6 +363,7 @@ DEPENDENCIES
jquery-rails (= 2.1.4) jquery-rails (= 2.1.4)
jquery-ui-rails jquery-ui-rails
kaminari! kaminari!
libv8 (~> 3.11.8)
mime-types mime-types
mini_magick mini_magick
mongo_session_store-rails3 (= 3.0.6) mongo_session_store-rails3 (= 3.0.6)
@ -373,6 +380,7 @@ DEPENDENCIES
radius radius
rails (~> 3.2.9) rails (~> 3.2.9)
rake rake
rb-readline
redis (>= 2.1.1) redis (>= 2.1.1)
redis-namespace redis-namespace
redis-search redis-search
@ -393,6 +401,7 @@ DEPENDENCIES
sunspot-rails-tester sunspot-rails-tester
sunspot_mongo sunspot_mongo
sunspot_solr sunspot_solr
therubyracer
tinymce-rails tinymce-rails
uglifier uglifier
watchr watchr

9
vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_pages_controller.rb vendored
View File

@ -24,6 +24,9 @@ class Panel::PersonalConference::Desktop::ConferencePagesController < Applicatio
@paper_types = ConferencePaperType.all @paper_types = ConferencePaperType.all
@author_types = ConferenceAuthorType.all @author_types = ConferenceAuthorType.all
@conference_candidate =
WritingConference.where(create_user_id: current_user.id).map{|j|j.conference_title}.uniq
if (not params[:q].nil?) and (current_user.name.include?params[:q]) if (not params[:q].nil?) and (current_user.name.include?params[:q])
@user = [{ :id => 0, :name => current_user.name}] # self account name @user = [{ :id => 0, :name => current_user.name}] # self account name
else else
@ -55,7 +58,7 @@ class Panel::PersonalConference::Desktop::ConferencePagesController < Applicatio
@writing_conference = WritingConference.new(params[:writing_conference]) @writing_conference = WritingConference.new(params[:writing_conference])
if @writing_conference.save if @writing_conference.save
render json: {success: true, msg: t('create.success.paper')}.to_json render json: {success: true, msg: t('create_success')}.to_json
else else
error_msg = @writing_conference.errors.full_messages.join("<br />") error_msg = @writing_conference.errors.full_messages.join("<br />")
render json: {success: false, msg: error_msg}.to_json render json: {success: false, msg: error_msg}.to_json
@ -67,7 +70,7 @@ class Panel::PersonalConference::Desktop::ConferencePagesController < Applicatio
@writing_conference= WritingConference.find(params[:id]) @writing_conference= WritingConference.find(params[:id])
if @writing_conference.update_attributes(params[:writing_conference]) if @writing_conference.update_attributes(params[:writing_conference])
render json: {success: true, msg: t('update.success.paper')}.to_json render json: {success: true, msg: t('update_success')}.to_json
else else
error_msg = @writing_conference.errors.full_messages.join("<br />") error_msg = @writing_conference.errors.full_messages.join("<br />")
render json: {success: false, msg: error_msg}.to_json render json: {success: false, msg: error_msg}.to_json
@ -77,7 +80,7 @@ class Panel::PersonalConference::Desktop::ConferencePagesController < Applicatio
def destroy def destroy
@writing_conference = WritingConference.find(params[:id]) @writing_conference = WritingConference.find(params[:id])
@writing_conference.destroy @writing_conference.destroy
render :json => {success: true, msg: t('delete.success.paper')} render :json => {success: true, msg: t('delete_success')}
end end
def conference_type def conference_type

11
vendor/built_in_modules/personal_conference/app/helpers/panel/personal_conference/desktop/conference_pages_helper.rb vendored
View File

@ -1,6 +1,7 @@
module Panel::PersonalConference::Desktop::ConferencePagesHelper module Panel::PersonalConference::Desktop::ConferencePagesHelper
def publication_record publication, view def publication_record publication, view
content_tag :li, content_tag :li,
"item" => "true",
:class => "list_t_item" do :class => "list_t_item" do
marker + \ marker + \
content(publication, view) + \ content(publication, view) + \
@ -11,8 +12,14 @@ module Panel::PersonalConference::Desktop::ConferencePagesHelper
def marker def marker
content_tag :div, content_tag :div,
:class => "list_item_action" :class => "list_item_action"
content_tag(:a, "", :class => "icon-check-empty") + \ content_tag(:a, "",:href=>"",
content_tag(:a, "", :class => "icon-star-empty") :class => "icon-check-empty",
"toggle-onclick"=>"icon-check-empty icon-check",
"ajax-remote"=>"false") + \
content_tag(:a, "",:href=>"",
:class => "icon-star-empty",
"toggle-onclick"=>"icon-star-empty icon-star",
"ajax-remote"=>"false")
end end
def content publication, view def content publication, view

12
vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/_show_form.html.erb vendored
View File

@ -1,13 +1,11 @@
<ul> <ul>
<% @conference_co_author_relations.each_with_index do |conference_co_author_relation,i| %> <% @conference_co_author_relations.each_with_index do |conference_co_author_relation,i| %>
<li class="s_grid_row" item="true"> <li class="s_grid_row" item="true">
<div class="form_space" id="form_space_<%= i.to_s %>"><%= conference_co_author_relation.relation %></div> <div class="form_space" id="form_space_<%= i.to_s %>"><%= conference_co_author_relation.relation %></div>
<div class="list_item_function"> <div class="list_item_function">
<%= link_to 'Edit', edit_panel_personal_conference_desktop_conference_co_author_relation_path(conference_co_author_relation), :class => "bt-edit-type admbg2 admtxt", "content-holder"=>"#form_space_"+i.to_s, "ajax-remote"=>"get" %> <%= link_to t('edit'), edit_panel_personal_conference_desktop_conference_co_author_relation_path(conference_co_author_relation), :class => "bt-edit-type admbg2 admtxt", "content-holder"=>"#form_space_"+i.to_s, "ajax-remote"=>"get" %>
<%= link_to 'Destroy', panel_personal_conference_desktop_conference_co_author_relation_path(conference_co_author_relation), "confirm-message"=>'Are you sure?', "ajax-remote"=>"delete", :class=>"bt-delete admbg2 admtxt" %> <%= link_to t('delete'), panel_personal_conference_desktop_conference_co_author_relation_path(conference_co_author_relation), "confirm-message"=>t('sure?'), "ajax-remote"=>"delete", :class=>"bt-delete admbg2 admtxt" %>
</div> </div>
</li> </li>
<% end %>
<% end %>
</ul> </ul>

2
vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/index.html.erb vendored
View File

@ -15,7 +15,7 @@
<div id="co_author_relation_table" class="tinycanvas vp"> <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="scrollbar sb_h vp"><div class="track"><div class="thumb thmc2"><div class="end"></div></div></div></div>
<div class="viewport"> <div class="viewport">
<div class="overview" content-layout="datalist" per-column="4" base-width="300"> <div class="overview" content-layout="datalist" per-column="5" base-width="300">
<%= render :partial => 'show_form'%> <%= render :partial => 'show_form'%>
</div> </div>
</div> </div>

12
vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_authors/index.html.erb vendored
View File

@ -7,28 +7,24 @@
<div id="co_author" class="tinycanvas vp"> <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="scrollbar sb_h vp"><div class="track"><div class="thumb thmc2"><div class="end"></div></div></div></div>
<div class="viewport"> <div class="viewport">
<div class="overview"> <div class="overview" content-layout="datalist" per-column="4" base-width="300">
<% @conference_co_authors.each_with_index do |co_author,i| %> <% @conference_co_authors.each_with_index do |co_author,i| %>
<% if ( i % 4 ) == 0 %>
<div class="g_col"> <div class="g_col">
<ul> <ul>
<% end %> <li class="list_t_item" item="true">
<li class="list_t_item">
<ul class="info"> <ul class="info">
<li><div class="name"><%= co_author.co_author %></div></li> <li><div class="name"><%= co_author.co_author %></div></li>
<li><div class="email"><i class="icon-envelope"></i> <%= co_author.email %></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> <%= @conference_co_author_relations.find(co_author.conference_co_author_relations_id).relation unless co_author.conference_co_author_relations_id.nil?%></div></li> <li><div class="relations"><i class="icon-user"></i> <%= @conference_co_author_relations.find(co_author.conference_co_author_relations_id).relation unless co_author.conference_co_author_relations_id.nil?%></div></li>
</ul> </ul>
<div class="list_item_function"> <div class="list_item_function">
<%= link_to 'Edit', edit_panel_personal_conference_desktop_conference_co_author_path(co_author), :class => "bt-edit admbg2 admtxt", "ajax-remote"=>"get" %> <%= link_to t('edit'), edit_panel_personal_conference_desktop_conference_co_author_path(co_author), :class => "bt-edit admbg2 admtxt", "ajax-remote"=>"get" %>
<%= link_to 'Destroy', panel_personal_conference_desktop_conference_co_author_path(co_author), "ajax-remote"=>"delete", "confirm-message"=>'Are you sure?', "callback-method"=>"paperDelete", :class=>"bt-delete admbg2 admtxt" %> <%= link_to t('delete'), panel_personal_conference_desktop_conference_co_author_path(co_author), "ajax-remote"=>"delete", "confirm-message"=>t('sure?'), "callback-method"=>"paperDelete", :class=>"bt-delete admbg2 admtxt" %>
</div> </div>
</li> </li>
<% if ( i % 4 ) == 3 %>
</ul> </ul>
</div> </div>
<% end %> <% end %>
<% end %>
</div> </div>
</div> </div>
</div> </div>

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

@ -1,9 +1,8 @@
<div class="toolbar hh2"> <div class="toolbar hh2">
<div class="fn_g hp"> <div class="fn_g hp">
<%= f.submit t("save"), name: "commit", value: "Save", class: "fn_btn ini_input hp hh2 thmc2 thmtxt" %> <%= f.submit t("save"), name: "commit", value: "Save", class: "fn_btn ini_input hp hh2 thmc2 thmtxt" %>
<!-- class: bt-cancle can't be remove -->
<% if not @writing_conference.new_record? %> <% if not @writing_conference.new_record? %>
<%= submit_tag t("cancel"), :type => "button", "ajax-remote" => "get", :href => panel_personal_conference_desktop_conference_pages_path, class: "bt-cancel ini_input hp hh2 thmadm thmtxt" %> <%= submit_tag t("cancel"), :type => "button", "ajax-remote" => "get", :href => panel_personal_conference_desktop_conference_pages_path, class: "ini_input hp hh2 thmadm thmtxt" %>
<% end %> <% end %>
</div> </div>
<div class="hh2 hp sdm"> <div class="hh2 hp sdm">
@ -25,8 +24,9 @@
<div id="paper_add" class="tinycanvas vp"> <div id="paper_add" 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="scrollbar sb_h vp"><div class="track"><div class="thumb thmc2"><div class="end"></div></div></div></div>
<div class="viewport"> <div class="viewport">
<div class="overview"> <div class="overview" content-layout="column" base-width="450">
<div class="s_grid_con s_form"> <div column="true">
<div class="s_form">
<ul> <ul>
<li class="s_grid_row"> <li class="s_grid_row">
<%= f.fields_for :paper_title_translations do |f| %> <%= f.fields_for :paper_title_translations do |f| %>
@ -37,7 +37,6 @@
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>
<li class="s_grid_row"> <li class="s_grid_row">
<%= f.fields_for :conference_title_translations do |f| %> <%= f.fields_for :conference_title_translations do |f| %>
<%= f.text_field locale, <%= f.text_field locale,
@ -49,7 +48,6 @@
<% end %> <% end %>
<span class="icon-plus input_append"></span> <span class="icon-plus input_append"></span>
</li> </li>
<li class="s_grid_row"> <li class="s_grid_row">
<div> <div>
<%= label_tag("", t("personal_conference.paper_type")) %> <%= label_tag("", t("personal_conference.paper_type")) %>
@ -66,11 +64,9 @@
</ul> </ul>
</div> </div>
</li> </li>
<li class="s_grid_row"> <li class="s_grid_row">
<%= f.text_field :keywords, size: "20", placeholder: t("personal_conference.keywords"), class: "s_grid_6 s_grid"%> <%= f.text_field :keywords, size: "20", placeholder: t("personal_conference.keywords"), class: "s_grid_6 s_grid"%>
</li> </li>
<li class="s_grid_row"> <li class="s_grid_row">
<div> <div>
<%= label_tag("", t("personal_conference.conference_time")) %> <%= label_tag("", t("personal_conference.conference_time")) %>
@ -87,21 +83,20 @@
</ul> </ul>
</div> </div>
</li> </li>
<li class="s_grid_row"> <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"%> <%= 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"%>
</li> </li>
<li class="s_grid_row"> <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.location"), class: "s_grid_2 s_grid") %><%= f.text_field :location, size: "20", placeholder: "Location", class: "s_grid_4 s_grid"%>
</li> </li>
<li class="s_grid_row"> <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.url"), class: "s_grid_2 s_grid") %><%= f.text_field :url, size: "20", placeholder: "www.sample.com", class: "s_grid_4 s_grid"%>
</li> </li>
</div> </div>
<div class="s_grid_con s_form"> </div>
<div column="true">
<div class="s_form">
<ul> <ul>
<li class="s_grid_row"> <li class="s_grid_row">
<%= f.label :author_tokens, t("personal_conference.authors") %><br /> <%= f.label :author_tokens, t("personal_conference.authors") %><br />
@ -159,7 +154,9 @@
</li> </li>
</ul> </ul>
</div> </div>
<div class="s_grid_con s_form"> </div>
<div column="true">
<div class="s_form">
<ul> <ul>
<li class="s_grid_row"> <li class="s_grid_row">
<table class="s_table"> <table class="s_table">
@ -190,7 +187,9 @@
</table> </table>
</li> </li>
</div> </div>
<div class="s_grid_con s_form"> </div>
<div column="true">
<div class="s_form">
<li class="s_grid_row"> <li class="s_grid_row">
<ul> <ul>
<%= f.text_area :note, size: "20x22", placeholder: t("personal_conference.note"), class: "s_grid_6 s_grid full_height"%> <%= f.text_area :note, size: "20x22", placeholder: t("personal_conference.note"), class: "s_grid_6 s_grid full_height"%>
@ -199,13 +198,14 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<%= stylesheet_link_tag "token-input-facebook" %> <%= stylesheet_link_tag "token-input-facebook" %>
<%= javascript_include_tag :defaults, "jquery.tokeninput" %> <%= javascript_include_tag :defaults, "jquery.tokeninput" %>
<script> <script>
$(function() { $(function() {
$("#writing_conference_author_tokens").tokenInput("/panel/personal_conference/desktop/conference_pages/new.json", { $("#writing_conference_author_tokens").tokenInput("/panel/personal_conference/desktop/conference_pages/new.json", {
crossDomain: false, crossDomain: false,
prePopulate: $("#writing_conference_author_tokens").data("pre"), prePopulate: $("#writing_conference_author_tokens").data("pre"),
@ -214,15 +214,15 @@ $(function() {
noResultsText: "<%=t("noResultsText")%>", noResultsText: "<%=t("noResultsText")%>",
searchingText: "<%=t("searchingText")%>" searchingText: "<%=t("searchingText")%>"
}); });
}); });
</script> </script>
<script type="text/javascript"> <script type="text/javascript">
orbitDesktop.prototype.initializeJournalPapers.conference_title_autocomplete_list = <%= @conference_candidate.to_json.html_safe %>; orbitDesktop.prototype.initializeJournalPapers.conference_title_autocomplete_list = <%= @conference_candidate.to_json.html_safe %>;
orbitDesktop.prototype.initializeJournalPapers.coauthor_autocomplete_list = <%= @co_author_candidate.to_json.html_safe %>; // orbitDesktop.prototype.initializeJournalPapers.coauthor_autocomplete_list = <%= @co_author_candidate.to_json.html_safe %>;
</script> </script>
<script> <script>
$('#add_plugin_file a.add').click(function(){ $('#add_plugin_file a.add').click(function(){
var new_id = $(this).prev().attr('value'); var new_id = $(this).prev().attr('value');
var old_id = new RegExp("new_writing_conference_files", "g"); var old_id = new RegExp("new_writing_conference_files", "g");
@ -240,4 +240,4 @@ $(function() {
$("tr#add_plugin_file_" + $(this).prev().attr('value')).hide(); $("tr#add_plugin_file_" + $(this).prev().attr('value')).hide();
}); });
</script> </script>

8
vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/conference_type.html.erb vendored
View File

@ -16,13 +16,11 @@
<div id="conference_list" class="tinycanvas vp"> <div id="conference_list" 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="scrollbar sb_h vp"><div class="track"><div class="thumb thmc2"><div class="end"></div></div></div></div>
<div class="viewport"> <div class="viewport">
<div class="overview"> <div class="overview" content-layout="datalist" per-column="5" base-width="300">
<% @conference_lists.each_with_index do |conference_list,i| %> <% @conference_lists.each_with_index do |conference_list,i| %>
<% if ( i % 5 ) == 0 %>
<div class="g_col"> <div class="g_col">
<ul> <ul>
<% end %> <li class="list_t_item" item="true">
<li class="list_t_item">
<div class="list_item_action"> <div class="list_item_action">
<i class="icon-file"></i> <i class="icon-file"></i>
</div> </div>
@ -30,11 +28,9 @@
<div class="list_t_title"><%= title %></div> <div class="list_t_title"><%= title %></div>
<div class="list_t_desc"><%= level.join(",") %></div> <div class="list_t_desc"><%= level.join(",") %></div>
</li> </li>
<% if ( i % 5 ) == 4 %>
</ul> </ul>
</div> </div>
<% end %> <% end %>
<% end %>
</div> </div>
</div> </div>
</div> </div>

4
vendor/built_in_modules/personal_conference/config/locales/en.yml vendored
View File

@ -28,11 +28,13 @@ en:
file_name : "File Name" file_name : "File Name"
description : "File Description" description : "File Description"
create_success : "Successfully Create"
update_success : "Successfully Update"
delete_success : "Successfully Delete"
add: "Add" add: "Add"
back: "Back" back: "Back"
delete: "Delete" delete: "Delete"
edit: "Edit" edit: "Edit"
no_: "No"
nothing: "Nothing" nothing: "Nothing"
show: "Show" show: "Show"
sure?: "Are you sure?" sure?: "Are you sure?"

3
vendor/built_in_modules/personal_conference/config/locales/zh_tw.yml vendored
View File

@ -28,11 +28,12 @@ zh_tw:
file_name : "檔案名稱" file_name : "檔案名稱"
description : "描述" description : "描述"
create_success : "新增完成!!"
update_success : "更新完成!!"
add: "新增" add: "新增"
back: "返回" back: "返回"
delete: "刪除" delete: "刪除"
edit: "編輯" edit: "編輯"
no_: "No"
nothing: "無" nothing: "無"
show: "顯示" show: "顯示"
sure?: "您肯定嗎?" sure?: "您肯定嗎?"

31
vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_pages_controller.rb vendored
View File

@ -22,13 +22,24 @@ class Panel::PersonalJournal::Desktop::JournalPagesController < ApplicationContr
@level_types = JournalLevelType.all @level_types = JournalLevelType.all
@author_types = JournalAuthorType.all @author_types = JournalAuthorType.all
@paper_types= JournalPaperType.all @paper_types= JournalPaperType.all
@journal_co_author_candidate = #@journal_co_author_candidate =
JournalCoAuthor.where(name_id: current_user.id).map{|c|c.co_author} # JournalCoAuthor.where(name_id: current_user.id).map{|c|c.co_author}
@journal_candidate = @journal_candidate =
WritingJournal.where(create_user_id: current_user.id).map{|j|j.journal_title}.uniq WritingJournal.where(create_user_id: current_user.id).map{|j|j.journal_title}.uniq
if (not params[:q].nil?) and (current_user.name.include?params[:q])
@user = [{ :id => 0, :name => current_user.name}] # self account name
else
@user = []
end
@co_authors = JournalCoAuthor.where(name_id: current_user.id, :co_author => /#{params[:q]}/)
@co_authors = [{ :id => params[:q], :name => params[:q] }] + # search string
@user + # self account name
@co_authors.map{|m| { :id => m.id, :name => m.co_author } } # match pattern
respond_to do |format| respond_to do |format|
format.html { render :layout => false} format.html { render :layout => false}
format.json { render :json => @co_authors.to_json }
end end
end end
@ -48,7 +59,7 @@ class Panel::PersonalJournal::Desktop::JournalPagesController < ApplicationContr
@writing_journal = WritingJournal.new(params[:writing_journal]) @writing_journal = WritingJournal.new(params[:writing_journal])
if @writing_journal.save if @writing_journal.save
render json: {success: true, msg: t('create.success.paper')}.to_json render json: {success: true, msg: t('create_success')}.to_json
else else
error_msg = @writing_journal.errors.full_messages.join("<br />") error_msg = @writing_journal.errors.full_messages.join("<br />")
render json: {success: false, msg: error_msg}.to_json render json: {success: false, msg: error_msg}.to_json
@ -60,31 +71,23 @@ class Panel::PersonalJournal::Desktop::JournalPagesController < ApplicationContr
@writing_journal= WritingJournal.find(params[:id]) @writing_journal= WritingJournal.find(params[:id])
if @writing_journal.update_attributes(params[:writing_journal]) if @writing_journal.update_attributes(params[:writing_journal])
render json: {success: true, msg: t('update.success.paper')}.to_json render json: {success: true, msg: t('update_success')}.to_json
else else
error_msg = @writing_journal.errors.full_messages.join("<br />") error_msg = @writing_journal.errors.full_messages.join("<br />")
render json: {success: false, msg: error_msg}.to_json render json: {success: false, msg: error_msg}.to_json
end end
end end
def check_file_type file
if not file.nil?
file_type = MIME::Types.type_for(file).first.to_s.split("/")[1]
file_type = "/assets/ft-icons/#{file_type}/#{file_type}-48_32.png"
else
file_type = ""
end
end
def destroy def destroy
@writing_journal = WritingJournal.find(params[:id]) @writing_journal = WritingJournal.find(params[:id])
@writing_journal.destroy @writing_journal.destroy
render :json => {success: true, msg: t('delete.success.paper')} render :json => {success: true, msg: t('delete_success')}
end end
def journal_type def journal_type
level_types = JournalLevelType.all level_types = JournalLevelType.all
all_journal_lists = WritingJournal.where(create_user_id: current_user.id) all_journal_lists = WritingJournal.where(create_user_id: current_user.id)
all_journal_lists = all_journal_lists.asc(:journal_title)
all_journal_lists = all_journal_lists.map do |j| all_journal_lists = all_journal_lists.map do |j|
[ j.journal_title, [ j.journal_title,
j.journal_level_type_ids.map do |type| j.journal_level_type_ids.map do |type|

23
vendor/built_in_modules/personal_journal/app/helpers/panel/personal_journal/desktop/journal_pages_helper.rb vendored
View File

@ -6,15 +6,20 @@ module Panel::PersonalJournal::Desktop::JournalPagesHelper
marker + \ marker + \
content(publication, view) + \ content(publication, view) + \
edit_or_delete(publication) edit_or_delete(publication)
end end
end end
def marker def marker
content_tag :div, content_tag :div,
:class => "list_item_action" :class => "list_item_action"
content_tag(:a, "",:href=>"", :class => "icon-check-empty", "toggle-onclick"=>"icon-check-empty icon-check", "ajax-remote"=>"false") + \ content_tag(:a, "",:href=>"",
content_tag(:a, "",:href=>"", :class => "icon-star-empty", "toggle-onclick"=>"icon-star-empty icon-star", "ajax-remote"=>"false") :class => "icon-check-empty",
"toggle-onclick"=>"icon-check-empty icon-check",
"ajax-remote"=>"false") + \
content_tag(:a, "",:href=>"",
:class => "icon-star-empty",
"toggle-onclick"=>"icon-star-empty icon-star",
"ajax-remote"=>"false")
end end
def content publication, view def content publication, view
@ -73,4 +78,16 @@ module Panel::PersonalJournal::Desktop::JournalPagesHelper
file_type = "" file_type = ""
end end
end end
def generate_authors_name ids
author_name = ids.map{|m|
if m == "0"
{:id => 0, :name => current_user.name}
else
{:id => m, :name => ConferenceCoAuthor.find(m).co_author}
end
}
author_name.to_json
end
end end

1
vendor/built_in_modules/personal_journal/app/models/journal_co_author.rb vendored
View File

@ -8,6 +8,7 @@ class JournalCoAuthor
field :email field :email
belongs_to :journal_co_author_relations belongs_to :journal_co_author_relations
has_and_belongs_to_many :writing_journals
VALID_EMAIL_REGEX = /\A[\w+\-.]+@[a-z\d\-.]+\.[a-z]+\z/ VALID_EMAIL_REGEX = /\A[\w+\-.]+@[a-z\d\-.]+\.[a-z]+\z/
validates :email, format: { with: VALID_EMAIL_REGEX }, validates :email, format: { with: VALID_EMAIL_REGEX },

46
vendor/built_in_modules/personal_journal/app/models/writing_journal.rb vendored
View File

@ -12,6 +12,7 @@ class WritingJournal
has_and_belongs_to_many :tags, :class_name => "PersonalJournalTag" has_and_belongs_to_many :tags, :class_name => "PersonalJournalTag"
has_and_belongs_to_many :journal_author_types has_and_belongs_to_many :journal_author_types
has_and_belongs_to_many :journal_level_types has_and_belongs_to_many :journal_level_types
has_and_belongs_to_many :journal_co_authors
has_many :writing_journal_files, :autosave => true, :dependent => :destroy has_many :writing_journal_files, :autosave => true, :dependent => :destroy
belongs_to :journal_paper_type belongs_to :journal_paper_type
@ -35,25 +36,44 @@ class WritingJournal
accepts_nested_attributes_for :writing_journal_files, :allow_destroy => true accepts_nested_attributes_for :writing_journal_files, :allow_destroy => true
after_save :save_writing_journal_files after_save :save_writing_journal_files
before_validation :add_http before_validation :add_http
before_save :save_co_author #before_save :save_co_author
validates :paper_title, :at_least_one => true validates :paper_title, :at_least_one => true
validates :url, :format => /^(http|https):\/\/(([a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5})|((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?))(:[0-9]{1,5})?(\/.*)?/i, :unless => Proc.new{self.url.blank?} validates :url, :format => /^(http|https):\/\/(([a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5})|((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?))(:[0-9]{1,5})?(\/.*)?/i, :unless => Proc.new{self.url.blank?}
def save_co_author attr_reader :author_tokens
authors_list = authors.split(",").map{|n| n.strip.gsub(/\s+/," ")}.reject{|n| n.empty? }
if new_record?
current_user = create_user_id
else
current_user = update_user_id
end
authors_db = JournalCoAuthor.where(:name_id => current_user).map(&:co_author) def author_tokens=(ids)
authors_list.delete(User.find(current_user).name) authors_ids = ids.split(",").map{|id|
authors_list = authors_list.delete_if{|author| authors_db.include?author} begin
authors_list.each do |author| JournalCoAuthor.find(m).id
JournalCoAuthor.new(:co_author => author, :name_id => current_user).save rescue
if id != "0"
new_co_author = JournalCoAuthor.new(:co_author => id, :name_id => create_user_id)
new_co_author.save
new_co_author.id
else
id
end end
end end
}
self.journal_co_author_ids = authors_ids
end
# old method
#def save_co_author
# authors_list = authors.split(",").map{|n| n.strip.gsub(/\s+/," ")}.reject{|n| n.empty? }
# if new_record?
# current_user = create_user_id
# else
# current_user = update_user_id
# end
# authors_db = JournalCoAuthor.where(:name_id => current_user).map(&:co_author)
# authors_list.delete(User.find(current_user).name)
# authors_list = authors_list.delete_if{|author| authors_db.include?author}
# authors_list.each do |author|
# JournalCoAuthor.new(:co_author => author, :name_id => current_user).save
# end
#end
def self.search( category_id = nil ) def self.search( category_id = nil )
if category_id.to_s.size > 0 if category_id.to_s.size > 0

8
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/_show_form.html.erb vendored
View File

@ -1,11 +1,11 @@
<ul> <ul>
<% @journal_co_author_relations.each_with_index do |journal_co_author_relation,i| %> <% @journal_co_author_relations.each_with_index do |journal_co_author_relation,i| %>
<li class="s_grid_row" item="true"> <li class="s_grid_row" item="true">
<div class="form_space" id="form_space_<%= i.to_s %>"><%= journal_co_author_relation.relation %></div> <div class="form_space" id="form_space_<%= i.to_s %>"><%= journal_co_author_relation.relation %></div>
<div class="list_item_function"> <div class="list_item_function">
<%= link_to '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" %> <%= 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" %>
<%= link_to 'Destroy', panel_personal_journal_desktop_journal_co_author_relation_path(journal_co_author_relation), "confirm-message"=>'Are you sure?', "ajax-remote"=>"delete", :class=>"bt-delete admbg2 admtxt" %> <%= link_to t('delete'), panel_personal_journal_desktop_journal_co_author_relation_path(journal_co_author_relation), "confirm-message"=>t('sure?'), "ajax-remote"=>"delete", :class=>"bt-delete admbg2 admtxt" %>
</div> </div>
</li> </li>
<% end %> <% end %>
</ul> </ul>

5
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/index.html.erb vendored
View File

@ -18,11 +18,10 @@
<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> <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> </ul>
<div class="list_item_function"> <div class="list_item_function">
<%= link_to 'Edit', edit_panel_personal_journal_desktop_journal_co_author_path(co_author), :class => "bt-edit admbg2 admtxt", "ajax-remote"=>"get" %> <%= link_to t('edit'), edit_panel_personal_journal_desktop_journal_co_author_path(co_author), :class => "bt-edit admbg2 admtxt", "ajax-remote"=>"get" %>
<%= link_to 'Destroy', panel_personal_journal_desktop_journal_co_author_path(co_author), "ajax-remote"=>"delete", "confirm-message"=>'Are you sure?', "callback-method"=>"paperDelete", :class=>"bt-delete admbg2 admtxt" %> <%= link_to t('delete'), panel_personal_journal_desktop_journal_co_author_path(co_author), "ajax-remote"=>"delete", "confirm-message"=>t('sure?'), "callback-method"=>"paperDelete", :class=>"bt-delete admbg2 admtxt" %>
</div> </div>
</li> </li>
<% end %> <% end %>
</ul> </ul>
</div> </div>

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

@ -1,8 +1,8 @@
<div class="toolbar hh2"> <div class="toolbar hh2">
<div class="fn_g hp"> <div class="fn_g hp">
<%= f.submit "Save", name: "commit", value: "Save", class: "fn_btn ini_input hp hh2 thmc2 thmtxt" %> <%= f.submit t("save"), name: "commit", value: "Save", class: "fn_btn ini_input hp hh2 thmc2 thmtxt" %>
<% if not @writing_journal.new_record? %> <% if not @writing_journal.new_record? %>
<%= submit_tag "Cancel", :type => "button", "ajax-remote" => "get", :href => panel_personal_journal_desktop_journal_pages_path, class: "ini_input hp hh2 thmadm thmtxt" %> <%= submit_tag t("cancel"), :type => "button", "ajax-remote" => "get", :href => panel_personal_journal_desktop_journal_pages_path, class: "ini_input hp hh2 thmadm thmtxt" %>
<% end %> <% end %>
</div> </div>
<div class="hh2 hp sdm"> <div class="hh2 hp sdm">
@ -91,14 +91,20 @@
<div class="s_form"> <div class="s_form">
<ul> <ul>
<li class="s_grid_row"> <li class="s_grid_row">
<%= f.fields_for :authors_translations do |f| %> <%= f.label :author_tokens, t("personal_journal.authors") %><br />
<%= f.text_area locale, <%= f.text_area :author_tokens,
class: "s_grid_6 s_grid",
size: "20x2",
placeholder: t("personal_journal.authors"),
"data-pre" => generate_authors_name(@writing_journal.journal_co_author_ids) %>
<%#= f.fields_for :authors_translations do |f| %>
<%#= f.text_area locale,
class: "s_grid_6 s_grid", class: "s_grid_6 s_grid",
size: "20x2", size: "20x2",
placeholder: t("personal_journal.authors"), placeholder: t("personal_journal.authors"),
"autocomplete-list" => "coauthor_autocomplete_list", "autocomplete-list" => "coauthor_autocomplete_list",
value: (@writing_journal.authors_translations[locale.to_s] rescue nil) %> value: (@writing_journal.authors_translations[locale.to_s] rescue nil) %>
<% end %> <%# end %>
<span class="icon-plus input_append"></span> <span class="icon-plus input_append"></span>
</li> </li>
<li class="s_grid_row"> <li class="s_grid_row">
@ -160,7 +166,7 @@
<%= 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_2 s_grid") %><%= f.text_field :url, size: "20", placeholder: "www.sample.com", class: "s_grid_4 s_grid"%>
</li> </li>
</ul> </ul>
</div> </div>
</div> </div>
<div column="true"> <div column="true">
<div class="s_form"> <div class="s_form">
@ -218,14 +224,11 @@
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
orbitDesktop.prototype.initializeJournalPapers.journal_title_autocomplete_list = <%= @journal_candidate.to_json.html_safe %>; orbitDesktop.prototype.initializeJournalPapers.journal_title_autocomplete_list = <%= @journal_candidate.to_json.html_safe %>;
orbitDesktop.prototype.initializeJournalPapers.coauthor_autocomplete_list = <%= @co_author_candidate.to_json.html_safe %>; // orbitDesktop.prototype.initializeJournalPapers.coauthor_autocomplete_list = <%= @co_author_candidate.to_json.html_safe %>;
</script> </script>
<script> <script>
var get_html = function(old_id,new_id){ var get_html = function(old_id,new_id){
return ("<%= escape_javascript(add_attribute 'form_file', f, :writing_journal_files) %>").replace(old_id, new_id) return ("<%= escape_javascript(add_attribute 'form_file', f, :writing_journal_files) %>").replace(old_id, new_id)
} }
</script> </script>

6
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/journal_type.html.erb vendored
View File

@ -18,11 +18,9 @@
<div class="viewport"> <div class="viewport">
<div class="overview" content-layout="datalist" base-width="300" per-column="5"> <div class="overview" content-layout="datalist" base-width="300" per-column="5">
<% @journal_lists.each_with_index do |journal_list,i| %> <% @journal_lists.each_with_index do |journal_list,i| %>
<% if ( i % 5 ) == 0 %>
<div class="g_col"> <div class="g_col">
<ul> <ul>
<% end %> <li class="list_t_item" item="true">
<li class="list_t_item">
<div class="list_item_action"> <div class="list_item_action">
<i class="icon-file"></i> <i class="icon-file"></i>
</div> </div>
@ -30,11 +28,9 @@
<div class="list_t_title"><%= title %></div> <div class="list_t_title"><%= title %></div>
<div class="list_t_desc"><%= level.join(",") %></div> <div class="list_t_desc"><%= level.join(",") %></div>
</li> </li>
<% if ( i % 5 ) == 4 %>
</ul> </ul>
</div> </div>
<% end %> <% end %>
<% end %>
</div> </div>
</div> </div>
</div> </div>

25
vendor/built_in_modules/personal_journal/config/locales/en.yml vendored
View File

@ -24,6 +24,25 @@ en:
file : "File" file : "File"
file_name : "File name" file_name : "File name"
description : "File Description" description : "File Description"
add : "Add"
edit : "Edit" create_success : "Successfully Create"
delete : "Destory" update_success : "Successfully Update"
delete_success : "Successfully Delete"
add: "Add"
back: "Back"
delete: "Delete"
edit: "Edit"
nothing: "Nothing"
show: "Show"
sure?: "Are you sure?"
update: "Update"
yes_: "Yes"
no_: "No"
cancel : "Cancel"
save: "save"
hintText: "Type in a search term"
noResultsText: "No results"
searchingText: "Searching…"
error_msg:
time_series_illegal: "must be before end time"

25
vendor/built_in_modules/personal_journal/config/locales/zh_tw.yml vendored
View File

@ -26,6 +26,25 @@ zh_tw:
file : "檔案" file : "檔案"
file_name : "檔案名稱" file_name : "檔案名稱"
description : "描述" description : "描述"
add : "新增"
edit : "編輯" create_success : "新增完成!!"
delete : "刪除" update_success : "更新完成!!"
delete_success : "刪除成功!!"
add: "新增"
back: "返回"
delete: "刪除"
edit: "編輯"
nothing: "無"
show: "顯示"
sure?: "您肯定嗎?"
update: "更新"
yes_: "是"
no_: "否"
cancel : "取消"
save: "儲存"
hintText: "請輸入搜尋關鍵字"
noResultsText: "沒有相關的比對結果"
searchingText: "搜尋中…"
error_msg:
time_series_illegal: "啟始時間必須早於結束時間"