Skip to content

Commit 7e9763b

Browse files
xbgmsharpxbgmsharp
committed
Merged master fixed conflict.
2 parents 886b003 + e409b39 commit 7e9763b

34 files changed

Lines changed: 553 additions & 273 deletions

‎CHANGELOG‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
Changes from v2.6.b to v2.7.a
2+
- Add custom pin marker support
3+
- Force usage of HTTPS for external URL and when possible for tiles #21
4+
- Add new options for world map view #40
5+
- Fix pictures without name #18 #23
6+
- Fix simple quote on title #20
7+
- Fix fontello with Firefox
8+
- Fix admin_photo_edit Click On Map
9+
- Update Leaflet to version 0.7.3
10+
- Update Leaflet plugins
11+
- Update language, thanks to the contributors
12+
113
Changes from v2.6a to v2.6.b
214
- Fix Install method
315
- Fix WorldMap URL

‎admin/admin_config.php‎

Lines changed: 42 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -114,56 +114,48 @@
114114
// Update conf if submitted in admin site
115115
if (isset($_POST['submit']) && !empty($_POST['osm_height']))
116116
{
117-
// On post admin form
118-
$conf['osm_conf'] = array(
119-
'right_panel' => array(
120-
'enabled' => get_boolean($_POST['osm_right_panel']),
121-
'add_before' => $_POST['osm_add_before'],
122-
'height' => $_POST['osm_height'],
123-
'zoom' => $_POST['osm_zoom'],
124-
'link' => $_POST['osm_right_link'],
125-
'linkcss' => $_POST['osm_right_linkcss'],
126-
'showosm' => get_boolean($_POST['osm_showosm']),
127-
),
128-
'left_menu' => array(
129-
'enabled' => get_boolean($_POST['osm_left_menu']),
130-
'link' => $_POST['osm_left_link'],
131-
'popup' => $_POST['osm_left_popup'],
132-
'popupinfo_name' => isset($_POST['osm_left_popupinfo_name']),
133-
'popupinfo_img' => isset($_POST['osm_left_popupinfo_img']),
134-
'popupinfo_link' => isset($_POST['osm_left_popupinfo_link']),
135-
'popupinfo_comment' => isset($_POST['osm_left_popupinfo_comment']),
136-
'popupinfo_author' => isset($_POST['osm_left_popupinfo_author']),
137-
),
138-
'category_description' => array(
139-
'enabled' => get_boolean($_POST['osm_category_description']),
140-
'height' => $_POST['osm_cat_height'],
141-
'width' => $_POST['osm_cat_width'],
142-
),
143-
'main_menu' => array(
144-
'enabled' => get_boolean($_POST['osm_main_menu']),
145-
'height' => $_POST['osm_menu_height'],
146-
),
147-
'map' => array(
148-
'baselayer' => $_POST['osm_baselayer'],
149-
'custombaselayer' => $_POST['osm_custombaselayer'],
150-
'custombaselayerurl' => $_POST['osm_custombaselayerurl'],
151-
'noworldwarp' => get_boolean($_POST['osm_noworldwarp']),
152-
'attrleaflet' => get_boolean($_POST['osm_attrleaflet']),
153-
'attrimagery' => get_boolean($_POST['osm_attrimagery']),
154-
'attrplugin' => get_boolean($_POST['osm_attrplugin']),
155-
),
156-
'pin' => array(
157-
'pin' => $_POST['osm_pin'],
158-
'pinpath' => $_POST['osm_pinpath'],
159-
'pinsize' => $_POST['osm_pinsize'],
160-
'pinshadowpath' => $_POST['osm_pinshadowpath'],
161-
'pinshadowsize' => $_POST['osm_pinshadowsize'],
162-
'pinoffset' => $_POST['osm_pinoffset'],
163-
'pinpopupoffset' => $_POST['osm_pinpopupoffset'],
164-
),
165-
166-
);
117+
// On post admin form
118+
$conf['osm_conf'] = array(
119+
'right_panel' => array(
120+
'enabled' => get_boolean($_POST['osm_right_panel']),
121+
'add_before' => $_POST['osm_add_before'],
122+
'height' => $_POST['osm_height'],
123+
'zoom' => $_POST['osm_zoom'],
124+
'link' => $_POST['osm_right_link'],
125+
'linkcss' => $_POST['osm_right_linkcss'],
126+
'showosm' => get_boolean($_POST['osm_showosm']),
127+
),
128+
'left_menu' => array(
129+
'enabled' => get_boolean($_POST['osm_left_menu']),
130+
'link' => $_POST['osm_left_link'],
131+
'popup' => $_POST['osm_left_popup'],
132+
'popupinfo_name' => isset($_POST['osm_left_popupinfo_name']),
133+
'popupinfo_img' => isset($_POST['osm_left_popupinfo_img']),
134+
'popupinfo_link' => isset($_POST['osm_left_popupinfo_link']),
135+
'popupinfo_comment' => isset($_POST['osm_left_popupinfo_comment']),
136+
'popupinfo_author' => isset($_POST['osm_left_popupinfo_author']),
137+
'zoom' => $_POST['osm_left_zoom'],
138+
'center' => $_POST['osm_left_center'],
139+
),
140+
'map' => array(
141+
'baselayer' => $_POST['osm_baselayer'],
142+
'custombaselayer' => $_POST['osm_custombaselayer'],
143+
'custombaselayerurl' => $_POST['osm_custombaselayerurl'],
144+
'noworldwarp' => get_boolean($_POST['osm_noworldwarp']),
145+
'attrleaflet' => get_boolean($_POST['osm_attrleaflet']),
146+
'attrimagery' => get_boolean($_POST['osm_attrimagery']),
147+
'attrplugin' => get_boolean($_POST['osm_attrplugin']),
148+
),
149+
'pin' => array(
150+
'pin' => $_POST['osm_pin'],
151+
'pinpath' => $_POST['osm_pinpath'],
152+
'pinsize' => $_POST['osm_pinsize'],
153+
'pinshadowpath' => $_POST['osm_pinshadowpath'],
154+
'pinshadowsize' => $_POST['osm_pinshadowsize'],
155+
'pinoffset' => $_POST['osm_pinoffset'],
156+
'pinpopupoffset' => $_POST['osm_pinpopupoffset'],
157+
),
158+
);
167159

168160
// Update config to DB
169161
conf_update_param('osm_conf', serialize($conf['osm_conf']));

‎admin/admin_config.tpl‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,18 @@ Refer to the <a href="https://github.com/xbgmsharp/piwigo-openstreetmap/wiki" ta
102102
</div>
103103
<small>{'LEFTPOPUPINFO_DESC'|@translate}</small>
104104
</li>
105+
<li>
106+
<label>{'ZOOM'|@translate} : </label>
107+
<select name="osm_left_zoom">
108+
{html_options options=$AVAILABLE_ZOOM selected=$left_menu.zoom}
109+
</select>
110+
<br/><small>{'ZOOM_DESC'|@translate}, default is 2</small>
111+
</li>
112+
<li>
113+
<label>{'CENTER_MAP'|@translate} : </label>
114+
<input type="text" value="{$left_menu.center}" name="osm_left_center" size="30" placeholder="0,0"/>
115+
<br/><small>{'CENTER_MAP_DESC'|@translate}. lat and lng separated by a comma, default is 0,0</small>
116+
</li>
105117
</ul>
106118
</fieldset>
107119
<fieldset>

‎admin/admin_photo.php‎

100755100644
File mode changed.

‎fontello/config.json‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,18 @@
66
"units_per_em": 1000,
77
"ascent": 850,
88
"glyphs": [
9+
{
10+
"uid": "8b80d36d4ef43889db10bc1f0dc9a862",
11+
"css": "user",
12+
"code": 128292,
13+
"src": "fontawesome"
14+
},
15+
{
16+
"uid": "e82cedfa1d5f15b00c5a81c9bd731ea2",
17+
"css": "info-circled",
18+
"code": 128289,
19+
"src": "fontawesome"
20+
},
921
{
1022
"uid": "d7271d490b71df4311e32cdacae8b331",
1123
"css": "home",
@@ -60,6 +72,18 @@
6072
"code": 128278,
6173
"src": "fontawesome"
6274
},
75+
{
76+
"uid": "63b3012c8cbe3654ba5bea598235aa3a",
77+
"css": "angle-double-up",
78+
"code": 128291,
79+
"src": "fontawesome"
80+
},
81+
{
82+
"uid": "dfec4ffa849d8594c2e4b86f6320b8a6",
83+
"css": "angle-double-down",
84+
"code": 128290,
85+
"src": "fontawesome"
86+
},
6387
{
6488
"uid": "555ef8c86832e686fef85f7af2eb7cde",
6589
"css": "left-big",

‎fontello/css/osm-codes.css‎

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

33

4-
.osm-home:before { content: '🔠'; } /* '\1f520' */
4+
.osm-user:before { content: '🔤'; } /* '\1f524' */
55
.osm-globe:before { content: '🔘'; } /* '\1f518' */
6+
.osm-home:before { content: '🔠'; } /* '\1f520' */
7+
.osm-link:before { content: '🔙'; } /* '\1f519' */
68
.osm-link-ext:before { content: '🔐'; } /* '\1f510' */
79
.osm-pin:before { content: '🔑'; } /* '\1f511' */
810
.osm-location:before { content: '🔒'; } /* '\1f512' */
9-
.osm-link:before { content: '🔙'; } /* '\1f519' */
11+
.osm-info-circled:before { content: '🔡'; } /* '\1f521' */
1012
.osm-cog:before { content: '🔔'; } /* '\1f514' */
1113
.osm-zoom-in:before { content: '🔕'; } /* '\1f515' */
1214
.osm-zoom-out:before { content: '🔖'; } /* '\1f516' */
15+
.osm-angle-double-up:before { content: '🔣'; } /* '\1f523' */
16+
.osm-angle-double-down:before { content: '🔢'; } /* '\1f522' */
1317
.osm-left-big:before { content: '🔗'; } /* '\1f517' */
1418
.osm-direction:before { content: '🔓'; } /* '\1f513' */

‎fontello/css/osm-embedded.css‎

Lines changed: 12 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎fontello/css/osm-ie7-codes.css‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11

2-
.osm-home { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#x1f520;&nbsp;'); }
2+
.osm-user { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#x1f524;&nbsp;'); }
33
.osm-globe { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#x1f518;&nbsp;'); }
4+
.osm-home { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#x1f520;&nbsp;'); }
5+
.osm-link { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#x1f519;&nbsp;'); }
46
.osm-link-ext { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#x1f510;&nbsp;'); }
57
.osm-pin { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#x1f511;&nbsp;'); }
68
.osm-location { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#x1f512;&nbsp;'); }
7-
.osm-link { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#x1f519;&nbsp;'); }
9+
.osm-info-circled { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#x1f521;&nbsp;'); }
810
.osm-cog { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#x1f514;&nbsp;'); }
911
.osm-zoom-in { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#x1f515;&nbsp;'); }
1012
.osm-zoom-out { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#x1f516;&nbsp;'); }
13+
.osm-angle-double-up { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#x1f523;&nbsp;'); }
14+
.osm-angle-double-down { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#x1f522;&nbsp;'); }
1115
.osm-left-big { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#x1f517;&nbsp;'); }
1216
.osm-direction { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#x1f513;&nbsp;'); }

‎fontello/css/osm-ie7.css‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,18 @@
1010
/* font-size: 120%; */
1111
}
1212

13-
.osm-home { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#x1f520;&nbsp;'); }
13+
.osm-user { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#x1f524;&nbsp;'); }
1414
.osm-globe { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#x1f518;&nbsp;'); }
15+
.osm-home { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#x1f520;&nbsp;'); }
16+
.osm-link { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#x1f519;&nbsp;'); }
1517
.osm-link-ext { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#x1f510;&nbsp;'); }
1618
.osm-pin { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#x1f511;&nbsp;'); }
1719
.osm-location { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#x1f512;&nbsp;'); }
18-
.osm-link { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#x1f519;&nbsp;'); }
20+
.osm-info-circled { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#x1f521;&nbsp;'); }
1921
.osm-cog { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#x1f514;&nbsp;'); }
2022
.osm-zoom-in { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#x1f515;&nbsp;'); }
2123
.osm-zoom-out { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#x1f516;&nbsp;'); }
24+
.osm-angle-double-up { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#x1f523;&nbsp;'); }
25+
.osm-angle-double-down { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#x1f522;&nbsp;'); }
2226
.osm-left-big { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#x1f517;&nbsp;'); }
2327
.osm-direction { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#x1f513;&nbsp;'); }

‎fontello/css/osm.css‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
@font-face {
44
font-family: 'osm';
5-
src: url('../font/osm.eot?16352570');
6-
src: url('../font/osm.eot?16352570#iefix') format('embedded-opentype'),
7-
url('../font/osm.woff?16352570') format('woff'),
8-
url('../font/osm.ttf?16352570') format('truetype'),
9-
url('../font/osm.svg?16352570#osm') format('svg');
5+
src: url('../font/osm.eot?39632956');
6+
src: url('../font/osm.eot?39632956#iefix') format('embedded-opentype'),
7+
url('../font/osm.woff?39632956') format('woff'),
8+
url('../font/osm.ttf?39632956') format('truetype'),
9+
url('../font/osm.svg?39632956#osm') format('svg');
1010
font-weight: normal;
1111
font-style: normal;
1212
}
@@ -16,7 +16,7 @@
1616
@media screen and (-webkit-min-device-pixel-ratio:0) {
1717
@font-face {
1818
font-family: 'osm';
19-
src: url('../font/osm.svg?16352570#osm') format('svg');
19+
src: url('../font/osm.svg?39632956#osm') format('svg');
2020
}
2121
}
2222
*/
@@ -52,14 +52,18 @@
5252
/* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */
5353
}
5454

55-
.osm-home:before { content: '🔠'; } /* '\1f520' */
55+
.osm-user:before { content: '🔤'; } /* '\1f524' */
5656
.osm-globe:before { content: '🔘'; } /* '\1f518' */
57+
.osm-home:before { content: '🔠'; } /* '\1f520' */
58+
.osm-link:before { content: '🔙'; } /* '\1f519' */
5759
.osm-link-ext:before { content: '🔐'; } /* '\1f510' */
5860
.osm-pin:before { content: '🔑'; } /* '\1f511' */
5961
.osm-location:before { content: '🔒'; } /* '\1f512' */
60-
.osm-link:before { content: '🔙'; } /* '\1f519' */
62+
.osm-info-circled:before { content: '🔡'; } /* '\1f521' */
6163
.osm-cog:before { content: '🔔'; } /* '\1f514' */
6264
.osm-zoom-in:before { content: '🔕'; } /* '\1f515' */
6365
.osm-zoom-out:before { content: '🔖'; } /* '\1f516' */
66+
.osm-angle-double-up:before { content: '🔣'; } /* '\1f523' */
67+
.osm-angle-double-down:before { content: '🔢'; } /* '\1f522' */
6468
.osm-left-big:before { content: '🔗'; } /* '\1f517' */
6569
.osm-direction:before { content: '🔓'; } /* '\1f513' */

0 commit comments

Comments
 (0)