Merge commit '20bdeb3c2d55f6c0404ae604108c4c23c3d4aa67' into development

Conflicts:
	app/assets/javascripts/orbitdesktop.js

.gitignore

@@ -17,7 +17,4 @@ uploads/**/*
 
 *.swp
 *.pid
-*.lck
-
-.sass-cache/*
-*.supported
+*.lck

Gemfile

@@ -26,7 +26,6 @@ gem "mongo_session_store-rails3", '3.0.6'
 gem 'nokogiri'
 
 gem 'fb_graph'
-gem 'rack-gridfs'
 gem 'radius'
 gem 'rake'
 # gem 'remotipart'

Gemfile.lock

@@ -194,10 +194,6 @@ GEM
     rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-gridfs (0.4.1)
-      mime-types
-      mongo (~> 1.2)
-      rack
     rack-oauth2 (1.0.0)
       activesupport (>= 2.3)
       attr_required (>= 0.0.5)
@@ -377,7 +373,6 @@ DEPENDENCIES
   pry-debugger
   pry-remote
   pry-stack_explorer
-  rack-gridfs
   radius
   rails (~> 3.2.9)
   rake

app/assets/javascripts/inc/page_widget_edit_interface.js

@@ -1,34 +0,0 @@
-function append_id(){
-  if ($("#object_id").length == 1) {
-    return "&id="+$("#object_id").val();
-  }
-  else{
-    return '';
-  };
-}
-
-$("#page_design").live('change', function() {
-  $.getScript($(this).attr('rel') + '?design_id=' + $(this).val() + append_id());
-});
-
-
-$("#module_app_list select").live('change', function() {
-  $.getScript($(this).attr('rel')  + '?module_app_id='+$(this).val() + append_id()); 
-});
-
-$("#widget_list select,#frontend_list select").live('change', function() {
-  $.getScript($(this).attr('rel')  +'?frontend=' +   $(this).val()  + '&module_app_id=' + $("#module_app_list select").val() + append_id() );
-});
-
-$("#tag_list select").live('change', function() {
-  $.getScript($(this).attr('rel') + '?type=' + $(this).val() + append_id() );
-});
-
-$("select.widget_field_select").live('change', function() {
-  $.getScript($(this).attr('rel') + '?widget_field_value='+ $(this).val()+'&dom_id=' + $(this).attr("id") + '&field_seri=' +$(this).attr('field_seri')+ '&module_app_id=' +$("#page_module_app_id,page_part_module_app_id").val() + append_id() );
-});
-
-$('.part_kind').live('click', function() {
-  $('.part_kind_partial').hide();
-  $('#part_' + $(this).attr('value')).show();
-});

app/assets/javascripts/orbitdesktopAPI.js

@@ -147,7 +147,7 @@ var orbitDesktopAPI = function(){
 					return;
 				}
 			}
-			var whtml =$('<div id="app_frame_'+o.windowcounter+'" class="thmc2 app_frame" data-app="'+settings.appid+'"><div id="content"><div id="header" class="hh3"><div class="dtitle hh3 hp" style="text-transform:capitalize;"><span class="thmtxth">'+settings.title+'</span></div><span class="icon-remove hh3 hp thmtxt"></span></div><div id="holder_'+o.windowcounter+'" class="app_holder"><iframe src="'+appurl+'" frameborder="0" scrolling="auto"></iframe><div class="clear"></div></div></div></div>');
+			var whtml =$('<div id="app_frame_'+o.windowcounter+'" class="thmc2 app_frame" data-app="'+settings.appid+'"><div id="content"><div id="header" class="hh3"><div class="dtitle w2 hh3 hp" style="text-transform:capitalize;"><span class="thmtxth">'+settings.title+'</span></div><span class="icon-remove hh3 hp thmtxt"></span></div><div id="holder_'+o.windowcounter+'" class="app_holder"><iframe src="'+appurl+'" frameborder="0" scrolling="auto"></iframe><div class="clear"></div></div></div></div>');
 			$(o.contentHolder).append(whtml);
 			var parentwindow = $(o.contentHolder).find("div#app_frame_"+o.windowcounter);
 			var app_holder_height = parentwindow.height() - 72;
@@ -206,6 +206,12 @@ var orbitDesktopAPI = function(){
 			}
 		}
 	};
+	this.use_select2 = function(){
+		$('select:not(.select2-offscreen)').select2({
+			minimumResultsForSearch: -1
+			// minimumInputLength: -1
+		});
+	}
 };
 orbitDesktopAPI.prototype.notifyImgPath = "temp";
 orbitDesktopAPI.prototype.wallpaperPath = "temp";

app/assets/javascripts/page_edit.js.erb

@@ -1,3 +1,42 @@
+function append_id(){
+	if ($("#object_id").length == 1) {
+		return "&id="+$("#object_id").val();
+	}
+	else{
+		return '';
+	};
+}
+
+$("div.editable").live("mouseenter mouseleave", function (event) {
+  $(this).children('.edit_link').toggle();
+});
+
+$("#page_design").live('change', function() {
+	$.getScript($(this).attr('rel') + '?design_id=' + $(this).val() + append_id());
+});
+
+
+$("#module_app_list select").live('change', function() {
+	$.getScript($(this).attr('rel')  + '?module_app_id='+$(this).val() + append_id()); 
+});
+
+$("#widget_list select,#frontend_list select").live('change', function() {
+	$.getScript($(this).attr('rel')  +'?frontend=' +   $(this).val()  + '&module_app_id=' + $("#module_app_list select").val() + append_id() );
+});
+
+$("#tag_list select").live('change', function() {
+	$.getScript($(this).attr('rel') + '?type=' + $(this).val() + append_id() );
+});
+
+$("select.widget_field_select").live('change', function() {
+	$.getScript($(this).attr('rel') + '?widget_field_value='+ $(this).val()+'&dom_id=' + $(this).attr("id") + '&field_seri=' +$(this).attr('field_seri')+ '&module_app_id=' +$("#page_module_app_id,page_part_module_app_id").val() + append_id() );
+});
+
+$('.part_kind').live('click', function() {
+	$('.part_kind_partial').hide();
+	$('#part_' + $(this).attr('value')).show();
+});
+
 $(document).ready(function(){
 	bindTreeDragHandle();
 });
@@ -21,8 +60,4 @@ var bindTreeDragHandle = function(){
 			$.post("<%= Rails.application.routes.url_helpers.admin_update_position_path %>", { id: ui.item.attr('id'), parent_id: ui.item.parent().closest('li').attr('id'), position: ui.item.index() } );
   	}
 	});
-}
-
-$("div.editable").live("mouseenter mouseleave", function (event) {
-  $(this).children('.edit_link').toggle();
-});
+}

app/assets/stylesheets/desktop/_desktop-helper.scss

@@ -3,10 +3,12 @@ $gray: #ddd;
 @mixin font-main($font-size) {
 	font-family: "Source Sans Pro", sans-serif;
 	font-size: #{$font-size}px;
+	font-weight: 300;
 }
 @mixin font-sub($font-size) {
 	font-family: "Source Sans Pro", Arial, sans-serif;
 	font-size: #{$font-size}px;
+	font-weight: 300;
 }
 @mixin transition-type($property, $sec) {
 	-webkit-transition: #{$property} #{$sec}s ease;

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

@@ -92,28 +92,20 @@
   z-index: 9;
   left: 0;
   top: 60px;
-  font-size: 15px;
-  width: 120px;
-  border: solid 2px #dddddd;
-  -webkit-box-sizing: border-box;
-  /* webkit */
-  -khtml-box-sizing: border-box;
-  /* konqueror */
-  -moz-box-sizing: border-box;
-  /* firefox */
-  -ms-box-sizing: border-box;
-  /* ie */
-  box-sizing: border-box;
-  /* css3 */ }
-  .sdm_o li {
-    border-top: solid 1px #f7f7f7; }
-  .sdm_o li:first-child {
-    border: none; }
-  .sdm_o a {
-    display: block; }
-  .sdm_o .admtxt {
-    display: block;
-    line-height: 36px; }
+  font-size: 15px; }
+
+.sdm_o li {
+  border-top: solid 1px #f2f2f2; }
+
+.sdm_o li:first-child {
+  border: none; }
+
+.sdm_o a {
+  display: block; }
+
+.sdm_o .admtxt {
+  display: block;
+  line-height: 36px; }
 
 /* simple dropdown menu with indicator */
 .sdm_mdr .sdm_t {
@@ -127,12 +119,15 @@
 .s_menu {
   font-size: 15px;
   line-height: 36px; }
-  .s_menu li {
-    border-top: solid 1px #dddddd; }
-  .s_menu li:first-child {
-    border: none; }
-  .s_menu a {
-    display: block; }
+
+.s_menu li {
+  border-top: solid 1px #dddddd; }
+
+.s_menu li:first-child {
+  border: none; }
+
+.s_menu a {
+  display: block; }
 
 /* simple tabs */
 .s_tab {
@@ -162,7 +157,7 @@
   font-size: 15px; }
   .s_form label {
     font-size: 13px;
-    font-weight: bold;
+    font-weight: normal;
     display: inline-block;
     vertical-align: middle;
     width: 100px;
@@ -202,8 +197,7 @@
     .s_form input[type=text]:focus,
     .s_form input[type=password]:focus,
     .s_form textarea:focus {
-      background-color: #f7f7f7;
-      border-color: #c4c4c4; }
+      background-color: #f7f7f7; }
   .s_form textarea {
     resize: none; }
     .s_form textarea.full_height {
@@ -256,22 +250,27 @@
   line-height: 36px;
   position: relative;
   z-index: 9; }
-  .toolbar .sdm, .toolbar .fn_g {
-    display: inline-block;
-    vertical-align: top; }
-  .toolbar .sdm_o {
-    top: 36px; }
-  .toolbar button {
-    border: none;
-    outline: none;
-    padding: 0 16px;
-    margin: 0;
-    font-family: inherit;
-    font-size: 15px;
-    vertical-align: top; }
-  .toolbar .fn_btn {
-    display: inline-block;
-    vertical-align: top; }
+
+.toolbar .sdm, .toolbar .fn_g {
+  display: inline-block;
+  vertical-align: top; }
+
+.toolbar .sdm_o {
+  top: 36px;
+  background-color: #f0f0f0; }
+
+.toolbar button {
+  border: none;
+  outline: none;
+  padding: 0 16px;
+  margin: 0;
+  font-family: inherit;
+  font-size: 15px;
+  vertical-align: top; }
+
+.toolbar .fn_btn {
+  display: inline-block;
+  vertical-align: top; }
 
 /* tiny scrollbar */
 .tinycanvas {
@@ -369,7 +368,10 @@
   .tinycanvas:hover .scrollbar {
     visibility: visible;
     opacity: 1; }
-  .toolbar + .tinycanvas, .s_tab + .tinycanvas {
-    height: 480px; }
-  #panel_r .tinycanvas {
-    padding: 12px 0; }
+
+.toolbar + .tinycanvas,
+.s_tab + .tinycanvas {
+  height: 480px; }
+
+#panel_r .tinycanvas {
+  padding: 12px 0; }

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

@@ -58,23 +58,19 @@
 	left: 0;
 	top: 60px;
 	font-size: 15px;
-	width: 120px;
-	border: solid 2px $gray;
-	@include box-sizing;
-	
-	li {
-		border-top: solid 1px lighten( $gray, 10% );
-	}
-	li:first-child {
-		border: none;
-	}
-	a {
-		display: block;
-	}
-	.admtxt {
-		display: block;
-		line-height: 36px;
 	}
+.sdm_o li {
+	border-top: solid 1px #f2f2f2;
+}
+.sdm_o li:first-child {
+	border: none;
+}
+.sdm_o a {
+	display: block;
+}
+.sdm_o .admtxt {
+	display: block;
+	line-height: 36px;
 }
 
 /* simple dropdown menu with indicator */
@@ -90,16 +86,15 @@
 .s_menu { 
 	font-size: 15px;
 	line-height: 36px;
-
-	li {
-		border-top: solid 1px $gray;
-	}
-	li:first-child {
-		border: none;
-	}
-	a {
-		display: block;
-	}
+}
+.s_menu li {
+	border-top: solid 1px #ddd;
+}
+.s_menu li:first-child {
+	border: none;
+}
+.s_menu a {
+	display: block;
 }
 
 /* simple tabs */
@@ -135,7 +130,7 @@
 	// basic style
 	label {
 		font-size: 13px;
-		font-weight: bold;
+		font-weight: normal;
 		display: inline-block;
 		vertical-align: middle;
 		width: 100px;
@@ -170,7 +165,6 @@
 
 		&:focus {
 			background-color: lighten($gray, 10%);
-			border-color: darken($gray, 10%);
 		}
 	}
 	textarea {
@@ -234,27 +228,27 @@
 	line-height: 36px;
 	position: relative;
 	z-index: 9;
-	
-	.sdm, .fn_g {
-		display: inline-block;
-		vertical-align: top;
-	}
-	.sdm_o {
-		top: 36px;
-	}
-	button {
-		border: none;
-		outline: none;
-		padding: 0 16px;
-		margin: 0;
-		font-family: inherit;
-		font-size: 15px;
-		vertical-align: top;
-	}
-	.fn_btn {
-		display: inline-block;
-		vertical-align: top;
-	}
+}
+.toolbar .sdm, .toolbar .fn_g {
+	display: inline-block;
+	vertical-align: top;
+}
+.toolbar .sdm_o {
+	top: 36px;
+	background-color: #f0f0f0;
+}
+.toolbar button {
+	border: none;
+	outline: none;
+	padding: 0 16px;
+	margin: 0;
+	font-family: inherit;
+	font-size: 15px;
+	vertical-align: top;
+}
+.toolbar .fn_btn {
+	display: inline-block;
+	vertical-align: top;
 }
 
 /* tiny scrollbar */
@@ -357,11 +351,11 @@
 		visibility: visible;
 		opacity: 1;
 	}
-	.toolbar + &,
-	.s_tab + & {
-		height: 480px;
-	}
-	#panel_r & {
-		padding: 12px 0;
-	}
+}
+.toolbar + .tinycanvas,
+.s_tab + .tinycanvas {
+	height: 480px;
+}
+#panel_r .tinycanvas {
+	padding: 12px 0;
 }

app/assets/stylesheets/desktop/desktop-main.css

@@ -54,6 +54,7 @@ table {
 body {
   font-family: "Source Sans Pro", sans-serif;
   font-size: 12px;
+  font-weight: 300;
   background-color: #000; }
 
 a, a:hover {
@@ -69,13 +70,11 @@ a:focus {
 .clear:after {
   display: table;
   width: 100%;
-  content: '';
-  clear: both; }
+  content: ''; }
 
 .o-loading {
-  font-size: 13px; }
-  .fullsize .o-loading {
-    padding: 12px; }
+  font-size: 13px;
+  font-weight: normal; }
   .o-loading i {
     font-size: 20px; }
 
@@ -295,7 +294,7 @@ a:focus {
 
 .fn_des.admtxt {
   line-height: 60px;
-  padding: 0 12px;
+  padding: 0 6px;
   font-size: 15px;
   position: absolute;
   z-index: 9;
@@ -334,7 +333,8 @@ a:focus {
   .section_label li {
     font-size: 15px; }
   .section_label li:first-child {
-    font-size: 18px; }
+    font-size: 18px;
+    font-weight: normal; }
 
 /* panel */
 #panel_l {
@@ -369,7 +369,8 @@ a:focus {
     #orbitnote .note_holder .note_message {
       color: #333;
       margin: 10px 0 0 48px;
-      font-size: 15px; }
+      font-size: 15px;
+      font-weight: normal; }
 
 /* Desktop Dialogue */
 #orbitdiag {
@@ -400,6 +401,7 @@ a:focus {
         margin: 0 6px;
         text-align: center;
         font-size: 15px;
+        font-weight: normal;
         line-height: 36px; }
         #orbitdiag .diag_holder .diag_holder_inner .diag_btn:hover {
           outline: solid 2px white; }
@@ -416,12 +418,12 @@ a:focus {
   position: absolute;
   left: 0;
   bottom: 0;
-  z-index: 3;
-  white-space: nowrap; }
+  z-index: 3; }
   [data-sizex="1"] .appname, .w1.h1 .appname {
     text-align: center; }
   [data-sizey="2"] .appname {
-    font-size: 21px; }
+    font-size: 21px;
+    font-weight: normal; }
   .hh2 .appname {
     position: relative;
     width: auto;
@@ -473,12 +475,8 @@ a:focus {
   left: 0;
   top: 0; }
 
-.gridster ul {
-  margin: -6px 0 0 -6px; }
-
 .widget.gs_w {
-  cursor: move;
-  overflow: hidden; }
+  cursor: move; }
 
 /* header drop menu */
 .sdm_mdr .sdm_o {
@@ -509,6 +507,7 @@ a:focus {
 
 .theme_preview {
   width: 528px;
+  height: 150px;
   line-height: 36px;
   font-size: 15px; }
 
@@ -519,24 +518,15 @@ a:focus {
     margin-right: 12px; }
   .theme_plate > div:first-child {
     margin-right: 48px; }
-  .theme_plate .g_sep {
-    margin-right: 0; }
-
-#color_input th {
-  vertical-align: bottom; }
 
 .stock_wallpaper .ssl_item {
   margin-bottom: 6px; }
 
 .s_title {
   font-size: 21px;
+  font-weight: normal;
   line-height: 60px;
   text-align: left; }
-  .s_title.size_large {
-    font-size: 36px; }
-  .s_title.size_small {
-    font-size: 15px;
-    line-height: 2em; }
 
 .s_subtitle {
   font-size: 15px;
@@ -555,6 +545,7 @@ a:focus {
   display: block;
   float: right;
   font-size: 15px;
+  font-weight: normal;
   line-height: 36px;
   text-align: center;
   border: 0; }
@@ -569,18 +560,8 @@ a:focus {
   max-width: 340px; }
 
 .g_sep {
-  width: 12px;
-  border-left: solid 1px white;
-  -webkit-box-sizing: border-box;
-  /* webkit */
-  -khtml-box-sizing: border-box;
-  /* konqueror */
-  -moz-box-sizing: border-box;
-  /* firefox */
-  -ms-box-sizing: border-box;
-  /* ie */
-  box-sizing: border-box;
-  /* css3 */ }
+  width: 11px;
+  border-left: solid 1px white; }
 
 .grp {
   height: 528px;
@@ -605,12 +586,14 @@ a:focus {
 
 /* list item */
 .list_t_item {
+  /*padding: 2px;*/
   overflow: hidden; }
 
 .list_t_title {
   margin-bottom: 6px;
   color: #333;
-  font-size: 15px; }
+  font-size: 15px;
+  font-weight: normal; }
 
 .list_t_des {
   line-height: 1.5em;
@@ -624,74 +607,118 @@ a:focus {
   font-size: 11px;
   -webkit-text-size-adjust: none; }
 
+/* Connection Page */
+#connection_setting {
+  height: 492px; }
+
+#connection_setting .s_form {
+  float: left;
+  margin: 0 12px 0 0;
+  padding-left: 24px;
+  height: 100%;
+  border-left: solid 1px #dddddd; }
+
+#connection_setting .s_form:first-child {
+  padding-left: 0;
+  border: none; }
+
+#connection_setting .s_form label {
+  line-height: 30px; }
+
+#connection_setting .s_form .c_icon, #connection_setting .s_form .c_name {
+  display: inline-block;
+  vertical-align: middle; }
+
+#connection_setting .s_form .c_name {
+  padding: 0 12px;
+  font-size: 18px; }
+
+#connection_setting .s_form input[type=text], #connection_setting .s_form input[type=password] {
+  width: 202px; }
+
+#connection_setting .setting_btn {
+  margin-left: 12px; }
+
+#connection_setting .setting_btn.disable {
+  background-color: #ddd;
+  cursor: default; }
+
+#connection_setting .c_status {
+  float: right;
+  padding: 6px;
+  background-color: #eee;
+  color: #ccc;
+  font-size: 9px;
+  font-weight: normal;
+  -webkit-text-size-adjust: none;
+  -webkit-transition: background-color 0.5s ease;
+  -moz-transition: background-color 0.5s ease;
+  transition: background-color 0.5s ease; }
+
+#connection_setting .c_status_on {
+  background-color: #51A351;
+  color: #fff; }
+
+#connection_setting .c_info {
+  padding: 7px 6px;
+  background-color: #fcfcfc;
+  cursor: default;
+  font-size: 18px;
+  font-weight: normal; }
+
 /* Journal Papers */
 [page-name="journal_p_list"] .list_t_item .inner {
   padding-left: 30px; }
