From 6b2aeadde6e98a1d3d8ed70a040b5b3bf8ca178e Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris@rulingcom.com>
Date: Wed, 29 Feb 2012 16:01:50 +0800
Subject: [PATCH] Changes for nccu

---
 Gemfile                                       |    2 +-
 Gemfile.lock                                  |    4 +
 app/assets/images/nccu_logo.png               |  Bin 0 -> 1964 bytes
 app/assets/javascripts/orbit-1.0.js           |  201 +-
 app/assets/stylesheets/bootstrap.css.erb      |   29 +-
 app/assets/stylesheets/style.css.erb          | 1647 +++++++++--------
 app/views/layouts/_orbit_bar.html.erb         |   10 +-
 app/views/layouts/_side_bar.html.erb          |    4 +-
 config/application.rb                         |    2 +-
 config/environments/development.rb            |   28 +-
 config/locales/en.yml                         |    1 +
 config/locales/zh_tw.yml                      |    5 +-
 lib/parsers/parser_front_end.rb               |    2 +-
 .../front_end/bulletins_controller.rb         |    4 +-
 .../app/models/bulletin_category.rb           |    4 +
 .../front_end/bulletins/index.html.erb        |    6 +-
 .../widget/bulletins/index.html.erb           |    2 +-
 .../widget/web_links_controller.rb            |    4 +-
 18 files changed, 999 insertions(+), 956 deletions(-)
 create mode 100644 app/assets/images/nccu_logo.png

diff --git a/Gemfile b/Gemfile
index 9eca9186..eb1f5434 100644
--- a/Gemfile
+++ b/Gemfile
@@ -20,7 +20,7 @@ gem 'rubyzip'
 gem 'sinatra'
 gem 'sprockets'
 gem 'tinymce-rails'
-# gem 'therubyracer'
+gem 'therubyracer'
 
 # Gems used only for assets and not required
 # in production environments by default.
diff --git a/Gemfile.lock b/Gemfile.lock
index 18f66fbf..8889b1d5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -84,6 +84,7 @@ GEM
       railties (~> 3.0)
       thor (~> 0.14)
     json (1.6.5)
+    libv8 (3.3.10.4)
     linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
     mail (2.3.0)
@@ -179,6 +180,8 @@ GEM
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     subexec (0.2.1)
+    therubyracer (0.9.9)
+      libv8 (~> 3.3.10)
     thor (0.14.6)
     tilt (1.3.3)
     tinymce-rails (3.4.8)
@@ -234,6 +237,7 @@ DEPENDENCIES
   sinatra
   spork
   sprockets
+  therubyracer
   tinymce-rails
   uglifier
   watchr
