Merge pull request #197 from openclassify/basetheme

#605

addons/default/visiosoft/advs-module/resources/views/list/partials/ads.twig

@@ -21,9 +21,11 @@
                         <div class="col-md-12">
                             <b>{{ adv.price.currency }}</b>
                         </div>
-                        <div class="col-md-12 justify-content-center align-self-center text-truncate">
+                        {% if setting_value('visiosoft.module.location::list_page_location') %}
-                            <small>{{ adv.city_name }} {{ adv.country_name }}</small>
+                            <div class="col-md-12 justify-content-center align-self-center text-truncate">
-                        </div>
+                                <small>{{ adv.city_name }} {{ adv.country_name }}</small>
+                            </div>
+                        {% endif %}
                     </div>
                 </div>
             </div>

addons/default/visiosoft/advs-module/resources/views/list/table.twig

@@ -11,9 +11,11 @@
                     class="text-center align-middle">{{ trans('visiosoft.module.advs::field.advs_list_table_thead.price') }}</th>
                 <th scope="col"
                     class="text-center align-middle">{{ trans('visiosoft.module.advs::field.advs_list_table_thead.publish_at') }}</th>
-                <th scope="col"
+                {% if setting_value('visiosoft.module.location::list_page_location') %}
-                    class="text-center align-middle">{{ trans('visiosoft.module.advs::field.advs_list_table_thead.location_city') }}
+                    <th scope="col"
-                    / {{ trans('visiosoft.module.advs::field.advs_list_table_thead.location_country') }}</th>
+                        class="text-center align-middle">{{ trans('visiosoft.module.advs::field.advs_list_table_thead.location_city') }}
+                        / {{ trans('visiosoft.module.advs::field.advs_list_table_thead.location_country') }}</th>
+                {% endif %}
                 {{ addBlock('ads-list/table-column',{'seenList':seenList})|raw }}
             </tr>
             </thead>

addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig

@@ -6,7 +6,7 @@
             <nav aria-label="breadcrumb">
                 <ol class="breadcrumb">
                     {% for cat in cats_d %}
-                        <li class="breadcrumb-item"><a href="#">{{ cat }}</a></li>
+                        <li class="breadcrumb-item text-primary">{{ cat }}</li>
                     {% endfor %}
                     <li class="breadcrumb-item">
                         <a href="{{ url_route('adv::edit_category',[id]) }}">

addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/login.twig

@@ -0,0 +1,47 @@
+{% extends "theme::layouts/default" %}
+
+{% block content %}
+    <div class="row justify-content-center">
+        <div class="col-12 col-sm-8 col-md-6 col-lg-4 text-left bg-light p-3 m-0">
+            {% set form = form('login').redirect(request_get('redirect', '/'))
+                .actions(
+                {'submit':
+                    {'type':'primary',
+                        'text':'<i class="fas fa-key"></i> '~trans('anomaly.module.users::button.login'),
+                        'class':'w-100 py-2'
+                    }
+                }).get() %}
+            {{ form_open({
+                'class': 'row form ' ~ form.options.class ,
+                'enctype': 'multipart/form-data',
+                'url': 'advs/save_adv',
+            })|raw }}
+            <div class="col-12">
+                {{ form.fields.email|raw }}
+            </div>
+            <div class="col-12">
+                {{ form.fields.password|raw }}
+            </div>
+            <div class="col-12">
+                <label class="c-input c-checkbox">
+                    <input value="0" type="hidden" name="remember_me">
+                    <input type="checkbox" name="remember_me">
+                    <span class="c-indicator"></span>
+                    {{ trans('anomaly.module.users::field.remember_me.name') }}
+                </label>
+            </div>
+            <div class="col-12 row m-0">
+                <div class="col-6 pl-0 pr-1">
+                    {{ form.actions|raw }}
+                </div>
+                <div class="col-6 pr-0 pl-1">
+                    <a href="{{ url('register') }}" class="btn btn-sm btn-success  w-100 py-2">
+                        <i class="fas fa-user-plus"></i>
+                        {{ trans('anomaly.module.users::button.register') }}
+                    </a>
+                </div>
+
+            </div>
+        </div>
+    </div>
+{% endblock %}

addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/register.twig

@@ -0,0 +1,45 @@
+{% extends "theme::layouts/default" %}
+
+{% block content %}
+    <div class="row justify-content-center">
+        <div class="col-12 col-sm-8 col-md-6 col-lg-4 text-left bg-light p-3 m-0">
+            {% set form = form('register').redirect(request_get('redirect', '/'))
+                .actions(
+                {'submit':
+                    {'type':'success',
+                        'text':'<i class="fas fa-user-plus"></i> '~trans('anomaly.module.users::button.register'),
+                        'class':'w-100 py-2'
+                    }
+                }).get() %}
+            {{ form_open({
+                'class': 'row form ' ~ form.options.class ,
+                'enctype': 'multipart/form-data',
+                'url': 'advs/save_adv',
+            })|raw }}
+            <div class="col-12">
+                {{ form.fields.display_name|raw }}
+            </div>
+            <div class="col-12">
+                {{ form.fields.username|raw }}
+            </div>
+            <div class="col-12">
+                {{ form.fields.email|raw }}
+            </div>
+            <div class="col-12">
+                {{ form.fields.password|raw }}
+            </div>
+            <div class="col-12 row m-0">
+                <div class="col-6 pl-0 pr-1">
+                    {{ form.actions|raw }}
+                </div>
+                <div class="col-6 pr-0 pl-1">
+                    <a href="{{ url('login') }}" class="btn btn-sm btn-primary  w-100 py-2">
+                        <i class="fas fa-key"></i>
+                        {{ trans('anomaly.module.users::button.login') }}
+                    </a>
+                </div>
+
+            </div>
+        </div>
+    </div>
+{% endblock %}

addons/default/visiosoft/base-theme/resources/views/index/default.twig

@@ -33,12 +33,14 @@
                                     <p class="card-title d-inline-block">{{ latestAd.name }}</p>
                                 </a>
                             </div>
+                            {% if setting_value('visiosoft.module.location::home_page_location') %}
                             <div class="d-flex justify-content-between align-items-center">
                                 <small>
                                     <i class="fas fa-location-arrow text-primary"></i>
                                     {{ latestAd.city_name }}, {{ latestAd.country_name }}
                                 </small>
                             </div>
+                            {% endif %}
                             <div class="d-flex justify-content-between align-items-center">
                                 <small>
                                     <i class="far fa-clock text-dark"></i>

addons/default/visiosoft/location-module/resources/config/settings.php

@@ -19,10 +19,4 @@ return [
             'default_value' => true,
         ],
     ],
-    'show_search_location_btn' => [
-        'type'   => 'anomaly.field_type.boolean',
-        'config' => [
-            'default_value' => true,
-        ],
-    ],
 ];