+
 [page-name="journal_p_list"] .list_item_action {
   font-size: 12px;
   float: left;
   margin-left: -30px; }
-  [page-name="journal_p_list"] .list_item_action a {
-    display: block;
-    width: 20px;
-    height: 20px;
-    line-height: 20px;
-    margin: 1px 1px 6px 1px; }
-  [page-name="journal_p_list"] .list_item_action .icon-star-empty {
-    color: #999;
-    font-size: 20px; }
-  [page-name="journal_p_list"] .list_item_action .icon-star {
-    color: #faa732;
-    font-size: 20px; }
-  [page-name="journal_p_list"] .list_item_action .icon-check-empty {
-    color: #999;
-    font-size: 20px; }
-  [page-name="journal_p_list"] .list_item_action .icon-check {
-    color: #333;
-    font-size: 20px; }
-[page-name="journal_p_list"] .file_view .list_t_des {
-  overflow: hidden; }
+
+[page-name="journal_p_list"] .list_item_action a {
+  display: block;
+  width: 20px;
+  height: 20px;
+  line-height: 20px;
+  margin: 1px 1px 6px 1px; }
+
+[page-name="journal_p_list"] .list_item_action .icon-star-empty {
+  color: #999;
+  font-size: 20px; }
+
+[page-name="journal_p_list"] .list_item_action .icon-star {
+  color: #faa732;
+  font-size: 20px; }
+
+[page-name="journal_p_list"] .list_item_action .icon-check-empty {
+  color: #999;
+  font-size: 20px; }
+
+[page-name="journal_p_list"] .list_item_action .icon-check {
+  color: #333;
+  font-size: 20px; }
+
+[page-name="journal_p_list"] .list_t_item.file_view {
+  height: 148px; }
+
 [page-name="journal_p_list"] .file_view .file {
-  float: left;
-  width: 120px;
+  display: inline-block;
+  width: 62px;
   height: 50px;
-  padding: 6px;
-  margin: 1px;
-  position: relative;
-  -webkit-box-sizing: border-box;
-  /* webkit */
-  -khtml-box-sizing: border-box;
-  /* konqueror */
-  -moz-box-sizing: border-box;
-  /* firefox */
-  -ms-box-sizing: border-box;
-  /* ie */
-  box-sizing: border-box;
-  /* css3 */ }
-  [page-name="journal_p_list"] .file_view .file:hover {
-    background-color: #f7f7f7; }
-  [page-name="journal_p_list"] .file_view .file img {
-    width: 38px;
-    height: 38px;
-    position: absolute;
-    left: 6px;
-    top: 6px; }
-  [page-name="journal_p_list"] .file_view .file .filetitle {
-    display: block;
-    width: 100%;
-    height: 38px;
-    padding-left: 40px;
-    overflow: hidden;
-    -webkit-box-sizing: border-box;
-    /* webkit */
-    -khtml-box-sizing: border-box;
-    /* konqueror */
-    -moz-box-sizing: border-box;
-    /* firefox */
-    -ms-box-sizing: border-box;
-    /* ie */
-    box-sizing: border-box;
-    /* css3 */ }
+  text-align: center; }
+
+[page-name="journal_p_list"] .file_view .file:hover {
+  background-color: #ddd; }
+
+[page-name="journal_p_list"] .file_view .file img {
+  width: 24px;
+  display: block;
+  margin: 0 auto;
+  margin-top: 4px; }
+
+[page-name="journal_p_list"] .file_view .filetitle {
+  font-size: 11px;
+  -webkit-text-size-adjust: none; }
 
 /* Journal Paper Add */
 #paper_add .s_grid_con {
@@ -700,22 +727,27 @@ a:focus {
   margin-left: 12px;
   padding-left: 12px;
   border-left: solid 1px #eeeeee; }
-  #paper_add .s_grid_con:first-child {
-    margin-left: 0;
-    padding-left: 0;
-    border: none; }
+
+#paper_add .s_grid_con:first-child {
+  margin-left: 0;
+  padding-left: 0;
+  border: none; }
+
 #paper_add .f_w {
   width: 336px; }
+
 #paper_add label {
   margin-right: 0; }
 
 /* Journal Journal list */
 [page-name="journal_p_journal"] .datalist_item .inner {
   padding-left: 30px; }
+
 [page-name="journal_p_journal"] .list_item_action {
   font-size: 12px;
   float: left;
   margin-left: -30px; }
+
 [page-name="journal_p_journal"] .list_item_action i {
   color: #999;
   font-size: 20px;
@@ -724,6 +756,7 @@ a:focus {
   height: 20px;
   line-height: 20px;
   margin: 1px 1px 6px 1px; }
+
 [page-name="journal_p_journal"] .list_t_desc {
   font-family: Arial, sans-serif;
   font-size: 12px;
@@ -732,17 +765,21 @@ a:focus {
 /* Journal Co-Author */
 [page-name="journal_p_coauthor"] .list_t_item {
   height: 110px; }
+
 [page-name="journal_p_coauthor"] .list_item_function a {
   display: inline-block;
   padding: 4px;
   font-family: Arial, sans-serif;
   font-size: 11px;
   -webkit-text-size-adjust: none; }
+
 [page-name="journal_p_coauthor"] .info {
   font-family: Arial, sans-serif; }
+
 [page-name="journal_p_coauthor"] .info li {
   margin-bottom: 8px;
   color: #999; }
+
 [page-name="journal_p_coauthor"] .info .name {
   font-size: 18px;
   line-height: 24px;
@@ -751,6 +788,7 @@ a:focus {
 /* Journal Co-Author Relationship*/
 [page-name="journal_p_coauthor_relation"] .edit_co_author_relation {
   /*margin-left: -10px;*/ }
+
 [page-name="journal_p_coauthor_relation"] .form_space {
   margin-bottom: 10px;
   font-size: 18px;
@@ -771,16 +809,18 @@ a:focus {
   right: 0;
   bottom: 0;
   z-index: 12; }
-  .app_frame .app_holder {
-    background-color: #fff;
-    position: absolute;
-    width: 100%; }
-  .app_frame #header .icon-remove {
-    display: block;
-    float: right;
-    line-height: 60px;
-    font-size: 20px;
-    cursor: pointer; }
+
+.app_frame .app_holder {
+  background-color: #fff;
+  position: absolute;
+  width: 100%; }
+
+.app_frame #header .icon-remove {
+  display: block;
+  float: right;
+  line-height: 60px;
+  font-size: 20px;
+  cursor: pointer; }
 
 /*Tooltip popup */
 .desktop_toolpopup {

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

@@ -66,15 +66,11 @@ a:focus { outline: none; }
 	display: table;
 	width: 100%;
 	content: '';
-	clear: both;
 }
 .o-loading {
 	font-size: 13px;
-	// font-weight: normal;
+	font-weight: normal;
 
-	.fullsize & {
-		padding: 12px;
-	}
 	i {
 		font-size: 20px;
 	}
@@ -231,7 +227,7 @@ a:focus { outline: none; }
 }
 .fn_des.admtxt {
 	line-height: 60px;
-	padding: 0 12px;
+	padding: 0 6px;
 	font-size: 15px;
 	position: absolute;
 	z-index: 9;
@@ -277,9 +273,10 @@ a:focus { outline: none; }
 	}
 	li:first-child {
 		font-size: 18px;
-		// font-weight: normal;
+		font-weight: normal;
 	}
 }
+
 /* panel */
 #panel_l {
 	background-color: #f0f0f0;
@@ -320,7 +317,7 @@ a:focus { outline: none; }
 			color: #333;
 			margin: 10px 0 0 48px;
 			font-size: 15px;
-			// font-weight: normal;
+			font-weight: normal;
 		}
 	}
 }
@@ -360,7 +357,7 @@ a:focus { outline: none; }
 				margin: 0 6px;
 				text-align: center;
 				font-size: 15px;
-				// font-weight: normal;
+				font-weight: normal;
 				line-height: 36px;
 
 				&:hover {
@@ -385,7 +382,6 @@ a:focus { outline: none; }
 	left: 0;
 	bottom: 0;
 	z-index: 3;
-	white-space: nowrap;
 
 	[data-sizex="1"] &,
 	.w1.h1 & {
@@ -393,7 +389,7 @@ a:focus { outline: none; }
 	}
 	[data-sizey="2"] & {
 		font-size: 21px;
-		// font-weight: normal;
+		font-weight: normal;
 	}
 	.hh2 & {
 		position: relative;
@@ -421,6 +417,8 @@ a:focus { outline: none; }
 		margin-right: 6px;
 	}
 }
+
+
 .appholder {
 	position: relative;
 	z-index: 2;
@@ -444,7 +442,7 @@ a:focus { outline: none; }
 	margin: 0 12px 0 0;
 	position: relative;
 	z-index: 9;
-}
+	}
 .tile {
 	display: block;
 	width: 100%;
@@ -452,19 +450,10 @@ a:focus { outline: none; }
 	position: absolute;
 	left: 0;
 	top: 0;
-}
-.gridster ul {
-	margin: -6px 0 0 -6px;
-}
+	}
 .widget.gs_w {
 	cursor: move;
-	overflow: hidden;
 }
-// .app.gs_w:active {
-// 	-webkit-transform: scale(0.9);
-// 	-moz-transform: scale(0.9);
-// 	transform: scale(0.9);
-// }
 
 /* header drop menu */
 .sdm_mdr .sdm_o { top: 36px; }
@@ -495,6 +484,7 @@ a:focus { outline: none; }
 }
 .theme_preview {
 	width: 528px;
+	height: 150px;
 	line-height: 36px;
 	font-size: 15px;
 }
@@ -508,12 +498,6 @@ a:focus { outline: none; }
 	> div:first-child {
 		margin-right: 48px;
 	}
