fix new ui ask module frontend

Do not show default widget if there's no data

Gemfile

@@ -18,6 +18,7 @@ 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/admin/filemanager.js

@@ -69,7 +69,7 @@ $(document).ready(function(){
 		$("input[type=checkbox]:checked").each(function(){
 			items_to_delete.push($(this).val());
 		})
-		$.post("/admin/assets/delete_files",{"files":items_to_delete,"type":type},function(){
+		$.post("<%= delete_files_admin_assets_path %>",{"files":items_to_delete,"type":type},function(){
 			deleteBtn.hide();
 		})
 	})

app/assets/javascripts/desktop/orbitdesktop.js

@@ -226,7 +226,7 @@ var orbitDesktop = function(dom){
 
   this.bindDesktopEvents = function(){  //this function will bind the global handlers to thd desktop, for example doc
     $(".docklist a").click(function(){
-      if( !$( this ).hasClass( 'disable' ) )
+      if( !$( this ).parent().hasClass( 'disable' ) )
           o.menu_item($(this));
       return false;
     });

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

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

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

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

app/assets/javascripts/lib/list-check.js

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

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

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

app/assets/javascripts/structure.js

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

app/assets/stylesheets/basic/global.css

@@ -191,7 +191,7 @@ legend {
 }
 #sidebar .sidebar-nav > li i {
   font-size: 1.6em;
-  line-height: 60px;
+  line-height: 45px;
 }
 #sidebar .sidebar-nav > li.active i {
   font-size: 2.2em;
@@ -621,8 +621,8 @@ legend {
   margin-bottom: 25px;
 }
 .sign-in .btn {
-  display: block;
   padding: 4px 0;
+  display: block;
   width: 100%;
   margin-bottom: 10px;
 }
@@ -650,7 +650,7 @@ legend {
 .sign-in .checkbox {
   position: absolute;
   text-align: left;
-  bottom: 47px;
+  bottom: 37px;
 }
 .sign-in .switchboard {
   color: #08C;

app/assets/stylesheets/basic/orbit_bar.css.erb

@@ -2,17 +2,16 @@
 	top: 0px;
 	left: -10px;
 	right: -10px;
+	height: 40px;
 	z-index: 1041;
 	position: fixed;
 	margin-bottom: 0;
-	height: 40px;
 }
 #orbit-bar .orbitlogo {
-	width: 50px;
-	height: 40px;
-	padding: 0!important;
+	width: 20px;
+	height: 20px;
 	background-size: 70%;
-	display: block;
+	display: inline-block;
 	background-position: center;
 	background-repeat: no-repeat;
 	background-image: url(<%= asset_path 'orbit-logo.svg' %>);
@@ -20,23 +19,8 @@
 	/* For Suck IE */
 	background-image: url(<%= asset_path 'orbit-logo.png' %>)\9;
 }
-#orbit-bar .dropdown-menu li > a {
-	padding: 0 20px;
-	display: block;
-	height: 30px;
-	line-height: 30px;
-}
-#orbit-bar .dropdown-menu li i {
-	float: left;
-	display: inline-block;
-	margin-right: 5px;
-	line-height: 30px;
-	height: 100%;
-}
 #orbit-bar.navbar .nav > li > a {
 	color: #EEE;
-	padding: 0 15px;
-	display: block;
 	text-shadow: 0 -1px 0 #000;
 	border-right: 1px solid #363636;
 	box-shadow: 1px 0px 0px rgba(0, 0, 0, 0.3);
@@ -50,11 +34,6 @@
 	background-color: #0095CF;
 	text-shadow: 0 -1px 0 #014380;
 }
-#orbit-bar.navbar .nav > li > a > [class^="icon"],
-#orbit-bar.navbar .nav > li > a > [class*=" icon"] {
-	line-height: 40px;
-	display: block;
-}
 #orbit-bar.navbar .nav li.dropdown.open > .dropdown-toggle,
 #orbit-bar.navbar .nav li.dropdown.active > .dropdown-toggle,
 #orbit-bar.navbar .nav li.dropdown.open.active > .dropdown-toggle {
@@ -62,7 +41,9 @@
 	text-shadow: 0 -1px 0 #014380;
 }
 #orbit-bar .navbar-inner {
+	height: 40px;
 	border-width: 0;
+	min-height: 40px;
 	background-color: #333333;
 	-webkit-border-radius: 0px;
 	   -moz-border-radius: 0px;
@@ -85,10 +66,6 @@
 	right: auto;
 	bottom: auto;
 }
-#orbit-bar .nav > li {
-	display: block;
-	line-height: 40px;
-}
 #orbit-bar .nav [class^="icon"],
 #orbit-bar .nav [class*=" icon"] {
 	font-size: 1.5em;
@@ -115,45 +92,17 @@
 #orbit-bar .modal .input-prepend {
 	margin-bottom: 15px;
 }
-#orbit-bar .modal .other-sign-in {
-	position: relative;
-	text-align: center;
-	margin-top: 20px;
-	margin-bottom: 30px;
-	padding-bottom: 20px;
-	border-bottom: 1px solid #EDEDED;
-}
-#orbit-bar .modal .other-sign-in .btn {
-	padding: 4px 0;
-	display: block;
-	margin-bottom: 5px;
-	width: 100%;
-}
-#orbit-bar .modal .other-sign-in p {
-	position: absolute;
-	width: 30px;
-	height: 30px;
-	background-color: #FFF;
-	padding: 0 10px;
-	margin-bottom: 0;
-	margin-left: -25px;
-	line-height: 30px;
-	left: 50%;
-	bottom: -15px;
-	font-size: 1.3em;
-	color: #B1B1B1;
-}
 
 /*Search*/
 #orbit-bar #search {
 	margin-bottom: 0;
 	position: relative;
-	padding: 0 10px;
+	padding: 8px 10px 0;
 	border-right: 1px solid #363636;
 	box-shadow: 1px 0px 0px rgba(0, 0, 0, 0.3);
 }
 #orbit-bar #search form {
-	margin: 8px 0;
+	margin-bottom: 8px;
 }
 #orbit-bar #search input[type="text"] {
 	height: 14px;
