Import Data, Sync Data

Conflicts:

	vendor/built_in_modules/personal_book/app/models/writing_book.rb
	vendor/built_in_modules/personal_conference/app/models/writing_conference.rb
	vendor/built_in_modules/personal_journal/app/models/writing_journal.rb

Gemfile

@@ -11,13 +11,14 @@ gem "net-ldap", "~> 0.3.1"
 gem 'devise', '1.5.3'
 gem 'exception_notification' # Send error trace
 gem 'execjs'
-gem 'jquery-rails', '2.1.4'
-gem 'jquery-ui-rails'
+gem 'jquery-rails', '3.0.4'
+gem 'jquery-ui-rails', "4.0.5"
 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"
@@ -38,7 +39,7 @@ gem 'resque-scheduler' # job scheduling
 gem 'resque-restriction'
 #gem 'rb-readline'
 # gem 'ruby-debug19'
-gem 'rubyzip'
+gem 'rubyzip', '< 1.0.0'
 
 gem 'sunspot_mongo'
 gem 'sunspot_solr'
@@ -97,6 +98,8 @@ 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
+//= require jquery.ui.all
 //= 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",function(){
+            $(o.contentHolder).empty().load("/desktop/desktop_container",function(){
               o.desktopData["d_desktop"] = "";
               o.initializeDesktop("d_desktop","",false);
             })
@@ -226,7 +226,8 @@ var orbitDesktop = function(dom){
 
   this.bindDesktopEvents = function(){  //this function will bind the global handlers to thd desktop, for example doc
     $(".docklist a").click(function(){
-        o.menu_item($(this));
+      if( !$( this ).parent().hasClass( 'disable' ) )
+          o.menu_item($(this));
       return false;
     });
 
@@ -274,10 +275,11 @@ var orbitDesktop = function(dom){
     });
 
     $("body").on("click","*[ajax-remote]",function(){
-      var $e = $(this);
-      var t = $e.attr("ajax-remote");
-      var classes_to_toggle = $e.attr("toggle-onclick");
-      var exe = $e.attr("callback-method"); // (typeof $e.attr("callback-method") == "function"? $e.attr("callback-method") : "");
+      var $e = $(this),
+          t = $e.attr("ajax-remote"),
+          classes_to_toggle = $e.attr("toggle-onclick"),
+          responsetype = $e.attr('response-type') ? $e.attr('response-type') : "html",
+          exe = $e.attr("callback-method"); // (typeof $e.attr("callback-method") == "function"? $e.attr("callback-method") : "");
       if(classes_to_toggle){
         $e.toggleClass(classes_to_toggle);
       }
@@ -289,9 +291,9 @@ var orbitDesktop = function(dom){
       }
       var ca = $e.attr("content-holder");
       var a = function(){
-
         $.ajax({
             type : t,
+            dataType : responsetype,
             url : $e.attr("href"),
             success : function(data){
               if(typeof data == "string"){
@@ -302,6 +304,7 @@ var orbitDesktop = function(dom){
                   // $("div[container=true]").html(data);
                 }
               }
+
               if(exe)
                 window.o[o.data_method][exe](data,$e);
               if(t == "delete"){
@@ -602,10 +605,11 @@ var orbitDesktop = function(dom){
 
   this.menu_item = function(dom,customload,submenuitem){
     if(!customload)customload=false;
-    var target = dom.attr("id");
-    var url = dom.attr("href");
+    var target = dom.attr("id"),
+        url = dom.attr("href"),
+        submenu_pass = ( dom.attr("sub-menu") == "false" ? false : true);
     if(!url)return false;
-   
+  
     o.data_method = dom.attr("callback-method");
     if(o.currenthtml!=target){
       if(o.desktopData[o.currentface] == "undefined"){
@@ -626,33 +630,37 @@ var orbitDesktop = function(dom){
                 window.o[o.data_method](target,url,cache);
               }
             }
-            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( submenu_pass ){
+              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 {
+                    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]);
-          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){}
+          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){}
+            }
 
-          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);
@@ -1092,7 +1100,7 @@ var orbitDesktop = function(dom){
               data : options,
               success : function(data){
                 if(data.success == "true"){
-                  if(dom.is(":checked")){ console.log("true");
+                  if(dom.is(":checked")){ 
                     elementSettingsData[$e.data("id")].sections.push({"id" : dom.data("section"),"name":sectionDetails.name});
                     o.notify("Added to " + sectionDetails.name,"success");
                   }else{
@@ -1116,20 +1124,16 @@ var orbitDesktop = function(dom){
       var info_open = function(){
         if($appinfo.is(":hidden")){
           $('.overview').stop().animate({'width': '+=480'},0 , function(){
-            $('.tinycanvas').tinyscrollbar_update();
+            // $('.tinycanvas').tinyscrollbar_update('relative');
           });
           $appinfo
             .css({
-              'display': 'block',
               'margin-left': -480
-            })
-            .delay(300)
+            }).fadeIn(200)
             .animate({
               'margin-left': 0
             }, 500, 'easeInOutQuint');
-        } else {
-          $('.tinycanvas').tinyscrollbar_update();
-        }
+        } 
       }
 
       var info_close = function(){
@@ -1140,13 +1144,11 @@ var orbitDesktop = function(dom){
               'margin-left': -480
             },500 , 'easeInOutQuint', function(){
               $('.overview').animate({'width': '-=480'}, 0, function(){
-                $('.tinycanvas').tinyscrollbar_update();
+                // $('.tinycanvas').tinyscrollbar_update();
               });
-              $(this).attr("style","");
+              $(this).fadeOut(300).attr("style","");
             });
-        } else {
-          $('.tinycanvas').tinyscrollbar_update();
-        }
+        } 
       }
       $(window).on('keydown', function(){
         if($('#searchbox').val() == 'Search'){

app/assets/javascripts/kernel.js

@@ -1,30 +1,58 @@
+var banners = [];
+var banner_index = 0;
+
 $(document).ready(function() {
-	
 	$.each($(".dymanic_load"),function(){
-		if($(this).attr("path")==''){$(this).html("App setting Failed");} 
-		
-		if($(this).attr("path")!=''){
-				 ajax_load_proc($(this),$(this).attr("path"));
-				} 
+		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"));
 			}
-			);
-	$("#main_content").addClass("module");
+		}
 	});
 
-function ajax_load_proc(wapper,url){
+	$("#main_content").addClass("module");
+});
+
+function ajax_load_proc(wapper,url,isBanner){
 	$.get(encodeURI(url), {}, function(respText,textSta,XML){ 
-			if (textSta == 'success') {
-				wapper.html(respText);	
-			};
-			if(textSta == 'error')
-				wapper.html("Loading Failed<br/>  <a href='"+$(this).attr('path')+"'>Go See</a>");
+		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>");
 	});
 }
 
-// Ad Banner FX code [start]
-function getTimeout() { 
-    return $(this).attr('time_to_next'); 
-} 
+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);
+	}
+}
 
 $(document).ready(function() { 
 	$(document).on('click', '.slideshow img', function()

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

@@ -43,8 +43,14 @@ $(function(){
     placeholder: 'placeholder',
     startCollapsed: true,
     disableNesting: 'no-nest',
-    stop: function(event, ui) {
-      $.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() } );
+    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 } );
     }
   });
   $(".sortable").delegate(".brand, .delete", clickEvent, function(e){

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

@@ -55,6 +55,13 @@
             } 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/lib/list-check.js

@@ -80,27 +80,22 @@ $(function() {
     _data.actionable ? $('#dialog').modal('show') : "";
     e.preventDefault();
   });
-
-  $("#dialog").on(clickEvent, '.delete-item', function() {
-    var _v = [],
-        _t = $t.attr("rel");
-
-    $("tbody .list-check:checked").each(function() {
-        _v.push(this.value);
+  $('.delete-item').on(clickEvent, function() {
+    var _v = [];
+    $("tbody .list-check").each(function() {
+      this.checked && _v.push("ids[]="+this.value)
     });
-
-    $.ajax({
-      url : _t,
-      type:"get",
-      data : {"ids":_v},
-      dataType : "json",
-      success : function(){
-        actionSuccess(_data.checkAction);
-      }
-    })
-
+    var _t = $t.attr("rel");
+    if(_t.indexOf("?") > -1) {
+      $.ajax(_t + "&" + _v.join("&")).done(function() {
+        actionSuccess(_data.checkAction)
+      });
+    } else {
+      $.ajax(_t + "?" + _v.join("&")).done(function() {
+        actionSuccess(_data.checkAction)
+      });
+    }
     $('#dialog').modal('hide');
     $('.list-active-btn').addClass('disabled').data('actionable', false);
-  })
-
+  });
 });

app/assets/javascripts/lib/member/sort.js.erb

@@ -0,0 +1,56 @@
+function dragMode() {
+  $('#card-list').sortable({
+    placeholder: "highlight",
+    update: function( event, ui ) {
+      var _userPosition = {};
+      _userPosition.position = $(ui.item).index();
+      _userPosition.id = $(ui.item).data('user-id');
+      $.ajax({
+        url: "<%= Rails.application.routes.url_helpers.update_order_card_admin_users_new_interface_index_path %>",
+        type: 'POST',
+        dataType: 'script',
+        data: {users: _userPosition}
+      });
+    }
+  });
+  $('#card-list').disableSelection();
+}
+
+function typeMode() {
+  var _userPosition = [];
+  $('#list-view tbody tr').each(function(i) {
+    $(this).data('user-index', i);
+  });
+
+  $('#member-list').on(clickEvent, '.edit_position', function(e){
+    var $input = $('<input type="text">'),
+        $cross = $('<a class="btn btn-mini"><i class="icons-cross"/></a>');
+    if($(this).siblings('input').length) {
+      $(this).siblings('input').attr('type', 'text').after($cross);
+    } else {
+      $(this).after($cross);
+      $(this).after($input);
+    }
+    $(this).hide();
+    $input.val($(this).text());
+    e.preventDefault();
+    $cross.click(function(event) {
+      $input.remove();
+      $(this).siblings('a').show().end().remove();
+    });
+  });
+
+  $('.bottomnav').on(clickEvent, '.btn', function(e) {
+    _userPosition = [];
+    $('#member-list tbody input').each(function(i) {
+      _userPosition.push([$(this).val(), $(this).siblings('a').data('user-id')]);
+    });
+    $.ajax({
+      url: "<%= Rails.application.routes.url_helpers.update_order_list_admin_users_new_interface_index_path %>",
+      type: 'POST',
+      dataType: 'script',
+      data: {users: _userPosition}
+    });
+    e.preventDefault();
+  });
+};

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.latest.js
+//= require lib/jquery.cycle.all.js

app/assets/javascripts/structure.js

@@ -1,5 +1,5 @@
 //= require basic
-//= require lib/jquery-ui-1.10.2.custom.min.js
+//= require jquery.ui.sortable
 //= require lib/jquery.ui.touch-punch.min.js
 //= require lib/jquery.mjs.nestedSortable.js
 //= require lib/items/items

app/assets/stylesheets/basic/global.css

@@ -83,6 +83,7 @@ legend {
   min-width: 61px;
   z-index: 1030;
   position: fixed;
+  padding-top: 40px;
   background-color: #171717;
   -webkit-box-shadow: inset -1px 0px 10px #000000;
      -moz-box-shadow: inset -1px 0px 10px #000000;
@@ -91,12 +92,14 @@ legend {
 }
 #sidebar #sidebar-menu {
   position: absolute;
-  top: 88px;
+  top: 85px;
   bottom: 0;
-  z-index: 1;
+  z-index: 0;
   display: block;
   width: 61px;
-  /*overflow: auto;*/
+}
+#sidebar #sidebar-menu.nano {
+  top: 0;
 }
 #sidebar .scroller {
   position: absolute;
@@ -120,16 +123,12 @@ legend {
   list-style: none;
 }
 #sidebar > h2.position {
-  top: 40px;
   margin: 0;
   width: 61px;
   color: #FFFFFF;
   font-weight: normal;
-  font-size: 2.4em;
-  line-height: 47px;
-  line-height: 46px\9;
   text-align: center;
-  position: absolute;
+  position: relative;
   background-color: #08c;
   background-image: -moz-linear-gradient(top, #08c, #006091);
   background-image: -ms-linear-gradient(top, #08c, #006091);
@@ -158,24 +157,20 @@ legend {
 }
 #sidebar > h2.position a {
   color: #FFFFFF;
-  padding: 6px 6px 5px;
   text-decoration: none;
+  display: inline-block;
   -webkit-text-shadow: 0px -1px 0px #333333;
      -moz-text-shadow: 0px -1px 0px #333333;
        -o-text-shadow: 0px -1px 0px #333333;
           text-shadow: 0px -1px 0px #333333;
 }
+#sidebar > h2.position a i {
+  line-height: 45px;
+}
 #sidebar .sidebar-nav > li {
   min-width: 61px;
-  height: 45px;
 }
-#sidebar .sidebar-nav > li.active {
-  font-size: 1.2em;
-}
-#sidebar .sidebar-nav > li.active .sub-nav-block {
-  display: block;
-}
-#sidebar .sidebar-nav > li.active > a > span {
+#sidebar .sidebar-nav > li.active span {
   color: #FFFFFF;
   cursor: pointer;
   -webkit-text-shadow: 0px -1px 0px #636363;
@@ -183,8 +178,7 @@ legend {
        -o-text-shadow: 0px -1px 0px #636363;
           text-shadow: 0px -1px 0px #636363;
 }
-#sidebar .sidebar-nav > li > a > span {
-  padding: 10px;
+#sidebar .sidebar-nav > li span {
   color: #B0B0B0;
   display: block;
   -webkit-text-shadow: 0px 1px 0px #000000;
@@ -192,8 +186,15 @@ legend {
        -o-text-shadow: 0px 1px 0px #000000;
           text-shadow: 0px 1px 0px #000000;
 }
-#sidebar .sidebar-nav > li > a > span > i {
-  font-size: 1.7em;
+#sidebar .sidebar-nav > li a {
+  display: block;
+}
+#sidebar .sidebar-nav > li i {
+  font-size: 1.6em;
+  line-height: 45px;
+}
+#sidebar .sidebar-nav > li.active i {
+  font-size: 2.2em;
 }
 #sidebar .sub-nav-block-list {
   top: 40px;
