new ui ask module lose 2 file

Fix backend bug in editing banner
Translation Added

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-rails', '3.0.4'
-gem 'jquery-ui-rails'
+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);
             })
@@ -605,8 +605,9 @@ var orbitDesktop = function(dom){
 
   this.menu_item = function(dom,customload,submenuitem){
     if(!customload)customload=false;
-    var target = dom.attr("id");
+    var target = dom.attr("id"),
-    var url = dom.attr("href");
+        url = dom.attr("href"),
+        submenu_pass = ( dom.attr("sub-menu") == "false" ? false : true);
     if(!url)return false;
   
     o.data_method = dom.attr("callback-method");
@@ -629,6 +630,7 @@ var orbitDesktop = function(dom){
                 window.o[o.data_method](target,url,cache);
               }
             }
+            if( submenu_pass ){
               try {
                 if(!customload){
                   o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[load=true]"),data);
@@ -640,10 +642,12 @@ var orbitDesktop = function(dom){
                   }
                 }
               } catch(EX){}
+            }
             header_ani();
          });
         }else{
           $(o.contentHolder).html(o.desktopData[o.currentface]);
+          if( submenu_pass ){
             try{
               if(!customload){
                 o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[load=true]"),o.desktopData[o.currentface]);
@@ -654,8 +658,9 @@ var orbitDesktop = function(dom){
                     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);
@@ -1095,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{
@@ -1119,19 +1124,15 @@ 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
-            })
+            }).fadeIn(200)
-            .delay(300)
             .animate({
               'margin-left': 0
             }, 500, 'easeInOutQuint');
-        } else {
-          $('.tinycanvas').tinyscrollbar_update();
         } 
       }
 
@@ -1143,12 +1144,10 @@ 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(){

app/assets/javascripts/kernel.js

@@ -1,29 +1,57 @@
+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")==''){
+			$(this).html("App setting Failed");
+		}else{
+			// Check if this App is AD_Banner
+			if($(this).attr("path").indexOf("show_banner")>0){
+				ajax_load_proc($(this),$(this).attr("path"),"true"); 	
+			}else{
+				ajax_load_proc($(this),$(this).attr("path"),$(this).attr("path"));
+			}
+		}
+	});
 
-		if($(this).attr("path")!=''){
-				 ajax_load_proc($(this),$(this).attr("path"));
-				} 
-			}
-			);
 	$("#main_content").addClass("module");
 });
 
