From 6d453ffab9ff7d481078176e1feb65d5c91fc6df Mon Sep 17 00:00:00 2001 From: David Molineus Date: Tue, 6 Jan 2015 21:52:36 +0100 Subject: [PATCH] Work on translations and icons. --- module/assets/img/icons.png | Bin 0 -> 1492 bytes module/assets/img/vectors.png | Bin 0 -> 1414 bytes module/dca/tl_leaflet_icon.php | 7 +++++++ module/dca/tl_leaflet_layer.php | 7 +++++++ module/dca/tl_leaflet_map.php | 2 +- module/dca/tl_leaflet_marker.php | 1 + module/languages/en/leaflet_layer.php | 2 ++ module/languages/en/tl_leaflet_layer.php | 2 ++ module/languages/en/tl_leaflet_map.php | 2 ++ module/templates/be_leaflet_geocode.html5 | 8 ++++---- 10 files changed, 26 insertions(+), 5 deletions(-) create mode 100644 module/assets/img/icons.png create mode 100644 module/assets/img/vectors.png diff --git a/module/assets/img/icons.png b/module/assets/img/icons.png new file mode 100644 index 0000000000000000000000000000000000000000..9e3b30ba0e7e1ff3411de7f247d8c954c384f293 GIT binary patch literal 1492 zcmaJ>drZ`J96#TB9N`!YgPK{(L=f-V-V54TZwGh4MUFAJd6?;9Y0F*3K5Tot0~uzp z19dtT=d!SnNEDbZxJeu&BW6rzHmB1tm8m2SjASYfm?C7(>3RsbKgOE0zehfw&-e97 zcjo10MXDF6RVr1aGuxi8tlIE9f3EUf`tTW{Eb+3VP%hw$#slnY%s7|FAGB8<@oSwUf|RI9B)fgnq087QK?42Oe59p8WeL*byu z?1EiF2JK_A%S5`MEZ0qzm5?X}TGs%pgP0<~(lP-A*)5!e1#xg(7gP4(YX}6!A#w>0 zK2NI9l?P<-A`O`Ju#SW+2w*Yk5fhA>&{co|MqmgrKya!KfiZI`1|z`411ix(su;_+ zXHLXYPB`e3WdVbrKp>zG81=m9g%A`)A=m&J3_1m&lS(<620nI3XNLz%oRdka^L~^IImnnCIhVUh?q*kWpaPBY=nDC_W&K<6SPy$w@N7 zk+jo}gNlNlVJIxkWXQDJP_qTK84<)`OtYmsP?I?mLDEr&-IzAXwezH(r8#+$OTFM) zrsamMzzRxaJ1sKr&{U?#v%q-C7&Cn?#%c8?xYYEyn5N}IN-|J*u>TtLHh1twd4bCp^M>~6%^vgZn&O_9q8WUoDK`38-0Z5} z#zJW@*{*%mO`Zx4Ir&Q5z5k9QI`rDwle_k?4X<_=*%rqZU2QvhFpjKs)eZLicE4$D z>as`V((@NCmK%pYU7y%Eo7BXC0oXS`=aX8Ecvs`~W(`-QR6MQKb{yE3_$P{Qe%6;F z#iwM2A}VWZ5)#sGT(7$N`;yFtes-l0MjaJa2`YzVBLd?>5}NW45(EMt_mU9&dl*uOttD zF)y;9_HkT%&FNFkzwjaJp#?{!74we7I-Qq$Woy&1zeitwKRK})8f|zhqSxE7yMtf2 zaLK{No%RP;u9gh@{SB>c)r~b{m$xm-F4qZ1Qq{h((oJwoOXsG}vHpbJIqEenXI`n+ zH8;K&YaWpwGoH;_b&2y3Jge26d8lPpv9mdJ>rwKZhdZyuYTHNlnOc7wIo$Ba59cEs z`sUDAnhl}Sq-%cxI7|&+dfj!7Y1LeM*n@c0Gj5@SD@X6%?5Fy3PDXv3FyqPfEBni8 z&;GQKSo-dO|14dPCtY4Iw0E3e{@_=!gUQ(J0$k{j!dJs?O52r+8!QHV@lroiSG>-5W@$BaK<%|E$xIYd@a8 Gsq!CU+bul+ literal 0 HcmV?d00001 diff --git a/module/assets/img/vectors.png b/module/assets/img/vectors.png new file mode 100644 index 0000000000000000000000000000000000000000..27a4b91663175589dae1494b54b76fe93731436f GIT binary patch literal 1414 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+n3Xa^B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxKsVXI%uvD1M9IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr4|esh*)icxGNo zet9uiy|1s8XI^nhVqS8pr;Du;&;-5A%oHn2Gjn5SM`II5a}#GnLsvr!S7Q@b7jqK> z7e{jg6C)RxUYGpj(%jU%5}4i;gkDpedO=Acw*Y9fOKMSOS!#+~QGTuh*vnR#xZPre z(>$o&6x?nx#;I2y=oo!a#3DsBObD2IKumbD1#;jCKQ#}S+KYh6T9xnK7X}8#U!E?G zAr-fl1n>8baTNGh_Wo|{q;vA$^;lX2yty5FdzB)7JU%p0&vn)xX2G6Tp+FrUmp~E0 z)g_J>>K%@HU%J`yV4;HNs)U6e_pIOQsFc57YiwQFUarOU&M^ObS=zptKhwe_lMCiQ z)mW;f=T^ijEVN?L{g`^M*ykpDLKV1~efRloHR9k^s}7R*{V2KMu<{14y=o_dB$8HL zKYC<4(>fOcb>^~|Q_D_Dq$(fl%6@Qnng4DlpYT+J4ew?i71y(SJJB%m{qGG9x7(R6 zU1c!2>MizJa{JjL0Zabesx-yPht>xhre(?K2Fgzi?K#(L%H|x+s*`^C&7AEFK2q1u zZu%AdFrM>8j=+WY$CGV(65Kx<=W@t8W~b*TXL0`5O)Q{&qoSr~K$An}vTCOj|p>bP0l+XkKX*L6z literal 0 HcmV?d00001 diff --git a/module/dca/tl_leaflet_icon.php b/module/dca/tl_leaflet_icon.php index 2e19062..5fd1e28 100644 --- a/module/dca/tl_leaflet_icon.php +++ b/module/dca/tl_leaflet_icon.php @@ -37,6 +37,13 @@ $GLOBALS['TL_DCA']['tl_leaflet_icon'] = array 'icon' => 'system/modules/leaflet/assets/img/leaflet.png', 'attributes' => 'onclick="Backend.getScrollOffset();" accesskey="m"' ), + 'layers' => array + ( + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_icon']['layersBtn'], + 'href' => 'table=tl_leaflet_layer', + 'icon' => 'system/modules/leaflet/assets/img/layers.png', + 'attributes' => 'onclick="Backend.getScrollOffset();" accesskey="e"' + ), 'all' => array ( 'label' => &$GLOBALS['TL_LANG']['MSC']['all'], diff --git a/module/dca/tl_leaflet_layer.php b/module/dca/tl_leaflet_layer.php index 0fd83ae..f7f37f9 100644 --- a/module/dca/tl_leaflet_layer.php +++ b/module/dca/tl_leaflet_layer.php @@ -38,6 +38,13 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = array 'icon' => 'system/modules/leaflet/assets/img/leaflet.png', 'attributes' => 'onclick="Backend.getScrollOffset();" accesskey="m"' ), + 'icons' => array + ( + 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['icons'], + 'href' => 'table=tl_leaflet_icon', + 'icon' => 'system/modules/leaflet/assets/img/icons.png', + 'attributes' => 'onclick="Backend.getScrollOffset();" accesskey="e"' + ), 'all' => array ( 'label' => &$GLOBALS['TL_LANG']['MSC']['all'], diff --git a/module/dca/tl_leaflet_map.php b/module/dca/tl_leaflet_map.php index 75c82f9..6851c8e 100644 --- a/module/dca/tl_leaflet_map.php +++ b/module/dca/tl_leaflet_map.php @@ -41,7 +41,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = array ( 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['icons'], 'href' => 'table=tl_leaflet_icon', - 'icon' => 'system/modules/leaflet/assets/img/layers.png', + 'icon' => 'system/modules/leaflet/assets/img/icons.png', 'attributes' => 'onclick="Backend.getScrollOffset();" accesskey="e"' ), 'all' => array diff --git a/module/dca/tl_leaflet_marker.php b/module/dca/tl_leaflet_marker.php index 5074968..a446fc2 100644 --- a/module/dca/tl_leaflet_marker.php +++ b/module/dca/tl_leaflet_marker.php @@ -209,6 +209,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_marker'] = array 'eval' => array( 'mandatory' => true, 'tl_class' => 'w50', + 'chosen' => true, ), 'sql' => "int(10) unsigned NOT NULL default '0'", ), diff --git a/module/languages/en/leaflet_layer.php b/module/languages/en/leaflet_layer.php index 75ea2cb..196938c 100644 --- a/module/languages/en/leaflet_layer.php +++ b/module/languages/en/leaflet_layer.php @@ -4,3 +4,5 @@ $GLOBALS['TL_LANG']['leaflet_layer']['provider'][0] = 'Leaflet provider'; $GLOBALS['TL_LANG']['leaflet_layer']['provider'][1] = 'Leaflet tile provider'; $GLOBALS['TL_LANG']['leaflet_layer']['group'][0] = 'Layer group'; $GLOBALS['TL_LANG']['leaflet_layer']['group'][1] = 'Layers group'; +$GLOBALS['TL_LANG']['leaflet_layer']['markers'][0] = 'Markers'; +$GLOBALS['TL_LANG']['leaflet_layer']['markers'][1] = 'Marker collection'; diff --git a/module/languages/en/tl_leaflet_layer.php b/module/languages/en/tl_leaflet_layer.php index f05acc8..f8074e0 100644 --- a/module/languages/en/tl_leaflet_layer.php +++ b/module/languages/en/tl_leaflet_layer.php @@ -5,6 +5,8 @@ $GLOBALS['TL_LANG']['tl_leaflet_layer']['active_legend'] = 'Activation'; $GLOBALS['TL_LANG']['tl_leaflet_layer']['map'][0] = 'Manage maps'; $GLOBALS['TL_LANG']['tl_leaflet_layer']['map'][1] = 'Manage leaflet maps'; +$GLOBALS['TL_LANG']['tl_leaflet_layer']['icons'][0] = 'Manage icons'; +$GLOBALS['TL_LANG']['tl_leaflet_layer']['icons'][1] = 'Manage marker icons.'; $GLOBALS['TL_LANG']['tl_leaflet_layer']['new'][0] = 'Create layer'; $GLOBALS['TL_LANG']['tl_leaflet_layer']['new'][1] = 'Create new layer'; $GLOBALS['TL_LANG']['tl_leaflet_layer']['edit'][0] = 'Edit layer'; diff --git a/module/languages/en/tl_leaflet_map.php b/module/languages/en/tl_leaflet_map.php index 03fa772..93906ff 100644 --- a/module/languages/en/tl_leaflet_map.php +++ b/module/languages/en/tl_leaflet_map.php @@ -17,6 +17,8 @@ $GLOBALS['TL_LANG']['tl_leaflet_map']['copy'][0] = 'Copy map'; $GLOBALS['TL_LANG']['tl_leaflet_map']['copy'][1] = 'Copy map ID %s'; $GLOBALS['TL_LANG']['tl_leaflet_map']['controls'][0] = 'Manage controls'; $GLOBALS['TL_LANG']['tl_leaflet_map']['controls'][1] = 'Manage controls of map ID %s'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['icons'][0] = 'Manage icons'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['icons'][1] = 'Manage marker icons.'; $GLOBALS['TL_LANG']['tl_leaflet_map']['delete'][0] = 'Delete map'; $GLOBALS['TL_LANG']['tl_leaflet_map']['delete'][1] = 'Delete map ID %s'; $GLOBALS['TL_LANG']['tl_leaflet_map']['show'][0] = 'Show details'; diff --git a/module/templates/be_leaflet_geocode.html5 b/module/templates/be_leaflet_geocode.html5 index 89e0b9a..d02c816 100644 --- a/module/templates/be_leaflet_geocode.html5 +++ b/module/templates/be_leaflet_geocode.html5 @@ -1,8 +1,8 @@ - - + + - - + +