-	.g_sep {
-		margin-right: 0;
-	}
-}
-#color_input th {
-	vertical-align: bottom
 }
 .stock_wallpaper {
 	.ssl_item {
@@ -523,17 +507,9 @@ a:focus { outline: none; }
 
 .s_title {
 	font-size: 21px;
-	// font-weight: normal;
+	font-weight: normal;
 	line-height: 60px;
 	text-align: left;
-
-	&.size_large {
-		font-size: 36px;
-	}
-	&.size_small {
-		font-size: 15px;
-		line-height: 2em;
-	}
 }
 .s_subtitle {
 	font-size: 15px;
@@ -552,7 +528,7 @@ a:focus { outline: none; }
 	display: block;
 	float: right;
 	font-size: 15px;
-	// font-weight: normal;
+	font-weight: normal;
 	line-height: 36px;
 	text-align: center;
 	border: 0;
@@ -570,9 +546,9 @@ a:focus { outline: none; }
 	max-width: 340px;
 }
 .g_sep {
-	width: 12px;
-	border-left: solid 1px #fff;
-	@include box-sizing;
+	width: 11px;
+	border-left:
+	solid 1px #fff;
 }
 
 
@@ -596,12 +572,12 @@ a:focus { outline: none; }
 }
 
 /* list item */
-.list_t_item { overflow: hidden; }
+.list_t_item { /*padding: 2px;*/ overflow: hidden; }
 .list_t_title { 
 	margin-bottom: 6px;
 	color: #333;
 	font-size: 15px;
-	// font-weight: normal;
+	font-weight: normal;
 }
 .list_t_des { 
 	line-height: 1.5em;
@@ -616,145 +592,155 @@ a:focus { outline: none; }
 	-webkit-text-size-adjust: none;
 }
 
-/* Journal Papers */
-[page-name="journal_p_list"] {
-	.list_t_item .inner { padding-left: 30px; }
-	.list_item_action {
-		font-size: 12px;
-		float: left;
-		margin-left: -30px;
-		
-		a { 
-			display: block;
-			width: 20px; 
-			height: 20px;
-			line-height: 20px;
-			margin: 1px 1px 6px 1px;
-		}
-		.icon-star-empty { color: #999; font-size: 20px; }
-		.icon-star { color: #faa732; font-size: 20px; }
-		.icon-check-empty { color: #999; font-size: 20px; }
-		.icon-check { color: #333; font-size: 20px; }
-	}
-	
-	.file_view {
-		.list_t_des {
-			overflow: hidden;
-		}
-		.file {
-			float: left;
-			width: 120px;
-			height: 50px;
-			padding: 6px;
-			margin: 1px;
-			position: relative;
-			@include box-sizing;
+/* Connection Page */
+#connection_setting { height: 492px; }
+#connection_setting .s_form {
+	float: left;
+	margin: 0 12px 0 0;
+	padding-left: 24px;
+	height: 100%;
+	border-left: solid 1px #ddd;
+}
+#connection_setting .s_form:first-child { padding-left: 0; border: none; }
+#connection_setting .s_form label { line-height: 30px; }
+#connection_setting .s_form .c_icon, #connection_setting .s_form .c_name {
+	display: inline-block;
+	vertical-align: middle;
+}
+#connection_setting .s_form .c_name { padding: 0 12px; font-size: 18px; }
+#connection_setting .s_form input[type=text], #connection_setting .s_form input[type=password] { width: 202px; }
+#connection_setting .setting_btn { margin-left: 12px; }
+#connection_setting .setting_btn.disable { background-color: #ddd; cursor: default; }
+#connection_setting .c_status {
+	float: right;
+	padding: 6px;
+	background-color: #eee;
+	color: #ccc;
+	font-size: 9px;
+	font-weight: normal;
+	-webkit-text-size-adjust: none;
+	@include transition-type("background-color",0.5);
+}
+#connection_setting .c_status_on { background-color: #51A351; color: #fff; }
+#connection_setting .c_info {
+	padding: 7px 6px;
+	background-color: #fcfcfc;
+	cursor: default;
+	font-size: 18px;
+	font-weight: normal;
+}
 
-			&:hover {
-				background-color: lighten($gray, 10%);
-			}
-			img {
-				width: 38px;
-				height: 38px;
-				position: absolute;
-				left: 6px;
-				top: 6px;
-			}
-			.filetitle {
-				display: block;
-				width: 100%;
-				height: 38px;
-				padding-left: 40px;
-				overflow: hidden;
-				@include box-sizing;
-			}
-		}
-	}
+/* Journal Papers */
+[page-name="journal_p_list"] .list_t_item .inner { padding-left: 30px; }
+[page-name="journal_p_list"] .list_item_action {
+	font-size: 12px;
+	float: left;
+	margin-left: -30px;
+}
+[page-name="journal_p_list"] .list_item_action a { 
+	display: block;
+	width: 20px; 
+	height: 20px;
+	line-height: 20px;
+	margin: 1px 1px 6px 1px;
+}
+[page-name="journal_p_list"] .list_item_action .icon-star-empty { color: #999; font-size: 20px; }
+[page-name="journal_p_list"] .list_item_action .icon-star { color: #faa732; font-size: 20px; }
+[page-name="journal_p_list"] .list_item_action .icon-check-empty { color: #999; font-size: 20px; }
+[page-name="journal_p_list"] .list_item_action .icon-check { color: #333; font-size: 20px; }
+
+[page-name="journal_p_list"] .list_t_item.file_view {
+	height: 148px;
+}
+[page-name="journal_p_list"] .file_view .file {
+	display: inline-block;
+	width: 62px;
+	height: 50px;
+	text-align: center;
+}
+[page-name="journal_p_list"] .file_view .file:hover {
+	background-color: #ddd;
+}
+[page-name="journal_p_list"] .file_view .file img {
+	width: 24px;
+	display: block;
+	margin: 0 auto;
+	margin-top: 4px;
+}
+[page-name="journal_p_list"] .file_view .filetitle {
+	font-size: 11px;
+	-webkit-text-size-adjust: none;
 }
 
 /* Journal Paper Add */
-#paper_add {
-	.s_grid_con {
-		float: left;
-		height: 456px;
-		margin-left: 12px;
-		padding-left: 12px;
-		border-left: solid 1px #eee;
-
-		&:first-child {
-			margin-left: 0;
-			padding-left: 0;
-			border: none;
-		}
-	}
-	.f_w { width: 336px; }
-	label { margin-right: 0; }
+#paper_add .s_grid_con {
+	float: left;
+	height: 456px;
+	margin-left: 12px;
+	padding-left: 12px;
+	border-left: solid 1px #eee;
 }
+#paper_add .s_grid_con:first-child { margin-left: 0; padding-left: 0; border: none; }
+#paper_add .f_w { width: 336px; }
+#paper_add label { margin-right: 0; }
 
 /* Journal Journal list */
-[page-name="journal_p_journal"] {
-
-	.datalist_item .inner {
-		padding-left: 30px;
-	}
-	.list_item_action {
-		font-size: 12px;
-		float: left;
-		margin-left: -30px;
-	}
-	.list_item_action i {
-		color: #999;
-		font-size: 20px;
-		display: block;
-		width: 20px;
-		height: 20px;
-		line-height: 20px;
-		margin: 1px 1px 6px 1px;
-	}
-	.list_t_desc {
-		font-family: Arial, sans-serif;
-		font-size: 12px;
-		color: #999;
-	}
+[page-name="journal_p_journal"] .datalist_item .inner {
+	padding-left: 30px;
+}
+[page-name="journal_p_journal"] .list_item_action {
+	font-size: 12px;
+	float: left;
+	margin-left: -30px;
+}
+[page-name="journal_p_journal"] .list_item_action i {
+	color: #999;
+	font-size: 20px;
+	display: block;
+	width: 20px;
+	height: 20px;
+	line-height: 20px;
+	margin: 1px 1px 6px 1px;
+}
+[page-name="journal_p_journal"] .list_t_desc {
+	font-family: Arial, sans-serif;
+	font-size: 12px;
+	color: #999;
 }
 
 /* Journal Co-Author */
-[page-name="journal_p_coauthor"] {
-	.list_t_item {
-		height: 110px;
-	}
-	.list_item_function {}
-	.list_item_function a {
-		display: inline-block;
-		padding: 4px;
-		font-family: Arial, sans-serif;
-		font-size: 11px;
-		-webkit-text-size-adjust: none;
-	}
-	.info {
-		font-family: Arial, sans-serif;
-	}
-	.info li {
-		margin-bottom: 8px;
-		color: #999;
-	}
-	.info .name {
-		font-size: 18px;
-		line-height: 24px;
-		color: #333;
-	}
+[page-name="journal_p_coauthor"] {}
+[page-name="journal_p_coauthor"] .list_t_item {
+	height: 110px;
+}
+[page-name="journal_p_coauthor"] .list_item_function {}
+[page-name="journal_p_coauthor"] .list_item_function a {
+	display: inline-block;
+	padding: 4px;
+	font-family: Arial, sans-serif;
+	font-size: 11px;
+	-webkit-text-size-adjust: none;
+}
+[page-name="journal_p_coauthor"] .info {
+	font-family: Arial, sans-serif;
+}
+[page-name="journal_p_coauthor"] .info li {
+	margin-bottom: 8px;
+	color: #999;
+}
+[page-name="journal_p_coauthor"] .info .name {
+	font-size: 18px;
+	line-height: 24px;
+	color: #333;
 }
-
 /* Journal Co-Author Relationship*/
-[page-name="journal_p_coauthor_relation"]{
-	.edit_co_author_relation {
-		/*margin-left: -10px;*/
-	}
-	.form_space {
-		margin-bottom: 10px;
-		font-size: 18px;
-		font-family: Arial, sans-serif;
-	}
+[page-name="journal_p_coauthor_relation"] .edit_co_author_relation {
+	/*margin-left: -10px;*/
+}
+[page-name="journal_p_coauthor_relation"] .form_space {
+	margin-bottom: 10px;
+	font-size: 18px;
+	font-family: Arial, sans-serif;
 }
 /* Journal New Co-Author */
 #new_co_author label {
@@ -773,19 +759,18 @@ a:focus { outline: none; }
 	right: 0;
 	bottom: 0;
 	z-index: 12;
-
-	.app_holder { 
-		background-color: #fff;
-		position: absolute;
-		width: 100%;
-	}
-	#header .icon-remove {
-		display: block;
-		float: right;
-		line-height: 60px;
-		font-size: 20px;
-		cursor: pointer;
-	}
+}
+.app_frame .app_holder { 
+	background-color: #fff;
+	position: absolute;
+	width: 100%;
+}
+.app_frame #header .icon-remove {
+	display: block;
+	float: right;
+	line-height: 60px;
+	font-size: 20px;
+	cursor: pointer;
 }
 
 /*Tooltip popup */

app/assets/stylesheets/desktop/desktop-select2.css.erb

@@ -65,7 +65,7 @@ Version: 3.3.1 Timestamp: Wed Feb 20 09:57:22 PST 2013
   font-size: 1px;
   text-decoration: none;
   border: 0;
-  background: url("select2/select2.png") right top no-repeat;
+  background: url(<%= asset_path "desktop/select2/select2.png" %>) right top no-repeat;
   cursor: pointer;
   outline: 0; }
 
@@ -86,21 +86,24 @@ Version: 3.3.1 Timestamp: Wed Feb 20 09:57:22 PST 2013
   position: absolute;
   z-index: 9999;
   top: 100%;
-  background-color: #fff;
+  background: #fff;
   color: #000;
-  border: 2px solid #dddddd; }
+  border: 1px solid #dddddd;
+  border-top: 0; }
 
 .select2-drop.select2-drop-above {
-  margin-top: 1px; }
+  margin-top: 1px;
+  border-top: 1px solid #dddddd;
+  border-bottom: 0; }
 
 .select2-container .select2-choice div {
   display: block;
-  width: 21px;
+  width: 20px;
   height: 100%;
   position: absolute;
   right: 0;
   top: 0;
-  border-left: solid 1px #dddddd;
+  background: #ccc;
   -webkit-box-sizing: border-box;
   /* webkit */
   -khtml-box-sizing: border-box;
@@ -116,7 +119,7 @@ Version: 3.3.1 Timestamp: Wed Feb 20 09:57:22 PST 2013
   display: block;
   width: 100%;
   height: 100%;
-  background: url("select2/select2.png") no-repeat 0 50%; }
+  background: url(<%= asset_path "desktop/select2/select2.png" %>) no-repeat 0 1px; }
 
 .select2-search {
   display: inline-block;
@@ -149,25 +152,29 @@ Version: 3.3.1 Timestamp: Wed Feb 20 09:57:22 PST 2013
   margin-top: 4px; }
 
 .select2-search input.select2-active {
-  background: white image-url("select2-spinner.gif") no-repeat 100%; }
+  background: white image-url(<%= asset_path "desktop/select2/select2-spinner.gif" %>) no-repeat 100%; }
 
 .select2-container-active .select2-choice,
 .select2-container-active .select2-choices {
   outline: none; }
 
 .select2-dropdown-open .select2-choice {
-  border-bottom-color: transparent; }
+  border-bottom-color: transparent;
+  background-color: #eee; }
 
 .select2-dropdown-open .select2-choice div {
-  background-color: #dddddd;
+  background: transparent;
+  border-left: none;
   filter: none; }
 
 .select2-dropdown-open .select2-choice div b {
-  background-position: -20px 50%; }
+  background-position: -18px 1px; }
 
 /* results */
 .select2-results {
   max-height: 200px;
+  padding: 0 0 0 4px;
+  margin: 4px 4px 4px 0;
   font-size: 13px;
   position: relative;
   overflow-x: hidden;
@@ -201,16 +208,13 @@ Version: 3.3.1 Timestamp: Wed Feb 20 09:57:22 PST 2013
 .select2-results li {
   list-style: none;
   display: list-item;
-  background-image: none;
-  border-top: solid 1px #f7f7f7; }
-  .select2-results li :first-child {
-    border-top: 0; }
+  background-image: none; }
 
 .select2-results li.select2-result-with-children > .select2-result-label {
   font-weight: bold; }
 
 .select2-results .select2-result-label {
-  padding: 6px;
+  padding: 4px 6px;
   margin: 0;
   cursor: pointer;
   -webkit-touch-callout: none;
@@ -261,7 +265,7 @@ disabled look for disabled choices in the results dropdown
   display: none; }
 
 .select2-more-results.select2-active {
-  background: #f4f4f4 image-url("select2-spinner.gif") no-repeat 100%; }
+  background: #f4f4f4 image-url(<%= asset_path "desktop/select2/select2-spinner.gif" %>) no-repeat 100%; }
 
 .select2-more-results {
   background: #f4f4f4;
@@ -323,7 +327,7 @@ disabled look for disabled choices in the results dropdown
   background: transparent !important; }
 
 .select2-container-multi .select2-choices .select2-search-field input.select2-active {
-  background: white image-url("select2-spinner.gif") no-repeat 100% !important; }
+  background: white image-url(<%= asset_path "desktop/select2/select2-spinner.gif" %>) no-repeat 100% !important; }
 
 .select2-default {
   color: #999999 !important; }
@@ -352,23 +356,23 @@ disabled look for disabled choices in the results dropdown
 
 .select2-search-choice-close {
   display: block;
-  width: 10px;
-  height: 10px;
+  width: 12px;
+  height: 13px;
   position: absolute;
   right: 3px;
-  top: 5px;
+  top: 4px;
   font-size: 1px;
   outline: none;
-  background: url("select2/select2.png") right top no-repeat; }
+  background: url(<%= asset_path "desktop/select2/select2.png" %>) right top no-repeat; }
 
 .select2-container-multi .select2-search-choice-close {
   left: 3px; }
 
 .select2-container-multi .select2-choices .select2-search-choice .select2-search-choice-close:hover {
-  background-position: right -20px; }
+  background-position: right -11px; }
 
 .select2-container-multi .select2-choices .select2-search-choice-focus .select2-search-choice-close {
-  background-position: right -20px; }
+  background-position: right -11px; }
 
 /* disabled styles */
 .select2-container-multi.select2-container-disabled .select2-choices {
@@ -393,13 +397,12 @@ disabled look for disabled choices in the results dropdown
 
 .select2-offscreen {
   position: absolute;
-  left: -10000px;
-  top: 0; }
+  left: -10000px; }
 
 /* Retina-ize icons */
 @media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min-resolution: 144dpi) {
   .select2-search input, .select2-search-choice-close, .select2-container .select2-choice abbr, .select2-container .select2-choice div b {
-    background-image: url("select2/select2x2.png") !important;
+    background-image: url(<%= asset_path "desktop/select2/select2x2.png" %>) !important;
     background-repeat: no-repeat !important;
     background-size: 60px 40px !important; }
 

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

@@ -86,26 +86,27 @@ Version: 3.3.1 Timestamp: Wed Feb 20 09:57:22 PST 2013
     position: absolute;
     z-index: 9999;
     top: 100%;
-    background-color: #fff;
+
+    background: #fff;
     color: #000;
-    border: 2px solid $gray;
-    // border-top: 0;
+    border: 1px solid $gray;
+    border-top: 0;
 }
 
 .select2-drop.select2-drop-above {
     margin-top: 1px;
-    // border-top: 1px solid $gray;
-    // border-bottom: 0;
+    border-top: 1px solid $gray;
+    border-bottom: 0;
 }
 
 .select2-container .select2-choice div {
     display: block;
-    width: 21px;
+    width: 20px;
     height: 100%;
     position: absolute;
     right: 0;
     top: 0;
-    border-left: solid 1px $gray;
+    background: #ccc;
     @include box-sizing;
 }
 
@@ -113,7 +114,7 @@ Version: 3.3.1 Timestamp: Wed Feb 20 09:57:22 PST 2013
     display: block;
     width: 100%;
     height: 100%;