-function ajax_load_proc(wapper,url){
+function ajax_load_proc(wapper,url,isBanner){
 	$.get(encodeURI(url), {}, function(respText,textSta,XML){ 
 		if (textSta == 'success') {
+			if(isBanner=="true"){
 				wapper.html(respText);
+				var banner = banners[banner_index];
+				$(banner.banner_name+" > img").each(function(){
+					$(this).load(function(){ banner.image_loaded++; });
+				});
+				BannerCycle(banner_index);
+				banner_index++;
+			}else{
+				wapper.html(respText);
+			}
 		};
 		if(textSta == 'error')
 			wapper.html("Loading Failed<br/>  <a href='"+$(this).attr('path')+"'>Go See</a>");
 	});
 }
 
-// Ad Banner FX code [start]
+function BannerCycle(banner_index){
-function getTimeout() { 
+	var banner = banners[banner_index];
-    return $(this).attr('time_to_next'); 
+	// 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() { 

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

@@ -43,8 +43,14 @@ $(function(){
     placeholder: 'placeholder',
     startCollapsed: true,
     disableNesting: 'no-nest',
-    stop: function(event, ui) {
+    update: 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() } );
+      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();
   });
-
+  $('.delete-item').on(clickEvent, function() {
-  $("#dialog").on(clickEvent, '.delete-item', function() {
+    var _v = [];
-    var _v = [],
+    $("tbody .list-check").each(function() {
-        _t = $t.attr("rel");
+      this.checked && _v.push("ids[]="+this.value)
-
+    });
-    $("tbody .list-check:checked").each(function() {
+    var _t = $t.attr("rel");
-        _v.push(this.value);
+    if(_t.indexOf("?") > -1) {
+      $.ajax(_t + "&" + _v.join("&")).done(function() {
+        actionSuccess(_data.checkAction)
+      });
+    } else {
+      $.ajax(_t + "?" + _v.join("&")).done(function() {
+        actionSuccess(_data.checkAction)
       });
-
-    $.ajax({
-      url : _t,
-      type:"get",
-      data : {"ids":_v},
-      dataType : "json",
-      success : 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/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/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);
+  *= require 'lib/codemirror/theme/ambiance-mobile'
-@import url(/orbit_4.0.1/assets/stylesheets/lib/codemirror/theme/blackboard.css);
+  *= require "lib/codemirror/theme/ambiance"
-@import url(/orbit_4.0.1/assets/stylesheets/lib/codemirror/theme/cobalt.css);
+  *= require "lib/codemirror/theme/blackboard"
-@import url(/orbit_4.0.1/assets/stylesheets/lib/codemirror/theme/eclipse.css);
+  *= require "lib/codemirror/theme/cobalt"
-@import url(/orbit_4.0.1/assets/stylesheets/lib/codemirror/theme/elegant.css);
+  *= require "lib/codemirror/theme/eclipse"
-@import url(/orbit_4.0.1/assets/stylesheets/lib/codemirror/theme/erlang-dark.css);
+  *= require "lib/codemirror/theme/elegant"
-@import url(/orbit_4.0.1/assets/stylesheets/lib/codemirror/theme/midnight.css);
+  *= require "lib/codemirror/theme/erlang-dark"
-@import url(/orbit_4.0.1/assets/stylesheets/lib/codemirror/theme/monokai.css);
+  *= require "lib/codemirror/theme/midnight"
-@import url(/orbit_4.0.1/assets/stylesheets/lib/codemirror/theme/neat.css);
+  *= require "lib/codemirror/theme/monokai"
-@import url(/orbit_4.0.1/assets/stylesheets/lib/codemirror/theme/night.css);
+  *= require "lib/codemirror/theme/neat"
-@import url(/orbit_4.0.1/assets/stylesheets/lib/codemirror/theme/rubyblue.css);
+  *= require "lib/codemirror/theme/night"
-@import url(/orbit_4.0.1/assets/stylesheets/lib/codemirror/theme/solarized.css);
+  *= require "lib/codemirror/theme/rubyblue"
-@import url(/orbit_4.0.1/assets/stylesheets/lib/codemirror/theme/theme.css);
+  *= require "lib/codemirror/theme/solarized"
-@import url(/orbit_4.0.1/assets/stylesheets/lib/codemirror/theme/twilight.css);
+  *= require "lib/codemirror/theme/theme"
-@import url(/orbit_4.0.1/assets/stylesheets/lib/codemirror/theme/vibrant-ink.css);
+  *= require "lib/codemirror/theme/twilight"
-@import url(/orbit_4.0.1/assets/stylesheets/lib/codemirror/theme/xq-dark.css);
+  *= require "lib/codemirror/theme/vibrant-ink"
-@import url(/orbit_4.0.1/assets/stylesheets/lib/codemirror/theme/xq-light.css);
+  *= 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_image.to_save = true
-    #@ad_banner.ad_images << ad_image
+    @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 []
+    roles = Role.find(params[:role_ids]) rescue nil
-    users = []
+    unless roles.nil?
-    roles.each do |role|
-      users += role.users.all.entries
-    end
-    unless roles.blank?
       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 []
+    sub_roles = SubRole.find(params[:sub_role_ids]) rescue nil
-    users = []
+    unless sub_roles.nil?
-    sub_roles.each do |sub_role|
-      users += sub_role.users.all.entries
-    end
-    unless sub_roles.blank?
       authorization = get_or_create_authorization
-      add_sub_roles_to_auth(authorization, sub_roles) 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 []
+    users = User.find(params[:user_ids]) rescue nil
-    unless users.blank?
+    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/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])
+    item.shift_to(params[:parent_id], params[:position].to_i)
-    render :nothing => true
+    render :nothing => true, status: 200
   end
   
 end

app/controllers/admin/users_new_interface_controller.rb

@@ -250,11 +250,37 @@ 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

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
@@ -321,7 +321,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
   

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,17 +12,34 @@ class FrontController < ApplicationController
   end
 
   def show_footer
+    @page = Page.find(:all, :conditions => {:name => /terms/i})
+    @name = @page.first.name 
+    @url = "/#{@name}"
+
+    if !@site.enable_terms_of_use
+      render :text => (@site.footer + "<a href='#{@url}'>Terms of Use</a>")
+    else
       render :text => @site.footer
     end
 
+  end
+
   def show_menu
     page = Page.find(params[:id]) rescue nil
     render :text => menu_level(Page.root, page, 1, page.design.layout.menu) if page
   end
 
   def show_site_sub_menu
+    @page = Page.find(:all, :conditions => {:name => /sitemap/i})
+    @name = @page.first.name 
+    @url = "/#{@name}"
+    
+    if !@site.sitemap_menu_in_header
+      render :text => (@site.sub_menu + "<a href='#{@url}'>Sitemap</a>")
+    else
       render :text => @site.sub_menu
     end
+  end
 
   def show_sitemap
     @items = get_homepage.children.excludes(sitemap_enabled: false) rescue []
@@ -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

@@ -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/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,17 +45,20 @@ class Item
   end
 
   def shift_to(new_parent, position)
-    unless self.parent_id.to_s.eql?(new_parent) && self.position.eql?(position.to_i)
+    position = position.to_i
     new_parent = Item.find(new_parent)
-      current_position_sibling = find_by_parent_and_position(new_parent, position.to_i)
+    current_position_sibling = find_by_parent_and_position(new_parent, position)
     if current_position_sibling
-        move_above(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
-  end
 
   def show_in_sitemap_for(locale)
     if !sitemap_enabled.blank? && !sitemap_enabled[locale].blank?

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
@@ -189,7 +190,8 @@ class ModuleApp
   end
 
   def update_auth_manager_users
-    self.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
@@ -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/site.rb

@@ -12,9 +12,11 @@ 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
@@ -34,7 +36,7 @@ class Site
   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) do |f| %>
-  <%= form_for(:ad_banner, :url => admin_ad_banner_path(:ad_banner), :remote => true) do |f| %>
   <fieldset>
-        <legend>Ad Banner</legend>
+    <legend><%= t("ad_banner.banner") %></legend>
-        <label>Banner Name</label>
+    <label><%= t("ad_banner.banner_name") %></label>
     <%= f.text_field :title, :class=>"input-large", :placeholder=>"Banner Name" %>
-        <span class="help-block">Banner Name only english</span>
+    <span class="help-block"><%= t("ad_banner.banner_name_note") %></span>
-        <label for="timeout">Ste</label>
+    <label for="timeout"><%= t("ad_banner.ste") %></label>
     <%= f.text_field :transition_sec, :class => 'input-large', :placeholder => 'Time' %>
-        <span class="help-block">Please enter the number of seconds</span>
+    <span class="help-block"><%= t("ad_banner.ste_note") %></span>
-        <label>Best Size</label>
+    <label><%= t("ad_banner.best_size") %></label>
     <%= f.text_field :best_size, :class=>"input-large", :placeholder=>"Banner Size" %>
-        <span class="help-block">Best Size EX:120x30 </span>
+    <span class="help-block"><%= t("ad_banner.best_size") %> EX:120x30 </span>
-        <label>Effect</label>
+    <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">Effect</span>
+    <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' %>
+    <%= f.submit t(:update_), class: 'btn btn-primary btn-small' %>
   </fieldset>
 <% end %>
-</div>
+<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.latest.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>
+      <legend><%= t("ad_banner.banner") %></legend>
-        <label>Banner Name</label>
+      <label><%= t("ad_banner.banner_name") %></label>
        <%= f.text_field :title, :class=>"input-large", :placeholder=>"Banner Name" %>
-        <span class="help-block">Banner Name only english</span>
+      <span class="help-block"><%= t("ad_banner.banner_name_note") %></span>
-        <label for="timeout">Ste</label>
+      <label for="timeout"><%= t("ad_banner.ste") %></label>
        <%= f.text_field :transition_sec, :class => 'input-large', :placeholder => 'Time' %>
-        <span class="help-block">Please enter the number of seconds</span>
+      <span class="help-block"><%= t("ad_banner.ste_note") %></span>
-        <label>Best Size</label>
+      <label><%= t("ad_banner.best_size") %></label>
        <%= f.text_field :best_size, :class=>"input-large", :placeholder=>"Banner Size" %>
-        <span class="help-block">Best Size EX:120x30 </span>
+      <span class="help-block"><%= t("ad_banner.best_size") %> EX:120x30 </span>
-        <label>Effect</label>
+      <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">Effect</span>
+      <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 %>
-</div>
+<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/designs/_design.html.erb

@@ -9,7 +9,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,10 +1,11 @@
 <thead>
-	<tr>
+<tr class="sort-header">
-		<th class="span1 strong"></th>
+  <th></th>
-		<th class="span2"></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>
-		<th class="span7"></th>
-		<th class="span2"></th>
 </tr>
 </thead>
 <tbody>

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/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 %>
+<head>
-  <%= stylesheet_link_tag 'normalize' %>
+    <%= stylesheet_link_tag "lib/wrap-nav"%>
-  <%= stylesheet_link_tag 'bootstrap-responsive' %>
+    <%= stylesheet_link_tag "lib/main-list"%>
-  <%= stylesheet_link_tag 'rulingorbit' %>
+    <%= stylesheet_link_tag "lib/mt-list"%>
-  <%= stylesheet_link_tag 'module-store' %>
+    <%= stylesheet_link_tag "lib/filter"%>
-<% end %>
+    <%= stylesheet_link_tag "lib/togglebox"%>
-<% content_for :page_specific_javascript do %>
-  <%= javascript_include_tag "jquery.cycle" %>
-  <%= javascript_include_tag "modules" %>
-<% end %>
 
-<div class="wrapper">
+    <%= javascript_include_tag 'lib/footable-0.1' %>
-  <div id="toolbar">
+    <%= javascript_include_tag 'lib/all-list' %>  
-    <div class="filter fn">
+    <%= javascript_include_tag 'lib/retina' %>  
-      <span class="label">Price</span>
+    <%= javascript_include_tag 'lib/mudole_templates_status' %>  
-      <div class="drop-menu ui">
+</head>
-        <a href="" class="controller">
+
-          <span class="option-default">All</span>
+<table id="mt-list" class="table main-list">
-          <span class="arrow down"></span>
+          <thead>
-        </a>
+            <tr class="sort-header">
-        <ul class="option-list">
+              <th class="first"><a href="#">Module Title</a></th>
-          <li><a class="option-item" href="">All</a></li>
+              <th data-hide="phone" class="active span3">Date of purchase</th>
-          <li><a class="option-item" href="">3000</a></li>
+              <th data-hide="all" class="active"><a href="#">Description</a></th>
-          <li><a class="option-item" href="">4000</a></li>
+              <th class="span2">Active</th>
-          <li><a class="option-item" href="">5000</a></li>
+            </tr>
-        </ul>
+          </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>
-    <div class="filter fn">
+                <h5 class="mt_title"><span>Module Title Module Title Module Title</span><span class="muted">2.0.1</span></h5>
-      <span class="label">Category</span>
+                <p class="mt_dev muted">Rulingcom</p>
-      <div class="drop-menu ui">
+              </td>
-        <a href="" class="controller">
+              <td class="detail-row">2013/07/12</td>
-          <span class="option-default">All</span>
+              <td>
-          <span class="arrow down"></span>
+                @detail
-        </a>
+              </td>
-        <ul class="option-list">
+              <td class="active"><button class="act btn btn-mini btn-success" type="button">Download</button></td>
-          <li><a class="option-item" href="">All</a></li>
+            </tr>
-          <li><a class="option-item" href="">National Taiwan University</a></li>
+            <tr class="install">
-          <li><a class="option-item" href="">Category 1</a></li>
+              <td class="detail-row">
-          <li><a class="option-item" href="">Category 2</a></li>
+                <div class="module_icon pull-left">
-          <li><a class="option-item" href="">Category 3</a></li>
+                  <%= image_tag "module_icon.png"%>
-        </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>
+                <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/sites/_sitemap_block.html.erb

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

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

@@ -20,7 +20,6 @@
             
             <!-- Input Area -->
             <div class="input-area">
-
               <div class="nav-name"><strong>Classification</strong></div>    
               <ul class="nav nav-pills language-nav">
                 <li class="active">
@@ -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"%>
+                   	  <%= f.check_box :frontend_open , :class=>"toggle-check"%>
-                      <span class="help-block">Only can be viewed by users logged in</span>
+                      <span class="help-block">If Checked, the frontend will be open for all users.</span>
                     </div>
                   </div>
                   <div class="control-group">
@@ -191,7 +190,7 @@
                         <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 %>
+                            <% if @site.default_image.file.present? %>
                     			<label class="checkbox">
                    				 <%= check_box_tag 'site[remove_default_image]' %>
                     			 <%= t(:delete_) %>

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" %> 
@@ -70,12 +70,28 @@
                      <%end%>
                     <%end%>
 
+                   <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%>
+
                   <!-- 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">
+                      <%= f.check_box :sitemap_menu_in_header, :class => "toggle-check" %> 
                     </div>
                   </div>
 
@@ -86,27 +102,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 -->
+                  <!-- CKeditor Site Footer -->
-                  <div class="control-group input-content hide">
                   <% @site_valid_locales.each do |locale|%>
                   <%= content_tag :div, :class => "tab-pane fade #{active_when_current_locale_eq locale} #{locale}" do %>
-                    <label class="control-label muted">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.fields_for :terms_of_use_translations do |f| %>
-                          <%= f.text_area locale, :class => "ckeditor input-block-level", :value => (@site.terms_of_user_translations[locale] rescue nil) %>
+                          <%= f.text_area locale, :class => "ckeditor input-block-level", :value => (@site.terms_of_use_translations[locale] rescue nil) %>
                         <% end %>
                       </div>
                      </div>
-                    </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,9 +12,31 @@
 <% 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 %>
+      <h3>Sitemap</h3>
+
+        <div id="sitemap">
+           <ul id="map-tree-language" class="nav nav-pills">
+            <% @site_valid_locales.each_with_index do |locale, i| %>
+              <li <%= ( i == 0 ) ? "class=active" : '' %>>
+               <a data-toggle="tab" href="#<%= locale %>">
+                <%= I18nVariable.from_locale(locale) %>
+               </a>
+              </li>
+             <% end %>
+           </ul>
+
+          <div class="tab-content map-tree-content">
+          <div class="line"></div>
+          <% @site_valid_locales.each_with_index do |temp_locale, i| %>
+           <ul id="<%= temp_locale %>" class="map-tree tab-pane fade in <%= ( i == 0 ) ? "in active" : '' %>">
+            <%= render :partial => 'sitemap_block', :collection => @items, :locals => {:temp_locale => temp_locale} %>
+           </ul>
+          <% end %>
+          </div>
+
+        </div>
 
     <% content_for :page_specific_javascript do %>
-	<%= javascript_include_tag "lib/jquery.masonry.min.js" %>
     <script>
       $(document).ready(function(){
         $('.site-map').masonry({
@@ -42,51 +59,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('checkbox').text("<%= t('off_upcase') %>")
-            $(this).parents(".map-block").find('li button').attr('disabled', 'disabled')
+            // $(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('checkbox').text("<%= t('on_upcase') %>")
-            $(this).parents(".map-block").find('li button').removeAttr("disabled")
+            // $(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>

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">
+<% content_for :right_nav do %>  
-  <table id="member-list" class="table main-list">
+  <div class="view-switch btn-group pull-right" data-toggle="buttons-radio">
-    <thead>
+    <%= 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')}" %>
-      <tr class="sort-header">
+    <%= 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')}" %>
-        <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>
+<% end %>
 
-<div class="bottomnav clearfix">
+<div id="order_content">
-  <div class="action pull-right">
+  <% case @type %>
-    <%= link_to t(:update_), '#', class: "btn btn-primary pull-right" %>
+  <% when 'card' %>
-  </div>
+    <%= render 'edit_order_card' %>
+  <% when 'list' %>
+    <%= render 'edit_order_list' %>
+  <% end %>
 </div>
 
 <% content_for :page_specific_javascript do %>
-  <script>
+  <%= javascript_include_tag "jquery.ui.sortable" %>
-    $(function(){
+  <%= javascript_include_tag "lib/jquery.ui.touch-punch.min.js" %>
-      var _userPosition = [];
+  <%= javascript_include_tag "lib/jquery.lite.image.resize.js" %>
-      $('#member-list').on(clickEvent, '.edit_position', function(e){
+  <%= javascript_include_tag "lib/member/sort.js.erb" %>
-        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>
 <% 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 @@
+<% if @data.present? %>
 	<%= render :partial => 'shared/search_header',:locals=>{:items=>@data}  %>
-
 	<%= render @partial %>
-<% if @paginate and  !@data.blank? %>
+	<% 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>
@@ -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){
+  var getInternetExplorerVersion = function(){
-    if($.browser.version < 9){
+   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/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(){
+  var banner = {"banner_name":"#slideshow-<%= @ad_banner.title.dehumanize %>",
-  jQuery(function( $ ){     
+                "banner_fx":"<%= @ad_banner.ad_fx.nil? ? 'fade': @ad_banner.ad_fx %>",
-
+                "banner_pager":".banner_nav-<%= @ad_banner.title.dehumanize %>",
-      $('#slideshow-<%= @ad_banner.title.dehumanize %>').cycle({
+                "image_count":"<%= @ad_banner.ad_images.length %>",
-        delay: -1000,
+                "image_loaded":0,
-        fx: "<%= @ad_banner.ad_fx.nil? ? 'fade': @ad_banner.ad_fx %>",
+                "time_to_next":<%= @ad_banner.transition_msec %>,
-        timeoutFn: getTimeout,
+              };
-        pager: '.banner_nav-<%= @ad_banner.title.dehumanize %>',
+  banners.push(banner);
-        pagerAnchorBuilder: function(idx, slide) {
-          return "<li><a href='#'></a></li>";
-        }
-      });
-  });
-});
 </script>

app/views/front/show_terms_of_use.html.erb

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

app/views/layouts/_left_menu.html.erb

@@ -28,3 +28,19 @@
   </li>
   
 </ul>
+<% @url_path = "#{request.fullpath}".scan(/admin/)%>
+<% if (@site.default_image.present? && (!@url_path.include? "admin"))%>
+<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 %>

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
@@ -71,3 +72,4 @@ en:
       tag: Error when updating category
       tag: Error when updating tag
   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/routes.rb

@@ -215,8 +215,10 @@ Orbit::Application.routes.draw do
         get 'temp_edit'
       end
       collection do
-        get 'edit_order'
+        get 'edit_order_card'
-        post 'update_order'
+        get 'edit_order_list'
+        post 'update_order_card'
+        post 'update_order_list'
       end
       match "edit_passwd" => "users_new_interface#edit_passwd" ,:as => :edit_passwd
     end
@@ -271,7 +273,7 @@ Orbit::Application.routes.draw do
 
   match "/desktop/compatibility" =>  "desktop#compatibility"
   match "desktop" =>  "desktop#index"
-  match "/desktop/desktop" => "desktop#desktop"
+  match "/desktop/desktop_container" => "desktop#desktop_container"
   match '/desktop/appactivation'=>'desktop#appactivation'
   match '/desktop/app_manager'=>'desktop#app_manager'
   match '/desktop/allsections'=>'desktop#allsections'
@@ -326,7 +328,7 @@ Orbit::Application.routes.draw do
     end 
   end
 
-  controller_paths :front, %w[show_breadcrumb show_banner show_footer show_menu show_page_sub_menu show_site_sub_menu show_sitemap show_tag_cloud]
+  controller_paths :front, %w[show_breadcrumb show_banner show_footer show_menu show_page_sub_menu show_site_sub_menu show_sitemap show_tag_cloud  show_terms_of_use]
   # controller_paths :mobile, %w[index announcement announcement_content dialog_contact dialog_copyright dialog_language map page page_content]
 
   # scope 'app' do

lib/orbit_core_lib.rb

@@ -197,13 +197,22 @@ module  OrbitCoreLib
         end
       end
 
+      def skip_authorization(arg = nil)
+        if arg
+          key = arg.shift
+          prepend_before_filter key[0] => key[1] {|f| f.no_authorization}
+        else
+          prepend_before_filter {|f| f.no_authorization}
+        end
+      end
+
     end
 
     module InstanceMethods
       protected
       def can_use
         setup_vars
-        set_current_user
+        unless @no_authorization
           if @user_type
             @user_type.each do |user_type|
               open = false
@@ -218,6 +227,7 @@ module  OrbitCoreLib
               when :approver
                 open ||= check_sub_manager
               when :visitor
+                set_current_user
                 open ||= true
                 visitor ||= true
               end
@@ -230,6 +240,7 @@ module  OrbitCoreLib
             check_user_can_use
           end
         end
+      end
 
       def check_admin
         current_or_guest_user.admin?
@@ -252,6 +263,10 @@ module  OrbitCoreLib
         @user_type << var
       end
 
+      def no_authorization
+        @no_authorization = true
+      end
+
       def check_user_can_use
         unless current_or_guest_user.admin? || @module_app.is_manager?(current_or_guest_user) || @module_app.is_sub_manager?(current_or_guest_user) || @module_app.can_approve?(current_or_guest_user)
           redirect_to root_url
@@ -259,9 +274,8 @@ module  OrbitCoreLib
       end
 
       def setup_vars
-        @app_title ||= controller_path.split('/')[1].singularize
+        @app_title ||= controller_path.split('/')[1].singularize rescue nil
-        @module_app ||= ModuleApp.first(conditions: {:key => @app_title} )
+        @module_app ||= ModuleApp.first(conditions: {:key => @app_title} ) rescue nil
-        # raise ModuleAppError, 'Can not find ModuleApp' if @module_app.nil?
       end
     end
   end

lib/orbit_model/authorizable.rb

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

lib/parsers/parser_common.rb

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

lib/parsers/parser_front_end.rb

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

lib/tasks/new_ui.rake

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

lib/tasks/site.rake

@@ -27,7 +27,7 @@ namespace :site do
     site.design = design
     site.save
     theme = design.themes.first
-    home = Page.new(  :design_id => design.id, :name => 'home', :is_published => true, :theme_id => theme.id )
+    home = Page.new(  :design_id => design.id, :name => 'home', :is_published => true, :theme_id => theme.id, :menu_enabled_for => [] )
 
     home.title_translations = {"zh_tw"=>"首頁", "en"=>"Home"}
     home.save 

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

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

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

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

vendor/built_in_modules/ad_banner/init.rb

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

vendor/built_in_modules/archive/app/controllers/panel/archive/front_end/archive_files_controller.rb

@@ -21,7 +21,7 @@ class Panel::Archive::FrontEnd::ArchiveFilesController < OrbitWidgetController
   def index
     @item = Page.find(params[:page_id])
     @title = @item.title
-    @frontend_style = @item.frontend_style
+    @frontend_style = !@item.frontend_style.blank? ? @item.frontend_style : "1"
     if !@item.frontend_data_count.blank?
       @page_num = @item.frontend_data_count
     else
@@ -43,15 +43,15 @@ class Panel::Archive::FrontEnd::ArchiveFilesController < OrbitWidgetController
     if @frontend_style == "1"
 
       if !params[:category_id].blank? && !params[:tag_id].blank?
-        @archive_files = ArchiveFile.can_display.where(:category_id.in => @archive_file_category_ids, :tagged_ids.in => params[:tag_id]).desc( :is_top ).default_sort(params[:sort]).page( params[:page_main] ).per(@page_num)
+        @archive_files = ArchiveFile.can_display.where(:category_id.in => @archive_file_category_ids, :tagged_ids.in => params[:tag_id], :title.nin=>[""]).desc( :is_top ).default_sort(params[:sort]).page( params[:page_main] ).per(@page_num)
         # @current_category = ArchiveFileCategory.from_id(params[:category_id]) rescue nil
       elsif !params[:category_id].blank?
-        @archive_files = ArchiveFile.can_display.where(:category_id.in => @archive_file_category_ids).desc( :is_top ).default_sort(params[:sort]).page( params[:page_main] ).per(@page_num)
+        @archive_files = ArchiveFile.can_display.where(:category_id.in => @archive_file_category_ids, :title.nin=>[""]).desc( :is_top ).default_sort(params[:sort]).page( params[:page_main] ).per(@page_num)
         # @current_category = ArchiveFileCategory.from_id(params[:category_id]) rescue nil
       elsif !params[:tag_id].blank?
-        @archive_files = ArchiveFile.can_display.where(:category_id.in => @archive_file_category_ids,:tagged_ids.in => params[:tag_id]).desc( :is_top ).default_sort(params[:sort]).page( params[:page_main] ).per(@page_num)
+        @archive_files = ArchiveFile.can_display.where(:category_id.in => @archive_file_category_ids,:tagged_ids.in => params[:tag_id], :title.nin=>[""]).desc( :is_top ).default_sort(params[:sort]).page( params[:page_main] ).per(@page_num)
       else
-        @archive_files = ArchiveFile.can_display.where(:category_id.in => @archive_file_category_ids).desc( :is_top ).default_sort(params[:sort]).page( params[:page_main] ).per(@page_num)
+        @archive_files = ArchiveFile.can_display.where(:category_id.in => @archive_file_category_ids, :title.nin=>[""]).desc( :is_top ).default_sort(params[:sort]).page( params[:page_main] ).per(@page_num)
       end
 
     elsif @frontend_style == "2"
@@ -61,13 +61,13 @@ class Panel::Archive::FrontEnd::ArchiveFilesController < OrbitWidgetController
       @archive_file_categorys.each do |afcg|
 
         if !params[:category_id].blank? && !params[:tag_id].blank?
-          @archive_files = ArchiveFile.can_display.where(:category_id.in => [afcg.id], :tagged_ids.in => params[:tag_id]).desc( :is_top ).default_sort(params[:sort])
+          @archive_files = ArchiveFile.can_display.where(:category_id.in => [afcg.id], :tagged_ids.in => params[:tag_id], :title.nin=>[""]).desc( :is_top ).default_sort(params[:sort])
         elsif !params[:category_id].blank?
-          @archive_files = ArchiveFile.can_display.where(:category_id.in => [afcg.id]).desc( :is_top ).default_sort(params[:sort])
+          @archive_files = ArchiveFile.can_display.where(:category_id.in => [afcg.id], :title.nin=>[""]).desc( :is_top ).default_sort(params[:sort])
         elsif !params[:tag_id].blank?
-          @archive_files = ArchiveFile.can_display.where(:category_id => afcg.id, :tagged_ids.in => params[:tag_id]).desc( :is_top ).default_sort(params[:sort])
+          @archive_files = ArchiveFile.can_display.where(:category_id => afcg.id, :tagged_ids.in => params[:tag_id], :title.nin=>[""]).desc( :is_top ).default_sort(params[:sort])
         else
-          @archive_files = ArchiveFile.can_display.where(:category_id => afcg.id).desc( :is_top ).default_sort(params[:sort])
+          @archive_files = ArchiveFile.can_display.where(:category_id => afcg.id, :title.nin=>[""]).desc( :is_top ).default_sort(params[:sort])
         end
 
         archive_file_datas = Array.new

vendor/built_in_modules/archive/app/controllers/panel/archive/widget/archive_files_controller.rb

@@ -23,6 +23,7 @@ class Panel::Archive::Widget::ArchiveFilesController < OrbitWidgetController
 	  end
 
     @widget_style = @part.widget_style
+    @widget_style = !@part.widget_style.blank? ? @part.widget_style : "1"
 
 	  @category_id = @part.category
 
@@ -64,13 +65,13 @@ class Panel::Archive::Widget::ArchiveFilesController < OrbitWidgetController
     if @widget_style == "1"
 
       if !params[:category_id].blank? && !params[:tag_id].blank?
-        @archive_files = ArchiveFile.can_display.where(:category_id.in => @archive_file_category_ids, :tagged_ids.in => params[:tag_id]).desc( :is_top ).default_sort(params[:sort]).page( params[:page_main] ).per(@page_num)
+        @archive_files = ArchiveFile.can_display.where(:category_id.in => @archive_file_category_ids, :tagged_ids.in => params[:tag_id], :title.nin=>[""]).desc( :is_top ).default_sort(params[:sort]).page( params[:page_main] ).per(@page_num)
       elsif !params[:category_id].blank?
-        @archive_files = ArchiveFile.can_display.where(:category_id.in => @archive_file_category_ids).desc( :is_top ).default_sort(params[:sort]).page( params[:page_main] ).per(@page_num)
+        @archive_files = ArchiveFile.can_display.where(:category_id.in => @archive_file_category_ids, :title.nin=>[""]).desc( :is_top ).default_sort(params[:sort]).page( params[:page_main] ).per(@page_num)
       elsif !params[:tag_id].blank?
-        @archive_files = ArchiveFile.can_display.where(:category_id.in => @archive_file_category_ids,:tagged_ids.in => params[:tag_id]).desc( :is_top ).default_sort(params[:sort]).page( params[:page_main] ).per(@page_num)
+        @archive_files = ArchiveFile.can_display.where(:category_id.in => @archive_file_category_ids,:tagged_ids.in => params[:tag_id], :title.nin=>[""]).desc( :is_top ).default_sort(params[:sort]).page( params[:page_main] ).per(@page_num)
       else
-        @archive_files = ArchiveFile.can_display.where(:category_id.in => @archive_file_category_ids).desc( :is_top ).default_sort(params[:sort]).page( params[:page_main] ).per(@page_num)
+        @archive_files = ArchiveFile.can_display.where(:category_id.in => @archive_file_category_ids, :title.nin=>[""]).desc( :is_top ).default_sort(params[:sort]).page( params[:page_main] ).per(@page_num)
       end
 
     elsif @widget_style == "2"
@@ -80,13 +81,13 @@ class Panel::Archive::Widget::ArchiveFilesController < OrbitWidgetController
       @archive_file_categorys.each do |afcg|
 
         if !params[:category_id].blank? && !params[:tag_id].blank?
-          @archive_files = ArchiveFile.can_display.where(:category_id.in => [afcg.id], :tagged_ids.in => params[:tag_id]).desc( :is_top ).default_sort(params[:sort]).limit(@page_num)
+          @archive_files = ArchiveFile.can_display.where(:category_id.in => [afcg.id], :tagged_ids.in => params[:tag_id], :title.nin=>[""]).desc( :is_top ).default_sort(params[:sort]).limit(@page_num)
         elsif !params[:category_id].blank?
-          @archive_files = ArchiveFile.can_display.where(:category_id.in => [afcg.id]).desc( :is_top ).default_sort(params[:sort]).limit(@page_num)
+          @archive_files = ArchiveFile.can_display.where(:category_id.in => [afcg.id], :title.nin=>[""]).desc( :is_top ).default_sort(params[:sort]).limit(@page_num)
         elsif !params[:tag_id].blank?
-          @archive_files = ArchiveFile.can_display.where(:category_id => afcg.id, :tagged_ids.in => params[:tag_id]).desc( :is_top ).default_sort(params[:sort]).limit(@page_num)
+          @archive_files = ArchiveFile.can_display.where(:category_id => afcg.id, :tagged_ids.in => params[:tag_id], :title.nin=>[""]).desc( :is_top ).default_sort(params[:sort]).limit(@page_num)
         else
-          @archive_files = ArchiveFile.can_display.where(:category_id => afcg.id).desc( :is_top ).default_sort(params[:sort]).limit(@page_num)
+          @archive_files = ArchiveFile.can_display.where(:category_id => afcg.id, :title.nin=>[""]).desc( :is_top ).default_sort(params[:sort]).limit(@page_num)
         end
 
         archive_file_datas = Array.new

vendor/built_in_modules/archive/app/views/panel/archive/widget/archive_files/_index.html.erb

@@ -87,9 +87,11 @@
 <% end %>
 
 <div class="pull_right">
+<% if !@archive_files.blank? or !@archive_file_datas.blank? %>
 	<% if !params[:category_id].blank? %>
 		<%= link_to t(:more_plus), panel_archive_front_end_archive_files_path(:category_id => @part.category) %>
 	<% else %>
 		<%= link_to t(:more_plus), panel_archive_front_end_archive_files_path %>
 	<% end %>
+<% end %>
 </div>

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

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

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

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

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

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

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

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

vendor/built_in_modules/ask/config/routes.rb

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

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

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

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

@@ -83,11 +83,12 @@ class WritingBook
   end
   
   def create_link
-    
+    title = []
-	title = ["\"#{self.extracted_chapters}\""]
+    # title = ["#{self.extracted_chapters}"] if self.extracted_chapters.present?
-	title << self.book_title
+    title << self.paper_title if self.paper_title.present?
-	title << self.publisher
+    title << self.book_title if self.book_title.present?
-	title << self.pages
+    title << self.publisher if self.publisher.present?
+    title << self.pages if self.pages.present?
     # title << "(#{self.journal_level_types.collect{|x| x.title}.join(', ')})"
     title.join(', ') 
   end

vendor/built_in_modules/personal_conference/app/helpers/panel/personal_conference/desktop/conference_pages_helper.rb

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

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

@@ -84,15 +84,13 @@ class WritingConference
   end
 
   def create_link
-
+    title = ["#{self.paper_title}"]
-    title = ["\"#{self.paper_title}\""]
+    title << self.conference_title if self.conference_title.present?
-    title << self.conference_title
+    title << self.sponsor if self.sponsor.present?
-    title << self.sponsor
+    title << self.location if self.location.present?
-    title << self.location
+    title << "#{period_start_date}-#{period_end_date}" if (self.period_start_date.present? && self.period_end_date.present?)
-    title << "#{period_start_date}-#{period_end_date}"
     # title << "(#{self.conference_paper_types.collect{|x| x.title}.join(', ')})"
     title.join(', ') 
-
   end
 
   protected

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

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

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

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

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

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