Merge branch 'master' of https://github.com/unaio/una

modules/boonex/artificer/data/template/bx_timeline/css/view.css

@@ -68,10 +68,11 @@ div.bx-tl-item div.bx-tl-item-activity .bx-menu-custom.bx-menu-custom-hor {
     display: block;
     padding: 0px !important;
 }
-.leading-5{
-    line-height: 1.25rem
-}
 .bx-tl-owner-avatar .bx-def-thumb-size{
     width: 40px;
     height: 40px;
+}
+.bx-tl-item-content video,
+.bx-tl-item-attachment img{
+    border-radius: .25rem;
 }

modules/boonex/artificer/data/template/bx_timeline/item_outline.html

@@ -67,7 +67,7 @@
                 <div class="__style_prefix__-item-fields mx-3 md:mx-4 lg:mx-6 mt-3 md:mt-4 lg:mt-6 bx-def-font-grayed bx-clearfix">__fields__</div>
             </bx_if:show_fields>
             <bx_if:show_menu_item_counters>
-                <div class="__style_prefix__-item-activity __style_prefix__-ia-counters space-x-4 p-2 md:p-3">__menu_item_counters__</div>
+                <div class="__style_prefix__-item-activity __style_prefix__-ia-counters space-x-4 px-2 md:px-3 pb-2 md:pb-3">__menu_item_counters__</div>
             </bx_if:show_menu_item_counters>
             <div class="flex justify-between space-x-8 p-3 md:p-4 border-t border-gray-200 dark:border-gray-700">
                 <bx_if:show_menu_item_actions>

modules/boonex/artificer/data/template/bx_timeline/item_timeline.html

@@ -75,7 +75,7 @@
             <div class="__style_prefix__-item-fields mx-3 md:mx-4 lg:mx-6 mt-3 md:mt-4 lg:mt-6 bx-def-font-grayed bx-clearfix">__fields__</div>
         </bx_if:show_fields>
         <bx_if:show_menu_item_counters>
-            <div class="__style_prefix__-item-activity __style_prefix__-ia-counters space-x-4 p-2 md:p-3">__menu_item_counters__</div>
+            <div class="__style_prefix__-item-activity __style_prefix__-ia-counters space-x-4 px-2 md:px-3 pb-2 md:pb-3">__menu_item_counters__</div>
         </bx_if:show_menu_item_counters>
         <div class="flex justify-between space-x-8 p-3 md:p-4 border-t border-gray-200 dark:border-gray-700">
             <bx_if:show_menu_item_actions>

modules/boonex/artificer/data/template/bx_timeline/type_post.html

@@ -15,16 +15,16 @@
         </bx_repeat:items>
     </div>
 </bx_if:show_videos>
-<div class="__style_prefix__-item-text group px-3 md:px-3 lg:px-4 pt-0 mb-2 md:mb-3 lg:mb-4">
+<div class="__style_prefix__-item-text group px-3 md:px-3 lg:px-4 pt-0">
     <bx_if:show_title>
-        <div class="__style_prefix__-title text-lg lg:text-xl font-semibold text-gray-700 group-hover:text-gray-900 dark:text-gray-300 dark:group-hover:text-white">__title__</div>
+        <div class="__style_prefix__-title text-lg lg:text-xl font-semibold text-gray-700 group-hover:text-gray-900 dark:text-gray-300 dark:group-hover:text-white mb-1 lg:mb-2 ">__title__</div>
     </bx_if:show_title>
     <bx_if:show_content>
-        <div class="__style_prefix__-content text-sm lg:text-base text-gray-500 group-hover:text-gray-600 dark:text-gray-400 dark:group-hover:text-gray-300">__item_content__</div>
+        <div class="__style_prefix__-content text-sm lg:text-base text-gray-500 group-hover:text-gray-600 dark:text-gray-400 dark:group-hover:text-gray-300 mb-2 md:mb-3 lg:mb-4">__item_content__</div>
     </bx_if:show_content>
 </div>
 <bx_if:show_attachments>
-    <div class="__style_prefix__-item-attachments __style_prefix__-ia-__display__ __style_prefix__-ia-i__count__ mx-1">
+    <div class="__style_prefix__-item-attachments __style_prefix__-ia-__display__ __style_prefix__-ia-i__count__ mx-1 mb-2 md:mb-3 lg:mb-4">
         <bx_repeat:items>
             <div class="__style_prefix__-item-attachment__class__">__item__</div>
         </bx_repeat:items>

template/location_field_plain.html

@@ -13,7 +13,7 @@
 <script>
 (function () {
     var getLocationString = function (sMode) {
-        var sCountry = $('select[name="__name___country"]').val();
+        var sCountry = $('select[name="__name___country"] :selected').text();
         var sZip = $('input[name="__name___zip"]').val();
         var sState = $('input[name="__name___state"]').val();
         var sCity = $('input[name="__name___city"]').val();
@@ -44,7 +44,7 @@
 
     var geocode = function (a, i) {
         var s = a[i];
-        $.getJSON('__nominatim_server__/search/' + encodeURIComponent(s) + '?format=json&limit=1&email=__nominatim_email__', function (oResult) {
+        $.getJSON('__nominatim_server__/search/?q=' + encodeURIComponent(s) + '&format=json&limit=1&email=__nominatim_email__', function (oResult) {
             glBxLocationFieldPlainGeocodingRequest = false;
             if (('object' === typeof oResult) && oResult.length && ('undefined' !== typeof oResult[0].lat) && ('undefined' !== typeof oResult[0].lon)) {
                 $('input[name="__name___lat"]').val(oResult[0].lat);