@@ -161,7 +110,6 @@
 	font-size: 13px;
 	padding-left: 25px;
 	padding-right: 25px;
-	display: block;
 	-webkit-border-radius: 12px;
 	   -moz-border-radius: 12px;
 	     -o-border-radius: 12px;
@@ -174,16 +122,15 @@
 #orbit-bar #search .search-clear {
 	position: absolute;
 	color: #A3A3A3;
-	top: 16px;
+	top: 14px;
 }
 #orbit-bar #search .icon-search {
-	left: 15px;
+	left: 13px;
+	top: 15px;
 	font-size: 1.2em;
-	width: 1.25em;
-	margin-top: 0;
 }
 #orbit-bar #search .search-clear {
-	right: 13px;
+	right: 14px;
 	font-size: 1.3em;
 }
 #orbit-bar #search .search-clear:hover {

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

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

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

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

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

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

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

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

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

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

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

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

app/assets/stylesheets/lib/member.css

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

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

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

app/assets/stylesheets/orbit_bar_bootstrap.css

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

app/controllers/admin/ad_images_controller.rb

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

app/controllers/admin/import_data_controller.rb

@@ -1,573 +0,0 @@
-# encoding: utf-8
-
-require 'net/http'
-require 'open-uri'
-
-class Admin::ImportDataController < OrbitBackendController
-    helper Admin::PagePartsHelper
-    include Admin::FrontendWidgetInterface
-
-  def get_teacher_data
-  	uri = URI("https://localhost:8000/teachers.xml")
-
-    #params = {"UnitName" => "管理學院".encode('big5-uao'), "account" => "manage"}
-    #uri.query = URI.encode_www_form(params)
-    res = Net::HTTP.get_response(uri)
-    
-    @teacher_data = Hash.from_xml(res.body)
-    @teachers = @teacher_data["objects"]   
-    @i = 5000
-    @teachers.each do |hash|
-          # @roles = Role.skip(1).first
-          @roles =  Role.all
-          @teacher = User.new
-          I18n.locale = :zh_tw
-          if !hash['teacher_zh_tw'].blank?
-            @teacher.first_name = hash['teacher_zh_tw']
-          elsif hash['teacher_zh_tw'].blank? && !hash['teacher_en'].blank?
-            @teacher.first_name = hash['teacher_en']
-          elsif hash['teacher_zh_tw'].blank? && hash['teacher_en'].blank?
-            @teacher.first_name = "Please Fill the Name"
-          end
-      
-          I18n.locale = :en
-          if !hash['teacher_en'].blank?
-            @teacher.first_name = hash['teacher_en']
-          elsif hash['teacher_en'].blank? && !hash['teacher_zh_tw'].blank?
-            @teacher.first_name = hash['teacher_zh_tw']
-          elsif hash['teacher_en'].blank? && hash['teacher_zh_tw'].blank?
-            @teacher.first_name = "Please Fill the Name"
-          end
-            
-          #@teacher.first_name = hash['teacher_en']      
-          @teacher.ntu_seq = hash['ntu_seq']
-          @teacher.sid = hash['ntu_seq']
-          @teacher.role_ids = ["#{@roles.skip(1).first.id}"]
-          @teacher.password = "testpass"
-          @i += 10
-          if !hash['email'].blank?
-             @user = User.where(email: "#{hash['email']}")
-            if @user.length == 0
-             @teacher.email = hash['email']
-            elsif @user.length > 0
-              @teacher.email = "#{@i}duplicate@ntu.edu.tw"            
-            end
-          else 
-            @teacher.email = "#{@i}@ntu.edu.tw"
-          end
-
-          if hash['teacher_zh_tw'].blank? && hash['teacher_en'].blank?
-           @teacher.user_id = "defaultuser"
-          elsif hash['teacher_en'].blank?
-            @teacher.user_id = hash['teacher_zh_tw']
-          elsif hash['teacher_zh_tw'] 
-            @teacher.user_id = hash['teacher_en']
-          end
-          @teacher.save!
-      end
-  end
-
-  def get_book_data
-    uri = URI("http://ann.cc.ntu.edu.tw/Achv/xmlTeacherData.asp")
-    params = {"UnitName" => "管理學院".encode('big5-uao'), "account" => "manage"}
-    uri.query = URI.encode_www_form(params)
-    res = Net::HTTP.get_response(uri)
-    
-    teachers = User.all
-
-    teachers.each do |hash|
-    if hash.ntu_seq.present?
-      ntu_seq = hash.ntu_seq
-	  books_xml = Nokogiri::XML( \
-	  open("http://ann.cc.ntu.edu.tw/Achv/xmlBook.asp?Seq=#{ntu_seq}"))
-	  @books = books_xml.xpath("//Book").map do |book_node|
-          {
-            author: (book_node>"Authors").text,
-            year: (book_node>"PublishYear").text,
-            title: (book_node>"DocTitle").text,
-            remarks: (book_node>"Remarks").text,
-            publisher: (book_node>"Publisher").text,
-            book_title: (book_node>"BookTitle").text
-          }
-      end
-    if @books.present? 
-		@books.each do |b|
-	 	 @book = WritingBook.new
-     I18n.locale = :zh_tw
-	 	 @book.authors = b[:author]
-	 	 @book.paper_title = b[:title]
-		 @book.book_title = b[:book_title]
-		 @book.note = b[:remarks]
-	   @book.publisher = b[:publisher]
-     I18n.locale = :en
-     @book.authors = b[:author]
-     @book.paper_title = b[:title]
-     @book.book_title = b[:book_title]
-     @book.note = b[:remarks]
-     @book.publisher = b[:publisher]
-     @book.year = b[:year]
-	   @book.create_user_id = hash.id
- 		 @book.save
-	   end
-      else
-		puts "No books by Teacher"
-      end
-  	 end
-    end
-  end
-
-  def get_conference_data
-    uri = URI("http://ann.cc.ntu.edu.tw/Achv/xmlTeacherData.asp")
-    params = {"UnitName" => "管理學院".encode('big5-uao'), "account" => "manage"}
-    uri.query = URI.encode_www_form(params)
-    res = Net::HTTP.get_response(uri)
-    
-    teachers = User.all
-
-    teachers.each do |hash|
-    if hash.ntu_seq.present?
-    ntu_seq = hash.ntu_seq
-    conference_xml = Nokogiri::XML( \
-    open("http://ann.cc.ntu.edu.tw/Achv/xmlPaper.asp?Seq=#{ntu_seq}&type=C"))
-        #open("http://versatile.management.ntu.edu.tw/publication1/conference/#{ntuseq}.xml"))
-    @conference_papers = conference_xml.xpath("//Paper").map do |cp_node|
-                            {
-                              author: (cp_node>"Authors").text,
-                              year: (cp_node>"PublishYear").text,
-                              title: (cp_node>"PaperTitle").text,
-                              conference: (cp_node>"PublishOn").text,
-                              date: Date::MONTHNAMES[(cp_node>"PublishMonth").text.to_i],
-                              location: "#{(cp_node>"Country").text} #{(cp_node>"location").text}",
-                              conference_title: (cp_node>"PublishOn").text,
-                              remarks: (cp_node>"Remarks").text
-                            }
-                          end
-     if @conference_papers.present? 
-       @conference_papers.each do |b|
-       @conference_paper = WritingConference.new
-       I18n.locale = :zh_tw
-       @conference_paper.authors = b[:author]
-       if b[:title].blank?
-        @conference_paper.paper_title = "No Title Present"
-       else 
-        @conference_paper.paper_title = b[:title]
-       end
-       if b[:conference_title].blank?
-         @conference_paper.conference_title = "No Title Present"
-       else
-          @conference_paper.conference_title = b[:conference_title]
-       end
-
-       @conference_paper.note = b[:remarks]
-       I18n.locale = :en
-       @conference_paper.authors = b[:author]
-       if b[:title].blank?
-        @conference_paper.paper_title = "No Title Present"
-       else 
-        @conference_paper.paper_title = b[:title]
-       end
-       if b[:conference_title].blank?
-         @conference_paper.conference_title = "No Title Present"
-       else
-          @conference_paper.conference_title = b[:conference_title]
-       end
-       @conference_paper.note = b[:remarks]
-
-       @conference_paper.location = b[:location]
-       @conference_paper.year = b[:year]
-       @conference_paper.create_user_id = hash.id
-
-       @conference_paper.save!
-     end
-      else
-    puts "No conference by Teacher"
-      end
-      end
-    end
-  end
-
-
-  def get_journal_paper_data
-    uri = URI("http://ann.cc.ntu.edu.tw/Achv/xmlTeacherData.asp")
-    params = {"UnitName" => "管理學院".encode('big5-uao'), "account" => "manage"}
-    uri.query = URI.encode_www_form(params)
-    res = Net::HTTP.get_response(uri)
-    
-    teachers = User.all
-
-    teachers.each do |hash|
-    if hash.ntu_seq.present?
-    ntu_seq = hash.ntu_seq
-    paper_xml = Nokogiri::XML( \
-        #open("http://versatile.management.ntu.edu.tw/publication1/journal/#{ntuseq}.xml"))
-    open("http://ann.cc.ntu.edu.tw/Achv/xmlPaper.asp?Seq=#{ntu_seq}&type=J"))
-    @journal_papers = paper_xml.xpath("//Paper").map do |paper_node|
-                  {
-                    author: (paper_node>"Authors").text,
-                    year: (paper_node>"PublishYear").text,
-                    title: (paper_node>"PaperTitle").text,
-                    journal: (paper_node>"PublishOn").text,
-                    volume:(paper_node>"Volume").text,
-                    volumeno:(paper_node>"VolumeNo").text,
-                    beginpage:(paper_node>"BeginPage").text,
-                    endpage:(paper_node>"EndPage").text,
-                    subgroup:(paper_node>"subgroup").text,
-                    remarks: (paper_node>"Remarks").text,
-                    cate: ((paper_node>"subgroup")>"Group").text
-                  }
-                end
-     if @journal_papers.present? 
-       @journal_papers.each do |b|
-       @journal_paper = WritingJournal.new
-       I18n.locale = :zh_tw
-       @journal_paper.authors = b[:author]
-       if b[:title].blank?
-          @journal_paper.paper_title = "No Title Present"
-       else 
-          @journal_paper.paper_title = b[:title]
-       end
-       @journal_paper.journal_title = b[:journal]
-       @journal_paper.note = b[:remarks]
-       I18n.locale = :en
-       @journal_paper.authors = b[:author]
-       if b[:title].blank?
-          @journal_paper.paper_title = "No Title Present"
-       else 
-          @journal_paper.paper_title = b[:title]
-       end
-       @journal_paper.journal_title = b[:journal]
-       @journal_paper.note = b[:remarks]
-       @journal_paper.year = b[:year]
-       @journal_paper.vol_no = b[:volumeno]
-       @journal_paper.form_to_start = b[:beginpage]
-       @journal_paper.form_to_end = b[:endpage]
-       if !b[:cate].blank?
-        @level_type = JournalLevelType.where(:key => b[:cate])
-        if @level_type.present?
-          @journal_paper.journal_level_type_ids = ["#{@level_type.first.id}"]
-        end
-       end
-
-       @journal_paper.create_user_id = hash.id
-       @journal_paper.save!
-     end
-      else
-    puts "No journal paper by Teacher"
-      end
-      end
-    end
-  end
-
- def sync_conference_data
-    @conference_data = WritingConference.where(create_user_id: "#{params[:user_id]}")
-    @conference_data.delete_all
-    @user = User.find("#{params[:user_id]}")
-
-    # teachers.each do |hash|
-     if @user.sid.present?
-    ntu_seq = @user.sid
-    conference_xml = Nokogiri::XML( \
-    open("http://ann.cc.ntu.edu.tw/Achv/xmlPaper.asp?Seq=#{ntu_seq}&type=C"))
-        #open("http://versatile.management.ntu.edu.tw/publication1/conference/#{ntuseq}.xml"))
-    @conference_papers = conference_xml.xpath("//Paper").map do |cp_node|
-                            {
-                              author: (cp_node>"Authors").text,
-                              year: (cp_node>"PublishYear").text,
-                              title: (cp_node>"PaperTitle").text,
-                              conference: (cp_node>"PublishOn").text,
-                              date: Date::MONTHNAMES[(cp_node>"PublishMonth").text.to_i],
-                              location: "#{(cp_node>"Country").text} #{(cp_node>"location").text}",
-                              conference_title: (cp_node>"PublishOn").text,
-                              remarks: (cp_node>"Remarks").text
-                            }
-                          end
-     if @conference_papers.present? 
-       @conference_papers.each do |b|
-       @conference_paper = WritingConference.new
-       I18n.locale = :zh_tw
-       @conference_paper.authors = b[:author]
-       if b[:title].blank?
-        @conference_paper.paper_title = "No Title Present"
-       else 
-        @conference_paper.paper_title = b[:title]
-       end
-       if b[:conference_title].blank?
-         @conference_paper.conference_title = "No Title Present"
-       else
-          @conference_paper.conference_title = b[:conference_title]
-       end
-
-       @conference_paper.note = b[:remarks]
-       I18n.locale = :en
-       @conference_paper.authors = b[:author]
-       if b[:title].blank?
-        @conference_paper.paper_title = "No Title Present"
-       else 
-        @conference_paper.paper_title = b[:title]
-       end
-       if b[:conference_title].blank?
-         @conference_paper.conference_title = "No Title Present"
-       else
-          @conference_paper.conference_title = b[:conference_title]
-       end
-       @conference_paper.note = b[:remarks]
-
-       @conference_paper.location = b[:location]
-       @conference_paper.year = b[:year]
-       @conference_paper.create_user_id = @user.id
-
-       @conference_paper.save!
-     end
-      else
-    puts "No conference by Teacher"
-      end
-      end
-       respond_to do |format|
-    
-        format.html
-        format.json { render json: {"success"=>true}.to_json}
-      
-      end
-  end
-
-
-  def sync_journal_paper_data
-    @journal_data = WritingJournal.where(create_user_id: "#{params[:user_id]}")
-    @journal_data.delete_all
-    @user = User.find("#{params[:user_id]}")
-
-    # teachers.each do |hash|
-    if @user.sid.present?
-      ntu_seq = @user.sid
-      paper_xml = Nokogiri::XML( \
-          #open("http://versatile.management.ntu.edu.tw/publication1/journal/#{ntuseq}.xml"))
-      open("http://ann.cc.ntu.edu.tw/Achv/xmlPaper.asp?Seq=#{ntu_seq}&type=J"))
-      @journal_papers = paper_xml.xpath("//Paper").map do |paper_node|
-                    {
-                      author: (paper_node>"Authors").text,
-                      year: (paper_node>"PublishYear").text,
-                      title: (paper_node>"PaperTitle").text,
-                      journal: (paper_node>"PublishOn").text,
-                      volume:(paper_node>"Volume").text,
-                      volumeno:(paper_node>"VolumeNo").text,
-                      beginpage:(paper_node>"BeginPage").text,
-                      endpage:(paper_node>"EndPage").text,
-                      subgroup:(paper_node>"subgroup").text,
-                      remarks: (paper_node>"Remarks").text,
-                      cate: ((paper_node>"subgroup")>"Group").text
-                    }
-                  end
-      if @journal_papers.present? 
-        @journal_papers.each do |b|
-           @journal_paper = WritingJournal.new
-           I18n.locale = :zh_tw
-           @journal_paper.authors = b[:author]
-
-           if b[:title].blank?
-              @journal_paper.paper_title = "No Title Present"
-           else 
-              @journal_paper.paper_title = b[:title]
-           end
-
-           @journal_paper.journal_title = b[:journal]
-           @journal_paper.note = b[:remarks]
-           I18n.locale = :en
-           @journal_paper.authors = b[:author]
-
-           if b[:title].blank?
-              @journal_paper.paper_title = "No Title Present"
-           else 
-              @journal_paper.paper_title = b[:title]
-           end
-
-           @journal_paper.journal_title = b[:journal]
-           @journal_paper.note = b[:remarks]
-           @journal_paper.year = b[:year]
-           @journal_paper.vol_no = b[:volumeno]
-           @journal_paper.form_to_start = b[:beginpage]
-           @journal_paper.form_to_end = b[:endpage]
-
-           if !b[:cate].blank?
-            @level_type = JournalLevelType.where(:key => b[:cate])
-            if @level_type.present?
-              @journal_paper.journal_level_type_ids = ["#{@level_type.first.id}"]
-            end
-           end
-
-           @journal_paper.create_user_id = @user.id
-           @journal_paper.save!
-        end
-      end
-     
-    end
-     respond_to do |format|
-    
-        format.html
-        format.json { render json: {"success"=>true}.to_json}
-      
-      end
-  end
-
-def sync_book_data
-    @books_data = WritingBook.where(create_user_id: "#{params[:user_id]}")
-    @books_data.delete_all
-    @user = User.find("#{params[:user_id]}")
-
-    # teachers.each do |hash|
-     if @user.sid.present?
-    ntu_seq = @user.sid
-    books_xml = Nokogiri::XML( \
-    open("http://ann.cc.ntu.edu.tw/Achv/xmlBook.asp?Seq=#{ntu_seq}"))
-    @books = books_xml.xpath("//Book").map do |book_node|
-          {
-            author: (book_node>"Authors").text,
-            year: (book_node>"PublishYear").text,
-            title: (book_node>"DocTitle").text,
-            remarks: (book_node>"Remarks").text,
-            publisher: (book_node>"Publisher").text,
-            book_title: (book_node>"BookTitle").text
-          }
-      end
-    if @books.present? 
-     @books.each do |b|
-     @book = WritingBook.new
-     I18n.locale = :zh_tw
-     @book.authors = b[:author]
-     @book.paper_title = b[:title]
-     @book.book_title = b[:book_title]
-     @book.note = b[:remarks]
-     @book.publisher = b[:publisher]
-     I18n.locale = :en
-     @book.authors = b[:author]
-     @book.paper_title = b[:title]
-     @book.book_title = b[:book_title]
-     @book.note = b[:remarks]
-     @book.publisher = b[:publisher]
-     @book.year = b[:year]
-     @book.create_user_id = @user.id
-     @book.save
-     end
-    end
-     end
-     respond_to do |format|
-    
-        format.html
-        format.json { render json: {"success"=>true}.to_json}
-      
-      end
-  end
-
-
-  def get_announcement_data
-  uri = URI("https://localhost:8000/announcements.xml")
-
-    #params = {"UnitName" => "管理學院".encode('big5-uao'), "account" => "manage"}
-    #uri.query = URI.encode_www_form(params)
-    res = Net::HTTP.get_response(uri)
-    
-    @announcement_data = Hash.from_xml(res.body)
-    @announcements = @announcement_data["objects"]   
-    @announcements.each do |hash|
-          @bulletin = Bulletin.new
-
-          I18n.locale = :zh_tw
-          if hash['announcement_title_zh_tw'].blank?
-           @bulletin.title = hash['announcement_title_en']
-           @bulletin.text = hash['announcement_content_zh_tw']
-          elsif hash['announcement_title_zh_tw'].blank? && hash['announcement_title_en'].blank?
-           @bulletin.title = "Please Fill the Name"
-           @bulletin.text = hash['announcement_content_zh_tw']
-          else
-           @bulletin.title = hash['announcement_title_zh_tw']
-           @bulletin.text = hash['announcement_content_zh_tw']
-          end
-
-          I18n.locale = :en
-          if hash['announcement_title_zh_tw'].blank? && hash['announcement_title_en'].blank?
-            @bulletin.title = "Please Fill the Name"
-            @bulletin.text = hash['announcement_content_en']
-
-          elsif hash['announcement_title_en'].blank?
-            @bulletin.title = hash['announcement_zh_tw']
-            @bulletin.text = hash['announcement_content_en']
-
-          elsif hash['announcement_title_zh_tw'].blank?
-            @bulletin.title = hash['announcement_title_en']
-            @bulletin.text = hash['announcement_content_en']
-          end
-          @bulletin.category_id = "51d2a16438178423c2000001"
-          @bulletin.is_pending = true
-
-          @bulletin.save!
-      end
-  end
-  
-  def get_page_data        
-    f = File.open("/home/rwub/orbit-db/ntu_mb/pages/management_pages.xml")
-    page_xml = Nokogiri::XML(f)
-        #open("http://versatile.management.ntu.edu.tw/publication1/conference/#{ntuseq}.xml"))
-    @pages = page_xml.xpath("//management-page").map do |cp_node|
-                            {
-                              menu_title: (cp_node>"menu-title").text,
-                              content: (cp_node>"content").text
-                            }
-                          end
-
-     if @pages.present? 
-       @i=0
-       @pages.each do |b|
-        
-        get_variables_for_new
-        @page = Page.new
-        
-         @page.parent = "4f45f3b9e9d02c5db900005d"
-         @page.design = "50ac424983e75219d2000021"
-         @page.theme_id = "50ac424a83e75219d2000025"
-         @page.menu_enabled_for= ["en", "zh_tw", ""]
-         @page.enabled_for= ["en", "zh_tw", ""]
-         @page.is_published = false
-        if b[:menu_title].blank?
-         @page.title = 'No Title Present'
-         @i += 1 
-         @page.name = "#{@i}Page"
-        else 
-         @i += 1 
-         @page.title = b[:menu_title]
-         @page.name = "#{@i}Page"
-        end
-        if b[:content].blank?
-         @page.content = "No Content Present"
-        else 
-        @page.content = b[:content]
-        end
-        @page.save!
-      end
-       else
-     puts "No Page Data"
-       end
-  end
-
-
-  def get_variables_for_new
-    @designs = Design.all.entries
-    @themes = Design.first.themes
-    @module_apps = ModuleApp.for_frontend_select
-    @app_frontend_urls = nil
-    @categories = nil
-    @tags = nil
-    @page_frontend_data_counts = nil
-    @frontend_styles = nil
-    @selected={
-      :design => @designs.first,
-      :theme=> @themes.first,
-      :module_app=>nil,#@module_apps.first
-      :app_frontend_url=> nil, #@module_apps.first
-      :category=>nil,
-      :tag=>nil,
-      :page_frontend_data_count=>nil,
-      :frontend_style => nil
-    }
-  end
-
-
-end