@@ -274,7 +275,7 @@ legend {
 }
 #sidebar .sub-nav-arrow {
   left: 53px;
-  top: -10px;
+  top: -16px;
   width: 0px;
   height: 0px;
   z-index: -1;
@@ -282,7 +283,6 @@ legend {
   border-style: solid;
   border-width: 8px 8px 8px 0;
   border-color: transparent #0088CC transparent transparent;
-  display: none\9; /* 用IE的去死 */
 }
 
 
@@ -300,14 +300,15 @@ legend {
   position: absolute;
   z-index: 100;
   width: 100%;
-  border-radius: 1px;
-  background-color: rgba(0, 136, 204, .3);
+  border-radius: 50%/1px;
+  background-color: rgba(0, 136, 204, .6);
 }
 
 
 /* Main Wrap */
 #main-wrap {
   padding-top: 40px;
+  position: relative;
 }
 #main-wrap .wrap-inner {
   padding: 60px 20px 20px;
@@ -419,6 +420,7 @@ legend {
 /* Search Clear */
 .searchClear {
   position: relative;
+  display: inline-block;
 }
 .searchClear .icon-search {
   position: absolute;
@@ -520,10 +522,9 @@ legend {
   padding: 0px 5px;
   position: absolute;
   z-index: 9999;
-  max-width: 500px;
+  max-width: 300px;
   border-radius: 3px;
   background-color: #0088CC;
-  white-space: nowrap;
 }
 #sideset .ui-tooltip.sidebar-tooltip:after {
   display: none;
@@ -533,10 +534,9 @@ legend {
   padding: 0px 5px;
   position: absolute;
   z-index: 9999;
-  max-width: 500px;
+  max-width: 300px;
   border-radius: 3px;
   background-color: #000000;
-  white-space: nowrap;
 }
 .ui-tooltip:after {
   content: '';
@@ -551,6 +551,135 @@ legend {
   border-color: #000000 transparent transparent transparent;
 }
 
+/* Sign In */
+#sign-in {
+  background-color: #F3F3F3;
+  background-repeat: no-repeat;
+  background : -webkit-radial-gradient(center center,circle cover, #F3F3F3 10%, #DBDBDB 100%);
+  background : -moz-radial-gradient(center center,circle cover, #F3F3F3 10%, #DBDBDB 100%);
+  background : -o-radial-gradient(center center,circle cover, #F3F3F3 10%, #DBDBDB 100%);
+  background : -ms-radial-gradient(center center,circle cover, #F3F3F3 10%, #DBDBDB 100%); 
+  background : -radial-gradient(center center,circle cover, #F3F3F3 10%, #DBDBDB 100%);
+}
+.sign-in {
+  text-align: center;
+  position: relative;
+  width: 300px;
+  margin: 150px auto 0;
+}
+.sign-in .other-sign-in {
+  display: none;
+}
+.sign-in .login-logo {
+  margin: 0;
+  padding-bottom: 15px;
+  border-bottom: 1px solid #ededed;
+}
+.sign-in .alert {
+  box-shadow: 0 3px 10px #CBCBCB;
+  text-align: left;
+}
+.sign-in .form {
+  background-color: #FFF;
+  box-shadow: 0 10px 20px #CBCBCB;
+  padding: 15px;
+  margin-bottom: 20px;
+}
+.sign-in .form-block {
+  overflow: hidden;
+}
+.sign-in .form-list {
+  width: 555px;
+}
+.sign-in .content {
+  float: left;
+  margin-bottom: 0;
+  position: relative;
+}
+.sign-in .content + .content {
+  margin-left: 15px;
+}
+.sign-in .control-group {
+  position: relative;
+  width: 270px;
+  margin: 0;
+}
+.sign-in .control-group label {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 39px;
+  height: 40px;
+  line-height: 40px;
+  margin: 0;
+  color: #5C5C5C;
+}
+.sign-in .control-group input {
+  width: 222px;
+  height: 30px;
+  padding: 4px 6px 4px 40px;
+  margin-bottom: 25px;
+}
+.sign-in .btn {
+  padding: 4px 0;
+  display: block;
+  width: 100%;
+  margin-bottom: 10px;
+}
+.sign-in .other-sign-in {
+  position: relative;
+  margin-top: 20px;
+  margin-bottom: 30px;
+  padding-bottom: 20px;
+  border-bottom: 1px solid #ededed;
+}
+.sign-in .other-sign-in p {
+  position: absolute;
+  width: 30px;
+  height: 30px;
+  background-color: #FFF;
+  padding: 0 10px;
+  margin-bottom: 0;
+  margin-left: -25px;
+  line-height: 30px;
+  left: 50%;
+  bottom: -15px;
+  font-size: 1.3em;
+  color: #b1b1b1;
+}
+.sign-in .checkbox {
+  position: absolute;
+  text-align: left;
+  bottom: 37px;
+}
+.sign-in .switchboard {
+  color: #08C;
+  cursor: pointer;
+}
+.sign-in .switchboard span,
+.sign-in .switchboard.active i {
+  display: inline;
+}
+.sign-in .switchboard.active span,
+.sign-in .switchboard i {
+  display: none;
+}
+.register {
+  box-shadow: inset 0 5px 5px #E0E0E0;
+  background-color: #eee;
+  padding: 15px;
+  margin: 15px -15px -15px;
+}
+.register .btn {
+  margin: 0;
+}
+.have-other-sign-in {
+  margin: 80px auto 0;
+}
+.have-other-sign-in .other-sign-in {
+  display: block;
+}
+
 /* IE go die */
 :root #sidebar .sub-nav-block:before {
   display: block\9;

app/assets/stylesheets/desktop/desktop-component.scss

@@ -21,10 +21,14 @@
 	}
 	.form_fix {
 		textarea {
-			margin-bottom: 12px;
+		    margin-bottom: 12px;
 		}
-		input {
+		input[type="text"] {
 			margin-left: 0;
+			margin-top: 0;
+		}
+		input[type="text"] + input {
+			margin-top: 12px;
 		}
 	}
 	// fixed width column with 12px gutter

app/assets/stylesheets/lib/checkbox-card.css

@@ -125,6 +125,14 @@
 }
 
 
+#list-view .checkbox-card li {
+	-webkit-transition: none;
+	   -moz-transition: none;
+		 -o-transition: none;
+			transition: none;
+}
+
+
 
 /* Responsive */
 @media (max-width: 767px) {

app/assets/stylesheets/lib/codemirror/theme/midnight.css

@@ -0,0 +1,52 @@
+/* Based on the theme at http://bonsaiden.github.com/JavaScript-Garden */
+
+/*<!--breakpoint-->*/
+.breakpoints {width: .8em;}
+.breakpoint { color: #822; }
+
+/*<!--match-->*/
+span.CodeMirror-matchhighlight { background: #494949 }
+.CodeMirror-focused span.CodeMirror-matchhighlight { background: #314D67 !important; }
+
+/*<!--activeline-->*/
+.activeline {background: #253540 !important;}
+
+.cm-s-midnight.CodeMirror {
+    background: #0F192A;
+    color: #D1EDFF;
+}
+
+.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
+
+.cm-s-midnight div.CodeMirror-selected {background: #314D67 !important;}
+.cm-s-midnight .CodeMirror-gutters {background: #0F192A; border-right: 1px solid;}
+.cm-s-midnight .CodeMirror-linenumber {color: #D0D0D0;}
+.cm-s-midnight .CodeMirror-cursor {
+    border-left: 1px solid #F8F8F0 !important;
+}
+
+.cm-s-midnight span.cm-comment {color: #428BDD;}
+.cm-s-midnight span.cm-atom {color: #AE81FF;}
+.cm-s-midnight span.cm-number {color: #D1EDFF;}
+
+.cm-s-midnight span.cm-property, .cm-s-tropicaleve span.cm-attribute {color: #A6E22E;}
+.cm-s-midnight span.cm-keyword {color: #E83737;}
+.cm-s-midnight span.cm-string {color: #1DC116;}
+
+.cm-s-midnight span.cm-variable {color: #FFAA3E;}
+.cm-s-midnight span.cm-variable-2 {color: #FFAA3E;}
+.cm-s-midnight span.cm-def {color: #4DD;}
+.cm-s-midnight span.cm-error {background: #F92672; color: #F8F8F0;}
+.cm-s-midnight span.cm-bracket {color: #D1EDFF;}
+.cm-s-midnight span.cm-tag {color: #008;}
+.cm-s-midnight span.cm-link {color: #AE81FF;}
+
+.cm-s-midnight .CodeMirror-matchingbracket {
+  text-decoration: underline;
+  color: white !important;
+}
+
+.typ { color: #FFAA3E; }
+.atn { color: #606; }
+.atv { color: #080; }
+.dec { color: #606; }

app/assets/stylesheets/lib/codemirror/theme/theme.css

@@ -1,21 +1,23 @@
-@import url(/orbit_4.0.1/assets/stylesheets/lib/codemirror/theme/ambiance-mobile.css);
-@import url(/orbit_4.0.1/assets/stylesheets/lib/codemirror/theme/ambiance.css);
-@import url(/orbit_4.0.1/assets/stylesheets/lib/codemirror/theme/blackboard.css);
-@import url(/orbit_4.0.1/assets/stylesheets/lib/codemirror/theme/cobalt.css);
-@import url(/orbit_4.0.1/assets/stylesheets/lib/codemirror/theme/eclipse.css);
-@import url(/orbit_4.0.1/assets/stylesheets/lib/codemirror/theme/elegant.css);
-@import url(/orbit_4.0.1/assets/stylesheets/lib/codemirror/theme/erlang-dark.css);
-@import url(/orbit_4.0.1/assets/stylesheets/lib/codemirror/theme/midnight.css);
-@import url(/orbit_4.0.1/assets/stylesheets/lib/codemirror/theme/monokai.css);
-@import url(/orbit_4.0.1/assets/stylesheets/lib/codemirror/theme/neat.css);
-@import url(/orbit_4.0.1/assets/stylesheets/lib/codemirror/theme/night.css);
-@import url(/orbit_4.0.1/assets/stylesheets/lib/codemirror/theme/rubyblue.css);
-@import url(/orbit_4.0.1/assets/stylesheets/lib/codemirror/theme/solarized.css);
-@import url(/orbit_4.0.1/assets/stylesheets/lib/codemirror/theme/theme.css);
-@import url(/orbit_4.0.1/assets/stylesheets/lib/codemirror/theme/twilight.css);
-@import url(/orbit_4.0.1/assets/stylesheets/lib/codemirror/theme/vibrant-ink.css);
-@import url(/orbit_4.0.1/assets/stylesheets/lib/codemirror/theme/xq-dark.css);
-@import url(/orbit_4.0.1/assets/stylesheets/lib/codemirror/theme/xq-light.css);
+/*
+  *= require 'lib/codemirror/theme/ambiance-mobile'
+  *= require "lib/codemirror/theme/ambiance"
+  *= require "lib/codemirror/theme/blackboard"
+  *= require "lib/codemirror/theme/cobalt"
+  *= require "lib/codemirror/theme/eclipse"
+  *= require "lib/codemirror/theme/elegant"
+  *= require "lib/codemirror/theme/erlang-dark"
+  *= require "lib/codemirror/theme/midnight"
+  *= require "lib/codemirror/theme/monokai"
+  *= require "lib/codemirror/theme/neat"
+  *= require "lib/codemirror/theme/night"
+  *= require "lib/codemirror/theme/rubyblue"
+  *= require "lib/codemirror/theme/solarized"
+  *= require "lib/codemirror/theme/theme"
+  *= require "lib/codemirror/theme/twilight"
+  *= require "lib/codemirror/theme/vibrant-ink"
+  *= require "lib/codemirror/theme/xq-dark"
+  *= require "lib/codemirror/theme/xq-light"
+*/
 .cm-tab {
 	border-left: 1px solid rgba(200, 200, 200, .2);
 }

app/assets/stylesheets/lib/main-list.css

@@ -1,200 +0,0 @@
-/* Main List */
-.main-list {
-  margin-bottom: 10px;
-}
-.main-list tbody {
-  border: 1px solid #dddddd;
-}
-.main-list thead {
-  border: 1px solid #454545;
-}
-.main-list thead th {
-  vertical-align: middle;
-  background-color: #454545;
-  white-space: nowrap;
-  color: #FFFFFF;
-}
-.main-list tbody tr.disable td {
-  color: #C5C5C5;
-  background-color: #eeeeee;
-}
-.main-list tbody tr.disable td .label-info {
-  background-color: #999999;
-}
-.main-list tbody tr.active td:first-child {
-  position: relative;
-}
-.main-list tbody tr.active td:first-child:before {
-  content: "";
-  width: 0px;
-  height: 0px;
-  left: -21px;
-  top: 50%;
-  margin-top: -6px;
-  position: absolute;
-  border-style: solid;
-  border-width: 6px 0 6px 6px;
-  border-color: transparent transparent transparent #333333;
-}
-.main-list td {
-  background-color: #FFFFFF;
-}
-.main-list td input[type="text"] {
-  margin-bottom: 0;
-  margin-left: -.4em;
-  margin-right: 3px;
-  padding: 0 .3em;
-  width: 4em;
-}
-.main-list td.action {
-  vertical-align: middle;
-  text-align: right;
-}
-.main-list td.preview img {
-  width: 100%;
-}
-.main-list td .banner-link {
-  width: 100px;
-  max-width: 120px;
-  display: inline-block;
-  text-overflow: ellipsis;
-  overflow: hidden;
-}
-.main-list td .file-list {
-  display: inline-block;
-  margin: 0 0 -6px;
-}
-.main-list td .file-list:after {
-  content: "";
-  clear: both;
-  display: block;
-  height: 0;
-  visibility: hidden;
-}
-.main-list td .file-type {
-  position: relative;
-  list-style: none;
-  float: left;
-  display: inline-block;
-}
-.main-list td .file-type a {
-  background-color: #A6A6A6;
-  color: #FFFFFF;
-  margin-right: 10px;
-  padding: 2px 5px 2px 3px;
-  border-radius: 3px;
-  text-decoration: none;
-  text-shadow: 0px -1px 0px rgba(100, 100, 100, .6);
-}
-.main-list td .file-type i,
-.main-forms fieldset .input-area .controls .file-type i {
-  width: 16px;
-  height: 16px;
-  margin-bottom: -1px;
-  display: inline-block;
-}
-.main-list td .file-type[class^="type-"] i,
-.main-list td .file-type[class*=" type-"] i,
-.main-forms fieldset .input-area .controls .file-type[class*=" type-"] i,
-.main-forms fieldset .input-area .controls .file-type[class^="type-"] i {
-  background-image: url(/orbit_4.0.1/assets/images/file_type.png);
-}
-.file-type.type-pdf i   {background-position: 0px 0px;}
-.file-type.type-psd i   {background-position: -16px 0px;}
-.file-type.type-ai i    {background-position: -32px 0px;}
-.file-type.type-fla i   {background-position: -48px 0px;}
-.file-type.type-in i    {background-position: -64px 0px;}
-.file-type.type-acc i   {background-position: 0px -16px;}
-.file-type.type-do i    {background-position: -16px -16px;}
-.file-type.type-xl i    {background-position: -32px -16px;}
-.file-type.type-pp i    {background-position: -48px -16px;}
-.file-type.type-zip i   {background-position: -64px -16px;}
-.file-type.type-txt i   {background-position: 0px -32px;}
-.file-type.type-jp i    {background-position: -16px -32px;}
-.file-type.type-gif i   {background-position: -32px -32px;}
-.file-type.type-png i   {background-position: -48px -32px;}
-.file-type.type-audio i {background-position: -64px -32px;}
-
-.main-list td .quick-edit {
-  height: 24px;
-  margin-top: 5px;
-}
-.main-list td .quick-edit .nav {
-  display: none; 
-  margin-bottom: 0;
-}
-.main-list tr:hover .quick-edit .nav {
-  display: block;
-}
-.main-list td .quick-edit .nav > li > a {
-  padding-top: 4px;
-  padding-bottom: 4px;
-  margin-top: 0px;
-  margin-bottom: 0px;
-  border: 1px dotted #d1d1d1;
-}
-.main-list td .quick-edit .nav > li > a:hover {
-  border: 1px dotted transparent;
-}
-.main-list thead tr.sort-header th a {
-  padding: 8px;
-  margin: -8px;
-  display: block;
-  color: #FFFFFF;
-  text-decoration: none;
-}
-.main-list thead tr.sort-header th.active a {
-  padding-bottom: 4px;
-  border-bottom: 4px solid #08c;
-}
-.main-list .footable-row-detail td {
-  padding: 0;
-  border-top: none;
-}
-.main-list .footable-row-detail td .footable-row-detail-inner {
-  display: none;
-  padding: 8px;
-  position: relative;
-  border-radius: 5px;
-  margin: 0 8px 8px;
-  background-color: #ededed;
-}
-.main-list .footable-row-detail td .footable-row-detail-inner:after {
-  display: block;
-  height: 0px;
-  width: 0px;
-  position: absolute;
-  top: -6px;
-  left: 50%;
-  margin-left: -3px;
-  content: "";
-  border-style: solid;
-  border-width: 0 6px 6px 6px;
-  border-color: transparent transparent #ededed transparent;
-}
-.main-list .footable-row-detail td .footable-row-detail-inner div {
-  margin: 10px 0;
-}
-#preview .preview {
-  margin: 0 auto;
-}
-
-
-/* For Retina */
-@media screen and (-webkit-min-device-pixel-ratio: 2), screen and (max--moz-device-pixel-ratio: 2) {
-  .main-list td .file-type[class^="type-"] i,
-  .main-list td .file-type[class*=" type-"] i,
-  .main-forms fieldset .input-area .controls .file-type[class*=" type-"] i,
-  .main-forms fieldset .input-area .controls .file-type[class^="type-"] i {
-    background-image: url(/orbit_4.0.1/assets/images/file_type@2x.png);
-    background-size: 80px 48px;
-  }
-}
-
-
-/* Responsive */
-@media (max-width: 480px) {
-  .main-list td .quick-edit .nav {
-    display: block;
-  }
-}

app/assets/stylesheets/lib/main-list.css.erb

@@ -39,6 +39,13 @@
 .main-list td {
   background-color: #FFFFFF;
 }
+.main-list td input[type="text"] {
+  margin-bottom: 0;
+  margin-left: -.4em;
+  margin-right: 3px;
+  padding: 0 .3em;
+  width: 4em;
+}
 .main-list td.action {
   vertical-align: middle;
   text-align: right;

app/assets/stylesheets/lib/member.css

@@ -10,6 +10,12 @@
 }
 
 /* List */
+#list-view #member-list tr.highlight td {
+	background-color: #FFFAE5;
+}
+#list-view #member-list tr.highlight td:first-child {
+	padding: 0
+}
 #list-view #member-list .gender,
 #list-view #member-list td[class^="gender-"] {
 	width: 5px;
@@ -189,6 +195,10 @@
 #list-view #member-card > li:hover .member-avatar .action {
 	visibility: visible;
 }
+#list-view #member-card .highlight {
+	background-color: #F0F0F0;
+	outline: 1px dashed #9E9E9E;
+}
 #list-view #member-card .member-avatar {
 	width: 150px;
 	height: 150px;

app/assets/stylesheets/lib/wrap-nav.css

@@ -29,6 +29,9 @@
 .topnav .btn-group {
   margin-left: 0;
 }
+.topnav .view-switch {
+  margin-left: 10px;
+}
 
 /* Bottom Nav */
 .bottomnav {

app/assets/stylesheets/orbit_bar_bootstrap.css

@@ -223,7 +223,7 @@
 
 #orbit-bar {
   margin: 0;
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-family: "Chivo";
   font-size: 12px;
   line-height: 20px;
   color: #333333;

app/controllers/admin/ad_banners_controller.rb

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

app/controllers/admin/ad_images_controller.rb

@@ -22,8 +22,10 @@ class Admin::AdImagesController < Admin::AdBannersController
   end
   
   def update
-    @ad_image = AdImage.find(params[:id])
+    @ad_banner = AdBanner.find params[:ad_banner][:id]
+    @ad_image = AdImage.find(params[:ad_image][:id])
     @ad_image.update_attributes(params[:ad_image])
+    @ad_banner.ad_images << @ad_image
     redirect_to  admin_ad_images_path
   end
   
@@ -38,10 +40,10 @@ class Admin::AdImagesController < Admin::AdBannersController
   end
   
   def create
-   # @ad_banner = AdBanner.find params[:ad_banner][:id]
+    @ad_banner = AdBanner.find params[:ad_banner][:id]
     @ad_image = AdImage.new  params[:ad_image]
-    #@ad_image.to_save = true
-    #@ad_banner.ad_images << ad_image
+    @ad_image.to_save = true
+    @ad_banner.ad_images << @ad_image
 
     if @ad_image.save
       redirect_to admin_ad_images_path

app/controllers/admin/authorizations_controller.rb

@@ -34,38 +34,30 @@ class Admin::AuthorizationsController < OrbitBackendController
   end
 
   def add_roles
-    roles = Role.find(params[:role_ids]) rescue []
-    users = []
-    roles.each do |role|
-      users += role.users.all.entries
-    end
-    unless roles.blank?
+    roles = Role.find(params[:role_ids]) rescue nil
+    unless roles.nil?
       authorization = get_or_create_authorization
-      add_roles_to_auth(authorization, roles) unless @error
+      add_roles_to_auth(authorization, roles)
     end
     @users = authorization.authorized_users
     render 'admin/authorizations/reload_users'
   end
 
   def add_sub_roles
-    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?
+    sub_roles = SubRole.find(params[:sub_role_ids]) rescue nil
+    unless sub_roles.nil?
       authorization = get_or_create_authorization
-      add_sub_roles_to_auth(authorization, sub_roles) unless @error
+      add_sub_roles_to_auth(authorization, sub_roles)
     end
     @users = authorization.authorized_users
     render 'admin/authorizations/reload_users'
   end
 
   def add_users
-    users = User.find(params[:user_ids]) rescue []
-    unless users.blank?
+    users = User.find(params[:user_ids]) rescue nil
+    unless users.nil?
       authorization = get_or_create_authorization
-      add_users_to_auth(authorization, users) unless @error
+      add_users_to_auth(authorization, users)
     end
     @users = authorization.authorized_users
     render 'admin/authorizations/reload_users'
@@ -120,10 +112,6 @@ 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
@@ -151,7 +139,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: "#{@type}_#{@module_app.key}")
+      @module_app.auth_manager || @module_app.create_auth_manager(module_app_id: @module_app.id, title: @module_app.key)
     else
       auth = @object.get_authorization_by_title("#{@type}_#{@module_app.key}")
       unless auth
@@ -162,10 +150,6 @@ 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,8 +27,8 @@ class Admin::ItemsController < OrbitBackendController
 
   def update_position
     item = Item.find(params[:id])
-    item.shift_to(params[:parent_id], params[:position])
-    render :nothing => true
+    item.shift_to(params[:parent_id], params[:position].to_i)
+    render :nothing => true, status: 200
   end
   
 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

@@ -250,18 +250,44 @@ class Admin::UsersNewInterfaceController <  OrbitMemberController
 
   end
 
-  def edit_order
+  def edit_order_card
     @users = User.not_guest_user
+    @type = 'card'
+    render 'edit_order'
   end
 
-  def update_order
+  def edit_order_list
+    @users = User.not_guest_user
+    @type = 'list'
+    render 'edit_order'
+  end
+
+  def update_order_card
+    @error = false
+    if params[:users].present?
+      to_go = params[:users][:position].to_i
+      user_at_position = User.where(position: to_go).first
+      user = User.find(params[:users][:id])
+      if user_at_position
+        if user.position > user_at_position.position
+          user.move_above(user_at_position)
+        else
+          user.move_below(user_at_position)
+        end
+      end
+    end
+    render nothing: true, status: 200
+  end
+
+  def update_order_list
+    @error = []
     if params[:users].present?
       params[:users].values.sort.each do |pair|
         to_go = pair[0].to_i
         if to_go > 0
           user_at_position = User.where(position: to_go - 1).first
           user = User.find(pair[1])
-          if user_at_position && !user_at_position == user
+          if user_at_position && !(user_at_position == user)
             if user.position > user_at_position.position
               user.move_above(user_at_position)
             else

app/controllers/application_controller.rb

@@ -18,7 +18,7 @@ class ApplicationController < ActionController::Base
   helper_attr :site_valid_locales
 
   def check_backend_openness
-    if !Me.backend_openness_on
+    if Site.first.backend_openness_on
       redirect_to '/users/sign_in'   if not (authenticate_user! and is_member? )
     end
   end
@@ -140,7 +140,9 @@ class ApplicationController < ActionController::Base
     # update session if passed
     session[:locale] = params[:locale] if params[:locale]
     browser_locale = condition = nil
+    default_locale = @site.default_locale if @site.default_locale.present?
     # 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])
     elsif session[:locale]
@@ -152,7 +154,7 @@ class ApplicationController < ActionController::Base
       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
+    session[:locale] = condition ? ( browser_locale || session[:locale] || default_locale) : I18n.default_locale.to_s
     I18n.locale = session[:locale].to_sym
     @site_in_use_locales = site_locales_default_head(@site.in_use_locales)
     @site_valid_locales = site_locales_default_head(@site.valid_locales)
@@ -321,7 +323,7 @@ class ApplicationController < ActionController::Base
                 a << object if (value.include?(object.category.id.to_s) rescue nil)
               end
               objects = a.uniq
-            when 'tag'
+            when 'tags'
               a = Array.new
               objects.each do |object|
                 object.tags.each do |tag|

app/controllers/desktop_apps_controller.rb

@@ -1,4 +1,4 @@
-class DesktopAppsController < OrbitBackendController
+class DesktopAppsController < ApplicationController
 	require "net/http"
 	require "uri"
   	require 'zip/zip'

app/controllers/desktop_controller.rb

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

app/controllers/desktop_widgets_controller.rb

@@ -1,4 +1,4 @@
-class DesktopWidgetsController < OrbitBackendController
+class DesktopWidgetsController < ApplicationController
 	require "net/http"
 	require "uri"
   	require 'zip/zip'

app/controllers/front_controller.rb

@@ -12,7 +12,16 @@ class FrontController < ApplicationController
   end
 
   def show_footer
-    render :text => @site.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
+
   end
 
   def show_menu
@@ -21,7 +30,15 @@ class FrontController < ApplicationController
   end
 
   def show_site_sub_menu
-    render :text => @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
   end
 
   def show_sitemap
@@ -43,6 +60,11 @@ 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 = PageContext.where(:archived => false).page(params[:page_main]).per(15)
+    @page_contexts = get_sorted_page_from_structure
   end
 
   def page_content
@@ -57,4 +57,12 @@ 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,6 +19,7 @@ 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
@@ -26,7 +27,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) unless save_from_no_lang_for_page
+              render_page(params.except(:controller, :action, :page_name)) unless save_from_no_lang_for_page
             end
           when 'Link'
             redirect_to(@item[:url]) unless save_from_no_lang_for_page
@@ -113,7 +114,7 @@ class PagesController < ApplicationController
   end
 
   def check_frontend_open
-    if Me.frontend_closed && current_user.nil?  #Need to be change
+    if Site.first.frontend_open && 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))
+        display_value(object.send(field)) rescue ''
       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,4 +1,3 @@
 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

@@ -45,15 +45,18 @@ class Item
   end
 
   def shift_to(new_parent, position)
-    unless self.parent_id.to_s.eql?(new_parent) && self.position.eql?(position.to_i)
-      new_parent = Item.find(new_parent)
-      current_position_sibling = find_by_parent_and_position(new_parent, position.to_i)
-      if current_position_sibling
-        move_above(current_position_sibling)
-      elsif self.parent != new_parent
-        self.parent = new_parent
-        save
+    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)
       end
+    elsif self.parent != new_parent
+      self.parent = new_parent
+      save
     end
   end
 

app/models/module_app.rb

@@ -7,6 +7,7 @@ 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
@@ -185,18 +186,19 @@ class ModuleApp
     user_ids = self.auth_approvals.inject([]) do |users, auth|
       users += auth.authorized_users.map{|user| user.id}
     end
-    update_attribute(:auth_approval_users, user_ids.uniq)
+    self.update_attribute(:auth_approval_users, user_ids.uniq)
   end
 
   def update_auth_manager_users
-    update_attribute(:auth_manager_users, self.auth_manager_authorized_users.map{|user| user.id})
+    users = self.auth_manager_authorized_users
+    self.update_attribute(:auth_manager_users, users.map{|user| user.id}) if users
   end
 
   def update_auth_sub_manager_users
     user_ids = self.auth_sub_managers.inject([]) do |users, auth|
       users += auth.authorized_users.map{|user| user.id}
     end
-    update_attribute(:auth_sub_manager_users, user_ids.uniq)
+    self.update_attribute(:auth_sub_manager_users, user_ids.uniq)
   end
 
   def managers
@@ -207,21 +209,6 @@ 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.name_translations = self.name_translations
-      self.tag.is_default = self.is_default
+      self.tag.attributes = {:name_translations => self.name_translations}
+      self.tag.attributes = {:is_default => self.is_default}
     end
   end
 

app/models/site.rb

@@ -12,14 +12,15 @@ class Site
   field :private_key, :type => Binary
   field :public_key, :type => Binary
 
-  field :frontend_closed, :type => Boolean, :default => false
+  field :frontend_open, :type => Boolean, :default => true
   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 :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=>{}
@@ -28,13 +29,14 @@ 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_user, localize: true
+  field :terms_of_use, localize: true
   field :google_analytics
   field :default_locale
 

app/models/tag.rb

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

app/models/user/user.rb

@@ -52,6 +52,7 @@ class User
   accepts_nested_attributes_for :attribute_values, :allow_destroy => true 
 
   before_create :initialize_desktop
+  before_save :assign_default_position, :if => :assign_default_position?
   before_save :rebuild_status_record
   scope :remote_account, where(:nccu_id.ne => nil)
   scope :not_guest_user, all_of(:name.ne => "guest")
@@ -289,7 +290,7 @@ class User
     end
   end
   
-  protected
+  private
 
   def rebuild_status_record
     self.status_record = {}
@@ -299,4 +300,9 @@ class User
     end
   end
 
+  # override mongoid-tree's method
+  def assign_default_position?
+    !self['name'].eql?('guest') && (self.position.nil? || self.parent_id_changed?)
+  end  
+
 end

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

@@ -1,25 +1,31 @@
-<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>
+<%= 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>

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

@@ -1,3 +1,5 @@
+<%= javascript_include_tag "lib/jquery.cycle.all.js"%>
+
 <table class="table main-list">
   <thead>
     <tr>
@@ -13,7 +15,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)%></li>
+              <li><%= link_to t(:edit), edit_admin_ad_banner_path(ad_banner), :class => "open-slide" %></li>
               <li><%= link_to 'Destroy', admin_ad_banner_path(ad_banner), method: :delete , :confirm => t(:sure?) %></li>  
 
           <% end %>
@@ -30,12 +32,8 @@
 <!-- footer -->
 <div class="bottomnav clearfix">
   <div class="action pull-right">
-    <%= link_to content_tag(:i, nil, class: "icons-plus") + " " + t(:add_new), "#add-banner", :class => "btn btn-primary open-slide"%>
+    <%= link_to content_tag(:i, nil, class: "icons-plus") + " " + t(:add_new), new_admin_ad_banner_path, :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,25 +1,31 @@
-<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>
+<%= 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>

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

@@ -55,7 +55,7 @@
                   <div class="control-group">
                     <label class="control-label muted">Banner</label>
                     <div class="controls">
-                    <%= select_tag 'ad_banner[id]',options_from_collection_for_select(AdBanner.all, "id", "title",params[:ad_banner_id]) , :class=>"input-medium" %>
+                    <%= select_tag 'ad_banner[id]',options_from_collection_for_select(AdBanner.all, "id", "title", @ad_image.ad_banner_id) , :class=>"input-medium" %>
                     </div>
                   </div>
 
@@ -244,6 +244,7 @@
 
             </div>
             <!-- Form Actions -->
+            <%= f.hidden_field :id, :value => @ad_image.id %>
             <div class="form-actions">
               <%= f.submit t("submit"),:class=>"btn btn-primary" %>
               <%= f.submit t("cancel"),:class=>"btn ",:type => 'reset' %>

app/views/admin/categories/_category.html.erb

@@ -10,7 +10,7 @@
 	            <li><%= link_to show_toggle_archive_btn(category) , toggle_admin_module_app_category_path(@module_app_id, category), method: :post, remote: true, class: "archive_toggle" %></li>
 	           <% end %>
             <% if is_manager? || is_admin? %>
-							<li><%= link_to t(:category_auth), admin_authorizations_path(@module_app.key, 'category', category.id) %></li>
+							<li><%= link_to t(:category_auth), admin_authorizations_path(@module_app.key, 'category_authorization', category.id) %></li>
 						<% end %>
           </ul>
         </div>

app/views/admin/designs/_design.html.erb

@@ -1,3 +1,4 @@
+<%= Rails.logger.info"@@@@@@@@@@@@@@@@"+design.inspect%>
 <tr class="with_action">
 	<td class="span1"><%= check_box_tag 'to_delete[]', design.id, false, :class => "checkbox_in_list" %></td>
 	<td class="span2">
@@ -9,7 +10,7 @@
 			</ul>
 		</div>
 	</td>
-	<td class="span1"><%= radio_button_tag 'design_default', design.id, (@site.design.id.to_s.eql?(design.id.to_s) ? true : false), :class => 'design_default', :rel => admin_sites_path %></td>
   <td class="span7"><%= design.intro %></td>
   <td class="span2"><%= design.author %></td>
+  <td class="span1 active"><%= radio_button_tag 'design_default', design.id, (@site.design.id.to_s.eql?(design.id.to_s) ? true : false), :class => 'design_default toggle-check', :rel => admin_sites_path %></td>
 </tr>

app/views/admin/designs/_designs.html.erb

@@ -1,11 +1,12 @@
 <thead>
-	<tr>
-		<th class="span1 strong"></th>
-		<th class="span2"></th>
-    <th class="span1"></th>
-		<th class="span7"></th>
-		<th class="span2"></th>
-	</tr>
+<tr class="sort-header">
+  <th></th>
+  <th class="first span3"><a href="#">Templates Title</a></th>
+  <th data-hide="phone" class="active span3">Active</th>
+  <th data-hide="phone" class="active span3">Date of purchase</th>
+  <th data-hide="phone" class="active span3">Designer</th>
+  <th class="span1"></th>
+</tr>
 </thead>
 <tbody>
 <tbody id="tbody_designs" class="sort-holder">

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

@@ -18,5 +18,5 @@
 			<%= f.text_field :intro %>
     </div>
   </div>
-    <%= f.submit t(:update_) %>
+    <%= f.submit t(:update_), :class=>"btn btn-primary" %>
 <% end %>

app/views/admin/designs/edit.html.erb

@@ -2,7 +2,27 @@
 	<%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('site.settings'), :link_url => admin_site_site_info_path(@site), :side_bar_content => 'admin/sites/side_bar'} %>
 <% end %>
 
-<h1><%= t('editing.design') %></h1>
+<head>
+    <%= stylesheet_link_tag "lib/wrap-nav"%>
+    <%= stylesheet_link_tag "lib/main-list"%>
+    <%= stylesheet_link_tag "lib/mt-list"%>
+    <%= stylesheet_link_tag "lib/filter"%>
+    <%= stylesheet_link_tag "lib/codemirror/theme/theme"%>
+  
+    <%= javascript_include_tag 'codemirror/codemirror' %>
+    <%= javascript_include_tag 'codemirror/jquery.codemirror' %>  
+    <%= javascript_include_tag 'codemirror/mode/css' %> 
+    <%= javascript_include_tag 'codemirror/mode/xml' %> 
+    <%= javascript_include_tag 'codemirror/mode/vbscript' %> 
+    <%= javascript_include_tag 'codemirror/mode/javascript' %> 
+    <%= javascript_include_tag 'codemirror/mode/htmlmixed' %> 
+    <%= javascript_include_tag 'codemirror/addon/edit/closetag' %> 
+    <%= javascript_include_tag 'codemirror/addon/edit/closebrackets' %> 
+    <%= javascript_include_tag 'codemirror/util/formatting' %> 
+    <%= javascript_include_tag 'lib/templates_code' %>   
+</head>
+
+<h1><%= @design.title %></h1>
 
 <ul class="nav nav-tabs" id="myTab">
   <li class="active"><a href="#info" data-toggle="tab"><%= t(:info) %></a></li>

app/views/admin/designs/index.html.erb

@@ -2,6 +2,21 @@
 	<%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('site.settings'), :link_url => admin_site_site_info_path(@site), :side_bar_content => 'admin/sites/side_bar'} %>
 <% end %>
 
+<head>
+    <%= stylesheet_link_tag "lib/wrap-nav"%>
+    <%= stylesheet_link_tag "lib/main-list"%>
+    <%= stylesheet_link_tag "lib/mt-list"%>
+    <%= stylesheet_link_tag "lib/filter"%>
+    <%= stylesheet_link_tag "lib/togglebox"%>
+
+    <%= javascript_include_tag 'lib/footable-0.1' %>
+    <%= javascript_include_tag 'lib/all-list' %>  
+    <%= javascript_include_tag 'lib/retina' %>  
+    <%= javascript_include_tag 'lib/mudole_templates_status' %>  
+
+</head>
+
+
 <%= render 'filter' %>
 <table class="table main-list">
 	<%= render 'designs' %>

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/items/index.html.erb

@@ -1,9 +1,9 @@
 <% node = Item.root %>
-
+<% unless node.nil? %>
 <ol id='<%= node.id %>' class="sortable item-groups">
   <%= render 'node_and_children', node: node %>
 </ol>
-
+<% end %>
 <%= render 'layouts/delete_modal', delete_options: {remote: true} %>
 
 <%= javascript_include_tag "lib/jquery.pageslide.js" %>

app/views/admin/module_store/index.html.erb

@@ -2,86 +2,84 @@
   <%= 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 %>
 
-<% content_for :page_specific_css do %>
-  <%= stylesheet_link_tag 'normalize' %>
-  <%= stylesheet_link_tag 'bootstrap-responsive' %>
-  <%= stylesheet_link_tag 'rulingorbit' %>
-  <%= stylesheet_link_tag 'module-store' %>
-<% end %>
-<% content_for :page_specific_javascript do %>
-  <%= javascript_include_tag "jquery.cycle" %>
-  <%= javascript_include_tag "modules" %>
-<% end %>
+<head>
+    <%= stylesheet_link_tag "lib/wrap-nav"%>
+    <%= stylesheet_link_tag "lib/main-list"%>
+    <%= stylesheet_link_tag "lib/mt-list"%>
+    <%= stylesheet_link_tag "lib/filter"%>
+    <%= stylesheet_link_tag "lib/togglebox"%>
 
-<div class="wrapper">
-  <div id="toolbar">
-    <div class="filter fn">
-      <span class="label">Price</span>
-      <div class="drop-menu ui">
-        <a href="" class="controller">
-          <span class="option-default">All</span>
-          <span class="arrow down"></span>
-        </a>
-        <ul class="option-list">
-          <li><a class="option-item" href="">All</a></li>
-          <li><a class="option-item" href="">3000</a></li>
-          <li><a class="option-item" href="">4000</a></li>
-          <li><a class="option-item" href="">5000</a></li>
-        </ul>
-      </div>
-    </div>
-    <div class="filter fn">
-      <span class="label">Category</span>
-      <div class="drop-menu ui">
-        <a href="" class="controller">
-          <span class="option-default">All</span>
-          <span class="arrow down"></span>
-        </a>
-        <ul class="option-list">
-          <li><a class="option-item" href="">All</a></li>
-          <li><a class="option-item" href="">National Taiwan University</a></li>
-          <li><a class="option-item" href="">Category 1</a></li>
-          <li><a class="option-item" href="">Category 2</a></li>
-          <li><a class="option-item" href="">Category 3</a></li>
-        </ul>
-      </div>
-    </div>
-    <div class="filter fn">
-      <span class="label">Sort by</span>
-      <div class="drop-menu ui">
-        <a href="" class="controller">
-          <span class="option-default">Date</span>
-          <span class="arrow down"></span>
-        </a>
-        <ul class="option-list">
-          <li><a class="option-item" href="">Date</a></li>
-          <li><a class="option-item" href="">Popular</a></li>
-          <li><a class="option-item" href="">Recent Upload</a></li>
-        </ul>
-      </div>
-    </div>
-  </div>
-  <div id="feature" class="clearfix">
-    <div id="feature-nav">
-      <ul>
-        <li><a href=""><img class="item-thumb" src="<%= asset_path "f1.jpg"%>" alt="Thumbnail 1" width="228" height="67"></a></li>
-        <li><a href=""><img class="item-thumb" src="<%= asset_path "f2.jpg"%>" alt="Thumbnail 2" width="228" height="67"></a></li>
-        <li><a href=""><img class="item-thumb" src="<%= asset_path "f3.jpg"%>" alt="Thumbnail 3" width="228" height="67"></a></li>
-      </ul>
-    </div>
-    <div class="holder">
-      <ul>
-        <li><a href=""><img class="item-thumb" src="<%= asset_path "f1.jpg"%>" alt="Thumbnail 1" width="740" height="220"></a></li>
-        <li><a href=""><img class="item-thumb" src="<%= asset_path "f2.jpg"%>" alt="Thumbnail 2" width="740" height="220"></a></li>
-        <li><a href=""><img class="item-thumb" src="<%= asset_path "f3.jpg"%>" alt="Thumbnail 3" width="740" height="220"></a></li>
-      </ul>
-    </div>
-  </div>
-  <div id="item-list">
-  <ul class="clearfix">
-    <% 12.times do |i| %>
-      <li><a href="module_store/show?m=<%= i + 1 %>"><img src="/assets/module/thumb/mt<%= i + 1 %>.jpg" alt="" class="item-thumb"><span class="item-info"><b class="item-name">Module <%= i + 1 %></b><span class="item-price">Free</span></span></a></li>
-    <% end %>
-  </ul>
-</div>
-</div>
+    <%= javascript_include_tag 'lib/footable-0.1' %>
+    <%= javascript_include_tag 'lib/all-list' %>  
+    <%= javascript_include_tag 'lib/retina' %>  
+    <%= javascript_include_tag 'lib/mudole_templates_status' %>  
+</head>
+
+<table id="mt-list" class="table main-list">
+          <thead>
+            <tr class="sort-header">
+              <th class="first"><a href="#">Module Title</a></th>
+              <th data-hide="phone" class="active span3">Date of purchase</th>
+              <th data-hide="all" class="active"><a href="#">Description</a></th>
+              <th class="span2">Active</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr>
+              <td class="detail-row">
+                <div class="module_icon pull-left">
+                  <%= image_tag "module_icon.png"%>
+                </div>
+                <h5 class="mt_title"><span>Module Title</span><span class="muted">2.0.1</span></h5>
+                <p class="mt_dev muted">Rulingcom</p>
+              </td>
+              <td class="detail-row">2013/07/12</td>
+              <td>
+                @detail
+              </td>
+              <td class="active"><button class="act btn btn-mini" type="button">Uninstall</button></td>
+            </tr>
+            <tr class="download">
+              <td class="detail-row">
+                <div class="module_icon pull-left">
+                  <%= image_tag "module_icon.png"%>
+                </div>
+                <h5 class="mt_title"><span>Module Title Module Title Module Title</span><span class="muted">2.0.1</span></h5>
+                <p class="mt_dev muted">Rulingcom</p>
+              </td>
+              <td class="detail-row">2013/07/12</td>
+              <td>
+                @detail
+              </td>
+              <td class="active"><button class="act btn btn-mini btn-success" type="button">Download</button></td>
+            </tr>
+            <tr class="install">
+              <td class="detail-row">
+                <div class="module_icon pull-left">
+                  <%= image_tag "module_icon.png"%>
+                </div>
+                <h5 class="mt_title"><span>Module Title</span><span class="muted">2.0.1</span></h5>
+                <p class="mt_dev muted">Rulingcom</p>
+              </td>
+              <td class="detail-row">2013/07/12</td>
+              <td>
+                @detail
+              </td>
+              <td class="active"><button class="act btn btn-mini btn-primary" type="button">Install</button></td>
+            </tr>
+            <tr class="update">
+              <td class="detail-row">
+                <div class="module_icon pull-left">
+                  <%= image_tag "module_icon.png"%>
+                </div>
+                <h5 class="mt_title"><span>Module Title</span><span class="muted">2.0.1</span></h5>
+                <p class="mt_dev muted">Rulingcom</p>
+              </td>
+              <td class="detail-row">2013/07/12</td>
+              <td>
+                @detail
+              </td>
+              <td class="active"><button class="act btn btn-mini btn-info" type="button">Update</button></td>
+            </tr>
+          </tbody>
+        </table>

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

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

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

@@ -7,6 +7,7 @@
 		<%= 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 "inc/update_cates_and_tags.js" %>
-<%= javascript_include_tag "inc/page_widget_edit_interface.js" %>
+<%=javascript_include_tag "lib/items/update_cates_and_tags.js" %>
+<%= javascript_include_tag "lib/items/page_widget_edit_interface.js" %>

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

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

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

@@ -20,8 +20,7 @@
             
             <!-- 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>
@@ -114,10 +113,10 @@
                 <!-- Openness -->
                 <div id="openness" class="tab-pane fade">
                   <div class="control-group">
-                    <label class="control-label muted"><%= I18n.t('site.frontend_closed')%></label>
+                    <label class="control-label muted"><%= I18n.t('site.frontend_open')%></label>
                     <div class="controls">
-                   	  <%= f.check_box :frontend_closed  , :class=>"toggle-check"%>
-                      <span class="help-block">Only can be viewed by users logged in</span>
+                   	  <%= f.check_box :frontend_open , :class=>"toggle-check"%>
+                      <span class="help-block">If Checked, the frontend will be open for all users.</span>
                     </div>
                   </div>
                   <div class="control-group">
@@ -147,6 +146,8 @@
                   <div class="control-group">
                     <label class="control-label muted">Default Language</label>
                     <div class="controls">
+                    <%= @site_in_use_locales %>
+
                     <% @site_in_use_locales.each do |locale| %>
                       <%= check_box_tag :default_locale, locale, (@site.enabled_for.nil?), :class=>"toggle-check"  %>
                       <%= I18nVariable.from_locale(locale) %>
@@ -157,10 +158,9 @@
                     <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][]', '' %>
+                      <%= check_box_tag "site[in_use_locales][]", locale, @site.valid_locales.include?(locale), :class=>"toggle-check" %>
+						            <%= I18nVariable.from_locale(valid_locale) %>
+					            <% end %>
                     </div>
                   </div>
 
@@ -174,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" />
@@ -189,23 +189,41 @@
                          <%end%>
                         </span>
                         <a href="#" class="btn fileupload-exists" data-dismiss="fileupload">Cancel</a>
-                        <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>
                     </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>
+                        <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/search_engine.html.erb

@@ -43,49 +43,48 @@
 
               <hr>
 
-            <% @site_valid_locales.each do |locale|%>
-            <%= content_tag :div, :class => "tab-pane fade #{active_when_current_locale_eq locale} #{locale}" do %>
-              <div class="control-group">
-                <label class="control-label muted">Site Keywords</label>
-                <div class="controls">
-                  <div class="tab-content textarea-lang">
-                    <div class="btn-group" data-toggle="buttons-radio">
-                     <% @site_valid_locales.each do |locale|%>
-                      <%= content_tag :li, link_to(I18nVariable.from_locale(locale), ".#{locale}", :data => {:toggle => "tab"}), :class => "btn #{(active_when_current_locale_eq locale)}"  %>
-                      <% end %>
-                    </div>
-                    <div class="tab-pane fade active in" id="keywords_en_0">
-                      <%= f.fields_for :keywords do |f| %>
-                        <%= f.text_area locale, :class => "resizable",:rows=>3, :value => (@site.keywords(locale) rescue nil) %>
-                       <% end %>
-                    </div>
-                    </div>
-                  </div>
-                </div>
-                <%end%>
-                <%end%>
-
-            <% @site_valid_locales.each do |locale|%>
-            <%= content_tag :div, :class => "tab-pane fade #{active_when_current_locale_eq locale} #{locale}" do %>
-              <div class="control-group">
-                <label class="control-label muted">Site Description</label>
-                <div class="controls">
-                  <div class="tab-content textarea-lang">
-                    <div class="btn-group" data-toggle="buttons-radio">
-                    <% @site_valid_locales.each do |locale|%>
-                      <%= content_tag :li, link_to(I18nVariable.from_locale(locale), ".#{locale}", :data => {:toggle => "tab"}), :class => "btn #{(active_when_current_locale_eq locale)}"  %>
-                      <% end %>
-                    </div>
-                    <div class="tab-pane fade active in" id="description_en_0">
-                     <%= f.fields_for :description do |f| %>
-                        <%= f.text_area locale, :class => "resizable",:rows=>3, :value => (@site.description(locale) rescue nil) %>
-                       <% end %>
-                    </div>
-                  </div>
-                </div>
+               <!-- Description -->
+        <div class="control-group">
+          <label class="control-label muted">Keywords</label>
+          <div class="controls">
+            <div class="tab-content textarea-lang">
+              <div class="btn-group" data-toggle="buttons-radio">
+                <% @site_valid_locales.each_with_index do |locale, i| %>
+                  <a class="btn <%= ( i == 0 ) ? "active" : '' %>" href="#textarea_<%= locale %>_0" data-toggle="tab"><%= I18nVariable.from_locale(locale) %></a>
+                <% end %>
               </div>
-              <%end%> 
-              <%end%> 
+              <% @site_valid_locales.each_with_index do |locale, i| %>
+                 <div class="tab-pane fade in <%= ( i == 0 ) ? "active" : '' %>" id="textarea_<%= locale %>_0">
+                  <%= f.fields_for :keywords do |f| %>
+                    <%= f.text_area locale, :class=>'resizable', :value => (@site.keywords(locale) rescue nil), :placeholder => I18nVariable.from_locale(locale), :rows=>"3" %>
+                  <% end %>
+                 </div>
+              <% end %>
+            </div>
+          </div>
+        </div>
+
+        <div class="control-group">
+          <label class="control-label muted">Description</label>
+          <div class="controls">
+            <div class="tab-content textarea-lang">
+              <div class="btn-group" data-toggle="buttons-radio">
+                <% @site_valid_locales.each_with_index do |locale, i| %>
+                  <a class="btn <%= ( i == 0 ) ? "active" : '' %>" href="#textarea_<%= locale %>_0" data-toggle="tab"><%= I18nVariable.from_locale(locale) %></a>
+                <% end %>
+              </div>
+              <% @site_valid_locales.each_with_index do |locale, i| %>
+                 <div class="tab-pane fade in <%= ( i == 0 ) ? "active" : '' %>" id="textarea_<%= locale %>_0">
+                  <%= f.fields_for :description do |f| %>
+                    <%= f.text_area locale, :class=>'resizable', :value => (@site.description(locale) rescue nil), :placeholder => I18nVariable.from_locale(locale), :rows=>"3" %>
+                  <% end %>
+                 </div>
+              <% end %>
+            </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">Always show in the title bar
+                    <label class="control-label muted"><%= t :always_display_title %>
                     </label>
                     <div class="controls">
                       <%= f.check_box :title_always_on, :class => "toggle-check" %> 
@@ -55,7 +55,6 @@
                   </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 %>
@@ -70,15 +69,30 @@
                      <%end%>
                     <%end%>
 
-                  <!-- Sitemap menu in Header -->
-                  <div class="control-group">
-                    <label class="control-label muted">Sitemap menu in header
-                    </label>
-                    <div class="controls">
-                      <input type="checkbox" class="toggle-check" data-disabled="true">
+                    <!-- 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>
-                  </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>
+                    <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%>
                   <hr>
 
                   <!-- Terms of Use -->
@@ -86,27 +100,25 @@
                     <label class="control-label muted">Terms of Use
                     </label>
                     <div class="controls">
-                      <input type="checkbox" class="toggle-check terms" data-disabled="true" checked="checked">
+                      <%= f.check_box :enable_terms_of_use, :class => "toggle-check" %> 
                     </div>
                   </div>
 
-                  <!-- CKeditor Default Terms of Use -->
-                  <div class="control-group input-content hide">
+                  <!-- 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">Default Terms of Use</label>
+                    <label class="control-label muted"><%= t('site.default_terms_of_use')%></label>
                     <div class="controls">
                       <div class="textarea">
-                       <%= 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) %>
+                        <%= 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) %>
                         <% 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

@@ -1,9 +1,4 @@
   <head>
-    <!-- Meta -->
-    <!--#include virtual="/orbit_4.0.1/include/meta.html"-->
-
-    <!-- Basic CSS -->
-    <!--#include virtual="/orbit_4.0.1/include/basic_css.html"-->
     <%= stylesheet_link_tag "lib/wrap-nav"%>
     <%= stylesheet_link_tag "lib/filter"%>
     <%= stylesheet_link_tag "lib/sitemap"%>
@@ -17,23 +12,43 @@
 <% 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>
 
-<% content_for :page_specific_javascript do %>
-	<%= javascript_include_tag "lib/jquery.masonry.min.js" %>
-	    <script>
-		    $(document).ready(function(){
-	        $('.site-map').masonry({
-	            itemSelector: '.map-block',
-	            columnWidth: 260
-	        });
-        $('a[data-toggle="tab"]').on('shown', function (e) {
+          <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" : '' %>">
+            <%= render :partial => 'sitemap_block', :collection => @items, :locals => {:temp_locale => temp_locale} %>
+           </ul>
+          <% end %>
+          </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 () {
+      });
+      $(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') %>")
@@ -42,51 +57,20 @@
           }
           $.getScript('<%= admin_sites_path %>' + '/' + $(this).attr('id') + '/sitemap_toggle?temp_locale=' + $(this).attr('temp_locale'));
         });
-        $(document).on('click', 'h4 .onoff', function () {
+        $(document).on('click', 'h6 .onoff', function () {
           $(this).parents(".map-block").toggleClass("disabled");
-          if($(this).parents("h4").parents("div").attr("class").indexOf("disabled") > 0){
+          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('button').text("<%= t('off_upcase') %>")
-            $(this).parents(".map-block").find('li button').attr('disabled', '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('button').text("<%= t('on_upcase') %>")
-            $(this).parents(".map-block").find('li button').removeAttr("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 %>
-
-    <section id="main-wrap">
-      <div class="wrap-inner">        
-
-        <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>
-        <% @site_valid_locales.each_with_index do |temp_locale, i| %>
-        <div class="tab-content map-tree-content">
-          <div class="line"></div>
-          <ul id="<%= temp_locale %>" class="map-tree tab-pane fade <%= ( i == 0 ) ? "in active" : '' %>">
-              <%= render :partial => 'sitemap_block', :collection => @items, :locals => {:temp_locale => temp_locale} %>
-          </ul>
-         <% end %>
-<br/><br/><br/>
-
-
-          <% @site_valid_locales.each_with_index do |temp_locale, i| %>
-          <div class="tab-pane site-map <%= temp_locale %> fade tab-pane <%= ( i == 0 ) ? "in active" : '' %>">
-            <%= render :partial => 'sitemap_block', :collection => @items, :locals => {:temp_locale => temp_locale} %>
-          </div>
-          <% end %>
-        </div>
-
-         
-        </div>
-      </div>
-    </section>
+     </script>
+    <% end %>

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

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

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

@@ -0,0 +1,23 @@
+<div id="list-view">
+  <div id="member-card" class="mini-layout-body">
+    <ul id="card-list" class="checkbox-card clearfix">
+      <% @users.each do |user| %>
+      	<li class="filter-item" data-user-id="<%= user.id %>">
+				  <label>
+				    <div class="user-pic">
+				      <%= show_avatar(user) %>
+				    </div>
+				    <span class="user-name"><%= user.name %></span>
+				    <span><%= user.email %></span>
+				  </label>
+				</li>
+      <% end %>
+    </ul>
+  </div>
+</div>
+
+<script>
+  $(function() {
+    dragMode();
+  });
+</script>

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

@@ -0,0 +1,44 @@
+<div id="list-view">
+  <table id="member-list" class="table main-list">
+    <thead>
+      <tr class="sort-header">
+        <th class="gender"></th>
+        <th class="span2"><a href="#"><%= t(:position) %></a></th>
+        <th class="span4"><a href="#"><%= t(:name) %></a></th>
+        <th><a href="#"><%= t(:email) %></a></th>
+      </tr>
+    </thead>
+    <tbody>
+      <% @users.each do |user| %>
+        <% 
+          case user.sex
+            when 'male'
+              user_sex = 'gender-man'
+            when 'female'
+              user_sex = 'gender-woman'
+            else
+              user_sex = 'gender-none'
+          end 
+        %>
+        <tr id="<%= dom_id user %>">
+          <td class="<%= user_sex %>"></td>
+          <td><%= link_to user.position + 1, '#', class: 'edit_position', 'data-user-id' => user.id %></td>
+          <td><%= link_to user.name, admin_users_new_interface_path(user) %></td>
+          <td><%= user.email %></td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+</div>
+
+<div class="bottomnav clearfix">
+  <div class="action pull-right">
+    <%= link_to t(:update_), '#', class: "btn btn-primary pull-right" %>
+  </div>
+</div>
+
+<script>
+  $(function() {
+    typeMode();
+  });
+</script>

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

@@ -1,7 +1,7 @@
 <div class="bottomnav clearfix">
   <div class="action pull-right">
     <% if is_admin? %>
-      <%= link_to t(:edit_order), edit_order_admin_users_new_interface_index_path, :class => "btn btn-primary" %>
+      <%= link_to t(:edit_order), edit_order_list_admin_users_new_interface_index_path, :class => "btn btn-primary" %>
       <%= link_to(new_admin_users_new_interface_path,:class=> "btn btn-primary") do %>
         <i class="icon-plus"></i><%= t(:add) %>
       <% end -%>

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

@@ -1,15 +0,0 @@
-<% 
-  if user_edit_order.sex == 'male'
-    @user_sex = 'gender-man'
-  elsif user_edit_order.sex == 'female'
-    @user_sex = 'gender-woman'
-  else
-    @user_sex = 'gender-none'
-  end
-%>
-<tr id="<%= dom_id user_edit_order %>">
-  <td class="<%= @user_sex %>"></td>
-  <td><%= link_to user_edit_order.position + 1, '#', class: 'edit_position', 'data-user-id' => user_edit_order.id %></td>
-  <td><%= link_to user_edit_order.name, admin_users_new_interface_path(user_edit_order) %></td>
-  <td><%= user_edit_order.email %></td>
-</tr>

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

@@ -1,65 +1,30 @@
 <% content_for :side_bar do %>
   <%= render :partial => 'admin/users_new_interface/side_bar' %>
 <% end %>
-<% content_for :page_specific_css do -%>
+<% content_for :page_specific_css do %>
   <%= stylesheet_link_tag "lib/member" %>
-<% end -%>
+  <%= stylesheet_link_tag "lib/checkbox-card" %>
+<% end %>
 
-<div id="list-view">
-  <table id="member-list" class="table main-list">
-    <thead>
-      <tr class="sort-header">
-        <th class="gender"></th>
-        <th class="span2"><a href="#"><%= t(:position) %></a></th>
-        <th class="span4"><a href="#"><%= t(:name) %></a></th>
-        <th><a href="#"><%= t(:email) %></a></th>
-      </tr>
-    </thead>
-    <tbody>
-      <%= render partial: "user_edit_order", collection: @users %>
-    </tbody>
-  </table>
-</div>
-
-<div class="bottomnav clearfix">
-  <div class="action pull-right">
-    <%= link_to t(:update_), '#', class: "btn btn-primary pull-right" %>
+<% content_for :right_nav do %>  
+  <div class="view-switch btn-group pull-right" data-toggle="buttons-radio">
+    <%= link_to content_tag(:i, nil, class: 'icon-list'), edit_order_list_admin_users_new_interface_index_path, class: "btn btn-small#{' active' if @type.eql?('list')}" %>
+    <%= link_to content_tag(:i, nil, class: 'icon-th'), edit_order_card_admin_users_new_interface_index_path, class: "btn btn-small#{' active' if @type.eql?('card')}" %>
   </div>
+<% end %>
+
+<div id="order_content">
+  <% case @type %>
+  <% when 'card' %>
+    <%= render 'edit_order_card' %>
+  <% when 'list' %>
+    <%= render 'edit_order_list' %>
+  <% end %>
 </div>
 
 <% content_for :page_specific_javascript do %>
-  <script>
-    $(function(){
-      var _userPosition = [];
-      $('#member-list').on(clickEvent, '.edit_position', function(e){
-        var $input = $('<input type="text">');
-        var $cross = $('<a class="btn btn-mini"><i class="icons-cross"/></a>');
-        $(this).after($cross);
-        $(this).after($input);
-        $(this).hide();
-        $input.val($(this).text()).attr('id', $(this).data('user-id'));
-        e.preventDefault();
-        $cross.click(function(event) {
-          $input.remove();
-          $(this).siblings('a').show().end().remove();
-        });
-      });
-
-      $('.bottomnav').on(clickEvent, '.btn', function(e) {
-        $('#member-list tbody input').each(function() {
-          _userPosition.push([$(this).val(), $(this).attr('id')])
-        });
-        e.preventDefault();
-        $.ajax({
-          url: '<%= update_order_admin_users_new_interface_index_path %>',
-          type: 'POST',
-          dataType: 'script',
-          data: {users: _userPosition}
-        }).done(function() {
-          _userPosition = [];
-          console.log(_userPosition)
-        });
-      });
-    });
-  </script>
+  <%= javascript_include_tag "jquery.ui.sortable" %>
+  <%= javascript_include_tag "lib/jquery.ui.touch-punch.min.js" %>
+  <%= javascript_include_tag "lib/jquery.lite.image.resize.js" %>
+  <%= javascript_include_tag "lib/member/sort.js.erb" %>
 <% end %>

app/views/admin/users_new_interface/update_order.js.erb

@@ -1 +0,0 @@
-$('#list-view table tbody').html("<%= j render partial: 'user_edit_order', collection: @users %>")

app/views/admin/users_new_interface/update_order_list.js.erb

@@ -0,0 +1 @@
+$('#order_content').html("<%= j render 'edit_order_list' %>")

app/views/default_widget/default_widget.html.erb

@@ -1,8 +1,9 @@
-<%= 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) %>
+<% 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 %>
 <% 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" 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>
+      <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>
       <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;"><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;" 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='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>
@@ -32,32 +32,32 @@
         <li class="dock_item"><a callback-method='initializePersonalExperience' href="<%= panel_personal_experience_desktop_experience_window_path %>" class="widget_fn wh2 hh2" id='d_working' onclick="return false;"><span class="widget_icon"><img src="" alt="Working" id="working_icon" width="30" height="30"/></span></a></li>
         <li class="dock_item"><a callback-method='initializePersonalDiploma' href="<%= panel_personal_diploma_desktop_diploma_window_path %>" class="widget_fn wh2 hh2" id='d_education' onclick="return false;"><span class="widget_icon"><img src="" alt="Education" id="education_icon" width="30" height="30"/></span></a></li>
         <li class="dock_item"><a callback-method='initializePersonalHonor' href="<%= panel_personal_honor_desktop_honor_window_path %>" class="widget_fn wh2 hh2" id='d_honors' onclick="return false;"><span class="widget_icon"><img src="" alt="Honors" id="honors_icon" width="30" height="30"/></span></a></li>
-        <li class="dock_item"><a callback-method='' href="activities" class="widget_fn wh2 hh2" id='d_activities' onclick="return false;"><span class="widget_icon"><img src="" alt="Activities" id="activities_icon" width="30" height="30"/></span></a></li>
-        <li class="dock_item"><a callback-method='' href="clubs" class="widget_fn wh2 hh2" id='d_clubs' onclick="return false;"><span class="widget_icon"><img src="" alt="Clubs" id="clubs_icon" width="30" height="30"/></span></a></li>
+        <li class="dock_item disable"><a callback-method='' href="activities" class="widget_fn wh2 hh2" id='d_activities' onclick="return false;"><span class="widget_icon disable"><img src="" alt="Activities" id="activities_icon" width="30" height="30"/></span></a></li>
+        <li class="dock_item disable"><a callback-method='' href="clubs" class="widget_fn wh2 hh2" id='d_clubs' onclick="return false;"><span class="widget_icon"><img src="" alt="Clubs" id="clubs_icon" width="30" height="30"/></span></a></li>
       </ul>
       </li>
       <li class="d_cate"><a callback-method='' href="" class="widget_fn wh2 hh2" id='d_landt' onclick="return false;"><span class="widget_icon"><img src="" alt="Learning & Teaching" id="landt_icon" width="30" height="30"/></span></a>
       <ul class="dock_child hh2 thmc4" style="width: 180px;">
-        <li class="dock_item"><a callback-method='' href="courses" class="widget_fn wh2 hh2" id='d_courses' onclick="return false;"><span class="widget_icon"><img src="" alt="Courses" id="courses_icon" width="30" height="30"/></span></a></li>
-        <li class="dock_item"><a callback-method='' href="homework" class="widget_fn wh2 hh2" id='d_homework' onclick="return false;"><span class="widget_icon"><img src="" alt="Homework" id="homework_icon" width="30" height="30"/></span></a></li>
-        <li class="dock_item"><a callback-method='' href="certification" class="widget_fn wh2 hh2" id='d_certification' onclick="return false;"><span class="widget_icon"><img src="" alt="Certification" id="certification_icon" width="30" height="30"/></span></a></li>
+        <li class="dock_item disable"><a callback-method='' href="courses" class="widget_fn wh2 hh2" id='d_courses' onclick="return false;"><span class="widget_icon"><img src="" alt="Courses" id="courses_icon" width="30" height="30"/></span></a></li>
+        <li class="dock_item disable"><a callback-method='' href="homework" class="widget_fn wh2 hh2" id='d_homework' onclick="return false;"><span class="widget_icon"><img src="" alt="Homework" id="homework_icon" width="30" height="30"/></span></a></li>
+        <li class="dock_item disable"><a callback-method='' href="certification" class="widget_fn wh2 hh2" id='d_certification' onclick="return false;"><span class="widget_icon"><img src="" alt="Certification" id="certification_icon" width="30" height="30"/></span></a></li>
       </ul>
       </li>
       <li class="d_cate"><a callback-method='' href="" class="widget_fn wh2 hh2" id='d_personal' onclick="return false;"><span class="widget_icon"><img src="" alt="Personal" id="personal_icon" width="30" height="30"/></span></a>
       <ul class="dock_child hh2 thmc4" style="width: 300px;">
-        <li class="dock_item"><a callback-method='' href="mypage" class="widget_fn wh2 hh2" id='d_mypage' onclick="return false;"><span class="widget_icon"><img src="" alt="myPage" id="mypage_icon" width="30" height="30"/></span></a></li>
-        <li class="dock_item"><a callback-method='' href="blog" class="widget_fn wh2 hh2" id='d_blog' onclick="return false;"><span class="widget_icon"><img src="" alt="Blog" id="blog_icon" width="30" height="30"/></span></a></li>
-        <li class="dock_item"><a callback-method='' href="album" class="widget_fn wh2 hh2" id='d_album' onclick="return false;"><span class="widget_icon"><img src="" alt="Album" id="album_icon" width="30" height="30"/></span></a></li>
-        <li class="dock_item"><a callback-method='' href="calendar" class="widget_fn wh2 hh2" id='d_calendar' onclick="return false;"><span class="widget_icon"><img src="" alt="Calendar" id="calendar_icon" width="30" height="30"/></span></a></li>
-        <li class="dock_item"><a callback-method='' href="files" class="widget_fn wh2 hh2" id='d_files' onclick="return false;"><span class="widget_icon"><img src="" alt="Files" id="files_icon" width="30" height="30"/></span></a></li>
+        <li class="dock_item disable"><a callback-method='' href="mypage" class="widget_fn wh2 hh2" id='d_mypage' onclick="return false;"><span class="widget_icon"><img src="" alt="myPage" id="mypage_icon" width="30" height="30"/></span></a></li>
+        <li class="dock_item disable"><a callback-method='' href="blog" class="widget_fn wh2 hh2" id='d_blog' onclick="return false;"><span class="widget_icon"><img src="" alt="Blog" id="blog_icon" width="30" height="30"/></span></a></li>
+        <li class="dock_item disable"><a callback-method='' href="album" class="widget_fn wh2 hh2" id='d_album' onclick="return false;"><span class="widget_icon"><img src="" alt="Album" id="album_icon" width="30" height="30"/></span></a></li>
+        <li class="dock_item disable"><a callback-method='' href="calendar" class="widget_fn wh2 hh2" id='d_calendar' onclick="return false;"><span class="widget_icon"><img src="" alt="Calendar" id="calendar_icon" width="30" height="30"/></span></a></li>
+        <li class="dock_item disable"><a callback-method='' href="files" class="widget_fn wh2 hh2" id='d_files' onclick="return false;"><span class="widget_icon"><img src="" alt="Files" id="files_icon" width="30" height="30"/></span></a></li>
       </ul>
       </li>
       <li class="d_cate"><a callback-method='initializeOrbitTimeline' href="<%= desktop_orbit_orbit_path %>" class="widget_fn wh2 hh2" id='d_orbit' onclick="return false;"><span class="widget_icon"><img src="" alt="Orbit" id="orbit_icon" width="30" height="30"/></span></a>
       <ul class="dock_child hh2 thmc4" style="width: 60px;">
-        <li class="dock_item"><a callback-method='' href="" class="widget_fn wh2 hh2" id='d_connection' onclick="return false;"><span class="widget_icon"><img src="" alt="Academia Connection" id="connection_icon" width="30" height="30"/></span></a></li>
+        <li class="dock_item disable"><a callback-method='' href="" class="widget_fn wh2 hh2" id='d_connection' onclick="return false;"><span class="widget_icon"><img src="" alt="Academia Connection" id="connection_icon" width="30" height="30"/></span></a></li>
       </ul>
       </li>
-      <li class="d_cate"><a callback-method='initializeAppstore' href="<%= desktop_appstore_appstore_path %>" class="widget_fn wh2 hh2" id='d_appstore' onclick="return false;"><span class="widget_icon"><img src="" alt="AppStore" id="appstore_icon" width="30" height="30"/></span></a></li>
+      <li class="d_cate  disable"><a callback-method='initializeAppstore' href="<%= desktop_appstore_appstore_path %>" class="widget_fn wh2 hh2" id='d_appstore' onclick="return false;"><span class="widget_icon"><img src="" alt="AppStore" id="appstore_icon" width="30" height="30"/></span></a></li>
     </ul>
     <div class="fn_des hh2 admbg admtxt"></div>
   </div>
@@ -92,10 +92,22 @@
   orbitDesktop.prototype.sectionId = "<%= @section.id %>";
   orbitDesktop.prototype.currentLanguage = "<%= I18n.locale %>";
   orbitDesktop.prototype.currentUsername = "<%= @currentusername %>";
-  //uselessfunction();
   var od = new orbitDesktop("#ajax_container");
-  if($.browser.msie){
-    if($.browser.version < 9){
+  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){
       $.fx.off =  true;
     o.notify("We turn off the animation (javascript) for you, but still you can turn it on",10);
     }

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

@@ -1,30 +1,64 @@
-<h1 class="login-logo"><%= t(:ruling_site) %></h1>
-<div id="signin-header">
-	<h3><%= t(:login) %></h3>
-</div>
-<div id="container" class="sign-in">
-	<%= form_for resource, :as => resource_name, :url => session_path(resource_name), :html => {:class => 'user_new form-horizontal'} do |f| %>
-		<div class="content">
-			 <% flash.each do |key, msg| %>
-		    <%= content_tag :span, msg, :class => [key, "notice label label-warning"] %>
-		  <% end %>
-			<p class="alert hide">You need to sign in or sign up before continuing.</p>
-			<div class="main">
-				<div class="control-group clear">
-					<%= f.label :user_id ,t("users.user_id")%>
-					<%= f.text_field :user_id, :placeholder => t("users.user_id"), :style => "width: 330px;" %>
-					<span class="help-inline">Please correct the error</span>
-				</div>
-				<div class="control-group clear">
-					<%= f.label :password,t("password") %>
-					<%= f.password_field :password, :placeholder => t(:dots), :style => "width: 330px;" %>
-					<span class="help-inline">Please correct the error</span>
-					<%= link_to t(:forgot_password), new_user_password_path, :class => 'pull-right forgot hide' %>
-				</div>
-			</div>
-		</div>
-		<div class="form-actions clear">
-			<%= content_tag :button, t(:login), :type => :submit, :class => 'btn btn-primary pull-right' %>
-		</div>
-	<% end %>
-</div>
+   <!-- Orbit Bar -->
+    <!--#include virtual="include/orbit_bar.html"-->
+    <section id="main-wrap">
+      <div class="sign-in have-other-sign-in">
+<!--         <p class="alert alert-error in fade">You need to sign in.</p>
+ -->    
+        <% flash.each do |key, msg| %>
+		    <%= content_tag :p, msg, :class => [key, "alert alert-error in fade"] %>
+		<% end %>
+
+ 		<div class="form">
+          <h3 class="login-logo">Log In to Orbit</h3>
+          <div>
+            <input name="utf8" type="hidden" value="" />
+            <input name="authenticity_token" type="hidden" value="" />
+          </div>
+<!--           <div class="other-sign-in">
+            <a class="btn btn-primary" type="submit">Other Sign In</a>
+            <p>or</p>
+          </div> -->
+          <div class="form-block">
+            <div class="form-list clearfix">
+              <form class="content" accept-charset="UTF-8" action="/users/sign_in" method="post">
+               <%= form_for resource, :as => resource_name, :url => session_path(resource_name), :html => {:class => 'content'} do |f| %>
+
+                <div class="control-group clear">
+                  <label for="user_email">
+                    <i class="icon-user"></i>
+                  </label>
+                 	<%= f.text_field :user_id, :placeholder => t("users.user_id"), :id=>"user_email" %>
+                </div>
+                <div class="control-group clear">
+                  <label for="user_password">
+                    <i class="icon-lock"></i>
+                  </label>
+                  <%= f.password_field :password, :placeholder => t(:dots), :id=>"user_password" %>
+                </div>
+                  <%= content_tag :button, t(:login), :type => :submit, :class => 'btn btn-primary' %>
+              </form>
+
+              <form class="content" accept-charset="UTF-8" action="/users/sign_in" method="post">
+                <div class="control-group clear">
+                  <label for="user_email">
+                    <i class="icon-user"></i>
+                  </label>
+                  <input type="text" id="user_id" name="user[id]" placeholder="帳號" />
+                </div>
+                <div class="control-group clear">
+                  <label for="user_password">
+                    <i class="icons-mail"></i>
+                  </label>
+                  <input type="text" id="user_email" name="user[email]" placeholder="電子郵件" />
+                </div>
+              </form>
+            </div>
+          </div>
+         <!--  <div class="register">
+            <button class="btn btn-inverse" type="submit">Register</button>
+          </div> -->
+        <% end %>
+
+        </div>
+      </div>
+    </section>

app/views/front/show_banner.html.erb

@@ -1,4 +1,3 @@
-<%= 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'>
@@ -10,18 +9,12 @@
   </div>
 </div>
 <script type='text/javascript'>
-$(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>
+  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>

app/views/front/show_terms_of_use.html.erb

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

app/views/layouts/_left_menu.html.erb

@@ -27,4 +27,19 @@
     </a>
   </li>
   
-</ul>
+</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 %>

app/views/layouts/_side_bar.html.erb

@@ -3,5 +3,4 @@
     <%= link_to content_tag(:i, nil, :class => (local_assigns.has_key? :icon) ? icon : 'icons-gauge'), (local_assigns.has_key? :link_url) ? link_url : admin_dashboards_path %>
   </h2>
 	<%= render ((local_assigns.has_key? :side_bar_content) ? side_bar_content : 'layouts/side_bar_content') %>
-  <div class="sub-nav-arrow"></div>
 </nav>

app/views/layouts/_side_bar_content.html.erb

@@ -6,6 +6,7 @@
 	    <% end %>
 	  </ul>
 	</div>
+	<div class="sub-nav-arrow"></div>
 </div>
 
 <div class="sub-nav-block-list">

app/views/layouts/devise.html.erb

@@ -6,15 +6,23 @@
 	<!--[if lt IE 9]>
 	   <%= javascript_include_tag "html5" %>
 	<![endif]-->
-	<%= stylesheet_link_tag "devise" %>
-	<%= javascript_include_tag "devise" %>
-	<%= csrf_meta_tag %>
+  <%= render 'layouts/meta' %>
+  <%= render 'layouts/google_font' %>
+  <%= stylesheet_link_tag "basic/global" %>
+  <%= stylesheet_link_tag "basic" %>
+
+  <%= render 'layouts/ie_html5_fix' %>
+  <%= javascript_include_tag "basic" %>
+  <%= yield :page_specific_css %>
+  <%= yield :page_specific_javascript %>
+
+  <style>
+
+  </style>
+  <%= csrf_meta_tag %>
 </head>
 <body>
 	<%= render 'layouts/orbit_bar' %>
 	<%= yield %>
-	<div id="sign-footer">
-      <p>Rulingcom</p>
-  </div>
 </body>
 </html>

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,6 +44,7 @@ public_r_tags:
   - sitemap
   - breadcrumb
   - tag_cloud
+  - terms_of_use
 
 page_part_kinds:
   - text

config/locales/en.yml

@@ -390,6 +390,7 @@ en:
     footer: Site footer
     footer_help: Footer Guide
     frontend_closed: Frontend Closed
+    frontend_open: Frontend Open
     header: Site header
     info: Site information
     keywords: Site keywords

config/locales/new_ui.en.yml

@@ -2,6 +2,7 @@ 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
@@ -70,4 +71,5 @@ en:
     error:
       tag: Error when updating category
       tag: Error when updating tag
-  url_alt: Alternative text
+  url_alt: Alternative text
+  use_default: Use Default

config/locales/new_ui.zh_tw.yml

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

config/locales/zh_tw.yml

@@ -385,6 +385,7 @@ zh_tw:
     thumbnail: 縮圖
   site:
     frontend_closed: 前台關閉？
+    frontend_open:  前台關閉 ?
     backend_openness_on: 開啟開放式後台（訪客可遊覽）
     default_image: 預設圖像
     description: 網站描述

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