Ray's changes for new backend

app/assets/javascripts/jquery.tinyscrollbar.min.js

@@ -1,118 +1,126 @@
-(function(a){
+(function(a){
-	function b(b,c){
+	function b(b,c){
-		function w(a){
+		function w(a){
-			if(!(g.ratio>=1)){
+			if(!(g.ratio>=1)){
-				o.now=Math.min(i[c.axis]-j[c.axis],Math.max(0,o.start+((k?a.pageX:a.pageY)-p.start)));
+				o.now=Math.min(i[c.axis]-j[c.axis],Math.max(0,o.start+((k?a.pageX:a.pageY)-p.start)));
-				n=o.now*h.ratio;g.obj.css(l,-n);
+				n=o.now*h.ratio;
-				j.obj.css(l,o.now)
+				g.obj.css(l,-n);
-			}
+				j.obj.css(l,o.now)
-			return false
+			}
-		}
+			return false
-		function v(b){
+		}
-			a(document).unbind("mousemove",w);
+		function v(b){
-			a(document).unbind("mouseup",v);
+			a(document).unbind("mousemove",w);
-			j.obj.unbind("mouseup",v);
+			a(document).unbind("mouseup",v);
-			document.ontouchmove=j.obj[0].ontouchend=document.ontouchend=null;
+			j.obj.unbind("mouseup",v);
-			return false
+			document.ontouchmove=j.obj[0].ontouchend=document.ontouchend=null;
-		}
+			return false
-		function u(b){
+		}
-			if(!(g.ratio>=1)){
+		function u(b){
-				var b=b||window.event;
+			if(!(g.ratio>=1)){
-				var d=b.wheelDelta?b.wheelDelta/120:-b.detail/3;
+				var b=b||window.event;
-				n-=d*c.wheel;
+				var d=b.wheelDelta?b.wheelDelta/120:-b.detail/3;
-				n=Math.min(g[c.axis]-f[c.axis],Math.max(0,n));
+				n-=d*c.wheel;
-				j.obj.css(l,n/h.ratio);
+				n=Math.min(g[c.axis]-f[c.axis],Math.max(0,n));
-				g.obj.css(l,-n);
+				j.obj.css(l,n/h.ratio);
-				b=a.event.fix(b);
+				g.obj.css(l,-n);
-				b.preventDefault()
+				b=a.event.fix(b);
-			}
+				b.preventDefault()
-		}
+			}
-		function t(b){
+		}
-			p.start=k?b.pageX:b.pageY;
+		function t(b){
-			var c=parseInt(j.obj.css(l));
+			p.start=k?b.pageX:b.pageY;
-			o.start=c=="auto"?0:c;
+			var c=parseInt(j.obj.css(l));
-			a(document).bind("mousemove",w);
+			o.start=c=="auto"?0:c;
-			document.ontouchmove=function(b){
+			a(document).bind("mousemove",w);
-				a(document).unbind("mousemove");
+			document.ontouchmove=function(b){
-				w(b.touches[0])
+				a(document).unbind("mousemove");
-			};
+				w(b.touches[0])
-			a(document).bind("mouseup",v);
+			};
-			j.obj.bind("mouseup",v);
+			a(document).bind("mouseup",v);
-			j.obj[0].ontouchend=document.ontouchend=function(b){
+			j.obj.bind("mouseup",v);
-				a(document).unbind("mouseup");
+			j.obj[0].ontouchend=document.ontouchend=function(b){
-				j.obj.unbind("mouseup");
+				a(document).unbind("mouseup");
-				v(b.touches[0])
+				j.obj.unbind("mouseup");
-			};
+				v(b.touches[0])};
-			return false
+				return false
-		}
+			}
-		function s(){
+			function s(){
-			j.obj.bind("mousedown",t);
+				j.obj.bind("mousedown",t);
-			j.obj[0].ontouchstart=function(a){
+				j.obj[0].ontouchstart=function(a){
-				a.preventDefault();
+					a.preventDefault();
-				j.obj.unbind("mousedown");
+					j.obj.unbind("mousedown");
-				t(a.touches[0]);
+					t(a.touches[0]);
-				return false
+					return false
-			};
+				};
-			i.obj.bind("mouseup",w);
+				i.obj.bind("mouseup",w);
-			if(c.scroll&&this.addEventListener){
+				if(c.scroll&&this.addEventListener){
-				e[0].addEventListener("DOMMouseScroll",u,false);
+					e[0].addEventListener("DOMMouseScroll",u,false);
-				e[0].addEventListener("mousewheel",u,false)
+					e[0].addEventListener("mousewheel",u,false)
-			}else if(c.scroll){
+				}else if(c.scroll){
-				e[0].onmousewheel=u
+					e[0].onmousewheel=u
-			}
+				}
-		}
+			}
-		function r(){
+			function r(){
-			j.obj.css(l,n/h.ratio);
+				j.obj.css(l,n/h.ratio);
-			g.obj.css(l,-n);
+				g.obj.css(l,-n);
-			p["start"]=j.obj.offset()[l];
+				p["start"]=j.obj.offset()[l];
-			var a=m.toLowerCase();
+				var a=m.toLowerCase();
-			h.obj.css(a,i[c.axis]);
+				h.obj.css(a,i[c.axis]);
-			i.obj.css(a,i[c.axis]);
+				i.obj.css(a,i[c.axis]);
-			j.obj.css(a,j[c.axis])
+				j.obj.css(a,j[c.axis])
-		}
+			}
-		function q(){
+			function q(){
-			d.update();
+				d.update();
-			s();
+				s();
-			return d
+				return d
-		}
+			}
-		var d=this;
+			var d=this;
-		var e=b;
+			var e=b;
-		var f={obj:a(".viewport",b)};
+			var f={obj:a(".viewport",b)};
-		var g={obj:a(".overview",b)};
+			var g={obj:a(".overview",b)};
-		var h={obj:a(".scrollbar",b)};
+			var h={obj:a(".scrollbar",b)};
-		var i={obj:a(".track",h.obj)};
+			var i={obj:a(".track",h.obj)};
-		var j={obj:a(".thumb",h.obj)};
+			var j={obj:a(".thumb",h.obj)};
-		var k=c.axis=="x",
+			var k=c.axis=="x",
-			l=k?"left":"top",
+				l=k?"left":"top",
-			m=k?"Width":"Height";
+				m=k?"Width":"Height";
-		var n,
+			var n,
-			o={start:0,now:0},
+				o={start:0,now:0},
-			p={};
+				p={};
-		this.update=function(a){
+			this.update=function(a){
-			f[c.axis]=f.obj[0]["offset"+m];
+				f[c.axis]=f.obj[0]["offset"+m];
-			g[c.axis]=g.obj[0]["scroll"+m];
+				g[c.axis]=g.obj[0]["scroll"+m];
-			g.ratio=f[c.axis]/g[c.axis];
+				g.ratio=f[c.axis]/g[c.axis];
-			h.obj.toggleClass("disable",g.ratio>=1);
+				h.obj.toggleClass("disable",g.ratio>=1);
-			i[c.axis]=c.size=="auto"?f[c.axis]:c.size;
+				i[c.axis]=c.size=="auto"?f[c.axis]:c.size;
-			j[c.axis]=Math.min(i[c.axis],Math.max(0,c.sizethumb=="auto"?i[c.axis]*g.ratio:c.sizethumb));
+				j[c.axis]=Math.min(i[c.axis],Math.max(0,c.sizethumb=="auto"?i[c.axis]*g.ratio:c.sizethumb));
-			h.ratio=c.sizethumb=="auto"?g[c.axis]/i[c.axis]:(g[c.axis]-f[c.axis])/(i[c.axis]-j[c.axis]);
+				h.ratio=c.sizethumb=="auto"?g[c.axis]/i[c.axis]:(g[c.axis]-f[c.axis])/(i[c.axis]-j[c.axis]);
-			n=a=="relative"&&g.ratio<=1?Math.min(g[c.axis]-f[c.axis],Math.max(0,n)):0;
+				n=a=="relative"&&g.ratio<=1?Math.min(g[c.axis]-f[c.axis],Math.max(0,n)):0;
-			n=a=="bottom"&&g.ratio<=1?g[c.axis]-f[c.axis]:isNaN(parseInt(a))?n:parseInt(a);
+				n=a=="bottom"&&g.ratio<=1?g[c.axis]-f[c.axis]:isNaN(parseInt(a))?n:parseInt(a);
-			r()
+				r()
-		};
+			};
-		return q()
+			return q()
-	}
+		}
-	a.tiny=a.tiny||{};
+		a.tiny=a.tiny||{};
-	a.tiny.scrollbar={options:{axis:"y",wheel:40,scroll:true,size:"auto",sizethumb:"auto"}};
+		a.tiny.scrollbar={
-	a.fn.tinyscrollbar=function(c){
+			options:{
-		var c=a.extend({},a.tiny.scrollbar.options,c);
+				axis:"y",
-		this.each(function(){
+				wheel:40,
-			a(this).data("tsb",new b(a(this),c))
+				scroll:true,
-		});
+				size:"auto",
-		return this
+				sizethumb:"auto"
-	};
+			}
-	a.fn.tinyscrollbar_update=function(b){
+		};
-		return a(this).data("tsb").update(b)
+		a.fn.tinyscrollbar=function(c){
-	};
+			var c=a.extend({},a.tiny.scrollbar.options,c);
-})
+			this.each(function(){
+				a(this).data("tsb",new b(a(this),c))
+			});
+			return this
+		};
+		a.fn.tinyscrollbar_update=function(b){
+			return a(this).data("tsb").update(b)
+		};
+	})
 (jQuery)

app/assets/javascripts/new_admin.js

@@ -8,6 +8,7 @@
 //= require jquery_ujs
 //= require jquery.form
 //= require bootstrap
+//= require jquery.masonry.min
 //= require jquery.isotope.min
 //= require jquery.tinyscrollbar.min
 //= require orbit-1.0

app/assets/javascripts/orbit-1.0.js

