Import Data, Sync Data

Gemfile

@@ -11,14 +11,13 @@ gem "net-ldap", "~> 0.3.1"
 gem 'devise', '1.5.3'
 gem 'exception_notification' # Send error trace
 gem 'execjs'
-gem 'jquery-rails', '3.0.4'
-gem 'jquery-ui-rails', "4.0.5"
+gem 'jquery-rails', '2.1.4'
+gem 'jquery-ui-rails'
 gem "select2-rails", '3.3.1'
 gem 'kaminari'
 gem 'time_difference'
 gem "acts_as_unvlogable"
 gem 'youtube_it'
-gem 'gotcha'
 
 # gem "memcached", "~> 1.4.3"
 # gem "memcache-client"
@@ -98,8 +97,6 @@ group :test, :development do
   gem "watchr"
   gem "spork"
   gem "capybara"
-  #gem 'rack-mini-profiler'
-  gem "better_errors"
   # gem 'yard'
   # gem "bluecloth"
 end

app/assets/javascripts/desktop/desktop.js

@@ -6,7 +6,7 @@
 //
 //= require jquery
 //= require jquery_ujs
-//= require jquery.ui.all
+//= require jquery-ui
 //= require desktop/jquery.form
 //= require desktop/jquery.tinyscrollbar
 //= require desktop/jquery.miniColors.min

app/assets/javascripts/desktop/orbitdesktop.js

