diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2022-12-08 12:11:35 +0100 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2022-12-12 12:23:20 +0100 |
commit | 0667dd545924d17d5f46991e68cf5eeeefe6c0e2 (patch) | |
tree | 6683d061cf287ee720f9a51a7a7bfcbfa7ea6f4a | |
parent | 3415975a9974f1892d8c70c2a675c550b9af6737 (diff) | |
download | Ishtar-0667dd545924d17d5f46991e68cf5eeeefe6c0e2.tar.bz2 Ishtar-0667dd545924d17d5f46991e68cf5eeeefe6c0e2.zip |
Image field: can use camera for mobile device
-rw-r--r-- | CHANGES.md | 1 | ||||
-rw-r--r-- | ishtar_common/static/js/ishtar.js | 44 | ||||
-rw-r--r-- | ishtar_common/templates/widgets/image_input.html | 36 |
3 files changed, 77 insertions, 4 deletions
diff --git a/CHANGES.md b/CHANGES.md index 20ffd0be9..44b54fef4 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -6,6 +6,7 @@ date: 2022-12-05 ### Features/improvements ### - Sheet: set default permissions to False - Find sheet: do not display container information if no permission +- Image field: can use camera for mobile device ### Bug fixes ### - Full text search: add "simple" config in search diff --git a/ishtar_common/static/js/ishtar.js b/ishtar_common/static/js/ishtar.js index 2a2b4fa9f..03d62bac3 100644 --- a/ishtar_common/static/js/ishtar.js +++ b/ishtar_common/static/js/ishtar.js @@ -1957,3 +1957,47 @@ var redraw_plots = function(name, key){ stats_current_graph[key].replot({resetAxes: true}); } }; + +var mobile_check = function() { + let check = false; + (function(a){if(/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i.test(a)||/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(a.substr(0,4))) check = true;})(navigator.userAgent||navigator.vendor||window.opera); + return check; +}; + +var preview_input_image = function(input, input_id){ + if (input.files && input.files[0]) { + var reader = new FileReader(); + reader.onload = function (e) { + $('#img-' + input_id).attr('src', e.target.result); + $('#img-' + input_id).parent().attr('href', e.target.result); + }; + reader.readAsDataURL(input.files[0]); + let gallery = document.getElementById('lightgallery-' + input_id); + if (gallery && gallery.getAttribute('lg-uid') && window.lgData) { + window.lgData[gallery.getAttribute('lg-uid')].destroy(true); + } + lightGallery(document.getElementById('lightgallery-' + input_id)); + } +}; + + +var register_preview_input_image = function(input_id){ + $('#img-' + input_id).on('load',function() { + let css; + let ratio = $(this).width() / $(this).height(); + let pratio = $(this).parent().parent().width() / $(this).parent().parent().height(); + if (ratio < pratio) { + css = {width:'auto', height:'100%'}; + } else { + css = {width:'100%', height:'auto'}; + } + $(this).css(css); + }); + $('#mobile-'+ input_id).change(function (){ + if($(this).is(":checked")) { + $("#input-" + input_id).attr("capture", "camera"); + } else { + $("#input-" + input_id).removeAttr("capture"); + } + }); +}; diff --git a/ishtar_common/templates/widgets/image_input.html b/ishtar_common/templates/widgets/image_input.html index e03aa9153..4b1d83c0e 100644 --- a/ishtar_common/templates/widgets/image_input.html +++ b/ishtar_common/templates/widgets/image_input.html @@ -2,8 +2,10 @@ {% if widget.value and widget.value.url or hidden_value %} <span class="col-4"> <div id="lightgallery-{{widget.name}}"> - <a href="{% if hidden_value %}{{hidden_value}}{% else %}{{ widget.value.url }}{%endif%}"> - <img class="form-thumbnail" src="{% if widget.value.url %}{{ widget.value.url }}{% else %}{{hidden_value}}{%endif%}"> + <a href="{% if hidden_value %}{{hidden_value}}{% else %}{{ widget.value.url }}{% endif %}"> + <img class="form-thumbnail" + id="img-{{ widget.name }}" + src="{% if widget.value.url %}{{ widget.value.url }}{% else %}{{hidden_value}}{% endif %}"> </a> </div> </span> @@ -11,14 +13,32 @@ <span class="col-4"> {{hidden_name_value}} </span> + {% else %} + <span class="col-4"> + <div id="lightgallery-{{widget.name}}"> + <a href=""> + <img class="form-thumbnail" id="img-{{ widget.name }}" src=""> + </a> + </div> + </span> {% endif %} <span class="col-8"> + <input type="{{ widget.type }}" + accept="image/*" capture="camera" + onchange="preview_input_image(this, '{{ widget.name }}');" + id="input-{{widget.name}}" + name="{{ widget.name }}"{% include 'django/forms/widgets/attrs.html' %} /> + <br class="mobile-capture" style="display:none"> + <input type="checkbox" name="mobile-capture" class="mobile-capture" style="display:none" + id="mobile-{{ widget.name }}" checked> + <label for="mobile-{{ widget.name }}" class="mobile-capture" style="display:none">{% trans "enable camera" %}</label> + {% if widget.value and widget.value.url %}{% if not widget.required %} + <br> <input type="checkbox" name="{{ widget.checkbox_name }}" id="{{ widget.checkbox_id }}" /> <label for="{{ widget.checkbox_id }}">{% trans "delete" %}</label> {% endif %}{% endif %} - <input type="{{ widget.type }}" name="{{ widget.name }}"{% include 'django/forms/widgets/attrs.html' %} /> <input type="hidden" name="{{ widget.name }}-hidden" value="{% if widget.value and widget.value.url %}{{widget.value.url}}{% elif hidden_value %}{{hidden_value}}{% endif %}"/> <input type="hidden" name="{{ widget.name }}-hidden-name" @@ -27,6 +47,14 @@ </div> {% if is_initial or widget.value.url %} <script type="text/javascript"> -lightGallery(document.getElementById('lightgallery-{{widget.name}}')); +$(document).ready(function(){ + if (mobile_check()){ + $(".mobile-capture").show(); + } else { + $("#input-{{ widget.name }}").removeAttr("capture"); + } + lightGallery(document.getElementById('lightgallery-{{widget.name}}')); + register_preview_input_image("{{ widget.name }}"); +}); </script> {% endif %} |