@@ -1,115 +1,208 @@
-var viewportwidth,
+var viewportwidth,
-	viewportheight;
+	viewportheight;
-function resize() {
+function resize() {
-	viewportheight=$(window).height();
+	viewportheight=$(window).height();
-	viewportwidth=$(window).width();
+	viewportwidth=$(window).width();
-	if(window.navigator.userAgent.indexOf("MSIE")>0){
+	if(window.navigator.userAgent.indexOf("MSIE")>0){
-		windH=document.clientHeight;
+		windH=document.clientHeight;
-		windW=document.clientWidht;
+		windW=document.clientWidht;
-	}
+	}
-}
+}
-$(document).ready(function(){
+$(document).ready(function(){
-	
+	
-	$('.tip').tooltip({
+	$('.tip').tooltip({
-		placement: "left"
+		placement: "left"
-	});
+	});
-	
+	
-	
+	$(document).on('click', '.privacy', function() {
-	$(document).on('click', '.privacy', function() {
+
-
+		switch ($(this).val()) {
-		switch ($(this).val()) {
+			case 'true':
-			case 'true':
+			$(this).parents('.controls').children('.select-role').slideUp(300);
-			$(this).parents('.controls').children('.select-role').slideUp(300);
+			break;
-			break;
+			case 'false':
-			case 'false':
+			$(this).parents('.controls').children('.select-role').slideDown(300);
-			$(this).parents('.controls').children('.select-role').slideDown(300);
+			break;
-			break;
+		}
-		}
+	});
-	});
+	
-	
+	var $role = $('.select-role');
-	var $role = $('.select-role');
+	var method =$('.privacy:eq(1)').attr('checked');
-	var method =$('.privacy:eq(1)').attr('checked');
+	if(method == 'checked'){
-	if(method == 'checked'){
+		$role.slideDown(0);
-		$role.slideDown(0);
+	}
-	}
+	$('.privacy').each(function($i) {
-	$('.privacy').each(function($i) {
+		$(this).click(function() {
-		$(this).click(function() {
+			switch ($i) {
-			switch ($i) {
+				case 0:
-				case 0:
+				$role.slideUp(300);
-				$role.slideUp(300);
+				break;
-				break;
+				case 1:
-				case 1:
+				$role.slideDown(300);
-				$role.slideDown(300);
+				break;
-				break;
+			}
-			}
+		});
-		});
+	});
-	});
+
-
+	/*tinyscrollbar&windows-Size*/
-	/*tinyscrollbar&windows-Size*/
+	resize();
-	resize();
+	mainResize()
-	var $mainWrapMarginLeft = parseInt($('#main-wrap').css("margin-left"))-2,
+	mainTablePosition();
-		$subWiget = $('#sub-wiget').width()+18;
+	itemPosition()
-		$orbitBar = $('#orbit-bar').height(),
+	$('#collapse-menu').on({
-		$mainSidebar = $('#main-sidebar').width()+5,
+		click: function(){
-		$formActionPadding = parseInt($('.form-fixed').css("padding-left"))+parseInt($('.form-fixed').css("padding-right"));
+			$('body').toggleClass("folded");
-	$('#main-sidebar').css("height", viewportheight-$orbitBar);
+			if($('#collapse-menu > i').attr("class")=="icon-chevron-right"){
-	$('#main-sidebar .viewport').css("height", viewportheight-$orbitBar);
+				$('#collapse-menu > i').removeClass('icon-chevron-right');
-	$('#post-body').css("width", viewportwidth-$mainWrapMarginLeft-$subWiget);
+				$('#collapse-menu > i').addClass('icon-chevron-left');
-	$('.post-title').css("width", viewportwidth-$mainWrapMarginLeft-$subWiget-16);
+			} else if($('#collapse-menu > i').attr("class")=="icon-chevron-left"){
-	$('#main-wrap .subnav').css("width", viewportwidth-$mainWrapMarginLeft);
+				$('#collapse-menu > i').removeClass('icon-chevron-left');
-	$('.form-fixed').css("width", viewportwidth-$mainWrapMarginLeft-$formActionPadding);
+				$('#collapse-menu > i').addClass('icon-chevron-right');
-	$('#main-sidebar').tinyscrollbar({size:(viewportheight-$orbitBar-4)});
+			}
-	$('.detal-list').tinyscrollbar();
+			resize();
-	mainTablePosition();
+			mainResize();
-
+			mainTablePosition();
-	/*isotope*/
+			itemPosition()
-  var $container = $('#isotope');
+		}
-  $container.isotope({
+	})
-      itemSelector : '.item',
+
-      layoutMode : 'masonry',
+	$('.with_action').on({
-  });
+		mouseleave: function(){
-	
+			$('.quick-edit').find('.dropdown').removeClass("open");
-	
+		}
-});
+	})
-$(window).resize(function(){
+
-	resize();
+	$(window).resize(function(){
-	var $mainWrapMarginLeft = parseInt($('#main-wrap').css("margin-left"))-2,
+		resize();
-		$subWiget = $('#sub-wiget').width()+18;
+		mainResize();
-		$orbitBar = $('#orbit-bar').height(),
+		mainTablePosition();
-		$mainSidebar = $('#main-sidebar').width()+5,
+		itemPosition()
-		$formActionPadding = parseInt($('.form-fixed').css("padding-left"))+parseInt($('.form-fixed').css("padding-right"));
+	});
-	$('#main-sidebar').css("height", viewportheight-$orbitBar);
+	
-	$('#main-sidebar .viewport').css("height", viewportheight-$orbitBar);
+});
-	$('#post-body').css("width", viewportwidth-$mainWrapMarginLeft-$subWiget);
+/*main-table position*/
-	$('.post-title').css("width", viewportwidth-$mainWrapMarginLeft-$subWiget-16);
+function mainTablePosition() {
-	$('#main-wrap .subnav').css("width", viewportwidth-$mainWrapMarginLeft);
+	var $height = $('#main-wrap .subnav').length && $('#main-wrap .subnav').height();
-	$('.form-fixed').css("width", viewportwidth-$mainWrapMarginLeft-$formActionPadding);
+	var $table = $('.main-list').length && $('.main-list:last');
-	$('#main-sidebar').tinyscrollbar({size:(viewportheight-$orbitBar-4)});
+	if($table && $table==0){
-	mainTablePosition();
+		// $table.css({marginTop:$height});
-});
+		$table.stop().animate({marginTop:$height}, 500)
-/*main-table position*/
+	}
-function mainTablePosition() {
+	else if($table){
-	var $height = $('#main-wrap .subnav').length && $('#main-wrap .subnav').height();
+		if($height>0){
-	var $table = $('.main-list').length && $('.main-list:last');
+			$height = $height-18;
-	if($table && $table==0){
+		}
-		$table.css({marginTop:$height});
+		$table.stop().animate({marginTop:$height}, 500, function(){
-	}
+		    resize();
-	else if($table){
+		    mainResize();
-		if($height>0){
+		});
-			$height = $height-17;
+	}
-		}
+	else if($('#main-wrap .subnav')){
-		$table.stop().animate({marginTop:$height},500);
+		var $object = $('#main-wrap .subnav').next();
-	}
+		// $object.css({marginTop:$height});
-	else if($('#main-wrap .subnav')){
+		$object.stop().animate({marginTop:$height}, 500)
-		var $object = $('#main-wrap .subnav').next();
+	};
-		$object.css({marginTop:$height});
+};
-	};
+
-};
+function moduleNav() {
-$(window).scroll(function () {
+	var $moduleNav = $('#module-nav'),
-	//var $mainWrapMarginLeft = parseInt($('#main-wrap').css("margin-left"))-1;
+		$userDataW = $('.user-data').width();
-	//var $subnavWidth = parseInt($('#main-wrap > .subnav').css("width"));
+	$moduleNav.css("width", $userDataW);
-	var $winLeft = $(window).scrollLeft()
+}
-	$(".table-label").css({left:$winLeft*-1} );
+function itemPosition() {
-	//$(".table-label").css({left:$mainWrapMarginLeft+($winLeft*-1)} );
+	moduleNav();
-	//$("#main-wrap > .subnav").css({width:$subnavWidth+($winLeft)} );
+	if($('#isotope').length>0 && $('.user-info').length>0){
-});
+		if(viewportwidth<=1200){
+			if($('body').attr("class")=="folded"){
+				$('#isotope').find('.detail').css("width", 550);
+		        $('#isotope').masonry({
+		            itemSelector: '.item',
+		            isAnimated: true
+		        });
+			}else{
+				$('#isotope').find('.detail').css("width", 435);
+		        $('#isotope').masonry({
+		            itemSelector: '.item',
+		            isAnimated: true
+		        });
+			}
+		}else if(viewportwidth>=1201 && viewportwidth<=1280){
+			if($('body').attr("class")=="folded"){
+				$('#isotope').find('.detail').css("width", 385);
+		        $('#isotope').masonry({
+		            itemSelector: '.item',
+		            isAnimated: true
+		        });
+			}else{
+				$('#isotope').find('.detail').css("width", 325);
+		        $('#isotope').masonry({
+		            itemSelector: '.item',
+		            isAnimated: true
+		        });
+			}
+		}else if(viewportwidth>=1281 && viewportwidth<=1440){
+			if($('body').attr("class")=="folded"){
+				$('#isotope').find('.detail').css("width", 470);
+		        $('#isotope').masonry({
+		            itemSelector: '.item',
+		            isAnimated: true
+		        });
+			}else{
+				$('#isotope').find('.detail').css("width", 410);
+		        $('#isotope').masonry({
+		            itemSelector: '.item',
+		            isAnimated: true
+		        });
+			}
+		}else if(viewportwidth>=1441){
+			if($('#isotope').length>0){
+				$('#isotope').find('.detail').css("width", 500);
+		        $('#isotope').masonry({
+		            itemSelector: '.item',
+		            isAnimated: true
+		        });
+			}
+		}
+	}else if($('#isotope').length>0){
+	    $('#isotope').masonry({
+	        itemSelector: '.item',
+	        isAnimated: true
+	    });
+	}
+}
+
+function mainResize() {
+	var $mainWrapMarginLeft = parseInt($('#main-wrap').css("margin-left"))-2,
+		$subWiget = $('#sub-wiget').width()+18;
+		$orbitBar = $('#orbit-bar').height(),
+		$brand = $('#brand').height(),
+		$collapseMenu = $('#collapse-menu').height()+$('#position').height()+1,
+		$mainSidebar = $('#main-sidebar').width()+5,
+		$formActionPadding = parseInt($('.form-fixed').css("padding-left"))+parseInt($('.form-fixed').css("padding-right")),
+		$scrollContent = $('#main-sidebar .nav-list').height();
+	$('#main-sidebar').css("height", viewportheight-$orbitBar);
+	$('#main-sidebar .viewport').css("height", viewportheight-$orbitBar-$collapseMenu);
+	$('.user-roles .viewport').css("height", viewportheight-$orbitBar-$brand-30);
+	$('#main-sidebar .viewport').css("top", $collapseMenu);
+	$('#main-sidebar .scrollbar').css("top", $collapseMenu);
+	$('#post-body').css("width", viewportwidth-$mainWrapMarginLeft-$subWiget);
+	$('.post-title').css("width", viewportwidth-$mainWrapMarginLeft-$subWiget-20);
+	$('#main-wrap .subnav').css("width", viewportwidth-$mainWrapMarginLeft);
+	$('#main-wrap .table-label').css("width", viewportwidth-$mainWrapMarginLeft);
+	$('.form-fixed').css("width", viewportwidth-$mainWrapMarginLeft-$formActionPadding);
+	$('.user-info').css("height", viewportheight-$orbitBar-30);
+	$('#main-sidebar').tinyscrollbar();
+	$('.detal-list').tinyscrollbar();
+	$('.user-roles').tinyscrollbar();
+	if((viewportheight-$orbitBar-$collapseMenu)>=$scrollContent){
+		$('#main-sidebar .overview').css("top", '0px');
+	}
+};
+$(window).scroll(function () {
+	//var $mainWrapMarginLeft = parseInt($('#main-wrap').css("margin-left"))-1;
+	//var $subnavWidth = parseInt($('#main-wrap > .subnav').css("width"));
+	var $winLeft = $(window).scrollLeft()
+	$(".table-label").css({left:$winLeft*-1} );
+	//$(".table-label").css({left:$mainWrapMarginLeft+($winLeft*-1)} );
+	//$("#main-wrap > .subnav").css({width:$subnavWidth+($winLeft)} );
+});

app/assets/javascripts/orbit-1.0.js.backup20120913

