From d6d69f25291d2978545ddf5ddd441b7ba4bb28a2 Mon Sep 17 00:00:00 2001 From: larsz Date: Sat, 11 Feb 2012 22:49:42 +0200 Subject: [PATCH 1/2] =?UTF-8?q?added=20styles=20for=20custom=20select=20(+?= =?UTF-8?q?=20hover)=20=E2=80=94=20issues=20#39=20&=20#40?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/css/main.css | 28 +++++++++++++----- ...omplete-field-arrows-sprite-2012-02-11.png | Bin 0 -> 1847 bytes 2 files changed, 21 insertions(+), 7 deletions(-) create mode 100644 web/images/autocomplete-field-arrows-sprite-2012-02-11.png diff --git a/web/css/main.css b/web/css/main.css index 2a91b6a56..8ad5d6213 100644 --- a/web/css/main.css +++ b/web/css/main.css @@ -3,7 +3,7 @@ Title : Vesta Author : Eugen Lobicov, eugen.lobicov@gmail.com created : November 27, 2009 -last updated : February 8, 2012 +last updated : February 11, 2012 - - - - - - - - - - - - - - - - - - */ html{ @@ -1474,8 +1474,9 @@ input::-moz-focus-inner{ background:url(../images/group-value-bullet.png) no-repeat 5px 8px; } .group-values .group-switcher{ + display:block; padding-right:15px; - background:url(../images/group-values-collapsed.png) no-repeat 100% 4px; + background:url(../images/group-values-collapsed.png) no-repeat 100% 50%; } .group-values .group-values-count{ font-size:12px; @@ -1574,7 +1575,7 @@ input::-moz-focus-inner{ .b-new-entry .textarea:focus{ -moz-box-shadow:0 0 8px rgba(82, 168, 236, 0.5); -webkit-box-shadow:0 0 8px rgba(82, 168, 236, 0.5); - border-color:rgba(82, 168, 236, 0.75) !important; + border-color:rgba(82, 168, 236, 0.75); color:#262523; } @@ -1611,6 +1612,8 @@ input::-moz-focus-inner{ } .b-new-entry select.styled{ top:0; + width:231px; + height:35px; } .b-new-entry option{ padding:5px 5px 5px 8px; @@ -1881,25 +1884,36 @@ input::-moz-focus-inner{ .b-new-entry .autocomplete-box{ position:relative; float:left; - padding-right:35px; + padding-right:34px; background:#fff; } .b-new-entry .autocomplete-box .text-field{ - width:213px; + width:221px; margin:0; + border-right:0; + cursor:pointer; + padding-top:6px; + padding-bottom:6px; } + .b-new-entry .autocomplete-box .text-field{ + -moz-box-shadow:none; + -webkit-box-shadow:none; + border-color:#B8C2C3; + } + .b-new-entry .autocomplete-box .arrow{ position:absolute; top:0; right:0; display:block; - width:32px; + width:34px; height:32px; font-size:0; line-height:0; - background:#fff url(../images/autocomplete-field-arrows-sprite.png) no-repeat; + background:#fff url(../images/autocomplete-field-arrows-sprite-2012-02-11.png) no-repeat; cursor:pointer; } + .b-new-entry .autocomplete-box:hover .arrow, .b-new-entry .autocomplete-box .arrow:hover, .b-new-entry .autocomplete-box .arrow:active, .b-new-entry .autocomplete-box .arrow:focus{ diff --git a/web/images/autocomplete-field-arrows-sprite-2012-02-11.png b/web/images/autocomplete-field-arrows-sprite-2012-02-11.png new file mode 100644 index 0000000000000000000000000000000000000000..0bbb315d1b03a34f51c137507f666060d06b15a2 GIT binary patch literal 1847 zcmaJ?X;2eq7>>mmm6o<1C~DPhsMOAwo1kP2Ar}TUNC5|}#~6}D0wx`q6lQaZd9~CN_S?zYo6zM-}if;neTXH z#A+Y!1>PhQ$tPSQiXvt*@rO?LB1Xwi8-66F`IvYk7LCMXDKZo$@fAoM427#?JK!i- zrr5K~2(KcMydY)FMr@;W9Y>C+s4@?Rs#9qQHi@)~r_;#fNiYV*!8?>{E_tY=j0`Ci zTyiX1N|$PcaDq~jio(&U5i#=ABzdrc%nN~5={SUd3dUrRPPJ35<>`$R^W;iE0#k{I)hH5GieMag|ULeVshwo z=*>qaqM?d-PLwF@O)O%^B`08*hC`#Jq@++&SX2bvL1P352YWP_ObUUZX!ocwnU12? z`cEi`V67ZgYA_|DhCGV0I3yY4l8H=Tm!Q(Tl~rrsToZ9&G@VRCV^Hayk|uys>HkAj zs<&t@76re{_dkWTF?%#HEeh5m$*7!YT)e+0l!hZjVHt*?F$l7A;ua$l5Dd{KAR0&* z&4yx?Y6X&_eT9}vIpJz8CR5Ada1obG@Tp3rg2MVa`F#EaSA@uuRj?YH;40p6g_CkUMo?*p$RZe3?uHd%D58R170gjio=fngdT+Rj z$#daP%B2y>&^&GZSDPn}2=927Z%s>V-r62k6JAFNQ(yRY^&p8fB`0!Sj2M7gfZqqe z=mx}C;|8^EP&WcP$3a6uK>?0ekAfy9lZoTF8*h3EEPv{=$MKf_fpRzA;07j#Q$I3d zC^F<(UERHQbA4N>sjb}RtSiyqsBO#%<#9$qt8Jvq;jC=4{5(87-0`@m_vzgs=Y4Z$ zF%BL8+%yiFhDO>00|TEr8(AzyAd5QWGWOd|ZoCC|*LL+3c0Q>xbye528=S*;$3g95 zM~5;|(9n9b$WYKbSlRukaKP2r(3Tg+Ug=29Fq4-S+9ydgh7zx!!>i9Tm+ zw5GJ`iv6X@)M0FGEwK(%+}2;Wy=;FDI?cUJPG?0|PZ7ZD0I1{fcsQuLZOCS`=RXHM zMsuab+SF^e6zlVFyvE$yP^>TLvbEb>HO(#eOzoviCf)9;Fq`w;pdNr~9*;XVTK)XF zsijr#dhwvw*&WFCH+S6%6)rP0mOGtyTFk$8S@k7V*It0fC5G!R&@=3+s%6g;cWAnVLpXhxSAIKsvJ|H+!X6eXYd!Zq~owcOOn6_suplmQA zet7Q5QV(8dFCQ7WLMJR zC;L96c&*8}H*fQtDg#qg@3&}Gm{aj^oqu-TjYOSwf&cg3d$W`o_o_dt>Q7wL(73Gr zw_gt4IF~`%`rv~ZIUi3=9nL!~{yO3PZ~Vg7&;zE+PWjV<=J^KC&U9MCkWb?3+0U|% ze6?uCl=Y^8Wa#$x*z|})hqvGZg$w%zb&6SEFy8Afkc?B8eztsf&_c}rYOW*WbM8`o z(ESoY$NHPbyz=NXUuulo)ZyzZqufXLW{jZgqgRJmjAsv5jJoiwLi;US*tX@r?^F0D z<}PVJXT5qg0d3nV=t&mM*_2W=RQz3a+RgacI}a>#?43JxUV7f4YdObk>MdluEkDjO zE#KjHf*Rr&;>_yo=(u#7ey7NXf4>Cu(E9T7xqvN_=Dt3GF!{Q;S+2LB v8}{dHt?J9|FLU$U$@?#kpFaDjh~!0zH_SSa`Q()6B_xH5BSg7^?dksjWqE6q literal 0 HcmV?d00001 From eef9cddb559e8e4161894270b0ffc8ac485e657b Mon Sep 17 00:00:00 2001 From: naumov-socolov Date: Sun, 12 Feb 2012 23:33:32 +0300 Subject: [PATCH 2/2] [php, js] active mark fix, removed web redundancy --- web/css/main.css | 4 ++-- web/js/pages.js | 5 ++++- web/vesta/api/WEB_DOMAIN.class.php | 6 ++++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/web/css/main.css b/web/css/main.css index 8ad5d6213..44ddc64a4 100644 --- a/web/css/main.css +++ b/web/css/main.css @@ -3,7 +3,7 @@ Title : Vesta Author : Eugen Lobicov, eugen.lobicov@gmail.com created : November 27, 2009 -last updated : February 11, 2012 +last updated : February 8, 2012 - - - - - - - - - - - - - - - - - - */ html{ @@ -1894,7 +1894,7 @@ input::-moz-focus-inner{ cursor:pointer; padding-top:6px; padding-bottom:6px; - } + } .b-new-entry .autocomplete-box .text-field{ -moz-box-shadow:none; -webkit-box-shadow:none; diff --git a/web/js/pages.js b/web/js/pages.js index 9c3e9b9d2..89af0f991 100644 --- a/web/js/pages.js +++ b/web/js/pages.js @@ -43,7 +43,9 @@ App.Pages.prepareHTML = function() $('#actions-toolbar .stats-subbar').remove(); $('#actions-toolbar .stats-components').remove(); $('#actions-toolbar .do_action_new_entry').removeClass('hidden'); + $('.active').removeClass('active'); + $('.row-filters').removeClass('hidden'); if ('undefined' != typeof App.Pages[App.Env.world].prepareHTML) { App.Pages[App.Env.world].prepareHTML(); @@ -53,7 +55,8 @@ App.Pages.prepareHTML = function() } $('#new-entry-keyword').text(App.Helpers.getHumanTabName()); document.title = 'Vesta | ' + App.Helpers.getHumanTabName(); - + + $('#'+App.Env.world).addClass('active'); App.Tmp[App.Env.world + '_selected_records'] = 0; } diff --git a/web/vesta/api/WEB_DOMAIN.class.php b/web/vesta/api/WEB_DOMAIN.class.php index 6ba8c9328..95c1749fc 100644 --- a/web/vesta/api/WEB_DOMAIN.class.php +++ b/web/vesta/api/WEB_DOMAIN.class.php @@ -78,7 +78,8 @@ class WEB_DOMAIN extends AjaxHandler $params = array( 'USER' => $user['uid'], 'DOMAIN' => $_s['DOMAIN'], - 'IP' => $_s['IP'] + 'IP' => $_s['IP'], + 'TPL' => $_s['TPL'] ); $result = Vesta::execute(Vesta::V_ADD_WEB_DOMAIN, $params); @@ -88,6 +89,7 @@ class WEB_DOMAIN extends AjaxHandler return $this->reply($result['status'], $result['data']); } + /* if (!empty($_s['TPL'])) { $params = array( 'USER' => $user['uid'], @@ -101,7 +103,7 @@ class WEB_DOMAIN extends AjaxHandler $this->errors['CHANGE_TPL'] = array($result['error_code'] => $result['error_message']); } } - + */ if (!empty($_s['ALIAS'])) { $alias_arr = explode(',', str_replace("\n", "", $_s['ALIAS']));