From 1804a8406272ef5e0f6eff5d68935745cf1aa5a0 Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Fri, 22 Jan 2016 20:47:58 +0000 Subject: [PATCH] Move date picker prev / next buttons to right side of header, with today button in between --- etemplate/templates/default/etemplate2.css | 24 ++++++++++++++++++ etemplate/templates/default/images/today.png | Bin 0 -> 784 bytes etemplate/templates/pixelegg/images/today.png | Bin 0 -> 1890 bytes pixelegg/css/mobile.css | 14 ++++++---- pixelegg/css/pixelegg.css | 12 ++++++--- pixelegg/images/day.png | Bin 0 -> 2104 bytes pixelegg/images/today.png | Bin 2104 -> 1890 bytes pixelegg/less/etemplate2.less | 4 +++ 8 files changed, 45 insertions(+), 9 deletions(-) create mode 100644 etemplate/templates/default/images/today.png create mode 100755 etemplate/templates/pixelegg/images/today.png create mode 100755 pixelegg/images/day.png diff --git a/etemplate/templates/default/etemplate2.css b/etemplate/templates/default/etemplate2.css index 6d4d347970..320f0f5bf7 100644 --- a/etemplate/templates/default/etemplate2.css +++ b/etemplate/templates/default/etemplate2.css @@ -431,6 +431,30 @@ span.et2_date span { span.et2_date_duration input.et2_date_duration{ width: 5em; } +/* customize calendar layout */ +.ui-datepicker .ui-datepicker-header .ui-datepicker-title { + margin-left: 2px; + margin-right: 4.6em; + text-align: left; +} +.ui-datepicker .ui-datepicker-header .ui-datepicker-prev { + left: initial; + right: 4em; +} +.ui-datepicker .ui-datepicker-buttonpane button[data-handler="today"] { + position: absolute; + top: -2px; + right: 24px; + width: 23px; + height: 23px; + overflow: hidden; + background-color: white; + margin-left: 3px; + text-indent: 20px; + background-size: contain; + background-image: url(images/today.png); +} + /** * Dialog widget * It uses jQueryUI, so this is just our little bits - icon on left diff --git a/etemplate/templates/default/images/today.png b/etemplate/templates/default/images/today.png new file mode 100644 index 0000000000000000000000000000000000000000..3c9e085eaed0f4413415d17ab330b2eb88246356 GIT binary patch literal 784 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 delta 1282 zcmV+d1^xQs4!97oS^^+AGc-j*FgHOkHa9^rF-0>$IXE;!I7T@(I7CG@MnW=^dIB6E zI5RXwLohcvFg79mK{+@yLpVk`HaJ8@Hbz1+lePk4ATU8VFflPVG%z{m}n8)+1uNoGt;s!5C{ zo2*f4#uhcWhbkg^u;`&IyX;=KBIvOfFCGN{fauwaM^E+8-J{?N7D^C7(Jo#@jo`m{ z5OoXM82=?sGSlBnGj=+pNwrhF^ufzF^L>-|z3=zloB2JqrKN>YM3!YHnSV?&q9`&P z$1y!UJ)M|tWj;x8Y;5c$U7VerG5!7h+VyM_gYKqn{HIKEk|Z$(gCTXpvTW*lX=%xP zaB$$Bot=F)K0f{ob26=WcX!k967wdEw#muK*3r??-+7*wbM1};B^?e&q_(#9DeU}> zsVO*e!qJJz2|6*!+}s>@d4GB7+1c6oYin!EenwqjuYrW5hA+c-3JocWHO0>Usg5(++9p#B(A^-*sd^m z^0itAD{(k@smzS3xLEogw$7xkn6^#rS%{OgGA2(9$`>_m%hK4?4wji28%n|c_ zPwZF=Io;>t0k=YcHXj@u`~#oP)K1tuMHcA?d{CEo=W>7nK@^LMiW1;#W<5$RQ?g|( zLv_8Q;oygdhaYI)f_G8%s~3FJba8RP6TSQFO$g{EOn)XQDQFSw#fSMnM@B}hdY}M$ z&mSKj+rfe#udc58z&jCa$>4m6eqpqFoB3BYIL;SeT^6`T6-8+z0ePfRdXI22Bt>qY8@0 z-C1~>grw%3=F)bD%izK#@ycC zE}?IWpb{QNA`u%Nw`}=-mtb>{o sJskk_B0{i-@l9`U@1ipQL4W}OBtY(PQs|O<01E&B07*qoM6N<$f+Ms@?EnA( diff --git a/pixelegg/less/etemplate2.less b/pixelegg/less/etemplate2.less index 8f6427220a..b04f3c93be 100755 --- a/pixelegg/less/etemplate2.less +++ b/pixelegg/less/etemplate2.less @@ -168,6 +168,10 @@ span.et2_date span { color: @gray_0; } +.ui-datepicker .ui-datepicker-buttonpane button[data-handler="today"] { + background-image: url(../images/today.png); +} + .et2_file .progress li:hover div.remove { .dimension_width_height_s; }