@@ -0,0 +1,115 @@
+var viewportwidth,
+	viewportheight;
+function resize() {
+	viewportheight=$(window).height();
+	viewportwidth=$(window).width();
+	if(window.navigator.userAgent.indexOf("MSIE")>0){
+		windH=document.clientHeight;
+		windW=document.clientWidht;
+	}
+}
+$(document).ready(function(){
+	
+	$('.tip').tooltip({
+		placement: "left"
+	});
+	
+	
+	$(document).on('click', '.privacy', function() {
+
+		switch ($(this).val()) {
+			case 'true':
+			$(this).parents('.controls').children('.select-role').slideUp(300);
+			break;
+			case 'false':
+			$(this).parents('.controls').children('.select-role').slideDown(300);
+			break;
+		}
+	});
+	
+	var $role = $('.select-role');
+	var method =$('.privacy:eq(1)').attr('checked');
+	if(method == 'checked'){
+		$role.slideDown(0);
+	}
+	$('.privacy').each(function($i) {
+		$(this).click(function() {
+			switch ($i) {
+				case 0:
+				$role.slideUp(300);
+				break;
+				case 1:
+				$role.slideDown(300);
+				break;
+			}
+		});
+	});
+
+	/*tinyscrollbar&windows-Size*/
+	resize();
+	var $mainWrapMarginLeft = parseInt($('#main-wrap').css("margin-left"))-2,
+		$subWiget = $('#sub-wiget').width()+18;
+		$orbitBar = $('#orbit-bar').height(),
+		$mainSidebar = $('#main-sidebar').width()+5,
+		$formActionPadding = parseInt($('.form-fixed').css("padding-left"))+parseInt($('.form-fixed').css("padding-right"));
+	$('#main-sidebar').css("height", viewportheight-$orbitBar);
+	$('#main-sidebar .viewport').css("height", viewportheight-$orbitBar);
+	$('#post-body').css("width", viewportwidth-$mainWrapMarginLeft-$subWiget);
+	$('.post-title').css("width", viewportwidth-$mainWrapMarginLeft-$subWiget-16);
+	$('#main-wrap .subnav').css("width", viewportwidth-$mainWrapMarginLeft);
+	$('.form-fixed').css("width", viewportwidth-$mainWrapMarginLeft-$formActionPadding);
+	$('#main-sidebar').tinyscrollbar({size:(viewportheight-$orbitBar-4)});
+	$('.detal-list').tinyscrollbar();
+	mainTablePosition();
+
+	/*isotope*/
+  var $container = $('#isotope');
+  $container.isotope({
+      itemSelector : '.item',
+      layoutMode : 'masonry',
+  });
+	
+	
+});
+$(window).resize(function(){
+	resize();
+	var $mainWrapMarginLeft = parseInt($('#main-wrap').css("margin-left"))-2,
+		$subWiget = $('#sub-wiget').width()+18;
+		$orbitBar = $('#orbit-bar').height(),
+		$mainSidebar = $('#main-sidebar').width()+5,
+		$formActionPadding = parseInt($('.form-fixed').css("padding-left"))+parseInt($('.form-fixed').css("padding-right"));
+	$('#main-sidebar').css("height", viewportheight-$orbitBar);
+	$('#main-sidebar .viewport').css("height", viewportheight-$orbitBar);
+	$('#post-body').css("width", viewportwidth-$mainWrapMarginLeft-$subWiget);
+	$('.post-title').css("width", viewportwidth-$mainWrapMarginLeft-$subWiget-16);
+	$('#main-wrap .subnav').css("width", viewportwidth-$mainWrapMarginLeft);
+	$('.form-fixed').css("width", viewportwidth-$mainWrapMarginLeft-$formActionPadding);
+	$('#main-sidebar').tinyscrollbar({size:(viewportheight-$orbitBar-4)});
+	mainTablePosition();
+});
+/*main-table position*/
+function mainTablePosition() {
+	var $height = $('#main-wrap .subnav').length && $('#main-wrap .subnav').height();
+	var $table = $('.main-list').length && $('.main-list:last');
+	if($table && $table==0){
+		$table.css({marginTop:$height});
+	}
+	else if($table){
+		if($height>0){
+			$height = $height-17;
+		}
+		$table.stop().animate({marginTop:$height},500);
+	}
+	else if($('#main-wrap .subnav')){
+		var $object = $('#main-wrap .subnav').next();
+		$object.css({marginTop:$height});
+	};
+};
+$(window).scroll(function () {
+	//var $mainWrapMarginLeft = parseInt($('#main-wrap').css("margin-left"))-1;
+	//var $subnavWidth = parseInt($('#main-wrap > .subnav').css("width"));
+	var $winLeft = $(window).scrollLeft()
+	$(".table-label").css({left:$winLeft*-1} );
+	//$(".table-label").css({left:$mainWrapMarginLeft+($winLeft*-1)} );
+	//$("#main-wrap > .subnav").css({width:$subnavWidth+($winLeft)} );
+});

app/assets/javascripts/orbit-bar-search.js

@@ -1,23 +1,25 @@
-
-$(document).ready(function(){
-	$('.search').tooltip({
-			placement: "bottom"
-	});
-});
 $(document).on('click', '.orbit-bar-search', function (){
 	if ($(this).parents('.search').hasClass('visible')){
 		$(this).parents('.search').stop().animate({
 			'width':'28px',
-		});
+		},500);
+		$('.navbar-search').stop().animate({
+			'left':'30px',
+			'opacity':'0',
+		},200);
 		$(this).parents('.search').css({
 			'background-color': 'transparent',
 		});	
-		$(this).parents('.search').removeClass('visible');	
+		$(this).parents('.search').removeClass('visible');
 	}
 	else{
 		$(this).parents('.search').stop().animate({
 			'width':'265px',
-		});
+		},200);
+		$('.navbar-search').stop().animate({
+			'left':'7px',
+			'opacity':'1'
+		},500);
 		$(this).parents('.search').css({
 			'background-color': 'rgba(0, 0, 0, 0.5)',
 		});

app/assets/stylesheets/bootstrap-orbit.css

