external/iiab
1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-03-09 15:40:17 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into distweb

Browse source
This commit is contained in:
Mitra Ardron 2019-04-28 17:54:50 +10:00
commit 6425626c11
2 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
roles/nextcloud/defaults/main.yml
View file

@ -11,7 +11,7 @@ nextcloud_url: /nextcloud
nextcloud_prefix: /opt
nextcloud_data_dir: "{{ content_base }}/nextcloud/data"
nextcloud_dl_url: https://download.nextcloud.com/server/releases
nextcloud_orig_src_file: nextcloud-15.tar.bz2 # 2019-04-25: latest-16.0.0.tar.bz2 requires PHP 7.1+ and so fails on current Raspbian and Debian 9 "Stretch". Aside: latest-16.tar.bz2 oddly not yet published at https://download.nextcloud.com/server/releases/
nextcloud_orig_src_file: latest-15.tar.bz2 # 2019-04-25: nextcloud-16.0.0.tar.bz2 requires PHP 7.1+ and so fails on current Raspbian and Debian 9 "Stretch". 2019-09-27 aside: latest-16.tar.bz2 oddly still not yet published at https://download.nextcloud.com/server/releases/
nextcloud_src_file: nextcloud_{{ nextcloud_orig_src_file }}
# we install on mysql with these setting or those from default_vars, etc.

22
roles/osm-vector/files/osm_functions.js
View file

@ -96,21 +96,21 @@ function genRegionItem(region,checkbox) {
console.log("in genRegionItem: " + region.name);
var itemId = region.title;
var ksize = region.size / 1000;
//console.log(html);
html += '<div class="extract" data-region={"name":"' + region.name + '"}>';
html += ' <label>';
//console.log(html);
html += '<div class="extract" data-region={"name":"' + region.name + '"}> ';
html += '<label>';
if ( checkbox ) {
if (selectedOsmItems.indexOf(region.name) != -1)
checked = 'checked';
else
checked = '';
if (selectedOsmItems.indexOf(region.name) != -1)
checked = 'checked';
else
checked = '';
html += '<input type="checkbox" name="' + region.name + '"';
html += ' onChange="updateOsmSpace(this)" ' + checked + '>';
html += ' onChange="updateOsmSpace(this)" ' + checked + '> ';
}
html += itemId;
if ( checkbox ) { html += '</input>';};
html += itemId;
if ( checkbox ) { html += '</input>';};
html += '</label>'; // end input
html += ' Size: ' + readableSize(ksize);
html += ' ' + readableSize(ksize);
html += '</div>';
//console.log(html);