app/controllers/admin/items_controller.rb

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

app/controllers/admin/pages_controller.rb

@@ -95,7 +95,7 @@ class Admin::PagesController < Admin::ItemsController
   	if @item.module_app && @item.module_app.key == 'page_content'
   	  @item.page_contexts.build(:create_user_id => current_user.id, :update_user_id => current_user.id )
   	end
-
+	
     if @item.save
       flash.now[:notice] = t('create.success.page')
       respond_to do |format|

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_widgets_controller.rb

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

app/controllers/front_controller.rb

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

app/controllers/mobile_controller.rb

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

app/controllers/pages_controller.rb

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

app/controllers/sessions_controller.rb

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

app/models/item.rb

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

app/models/module_app.rb

@@ -185,18 +185,18 @@ class ModuleApp
     user_ids = self.auth_approvals.inject([]) do |users, auth|
       users += auth.authorized_users.map{|user| user.id}
     end
-    update_attribute(:auth_approval_users, user_ids.uniq)
+    self.update_attribute(:auth_approval_users, user_ids.uniq)
   end
 
   def update_auth_manager_users
-    update_attribute(:auth_manager_users, self.auth_manager_authorized_users.map{|user| user.id})
+    self.update_attribute(:auth_manager_users, self.auth_manager_authorized_users.map{|user| user.id})
   end
 
   def update_auth_sub_manager_users
     user_ids = self.auth_sub_managers.inject([]) do |users, auth|
       users += auth.authorized_users.map{|user| user.id}
     end
