query/avocsh style update

arangodb · May 7, 2012 · e13863f · e13863f
1 parent 566b8d4
commit e13863f
Show file tree

Hide file tree

Showing 4 changed files with 75 additions and 30 deletions.
diff --git a/html/admin/css/jquery.snippet.css b/html/admin/css/jquery.snippet.css
@@ -21,11 +21,15 @@
 }
 
 .sh_cbracket {
-  color: green;
+  color: #C7A317;
 }
 
 .sh_keyword { 
-  color: red;  
+  color: #4E387E;  
+}
+
+.sh_string {
+  color: green;
 }
 
 .sh_object {

diff --git a/html/admin/css/layout.css b/html/admin/css/layout.css
@@ -28,6 +28,14 @@ html.busy, html.busy * {
 #logView .fg-toolbar{display: none;}
 #documentsView .fg-toolbar{display: none;}
 
+#documentsView button, #documentEditView button, #newDocumentTableView button {
+  padding-left:11px; 
+}
+
+#documentsView td button, #documentEditView td button, #newDocumentTableView td button {
+  padding: 0; 
+}
+
 html {
   font-family: Verdana,Arial,sans-serif; 
   font-size: 1em;
@@ -37,7 +45,15 @@ tr {
   font-size: 0.8em; 
 }
 th {
-  font-size: 1.1em; 
+  font-size: 1.2em;
+  height:30px;  
+  -webkit-box-shadow: inset 0 0 1px 1px #f6f6f6;
+  -moz-box-shadow: inset 0 0 1px 1px #f6f6f6;
+  box-shadow: inset 0 0 1px 1px #f6f6f6;
+  text-shadow: 0 1px 0 #fff;
+}
+td {
+  height:30px;    
 }
 
 #editCollectionView td {
@@ -110,14 +126,16 @@ pre ul li span{
   height:30px;
   line-height: 30px;
   vertical-align: middle;
-  //background-color: #7E9246; 
   background-color: #F3F1EE; 
   color: #9EAF5A;
   font-weight: bold; 
   text-decoration: none;
   border-top: 1px solid  #7E9246;
   border-bottom: 1px solid #7E9246;
   padding-left: 7px; 
+  -webkit-box-shadow: inset 0 0 1px 1px #f6f6f6;
+  -moz-box-shadow: inset 0 0 1px 1px #f6f6f6;
+  box-shadow: inset 0 0 1px 1px #f6f6f6;
 }
 
 #createCollectionView {
@@ -197,25 +215,46 @@ pre ul li span{
 #refreshLogButton {
   margin-top: 6px; 
 }
+
 #logSearchField {
   font-size: 0.8em;
   height:20px;  
 }
 
+#submitQuery {
+  height:34px !important;
+  width: 100px !important;
+  float:right; 
+  margin-top: -11px !important;     
+}
+
 #queryContent {
   width: 100%;
+  resize: none; 
 }
 
 #avocshWindow {
   background-color: white;  
   height: 300px; 
   overflow-y: auto; 
-  width:100%; 
+  width:100%;
+}
+
+
+#avocshWindow p {
+  margin-top: 10px; 
+  padding-left: 20px; 
+  padding-right: 20px; 
+}
+
+#avocshWindow a {
+  margin-top: 10px; 
+  padding-left: 10px; 
+  padding-right: 10px; 
 }
 
 #avocshContent {
-  width: 100%;
-  text-align:center;   
+  width: 90%;
   height: 40px; 
 } 
 
@@ -229,6 +268,11 @@ pre ul li span{
   color: white; 
 }
 
+#submitAvoc { 
+  height: 40px !important; 
+  width: 10% !important;   
+}
+
 #centerView {
   //background: #f1eee0 url(../media/images/bg.jpg);
   background-color: white;