-    background: url('select2/select2.png') no-repeat 0 50%;
+    background: url('select2/select2.png') no-repeat 0 1px;
 }
 
 .select2-search {
@@ -166,22 +167,23 @@ Version: 3.3.1 Timestamp: Wed Feb 20 09:57:22 PST 2013
 
 .select2-dropdown-open .select2-choice {
     border-bottom-color: transparent;
+    background-color: #eee;
 }
 
 .select2-dropdown-open .select2-choice div {
-    background-color: $gray;
-    // border-left: none;
+    background: transparent;
+    border-left: none;
     filter: none;
 }
 .select2-dropdown-open .select2-choice div b {
-    background-position: -20px 50%;
+    background-position: -18px 1px;
 }
 
 /* results */
 .select2-results {
     max-height: 200px;
-    // padding: 0 0 0 4px;
-    // margin: 4px 4px 4px 0;
+    padding: 0 0 0 4px;
+    margin: 4px 4px 4px 0;
     font-size: 13px;
     position: relative;
     overflow-x: hidden;
@@ -205,11 +207,6 @@ Version: 3.3.1 Timestamp: Wed Feb 20 09:57:22 PST 2013
     list-style: none;
     display: list-item;
     background-image: none;
-    border-top: solid 1px lighten($gray, 10%);
-
-    :first-child {
-        border-top: 0;
-    }
 }
 
 .select2-results li.select2-result-with-children > .select2-result-label {
@@ -217,7 +214,7 @@ Version: 3.3.1 Timestamp: Wed Feb 20 09:57:22 PST 2013
 }
 
 .select2-results .select2-result-label {
-    padding: 6px;
+    padding: 4px 6px;
     margin: 0;
     cursor: pointer;
 
@@ -380,11 +377,11 @@ disabled look for disabled choices in the results dropdown
 
 .select2-search-choice-close {
     display: block;
-    width: 10px;
-    height: 10px;
+    width: 12px;
+    height: 13px;
     position: absolute;
     right: 3px;
-    top: 5px;
+    top: 4px;
     font-size: 1px;
     outline: none;
     background: url('select2/select2.png') right top no-repeat;
@@ -395,10 +392,10 @@ disabled look for disabled choices in the results dropdown
 }
 
 .select2-container-multi .select2-choices .select2-search-choice .select2-search-choice-close:hover {
-  background-position: right -20px;
+  background-position: right -11px;
 }
 .select2-container-multi .select2-choices .select2-search-choice-focus .select2-search-choice-close {
-    background-position: right -20px;
+    background-position: right -11px;
 }
 
 /* disabled styles */
@@ -430,7 +427,6 @@ disabled look for disabled choices in the results dropdown
 .select2-offscreen {
     position: absolute;
     left: -10000px;
-    top: 0;
 }
 
 /* Retina-ize icons */

app/controllers/admin/dashboards_controller.rb

@@ -5,9 +5,8 @@ class Admin::DashboardsController < OrbitBackendController
 #  before_filter :is_admin?
   
   def index
-    check_backend_openness
-    @module_app_contents, @module_app_contents_total = get_module_app_count('bulletin', 'page_context', 'web_link')
-    @recent_updated = get_recently_updated('bulletin', 'page_context', 'web_link')
+  	@module_app_contents, @module_app_contents_total = get_module_app_count('bulletin', 'page_context', 'web_link')
+  	@recent_updated = get_recently_updated('bulletin', 'page_context', 'web_link')
     @most_visited = get_most_visited('bulletin', 'page_context')
   end
 

app/controllers/admin/pages_controller.rb

@@ -148,22 +148,7 @@ include Admin::FrontendWidgetInterface
     else
       flash.now[:error] = t('create.error.page')
       @designs = Design.all.entries
-      @design =  Design.find(params[:page][:design]) ||  Design.first
-      @themes = @design.themes
-      @module_apps = ModuleApp.for_frontend_select
-      @selected={
-      :design => params[:page][:design],
-      :theme=> (Theme.find(params[:page][:theme_id]) rescue nil),
-      :module_app=> (ModuleApp.find(params[:page][:module_app_id]) rescue nil) ,#@module_apps.first
-      :app_frontend_url=> params[:page][:app_frontend_url], #@module_apps.first
-      :category=>params[:page][:category],
-      :tag=>params[:page][:tag],
-      :page_frontend_data_count=>params[:page][:page_frontend_data_count],
-      :frontend_style => params[:page][:frontend_style]
-     }
-      @app_frontend_urls = @item.module_app ? select_array_for_app_frontend_urls(@item.module_app.app_pages) : nil
-      get_categories_and_tags
-      get_frontend_data_count
+      @design = Design.first
       render :action => "new"
     end
   end

app/controllers/admin/role_categorys_controller.rb

@@ -1,9 +0,0 @@
-class Admin::RoleCategorysController < Admin::RoleFiltersController
-
-  def initialize
-    super
-    @app_type = 'role_category'
-    @app_type_name = 'category'
-  end
-  
-end

app/controllers/admin/role_filters_controller.rb

@@ -1,144 +0,0 @@
-class Admin::RoleFiltersController < OrbitBackendController
-     
-  include OrbitControllerLib::DivisionForDisable
-
-  layout "new_admin"
-  
-  before_filter :authenticate_user!
-  before_filter :is_admin?
-  # before_filter :set_attribute, :only => [:index, :show, :new, :edit]
-  helper Admin::AttributeValuesViewHelper
-  
-  def index
-	  get_types
-	  @role = Role.find(params[:role_id])
-    @role_filters =  @types.where(:role_id=>params[:role_id])
-    @role_filter = @types.new(:display => 'List')
-	
-	# @url = admin_role_filter_role_filters_path
-
-    if @app_type == 'role_statuses'
-      @url = eval("admin_#{@app_type}_path")
-    else
-	    @url = eval("admin_#{@app_type}s_path")
-	  end
-
-    respond_to do |format|
-      format.html # index.html.erb
-      format.js
-    end
-
-  end
-
-
-  def show
-  
-	  get_types
-	
-    @role_filter = @types.find(params[:id])
-
-    respond_to do |format|
-      format.html # show.html.erb
-      format.js
-    end
-  end
-
-
-  def new
-  
-	  get_types
-	
-    @role_filter = @types.new(:display => 'List')
-	
-	  @verb = :post
-
-    respond_to do |format|
-      format.html # new.html.erb
-      format.js
-    end
-  end
-  
-
-  def edit
-  
-	  get_types
-	
-    @role_filter = @types.find(params[:id])
-	
-	  @url = polymorphic_path([:admin, @role_filter])
-	
-	  @verb = :put
-
-    respond_to do |format|
-      format.html
-      format.js
-    end
-  end
-
-
-  def create
-    
-	  get_types
-	
-    @role_filter = @types.new(params[:role_filter])
-
-    respond_to do |format|
-      if @role_filter.save
-        format.html { redirect_to(admin_role_filter_url(params[:role_filter][:role_id])) }
-        format.js
-      end
-    end
-
-  end
-
-
-  def update
-  
-	  get_types
-	
-    @role_filter = @types.find(params[:id])
-	# debugger
-	# @url = admin_role_filter_role_filter_path(@role_filter)
-	# @url = eval("admin_role_filter_#{@app_type}_path(#{@role_filter})")
-	  @url = polymorphic_path([:admin, @role_filter])
-
-    respond_to do |format|
-      if @role_filter.update_attributes(params[:role_filter])
-        format.html { redirect_to(admin_role_filter_role_filters_url(params[:role_id]), :notice => t('role_filter.update_role_filter_success')) }
-        # format.xml  { head :ok }
-        format.js
-      else
-        format.html { render :action => "edit" }
-        format.js { render :action => "edit" }
-      end
-    end
-  end
-
-
-  def destroy
-  
-	  get_types
-	
-    @role_filter = @types.find(params[:id])
-    @role_filter.disable = @role_filter.disable ? false : true
-
-    if @role_filter.save!
-      respond_to do |format|
-        format.html { redirect_to(admin_role_filter_role_filters_url) }
-        # format.xml  { head :ok }
-        format.js
-      end      
-    else
-      flash[:error] = t("role_filter.update_failed")
-      format.html { render :action => "index" }
-    end
-
-  end
-  
-  protected
-  
-  def get_types
-    @types = @app_type.classify.constantize
-  end
-  
-end

app/controllers/admin/role_statuses_controller.rb

@@ -1,9 +0,0 @@
-class Admin::RoleStatusesController < Admin::RoleFiltersController
-
-  def initialize
-    super
-    @app_type = 'role_statuses'
-    @app_type_name = 'status'
-  end
-  
-end

app/controllers/admin/roles_controller.rb

@@ -17,34 +17,35 @@ class Admin::RolesController < OrbitBackendController
   
   def role_field
   
-	  @field_name = 'role'
+	@field_name = 'role'
 	
-	  @attribute = Role.find(params[:role_id])
+	@attribute = Role.find(params[:role_id])
 	
   end
   
   def sub_role
 	
-	  @attribute = Role.find(params[:role_id])
-	  @attribute_fields_upper_object = @attribute.sub_roles
+	@attribute = Role.find(params[:role_id])
+	@attribute_fields_upper_object = @attribute.sub_roles
+	
 	
   end
   
   def add_sub_role
 	
-	  @attribute = Role.find(params[:role_id])
-	  # @sub_attribute = Role.find(params[:role_id])
+	@attribute = Role.find(params[:role_id])
+	# @sub_attribute = Role.find(params[:role_id])
 	
-	  @sub_attribute = SubRole.new
+	@sub_attribute = SubRole.new
     @sub_attribute.role_id = params[:role_id]
   
   end
   
   def edit_sub_role
 	
-	  @sub_attribute = SubRole.find(params[:role_id])
+	@sub_attribute = SubRole.find(params[:role_id])
 	
-	  @attribute = Role.find(@sub_attribute.role_id)
+	@attribute = Role.find(@sub_attribute.role_id)
 	
     @sub_attribute.role_id = @sub_attribute.role_id
   
@@ -54,52 +55,53 @@ class Admin::RolesController < OrbitBackendController
   
     @field_name = 'sub_role'
 	
-	  @sub_attribute = SubRole.find(params[:role_id])
+	@sub_attribute = SubRole.find(params[:role_id])
 	
-	  @attribute = Role.find(@sub_attribute.role_id)
+	@attribute = Role.find(@sub_attribute.role_id)
 	
   end
   
   def add_attribute_field
 	
-	  if params[:sub_role]
+	if params[:sub_role]
 	
-	    @field_name = 'sub_role'
+	@field_name = 'sub_role'
 	
-	    attribute = SubRole.find(params[:sub_role][:id]) rescue nil
-      @attribute_field_counter = attribute.attribute_fields.count
-      @attribute_field = attribute.attribute_fields.build
-      @attribute_field.save
+	attribute = SubRole.find(params[:sub_role][:id]) rescue nil
+    @attribute_field_counter = attribute.attribute_fields.count
+    @attribute_field = attribute.attribute_fields.build
+    @attribute_field.save
 	
-      @attribute_field[:af_count] = @attribute_field_counter
+    @attribute_field[:af_count] = @attribute_field_counter
 	
-      @attribute = SubRole.find(params[:sub_role][:id])
+    @attribute = SubRole.find(params[:sub_role][:id])
 	
-	  else
+	else
 	
-	    @field_name = 'role'
+	@field_name = 'role'
 	
-      attribute = Role.find(params[:role_id]) rescue nil
-      @attribute_field_counter = attribute.attribute_fields.count
-        @attribute_field = attribute.attribute_fields.build
-      @attribute_field.save
+    attribute = Role.find(params[:role_id]) rescue nil
+    @attribute_field_counter = attribute.attribute_fields.count
+    @attribute_field = attribute.attribute_fields.build
+    @attribute_field.save
 	
-      @attribute_field[:af_count] = @attribute_field_counter
+    @attribute_field[:af_count] = @attribute_field_counter
 	
-      @attribute = Role.find(params[:role_id])
+    @attribute = Role.find(params[:role_id])
 	
-	  end
+	end
 	
-	  respond_to do |format|
+	respond_to do |format|
       format.js  { render 'add_attribute_field' }
-    end	
+    end
+	
 
   end
   
   def new
     @attribute = Role.new
 	
-	  if !params[:parent_id]
+	if !params[:parent_id]
       render :template => 'admin/attributes/new'
     end
 	
@@ -163,17 +165,17 @@ class Admin::RolesController < OrbitBackendController
   
   def destroy
     
-	  if params[:sub_role]
+	if params[:sub_role]
 	
-	    @sub_role = SubRole.find(params[:sub_role][:id])
+	  @sub_role = SubRole.find(params[:sub_role][:id])
 	  
       respond_to do |format|
         if @sub_role.destroy
-		      format.html { redirect_to(admin_role_sub_role_url(@sub_role.role_id)) }
+		  format.html { redirect_to(admin_role_sub_role_url(@sub_role.role_id)) }
         end
       end
 	  
-	  else
+	else
 	
       @attribute = Role.find(params[:id])
       @attribute.destroy

app/controllers/admin/sites_controller.rb

@@ -14,16 +14,8 @@ class Admin::SitesController < OrbitBackendController
   #   @site = Site.new
   # end
 
-  def show_system_preference
-    @git_commit_list_file = File.new(OrbitSystemPreference::GitCommitListPath, "r") rescue nil
-    @db_backup_list_file = File.new(OrbitSystemPreference::ArchiveDbListPath, "r") rescue nil
-    @resque_logs_file = File.new(OrbitSystemPreference::ResqueLogFile, "r") rescue nil
-    @site = Site.first
-  end
-
   def update
     @site.update_attributes(params[:site])
-    site_restart
     redirect_to :back
   end
 

app/controllers/admin/tags_controller.rb

@@ -2,10 +2,16 @@ class Admin::TagsController < OrbitBackendController
   before_filter :force_order_for_visitor,:only=>[:index]
   before_filter :force_order_for_user,:except => [:index]
   before_filter :for_app_sub_manager,:except => [:index]
+  
+
+  # layout 'new_admin'
+  # before_filter :authenticate_user!
+  # before_filter :is_admin?
   # before_filter :set_module_app
    
   def index
-    @tags = get_tags
+    get_tags
+    @module_app_id = @module_app.id rescue nil
   end
 
   def new
@@ -17,7 +23,12 @@ class Admin::TagsController < OrbitBackendController
   end
 
   def create
-    @tag = @module_app ? @module_app.tags.create(params[:tag]) : Tag.create(params[:tag])
+    if params[:tag][:module_app_id].blank?
+      @tag = Tag.create(params[:tag])
+    else
+      module_app = ModuleApp.find(params[:tag][:module_app_id])
+      @tag = eval("#{module_app.key.camelize}Tag").create(params[:tag])
+    end
   end
 
   def update
@@ -36,12 +47,15 @@ class Admin::TagsController < OrbitBackendController
   protected
   
   def get_tags
-    @tags = @module_app.blank? ? Tag.all : @module_app.tags
+    @tags = (@module_app ?  @module_app.tags : Tag.all)
   end
 
   def setup_vars
-    @module_app = ModuleApp.find(params[:module_app_id]) if params[:module_app_id]
-    @module_app_id = @module_app.id rescue nil
+    @app_key = request.env['HTTP_REFERER'].split('/')[4]
+    if @app_key
+      @app_key.gsub!(/[?].*/, '')
+      @module_app = ModuleApp.first(conditions: {:key => @app_key})
+    end
   end
   
 end

app/controllers/admin/users_new_interface_controller.rb

@@ -1,6 +1,4 @@
 class Admin::UsersNewInterfaceController <  OrbitBackendController
-
-  helper MemberHelper
   
   layout "new_admin"
   # before_filter :authenticate_user!
@@ -25,13 +23,13 @@ class Admin::UsersNewInterfaceController <  OrbitBackendController
     
     render case params[:at]
       when 'summary'
-        @users=User.not_guest_user.page(page_num).per(12).asc("_id").includes('avatar')
+        @users=User.not_guest_user.page(page_num).per(12).includes('avatar')
         "index_summary"
       when 'thumbnail'
-        @users=User.not_guest_user.page(page_num).per(36).asc("_id").includes('avatar')
+        @users=User.not_guest_user.page(page_num).per(36).includes('avatar')
         "index_thumbnail"
       else
-        @users=User.not_guest_user.page(page_num).per(10).asc("_id").includes('avatar')
+        @users=User.not_guest_user.page(page_num).per(10).includes('avatar')
         "index"
     end
   end
@@ -45,7 +43,7 @@ class Admin::UsersNewInterfaceController <  OrbitBackendController
     @student_data = []
     @staff_data = []
 
-    attribute_values = @user.attribute_values.asc("_id")
+    attribute_values = @user.attribute_values
     attribute_values.each{|att_val|
       @profile_data.push({:name => att_val.attribute_field.title,:value =>att_val.get_value_by_locale(I18n.locale.to_s)}) if att_val.attribute_field.attribute.key=="profile" rescue false
     }
@@ -82,29 +80,21 @@ class Admin::UsersNewInterfaceController <  OrbitBackendController
   end
   
   def create
-    # puts params.to_yaml
+    puts params.to_yaml
     # attribute_values_key = params[:user].has_key?('new_attribute_values') ? 'new_attribute_values' : 'attribute_values'
     # attribute_values = params[:user].delete(attribute_values_key)
     @user = User.new(params["user"])
-
-    @checkuser = User.where(:user_id => params[:user][:user_id]).first
-
-    if !@checkuser.blank?
-      flash.now[:error] = t("users.user_id_error")
-    end
-    
       # attribute_values.to_hash.each{|key,value|
       #   @user.attribute_values.build(value)
       # }
     # @user.rebuild_sub_roles_from_attribute_values!(attribute_values)
     # binding.pry
-    if !flash.now[:error] && @user.save
+    if @user.save
       flash[:notice] = t('create.success.user')
       redirect_to :action => :index
     else
-      @user.attribute_values = nil
       @form_index = 0
-      render :action => :new , :notice => flash.now[:error]   
+      render :action => :new      
     end
   end
   
@@ -120,46 +110,16 @@ class Admin::UsersNewInterfaceController <  OrbitBackendController
     @form_index = 0
     get_info_and_roles
   end
-
-  def edit_passwd
-    # @disable_all_field = false
-    @user = User.find(params[:users_new_interface_id])
-  end
   
   def update
-
     @user = User.find(params[:id])
-
-    if params[:edit_type] == 'edit_passwd'
-
-      @checkuser = User.where(:user_id => params[:user][:user_id]).first
-
-      if !@checkuser.blank? &&  @checkuser.id != @user.id
-        flash.now[:error] = t("users.user_id_error")
-      elsif @user.admin && current_user.id == @user.id
-        flash.now[:error] = t("users.admin_change_password")
-      end
-
-      if !flash.now[:error] && @user.update_attributes(params[:user])
-        redirect_to :action => :show
-      else
-        render :action => :edit_passwd, :notice => flash.now[:error]
-      end
-
-    else
-
-      @user.update_attributes(params[:user])
-
-      attribute_values_key = params[:user].has_key?('new_attribute_values') ? 'new_attribute_values' : 'attribute_values'
-      attribute_values = params[:user].delete(attribute_values_key)
-      # @user.rebuild_sub_roles_from_attribute_values!(attribute_values)
-      @user.save
-
-      redirect_to :action => :show
-
-    end
-    
     
+    @user.update_attributes(params[:user])
+    attribute_values_key = params[:user].has_key?('new_attribute_values') ? 'new_attribute_values' : 'attribute_values'
+    attribute_values = params[:user].delete(attribute_values_key)
+    # @user.rebuild_sub_roles_from_attribute_values!(attribute_values)
+    @user.save
+    redirect_to :action => :show
     # # Update changes to the avatar
     # @user.remove_avatar! if params[:file]
     # @user.avatar = params[:file] if params[:file]

app/controllers/application_controller.rb

@@ -17,15 +17,7 @@ class ApplicationController < ActionController::Base
 
   helper_attr :site_valid_locales
 
-  def check_backend_openness
-    if !Me.backend_openness_on
-      redirect_to '/users/sign_in'   if not (authenticate_user! and is_member? )
-    end
-  end
 
-  def site_restart
-    Resque.enqueue(RestartServer)
-  end
 
   def set_current_user
     User.current = current_or_guest_user
@@ -109,10 +101,10 @@ class ApplicationController < ActionController::Base
   end
   
   # Render the page
-  def render_page(args=nil)
+  def render_page
     if @item
       respond_to do |format|
-        format.html { render :text => parse_page_content(@item,args), :layout => 'page_layout' }
+        format.html { render :text => parse_page_content(@item), :layout => 'page_layout' }
         format.rss { render_main_rss }
         format.mobile { redirect_to mobile_path(:app => params[:app]) }
       end

app/controllers/default_widget_controller.rb

@@ -36,13 +36,12 @@ class DefaultWidgetController< OrbitWidgetController
       result = eval("#{ori_class_name}.where(:#{get_category_field_name(ori_class_name)}.in=>params['category_id'])")
     end
     date_now = Time.now
-    result.available_for_lang(I18n.locale).can_display.desc(:is_top, :postdate)
+    result.available_for_lang(I18n.locale).can_display.any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc(:is_top, :postdate)
   end
 
   def default_widget
     if !params[:id].blank?
-      clicked_field_name = params["clicked_field_name"].to_sym
-      redirect_to eval("#{@page_part.module_app.widget_fields_link_method[clicked_field_name][:method]}('#{params[:id]}', {inner: #{params[:inner] || true}})")
+      redirect_to eval("#{@page_part.module_app.widget_fields_link_method[:title][:method]}('#{params[:id]}', {inner: #{params[:inner] || true}})")
     else
       @tag_class = nil
       @default_widget = @page_part.module_app.get_default_widget

app/controllers/orbit_backend_controller.rb

@@ -1,7 +1,6 @@
 class OrbitBackendController < ApplicationController
   include OrbitCoreLib::AppBackendUtility
   include OrbitCoreLib::PermissionUtility
-  include OrbitTag::Tagging
   include AdminHelper
   include ApplicationHelper
   
@@ -16,7 +15,6 @@ class OrbitBackendController < ApplicationController
   private
 
   def force_order_for_visitor
-    check_backend_openness
     setup_vars
     set_current_user
   end
@@ -61,20 +59,6 @@ class OrbitBackendController < ApplicationController
             when :referenced_in
               objects = get_objects_from_referenced_objects(object_class.relations[option].class_name.constantize, objects, "#{option}_id")
           end
-        elsif option.eql?('tags')
-          tag_array = @module_app.tags.inject([]){ |result, value|
-            result << [value.name, value]
-          }
-          params[:direction].eql?('asc') ? tag_array.sort : tag_array.sort.reverse!
-          sorted_objects = Array.new
-          tag_array.each do |x|
-            taggings = x[1].taggings
-            taggings.each {|tagging| sorted_objects << tagging.taggable }
-          end
-          # debugger
-          sorted_objects.flatten!
-          sorted_objects.uniq!
-          objects = get_with_nil(objects, option, sorted_objects)
         end 
       end
     end

app/controllers/pages_controller.rb

@@ -1,15 +1,8 @@
 class PagesController < ApplicationController
   include ApplicationHelper
   before_filter :get_item, :only => [:index_from_link, :show_from_link]
-  before_filter :check_frontend_open, :only => [:index,:show]
   # caches_page :index
 
-  def check_frontend_open
-    if Me.frontend_closed
-      redirect_to '/admin/dashboards'  
-    end
-  end
-
   def index
     @item = Page.find_by_name('home')
 
@@ -21,18 +14,14 @@ class PagesController < ApplicationController
     end
   end
   
-  def show
+  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))
         impressionist(@item)
         case @item.class.to_s
           when 'Page'