-    update_attribute(:auth_sub_manager_users, user_ids.uniq)
+    self.update_attribute(:auth_sub_manager_users, user_ids.uniq)
   end
 
   def managers

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/user/user.rb

@@ -16,13 +16,10 @@ class User
   field :first_name, localize: true
   field :last_name, localize: true
   field :email
-  field :email_hidden, :type => Boolean, :default => false
   field :sex, :default => 'unknown'
   field :office_tel
   field :cache_dept,type: Hash
   field :status_record,type: Hash
-  field :ntu_seq
-  #validates :ntu_seq, :uniqueness => true
 
   has_and_belongs_to_many :approving_apps, class_name: 'AuthApproval', inverse_of: 'authorized_users'
   has_and_belongs_to_many :managing_apps, class_name: 'AuthManager', inverse_of: 'authorized_users'
@@ -55,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")
@@ -292,7 +290,7 @@ class User
     end
   end
   
-  protected
+  private
 
   def rebuild_status_record
     self.status_record = {}
@@ -302,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_images/_form.html.erb

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -20,8 +20,7 @@
             
             <!-- Input Area -->
             <div class="input-area">
-
-              <div class="nav-name"><strong>Classification</strong></div>
+              <div class="nav-name"><strong>Classification</strong></div>    
               <ul class="nav nav-pills language-nav">
                 <li class="active">
                   <a href="#sidebar-nav" data-toggle="tab">Sidebar Nav</a>
