Skip to content

Commit 6aeaf8f

Browse files
mb1248mb1248
committed
Merge branch 'upstream/master'
Conflicts: osmmap2.php
2 parents 91f3bc2 + 01ce2eb commit 6aeaf8f

33 files changed

Lines changed: 628 additions & 320 deletions

‎admin/admin_config.php‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,15 @@
9090
$available_pin = array(
9191
'0' => l10n('NOPIN'),
9292
'1' => l10n('DEFAULTPIN'),
93-
'2' => l10n('LEAFPINGREEN'),
94-
'3' => l10n('LEAFPINORANGE'),
95-
'4' => l10n('LEAFPINRED'),
96-
'5' => l10n('MAPICONSBLEU'),
97-
'6' => l10n('MAPICONSGREEN'),
98-
'7' => l10n('OWNPIN'),
93+
'2' => l10n('DEFAULTPINGREEN'),
94+
'3' => l10n('DEFAULTPINRED'),
95+
'4' => l10n('LEAFPINGREEN'),
96+
'5' => l10n('LEAFPINORANGE'),
97+
'6' => l10n('LEAFPINRED'),
98+
'7' => l10n('MAPICONSBLEU'),
99+
'8' => l10n('MAPICONSGREEN'),
100+
'9' => l10n('OWNPIN'),
101+
'10' => l10n('IMAGE'),
99102
);
100103

101104
// Available popup
@@ -141,6 +144,15 @@
141144
'attrimagery' => get_boolean($_POST['osm_attrimagery']),
142145
'attrplugin' => get_boolean($_POST['osm_attrplugin']),
143146
),
147+
'pin' => array(
148+
'pin' => $_POST['osm_pin'],
149+
'pinpath' => $_POST['osm_pinpath'],
150+
'pinsize' => $_POST['osm_pinsize'],
151+
'pinshadowpath' => $_POST['osm_pinshadowpath'],
152+
'pinshadowsize' => $_POST['osm_pinshadowsize'],
153+
'pinoffset' => $_POST['osm_pinoffset'],
154+
'pinpopupoffset' => $_POST['osm_pinpopupoffset'],
155+
),
144156
);
145157

146158
// Update config to DB

‎admin/admin_config.tpl‎