-            if params[:clicked_field_name]
-              render_page({"clicked_field_name"=>params["clicked_field_name"]}) unless save_from_no_lang_for_page
-              else
-              render_page unless save_from_no_lang_for_page
-            end
+            render_page unless save_from_no_lang_for_page
           when 'Link'
             redirect_to(@item[:url]) unless save_from_no_lang_for_page
         end
@@ -65,7 +54,6 @@ class PagesController < ApplicationController
     options << "#{options.blank? ? '?' : '&'}tag_id=#{params[:tag_id]}" unless params[:tag_id].blank?
     options << "#{options.blank? ? '?' : '&'}preview=#{params[:preview]}" unless params[:preview].blank?
     options << "#{options.blank? ? '?' : '&'}controller_action=#{params[:controller_action]}" unless params[:controller_action].blank?
-    options << "#{options.blank? ? '?' : '&'}clicked_field_name=#{params[:clicked_field_name]}" unless params[:clicked_field_name].blank?
     redirect_to(url + options) unless save_from_no_lang_for_page
   end
    

app/helpers/admin/frontend_widget_interface.rb

@@ -4,7 +4,7 @@ protected
   def get_categories_and_tags
     unless @selected[:module_app].nil?
       @categories = @selected[:module_app].get_categories 
-      @tags = @selected[:module_app].tags
+      @tags = @selected[:module_app].get_tags
     end
   end
 
@@ -55,4 +55,4 @@ protected
   end
 
 
-end
+end

app/helpers/default_widget_helper.rb

@@ -6,9 +6,7 @@ module DefaultWidgetHelper
   def link_to_field(row_data,field, switch, options=nil)
     method_ary = @page_part.module_app.widget_fields_link_method
     field = field.to_sym
-    options = options || {}
-    options[:clicked_field_name] = field
-    if(method_ary.has_key?(field) and (switch.to_s == "true"))
+    if(method_ary.has_key?(field) and (switch == true))
       url = case method_ary[field][:args]
       when nil # no args
         get_data_link(method_ary[field][:method], options)

app/helpers/member_helper.rb

@@ -1,5 +0,0 @@
-module MemberHelper
-  def nl2br(val)
-    val.gsub(/\r\n/, '<br />').html_safe
-  end
-end

app/jobs/backup_server.rb

@@ -5,13 +5,9 @@ class BackupServer
     #CronMail.time_check("Going to backup Orbit").deliver
     dbhost = Mongoid.config.database.connection.primary.join ':'
     dbname = Mongoid.config.database.name