@@ -44,24 +44,14 @@ h1, h2, h3, h4, h5, h6 {
 .subnav {
 	width: 100%;
 	height: 36px;
-	background-color: #eeeeee; /* Old browsers */
+	/*border-top: 1px solid #e5e5e5;*/
-	background-repeat: repeat-x; /* Repeat the gradient */
+	background-color: #ffffff;
-	background-image: -moz-linear-gradient(top, #f5f5f5 0%, #eeeeee 100%); /* FF3.6+ */
-	background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #f5f5f5), color-stop(100%, #eeeeee)); /* Chrome,Safari4+ */
-	background-image: -webkit-linear-gradient(top, #f5f5f5 0%, #eeeeee 100%); /* Chrome 10+,Safari 5.1+ */
-	background-image: -ms-linear-gradient(top, #f5f5f5 0%, #eeeeee 100%); /* IE10+ */
-	background-image: -o-linear-gradient(top, #f5f5f5 0%, #eeeeee 100%); /* Opera 11.10+ */
- filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f5f5f5', endColorstr='#eeeeee', GradientType=0 ); /* IE6-9 */
-	background-image: linear-gradient(top, #f5f5f5 0%, #eeeeee 100%); /* W3C */
-	border: 1px solid #e5e5e5;
-	-webkit-border-radius: 4px;
-	-moz-border-radius: 4px;
-	border-radius: 4px;
 }
-.subnav .nav {
+.subnav .filter {
 	margin-bottom: 0;
+	border-bottom: 1px solid #e5e5e5;
 }
-.subnav .nav > li > a {
+.subnav .filter > li > a {
 	margin: 0;
 	padding-top:    11px;
 	padding-bottom: 11px;
@@ -71,7 +61,7 @@ h1, h2, h3, h4, h5, h6 {
 	-moz-border-radius: 0;
 	border-radius: 0;
 }
-.subnav .nav > .active > a, .subnav .nav > .active > a:hover {
+.subnav .filter > .active > a, .subnav .filter > .active > a:hover {
 	padding-left: 13px;
 	color: #777;
 	background-color: #e9e9e9;
@@ -81,17 +71,17 @@ h1, h2, h3, h4, h5, h6 {
 	-moz-box-shadow: inset 0 3px 5px rgba(0,0,0,.05);
 	box-shadow: inset 0 3px 5px rgba(0,0,0,.05);
 }
-.subnav .nav > .active > a .caret, .subnav .nav > .active > a:hover .caret {
+.subnav .filter > .active > a .caret, .subnav .filter > .active > a:hover .caret {
 	border-top-color: #777;
 }
-.subnav .nav > li:first-child > a, .subnav .nav > li:first-child > a:hover {
+.subnav .filter > li:first-child > a, .subnav .filter > li:first-child > a:hover {
 	border-left: 0;
 	padding-left: 12px;
 	-webkit-border-radius: 4px 0 0 4px;
 	-moz-border-radius: 4px 0 0 4px;
 	border-radius: 4px 0 0 4px;
 }
-.subnav .nav > li:last-child > a {
+.subnav .filter > li:last-child > a {
 	border-right: 0;
 }
 .subnav .dropdown-menu {

app/assets/stylesheets/font-awesome.css.erb

@@ -23,8 +23,8 @@
     */
 @font-face {
   font-family: "FontAwesome";
-  src: url(<%= asset_path "desktop/fontawesome-webfont.eot" %>);
+  src: url(<%= asset_path 'fontawesome-webfont.eot' %>);
-  src: url(<%= asset_path "desktop/fontawesome-webfont.eot?#iefix" %>) format('eot'), url(<%= asset_path "desktop/fontawesome-webfont.woff" %>) format('woff'), url(<%= asset_path "desktop/fontawesome-webfont.ttf" %>) format('truetype'), url(<%= asset_path "desktop/fontawesome-webfont.svg#FontAwesome" %>) format('svg');
+  src: url(<%= asset_path 'fontawesome-webfont.eot?#iefix' %>) format('eot'), url(<%= asset_path 'fontawesome-webfont.woff' %>) format('woff'), url(<%= asset_path 'fontawesome-webfont.ttf' %>) format('truetype'), url(<%= asset_path 'fontawesome-webfont.svg#FontAwesome' %>) format('svg');
   font-weight: normal;
   font-style: normal;
 }
@@ -38,12 +38,6 @@
   display: inline-block;
   text-decoration: inherit;
 }
-[class^="icon-"], [class*=" icon-"] {
-  background: none;
-  width: auto;
-  height: auto;
-  vertical-align: baseline;
-}
 a [class^="icon-"], a [class*=" icon-"] {
   display: inline-block;
   text-decoration: inherit;

app/assets/stylesheets/isotope.css

@@ -1,11 +1,15 @@
-/*isotope*/
-
 #isotope {
   margin-top: 2px;
 }
 .isotope-item {
   z-index: 2;
 }
+
+.isotope-hidden.isotope-item {
+  pointer-events: none;
+  z-index: 1;
+}
+
 /**** Isotope CSS3 transitions ****/
 
 .isotope,
@@ -39,104 +43,4 @@
      -moz-transition-duration: 0s;
        -o-transition-duration: 0s;
           transition-duration: 0s;
-}
-.w-a {
-    width: 398px;
-}
-.w-b {
-    width: 812px;
-}
-.h-a {
-  height: 315px;
-}
-.h-b {
-  height: 703px;
-}
-.item {
-  margin: 5px 0 15px 15px;
-}
-.item h3 {
-  margin: 20px 0 5px;
-}
-.item h3 [class^="icons-"] {
-  margin: 1px 5px 0 3px;
-}
-.item .detail {
-  border: 1px solid rgba(0, 0, 0, 0.1);
-  background-color: #FFFFFF;
-  border-radius: 5px;
-  -webkit-border-radius: 5px;
-  -moz-border-radius: 5px;
-  box-shadow: 0 3px 3px rgba(0, 0, 0, 0.1);
-  -webkit-box-shadow: 0 3px 3px rgba(0, 0, 0, 0.1);
-}
-.item .detail .totle {
-  font-size: 50px;
-  padding:10px 5px 30px 0;
-  margin: 0;
-  text-align: right;
-  border-bottom:1px solid #d9d9d9;
-}
-.item .detail .totle span {
-  display: block;
-  font-size:18px;
-  color: #333;
-  padding-left: 5px;
-  text-align:left;
-  margin-bottom: -7px;
-}
-.item .detail .table {
-  margin-bottom: 0;
-}
-.item .detail .table th, .item .detail .table td {
-  border-top: none;
-  border-bottom: 1px solid #DDDDDD;
-}
-.item .detail .table tr th {
-  background-color: #F2F2F2;
-  border-bottom: 1px solid #AAAAAA;
-}
-.item .detail .table tr td:first-child {
-  color: #666;;
-}
-.item .detail .table tr td:last-child, .item .detail .table tr th:last-child {
-  text-align:right;
-  padding-right: 15px;
-}
-.item .h-a .my_scroll .viewport {
-  height: 210px;
-}
-.item .h-b .my_scroll .viewport {
-  height: 594px;
-}
-.item .isotope-hidden.isotope-item {
-  pointer-events: none;
-  z-index: 1;
-}
-.item .my_scroll {
-  position: relative;
-}
-.item .my_scroll .scrollbar {
-  right: 3px;
-  top: 0;
-  position: absolute;
-  z-index: 10;
-}
-.item .my_scroll .track {
-  background-color: transparent;
-}
-.detail.noStatistics {
-  overflow: hidden;
-}
-.detail.noStatistics.h-a {
-  height: 315px;
-}
-.detail.noStatistics.h-a .my_scroll .viewport {
-  height: 280px;
-}
-.detail.noStatistics.h-b {
-  height: 704px;
-}
-.detail.noStatistics.h-b .my_scroll .viewport {
-  height: 670px;
 }

app/assets/stylesheets/item.css

@@ -0,0 +1,79 @@
+.w-a {
+    width: 388px;
+}
+.w-b {
+    width: 802px;
+}
+.h-a {
+  height: 315px;
+}
+.h-b {
+  height: 699px;
+}
+.item {
+  margin: 5px 0 15px 15px;
+}
+.item h3 {
+  margin: 5px 0;
+}
+.item h3 [class^="icons-"] {
+  margin: 3px 5px 0 3px;
+}
+.item .detail {
+  border: 1px solid rgba(0, 0, 0, 0.1);
+  background-color: #FFFFFF;
+  border-radius: 5px;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  box-shadow: 0 3px 3px rgba(0, 0, 0, 0.1);
+  -webkit-box-shadow: 0 3px 3px rgba(0, 0, 0, 0.1);
+  -moz-box-shadow: 0 3px 3px rgba(0, 0, 0, 0.1);
+}
+.item .detail .totle {
+  font-size: 50px;
+  padding:10px 5px 20px 0;
+  margin: 0px;
+  text-align: right;
+  border-bottom:1px solid #d9d9d9;
+  line-height: 18px;
+}
+.item .detail .totle span {
+  display: block;
+  font-size:18px;
+  color: #333;
+  padding-left: 5px;
+  text-align:left;
+}
+.item .detail .table {
+  margin-bottom: 0;
+}
+.item .detail .table tr th {
+  background-color: #F2F2F2;
+  border-bottom: 1px solid #AAA;
+}
+.item .detail .table th, .item .detail .table td {
+  border-top: none;
+  border-bottom: 1px solid #DDDDDD;
+}
+.item .detail .table tr td:first-child {
+  color: #666;;
+}
+.item .detail .table tr td:last-child, .item .detail .table tr th:last-child {
+  text-align:right;
+}
+.item .h-a .my_scroll .viewport {
+  height: 248px;
+}
+.item .h-b .my_scroll .viewport {
+  height: 632px;
+}
+.item .my_scroll .track {
+  opacity: 0.7;
+  -moz-opacity: 0.7;
+  filter:alpha(opacity=7);
+}
+
+/*user-data*/
+.user-data .item {
+  margin: 5px 8px 15px;
+}

app/assets/stylesheets/list.css

@@ -1,7 +1,13 @@
 /*list*/
 
-.table th.select {
+.table th.select>span {
 	border-bottom:2px solid #0088CC;
+	display: block;
+	margin: 0 -8px;
+	padding: 0 8px;
+}
+#check_all {
+	margin-top: -20px;
 }
 .main-list {
 	margin-bottom: 0;
@@ -11,7 +17,7 @@
 	border-right: medium none;
 }
 .main-list thead th:last-child {
-	border-right: none; 
+	border-right: none !important; 
 }
 .main-list .span1 {
 	min-width: 32px;
@@ -33,14 +39,21 @@
 	width: 350px;
 	left: -8px;
 }
+.main-list tbody .quick-edit .nav .dropdown-menu {
+	margin: 0;
+}
 .main-list tr:first-child td {
 	border-top: 1px solid #DDDDDD;
 }
 .main-list td {
 	background-color: #FFFFFF;
 	border-bottom: 1px solid #DDDDDD;
+	border-right: 1px solid #FFFFFF;
 	border-top: medium none;
 }
+.main-list td:last-child {
+	border-right: none;
+}
 .main-list .nav {
     margin-top: 0;
     margin-bottom: 3px;
@@ -51,10 +64,14 @@
 }
 .main-list tr.with_action:hover>td {
 	color: #333333;
+	border-right: 1px solid #E6E6E6;
 	background-color: #E6E6E6;
 	-webkit-transition: all 0.2s linear;
 	-moz-transition: all 0.2s linear;
 }
+.main-list tr.with_action:hover>td:last-child {
+	border-right: none;
+}
 .main-list tr.with_action:hover .hide {
 	display:block !important;
 }
@@ -95,11 +112,11 @@
 .table-label {
     background-color: #F2F2F2;
     position: relative;
+	border-bottom: 1px solid #e5e5e5;
 }
 .table-label .main-list thead th {
-    background-color: #F2F2F2;
+    background-color: #FFFFFF;
-    border-right: 1px solid #DDDDDD;
+    border-right: 1px solid #e5e5e5;
-    border-top: 1px solid #DDDDDD !important;
 	line-height: 20px;
 }
 .route-group .route {
@@ -150,7 +167,7 @@ legend {
 	top: 30px;
 	z-index: 50;
 }
-.subnav .nav > li:first-child > a, .subnav .nav > li:first-child > a:hover {
+.subnav .filter > li:first-child > a, .subnav .filter > li:first-child > a:hover {
 	-moz-border-radius: 0;
 	-webkit-border-radius: 0;
     border-radius: 0;
@@ -204,10 +221,11 @@ legend {
 	margin: 0;
 	padding: 10px;
 	bottom: 0;
-	z-index: 2;
+	z-index: 10;
 }
 .form-fixed .btn {
 	margin-top: 4px;
+	margin-left: 5px;
 }
 .paginationFixed {
 }
@@ -219,4 +237,4 @@ legend {
 }
 .member-list td:last-child .gender {
 	border-radius: 0;
-}
+}

app/assets/stylesheets/list.css.backup120913

@@ -0,0 +1,237 @@
+/*list*/
+
+.table th.select>span {
+	border-bottom:2px solid #0088CC;
+	display: block;
+	margin: 0 -8px -8px;
+	padding: 0 8px 6px;
+}
+.main-list {
+	margin-bottom: 0;
+}
+.main-wrap>.main-list thead th {
+	background-color: transparent;
+	border-right: medium none;
+}
+.main-list thead th:last-child {
+	border-right: none !important; 
+}
+.main-list .span1 {
+	min-width: 32px;
+}
+.main-list .span7 {
+    min-width: 300px;
+}
+.main-list .nav-pills > li > a {
+	border-radius: 5px 5px 5px 5px;
+	margin: 2px;
+	padding:5px;
+}
+.main-list tbody .quick-edit {
+	position:relative;
+	height:20px;
+}
+.main-list tbody .quick-edit .nav {
+	position: absolute;
+	width: 350px;
+	left: -8px;
+}
+.main-list tbody .quick-edit .nav .dropdown-menu {
+	margin: 0;
+}
+.main-list tr:first-child td {
+	border-top: 1px solid #DDDDDD;
+}
+.main-list td {
+	background-color: #FFFFFF;
+	border-bottom: 1px solid #DDDDDD;
+	border-right: 1px solid #FFFFFF;
+	border-top: medium none;
+}
+.main-list td:last-child {
+	border-right: none;
+}
+.main-list .nav {
+    margin-top: 0;
+    margin-bottom: 3px;
+}
+.main-list tr.with_action>td {
+	-webkit-transition: all 0.1s linear;
+	-moz-transition: all 0.1s linear;
+}
+.main-list tr.with_action:hover>td {
+	color: #333333;
+	border-right: 1px solid #E6E6E6;
+	background-color: #E6E6E6;
+	-webkit-transition: all 0.2s linear;
+	-moz-transition: all 0.2s linear;
+}
+.main-list tr.with_action:hover>td:last-child {
+	border-right: none;
+}
+.main-list tr.with_action:hover .hide {
+	display:block !important;
+}
+.main-list .label-group {
+	position: relative;
+	height: 40px;
+}
+.main-list .label-group .label {
+	margin-bottom: 1px;
+	display: inline-block;
+	padding: 0 3px;
+}
+.main-list .label-td {
+    height: 40px;
+    overflow: hidden;
+    position: absolute;
+    width: 100%;
+	left: 0;
+	z-index: 1;	
+}
+.main-list .label-td:hover {
+    background-color: #fff;
+	height: auto;
+    padding: 7px;
+	left: -55px;
+	top: -8px;
+	border: 1px solid #333;
+	border-radius: 3px;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	z-index: 5;
+	width: 160px;
+	min-height: 40px;
+}
+.qe-edit-div .table-condensed {
+	background-color: #F2F2F2;
+}
+.table-label {
+    background-color: #F2F2F2;
+    position: relative;
+	border-bottom: 1px solid #e5e5e5;
+}
+.table-label .main-list thead th {
+    background-color: #FFFFFF;
+    border-right: 1px solid #e5e5e5;
+	line-height: 20px;
+}
+.route-group .route {
+	padding: 0;
+}
+.route-group .route .breadcrumb {
+	border-width: 0!important;
+}
+.qe-block td {
+	height:auto;
+	padding: 0;
+	/*background-color: #dedede;*/
+}
+.qe-block legend {
+	padding-left: 8px;
+	margin-bottom: 0;
+	padding-bottom: 0;
+}
+.qe-block .control-group {
+	margin-bottom: 0;
+}
+.qe-block .controls, .qe-block .control-label {
+	margin-top: 10px;
+	margin-bottom: 10px;
+}
+.qe-block .table td, .qe-block .table th {
+	padding: 8px;
+}
+.qe-block .form-horizontal {
+	margin-bottom: 0;
+}
+.qe-block .form-actions {
+	margin-bottom: 0;
+}
+legend {
+  font-size: 15px;
+  line-height: 30px;
+  margin-bottom: 15px;
+  padding-bottom: 5px;
+}
+.subnav {
+	-moz-border-radius: 0;
+	-webkit-border-radius: 0;
+    border-radius: 0;
+	border-left: none;
+	border-right: none;
+	position: fixed;
+	top: 30px;
+	z-index: 50;
+}
+.subnav .filter > li:first-child > a, .subnav .filter > li:first-child > a:hover {
+	-moz-border-radius: 0;
+	-webkit-border-radius: 0;
+    border-radius: 0;
+}
+.dropdown-menu.tags {
+	max-width: none;
+}
+.dropdown-menu.tags .tags-cloud {
+	width: 300px;
+	padding:10px;
+}
+.dropdown-menu.tags .tags-cloud .active {
+	background-color: #0088CC;
+	color: #FFFFFF;
+}
+.dropdown-menu.tags .tags-cloud a {
+    display: inline-block;
+	margin-bottom: 3px;
+}
+.dropdown-menu.tags li:last-child  a {
+    display: block;
+	text-align:center;
+}
+.sort-header th {
+	padding: 0 8px;
+	vertical-align: inherit;
+	position: relative;
+}
+.sort-header th a {
+	display: block;
+	padding: 10px 0;
+	white-space: nowrap;
+}
+.sort-header th a:hover {
+	text-decoration: none;
+}
+.list-remove {
+	position: absolute;
+	top: 0;
+	padding-top: 11px !important;
+	left: 25px;
+	font-size: 19px;
+	color: #333;
+}
+.list-remove:hover {
+	color: #333;
+	text-decoration: none;
+}
+.form-fixed {
+	position: fixed;
+	margin: 0;
+	padding: 10px;
+	bottom: 0;
+	z-index: 10;
+}
+.form-fixed .btn {
+	margin-top: 4px;
+	margin-left: 5px;
+}
+.paginationFixed {
+}
+.paginationFixed .pagination {
+	margin-top: 0 !important;
+}
+.member-list td:last-child {
+	position: relative;
+}
+.member-list td:last-child .gender {
+	border-radius: 0;
+}

app/assets/stylesheets/member.css

@@ -0,0 +1,275 @@
+.gender {
+	position: absolute;
+	border-radius: 0 0 5px 0;
+	border-width: .5em;
+	margin: 0;
+	border-style: solid;
+	z-index: 10;
+	bottom: 0;
+	right: 0;
+}
+.gender.male {
+	border-color: transparent #41B1D5 #41B1D5 transparent;
+}
+.gender.female {
+	border-color: transparent #DB186E #DB186E transparent;
+}
+.user-info {
+	background-color: #FFFFFF;
+	padding: 30px 10px 0 20px;
+	top: 31px;
+	position: relative;
+	border-right: 1px solid #b8b8b8;
+	width: 330px;
+	position: fixed;
+	z-index: 1;
+	-webkit-box-shadow: 5px 0px 10px rgba(0,0,0,.15);
+	   -moz-box-shadow: 5px 0px 10px rgba(0,0,0,.15);
+	        box-shadow: 5px 0px 10px rgba(0,0,0,.15);
+}
+.user-info .gender {
+	border-color: #41B1D5 transparent transparent #41B1D5;
+	border-radius: 5px 0 0 0;
+	bottom: auto;
+	right: auto;
+}
+.user-info .brand {
+}
+.user-info .scrollbar {
+	right: -9px;
+}
+.user-info .brand .user-avatar {
+	margin-bottom: 10px;
+	margin-right: 10px;
+}
+.user-roles {
+	clear: both;
+}
+.user-roles .roles .table tr:first-child td {
+	border-top: none;
+}
+.user-roles .roles .table td:first-child {
+	text-align: right;
+}
+.user-roles .label-line {
+	position: relative;
+	text-align: center;
+}
+.user-roles .label-line hr {
+	position: absolute;
+	top: 50%;
+	width: 100%;
+	height: 4px;
+	border: none;
+	margin: -2px 0 0;
+}
+.user-roles .label-line span {
+	color: #343434;
+	font-size: 1.2em;
+	padding: 0 5px;
+	background-color: #FFF;
+	display: inline-block;
+	position: relative;
+}
+.user-roles .basic .label-line hr {
+	background-color: #e0e0e0;
+}
+.user-roles .teacher .label-line hr {
+	background-color: #186AB6;
+}
+.user-roles .student .label-line hr {
+	background-color: #F38C08;
+}
+.user-roles .staff .label-line hr {
+	background-color: #139E2F;
+}
+.user-avatar {
+	overflow: hidden;
+	width: 80px;
+	height: 80px;
+	border-radius: 5px;
+	box-shadow: 0 1px 3px rgba(0,0,0,.8);
+	margin-right: 10px;
+	margin-bottom: 10px;
+}
+.user-avatar .reflective {
+	background-image: url(img/reflective.png);
+	background-repeat: no-repeat;
+	background-position: 0;
+	height: 80px;
+	width: 80px;
+	position: absolute;
+}
+.user .user-avatar .reflective {
+	background-image: url(img/reflective.png);
+	background-repeat: no-repeat;
+	background-position: 0 -20px;
+	height: 80px;
+	width: 80px;
+	position: absolute;
+	top: 10px;
+	left: 10px;
+	opacity: 0;
+	-moz-opacity: 0;
+	filter:alpha(opacity=0);
+}
+.user:hover .user-avatar .reflective {
+	background-position: 0 0;
+	opacity: 1;
+	-moz-opacity: 1;
+	filter:alpha(opacity=10);
+}
+.user-name {
+	font-size: 1.5em;
+	color: #2d2d2d;
+	margin: 0 0 3px;
+	font-family: Helvetica, "微軟正黑體";
+}
+.user-mail {
+	font-size: 1em;
+	color: #A2A2A2;
+	margin: 0 0 3px;
+}
+.user-data {
+	padding: 70px 20px 0;
+	margin: 20px 0 0 360px;
+}
+.user-data #module-nav {
+	margin-left: -20px;
+	position: fixed;
+	z-index: 1;
+	background-color: #FFFFFF;
+	top: 31px;
+	padding: 10px 20px 0;
+	-webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, .16);
+	   -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, .16);
+	        box-shadow: 0px 5px 10px rgba(0, 0, 0, .16);
+}
+.user-data #module-nav ul {
+	margin-bottom: 10px;
+}
+.member-abstract, .member-large {
+	padding: 15px;
+}
+.member-abstract ul, .member-large ul {
+	margin: 0;
+	padding: 0;
+	list-style: none;
+}
+.member-abstract>ul>li, .member-large>ul>li {
+	margin: 5px;
+	overflow: hidden;
+	border-radius: 5px;
+	box-shadow: 0 1px 3px rgba(0,0,0,.3);
+}
+.member-abstract .user *, .member-large .user * {
+	-webkit-transition: all .3s ease;
+	   -moz-transition: all .3s ease;
+	     -o-transition: all .3s ease;
+	        transition: all .3s ease;
+}
+.member-abstract .user, .member-large .user {
+	background-color: #EDEDED;
+	padding: 10px;
+	position: relative;
+	border-radius: 0 0 5px 5px;
+	width: 360px;
+	-webkit-transition: all .3s ease;
+	   -moz-transition: all .3s ease;
+	     -o-transition: all .3s ease;
+	        transition: all .3s ease;
+}
+.member-abstract .user:hover, .member-large .user:hover {
+	background-color: #333333;
+}
+.member-abstract .user:hover .user-name, .member-large .user:hover .user-name {
+	color: #DDD;
+}
+.member-abstract .user .user-meta {
+	margin-left: 90px;
+}
+.member-abstract .user .user-title span {
+	color: #5e5e5e;
+	font-size: 1.3em;
+	padding-right: 10px;
+}
+.member-abstract .user:hover .user-title span {
+	color: #AAA;
+}
+.member-abstract .user ul.user-itemborder {
+	margin-top: 8px;
+	border-top: 1px solid #D5D5D5;
+	padding: 4px 0 0;
+}
+.member-abstract .user ul.user-itemborder li, .member-abstract .user ul.user-itemborder li span {
+	color: #333;
+}
+.member-abstract .user:hover ul.user-itemborder {
+	color: #EDEDED;
+	border-top: 1px solid #666;
+}
+.member-abstract .user:hover ul.user-itemborder li, .member-abstract .user:hover ul.user-itemborder li span {
+	color: #EDEDED;
+}
+.member-abstract .user ul.user-itemborder li {
+	width: 33%;
+	font-size: 1.1em;
+	text-align: center;
+}
+.member-abstract .user ul.user-itemborder li span {
+	font-size: 13px;
+	font-weight: bold;
+	padding-right: 5px;
+}
+.member-large .user {
+	width: 80px;
+	min-height: 125px;
+}
+.member-large .user-avatar {
+	margin-right: 0;
+}
+.member-large .user-name {
+	font-weight: bold;
+	font-size: 1.1em;
+	width: 80px;
+	line-height: 18px;
+	padding-top: 5px;
+	text-align: center;
+}
+.rolesTag {
+	width: 100%;
+}
+.rolesTag td {
+	height: 6px;
+	background-color: #333;
+}
+.rolesTag td.teacher {
+	background-color: #186AB6;
+}
+.rolesTag td.student {
+	background-color: #F38C08;
+}
+.rolesTag td.staff {
+	background-color: #139E2F;
+}
+
+.modal.alert-error {
+	color: #B94A48;
+	background-color: #F2DEDE;
+	border-color: #EED3D7;
+}
+.news_paragraph p {
+    line-height: 20px;
+}
+.nav-tabs>li>.edit, .nav-tabs>li>.edit:hover {
+	background-color: #333;
+	color: #FFF;
+	padding-right: 12px;
+}
+.nav-tabs li .icons-pencil {
+	float: right;
+	margin-top: 8px;
+}
+.nav-tabs li a {
+	padding-right: 32px;
+}

app/assets/stylesheets/new_admin.css.erb

@@ -7,6 +7,8 @@
  *= require message
  *= require bootstrap
  *= require style
+ *= require font-awesome
+ *= require orbit-bar
  *= require bootstrap-orbit
  *= require list
  *= require widgets

app/assets/stylesheets/orbit-bar.css.erb

@@ -0,0 +1,228 @@
+
+#orbit-bar {
+	margin-bottom: 0;
+	position:fixed;
+	width:100%;
+	z-index: 99;
+	top: 0;
+	left: 0;
+}
+#orbit-bar .navbar-inner {
+	min-height: 28px;
+	height: 28px;
+	border: none;
+	-moz-border-radius: 0px;
+	-webkit-border-radius: 0px;
+	border-radius: 0px;
+	padding-top: 2px;
+	padding-bottom: 1px;
+	-webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.8), inset 0 1px 0 rgba(127, 149, 165, 1), 0 -1px 0 rgba(31, 32, 36, 1) inset;
+	   -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.8), inset 0 1px 0 rgba(127, 149, 165, 1), 0 -1px 0 rgba(31, 32, 36, 1) inset;
+	        box-shadow: 0 1px 3px rgba(0, 0, 0, 0.8), inset 0 1px 0 rgba(127, 149, 165, 1), 0 -1px 0 rgba(31, 32, 36, 1) inset;
+	background-image: -moz-linear-gradient(top, #545b60, #191a1c);
+	background-image: -ms-linear-gradient(top, #545b60, #191a1c);
+	background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#545b60), to(#191a1c));
+	background-image: -webkit-linear-gradient(top, #545b60, #191a1c);
+	background-image: -o-linear-gradient(top, #545b60, #191a1c);
+	background-image: linear-gradient(top, #545b60, #191a1c);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#545b60', endColorstr='#191a1c', GradientType=0);
+}
+#orbit-bar .navbar-search {
+	left: 30px;
+	margin: 0;
+	position: absolute;
+	text-align: right;
+	top: -1px;
+	z-index: 0;
+	opacity: 0;
+	-moz-opacity: 0;
+	filter:alpha(opacity=0);
+}
+#orbit-bar .nav.pull-right {
+	margin-right: -20px;
+}
+#orbit-bar .search-query {
+	padding: 7px 9px 5px;
+	height: 12px;
+	margin-top: 3px;
+	border: none;
+	line-height: 14px;
+	border-radius: 3px;
+}
+#orbit-bar .search-query:focus {
+	background-position: 5px 2px;
+}
+#orbit-bar .container {
+	width:100%;
+}
+#orbit-bar .orbit-logo .brand {
+	background: url(<%= asset_path 'orbit-bar.png' %>) no-repeat -162px -5px;
+	text-indent:-9999px;
+	padding: 5px 20px 4px;
+}
+#orbit-bar .orbit-logo .brand:hover {
+	background-color: rgba(0,157,220,1);
+}
+#orbit-bar .orbit-logo.open .brand {
+	background-color: rgba(0,157,220,1);
+}
+#orbit-bar .orbit-logo .dropdown-menu {
+	left: -15px;
+}
+#orbit-bar .nav > li {
+	height: 28px;
+}
+#orbit-bar .nav > li > a:hover {
+	background-color: rgba(0,157,220,1);
+}
+#orbit-bar .nav > li > a {
+	background-image: url(<%= asset_path 'orbit-bar.png' %>);
+	background-repeat:no-repeat;
+	display: inline-block;
+	width: 16px;
+	height: 16px;
+	text-indent: -9999px;
+	padding:6px;
+}
+#orbit-bar .nav > li.search {
+	overflow: hidden;
+	width: 28px;
+	position: relative;
+}
+#orbit-bar .nav > li > a.orbit-bar-home {
+	background-position: -10px -10px;
+}
+#orbit-bar .nav > li > a.orbit-bar-desktop {
+	background-position: -106px -9px;
+}
+#orbit-bar .nav > li > a.orbit-bar-member {
+	background-position: -4px -37px;
+}
+#orbit-bar .nav > li > a.orbit-bar-member {
+	background-position: -10px -43px;
+}
+#orbit-bar .nav > li > a.orbit-bar-language {
+	background-position: -42px -42px;
+}
+#orbit-bar .nav > li > a.orbit-bar-search {
+	background-position: -75px -10px;
+	overflow: hidden;
+	position: absolute;
+	right: 0;
+	z-index: 1;
+}
+#orbit-bar .nav > li.language.open > a.orbit-bar-language {
+	background-color: rgba(0,157,220,1);
+}
+.language-menu .active {
+  color: #ffffff;
+  text-decoration: none;
+  background-color: #0088cc;
+}
+#orbit-bar .nav > li > a.orbit-bar-account {
+	background-image: none;
+	height: 22px;
+	padding: 3px;
+	text-indent: inherit;
+	min-width: 110px;
+	width: auto !important;
+	text-align: left;
+	color: #FFFFFF;
+	text-shadow: none;
+	background-color: rgba(0, 0, 0, 0.5);
+}
+#orbit-bar .nav > li > a.orbit-bar-account:hover {
+	background-color: #08C;
+}
+#orbit-bar .nav span.member-name {
+	display: inline-block;
+	line-height: 22px;
+	padding: 0 10px;
+}
+#orbit-bar .nav img.member-img {
+	display: inline-block;
+	max-width: 24px;
+	margin-top: -2px;
+}
+#orbit-bar .clear {
+	clear: none;
+}
+#orbit-bar .account-menu {
+	right: 5px;
+}
+#orbit-bar .bar-login {
+	
+}
+#orbit-bar .bar-login .open, #orbit-bar .open .orbit-bar-account {
+	background-color: #009DDC;
+}
+#orbit-bar .bar-login .dropdown-menu {
+	padding: 0 0 10px;
+	max-width: 260px;
+}
+#orbit-bar .bar-login .dropdown-menu .log {
+	margin: 10px 15px 0;
+	list-style: none outside none;
+}
+#orbit-bar .bar-login .dropdown-menu .log .title {
+	background: url(<%= asset_path 'sign-in-logo2.png' %>) no-repeat center center;
+	height: 70px;
+}
+#orbit-bar .bar-login .dropdown-menu .log form {
+	margin: 0 0 8px;
+}
+#orbit-bar .bar-login .dropdown-menu .log input {
+	display: inline-block;
+	margin: 0;
+}
+#orbit-bar .bar-login .dropdown-menu .log .span2 {
+	width: 182px;
+}
+#orbit-bar .bar-login .dropdown-menu .log .forgot {
+	margin-bottom: 20px;
+	padding: 3px 0 0;
+	float: right;
+	display: inline-block;
+	color: #0088CC;
+}
+#orbit-bar .bar-login .dropdown-menu .log .input-prepend {
+	margin-top: 20px;
+}
+#orbit-bar .bar-login .dropdown-menu .log .remember {
+	margin-top: 5px;
+}
+#orbit-bar .bar-login .dropdown-menu .log .forgot:hover {
+	padding: 3px 0 0;
+	float: right;
+	display: inline-block;
+	color: #005580;
+	text-decoration: underline;
+	background-color: transparent;
+}
+#orbit-bar .bar-login .dropdown-menu .log .btn {
+	width: 220px;
+}
+#orbit-bar .bar-login .dropdown-menu .log .divider {
+	position:relative;
+	overflow: inherit;
+	margin: 20px 0;
+}
+#orbit-bar .bar-login .dropdown-menu .log .divider span {
+	position: absolute;
+	width: 20px;
+	height: 20px;
+	background-color: #FFF;
+	color: #666;
+	top: -9px;
+	left: 100px;
+	font-size: 1.4em;
+	text-align: center;
+}
+#orbit-bar .bar-login .dropdown-menu .register {
+	color: #FFFFFF;
+	margin: 0 15px;
+	width: 188px;
+}
+#orbit-bar .add-on i {
+	font-size: 12px;
+}