@@ -114,10 +113,10 @@
                 <!-- Openness -->
                 <div id="openness" class="tab-pane fade">
                   <div class="control-group">
-                    <label class="control-label muted"><%= I18n.t('site.frontend_closed')%></label>
+                    <label class="control-label muted"><%= I18n.t('site.frontend_open')%></label>
                     <div class="controls">
-                   	  <%= f.check_box :frontend_closed  , :class=>"toggle-check"%>
-                      <span class="help-block">Only can be viewed by users logged in</span>
+                   	  <%= f.check_box :frontend_open , :class=>"toggle-check"%>
+                      <span class="help-block">If Checked, the frontend will be open for all users.</span>
                     </div>
                   </div>
                   <div class="control-group">
@@ -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/search_engine.html.erb

@@ -43,49 +43,48 @@
 
               <hr>
 
-            <% @site_valid_locales.each do |locale|%>
-            <%= content_tag :div, :class => "tab-pane fade #{active_when_current_locale_eq locale} #{locale}" do %>
-              <div class="control-group">
-                <label class="control-label muted">Site Keywords</label>
-                <div class="controls">
-                  <div class="tab-content textarea-lang">
-                    <div class="btn-group" data-toggle="buttons-radio">
-                     <% @site_valid_locales.each do |locale|%>
-                      <%= content_tag :li, link_to(I18nVariable.from_locale(locale), ".#{locale}", :data => {:toggle => "tab"}), :class => "btn #{(active_when_current_locale_eq locale)}"  %>
-                      <% end %>
-                    </div>
-                    <div class="tab-pane fade active in" id="keywords_en_0">
-                      <%= f.fields_for :keywords do |f| %>
-                        <%= f.text_area locale, :class => "resizable",:rows=>3, :value => (@site.keywords(locale) rescue nil) %>
-                       <% end %>
-                    </div>
-                    </div>
-                  </div>
-                </div>
-                <%end%>
-                <%end%>
-
-            <% @site_valid_locales.each do |locale|%>
-            <%= content_tag :div, :class => "tab-pane fade #{active_when_current_locale_eq locale} #{locale}" do %>
-              <div class="control-group">
-                <label class="control-label muted">Site Description</label>
-                <div class="controls">
-                  <div class="tab-content textarea-lang">
-                    <div class="btn-group" data-toggle="buttons-radio">
-                    <% @site_valid_locales.each do |locale|%>
-                      <%= content_tag :li, link_to(I18nVariable.from_locale(locale), ".#{locale}", :data => {:toggle => "tab"}), :class => "btn #{(active_when_current_locale_eq locale)}"  %>
-                      <% end %>
-                    </div>
-                    <div class="tab-pane fade active in" id="description_en_0">
-                     <%= f.fields_for :description do |f| %>
-                        <%= f.text_area locale, :class => "resizable",:rows=>3, :value => (@site.description(locale) rescue nil) %>
-                       <% end %>
-                    </div>
-                  </div>
-                </div>
+               <!-- Description -->
+        <div class="control-group">
+          <label class="control-label muted">Keywords</label>
+          <div class="controls">
+            <div class="tab-content textarea-lang">
+              <div class="btn-group" data-toggle="buttons-radio">
+                <% @site_valid_locales.each_with_index do |locale, i| %>
+                  <a class="btn <%= ( i == 0 ) ? "active" : '' %>" href="#textarea_<%= locale %>_0" data-toggle="tab"><%= I18nVariable.from_locale(locale) %></a>
+                <% end %>
               </div>