@@ -168,7 +168,7 @@ var orbitDesktop = function(dom){
           o.loadIconCache();
           var custom_load = window.location.hash;
           if(!custom_load){
-            $(o.contentHolder).empty().load("/desktop/desktop_container",function(){
+            $(o.contentHolder).empty().load("/desktop/desktop",function(){
               o.desktopData["d_desktop"] = "";
               o.initializeDesktop("d_desktop","",false);
             })
@@ -605,11 +605,10 @@ var orbitDesktop = function(dom){
 
   this.menu_item = function(dom,customload,submenuitem){
     if(!customload)customload=false;
-    var target = dom.attr("id"),
-        url = dom.attr("href"),
-        submenu_pass = ( dom.attr("sub-menu") == "false" ? false : true);
+    var target = dom.attr("id");
+    var url = dom.attr("href");
     if(!url)return false;
-  
+   
     o.data_method = dom.attr("callback-method");
     if(o.currenthtml!=target){
       if(o.desktopData[o.currentface] == "undefined"){
@@ -630,37 +629,33 @@ var orbitDesktop = function(dom){
                 window.o[o.data_method](target,url,cache);
               }
             }
-            if( submenu_pass ){
-              try {
-                if(!customload){
-                  o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[load=true]"),data);
+            try {
+              if(!customload){
+                o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[load=true]"),data);
+              } else {
+                if(submenuitem){
+                  o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[custom-load="+submenuitem+"]"));
                 } else {
-                  if(submenuitem){
-                    o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[custom-load="+submenuitem+"]"));
-                  } else {
-                    o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[load=true]"),data);
-                  }
+                  o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[load=true]"),data);
                 }
-              } catch(EX){}
-            }
+              }
+            } catch(EX){}
             header_ani();
          });
         }else{
           $(o.contentHolder).html(o.desktopData[o.currentface]);
-          if( submenu_pass ){
-            try{
-              if(!customload){
-                o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[load=true]"),o.desktopData[o.currentface]);
-              }else{
-                if(submenuitem)
-                    o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[custom-load="+submenuitem+"]"),o.desktopData[o.currentface]);
-                  else
-                    o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[load=true]"),o.desktopData[o.currentface]);
-                }
-              }catch(EX){}
-            }
+          try{
+            if(!customload){
+              o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[load=true]"),o.desktopData[o.currentface]);
+            }else{
+              if(submenuitem)
+                  o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[custom-load="+submenuitem+"]"),o.desktopData[o.currentface]);
+                else
+                  o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[load=true]"),o.desktopData[o.currentface]);
+              }
+            }catch(EX){}
 
-          // cache = (o.lastlink == "/desktop/app_manager" ? false : true);
+          cache = (o.lastlink == "/desktop/app_manager" ? false : true);
           if(typeof o.data_method != "undefined"){
              if(o.data_method != ""){
               window.o[o.data_method](target,url,cache);
@@ -1100,7 +1095,7 @@ var orbitDesktop = function(dom){
               data : options,
               success : function(data){
                 if(data.success == "true"){
-                  if(dom.is(":checked")){ 
+                  if(dom.is(":checked")){ console.log("true");
                     elementSettingsData[$e.data("id")].sections.push({"id" : dom.data("section"),"name":sectionDetails.name});
                     o.notify("Added to " + sectionDetails.name,"success");
                   }else{
@@ -1124,16 +1119,20 @@ var orbitDesktop = function(dom){
       var info_open = function(){
         if($appinfo.is(":hidden")){
           $('.overview').stop().animate({'width': '+=480'},0 , function(){
-            // $('.tinycanvas').tinyscrollbar_update('relative');
+            $('.tinycanvas').tinyscrollbar_update();
           });
           $appinfo
             .css({
+              'display': 'block',
               'margin-left': -480
-            }).fadeIn(200)
+            })
+            .delay(300)
             .animate({
               'margin-left': 0
             }, 500, 'easeInOutQuint');
-        } 
+        } else {
+          $('.tinycanvas').tinyscrollbar_update();
+        }
       }
 
       var info_close = function(){
@@ -1144,11 +1143,13 @@ var orbitDesktop = function(dom){
               'margin-left': -480
             },500 , 'easeInOutQuint', function(){
               $('.overview').animate({'width': '-=480'}, 0, function(){
-                // $('.tinycanvas').tinyscrollbar_update();
+                $('.tinycanvas').tinyscrollbar_update();
               });
-              $(this).fadeOut(300).attr("style","");
+              $(this).attr("style","");
             });
-        } 
+        } else {
+          $('.tinycanvas').tinyscrollbar_update();
+        }
       }
       $(window).on('keydown', function(){
         if($('#searchbox').val() == 'Search'){

app/assets/javascripts/kernel.js

@@ -1,58 +1,30 @@
-var banners = [];
-var banner_index = 0;
-
 $(document).ready(function() {
+	
 	$.each($(".dymanic_load"),function(){
-		if($(this).attr("path")==''){
-			$(this).html("App setting Failed");
-		}else{
-			// Check if this App is AD_Banner
-			if($(this).attr("path").indexOf("show_banner")>0){
-				ajax_load_proc($(this),$(this).attr("path"),"true"); 	
-			}else{
-				ajax_load_proc($(this),$(this).attr("path"),$(this).attr("path"));
+		if($(this).attr("path")==''){$(this).html("App setting Failed");} 
+		
+		if($(this).attr("path")!=''){
+				 ajax_load_proc($(this),$(this).attr("path"));
+				} 
 			}
-		}
-	});
-
+			);
 	$("#main_content").addClass("module");
-});
+	});
 
-function ajax_load_proc(wapper,url,isBanner){
+function ajax_load_proc(wapper,url){
 	$.get(encodeURI(url), {}, function(respText,textSta,XML){ 
-		if (textSta == 'success') {
-			if(isBanner=="true"){
-				wapper.html(respText);
-				var banner = banners[banner_index];
-				$(banner.banner_name+" > img").each(function(){
-					$(this).load(function(){ banner.image_loaded++; });
-				});
-				BannerCycle(banner_index);
-				banner_index++;
-			}else{
-				wapper.html(respText);
-			}
-		};
-		if(textSta == 'error')
-			wapper.html("Loading Failed<br/>  <a href='"+$(this).attr('path')+"'>Go See</a>");
+			if (textSta == 'success') {
+				wapper.html(respText);	
+			};
+			if(textSta == 'error')
+				wapper.html("Loading Failed<br/>  <a href='"+$(this).attr('path')+"'>Go See</a>");
 	});
 }
 
-function BannerCycle(banner_index){
-	var banner = banners[banner_index];
-	// Wait untill all images are loaded
-	if (banner.image_loaded==$(banner.banner_name+" img").length){
-    	$(banner.banner_name).cycle({
-			delay: -1000,
-			fx: banner.banner_fx,
-			timeout: banner.time_to_next,
-			pager: banner.banner_pager,
-			pagerAnchorBuilder: function(idx, slide) { return "<li><a href='#'></a></li>"; }
-		});
-	}else{
-		setTimeout("BannerCycle("+banner_index+")",500);
-	}
-}
+// Ad Banner FX code [start]
+function getTimeout() { 
+    return $(this).attr('time_to_next'); 
+} 
 
 $(document).ready(function() { 
 	$(document).on('click', '.slideshow img', function()

app/assets/javascripts/lib/items/items.js.erb

@@ -44,13 +44,7 @@ $(function(){
     startCollapsed: true,
     disableNesting: 'no-nest',
     update: function(event, ui) {
-      var position = null;
-      if($(ui.item).closest('ol').hasClass('item-groups')) {
-        position = $(ui.item).index() - 1;
-      } else {
-        position = $(ui.item).index();
-      };
-      $.post("<%= Rails.application.routes.url_helpers.admin_update_position_path %>", { id: ui.item.attr('id'), parent_id: (ui.item.parent().closest('li').attr('id') || ui.item.parent().closest('ol').attr('id')), position: position } );
+      $.post("<%= Rails.application.routes.url_helpers.admin_update_position_path %>", { id: ui.item.attr('id'), parent_id: (ui.item.parent().closest('li').attr('id') || ui.item.parent().closest('ol').attr('id')), position: ui.item.index() } );
     }
   });
   $(".sortable").delegate(".brand, .delete", clickEvent, function(e){

app/assets/javascripts/lib/jquery.pageslide.js

@@ -55,13 +55,6 @@
             } else {
                 $viewPage.find('.content').load(url, function(){
                     $viewPage.clone(true).appendTo( $pageslide.empty() ).show();
-                    if($('#filter-default-tag').length) {
-                        $('#filter-default-tag').fastLiveFilter('.add-default-tags-list', '.filter-item', '.tag');
-                        addTagsTab();
-                        $('#view-page .card').cardCheck({
-                            item: $('#view-page input[type="checkbox"]'),
-                        });
-                    };
                     if(callback)callback.call(this,$viewPage,element);
                 });
             }

app/assets/javascripts/page_layout.js

@@ -4,4 +4,4 @@
 //= require basic/bootstrap
 //= require kernel
 //= require lib/jquery.preload-min.js
-//= require lib/jquery.cycle.all.js
+//= require lib/jquery.cycle.all.latest.js

app/controllers/admin/ad_banners_controller.rb

@@ -40,7 +40,6 @@ class Admin::AdBannersController < OrbitBackendController
   
   def edit
     @ad_banner = AdBanner.find(params[:id])
-    render layout: false
   end
   
   def update

app/controllers/admin/authorizations_controller.rb

@@ -34,30 +34,38 @@ class Admin::AuthorizationsController < OrbitBackendController
   end
 
   def add_roles
-    roles = Role.find(params[:role_ids]) rescue nil
-    unless roles.nil?
+    roles = Role.find(params[:role_ids]) rescue []
+    users = []
+    roles.each do |role|
+      users += role.users.all.entries
+    end
+    unless roles.blank?
       authorization = get_or_create_authorization
-      add_roles_to_auth(authorization, roles)
+      add_roles_to_auth(authorization, roles) unless @error
     end
     @users = authorization.authorized_users
     render 'admin/authorizations/reload_users'
   end
 
   def add_sub_roles
-    sub_roles = SubRole.find(params[:sub_role_ids]) rescue nil
-    unless sub_roles.nil?
+    sub_roles = SubRole.find(params[:sub_role_ids]) rescue []
+    users = []
+    sub_roles.each do |sub_role|
+      users += sub_role.users.all.entries
+    end
+    unless sub_roles.blank?
       authorization = get_or_create_authorization
-      add_sub_roles_to_auth(authorization, sub_roles)
+      add_sub_roles_to_auth(authorization, sub_roles) unless @error
     end
     @users = authorization.authorized_users
     render 'admin/authorizations/reload_users'
   end
 
   def add_users
-    users = User.find(params[:user_ids]) rescue nil
-    unless users.nil?
+    users = User.find(params[:user_ids]) rescue []
+    unless users.blank?
       authorization = get_or_create_authorization
-      add_users_to_auth(authorization, users)
+      add_users_to_auth(authorization, users) unless @error
     end
     @users = authorization.authorized_users
     render 'admin/authorizations/reload_users'
@@ -112,6 +120,10 @@ class Admin::AuthorizationsController < OrbitBackendController
   
   protected
 
+  def add_managers_to_auth(users)
+    @module_app.add_managers(users)
+  end
+
   def add_roles_to_auth(authorization, roles)
     authorization.add_roles(roles)
   end
@@ -139,7 +151,7 @@ class Admin::AuthorizationsController < OrbitBackendController
         @error = t(:no_data)
       end
     when nil
-      @module_app.auth_manager || @module_app.create_auth_manager(module_app_id: @module_app.id, title: @module_app.key)
+      @module_app.auth_manager || @module_app.create_auth_manager(module_app_id: @module_app.id, title: "#{@type}_#{@module_app.key}")
     else
       auth = @object.get_authorization_by_title("#{@type}_#{@module_app.key}")
       unless auth
@@ -150,6 +162,10 @@ class Admin::AuthorizationsController < OrbitBackendController
     end
   end
 
+  def remove_managers_from_auth(users)
+    @module_app.remove_manager(users)
+  end
+
   def remove_roles_form_auth(authorization, roles)
     authorization.remove_roles(roles)
   end

app/controllers/admin/import_data_controller.rb

@@ -0,0 +1,573 @@
+# encoding: utf-8
+
+require 'net/http'
+require 'open-uri'
+
+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.sid.present?
+      ntu_seq = hash.sid
+	  books_xml = Nokogiri::XML( \
+	  open("http://ann.cc.ntu.edu.tw/Achv/xmlBook.asp?Seq=#{ntu_seq}"))
+	  @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.sid.present?
+    ntu_seq = hash.sid
+    conference_xml = Nokogiri::XML( \
+    open("http://ann.cc.ntu.edu.tw/Achv/xmlPaper.asp?Seq=#{ntu_seq}&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.sid.present?
+    ntu_seq = hash.sid
+    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"))
+    @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?
+    ntu_seq = @user.sid
+    conference_xml = Nokogiri::XML( \
+    open("http://ann.cc.ntu.edu.tw/Achv/xmlPaper.asp?Seq=#{ntu_seq}&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
+        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?
+      ntu_seq = @user.sid
+      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"))
+      @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
+        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?
+    ntu_seq = @user.sid
+    books_xml = Nokogiri::XML( \
+    open("http://ann.cc.ntu.edu.tw/Achv/xmlBook.asp?Seq=#{ntu_seq}"))
+    @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
+        format.json { render json: {"success"=>true}.to_json}
+      
+      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
+  
+  def get_page_data        
+    f = File.open("/home/rwub/orbit-db/ntu_mb/pages/management_pages.xml")
+    page_xml = Nokogiri::XML(f)
+        #open("http://versatile.management.ntu.edu.tw/publication1/conference/#{ntuseq}.xml"))
+    @pages = page_xml.xpath("//management-page").map do |cp_node|
+                            {
+                              menu_title: (cp_node>"menu-title").text,
+                              content: (cp_node>"content").text
+                            }
+                          end
+
+     if @pages.present? 
+       @i=0
+       @pages.each do |b|
+        
+        get_variables_for_new
+        @page = Page.new
+        
+         @page.parent = "4f45f3b9e9d02c5db900005d"
+         @page.design = "50ac424983e75219d2000021"
+         @page.theme_id = "50ac424a83e75219d2000025"
+         @page.menu_enabled_for= ["en", "zh_tw", ""]
+         @page.enabled_for= ["en", "zh_tw", ""]
+         @page.is_published = false
+        if b[:menu_title].blank?
+         @page.title = 'No Title Present'
+         @i += 1 
+         @page.name = "#{@i}Page"
+        else 
+         @i += 1 
+         @page.title = b[:menu_title]
+         @page.name = "#{@i}Page"
+        end
+        if b[:content].blank?
+         @page.content = "No Content Present"
+        else 
+        @page.content = b[:content]
+        end
+        @page.save!
+      end
+       else
+     puts "No Page Data"
+       end
+  end
+
+
+  def get_variables_for_new
+    @designs = Design.all.entries
+    @themes = Design.first.themes
+    @module_apps = ModuleApp.for_frontend_select
+    @app_frontend_urls = nil
+    @categories = nil
+    @tags = nil
+    @page_frontend_data_counts = nil
+    @frontend_styles = nil
+    @selected={
+      :design => @designs.first,
+      :theme=> @themes.first,
+      :module_app=>nil,#@module_apps.first
+      :app_frontend_url=> nil, #@module_apps.first
+      :category=>nil,
+      :tag=>nil,
+      :page_frontend_data_count=>nil,
+      :frontend_style => nil
+    }
+  end
+
+
+end

app/controllers/admin/items_controller.rb

@@ -27,7 +27,7 @@ class Admin::ItemsController < OrbitBackendController
 
   def update_position
     item = Item.find(params[:id])
-    item.shift_to(params[:parent_id], params[:position].to_i)
+    item.shift_to(params[:parent_id], params[:position].to_i - 1)
     render :nothing => true, status: 200
   end
   

app/controllers/admin/sites_controller.rb

@@ -60,7 +60,7 @@ class Admin::SitesController < OrbitBackendController
   end
 
   def preference
-      
+    
   end
 
 

app/controllers/admin/users_new_interface_controller.rb

@@ -181,16 +181,6 @@ class Admin::UsersNewInterfaceController <  OrbitMemberController
   def edit_passwd
     # @disable_all_field = false
     @user = User.find(params[:users_new_interface_id])
-    if current_user.id == @user.id
-      redirect_to :action => :index
-    end
-  end
-
-  def edit_privilege
-    @user = User.find(params[:users_new_interface_id])
-    if current_user.id == @user.id
-      redirect_to :action => :index
-    end
   end
   
   def update
@@ -213,20 +203,6 @@ class Admin::UsersNewInterfaceController <  OrbitMemberController
         render :action => :edit_passwd, :notice => flash.now[:error]
       end
 
-    elsif params[:edit_type] == 'edit_privilege'
-
-      @checkuser = User.where(:user_id => params[:user][:user_id]).first
-
-      if @user.admin && current_user.id == @user.id
-        flash.now[:error] = t("users.admin_change_password")
-      end
-
-      if !flash.now[:error] && @user.update_attributes(params[:user])
-        redirect_to :action => :show
-      else
-        render :action => :edit_privilege, :notice => flash.now[:error]
-      end
-
     else
 
       @user.update_attributes(params[:user])
@@ -298,6 +274,8 @@ class Admin::UsersNewInterfaceController <  OrbitMemberController
         else
           user.move_below(user_at_position)
         end
+      elsif to_go > User.count
+        user.move_to_bottom
       end
     end
     render nothing: true, status: 200

app/controllers/application_controller.rb

@@ -140,21 +140,17 @@ class ApplicationController < ActionController::Base
     # update session if passed
     session[:locale] = params[:locale] if params[:locale]
     browser_locale = condition = nil
-    default_locale = condition = nil
-
     # check if locale is valid for non site pages
     if LIST[:forbidden_item_names].include?(env['PATH_INFO'].split('/')[1].to_s)
       condition = VALID_LOCALES.include?(session[:locale])
-    #check if the default locale is present or not
-    elsif @site.default_locale.present?
-      default_locale = @site.default_locale
-      condition = @site.in_use_locales.include?(default_locale)
-    elsif !@site.enable_language_detection
-      #check enable langauge detection
-      browser_locale = request.env['HTTP_ACCEPT_LANGUAGE'].scan(/^[a-z]{2}/).first rescue nil
-      condition = @site.in_use_locales.include?(browser_locale)
     elsif session[:locale]
       condition = @site.in_use_locales.include?(session[:locale])
+    elsif @site.default_locale.present?
+      default_locale = @site.default_locale
+      condition = @site.valid_locales.include?(default_locale)
+    else
+      browser_locale = request.env['HTTP_ACCEPT_LANGUAGE'].scan(/^[a-z]{2}/).first rescue nil
+      condition = @site.in_use_locales.include?(browser_locale)
     end
     session[:locale] = condition ? (default_locale || browser_locale || session[:locale]) : I18n.default_locale.to_s
     I18n.locale = session[:locale].to_sym

app/controllers/desktop_controller.rb

@@ -19,7 +19,7 @@ class DesktopController< ApplicationController
     render :layout => "compatibility" 
   end
   
-  def desktop_container
+  def desktop
     render :layout => false
   end
   
@@ -340,11 +340,10 @@ class DesktopController< ApplicationController
     render :json=>b.to_json
   end
  
-  protected
+  private
 
   def check_desktop_open
-    @site = Site.first
-    if @site.desktop_closed  #Need to be change
+    if Me.desktop_closed && current_user.nil?  #Need to be change
       redirect_to '/admin/dashboards'  
     end
   end

app/controllers/front_controller.rb

@@ -12,16 +12,7 @@ class FrontController < ApplicationController
   end
 
   def show_footer
-    @page = Page.find(:all, :conditions => {:name => /terms/i})
-    @name = @page.first.name 
-    @url = "/#{@name}"
-
-    if !@site.enable_terms_of_use
-      render :text => (@site.footer + "<a href='#{@url}'>Terms of Use</a>")
-    else
-      render :text => @site.footer
-    end
-
+    render :text => @site.footer
   end
 
   def show_menu
@@ -30,15 +21,7 @@ class FrontController < ApplicationController
   end
 
   def show_site_sub_menu
-    @page = Page.find(:all, :conditions => {:name => /sitemap/i})
-    @name = @page.first.name 
-    @url = "/#{@name}"
-    
-    if !@site.sitemap_menu_in_header
-      render :text => (@site.sub_menu + "<a href='#{@url}'>Sitemap</a>")
-    else
-      render :text => @site.sub_menu
-    end
+    render :text => @site.sub_menu
   end
 
   def show_sitemap
@@ -60,11 +43,6 @@ class FrontController < ApplicationController
     @tags = module_app.sorted_tags_for_cloud
   end
 
-  def show_terms_of_use
-    @site = Site.first rescue nil
-    @terms = @site.terms_of_use
-  end
-
   private
 
   def menu_level(page, current_page, current, menu)

app/controllers/mobile_controller.rb

@@ -43,7 +43,7 @@ class MobileController < ApplicationController
 
   def page
     @page_title = t('mobile.page')
-    @page_contexts = get_sorted_page_from_structure
+    @page_contexts = PageContext.where(:archived => false).page(params[:page_main]).per(15)
   end
 
   def page_content
@@ -57,12 +57,4 @@ class MobileController < ApplicationController
     @no_footer = true if request.path =~ /app/
   end
 
-  def get_sorted_page_from_structure
-    page_contexts = Item.structure_ordered_items.inject([]){ |pages, page|
-      pages << page.page_contexts.where(archived: false).limit(1)[0] if page.is_a?(Page) && !page.page_contexts.blank?
-      pages
-    }
-    Kaminari.paginate_array(page_contexts).page(params[:page]).per(15)
-  end
-
 end

app/controllers/pages_controller.rb

@@ -9,7 +9,7 @@ class PagesController < ApplicationController
 
     if @item
       delayed_impressionist(@item)
-      render_page
+      render_page 
     else
       redirect_to '/admin/dashboards',:notice=>t(:need_home)
       # render :text => t(:need_home)
@@ -19,7 +19,6 @@ class PagesController < ApplicationController
   def show
     #begin  
       @item = Item.first(:conditions => {:path => params[:page_name]})
-
       if @item && @item.is_published && (@item.enabled_for.nil? ? true : @item.enabled_for.include?(I18n.locale.to_s))
         delayed_impressionist(@item)
         case @item.class.to_s
@@ -27,7 +26,7 @@ class PagesController < ApplicationController
             if params[:clicked_field_name]
               render_page({"clicked_field_name"=>params["clicked_field_name"]}) unless save_from_no_lang_for_page
               else
-              render_page(params.except(:controller, :action, :page_name)) unless save_from_no_lang_for_page
+              render_page(params) unless save_from_no_lang_for_page
             end
           when 'Link'
             redirect_to(@item[:url]) unless save_from_no_lang_for_page
@@ -114,7 +113,7 @@ class PagesController < ApplicationController
   end
 
   def check_frontend_open
-    if Site.first.frontend_open && current_user.nil?  #Need to be change
+    if !Site.first.frontend_closed && current_user.nil?  #Need to be change
       redirect_to '/admin/dashboards'  
     end
   end

app/helpers/application_helper.rb

@@ -180,7 +180,7 @@ module ApplicationHelper
     page_title = page.page_title ? page.page_title : page.title
     if page.root? && @site.title
       res << @site.title
-    elsif @site.title && !@site.title_always_on
+    elsif @site.title && @site.title_always_on
       res << @site.title + ' - ' + page_title
     else
       res << page_title

app/helpers/orbit_backend_helper.rb

@@ -199,7 +199,7 @@ module OrbitBackendHelper
       objects.join(' ')
     else
       objects = Array(objects).map do |object|
-        display_value(object.send(field)) rescue ''
+        display_value(object.send(field))
       end
       objects.join(', ')
     end

app/models/ad_banner.rb

@@ -2,8 +2,8 @@ class AdBanner
   include Mongoid::Document
   include Mongoid::Timestamps
   include Mongoid::MultiParameterAttributes
+  include OrbitCoreLib::ObjectAuthable
   include OrbitTag::Taggable
-  include OrbitModel::Authorizable
 
   field :title
   field :transition_msec,type: Integer

app/models/auth/auth_manager.rb

@@ -1,3 +1,4 @@
 class AuthManager < Authorization
+	# belongs_to :manager_authorizable, polymorphic: true
 	has_and_belongs_to_many :authorized_users, class_name: 'User', inverse_of: 'managing_apps'
 end

app/models/item.rb

@@ -46,17 +46,15 @@ class Item
 
   def shift_to(new_parent, position)
     position = position.to_i
-    new_parent = Item.find(new_parent)
-    current_position_sibling = find_by_parent_and_position(new_parent, position)
-    if current_position_sibling
-      if self.position > current_position_sibling.position
-        self.move_above(current_position_sibling)
-      else
-        self.move_below(current_position_sibling)
+    unless self.parent_id.to_s.eql?(new_parent) && self.position == position
+      new_parent = Item.find(new_parent)
+      current_position_sibling = find_by_parent_and_position(new_parent, position)
+      if current_position_sibling
+        move_above(current_position_sibling)
+      elsif self.parent != new_parent
+        self.parent = new_parent
+        save
       end
-    elsif self.parent != new_parent
-      self.parent = new_parent
-      save
     end
   end
 

app/models/module_app.rb

@@ -7,7 +7,6 @@ class ModuleApp
   field :auth_approval_users, type: Array, default: nil
   field :auth_manager_users, type: Array, default: nil
   field :auth_sub_manager_users, type: Array, default: nil
-  field :has_category, type: Boolean, default: false
   field :key
   field :title
   field :sidebar_order,type: Integer,default: 0
@@ -190,8 +189,7 @@ class ModuleApp
   end
 
   def update_auth_manager_users
-    users = self.auth_manager_authorized_users
-    self.update_attribute(:auth_manager_users, users.map{|user| user.id}) if users
+    self.update_attribute(:auth_manager_users, self.auth_manager_authorized_users.map{|user| user.id})
   end
 
   def update_auth_sub_manager_users
@@ -209,6 +207,21 @@ class ModuleApp
     managers.include?(user)
   end
 
+  def add_managers(users)
+    users = Array(users)
+    if auth_manager = self.auth_manager
+      auth_manager.update_attribute(:authorized_users, (auth_manager.authorized_users + users).uniq)
+    else
+      self.create_auth_manager(authorized_users: users)
+    end
+  end
+
+  def remove_managers(users)
+    users = Array(users)
+    users = users.delete_if{|user| user == current_user || is_admin?}
+    self.auth_manager.update_attribute(:authorized_users, auth_manager.authorized_users - users)
+  end
+
   def is_manager?(user)
     if user && !auth_manager_users.blank?
       auth_manager_users.include?(user.id)

app/models/module_tag.rb

@@ -30,8 +30,8 @@ class ModuleTag
     if self.new_record?
       self.build_tag(name_translations: self.name_translations, is_default: self.is_default)
     else
-      self.tag.attributes = {:name_translations => self.name_translations}
-      self.tag.attributes = {:is_default => self.is_default}
+      self.tag.name_translations = self.name_translations
+      self.tag.is_default = self.is_default
     end
   end
 

app/models/site.rb

@@ -7,22 +7,19 @@ class Site
   
   field :in_use_locales, :type => Array
   field :valid_locales, :type => Array
-  field :enable_locales, :type => Array
   
   field :roaming_id
   field :private_key, :type => Binary
   field :public_key, :type => Binary
 
-  field :frontend_open, :type => Boolean, :default => true
+  field :frontend_closed, :type => Boolean, :default => false
   field :backend_openness_on, :type => Boolean, :default => false
   field :desktop_closed, :type => Boolean, :default => false
-  field :sitemap_menu_in_header, :type => Boolean, :default => false
-  field :enable_terms_of_use, :type => Boolean, :default => false
-  field :enable_language_detection, :type => Boolean, :default => false
 
   field :title_always_on, :type => Boolean, :default => false
   field :dashbroad_allow_visitor, :type => Boolean, :default => false
   field :mail_settings, :type => Hash
+  field :enabled_for, :type => Array, :default => nil
 
   field :disk_space, :type => String
   field :system_package_info, :type => Hash,:default=>{}
@@ -31,14 +28,13 @@ class Site
   field :department
   
   mount_uploader :default_image, ImageUploader
-  mount_uploader :favicon, ImageUploader
 
   field :search,:type => Hash
   field :resque_namespace,:type => String, :default=>APP_CONFIG['orbit']
   field :title, localize: true
   field :footer, localize: true
   field :sub_menu, localize: true
-  field :terms_of_use, localize: true
+  field :terms_of_user, localize: true
   field :google_analytics
   field :default_locale
 
@@ -46,21 +42,6 @@ class Site
 
   belongs_to :design
   has_many :site_metas, :autosave => true, :dependent => :destroy
-  validate :in_use_locales, :minimum_enabled_locales
-
-  def minimum_enabled_locales
-    size = self.in_use_locales.length
-    if size < 1 
-      errors.add(:size, "Needs at least one language in use")
-    end
-  end
-
-  def maximum_enabled_locales
-    size = self.in_use_locales.length
-    if size >= 2 
-      errors.add(:size, "Max 2 ")
-    end
-  end
 
   def generate_keys
     private_key = OpenSSL::PKey::RSA.generate(2048)

app/models/tag.rb

@@ -1,3 +1,8 @@
+# class Tag < ProtoTag
+#   belongs_to :module_app
+
+# end
+
 class Tag
   include Mongoid::Document
   include Mongoid::Timestamps

app/views/admin/ad_banners/_edit.html.erb

@@ -1,31 +1,25 @@
-<%= form_for @ad_banner, url: admin_ad_banner_path(@ad_banner) do |f| %>
-  <fieldset>
-    <legend><%= t("ad_banner.banner") %></legend>
-    <label><%= t("ad_banner.banner_name") %></label>
-    <%= f.text_field :title, :class=>"input-large", :placeholder=>"Banner Name" %>
-    <span class="help-block"><%= t("ad_banner.banner_name_note") %></span>
-    <label for="timeout"><%= t("ad_banner.ste") %></label>
-    <%= f.text_field :transition_sec, :class => 'input-large', :placeholder => 'Time' %>
-    <span class="help-block"><%= t("ad_banner.ste_note") %></span>
-    <label><%= t("ad_banner.best_size") %></label>
-    <%= f.text_field :best_size, :class=>"input-large", :placeholder=>"Banner Size" %>
-    <span class="help-block"><%= t("ad_banner.best_size") %> EX:120x30 </span>
-    <label><%= t("ad_banner.effect") %></label>
-    <%= f.select :ad_fx ,AdBanner::FX_TYPES %>
-    <div class="preview">
-      <%= image_tag "slideshow_preview_A.png", :width=>220 %>
-      <%= image_tag "slideshow_preview_B.png", :width=>220 %>
-    </div>
-    <span class="help-block"><%= t("ad_banner.effect") %></span>
-    <a href="javascript:$.pageslide.close()" class="btn btn-small"><%= t(:cancel) %></a>
-    <%= f.submit t(:update_), class: 'btn btn-primary btn-small' %>
-  </fieldset>
-<% end %>
-<script type="text/javascript">
-  $('select').on('change', function() {
-    $(".preview").cycle({
-      delay: -3000,
-      fx: $(this).val()
-    });
-  });
-</script>
+<div class="content">
+  <%= form_for(:ad_banner, :url => admin_ad_banner_path(:ad_banner), :remote => true) do |f| %>
+      <fieldset>
+        <legend>Ad Banner</legend>
+        <label>Banner Name</label>
+         <%= f.text_field :title, :class=>"input-large", :placeholder=>"Banner Name" %>
+        <span class="help-block">Banner Name only english</span>
+        <label for="timeout">Ste</label>
+         <%= f.text_field :transition_sec, :class => 'input-large', :placeholder => 'Time' %>
+        <span class="help-block">Please enter the number of seconds</span>
+        <label>Best Size</label>
+         <%= f.text_field :best_size, :class=>"input-large", :placeholder=>"Banner Size" %>
+        <span class="help-block">Best Size EX:120x30 </span>
+        <label>Effect</label>
+         <%= f.select :ad_fx ,AdBanner::FX_TYPES %>
+          <div class="preview">
+            <%= image_tag "slideshow_preview_A.png", :width=>220 %>
+            <%= image_tag "slideshow_preview_B.png", :width=>220 %>
+          </div>
+        <span class="help-block">Effect</span>
+          <a href="javascript:$.pageslide.close()" class="btn btn-small"><%= t(:cancel) %></a>
+<%= f.submit t(:create_), class: 'btn btn-primary btn-small' %>
+      </fieldset>
+  <% end %>
+</div>

app/views/admin/ad_banners/_index.html.erb

@@ -1,5 +1,3 @@
-<%= javascript_include_tag "lib/jquery.cycle.all.js"%>
-
 <table class="table main-list">
   <thead>
     <tr>
@@ -15,7 +13,7 @@
         <div class="quick-edit">
           <ul class="nav nav-pills">
             <% if is_admin?%>
-              <li><%= link_to t(:edit), edit_admin_ad_banner_path(ad_banner), :class => "open-slide" %></li>
+              <li><%= link_to t(:edit), edit_admin_ad_banner_path(ad_banner)%></li>
               <li><%= link_to 'Destroy', admin_ad_banner_path(ad_banner), method: :delete , :confirm => t(:sure?) %></li>  
 
           <% end %>
@@ -32,8 +30,12 @@
 <!-- footer -->
 <div class="bottomnav clearfix">
   <div class="action pull-right">
-    <%= link_to content_tag(:i, nil, class: "icons-plus") + " " + t(:add_new), new_admin_ad_banner_path, :class => "btn btn-primary open-slide"%>
+    <%= link_to content_tag(:i, nil, class: "icons-plus") + " " + t(:add_new), "#add-banner", :class => "btn btn-primary open-slide"%>
   </div>
 </div>
 
+<div id="add-banner" class="nano" style="display:none">
+  <%= render 'new' %>
+</div>
+
 <% end %>

app/views/admin/ad_banners/_new.html.erb

@@ -1,31 +1,25 @@
-<%= form_for(:ad_banner, :url => admin_ad_banners_path) do |f| %>
-    <fieldset>
-      <legend><%= t("ad_banner.banner") %></legend>
-      <label><%= t("ad_banner.banner_name") %></label>
-       <%= f.text_field :title, :class=>"input-large", :placeholder=>"Banner Name" %>
-      <span class="help-block"><%= t("ad_banner.banner_name_note") %></span>
-      <label for="timeout"><%= t("ad_banner.ste") %></label>
-       <%= f.text_field :transition_sec, :class => 'input-large', :placeholder => 'Time' %>
-      <span class="help-block"><%= t("ad_banner.ste_note") %></span>
-      <label><%= t("ad_banner.best_size") %></label>
-       <%= f.text_field :best_size, :class=>"input-large", :placeholder=>"Banner Size" %>
-      <span class="help-block"><%= t("ad_banner.best_size") %> EX:120x30 </span>
-      <label><%= t("ad_banner.effect") %></label>
-       <%= f.select :ad_fx ,AdBanner::FX_TYPES %>
-        <div class="preview">
-          <%= image_tag "slideshow_preview_A.png", :width=>220 %>
-          <%= image_tag "slideshow_preview_B.png", :width=>220 %>
-        </div>
-      <span class="help-block"><%= t("ad_banner.effect") %></span>
-        <a href="javascript:$.pageslide.close()" class="btn btn-small"><%= t(:cancel) %></a>
-        <%= f.submit t(:create_), class: 'btn btn-primary btn-small' %>
-    </fieldset>
-<% end %>
-<script type="text/javascript">
-  $('select').on('change', function() {
-    $(".preview").cycle({
-      delay: -3000,
-      fx: $(this).val()
-    });
-  });
-</script>
+<div class="content">
+  <%= form_for(:ad_banner, :url => admin_ad_banners_path) do |f| %>
+      <fieldset>
+        <legend>Ad Banner</legend>
+        <label>Banner Name</label>
+         <%= f.text_field :title, :class=>"input-large", :placeholder=>"Banner Name" %>
+        <span class="help-block">Banner Name only english</span>
+        <label for="timeout">Ste</label>
+         <%= f.text_field :transition_sec, :class => 'input-large', :placeholder => 'Time' %>
+        <span class="help-block">Please enter the number of seconds</span>
+        <label>Best Size</label>
+         <%= f.text_field :best_size, :class=>"input-large", :placeholder=>"Banner Size" %>
+        <span class="help-block">Best Size EX:120x30 </span>
+        <label>Effect</label>
+         <%= f.select :ad_fx ,AdBanner::FX_TYPES %>
+          <div class="preview">
+            <%= image_tag "slideshow_preview_A.png", :width=>220 %>
+            <%= image_tag "slideshow_preview_B.png", :width=>220 %>
+          </div>
+        <span class="help-block">Effect</span>
+          <a href="javascript:$.pageslide.close()" class="btn btn-small"><%= t(:cancel) %></a>
+<%= f.submit t(:create_), class: 'btn btn-primary btn-small' %>
+      </fieldset>
+  <% end %>
+</div>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

app/views/admin/module_tags/index.js.erb

@@ -5,6 +5,6 @@ $("#tags_index").html("<%= j render 'index' %>")
 $.pageslide.close();
 openSlide();
 $('.card').cardCheck({
-    item: $('.card input[type="checkbox"]'),
+    check: $('.card input[type="checkbox"]'),
 });
 checkedLength()

app/views/admin/page_parts/_public_r_tag.html.erb

@@ -7,7 +7,6 @@
 		<%= f.hidden_field :public_r_tag_object_id, :value => @part.page.id %>
 		<%#= f.select :public_r_tag_object_id, options_for_select([t(:horizontal), t(:vertical)], t(:horizontal)) %>	
 	<% elsif @r_tag.eql?('sitemap') %>
-	<% elsif @r_tag.eql?('terms_of_use') %>
 	<% elsif @r_tag.eql?('breadcrumb') %>
 	<% else %>
 		<%= f.select :public_r_tag_object_id, options_from_collection_for_select(@tag_objects, :id, :title, :selected => @part.public_r_tag_object_id) %>

app/views/admin/pages/_form.html.erb

@@ -91,5 +91,5 @@
 	</div>
 </div>
 
-<%=javascript_include_tag "lib/items/update_cates_and_tags.js" %>
-<%= javascript_include_tag "lib/items/page_widget_edit_interface.js" %>
+<%=javascript_include_tag "inc/update_cates_and_tags.js" %>
+<%= javascript_include_tag "inc/page_widget_edit_interface.js" %>

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

@@ -1,13 +1,13 @@
-<li class="map-block <%= 'disabled' if !sitemap_block.show_in_sitemap_for(temp_locale) %>">
+<li>
   <h6>
-    <input type="checkbox" id="<%= sitemap_block.id %>" class="toggle-check onoff" temp_locale="<%= temp_locale %>" data-deploy="right">
+    <input type="checkbox" class="toggle-check" data-deploy="right">
     <span><%= sitemap_block_counter + 1 %> <%= sitemap_block.title_translations[temp_locale] %></span>
   </h6>
   <ul>
     <% sitemap_block.children.each_with_index do |child, i| %>
-      <li class="<%= 'disabled' if !child.show_in_sitemap_for(temp_locale)  %>">
+      <li "<%= 'disabled' if !child.show_in_sitemap_for(temp_locale)  %>">
         <h6>
-          <input type="checkbox" id="<%= child.id %>" class="toggle-check onoff" temp_locale="<%= temp_locale %>" data-deploy="right">
+          <input type="checkbox" class="toggle-check" data-deploy="right">
           <span><%= "#{sitemap_block_counter + 1}-#{i + 1}" %> <%= child.title_translations[temp_locale] %></span>
         </h6>
       </li>

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

@@ -17,9 +17,11 @@
 
           <fieldset>
 
+            
             <!-- Input Area -->
             <div class="input-area">
-              <div class="nav-name"><strong>Classification</strong></div>    
+
+              <div class="nav-name"><strong>Classification</strong></div>
               <ul class="nav nav-pills language-nav">
                 <li class="active">
                   <a href="#sidebar-nav" data-toggle="tab">Sidebar Nav</a>
@@ -112,10 +114,10 @@
                 <!-- Openness -->
                 <div id="openness" class="tab-pane fade">
                   <div class="control-group">
-                    <label class="control-label muted"><%= I18n.t('site.frontend_open')%></label>
+                    <label class="control-label muted"><%= I18n.t('site.frontend_closed')%></label>
                     <div class="controls">
-                   	  <%= f.check_box :frontend_open , :class=>"toggle-check"%>
-                      <span class="help-block">If Checked, the frontend will be open for all users.</span>
+                   	  <%= f.check_box :frontend_closed  , :class=>"toggle-check"%>
+                      <span class="help-block">Only can be viewed by users logged in</span>
                     </div>
                   </div>
                   <div class="control-group">
@@ -126,7 +128,7 @@
                     </div>
                   </div>
                   <div class="control-group">
-                    <label class="control-label muted"><%= I18n.t('site.enable_personal_desktop')%></label>
+                    <label class="control-label muted">Disable personal desktop</label>
                     <div class="controls">
                       <%= f.check_box :desktop_closed , :class=>"toggle-check" %>
                     </div>
@@ -142,32 +144,25 @@
                       <input type="checkbox" class="toggle-check" data-disabled="true">
                     </div>
                   </div> -->
-                  <!-- Terms of Use -->
-                  <div class="control-group">
-                    <label class="control-label muted">Enable User Language Detection
-                    </label>
-                    <div class="controls">
-                      <%= f.check_box :enable_language_detection, :class => "toggle-check" %> 
-                    </div>
-                  </div>
-
-                  <div class="control-group">
-                    <label class="control-label muted">Enable Language</label>
-                    <div class="controls">
-                     <% @site_valid_locales.each do |valid_locale| %>
-                      <%= check_box_tag "site[enable_locales][]", locale, @site.valid_locales.include?(locale), :class=>"toggle-check", :data => { :title => "#{I18nVariable.from_locale(locale)}" } %>
-					            <% end %>
-                    </div>
-                  </div>
-
                   <div class="control-group">
                     <label class="control-label muted">Default Language</label>
                     <div class="controls">
                     <% @site_in_use_locales.each do |locale| %>
-                      <%= check_box_tag :default_locale, locale, (@site.default_locale.nil?), :class=>"toggle-check", :data => { :title => "#{I18nVariable.from_locale(locale)}" }  %>
+                      <%= check_box_tag :default_locale, locale, (@site.enabled_for.nil?), :class=>"toggle-check"  %>
+                      <%= I18nVariable.from_locale(locale) %>
                      <% end %>
                     </div>
                   </div>
+                  <div class="control-group">
+                    <label class="control-label muted">Enable Language</label>
+                    <div class="controls">
+                     <% @site_valid_locales.each do |valid_locale| %>
+						<%= check_box_tag 'site[enabled_for][]', valid_locale, (@site.enabled_for.nil?), :class=>"toggle-check"  %>
+						<%= I18nVariable.from_locale(valid_locale) %>
+					<% end %>
+					<%= hidden_field_tag 'site[enabled_for][]', '' %>
+                    </div>
+                  </div>
 
                 </div>
 
@@ -179,7 +174,7 @@
                       <!-- if this page editing please add class "fileupload-edit" -->
                       <div class="fileupload fileupload-new clearfix" data-provides="fileupload">
                         <div class="fileupload-new thumbnail pull-left">
-                        <% if @site.default_image %>
+                          <% if @site.default_image %>
                    		   <%= image_tag( @site.default_image, :size=>"120x120") rescue ''%>
                 	      <% else %>
                  		   <img class="pull-left upload-picture" src="/assets/default-img.png" />
@@ -194,41 +189,23 @@
                          <%end%>
                         </span>
                         <a href="#" class="btn fileupload-exists" data-dismiss="fileupload">Cancel</a>
-                      
-                      </div>
-                    </div>
-
-                    <div class="control-group">
-                    <label class="control-label muted">Orbit Favicon</label>
-                    <div class="controls">
-                      <!-- if this page editing please add class "fileupload-edit" -->
-                      <div class="fileupload fileupload-new clearfix" data-provides="fileupload">
-                        <div class="fileupload-new thumbnail pull-left">
-                        <% if @site.favicon %>
-                         <%= image_tag( @site.favicon, :size=>"120x120") rescue ''%>
-                        <% else %>
-                       <img class="pull-left upload-picture" src="/assets/default-img.png" />
-                        <% end %>
+                        <div class="controls" data-toggle="buttons-checkbox">
+                          <label class="checkbox inline btn btn-danger fileupload-remove">
+                            <% if @site.default_image.file %>
+                    			<label class="checkbox">
+                   				 <%= check_box_tag 'site[remove_default_image]' %>
+                    			 <%= t(:delete_) %>
+                    			</label>
+                  			 <% end %>
+                          </label>
                         </div>
-                        <div class="fileupload-preview fileupload-exists thumbnail pull-left"></div>
-                        <span class="btn btn-file">
-                        <% if @site.favicon.file.present?%>
-                         <%= f.file_field :favicon, :id => "input-upload", :class => 'fileupload-new', :onchange => "document.getElementById('fu').innerHTML = this.form.fu.value = this.value;" %>Change
-                         <%else%>
-                         <%= f.file_field :favicon, :id => "input-upload", :class => 'fileupload-new', :onchange => "document.getElementById('fu').innerHTML = this.form.fu.value = this.value;" %>Select Image
-                         <%end%>
-                        </span>
-                        <a href="#" class="btn fileupload-exists" data-dismiss="fileupload">Cancel</a>
-                      
                       </div>
                     </div>
-
                   </div>
 
                 </div>
               </div>
 
-
             </div>
             <!-- Form Actions -->
             <div class="form-actions">

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

@@ -47,7 +47,7 @@
 
                   <!-- Always shoe in the title bar -->
                   <div class="control-group">
-                    <label class="control-label muted"><%= t :always_display_title %>
+                    <label class="control-label muted">Always show in the title bar
                     </label>
                     <div class="controls">
                       <%= f.check_box :title_always_on, :class => "toggle-check" %> 
@@ -55,6 +55,7 @@
                   </div>
 
                   <hr>
+
                   <!-- CKeditor Site Header -->
                   <% @site_valid_locales.each do |locale|%>
                   <%= content_tag :div, :class => "tab-pane fade #{active_when_current_locale_eq locale} #{locale}" do %>
@@ -69,30 +70,15 @@
                      <%end%>
                     <%end%>
 
-                    <!-- Sitemap menu in Header -->
-                    <div class="control-group">
-                      <label class="control-label muted">Sitemap menu in header
-                      </label>
-                      <div class="controls">
-                      <%= f.check_box :sitemap_menu_in_header, :class => "toggle-check" %> 
-                      </div>
-                    </div>
-
-                   <hr>
-
-                <!-- CKeditor Site Footer -->
-                  <% @site_valid_locales.each do |locale|%>
-                  <%= content_tag :div, :class => "tab-pane fade #{active_when_current_locale_eq locale} #{locale}" do %>
-                    <label class="control-label muted"><%= t('site.footer')%></label>
+                  <!-- Sitemap menu in Header -->
+                  <div class="control-group">
+                    <label class="control-label muted">Sitemap menu in header
+                    </label>
                     <div class="controls">
-                      <div class="textarea">
-                        <%= f.fields_for :footer_translations do |f| %>
-                          <%= f.text_area locale, :class => "ckeditor input-block-level", :value => (@site.footer_translations[locale] rescue nil) %>
-                        <% end %>
-                      </div>
-                     </div>
-                     <%end%>
-                    <%end%>
+                      <input type="checkbox" class="toggle-check" data-disabled="true">
+                    </div>
+                  </div>
+
                   <hr>
 
                   <!-- Terms of Use -->
@@ -100,25 +86,27 @@
                     <label class="control-label muted">Terms of Use
                     </label>
                     <div class="controls">
-                      <%= f.check_box :enable_terms_of_use, :class => "toggle-check" %> 
+                      <input type="checkbox" class="toggle-check terms" data-disabled="true" checked="checked">
                     </div>
                   </div>
 
-                  <!-- CKeditor Site Footer -->
+                  <!-- CKeditor Default Terms of Use -->
+                  <div class="control-group input-content hide">
                   <% @site_valid_locales.each do |locale|%>
                   <%= content_tag :div, :class => "tab-pane fade #{active_when_current_locale_eq locale} #{locale}" do %>
-                    <label class="control-label muted"><%= t('site.default_terms_of_use')%></label>
+                    <label class="control-label muted">Default Terms of Use</label>
                     <div class="controls">
                       <div class="textarea">
-                        <%= f.fields_for :terms_of_use_translations do |f| %>
-                          <%= f.text_area locale, :class => "ckeditor input-block-level", :value => (@site.terms_of_use_translations[locale] rescue nil) %>
+                       <%= f.fields_for :terms_of_user_translations do |f| %>
+                          <%= f.text_area locale, :class => "ckeditor input-block-level", :value => (@site.terms_of_user_translations[locale] rescue nil) %>
                         <% end %>
+                        </div>
                       </div>
-                     </div>
-                     <%end%>
+                    </div>
+                    <%end%>
                     <%end%>
-            
 
+                </div>
                  <!-- Form Actions -->
                 <div class="form-actions">
                   <%= f.submit t("submit"), :class => "btn btn-primary" %>

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

@@ -12,65 +12,28 @@
 <% 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 %>
-        <div id="sitemap">
-           <ul id="map-tree-language" class="nav nav-pills">
-            <% @site_valid_locales.each_with_index do |locale, i| %>
-              <li <%= ( i == 0 ) ? "class=active" : '' %>>
-               <a data-toggle="tab" href="#<%= locale %>">
-                <%= I18nVariable.from_locale(locale) %>
-               </a>
-              </li>
-             <% end %>
-           </ul>
 
+    <section>
+      <h3>Sitemap</h3>
+      <div>        
+
+        <div id="sitemap">
+
+           <ul id="map-tree-language" class="nav nav-pills">
+           <% @site_valid_locales.each_with_index do |locale, i| %>
+            <li <%= ( i == 0 ) ? " class=active" : '' %>><a data-toggle="tab" href="#<%= locale %>"><%= I18nVariable.from_locale(locale) %></a></li>
+            <% end %>
+          </ul>
           <div class="tab-content map-tree-content">
           <div class="line"></div>
+
           <% @site_valid_locales.each_with_index do |temp_locale, i| %>
-           <ul id="<%= temp_locale %>" class="map-tree tab-pane fade in <%= ( i == 0 ) ? "in active" : '' %>">
+          <ul id="<%= temp_locale %>" class="map-tree tab-pane fade in active">
             <%= render :partial => 'sitemap_block', :collection => @items, :locals => {:temp_locale => temp_locale} %>
-           </ul>
+          </ul>
           <% end %>
-          </div>
+         </div>
 
-        </div>
-
-    <% content_for :page_specific_javascript do %>
-    <script>
-      $(document).ready(function(){
-        $('.site-map').masonry({
-        itemSelector: '.map-block',
-        columnWidth: 260
-      });
-      $('a[data-toggle="tab"]').on('shown', function (e) {
-          $('.site-map').masonry({
-              itemSelector: '.map-block',
-              columnWidth: 260
-          });
-        })
-      });
-      $(document).on('click', 'li .onoff', function () {
-          $(this).parents("li").toggleClass("disabled");
-          if($(this).parents("li").attr("class").indexOf("disabled") > 0){
-            $(this).text("<%= t('off_upcase') %>")
-          } else {
-            $(this).text("<%= t('on_upcase') %>")
-          }
-          $.getScript('<%= admin_sites_path %>' + '/' + $(this).attr('id') + '/sitemap_toggle?temp_locale=' + $(this).attr('temp_locale'));
-        });
-        $(document).on('click', 'h6 .onoff', function () {
-          $(this).parents(".map-block").toggleClass("disabled");
-          if($(this).parents("h6").parents("li").attr("class").indexOf("disabled") > 0){
-            $(this).text("<%= t('off_upcase') %>")
-            $(this).parents(".map-block").find('li').addClass('disabled')
-            $(this).parents(".map-block").find('checkbox').text("<%= t('off_upcase') %>")
-            // $(this).parents(".map-block").find('li checkbox').attr('disabled', 'disabled')
-          } else {
-            $(this).text("<%= t('on_upcase') %>")
-            $(this).parents(".map-block").find('li').removeClass('disabled')
-            $(this).parents(".map-block").find('checkbox').text("<%= t('on_upcase') %>")
-            // $(this).parents(".map-block").find('li checkbox').removeAttr("disabled")
-          }
-          $.getScript('<%= admin_sites_path %>' + '/' + $(this).attr('id') + '/sitemap_toggle?parent=true&temp_locale=' + $(this).attr('temp_locale'));
-        });
-     </script>
-    <% end %>
+        </div>         
+      </div>
+    </section>

app/views/admin/tags/index.js.erb

@@ -4,6 +4,6 @@ $("#tags_index").html("<%= j render 'index' %>")
 $.pageslide.close();
 openSlide();
 $('.card').cardCheck({
-    item: $('.card input[type="checkbox"]'),
+    check: $('.card input[type="checkbox"]'),
 });
 checkedLength()

app/views/admin/users_new_interface/_user_basic_passwd.html.erb

@@ -39,5 +39,16 @@
         </div>
       </div>
 
+      <!-- Chec Admin -->
+      <div class="control-group">
+        <label class="control-label muted" for="">Administrator</label>
+        <div class="controls">
+          <label class="checkbox inline">
+            <%= f.check_box :admin %>
+            <%= t("admin") %>
+          </label>
+        </div>
+      </div>
+
     </div>
   </div>

app/views/admin/users_new_interface/_user_basic_privilege.html.erb

@@ -1,32 +0,0 @@
-  <%#= devise_error_messages! %>
-  <%= flash_messages %>
-
-  <div class="attributes">
-    <div class="attributes-header clearfix">
-      <h4><%=t("users.setting_privilege")%></h4>
-    </div>
-    <div class="attributes-body">
-
-      <!-- Account -->
-      <div class="control-group">
-        <label class="control-label muted" for="account">
-          <%= f.label t("users.user_id"),:class=>"control-label" %>
-        </label>
-        <div class="controls add-input">
-          <%= @user.user_id %>
-        </div>
-      </div>
-
-      <!-- Chec Admin -->
-      <div class="control-group">
-        <label class="control-label muted" for="">Administrator</label>
-        <div class="controls">
-          <label class="checkbox inline">
-            <%= f.check_box :admin %>
-            <%= t("admin") %>
-          </label>
-        </div>
-      </div>
-
-    </div>
-  </div>

app/views/admin/users_new_interface/_user_for_listing.html.erb

@@ -20,7 +20,7 @@
         <div class="quick-edit">
           <ul class="nav nav-pills">
             <%= content_tag(:li, link_to(t(:edit),edit_admin_users_new_interface_path(user_for_listing))) if is_admin? %>
-            <%= content_tag(:li, link_to(t("users.setting_privilege"),admin_users_new_interface_edit_privilege_path(user_for_listing))) if is_admin? and current_user.id != user_for_listing.id %>
+            <%= content_tag(:li, link_to(t(:Permissions),'#')) if is_admin? %>
             <%= content_tag(:li, link_to(t(:delete),admin_users_new_interface_path(user_for_listing, :at=>params[:at]), :confirm => t(:sure?), :method => :delete, :class=>"text-error", :remote => true)) if is_admin? %>
           </ul>
         </div>

app/views/admin/users_new_interface/_user_for_summary.html.erb

@@ -12,7 +12,7 @@
       <p class="<%= @user_sex%>"></p>
       <div class="action">
         <%= link_to(content_tag(:i, nil, :class => 'icon-edit'),edit_admin_users_new_interface_path(user_for_summary),:class=>"edit" ) if is_admin?%>
-        <%= link_to(content_tag(:i, nil, :class => 'icon-key'),admin_users_new_interface_edit_privilege_path(user_for_summary),:class=>"key" ) if is_admin? and current_user.id != user_for_summary.id %>
+        <%= link_to(content_tag(:i, nil, :class => 'icon-key'),'#',:class=>"key" ) if is_admin?%>
         <%= link_to(content_tag(:i, nil, :class => 'icon-trash'), admin_users_new_interface_path(user_for_summary, :at=>params[:at]), :confirm => t(:sure?), :method => :delete, :class=>"trash", :remote => true) if is_admin? %>
       </div>
       <%= image_tag(user_for_summary.avatar) %>

app/views/admin/users_new_interface/_user_for_thumbnail.html.erb

@@ -12,7 +12,7 @@
       <div class="action">
 
         <%= link_to(content_tag(:i, nil, :class => 'icon-edit'),edit_admin_users_new_interface_path(user_for_thumbnail),:class=>"edit" ) if is_admin?%>
-        <%= link_to(content_tag(:i, nil, :class => 'icon-key'),admin_users_new_interface_edit_privilege_path(user_for_thumbnail),:class=>"key" ) if is_admin? and current_user.id != user_for_thumbnail.id %>
+        <%= link_to(content_tag(:i, nil, :class => 'icon-key'),'#',:class=>"key" ) if is_admin?%>
         <%= link_to(content_tag(:i, nil, :class => 'icon-trash'), admin_users_new_interface_path(user_for_thumbnail, :at=>params[:at]), :confirm => t(:sure?), :method => :delete, :class=>"trash", :remote => true) if is_admin? %>
         
       </div>

app/views/admin/users_new_interface/edit_privilege.html.erb

@@ -1,39 +0,0 @@
-<% content_for :side_bar do %>
-  <%= render :partial => 'admin/users_new_interface/side_bar' %>
-<% end %>
-
-<% content_for :page_specific_css do -%>
-    <%= stylesheet_link_tag "lib/wrap-nav.css" %>
-    <%= stylesheet_link_tag "lib/pageslide.css" %>
-    <%= stylesheet_link_tag "lib/main-forms.css" %>
-    <%= stylesheet_link_tag "lib/fileupload.css" %>
-    <%= stylesheet_link_tag "lib/togglebox.css" %>
-<% end -%>
-<% content_for :page_specific_javascript do -%>
-    <%= javascript_include_tag "lib/jquery.tmpl.min.js" %>
-    <%= javascript_include_tag "lib/bootstrap-fileupload.js" %>
-    <%= javascript_include_tag "lib/member/role-forms.js" %>
-    <%= javascript_include_tag "lib/member/textarea-lang-btn.js" %>
-<% end -%>
-
-
-<%= form_for @user, :url => admin_users_new_interface_path(@user), :html => { :multipart => true , :class=>"form-horizontal main-forms"} do |f| %>
-
-  <fieldset>
-    <div id="basic-area" class="input-area">
-
-    <%= f.error_messages %>
-    <%= render :partial => 'user_basic_privilege', :locals => {:f => f}%>
-
-    </div>
-    
-
-    <div class="form-actions">
-      <%= link_back('btn') %>
-      <%= hidden_field_tag 'edit_type', 'edit_privilege' %>
-      <%= link_to t(:update_), "#", :class=>"btn btn-primary returnDecide", :onclick=>"$('#edit_user_#{@user.id}').submit()" %>
-    </div>
-
-  </fieldset>  
-
-<% end -%>

app/views/admin/users_new_interface/show.html.erb

@@ -21,7 +21,6 @@
               <div class="btn-group">
                   <%= link_to("<i class='icon-edit'></i> #{t(:edit)}".html_safe,edit_admin_users_new_interface_path(@user),:class=>"btn btn-mini" ) if is_admin?%>
                   <%= link_to("<i class='icons-cycle'></i> #{t("users.change_passwd")}".html_safe,admin_users_new_interface_edit_passwd_path(@user),:class=>"btn btn-mini" ) if is_admin?%>
-                  <%= link_to("<i class='icons-lock-open'></i> #{t("users.setting_privilege")}".html_safe,admin_users_new_interface_edit_privilege_path(@user),:class=>"btn btn-mini" ) if is_admin? and current_user.id != @user.id %>
               </div>
             </div>
 

app/views/default_widget/default_widget.html.erb

@@ -1,9 +1,8 @@
-<% if @data.present? %>
-	<%= render :partial => 'shared/search_header',:locals=>{:items=>@data}  %>
-	<%= render @partial %>
-	<% if @paginate %>
-	  <%= paginate @data, :param_name => :page_main, :params => {:same_page_id => @page_id} %>
-	<% elsif @page_part.module_app %>
-	  <%= @page_part.module_app.get_registration.default_widget_setting.link_to_more_tag(request,params) %>
-	<% end %>
+<%= render :partial => 'shared/search_header',:locals=>{:items=>@data}  %>
+
+<%= render @partial %>
+<% if @paginate and  !@data.blank? %>
+  <%= paginate @data, :param_name => :page_main, :params => {:same_page_id => @page_id} %>
+<% elsif @page_part.module_app %>
+  <%=  @page_part.module_app.get_registration.default_widget_setting.link_to_more_tag(request,params) %>
 <% end %>

app/views/desktop/index.html.erb

@@ -2,9 +2,9 @@
 <div id="side">
   <div id="rwidget" class="wh2 thmc4">
     <ul class="docklist">
-      <li class="d_cate"><a callback-method='initializeDesktop' href="desktop/desktop_container" class="widget_fn wh2 hh2" id='home' onclick="return false;" sub-menu="false"><span class="widget_icon"><img src="" alt="Home" id="home_icon" width="30" height="30"/></span></a>
+      <li class="d_cate"><a callback-method='initializeDesktop' href="desktop/desktop" class="widget_fn wh2 hh2" id='home' onclick="return false;"><span class="widget_icon"><img src="" alt="Home" id="home_icon" width="30" height="30"/></span></a>
       <ul class="dock_child hh2 thmc4" style="width: 120px;">
-        <li class="dock_item"><a callback-method='initializeAppManager' href="<%= desktop_app_manager_path %>" class="widget_fn wh2 hh2" id="d_app_manager" onclick="return false;" sub-menu="false"><span class="widget_icon"><img src="" alt="App Manager" id="app_manager_icon" width="30" height="30"/></span></a></li>
+        <li class="dock_item"><a callback-method='initializeAppManager' href="<%= desktop_app_manager_path %>" class="widget_fn wh2 hh2" id="d_app_manager" onclick="return false;"><span class="widget_icon"><img src="" alt="App Manager" id="app_manager_icon" width="30" height="30"/></span></a></li>
         <li class="dock_item"><a callback-method='initializeSettings' href="<%= desktop_settings_path %>" custom-load="settings" class="widget_fn wh2 hh2" id="d_settings" onclick="return false;"><span class="widget_icon"><img src="" alt="Settings" id="settings_icon" width="30" height="30"/></span></a></li>
       </ul>
       </li>
@@ -92,22 +92,10 @@
   orbitDesktop.prototype.sectionId = "<%= @section.id %>";
   orbitDesktop.prototype.currentLanguage = "<%= I18n.locale %>";
   orbitDesktop.prototype.currentUsername = "<%= @currentusername %>";
+  //uselessfunction();
   var od = new orbitDesktop("#ajax_container");
-  var getInternetExplorerVersion = function(){
-   var rv = -1; // Return value assumes failure.
-     if (navigator.appName == 'Microsoft Internet Explorer')
-     {
-        var ua = navigator.userAgent;
-        var re  = new RegExp("MSIE ([0-9]{1,}[\.0-9]{0,})");
-        if (re.exec(ua) != null)
-           rv = parseFloat( RegExp.$1 );
-     }
-     return rv;
-  }
-
-  var version = getInternetExplorerVersion();
-  if( version != -1){
-    if(version < 9){
+  if($.browser.msie){
+    if($.browser.version < 9){
       $.fx.off =  true;
     o.notify("We turn off the animation (javascript) for you, but still you can turn it on",10);
     }

app/views/front/show_banner.html.erb

@@ -1,3 +1,4 @@
+<%= javascript_include_tag "lib/jquery.cycle.all.latest.js"%>
 <div style='position:relative'>
   <ul id='banner_nav' class='clear banner_nav-<%= @ad_banner.title.dehumanize %>'></ul>
   <div id='slideshow-<%= @ad_banner.title.dehumanize %>' class='slideshow'>
@@ -9,12 +10,18 @@
   </div>
 </div>
 <script type='text/javascript'>
-  var banner = {"banner_name":"#slideshow-<%= @ad_banner.title.dehumanize %>",
-                "banner_fx":"<%= @ad_banner.ad_fx.nil? ? 'fade': @ad_banner.ad_fx %>",
-                "banner_pager":".banner_nav-<%= @ad_banner.title.dehumanize %>",
-                "image_count":"<%= @ad_banner.ad_images.length %>",
-                "image_loaded":0,
-                "time_to_next":<%= @ad_banner.transition_msec %>,
-              };
-  banners.push(banner);
-</script>
+$(document).ready(function(){
+  jQuery(function( $ ){     
+
+      $('#slideshow-<%= @ad_banner.title.dehumanize %>').cycle({
+        delay: -1000,
+        fx: "<%= @ad_banner.ad_fx.nil? ? 'fade': @ad_banner.ad_fx %>",
+        timeoutFn: getTimeout,
+        pager: '.banner_nav-<%= @ad_banner.title.dehumanize %>',
+        pagerAnchorBuilder: function(idx, slide) {
+          return "<li><a href='#'></a></li>";
+        }
+      });
+  });
+});
+</script>

app/views/front/show_terms_of_use.html.erb

@@ -1 +0,0 @@
-<%= @terms.html_safe %>

app/views/layouts/_left_menu.html.erb

@@ -21,27 +21,10 @@
   </li>
 
   <!-- Desktop -->
-  <% if !@site.desktop_closed%>
   <li id="orbit-desktop">
     <a href="<%= desktop_path %>" role="button">
       <i class="icons-screen"></i> <span class="hide"><%= t(:desktop) %></span>
     </a>
   </li>
-  <% end %>
   
-</ul>
-<% if @site.default_image.present?%>
-<style>
-  #orbit-bar .orbitlogo {
-  width: 20px;
-  height: 20px;
-  background-size: 70%;
-  display: inline-block;
-  background-position: center;
-  background-repeat: no-repeat;
-  background-image: url(<%= @site.default_image %>);
-  /* For Suck IE */
-  background-image: url(<%= @site.default_image%>)\9;
-}
-</style>
-<% end %>
+</ul>

app/views/layouts/module_widget.html.erb

@@ -5,7 +5,7 @@
 	   <%= javascript_include_tag "html5" %>
 	<![endif]-->
 	<%#= stylesheet_link_tag "module_widget" %>
-	<%#= javascript_include_tag "module" %>
+	<%= javascript_include_tag "module" %>
 	<%#= javascript_include_tag "#{@app_title}/module_widget" %>
 	<%= yield :page_specific_javascript %>
 	<%= csrf_meta_tag %>

config/list.yml

@@ -44,7 +44,6 @@ public_r_tags:
   - sitemap
   - breadcrumb
   - tag_cloud
-  - terms_of_use
 
 page_part_kinds:
   - text

config/locales/en.yml

@@ -390,8 +390,6 @@ en:
     footer: Site footer
     footer_help: Footer Guide
     frontend_closed: Frontend Closed
-    frontend_open: Frontend Open
-    enable_personal_desktop: Enable Personal Desktop
     header: Site header
     info: Site information
     keywords: Site keywords
@@ -487,8 +485,7 @@ en:
   users:
     admin_change_password: You cannot change your own password here!
     avatar: Profile Picture
-    change_passwd: Password
-    setting_privilege: Privilege
+    change_passwd: Change password
     email: Email
     first_name: First Name
     last_name: Last Name

config/locales/new_ui.en.yml

@@ -2,7 +2,6 @@ en:
   add_category: Add category
   add_link: Add link
   add_page: Add page
-  add_tags: Add Tags
   add_to_default: Add to default
   alternative: Alternative
   approval_setting: Approval Setting
@@ -71,5 +70,4 @@ en:
     error:
       tag: Error when updating category
       tag: Error when updating tag
-  url_alt: Alternative text
-  use_default: Use Default
+  url_alt: Alternative text

config/locales/new_ui.zh_tw.yml

@@ -2,7 +2,6 @@ zh_tw:
   add_category: 新增類別
   add_link: 新增連結
   add_page: 新增頁面
-  add_tags: Add Tags
   add_to_default: 加入預設
   alternative: 註解
   approval_setting: 審核設定
@@ -72,4 +71,3 @@ zh_tw:
       tag: 更新類別時發生錯誤
       tag: 更新標籤時發生錯誤
   url_alt: 註解
-  use_default: Use Default

config/locales/zh_tw.yml

@@ -385,9 +385,7 @@ zh_tw:
     thumbnail: 縮圖
   site:
     frontend_closed: 前台關閉？
-    frontend_open: 開啟前台
     backend_openness_on: 開啟開放式後台（訪客可遊覽）
-    enable_personal_desktop: 開啟個人桌面
     default_image: 預設圖像
     description: 網站描述
     description_help: 網站描述說明
@@ -489,7 +487,6 @@ zh_tw:
     admin_change_password: 您不能在此處修改自己的密碼！
     avatar: 大頭貼照
     change_passwd: 變更密碼
-    setting_privilege: 權限設定
     email: 電子郵件
     first_name: 名字
     male: 男性

config/mongoid.yml

@@ -10,8 +10,6 @@ development:
   <<: *defaults
   database: test_site
 
-
-
 test:
   <<: *defaults
   database: test_site
@@ -24,4 +22,4 @@ production:
   # password: <%= ENV['MONGOID_PASSWORD'] %>
   # database: <%= ENV['MONGOID_DATABASE'] %>
   <<: *defaults
-  database: test_site_new
+  database: test_site

config/routes.rb

@@ -201,6 +201,16 @@ Orbit::Application.routes.draw do
       get 'preference'
     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"
+
     resources :tags do
       collection do
         post 'add_to_default'
@@ -221,7 +231,6 @@ Orbit::Application.routes.draw do
         post 'update_order_list'
       end
       match "edit_passwd" => "users_new_interface#edit_passwd" ,:as => :edit_passwd
-      match "edit_privilege" => "users_new_interface#edit_privilege" ,:as => :edit_privilege
     end
 
     resources :member_selects do
@@ -274,7 +283,7 @@ Orbit::Application.routes.draw do
 
   match "/desktop/compatibility" =>  "desktop#compatibility"
   match "desktop" =>  "desktop#index"
-  match "/desktop/desktop_container" => "desktop#desktop_container"
+  match "/desktop/desktop" => "desktop#desktop"
   match '/desktop/appactivation'=>'desktop#appactivation'
   match '/desktop/app_manager'=>'desktop#app_manager'
   match '/desktop/allsections'=>'desktop#allsections'
@@ -329,7 +338,7 @@ Orbit::Application.routes.draw do
     end 
   end
 
-  controller_paths :front, %w[show_breadcrumb show_banner show_footer show_menu show_page_sub_menu show_site_sub_menu show_sitemap show_tag_cloud  show_terms_of_use]
+  controller_paths :front, %w[show_breadcrumb show_banner show_footer show_menu show_page_sub_menu show_site_sub_menu show_sitemap show_tag_cloud]
   # controller_paths :mobile, %w[index announcement announcement_content dialog_contact dialog_copyright dialog_language map page page_content]
 
   # scope 'app' do

lib/orbit_core_lib.rb

@@ -188,15 +188,6 @@ module  OrbitCoreLib
         end
       end
 
-      def open_for_user(arg = nil)
-        if arg
-          key = arg.shift
-          prepend_before_filter key[0] => key[1] {|f| f.open_for :user}
-        else
-          prepend_before_filter {|f| f.open_for :user}
-        end
-      end
-
       def open_for_visitor(arg = nil)
         if arg
           key = arg.shift
@@ -206,50 +197,37 @@ module  OrbitCoreLib
         end
       end
 
-      def skip_authorization(arg = nil)
-        if arg
-          key = arg.shift
-          prepend_before_filter key[0] => key[1] {|f| f.no_authorization}
-        else
-          prepend_before_filter {|f| f.no_authorization}
-        end
-      end
-
     end
 
     module InstanceMethods
       protected
       def can_use
         setup_vars
-        unless @no_authorization
-          if @user_type
-            @open = false
-            @visitor = false
-            @user_type.each do |user_type|
-              case user_type
-              when :admin
-                @open ||= check_admin
-              when :manager
-                @open ||= check_manager
-              when :sub_manager
-                @open ||= check_sub_manager
-              when :approver
-                @open ||= check_sub_manager
-              when :user
-                @open ||= true
-              when :visitor
-                set_current_user
-                @open ||= true
-                @visitor ||= true
-              end
+        set_current_user
+        if @user_type
+          @user_type.each do |user_type|
+            open = false
+            visitor = false
+            case user_type
+            when :admin
+              open ||= check_admin
+            when :manager
+              open ||= check_manager
+            when :sub_manager
+              open ||= check_sub_manager
+            when :approver
+              open ||= check_sub_manager
+            when :visitor
+              open ||= true
+              visitor ||= true
             end
-            check_backend_openness if @visitor
-            authenticate_user! unless @visitor
-            redirect_to root_url unless @open
-          else
-            authenticate_user!
-            check_user_can_use
+            check_backend_openness if visitor
+            authenticate_user! unless visitor
+            redirect_to root_url unless open
           end
+        else
+          authenticate_user!
+          check_user_can_use
         end
       end
 
@@ -270,14 +248,10 @@ module  OrbitCoreLib
       end
 
       def open_for(var)
-        @user_type ||= []
+         @user_type ||= []
         @user_type << var
       end
 
-      def no_authorization
-        @no_authorization = true
-      end
-
       def check_user_can_use
         unless current_or_guest_user.admin? || @module_app.is_manager?(current_or_guest_user) || @module_app.is_sub_manager?(current_or_guest_user) || @module_app.can_approve?(current_or_guest_user)
           redirect_to root_url
@@ -285,8 +259,9 @@ module  OrbitCoreLib
       end
 
       def setup_vars
-        @app_title ||= controller_path.split('/')[1].singularize rescue nil
-        @module_app ||= ModuleApp.first(conditions: {:key => @app_title} ) rescue nil
+        @app_title ||= controller_path.split('/')[1].singularize
+        @module_app ||= ModuleApp.first(conditions: {:key => @app_title} )
+        # raise ModuleAppError, 'Can not find ModuleApp' if @module_app.nil?
       end
     end
   end

lib/orbit_model/authorizable.rb

@@ -7,7 +7,6 @@ module OrbitModel
         has_one :auth_approval, as: :approval_authorizable, dependent: :destroy
         has_one :auth_sub_manager, as: :sub_manager_authorizable, dependent: :destroy
         delegate :authorized_users, to: :auth_approval, prefix: true, allow_nil: true
-        delegate :authorized_users, to: :auth_manager, prefix: true, allow_nil: true
         delegate :authorized_users, to: :auth_sub_manager, prefix: true, allow_nil: true
         send :include, InstanceMethods
       end

lib/parsers/parser_common.rb

@@ -125,7 +125,6 @@ module ParserCommon
   def parse_sub_menus_edit(body = nil, page = nil, edit=nil)
     body.css('sub_menu').each do |sub_menu|
       menu_page = Page.find(sub_menu['id']) rescue nil
-      
       res = ''
       if menu_page && menu_page.visible_children.size > 0
         res << "<div class='category_list'>"
@@ -246,15 +245,6 @@ module ParserCommon
     sitemap.swap(fragment)
   end
 
-  # terms_of_use
-  def parse_terms_of_uses_edit(body = nil, page = nil, edit=nil)
-    terms_of_use = body.css('terms_of_use').first
-    url = front_show_terms_of_use_path
-    options = "?inner=true"
-    fragment = Nokogiri::HTML::DocumentFragment.new(body, "<div class='dymanic_load' path='#{url + options}'></div>")
-    terms_of_use.swap(fragment)
-  end
-
   # page_contents
   def parse_contents_edit(body, page, edit=nil)
     public_r_tags = []
@@ -296,8 +286,8 @@ module ParserCommon
                 when 'default_widget'
                     "/panel/orbit_app/widget/#{part.widget_style}?inner=true"
                   else
-                    # raise ModuleAppError,"PagePart can't find ModuleApp"   if part.module_app.nil?
-                    "/panel/#{part.module_app.key}/widget/#{part.widget_path}?inner=true" rescue ''
+                    raise ModuleAppError,"PagePart can't find ModuleApp"   if part.module_app.nil?
+                    "/panel/#{part.module_app.key}/widget/#{part.widget_path}?inner=true"
                 end
           
           categories_str=(!part[:category].blank? ? part[:category] : category).collect{|t| "category_id[]=#{t}"}.join('&')

lib/parsers/parser_front_end.rb

@@ -222,9 +222,4 @@ module ParserFrontEnd
   def generate_tag_clouds(*args)
     "<div class='dymanic_load' path='#{front_show_tag_cloud_path(args[0])}'></div>"
   end
-
-   # tag_cloud
-  def generate_terms_of_uses(*args)
-    "<div class='dymanic_load' path='#{front_show_terms_of_use_path}'></div>"
-  end
 end

lib/tasks/new_ui.rake

@@ -1,191 +1,94 @@
 namespace :new_ui do
 
-  MODULE_APPS = [ %w(announcement bulletin),
-                  %w(archive archive_file),
-                  %w(ask ask_question ask_category),
-                  %w(asset asset),
-                  %w(faq qa),
-                  %w(gallery gallery_album gallery_category),
-                  %w(location location),
-                  %w(personal_book writing_book),
-                  %w(personal_conference writing_conference),
-                  %w(personal_experience experience),
-                  %w(personal_honor honor),
-                  %w(personal_journal writing_journal),
-                  %w(personal_patent writing_patent),
-                  %w(personal_project project),
-                  %w(web_resource web_link)
-                ] # app_key, model_name, category_name
-
-  task :migrate => :environment do
-    @db = Mongoid.database
-    migrate_tags
-    migrate_categories
-    migrate_approval_on_object
-    migrate_managers
-  end
-
   # :category_name is optional, depends on the naming of the category model: if no conventional, specify it
   task :migrate_categories, [:app_key, :model_name, :category_name] => :environment do |t, args|
-    migrate_categories(args)
+    @db = Mongoid.database
+    if args[:app_key] && args[:model_name]
+      migrate_category(args[:app_key], args[:model_name], args[:category_name])
+    else
+      module_apps = [ %w(announcement bulletin),
+                      %w(archive archive_file),
+                      %w(ask ask_question ask),
+                      %w(asset asset),
+                      %w(faq qa),
+                      %w(gallery gallery_album gallery),
+                      %w(personal_book writing_book),
+                      %w(personal_conference writing_conference),
+                      %w(personal_experience experience),
+                      %w(personal_honor honor),
+                      %w(personal_journal writing_journal),
+                      %w(personal_patent writing_patent),
+                      %w(personal_project project),
+                      %w(web_resource web_link)
+                    ]
+      module_apps.each{|value_array| migrate_category(value_array[0], value_array[1], value_array[2])}
+    end
+  end
+
+  def migrate_category(app_key, model_name, category_name=nil)
+    category_name = model_name unless category_name
+    # # coll_cat = @db["#{category_name}_categories"]
+    # # categories = coll_cat.find if coll_cat
+    module_app = ModuleApp.where(key: app_key)[0]
+    if module_app.has_category
+      categories = "#{category_name}_categories".classify.constantize.admin_manager_all rescue nil
+      categories = "#{category_name}_categories".classify.constantize.all if categories.blank?
+      categories.each do |category|
+        new_category = module_app.categories.build
+        new_category.title_translations = category['title']
+        new_category.disable = category['disable']
+        new_category.save
+        model_name.classify.constantize.where("#{category_name}_category_id" => category['_id']).each do |object|
+          if object.id.is_a?(String)
+            object.destroy
+          else
+            object.category = new_category.id
+            object.remove_attribute("#{category_name}_category_id")
+            object.save
+          end
+        end
+        if object_auths = ObjectAuth.where(obj_authable_type: "#{category_name.classify}Category")
+          object_auths.each do |object_auth|
+            case object_auth.title
+            when 'fact_check'
+              new_object_auth = new_category.get_object_auth_by_title("approval_#{module_app.key}")
+            else
+              new_object_auth = new_category.get_object_auth_by_title("category_#{module_app.key}")
+            end
+            object_auth.auth_users.each do |user|
+              new_object_auth.add_user_to_privilege_list(user)
+            end
+            object_auth.destroy
+          end
+        end
+        category.destroy
+      end
+    end
   end
 
   task :migrate_tags => :environment do
-    migrate_tags
-  end
-
-  task :fix_tagged_ids => :environment do
-    fix_tagged_ids
-  end
-
-  def migrate_categories(args = nil)
-    if args && args[:app_key] && args[:model_name]
-      migrate_category(args[:app_key], args[:model_name], args[:category_name])
-    else
-      MODULE_APPS.each{|value_array| migrate_category(value_array[0], value_array[1], value_array[2])}
-    end
-  end
-
-  def migrate_category(app_key, model_name, category_name = nil)
-    @db ||= Mongoid.database
-    category_name = "#{model_name}_category" unless category_name
-    collection_category = @db[category_name.pluralize]
-    categories = collection_category.find.entries if collection_category
-    collection_model = @db[model_name.pluralize]
-    collection_buffer_category = @db['buffer_categories']
-    collection_prototype_auth = @db['prototype_auths']
-    if categories.present?
-      module_app = ModuleApp.where(key: app_key).first
-      if module_app.try(:has_category)
-        categories.each do |category|
-          new_category = module_app.categories.build
-          new_category.title_translations = category['title']
-          new_category.disable = category['disable']
-          new_category.save
-          collection_model.find("#{category_name}_id" => category['_id']).each do |object|
-            object['category_id'] = new_category.id
-            object.delete("#{category_name}_id")
-            collection_model.save object
-            collection_buffer_category.save ({ '_type' => 'BufferCategory', 'category_id' => new_category.id, 'categorizable_type' => model_name.camelize, 'categorizable_id' => object['_id'] })
-          end
-          object_auths = collection_prototype_auth.find(_type: 'ObjectAuth', obj_authable_id: category['_id'], '$or' => [{privilege_user_ids: {'$not' => {'$size' => 0}}}, {role_ids: {'$not' => {'$size' => 0}}}, {sub_role_ids: {'$not' => {'$size' => 0}}}]).entries
-          if object_auths.present?
-            object_auths.each do |object_auth|
-              if object_auth['title'].eql?('fact_check')
-                authorization = new_category.auth_approval || new_category.create_auth_approval(module_app_id: module_app.id, title: "category_approval_#{module_app.key}")   
-              else
-                authorization = new_category.auth_sub_manager || new_category.create_auth_sub_manager(module_app_id: module_app.id, title: "category_authorization_#{module_app.key}")
-              end
-              add_users(object_auth, authorization)
-              collection_prototype_auth.remove(object_auth)
-            end
-          end
-        end
-        collection_category.drop
-        collection_prototype_auth.remove(obj_authable_type: category_name.classify)
-      end
-    else
-      collection_category.drop
-      collection_prototype_auth.remove(obj_authable_type: category_name.classify)
-    end
-  end
-
-  def fix_tagged_ids
-    Tag.all.each do |tag|
+    tags = Tag.where(_type: 'Tag')
+    tags.each do |tag|
+      module_app = ModuleApp.find(tag.module_tag_id)
+      new_tag = module_app.module_tags.build
+      new_tag.name_translations = tag['name']
+      new_tag.is_default = tag['is_default']
+      new_tag.save
+      n_tag = new_tag.tag
+      n_tag.cloud_view_count = tag['cloud_view_count']
+      n_tag.view_count = tag['view_count']
+      n_tag.save
       tag.taggings.each do |tagging|
-        tagged_ids = tagging.taggable.tagged_ids
-        unless tagged_ids.include?(tag.id.to_s)
-          tagged_ids << tag.id.to_s
-          tagging.taggable.update_attribute(:tagged_ids, tagged_ids)
-        end
+        tagging.taggable.taggings.create(tag_id: n_tag.id)
       end
+      tag.destroy
     end
   end
 
-  def migrate_tags
-    @db ||= Mongoid.database
-    tags = Tag.where(_type: 'Tag').entries
-    tags.each_with_index do |tag, i|
-      unless tag.tag_lease
-        if module_app = ModuleApp.find(tag[:module_tag_id])
-          new_tag = module_app.module_tags.build
-          new_tag.name_translations = tag['name']
-          new_tag.is_default = tag['is_default']
-          new_tag.save
-          n_tag = new_tag.tag
-          n_tag.cloud_view_count = tag['cloud_view_count']
-          n_tag.view_count = tag['view_count']
-          n_tag.save
-          tag.taggings.each do |tagging|
-            tagged_ids = tagging.taggable.tagged_ids
-            unless tagged_ids.include?(tag.id.to_s)
-              tagged_ids << tag.id.to_s
-              tagging.taggable.update_attribute(:tagged_ids, tagged_ids)
-            end
-            tagging.taggable.taggings.create(tag_id: n_tag.id)
-          end
-        end
-        tag.destroy
-      end
+  task :change_auth_naming => :environment do
+    ObjectAuth.where(title: /submit_/).each do |auth|
+      auth.update_attribute(:title, auth.title.gsub('submit_', 'category_'))
     end
-    old_tags = Tag.where(_type: {'$ne' => 'Tag'}).delete
-    @db = Mongoid.database
-    @db['proto_tags'].drop
-  end
-
-  def migrate_approval_on_object
-    @db ||= Mongoid.database
-    collection_prototype_auth = @db['prototype_auths']
-    object_auths = collection_prototype_auth.find({_type: 'ObjectAuth', obj_authable_type: {'$in' => ["AdBanner", "PageContext"]}, '$or' => [{privilege_user_ids: {'$not' => {'$size' => 0}}}, {role_ids: {'$not' => {'$size' => 0}}}, {sub_role_ids: {'$not' => {'$size' => 0}}}]}).entries
-    object_auths.each do |object_auth|
-      case object_auth['obj_authable_type']
-      when 'AdBanner'
-        module_app = ModuleApp.where(key: 'ad_banner').first
-      when 'PageContext'
-        module_app = ModuleApp.where(key: 'page_content').first
-      end
-      if module_app
-        object = object_auth['obj_authable_type'].constantize.find(object_auth['obj_authable_id']) rescue nil
-        if object 
-          authorization = object.create_auth_sub_manager(module_app_id: module_app.id, title: "#{object_auth['obj_authable_type'].underscore}_authorization_#{module_app.key}")
-          add_users(object_auth, authorization) if authorization
-        end
-      end
-      collection_prototype_auth.remove(object_auth)
-    end
-    collection_prototype_auth.remove(obj_authable_type: {'$in' => ["AdBanner", "PageContext"]})
-  end
-
-  def add_users(object_auth, authorization)    
-    if authorization
-      if object_auth['role_ids'].present?
-        roles = Role.find(object_auth['role_ids']) rescue nil
-        authorization.add_roles(roles) if roles
-      end
-      if object_auth['sub_role_ids'].present?
-        sub_roles = SubRole.find(object_auth['sub_role_ids']) rescue nil
-        authorization.add_sub_roles(sub_roles) if sub_roles
-      end
-      if object_auth['privilege_user_ids'].present?
-        users = User.find(object_auth['privilege_user_ids']) rescue nil
-        authorization.add_users(users) if users
-      end
-    end
-  end
-
-  def migrate_managers
-    @db ||= Mongoid.database
-    collection_app_manager = @db['app_managers']
-    app_managers = collection_app_manager.find(managing_app_id: {'$not' => {'$size' => 0}}).entries
-    app_managers.each do |app_manager|
-      module_app = ModuleApp.find(app_manager['managing_app_id']) rescue nil
-      user = User.find(app_manager['user_id']) rescue nil
-      if module_app && user
-        authorization = module_app.auth_manager || module_app.create_auth_manager(module_app_id: module_app.id, title: module_app.key)
-        authorization.add_users(user)
-      end
-    end
-    collection_app_manager.drop
   end
 
   task :reset_user_position => :environment do

vendor/built_in_modules/ad_banner/config/locales/en.yml

@@ -3,12 +3,6 @@ en:
   ad_banner:
     ad_banner: Ad Banner
     banner: Banner
-    banner_name: Banner Name
-    banner_name_note: Banner Name only english
-    ste: Transition Interval
-    ste_note: Please enter the number of seconds
-    best_size: Best Size
-    effect: Effect
     all: All
     categories: Categories
     add: Add

vendor/built_in_modules/ad_banner/config/locales/zh_tw.yml

@@ -3,12 +3,6 @@ zh_tw:
   ad_banner:
     ad_banner: 廣告輪播
     banner: 橫幅
-    banner_name: 橫幅名稱
-    banner_name_note: 橫幅名稱只能為英文
-    ste: 轉換間隔時間
-    ste_note: 請輸入秒數
-    best_size: 最佳尺寸
-    effect: 效果
     all: 全部
     categories: 類別
     add: 新增

vendor/built_in_modules/ad_banner/init.rb

@@ -11,9 +11,7 @@ module AdBanner
     update_info 'some update_info'
     
     taggable
-    authorizable do
-      authorizable_on('AdBanner')
-    end
+    authorizable
 
     # front_end do
     #   app_page 'bulletins'

vendor/built_in_modules/ask/app/controllers/panel/ask/front_end/ask_questions_controller.rb

@@ -9,33 +9,27 @@ class Panel::Ask::FrontEnd::AskQuestionsController < OrbitWidgetController
 
   def index
     @ask_question = AskQuestion.new
-    @categories = @module_app.categories.enabled
   end
 
   def create
     @ask_question = AskQuestion.new(params[:ask_question])
     if gotcha_valid? && @ask_question.save
-      @acknowledgement = AskAcknowledgement.last
+     @acknowledgement = AskAcknowledgement.last
       @ask_acknowledgement = AskAcknowledgement.first || AskAcknowlegement.new
-
+      #@ask_question.save
+      #redirect_to root_path
       AskAdmin.all.each do |ask_admin|
         AskMailer.notice(ask_admin, @ask_question).deliver
         Resque.enqueue(SendAskNoticeMail, ask_admin.id, @ask_question.id)
       end
-
-      # Render to create.js.erb
+ #      redirect_to panel_ask_front_end_thank_you_path
       respond_to do |format|
         format.js
-      end
-    else
-      # Render to index.js.erb
-      respond_to do |format| 
-        format.js { render :index }
+       # format.js { render :thank_you, notice: 'Your question has been successfully sent.' }
       end
     end
   end
 
-
   def thank_you
     @acknowledgement = AskAcknowledgement.last
     @item = Page.find(params[:page_id]) rescue nil

vendor/built_in_modules/ask/app/views/panel/ask/front_end/ask_questions/index.html.erb

@@ -35,7 +35,7 @@ $(document).ready(function(){
     <div class="control-group">
       <%= f.label :ask_category_id, class: 'control-label required' %>
       <div class="controls">
-        <%= f.select :category_id, @categories.collect{|t| [ t.title, t.id ]} %>
+        <%= f.collection_select :ask_category_id, AskCategory.all, :id, :name  %>
       </div>
     </div>
     <div class="control-group">

vendor/built_in_modules/ask/app/views/panel/ask/front_end/ask_questions/index.js.erb

@@ -1 +0,0 @@
-window.location.href = "<%= panel_ask_front_end_sorry_path %>";

vendor/built_in_modules/ask/app/views/panel/ask/front_end/ask_questions/sorry.html.erb

@@ -1 +0,0 @@
-<h3><%= t(:ask_fail, :scope => :ask) %> !</h3>

vendor/built_in_modules/ask/config/routes.rb

@@ -19,10 +19,8 @@ Rails.application.routes.draw do
 
       namespace :front_end do
         match "ask_questions/thank_you" => "ask_questions#thank_you", :as => 'thank_you'
-        match "ask_questions/sorry" => "ask_questions#sorry", :as => 'sorry' 
         resources :ask_questions
       end
-
     end
   end
 

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

@@ -92,6 +92,11 @@ orbitDesktop.prototype.initializePersonalBook = function(target,url,cache){ // t
         width: $(".overview").width() - 20
       });
   }
+  
+  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){

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

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

vendor/built_in_modules/personal_book/app/helpers/panel/personal_book/desktop/personal_books_helper.rb

@@ -71,11 +71,11 @@ module Panel::PersonalBook::Desktop::PersonalBooksHelper
   def link_publication_file publication
     publication.writing_book_files.map{|file|
       link_to(image_tag(check_file_type(file.file.url)) + \
-      content_tag(:span, (file.title_translations[I18n.locale.to_s] rescue nil), :class => "filetitle"),
+      content_tag(:span, file.title_translations[I18n.locale.to_s], :class => "filetitle"),
         file.file.url,
         :class => "file",
         "target" => "_blank",
-        "title" => (file.title_translations[I18n.locale.to_s] rescue nil))
+        "title" => file.title_translations[I18n.locale.to_s])
     }.inject(:+)
   end
 

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

@@ -90,7 +90,7 @@ class WritingBook
     title << self.publisher if self.publisher.present?
     title << self.pages if self.pages.present?
     # title << "(#{self.journal_level_types.collect{|x| x.title}.join(', ')})"
-    title.join(', ') 
+    title.join(', ')
   end
 
   protected

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

@@ -57,6 +57,11 @@
       </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,6 +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('announcement.add_new'), new_panel_personal_book_back_end_writing_book_path(:user_id => @user.id), :class => 'btn btn-primary' %>
 	</div>

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

@@ -42,6 +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(){

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/helpers/panel/personal_conference/desktop/conference_pages_helper.rb

@@ -71,11 +71,11 @@ module Panel::PersonalConference::Desktop::ConferencePagesHelper
   def link_publication_file publication
     publication.writing_conference_files.map{|file|
       link_to(image_tag(check_file_type(file.file.url)) + \
-        content_tag(:span, (file.title_translations[I18n.locale.to_s] rescue nil), :class => "filetitle"),
+        content_tag(:span, file.title_translations[I18n.locale.to_s], :class => "filetitle"),
         file.file.url,
         :class => "file",
         "target" => "_blank",
-        "title" => (file.title_translations[I18n.locale.to_s] rescue nil))
+        "title" => file.title_translations[I18n.locale.to_s])
     }.inject(:+)
   end
 

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

@@ -90,7 +90,7 @@ class WritingConference
     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

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

@@ -58,7 +58,12 @@
       </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>
 </div>

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

@@ -75,7 +75,11 @@
 <% 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('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">

vendor/built_in_modules/personal_diploma/app/helpers/panel/personal_diploma/desktop/personal_diplomas_helper.rb

@@ -71,11 +71,11 @@ module Panel::PersonalDiploma::Desktop::PersonalDiplomasHelper
   def link_publication_file publication
     publication.writing_conference_files.map{|file|
       link_to(image_tag(check_file_type(file.file.url)) + \
-        content_tag(:span, (file.title_translations[I18n.locale.to_s] rescue nil), :class => "filetitle"),
+        content_tag(:span, file.title_translations[I18n.locale.to_s], :class => "filetitle"),
         file.file.url,
         :class => "file",
         "target" => "_blank",
-        "title" => (file.title_translations[I18n.locale.to_s] rescue nil))
+        "title" => file.title_translations[I18n.locale.to_s])
     }.inject(:+)
   end
 

vendor/built_in_modules/personal_experience/app/helpers/panel/personal_experience/desktop/personal_experiences_helper.rb

@@ -71,11 +71,11 @@ module Panel::PersonalExperience::Desktop::PersonalExperiencesHelper
   def link_publication_file publication
     publication.writing_conference_files.map{|file|
       link_to(image_tag(check_file_type(file.file.url)) + \
-        content_tag(:span, file.title_translations[I18n.locale.to_s] rescue nil), :class => "filetitle"),
+        content_tag(:span, file.title_translations[I18n.locale.to_s], :class => "filetitle"),
         file.file.url,
         :class => "file",
         "target" => "_blank",
-        "title" => file.title_translations[I18n.locale.to_s] rescue nil))
+        "title" => file.title_translations[I18n.locale.to_s])
     }.inject(:+)
   end
 

vendor/built_in_modules/personal_honor/app/helpers/panel/personal_honor/desktop/personal_honors_helper.rb

@@ -64,11 +64,11 @@ module Panel::PersonalHonor::Desktop::PersonalHonorsHelper
   def link_publication_file publication
     publication.writing_book_files.map{|file|
       link_to(image_tag(check_file_type(file.file.url)) + \
-        content_tag(:span, (file.title_translations[I18n.locale.to_s] rescue nil), :class => "filetitle"),
+        content_tag(:span, file.title_translations[I18n.locale.to_s], :class => "filetitle"),
         file.file.url,
         :class => "file",
         "target" => "_blank",
-        "title" => (file.title_translations[I18n.locale.to_s] rescue nil))
+        "title" => file.title_translations[I18n.locale.to_s])
     }.inject(:+)
   end
 

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

@@ -42,6 +42,10 @@ 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,8 @@ 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

@@ -1,6 +1,5 @@
 module Panel::PersonalJournal::Desktop::JournalPagesHelper
   def publication_record publication, view
-   
     content_tag :li,
      "item" => "true",
        "data-id" => publication.id.to_s,
@@ -89,13 +88,12 @@ module Panel::PersonalJournal::Desktop::JournalPagesHelper
 
   def link_publication_file publication
     publication.writing_journal_files.map{|file|
-      
       link_to(image_tag(check_file_type(file.file.url)) + \
-        content_tag(:span, (file.title_translations[I18n.locale.to_s] rescue nil), :class => "filetitle"),
+        content_tag(:span, file.title_translations[I18n.locale.to_s], :class => "filetitle"),
         file.file.url,
         :class => "file",
         "target" => "_blank",
-        "title" => (file.title_translations[I18n.locale.to_s] rescue nil))
+        "title" => file.title_translations[I18n.locale.to_s])
     }.inject(:+)
   end
 

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

@@ -96,7 +96,7 @@ class WritingJournal
     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
 
   def new_writing_journal_files=(var)