-    archive_db_list_path = OrbitSystemPreference::ArchiveDbListPath
     dbdirectory = "#{Rails.root}/tmp/#{dbname}-"+Time.now.strftime("%Y-%m-%d-%H-%M")
     %x[mongodump -h #{dbhost} -d #{dbname} -o #{dbdirectory} ]
 
-    %x[rm #{archive_db_list_path}]
-    %x[ls #{Rails.root}/tmp/#{dbname}* | du -h --max-depth=1 --block-size=1M |sort -h >> #{archive_db_list_path}]
-    OrbitJobLogger.info "DB backup done Path:#{dbdirectory}"
-    
+    # %x[touch  #{Rails.root}/tmp/restart]
   end
 end

app/jobs/dashboard_counter.rb

@@ -1,36 +0,0 @@
-class DashboardCounter < Resque::Plugins::RestrictionJob
-  @queue = :high
-
-  def self.perform(*args)
-    site = Site.first
-    obj = new(*args)
-    site.dashboard_counter[:visitors_this_week] = obj.display_visitors_this_week 
-    site.dashboard_counter[:visitors_this_month] = obj.display_visitors_this_month 
-    site.dashboard_counter[:visitors_this_year] = obj.display_visitors_this_year
-    site.save
-    OrbitJobLogger.info "DashboardCounter done #{site.dashboard_counter.to_s}"
-  end
-
-
-  def display_visitors(options={})
-    impressions = Impression.where(options).and(:referrer.ne => nil)
-    impressions.map{|i| i[:session_hash]}.uniq.count
-  end
-
-  def display_visitors_today
-    display_visitors(created_at: {'$gte' => Date.today.beginning_of_day, '$lte' => Date.today.end_of_day})
-  end
-
-  def display_visitors_this_week
-    display_visitors(created_at: {'$gte' => Date.today.beginning_of_week, '$lte' => Date.today.end_of_week})
-  end
-
-  def display_visitors_this_month
-    display_visitors(created_at: {'$gte' => Date.today.beginning_of_month, '$lte' => Date.today.end_of_month})
-  end
-
-  def display_visitors_this_year
-    display_visitors(created_at: {'$gte' => Date.today.beginning_of_year, '$lte' => Date.today.end_of_year})
-  end
-
-end

app/jobs/generate_system_summary.rb

@@ -1,46 +0,0 @@
-class GenerateSystemSummary
-  @queue = :high
-
-  def self.perform()
-    @site = Site.first
-    get_disk_free
-    get_git_log_list
-    get_package_info
-    @site.save
-  end
-
-  def self.get_package_info
-    @info = {}
-    get_nginx_version
-    get_MongoDB_version
-    get_Linux_version
-    @site.system_package_info = @info
-  end
-
-  def self.get_git_log_list
-    git_commit_list_path = OrbitSystemPreference::GitCommitListPath
-    %x[rm #{git_commit_list_path}]
-    %x[cd #{Rails.root};#{OrbitSystemPreference::GitLogCommend} >>#{git_commit_list_path} ]
-  end
-
-  def self.get_disk_free
-    @site.disk_space= %x[#{OrbitSystemPreference::DiskFree}]
-  end
-
-  def self.get_nginx_version
-    @info[:nginx] = %x[#{OrbitSystemPreference::SystemPackage::NginxVersion} ]
-  end
-
-  def self.get_MongoDB_version
-    @info[:mongodb] = %x[#{OrbitSystemPreference::SystemPackage::MongodbVersion} ]
-  end
-
-  def self.get_Linux_version
-    @info[:linux] = %x[#{OrbitSystemPreference::SystemPackage::SystemVersion} ]
-  end
-
-  def self.check_system_has_enough_space( limit =OrbitSystemPreference::DefaultDiskSpaceLimit )
-    binding.pry
-  end
-
-end

app/jobs/nccu_calendar.rb

@@ -0,0 +1,21 @@
+class NccuCalendar 
+  require 'open-uri'
+  require 'tempfile'  
+
+  @queue = :high
+
+  def self.perform()
+  # temp_file = Tempfile.new('new_cal')  
+  # open('http://events.nccu.edu.tw/Month').read{|data|
+  #   temp_file << data
+  # }
+
+open(File.join(Rails.root, 'public/static', 'nccu_calendar.xml'), 'wb') do |fo|
+  fo.print open('http://events.nccu.edu.tw/Month').read
+end
+
+   # FileUtils.mv(temp_file, File.join(Rails.root, 'public/static', 'nccu_calendar.xml'))
+
+    puts "[#{ DateTime.now.strftime("%Y %D %H:%M")}]NccuCalendar Synced #{File.join(Rails.root, 'public/static', 'nccu_calendar.xml')}"
+  end
+end

app/jobs/restart_server.rb

@@ -1,8 +0,0 @@
-class RestartServer 
-  @queue = :high
-
-  def self.perform()
-    temp_directory = "#{Rails.root}/tmp/"
-    %x[touch #{temp_directory}restart.txt ]
-  end
-end

app/jobs/sync_db.rb

@@ -0,0 +1,25 @@
+class SyncDb 
+  
+  @queue = :high
+
+  def self.perform()
+    puts "[ #{DateTime.now.strftime("%Y %D %H:%M") }]\t SyncDb Starting"
+    self.start_sync
+    self.set_admin
+  end
+  
+  def self.start_sync
+    task = 'mid_site:sync'
+    args = []
+    %x[rake #{task} --trace  >> #{Rails.root}/log/rake.log]
+    User.all.each{|ur| ur.create_dept_cache}
+    puts "[#{ DateTime.now.strftime("%Y %D %H:%M")}]\tSyncDb Synced"
+  end
+
+    def self.set_admin
+    task = 'mid_site:install_admin'
+    args = []
+    %x[rake #{task} --trace  >> #{Rails.root}/log/rake.log]
+    puts "[#{ DateTime.now.strftime("%Y %D %H:%M")}]\tAdmin done"
+  end
+end

app/jobs/update_tag_cloud.rb

@@ -5,6 +5,5 @@ class UpdateTagCloud
     Tag.all.each do |tag|
       tag.update_attribute(:cloud_view_count, tag.impressionist_count(:created_at.gte => 14.days.ago, :created_at.lte => Time.now))
     end
-    OrbitJobLogger.info "UpdateTagCloud Done"
   end
 end

app/models/asset.rb

@@ -21,8 +21,7 @@ class Asset
   before_save :clean_tags
 
   def sorted_tags
-    #tags.order_by(I18n.locale, :asc)
-	tags
+    tags.order_by(I18n.locale, :asc)
   end
 
   protected

app/models/item.rb

@@ -17,7 +17,7 @@ class Item
  
   validates_format_of :name, :with => /^[0-9a-zA-Z\-_]+$/
   # validates :name, :exclusion => { :in => LIST[:forbidden_item_names] }
-  validates_uniqueness_of :name #, :scope => :parent_id
+  validates_uniqueness_of :name, :scope => :parent_id
   validates_presence_of :name
   validates_associated :parent, :children
   

app/models/module_app.rb

@@ -8,8 +8,6 @@ class ModuleApp
   field :title
   field :sidebar_order,type: Integer,default: 0
 
-  has_many :tags, as: :module_tag, dependent: :destroy
-
   def refetch_setting!(reg)
     # %w{module_label category base_url version organization author intro update_info create_date}.each  do |field|
     #   self[field.to_sym] =  reg.send field 
@@ -120,6 +118,10 @@ class ModuleApp
   
   has_one :app_auth,dependent: :delete
 
+  def get_tags
+    get_registration.get_tags
+  end
+
   def get_categories
     get_registration.get_categories
   end
@@ -131,9 +133,5 @@ class ModuleApp
   def get_registration
     OrbitApp::Module::Registration.find_by_key(key)
   end
-
-  def self.find_by_key(key)
-    self.where(key: key)[0] rescue nil
-  end
   
 end

app/models/site.rb

@@ -11,17 +11,10 @@ class Site
   field :roaming_id
   field :private_key, :type => Binary
   field :public_key, :type => Binary
-
-  field :frontend_closed, :type => Boolean, :default => false
-  field :backend_openness_on, :type => Boolean, :default => false
-
   field :title_always_on, :type => Boolean, :default => false
   field :dashbroad_allow_visitor, :type => Boolean, :default => false
   field :mail_settings, :type => Hash
-
-  field :disk_space, :type => String
-  field :system_package_info, :type => Hash,:default=>{}
-
+  
   field :school
   field :department
   

app/models/sub_role_tag.rb

@@ -1,3 +1,4 @@
 class SubRoleTag < ProtoTag
   has_and_belongs_to_many :sub_roles
+
 end

app/models/tag.rb

@@ -10,13 +10,10 @@ class Tag
   
   is_impressionable :counter_cache => { :column_name => :view_count }
   
-  field :name, localize: true
+  field :key
   field :view_count, :type => Integer, :default => 0
   field :cloud_view_count, :type => Integer, :default => 0
 
-  belongs_to :module_tag, polymorphic: true
-  has_many :taggings, dependent: :destroy
-
   #field :cloud_amper,:type: Integer,:default=> 0 
 
   def self.sorted_for_cloud

app/models/tagging.rb

@@ -1,9 +0,0 @@
-class Tagging
-  include Mongoid::Document
-  include Mongoid::Timestamps
-
-  field :to_destroy, default: false
-
-  belongs_to :tag
-  belongs_to :taggable, polymorphic: true
-end

app/models/user/role.rb

@@ -11,14 +11,9 @@ class Role < Attribute
   
   has_many :sub_roles, :autosave => true, :dependent => :destroy
   has_many :users
-  # has_many :statuses, :autosave => true, :dependent => :destroy
+  has_many :statuses, :autosave => true, :dependent => :destroy
   # has_many :attribute_fields, :autosave => true, :dependent => :destroy
-  has_many :role_statuses, :autosave => true, :dependent => :destroy
-  has_many :role_categorys, :autosave => true, :dependent => :destroy
-  
   accepts_nested_attributes_for :sub_roles, :allow_destroy => true
-  accepts_nested_attributes_for :role_statuses, :allow_destroy => true
-  accepts_nested_attributes_for :role_categorys, :allow_destroy => true
   
   def is_built_in?
     self.built_in

app/models/user/role_category.rb

@@ -1,14 +0,0 @@
-class RoleCategory < RoleFilter
-
-  has_and_belongs_to_many :users
-  belongs_to :role
-
-  def self.get_role_data(role_key)
-
-  	@role = Role.where(:key =>role_key).first
-
-  	return @role.id
-  	
-  end
-  
-end

app/models/user/role_filter.rb

@@ -1,26 +0,0 @@
-class RoleFilter
-  
-  include Mongoid::Document
-  include Mongoid::Timestamps
-  # include OrbitCoreLib::ObjectAuthable
-  include OrbitCoreLib::ObjectDisable
-
-
-  field :key
-  field :title, localize: true
-  
-  # belongs_to :role
-
-  def pp_object
-    title
-  end
-
-  def self.from_id(id)
-    RoleFilter.find(id) rescue nil
-  end
-
-  def self.is_localized?(field_name)
-    self.fields[field_name.to_s].localized?
-  end
-  
-end

app/models/user/role_status.rb

@@ -1,16 +0,0 @@
-class RoleStatus < RoleFilter
-
-  has_and_belongs_to_many :users
-  belongs_to :role
-
-  scope :can_display,where(disable: false)
-
-  def self.get_role_data(role_key)
-
-  	@role = Role.where(:key =>role_key).first
-
-  	return @role.id
-  	
-  end
-  
-end

app/models/user/user.rb

@@ -9,13 +9,7 @@ class User
   
   field :admin, :type => Boolean, :default => true
   field :active_role
-  field :user_id
-  field :sid
-  field :first_name, localize: true
-  field :last_name, localize: true
   field :email
-  field :sex, :default => 'unknown'
-  field :office_tel
   field :cache_dept,type: Hash
   field :status_record,type: Hash
 
@@ -31,11 +25,9 @@ class User
   # has_many :papers, :autosave => true, :dependent => :destroy
   has_and_belongs_to_many :sub_role_tags
 
-#  has_and_belongs_to_many :statuses
+  has_and_belongs_to_many :statuses
   has_and_belongs_to_many :roles
   has_and_belongs_to_many :sub_roles
-  has_and_belongs_to_many :role_statuses
-  has_and_belongs_to_many :role_categorys
   accepts_nested_attributes_for :attribute_values, :allow_destroy => true 
 
   before_create :initialize_desktop
@@ -44,9 +36,6 @@ class User
   scope :remote_account, where(:nccu_id.ne => nil)
   scope :not_guest_user, all_of(:name.ne => "guest")
 
-  validates :user_id,
-            :presence => { :message => I18n.t("users.user_id_not_null") } , 
-            :length => {:minimum => 3, :maximum => 50, :message => I18n.t("users.user_id_length") }
   # validates_uniqueness_of :email,:message=> I18n.t("devise.registrations.email_not_unique")
   
   # def new_attribute_values=(vars)
@@ -112,24 +101,6 @@ class User
     end
   end
 
-  def role_status=(var)
-    self.role_statuses = []
-    var[:id].each do |id,val|  
-      if (val=="true")
-        self.role_statuses << RoleStatus.find(id)
-      end
-    end
-  end
-
-  def role_category=(var)
-    self.role_categorys = []
-    var[:id].each do |id,val|  
-      if (val=="true")
-        self.role_categorys << RoleCategory.find(id)
-      end
-    end
-  end
-
 
 
   def set_sub_role(sub_role_id,status_id)
@@ -173,17 +144,6 @@ class User
     }.uniq!
   end
 
-  def self.get_member_list_attribute_field_name(role_type,field_key)
-    @attribute = ::Attribute.where(:key => role_type).first
-    return ::AttributeField.where(:key => field_key, :attribute_id => @attribute.id).first.title
-  end
-
-  def self.get_member_list_attribute_value(user_id,role_type,field_key)
-    @attribute = ::Attribute.where(:key => role_type).first
-    @AttributeField = ::AttributeField.where(:key => field_key, :attribute_id => @attribute.id).first
-    return ::AttributeValue.where(attribute_field_id: @AttributeField.id, :user_id => user_id).first[I18n.locale.to_s]
-  end
-
   def create_dept_cache
     dept_hash = {}
 
@@ -210,30 +170,12 @@ class User
     (query1 + query2).uniq
   end
   
-  # def name
-  #   info = Class::Info.first(:conditions => {:key => 'profile'})
-  #   if info
-  #     first_name = get_attribute_values.detect {|value| value.key.to_s.eql?('first_name') }[I18n.locale.to_s] rescue nil
-  #     last_name = get_attribute_values.detect {|value| value.key.to_s.eql?('last_name') }[I18n.locale.to_s] rescue nil
-  #     full_name = "#{last_name} #{first_name}"
-
-  #     if full_name.strip.empty?
-  #       full_name = email
-  #     end
-
-  #     return full_name
-  #   else
-  #     return nil
-  #   end
-  # end
-  
   def name
     info = Class::Info.first(:conditions => {:key => 'profile'})
     if info
-      # first_name = get_attribute_values.detect {|value| value.key.to_s.eql?('first_name') }[I18n.locale.to_s] rescue nil
-      # last_name = get_attribute_values.detect {|value| value.key.to_s.eql?('last_name') }[I18n.locale.to_s] rescue nil
-      # full_name = (I18n.locale != 'zh_tw') ? "#{self.last_name} #{self.first_name}" : "#{self.first_name} #{self.last_name}"
-      full_name = (I18n.locale.to_s == 'zh_tw') ? "#{self.last_name} #{self.first_name}" : "#{self.first_name} #{self.last_name}"
+      first_name = get_attribute_values.detect {|value| value.key.to_s.eql?('first_name') }[I18n.locale.to_s] rescue nil
+      last_name = get_attribute_values.detect {|value| value.key.to_s.eql?('last_name') }[I18n.locale.to_s] rescue nil
+      full_name = "#{last_name} #{first_name}"
 
       if full_name.strip.empty?
         full_name = email
@@ -269,6 +211,7 @@ class User
       self.roles = self.roles.uniq
     end
 
+
   def rebuild_status_record
     self.status_record = {}
     self.attribute_values.reject{|t| t.key!='status'}.each do |status|

app/views/admin/assets/_asset.html.erb

@@ -17,7 +17,7 @@
 		<div class="label-group">
 			<div class="label-td">
 				<% asset.sorted_tags.each do |tag| %>
-					<span class="label label-tags"><%= tag.name %></span>
+					<span class="label label-tags"><%= tag[I18n.locale] %></span>
 				<% end %>
 			</div>
 		</div>

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

@@ -25,7 +25,7 @@
         <% @tags.each do |tag| %>
             <%= content_tag :label, :class => "checkbox inline" do -%>
                 <%= check_box_tag 'asset[tag_ids][]', tag.id, @asset.tag_ids.include?(tag.id) %>
-                <%= tag.name %>
+                <%= tag[I18n.locale] %>
                 <%= hidden_field_tag 'asset[tag_ids][]', '' %>
             <% end %>
         <% end %>

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

@@ -1,5 +1,5 @@
 <% content_for :side_bar do %>
-  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member_), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
 <% end %>
 
             <%= form_for @attribute,:url => eval("admin_#{@attribute_type}_path(@attribute)") ,:class=> "form-horizontal" do |f| %>

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

@@ -1,5 +1,5 @@
 <% content_for :side_bar do %>
-  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member_), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
 <% end %>
 
 
@@ -37,8 +37,6 @@
 						<% if @attribute_type == 'role' %>
 						<li><%= link_to t(:role_field), eval("admin_#{@attribute_type}_role_field_path(attribute)") %></li>
 						<li><%= link_to t(:sub_role), eval("admin_#{@attribute_type}_sub_role_path(attribute)") %></li>
-						<li><%= link_to t(:status), eval("admin_role_statuses_path(:role_id=>attribute)") %></li>
-						<li><%= link_to t(:category), eval("admin_role_categorys_path(:role_id=>attribute)") %></li>
 						<% end %>
 						<li><%= link_to t(:enable), eval("admin_#{@attribute_type}_path(attribute, :authenticity_token => form_authenticity_token, :#{@attribute_type} => {:disabled => true})"), :remote => true, :method => :put, :id => "disable_#{attribute.id}", :style => "display:#{attribute.is_disabled? ? 'none' : ''}", :class => 'switch' %></li>
 						<li><%= link_to t(:disable), eval("admin_#{@attribute_type}_path(attribute, :authenticity_token => form_authenticity_token, :#{@attribute_type} => {:disabled => false})"), :remote => true, :method => :put, :id => "enable_#{attribute.id}", :style => "display:#{attribute.is_disabled? ? '' : 'none'}", :class => 'switch' %></li>

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

@@ -40,7 +40,7 @@
         </div>
     </div>
 <!--     <div class="item element">
-        <h3><i class="icons-"></i><a href=""><%= t(:member_) %></a></h3>
+        <h3><i class="icons-"></i><a href=""><%= t(:member) %></a></h3>
         <div class="detail w-a h-a">
             <p class="totle"><span><%= t(:all_member) %></span>2,217</p>
             <table class="table table-striped">

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

@@ -2,14 +2,5 @@
 	<%= render_node_and_children(Item.first(:conditions => {:parent_id => nil})) %>
 </ol>
 <script type="text/javascript">
-        $.ajaxSetup({
-    error: function(xhr, status, err) {
-    if (xhr.status == 401){
-    alert("<%= I18n.t('access.denied.ajax_401_error') %>");
-     window.location.href = '/';
-     }
-    }
-    });
-
 	bindTreeDragHandle();
 </script>

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

@@ -19,6 +19,5 @@
 
 </div>
 <% end %>
-  
-<%=javascript_include_tag "inc/update_cates_and_tags.js" %>
-<%= javascript_include_tag "inc/page_widget_edit_interface.js" %>
+
+<%=javascript_include_tag "inc/update_cates_and_tags.js" %>

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

@@ -13,7 +13,7 @@
         <%= nil_checkbox_button(object,:tag) %>
         <%= content_tag_for(:label, @tags,:class=>"radio inline") do |tag|%>
           <%= check_box_tag("#{field_name}[tag][]", tag.id,  tag_checked_value(object,tag.id),:class=>'select_option'  ) %>
-          <%= tag.name%>
+          <%= tag[I18n.locale]%>
         <% end if @tags%>
     </fieldset>
   <% else %>

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

@@ -2,4 +2,8 @@
 	<%= render 'admin/items/site_map_left_bar' %>
 <% end -%>
 
+
+
+
+
 <%= render 'edit' %>

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

@@ -112,5 +112,4 @@
 	</div>
 </div>
 
-<%=javascript_include_tag "inc/update_cates_and_tags.js" %>
-<%= javascript_include_tag "inc/page_widget_edit_interface.js" %>
+<%=javascript_include_tag "inc/update_cates_and_tags.js" %>

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

@@ -3,4 +3,4 @@
     <%= render 'admin/items/site_map_left_bar' %>
 <% end -%>
 
-<%= render 'edit' %> 
+<%= render 'edit' %>

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

@@ -1,31 +0,0 @@
-<% # encoding: utf-8 %>
-
-<%= form_for(:role_filter, :remote => true, :url => @url, :method => @verb, :html => { :id => 'form_role_filter' } ) do |f| %>
-
-	<h2><%= (@role_filter.new_record? ? 'Add' : 'Edit') %></h2>
-
-	<div id="widget-title">
-		<%= f.label :key %>
-		<%= f.text_field :key %>
-	</div>
-	
-	<div id="widget-title">
-		<%= f.fields_for :title_translations do |f| %>
-		  <% @site_valid_locales.each do |locale| %>
-				<div class="control-group">
-					<%= label_tag "name-#{locale}", "Name-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %>
-					<div class="controls">
-						<%= f.text_field locale, :class =>' input-xxlarge', :value => (@role_filter.title_translations[locale] rescue nil) %>
-					</div>
-				</div>
-		  <% end %>
-		<% end %>
-	</div>
-  
-  <div class="form-actions">
-		<%= f.hidden_field :role_id, :value => params[:role_id] if !params[:role_id].blank? %>
-    <%= f.submit 'Submit/送出', :class=>'btn btn-primary' %>
-  </div>
-  
-<% end %>
- 

app/views/admin/role_filters/_role_filter.html.erb

@@ -1,23 +0,0 @@
-
-	<tr id="<%= dom_id role_filter %>" class="with_action">
-		<td>
-			<%= role_filter.key %>
-			<div class="quick-edit">
-				<ul class="nav nav-pills hide">
-					<% if is_admin?%>
-						<li><%= link_to t('role_filter.edit'), 
-						polymorphic_path([:admin, role_filter], {:action => :edit}), :remote => true %></li>
-						<li><%= link_to show_toggle_archive_btn(role_filter), 
-						polymorphic_path([:admin, role_filter]), :confirm => t('sure?'), :method => :delete, :remote => true,:class=>"archive_toggle" %></li>
-					<% end %>
-				</ul>
-			</div>
-		</td>
-		<% if @types.is_localized?(:title) %>
-		<% @site_valid_locales.each do |locale| %>
-		<td><%= role_filter.title_translations[locale] rescue nil %></td>
-		<% end %>
-		<% else %>
-		<td><%= role_filter.title %></td>
-		<% end %>
-	</tr>

app/views/admin/role_filters/create.js.erb

@@ -1,2 +0,0 @@
-$('<%= j render :partial => 'role_filter', :collection => [@role_filter] %>').appendTo('#role_filters').hide().fadeIn();
-$("#form_role_filter")[0].reset();

app/views/admin/role_filters/destroy.js.erb

@@ -1 +0,0 @@
-$("#<%= dom_id @role_filter %>").find(".archive_toggle").text("<%= show_toggle_archive_btn(@role_filter) %>  ");

app/views/admin/role_filters/edit.js.erb

@@ -1 +0,0 @@
-$("#form > form").replaceWith("<%= j render "form" %>");

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

@@ -1,49 +0,0 @@
-
-<% content_for :side_bar do %>
-  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member_), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
-<% end %>
-
-<div class="subnav">
-	<ul class="breadcrumb">
-		<li><%= link_to( t("role"), admin_roles_path ) %> <span class="divider">/</span></li>
-		<li class="active">( <%= @role.title %> ) <%= t(@app_type_name) %></li>
-	</ul>
-	<div id="accordion">
-		<div class="accordion-group filters">
-			<div class="table-label">
-				<table class="table main-list">
-					<thead>
-						<tr class="sort-header">
-
-							<th id="sort-name" class="sort span1-2 select"><span><a href="#"><%= t('role_filters.key') %><b class="web-symbol"></b></a></span></th>
-							<% @site_valid_locales.each do |locale| %>
-							<th id="sort-name" class="sort span1-2 select"><span><a href="#"><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %><b class="web-symbol"></b></a></span></th>
-							<% end %>
-
-						</tr>
-					</thead>
-				</table>
-			</div> 
-		</div>
-	</div>
-</div>
-
-<table id="role_filters" class="table main-list">
-	<thead>
-		<tr>
-			<th class="span1-2"></th>
-			<% @site_valid_locales.each do |locale| %>
-			<th class="span1-2"></th>
-			<% end %>
-		</tr>
-	</thead>
-	<tbody>
-
-	<%= render :partial => 'role_filter', :collection => @role_filters %>
-	
-	</tbody>
-</table>
-
-<div id="form"><%= render :partial => "form" %></div>
-
-

app/views/admin/role_filters/new.js.erb

@@ -1 +0,0 @@
-$("#form > form").replaceWith("<%= j render "form" %>");

app/views/admin/role_filters/update.js.erb

@@ -1,4 +0,0 @@
-$("#<%= dom_id @role_filter %>").replaceWith("<%= j render :partial => 'role_filter', :collection => [@role_filter] %>");
-<% @role_filter = @types.new(:display => 'List') # reset for new form %>
-$("#form_role_filter").replaceWith("<%= j render "form" %>")
-$("#form_role_filter")[0].reset();

app/views/admin/roles/add_sub_role.html.erb

@@ -1,9 +1,3 @@
-
-<% content_for :side_bar do %>
-  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member_), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
-<% end %>
-
-
             <%= form_for @sub_attribute,:url => eval("admin_#{@attribute_type}s_path") ,:class=> "form-horizontal" do |f| %>
             <div class="site-map role-block">
                 <div class="map-block back">

app/views/admin/roles/edit_sub_role.html.erb

@@ -1,9 +1,3 @@
-
-<% content_for :side_bar do %>
-  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member_), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
-<% end %>
-
-
             <%= form_for @sub_attribute,:url => eval("admin_#{@attribute_type}_path(@attribute)") ,:class=> "form-horizontal" do |f| %>
             <div class="site-map role-block">
                 <div class="map-block back">

app/views/admin/roles/role_field.html.erb

@@ -1,5 +1,5 @@
 <% content_for :side_bar do %>
-  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member_), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
 <% end %>
 			
 		<%= form_for @attribute,:url => eval("admin_#{@attribute_type}_path(@attribute)") ,:class=> "form-horizontal" do |f| %>

app/views/admin/roles/sub_role.html.erb

@@ -1,7 +1,7 @@
 <% # encoding: utf-8 %>
 
 <% content_for :side_bar do %>
-  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member_), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
 <% end %>
 
 

app/views/admin/roles/sub_role_field.html.erb

@@ -1,5 +1,5 @@
 <% content_for :side_bar do %>
-  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member_), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
 <% end %>
 
 		<%= form_for @attribute,:url => eval("admin_#{@attribute_type}_path(@attribute)") ,:class=> "form-horizontal" do |f| %>

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

@@ -1,47 +0,0 @@
-<h1><%= I18n.t("site.system_preference") %></h1>
-<ul class="nav nav-tabs" id="myTab">
-  <li class="active"><a href="#summary"  data-toggle="tab"><%= I18n.t("site.system_preference_.tab_summary") %></a></li>
-  <li><a href="#commits" data-toggle="tab"><%= I18n.t("site.system_preference_.tab_commits") %></a></li>
-  <li><a href="#backups"  data-toggle="tab"><%= I18n.t("site.system_preference_.tab_backups") %></a></li>
-  <li><a href="#resque_logs"  data-toggle="tab"><%= I18n.t("site.system_preference_.tab_logs") %></a></li>
-</ul>
- 
-<div class="tab-content">
-  <div class="tab-pane  active in" id="summary">
-        <h2><%= I18n.t("site.system_preference_.summary.disk_space") %>:</h2>
-         <%= content_tag :p,@site.disk_space.gsub(/\n/,"<br />").html_safe if @site.disk_space %>
-        <h2><%= I18n.t("site.system_preference_.summary.code_update_at") %>: </h2>
-        <% @site.system_package_info.each do |index,value| %>
-          <h2><%= index.titleize %> <%= I18n.t("site.system_preference_.summary.version") %>:</h2>       
-          <%= content_tag :p,value %>
-        <% end %>
-        <h2><%= I18n.t("site.system_preference_.summary.weekness_report") %>:<%= '' %></h2>
-  </div>
-  <div class="tab-pane" id="commits">
-    <% if @git_commit_list_file %>
-      <% @git_commit_list_file.lines do |line|%>
-        <%= line %><br/>
-      <% end%>
-      <% else %>
-      <div class="well"><%= I18n.t("site.system_preference_.summary.no_data") %></div>
-    <% end %>
-  </div>
-  <div class="tab-pane" id="backups">
-    <%if @db_backup_list_file %>
-      <% @db_backup_list_file.lines do |line|%>
-        <%=line %><br/>
-      <% end %>
-      <% else %>
-        <div class="well"><%= I18n.t("site.system_preference_.summary.no_data") %></div>
-    <% end %>
-  </div>
-  <div class="tab-pane" id="resque_logs">
-  <%if @db_backup_list_file %>
-    <% @resque_logs_file.lines do |line|%>
-      <%=line %><br/>
-    <% end if @resque_logs_file%>
-    <%else %>
-          <div class="well"><%= I18n.t("site.system_preference_.summary.no_data") %></div>
-    <% end %>
-  </div>
-</div>

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

@@ -35,14 +35,6 @@
               </div>
             <% end %>
           <% end %>
-          <div class="control-group">
-            <label class="control-label"><%= t 'site.openness' %></label>
-            <div class="controls">
-              <%= f.check_box :frontend_closed %><%= I18n.t('site.frontend_closed') %><br/>
-              <%= f.check_box :backend_openness_on %><%= I18n.t('site.backend_openness_on') %>
-              <p class="help-block"><%= (t 'site.search_help').html_safe %></p>
-            </div>
-        </div>
           <div class="control-group">
             <label class="control-label"><%= t 'site.search' %></label>
             <div class="controls">

app/views/admin/tags/_add.html.erb

@@ -1,9 +1,7 @@
 <%= form_for :tag, :url => admin_tags_path, :remote => true, :html => {:id => 'tag_form'} do |f| %>
-  <%= f.fields_for :name_translations do |f| %>
-  	<% @site_valid_locales.each do |locale| %>
-  	  <%= I18nVariable.from_locale(locale) %>:<%= f.text_field locale %>
-  	<% end %>
-  <% end %>
-	<%= hidden_field_tag :module_app_id, @module_app_id %>
+	<% @site_valid_locales.each do |locale| %>
+	  <%= I18nVariable.from_locale(locale) %>:<%= f.text_field locale %>
+	<% end %>
+	<%= f.hidden_field :module_app_id, :value => @module_app_id %>
 	<%= f.submit t(:add) %>
 <% end %>

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

@@ -1,9 +1,7 @@
 <%= form_for :tag, :url => admin_tag_path(tag), :method => :put, :remote => true do |f| %>
-  <%= f.fields_for :name_translations do |f| %>
-    <% @site_valid_locales.each do |locale| %>
-      <%= I18nVariable.from_locale(locale) %>:<%= f.text_field locale, value: @tag.name_translations[locale] %>
-    <% end %>
-  <% end %>
-  <%= hidden_field_tag :module_app_id, @module_app_id %>
+	<% @site_valid_locales.each do |locale| %>
+	  <%= I18nVariable.from_locale(locale) %>:<%= f.text_field locale %>
+	<% end %>
+	<%= f.hidden_field :module_app_id, :value => tag.module_app_id %>
 	<%= f.submit t(:update_) %>
 <% end %>

app/views/admin/tags/_tag.html.erb

@@ -3,11 +3,11 @@
 	<i class="icons-tag"></i>
 	<% @site_valid_locales.each do |locale| %>
 	 	<%#= I18nVariable.from_locale(locale) %>
-		<%= tag.name_translations[locale] %>
+		<%= tag[locale] %>
 	<% end %>
 	</div>
 	<div class="action">
-	<%= link_to t(:edit), edit_admin_tag_path(tag, :module_app_id => @module_app_id), :remote => true  %>
+	<%= link_to t(:edit), edit_admin_tag_path(tag), :remote => true  %>
 	<%= link_to t(:delete_), admin_tag_path(tag), :confirm => t('sure?'), :method => :delete, :remote => true  %>
 	</div>
 </div>

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

@@ -4,34 +4,12 @@
 
 <div class="groups map-block back <%= role_disable ? 'disabled' : '' %>">
   <h4>
-  <button  for=<%=@form_index%> class="onoff pull-right"><%= role_disable ? 'OFF' : 'ON' %></button><span><%= role.title %><%= t(:role_info)%></span>
+  <button  for=<%=@form_index%> class="onoff pull-right"><%= role_disable ? 'OFF' : 'ON' %></button><span><%= role.title %></span>
   <%= hidden_field_tag("user[disable_role][id][#{role.id}]",role_disable,:for=>@form_index,:class=>"subrole_disable_field",:value=>role_disable)%>
   </h4>
   
   <div class="form-horizontal <%= role_disable ? 'hide' : '' %>">
-
-  <% @form_index = @form_index +1 %>
-
-  <div class="control-group">
-
-  <%= label_tag t(:status), nil, {:func=>"field_label", :for=>"1", :class=>"control-label"} %>
-  <% role.role_statuses.where(:disable => false).each_with_index do |rrs, i|%>
-    <%= hidden_field_tag("user[role_status][id][#{rrs.id}]", false,:for=>"#{@form_index}")%>
-    <%= label_tag(i,check_box_tag( "user[role_status][id][#{rrs.id}]", true, @user.role_statuses.include?(rrs))+rrs.title,:class=>"control-label") %>
-  <% end %>
-  </div>
-
-  <% @form_index = @form_index +1 %>
-
-  <div class="control-group">
-  <%= label_tag t(:category), nil, {:func=>"field_label", :for=>"1", :class=>"control-label"} %>
-  <% role.role_categorys.where(:disable => false).each_with_index do |rrcg, i|%>
-    <%= hidden_field_tag("user[role_category][id][#{rrcg.id}]", false,:for=>"#{@form_index}")%>
-    <%= label_tag(i,check_box_tag( "user[role_category][id][#{rrcg.id}]", true, @user.role_categorys.include?(rrcg))+rrcg.title,:class=>"control-label") %>
-  <% end %>
-  </div>
-
-
+  
   <% role.attribute_fields.each  do |rf|%>
   
 	<%= rf.block_helper(@user,@form_index)%>

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

@@ -1,22 +1,14 @@
 <div class="roles <%= show_roles.key %>">
-    <%= show_roles.title %><%= t(:role_info)%>
+    <%= show_roles.title %>
     <div class="label-line">
         <hr />
     </div>
     <table class="table">
         <tbody>
-            <tr>
-              <td class="span1"><%= t('status') %></td>
-              <td><%= show_attribute_value(@user.role_statuses.where(:role_id=>show_roles.id).map{|t|t.title.to_s}.join(',')) rescue '' %></td>
-            </tr>
-            <tr>
-              <td class="span1"><%= t('category') %></td>
-              <td><%= show_attribute_value(@user.role_categorys.where(:role_id=>show_roles.id).map{|t|t.title.to_s}.join(',')) rescue '' %></td>
-            </tr>
 			<% show_roles.attribute_fields.where(:disabled=>false).each do |rf| %>
 				<tr>
 				  <td class="span1"><%= rf.title %></td>
-				  <td><%= nl2br(show_attribute_value(@user.get_attribute_value(rf).get_value_by_locale(I18n.locale))) rescue '' %></td>
+				  <td><%= show_attribute_value(@user.get_attribute_value(rf).get_value_by_locale(I18n.locale)) rescue '' %></td>
 				</tr>
 			<% end -%>
                 <%= render :partial => 'show_sub_role',:collection=> @user.get_sub_roles_by_role(show_roles)%>

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

@@ -2,6 +2,6 @@
 <% show_sub_role.attribute_fields.each do |item|%>
   <tr>
       <td class="span1"><%= item.title %></td>
-      <td><%= nl2br(show_attribute_value(@user.get_attribute_value(item).get_value_by_locale(I18n.locale))) rescue '' %></td>
+      <td><%= show_attribute_value(@user.get_attribute_value(item).get_value_by_locale(I18n.locale)) rescue '' %></td>
   </tr>
 <% end %>

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

@@ -1,5 +1,5 @@
 <%= content_tag :li, :class => active_for_controllers('users_new_interface')  do -%>
-  <%= link_to content_tag(:i, nil, :class => 'icons-user')+ content_tag(:span, t(:member_)), admin_users_new_interface_index_path %>
+  <%= link_to content_tag(:i, nil, :class => 'icons-user')+ content_tag(:span, t(:member)), admin_users_new_interface_index_path %>
     <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('users_new_interface')) do -%>
       <%= content_tag :li, link_to((t(:all_member) + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, admin_users_new_interface_index_path), :class => active_for_action('users_new_interface', 'index') %>
       <%= content_tag :li, link_to((t(:add_member) + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, new_admin_users_new_interface_path), :class => active_for_action('users_new_interface', 'new') if (is_admin? rescue nil) %>

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

@@ -1,120 +1,32 @@
   <%#= devise_error_messages! %>
 
   <div class="map-block back">
-    <h4><span><%=t(:sys_basic_form)%></span></h4>
+                <h4><span><%=t(:sys_basic_form)%></span></h4>
 
-     <div class="form-horizontal">
-      <div class="controls-block" >
-        <div class="control-group language-swich">
-            <%= f.label t("users.first_name"),{:class=>"control-label", :func=>"field_label"} %>
-            <div class="controls">
-              <div class="tabbable">
-                <div class="tab-content">
-                  <% @site_valid_locales.each_with_index do |locale, i| %>
-                  <div class="tab-pane fade <%= locale %> user-attribute_values-first_name <%= ( i == 0 ) ? "in active" : '' %>">
-                      <%= f.fields_for :first_name_translations do |f| %>
-                        <%= f.text_field locale, :func=>'input_unit', :value => (@user.first_name_translations[locale] rescue nil) %>
-                      <% end %>
+                <div class="form-horizontal">
+                    <div class="control-group">
+                        <%= f.label t(:email),:class=>"control-label" %><br />
+                        <div class="controls">
+                            <%= f.email_field :email %>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="form-horizontal">
+                    <div class="control-group">
+                        <%= f.label t(:password),:class=>"control-label" %>
+                        <div class="controls">
+                            <%= f.password_field :password %>
+                        </div>
+                    </div>
                   </div>
-                  <% end %>
-               </div>
-                <ul class="nav nav-pills">
-                  <% @site_valid_locales.each_with_index do |locale, i| %>
-                    <li <%= ( i == 0 ) ? "class=active" : '' %> for="<%= locale %>">
-                      <a data-toggle="tab" href=".user-attribute_values-first_name.<%= locale %>"><%= I18nVariable.from_locale(locale) %></a></li>
-                  <% end %>
-                </ul> 
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
 
-     <div class="form-horizontal">
-      <div class="controls-block" >
-        <div class="control-group language-swich">
-            <%= f.label t("users.last_name"),{:class=>"control-label", :func=>"field_label"} %>
-            <div class="controls">
-              <div class="tabbable">
-                <div class="tab-content">
-                  <% @site_valid_locales.each_with_index do |locale, i| %>
-                  <div class="tab-pane fade <%= locale %> user-attribute_values-last_name <%= ( i == 0 ) ? "in active" : '' %>">
-                      <%= f.fields_for :last_name_translations do |f| %>
-                        <%= f.text_field locale, :func=>'input_unit', :value => (@user.last_name_translations[locale] rescue nil) %>
-                      <% end %>
-                  </div>
-                  <% end %>
-               </div>
-                <ul class="nav nav-pills">
-                  <% @site_valid_locales.each_with_index do |locale, i| %>
-                    <li <%= ( i == 0 ) ? "class=active" : '' %> for="<%= locale %>">
-                      <a data-toggle="tab" href=".user-attribute_values-last_name.<%= locale %>"><%= I18nVariable.from_locale(locale) %></a></li>
-                  <% end %>
-                </ul> 
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-
-    <div class="form-horizontal">
-        <div class="control-group">
-            <%= f.label t("users.email"),:class=>"control-label" %>
-            <div class="controls">
-                <%= f.email_field :email %>
-            </div>
-        </div>
-    </div>
-
-    <div class="form-horizontal">
-        <div class="control-group">
-            <%= f.label t("users.sid"),:class=>"control-label" %>
-            <div class="controls">
-              <%= f.text_field :sid %>
-              <span>( <%= t("users.sid_note")%> )</span>
-            </div>
-
-        </div>
-    </div>
-
-    <div class="form-horizontal">
-        <div class="control-group">
-            <%= f.label t("users.office_tel"),:class=>"control-label" %>
-            <div class="controls">
-              <%= f.text_field :office_tel %>
-              <span>( <%= t("users.office_tel_note")%> )</span>
-            </div>
-        </div>
-    </div>
-
-    <div class="form-horizontal">
-        <div class="control-group">
-            <%= f.label t("users.avatar"),:class=>"control-label" %>
-            <div class="controls">
-              <%= f.file_field :avatar %>
-              <% if @user.avatar.file %>
-                <%= f.check_box :remove_avatar %>
-                <%= t('delete.file') %>
-              <% end %>
-            </div>
-        </div>
-    </div>
-
-    <div class="form-horizontal">
-        <div class="control-group">
-            <%= f.label t("users.sex"),:class=>"control-label" %>
-            <div class="controls">
-              <label func="input_unit" for="0" class=" radio inline">
-                <%= f.radio_button :sex, "male" %><%= t('users.male')%>
-              </label>
-              <label func="input_unit" for="1" class=" radio inline">
-                <%= f.radio_button :sex, "female" %><%= t('users.female')%>
-              </label>
-              <label func="input_unit" for="2" class=" radio inline">
-                <%= f.radio_button :sex, "unknown" %><%= t('users.unknown')%>
-              </label>
-            </div>
-        </div>
-    </div>
-
-</div>
+                  <div class="form-horizontal">
+                    <div class="control-group">
+                      <%= f.label t(:password_confirmation),:class=>"control-label" %>
+                          <div class="controls">
+                              <%= f.password_field :password_confirmation %>
+                        </div>
+                    </div>
+                </div>
+            </div>

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

@@ -1,36 +0,0 @@
-  <%#= devise_error_messages! %>
-  <%= flash_messages %>
-
-  <div class="map-block back">
-    <h4><span><%=t(:sys_basic_id_form)%></span></h4>
-
-    <div class="form-horizontal">
-        <div class="control-group">
-            <%= f.label t("users.user_id"),:class=>"control-label" %>
-            <%#= f.label t(:user_id),:class=>"control-label" %>
-            <div class="controls">
-                <%= f.text_field :user_id %>
-                <span>( <%= t("users.user_id_note")%> )</span>
-            </div>
-        </div>
-    </div>
-
-    <div class="form-horizontal">
-        <div class="control-group">
-            <%= f.label t("users.new_password"),:class=>"control-label" %>
-            <div class="controls">
-                <%= f.password_field :password %>
-                <span>( <%= t("users.new_password_note")%> )</span>
-            </div>
-        </div>
-      </div>
-
-      <div class="form-horizontal">
-        <div class="control-group">
-          <%= f.label t("users.new_password_confirmation"),:class=>"control-label" %>
-              <div class="controls">
-                  <%= f.password_field :password_confirmation %>
-            </div>
-        </div>
-    </div>
-</div>

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

@@ -18,10 +18,7 @@
                                 <%= link_to user_for_summary.name,admin_users_new_interface_path(user_for_summary)%>
                             </p>
                             <div class="user-title">
-                                <% user_for_summary.roles.each do |rf| %>
-                                <% @roledata = Role.find(rf.id) %>
-                                <span><%= @roledata.title %></span>
-                                <% end %>
+                                <span>#TODO 教授兼系主任</span><span>#TODO 大學部校友</span>
                             </div>
                             <ul class="user-itemborder clear">
                                 <li class="pull-left"><span>#TODO 258</span>Publications</li>

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

@@ -5,32 +5,6 @@
                             </div>
                             <table class="table">
                                 <tbody>
-                                    <tr>
-                                        <td class="span1"><%= t('users.first_name')%></td>
-                                        <td><%= @user.first_name %></td>
-                                    </tr>
-                                    <tr>
-                                        <td class="span1"><%= t('users.last_name')%></td>
-                                        <td><%= @user.last_name %></td>
-                                    </tr>
-                                    <tr>
-                                        <td class="span1"><%= t('users.email')%></td>
-                                        <td><%= @user.email %></td>
-                                    </tr>
-                                    <% if !@user.sid.blank? %>
-                                    <tr>
-                                        <td class="span1"><%= t('users.sid')%></td>
-                                        <td><%= @user.sid %></td>
-                                    </tr>
-                                    <tr>
-                                        <td class="span1"><%= t('users.office_tel')%></td>
-                                        <td><%= @user.office_tel %></td>
-                                    </tr>
-                                    <% end %>
-                                    <tr>
-                                        <td class="span1"><%= t('users.sex')%></td>
-                                        <td><%= t("users.#{@user.sex}") %></td>
-                                    </tr>
                                     <% items.each do |item| %>
                                         <tr>
                                             <td class="span1"><%= item[:name] %></td>

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

@@ -1,5 +1,5 @@
 <% content_for :side_bar do %>
-  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member_), :link_url => admin_site_site_info_path(@site), :icon => 'icons-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
 <% end %>
 
 <% content_for :page_specific_css do -%>

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

@@ -1,32 +0,0 @@
-<% content_for :side_bar do %>
-  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member_), :link_url => admin_site_site_info_path(@site), :icon => 'icons-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
-<% end %>
-
-<% content_for :page_specific_css do -%>
-    <%= stylesheet_link_tag "member" %>
-    <%= stylesheet_link_tag "site-map" %>
-<% end -%>
-<% content_for :page_specific_javascript do -%>
-    <%= javascript_include_tag "/static/jquery.cycle.all.latest.js" %>
-    <%= javascript_include_tag "inc/modal-preview" %>
-    <%= javascript_include_tag "lib/contenteditable" %>
-    <%= javascript_include_tag "inc/ploy_input_field" %>
-    <%= javascript_include_tag "inc/input_module" %>
-    <%= javascript_include_tag "inc/attribute_panel_select" %>
-    <%= javascript_include_tag "inc/attribute_onoff" %>
-<% end -%>
-
-
-<%= content_tag :div,:class=>"user-role site-map role-block"  do%>
-
-    <%= form_for @user, :url => admin_users_new_interface_path(@user), :html => { :multipart => true } do |f| %>
-      <%= f.error_messages %>
-      <%= render :partial => 'user_basic_passwd', :locals => {:f => f}%>
-      <div class="button_bar">
-        <%= link_back %>
-        <%= hidden_field_tag 'edit_type', 'edit_passwd' %>
-        <%= link_to t(:update_), "#", :onclick=>"$('#edit_user_#{@user.id}').submit()" %>
-      </div>
-    <% end -%>
-
-<% end -%>

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

@@ -1,5 +1,5 @@
 <% content_for :side_bar do %>
-  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member_), :link_url => admin_site_site_info_path(@site), :icon => 'icons-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
 <% end %>
 
 <%= render :partial => "js_and_css"%>

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

@@ -1,5 +1,5 @@
 <% content_for :side_bar do %>
-  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member_), :link_url => admin_site_site_info_path(@site), :icon => 'icons-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
 <% end %>
 
 <%= render :partial => "js_and_css"%>

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

