Final test for update manager

Gemfile

@@ -20,7 +20,6 @@ gem "acts_as_unvlogable"
 gem 'youtube_it'
 gem 'gotcha'
 gem "geocoder"
-gem 'whenever', :require => false
 
 # gem "memcached", "~> 1.4.3"
 # gem "memcache-client"

README.md

@@ -1,3 +1,4 @@
 # Ruling Orbit
 
 RulingSite-s Version 4.0 Beta
+Update Manager!

app/assets/javascripts/desktop/orbitdesktop.js

@@ -289,14 +289,13 @@ var orbitDesktop = function(dom){
         return false;
       }
       var ca = $e.attr("content-holder");
-
       var a = function(){
         $.ajax({
             type : t,
             dataType : responsetype,
             url : $e.attr("href"),
             success : function(data){
-              if(typeof data == "string" && t != "delete"){
+              if(typeof data == "string"){
                 if(ca)
                   $(ca).html(data);
                 else{
@@ -309,12 +308,10 @@ var orbitDesktop = function(dom){
                 window.o[o.data_method][exe](data,$e);
               if(t == "delete"){
                 if($e.attr("delete-item")=="true"){
-                  var li_to_delete = $e.parentsUntil("li[item=true]");
+                  var li_to_delete = $e.parentsUntil("li[item=true]").find("li[item=true]");
                   li_to_delete.slideUp();
                 }
               }
-            },
-            error : function(x){
             }
         });
       }

app/controllers/admin/import_data_controller.rb

@@ -1,734 +0,0 @@
-# encoding: utf-8
-
-require 'net/http'
-require 'open-uri'
-require 'timeout'
-
-class Admin::ImportDataController < OrbitBackendController
-    # helper Admin::PagePartsHelper
-    # include Admin::FrontendWidgetInterface
-
-  def get_teacher_data
-    uri = URI("https://localhost:8000/teachers.xml")
-
-    #params = {"UnitName" => "管理學院".encode('big5-uao'), "account" => "manage"}
-    #uri.query = URI.encode_www_form(params)
-    res = Net::HTTP.get_response(uri)
-    
-    @teacher_data = Hash.from_xml(res.body)
-    @teachers = @teacher_data["objects"]   
-    @i = 5000
-    @teachers.each do |hash|
-          # @roles = Role.skip(1).first
-          @roles =  Role.all
-          @teacher = User.new
-          I18n.locale = :zh_tw
-          if !hash['teacher_zh_tw'].blank?
-            @teacher.first_name = hash['teacher_zh_tw']
-          elsif hash['teacher_zh_tw'].blank? && !hash['teacher_en'].blank?
-            @teacher.first_name = hash['teacher_en']
-          elsif hash['teacher_zh_tw'].blank? && hash['teacher_en'].blank?
-            @teacher.first_name = "Please Fill the Name"
-          end
-      
-          I18n.locale = :en
-          if !hash['teacher_en'].blank?
-            @teacher.first_name = hash['teacher_en']
-          elsif hash['teacher_en'].blank? && !hash['teacher_zh_tw'].blank?
-            @teacher.first_name = hash['teacher_zh_tw']
-          elsif hash['teacher_en'].blank? && hash['teacher_zh_tw'].blank?
-            @teacher.first_name = "Please Fill the Name"
-          end
-            
-          #@teacher.first_name = hash['teacher_en']      
-          @teacher.ntu_seq = hash['ntu_seq']
-          @teacher.sid = hash['ntu_seq']
-          @teacher.role_ids = ["#{@roles.skip(1).first.id}"]
-          @teacher.password = "testpass"
-          @i += 10
-          if !hash['email'].blank?
-             @user = User.where(email: "#{hash['email']}")
-            if @user.length == 0
-             @teacher.email = hash['email']
-            elsif @user.length > 0
-              @teacher.email = "#{@i}duplicate@ntu.edu.tw"            
-            end
-          else 
-            @teacher.email = "#{@i}@ntu.edu.tw"
-          end
-
-          if hash['teacher_zh_tw'].blank? && hash['teacher_en'].blank?
-           @teacher.user_id = "defaultuser"
-          elsif hash['teacher_en'].blank?
-            @teacher.user_id = hash['teacher_zh_tw']
-          elsif hash['teacher_zh_tw'] 
-            @teacher.user_id = hash['teacher_en']
-          end
-          @teacher.save!
-      end
-  end
-
-  def get_book_data
-    uri = URI("http://ann.cc.ntu.edu.tw/Achv/xmlTeacherData.asp")
-    params = {"UnitName" => "管理學院".encode('big5-uao'), "account" => "manage"}
-    uri.query = URI.encode_www_form(params)
-    res = Net::HTTP.get_response(uri)
-    
-    teachers = User.all
-
-    teachers.each do |hash|
-    # if hash.ntu_seq.present?
-    if hash.user_id.present?
-      # ntu_seq = hash.ntu_seq
-      u_account = hash.user_id
-    books_xml = Nokogiri::XML( \
-    # open("http://ann.cc.ntu.edu.tw/Achv/xmlBook.asp?Seq=#{ntu_seq}"))
-    open("http://ann.cc.ntu.edu.tw/Achv/xmlData_useMail.asp?item=Book&account=#{u_account}"))
-    @books = books_xml.xpath("//Book").map do |book_node|
-          {
-            author: (book_node>"Authors").text,
-            year: (book_node>"PublishYear").text,
-            title: (book_node>"DocTitle").text,
-            remarks: (book_node>"Remarks").text,
-            publisher: (book_node>"Publisher").text,
-            book_title: (book_node>"BookTitle").text
-          }
-      end
-    if @books.present? 
-    @books.each do |b|
-     @book = WritingBook.new
-     I18n.locale = :zh_tw
-     @book.authors = b[:author]
-     @book.paper_title = b[:title]
-     @book.book_title = b[:book_title]
-     @book.note = b[:remarks]
-     @book.publisher = b[:publisher]
-     I18n.locale = :en
-     @book.authors = b[:author]
-     @book.paper_title = b[:title]
-     @book.book_title = b[:book_title]
-     @book.note = b[:remarks]
-     @book.publisher = b[:publisher]
-     @book.year = b[:year]
-     @book.create_user_id = hash.id
-     @book.save
-     end
-      else
-    puts "No books by Teacher"
-      end
-     end
-    end
-  end
-
-  def get_conference_data
-    uri = URI("http://ann.cc.ntu.edu.tw/Achv/xmlTeacherData.asp")
-    params = {"UnitName" => "管理學院".encode('big5-uao'), "account" => "manage"}
-    uri.query = URI.encode_www_form(params)
-    res = Net::HTTP.get_response(uri)
-    
-    teachers = User.all
-
-    teachers.each do |hash|
-    # if hash.ntu_seq.present?
-    if hash.user_id.present?
-    # ntu_seq = hash.ntu_seq
-    u_account = hash.user_id
-    conference_xml = Nokogiri::XML( \
-    # open("http://ann.cc.ntu.edu.tw/Achv/xmlPaper.asp?Seq=#{ntu_seq}&type=C"))
-    open("http://ann.cc.ntu.edu.tw/Achv/xmlData_useMail.asp?item=paper&account=#{u_account}&type=C"))
-        #open("http://versatile.management.ntu.edu.tw/publication1/conference/#{ntuseq}.xml"))
-    @conference_papers = conference_xml.xpath("//Paper").map do |cp_node|
-                            {
-                              author: (cp_node>"Authors").text,
-                              year: (cp_node>"PublishYear").text,
-                              title: (cp_node>"PaperTitle").text,
-                              conference: (cp_node>"PublishOn").text,
-                              date: Date::MONTHNAMES[(cp_node>"PublishMonth").text.to_i],
-                              location: "#{(cp_node>"Country").text} #{(cp_node>"location").text}",
-                              conference_title: (cp_node>"PublishOn").text,
-                              remarks: (cp_node>"Remarks").text
-                            }
-                          end
-     if @conference_papers.present? 
-       @conference_papers.each do |b|
-       @conference_paper = WritingConference.new
-       I18n.locale = :zh_tw
-       @conference_paper.authors = b[:author]
-       if b[:title].blank?
-        @conference_paper.paper_title = "No Title Present"
-       else 
-        @conference_paper.paper_title = b[:title]
-       end
-       if b[:conference_title].blank?
-         @conference_paper.conference_title = "No Title Present"
-       else
-          @conference_paper.conference_title = b[:conference_title]
-       end
-
-       @conference_paper.note = b[:remarks]
-       I18n.locale = :en
-       @conference_paper.authors = b[:author]
-       if b[:title].blank?
-        @conference_paper.paper_title = "No Title Present"
-       else 
-        @conference_paper.paper_title = b[:title]
-       end
-       if b[:conference_title].blank?
-         @conference_paper.conference_title = "No Title Present"
-       else
-          @conference_paper.conference_title = b[:conference_title]
-       end
-       @conference_paper.note = b[:remarks]
-
-       @conference_paper.location = b[:location]
-       @conference_paper.year = b[:year]
-       @conference_paper.create_user_id = hash.id
-
-       @conference_paper.save!
-     end
-      else
-    puts "No conference by Teacher"
-      end
-      end
-    end
-  end
-
-
-  def get_journal_paper_data
-    uri = URI("http://ann.cc.ntu.edu.tw/Achv/xmlTeacherData.asp")
-    params = {"UnitName" => "管理學院".encode('big5-uao'), "account" => "manage"}
-    uri.query = URI.encode_www_form(params)
-    res = Net::HTTP.get_response(uri)
-    
-    teachers = User.all
-
-    teachers.each do |hash|
-    # if hash.ntu_seq.present?
-    if hash.user_id.present?
-    # ntu_seq = hash.ntu_seq
-    u_account = hash.user_id
-    paper_xml = Nokogiri::XML( \
-        #open("http://versatile.management.ntu.edu.tw/publication1/journal/#{ntuseq}.xml"))
-    # open("http://ann.cc.ntu.edu.tw/Achv/xmlPaper.asp?Seq=#{ntu_seq}&type=J"))
-    open("http://ann.cc.ntu.edu.tw/Achv/xmlData_useMail.asp?item=paper&account=#{u_account}&type=J"))
-    @journal_papers = paper_xml.xpath("//Paper").map do |paper_node|
-                  {
-                    author: (paper_node>"Authors").text,
-                    year: (paper_node>"PublishYear").text,
-                    title: (paper_node>"PaperTitle").text,
-                    journal: (paper_node>"PublishOn").text,
-                    volume:(paper_node>"Volume").text,
-                    volumeno:(paper_node>"VolumeNo").text,
-                    beginpage:(paper_node>"BeginPage").text,
-                    endpage:(paper_node>"EndPage").text,
-                    subgroup:(paper_node>"subgroup").text,
-                    remarks: (paper_node>"Remarks").text,
-                    cate: ((paper_node>"subgroup")>"Group").text
-                  }
-                end
-     if @journal_papers.present? 
-       @journal_papers.each do |b|
-       @journal_paper = WritingJournal.new
-       I18n.locale = :zh_tw
-       @journal_paper.authors = b[:author]
-       if b[:title].blank?
-          @journal_paper.paper_title = "No Title Present"
-       else 
-          @journal_paper.paper_title = b[:title]
-       end
-       @journal_paper.journal_title = b[:journal]
-       @journal_paper.note = b[:remarks]
-       I18n.locale = :en
-       @journal_paper.authors = b[:author]
-       if b[:title].blank?
-          @journal_paper.paper_title = "No Title Present"
-       else 
-          @journal_paper.paper_title = b[:title]
-       end
-       @journal_paper.journal_title = b[:journal]
-       @journal_paper.note = b[:remarks]
-       @journal_paper.year = b[:year]
-       @journal_paper.vol_no = b[:volumeno]
-       @journal_paper.form_to_start = b[:beginpage]
-       @journal_paper.form_to_end = b[:endpage]
-       if !b[:cate].blank?
-        @level_type = JournalLevelType.where(:key => b[:cate])
-        if @level_type.present?
-          @journal_paper.journal_level_type_ids = ["#{@level_type.first.id}"]
-        end
-       end
-
-       @journal_paper.create_user_id = hash.id
-       @journal_paper.save!
-
-     end
-      else
-    puts "No journal paper by Teacher"
-      end
-      end
-    end
-  end
-
-def sync_conference_data
-    @conference_data = WritingConference.where(create_user_id: "#{params[:user_id]}")
-    @conference_data.delete_all
-    @user = User.find("#{params[:user_id]}")
-
-    # teachers.each do |hash|
-     # if @user.sid.present?
-     if @user.user_id.present?
-    # ntu_seq = @user.sid
-      u_account = @user.user_id
-    conference_xml = Nokogiri::XML( \
-    # open("http://ann.cc.ntu.edu.tw/Achv/xmlPaper.asp?Seq=#{ntu_seq}&type=C"))
-    open("http://ann.cc.ntu.edu.tw/Achv/xmlData_useMail.asp?item=paper&account=#{u_account}&type=C"))
-        #open("http://versatile.management.ntu.edu.tw/publication1/conference/#{ntuseq}.xml"))
-    @conference_papers = conference_xml.xpath("//Paper").map do |cp_node|
-                            {
-                              author: (cp_node>"Authors").text,
-                              year: (cp_node>"PublishYear").text,
-                              title: (cp_node>"PaperTitle").text,
-                              conference: (cp_node>"PublishOn").text,
-                              date: Date::MONTHNAMES[(cp_node>"PublishMonth").text.to_i],
-                              location: "#{(cp_node>"Country").text} #{(cp_node>"location").text}",
-                              conference_title: (cp_node>"PublishOn").text,
-                              remarks: (cp_node>"Remarks").text
-                            }
-                          end
-     if @conference_papers.present? 
-       @conference_papers.each do |b|
-       @conference_paper = WritingConference.new
-       I18n.locale = :zh_tw
-       @conference_paper.authors = b[:author]
-       if b[:title].blank?
-        @conference_paper.paper_title = "No Title Present"
-       else 
-        @conference_paper.paper_title = b[:title]
-       end
-       if b[:conference_title].blank?
-         @conference_paper.conference_title = "No Title Present"
-       else
-          @conference_paper.conference_title = b[:conference_title]
-       end
-
-       @conference_paper.note = b[:remarks]
-       I18n.locale = :en
-       @conference_paper.authors = b[:author]
-       if b[:title].blank?
-        @conference_paper.paper_title = "No Title Present"
-       else 
-        @conference_paper.paper_title = b[:title]
-       end
-       if b[:conference_title].blank?
-         @conference_paper.conference_title = "No Title Present"
-       else
-          @conference_paper.conference_title = b[:conference_title]
-       end
-       @conference_paper.note = b[:remarks]
-
-       @conference_paper.location = b[:location]
-       @conference_paper.year = b[:year]
-       @conference_paper.create_user_id = @user.id
-
-       @conference_paper.save!
-     end
-      else
-    puts "No conference by Teacher"
-      end
-      end
-       respond_to do |format|
-    
-        format.html { redirect_to request.referer }
-        format.json { render json: {"success"=>true}.to_json}
-      
-      end
-  end
-
-
-  def sync_journal_paper_data
-    
-    @journal_data = WritingJournal.where(create_user_id: "#{params[:user_id]}")
-    @journal_data.delete_all
-    @user = User.find("#{params[:user_id]}")
-
-    # teachers.each do |hash|
-    # if @user.sid.present?
-    if @user.user_id.present?
-      # ntu_seq = @user.sid
-      u_account = @user.user_id
-      paper_xml = Nokogiri::XML( \
-          #open("http://versatile.management.ntu.edu.tw/publication1/journal/#{ntuseq}.xml"))
-      # open("http://ann.cc.ntu.edu.tw/Achv/xmlPaper.asp?Seq=#{ntu_seq}&type=J"))
-      open("http://ann.cc.ntu.edu.tw/Achv/xmlData_useMail.asp?item=paper&account=#{u_account}&type=J"))
-      @journal_papers = paper_xml.xpath("//Paper").map do |paper_node|
-                    {
-                      author: (paper_node>"Authors").text,
-                      year: (paper_node>"PublishYear").text,
-                      title: (paper_node>"PaperTitle").text,
-                      journal: (paper_node>"PublishOn").text,
-                      volume:(paper_node>"Volume").text,
-                      volumeno:(paper_node>"VolumeNo").text,
-                      beginpage:(paper_node>"BeginPage").text,
-                      endpage:(paper_node>"EndPage").text,
-                      subgroup:(paper_node>"subgroup").text,
-                      remarks: (paper_node>"Remarks").text,
-                      cate: ((paper_node>"subgroup")>"Group").text
-                    }
-                  end
-      if @journal_papers.present? 
-        @journal_papers.each do |b|
-           @journal_paper = WritingJournal.new
-           I18n.locale = :zh_tw
-           @journal_paper.authors = b[:author]
-
-           if b[:title].blank?
-              @journal_paper.paper_title = "No Title Present"
-           else 
-              @journal_paper.paper_title = b[:title]
-           end
-
-           @journal_paper.journal_title = b[:journal]
-           @journal_paper.note = b[:remarks]
-           I18n.locale = :en
-           @journal_paper.authors = b[:author]
-
-           if b[:title].blank?
-              @journal_paper.paper_title = "No Title Present"
-           else 
-              @journal_paper.paper_title = b[:title]
-           end
-
-           @journal_paper.journal_title = b[:journal]
-           @journal_paper.note = b[:remarks]
-           @journal_paper.year = b[:year]
-           @journal_paper.vol_no = b[:volumeno]
-           @journal_paper.form_to_start = b[:beginpage]
-           @journal_paper.form_to_end = b[:endpage]
-
-           if !b[:cate].blank?
-            @level_type = JournalLevelType.where(:key => b[:cate])
-            if @level_type.present?
-              @journal_paper.journal_level_type_ids = ["#{@level_type.first.id}"]
-            end
-           end
-
-           @journal_paper.create_user_id = @user.id
-           @journal_paper.save!
-        end
-      end
-     
-    end
-    
-    respond_to do |format|
-        
-      format.html { redirect_to request.referer }
-      format.json { render json: {"success"=>true}.to_json}
-    
-    end
-  end
-
-def sync_book_data
-    @books_data = WritingBook.where(create_user_id: "#{params[:user_id]}")
-    @books_data.delete_all
-    @user = User.find("#{params[:user_id]}")
-
-    # teachers.each do |hash|
-     # if @user.sid.present?
-     if @user.user_id.present?
-    # ntu_seq = @user.sid
-      u_account = @user.user_id
-    books_xml = Nokogiri::XML( \
-    # open("http://ann.cc.ntu.edu.tw/Achv/xmlBook.asp?Seq=#{ntu_seq}"))
-    open("http://ann.cc.ntu.edu.tw/Achv/xmlData_useMail.asp?item=Book&account=#{u_account}"))
-    @books = books_xml.xpath("//Book").map do |book_node|
-          {
-            author: (book_node>"Authors").text,
-            year: (book_node>"PublishYear").text,
-            title: (book_node>"DocTitle").text,
-            remarks: (book_node>"Remarks").text,
-            publisher: (book_node>"Publisher").text,
-            book_title: (book_node>"BookTitle").text
-          }
-      end
-    if @books.present? 
-     @books.each do |b|
-     @book = WritingBook.new
-     I18n.locale = :zh_tw
-     @book.authors = b[:author]
-     @book.paper_title = b[:title]
-     @book.book_title = b[:book_title]
-     @book.note = b[:remarks]
-     @book.publisher = b[:publisher]
-     I18n.locale = :en
-     @book.authors = b[:author]
-     @book.paper_title = b[:title]
-     @book.book_title = b[:book_title]
-     @book.note = b[:remarks]
-     @book.publisher = b[:publisher]
-     @book.year = b[:year]
-     @book.create_user_id = @user.id
-     @book.save
-     end
-    end
-     end
-     
-     respond_to do |format|
-    
-        format.html { redirect_to request.referer }
-        format.json { render json: {"success"=>true}.to_json}
-      
-      end
-end
-
-
- def sync_conference_data_auto
-  @user = User.all
-  @user.each do |user|
-    if user.user_id.present?
-      next if !user.email.include? "ntu.edu.tw"
-      u_account = user.user_id
-      @conference_xml = nil
-      begin
-        timeout(60) do
-          @conference_xml = Nokogiri::XML( \
-          open("http://ann.cc.ntu.edu.tw/Achv/xmlData_useMail.asp?item=paper&account=#{u_account}&type=C"))
-         end
-      rescue Timeout::Error
-        next
-      end
-    @conference_papers = @conference_xml.xpath("//Paper").map do |cp_node|
-                            {
-                              author: (cp_node>"Authors").text,
-                              year: (cp_node>"PublishYear").text,
-                              title: (cp_node>"PaperTitle").text,
-                              conference: (cp_node>"PublishOn").text,
-                              date: Date::MONTHNAMES[(cp_node>"PublishMonth").text.to_i],
-                              location: "#{(cp_node>"Country").text} #{(cp_node>"location").text}",
-                              conference_title: (cp_node>"PublishOn").text,
-                              remarks: (cp_node>"Remarks").text
-                            }
-                          end
-     if @conference_papers.present? 
-       WritingConference.delete_all(conditions:{create_user_id: user.id})
-
-       @conference_papers.each do |b|
-       @conference_paper = WritingConference.new
-       I18n.locale = :zh_tw
-       @conference_paper.authors = b[:author]
-       if b[:title].blank?
-        @conference_paper.paper_title = "No Title Present"
-       else 
-        @conference_paper.paper_title = b[:title]
-       end
-       if b[:conference_title].blank?
-         @conference_paper.conference_title = "No Title Present"
-       else
-          @conference_paper.conference_title = b[:conference_title]
-       end
-
-       @conference_paper.note = b[:remarks]
-       I18n.locale = :en
-       @conference_paper.authors = b[:author]
-       if b[:title].blank?
-        @conference_paper.paper_title = "No Title Present"
-       else 
-        @conference_paper.paper_title = b[:title]
-       end
-       if b[:conference_title].blank?
-         @conference_paper.conference_title = "No Title Present"
-       else
-          @conference_paper.conference_title = b[:conference_title]
-       end
-       @conference_paper.note = b[:remarks]
-
-       @conference_paper.location = b[:location]
-       @conference_paper.year = b[:year]
-       @conference_paper.create_user_id = user.id
-
-       @conference_paper.save!
-     end
-      else
-      end
-    end
-    end
-  end
-
-
-def sync_journal_paper_data_auto
-  @user = User.all
-  @user.each do |user|
-    if user.user_id.present?
-      next if !user.email.include? "ntu.edu.tw"
-      u_account = user.user_id
-      @paper_xml = nil
-      begin
-        timeout(60) do
-          @paper_xml = Nokogiri::XML( \
-          open("http://ann.cc.ntu.edu.tw/Achv/xmlData_useMail.asp?item=paper&account=#{u_account}&type=J"))
-        end
-      rescue Timeout::Error
-        next
-      end
-      @journal_papers = @paper_xml.xpath("//Paper").map do |paper_node|
-                    {
-                      author: (paper_node>"Authors").text,
-                      year: (paper_node>"PublishYear").text,
-                      title: (paper_node>"PaperTitle").text,
-                      journal: (paper_node>"PublishOn").text,
-                      volume:(paper_node>"Volume").text,
-                      volumeno:(paper_node>"VolumeNo").text,
-                      beginpage:(paper_node>"BeginPage").text,
-                      endpage:(paper_node>"EndPage").text,
-                      subgroup:(paper_node>"subgroup").text,
-                      remarks: (paper_node>"Remarks").text,
-                      cate: ((paper_node>"subgroup")>"Group").text
-                    }
-                  end
-      if @journal_papers.present? 
-
-        WritingJournal.delete_all(conditions:{create_user_id: user.id})
-        
-        @journal_papers.each do |b|
-           @journal_paper = WritingJournal.new
-           I18n.locale = :zh_tw
-           @journal_paper.authors = b[:author]
-
-           if b[:title].blank?
-              @journal_paper.paper_title = "No Title Present"
-           else 
-              @journal_paper.paper_title = b[:title]
-           end
-
-           @journal_paper.journal_title = b[:journal]
-           @journal_paper.note = b[:remarks]
-           I18n.locale = :en
-           @journal_paper.authors = b[:author]
-
-           if b[:title].blank?
-              @journal_paper.paper_title = "No Title Present"
-           else 
-              @journal_paper.paper_title = b[:title]
-           end
-
-           @journal_paper.journal_title = b[:journal]
-           @journal_paper.note = b[:remarks]
-           @journal_paper.year = b[:year]
-           @journal_paper.vol_no = b[:volumeno]
-           @journal_paper.form_to_start = b[:beginpage]
-           @journal_paper.form_to_end = b[:endpage]
-
-           if !b[:cate].blank?
-            @level_type = JournalLevelType.where(:key => b[:cate])
-            if @level_type.present?
-              @journal_paper.journal_level_type_ids = ["#{@level_type.first.id}"]
-            end
-           end
-
-           @journal_paper.create_user_id = user.id
-           @journal_paper.save!
-        end
-      end
-      puts "Sync "+u_account+"\r\n"
-    end
-  end   
-end
-
-def sync_book_data_auto
-  @user = User.all
-  @user.each do |user|
-    if user.user_id.present?
-      next if !user.email.include? "ntu.edu.tw"
-      u_account = user.user_id
-      @books_xml = nil
-      begin
-        timeout(60) do
-          @books_xml = Nokogiri::XML( \
-          open("http://ann.cc.ntu.edu.tw/Achv/xmlData_useMail.asp?item=Book&account=#{u_account}"))
-        end
-      rescue Timeout::Error
-        next
-      end
-      
-    @books = @books_xml.xpath("//Book").map do |book_node|
-          {
-            author: (book_node>"Authors").text,
-            year: (book_node>"PublishYear").text,
-            title: (book_node>"DocTitle").text,
-            remarks: (book_node>"Remarks").text,
-            publisher: (book_node>"Publisher").text,
-            book_title: (book_node>"BookTitle").text
-          }
-      end
-
-    if @books.present? 
-
-      WritingBook.delete_all(conditions:{create_user_id: user.id})
-
-     @books.each do |b|
-     @book = WritingBook.new
-     I18n.locale = :zh_tw
-     @book.authors = b[:author]
-     @book.paper_title = b[:title]
-     @book.book_title = b[:book_title]
-     @book.note = b[:remarks]
-     @book.publisher = b[:publisher]
-     I18n.locale = :en
-     @book.authors = b[:author]
-     @book.paper_title = b[:title]
-     @book.book_title = b[:book_title]
-     @book.note = b[:remarks]
-     @book.publisher = b[:publisher]
-     @book.year = b[:year]
-     @book.create_user_id = user.id
-     @book.save
-     end
-    end
-     end
-  end
-end
-
-
-  def get_announcement_data
-  uri = URI("https://localhost:8000/announcements.xml")
-
-    #params = {"UnitName" => "管理學院".encode('big5-uao'), "account" => "manage"}
-    #uri.query = URI.encode_www_form(params)
-    res = Net::HTTP.get_response(uri)
-    
-    @announcement_data = Hash.from_xml(res.body)
-    @announcements = @announcement_data["objects"]   
-    @announcements.each do |hash|
-          @bulletin = Bulletin.new
-
-          I18n.locale = :zh_tw
-          if hash['announcement_title_zh_tw'].blank?
-           @bulletin.title = hash['announcement_title_en']
-           @bulletin.text = hash['announcement_content_zh_tw']
-          elsif hash['announcement_title_zh_tw'].blank? && hash['announcement_title_en'].blank?
-           @bulletin.title = "Please Fill the Name"
-           @bulletin.text = hash['announcement_content_zh_tw']
-          else
-           @bulletin.title = hash['announcement_title_zh_tw']
-           @bulletin.text = hash['announcement_content_zh_tw']
-          end
-
-          I18n.locale = :en
-          if hash['announcement_title_zh_tw'].blank? && hash['announcement_title_en'].blank?
-            @bulletin.title = "Please Fill the Name"
-            @bulletin.text = hash['announcement_content_en']
-
-          elsif hash['announcement_title_en'].blank?
-            @bulletin.title = hash['announcement_zh_tw']
-            @bulletin.text = hash['announcement_content_en']
-
-          elsif hash['announcement_title_zh_tw'].blank?
-            @bulletin.title = hash['announcement_title_en']
-            @bulletin.text = hash['announcement_content_en']
-          end
-          @bulletin.category_id = "51d2a16438178423c2000001"
-          @bulletin.is_pending = true
-
-          @bulletin.save!
-      end
-  end
-end

app/controllers/admin/sites_controller.rb

@@ -3,6 +3,7 @@ class Admin::SitesController < OrbitBackendController
   before_filter :authenticate_user!
   before_filter :is_admin?
   before_filter :get_site
+  before_filter :git_branch
   
   # def index
   #   @site = Site.first
@@ -107,6 +108,43 @@ class Admin::SitesController < OrbitBackendController
     render :nothing => true
   end
 
+  def update_manager
+  end
+
+  def get_update_history
+    @update_log = %x{git log --pretty=format:"%ad','%s" --date=short}.split("\n").map{|log| log.gsub("'","").split(",")}.to_json
+    render :json => @update_log
+  end
+
+  def check_updates
+    %x(git fetch origin)
+    @new_updates = %x(git log #{@branch}..origin/#{@branch}  --pretty=format:"%ad','%s" --date=short).split("\n").map{|log| log.gsub("'","").split(",")}.to_json
+    render :json => @new_updates
+  end
+
+  def update_orbit
+    result = ""
+    need_stash = %x(git diff).blank?
+    %x(git stash) unless need_stash
+    %x(git fetch origin)
+    pull_result = %x(git pull -r --ff-only 2>&1 origin #{@branch})
+
+    if pull_result.include? "fatal: Not possible to fast-forward, aborting."
+      result = "failed"
+    else
+      result = "success"
+      %x{bundle install}
+      %x{touch tmp/restart.txt}
+    end
+    %x(git stash pop) unless need_stash
+
+    render :text => result
+  end
+
+  def restart_server
+    render :text => "success"
+  end
+
   protected
 
   def update_design(design)
@@ -125,4 +163,8 @@ class Admin::SitesController < OrbitBackendController
     @site ||= Site.first
   end
 
+  def git_branch
+    @branch = %x(git rev-parse --abbrev-ref HEAD).gsub("\n","")
+  end
+  
 end

app/controllers/saml_logins_controller.rb

@@ -1,34 +0,0 @@
-class SamlLoginsController < ApplicationController
-
-  require "net/http"
-  require "uri"
-  require 'rexml/document'
-  include REXML
-
-  def index 
-  
-    if params[:wa] == "wsignoutcleanup1.0" #logout
-
-      redirect_to :root
-
-    else  #login
-
-
-    @wresult = params[:wresult]
-    @wctx = params[:wctx]
-
-    @main_url = LIST[:sites][@wctx]['url']
-    @main_public_key = LIST[:sites][@wctx]['key']
-
-    @doc = REXML::Document.new @wresult
-    
-    public_key = OpenSSL::PKey::RSA.new(@main_public_key)
-    encrypted_data = public_key.public_encrypt(@doc.elements["//saml:AttributeValue"].text)
-    
-    redirect_to "http://#{@main_url}/user_login?" + { :wresult => encrypted_data }.to_param
-
-   end
-
-  end
-
-end

app/controllers/sessions_controller.rb

@@ -1,40 +0,0 @@
-# encoding: utf-8
-
-class SessionsController < Devise::SessionsController
-	prepend_before_filter :require_no_authentication, :only => [ :new, :create ]
-
-
-  def create 
-	  @site = Site.first
-
-      private_key = OpenSSL::PKey::RSA.new(@site.private_key)
-      wresult = private_key.private_decrypt(request.params['wresult'])
-
-  	  @ids = wresult.split("@")
-
-      login_uid = @ids[0]
-
-  	  resource = User.first(conditions:{user_id: login_uid})
-
-	  if !resource.blank?
-	     resource_name = resource.class.to_s.downcase
-	     sign_in(resource_name, resource)
-	     session[:user_id_type] = "myntucoph"
-	     redirect_to after_sign_in_path_for(resource)
-	  else
-	     flash[:error] = "很抱歉,您無此權限或帳號登入本站,請洽本站管理員<br />Sorry, you don't have the account or authority to login. Please contact the website administrator."
-	     redirect_to :root
-	  end
-  end
-
-  def destroy
-  	@user_id_type = session[:user_id_type]
-    sign_out
-    if @user_id_type == "myntucoph"
-      redirect_to "https://adfs.ntu.edu.tw/adfs/ls/?wa=wsignout1.0&wreply=https://cophlogin.ntu.edu.tw"
-    else
-      redirect_to root_path
-    end
-  end
-
-end

app/views/admin/import_data/get_announcement_data.html.erb

@@ -1 +0,0 @@
-<p>Successfully Imported Announcement Data!</p>

app/views/admin/import_data/get_book_data.html.erb

@@ -1 +0,0 @@
-<p>Successfully Book Data!</p>

app/views/admin/import_data/get_conference_data.html.erb

@@ -1 +0,0 @@
-<p>Successfully Conference Data!</p>

app/views/admin/import_data/get_journal_paper_data.html.erb

@@ -1 +0,0 @@
-<p>Successfully Journal Paper Data!</p>

app/views/admin/import_data/get_page_data.html.erb

@@ -1 +0,0 @@
-<p>Successfully Imported Page Data!</p>

app/views/admin/import_data/get_teacher_data.html.erb

@@ -1 +0,0 @@
-<p>Successfully Imported Teacher Data!</p>

app/views/admin/import_data/sync_book_data.html.erb

@@ -1 +0,0 @@
-<p>Book Data Synced Successfully!</p>

app/views/admin/import_data/sync_conference_data.html.erb

@@ -1 +0,0 @@
-<p>Conference Paper Data Synced Successfully!</p>

app/views/admin/import_data/sync_journal_paper_data.html.erb

@@ -1 +0,0 @@
-<p>Journal Paper Data Synced Successfully!</p>

app/views/admin/items/_site_bar.html.erb

@@ -20,6 +20,8 @@
 
 				<li title="<%= t('preference') %>"><%= link_to admin_site_preference_path(@site), :class => active_for_action('sites', 'preference') do %><span><i class="icons-cog"></i></span><%end%></li>
 
+				<li title="<%= t('update_manager') %>"><%= link_to admin_site_update_manager_path(@site), :class => active_for_action('sites', 'update_manager') do %><span><i class="icon-refresh"></i></span><%end%></li>
+
 <!-- 				<li title="System Info"><a href="/orbit_4.0.1/admin/system_info/index.shtml?sidebarNavList=8&amp;subNavBlockList=0"><span><i class="icons-info-2"></i></span></a></li>
  -->			</ul>
 		</div>

app/views/admin/sites/_side_bar.html.erb

@@ -20,6 +20,8 @@
 
 				<li title="<%= t('preference') %>"><%= link_to admin_site_preference_path(@site), :class => active_for_action('sites', 'preference') do %><span><i class="icons-cog"></i></span><%end%></li>
 
+				<li title="<%= t('update_manager') %>"><%= link_to admin_site_update_manager_path(@site), :class => active_for_action('sites', 'update_manager') do %><span><i class="icon-refresh"></i></span><%end%></li>
+
 <!-- 				<li title="System Info"><a href="/orbit_4.0.1/admin/system_info/index.shtml?sidebarNavList=8&amp;subNavBlockList=0"><span><i class="icons-info-2"></i></span></a></li>
  -->			</ul>
 		</div>

app/views/admin/sites/update_manager.erb

@@ -0,0 +1,245 @@
+<% content_for :side_bar do %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('site.settings'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-cog', :side_bar_content => 'admin/sites/side_bar'} %>
+<% end %>
+<style type="text/css">
+	.container{
+	}
+
+	#new_update_container{
+		display: none;
+	}
+
+	#update_progress{
+		margin: 0 auto;
+		text-align: center;
+	}
+
+	#update_status{
+		/*display: none;*/
+	}
+
+	#update_done{
+		display: none;	
+	}
+
+	#update_failed{
+		display: none;
+	}
+
+	.panel{
+		/*max-height: 400px;*/
+		border-radius: 5px;
+		overflow: hidden;
+		border: 1px solid #DFDFDF;
+		background: #FFF;
+		box-shadow: 0px 0px 10px #CCC;
+	}
+
+	.panel-heading{
+		font-size: 16px;
+		color: #666;
+		padding: 10px 20px;
+
+		background-color: #fafafa;
+		background-image: -moz-linear-gradient(top, #ffffff, #f2f2f2);
+		background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f2f2f2));
+		background-image: -webkit-linear-gradient(top, #ffffff, #f2f2f2);
+		background-image: -o-linear-gradient(top, #ffffff, #f2f2f2);
+		background-image: linear-gradient(to bottom, #ffffff, #f2f2f2);
+		background-repeat: repeat-x;
+		filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0);
+		*zoom: 1;
+		border-bottom:  1px solid #DDD;
+	}
+
+	.table{
+		margin: 0;
+		-webkit-border-radius: 5px;
+		border-radius: 5px;
+	}
+
+	.pannel-body{
+		max-height:  400px;
+		overflow: scroll;
+		overflow-x: hidden;
+		overflow-y: hidden;
+		padding: 15px;
+	}
+
+	.pannel-body:hover{
+		overflow-y: scroll;
+	}
+
+	::-webkit-scrollbar {
+		width: 5px;
+	}
+	::-webkit-scrollbar-track {
+		background-color: #AAA;
+	} 
+	::-webkit-scrollbar-thumb {
+		background-color: #666;
+	}
+
+	.break{
+		border-left: 1px solid #FCFCFC;
+		border-right: 1px solid #DDD;
+		padding: 10px 0;
+		margin: 0 15px;
+	}
+</style>
+<div class="container">
+	<div class="row-fluid">
+		<div class="span6">
+			<div  id="new_update_container">
+				<div class="panel">
+					<div class="panel-heading">
+						<i class="icon-exclamation-sign"></i>
+						<span class="break"></span>
+						<span class="panel-title"><%= t("update_manager_.available_updates") %></span>
+						<span id="num_new_updates" class="badge badge-important pull-right"></span>
+					</div>
+					<div class="pannel-body">
+						<table class="table table-striped">
+							<tbody id="new_update_table">
+								
+							</tbody>
+						</table>
+					</div>	
+				</div>
+				<div style="height: 55px;">
+					<button id="update_btn" class="btn btn-primary pull-right"  style="margin: 10px;"><i class="icon-inbox icon-white"></i> <%= t("update_manager_.system_update") %></button>
+				</div>
+			</div>
+			<div id="update_status">
+				<div class="panel">
+					<div class="panel-heading">
+						<i class="icon-info-sign"></i>
+						<span class="break"></span>
+						<span class="panel-title"><%= t("update_manager_.update_status") %></span>
+					</div>
+					<div class="pannel-body">
+						<div id="update_done" class="alert alert-success" style="font-size: 16px; text-align: center; margin: 0px;">
+							<i class="icon-ok-sign">&nbsp;&nbsp;&nbsp;&nbsp;<%= t("update_manager_.update_done") %></i>
+						</div>
+						<div id="update_failed" class="alert alert-error" style="font-size: 16px; text-align: center; margin: 0px;">
+							<i class="icon-remove">&nbsp;&nbsp;&nbsp;&nbsp;<%= t("update_manager_.update_faild") %></i>
+						</div>
+						<div id="update_progress">
+							<img src="http://ridepal.com/images/homeimg/preloader_transparent.gif" width="50"><br/>
+							<span id="progress_msg"></span>
+						</div>
+					</div>	
+				</div>
+				<div style="padding: 10px 0; height: 65px;">
+					<button id="chech_update_btn" class="btn btn-small btn-inverse pull-right"><i class="icon-refresh icon-white"></i> <%= t("update_manager_.check_update") %></button>
+				</div>
+			</div>
+		</div>
+  		<div class="span6">
+  			<div class="panel">
+				<div class="panel-heading">
+					<i class="icon-th-list"></i>
+					<span class="break"></span>
+					<span class="panel-title"><%= t("update_manager_.update_history") %></span>
+					<span id="num_updates" class="badge badge-success pull-right"></span>
+				</div>
+				<div class="pannel-body" id="update-history-body">
+					<table class="table table-striped">
+						<tbody id="update_history_table">
+							
+						</tbody>
+					</table>
+				</div>
+			</div>
+  		</div>
+	</div>
+</div>
+<script>
+	var update_logs;
+	var update_log_display;
+	var new_updates;
+
+	function get_update_history(){
+		$.getJSON("<%= admin_site_get_update_history_path %>",function(data){
+			update_logs = data;
+			update_log_display = 0;
+			$("#num_updates").text(update_logs.length);
+			$("#update_history_table").html("");
+			
+			show_update_history();
+		});
+	}
+	
+	function show_update_history(){
+		for(var i = 0; i<30; i++){
+			var log = update_logs[update_log_display];
+			update_log_display++;
+			$("#update_history_table").append("<tr><td width=30%'>"+log[0]+"</td><td>"+log[1]+"</td></tr>");
+			if((update_log_display+1)>update_logs.length) break;
+		}
+	}
+
+	function check_updates(){
+		$("#progress_msg").html("<strong><%= t("update_manager_.checking_update") %></strong>");
+		$("#new_update_container").fadeOut(function(){
+			$("#update_done").fadeOut(function(){
+				$("#update_status").fadeIn(function(){
+					$("#update_progress").fadeIn();
+				});
+			});
+		});
+		
+		$.getJSON("<%= admin_site_check_updates_path %>",function(data){
+			new_updates = data;
+			show_new_updates();
+		});
+	}
+
+	function show_new_updates(){
+		if(new_updates.length){
+			$("#num_new_updates").text(new_updates.length);
+			$.each(new_updates,function(){
+				$("#new_update_table").append("<tr><td>"+$(this)[0]+"</td><td>"+$(this)[1]+"</td></tr>");
+			});
+			$("#update_status").fadeOut(function(){$("#new_update_container").fadeIn();});
+		}else{
+			$("#update_progress").fadeOut(function(){$("#update_done").fadeIn();});
+		}
+	}
+
+	$(document).ready(function(){
+		check_updates();
+		get_update_history();
+
+		$("#chech_update_btn").click(check_updates);
+
+		$("#update_btn").click(function(){
+			$("#progress_msg").html("<strong><%= t("update_manager_.updating_orbit") %></strong>");
+			$("#new_update_container").fadeOut(function(){
+				$("#update_status").fadeIn();
+			});
+			$.get("<%= admin_site_update_orbit_path %>",function(result){
+				if(result=="failed"){
+					$("#chech_update_btn").hide();
+					$("#update_progress").fadeOut(function(){$("#update_failed").fadeIn();});
+				}else{
+					$("#progress_msg").html("<strong><%= t("update_manager_.restart_server") %></strong>");
+					$.get("<%= admin_site_restart_server_path %>",function(result){
+						$("#update_progress").fadeOut(function(){$("#update_done").fadeIn();});
+						$("#update_status").fadeIn();
+						get_update_history();
+					});
+				}
+			});
+		});
+
+		$("#update-history-body").scroll(function () {
+			if((update_log_display+1)<update_logs.length){
+				var scroll_pos =  ($("#update-history-body").scrollTop()+$("#update-history-body").height())/$("#update_history_table").height()*100;
+				if(scroll_pos>90){
+					show_update_history();
+				}
+			}
+		});
+	});
+</script>

app/views/devise/sessions/new.html.erb

@@ -1,62 +1,59 @@
-
+    <section id="main-wrap">
-
       <div class="sign-in have-other-sign-in">
-
+<!--         <p class="alert alert-error in fade">You need to sign in.</p>
-		<% flash.each do |key, msg| %>
+ -->    
-			<%= content_tag :p, msg, :class => [key, "alert alert-error"] %>
+        <% flash.each do |key, msg| %>
+		    <%= content_tag :p, msg, :class => [key, "alert alert-error in fade"] %>
 		<% end %>
 
-        
+ 		<div class="form">
-        <div class="form">
+          <h3 class="login-logo">Log In to Orbit</h3>
-          <h3 class="login-logo"><%= t(:login) %></h3>
+          <div>
-          <div class="other-sign-in">
+            <input name="utf8" type="hidden" value="" />
-            <% @request_hosts = request.host_with_port.split(".") %>
+            <input name="authenticity_token" type="hidden" value="" />
-              <a class="btn btn-primary" type="submit" href="https://adfs.ntu.edu.tw/adfs/ls/?wa=wsignin1.0&wtrealm=https://cophlogin.ntu.edu.tw/saml_login&wctx=<%= @request_hosts[0] %>">使用計中帳號登入</a>
-            <p>or</p>
           </div>
+<!--           <div class="other-sign-in">
+            <a class="btn btn-primary" type="submit">Other Sign In</a>
+            <p>or</p>
+          </div> -->
           <div class="form-block">
             <div class="form-list clearfix">
-              <%= form_for resource, :as => resource_name, :url => session_path(resource_name), :html => {:class => 'content'} do |f| %>
+              <form class="content" accept-charset="UTF-8" action="/users/sign_in" method="post">
+               <%= form_for resource, :as => resource_name, :url => session_path(resource_name), :html => {:class => 'content'} do |f| %>
+
                 <div class="control-group clear">
                   <label for="user_email">
                     <i class="icon-user"></i>
                   </label>
-				  <%= f.text_field :user_id, :placeholder => t("users.user_id") %>
+                 	<%= f.text_field :user_id, :placeholder => t("users.user_id"), :id=>"user_email" %>
                 </div>
                 <div class="control-group clear">
                   <label for="user_password">
                     <i class="icon-lock"></i>
                   </label>
-                  <%= f.password_field :password, :placeholder => t(:dots) %>
+                  <%= f.password_field :password, :placeholder => t(:dots), :id=>"user_password" %>
                 </div>
-                <!-- <label class="checkbox">
+                <br/>
-                  <input type="checkbox" value="">
+                <label class="checkbox">
-                  <small>Remember me</small>
+                <% if devise_mapping.rememberable? -%>
-                </label> -->
+                  <%= f.check_box :remember_me %> <small><%= f.label :remember_me %></small>
+                <% end -%>
+                </label>
+                
                 <%= content_tag :button, t(:login), :type => :submit, :class => 'btn btn-primary' %>
-              <% end %>
+              </form>
               
-              <!-- <form class="content" accept-charset="UTF-8" action="/users/sign_in" method="post">
-                <div class="control-group clear">
-                  <label for="user_email">
-                    <i class="icon-user"></i>
-                  </label>
-                  <input type="text" id="user_id" name="user[id]" placeholder="帳號" />
-                </div>
-                <div class="control-group clear">
-                  <label for="user_password">
-                    <i class="icons-mail"></i>
-                  </label>
-                  <input type="text" id="user_email" name="user[email]" placeholder="電子郵件" />
-                </div>
-                <button class="btn btn-primary" type="submit">Submit</button>
-              </form> -->
             </div>
-            <!-- <div class="switchboard"><span>Forgot Password ?</span> <i class="icons-arrow-left-2"></i></div> -->
           </div>
-          <!-- <div class="register">
+          <div class="pull-right">
+            <%= link_to content_tag(:small, t(:forgot_password)), new_user_password_path %>
+          </div>
+          <br/>
+         <!--  <div class="register">
             <button class="btn btn-inverse" type="submit">Register</button>
           </div> -->
+        <% end %>
 
         </div>
       </div>
+    </section>

app/views/layouts/_right_menu.html.erb

@@ -56,11 +56,6 @@
           </div>
           <div class="modal-body">
             <%= form_for :user, url: user_session_path, html: {class: 'container'} do |f| %>
-              <div class="other-sign-in">
-                <% @request_hosts = request.host_with_port.split(".") %>
-                <a class="btn btn-primary" type="submit" href="https://adfs.ntu.edu.tw/adfs/ls/?wa=wsignin1.0&wtrealm=https://cophlogin.ntu.edu.tw/saml_login&wctx=<%= @request_hosts[0] %>">使用計中帳號登入</a>
-                <p>or</p>
-              </div>
               <div class="input-prepend">
                 <span class="add-on">
                   <i class="icon-user"></i>

config/list.yml

@@ -80,27 +80,3 @@ default_widget_style:
   - style3
   - style4
   - style5
-
-sites:
-  coph:
-    url: coph.ntu.edu.tw
-    key: "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzpqn0cXyC98jZ2hk4F8W\n0K7qgNSqHvH8unxCbgEuxWvkUA1ld2NMfsj9fTl9f2UlhPtwiaZchVAFSDjpYeQD\nH3A5XtlonUXfTD5XdnKBvk6WtKl7cFuyhIazcxp3MA8/cmSuGbXIjyZLMiUkElZg\n5CZ/1n+yhGFjXQz/d4d8W7sN7AjmhHjTi5vgJF4fkaSr1g6TwWJfLhhzzYsva2z/\nDRkQl3OpUEbSQP1X9/RmManDrYpn7Wrqi9Joqu7rPk0Grki8lCo5T/kaEsQ0wKte\nt7N9QRCBM/f2tOYoH+elitnOJq9zAtAtGaw80xso/GkjMHhcmPnI2YZ90yy1Fvau\nOwIDAQAB\n-----END PUBLIC KEY-----\n"
-  dph:
-    url: dph.ntu.edu.tw
-    key: "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0wNXuqsY6iHiPORSA+M1\nQzzoepGnJGSP92VszqTp7M+rDf6R98J+jFzG4YkMMUaFids4sXTwVp3zfgmhfl5k\nLJiufcXk9U5HYQ5b88kW+8BOAj9GBMQ7tDTw5hkFGL98anAAxZgW/FVovlAr3jv7\nei5/MBRPwctuOYhR4s9Mh47tbCnMFOswyjErEp5OfkbTo+qar44f2m4d1RVPTM1k\n0RCU65+0syw+hYgg01yRuWkSNzHie5FOVD7CujWeTD2CVZFh72kaGLp99ExOtrM3\n7AzS8duVmty/f7RG8DiJdB4a/mcHjcanlBLcowoo3FaaA1Arg1DkdjH0zwB2UVMs\nEQIDAQAB\n-----END PUBLIC KEY-----\n"
-  ntuhpm:
-    url: ntuhpm.ntu.edu.tw
-    key: "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq/kK75YjD3Yvv9wacE0+\ncImWxnVcVFXhtG5T8Hm0tkit3OroJ2BobWHe23QBThnzXCF4+S1XosYw60XPNAKk\nrmImHry9lG2iz/UfXwj49AfMHOw0tpOcf2UHiVAZUKb9zZRAEDL6WbhVQ5C/9jZ1\nKWtrcArRxck1tivgT5tUaKrCHrnj9/jo6eAHiKg0CsEfS0hlXQFfo7/2kBZc0oBq\ntuVyoDADaY1PoyvqzHxZC3eyUTjURVa0+Lkpw9d9jbSUNnf2XfEi51Rt79PlrtNj\naxsQ2UKhz0xYouTXQPt9Mc+vxow9bvd1CPr52ywX37sjRlmOQ4gpcxEPa21bRevW\nwwIDAQAB\n-----END PUBLIC KEY-----\n"
-  epm:
-    url: epm.ntu.edu.tw
-    key: "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0pl5F02WcZC+YLDuowl7\nE2VbgXS/V4R1/pRryGCkuZFBQ5DRw6055dhDp8lribEUYRTk8Y8EUIM+8A1A80Y1\nJqaAhF/ZUE7Io1boqdf0XeRgAmQF4bCphLCSVTz6v2AeAQaS7btUqrLr3t7Ldbso\nbnXQ8qKxsBGTtuvIID5zx2JyRuO1U740KEbt7l5Nnb6zSYYHayOHzsS4FS4HmCa/\nK+1jQcnpis1k7tp/s3tif/9a8t4IjwuxyKI6PEUoyGTZYG9hyrTvoTGobR9g+r6s\n8IluoAauG6IlSjl92sL6D6p+BYS3VsFn+2mznrjgKl9TVt8HfQSgECgfyUAS/OgC\n3wIDAQAB\n-----END PUBLIC KEY-----\n"
-  ieh:
-    url: ieh.ntu.edu.tw
-    key: "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvtmUdzHwAE+b1Bt2HGSr\ny/o8rA4fWIpc9zTn4jXkAoH7yQMO0WsneMn1KxE0eUmhHiGaZGQLGrixxQ9ZG9DP\n1fe41IGRKZRt7ep5rpXQFCXxEwBV+CAmdVpwGM0ji3l9tL4CwKkX+ObmUiorQZLG\nAxQHAWpFdM7foiTNw37vqTm8TDIcCu0HXSV+Mb6IydbpQbvYTHdHN2wlgfIa41qU\nWhYqHckKimvApJCsIDHd8ZF32EuOaalfGFvYB7de7Z1Tn9YLvIqgPgIj6o89q4UK\n5EAr1E6kKX9jk3ru5r0u/EEL0zADdbJAWuops4a+XRdPaZMXqngdlEbcxwKTryU+\ncwIDAQAB\n-----END PUBLIC KEY-----\n"
-  omih:
-    url: omih.ntu.edu.tw
-    key: "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwgyfe4FFBnE6If3TH/L7\nVm43BYEunoK6ItBC9VccUGrhT3ZD5gAdnNC5OkR8HIUEBxtzvD57CsHaaGKrxxAf\nd8XJh5nXZCg5RaoQVaBNjFBmOPm4jZAWPUFPuGRow8Uzs/LzA5HNew196g+qWayB\nglTyX2TJUAADyx6Peq4ZNqEBBB68n4DyugXzfvlk0yXsrLDtbM44bzOhRuosKa7Y\nung+IonA5lqr2mJDrTMDOupIAgW6/4xO7ww2e/pMOVtfoVSw+5YfXFBGCbRjGKwT\nZ4b7whRBBuRd1lgWhQrzOikb+/NtEVQWLpWPpSeTFx5sIUyb5PmQTXtRxZX1xNcS\neQIDAQAB\n-----END PUBLIC KEY-----\n"
-  mph:
-    url: mph.ntu.edu.tw
-    key: "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7rlich0iWAWKUhT7pHji\nOHeEURjnykiX5ElkBD7twy5UyagiD9wVeBOi7mElaJjcR84WfoZVTJVbI08/a5KY\neFURiOy4CigwIFyiDKhwMH5XETuQD96JFqClZGgfxaZAtt9IEpqE3HbqGpPh/0Oc\noLP6Pez8icDYqShZrrZioQZ9XshlZJ6Xt2iStMHNucKHrptMylvtHo6sp/Uy00jC\nubbtH7cvAbQf/Ee/jbGWWMyVwjko1h8u1pMtQlXIC6R0UP6yfCAg7c/0P9eb33OE\n2B6t9i/7kdqTysyKvf6jdDeJeyDYxZVFFXEETu5TzffdhrEK67KAot3J3hi0Qwq7\nvQIDAQAB\n-----END PUBLIC KEY-----\n"
-

config/locales/en.yml

@@ -353,8 +353,7 @@ en:
     brief_intro : "Brief Intro."
     complete_list : "Complete List"
     frontend_page : "Frontend Page"
-    phone_number: "Phone Number"
+  phone_number: "Phone Number"
-    sync_data: "Synchronize"
   picture: Picture
   placeholder: Field Hint
   plugins: Plugins
@@ -533,6 +532,18 @@ en:
     success_: Successfully updated
   update_: Update
   update_at: Update at
+  update_manager: Update Manager
+  update_manager_:
+    available_updates: Available Updates 
+    check_update: Check Update
+    checking_update: Checking for Updates
+    system_update: Install Updates
+    update_done: System is update to date
+    update_faild: Update failed. Merge is require in the update. Please login to server and update manually.
+    update_history: Update Histroy
+    update_status: Update Status
+    updating_orbit: Updating Orbit. Please wait.
+    restart_server: Restarting Server. Please wait.
   upload: Upload
   url: URL
   use_status: Use Statue

config/locales/zh_tw.yml

@@ -356,8 +356,7 @@ zh_tw:
     brief_intro : "摘要"
     complete_list : "完整列表"
     frontend_page : "前台呈現"
-    phone_number: "電話"
+  phone_number: "電話"
-    sync_data: "同步資料"
   picture: 圖片
   placeholder: 欄位提示文字
   plugins: 學術資訊
@@ -536,6 +535,18 @@ zh_tw:
     success_: 使用者已更新成功
   update_: 更新
   update_at: 最後更新時間
+  update_manager: 更新管理員
+  update_manager_:
+    available_updates: 有可用更新
+    check_update: 檢查更新
+    checking_update: 檢查更新中
+    system_update: 安裝更新
+    update_done: 系統已是最新版本
+    update_faild: 更新失敗. 更新需要合併程式碼. 請登入伺服器手動進行更新.
+    update_history: 更新紀錄
+    update_status: 更新狀態
+    updating_orbit: 安裝更新中,請稍候.
+    restart_server: 重啟伺服器中,請稍候.
   upload: 上傳
   url: 網址
   use_status: 使用狀態

config/mongoid.yml

@@ -8,13 +8,13 @@ defaults: &defaults
 
 development:
   <<: *defaults
-  database: ntu_mb_orbit_2_new
+  database: orbit_site_new
 
 
 
 test:
   <<: *defaults
-  database: ntu_mb_orbit_2_new
+  database: orbit_site_new
 
 # set these environment variables on your prod server
 production:
@@ -24,4 +24,4 @@ production:
   # password: <%= ENV['MONGOID_PASSWORD'] %>
   # database: <%= ENV['MONGOID_DATABASE'] %>
   <<: *defaults
-  database: ntu_mb_orbit_2_new
+  database: orbit_site_new

config/routes.rb

@@ -8,13 +8,6 @@ Orbit::Application.routes.draw do
     match "/users_passwd" => "desktop/registrations#update", :as => :users_passwd, :via => :put
   end
 
-  devise_scope :user do
-    get 'user_login' => 'sessions#create'
-    match 'user_logout' => 'sessions#destroy'
-  end
-
-  match "saml_login" => 'saml_logins#index'
-
   mount Resque::Server, :at => "/admin/resque"
   mount Rack::GridFS::Endpoint.new(:db => Mongoid.database,:lookup=>:path), :at => "gridfs"
 
@@ -219,21 +212,13 @@ Orbit::Application.routes.draw do
       get 'change_design'
       get 'reset_default_locale'
       get 'preference'
+      get 'update_manager'
+      get 'get_update_history'
+      get 'check_updates'
+      get 'update_orbit'
+      get 'restart_server'
     end
 
-    get "import_data/get_teacher_data"
-    get "import_data/get_book_data"
-    get "import_data/get_conference_data"
-    get "import_data/get_journal_paper_data"
-    get "import_data/get_announcement_data"
-    get "import_data/get_page_data"
-    get "import_data/sync_book_data"
-    get "import_data/sync_journal_paper_data"
-    get "import_data/sync_conference_data"
-    get "import_data/sync_book_data_auto"
-    get "import_data/sync_journal_paper_data_auto"
-    get "import_data/sync_conference_data_auto"
-
     resources :tags do
       collection do
         post 'add_to_default'

config/schedule.rb

@@ -1,20 +0,0 @@
-# Use this file to easily define all of your cron jobs.
-#
-# It's helpful, but not entirely necessary to understand cron before proceeding.
-# http://en.wikipedia.org/wiki/Cron
-
-# Example:
-#
-# set :output, "/path/to/my/cron_log.log"
-#
- every 1.day, :at => '11:00 pm' do
-#   command "/usr/bin/some_great_command"
-#   runner "MyModel.some_method"
-   	rake "rake synchronize:data"
- end
-#
-# every 4.days do
-#   runner "AnotherModel.prune_old_records"
-# end
-
-# Learn more: http://github.com/javan/whenever

lib/tasks/import_teachers.rake

@@ -1,58 +0,0 @@
-#encoding: utf-8
-namespace :teacher do
-	task :import, [:department,:category] => :environment do |t, args|
-		department = "#{args.department}"
-		teacher_role = Role.where(:key=>"teacher").first
-		role_fulltime = RoleStatus.where(:key=>"1.fulltime").first
-		role_adjunct = RoleStatus.where(:key=>"2.adjunct").first
-		role_category = RoleCategory.where(:key=>"#{args.category}").first
-		@teacher = []
-		CSV.foreach("#{Rails.root}/#{department}.csv") do |row|
-			@teacher.push(row)
-		end
-		@teacher.each do |teacher|
-			sex = "unknown"
-			if teacher[2]=="男"
-				sex = "male"
-			elsif teacher[2]=="女"
-				sex = "female"
-			end
-
-			role_status = ""
-			if teacher[3].include? "兼任"
-				role_status = role_adjunct
-			else
-				role_status = role_fulltime
-			end
-					
-			if teacher[1].blank?
-				teacher[1] = " "
-			end
-
-			user_data = {
-				:user_id => teacher[5].split("@")[0],
-				:password => "password",
-				:first_name_translations =>{"zh_tw"=>teacher[0].split(teacher[0][0])[1],"en"=>teacher[1].split(" ")[1]},
-				:last_name_translations => {"zh_tw"=>teacher[0][0],"en"=>teacher[1].split(" ")[0]},
-				:roles => [teacher_role],
-				:role_statuses => [role_status],
-				:role_categorys => [role_category],
-				:office_tel => teacher[4],
-				:email => teacher[5],
-				:confirmation_token => nil,
-				:confirmed_at => Time.now,
-				:approved => true,
-				:sex => sex
-			}
-
-			if User.where(:email=>teacher[5]).count == 0
-				user = User.new(user_data)
-				user.save
-			else
-				user = User.where(:email=>teacher[5]).first
-				user.update_attributes(user_data)
-
-			end
-		end
-	end
-end

lib/tasks/synchronize.rake

@@ -1,12 +0,0 @@
-# encoding: utf-8 
-namespace :synchronize do
- desc "synchronize tasks"
- task :data => :environment do
-   	p Admin::ImportDataController.new.sync_book_data_auto
-   	puts "Book Data Synchronization Complete"
-   	p Admin::ImportDataController.new.sync_journal_paper_data_auto
-   	puts "Journal Paper Data Synchronization Complete"
-   	p Admin::ImportDataController.new.sync_conference_data_auto
-   	puts "Conference Data Synchronization Complete"
- end
-end

vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/index.html.erb

@@ -80,7 +80,7 @@
 								<div class="o-members-pic"><%= show_avatar(member) %></div>
 								<ul class="o-members-info">
 									<li><b class="o-members-label"><%= t("users.name")%></b><%= link_to member.name, panel_member_front_end_member_list_path(member.id), {:class => "o-members-link"} %></li>
-									<% @job_title = @member_lists.get_member_list_attribute_value(member.id,@job_title_field.id).get_value_by_locale(I18n.locale) rescue ""
+									<% @job_title = @member_lists.get_member_list_attribute_value(member.id,@job_title_field.id).get_value_by_locale(I18n.locale)
 									   if @job_title != 'NoData' and !@job_title.blank?
 									%>
 									<li><b class="o-members-label"><%= @job_title_field.title %></b><%= @job_title %></li>

vendor/built_in_modules/personal_book/app/assets/javascripts/personal_book/desktop/personal_books.js

@@ -93,16 +93,6 @@ 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){
     if(data.success){
       o.notify(data.msg,"success");

vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/desktop/personal_books_controller.rb

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

vendor/built_in_modules/personal_book/app/models/writing_book.rb

@@ -84,11 +84,18 @@ class WritingBook
   
   def create_link
     title = []
-    # title = ["#{self.extracted_chapters}"] if self.extracted_chapters.present?
+    title << self.authors if self.authors.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.publisher if self.publisher.present?
-    title << self.pages if self.pages.present?
+    title << self.isbn if self.isbn.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.join(', ') 
   end

vendor/built_in_modules/personal_book/app/views/panel/personal_book/desktop/personal_books/index.html.erb

@@ -57,9 +57,6 @@
       </ul>
     </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="sdm_t hh1"><span class="icon-question-sign"></span></div>
   </div>

vendor/built_in_modules/personal_book/app/views/panel/personal_book/plugin/_profile.html.erb

@@ -75,9 +75,8 @@
 <% if is_admin? %>
 <div class="bottomnav clearfix">
 	<div class="action pull-right">
-        <%= 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('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.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' %>
-        <%= 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 class="pagination pagination-centered">
 		<%= paginate @writing_books, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>

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

@@ -42,10 +42,7 @@ 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');

vendor/built_in_modules/personal_conference/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

vendor/built_in_modules/personal_conference/app/models/writing_conference.rb

@@ -84,9 +84,17 @@ class WritingConference
   end
 
   def create_link
-    title = ["#{self.paper_title}"]
+    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(', ')})"

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

@@ -58,10 +58,6 @@
       </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>

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

@@ -75,9 +75,8 @@
 <% if is_admin? %>
 <div class="bottomnav clearfix">
 	<div class="action pull-right">
-        <%= 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('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('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} %>

vendor/built_in_modules/personal_journal/app/assets/javascripts/personal_journal/desktop/journal_pages.js

@@ -33,7 +33,6 @@ orbitDesktop.prototype.initializeJournalPapers = function(target,url,cache){ //
   }
   this.initializeJournalPapers.paperDelete = function(data,dom){
     var parent = dom.parent().parent().parent();
-    // console.log(parent);    
     if(data.success){
       parent.hide("slide",function(){parent.remove();});
       o.notify(data.msg,"success");
@@ -43,10 +42,6 @@ orbitDesktop.prototype.initializeJournalPapers = function(target,url,cache){ //
   this.initializeJournalPapers.cancelpaper = function(){
     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(){
     $('#add_plugin_file a.add').click(function(){

vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_pages_controller.rb

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

vendor/built_in_modules/personal_journal/app/helpers/panel/personal_journal/desktop/journal_pages_helper.rb

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

vendor/built_in_modules/personal_journal/app/models/writing_journal.rb

@@ -90,12 +90,20 @@ class WritingJournal
   end
 
   def create_link
-    title = ["#{self.paper_title}"]
+    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.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 << "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(', ') 
   end
 

vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb

@@ -58,9 +58,6 @@
       </ul>
     </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="sdm_t hh1"><span class="icon-question-sign"></span></div>
   </div>

vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/plugin/_profile.html.erb

@@ -80,9 +80,8 @@
 <% if is_admin? %>
 <div class="bottomnav clearfix">
 	<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 class="pagination pagination-centered">
 		<%= paginate @writing_journals, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>