From d791764effd5d4d11e74f7c9e558daa7b9e41aba Mon Sep 17 00:00:00 2001 From: Heiko Kernbach Date: Mon, 7 May 2012 15:12:46 +0200 Subject: [PATCH] style update --- html/admin/css/layout.css | 53 ++++++++++++++---- html/admin/js/master.js | 8 +-- html/admin/media/icons/doc_edit_icon16.png | Bin 512 -> 512 bytes .../icons/doc_edit_icon16_nofunction.png | Bin 0 -> 449 bytes .../media/icons/zoom_icon16_nofunction.png | Bin 0 -> 426 bytes 5 files changed, 46 insertions(+), 15 deletions(-) create mode 100644 html/admin/media/icons/doc_edit_icon16_nofunction.png create mode 100644 html/admin/media/icons/zoom_icon16_nofunction.png diff --git a/html/admin/css/layout.css b/html/admin/css/layout.css index aad5894127..22326b97dd 100644 --- a/html/admin/css/layout.css +++ b/html/admin/css/layout.css @@ -22,7 +22,9 @@ html.busy, html.busy * { } #logView .ui-tabs-nav .ui-state-active { - background-color: #E4E9D2 !important; + //background-color: #E4E9D2 !important; + background-color: #E6E6E6 !important; + border-bottom: solid 2px #E6E6E6 !important; } #logView .fg-toolbar{display: none;} @@ -60,6 +62,11 @@ td { font-size: 1.2em ; } +.nofunction { + padding-left: 4px; + padding-right: 1px; +} + pre ul li span{ font-family:"Lucida Sans Unicode", "Lucida Grande", sans-serif; font-size: 1em; @@ -87,6 +94,9 @@ pre ul li span{ border-bottom-left-radius: 2px; border-bottom-right-radius: 2px; background: url("images/ui-bg_flat_75_e6e6e6_40x100.png") repeat-x scroll 50% 50% #E6E6E6; + -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; } .dataTables_info{ @@ -198,7 +208,8 @@ pre ul li span{ .ui-tabs-nav { font-size: 0.8em !important; - height: 35px; + height: 35px; + //border-bottom: 0px !important; } .ui-tabs, .ui-tabs-panel { @@ -209,6 +220,14 @@ pre ul li span{ background: #F3F1EE; border: 0; } + +#tabs th{ + border-top: none; + -webkit-box-shadow: none !important; + -moz-box-shadow: none !important; + box-shadow: none !important; +} + #tab_right { margin-top: -18px; } @@ -228,7 +247,12 @@ pre ul li span{ margin-top: -11px !important; } +#queryOutput { + font-family: "courier"; +} + #queryContent { + font-family: "courier"; width: 100%; resize: none; } @@ -243,29 +267,36 @@ pre ul li span{ #avocshWindow p { margin-top: 10px; - padding-left: 20px; - padding-right: 20px; + padding-left: 30px; + padding-right: 30px; } -#avocshWindow a { - margin-top: 10px; +#avocshWindow b { padding-left: 10px; padding-right: 10px; } #avocshContent { + font-family: "courier"; width: 90%; - height: 40px; + height: 40px; + background-color: white; } .avocshSuccess { - background-color: #9EAF5A; - color: black; + font-family: "courier"; + background-color: #e4e9d2; + color: #335127; } .avocshError { - background-color: red; - color: white; + font-family: "courier"; + background-color: #FFD8D8; + color: red; +} + +.avocshClient { + font-family: "courier"; } #submitAvoc { diff --git a/html/admin/js/master.js b/html/admin/js/master.js index 07423cec1b..0af2fffed8 100644 --- a/html/admin/js/master.js +++ b/html/admin/js/master.js @@ -1037,12 +1037,12 @@ var logTable = $('#logTableID').dataTable({ $('#submitAvoc').live('click', function () { var data = $('#avocshContent').val(); - var client = "client:" + data; + var client = "avocadodb:" + data; - $('#avocshWindow').append('' + client + ''); + $('#avocshWindow').append('' + client + ''); try { - var server = "server:" + eval(data); + var server = "" + JSON.stringify(eval(data)); $('#avocshWindow').append('

' + server + '

'); } catch(e) { @@ -1356,7 +1356,7 @@ function drawCollectionsTable () { } else if (tempStatus == 2) { tempStatus = "unloaded"; - items.push(['', + items.push(['', val.id, val.name, tempStatus, "", ""]); } else if (tempStatus == 3) { diff --git a/html/admin/media/icons/doc_edit_icon16.png b/html/admin/media/icons/doc_edit_icon16.png index 14dcd5f3816f59017fc713ec92934b9b0a67ad11..53c0b15ee2035c7429df50d515aaab973e719b49 100644 GIT binary patch delta 20 bcmZo*X<(TU&&kTpWocx7d&b3$88a9GJUIrh delta 20 bcmZo*X<(TU&&eXeZp>ouBk^Km#tcRPG{*&) diff --git a/html/admin/media/icons/doc_edit_icon16_nofunction.png b/html/admin/media/icons/doc_edit_icon16_nofunction.png new file mode 100644 index 0000000000000000000000000000000000000000..3415df72eec7aa6fd2d3525c048c65f719697cf4 GIT binary patch literal 449 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-AbW|YuPgf&*TE`H;i+NXD+#NJo&++Inn+q zh7WW%^gX^28ama}tF}g4bGnGvuX#Nw`wsuRVP4J5S0~4o8u?0aj!LKY=}r9KbIoO& z&OiTbTrpe4({69v`u$pYJ%z4;ci!8uNGBIHEYRqBw=Ud1?wHa2goZpp>0}?}%&R-k zY4BXgef%#h)w9|&+cP))FaI5J3kHuU&o0&4pK;2W*7MJQzWj1ZAE!xN!ZTy@N%vIu z>WFp!sjyi#Y16&~dwVB2H9RenEHRJBPR@SI_M;}`V&?MDnOn_Rq!OOR-(lmZWtzv? o;&9A9SLtML&5C`y_Z{Hh;wOK59rGg@VE8h4y85}Sb4q9e0Ce83JOBUy literal 0 HcmV?d00001 diff --git a/html/admin/media/icons/zoom_icon16_nofunction.png b/html/admin/media/icons/zoom_icon16_nofunction.png new file mode 100644 index 0000000000000000000000000000000000000000..0f98bf0d86c10a4301fe6710283b1742144e30e4 GIT binary patch literal 426 zcmV;b0agBqP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iye* z3Nkn}`lti|00AmVL_t(I%axKba>6hWMV}mslrB@IOvkz~FjUZ`#K)k^4T4XQHn$)* z2qm_eLEOMc-~{|Mat1TTadt){TdVh^*_ERwPN&lfcn9oi*#r4_JpKZ3_h9e+Ccq6; z1J75o+{`weg5&YH0=B@}IhUE)?n=Cnv;|@yi|$;YIk^P`g#WDB*C~)>l6;aRyRLka zBs)o7l0`i=^z?@Z7l1d*g#5@DPr4Tb?ml9u5X0NH##ulYy(0JYnN U8v|*>9smFU07*qoM6N<$f?UC`sQ>@~ literal 0 HcmV?d00001