Merge branch 'anc_approval_list' of https://github.com/Rulingcom/orbit into anc_approval_list

app/assets/fonts/widget.css

@@ -1,79 +0,0 @@
-.widget-size-300 {
-	width:298px;
-}
-.widget-box {
-	background-color: #FFF;
-	overflow: hidden;
-	min-width: 300px;
-	border: 1px solid #DDD;
-	border-radius: 5px;
-	-moz-border-radius: 5px;
-	-webkit-border-radius: 5px;
-	margin: 0 0 5px 5px;
-	position:relative;
-}
-.widget-box .widget-title {
-	background: #999;
-	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;
-}
-.widget-box .widget-content {
-	padding: 10px;
-}
-.widget-box .form-horizontal .control-group > label {
-  width: 50px;
-}
-.widget-box .form-horizontal .controls {
-  margin-left: 60px;
-}
-.widget-action {
-	position:absolute;
-	right:1px;
-	top:6px;
-}
-.action {
-	float: left;
-	display:inline-block;
-	margin-right: 5px;
-	opacity: 0.8;
-	filter: alpha(opacity=80);
-}
-.action:hover {
-	opacity: 1;
-	filter: alpha(opacity=100);
-	cursor: pointer;
-}
-.select-role {
-	display:none;
-	padding: 10px 0 0;
-}
-.file-upload {
-	position:relative;
-}
-.file-upload .file-name {
-	display: inline-block;
-	margin: 0 0 5px 5px;
-	white-space: nowrap;
-	width: 140px;
-}
-.file-upload .upload {
-	margin:0;
-	padding:0;
-	position:absolute;
-	top:0;
-	left:0;
-	opacity:.0;
-	filter: alpha(opacity=100);
-}
-.file-upload .upload:focus {
-	position:absolute;
-}
-.upload-picture {
-	margin-right: 5px;
-}
-#widget-link table {
-	margin-bottom:0
-}

app/assets/javascripts/ajax_form.js