@@ -412,6 +456,9 @@ pre ul li span{
 .fg-toolbar {
   font-size: 0.7em; 
   border: 1px solid #D3D3D3 !important; 
+  -webkit-box-shadow: inset 0 0 1px 1px #f6f6f6;
+  -moz-box-shadow: inset 0 0 1px 1px #f6f6f6;
+  box-shadow: inset 0 0 1px 1px #f6f6f6;
 }
 
 /*
@@ -421,17 +468,14 @@ pre ul li span{
 */
 #menue button.minimal{
   background: #e3e3e3;
+  padding: 9px 0 8px; 
   border: 1px solid #bbb;
-  -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
-  border-radius: 3px;
   -webkit-box-shadow: inset 0 0 1px 1px #f6f6f6;
   -moz-box-shadow: inset 0 0 1px 1px #f6f6f6;
   box-shadow: inset 0 0 1px 1px #f6f6f6;
   color: #333;
   font: 0.7em Verdana,Arial,sans-serif;
   line-height: 1;
-  padding: 8px 0 9px;
   text-align: center;
   text-shadow: 0 1px 0 #fff;
   width: 80px;
@@ -460,6 +504,7 @@ pre ul li span{
   background-color: transparent;
   font: 12px "helvetica neue", helvetica, arial, sans-serif;
   width: auto;
+  padding-left:11px;
 }
 
 #collectionsView button a {

diff --git a/html/admin/index.html b/html/admin/index.html
@@ -8,24 +8,20 @@
       @import "css/jquery-ui-1.8.19.custom.css";
       @import "css/jquery.dataTables_themeroller.css";  
     </style>
-
-    <link href="css/prettify.css" type="text/css" rel="stylesheet" />
-
-    <script type="text/javascript" language="javascript" src="js/jquery-1.7.2.js"></script>
-    <script type="text/javascript" language="javascript" src="js/jquery.snippet.js"></script>
-    <script type="text/javascript" language="javascript" src="js/json2.js"></script>
-    <script type="text/javascript" language="javascript" src="js/jquery.sha256.js"></script>
-    <script type="text/javascript" language="javascript" src="js/jquery.layout-latest.js"></script>
-    <script type="text/javascript" language="javascript" src="js/jquery.address-1.4.js"></script>
-    <script type="text/javascript" language="javascript" src="js/jquery.dataTables.js"></script>
-    <script type="text/javascript" language="javascript" src="js/jquery-ui-1.8.18.custom.min.js"></script>
-    <script type="text/javascript" language="javascript" src="js/jquery.jeditable.js"></script>
-    <script type="text/javascript" language="javascript" src="js/master.js"></script>
-    <script type="text/javascript" language="javascript" src="js/avocsh1.js"></script>
-    <script type="text/javascript" language="javascript" src="js/client.js"></script>
-    <script type="text/javascript" language="javascript" src="js/jsunity.js"></script>
-    <script type="text/javascript" language="javascript" src="js/test.js"></script>
-
+      <script type="text/javascript" language="javascript" src="js/jquery-1.7.2.js"></script>
+      <script type="text/javascript" language="javascript" src="js/jquery.snippet.js"></script>
+      <script type="text/javascript" language="javascript" src="js/json2.js"></script>
+      <script type="text/javascript" language="javascript" src="js/jquery.sha256.js"></script>
+      <script type="text/javascript" language="javascript" src="js/jquery.layout-latest.js"></script>
+      <script type="text/javascript" language="javascript" src="js/jquery.address-1.4.js"></script>
+      <script type="text/javascript" language="javascript" src="js/jquery.dataTables.js"></script>
+      <script type="text/javascript" language="javascript" src="js/jquery-ui-1.8.18.custom.min.js"></script>
+      <script type="text/javascript" language="javascript" src="js/jquery.jeditable.js"></script>
+      <script type="text/javascript" language="javascript" src="js/master.js"></script>
+      <script type="text/javascript" language="javascript" src="js/avocsh1.js"></script>
+      <script type="text/javascript" language="javascript" src="js/client.js"></script>
+      <script type="text/javascript" language="javascript" src="js/jsunity.js"></script>
+      <script type="text/javascript" language="javascript" src="js/test.js"></script>
     <style>
       a:link {color: #9EAF5A; text-decoration: none;}  
       a:visited {color: #9EAF5A; text-decoration: none;}

diff --git a/html/admin/js/master.js b/html/admin/js/master.js
@@ -1039,7 +1039,7 @@ var logTable = $('#logTableID').dataTable({
     var data = $('#avocshContent').val();
     var client = "client:" + data;
 
-    $('#avocshWindow').append('<p>' + client + '</p>');
+    $('#avocshWindow').append('<a>' + client + '</a>');
 
     try {
       var server = "server:" + eval(data);