@@ -1,5 +1,5 @@
 <% content_for :side_bar do %>
-  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member_), :link_url => admin_site_site_info_path(@site), :icon => 'icons-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
 <% end %>
 
 <%= render :partial => "js_and_css"%>

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

@@ -1,5 +1,5 @@
 <% content_for :side_bar do %>
-  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member_), :link_url => admin_site_site_info_path(@site), :icon => 'icons-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
 <% end %>
 
 <% content_for :page_specific_css do -%>
@@ -21,7 +21,6 @@
     <%= form_for @user, :url =>  admin_users_new_interface_index_path, :html => { :multipart => true },:method => :post do |f| %>
 
       <%= f.error_messages %>
-      <%= render :partial => 'user_basic_passwd', :locals => {:f => f}%>
       <%= render :partial => 'user_basic', :locals => {:f => f}%>
       <%= render :partial => 'form', :locals => { :f => f } %>
       <div class="button_bar">

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

@@ -1,5 +1,5 @@
 <% content_for :side_bar do %>
-  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member_), :link_url => admin_site_site_info_path(@site), :icon => 'icons-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
 <% end %>
 
             <div class="member-plugin">

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

@@ -1,5 +1,5 @@
 <% content_for :side_bar do %>
-  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member_), :link_url => admin_site_site_info_path(@site), :icon => 'icons-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
 <% end %>
 
 <%= render :partial => "js_and_css"%>
