From 7600a9a6e86557c0b8dd3fa4e3ca365d4cda6450 Mon Sep 17 00:00:00 2001 From: Heiko Kernbach Date: Tue, 8 May 2012 15:02:56 +0200 Subject: [PATCH] style/sliderbutton --- html/admin/css/layout.css | 7 +++ html/admin/index.html | 76 +++++++++++------------ html/admin/js/master.js | 24 ++++--- html/admin/media/images/sliderButton.png | Bin 2515 -> 1208 bytes 4 files changed, 59 insertions(+), 48 deletions(-) diff --git a/html/admin/css/layout.css b/html/admin/css/layout.css index 02e72f2c92..f7c4152c98 100644 --- a/html/admin/css/layout.css +++ b/html/admin/css/layout.css @@ -38,6 +38,13 @@ html.busy, html.busy * { padding: 0; } +.snippet-no-num { + font-size: 1em; + font-weight: normal; + font-; + font-family: Verdana, Arial, sans-serif; +} + html { font-family: Verdana,Arial,sans-serif; font-size: 1em; diff --git a/html/admin/index.html b/html/admin/index.html index 55cb1db114..cdf92832d1 100644 --- a/html/admin/index.html +++ b/html/admin/index.html @@ -60,11 +60,11 @@
- - @@ -85,11 +85,11 @@
@@ -300,10 +300,10 @@
- - - - + + + + Showing
@@ -318,10 +318,10 @@
- - - - + + + + Showing
@@ -366,11 +366,11 @@
Welcome Guest! - +
diff --git a/html/admin/js/master.js b/html/admin/js/master.js index 34114fc83c..78eebf34d8 100644 --- a/html/admin/js/master.js +++ b/html/admin/js/master.js @@ -416,10 +416,11 @@ var logTable = $('#logTableID').dataTable({ documentEditTable.fnAddData(["", key, value2html(val), JSON.stringify(val)]); } else if (key != '_rev' && key != '_id') { - documentEditTable.fnAddData(['',key, value2html(val), JSON.stringify(val)]); + documentEditTable.fnAddData(['',key, value2html(val), JSON.stringify(val)]); } }); documentTableMakeEditable('#documentEditTableID'); + showCursor(); }, error: function(data) { } @@ -462,9 +463,10 @@ var logTable = $('#logTableID').dataTable({ contentType: "application/json", success: function(data) { $.each(data.result, function(k, v) { - documentsTable.fnAddData(['', v._id, v._rev, '
' + cutByResolution(JSON.stringify(v)) + '
']); + documentsTable.fnAddData(['', v._id, v._rev, '
' + cutByResolution(JSON.stringify(v)) + '
']); }); $(".prettify").snippet("javascript", {style: "nedit", menu: false, startText: false, transparent: true, showNum: false}); + showCursor(); }, error: function(data) { @@ -558,7 +560,7 @@ var logTable = $('#logTableID').dataTable({ $("#configContent").empty(); $.each(content, function(data) { - $('#configContent').append('
' + data + '
'); + $('#configContent').append('
' + data + '
'); $.each(content[data], function(key, val) { if (switcher == "primary") { $('#configContent').append('' + key + '' + val + '
'); @@ -702,8 +704,9 @@ var logTable = $('#logTableID').dataTable({ $('#addEditedDocRowButton').live('click', function () { if (tableView == true) { - documentEditTable.fnAddData(['', "somevalue", value2html("editme"), JSON.stringify("editme")]); + documentEditTable.fnAddData(['', "somevalue", value2html("editme"), JSON.stringify("editme")]); documentTableMakeEditable('#documentEditTableID'); + showCursor(); } else { } @@ -775,8 +778,9 @@ var logTable = $('#logTableID').dataTable({ $('#addNewDocButton').live('click', function () { if (tableView == true) { - newDocumentTable.fnAddData(['', "somevalue", value2html("editme"), JSON.stringify("editme")]); + newDocumentTable.fnAddData(['', "somevalue", value2html("editme"), JSON.stringify("editme")]); documentTableMakeEditable('#NewDocumentTableID'); + showCursor(); } else { } @@ -817,7 +821,7 @@ var logTable = $('#logTableID').dataTable({ documentEditTable.fnClearTable(); $.each(parsedContent, function(key, val) { - documentEditTable.fnAddData(['', v._id, v._rev, '
' + cutByResolution(JSON.stringify(v)) + '
']); + $('#documentsTableID').dataTable().fnAddData(['', v._id, v._rev, '
' + cutByResolution(JSON.stringify(v)) + '
']); }); $(".prettify").snippet("javascript", {style: "nedit", menu: false, startText: false, transparent: true, showNum: false}); }, @@ -1693,7 +1697,7 @@ function createNextDocPagination () { contentType: "application/json", success: function(data) { $.each(data.result, function(k, v) { - $("#documentsTableID").dataTable().fnAddData(['', v._id, v._rev, '
' + cutByResolution(JSON.stringify(v)) + '
']); + $("#documentsTableID").dataTable().fnAddData(['', v._id, v._rev, '
' + cutByResolution(JSON.stringify(v)) + '
']); }); $(".prettify").snippet("javascript", {style: "nedit", menu: false, startText: false, transparent: true, showNum: false}); }, @@ -1802,7 +1806,7 @@ function createFirstPagination () { contentType: "application/json", success: function(data) { $.each(data.result, function(k, v) { - $('#documentsTableID').dataTable().fnAddData(['', v._id, v._rev, '
' + cutByResolution(JSON.stringify(v)) + '
' ]); + $('#documentsTableID').dataTable().fnAddData(['', v._id, v._rev, '
' + cutByResolution(JSON.stringify(v)) + '
' ]); }); $(".prettify").snippet("javascript", {style: "nedit", menu: false, startText: false, transparent: true, showNum: false}); collectionCurrentPage = 1; @@ -1855,7 +1859,7 @@ function createLastPagination () { contentType: "application/json", success: function(data) { $.each(data.result, function(k, v) { - $('#documentsTableID').dataTable().fnAddData(['', v._id, v._rev, '
' + cutByResolution(JSON.stringify(v)) + '
' ]); + $('#documentsTableID').dataTable().fnAddData(['', v._id, v._rev, '
' + cutByResolution(JSON.stringify(v)) + '
' ]); }); $(".prettify").snippet("javascript", {style: "nedit", menu: false, startText: false, transparent: true, showNum: false}); collectionCurrentPage = totalCollectionCount; diff --git a/html/admin/media/images/sliderButton.png b/html/admin/media/images/sliderButton.png index c0ad950f888652cb56e8ea8bc643d3c079dd698e..cda2551cf017a3158681807c0424d905ce0ad207 100644 GIT binary patch delta 1141 zcmV-*1d9996SxVGHwgd$0002_L%V;GKp%ev2n;tK$8NP)000CyNklc1A@o*6JA%)XK`B6y937 zHVPJZ1T>x&wrqiR#@s~)n|Zf5-S`I-0Y{U2f63R(_lNJ9_nmKECJ(?c48t%C!!UpU z7lfBucxr0O1fUIobg%0Wz^>Qpy?E0?CMPF*1wrruFg!7Ig@`77K40oh3Gw^=20;)u z0GOULkBEl-e*f>K{{H)Ni17J*CIEjH5QSX)Y`5DD(P;GZs|uNzm@r(6kcbGyGyo>M z-7ZC=(J#gB<6Wsjh-ia|iWYIJ4S9dP-d~E{#}B257#kbwRTRZk#hL8sGUaBvV+RaH1SIeBVH$!4>C-P_wcR4uheMn+7Eq8JoKLB3X9U5&oJK8T_S zi^YP@&Q3fw{*ILj$_Hx*&=olF20M>gr&zSfJHv5s5^Q&1Qe|O>I+K zNZypPSS)ZlodAHfwKW_Z96+PdpufK#Mxzmxm6cdpTFNIzQuWkQ6y-y%)5mN!-x0CD zzYiipHk(B#6hbi~I6e5}=qTVu=C@XsWr{?Kh=yOSj87yIe>HzKH5rJ=RDy^L z0H1=vVCvO`T#NZ^wOSC=@y@We@MmmE6f>@{84K{hNqBKBLT75d`7a z#l^*v|F^%$R}{C~-3y@Ov9Blq=9ZV2Q(zc|VHk#C7=~dOhG7_nVag3V=<>l1x)Nar z-3{!ZV+Y*}M1+WZWj22c7)D1&dsU6djf3t5UO^oIR#b}!5w+dFqmm?{y}iAlyI)gN zgXZSue{%G-sTz@74myX!0i)3fNs2z?r-4I3b-O2K#+mIv)R;v|StrqL+>ksUHMxzl(M(0i2zkJ+}1QaM0amb#)a) zgqD^TWHK2nEG%IlolZYBZMT^H6kTh@y{D6rKp%eu7zh>^$l}v|000S7Nklf#vWUl7R+)UyhFquEV%-l?7t~4gb z7$d|}ys7ods2C8BRQYJEgrd?a(gNDnl(}%folOtYBQTS$WGB0Cd3WDuzlXKfvmSp+ z$b&f?4hi@LI09G!GhhJ9fD-l3mVq!31iZjYzzJMb6eXJL7)o*k@F(Cj&g%kh7IG7g+m6yQtfaZQ zncCV~ZSxrLtD-2wSp#u69R0vQfELjfjYe_1-S~Vy3S~7lHSF58i}Lc=XBzbJ}w zBV!;ch<~a_DUu`+i9{G39VHTpP-xTXbXY7F?Q-)1e@+Fa%$*)l6hv9U+Qo{(i3kH>?@<6*sQ>(;GUEEesa>5e}Dq$K?=3lNed z@$utF-oAay^78V!UGLw&XKH_HN{r8@j**l=R6o%#K8M3$#>dCm2=?yXJN$mX_}H(G zHRX()6@DTbjWRMavaT}`e@#qG@a@|-)G?k-3PcS%I)tB?n3y0G3T-GLkw}C$Z{CO@ zcc^1dn2|Fvm-_7+A3l88P$0xLH#evCVP{qVQKQ)1qVd_YXL()UO-+AId3~PS?H0GY z)v?EB2%m^Haa^ylSR5&*@q7w#BHa;;gDoCv)cqvQc|Klud_Cz(TLq{ zN3YkfXt&vHl$Vz?Ha368!oosMzv1)wh(sdjbh=HzFS44R#zOMt<>j0MzJY;(1Q5d7 z+uH$n^5jWgz?e)XfFrV+V*?Nf1abmmGMPAb>{tv$G#bU@@eqwhwIN0f%=72ZnVXx- z`uBptpt!ZlBDw`~dT48FD?L3uE86^iKOT<YHx2xr_=H3)hph= zf1lNFYG%|dt852A)>&RM5RpiP2M->^2Ko8(X99r$Kn#q!M^5Vq{CMG5_{@u@? zKZ{#~tWq{Vvi~fWRd;tc2M-=hmI@@i80}{PX7lFF9653XgTcVa$Vj#eqD;z#1?lbW zO$x&4bfygZXJ&t9n4FwUXg_%HAicf4S+ha05asLFuNgU|o}M1s+S-zWc>VhIPy4#v zZk$eMLf^KwHhOw`G8%_4S>=;TDk>_{o5Qj)1_lObY;0W79twrHbLURl`|S1W*8~Cq zPMkQg;;3$KZ^vjfa_7z+!r^e*oS3B2n6W*w+I9Hw;iP{chK7dldc7IFO|RF>(9jT} zP-w;T%w{u(4FDUd z?RIOuYfgXW_xrhg`7*nA?@l|tHX4oM_NA;+`+oq?>-A~*l29nb*w|R!^YTC-kkNAu zhL|sR%D_e7@4%*phK8Jj#%G$)m1A+ZULmKs%k@nC@+667d(JlRJo)$h7o{0d-iN-AXck2 zVazcgYPoA%tiO2gy-}>bzFy46xVA(W&orJ>D@E+zzaO1Wx1nZ2mSt=(g0S$Y^~7k_r8k$$wJsH_wzf7pIy$l|y`?IKdcEE? zts!=GbzwG}b1R0XDo-yiE;2GQQqZbyV`C%T-Q8ki=U$$Ut1GS$40yd>o<4ob($Z4i z09001(%IQ5W+A_Vfh4856%r1w*NeyF$w`0tU^1C#X=xDvpimNyB!Ch`HQ{g=uh+|$ zFJJib<;zc(USne;H8nNV)YM=$n<*e+ zQP8c06x;n3Gzq+~_tJRuzT_$G*-LYfGFq_SEcXxC1 z=1o3*`jqqAt*@`AudffiUQbI)3%73FTD6Z>K_?NXpj+)NXozL>dOdx8ebm<0<}?#^ zb#*Zi@IzG7)z!6XKdpjJB2GcK+NFO{8^pj23=Cuqrmn7z{{H?1RjR>Y$V60=xq|Ng z{rd?=v|g{rZnv{}^X7~>-(=ESuh+}{`}Z>2TvO?wtg;ggA~()P6+J#a z&ceb1R;zWzo8Gr?9|nVgj~{kBfroE3Db?9-=DJbLsfM&ndgRtj-gf?c?9AwlSwsTEW~ zH$Okmskrl1Rj zLR`CcjoH~*0)YUdqoX`{@PO~%zZXP7SE6B2egiDR+2#7*Ht~^dJ|bjc6%`fY0GU)2 z<#+KcO2HI#*{ZaQ3Ob4ky0x*Qf)0uby1ZFYLAP3Yx~QN_!-@(ziVC_IprV3~JS*t_ Z1Kd;lnZrr7N&o-=07(Z$PDHLkV1m)Hxu^gD