From abbb832c6feb07b054000000ff5731bb46efe6c7 Mon Sep 17 00:00:00 2001 From: PhilW Date: Wed, 10 Jan 2018 19:30:13 +0000 Subject: [PATCH] move qrcode link to new contact actions menu --- program/js/app.js | 3 ++- program/steps/addressbook/func.inc | 4 +++- program/steps/addressbook/show.inc | 4 ---- skins/classic/addressbook.css | 5 +++++ skins/classic/images/contactactions.png | Bin 929 -> 1114 bytes skins/classic/templates/addressbook.html | 3 +++ skins/classic/templates/contact.html | 3 --- skins/larry/addressbook.css | 4 ++++ skins/larry/images/listicons.png | Bin 15745 -> 16069 bytes skins/larry/templates/addressbook.html | 3 +++ skins/larry/templates/contact.html | 3 --- 11 files changed, 20 insertions(+), 12 deletions(-) diff --git a/program/js/app.js b/program/js/app.js index c3012fc7b..cd8c828f7 100644 --- a/program/js/app.js +++ b/program/js/app.js @@ -5918,6 +5918,7 @@ function rcube_webmail() this.enable_command('export-selected', 'copy', selected > 0); this.enable_command('edit', id && writable); this.enable_command('delete', 'move', selected && writable); + this.enable_command('qrcode', selected == 1); return false; }; @@ -6876,7 +6877,7 @@ function rcube_webmail() options = {button: false, cancel_button: 'close', width: 300, height: 300}, img = new Image(300, 300); - img.src = this.url('addressbook/qrcode', {_source: this.env.source, _cid: this.env.cid}); + img.src = this.url('addressbook/qrcode', {_source: this.env.source, _cid: this.env.cid || this.contact_list.get_single_selection()}); return this.simple_dialog(img, title, null, options); }; diff --git a/program/steps/addressbook/func.inc b/program/steps/addressbook/func.inc index 5d99ad523..519201950 100644 --- a/program/steps/addressbook/func.inc +++ b/program/steps/addressbook/func.inc @@ -131,7 +131,9 @@ $RCMAIL->register_action_map(array( 'search-delete' => 'search.inc', )); - +// Disable qr-code if php-gd or Endroid's QrCode is not installed +$OUTPUT->set_env('qrcode', function_exists('imagecreate') && class_exists('Endroid\QrCode\QrCode')); +$OUTPUT->add_label('qrcode'); // instantiate a contacts object according to the given source function rcmail_contact_source($source=null, $init_env=false, $writable=false) diff --git a/program/steps/addressbook/show.inc b/program/steps/addressbook/show.inc index 74779e454..e8e3712b6 100644 --- a/program/steps/addressbook/show.inc +++ b/program/steps/addressbook/show.inc @@ -42,10 +42,6 @@ if ($cid && ($record = ($CONTACT_RECORD ?: $CONTACTS->get_record($cid, true)))) // get address book name (for display) rcmail_set_sourcename($CONTACTS); -// Disable qr-code if php-gd or Endroid's QrCode is not installed -$OUTPUT->set_env('qrcode', function_exists('imagecreate') && class_exists('Endroid\QrCode\QrCode')); -$OUTPUT->add_label('qrcode'); - $OUTPUT->add_handlers(array( 'contacthead' => 'rcmail_contact_head', 'contactdetails' => 'rcmail_contact_details', diff --git a/skins/classic/addressbook.css b/skins/classic/addressbook.css index 95b7a7d28..91e675ff3 100644 --- a/skins/classic/addressbook.css +++ b/skins/classic/addressbook.css @@ -104,6 +104,11 @@ background-position: 7px 20px; } +#contactmenu li a.qrcode +{ + background-position: 7px -39px; +} + #contactmenu li a.assigngroup { background-position: 7px 0; diff --git a/skins/classic/images/contactactions.png b/skins/classic/images/contactactions.png index 5fd9ef3f9df70dc0f7907261eb30cb767ae0c367..8eda5388f5228aed5765d1b3e28f83744f05a82d 100644 GIT binary patch delta 1106 zcmV-Y1g-m_2igdb7k@km1^@s6YiQ~b000CbNkldcIIrObHoQ9ls?{4V^BMU_?6(AeCvBDjtKk)enZ zlT+dF;lnEu92!P|$WTOa35m?YUo$d_C?YDBDf%@dBa85daDQgOuNfIdvKWXfd{q(nL$}=mJ)ffDG(zghgF0eC^~%t10&sV^ZISrvvV()_(_1uR!-QGqH6g- zWqBNP!dV{^1~GR>Xi}#DDXkAI=5tIl5M~52baKOsrfM z+O1#y0t8f;fMMS2AeW2IxK$~H<~PTFN?#PBh;#~`ayIB%Ju6>ahMbbBWBMo@pJu{cF)d`l7^(mABQYXPAHL* zf;=%%$bR(=$Wm2>V)recw0m}ksVO8r{~WaV2f&r?`4Bh8VNR-%0pO1rKBRh6BL|Y5)qmFR!C^NSXflAIwKJ+?p{K)MH$xC zs8CVy&3tur6^txKDNR)Lg|Xahbo%VcHGh9aWBXr(Ll(1(1r`_^HaSUFB6Z9mj53KO zj3dSsGruf%l(@4KZNm_eiFpCjOA>WrUcQ$jViz4zDjU&DM2?Q=5OF8*B}ueE&9R@F z3}zb(%rRDMauTdWzbe>G4VFWi8jx6VjrL&PCo#cBL`ZJZ*|lEGtM~5Y|A;{r(n}FJ zVxDHP{m)<=Nxa2QbOPf_V%sv&v-h6Sy<_t>E0G{k%mQ_c7A6Gq#=UPu6kz!NZ*27W Y8P2I62}&XA(*OVf07*qoM6N<$f=5{g9smFU delta 920 zcmV;J184l&2%!g%7k?-S1^@s6^DnBL000AMNklO-`tfG>IWZ{S!n_Hxfzhz_`QFU#DRP-B0#t|_Os-z9SWq)KGQGQ{GR3JMtKE?EL zMOoQ-Qi1Hq*gAOdC`6(`ICS_Z)~?$Cv1BmXJGwAp%urKDvdDkcuHBV%jD z$~7=HHo?l3t1)HzRJ8RsVa(K_7&&1m<}aUt>beH5hX|6J?jUU-(gKgFep?-xi}SvcAY@ah{|AKjFKu7SQF)QMMJL$qirg7nR$Qr}%|5-&yi&ZAQ>0kBPL&T0(VAGh;vAux$qG`#OA`g1(>Rb$u_v%PM0w*3*p}*A#wkoG@uJO`Sf2GO}_hHa?jO zib|-yv45GGo7MNL1RE*pA9%Ad^{TS!zjuta>h}>LlcxU!{H#Z#p@IxH1 zv46pp*f^XF3&lA-U5sN!+HYoI&-+r24hZNurm1=1-lw19(mU_q=DY7=r<%s_=zSGF)wPk`nx^(4&!apzAz6bWxvJpX2!m`x>0000