external/iiab
1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-02-13 11:42:08 +00:00
Code Issues Releases Wiki Activity

Merge pull request #234 from iiab/master

Browse source 
sync from iiab/iiab
This commit is contained in:
A Holt 2019-04-29 18:32:05 -04:00 committed by GitHub
commit 8f61fdb60d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,8 @@
nextcloud_install: True
nextcloud_enabled: False
# nextcloud_install: False
# nextcloud_enabled: False
# All above are set in: github.com/iiab/iiab/blob/master/vars/default_vars.yml
# If nec, change them by editing /etc/iiab/local_vars.yml prior to installing!
# REMOVE /opt/nextcloud/version.php TO FORCE AN INSTALL OR REINSTALL OR UPGRADE
nextcloud_force_install: False
@ -8,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: latest-15.tar.bz2
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);