Add author field for list

app/assets/javascripts/personal_conference/desktop/conference_pages.js

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

app/controllers/panel/personal_conference/back_end/writing_conferences_controller.rb

@@ -226,7 +226,13 @@ class Panel::PersonalConference::BackEnd::WritingConferencesController < OrbitBa
 
       respond_to do |format|
         if @writing_conference.update_attributes(params[:writing_conference])
-          format.html { redirect_to(panel_personal_conference_back_end_writing_conferences_url) }
+    
+          if params[:writing_conference][:user_id]
+            format.html { redirect_to(admin_users_new_interface_url(:id=>params[:writing_conference][:user_id],:show_plugin_profile=>'WritingConference')) }
+          else
+            format.html { redirect_to(panel_personal_conference_back_end_writing_conferences_url) }
+          end
+          
       		# format.js  { render 'toggle_enable' }
           format.xml  { head :ok }
         else
@@ -246,7 +252,13 @@ class Panel::PersonalConference::BackEnd::WritingConferencesController < OrbitBa
     @writing_conference.destroy
 
     respond_to do |format|
-      format.html { redirect_to(panel_personal_conference_back_end_writing_conferences_url) }
+    
+      if params[:user_id]
+        format.html { redirect_to(admin_users_new_interface_url(:id=>params[:user_id],:show_plugin_profile=>'WritingConference')) }
+      else
+        format.html { redirect_to(panel_personal_conference_back_end_writing_conferences_url) }
+      end
+      
       # format.xml  { head :ok }
       format.js
     end

app/controllers/panel/personal_conference/desktop/conference_pages_controller.rb

@@ -4,7 +4,7 @@ class Panel::PersonalConference::Desktop::ConferencePagesController < Applicatio
     @writing_conferences = WritingConference.where(create_user_id: current_user.id)
     page = params[:page]
     page ||= 1
-
+    @userid = current_user.id
     if @view_by.nil?
       @writing_conferences = @writing_conferences.asc(:paper_title)
     else

app/models/writing_conference.rb

@@ -85,20 +85,14 @@ class WritingConference
 
   def create_link
     title = []
-
     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.conference_title if self.conference_title.present?
+    title << self.sponsor if self.sponsor.present?
     title << self.location if self.location.present?
     title << "#{period_start_date}-#{period_end_date}" if (self.period_start_date.present? && self.period_end_date.present?)
     # title << "(#{self.conference_paper_types.collect{|x| x.title}.join(', ')})"
-    title.join(', ') 
+    title.join(', ')
   end
 
   protected

app/views/panel/personal_conference/desktop/conference_pages/index.html.erb

@@ -58,6 +58,10 @@
       </ul>
     </div>
   </div>
+  
+  <div class="hh1 hp sdm">
+      <div class="sdm_t hh1"><a href="<%= admin_import_data_sync_conference_data_path(:user_id => @userid) %>" class="icons-cycle" ajax-remote="get" response-type="json" callback-method="syncComplete" > Sync Conference Papers</a></div>
+    </div>
   <div class="hh1 hp sdm">
     <div class="sdm_t hh1"><span class="icon-question-sign"></span></div>
   </div>

app/views/panel/personal_conference/front_end/_profile.html.erb

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

app/views/panel/personal_conference/front_end/writing_conferences/show.html.erb

@@ -1,5 +1,6 @@
 <% # encoding: utf-8 %>
 
+<div class="writing_detail">
 <table>
 	<caption> <%= t("module_name.personal_conference") %> </caption>
 	<tbody>
@@ -55,7 +56,9 @@
 		<tr><th><%= t("personal_conference.url")%></th><td><%= link_to t(:url), @writing_conference.url, {:target => '_blank', :title => @writing_conference.url} if !@writing_conference.url.blank? %></td></tr>
 		<% end %>
 
-		<tr><th><%= t("personal_conference.authors")%></th><td><%= "#{User.from_id(@writing_conference.create_user_id).name rescue ''},#{@personal_conference.authors rescue ''}"%></td></tr>
+		<% if !@writing_conference.authors.blank? %>
+		<tr><th><%= t("personal_conference.authors")%></th><td><%= "#{@writing_conference.authors rescue ''}"%></td></tr>
+		<% end %>
 
 		<% if @writing_conference.writing_conference_files.size > 0 %>
 		<tr><th><%= t("personal_conference.file")%></th>
@@ -73,3 +76,4 @@
 		<% end %>
 	</tbody>
 </table>
+</div>

app/views/panel/personal_conference/plugin/_profile.html.erb

@@ -41,7 +41,7 @@
 </div>
 <% end -%>
 
-<table class="table table-condensed table-striped">
+<table class="table table-condensed table-striped main-list">
   <thead>
     <tr>
       <% if is_admin? %>
@@ -55,7 +55,7 @@
 		
 	<% @writing_conferences.each do |writing_conference| %>	
 			
-    <tr class="<%= writing_conference.is_hidden ? "checkHide" : "" %>">
+    <tr id="<%= dom_id writing_conference %>" class="<%= writing_conference.is_hidden ? "checkHide" : "" %>">
       <% if is_admin? %>
       <td>
         <%= check_box_tag 'to_change[]', writing_conference.id.to_s, false, :class => "list-check" %>
@@ -64,6 +64,14 @@
 			<td><%= writing_conference.year %></td>
 			<td>
 			<%= link_to writing_conference.create_link, panel_personal_conference_front_end_writing_conference_path(writing_conference) %>
+      <div class="quick-edit">
+        <ul class="nav nav-pills hide">
+          <%if at_least_module_manager || writing_conference.writing_conference_category.cur_user_is_sub_manager_of(:edit)%>
+          <li><%= link_to t('edit'), edit_panel_personal_conference_back_end_writing_conference_path(writing_conference,:user_id => @user.id) %></li>
+          <li><%= link_to t(:delete_), panel_personal_conference_back_end_writing_conference_path(writing_conference,:user_id => @user.id), :confirm => t('sure?'), :method => :delete, :remote => true %></li>
+          <% end -%>
+        </ul>
+      </div>
 			</td>
 		</tr>		
 		
@@ -75,8 +83,9 @@
 <% if is_admin? %>
 <div class="bottomnav clearfix">
 	<div class="action pull-right">
-    <%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('personal_plugins.edit_brief_intro'), panel_personal_conference_back_end_personal_conference_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_conference_back_end_writing_conference_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_conference_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_conference_back_end_personal_conference_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_conference_back_end_writing_conference_path(:user_id => @user.id), :class => 'btn btn-primary' %>
 	</div>
 	<div class="pagination pagination-centered">
 		<%= paginate @writing_conferences, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>