app/assets/stylesheets/scroll_style.css

@@ -1,15 +1,14 @@
-/*scroll_style*/
-
 @charset "UTF-8";
 /* CSS Document */
 .my_scroll {
+	position: relative;
 	width: 100%;
 	clear: both;
 }
 .my_scroll .viewport {
-	width: 1005;
 	overflow: hidden;
 	position: relative;
+	top: 0px;
 }
 .my_scroll .overview {
 	list-style: none;
@@ -22,14 +21,15 @@
 	background-color: #000000;
 }
 .my_scroll .scrollbar {
-	position: relative;
+	position: absolute;
 	float: right;
 	width: 8px;
-	top:2px;
+	top: 0px;
-	right:-2px;
+	right: 2px;
+	z-index: 1;
 }
 .my_scroll .track {
-	background-color: #CFCFCF;
+	/*background-color: #CFCFCF;*/
 	height: 100%;
 	width:7px;
 	position: relative;

app/assets/stylesheets/widget.css

@@ -0,0 +1,153 @@
+.widget-size-300 {
+	width:298px;
+}
+.widget-box {
+	background-color: #FFF;
+	overflow: hidden;
+	min-width: 300px;
+	margin: 0 0 5px 5px;
+	position:relative;
+}
+.widget-box .widget-title {
+	margin: 0;
+	font-size: 1.5em;
+	line-height: 1.5em;
+	color: #FFF;
+	padding-left: 5px;
+	border-radius: 5px 5px 0 0;
+	-moz-border-radius: 5px 5px 0 0;
+	-webkit-border-radius: 5px 5px 0 0;
+	background-image: -moz-linear-gradient(top, #B7B7B7, #9d9d9d);
+	background-image: -ms-linear-gradient(top, #B7B7B7, #9d9d9d);
+	background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#B7B7B7), to(#9d9d9d));
+	background-image: -webkit-linear-gradient(top, #B7B7B7, #9d9d9d);
+	background-image: -o-linear-gradient(top, #B7B7B7, #9d9d9d);
+	background-image: linear-gradient(top, #B7B7B7, #9d9d9d);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#B7B7B7', endColorstr='#9d9d9d', GradientType=0);
+}
+.widget-box .widget-title [class^="icons-"] {
+	margin: 3px 5px 0 2px;
+}
+.widget-box .widget-content {
+	padding: 10px;
+	border-width: 0 1px 1px;
+	border-style: solid;
+	border-color: #CCCCCC;
+	border-radius: 0 0 5px 5px;
+	-moz-border-radius: 0 0 5px 5px;
+	-webkit-border-radius: 0 0 5px 5px;
+}
+.widget-box .form-horizontal .control-group > label {
+  width: 50px;
+}
+.widget-box .form-horizontal .controls {
+  margin-left: 60px;
+}
+.widget-action {
+	position:absolute;
+	right:1px;
+	top:4px;
+}
+.action {
+	float: left;
+	display:inline-block;
+	margin-right: 5px;
+	opacity: 0.8;
+	filter: alpha(opacity:80);
+	color: #FFF;
+}
+.action:hover {
+	opacity: 1;
+	filter: alpha(opacity:100);
+	cursor: pointer;
+	color: #FFF;
+	text-decoration: none;
+}
+.select-role {
+	display:none;
+	overflow:hidden;
+}
+.file-upload {
+	position:relative;
+	overflow: hidden;
+}
+.file-upload .file-name {
+	white-space: nowrap;
+	overflow: hidden;
+	border-style: solid;
+	border-width: 1px 1px 1px 0;
+	border-color: #CCC;
+	display: inline-block;
+	padding: 4px 10px;
+	height: 20px;
+	line-height: 18px;
+	-webkit-border-radius: 0 3px 3px 0;
+	-moz-border-radius: 0 3px 3px 0;
+	border-radius: 0 3px 3px 0;
+	text-align: left;
+	margin: 0;
+    width: 175px;
+}
+.file-upload .upload {
+	margin:0;
+	padding:0;
+	position:absolute;
+	top: 0;
+	left:0;
+	opacity:.0;
+    font-size: 60px;
+    left: -595px/9;
+	filter: alpha(opacity: 0);
+	outline: none;
+}
+.file-upload .upload:focus {
+	position:absolute;
+}
+.upload-picture {
+	margin-bottom: 5px;
+	text-align: center;
+	width: 276px;
+	overflow: hidden;
+	height: 90px;
+}
+.upload-picture img {
+    left: 0;
+    margin-top: -15%;
+    width: 100%;
+}
+.widget-box .widgetInfo {
+    display: inline-block;
+    text-align: center;
+    width: 255px;
+    margin : 0px 0 5px;
+    padding: 5px 10px;
+}
+.file-upload .input-medium {
+    border-radius: 3px 3px 3px 3px !important;
+    width: 263px;
+    position: relative;
+	z-index: 5;
+}
+#widget-link table {
+	margin-bottom:0
+}
+/*Date*/
+.showDate {
+	border-style: solid;
+	border-width: 1px 0 1px 1px;
+	border-color: #CCC;
+	display: inline-block;
+	float: left;
+	padding: 4px 10px;
+	height: 18px;
+	line-height: 18px;
+	-webkit-border-radius: 3px 0 0 3px;
+	-moz-border-radius: 3px 0 0 3px;
+	border-radius: 3px 0 0 3px;
+	text-align: center;
+}
+.calendarInput {
+	position: absolute;
+	visibility: hidden;
+	left: 11px;
+}

app/assets/stylesheets/widgets.css

@@ -1,6 +1,3 @@
-/*Widget*/
-
-
 .widget-size-300 {
 	width:298px;
 }
@@ -12,6 +9,9 @@
 	position:relative;
 }
 .widget-box .widget-title {
+	margin: 0;
+	font-size: 1.5em;
+	line-height: 1.5em;
 	color: #FFF;
 	padding-left: 5px;
 	border-radius: 5px 5px 0 0;
@@ -53,12 +53,15 @@
 	display:inline-block;
 	margin-right: 5px;
 	opacity: 0.8;
-  filter: alpha(opacity=80);
+	filter: alpha(opacity=80);
+	color: #FFF;
 }
 .action:hover {
 	opacity: 1;
-  filter: alpha(opacity=80);
+	filter: alpha(opacity=80);
 	cursor: pointer;
+	color: #FFF;
+	text-decoration: none;
 }
 .select-role {
 	display:none;

app/helpers/application_helper.rb

@@ -165,13 +165,15 @@ module ApplicationHelper
 
   def page_stylesheets(page, edit=nil)
     stylesheets = ''
-    unless edit
+    unless edit 
-      stylesheets << "<link href='/assets/bootstrap.css' rel='stylesheet' type='text/css' />\n" 
       stylesheets << "<link href='/assets/bootstrap-orbit.css' rel='stylesheet' type='text/css' />\n"
       stylesheets << "<link href='/assets/style.css' rel='stylesheet' type='text/css' />\n"
     end
-    stylesheets << "<link href='/assets/social-share-button.css' rel='stylesheet' type='text/css' />\n" 
     stylesheets << "<link href='#{page.design.reset_css.file.url}' rel='stylesheet' type='text/css' />\n" if page.design.reset_css
+    stylesheets << "<link href='/assets/bootstrap.css' rel='stylesheet' type='text/css' />\n"
+    stylesheets << "<link href='/assets/font-awesome.css' rel='stylesheet' type='text/css' />\n"
+    stylesheets << "<link href='/assets/orbit-bar.css' rel='stylesheet' type='text/css' />\n"
+    stylesheets << "<link href='/assets/social-share-button.css' rel='stylesheet' type='text/css' />\n" 
     stylesheets << "<link href='#{asset_path 'banner_nav.css'}' rel='stylesheet' type='text/css' />\n" 
     stylesheets << "<link href='#{page.design.default_css.file.url}' rel='stylesheet' type='text/css' />\n" if page.design.default_css
     theme = page.design.themes.detect{ |d| d.id == page.theme_id }

app/helpers/orbit_backend_helper.rb

@@ -38,7 +38,9 @@ module OrbitBackendHelper
 
   def render_title(title, fields, span, translation)
     content_tag :th, :class => "sort #{span} #{is_sort_active?(title)}" do
-      link_to (t(translation) + content_tag(:b, nil, :class => is_sort?(title))).html_safe, url_for({:filter => @filter}.merge(sortable(title).merge(:sort_options => fields))), :class => 'js_history'
+      content_tag :span do
+        link_to (t(translation) + content_tag(:b, nil, :class => is_sort?(title))).html_safe, url_for({:filter => @filter}.merge(sortable(title).merge(:sort_options => fields))), :class => 'js_history'
+      end
     end
   end
 

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

@@ -1,3 +1,6 @@
+<% content_for :page_specific_css do -%>
+    <%= stylesheet_link_tag "item" %>
+<% end -%>
 <div id="isotope">
     <div class="item element">
         <h3><i class="icons-content"></i><%= t(:content) %></h3>

app/views/layouts/_orbit_bar.html.erb

@@ -37,13 +37,13 @@
                 <li class="search clear" title="<%= t :search_google %>">
                     <a class="orbit-bar-search" href="#">search</a>
 					<form class="navbar-search" method="get" action="http://www.google.com/custom">
-					<input type="hidden" name="client" value="pub-&amp" /> 
+						<input type="hidden" name="client" value="pub-&amp" /> 
-					<input type="hidden" name="ie" id="ie" value="utf-8" />
+						<input type="hidden" name="ie" id="ie" value="utf-8" />
-					<input type="hidden" name="oe" id="oe" value="utf-8" />
+						<input type="hidden" name="oe" id="oe" value="utf-8" />
-					<input type="hidden" name="cof" id="cof" value="AH:center;AWFID:03de271f1940eea3;" />
+						<input type="hidden" name="cof" id="cof" value="AH:center;AWFID:03de271f1940eea3;" />
-					<input type='hidden' name='domains' value='<%= @site.search["domains"]  rescue ''%>'>
+						<input type='hidden' name='domains' value='<%= @site.search["domains"]  rescue ''%>'>
-                    		<input type='hidden' name='sitesearch' value='<%= @site.search["sitesearch"] rescue '' %>'>
+                		<input type='hidden' name='sitesearch' value='<%= @site.search["sitesearch"] rescue '' %>'>
-                    		<%= text_field_tag 'q','',{:class => "search-query span3",:placeholder=> t(:search_nccu) ,:disabled=> ((@site.search["sitesearch"] || @site.search["domains"] ).blank? rescue true)}%>
+                		<%= text_field_tag 'q','',{:class => "search-query span3",:placeholder=> t(:search_nccu) ,:disabled=> ((@site.search["sitesearch"] || @site.search["domains"] ).blank? rescue true)}%>
 		      		</form>
                 </li>
 				<% if user_signed_in? %>

app/views/layouts/_side_bar.html.erb

@@ -6,28 +6,28 @@
 <% end %>
 
 <%= content_tag :li, :class => (active_for_controllers('bulletins', '/panel/announcement/back_end/tags', 'bulletin_categorys', 'approvals') ||  active_for_app_auth('Announcement') || active_for_ob_auths_object("BulletinCategory") ) do -%>
-	<%= link_to content_tag(:i, nil, :class => 'icons-announcement') + t('admin.announcement'), panel_announcement_back_end_bulletins_path %>
+	<%= link_to content_tag(:i, nil, :class => 'icons-announcement') + content_tag(:span, t('admin.announcement')), panel_announcement_back_end_bulletins_path %>
 	<%= content_tag :ul, :class => ("nav nav-list " + (visible_for_controllers('bulletins', '/panel/announcement/back_end/tags', 'bulletin_categorys', 'approvals')||active_for_ob_auths_object("BulletinCategory"))) do -%>
-		<%= content_tag :li, link_to(t('announcement.all_articles'), panel_announcement_back_end_bulletins_path), :class => active_for_action('bulletins', 'index') %>
+		<%= content_tag :li, link_to((t('announcement.all_articles') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, panel_announcement_back_end_bulletins_path), :class => active_for_action('bulletins', 'index') %>
-		<%= content_tag :li, link_to(t('announcement.add_new'), new_panel_announcement_back_end_bulletin_path), :class => active_for_action('bulletins', 'new') if (is_manager? rescue nil) %>
+		<%= content_tag :li, link_to((t('announcement.add_new') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, new_panel_announcement_back_end_bulletin_path), :class => active_for_action('bulletins', 'new') if (is_manager? rescue nil) %>
-		<%= content_tag :li, link_to(t('announcement.categories'), panel_announcement_back_end_bulletin_categorys_path), :class =>( active_for_action('bulletin_categorys', 'index') || active_for_ob_auths_object("BulletinCategory") )if (is_manager? rescue nil) %>
+		<%= content_tag :li, link_to((t('announcement.categories') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, panel_announcement_back_end_bulletin_categorys_path), :class =>( active_for_action('bulletin_categorys', 'index') || active_for_ob_auths_object("BulletinCategory") )if (is_manager? rescue nil) %>
-		<%= content_tag :li, link_to(t('announcement.tags'), panel_announcement_back_end_tags_path), :class => active_for_action('/panel/announcement/back_end/tags', 'index')if (is_manager? rescue nil) %>
+		<%= content_tag :li, link_to((t('announcement.tags') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, panel_announcement_back_end_tags_path), :class => active_for_action('/panel/announcement/back_end/tags', 'index')if (is_manager? rescue nil) %>
-		<%= content_tag :li, link_to(t('announcement.bulletin.approval_setting'), panel_announcement_back_end_approval_setting_path), :class => active_for_action('approvals', 'setting')  if (is_manager? rescue nil) %>
+		<%= content_tag :li, link_to((t('announcement.bulletin.approval_setting') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, panel_announcement_back_end_approval_setting_path), :class => active_for_action('approvals', 'setting')  if (is_manager? rescue nil) %>
-		<%= content_tag :li, link_to(t('admin.module.authorization'),admin_module_app_manager_auth_proc_path(ModuleApp.first(conditions: {title: "Announcement"}))), :class => active_for_app_auth('Announcement') if (is_admin? rescue nil) %>
+		<%= content_tag :li, link_to((t('admin.module.authorization') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe,admin_module_app_manager_auth_proc_path(ModuleApp.first(conditions: {title: "Announcement"}))), :class => active_for_app_auth('Announcement') if (is_admin? rescue nil) %>
 
 	<% end -%>
 
 <% end -%>
 
 <%= content_tag :li, :class =>( active_for_controllers('news_bulletins', '/panel/news/back_end/tags', 'news_bulletin_categorys', 'news_approvals')||  active_for_app_auth('news') || active_for_ob_auths_object("NewsBulletinCategory")) do -%>
-	<%= link_to content_tag(:i, nil, :class => 'icons-announcement') + t('admin.news'), panel_news_back_end_news_bulletins_path %>
+	<%= link_to content_tag(:i, nil, :class => 'icons-announcement') + content_tag(:span, t('admin.news')), panel_news_back_end_news_bulletins_path %>
 	<%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('news_bulletins', '/panel/news/back_end/tags', 'news_bulletin_categorys', 'news_approvals')) do -%>
-		<%= content_tag :li, link_to(t('announcement.all_articles'), panel_news_back_end_news_bulletins_path), :class => active_for_action('news_bulletins', 'index') %>
+		<%= content_tag :li, link_to((t('announcement.all_articles') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, panel_news_back_end_news_bulletins_path), :class => active_for_action('news_bulletins', 'index') %>
-		<%= content_tag :li, link_to(t('announcement.add_new'), new_panel_news_back_end_news_bulletin_path), :class => active_for_action('news_bulletins', 'new') if (is_manager? rescue nil) %>
+		<%= content_tag :li, link_to((t('announcement.add_new') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, new_panel_news_back_end_news_bulletin_path), :class => active_for_action('news_bulletins', 'new') if (is_manager? rescue nil) %>
-		<%= content_tag :li, link_to(t('announcement.categories'), panel_news_back_end_news_bulletin_categorys_path), :class => active_for_action('news_bulletin_categorys', 'index') || active_for_ob_auths_object("NewsBulletinCategory") if (is_manager? rescue nil) %>
+		<%= content_tag :li, link_to((t('announcement.categories') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, panel_news_back_end_news_bulletin_categorys_path), :class => active_for_action('news_bulletin_categorys', 'index') || active_for_ob_auths_object("NewsBulletinCategory") if (is_manager? rescue nil) %>
-		<%= content_tag :li, link_to(t('announcement.tags'), panel_news_back_end_tags_path), :class => active_for_action('/panel/news/back_end/tags', 'index') if (is_manager? rescue nil)%>
+		<%= content_tag :li, link_to((t('announcement.tags') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, panel_news_back_end_tags_path), :class => active_for_action('/panel/news/back_end/tags', 'index') if (is_manager? rescue nil)%>
-		<%= content_tag :li, link_to(t('announcement.bulletin.approval_setting'), panel_news_back_end_approval_setting_path), :class => active_for_action('news_approvals', 'setting')  if (is_manager? rescue nil) %>
+		<%= content_tag :li, link_to((t('announcement.bulletin.approval_setting') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, panel_news_back_end_approval_setting_path), :class => active_for_action('news_approvals', 'setting')  if (is_manager? rescue nil) %>
-		<%= content_tag :li, link_to(t('admin.module.authorization'),admin_module_app_manager_auth_proc_path(ModuleApp.first(conditions: {key: "news"}))), :class => active_for_app_auth('news') if (is_admin? rescue nil) %>
+		<%= content_tag :li, link_to((t('admin.module.authorization') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe,admin_module_app_manager_auth_proc_path(ModuleApp.first(conditions: {key: "news"}))), :class => active_for_app_auth('news') if (is_admin? rescue nil) %>
 	<% end -%>
 
 <% end -%>
@@ -53,66 +53,66 @@
 
 
 <%= content_tag :li, :class => active_for_controllers('page_contexts') || active_for_app_auth('page_content') || active_for_ob_auths_object("PageContext")  do -%>
-	<%= link_to content_tag(:i, nil, :class => 'icons-page') + t('admin.page'), panel_page_content_back_end_page_contexts_path %>
+	<%= link_to content_tag(:i, nil, :class => 'icons-page') + content_tag(:span, t('admin.page')), panel_page_content_back_end_page_contexts_path %>
 		<%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('page_contexts')) do -%>
 			<%#= content_tag :li, link_to(t('admin.all_articles'), panel_page_content_back_end_page_contexts_path), :class => active_for_action('page_context', 'index') %>
-			<%= content_tag :li, link_to(t('admin.module.authorization'),admin_module_app_manager_auth_proc_path(ModuleApp.first(conditions: {key: "page_content"}))), :class => active_for_app_auth('page_content')  if (is_admin? rescue nil) %>
+			<%= content_tag :li, link_to((t('admin.module.authorization') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe,admin_module_app_manager_auth_proc_path(ModuleApp.first(conditions: {key: "page_content"}))), :class => active_for_app_auth('page_content')  if (is_admin? rescue nil) %>
 		<% end -%>
 
 <% end -%>
 
 <%= content_tag :li, :class => active_for_controllers('ad_banners', 'ad_images') ||active_for_ob_auths_object("AdBanner") ||active_for_app_auth('ad_banners') do -%>
-	<%= link_to content_tag(:i, nil, :class => 'icons-link') + t('admin.ad_banner'), admin_ad_banners_path %>
+	<%= link_to content_tag(:i, nil, :class => 'icons-link') + content_tag(:span, t('admin.ad_banner')), admin_ad_banners_path %>
 
 	<%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('ad_banners', 'ad_images') ) do -%>
 		<%#= content_tag :li, link_to(t('admin.ad.all_banners'), admin_ad_banners_path), :class => active_for_action('ad_banners', 'index') %>
 		<%#= content_tag :li, link_to(t('admin.ad.new_banner'), new_admin_ad_banner_path), :class => active_for_action('ad_banners', 'new') %>
 		<%#= content_tag :li, link_to(t('admin.ad.new_image'), new_ad_image_admin_ad_banners_path), :class => active_for_action('ad_images', 'new') %>
-	<%= content_tag :li, link_to(t('admin.module.authorization'),admin_module_app_manager_auth_proc_path(ModuleApp.first(conditions: {key: "ad_banners"}))), :class => active_for_app_auth('ad_banners')  if (is_admin? rescue nil) %>
+	<%= content_tag :li, link_to((t('admin.module.authorization') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe,admin_module_app_manager_auth_proc_path(ModuleApp.first(conditions: {key: "ad_banners"}))), :class => active_for_app_auth('ad_banners')  if (is_admin? rescue nil) %>
 	<% end -%>
 <% end %>
 
 
 <%= content_tag :li, :class => active_for_controllers('web_links', '/panel/web_resource/back_end/tags', 'web_link_categorys') || active_for_app_auth('web_resource')  || active_for_ob_auths_object("WebLinkCategory")  do -%>
-	<%= link_to content_tag(:i, nil, :class => 'icons-link') + t('admin.link'), panel_web_resource_back_end_web_links_path %>
+	<%= link_to content_tag(:i, nil, :class => 'icons-link') + content_tag(:span, t('admin.link')), panel_web_resource_back_end_web_links_path %>
 	<%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('web_links', '/panel/web_resource/back_end/tags', 'web_link_categorys')) do -%>
-		<%= content_tag :li, link_to(t('admin.all_articles'), panel_web_resource_back_end_web_links_path), :class => active_for_action('web_links', 'index') %>
+		<%= content_tag :li, link_to((t('admin.all_articles') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, panel_web_resource_back_end_web_links_path), :class => active_for_action('web_links', 'index') %>
-		<%= content_tag :li, link_to(t('announcement.add_new'), new_panel_web_resource_back_end_web_link_path), :class => active_for_action('web_links', 'new') if (is_manager? rescue nil)%>
+		<%= content_tag :li, link_to((t('announcement.add_new') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, new_panel_web_resource_back_end_web_link_path), :class => active_for_action('web_links', 'new') if (is_manager? rescue nil)%>
-		<%= content_tag :li, link_to(t('announcement.categories'), panel_web_resource_back_end_web_link_categorys_path), :class => (active_for_action('web_link_categorys', 'index') || active_for_ob_auths_object("WebLinkCategory")) if (is_manager? rescue nil)%>
+		<%= content_tag :li, link_to((t('announcement.categories') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, panel_web_resource_back_end_web_link_categorys_path), :class => (active_for_action('web_link_categorys', 'index') || active_for_ob_auths_object("WebLinkCategory")) if (is_manager? rescue nil)%>
-		<%= content_tag :li, link_to(t('announcement.tags'), panel_web_resource_back_end_tags_path), :class => active_for_action('/panel/web_resource/back_end/tags', 'index') if (is_manager? rescue nil)%>
+		<%= content_tag :li, link_to((t('announcement.tags') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, panel_web_resource_back_end_tags_path), :class => active_for_action('/panel/web_resource/back_end/tags', 'index') if (is_manager? rescue nil)%>
-		<%= content_tag :li, link_to(t('admin.module.authorization'),admin_module_app_manager_auth_proc_path(ModuleApp.first(conditions: {title: "web_resource"}))), :class => active_for_app_auth('web_resource')  if (is_admin? rescue nil) %>
+		<%= content_tag :li, link_to((t('admin.module.authorization') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe,admin_module_app_manager_auth_proc_path(ModuleApp.first(conditions: {title: "web_resource"}))), :class => active_for_app_auth('web_resource')  if (is_admin? rescue nil) %>
 	<% end -%>
 <% end -%>
 
 <%= content_tag :li, :class => active_for_controllers('albums','album_images','gallery_categories','/panel/gallery/back_end/tags') || active_for_app_auth("gallery") do -%>
-	<%= link_to content_tag(:i, nil, :class => 'icons-picture') + t('admin.orbit_gallery'), panel_gallery_back_end_albums_path %>
+	<%= link_to content_tag(:i, nil, :class => 'icons-picture') + content_tag(:span, t('admin.orbit_gallery')), panel_gallery_back_end_albums_path %>
 	<%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('albums') ) do -%>
 		<%#= content_tag :li, link_to(t('admin.ad.all_banners'), admin_ad_banners_path), :class => active_for_action('ad_banners', 'index') %>
 		<%#= content_tag :li, link_to(t('admin.ad.new_banner'), new_admin_ad_banner_path), :class => active_for_action('ad_banners', 'new') %>
 		<%#= content_tag :li, link_to(t('admin.ad.new_image'), new_ad_image_admin_ad_banners_path), :class => active_for_action('ad_images', 'new') %>
-	<%= content_tag :li, link_to(t('gallery.categories'), panel_gallery_back_end_gallery_categories_path), :class => active_for_action('gallery_categories','index') %>
+	<%= content_tag :li, link_to((t('gallery.categories') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, panel_gallery_back_end_gallery_categories_path), :class => active_for_action('gallery_categories','index') %>
-	<%= content_tag :li, link_to(t('gallery.tags'), panel_gallery_back_end_tags_path), :class => active_for_action('/panel/gallery/back_end/tags', 'index') %>
+	<%= content_tag :li, link_to((t('gallery.tags') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, panel_gallery_back_end_tags_path), :class => active_for_action('/panel/gallery/back_end/tags', 'index') %>
-	<%= content_tag :li, link_to(t('admin.module.authorization'),admin_module_app_manager_auth_proc_path(ModuleApp.first(conditions: {key: "gallery"}))), :class => active_for_app_auth('gallery')  if (is_admin? rescue nil) %>
+	<%= content_tag :li, link_to((t('admin.module.authorization') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe,admin_module_app_manager_auth_proc_path(ModuleApp.first(conditions: {key: "gallery"}))), :class => active_for_app_auth('gallery')  if (is_admin? rescue nil) %>
 	<% end -%>
 <% end %>
 
 <%= content_tag :li, :class => active_for_controllers('archive_files', 'tags', 'archive_file_categorys') do -%>
-	<%= link_to content_tag(:i, nil, :class => 'icons-asset') + t('admin.archive'), panel_archive_back_end_archive_files_path %>
+	<%= link_to content_tag(:i, nil, :class => 'icons-asset') + content_tag(:span, t('admin.archive')), panel_archive_back_end_archive_files_path %>
 	  <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('archive_files', 'tags', 'archive_file_categorys')) do -%>
-		<%= content_tag :li, link_to(t('admin.all_articles'), panel_archive_back_end_archive_files_path), :class => active_for_action('archive_file', 'index') %>
+		<%= content_tag :li, link_to((t('admin.all_articles') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, panel_archive_back_end_archive_files_path), :class => active_for_action('archive_file', 'index') %>
-		<%= content_tag :li, link_to(t('admin.add_new'), new_panel_archive_back_end_archive_file_path), :class => active_for_action('archive_file', 'new') %>
+		<%= content_tag :li, link_to((t('admin.add_new') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, new_panel_archive_back_end_archive_file_path), :class => active_for_action('archive_file', 'new') %>
-		<%= content_tag :li, link_to(t('admin.categories'), panel_archive_back_end_archive_file_categorys_path), :class => active_for_action('archive_file_categorys', 'index') %>
+		<%= content_tag :li, link_to((t('admin.categories') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, panel_archive_back_end_archive_file_categorys_path), :class => active_for_action('archive_file_categorys', 'index') %>
-		<%= content_tag :li, link_to(t('admin.tags'), panel_archive_back_end_tags_path), :class => active_for_action('tags', 'index') %>
+		<%= content_tag :li, link_to((t('admin.tags') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, panel_archive_back_end_tags_path), :class => active_for_action('tags', 'index') %>
 	<% end -%>
 <% end -%>
 
 <%= content_tag :li, :class => active_for_controllers('cals','calendar_categories') || active_for_app_auth("calendar") do -%>
-	<%#= link_to content_tag(:i, nil, :class => 'icons-calendar') + t('admin.calendar'), panel_calendar_back_end_cals_path %>
+	<%#= link_to content_tag(:i, nil, :class => 'icons-calendar') + content_tag(:span, t('admin.calendar')), panel_calendar_back_end_cals_path %>
 	<%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('cals','calendar_categories') ) do -%>
 		<%#= content_tag :li, link_to(t('admin.ad.all_banners'), admin_ad_banners_path), :class => active_for_action('ad_banners', 'index') %>
 		<%#= content_tag :li, link_to(t('admin.ad.new_banner'), new_admin_ad_banner_path), :class => active_for_action('ad_banners', 'new') %>
 		<%#= content_tag :li, link_to(t('admin.ad.new_image'), new_ad_image_admin_ad_banners_path), :class => active_for_action('ad_images', 'new') %>
-	<%#= content_tag :li, link_to(t('calendar.calendars'), panel_calendar_back_end_calendar_categories_path), :class => active_for_action('calendar_categories','index') %>
+	<%#= content_tag :li, link_to((t('calendar.calendars') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, panel_calendar_back_end_calendar_categories_path), :class => active_for_action('calendar_categories','index') %>
 	<%#= content_tag :li, link_to(t('gallery.tags'), panel_gallery_back_end_tags_path), :class => active_for_action('/panel/gallery/back_end/tags', 'index') %>
 	<%#= content_tag :li, link_to(t('admin.module.authorization'),admin_module_app_manager_auth_proc_path(ModuleApp.first(conditions: {key: "gallery"}))), :class => active_for_app_auth('gallery')  if (is_admin? rescue nil) %>
 	<% end -%>

app/views/layouts/new_admin.html.erb

@@ -13,9 +13,13 @@
 	<%= yield :page_specific_javascript %>
 	<%= csrf_meta_tag %>
 </head>
-<body>
+<body class="folded">
 	<%= render 'layouts/orbit_bar' %>
 	<div id="main-sidebar" class="my_scroll">
+        <div id="position">
+            <a href="#"><i class="icons-dashboard"></i><span>Dashboard</span></a>
+            <div id="collapse-menu"><i class="icon-chevron-right"></i><i class="icon-chevron-right"></i></div>
+        </div>
 		<div class="scrollbar">
 			<div class="track">
 				<div class="thumb">