Compare commits

..

2 Commits

Author SHA1 Message Date
spen 15cce36f9a Add show plugin profile action 2014-03-20 15:57:04 +08:00
Manson Wang 22c2942f8e Fix list check issue 2014-02-10 17:38:04 +08:00
7 changed files with 17 additions and 18 deletions

View File

@ -42,10 +42,6 @@ orbitDesktop.prototype.initializeJournalPapers = function(target,url,cache){ //
this.initializeJournalPapers.cancelpaper = function(){ this.initializeJournalPapers.cancelpaper = function(){
o.highlight_sub_menu_item(0); o.highlight_sub_menu_item(0);
} }
this.initializeJournalPapers.syncComplete = function(){
o.notify("Sync Complete","success");
o.sub_menu_item($("div[content-type=menu] a").eq(0));
}
var uploadFiles = function(){ var uploadFiles = function(){
$('#add_plugin_file a.add').click(function(){ $('#add_plugin_file a.add').click(function(){

View File

@ -7,7 +7,7 @@ class Panel::PersonalJournal::Desktop::JournalPagesController < ApplicationContr
page ||= 1 page ||= 1
@per_column = 5 @per_column = 5
@userid = current_user.id
case @view_by case @view_by
when "abstract" when "abstract"
@per_column = 1 @per_column = 1

View File

@ -81,7 +81,6 @@ module Panel::PersonalJournal::Desktop::JournalPagesHelper
"ajax-remote" => "delete", "ajax-remote" => "delete",
"confirm-message" => t("sure?"), "confirm-message" => t("sure?"),
"callback-method" => "paperDelete", "callback-method" => "paperDelete",
"response-type" => "json",
"delete-item" => "true", "delete-item" => "true",
:class => "journal_paper_delete admbg2 admtxt", :class => "journal_paper_delete admbg2 admtxt",
:href => panel_personal_journal_desktop_journal_page_path(publication)) :href => panel_personal_journal_desktop_journal_page_path(publication))

View File

@ -91,13 +91,19 @@ class WritingJournal
def create_link def create_link
title = [] title = []
title << self.authors if self.authors.present? title << self.authors if self.authors.present?
if !self.publication_date.nil?
pd = self.publication_date.strftime("%Y-%m-%d").split('-')
title << pd[0]
end
title << self.paper_title if self.paper_title.present? title << self.paper_title if self.paper_title.present?
title << self.journal_title if self.journal_title.present? title << self.journal_title if self.journal_title.present?
title << self.vol_no if (self.vol_no.present? && self.vol_no != "0")
title << self.issue_no if (self.issue_no.present? && self.issue_no != "0")
title << "pp"+self.form_to_start+"-"+self.form_to_end if (self.form_to_start.present? && self.form_to_start != "0")
title << ( !self.journal_level_types.blank? ? "(#{self.journal_level_types.collect{|x| x.title}.join(', ')})" : nil) title << ( !self.journal_level_types.blank? ? "(#{self.journal_level_types.collect{|x| x.title}.join(', ')})" : nil)
title << "Volume No: "+self.vol_no if (self.vol_no.present? && self.vol_no != "0")
title << "From Page: "+self.form_to_start if (self.form_to_start.present? && self.form_to_start != "0")
title << "To Page: "+self.form_to_end if (self.form_to_end.present? && self.form_to_end != "0")
title.join(', ') title.join(', ')
end end

View File

@ -58,9 +58,6 @@
</ul> </ul>
</div> </div>
</div> </div>
<div class="hh1 hp sdm">
<div class="sdm_t hh1"><a href="<%= admin_import_data_sync_journal_paper_data_path(:user_id => @userid) %>" class="icons-cycle" ajax-remote="get" response-type="json" callback-method="syncComplete" > Sync Journal Papers</a></div>
</div>
<div class="hh1 hp sdm"> <div class="hh1 hp sdm">
<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>

View File

@ -23,6 +23,7 @@
<tr> <tr>
<th class="grid1"><%= t('personal_journal.year') %></th> <th class="grid1"><%= t('personal_journal.year') %></th>
<th class="grid8"><%= t('module_name.personal_journal') %></th> <th class="grid8"><%= t('module_name.personal_journal') %></th>
<th class="grid3"><%= t('personal_journal.authors') %></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -34,6 +35,7 @@
<td> <td>
<%= link_to writing_journal.create_link, panel_personal_journal_front_end_writing_journal_path(writing_journal) %> <%= link_to writing_journal.create_link, panel_personal_journal_front_end_writing_journal_path(writing_journal) %>
</td> </td>
<td><%= User.find(writing_journal.create_user_id).name rescue '' %></td>
</tr> </tr>
<% end %> <% end %>

View File

@ -44,7 +44,7 @@
<thead> <thead>
<tr> <tr>
<% if is_admin? %> <% if is_admin? %>
<th><input type="checkbox" class="list-check" /></th> <th><input type="checkbox" /></th>
<% end -%> <% end -%>
<th class="span1"><%= t('personal_journal.year') %></th> <th class="span1"><%= t('personal_journal.year') %></th>
<th><%= t('module_name.personal_journal') %></th> <th><%= t('module_name.personal_journal') %></th>
@ -90,9 +90,8 @@
<% if is_admin? %> <% if is_admin? %>
<div class="bottomnav clearfix"> <div class="bottomnav clearfix">
<div class="action pull-right"> <div class="action pull-right">
<%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('personal_plugins.sync_data'), admin_import_data_sync_journal_paper_data_path(:user_id => @user.id), :class => 'btn btn-primary' %> <%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('personal_plugins.edit_brief_intro'), panel_personal_journal_back_end_personal_journal_intros_path(:user_id => @user.id), :class => 'btn btn-primary' %>
<%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('personal_plugins.edit_brief_intro'), panel_personal_journal_back_end_personal_journal_intros_path(:user_id => @user.id), :class => 'btn btn-primary' %> <%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('announcement.add_new'), new_panel_personal_journal_back_end_writing_journal_path(:user_id => @user.id), :class => 'btn btn-primary' %>
<%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('announcement.add_new'), new_panel_personal_journal_back_end_writing_journal_path(:user_id => @user.id), :class => 'btn btn-primary' %>
</div> </div>
<div class="pagination pagination-centered"> <div class="pagination pagination-centered">
<%= paginate @writing_journals, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %> <%= paginate @writing_journals, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>