diff --git a/app/assets/images/nccu_logo.png b/app/assets/images/nccu_logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..68b9a72f669226970e3634612793a79e99a2625f
GIT binary patch
literal 1964
zcmaJ?Yg7|w8Xh%;7zL#Cpn%9QNL!F3lf)2+iGYMi&>&*u5^Eus2}H<DoD34Mh&Mb7
z#4WZcS}xwDQWPl2ikB79x*`ZDMFqSea8MA@qTH6A-H8?3AIr`;Gw=6(=Xsv@eZTiP
zXEMV=S6a~=X#fCNNrFY;WL!wTPE-r>i&2NX$lyQ(MG@;T4Uw$C5g<T~DG^YjQ^X<R
zh(evRxgHS!z${QJiz1?=tNAKS$55Ct45Lm@vH?KgXVfcH2?zlykvJ_XgoZ9&fk3TV
z2t{(Guv8z2#A}07ab#U;s7#fbpz>8ie#=3DkxvTf5JCYOb&05fZxllBb@}Ale9VNv
z_YfjM2>nr1lr#(s#Bc=UGGMw2_J%=k7K6oE%H#38KsL;RnJ}BlV$)eXK8MYRVerEP
zk=byyh952xf5=7dgit&|==n@$a&j^wnZv;FI3~;2*VnAUX46Ro-H?J33L_mgxJ@aD
z5Q7TW>Ip4|f@Vd95=$b45LxLTE$H+gWl_V2Ya%a<X;kQ$ECy_DX$mNn{(q=W_YrL%
z!jV7g{hz`HS&ANEh9d?n30IMW)3}*a>G^>;q98C_hGB_Qw-^?W5ttz!(}RKQxL~9f
zRb$D9_h_k<FF_520#zXrkq{#J46Rnp7sEdA(xqaSH``|^ixtH3VT;%S+(3>f5a#)^
zcmY#f5vEGgAt*7$RsYFlPs=qML8m7(ix6D91yPG}Ob5Pin6I6-mLT!8dLOvz>1%<f
z<ub`)nC7wmWz17Yq<75AkESIzA8n7Iq}OrM)WrPkUjcvuNkjoMV}~h15<1{NF9~ei
zW!in6_DgiR=t<1N?LCwnyTt`$=&_jn1rX{FRj3q|%7ITd?6!5Hd^*Ny9v|Yi9qsmU
zrSI?9VpG=t?x#%~&O|ggw&3My4|D^?g;z`9tu1M#&CSgLrL=^16`X_1sImRO|Ndy=
z<bDNrVATHV&o2mmKhNXcZ@=Be9_}fW_yu=5J2`bepEEW#_5iy?>+Fxp2|0JT?GW*g
zn)>?sqP3@9y?WJ{JU=4$@qw>*%(b%e_})He1uc^q6BFZith}_P+$~C_(VQCe?;jb7
z@Vno0iSO7XnlXczU)D+Cc=sh|A<jqg;bpFycIqBfKMETzD=TXsstwuPPxTfER<D^8
zrg;74&7Gj`$;rvlvuo9>I(imtUa=$=bxTS~k;pHNJ->OAI>SM_s18@w&F+0PX;1g^
zqC`eU-Wp%DPt*E3m6ItJEpRQdGOdJ*dOb}|gIB+?ZC%@#31}m_+UK-6XZ`C=F7<p7
zg<7r)vlICFEvaePW2$1*3Od)*9hb*^_0?E*c6QhJc#3<I<G0jmaji8>6Uidew{ERe
z7u@n}G5B;V1a;4JV#Z9`>$Fur`FvkLR$N@XBckSU-T}=?*9+F^1d$6af9xjy;>o+{
zj0I%?{7qU~lKQ1h;$GTDxtzuYMsz=Hmk*j?c-)>jORPO``Sj`25LDeIvcAlGEC12U
z_TKq<(bv>j|Gp7KHRWt?Jmc(q^6h`3s;n*ykB*L>NNxUdp5V&o?fx+{^d1%qemQ>p
zDK$9YvwfInde0=ARhwqAoD_SP*Vu$e()ZRucF#B3=32<+#yUqoy|Aa-XPewxq1^h=
zGz7>#O9<(5rezeytzS|27LdhSEpl-gJ&>0-TwuWQyGKJxd)wu$t*xGi4=Fw6p8Fzc
zf{7)(UDqyJfiDB;+VETX85UvL11O4i0OHJFZTpGg%J#&6o{6}7L;B!a;)rQ(Zd*@&
z$)}Xw%2ONtoPc|8-c%gBGkl5d;lAPg!n(gN<Tcgr-CvS)x@`HE5AT6?c6K`~TAJ_v
zU}Ix5($#e|;cIOybbnvp4QzMe>x7C~4Lh1Vvnt*D<ahF_b1N{1zTu?k?iZI&%=Ens
zy=;pzIX51k=~h&T%1Tg6OH22fXB}Q^3&X3@fuNIbi^i`nuC_ZnKfKC=d(I=jr9e~p
z;?_aC7?J;pj3=MOS6S4C2)DT;)*NZrHTe)kWQWwZr4;qfXNTgx3v|F2yIk~EhLms0
zk(c;tt*@(Z-@aW@FnG4Kbn(iYi;mdhKLegy;PzgJ7d?HSuU1YTo>y)ibYab!HNLdJ
zJ*8-51)OEe8lG?2cz<wW*Q)$J_j9@HUBAshWO-bltI&~xfG4#DLVJu~H!<5XOV2JY
lb7@>>0PY1Jo45kZ0;-IeY1<BRW}E+?lAuu0*%h%n{|g+y74!fA

literal 0
HcmV?d00001

diff --git a/app/assets/javascripts/orbit-1.0.js b/app/assets/javascripts/orbit-1.0.js
index a32f6c9f..efb7042e 100644
--- a/app/assets/javascripts/orbit-1.0.js
+++ b/app/assets/javascripts/orbit-1.0.js
@@ -1,104 +1,97 @@
-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(){
-	$(document).on('click', '.language-menu li', function(){
-		$(this).each(function(i){
-			$(this).siblings().removeClass('active')
-			$(this).addClass('active')
-		})
-		return false;
-	});
-	$(document).on('click', '.orbit-bar-member', function(){
-		$(this).hasClass('open') ? $(this).removeClass('open') : $(this).addClass('open');
-		$('.bar-login .dropdown-menu').toggle();
-		return false;
-	});
-
-	$(document).click(function() {
-		$('.orbit-bar-member').removeClass("open");
-		$('.bar-login .dropdown-menu').hide();
-	});
-
-	$(document).on('click', '.bar-login .dropdown-menu', function(e) {
-		e.stopPropagation();
-		$('.bar-login .dropdown-menu').show();
-	});
-	
-	$('.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;
-		}
-	});
-	
-	$(document).on('click', '.toggle-tr-edit', function() {
-		$(this).parents('tr').next('.qe-block').removeClass('hide');
-		$(this).parents('tr').next('.qe-block').find('.qe-edit-div').addClass('hide');
-		$(this).parents('tr').next('.qe-block').find('#qe-' + $(this).attr('rel')).toggleClass('hide');
-	});
-
-	$(document).on('click', '.sort-header > .sort', function() {
-		$.getScript($(this).attr('rel'));
-	});
-
-	/*tinyscrollbar&windows-Size*/
-	resize();
-	$('#main-sidebar').css("height", viewportheight-40);
-	$('#main-sidebar .viewport').css("height", viewportheight-40);
-	$('.post-title').css("width", viewportwidth-495);
-	$('#main-sidebar').tinyscrollbar();
-	$('.detal-list').tinyscrollbar();
-	$('#main-sidebar').tinyscrollbar({size:(viewportheight-44)});
-
-	/*isotope*/
-  var $container = $('#isotope');
-  $container.isotope({
-      itemSelector : '.item',
-      layoutMode : 'masonry',
-  });
-	
-	
-});
-$(window).resize(function(){
-	resize();
-	var $mainWrapMarginLeft = parseInt($('#main-wrap').css("margin-left"))-2;
-	$('#main-sidebar').css("height", viewportheight-30);
-	$('#main-sidebar .viewport').css("height", viewportheight-30);
-	$('.post-title').css("width", viewportwidth-495);
-	$('#main-wrap > .subnav').css("width", viewportwidth-$mainWrapMarginLeft)
-	$('#main-sidebar').tinyscrollbar({size:(viewportheight-34)});
-	mainTablePosition()
-});
-/*main-table position*/
-function mainTablePosition() {
-	var $height = $('#main-wrap > .subnav').height()
-	var $table = $('#main-wrap > .table')
-	//alert ($table.height())
-	$table.stop().animate({marginTop:$height},500)
-	//$table.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)} );
-	//console.log($mainWrapMarginLeft+($winLeft*-1)+5);
-});
+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(){
+	$(document).on('click', '.orbit-bar-member', function(){
+		$(this).hasClass('open') ? $(this).removeClass('open') : $(this).addClass('open');
+		$('.bar-login .dropdown-menu').toggle();
+		return false;
+	});
+
+	$(document).click(function() {
+		$('.orbit-bar-member').removeClass("open");
+		$('.bar-login .dropdown-menu').hide();
+	});
+
+	$(document).on('click', '.bar-login .dropdown-menu', function(e) {
+		e.stopPropagation();
+		$('.bar-login .dropdown-menu').show();
+	});
+	
+	$('.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;
+		}
+	});
+	
+	$(document).on('click', '.toggle-tr-edit', function() {
+		$(this).parents('tr').next('.qe-block').removeClass('hide');
+		$(this).parents('tr').next('.qe-block').find('.qe-edit-div').addClass('hide');
+		$(this).parents('tr').next('.qe-block').find('#qe-' + $(this).attr('rel')).toggleClass('hide');
+	});
+
+	$(document).on('click', '.sort-header > .sort', function() {
+		$.getScript($(this).attr('rel'));
+	});
+
+	/*tinyscrollbar&windows-Size*/
+	resize();
+	$('#main-sidebar').css("height", viewportheight-40);
+	$('#main-sidebar .viewport').css("height", viewportheight-40);
+	$('.post-title').css("width", viewportwidth-495);
+	$('#main-sidebar').tinyscrollbar();
+	$('.detal-list').tinyscrollbar();
+	$('#main-sidebar').tinyscrollbar({size:(viewportheight-44)});
+
+	/*isotope*/
+  var $container = $('#isotope');
+  $container.isotope({
+      itemSelector : '.item',
+      layoutMode : 'masonry',
+  });
+	
+	
+});
+$(window).resize(function(){
+	resize();
+	var $mainWrapMarginLeft = parseInt($('#main-wrap').css("margin-left"))-2;
+	$('#main-sidebar').css("height", viewportheight-30);
+	$('#main-sidebar .viewport').css("height", viewportheight-30);
+	$('.post-title').css("width", viewportwidth-495);
+	$('#main-wrap > .subnav').css("width", viewportwidth-$mainWrapMarginLeft)
+	$('#main-sidebar').tinyscrollbar({size:(viewportheight-34)});
+	mainTablePosition()
+});
+/*main-table position*/
+function mainTablePosition() {
+	var $height = $('#main-wrap > .subnav').height()
+	var $table = $('#main-wrap > .table')
+	//alert ($table.height())
+	$table.stop().animate({marginTop:$height},500)
+	//$table.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)} );
+	//console.log($mainWrapMarginLeft+($winLeft*-1)+5);
+});
diff --git a/app/assets/stylesheets/bootstrap.css.erb b/app/assets/stylesheets/bootstrap.css.erb
index 9ad62e96..ee2ae5a4 100644
--- a/app/assets/stylesheets/bootstrap.css.erb
+++ b/app/assets/stylesheets/bootstrap.css.erb
@@ -2642,8 +2642,8 @@ button.btn.small, input[type="submit"].btn.small {
   color: #333333;
 }
 .pagination {
-  height: 36px;
-  margin: 18px 0;
+    height: 36px;
+    margin: 18px 0;
 }
 .pagination ul {
   display: inline-block;
@@ -2663,7 +2663,8 @@ button.btn.small, input[type="submit"].btn.small {
 .pagination li {
   display: inline;
 }
-.pagination a {
+
+.pagination .page{
   float: left;
   padding: 0 14px;
   line-height: 34px;
@@ -2671,6 +2672,28 @@ button.btn.small, input[type="submit"].btn.small {
   border: 1px solid #ddd;
   border-left-width: 0;
 }
+.pagination a {
+  float: left;
+}
+.pagination .next{
+  float: left;
+  padding: 0 14px;
+  line-height: 34px;
+  text-decoration: none;
+  border: 1px solid #ddd;
+  border-left-width: 0;
+}
+.pagination .last{
+  float: left;
+  padding: 0 14px;
+  line-height: 34px;
+  text-decoration: none;
+  border: 1px solid #ddd;
+  border-left-width: 0;
+}
+.pagination .current{
+  border-left-width: 1px;
+}
 .pagination a:hover, .pagination .active a {
   background-color: #f5f5f5;
 }
diff --git a/app/assets/stylesheets/style.css.erb b/app/assets/stylesheets/style.css.erb
index 912df36a..beae5a8e 100644
--- a/app/assets/stylesheets/style.css.erb
+++ b/app/assets/stylesheets/style.css.erb
@@ -1,819 +1,830 @@
-@font-face{ 
-	font-family: 'WebSymbolsRegular';
-	src: url(<%= asset_path 'websymbols-regular-webfont.eot' %>);
-	src: url(<%= asset_path 'websymbols-regular-webfont.eot?#iefix' %>) format('embedded-opentype'),
-	     url(<%= asset_path 'websymbols-regular-webfont.woff' %>) format('woff'),
-	     url(<%= asset_path 'websymbols-regular-webfont.ttf' %>) format('truetype'),
-	     url(<%= asset_path 'websymbols-regular-webfont.svg#WebSymbolsRegular' %>) format('svg');
-}
-.login-logo {
-	text-indent: -9999px;
-	background: url(<%= asset_path 'sign-in-logo.png' %>) no-repeat center 40px;
-	padding-top: 40px;
-	height: 160px;
-}
-#orbit-bar {
-	margin-bottom: 0;
-	position:fixed;
-	width:100%;
-	z-index: 99;
-	top: 0;
-	left: 0;
-}
-#orbit-bar .navbar-inner {
-	height: 28px;
-	-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 {
-	float: none;
-	margin: 0 auto;
-	text-align: center;
-}
-#orbit-bar .nav.pull-right {
-	margin-right: -20px;
-}
-#orbit-bar .search-query {
-	background-image: url(<%= asset_path 'main-search.png' %>);
-	background-repeat: no-repeat;
-	background-position: 5px 6px;
-	padding-left: 25px;
-	/*background-color: rgba(255, 255, 255, 0.8);
-	color: #333;
-	text-shadow: 0px 1px 0px #FFF;*/
-	box-shadow: 0 1px 1px rgba(0, 0, 0, 0.3) inset, 0 1px 0 rgba(255, 255, 255, 0.15);
-}
-#orbit-bar .search-query:focus {
-	/*background-color: rgba(255, 255, 255, 0.9);
-	text-shadow: 0px 1px 0px #FFF;*/
-	background-position: 6px 7px;
-}
-#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 > a.orbit-bar-home {
-	background-position: -10px -10px;
-}
-#orbit-bar .nav > li > a.orbit-bar-desktop {
-	background-position: -100px -4px;
-}
-#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;
-}
-.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;
-}
-#orbit-bar .nav span.member-name {
-	display: inline-block;
-	line-height: 22px;
-	padding: 0 10px;
-}
-#orbit-bar .nav img.member-img {
-	display: inline-block;
-	float: left;
-	max-width: 22px;
-}
-#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: 183px;
-}
-#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:16px;
-	text-align: center;
-}
-#orbit-bar .bar-login .dropdown-menu .register {
-	color: #FFFFFF;
-	margin: 0 15px;
-	width: 188px;
-}
-#main-sidebar {
-    background: url(<%= asset_path 'background.jpg' %>) repeat left top;
-	width: 155px;
-	padding-right: 4px;
-	border-right: 1px solid rgba(0,0,0,.2);
-	position:fixed;
-	top: 32px;
-	z-index: 88;
-}
-#main-sidebar .nav {
-    padding-top: 5px;
-}
-#main-sidebar .nav > li.active > a [class^="icons-"] {
-	background-image: url(<%= asset_path 'icons_pack_white.png' %>);
-}
-#main-sidebar .nav > li > .nav {
-	margin-left: -14px;
-	margin-bottom: 5px;
-	width: 155px;
-	padding: 0;
-	background-color: #FFF;
-	/*border-radius: 0px 0px 8px 0px;
-	-webkit-border-radius: 0px 0px 8px 0px;
-	-moz-border-radius: 0px 0px 8px 0px;*/
-	box-shadow: 0px 2px 1px rgba(0,0,0,0.1);
-	-moz-box-shadow: 0px 2px 1px rgba(0,0,0,0.1);
-	-webkit-box-shadow: 0px 2px 1px rgba(0,0,0,0.1);
-}
-#main-sidebar .nav > li > .nav > li > a {
-	margin-left: 0;
-	padding-left: 19px;
-	color: #999;
-}
-#main-sidebar .nav > li > .nav > li > a:hover {
-	color: #000;
-	background-color: #d7eeff;
-}
-#main-sidebar .nav > li > .nav > li.active > a {
-	background-color: #b7b7b7;
-	color: #fff;
-}
-#main-wrap {
-	background-color: #FFF;
-	margin-left:160px;
-	padding-top: 32px;
-	padding-bottom: 18px;
-	position: relative;
-	min-height: 100%;
-}
-#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;
-}
-#main-wrap .pagination {
-	margin: 18px 0 0;
-	text-align: center;
-}
-.main-list .route-group td {
-	border: none;
-}
-#main-wrap .route-group .breadcrumb {
-	background-image: none;
-	border-radius: 0;
-	-moz-border-radius: 0;
-	-webkit-border-radius: 0;
-	border-width: 0 0 1px 0;
-    box-shadow: none;
-	-webkit-box-shadow: none;
-	-moz-box-shadow: none;
-	margin-bottom: 0px;
-	padding: 7px 8px 5px;
-}
-#main-wrap .breadcrumb li {
-	font-size: 12px;
-	color: #999;
-}
-#sub-wiget {
-	clear: right;
-	float: right;
-	padding-right: 10px;
-	padding-top: 8px;
-	position: relative;
-	margin-bottom: 13px;
-	width: 304px;
-}
-.main-wiget .widget-box {
-    margin: 5px 0;
-    width: 100%;
-}
-#poststuff .form-actions {
-	background-color: transparent;
-	text-align: right;
-	padding-left: 10px;
-	padding-right: 10px;
-	margin-bottom: 0;
-	clear: both;
-}
-#poststuff form {
-	margin-bottom: 0;
-}
-#post-body {
-	float: left;
-	clear: left;
-	width: 100%;
-	margin-right: -340px;
-}
-#post-body .title input[type=text] {
-	margin-bottom: 0;
-	width: 100%;
-	height: 30px;
-}
-#post-body .btn-group {
-	margin-left: 5px;
-}
-#post-body .well {
-	margin: 0;
-	border-radius: 0px;
-	-moz-border-radius: 0px;
-	box-shadow: none;
-	-moz-box-shadow: none;
-	-webkit-box-shadow: none;
-	border-top: none;
-}
-#post-body .editor {
-	background-color: #333333;
-	height: 20px;
-	margin: 8px 0;
-	width: 100%;
-}
-#post-body-content {
-	margin-right: 320px;
-	padding: 8px 0 8px 6px;
-}
-.filter .accordion-heading > a:hover {
-  text-decoration: none;
-}
-.filter .accordion-group {
-    border-bottom: none;
-    border-top: none;
-    border-left: 1px solid rgba(0,0,0,0.07);
-    border-right: none;
-	-moz-border-radius: 0;
-	-webkit-border-radius: 0;
-    border-radius: 0;
-    margin-bottom: -1px;
-	position: relative;
-	left: 0;
-	top: 0;
-}
-.filter .accordion-group:last-child {
-	border-right: 1px solid rgba(0,0,0,0.07);
-}
-.filter .accordion-heading .accordion-toggle {
-    padding: 9px 15px;
-}
-.accordion-group .accordion-toggle .caret {
-    border-top-color: #0088CC;
-    margin-top: 6px;
-}
-.filter .active {
-	background-color: #0088CC;
-}
-.filter .active a {
-	color: #FFF;
-}
-.filters {
-	background-color: rgba(0,0,0,0.075);
-	-webkit-box-shadow: inset 0 2px 3px rgba(0, 0, 0, 0.2);
-	-moz-box-shadow: inset 0 2px 3px rgba(0, 0, 0, 0.2);
-	box-shadow: inset 0 2px 3px rgba(0, 0, 0, 0.2);
-}
-.filters > div {
-	background-color: #dadada;
-}
-.filters .btn {
-	margin-bottom: 5px;
-}
-.filters .accordion-inner {
-    border-top: none;
-	padding: 9px 15px 4px;
-}
-.filters .filter-clear {
-	padding: 5px 5px 0;
-	border-top: 1px solid rgba(0,0,0,0.1);
-	text-align: right;
-	margin: 0 5px;
-	-webkit-box-shadow: inset 0 1px 0px rgba(255, 255, 255, 0.5);
-	-moz-box-shadow: inset 0 1px 0px rgba(255, 255, 255, 0.5);
-	box-shadow: inset 0 1px 0px rgba(255, 255, 255, 0.5);
-}
-.filters .in {
-	/*border-bottom: 1px solid rgba(0,0,0,0.07)*/
-}
-.sign-in {
-	width: 360px;
-	margin: 0 auto 70px;
-	background-color: #FFF;
-	-moz-border-radius: 0 0 5px 5px;
-	-webkit-border-radius: 0 0 5px 5px;
-	border-radius: 0 0 5px 5px;
-	-moz-box-shadow: 0 2px 2px rgba(143, 143, 143, 0.38);
-	-webkit-box-shadow: 0 2px 2px rgba(143, 143, 143, 0.38);
-	box-shadow: 0 2px 2px rgba(143, 143, 143, 0.38);
-	border-width: 0px 1px 1px 1px;
-	border-style: none solid solid solid;
-	border-color: transparent #c6c6c6 #c6c6c6 #c6c6c6;
-}
-#signin-header {
-	width: 340px;
-	margin: 30px auto 0;
-	line-height: 25px;
-	padding: 5px 10px;
-	border-width: 1px 1px 0px 1px;
-	border-style: solid solid none solid;
-	border-color: #c6c6c6 #c6c6c6 transparent #c6c6c6;
-	background-color: #006dcc;
-	background-image: -moz-linear-gradient(top, #dadada, #c0c0c0);
-	background-image: -ms-linear-gradient(top, #dadada, #c0c0c0);
-	background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#dadada), to(#c0c0c0));
-	background-image: -webkit-linear-gradient(top, #dadada, #c0c0c0);
-	background-image: -o-linear-gradient(top, #dadada, #c0c0c0);
-	background-image: linear-gradient(top, #dadada, #c0c0c0);
-	-moz-border-radius: 5px 5px 0px 0px ;
-	-webkit-border-radius: 5px 5px 0px 0px;
-	border-radius: 5px 5px 0px 0px;
-	-moz-box-shadow: 0 1px 0px rgba(20, 20, 20, 0.3);
-	-webkit-box-shadow: 0 1px 0px rgba(20, 20, 20, 0.3);
-	box-shadow: 0 1px 0px rgba(20, 20, 20, 0.3);
-}
-#signin-header h3 {
-	color: #848484;
-	text-shadow: 0 1px 0 #e9e9e9;
-}
-#sign-footer {
-	width: 100%;
-	position:fixed;
-	bottom: 0;
-	height: 40px;
-	background-color: #dadada;
-	color: #7a7a7a;
-	box-shadow: 0 -1px 3px rgba(0, 0, 0, 0.3);
-	-moz-box-shadow: 0 -1px 3px rgba(0, 0, 0, 0.3);
-	-webkit-box-shadow: 0 -1px 3px rgba(0, 0, 0, 0.3);
-}
-#sign-footer p {
-	line-height: 40px;
-	padding: 0 10px;
-	text-align: right;
-}
-.sign-in .control-group label {
-	text-align: left;
-	width: auto;
-	font-size: 15px;
-}
-.sign-in .forgot {
-	padding-top: 5px;
-}
-.sign-in .content {
-	padding: 10px;
-}
-.sign-in .form-actions {
-	padding: 17px 10px 18px;
-	margin: 0;
-	-moz-border-radius: 0px 0px 5px 5px;
-	-webkit-border-radius: 0px 0px 5px 5px;
-	border-radius: 0px 0px 5px 5px;
-}
-.sign-in form {
-	margin: 0;
-}
-.sign-in .control-group .help-inline {
-	display:none;
-}
-.sign-in .error .help-inline {
-	display:inline-block;	
-}
-.web-symbol:after {
-	font-family: 'WebSymbolsRegular';
-	content: "{";
-    margin-left: 2px;
-    margin-top: 8px;
-}
-.active .web-symbol:after {
-	content: "}";
-}
-/*icons*/
-.the-icons i:after {
-	content: attr(class);
-	display: block;
-	font-style: normal;
-	margin-left: 20px;
-	width: 140px;
-}
-.the-icons i {
-	display: block;
-	margin-bottom: 5px;
-}
-[class^="text-"] {
-	font-size: 15px !important;
-}
-.text-blue {
-	color: #0088CC !important;
-}
-.text-red {
-	color: #CC3300 !important;
-}
-.text-yellow {
-	color: #ffcc00 !important;
-}
-.text-orange {
-	color: #f7941d !important;
-}
-.text-purple {
-	color: #a864a8 !important;
-}
-.text-palm {
-	color: #a67c52 !important;
-}
-.text-green {
-	color: #39b54a !important;
-}
-[class^="icons-"] {
-	display: inline-block;
-	width: 16px;
-	height: 16px;
-	vertical-align: text-top;
-	background-image: url(<%= asset_path 'icons_pack.png' %>);
-	background-position: 16px 16px;
-	background-repeat: no-repeat;
-	*margin-right: .3em;
-	margin-right:10px;
-}
-[class^="icons-"]:last-child {
- 	*margin-left: 0;
-}
-.icons-white {
-	background-image: url(<%= asset_path 'icons_pack_white.png' %>);
-}
-/*1*/
-.icons-pencil {
-	background-position: 0 0;
-}
-.icons-brush {
-	background-position: -32px 0;
-}
-.icons-pen {
-	background-position: -64px 0;
-}
-.icons-brush-large {
-	background-position: -128px 0;
-}
-.icons-pen-small {
-	background-position: -96px 0;
-}
-.icons-bucket {
-	background-position: -160px 0;
-}
-.icons-eye {
-	background-position: -192px 0;
-}
-.icons-ban {
-	background-position: -224px 0;
-}
-.icons-trash {
-	background-position: -256px 0;
-}
-.icons-zoom {
-	background-position: -288px 0;
-}
-.icons-zoom-out {
-	background-position: -320px 0;
-}
-.icons-zoom-in {
-	background-position: -352px 0;
-}
-.icons-magic {
-	background-position: -384px 0;
-}
-.icons-aim {
-	background-position: -416px 0;
-}
-/*2*/
-.icons-flag {
-	background-position: 0 -32px;
-}
-.icons-paperclip {
-	background-position: -32px -32px;
-}
-.icons-share {
-	background-position: -64px -32px;
-}
-.icons-link {
-	background-position: -96px -32px;
-}
-.icons-tag {
-	background-position: -128px -32px;
-}
-.icons-lock {
-	background-position: -160px -32px;
-}
-.icons-unlock {
-	background-position: -192px -32px;
-}
-/*3*/
-.icons-content {
-	background-position: -160px -66px;
-}
-.icons-announcement {
-	background-position: -576px -64px;
-}
-/*4*/
-.icons-contact {
-	background-position: 0 -96px;
-}
-.icons-roll {
-	background-position: -32px -96px;
-}
-.icons-member {
-	background-position: -288px -96px;
-}
-.icons-member-user {
-	background-position: -64px -96px;
-}
-.icons-member-admin {
-	background-position: -96px -96px;
-}
-.icons-member-manager{
-	background-position: -128px -96px;
-}
-.icons-member-plus{
-	background-position: -160px -96px;
-}
-.icons-member-minus{
-	background-position: -192px -96px;
-}
-.icons-member-blockade{
-	background-position: -224px -96px;
-}
-.icons-carte {
-	background-position: -256px -96px;
-}
-.icons-building {
-	background-position: -320px -96px;
-}
-.icons-calendar {
-	background-position: -352px -96px;
-}
-.icons-calendars {
-	background-position: -384px -96px;
-}
-.icons-out {
-	background-position: -416px -96px;
-}
-.icons-desktop {
-	background-position: -448px -96px;
-}
-/*5*/
-.icons-page-blank {
-	background-position: 0px -128px;
-}
-.icons-page {
-	background-position: -32px -128px;
-}
-.icons-page-copy {
-	background-position: -64px -128px;
-}
-.icons- {
-	background-position: -0px -128px;
-}
-/*6*/
-.icons-globe {
-	background-position: -96px -160px;
-}
-.icons-structure {
-	background-position: -352px -160px;
-}
-/*7*/
-.icons-purchase {
-	background-position: -64px -192px;
-}
-/*8*/
-.icons-dashboard {
-	background-position: 0 -224px;
-}
-.icons-cog {
-	background-position: -32px -224px;
-}
-.icons-cogs {
-	background-position: -64px -224px;
-}
-.icons-tool {
-	background-position: -96px -224px;
-}
-.icons-screwdriver {
-	background-position: -128px -224px;
-}
-.icons-wrench {
-	background-position: -160px -224px;
-}
-.icons-toolbox {
-	background-position: -192px -224px;
-}
-.icons-switch {
-	background-position: -224px -224px;
-}
-.icons-valve {
-	background-position: -256px -224px;
-}
-/*9*/
-.icons-picture {
-	background-position: -256px -256px;
-}
-.icons-asset {
-	background-position: -384px -256px;
-}
-.icons-asset-upload {
-	background-position: -448px -256px;
-}
-.icons-asset-download {
-	background-position: -416px -256px;
-}
-/*10*/
-.icons- {
-	background-position: -0px -288px;
-}
-/*11*/
-.icons-pie {
-	background-position: 0px -320px;
-}
-.icons-histogram {
-	background-position: -32px -320px;
-}
-.icons-window {
-	background-position: -64px -320px;
-}
-.icons-window-line{
-	background-position: -96px -320px;
-}
-.icons-window-command{
-	background-position: -128px -320px;
-}
-.icons-window-list{
-	background-position: -160px -320px;
-}
-.icons-window-block{
-	background-position: -192px -320px;
-}
-.icons-terminal{
-	background-position: -224px -320px;
-}
-/*12*/
-.icons-star-thin {
-	background-position: -416px -352px;
-}
-.icons- {
-	background-position: -0px -352px;
-}
-/*13*/
-.icons- {
-	background-position: -0px -384px;
-}
-/*14*/
-.icons- {
-	background-position: -0px -416px;
-}
-/*15*/
-.icons- {
-	background-position: -0px -448px;
-}
-/*16*/
-.icons- {
-	background-position: -0px -480px;
-}
-/*17*/
-.icons- {
-	background-position: -0px -512px;
-}
-/*18*/
-.icons-help {
-	background-position: -160px -544px;
-}
-.icons- {
-	background-position: -0px -544px;
-}
-/*19*/
-.icons-plus-cube {
-	background-position: -192px -576px;
-}
-.icons-plus {
-	background-position: -288px -576px;
-}
-.icons-power {
-	background-position: -0px -608px;
-}
-/*20*/
-.icons- {
-	background-position: -0px -608px;
-}
-/*21*/
-.icons- {
-	background-position: -0px -640px;
+@font-face{ 
+	font-family: 'WebSymbolsRegular';
+	src: url(<%= asset_path 'websymbols-regular-webfont.eot' %>);
+	src: url(<%= asset_path 'websymbols-regular-webfont.eot?#iefix' %>) format('embedded-opentype'),
+	     url(<%= asset_path 'websymbols-regular-webfont.woff' %>) format('woff'),
+	     url(<%= asset_path 'websymbols-regular-webfont.ttf' %>) format('truetype'),
+	     url(<%= asset_path 'websymbols-regular-webfont.svg#WebSymbolsRegular' %>) format('svg');
+}
+.login-logo {
+	text-indent: -9999px;
+	background: url(<%= asset_path 'sign-in-logo.png' %>) no-repeat center 40px;
+	padding-top: 40px;
+	height: 160px;
+}
+#orbit-bar {
+	margin-bottom: 0;
+	position:fixed;
+	width:100%;
+	z-index: 99;
+	top: 0;
+	left: 0;
+}
+#orbit-bar .navbar-inner {
+	height: 28px;
+	-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, #5282A6, #133757);
+	background-image: -ms-linear-gradient(top, #5282A6, #133757);
+	background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5282A6), to(#133757));
+	background-image: -webkit-linear-gradient(top, #5282A6, #133757);
+	background-image: -o-linear-gradient(top, #5282A6, #133757);
+	background-image: linear-gradient(top, #5282A6, #133757);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5282A6', endColorstr='#133757', GradientType=0);
+	/*
+	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 {
+	float: none;
+	margin: 0 auto;
+	text-align: center;
+}
+#orbit-bar .nav.pull-right {
+	margin-right: -20px;
+}
+#orbit-bar .search-query {
+	background-image: url(<%= asset_path 'main-search.png' %>);
+	background-repeat: no-repeat;
+	background-position: 5px 6px;
+	padding-left: 25px;
+	/*background-color: rgba(255, 255, 255, 0.8);
+	color: #333;
+	text-shadow: 0px 1px 0px #FFF;*/
+	box-shadow: 0 1px 1px rgba(0, 0, 0, 0.3) inset, 0 1px 0 rgba(255, 255, 255, 0.15);
+}
+#orbit-bar .search-query:focus {
+	/*background-color: rgba(255, 255, 255, 0.9);
+	text-shadow: 0px 1px 0px #FFF;*/
+	background-position: 6px 7px;
+}
+#orbit-bar .container {
+	width:100%;
+}
+#orbit-bar .orbit-logo .brand {
+	/* background: url(<%= asset_path 'orbit-bar.png' %>) no-repeat -162px -5px; */
+	background: url(<%= asset_path 'nccu_logo.png' %>) no-repeat 6px 0px;
+	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 > a.orbit-bar-home {
+	background-position: -10px -10px;
+}
+#orbit-bar .nav > li > a.orbit-bar-desktop {
+	background-position: -100px -4px;
+}
+#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;
+}
+.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;
+}
+#orbit-bar .nav span.member-name {
+	display: inline-block;
+	line-height: 22px;
+	padding: 0 10px;
+}
+#orbit-bar .nav img.member-img {
+	display: inline-block;
+	float: left;
+	max-width: 22px;
+}
+#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: 183px;
+}
+#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:16px;
+	text-align: center;
+}
+#orbit-bar .bar-login .dropdown-menu .register {
+	color: #FFFFFF;
+	margin: 0 15px;
+	width: 188px;
+}
+#main-sidebar {
+    background: url(<%= asset_path 'background.jpg' %>) repeat left top;
+	width: 155px;
+	padding-right: 4px;
+	border-right: 1px solid rgba(0,0,0,.2);
+	position:fixed;
+	top: 32px;
+	z-index: 88;
+}
+#main-sidebar .nav {
+    padding-top: 5px;
+}
+#main-sidebar .nav > li.active > a [class^="icons-"] {
+	background-image: url(<%= asset_path 'icons_pack_white.png' %>);
+}
+#main-sidebar .nav > li > .nav {
+	margin-left: -14px;
+	margin-bottom: 5px;
+	width: 155px;
+	padding: 0;
+	background-color: #FFF;
+	/*border-radius: 0px 0px 8px 0px;
+	-webkit-border-radius: 0px 0px 8px 0px;
+	-moz-border-radius: 0px 0px 8px 0px;*/
+	box-shadow: 0px 2px 1px rgba(0,0,0,0.1);
+	-moz-box-shadow: 0px 2px 1px rgba(0,0,0,0.1);
+	-webkit-box-shadow: 0px 2px 1px rgba(0,0,0,0.1);
+}
+#main-sidebar .nav > li > .nav > li > a {
+	margin-left: 0;
+	padding-left: 19px;
+	color: #999;
+}
+#main-sidebar .nav > li > .nav > li > a:hover {
+	color: #000;
+	background-color: #d7eeff;
+}
+#main-sidebar .nav > li > .nav > li.active > a {
+	background-color: #b7b7b7;
+	color: #fff;
+}
+#main-wrap {
+	background-color: #FFF;
+	margin-left:160px;
+	padding-top: 32px;
+	padding-bottom: 18px;
+	position: relative;
+	min-height: 100%;
+}
+#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;
+}
+#main-wrap .pagination {
+	margin: 18px 0 0;
+	text-align: center;
+}
+.main-list .route-group td {
+	border: none;
+}
+#main-wrap .route-group .breadcrumb {
+	background-image: none;
+	border-radius: 0;
+	-moz-border-radius: 0;
+	-webkit-border-radius: 0;
+	border-width: 0 0 1px 0;
+    box-shadow: none;
+	-webkit-box-shadow: none;
+	-moz-box-shadow: none;
+	margin-bottom: 0px;
+	padding: 7px 8px 5px;
+}
+#main-wrap .breadcrumb li {
+	font-size: 12px;
+	color: #999;
+}
+#sub-wiget {
+	clear: right;
+	float: right;
+	padding-right: 10px;
+	padding-top: 8px;
+	position: relative;
+	margin-bottom: 13px;
+	width: 304px;
+}
+.main-wiget .widget-box {
+    margin: 5px 0;
+    width: 100%;
+}
+#poststuff .form-actions {
+	background-color: transparent;
+	text-align: right;
+	padding-left: 10px;
+	padding-right: 10px;
+	margin-bottom: 0;
+	clear: both;
+}
+#poststuff form {
+	margin-bottom: 0;
+}
+#post-body {
+	float: left;
+	clear: left;
+	width: 100%;
+	margin-right: -340px;
+}
+#post-body .title input[type=text] {
+	margin-bottom: 0;
+	width: 100%;
+	height: 30px;
+}
+#post-body .btn-group {
+	margin-left: 5px;
+}
+#post-body .well {
+	margin: 0;
+	border-radius: 0px;
+	-moz-border-radius: 0px;
+	box-shadow: none;
+	-moz-box-shadow: none;
+	-webkit-box-shadow: none;
+	border-top: none;
+}
+#post-body .editor {
+	background-color: #333333;
+	height: 20px;
+	margin: 8px 0;
+	width: 100%;
+}
+#post-body-content {
+	margin-right: 320px;
+	padding: 8px 0 8px 6px;
+}
+.filter .accordion-heading > a:hover {
+  text-decoration: none;
+}
+.filter .accordion-group {
+    border-bottom: none;
+    border-top: none;
+    border-left: 1px solid rgba(0,0,0,0.07);
+    border-right: none;
+	-moz-border-radius: 0;
+	-webkit-border-radius: 0;
+    border-radius: 0;
+    margin-bottom: -1px;
+	position: relative;
+	left: 0;
+	top: 0;
+}
+.filter .accordion-group:last-child {
+	border-right: 1px solid rgba(0,0,0,0.07);
+}
+.filter .accordion-heading .accordion-toggle {
+    padding: 9px 15px;
+}
+.accordion-group .accordion-toggle .caret {
+    border-top-color: #0088CC;
+    margin-top: 6px;
+}
+.filter .active {
+	background-color: #0088CC;
+}
+.filter .active a {
+	color: #FFF;
+}
+.filters {
+	background-color: rgba(0,0,0,0.075);
+	-webkit-box-shadow: inset 0 2px 3px rgba(0, 0, 0, 0.2);
+	-moz-box-shadow: inset 0 2px 3px rgba(0, 0, 0, 0.2);
+	box-shadow: inset 0 2px 3px rgba(0, 0, 0, 0.2);
+}
+.filters > div {
+	background-color: #dadada;
+}
+.filters .btn {
+	margin-bottom: 5px;
+}
+.filters .accordion-inner {
+    border-top: none;
+	padding: 9px 15px 4px;
+}
+.filters .filter-clear {
+	padding: 5px 5px 0;
+	border-top: 1px solid rgba(0,0,0,0.1);
+	text-align: right;
+	margin: 0 5px;
+	-webkit-box-shadow: inset 0 1px 0px rgba(255, 255, 255, 0.5);
+	-moz-box-shadow: inset 0 1px 0px rgba(255, 255, 255, 0.5);
+	box-shadow: inset 0 1px 0px rgba(255, 255, 255, 0.5);
+}
+.filters .in {
+	/*border-bottom: 1px solid rgba(0,0,0,0.07)*/
+}
+.sign-in {
+	width: 360px;
+	margin: 0 auto 70px;
+	background-color: #FFF;
+	-moz-border-radius: 0 0 5px 5px;
+	-webkit-border-radius: 0 0 5px 5px;
+	border-radius: 0 0 5px 5px;
+	-moz-box-shadow: 0 2px 2px rgba(143, 143, 143, 0.38);
+	-webkit-box-shadow: 0 2px 2px rgba(143, 143, 143, 0.38);
+	box-shadow: 0 2px 2px rgba(143, 143, 143, 0.38);
+	border-width: 0px 1px 1px 1px;
+	border-style: none solid solid solid;
+	border-color: transparent #c6c6c6 #c6c6c6 #c6c6c6;
+}
+#signin-header {
+	width: 340px;
+	margin: 30px auto 0;
+	line-height: 25px;
+	padding: 5px 10px;
+	border-width: 1px 1px 0px 1px;
+	border-style: solid solid none solid;
+	border-color: #c6c6c6 #c6c6c6 transparent #c6c6c6;
+	background-color: #006dcc;
+	background-image: -moz-linear-gradient(top, #dadada, #c0c0c0);
+	background-image: -ms-linear-gradient(top, #dadada, #c0c0c0);
+	background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#dadada), to(#c0c0c0));
+	background-image: -webkit-linear-gradient(top, #dadada, #c0c0c0);
+	background-image: -o-linear-gradient(top, #dadada, #c0c0c0);
+	background-image: linear-gradient(top, #dadada, #c0c0c0);
+	-moz-border-radius: 5px 5px 0px 0px ;
+	-webkit-border-radius: 5px 5px 0px 0px;
+	border-radius: 5px 5px 0px 0px;
+	-moz-box-shadow: 0 1px 0px rgba(20, 20, 20, 0.3);
+	-webkit-box-shadow: 0 1px 0px rgba(20, 20, 20, 0.3);
+	box-shadow: 0 1px 0px rgba(20, 20, 20, 0.3);
+}
+#signin-header h3 {
+	color: #848484;
+	text-shadow: 0 1px 0 #e9e9e9;
+}
+#sign-footer {
+	width: 100%;
+	position:fixed;
+	bottom: 0;
+	height: 40px;
+	background-color: #dadada;
+	color: #7a7a7a;
+	box-shadow: 0 -1px 3px rgba(0, 0, 0, 0.3);
+	-moz-box-shadow: 0 -1px 3px rgba(0, 0, 0, 0.3);
+	-webkit-box-shadow: 0 -1px 3px rgba(0, 0, 0, 0.3);
+}
+#sign-footer p {
+	line-height: 40px;
+	padding: 0 10px;
+	text-align: right;
+}
+.sign-in .control-group label {
+	text-align: left;
+	width: auto;
+	font-size: 15px;
+}
+.sign-in .forgot {
+	padding-top: 5px;
+}
+.sign-in .content {
+	padding: 10px;
+}
+.sign-in .form-actions {
+	padding: 17px 10px 18px;
+	margin: 0;
+	-moz-border-radius: 0px 0px 5px 5px;
+	-webkit-border-radius: 0px 0px 5px 5px;
+	border-radius: 0px 0px 5px 5px;
+}
+.sign-in form {
+	margin: 0;
+}
+.sign-in .control-group .help-inline {
+	display:none;
+}
+.sign-in .error .help-inline {
+	display:inline-block;	
+}
+.web-symbol:after {
+	font-family: 'WebSymbolsRegular';
+	content: "{";
+    margin-left: 2px;
+    margin-top: 8px;
+}
+.active .web-symbol:after {
+	content: "}";
+}
+/*icons*/
+.the-icons i:after {
+	content: attr(class);
+	display: block;
+	font-style: normal;
+	margin-left: 20px;
+	width: 140px;
+}
+.the-icons i {
+	display: block;
+	margin-bottom: 5px;
+}
+[class^="text-"] {
+	font-size: 15px !important;
+}
+.text-blue {
+	color: #0088CC !important;
+}
+.text-red {
+	color: #CC3300 !important;
+}
+.text-yellow {
+	color: #ffcc00 !important;
+}
+.text-orange {
+	color: #f7941d !important;
+}
+.text-purple {
+	color: #a864a8 !important;
+}
+.text-palm {
+	color: #a67c52 !important;
+}
+.text-green {
+	color: #39b54a !important;
+}
+[class^="icons-"] {
+	display: inline-block;
+	width: 16px;
+	height: 16px;
+	vertical-align: text-top;
+	background-image: url(<%= asset_path 'icons_pack.png' %>);
+	background-position: 16px 16px;
+	background-repeat: no-repeat;
+	*margin-right: .3em;
+	margin-right:10px;
+}
+[class^="icons-"]:last-child {
+ 	*margin-left: 0;
+}
+.icons-white {
+	background-image: url(<%= asset_path 'icons_pack_white.png' %>);
+}
+/*1*/
+.icons-pencil {
+	background-position: 0 0;
+}
+.icons-brush {
+	background-position: -32px 0;
+}
+.icons-pen {
+	background-position: -64px 0;
+}
+.icons-brush-large {
+	background-position: -128px 0;
+}
+.icons-pen-small {
+	background-position: -96px 0;
+}
+.icons-bucket {
+	background-position: -160px 0;
+}
+.icons-eye {
+	background-position: -192px 0;
+}
+.icons-ban {
+	background-position: -224px 0;
+}
+.icons-trash {
+	background-position: -256px 0;
+}
+.icons-zoom {
+	background-position: -288px 0;
+}
+.icons-zoom-out {
+	background-position: -320px 0;
+}
+.icons-zoom-in {
+	background-position: -352px 0;
+}
+.icons-magic {
+	background-position: -384px 0;
+}
+.icons-aim {
+	background-position: -416px 0;
+}
+/*2*/
+.icons-flag {
+	background-position: 0 -32px;
+}
+.icons-paperclip {
+	background-position: -32px -32px;
+}
+.icons-share {
+	background-position: -64px -32px;
+}
+.icons-link {
+	background-position: -96px -32px;
+}
+.icons-tag {
+	background-position: -128px -32px;
+}
+.icons-lock {
+	background-position: -160px -32px;
+}
+.icons-unlock {
+	background-position: -192px -32px;
+}
+/*3*/
+.icons-content {
+	background-position: -160px -66px;
+}
+.icons-announcement {
+	background-position: -576px -64px;
+}
+/*4*/
+.icons-contact {
+	background-position: 0 -96px;
+}
+.icons-roll {
+	background-position: -32px -96px;
+}
+.icons-member {
+	background-position: -288px -96px;
+}
+.icons-member-user {
+	background-position: -64px -96px;
+}
+.icons-member-admin {
+	background-position: -96px -96px;
+}
+.icons-member-manager{
+	background-position: -128px -96px;
+}
+.icons-member-plus{
+	background-position: -160px -96px;
+}
+.icons-member-minus{
+	background-position: -192px -96px;
+}
+.icons-member-blockade{
+	background-position: -224px -96px;
+}
+.icons-carte {
+	background-position: -256px -96px;
+}
+.icons-building {
+	background-position: -320px -96px;
+}
+.icons-calendar {
+	background-position: -352px -96px;
+}
+.icons-calendars {
+	background-position: -384px -96px;
+}
+.icons-out {
+	background-position: -416px -96px;
+}
+.icons-desktop {
+	background-position: -448px -96px;
+}
+/*5*/
+.icons-page-blank {
+	background-position: 0px -128px;
+}
+.icons-page {
+	background-position: -32px -128px;
+}
+.icons-page-copy {
+	background-position: -64px -128px;
+}
+.icons- {
+	background-position: -0px -128px;
+}
+/*6*/
+.icons-globe {
+	background-position: -96px -160px;
+}
+.icons-structure {
+	background-position: -352px -160px;
+}
+/*7*/
+.icons-purchase {
+	background-position: -64px -192px;
+}
+/*8*/
+.icons-dashboard {
+	background-position: 0 -224px;
+}
+.icons-cog {
+	background-position: -32px -224px;
+}
+.icons-cogs {
+	background-position: -64px -224px;
+}
+.icons-tool {
+	background-position: -96px -224px;
+}
+.icons-screwdriver {
+	background-position: -128px -224px;
+}
+.icons-wrench {
+	background-position: -160px -224px;
+}
+.icons-toolbox {
+	background-position: -192px -224px;
+}
+.icons-switch {
+	background-position: -224px -224px;
+}
+.icons-valve {
+	background-position: -256px -224px;
+}
+/*9*/
+.icons-picture {
+	background-position: -256px -256px;
+}
+.icons-asset {
+	background-position: -384px -256px;
+}
+.icons-asset-upload {
+	background-position: -448px -256px;
+}
+.icons-asset-download {
+	background-position: -416px -256px;
+}
+/*10*/
+.icons- {
+	background-position: -0px -288px;
+}
+/*11*/
+.icons-pie {
+	background-position: 0px -320px;
+}
+.icons-histogram {
+	background-position: -32px -320px;
+}
+.icons-window {
+	background-position: -64px -320px;
+}
+.icons-window-line{
+	background-position: -96px -320px;
+}
+.icons-window-command{
+	background-position: -128px -320px;
+}
+.icons-window-list{
+	background-position: -160px -320px;
+}
+.icons-window-block{
+	background-position: -192px -320px;
+}
+.icons-terminal{
+	background-position: -224px -320px;
+}
+/*12*/
+.icons-star-thin {
+	background-position: -416px -352px;
+}
+.icons- {
+	background-position: -0px -352px;
+}
+/*13*/
+.icons- {
+	background-position: -0px -384px;
+}
+/*14*/
+.icons- {
+	background-position: -0px -416px;
+}
+/*15*/
+.icons- {
+	background-position: -0px -448px;
+}
+/*16*/
+.icons- {
+	background-position: -0px -480px;
+}
+/*17*/
+.icons- {
+	background-position: -0px -512px;
+}
+/*18*/
+.icons-help {
+	background-position: -160px -544px;
+}
+.icons- {
+	background-position: -0px -544px;
+}
+/*19*/
+.icons-plus-cube {
+	background-position: -192px -576px;
+}
+.icons-plus {
+	background-position: -288px -576px;
+}
+.icons-power {
+	background-position: -0px -608px;
+}
+/*20*/
+.icons- {
+	background-position: -0px -608px;
+}
+/*21*/
+.icons- {
+	background-position: -0px -640px;
 }
\ No newline at end of file
diff --git a/app/views/layouts/_orbit_bar.html.erb b/app/views/layouts/_orbit_bar.html.erb
index c2ba7fbd..e9a91f48 100644
--- a/app/views/layouts/_orbit_bar.html.erb
+++ b/app/views/layouts/_orbit_bar.html.erb
@@ -26,10 +26,10 @@
           </ul>
         </li>
 				<% if user_signed_in? %>
-					<li class="dropdown active clear">
+					<li class="dropdown active">
 						<a class="orbit-bar-account" href="#" data-toggle="dropdown">
-							<!-- <img src="images/menber-pic.png" /> -->
-							<%= image_tag current_user.avatar.thumb.url, :class => 'member-img' %>
+							<img class="member-img" src="/assets/menber-pic.png" />
+							<%#= image_tag current_user.avatar.thumb.url, :class => 'member-img' %>
 							<span class="member-name"><%= current_user.name %></span>
 						</a>
 						<ul class="dropdown-menu account-menu">
@@ -45,7 +45,7 @@
 									<%= t(:desktop) %>
 								</a>
 							</li>
-							<li><%= link_to content_tag(:i, nil, :class => 'icons-out') + t(:logout), destroy_user_session_path %></li>
+							<li><%= link_to content_tag(:i, nil, :class => 'icons-out') + ' ' +  t(:logout), destroy_user_session_path %></li>
 							
 							<li class="divider"></li>
 							<li>
@@ -95,7 +95,7 @@
 				<% end %>
 			</ul>
 			<form class="navbar-search span6" action="">
-          <input class="search-query span4" type="text" placeholder="Search NCCU">
+          <input class="search-query span4" type="text" placeholder="<%= t(:search_nccu) %>">
       </form>
 		</div>
 	</div>
diff --git a/app/views/layouts/_side_bar.html.erb b/app/views/layouts/_side_bar.html.erb
index 15948578..33e41597 100644
--- a/app/views/layouts/_side_bar.html.erb
+++ b/app/views/layouts/_side_bar.html.erb
@@ -13,7 +13,7 @@
 <% end -%>
 
 <%= content_tag :li, :class => active_for_controllers('users') do -%>
-	<%= link_to content_tag(:i, nil, :class => 'icons-member') + t('admin.member'), panel_web_resource_back_end_web_links_path %>
+	<%= link_to content_tag(:i, nil, :class => 'icons-member') + t('admin.member'), admin_users_path %>
 <% end -%>
 
 <%= content_tag :li, :class => active_for_controllers(nil) do -%>
@@ -25,7 +25,7 @@
 <% end -%>
 
 <%= content_tag :li, :class => active_for_controllers(nil) do -%>
-	<%= link_to content_tag(:i, nil, :class => 'icons-link') + t('admin.link'), nil %>
+	<%= link_to content_tag(:i, nil, :class => 'icons-link') + t('admin.link'), panel_web_resource_back_end_web_links_path %>
 <% end -%>
 
 <%= content_tag :li, :class => active_for_controllers(nil) do -%>
diff --git a/config/application.rb b/config/application.rb
index 3a7fb91f..50b9f4a7 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -47,7 +47,7 @@ module PrototypeR4
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
-    config.i18n.default_locale = :en
+    config.i18n.default_locale = :zh_tw
 
     # JavaScript files you want as :defaults (application.js is always included).
     # config.action_view.javascript_expansions[:defaults] = %w(jquery rails)
diff --git a/config/environments/development.rb b/config/environments/development.rb
index d1b671e5..c2b4c930 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -24,21 +24,21 @@ PrototypeR4::Application.configure do
   config.action_dispatch.best_standards_support = :builtin  
 
 
-  config.middleware.use ExceptionNotifier,
-    :email_prefix => "[R4_error]",
-    :sender_address => %{"notifier" <redmine@rulingcom.com>},
-    :exception_recipients => %w{chris@rulingcom.com}
+  # config.middleware.use ExceptionNotifier,
+  #   :email_prefix => "[R4_error]",
+  #   :sender_address => %{"notifier" <redmine@rulingcom.com>},
+  #   :exception_recipients => %w{chris@rulingcom.com}
     
-  config.action_mailer.delivery_method = :smtp
-  config.action_mailer.smtp_settings = {
-    :tls => true,
-    :enable_starttls_auto => true,
-    :address => "smtp.gmail.com",
-    :port => '587',
-    :domain => "smtp.gmail.com",
-    :authentication => "plain",
-    :user_name => "redmine@rulingcom.com",
-    :password => "rulingredmine" }
+  # config.action_mailer.delivery_method = :smtp
+  # config.action_mailer.smtp_settings = {
+  #   :tls => true,
+  #   :enable_starttls_auto => true,
+  #   :address => "smtp.gmail.com",
+  #   :port => '587',
+  #   :domain => "smtp.gmail.com",
+  #   :authentication => "plain",
+  #   :user_name => "redmine@rulingcom.com",
+  #   :password => "rulingredmine" }
 
 end
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 3d293783..da72a4eb 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -32,6 +32,7 @@ en:
   password: Password
   register: Register
   remember_me: Remember me
+  search_nccu: Search NCCU
   show: Show
   submit: Submit
   sure?: Are you sure?
diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml
index e4d1366d..049be66b 100644
--- a/config/locales/zh_tw.yml
+++ b/config/locales/zh_tw.yml
@@ -17,7 +17,7 @@ zh_tw:
   edit: 編輯
   email: 電子郵件
   enable: 啟用
-  forget_password: 忘記密碼?
+  forgot_password: 忘記密碼?
   help: 協助
   hide: 隱藏
   homepage: 首頁
@@ -25,10 +25,11 @@ zh_tw:
   logout: 登出
   no_: "No"
   nothing: 無
-  or_lower: 或者
+  or_lower: 或
   password: 密碼
   register: 註冊
   remember_me: 記住我
+  search_nccu: 搜尋政大
   show: 顯示
   submit: 送出
   sure?: 您肯定嗎?
diff --git a/lib/parsers/parser_front_end.rb b/lib/parsers/parser_front_end.rb
index d1334b06..305596ed 100644
--- a/lib/parsers/parser_front_end.rb
+++ b/lib/parsers/parser_front_end.rb
@@ -81,7 +81,7 @@ module ParserFrontEnd
         res << "<script type='text/javascript' src='/assets/orbit_bar.js'></script>"
         res << "<script type='text/javascript' src='/assets/event.js'></script>"
         page.design.javascripts.each do |js|
-          res << "<script type='text/javascript' src='#{js.file.url}'></script>"
+          # res << "<script type='text/javascript' src='#{js.file.url}'></script>"
         end
         res
       end
diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
index cf4e1801..b71a4609 100644
--- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
+++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
@@ -17,7 +17,9 @@ class Panel::Announcement::FrontEnd::BulletinsController < ObitWidgetController
       @bulletins = Bulletin.any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).page( params[:page]).per(10)
     end
 
-	get_categorys
+	  get_categorys
+	  
+	  @current_category = BulletinCategory.from_id(params[:bulletin_category_id]) rescue nil
   end
   
   def show
diff --git a/vendor/built_in_modules/announcement/app/models/bulletin_category.rb b/vendor/built_in_modules/announcement/app/models/bulletin_category.rb
index f5da3ad7..0161847d 100644
--- a/vendor/built_in_modules/announcement/app/models/bulletin_category.rb
+++ b/vendor/built_in_modules/announcement/app/models/bulletin_category.rb
@@ -14,4 +14,8 @@ class BulletinCategory
   
   has_many :bulletins
   
+  def self.from_id(id)
+    BulletinCategory.find(id) rescue nil
+  end
+  
 end
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb
index d7aefeab..d4335e9a 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb
@@ -2,7 +2,11 @@
 
 <%= flash_messages %>
 
-<h1 class="h1"><%= t('announcement.list_announcement') %></h1>
+<% if @current_category %>
+	<h1 class="h1"><%= @current_category.i18n_variable[I18n.locale] + t('announcement.bulletin.list_lower') %></h1>
+<% else %>
+	<h1 class="h1"><%= t('announcement.list_announcement') %></h1>
+<% end %>
 
 
 <table class="table table-bordered">
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/index.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/index.html.erb
index e3ba9d48..33166165 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/index.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/index.html.erb
@@ -11,7 +11,7 @@
 		<li>
 			<div class="news_img"><%= image_tag(post.image.url, :size => "290x130") if post.image.file %></div>
 			<h3 class="h3 news_title"><%= link_to post.title[I18n.locale], panel_announcement_front_end_bulletin_path(post, :category_id => post.bulletin_category_id) %></h3>
-			<p class="news_wrap"><%= post.subtitle[I18n.locale] %></p>
+			<p class="news_wrap"><%= post.subtitle[I18n.locale].html_safe %></p>
 		</li>
 		<% end %>
 	</ul>
diff --git a/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb b/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb
index 66b74799..bbe4a8d9 100644
--- a/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb
+++ b/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb
@@ -14,7 +14,7 @@ class Panel::WebResource::Widget::WebLinksController < ObitWidgetController
   
     # @web_link = WebLink.where( :is_hidden => false ).desc(:is_top, :name).first
 
-    @web_links = WebLink.widget_datas.page(params[:page]).per(9)
+    @web_links = WebLink.widget_datas.page(params[:page]).per(5)
 	
 	# get_categorys
   	
@@ -24,7 +24,7 @@ class Panel::WebResource::Widget::WebLinksController < ObitWidgetController
   end
 
   def reload_web_links
-    @web_links = WebLink.widget_datas.page(params[:page]).per(9)
+    @web_links = WebLink.widget_datas.page(params[:page]).per(5)
   end