-              <%end%> 
-              <%end%> 
+              <% @site_valid_locales.each_with_index do |locale, i| %>
+                 <div class="tab-pane fade in <%= ( i == 0 ) ? "active" : '' %>" id="textarea_<%= locale %>_0">
+                  <%= f.fields_for :keywords do |f| %>
+                    <%= f.text_area locale, :class=>'resizable', :value => (@site.keywords(locale) rescue nil), :placeholder => I18nVariable.from_locale(locale), :rows=>"3" %>
+                  <% end %>
+                 </div>
+              <% end %>
+            </div>
+          </div>
+        </div>
+
+        <div class="control-group">
+          <label class="control-label muted">Description</label>
+          <div class="controls">
+            <div class="tab-content textarea-lang">
+              <div class="btn-group" data-toggle="buttons-radio">
+                <% @site_valid_locales.each_with_index do |locale, i| %>
+                  <a class="btn <%= ( i == 0 ) ? "active" : '' %>" href="#textarea_<%= locale %>_0" data-toggle="tab"><%= I18nVariable.from_locale(locale) %></a>
+                <% end %>
+              </div>
+              <% @site_valid_locales.each_with_index do |locale, i| %>
+                 <div class="tab-pane fade in <%= ( i == 0 ) ? "active" : '' %>" id="textarea_<%= locale %>_0">
+                  <%= f.fields_for :description do |f| %>
+                    <%= f.text_area locale, :class=>'resizable', :value => (@site.description(locale) rescue nil), :placeholder => I18nVariable.from_locale(locale), :rows=>"3" %>
+                  <% end %>
+                 </div>
+              <% end %>
+            </div>
+          </div>
+        </div>
+
+
             </div>
             <!-- Form Actions -->
             <div class="form-actions">

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

