From 92a53c1b27c66b8050792b8a07ca4a4096358e6f Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris@rulingcom.com>
Date: Wed, 2 May 2012 16:20:59 +0800
Subject: [PATCH] Ray's fix

---
 app/assets/javascripts/orbit-1.0.js              |  8 --------
 app/assets/stylesheets/bootstrap.css.erb         |  5 ++++-
 app/assets/stylesheets/list.css                  | 16 +++++++++++-----
 app/views/layouts/new_admin.html.erb             |  4 ++--
 .../back_end/bulletins/index.html.erb            | 11 +++++------
 .../news/back_end/news_bulletins/index.html.erb  | 11 +++++------
 6 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/app/assets/javascripts/orbit-1.0.js b/app/assets/javascripts/orbit-1.0.js
index 30e8fbe3..368bf2d0 100644
--- a/app/assets/javascripts/orbit-1.0.js
+++ b/app/assets/javascripts/orbit-1.0.js
@@ -1,6 +1,5 @@
 var viewportwidth,
 	viewportheight;
-	console.log($(window).height())
 function resize() {
 	viewportheight=$(window).height();
 	viewportwidth=$(window).width();
@@ -17,7 +16,6 @@ $(document).ready(function(){
 	
 	$(document).on('click', '.privacy', function() {
 
-			console.log($(this).val());
 		switch ($(this).val()) {
 			case 'true':
 			$(this).parents('.controls').children('.select-role').slideUp(300);
@@ -53,15 +51,12 @@ $(document).ready(function(){
 		$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);
 	$('.form-fixed').css("width", viewportwidth-$mainWrapMarginLeft-$formActionPadding);
-	$('#bulletin_pagination').css("width", viewportwidth-$mainSidebar);
 	$('#main-sidebar').tinyscrollbar({size:(viewportheight-$orbitBar-4)});
 	$('.detal-list').tinyscrollbar();
 	mainTablePosition();
@@ -82,14 +77,12 @@ $(window).resize(function(){
 		$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);
 	$('.form-fixed').css("width", viewportwidth-$mainWrapMarginLeft-$formActionPadding);
-	$('#bulletin_pagination').css("width", viewportwidth-$mainSidebar);
 	$('#main-sidebar').tinyscrollbar({size:(viewportheight-$orbitBar-4)});
 	mainTablePosition();
 });
@@ -118,5 +111,4 @@ $(window).scroll(function () {
 	$(".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 40b3afca..62a0afe8 100644
--- a/app/assets/stylesheets/bootstrap.css.erb
+++ b/app/assets/stylesheets/bootstrap.css.erb
@@ -2701,8 +2701,11 @@ button.btn.small, input[type="submit"].btn.small {
 .pagination .current{
   border-left-width: 1px;
 }
+.pagination a {
+  background-color: #FFFFFF;
+}
 .pagination a:hover, .pagination .active a {
-  background-color: #f5f5f5;
+  background-color: #e8e8e8;
 }
 .pagination .active a {
   color: #999999;
diff --git a/app/assets/stylesheets/list.css b/app/assets/stylesheets/list.css
index b7748291..4d7c11b1 100644
--- a/app/assets/stylesheets/list.css
+++ b/app/assets/stylesheets/list.css
@@ -70,9 +70,8 @@
 }
 .main-list .label-td:hover {
 	height: auto;
-    text-align: center;
     padding: 5px 5px 8px;
-	left: -6px;
+	left: -40px;
 	top: -6px;
 	border: 1px solid rgba(0, 0, 0, 0.2);
 	box-shadow: 0px 5px 10px rgba(0,0,0,0.2);
@@ -82,6 +81,7 @@
 	-webkit-border-radius: 3px;
 	-moz-border-radius: 3px;
 	z-index: 5;
+	width: 200px;
 }
 .qe-edit-div .table-condensed {
 	background-color: #F2F2F2;
@@ -188,10 +188,16 @@ legend {
 }
 .form-fixed {
 	position: fixed;
-	margin-bottom: 0;
+	margin: 0;
+	padding: 10px;
 	bottom: 0;
-	z-index: 10;
+	z-index: 2;
+}
+.form-fixed .btn {
+	margin-top: 4px;
 }
 .paginationFixed {
-	margin-bottom: 25px;
+}
+.paginationFixed .pagination {
+	margin-top: 0 !important;
 }
\ No newline at end of file
diff --git a/app/views/layouts/new_admin.html.erb b/app/views/layouts/new_admin.html.erb
index b6156c5d..4686545e 100644
--- a/app/views/layouts/new_admin.html.erb
+++ b/app/views/layouts/new_admin.html.erb
@@ -14,7 +14,7 @@
 </head>
 <body>
 	<%= render 'layouts/orbit_bar' %>
-	<nav id="main-sidebar" class="my_scroll">
+	<div id="main-sidebar" class="my_scroll">
 		<div class="scrollbar">
 			<div class="track">
 				<div class="thumb">
@@ -29,7 +29,7 @@
 				</ul>
 			</div>
 		</div>
-	</nav>
+	</div>
 	<div id="main-wrap">
 		<%= yield %>
 	</div>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
index 563be190..875c1eaf 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
@@ -5,8 +5,11 @@
 	</table>
 <% end %>
 
-<div id="bulletin_pagination" class="paginationFixed">
-	<%= paginate @bulletins, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil, :sort_options => params[:sort_options]} %>
+<div class="form-actions form-fixed pagination-right">
+	<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('admin.add'), new_panel_announcement_back_end_bulletin_path, :class => 'btn btn-primary pull-right' %>
+	<div id="bulletin_pagination" class="paginationFixed">
+		<%= paginate @bulletins, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil, :sort_options => params[:sort_options]} %>
+	</div>
 </div>
 
 <div id="bulletin_link_qe">
@@ -14,10 +17,6 @@
 		<%= render :partial => "bulletin_link_qe" %>
 	</div>
 </div>
-		
-<div class="form-actions form-fixed pagination-right">
-	<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('admin.add'), new_panel_announcement_back_end_bulletin_path, :class => 'btn btn-primary' %>
-</div>
 
 <% content_for :page_specific_javascript do %>
 	<%= javascript_include_tag "bulletin_form" %>
diff --git a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/index.html.erb b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/index.html.erb
index 78535138..123b1a91 100644
--- a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/index.html.erb
+++ b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/index.html.erb
@@ -5,8 +5,11 @@
 	</table>
 <% end %>
 
-<div id="news_bulletin_pagination">
-	<%= paginate @news_bulletins, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil, :sort_options => params[:sort_options]} %>
+<div class="form-actions form-fixed pagination-right">
+	<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('admin.add'), new_panel_news_back_end_news_bulletin_path, :class => 'btn btn-primary' %>
+	<div id="news_bulletin_pagination" class="paginationFixed">
+		<%= paginate @news_bulletins, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil, :sort_options => params[:sort_options]} %>
+	</div>
 </div>
 
 <div id="news_bulletin_link_qe">
@@ -20,10 +23,6 @@
 		<%= render :partial => "news_bulletin_file_qe" %>
 	</div>
 </div>
-		
-<div class="form-actions">
-	<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('admin.add'), new_panel_news_back_end_news_bulletin_path, :class => 'btn btn-primary' %>
-</div>
 
 <% content_for :page_specific_javascript do %>
 	<%= javascript_include_tag "news_bulletin_form" %>