Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel

html/admin/css/collectionsItemView.css

@@ -1,6 +1,6 @@
 .span3 {
   min-height:100px;
-  width: 280px;
+  width: 230px;
   margin-left: 8px !important;
   margin-bottom: 8px !important;
   border: 0px;
@@ -20,7 +20,7 @@
   white-space: nowrap !important;
   overflow: hidden !important;
   text-overflow: ellipsis !important;
-  width: 264px;
+  width: 214px;
   color: #fff;
   border: 0;
   background:#676665;

html/admin/css/dashboardView.css

@@ -22,8 +22,8 @@
 
 .group-close, .group-open {
   float:right;
-  margin-top: 17px !important;
-  margin-right: 7px !important;
+  margin-top: 18px !important;
+  margin-right: 25px !important;
 }
 
 .db-zoom, .db-minimize, .db-hide, .db-info, #detailReplicationMinimize{
@@ -42,9 +42,10 @@
 }
 
 .statGroups {
+  margin-top: 10px !important;
   margin-left: 0px;
   float:left;
-  width: 100%;
+  width: 100% !important;
   margin-bottom: -15px !important;
 }
 
@@ -61,21 +62,20 @@
 
 .statSingleClient {
   height: 300px;
-  width: 99.7%;
+  width: 100% !important;
   margin-top: 10px;
   margin-left: 10px !important;
-  margin-right: 11px;
+  margin-right: 11px !important;
   margin-bottom: 0px !important;
-  border: 1px solid black;
   background-color: #F4F3F3;
 }
 
 .statClient {
   float: left;
   height: 70px;
-  width: 203px;
-  margin-left: 9px;
-  margin-bottom: 12px;
+  width: 230px;
+  margin-left: 8px !important;
+  margin-bottom: 4px !important;
   border: 1px solid black;
   background-color: #F4F3F3;
 }
@@ -106,8 +106,7 @@
   margin-top: 0 !important;
   padding-top: 0 !important;
   height: 140px;
-  /*width: 255px;*/
-  width: 272px;
+  width: 300px;
 }
 
 .svgDetailClass {
@@ -136,16 +135,23 @@
   margin-bottom: -15px !important;
 }
 
-.statsHeader {
+#statsHeaderDiv {
+  margin-bottom: 16px;
   margin-top: 12px;
-  margin-left: 10px;
-  margin-right: 10px;
-  width: 100%;
-  background-color: #686766;
+  margin-right: 20px !important;
+  margin-left: 8px !important;
+  padding: 0 !important;
+  height: 24px !important;
+  width: auto !important;
   color: white;
   height: 36px;
 }
 
+.statsHeader {
+  width: 100%;
+  background-color: #686766 !important;
+}
+
 #dashboardHeader {
   background-color: #686766;
   border-bottom: 1px solid #A0A0A0;
@@ -278,6 +284,7 @@
 
 #detailReplicationDiv {
   padding-top: 26px;
+  padding-right: 20px;
 }
 
 #detailReplicationDiv table {
@@ -319,6 +326,7 @@
 
 #leftReplicationDiv table, #rightReplicationDiv table {
   width: 100%;
+  padding-right: 10px !important;
 }
 
 #leftReplicationDiv table tr, #rightReplicationDiv table tr{
@@ -335,6 +343,7 @@
   width: 100%;
   min-height: 150px;
   margin-bottom: 8px;
+  margin-right: 10px;
   margin-top: -20px;
 }
 
@@ -405,7 +414,11 @@
 }
 
 #detailReplication {
-  background-color: #D9D5D1 !important;
+  margin-right: 20px;
+  background-color: transparent !important;
   border: 0 !important;
 }
 
+#detailGraphPadding {
+  padding-right: 33px !important;
+}

html/admin/css/layout.css

@@ -242,7 +242,10 @@ table .sorting {
 }
 
 .marginRight10 {
-  padding-right: 33px !important;
+  padding-left: 10px !important;
+  padding-top: 10px !important;
+  padding-bottom: 10px !important;
+  padding-right: 0px !important;
 }
 
 .form-actions {

html/admin/css/shellView.css

@@ -29,9 +29,14 @@
 .vsplitbar {
   border: 0;
   width: 10px;
-  background-color: #686766;
-  border-bottom: 1px solid black;
+  background-color: #F0F0F0;
   border-top: 1px solid black;
+  border-bottom: 1px solid black;
+  border-left: 1px solid #A0A0A0;
+  border-right: 1px solid #A0A0A0;
+  background-image: url(../img/stripes90.gif);
+  background-repeat:no-repeat;
+  background-position: 50% 50%;
 }
 
 .vsplitbar:hover {

html/admin/js/templates/dashboardView.ejs

@@ -127,6 +127,7 @@
     <h4 class="">Detail Chart</h4>
   </li>
 
+  <div id="detailGraphPadding">
   <li id="detailGraph" class="statSingleClient">
     <div class="boxHeader">
       <h6 id="detailGraphHeader" class="dashboardH6">User Time</h6>
@@ -135,5 +136,6 @@
       <svg class="svgDetailClass"/>
     </div>
   </li>
+  </div>
 
 </ul>

html/admin/js/templates/graphView.ejs

@@ -17,11 +17,16 @@ ds = _.sortBy(ds, sortF);
 es = _.sortBy(es, sortF);
 gs = _.sortBy(gs, sortF);
 %>
-<div class="thumbnails" id="background">
+<div id="background">
+  <ul class="thumbnails2">
+    <div id="transparentHeader">
+      <h4>Graph Viewer Configuration</h4>
+    </div>
+  </ul>
+
+  <ul class="thumbnails">
     <form action="javascript:void(0);" autocomplete="on" class="form-horizontal" id="creationDialog">
       <fieldset>
-      <legend>Configuration</legend>
-
         <div class="control-group">
           
           <fieldset id="datasoure">
@@ -135,4 +140,5 @@ gs = _.sortBy(gs, sortF);
         </div>
       </fieldset>
     </form>
+  </ul>
 </div>

html/admin/js/views/dashboardView.js

@@ -211,7 +211,7 @@ var dashboardView = Backbone.View.extend({
       $('.thumbnails').append(
         '<ul class="statGroups" id="' + this.group + '">' +
         '<i class="group-close icon-minus icon-white"></i>' +
-        '<h4 class="statsHeader">' + this.name + '</h4>' +
+        '<div id="statsHeaderDiv"><h4 class="statsHeader">' + this.name + '</h4></div>' +
         '</ul>');
 
       //group

html/admin/js/views/navigationView.js

@@ -24,7 +24,9 @@ var navigationView = Backbone.View.extend({
     //padding row 40px
     var containerWidth = $(window).width() - 70;
     //var spanWidth = $('.span3').outerWidth(true);
-    var spanWidth = 292;
+    var test = $('.span3').outerWidth(true);
+    console.log(test);
+    var spanWidth = 242;
     var divider = containerWidth / spanWidth;
     var roundDiv = parseInt(divider, 10);