@@ -47,7 +47,7 @@
 
                   <!-- Always shoe in the title bar -->
                   <div class="control-group">
-                    <label class="control-label muted">Always show in the title bar
+                    <label class="control-label muted"><%= t :always_display_title %>
                     </label>
                     <div class="controls">
                       <%= f.check_box :title_always_on, :class => "toggle-check" %> 
@@ -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 -->
-                  <div class="control-group input-content hide">
+                  <!-- CKeditor Site Footer -->
                   <% @site_valid_locales.each do |locale|%>
                   <%= content_tag :div, :class => "tab-pane fade #{active_when_current_locale_eq locale} #{locale}" do %>
-                    <label class="control-label muted">Default Terms of Use</label>
+                    <label class="control-label muted"><%= t('site.default_terms_of_use')%></label>
                     <div class="controls">
                       <div class="textarea">
-                       <%= f.fields_for :terms_of_user_translations do |f| %>
-                          <%= f.text_area locale, :class => "ckeditor input-block-level", :value => (@site.terms_of_user_translations[locale] rescue nil) %>
+                        <%= f.fields_for :terms_of_use_translations do |f| %>
+                          <%= f.text_area locale, :class => "ckeditor input-block-level", :value => (@site.terms_of_use_translations[locale] rescue nil) %>
                         <% end %>
-                        </div>
                       </div>
-                    </div>
-                    <%end%>
+                     </div>
+                     <%end%>
                     <%end%>
+            
 
-                </div>
                  <!-- Form Actions -->
                 <div class="form-actions">
                   <%= f.submit t("submit"), :class => "btn btn-primary" %>

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

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

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

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

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

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

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

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

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

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

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

@@ -6,7 +6,6 @@
     <%= stylesheet_link_tag "lib/main-list" %>
     <%= stylesheet_link_tag "lib/filter" %>
     <%= stylesheet_link_tag "lib/member" %>
-     <%= stylesheet_link_tag "lib/togglebox" %>
 
 <% end -%>
 <% content_for :page_specific_javascript do -%>

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

@@ -94,13 +94,7 @@
           <%= f.email_field :email %>
         </div>
       </div>
-      <div class="control-group">
-        <%= f.label "Disable email", :class=>"control-label muted" %>
-        <div class="controls">
-          <%= f.check_box :email_hidden %>
-        </div>
-      </div>
-                
+
       <!-- ID Number -->
       <div class="control-group">
         <%= f.label t("users.sid"),:class=>"control-label muted" %>

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

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

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

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

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

@@ -21,7 +21,6 @@
     </form>
 
   </div>
-
   <ul class="nav nav-pills filter-nav pull-right">
     <li class="accordion-group">
       <div class="accordion-heading">

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

@@ -22,7 +22,6 @@
                   <%= link_to("<i class='icon-edit'></i> #{t(:edit)}".html_safe,edit_admin_users_new_interface_path(@user),:class=>"btn btn-mini" ) if is_admin?%>
                   <%= link_to("<i class='icons-cycle'></i> #{t("users.change_passwd")}".html_safe,admin_users_new_interface_edit_passwd_path(@user),:class=>"btn btn-mini" ) if is_admin?%>
               </div>
-           
             </div>
 
             <div id="member-roles" class="nano">

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

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

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

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

app/views/default_widget/default_widget.html.erb

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

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

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

app/views/front/show_terms_of_use.html.erb

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

app/views/layouts/_left_menu.html.erb

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

app/views/layouts/_right_menu.html.erb

@@ -33,7 +33,7 @@
         <ul class="dropdown-menu" role="menu" aria-labelledby="orbit-user">
           <li><%= link_to content_tag(:i, nil, class: 'icons-tools') + ' ' +  t(:account_settings), desktop_path + "#settings-account", tabindex: '-1' %></li>
           <li><%= link_to content_tag(:i, nil, class: 'icons-screen') + ' ' +  t(:desktop), desktop_path, tabindex: '-1' %></li>
-          <li><%= link_to content_tag(:i, nil, class: 'icons-logout') + ' ' +  t(:logout), user_logout_path, tabindex: '-1' %></li>
+          <li><%= link_to content_tag(:i, nil, class: 'icons-logout') + ' ' +  t(:logout), destroy_user_session_path, tabindex: '-1' %></li>
           <li class="divider"></li>
           <li><a tabindex="-1" href="#"><i class="icons-lifebuoy"></i> <%= t(:help) %></a></li>
         </ul>
@@ -53,11 +53,6 @@
           </div>
           <div class="modal-body">
             <%= form_for :user, url: user_session_path, html: {class: 'container'} do |f| %>
-              <div class="other-sign-in">
-                <% @request_hosts = request.host_with_port.split(".") %>
-                <a class="btn btn-primary" type="submit" href="https://adfs.ntu.edu.tw/adfs/ls/?wa=wsignin1.0&wtrealm=https://management.ntu.edu.tw/saml_login&wctx=<%= @request_hosts[0] %>">使用計中帳號登入</a>
-                <p>or</p>
-              </div>
               <div class="input-prepend">
                 <span class="add-on">
                   <i class="icon-user"></i>

app/views/layouts/_side_bar.html.erb

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

app/views/layouts/_side_bar_content.html.erb

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

app/views/layouts/devise.html.erb

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

config/list.yml

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

config/locales/en.yml

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

config/locales/new_ui.en.yml

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

config/locales/new_ui.zh_tw.yml

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

config/locales/zh_tw.yml

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

config/mongoid.yml

@@ -8,7 +8,7 @@ defaults: &defaults
 
 development:
   <<: *defaults
-  database: ntu_mb_orbit_test
+  database: test_site
 
 
 

config/routes.rb

@@ -9,14 +9,6 @@ Orbit::Application.routes.draw do
     match "/users_passwd" => "desktop/registrations#update", :as => :users_passwd, :via => :put
   end
 