@@ -1,4 +1,4 @@
-$('#submit_button').live('click', function(){
+$(document).on('click', '#ajax_form_submit', function(){
 	$('#ajaxForm').ajaxSubmit({
 		beforeSubmit: function(a,f,o) {
 			o.dataType = 'script';

app/assets/javascripts/bulletin_form.js.erb

@@ -6,10 +6,9 @@ $('.bulletin_files_block a.delete').live('click', function(){
   $(this).parents('.list_item').remove();
 });
 
-$('.action a.remove_existing_record').live('click', function(){
+$(document).on('click', '.action a.remove_existing_record', function(){
   $(this).next('.should_destroy').attr('value', 1);
-  //$("#bulletin_" + $(this).prev().attr('value')).hide();
-  $("tr#bulletin_" + $(this).prev().attr('value')).hide();
+  $("tr #" + $(this).prev().attr('value')).hide();
 });
 
 $('.quick_edit_cancel').live('click', function(){

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

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

@@ -6,6 +6,7 @@
 //
 //= require jquery
 //= require jquery_ujs
+//= require jquery.form
 //= require bootstrap
 //= require jquery.isotope.min
 //= require jquery.tinyscrollbar.min
@@ -13,4 +14,5 @@
 //= require tinymce-jquery
 //= require tinymce_orbit
 //= require orbit-bar-search
-//= require side_bar_history
+//= require side_bar_history
+//= require ajax_form

app/assets/javascripts/orbit-1.0.js

@@ -1,5 +1,6 @@
 var viewportwidth,
 	viewportheight;
+	console.log($(window).height())
 function resize() {
 	viewportheight=$(window).height();
 	viewportwidth=$(window).width();
@@ -49,14 +50,20 @@ $(document).ready(function(){
 	resize();
 	var $mainWrapMarginLeft = parseInt($('#main-wrap').css("margin-left"))-2,
 		$subWiget = $('#sub-wiget').width()+18;
-	$('#main-sidebar').css("height", viewportheight-30);
-	$('#main-sidebar .viewport').css("height", viewportheight-30);
+		$orbitBar = $('#orbit-bar').height(),
+		$mainSidebar = $('#main-sidebar').width()+5,
+		$formActionPadding = parseInt($('.form-fixed').css("padding-left"))+parseInt($('.form-fixed').css("padding-right"));
+		console.log($orbitBar);
+		console.log("ready"+$(window).height());
+	$('#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);
-	$('#main-sidebar').tinyscrollbar();
+	$('.form-fixed').css("width", viewportwidth-$mainWrapMarginLeft-$formActionPadding);
+	$('#bulletin_pagination').css("width", viewportwidth-$mainSidebar);
+	$('#main-sidebar').tinyscrollbar({size:(viewportheight-$orbitBar-4)});
 	$('.detal-list').tinyscrollbar();
-	$('#main-sidebar').tinyscrollbar({size:(viewportheight-34)});
 	mainTablePosition();
 
 	/*isotope*/
@@ -72,12 +79,18 @@ $(window).resize(function(){
 	resize();
 	var $mainWrapMarginLeft = parseInt($('#main-wrap').css("margin-left"))-2,
 		$subWiget = $('#sub-wiget').width()+18;
-	$('#main-sidebar').css("height", viewportheight-30);
-	$('#main-sidebar .viewport').css("height", viewportheight-30);
+		$orbitBar = $('#orbit-bar').height(),
+		$mainSidebar = $('#main-sidebar').width()+5,
+		$formActionPadding = parseInt($('.form-fixed').css("padding-left"))+parseInt($('.form-fixed').css("padding-right"));
+		console.log(viewportheight);
+	$('#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)
-	$('#main-sidebar').tinyscrollbar({size:(viewportheight-34)});
+	$('#main-wrap .subnav').css("width", viewportwidth-$mainWrapMarginLeft);
+	$('.form-fixed').css("width", viewportwidth-$mainWrapMarginLeft-$formActionPadding);
+	$('#bulletin_pagination').css("width", viewportwidth-$mainSidebar);
+	$('#main-sidebar').tinyscrollbar({size:(viewportheight-$orbitBar-4)});
 	mainTablePosition();
 });
 /*main-table position*/

app/assets/javascripts/side_bar_history.js

@@ -1,28 +1,28 @@
 var history_edited = false; 
 
-// $('#back_sidebar a, #back_main a.nav').live('click',  
-//   function () {  
-//     $.getScript(this.href);
-// 		history.pushState(null, document.title, this.href);
-// 		history_edited = true;
-//     return false;
-//   }  
-// );
+$('#back_sidebar a, #back_main a.nav').live('click',  
+  function () {  
+    $.getScript(this.href);
+		history.pushState(null, document.title, this.href);
+		history_edited = true;
+    return false;
+  }  
+);
 
-// $('#back_main a.reload').live('click',
-//   function () { 
-//     $.getScript(this.href);
-// 		history.replaceState(null, document.title, this.href);
-// 		history_edited = true;
-//     return false;
-//   }
-// );
+$('#back_main a.reload').live('click',
+  function () { 
+    $.getScript(this.href);
+		history.replaceState(null, document.title, this.href);
+		history_edited = true;
+    return false;
+  }
+);
 
-// $('.form').live('submit', function () { 
-//   $.post(this.action, $(this).serialize(), null, 'script');
-// 	history_edited = true;
-//   return false;
-// });
+$('#back_main .form').live('submit', function () { 
+  $.post(this.action, $(this).serialize(), null, 'script');
+	history_edited = true;
+  return false;
+});
 
 $(document).on('click', '.js_history',
   function () { 

app/assets/javascripts/site_editor.js

@@ -6,6 +6,10 @@
 //
 //= require jquery
 //= require jquery_ujs
-//= require page_edit
+//= require bootstrap
+//= require jquery.isotope.min
+//= require jquery.tinyscrollbar.min
+//= require orbit-1.0
+//= require orbit-bar-search
 //= require side_bar_history
-//= require new_admin
+//= require page_edit

app/assets/stylesheets/bootstrap-orbit.css

@@ -1,5 +1,5 @@
-/*bootstrap-orbit*/
-
+/*bootstrap-orbit*/
+
 h1, h2, h3, h4, h5, h6 {
   font-weight:normal ;
 }
@@ -112,6 +112,18 @@ table .span1-3 {
 .qe-block .form-horizontal .form-actions {
 	text-align:right;
 }
+.form-actions form {
+	margin-bottom: 0;
+}
+.form-actions form input {
+	margin-bottom: 0;
+}
 .modal.fade {
     top: -50%;
+}
+.form-search button {
+	margin-bottom: 0;
+}
+.modal form {
+	margin-bottom: 0;
 }

app/assets/stylesheets/isotope.css

@@ -1,18 +1,11 @@
-/*isotope*/
-
+/*isotope*/
+
 #isotope {
   margin-top: 2px;
-  background-color:#f4f4f4;
 }
 .isotope-item {
   z-index: 2;
 }
-
-.isotope-hidden.isotope-item {
-  pointer-events: none;
-  z-index: 1;
-}
-
 /**** Isotope CSS3 transitions ****/
 
 .isotope,
@@ -48,28 +41,27 @@
           transition-duration: 0s;
 }
 .w-a {
-    width: 388px;
+    width: 398px;
 }
 .w-b {
-    width: 802px;
+    width: 812px;
 }
 .h-a {
   height: 315px;
 }
 .h-b {
-  height: 699px;
+  height: 703px;
 }
 .item {
   margin: 5px 0 15px 15px;
 }
 .item h3 {
-  margin: 5px 0;
+  margin: 20px 0 5px;
 }
 .item h3 [class^="icons-"] {
-  margin: 3px 5px 0 3px;
+  margin: 1px 5px 0 3px;
 }
 .item .detail {
-  padding: 5px;
   border: 1px solid rgba(0, 0, 0, 0.1);
   background-color: #FFFFFF;
   border-radius: 5px;
@@ -77,12 +69,11 @@
   -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;
+  padding:10px 5px 30px 0;
+  margin: 0;
   text-align: right;
   border-bottom:1px solid #d9d9d9;
 }
@@ -92,20 +83,60 @@
   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 td:last-child, .item .detail .table tr th:last-child {
   text-align:right;
+  padding-right: 15px;
 }
 .item .h-a .my_scroll .viewport {
-  height: 248px;
+  height: 210px;
 }
 .item .h-b .my_scroll .viewport {
-  height: 632px;
+  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/list.css

@@ -22,7 +22,7 @@
 .main-list .nav-pills > li > a {
 	border-radius: 5px 5px 5px 5px;
 	margin: 2px;
-	padding:5px
+	padding:5px;
 }
 .main-list tbody .quick-edit {
 	position:relative;
@@ -35,6 +35,9 @@
 	width: 350px;
 	left: -8px;
 }
+.main-list tr:first-child td {
+	border-top: 1px solid #DDDDDD;
+}
 .main-list td {
 	background-color: #FFFFFF;
 	border-bottom: 1px solid #DDDDDD;
@@ -51,6 +54,11 @@
 	position: relative;
 	height: 40px;
 }
+.main-list .label-group .label {
+	margin-bottom: 1px;
+	display: inline-block;
+	padding: 0 3px;
+}
 .main-list .label-td {
     background-color: rgba(255, 255, 255, 1);
     height: 40px;
@@ -75,6 +83,9 @@
 	-moz-border-radius: 3px;
 	z-index: 5;
 }
+.qe-edit-div .table-condensed {
+	background-color: #F2F2F2;
+}
 .table-label {
     background-color: #F2F2F2;
     position: relative;
@@ -93,6 +104,19 @@
 .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;
@@ -156,11 +180,18 @@ legend {
 .sort-header th a:hover {
 	text-decoration: none;
 }
-#check_all_bulletins {
+.list-remove {
 	position: absolute;
-	top: 10px;
-	left: 5px;
+	top: 0;
+	padding-top: 9px !important;
+	left: 25px;
 }
-#sort_headers .list-remove {
-	padding: 8px 0 8px 16px !important;
+.form-fixed {
+	position: fixed;
+	margin-bottom: 0;
+	bottom: 0;
+	z-index: 10;
+}
+.paginationFixed {
+	margin-bottom: 25px;
 }

app/assets/stylesheets/sidebar.css.erb

@@ -1,12 +1,23 @@
 /*sidebar*/
 
-#back_sidebar {
-	left: 0;
-	position: fixed;
-	top: 0;
-	width: 160px;
+.nav-list {
+	padding: 0px 0px 100px 5px;
 }
-
+.nav-list li {
+	position: relative;
+}
+.nav-list ul {
+	margin-left: 10px;
+}
+.nav-list ul li {
+	padding: 5px 0;
+}
+.nav-list ul li a {
+	font-size: 13px;
+	padding: 3px 0px;
+	display: block;
+}
+/*
 #back_sidebar h1 {
     background: url(<%= asset_path "h1_bg.png" %>) repeat-x scroll left top transparent;
     border-bottom: 1px solid #1B1B1B;
@@ -106,36 +117,35 @@
 }
 #main-sidebar ul ul li a{
     padding: 10px 0 10px 20px;
+}*/
+.with_action:hover .hide {
+	display: block;
 }
-#main-sidebar li:hover .quick-edit{
-	display:block;
-}
-#main-sidebar .quick-edit{
+#main-sidebar .quick-edit {
     background: none repeat scroll 0 0 #FFFFFF;
     border: 1px solid #DDDDDD;
     border-radius: 5px 5px 5px 5px;
-    display: none;
-    margin:-3px 0 0 3px;
-    padding: 3px;
+    margin: 0 0 0 3px;
+    padding: 0;
     z-index:1;
+	position: absolute;
+	left: -3px;
+	width: 70px;
 }
-#main-sidebar .quick-edit:after{
-    content: "."; 
-    display: block;
-    height: 0; 
-    clear: both; 
-    visibility: hidden;
-}
-#main-sidebar .quick-edit a{
+#main-sidebar .quick-edit a {
+	display: block;
+	line-height: 22px;
     border-bottom: medium none;
-    border-radius: 5px 5px 5px 5px;
     font-size:12px;
-    float: left;
-    margin: 0 3px 0 0;
-    padding: 3px;
+    margin: 0;
+    padding: 3px 5px;
 }
-
-#main-sidebar .quick-edit a:hover{
-    background: none repeat scroll 0 0 #EEEEEE;
-    border-bottom:none;
+#main-sidebar .quick-edit a:first-child {
+    border-radius: 5px 5px 0px 0px;
+}
+#main-sidebar .quick-edit a:last-child {
+    border-radius: 0px 0px 5px 5px;
+}
+#main-sidebar .quick-edit a:hover {
+	background-color: #DDDDDD;
 }

app/assets/stylesheets/site_editor.css.erb

@@ -5,6 +5,10 @@
  *= require reset
  *= require_self
  *= require message
+ *= require bootstrap
+ *= require style
+ *= require bootstrap-orbit
+ *= require scroll_style
  *= require site_items
  *= require sidebar
 */

app/assets/stylesheets/style.css.erb

@@ -1,5 +1,5 @@
-/*style*/
-
+/*style*/
+
 @font-face{ 
 	font-family: 'WebSymbolsRegular';
 	src: url(<%= asset_path 'websymbols-regular-webfont.eot' %>);
@@ -109,7 +109,7 @@
 	text-indent: -9999px;
 	padding:6px;
 }
-#orbit-bar .nav > li.search {
+#orbit-bar .nav > li.search {
 	background-image: none;
 	overflow: hidden;
 	width: 28px;
@@ -243,7 +243,7 @@
 	padding-right: 4px;
 	border-right: 1px solid rgba(0,0,0,.2);
 	position:fixed;
-	top: 32px;
+	top: 31px;
 	z-index: 88;
 }
 #main-sidebar .nav {
@@ -286,17 +286,18 @@
 	background-color: #FFF;
 	margin-left:160px;
 	padding-top: 32px;
-	padding-bottom: 18px;
+	/*padding-bottom: 18px;*/
 	position: relative;
-	min-height: 100%;
+	padding-bottom: 45px;
+	/*min-height: 100%;*/
 }
-#main-wrap > .form-actions {
+/*#main-wrap > .form-actions {
 	background-color: #FFF;
 	text-align: center;
     padding: 17px 20px 0;
 	margin: 0;
 	border-top: none;
-}
+}*/
 #main-wrap .subnav {
 	height: auto;
 	min-height: 36px;
@@ -323,9 +324,9 @@
 #main-wrap .breadcrumb li {
 	font-size: 12px;
 	color: #999;
-}
-.form-actions .btn {
-	margin-bottom: 0;
+}
+.form-actions .btn {
+	margin-bottom: 0;
 }
 #sub-wiget {
 	clear: right;
@@ -345,7 +346,7 @@
 	text-align: right;
 	padding-left: 10px;
 	padding-right: 10px;
-	margin-bottom: 0;
+	margin-bottom: -50px;
 	clear: both;
 }
 #poststuff form {
@@ -569,8 +570,8 @@
     padding: 5px;
 }
 .popover-content {
-	-webkit-border-radius: 0 0 3px 3px;
-	-moz-border-radius: 0 0 3px 3px;
+	-webkit-border-radius: 0 0 3px 3px;
+	-moz-border-radius: 0 0 3px 3px;
 	border-radius: 0 0 3px 3px;
     padding: 5px;
 }
@@ -612,20 +613,27 @@
 }
 .text-green {
 	color: #39b54a !important;
-}
-.adbanner-list {
-	margin-top: 20px;
-}
-.adbanner-list ul {
-	margin: 0px;
-}
-.adbanner-list ul li {
-	list-style: none;
-	margin-left: 0;
-	margin-right: 20px;
-}
-.adbanner-action {
-	margin-bottom: 20px;
+}
+.adbanner-setup {
+	margin-right: 10px;
+	margin-bottom: 30px !important;
+}
+.adbanner-list {
+	border-top: 1px solid #AAA;
+	margin-right: 10px;
+	padding-top: 10px;
+	position: relative;
+}
+.adbanner-list ul {
+	margin: 0px;
+}
+.adbanner-list ul li {
+	list-style: none;
+	margin-left: 0;
+	margin-right: 20px;
+}
+.adbanner-action {
+	margin-bottom: 20px;
 }
 [class^="icons-"] {
 	display: inline-block;
@@ -915,5 +923,5 @@
 }
 /*21*/
 .icons- {
-	background-position: -0px -640px;
-}
+	background-position: -0px -640px
+}

app/assets/stylesheets/widgets.css

@@ -1,5 +1,5 @@
-/*Widget*/
-
+/*Widget*/
+
 
 .widget-size-300 {
 	width:298px;
@@ -53,11 +53,11 @@
 	display:inline-block;
 	margin-right: 5px;
 	opacity: 0.8;
-	filter: alpha(opacity:80);
+	filter: alpha(opacity=80);
 }
 .action:hover {
 	opacity: 1;
-	filter: alpha(opacity:100);
+	filter: alpha(opacity=100);
 	cursor: pointer;
 }
 .select-role {
@@ -95,12 +95,24 @@
 	opacity:.0;
     font-size: 60px;
     left: -595px/9;
-	filter: alpha(opacity: 0);
+	filter: alpha(opacity= 0);
 	outline: none;
 }
 .file-upload .upload:focus {
 	position:absolute;
 }
+.file-upload .input-medium {
+    border-radius: 3px 3px 3px 3px !important;
+    width: 267px;
+    position: relative;
+	z-index: 5;
+	display: block;
+	clear: both;
+}
+.file-upload .control-label {
+	margin-top: 0;
+	margin-bottom: 5px;
+}
 .upload-picture {
 	margin-bottom: 5px;
 	text-align: center;
@@ -120,12 +132,6 @@
     margin : 0px 0 5px;
     padding: 5px 10px;
 }
-.file-upload .input-medium {
-    border-radius: 3px 3px 3px 3px !important;
-    width: 267px;
-    position: relative;
-	z-index: 5;
-}
 #widget-link table {
 	margin-bottom:0
 }

app/helpers/admin/item_helper.rb

@@ -9,18 +9,20 @@ module Admin::ItemHelper
         when 'Link'
           dest = admin_link_path(node)
       end
-      ret << "<ul class='list'>"
+      ret << "<ul>" unless node.parent.nil?
       ret << "<li>"
+      ret << "<div class='with_action'>"
       ret << (link_to node.i18n_variable[I18n.locale], dest)
-      ret << "<div class='quick-edit'>"
+      ret << "<div class='quick-edit hide'>"
       ret << (link_to t('admin.edit'), eval("edit_admin_#{node._type.downcase}_path(node)")) if node._type.eql?('Page')
       ret << (link_to t('admin.new_page'), new_admin_page_path(:parent_id => node.id), :class => 'new_page') if node._type.eql?('Page')
       ret << (link_to t('admin.new_link'), new_admin_link_path(:parent_id => node.id), :class => 'new_link') if node._type.eql?('Page')
       ret << (link_to t(:delete), eval("delete_admin_#{node._type.downcase}_path(node, :authenticity_token => form_authenticity_token)"), :confirm => t('sure?'), :class => 'delete')
       ret << "</div>"
-      ret << "</li>"
+      ret << "</div>"
       ret << render_children(node)
-      ret << "</ul>"
+      ret << "</li>"
+      ret << "</ul>" unless node.parent.nil?
     end
     ret.html_safe
   end

app/helpers/application_helper.rb

@@ -124,11 +124,13 @@ module ApplicationHelper
     "<title>#{page.title ? page.title[I18n.locale] : page.i18n_variable[I18n.locale]}</title>\n"
   end  
 
-  def page_stylesheets(page)
+  def page_stylesheets(page, edit=nil)
     stylesheets = ''
-    stylesheets << "<link href='/assets/bootstrap.css.erb' 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.erb' rel='stylesheet' type='text/css' />\n"
+    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='#{page.design.reset_css.file.url}' rel='stylesheet' type='text/css' />\n" if page.design.reset_css
     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 }
@@ -136,17 +138,19 @@ module ApplicationHelper
     stylesheets
   end
 
-  def page_javascripts(page)
+  def page_javascripts(page, edit=nil)
     javascripts = ''
-    javascripts << "<script type='text/javascript' src='/static/jquery.js'></script>\n"
+    unless edit
+      javascripts << "<script type='text/javascript' src='/static/jquery.js'></script>\n"
+      javascripts << "<script type='text/javascript' src='/assets/bootstrap.js'></script>\n"
+      javascripts << "<script type='text/javascript' src='/assets/jquery.tinyscrollbar.min.js'></script>\n"
+      javascripts << "<script type='text/javascript' src='/assets/jquery.isotope.min.js'></script>\n"
+      javascripts << "<script type='text/javascript' src='/assets/orbit-bar-member.js'></script>\n"
+      javascripts << "<script type='text/javascript' src='/assets/orbit-bar-search.js'></script>\n"
+      javascripts << "<script type='text/javascript' src='/assets/orbit_bar.js'></script>\n"
+    end
     javascripts << "<script type='text/javascript' src='/static/jquery.cycle.all.latest.js'></script>\n"
     javascripts << "<script type='text/javascript' src='/static/kernel.js'></script>\n"
-    javascripts << "<script type='text/javascript' src='/assets/bootstrap.js'></script>\n"
-    javascripts << "<script type='text/javascript' src='/assets/jquery.tinyscrollbar.min.js'></script>\n"
-    javascripts << "<script type='text/javascript' src='/assets/jquery.isotope.min.js'></script>\n"
-    javascripts << "<script type='text/javascript' src='/assets/orbit-bar-member.js'></script>\n"
-    javascripts << "<script type='text/javascript' src='/assets/orbit-bar-search.js'></script>\n"
-    javascripts << "<script type='text/javascript' src='/assets/orbit_bar.js'></script>\n"
     javascripts << "<script type='text/javascript' src='/assets/event.js'></script>\n"
     page.design.javascripts.each do |js|
       # javascripts << "<script type='text/javascript' src='#{js.file.url}'></script>"

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

@@ -1,23 +1,27 @@
-<div class="tab-pane <%= "active"  if ad_banner_tab==@active%>" id=<%= ad_banner_tab.title %>>
-	<p><%= t("admin.ad.banner_best_size") %>：</p>
+<div class="tab-pane fade <%= "active in" if ad_banner_tab==@active%>" id=<%= ad_banner_tab.title.dehumanize %>>
 
 	<%= form_for ad_banner_tab,:url=> admin_ad_banner_path(ad_banner_tab),:method => :put,:class=>"input-medium" do |f| -%>
-		<%= f.label :ad_fx, t('admin.ad.ab_fx') %>
-		<%= f.select :ad_fx ,AdBanner::FX_TYPES %>
-		<%= f.label :transition_sec, t('admin.ad.transition_sec') %>
-		<%= f.text_field :transition_sec,:placeholder=>t('admin.ad.sec_place_holder'),:class=> "span3" %> <%= t("admin.ad.trans_unit_sec") %>
-		<%= f.submit t("admin.ad.update_banner") %>
-		<%= f.submit t("cancel"),:type=>'reset' %>
-	<div class="adbanner-list">
-		<div class="adbanner-action">
-			<%= link_to t("admin.ad.new_image"),new_admin_ad_banner_ad_image_path(ad_banner_tab) ,:class => "btn btn-primary"%>
-			<%= link_to t("modal.preview"), admin_realtime_preview_ad_banner_path(ad_banner_tab) , :class=>'preview_trigger btn btn-success'%>
+		<div class="adbanner-setup well">
+			<!--<p><%#= t("admin.ad.banner_best_size") %>：</p>-->
+			<%= f.label :ad_fx, t('admin.ad.ab_fx') %>
+			<%= f.select :ad_fx ,AdBanner::FX_TYPES %>
+			<%= f.label :transition_sec, t('admin.ad.transition_sec') %>
+			<%= f.text_field :transition_sec,:placeholder=>t('admin.ad.sec_place_holder'),:class=> "span3" %> <%= t("admin.ad.trans_unit_sec") %>
+			<br>
+			<%= f.submit t("admin.ad.update_banner"), :class => 'btn' %>
+			<%= f.submit t("cancel"),:type=>'reset', :class => 'btn'  %>
+		</div>
+		<h3>圖片列表</h3>
+		<div class="adbanner-list">
+			<div class="adbanner-action">
+				<%= link_to t("admin.ad.new_image"),new_admin_ad_banner_ad_image_path(ad_banner_tab) ,:class => "btn btn-primary"%>
+				<%= link_to t("modal.preview"), admin_realtime_preview_ad_banner_path(ad_banner_tab.title) , :class=>'preview_trigger btn btn-success'%>
+			</div>
+			<ul class="clear">
+				<%= render :partial => "ad_image_update", :collection => ad_banner_tab.ad_images,:as => :ad_image,:locals=>{:ad_banner => ad_banner_tab}  %>
+			</ul>
+			<%#= render :partial => 'new_add_banner_file', :object => ad_banner_tab.ad_images.build, :locals => { :field_name => "new_ad_images[]", :f => f, :classes => "r_destroy" } %>
 		</div>
-		<ul class="clear">
-			<%= render :partial => "ad_image_update", :collection => ad_banner_tab.ad_images,:as => :ad_image,:locals=>{:ad_banner => ad_banner_tab}  %>
-		</ul>
-		<%#= render :partial => 'new_add_banner_file', :object => ad_banner_tab.ad_images.build, :locals => { :field_name => "new_ad_images[]", :f => f, :classes => "r_destroy" } %>
-	</div>
 	<% end -%>
 	<%#= render :partial => 'preview_block',:locals=> {:ad_banner =>ad_banner_tab} %> 
 </div>

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

@@ -1,5 +1,5 @@
 
-<div id="new-a-banner" class="modal fade in tab-pane <%= 'active' if @active.nil? %>">
+<div id="new-a-banner" class="modal fade <%= 'active' if @active.nil? %>">
 	<%= form_for(:ad_banner,:remote => true, :url => admin_ad_banners_path) do |f| %>
 
 	<div class="modal-header">
@@ -28,25 +28,11 @@
 				<%= f.select :ad_fx ,AdBanner::FX_TYPES %>
 			</div>
 		</div>
-
-		<div class="modal-footer">
-			<%= f.submit t('submit'), :class=>'btn btn-primary',:remote=>true %>
-			<a class="btn" data-dismiss="modal"><%= t('cancel')%></a>
-		</div>
+	</div>
+	<div class="modal-footer">
+		<%= f.submit t('submit'), :class=>'btn btn-primary',:remote=>true %>
+		<a class="btn" data-dismiss="modal"><%= t('cancel')%></a>
+	</div>
 	<% end %>
 </div>
-<script type="text/javascript" charset="utf-8">
-$('#new_ad_banner_tab_but').on('shown', function (e) {
-			$('#new-a-banner').modal({show: true});
-});
-
-
-$('#new-a-banner').on('hidden', function (e) {
-	$('#post-body-content').find(".nav.nav-tabs").children('li.active').removeClass("active");
-	
-	$('#post-body-content').find(".nav.nav-tabs").children('li[id!="new_ad_banner_tab_but"]').last().addClass("active");
-	$('.tab-pane').find(".nav.nav-tabs").children('li[id!="new_ad_banner_tab_but"]').last().addClass("active");
-	
-});
-</script>
 

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

@@ -8,7 +8,7 @@
   <div class="modal-body">
     <p class="ad_banner_slideshow">
 			<% preview_block_ad_images_helper(ad_banner).each do |ad_image| -%>
-				<%= image_tag ad_image.file,:alt => (ad_image.title[locale] || " "),:time_to_next => ad_banner.transition_sec,:link_open=> ad_image.link_open, :link_url =>((ad_image.out_link || ad_banner.context || " ")) %>
+				<%= image_tag ad_image.file,:alt => (ad_image.title[locale] || " "),:time_to_next => ad_banner.transition_msec,:link_open=> ad_image.link_open, :link_url =>((ad_image.out_link || ad_banner.context || " ")) %>
 			<% end -%>
     </p>
   </div>

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

@@ -9,7 +9,7 @@
   <div class="modal-body">
     <p class="ad_banner_slideshow">
 			<% preview_block_ad_images_helper(ad_banner).each do |ad_image| -%>
-				<%= image_tag ad_image.file,:alt => (ad_image.title[locale] || ' '),:time_to_next => ad_banner.transition_sec,:link_open=> ad_image.link_open, :link_url =>((ad_image.out_link || ad_banner.context || ' ')) %>
+				<%= image_tag ad_image.file,:alt => (ad_image.title[locale] || ' '),:time_to_next => ad_banner.transition_msec,:link_open=> ad_image.link_open, :link_url =>((ad_image.out_link || ad_banner.context || ' ')) %>
 			<% end -%>
     </p>
   </div>

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

@@ -8,17 +8,17 @@
 
 
 <div id="post-body-content" class="clear">
-	<ul class="nav nav-tabs">
+	<ul id="banner_tab" class="nav nav-tabs">
 		<% @ad_banners.each do |ab| %>
-			<%= content_tag :li,link_to(ab.title,"##{ab.title}",:data=>{:toggle=>"tab"}),:class => (ab ==  @active ? 'active' : nil ) %>
+			<%= content_tag :li,link_to(ab.title,"##{ab.title.dehumanize}",:data=>{:toggle=>"tab"}),:class => (ab ==  @active ? 'active' : nil ) %>
 		<% end -%>
-		<%= content_tag :li,link_to(t("admin.ad.new_banner"),"#new-a-banner",:data=>{:toggle=>"tab"}),:id=>'new_ad_banner_tab_but',:class => (@active.nil? ? 'active' : nil ) %>
+		<%= content_tag :li,link_to(t("admin.ad.new_banner"),"#new-a-banner",:data=>{:toggle=>"modal"}),:id=>'new_ad_banner_tab_but',:class => (@active.nil? ? 'active' : nil ) %>
 		
 	</ul>
 	
 	<div class="tab-content">
-		<%= render :partial => 'ad_banner_tab',:collection => @ad_banners %>		
-		<%= render :partial => "modal_ad_banner_form"%>
+		<%= render :partial => 'ad_banner_tab',:collection => @ad_banners %>
 	</div>
+	<%= render :partial => "modal_ad_banner_form"%>
 		
 </div>

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

@@ -3,10 +3,10 @@
 <% end %>
 <% content_for :page_specific_javascript do %>
 	<%= javascript_include_tag "lib/datepicker"  %>
-	<%= javascript_include_tag "lib/date.format"  %>
+	<%= javascript_include_tag "lib/date.format.js"  %>
 	<%= javascript_include_tag "inc/modal-preview" %>
 	<%= javascript_include_tag "/static/jquery.cycle.all.latest.js" %>
-	<%= javascript_include_tag "inc/jquery.imagesloaded" %>
+	<%= javascript_include_tag "inc/jquery.imagesloaded.js" %>
 	
 <% end %>
 
@@ -83,7 +83,7 @@
             <span class="alert widgetInfo">此區塊圖片尺寸請使用580px × 225px</span>
             <div class="controls file-upload input-prepend">
               <label class="control-label add-on btn" for="input-upload">
-								Choose file
+								<%= t(:browse) %>
 								<%= f.file_field :file,:id=>"input-upload",:class => "upload", :onchange=> "document.getElementById('fu1').innerHTML = this.form.fu1.value = this.value;" %>
 							</label>
 							<span id="fu1" class="file-name"></span>
@@ -157,7 +157,7 @@
 					</div>
 				</div>
 				<div class="form-actions">
-					<%= link_to t("modal.preview"), admin_realtime_preview_ad_banner_path(@ad_image.ad_banner.title) ,:class=>"preview_trigger btn btn-success" rescue nil%>
+					<%#= link_to t("modal.preview"), admin_realtime_preview_ad_banner_path(@ad_image.ad_banner.title) ,:class=>"preview_trigger btn btn-success" rescue nil%>
 					<%= f.submit t("submit"),:class=>"btn btn-primary" %>
 					<%= f.submit t("cancel"),:class=>"btn ",:type => 'reset' %>
 				</div>

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

@@ -9,7 +9,7 @@
     		<%= link_back %>
 				<%= f.submit t(:edit) %>
 			<% else %>
-				<a id='submit_button'><%= t(:edit) %></a>
+				<a id='ajax_form_submit'><%= t(:edit) %></a>
 			<% end %>
 	  </div>
 	<% end %>

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

@@ -9,7 +9,7 @@
     		<%= link_back %>
 				<%= f.submit t(:create) %>
 			<% else %>
-				<a id='submit_button' class="new"><%= t(:create) %></a>
+				<a id='ajax_form_submit' class="new"><%= t(:create) %></a>
 			<% end %>
 	  </div>
 	<% end %>

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

@@ -2,198 +2,17 @@
 
 <div id="isotope">
     <div class="item element">
-        <h3><i class="icons-member"></i><a href="">Member</a></h3>
-        <div class="detail w-a h-a">
-            <p class="totle"><span>Quantity</span>9,517</p>
-            <div class="detal-list my_scroll">
-                <div class="scrollbar">
-                    <div class="track">
-                        <div class="thumb">
-                            <div class="end"></div>
-                        </div>
-                    </div>
-                </div>
-                <div class="viewport">
-                    <div class="overview">
-                        <table class="table table-striped">
-                            <tbody>
-                                <tr>
-                                    <td>University</td>
-                                    <td>2,304</td>
-                                </tr>
-                                <tr>
-                                    <td>Master</td>
-                                    <td>783</td>
-                                </tr>
-                                <tr>
-                                    <td>Doctor</td>
-                                    <td>45</td>
-                                </tr>
-                                <tr>
-                                    <td>Staff</td>
-                                    <td>62</td>
-                                </tr>
-                                <tr>
-                                    <td>Teacher</td>
-                                    <td>52</td>
-                                </tr>
-                                <tr>
-                                    <td>Professor</td>
-                                    <td>20</td>
-                                </tr>
-                                <tr>
-                                    <td>Assistant Professor</td>
-                                    <td>41</td>
-                                </tr>
-                                <tr>
-                                    <td>Substitute teacher</td>
-                                    <td>37</td>
-                                </tr>
-                                <tr>
-                                    <td>Lecturer</td>
-                                    <td>41</td>
-                                </tr>
-                                <tr>
-                                    <td>Part-time teacher</td>
-                                    <td>20</td>
-                                </tr>
-                            </tbody>
-                        </table>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <div class="item element">
-        <h3><i class="icons-content"></i><a href="">Content</a></h3>
-        <div class="detail w-a h-a">
-        <p class="totle"><span>Quantity</span>9,517</p>
-            <div class="detal-list my_scroll">
-                <div class="scrollbar">
-                    <div class="track">
-                        <div class="thumb">
-                            <div class="end"></div>
-                        </div>
-                    </div>
-                </div>
-                <div class="viewport">
-                    <div class="overview">
-                        <table class="table table-striped">
-                            <tbody>
-                                <tr>
-                                    <td>University</td>
-                                    <td>2,304</td>
-                                </tr>
-                                <tr>
-                                    <td>Master</td>
-                                    <td>783</td>
-                                </tr>
-                                <tr>
-                                    <td>Doctor</td>
-                                    <td>45</td>
-                                </tr>
-                                <tr>
-                                    <td>Staff</td>
-                                    <td>62</td>
-                                </tr>
-                                <tr>
-                                    <td>Teacher</td>
-                                    <td>52</td>
-                                </tr>
-                                <tr>
-                                    <td>Professor</td>
-                                    <td>20</td>
-                                </tr>
-                                <tr>
-                                    <td>Assistant Professor</td>
-                                    <td>41</td>
-                                </tr>
-                                <tr>
-                                    <td>Substitute teacher</td>
-                                    <td>37</td>
-                                </tr>
-                                <tr>
-                                    <td>Lecturer</td>
-                                    <td>41</td>
-                                </tr>
-                                <tr>
-                                    <td>Part-time teacher</td>
-                                    <td>20</td>
-                                </tr>
-                            </tbody>
-                        </table>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <div class="item element">
-        <h3><i class="icons-asset"></i><a href="">Asset</a></h3>
-        <div class="detail w-a h-a">
-            <p class="totle"><span>Quantity</span>9,517</p>
-            <div class="detal-list my_scroll">
-                <div class="scrollbar">
-                    <div class="track">
-                        <div class="thumb">
-                            <div class="end"></div>
-                        </div>
-                    </div>
-                </div>
-                <div class="viewport">
-                    <div class="overview">
-                        <table class="table table-striped">
-                            <tbody>
-                                <tr>
-                                    <td>University</td>
-                                    <td>2,304</td>
-                                </tr>
-                                <tr>
-                                    <td>Master</td>
-                                    <td>783</td>
-                                </tr>
-                                <tr>
-                                    <td>Doctor</td>
-                                    <td>45</td>
-                                </tr>
-                                <tr>
-                                    <td>Staff</td>
-                                    <td>62</td>
-                                </tr>
-                                <tr>
-                                    <td>Teacher</td>
-                                    <td>52</td>
-                                </tr>
-                                <tr>
-                                    <td>Professor</td>
-                                    <td>20</td>
-                                </tr>
-                                <tr>
-                                    <td>Assistant Professor</td>
-                                    <td>41</td>
-                                </tr>
-                                <tr>
-                                    <td>Substitute teacher</td>
-                                    <td>37</td>
-                                </tr>
-                                <tr>
-                                    <td>Lecturer</td>
-                                    <td>41</td>
-                                </tr>
-                                <tr>
-                                    <td>Part-time teacher</td>
-                                    <td>20</td>
-                                </tr>
-                            </tbody>
-                        </table>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <div class="item element">
-        <h3><i class="icons-"></i><a href="">Traffic</a></h3>
+        <h3><i class="icons-content"></i><a href=""><%= t(:content) %></a></h3>
         <div class="detail w-a h-b">
-            <p class="totle"><span>Quantity</span>9,517</p>
+            <p class="totle"><span><%= t(:all_content) %></span>9,517</p>
+            <table class="table table-striped">
+                <thead>
+                    <tr>
+                        <th><%= t(:module) %></th>
+                        <th class="span2"><%= t(:quantity) %></th>
+                    </tr>
+                </thead>
+            </table>
             <div class="detal-list my_scroll">
                 <div class="scrollbar">
                     <div class="track">
@@ -207,128 +26,44 @@
                         <table class="table table-striped">
                             <tbody>
                                 <tr>
-                                    <td>University</td>
-                                    <td>2,304</td>
+                                    <td>公告</td>
+                                    <td class="span2">2,304</td>
                                 </tr>
                                 <tr>
-                                    <td>Master</td>
-                                    <td>783</td>
+                                    <td>新聞</td>
+                                    <td class="span2">783</td>
                                 </tr>
                                 <tr>
-                                    <td>Doctor</td>
-                                    <td>45</td>
+                                    <td>連結</td>
+                                    <td class="span2">45</td>
                                 </tr>
                                 <tr>
-                                    <td>Staff</td>
-                                    <td>62</td>
+                                    <td>連結</td>
+                                    <td class="span2">62</td>
                                 </tr>
                                 <tr>
-                                    <td>Teacher</td>
-                                    <td>52</td>
+                                    <td>連結</td>
+                                    <td class="span2">52</td>
                                 </tr>
                                 <tr>
-                                    <td>Professor</td>
-                                    <td>20</td>
+                                    <td>新聞</td>
+                                    <td class="span2">20</td>
                                 </tr>
                                 <tr>
-                                    <td>Assistant Professor</td>
-                                    <td>41</td>
+                                    <td>公告</td>
+                                    <td class="span2">41</td>
                                 </tr>
                                 <tr>
-                                    <td>Substitute teacher</td>
-                                    <td>37</td>
+                                    <td>公告</td>
+                                    <td class="span2">37</td>
                                 </tr>
                                 <tr>
-                                    <td>Lecturer</td>
-                                    <td>41</td>
+                                    <td>公告</td>
+                                    <td class="span2">41</td>
                                 </tr>
                                 <tr>
-                                    <td>Part-time teacher</td>
-                                    <td>20</td>
-                                </tr>
-                                <tr>
-                                    <td>Staff</td>
-                                    <td>62</td>
-                                </tr>
-                                <tr>
-                                    <td>Teacher</td>
-                                    <td>52</td>
-                                </tr>
-                                <tr>
-                                    <td>Professor</td>
-                                    <td>20</td>
-                                </tr>
-                                <tr>
-                                    <td>Assistant Professor</td>
-                                    <td>41</td>
-                                </tr>
-                                <tr>
-                                    <td>Substitute teacher</td>
-                                    <td>37</td>
-                                </tr>
-                                <tr>
-                                    <td>Lecturer</td>
-                                    <td>41</td>
-                                </tr>
-                                <tr>
-                                    <td>Part-time teacher</td>
-                                    <td>20</td>
-                                </tr>
-                                <tr>
-                                    <td>Staff</td>
-                                    <td>62</td>
-                                </tr>
-                                <tr>
-                                    <td>Teacher</td>
-                                    <td>52</td>
-                                </tr>
-                                <tr>
-                                    <td>Professor</td>
-                                    <td>20</td>
-                                </tr>
-                                <tr>
-                                    <td>Assistant Professor</td>
-                                    <td>41</td>
-                                </tr>
-                                <tr>
-                                    <td>Substitute teacher</td>
-                                    <td>37</td>
-                                </tr>
-                                <tr>
-                                    <td>Lecturer</td>
-                                    <td>41</td>
-                                </tr>
-                                <tr>
-                                    <td>Part-time teacher</td>
-                                    <td>20</td>
-                                </tr>
-                                <tr>
-                                    <td>Staff</td>
-                                    <td>62</td>
-                                </tr>
-                                <tr>
-                                    <td>Teacher</td>
-                                    <td>52</td>
-                                </tr>
-                                <tr>
-                                    <td>Professor</td>
-                                    <td>20</td>
-                                </tr>
-                                <tr>
-                                    <td>Assistant Professor</td>
-                                    <td>41</td>
-                                </tr>
-                                <tr>
-                                    <td>Substitute teacher</td>
-                                    <td>37</td>
-                                </tr>
-                                <tr>
-                                    <td>Lecturer</td>
-                                    <td>41</td>
-                                </tr>
-                                <tr>
-                                    <td>Part-time teacher</td>
-                                    <td>20</td>
+                                    <td>公告</td>
+                                    <td class="span2">20</td>
                                 </tr>
                             </tbody>
                         </table>
@@ -338,72 +73,17 @@
         </div>
     </div>
     <div class="item element">
-        <h3><i class="icons-"></i><a href="">Site info</a></h3>
-        <div class="detail w-b h-a">
-            <p class="totle"><span>Quantity</span>9,517</p>
-            <div class="detal-list my_scroll">
-                <div class="scrollbar">
-                    <div class="track">
-                        <div class="thumb">
-                            <div class="end"></div>
-                        </div>
-                    </div>
-                </div>
-                <div class="viewport">
-                    <div class="overview">
-                        <table class="table table-striped">
-                            <tbody>
-                                <tr>
-                                    <td>University</td>
-                                    <td>2,304</td>
-                                </tr>
-                                <tr>
-                                    <td>Master</td>
-                                    <td>783</td>
-                                </tr>
-                                <tr>
-                                    <td>Doctor</td>
-                                    <td>45</td>
-                                </tr>
-                                <tr>
-                                    <td>Staff</td>
-                                    <td>62</td>
-                                </tr>
-                                <tr>
-                                    <td>Teacher</td>
-                                    <td>52</td>
-                                </tr>
-                                <tr>
-                                    <td>Professor</td>
-                                    <td>20</td>
-                                </tr>
-                                <tr>
-                                    <td>Assistant Professor</td>
-                                    <td>41</td>
-                                </tr>
-                                <tr>
-                                    <td>Substitute teacher</td>
-                                    <td>37</td>
-                                </tr>
-                                <tr>
-                                    <td>Lecturer</td>
-                                    <td>41</td>
-                                </tr>
-                                <tr>
-                                    <td>Part-time teacher</td>
-                                    <td>20</td>
-                                </tr>
-                            </tbody>
-                        </table>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <div class="item element">
-        <h3><i class="icons-"></i><a href="">Connection</a></h3>
+        <h3><i class="icons-member"></i><a href=""><%= t(:member) %></a></h3>
         <div class="detail w-a h-a">
-            <p class="totle"><span>Quantity</span>9,517</p>
+            <p class="totle"><span><%= t(:all_member) %></span>2,217</p>
+            <table class="table table-striped">
+                <thead>
+                    <tr>
+                        <th><%= t(:role) %></th>
+                        <th class="span2"><%= t(:quantity) %></th>
+                    </tr>
+                </thead>
+            </table>
             <div class="detal-list my_scroll">
                 <div class="scrollbar">
                     <div class="track">
@@ -463,4 +143,450 @@
             </div>
         </div>
     </div>
+    <div class="item element">
+        <h3><i class="icons-asset"></i><a href=""><%= t(:file) %></a></a></h3>
+        <div class="detail w-a h-a">
+            <p class="totle"><span><%= t(:all_file) %></span>3,422</p>
+            <table class="table table-striped">
+                <thead>
+                    <tr>
+                        <th><%= t(:file_type) %></th>
+                        <th class="span2"><%= t(:quantity) %></th>
+                    </tr>
+                </thead>
+            </table>
+            <div class="detal-list my_scroll">
+                <div class="scrollbar">
+                    <div class="track">
+                        <div class="thumb">
+                            <div class="end"></div>
+                        </div>
+                    </div>
+                </div>
+                <div class="viewport">
+                    <div class="overview">
+                        <table class="table table-striped">
+                            <tbody>
+                                <tr>
+                                    <td>Word</td>
+                                    <td>304</td>
+                                </tr>
+                                <tr>
+                                    <td>PDF</td>
+                                    <td>783</td>
+                                </tr>
+                                <tr>
+                                    <td>PowerPoint</td>
+                                    <td>45</td>
+                                </tr>
+                                <tr>
+                                    <td>Excel</td>
+                                    <td>62</td>
+                                </tr>
+                                <tr>
+                                    <td>Jpeg</td>
+                                    <td>52</td>
+                                </tr>
+                                <tr>
+                                    <td>Gif</td>
+                                    <td>20</td>
+                                </tr>
+                                <tr>
+                                    <td>Png</td>
+                                    <td>41</td>
+                                </tr>
+                                <tr>
+                                    <td>Avi</td>
+                                    <td>37</td>
+                                </tr>
+                                <tr>
+                                    <td>Txt</td>
+                                    <td>41</td>
+                                </tr>
+                                <tr>
+                                    <td>Zip</td>
+                                    <td>20</td>
+                                </tr>
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="item element">
+        <h3><i class="icons-"></i><a href=""><%= t(:referral_in_links) %></a></h3>
+        <div class="detail w-a h-a">
+            <p class="totle"><span><%= t(:statistics) %></span>517</p>
+            <table class="table table-striped">
+                <thead>
+                    <tr>
+                        <th><%= t(:site_name) %></th>
+                        <th class="span2"><%= t(:statistics) %></th>
+                    </tr>
+                </thead>
+            </table>
+            <div class="detal-list my_scroll">
+                <div class="scrollbar">
+                    <div class="track">
+                        <div class="thumb">
+                            <div class="end"></div>
+                        </div>
+                    </div>
+                </div>
+                <div class="viewport">
+                    <div class="overview">
+                        <table class="table table-striped">
+                            <tbody>
+                                <tr>
+                                    <td>Ruling</td>
+                                    <td class="span2">36</td>
+                                </tr>
+                                <tr>
+                                    <td>Yahoo</td>
+                                    <td class="span2">31</td>
+                                </tr>
+                                <tr>
+                                    <td>Google</td>
+                                    <td class="span2">3,187</td>
+                                </tr>
+                                <tr>
+                                    <td>facebook</td>
+                                    <td class="span2">公告</td>
+                                </tr>
+                                <tr>
+                                    <td>Title5</td>
+                                    <td class="span2">公告</td>
+                                </tr>
+                                <tr>
+                                    <td>Title6</td>
+                                    <td class="span2">頁面</td>
+                                </tr>
+                                <tr>
+                                    <td>Title7</td>
+                                    <td class="span2">頁面</td>
+                                </tr>
+                                <tr>
+                                    <td>Title8</td>
+                                    <td class="span2">公告</td>
+                                </tr>
+                                <tr>
+                                    <td>Title9</td>
+                                    <td class="span2">頁面</td>
+                                </tr>
+                                <tr>
+                                    <td>Title10</td>
+                                    <td class="span2">公告</td>
+                                </tr>
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="item element">
+        <h3><i class="icons-"></i><a href=""><%= t(:most_visited_page) %></a></h3>
+        <div class="detail noStatistics w-b h-a">
+            <table class="table table-striped">
+                <thead>
+                    <tr>
+                        <th><%= t(:title) %></th>
+                        <th class="span2"><%= t(:module) %></th>
+                        <th class="span2"><%= t(:hits) %></th>
+                    </tr>
+                </thead>
+            </table>
+            <div class="detal-list my_scroll">
+                <div class="scrollbar">
+                    <div class="track">
+                        <div class="thumb">
+                            <div class="end"></div>
+                        </div>
+                    </div>
+                </div>
+                <div class="viewport">
+                    <div class="overview">
+                        <table class="table table-striped">
+                            <tbody>
+                                <tr>
+                                    <td>Title1</td>
+                                    <td class="span2">公告</td>
+                                    <td class="span2">2,549</td>
+                                </tr>
+                                <tr>
+                                    <td>Title2</td>
+                                    <td class="span2">頁面</td>
+                                    <td class="span2">1,022</td>
+                                </tr>
+                                <tr>
+                                    <td>Title3</td>
+                                    <td class="span2">頁面</td>
+                                    <td class="span2">928</td>
+                                </tr>
+                                <tr>
+                                    <td>Title4</td>
+                                    <td class="span2">公告</td>
+                                    <td class="span2">904</td>
+                                </tr>
+                                <tr>
+                                    <td>Title5</td>
+                                    <td class="span2">公告</td>
+                                    <td class="span2">867</td>
+                                </tr>
+                                <tr>
+                                    <td>Title6</td>
+                                    <td class="span2">頁面</td>
+                                    <td class="span2">830</td>
+                                </tr>
+                                <tr>
+                                    <td>Title7</td>
+                                    <td class="span2">頁面</td>
+                                    <td class="span2">749</td>
+                                </tr>
+                                <tr>
+                                    <td>Title8</td>
+                                    <td class="span2">公告</td>
+                                    <td class="span2">702</td>
+                                </tr>
+                                <tr>
+                                    <td>Title9</td>
+                                    <td class="span2">頁面</td>
+                                    <td class="span2">639</td>
+                                </tr>
+                                <tr>
+                                    <td>Title10</td>
+                                    <td class="span2">公告</td>
+                                    <td class="span2">549</td>
+                                </tr>
+                                <tr>
+                                    <td>Title1</td>
+                                    <td class="span2">公告</td>
+                                    <td class="span2">2,549</td>
+                                </tr>
+                                <tr>
+                                    <td>Title2</td>
+                                    <td class="span2">頁面</td>
+                                    <td class="span2">1,022</td>
+                                </tr>
+                                <tr>
+                                    <td>Title3</td>
+                                    <td class="span2">頁面</td>
+                                    <td class="span2">928</td>
+                                </tr>
+                                <tr>
+                                    <td>Title4</td>
+                                    <td class="span2">公告</td>
+                                    <td class="span2">904</td>
+                                </tr>
+                                <tr>
+                                    <td>Title5</td>
+                                    <td class="span2">公告</td>
+                                    <td class="span2">867</td>
+                                </tr>
+                                <tr>
+                                    <td>Title6</td>
+                                    <td class="span2">頁面</td>
+                                    <td class="span2">830</td>
+                                </tr>
+                                <tr>
+                                    <td>Title7</td>
+                                    <td class="span2">頁面</td>
+                                    <td class="span2">749</td>
+                                </tr>
+                                <tr>
+                                    <td>Title8</td>
+                                    <td class="span2">公告</td>
+                                    <td class="span2">702</td>
+                                </tr>
+                                <tr>
+                                    <td>Title9</td>
+                                    <td class="span2">頁面</td>
+                                    <td class="span2">639</td>
+                                </tr>
+                                <tr>
+                                    <td>Title10</td>
+                                    <td class="span2">公告</td>
+                                    <td class="span2">549</td>
+                                </tr>
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="item element">
+        <h3><i class="icons-"></i><a href=""><%= t(:traffic) %></a></h3>
+        <div class="detail w-a h-a">
+            <p class="totle"><span><%= t(:total_visitors) %></span>438,913</p>
+            <table class="table table-striped">
+                <thead>
+                    <tr>
+                        <th><%= t(:item) %></th>
+                        <th class="span2"><%= t(:data) %></th>
+                    </tr>
+                </thead>
+            </table>
+            <div class="detal-list my_scroll">
+                <div class="scrollbar">
+                    <div class="track">
+                        <div class="thumb">
+                            <div class="end"></div>
+                        </div>
+                    </div>
+                </div>
+                <div class="viewport">
+                    <div class="overview">
+                        <table class="table table-striped">
+                            <tbody>
+                                <tr>
+                                    <td>Visitors Today</td>
+                                    <td>2,304</td>
+                                </tr>
+                                <tr>
+                                    <td>Visitors This Month</td>
+                                    <td>783</td>
+                                </tr>
+                                <tr>
+                                    <td>Visitor This Tear</td>
+                                    <td>45</td>
+                                </tr>
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="item element">
+        <h3><i class="icons-"></i><a href=""><%= t(:site_info) %></a></h3>
+        <div class="detail noStatistics w-b h-a">
+            <!--<p class="totle"><span><%= t(:statistics) %></span>9,517</p>-->
+            <table class="table table-striped">
+                <thead>
+                    <tr>
+                        <th><%= t(:item) %></th>
+                        <th class="span6"><%= t(:content) %></th>
+                    </tr>
+                </thead>
+            </table>
+            <div class="detal-list my_scroll">
+                <div class="scrollbar">
+                    <div class="track">
+                        <div class="thumb">
+                            <div class="end"></div>
+                        </div>
+                    </div>
+                </div>
+                <div class="viewport">
+                    <div class="overview">
+                        <table class="table table-striped">
+                            <tbody>
+                                <tr>
+                                    <td>Title:</td>
+                                    <td class="span6">National Chengchi University</td>
+                                </tr>
+                                <tr>
+                                    <td>Description:</td>
+                                    <td class="span6">......</td>
+                                </tr>
+                                <tr>
+                                    <td>Keywords</td>
+                                    <td class="span6">.....</td>
+                                </tr>
+                                <tr>
+                                    <td>Online Date:</td>
+                                    <td class="span6">2012/04/30</td>
+                                </tr>
+                                <tr>
+                                    <td>WedID:</td>
+                                    <td class="span6">nccu</td>
+                                </tr>
+                                <tr>
+                                    <td>Softwave Version:</td>
+                                    <td class="span6">R4 beta</td>
+                                </tr>
+                                <tr>
+                                    <td>Warranty:</td>
+                                    <td class="span6">Valid</td>
+                                </tr>
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="item element">
+        <h3><i class="icons-"></i><a href=""><%= t(:recent_update) %></a></h3>
+        <div class="detail noStatistics w-a h-a">
+            <!--<p class="totle"><span><%= t(:statistics) %></span>9,517</p>-->
+            <table class="table table-striped">
+                <thead>
+                    <tr>
+                        <th><%= t(:title) %></th>
+                        <th class="span2"><%= t(:module) %></th>
+                    </tr>
+                </thead>
+            </table>
+            <div class="detal-list my_scroll">
+                <div class="scrollbar">
+                    <div class="track">
+                        <div class="thumb">
+                            <div class="end"></div>
+                        </div>
+                    </div>
+                </div>
+                <div class="viewport">
+                    <div class="overview">
+                        <table class="table table-striped">
+                            <tbody>
+                                <tr>
+                                    <td>Title1</td>
+                                    <td class="span2">公告</td>
+                                </tr>
+                                <tr>
+                                    <td>Title2</td>
+                                    <td class="span2">頁面</td>
+                                </tr>
+                                <tr>
+                                    <td>Title3</td>
+                                    <td class="span2">頁面</td>
+                                </tr>
+                                <tr>
+                                    <td>Title4</td>
+                                    <td class="span2">公告</td>
+                                </tr>
+                                <tr>
+                                    <td>Title5</td>
+                                    <td class="span2">公告</td>
+                                </tr>
+                                <tr>
+                                    <td>Title6</td>
+                                    <td class="span2">頁面</td>
+                                </tr>
+                                <tr>
+                                    <td>Title7</td>
+                                    <td class="span2">頁面</td>
+                                </tr>
+                                <tr>
+                                    <td>Title8</td>
+                                    <td class="span2">公告</td>
+                                </tr>
+                                <tr>
+                                    <td>Title9</td>
+                                    <td class="span2">頁面</td>
+                                </tr>
+                                <tr>
+                                    <td>Title10</td>
+                                    <td class="span2">公告</td>
+                                </tr>
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
 </div>

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

@@ -1,24 +1,41 @@
 <%= flash_messages %>
+<div id="filter" class="subnav">
+	<div class="filters">
+		<div id="sort_headers" class="table-label">
+			<table class="table main-list">	
+				<thead>
+					<tr>
+						<th class="span1 strong">
+							<input type="checkbox">
+							<a href class="list-remove"><i class="icon-trash"></i></a>
+						</th>
+						<th class="span7"><%= t('admin.title') %></th>
+						<th class="span2"><%= t('admin.author') %></th>
+						<th class="span2"><%= t('admin.intro') %></th>
+					</tr>
+				</thead>
+			</table>
+		</div>
+	</div>
+</div>
+
 <table class="table main-list">
 	<thead>
 		<tr>
-			<th class="span1 strong">
-				<input type="checkbox">
-				<a href class="list-remove"><i class="icon-trash"></i></a>
-			</th>
-			<th class="span7 select"><%= t('admin.title') %></th>
-			<th class="span1-2"><%= t('admin.author') %></th>
-			<th class="span1-2"><%= t('admin.intro') %></th>
+			<th class="span1 strong"></th>
+			<th class="span7"></th>
+			<th class="span2"></th>
+			<th class="span2"></th>
 		</tr>
 	</thead>
 	<tbody>
 		<% @designs.each do |design| %>
-			<tr>
+			<tr class="with_action">
 				<td><input type="checkbox"></td>
 				<td>
 					<%= design.title %>
 					<div class="quick-edit">
-						<ul class="nav nav-pills">
+						<ul class="nav nav-pills hide">
 							<li><%= link_to t(:edit), edit_admin_design_path(design), :class => 'edit'  %></li>
 							<li class="dropdown"><%= link_to t(:delete), admin_design_path(design), :confirm => t('sure?'), :method => :delete, :class => 'delete' %></li>
 						</ul>
@@ -30,6 +47,6 @@
 		<% end %>
 	</tbody>
 </table>
-<div class="form-actions">
+<div class="form-actions form-fixed pagination-right">
 	<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('admin.add'), new_admin_design_path, :class => 'btn btn-primary' %>
 </div>

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

@@ -1,3 +1 @@
-<div id="viewport">
-	<%= render_node_and_children(Item.first(:conditions => {:parent_id => nil})) %>
-</div>
+<%= render_node_and_children(Item.first(:conditions => {:parent_id => nil})) %>

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

@@ -1,7 +1,7 @@
 <%= flash_messages %>
 
 
-<%= page_stylesheets(@item).html_safe %> 
-<%= page_javascripts(@item).html_safe %> 
+<%= page_stylesheets(@item, true).html_safe %> 
+<%= page_javascripts(@item, true).html_safe %> 
 
 <%= parse_page_edit_noko(@item).html_safe %>

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

@@ -1,5 +1 @@
-<% content_for :sidebar do %>
-	<%= render 'admin/items/site_map_left_bar' %>
-<% end -%>
-
 <%= render 'show' %>

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

@@ -1,4 +1,4 @@
-<div class="subnav">
+<!--<div class="subnav">
     <ul class="nav nav-pills filter">
         <li class="accordion-group">
             <form class="form-search">
@@ -8,9 +8,10 @@
         </li>
     </ul>
 </div>
+-->
 <div id='tags' class="clear">
 	<%= render :partial => 'tag', :collection => @tags %>
 </div>
-<div class="form-actions">
+<div class="form-actions form-fixed pagination-right">
 	<%= render 'add' %>
 </div>

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

@@ -16,10 +16,10 @@
 					<span class="help-inline">Please correct the error</span>
 				</div>
 				<div class="control-group clear">
-					<%= link_to t(:forgot_password), new_user_password_path, :class => 'pull-right forgot' %>
 					<%= f.label :password %>
 					<%= f.password_field :password, :placeholder => t(:dots), :style => "width: 330px;" %>
 					<span class="help-inline">Please correct the error</span>
+					<%= link_to t(:forgot_password), new_user_password_path, :class => 'pull-right forgot hide' %>
 				</div>
 			</div>
 		</div>

app/views/layouts/_orbit_bar.html.erb

@@ -69,7 +69,7 @@
 						<a class="dropdown-toggle orbit-bar-member" href="#"><%= t(:login) %></a>
 						<div class="dropdown-menu">
 							<ul class="log">
-								<li class="title"></li>
+								<li class="title hide"></li>
 								
 								<%= form_for :user, :url => user_session_path do |f| %>
 									<li>
@@ -84,7 +84,7 @@
 										  <%= f.password_field :password, :class => 'span2', :placeholder => t(:password), :size => 16 %>
 										</div>
 									</li>
-									<li class="clear">
+									<li class="clear hide">
 										<%= link_to t(:forgot_password), new_user_password_path, :class => 'forgot' %>
 									</li>
 									<li>
@@ -94,10 +94,10 @@
 											<span style="display: inline-block;height: 10px;"><%= t(:remember_me) %></span>
 										</label>
 									</li>
-									<li class="divider"><span><%= t(:or_lower) %></span></li>
+									<li class="divider hide"><span><%= t(:or_lower) %></span></li>
 								<% end %>
 							</ul>
-							<%= link_to t(:register), new_user_registration_path, :class => 'btn btn-danger register' %>
+							<%#= link_to t(:register), new_user_registration_path, :class => 'btn btn-danger register' %>
 						</div>
 					</li>
 				<% end %>

app/views/layouts/_side_bar.html.erb

@@ -26,9 +26,9 @@
 
 <%= content_tag :li, :class => active_for_controllers('page_contexts') do -%>
 	<%= link_to content_tag(:i, nil, :class => 'icons-page') + 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') %>
-	<% end -%>
+		<%#= 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') %>
+		<%# end -%>
 <% end -%>
 
 <%= content_tag :li, :class => active_for_controllers('designs') do -%>
@@ -37,18 +37,18 @@
 
 <%= content_tag :li, :class => active_for_controllers('ad_banners', 'ad_images') do -%>
 	<%= link_to content_tag(:i, nil, :class => 'icons-link') + 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') %>
-	<% end %>
+	<%#= 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') %>
+	<%# end %>
 <% end %>
 
 <%= content_tag :li, :class => active_for_controllers('web_links', '/panel/web_resource/back_end/tags', 'web_link_categorys') do -%>
 	<%= link_to content_tag(:i, nil, :class => 'icons-link') + 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_link', 'index') %>
-		<%= content_tag :li, link_to(t('announcement.add_new'), new_panel_web_resource_back_end_web_link_path), :class => active_for_action('web_link', 'new') %>
+		<%= 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('announcement.add_new'), new_panel_web_resource_back_end_web_link_path), :class => active_for_action('web_links', 'new') %>
 		<%= 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') %>
 		<%= 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') %>
 	<% end -%>

app/views/layouts/site_editor.html.erb

@@ -9,31 +9,30 @@
 	<![endif]-->
 	<%= stylesheet_link_tag "site_editor" %>
 	<%= javascript_include_tag "site_editor" %>
-	<%= yield :page_specific_css %>
-	<%= yield :page_specific_javascript %>
 	<%= csrf_meta_tag %>
 </head>
 <body>
-<!--
-	<header id="back_banner_link" class="fixed clear" >
-		<nav id="back_orbit">
-			<span>Orbit Icon</span>
-			<%= render 'layouts/drop_down_menu' %>
-		</nav>
-		<div class="hmenu">
-			<%= render 'devise/menu/login_items' %>
-			<div class="lang"><%= render 'layouts/lang_menu' %></div>
+	<%= render 'layouts/orbit_bar' %>
+	<nav id="main-sidebar" class="my_scroll">
+		<div class="scrollbar">
+			<div class="track">
+				<div class="thumb">
+					<div class="end"></div>
+				</div>
+			</div>
 		</div>
-	</header>
--->
+		<div class="viewport">
+			<div id='back_sidebar' class="overview">
+				<ul class="nav nav-list">
+					<%= yield :sidebar %>
+				</ul>
+			</div>
+		</div>
+	</nav>
 	<div id="main-wrap">
-		<div id="main-sidebar"><%= yield :sidebar %></div>
-		<div class="main"><div id='back_main' class="main2">
+		<div id='back_main'>
 			<%= yield %>
-		</div></div>
-		<div class="tertiary"><%= yield :tertiary %></div>
-		<div id="back_footer"><p><%= APP_CONFIG['ruling_digital'] %></p></div>
+		</div>
 	</div>
-
 </body>
 </html>