From 747f794a1832bf5d4c78ad9841eaeb3759f54f4f Mon Sep 17 00:00:00 2001
From: manson <manson@rulingcom.com>
Date: Thu, 17 Jul 2014 18:38:08 +0800
Subject: [PATCH] Update RWD for dashboard and OrbitBar

---
 app/assets/stylesheets/basic/orbit_bar.css.erb  | 14 +++++++++++---
 app/views/admin/dashboards/_server_loading.erb  | 11 ++++++-----
 app/views/admin/dashboards/_traffic_loading.erb |  2 +-
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/app/assets/stylesheets/basic/orbit_bar.css.erb b/app/assets/stylesheets/basic/orbit_bar.css.erb
index 51d828b..4842867 100644
--- a/app/assets/stylesheets/basic/orbit_bar.css.erb
+++ b/app/assets/stylesheets/basic/orbit_bar.css.erb
@@ -295,14 +295,16 @@
 
 
 /* Responsive */
-@media (max-width: 480px) {
+@media (max-width: 630px) {
 	#orbit-bar .navbar-inner .nav {
 		margin-right: 0;
 	}
-	#orbit-bar #orbit-user span,
-	#orbit-bar #search {
+	#orbit-bar #orbit-user span{
 		display: none;
 	}
+	#orbit-bar #search input[type="text"] {
+		width: 80px;
+	}
 	#orbit-bar #orbit-language [class^="flag-"],
 	#orbit-bar #orbit-language [class*=" flag-"] {
 		margin: -8px;
@@ -314,4 +316,10 @@
 		width: 350px;
 		margin-left: -175px;
 	}
+}
+
+@media (max-width: 430px) {
+	#orbit-bar #search{
+		display: none;
+	}
 }
\ No newline at end of file
diff --git a/app/views/admin/dashboards/_server_loading.erb b/app/views/admin/dashboards/_server_loading.erb
index 0bdc090..2f39542 100644
--- a/app/views/admin/dashboards/_server_loading.erb
+++ b/app/views/admin/dashboards/_server_loading.erb
@@ -12,10 +12,6 @@
     <div id="disk_usage" class="usages pull-right span4" style=""></div>
   </div>
 </div>
-<style type="text/css">
-  .usages{
-  }
-</style>
 <script type="text/javascript">
 var Gages = { 'CPU':{
               'JustGage': null,
@@ -55,7 +51,12 @@ $(function () {
 });
 
 function initialize_usage(){
-  var h = parseInt($('#server_loading').width()/3*0.75);
+  var h
+  if(window.outerWidth > 768) {
+    h = parseInt($('#server_loading').width()/3*0.75);
+  } else {
+    h = parseInt($('#server_loading').width()*0.3);
+  }
   $.each($(".usages"),function(){$(this).height(h);});
 
   $.each(Gages,function(id,Gage){
diff --git a/app/views/admin/dashboards/_traffic_loading.erb b/app/views/admin/dashboards/_traffic_loading.erb
index 6e2d52b..e7f8a99 100644
--- a/app/views/admin/dashboards/_traffic_loading.erb
+++ b/app/views/admin/dashboards/_traffic_loading.erb
@@ -6,7 +6,7 @@
     </h2>
 </div>
 <div class="box-content">
-    <div id="month_traffic" style="min-width: 310px; margin: 0 auto">
+    <div id="month_traffic" style="margin: 0 auto">
         <%= line_chart  get_month_traffic, :height => "200px", :name => 'Visit',
                     :library => {
                         legend: 'none',