-  devise_scope :user do
-    get 'user_login' => 'sessions#create'
-    match 'user_logout' => 'sessions#destroy'
-  end
-
-  match "saml_login" => 'saml_logins#index'
-
-
   mount Resque::Server, :at => "/admin/resque"
   mount Rack::GridFS::Endpoint.new(:db => Mongoid.database,:lookup=>:path), :at => "gridfs"
 
@@ -208,17 +200,6 @@ Orbit::Application.routes.draw do
       get 'change_design'
       get 'preference'
     end
-    
-    get "import_data/get_teacher_data"
-    get "import_data/get_book_data"
-    get "import_data/get_conference_data"
-    get "import_data/get_journal_paper_data"
-    get "import_data/get_announcement_data"
-    get "import_data/get_page_data"
-    get "import_data/sync_book_data"
-    get "import_data/sync_journal_paper_data"
-    get "import_data/sync_conference_data"
-
 
     resources :tags do
       collection do
@@ -234,8 +215,10 @@ Orbit::Application.routes.draw do
         get 'temp_edit'
       end
       collection do
-        get 'edit_order'
-        post 'update_order'
+        get 'edit_order_card'
+        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
@@ -345,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_app/module/side_bar.rb

@@ -112,7 +112,7 @@ module OrbitApp
             current_priority = @context_links.count
             if @approvable_with_link
               context_link 'approval_setting',
-                            :link_path => "admin_authorizations_path(get_module_app.key, 'approval')",
+                            :link_path => "admin_authorizations_path(get_module_app.key, 'category_approval')",
                             :priority => current_priority + 1,
                             :available_for => [:manager]
             end

lib/orbit_core_lib.rb

@@ -197,37 +197,48 @@ 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
-        if @user_type
-          @user_type.each do |user_type|
-            open = false
-            visitor = false
-            case user_type
-            when :admin
-              open ||= check_admin
-            when :manager
-              open ||= check_manager
-            when :sub_manager
-              open ||= check_sub_manager
-            when :approver
-              open ||= check_sub_manager
-            when :visitor
-              open ||= true
-              visitor ||= true
+        unless @no_authorization
+          if @user_type
+            @user_type.each do |user_type|
+              open = false
+              visitor = false
+              case user_type
+              when :admin
+                open ||= check_admin
+              when :manager
+                open ||= check_manager
+              when :sub_manager
+                open ||= check_sub_manager
+              when :approver
+                open ||= check_sub_manager
+              when :visitor
+                set_current_user
+                open ||= true
+                visitor ||= true
+              end
+              check_backend_openness if visitor
+              authenticate_user! unless visitor
+              redirect_to root_url unless open
             end
-            check_backend_openness if visitor
-            authenticate_user! unless visitor
-            redirect_to root_url unless open
+          else
+            authenticate_user!
+            check_user_can_use
           end
-        else
-          authenticate_user!
-          check_user_can_use
         end
       end
 
@@ -248,10 +259,14 @@ module  OrbitCoreLib
       end
 
       def open_for(var)
-         @user_type ||= []
+        @user_type ||= []
         @user_type << var
       end
 
+      def no_authorization
+        @no_authorization = true
+      end
+
       def check_user_can_use
         unless current_or_guest_user.admin? || @module_app.is_manager?(current_or_guest_user) || @module_app.is_sub_manager?(current_or_guest_user) || @module_app.can_approve?(current_or_guest_user)
           redirect_to root_url
@@ -259,9 +274,8 @@ module  OrbitCoreLib
       end
 
       def setup_vars
-        @app_title ||= controller_path.split('/')[1].singularize
-        @module_app ||= ModuleApp.first(conditions: {:key => @app_title} )
-        # raise ModuleAppError, 'Can not find ModuleApp' if @module_app.nil?
+        @app_title ||= controller_path.split('/')[1].singularize rescue nil
+        @module_app ||= ModuleApp.first(conditions: {:key => @app_title} ) rescue nil
       end
     end
   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?
-                    "/panel/#{part.module_app.key}/widget/#{part.widget_path}?inner=true"
+                    # raise ModuleAppError,"PagePart can't find ModuleApp"   if part.module_app.nil?
+                    "/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

@@ -91,8 +91,11 @@ namespace :new_ui do
     end
   end
 
-  task :save_users => :environment do
-    User.all.each(&:save)
+  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/announcement/init.rb

@@ -23,7 +23,7 @@ module Announcement
     end
 
     # category ["BulletinCategory"]
-    data_count 1..10
+    data_count 3..10
 
     authorizable
     approvable
@@ -37,7 +37,7 @@ module Announcement
         image :image
         field :postdate
         link_field :title,{:method => 'panel_announcement_front_end_bulletin_path',:args=>:self}
-        link_field :bulletin_category_with_title,{:method => 'panel_announcement_front_end_bulletins_path',:args=>{:category_id => [:category,:id]}}
+        link_field :bulletin_category_with_title,{:method => 'panel_announcement_front_end_bulletins_path',:args=>{:category_id => [:bulletin_category,:id]}}
         field :subtitle
         link_to_more 'panel_announcement_front_end_bulletins_path',:title_i18n=> 'more_plus'
       end

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 !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 %>
+<% 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,27 +9,33 @@ class Panel::Ask::FrontEnd::AskQuestionsController < OrbitWidgetController
 
   def index
     @ask_question = AskQuestion.new
+    @categories = @module_app.categories.enabled
   end
 
   def create
     @ask_question = AskQuestion.new(params[:ask_question])
     if gotcha_valid? && @ask_question.save
-     @acknowledgement = AskAcknowledgement.last
+      @acknowledgement = AskAcknowledgement.last
       @ask_acknowledgement = AskAcknowledgement.first || AskAcknowlegement.new
-      #@ask_question.save
-      #redirect_to root_path
+
       AskAdmin.all.each do |ask_admin|
         AskMailer.notice(ask_admin, @ask_question).deliver
         Resque.enqueue(SendAskNoticeMail, ask_admin.id, @ask_question.id)
       end
- #      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/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