Compare commits

...

2 Commits

Author SHA1 Message Date
spen 6c06d0f457 Add show plugin profile action 2014-04-15 12:02:55 +08:00
Manson Wang 3ad405936c ntu_cph sync 2014-02-10 10:23:22 +08:00
8 changed files with 53 additions and 22 deletions

View File

@ -93,6 +93,16 @@ orbitDesktop.prototype.initializePersonalBook = function(target,url,cache){ // t
}); });
} }
this.initializePersonalBook.syncComplete = function(){
o.notify("Sync Complete","success");
o.sub_menu_item($("div[content-type=menu] a").eq(0));
}
this.initializePersonalBook.syncComplete = function(){
o.notify("Sync Complete","success");
o.sub_menu_item($("div[content-type=menu] a").eq(0));
}
this.initializePersonalBook.coAuthorformCallback = function(data){ this.initializePersonalBook.coAuthorformCallback = function(data){
if(data.success){ if(data.success){
o.notify(data.msg,"success"); o.notify(data.msg,"success");

View File

@ -231,7 +231,13 @@ class Panel::PersonalBook::BackEnd::WritingBooksController < OrbitBackendControl
respond_to do |format| respond_to do |format|
if @writing_book.update_attributes(params[:writing_book]) if @writing_book.update_attributes(params[:writing_book])
format.html { redirect_to(panel_personal_book_back_end_writing_books_url) }
if params[:writing_book][:user_id]
format.html { redirect_to(admin_users_new_interface_url(:id=>params[:writing_book][:user_id],:show_plugin_profile=>"WritingBook")) }
else
format.html { redirect_to(panel_personal_book_back_end_writing_books_url) }
end
# format.js { render 'toggle_enable' } # format.js { render 'toggle_enable' }
format.xml { head :ok } format.xml { head :ok }
else else
@ -251,7 +257,13 @@ class Panel::PersonalBook::BackEnd::WritingBooksController < OrbitBackendControl
@writing_book.destroy @writing_book.destroy
respond_to do |format| respond_to do |format|
format.html { redirect_to(panel_personal_book_back_end_writing_books_url) }
if params[:user_id]
format.html { redirect_to(admin_users_new_interface_url(:id=>params[:user_id],:show_plugin_profile=>"WritingBook")) }
else
format.html { redirect_to(panel_personal_book_back_end_writing_books_url) }
end
# format.xml { head :ok } # format.xml { head :ok }
format.js format.js
end end

View File

@ -7,7 +7,7 @@ class Panel::PersonalBook::Desktop::PersonalBooksController < ApplicationControl
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

@ -84,18 +84,11 @@ class WritingBook
def create_link def create_link
title = [] title = []
title << self.authors if self.authors.present? # title = ["#{self.extracted_chapters}"] if self.extracted_chapters.present?
title << self.paper_title if self.paper_title.present?
# title << self.paper_title if self.paper_title.present?
title << self.book_title if self.book_title.present? title << self.book_title if self.book_title.present?
title << self.publisher if self.publisher.present? title << self.publisher if self.publisher.present?
title << self.isbn if self.isbn.present? title << self.pages if self.pages.present?
if !self.publish_date.nil?
pd = self.publish_date.strftime("%Y-%m-%d").split('-')
title << pd[0]+"/"+pd[1]
end
# title << "(#{self.journal_level_types.collect{|x| x.title}.join(', ')})" # title << "(#{self.journal_level_types.collect{|x| x.title}.join(', ')})"
title.join(', ') title.join(', ')
end end

View File

@ -255,7 +255,7 @@
<label class="control-label muted"><%= t("personal_book.authors") %></label> <label class="control-label muted"><%= t("personal_book.authors") %></label>
<div class="controls"> <div class="controls">
<%= f.fields_for :authors_translations do |f| %> <%= f.fields_for :authors_translations do |f| %>
<%= f.text_area locale, rows: 2, class: "input-block-level", value: (@writing_book.authors_translations[locale] rescue nil) %> <%= f.text_field locale, rows: 2, class: "input-block-level", value: (@writing_book.authors_translations[locale] rescue nil) %>
<% end %> <% end %>
</div> </div>
</div> </div>

View File

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

@ -1,5 +1,6 @@
<% # encoding: utf-8 %> <% # encoding: utf-8 %>
<div class="writing_detail">
<table> <table>
<caption> <%= t("module_name.personal_book") %> </caption> <caption> <%= t("module_name.personal_book") %> </caption>
<tbody> <tbody>
@ -59,7 +60,9 @@
<tr><th><%= t("personal_book.url")%></th><td><%= link_to t(:url), @writing_book.url, {:target => '_blank', :title => @writing_book.url} if !@writing_book.url.blank? %></td></tr> <tr><th><%= t("personal_book.url")%></th><td><%= link_to t(:url), @writing_book.url, {:target => '_blank', :title => @writing_book.url} if !@writing_book.url.blank? %></td></tr>
<% end %> <% end %>
<tr><th><%= t("personal_book.authors")%></th><td><%= "#{User.from_id(@writing_book.create_user_id).name rescue ''},#{@writing_book.authors rescue ''}"%></td></tr> <% if !@writing_book.authors.blank? %>
<tr><th><%= t("personal_book.authors")%></th><td><%= "#{@writing_book.authors rescue ''}"%></td></tr>
<% end %>
<% if @writing_book.writing_book_files.size > 0 %> <% if @writing_book.writing_book_files.size > 0 %>
<tr><th><%= t("personal_book.files")%></th> <tr><th><%= t("personal_book.files")%></th>
@ -77,3 +80,4 @@
<% end %> <% end %>
</tbody> </tbody>
</table> </table>
</div>

View File

@ -41,7 +41,7 @@
</div> </div>
<% end -%> <% end -%>
<table class="table table-condensed table-striped"> <table class="table table-condensed table-striped main-list">
<thead> <thead>
<tr> <tr>
<% if is_admin? %> <% if is_admin? %>
@ -55,7 +55,7 @@
<% @writing_books.each do |writing_book| %> <% @writing_books.each do |writing_book| %>
<tr class="<%= writing_book.is_hidden ? "checkHide" : "" %>"> <tr id="<%= dom_id writing_book %>" class="<%= writing_book.is_hidden ? "checkHide" : "" %>">
<% if is_admin? %> <% if is_admin? %>
<td> <td>
<%= check_box_tag 'to_change[]', writing_book.id.to_s, false, :class => "list-check" %> <%= check_box_tag 'to_change[]', writing_book.id.to_s, false, :class => "list-check" %>
@ -64,6 +64,14 @@
<td><%= writing_book.year %></td> <td><%= writing_book.year %></td>
<td> <td>
<%= link_to writing_book.create_link, panel_personal_book_front_end_writing_book_path(writing_book) %> <%= link_to writing_book.create_link, panel_personal_book_front_end_writing_book_path(writing_book) %>
<div class="quick-edit">
<ul class="nav nav-pills hide">
<%if at_least_module_manager || writing_book.writing_book_category.cur_user_is_sub_manager_of(:edit)%>
<li><%= link_to t('edit'), edit_panel_personal_book_back_end_writing_book_path(writing_book,:user_id => @user.id) %></li>
<li><%= link_to t(:delete_), panel_personal_book_back_end_writing_book_path(writing_book,:user_id => @user.id), :confirm => t('sure?'), :method => :delete, :remote => true %></li>
<% end -%>
</ul>
</div>
</td> </td>
</tr> </tr>
@ -75,8 +83,9 @@
<% 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.edit_brief_intro'), panel_personal_book_back_end_personal_book_intros_path(:user_id => @user.id), :class => 'btn btn-primary' %> <%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('personal_plugins.sync_data'), admin_import_data_sync_book_data_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_book_back_end_writing_book_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_book_back_end_personal_book_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_book_back_end_writing_book_path(:user_id => @user.id), :class => 'btn btn-primary' %>
</div> </div>
<div class="pagination pagination-centered"> <div class="pagination pagination-centered">
<%= paginate @writing_books, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %> <%= paginate @writing_books, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>