Lines changed: 141 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -108,23 +108,26 @@ Refer to the <a href="https://github.com/xbgmsharp/piwigo-openstreetmap/wiki" ta
108108
<legend>{'G_MAP'|@translate}</legend>
109109
<ul>
110110
<li>
111+
<img id="tile_preview" align="right" src="">
111112
<label>{'BASELAYER'|@translate} : </label>
112-
<select name="osm_baselayer">
113+
<select name="osm_baselayer" id="osm_baselayer" onchange="tile_toggle(this)">
113114
{html_options options=$AVAILABLE_BASELAYER selected=$map.baselayer}
114115
</select>
115116
<br/><small>{'BASELAYER_DESC'|@translate}</small><br/>
116117
<small>Check out <a href="http://leaflet-extras.github.io/leaflet-providers/preview/" target="_blank">this example</a> with half a hundred different layers to choose from.</small>
117118
</li>
118-
<li>
119-
<label>{'CUSTOMBASELAYER'|@translate} : </label>
120-
<input type="text" value="{$map.custombaselayer}" name="osm_custombaselayer" size="40"/>
121-
<br/><small>{'CUSTOMBASELAYER_DESC'|@translate}</small>
122-
</li>
123-
<li>
124-
<label>{'CUSTOMBASELAYERURL'|@translate} : </label>
125-
<input type="text" value="{$map.custombaselayerurl}" name="osm_custombaselayerurl" size="40"/>
126-
<br/><small>{'CUSTOMBASELAYERURL_DESC'|@translate}</small>
127-
</li>
119+
<div id="custom-tile-toggle" style="visibility:hidden; width:0px; height:0px; display:none;">
120+
<li>
121+
<label>{'CUSTOMBASELAYER'|@translate} : </label>
122+
<input type="text" value="{$map.custombaselayer}" name="osm_custombaselayer" size="40"/>
123+
<br/><small>{'CUSTOMBASELAYER_DESC'|@translate}</small>
124+
</li>
125+
<li>
126+
<label>{'CUSTOMBASELAYERURL'|@translate} : </label>
127+
<input type="text" value="{$map.custombaselayerurl}" name="osm_custombaselayerurl" size="40"/>
128+
<br/><small>{'CUSTOMBASELAYERURL_DESC'|@translate}</small>
129+
</li>
130+
</div>
128131
<li>
129132
<label>{'NOWORLDWARP'|@translate} : </label>
130133
<label><input type="radio" name="osm_noworldwarp" value="true" {if $map.noworldwarp}checked="checked"{/if}/> {'Yes'|@translate}</label>
@@ -149,53 +152,145 @@ Refer to the <a href="https://github.com/xbgmsharp/piwigo-openstreetmap/wiki" ta
149152
<label><input type="radio" name="osm_attrplugin" value="false" {if not $map.attrplugin}checked="checked"{/if}/> {'No'|@translate}</label>
150153
<br/><small>{'ATTRPLUGIN_DESC'|@translate}</small>
151154
</li>
155+
152156
</ul>
153-
<!-- <fieldset>
157+
<fieldset>
154158
<legend>{'H_PIN'|@translate}</legend>
155159
<ul>
156160
<li>
157-
<label>{'PIN'|@translate} : </label>
158-
<select name="osm_pin">
159-
{html_options options=$AVAILABLE_PIN selected=$SELECTED_PIN}
161+
<img id="pin_preview" align="left" src="">
162+
<label >{'PIN'|@translate} : </label>
163+
<select name="osm_pin" id="osm_pin" onchange="pin_toggle(this)">
164+
{html_options options=$AVAILABLE_PIN selected=$pin.pin}
160165
</select>
161166
<br/><small>{'PIN_DESC'|@translate}</small>
162167
</li>
163-
<li>
164-
<label>{'PINPATH'|@translate} : </label>
165-
<input type="text" value="{$PINPATH}" name="osm_pinpath" size="40"/>
166-
<br/><small>{'PINPATH_DESC'|@translate}</small>
167-
</li>
168-
<li>
169-
<label>{'PINSIZE'|@translate} : </label>
170-
<input type="text" value="{$CUSTOMBASELAYERURL}" name="osm_pinsize" size="6/>
171-
<br/><small>{'PINSIZE_DESC'|@translate}</small>
172-
</li>
173-
<li>
174-
<label>{'PINSHADOWPATH'|@translate} : </label>
175-
<input type="text" value="{$PINSHADOWPATH}" name="osm_pinshadowpath" size="40"/>
176-
<br/><small>{'PINSHADOWPATH_DESC'|@translate}</small>
177-
</li>
178-
<li>
179-
<label>{'PINSHADOWSIZE'|@translate} : </label>
180-
<input type="text" value="{$PINSHADOWSIZE}" name="osm_pinshadowsize" size="4"/>
181-
<br/><small>{'PINSHADOWSIZE_DESC'|@translate}</small>
182-
</li>
183-
<li>
184-
<label>{'PINOFFSET'|@translate} : </label>
185-
<input type="text" value="{$PINOFFSET}" name="osm_pinoffset" size="4"/>
186-
<br/><small>{'PINOFFSET_DESC'|@translate}</small>
187-
</li>
188-
<li>
189-
<label>{'PINPOPUPOFFSET'|@translate} : </label>
190-
<input type="text" value="{$PINPOPUPOFFSET}" name="osm_pinpopupoffset" size="4"/>
191-
<br/><small>{'PINPOPUPOFFSET_DESC'|@translate}</small>
192-
</li>
168+
<div id="custom-pin-toggle" style="visibility:hidden; width:0px; height:0px; display:none;">
169+
<li>
170+
<label>{'PINPATH'|@translate} : </label>
171+
<input type="text" value="{$pin.pinpath}" name="osm_pinpath" size="40"/>
172+
<br/><small>{'PINPATH_DESC'|@translate}</small>
173+
</li>
174+
<li>
175+
<label>{'PINSIZE'|@translate} : </label>
176+
<input type="text" value="{$pin.pinsize}" name="osm_pinsize" size="6"/>
177+
<br/><small>{'PINSIZE_DESC'|@translate}</small>
178+
</li>
179+
<li>
180+
<label>{'PINSHADOWPATH'|@translate} : </label>
181+
<input type="text" value="{$pin.pinshadowpath}" name="osm_pinshadowpath" size="40"/>
182+
<br/><small>{'PINSHADOWPATH_DESC'|@translate}</small>
183+
</li>
184+
<li>
185+
<label>{'PINSHADOWSIZE'|@translate} : </label>
186+
<input type="text" value="{$pin.pinshadowsize}" name="osm_pinshadowsize" size="4"/>
187+
<br/><small>{'PINSHADOWSIZE_DESC'|@translate}</small>
188+
</li>
189+
<li>
190+
<label>{'PINOFFSET'|@translate} : </label>
191+
<input type="text" value="{$pin.pinoffset}" name="osm_pinoffset" size="4"/>
192+
<br/><small>{'PINOFFSET_DESC'|@translate}</small>
193+
</li>
194+
<li>
195+
<label>{'PINPOPUPOFFSET'|@translate} : </label>
196+
<input type="text" value="{$pin.pinpopupoffset}" name="osm_pinpopupoffset" size="4"/>
197+
<br/><small>{'PINPOPUPOFFSET_DESC'|@translate}</small>
198+
</li>
199+
</div>
193200
</ul>
194201
</fieldset>
195-
-->
196202
</fieldset>
197203
198204
<p>
199205
<input class="submit" type="submit" value="{'Save Settings'|@translate}" name="submit"/>
200206
</p>
201207
</form>
208+
209+
{literal}
210+
<script type="text/javascript">
211+
function tile_toggle()
212+
{
213+
var div = document.getElementById("custom-tile-toggle");
214+
var select = document.getElementById("osm_baselayer");
215+
//alert(select.selectedIndex);
216+
if (select.selectedIndex == 8) // If custom
217+
{
218+
div.removeAttribute("style");
219+
} else {
220+
div.setAttribute("style","visibility:hidden; width:0px; height:0px; display:none;");
221+
}
222+
tile_preview();
223+
}
224+
225+
function pin_toggle()
226+
{
227+
var div = document.getElementById("custom-pin-toggle");
228+
var select = document.getElementById("osm_pin");
229+
//alert(select.selectedIndex);
230+
if (select.selectedIndex == 9) // If custom
231+
{
232+
div.removeAttribute("style");
233+
} else {
234+
div.setAttribute("style","visibility:hidden; width:0px; height:0px; display:none;");
235+
}
236+
pin_preview();
237+
}
238+
239+
function tile_preview()
240+
{
241+
var select = document.getElementById("osm_baselayer");
242+
baselayer = new Array(
243+
'https://c.tile.openstreetmap.org/5/15/11.png',
244+
'http://c.www.toolserver.org/tiles/bw-mapnik/5/15/11.png',
245+
'http://c.tile.openstreetmap.fr/hot/5/15/11.png',
246+
'http://c.tile.openstreetmap.de/tiles/osmde/5/15/11.png',
247+
'http://c.tile.openstreetmap.fr/hot/5/15/11.png',
248+
'http://otile1.mqcdn.com/tiles/1.0.0/osm/5/15/11.png',
249+
'http://oatile1.mqcdn.com/tiles/1.0.0/sat/5/15/11.png',
250+
'http://a.tile.cloudmade.com/7807cc60c1354628aab5156cfc1d4b3b/997/256/5/15/11.png',
251+
'NULL'
252+
);
253+
//alert(baselayer[select.selectedIndex]);
254+
var img_elem = document.getElementById("tile_preview");
255+
if (baselayer[select.selectedIndex] == "NULL")
256+
{
257+
img_elem.setAttribute("style","visibility:hidden; width:0px; height:0px; display:none;");
258+
} else {
259+
img_elem.removeAttribute("style");
260+
img_elem.src = baselayer[select.selectedIndex];
261+
}
262+
}
263+
264+
function pin_preview()
265+
{
266+
var select = document.getElementById("osm_pin");
267+
pins = new Array(
268+
'NULL',
269+
'{/literal}{$OSM_PATH}{literal}leaflet/images/marker-blue.png',
270+
'{/literal}{$OSM_PATH}{literal}leaflet/images/marker-green.png',
271+
'{/literal}{$OSM_PATH}{literal}leaflet/images/marker-red.png',
272+
'{/literal}{$OSM_PATH}{literal}leaflet/images/leaf-green.png',
273+
'{/literal}{$OSM_PATH}{literal}leaflet/images/leaf-orange.png',
274+
'{/literal}{$OSM_PATH}{literal}leaflet/images/leaf-red.png',
275+
'{/literal}{$OSM_PATH}{literal}leaflet/images/mapicons-blue.png',
276+
'{/literal}{$OSM_PATH}{literal}leaflet/images/mapicons-green.png',
277+
'NULL',
278+
'NULL'
279+
);
280+
//alert(pins[select.selectedIndex]);
281+
var img_elem = document.getElementById("pin_preview");
282+
if (pins[select.selectedIndex] == "NULL")
283+
{
284+
img_elem.setAttribute("style","visibility:hidden; width:0px; height:0px; display:none;");
285+
} else {
286+
img_elem.removeAttribute("style");
287+
img_elem.setAttribute("style","padding-right: 5px;");
288+
img_elem.src = pins[select.selectedIndex];
289+
}
290+
}
291+
292+
window.onload = pin_preview();
293+
window.onload = tile_preview();
294+
295+
</script>
296+
{/literal}