@@ -39,7 +39,6 @@
                     <%= @user.email %>
                 </p>
                 <%= link_to("<i class='icon-pencil'></i>#{t(:edit)}".html_safe,edit_admin_users_new_interface_path(@user),:class=>"btn btn-small" ) if is_admin?%>
-                <%= link_to("<i class='icon-pencil'></i>#{t("users.change_passwd")}".html_safe,admin_users_new_interface_edit_passwd_path(@user),:class=>"btn btn-small" ) if is_admin?%>
             </div>
             <div class="user-roles my_scroll">
                 <div class="scrollbar">

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

@@ -1,5 +1,5 @@
 <% content_for :side_bar do %>
-  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member_), :link_url => admin_site_site_info_path(@site), :icon => 'icons-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
 <% end %>
 
 <% content_for :page_specific_css do -%>

app/views/desktop/desktop.html.erb

@@ -2,9 +2,13 @@
 <div id="content">
 	<div id="header" class="hh2">
 		<div class="dtitle w2 hh2 hp sdm">
-			<div class="thmtxth sdm_t" id="section_heading"></div>
-			<div class="admbg sdm_o w2">
+			<div class="thmtxth sdm_t" id="section_heading">Loading...</div>
+			<div class="admbg sdm_o">
 				<ul id="section_list">
+				<!--	<li><a class="admtxt hp w2 hh2" href="">Campus</a></li>
+					<li><a class="admtxt hp w2 hh2" href="">Research</a></li>
+					<li><a class="admtxt hp w2 hh2" href="">Social</a></li>
+					<li><a class="admtxt hp w2 hh2" href="">Private</a></li> -->
 				</ul>
 			</div>
 		</div>

app/views/desktop/index.html.erb

@@ -1,7 +1,7 @@
 <div id="side">
   <div id="rwidget" class="wh2 thmc4">
     <ul class="docklist">
-      <li class="d_cate"><a callback-method='initializeDesktop' href="desktop/desktop" class="widget_fn wh2 hh2" id='home' onclick="return false;"><span class="widget_icon"><img src="" alt="Home" id="home_icon" width="30" height="30"/></span></a>
+      <li class="d_cate"><a callback-method='initializeDesktop' href="desktop/" class="widget_fn wh2 hh2" id='home' onclick="return false;"><span class="widget_icon"><img src="" alt="Home" id="home_icon" width="30" height="30"/></span></a>
       <ul class="dock_child hh2 thmc4" style="width: 180px;">
         <li class="dock_item"><a callback-method='initializeAppSearch' href="<%= desktop_app_manager_path %>" class="widget_fn wh2 hh2" id="d_app_manager" onclick="return false;"><span class="widget_icon"><img src="" alt="App Manager" id="app_manager_icon" width="30" height="30"/></span></a></li>
         <li class="dock_item"><a callback-method='initializeSectionsManager' href="<%= desktop_allsections_path %>" class="widget_fn wh2 hh2" id="d_sections" custom-load="sections" onclick="return false;"><span class="widget_icon"><img src="" alt="All Sections" id="sections_icon" width="30" height="30"/></span></a></li>

app/views/desktop/settings/sections.html.erb

@@ -2,10 +2,10 @@
 		<div class="overview" content-layout="simple" base-width="1000">
 			<div class="s_title hh2">Section Names</div>
 			<ul class="s_form" id="desktop_names">
-				<li class="s_grid_row"><label class="s_grid s_grid_4" for="s_name1">Section 1</label><input id="s_name1" class="s_grid s_grid_8" type="text" value=""></li>
-				<li class="s_grid_row"><label class="s_grid s_grid_4" for="s_name2">Section 2</label><input id="s_name2" class="s_grid s_grid_8" type="text" value=""></li>
-				<li class="s_grid_row"><label class="s_grid s_grid_4" for="s_name3">Section 3</label><input id="s_name3" class="s_grid s_grid_8" type="text" value=""></li>
-				<li class="s_grid_row"><label class="s_grid s_grid_4" for="s_name4">Section 4</label><input id="s_name4" class="s_grid s_grid_8" type="text" value=""></li>
+				<li class="s_grid_row"><label for="s_name1">Section 1</label><input id="s_name1" type="text" value=""></li>
+				<li class="s_grid_row"><label for="s_name2">Section 2</label><input id="s_name2" type="text" value=""></li>
+				<li class="s_grid_row"><label for="s_name3">Section 3</label><input id="s_name3" type="text" value=""></li>
+				<li class="s_grid_row"><label for="s_name4">Section 4</label><input id="s_name4" type="text" value=""></li>
 			</ul>
 			<div class="s_subtitle">sample desciption</div>
 			<div class="s_action">

app/views/desktop/settings/themes.html.erb

@@ -21,7 +21,7 @@
 				<div class="theme_preview vp thmbgc" style="background-color: #000;" id="theme_preview_area">
 					<div class="thmtxth hh1 hp" style="margin-left:108px;">Theme Text1</div>
 					<div class="theme_plate">
-						<div class="thmc4 h1 wh2"></div>
+						<div class="thmc4 h1 wh3"></div>
 						<div class="thmc1 h1 w1"><div class="thmtxt hp">Theme Text2</div></div>
 						<div class="g_sep h1 op07"></div>
 						<div class="thmc2 h1 w1"><div class="thmtxt hp">Theme Text</div></div>
@@ -30,10 +30,10 @@
 				<div>
 					<table id="color_input" cellpadding="0" cellspacing="0" border="0" width="528" >
 						<tr>
-							<th class="s_title size_small hh2" width="190px">Theme Color</th>
-							<th class="s_title size_small hh2">Line Color</th>
-							<th class="s_title size_small hh2" width="120px">Text Color</th>
-							<th class="s_title size_small hh2" width="120px">Background Color</th>
+							<th class="s_title hh2" width="190px">Theme Color</th>
+							<th class="s_title hh2">Line Color</th>
+							<th class="s_title hh2" width="120px">Text Color</th>
+							<th class="s_title hh2" width="120px">Background Color</th>
 						</tr>
 						<tr>
 							<td>