‎admin/admin_photo.php‎

100644100755
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,22 +130,22 @@
130130
map.addControl(L.control.zoom({position: 'topleft'}));
131131
132132
L.marker([".$lat.", ".$lon."]).addTo(map)
133-
.bindPopup('".render_element_name($picture)."').openPopup();
133+
.bindPopup('".addslashes(render_element_name($picture))."').openPopup();
134134
135-
/* BEGIN leaflet-providers */
135+
/* BEGIN leaflet-providers
136136
var baseLayers = ['OpenStreetMap.Mapnik', 'OpenStreetMap.BlackAndWhite', 'OpenStreetMap.DE', 'OpenStreetMap.HOT', 'MapQuestOpen.OSM', 'MapQuestOpen.Aerial', 'Stamen.Watercolor'],
137137
overlays = [''];
138138
139139
L.control.layers.provided(baseLayers, overlays).addTo(map);
140-
/* END leaflet-providers */
140+
END leaflet-providers */
141141
\n";
142142

143143
$template->assign(array(
144144
'PWG_TOKEN' => get_pwg_token(),
145145
'F_ACTION' => $self_url,
146146
'TN_SRC' => DerivativeImage::thumb_url($picture).'?'.time(),
147147
'TITLE' => render_element_name($picture),
148-
'OSM_PATH' => OSM_PATH,
148+
'OSM_PATH' => embellish_url(get_absolute_root_url().OSM_PATH),
149149
'OSM_JS' => $js,
150150
'LAT' => $lat,
151151
'LON' => $lon,

‎fontello/config.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,67 +9,67 @@
99
{
1010
"uid": "d7271d490b71df4311e32cdacae8b331",
1111
"css": "home",
12-
"code": 919553,
12+
"code": 128288,
1313
"src": "fontawesome"
1414
},
1515
{
1616
"uid": "0ddd3e8201ccc7d41f7b7c9d27eca6c1",
1717
"css": "link",
18-
"code": 919554,
18+
"code": 128281,
1919
"src": "fontawesome"
2020
},
2121
{
2222
"uid": "e15f0d620a7897e2035c18c80142f6d9",
2323
"css": "link-ext",
24-
"code": 919555,
24+
"code": 128272,
2525
"src": "fontawesome"
2626
},
2727
{
2828
"uid": "5b0772e9484a1a11646793a82edd622a",
2929
"css": "pin",
30-
"code": 919556,
30+
"code": 128273,
3131
"src": "fontawesome"
3232
},
3333
{
3434
"uid": "0d08dbb1dd648a43bdea81b7e6c9e036",
3535
"css": "location",
36-
"code": 919557,
36+
"code": 128274,
3737
"src": "fontawesome"
3838
},
3939
{
4040
"uid": "921e3974e54ff9e8b7cd906a3dc74636",
4141
"css": "direction",
42-
"code": 919558,
42+
"code": 128275,
4343
"src": "fontawesome"
4444
},
4545
{
4646
"uid": "e99461abfef3923546da8d745372c995",
4747
"css": "cog",
48-
"code": 919559,
48+
"code": 128276,
4949
"src": "fontawesome"
5050
},
5151
{
5252
"uid": "0b2b66e526028a6972d51a6f10281b4b",
5353
"css": "zoom-in",
54-
"code": 919560,
54+
"code": 128277,
5555
"src": "fontawesome"
5656
},
5757
{
5858
"uid": "d25d10efa900f529ad1d275657cfd30e",
5959
"css": "zoom-out",
60-
"code": 919561,
60+
"code": 128278,
6161
"src": "fontawesome"
6262
},
6363
{
6464
"uid": "555ef8c86832e686fef85f7af2eb7cde",
6565
"css": "left-big",
66-
"code": 919569,
66+
"code": 128279,
6767
"src": "fontawesome"
6868
},
6969
{
7070
"uid": "197375a3cea8cb90b02d06e4ddf1433d",
7171
"css": "globe",
72-
"code": 919568,
72+
"code": 128280,
7373
"src": "fontawesome"
7474
}
7575
]

‎fontello/css/osm-codes.css‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
@charset "UTF-8";
22

33

4-
.osm-home:before { content: '󠠁'; } /* '\e0801' */
5-
.osm-globe:before { content: '󠠐'; } /* '\e0810' */
6-
.osm-link-ext:before { content: '󠠃'; } /* '\e0803' */
7-
.osm-pin:before { content: '󠠄'; } /* '\e0804' */
8-
.osm-location:before { content: '󠠅'; } /* '\e0805' */
9-
.osm-link:before { content: '󠠂'; } /* '\e0802' */
10-
.osm-cog:before { content: '󠠇'; } /* '\e0807' */
11-
.osm-zoom-in:before { content: '󠠈'; } /* '\e0808' */
12-
.osm-zoom-out:before { content: '󠠉'; } /* '\e0809' */
13-
.osm-left-big:before { content: '󠠑'; } /* '\e0811' */
14-
.osm-direction:before { content: '󠠆'; } /* '\e0806' */
4+
.osm-home:before { content: '🔠'; } /* '\1f520' */
5+
.osm-globe:before { content: '🔘'; } /* '\1f518' */
6+
.osm-link-ext:before { content: '🔐'; } /* '\1f510' */
7+
.osm-pin:before { content: '🔑'; } /* '\1f511' */
8+
.osm-location:before { content: '🔒'; } /* '\1f512' */
9+
.osm-link:before { content: '🔙'; } /* '\1f519' */
10+
.osm-cog:before { content: '🔔'; } /* '\1f514' */
11+
.osm-zoom-in:before { content: '🔕'; } /* '\1f515' */
12+
.osm-zoom-out:before { content: '🔖'; } /* '\1f516' */
13+
.osm-left-big:before { content: '🔗'; } /* '\1f517' */
14+
.osm-direction:before { content: '🔓'; } /* '\1f513' */

0 commit comments

Comments
 (0)