Merge pull request #283 from openclassify/vedatakdogan

move favicon

addons/default/visiosoft/advs-module/resources/config/settings/sections.php

@@ -9,7 +9,7 @@ return [
             'general' => [
                 'title' => 'visiosoft.module.advs::section.general',
                 'fields' => [
-                    'favicon', 'iban_numbers', 'google_statistic_code', 'ogImage', 'free_currencyconverterapi_key',
+                    'iban_numbers', 'google_statistic_code', 'ogImage', 'free_currencyconverterapi_key',
                     'enabled_currencies'
 
                 ],

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

@@ -17,13 +17,6 @@ return [
             'default_value' => 5,
         ],
     ],
-    "favicon" => [
-        "type" => "anomaly.field_type.file",
-        "config" => [
-            "folders" => ['favicon'],
-            "mode" => "upload",
-        ]
-    ],
     'auto_approve' => [
         'type' => 'anomaly.field_type.boolean',
         'bind' => 'adv.auto_approve',

addons/default/visiosoft/base-theme/resources/css/intlTelInput.css

@@ -916,13 +916,18 @@
 .iti__flag {
     height: 15px;
     box-shadow: 0px 0px 1px 0px #888;
-    background-image: url('{{ img("theme::images/flags.png").url }}');
+    background-image: url('{{ img("visiosoft.theme.base::images/flags.png").url }}');
     background-repeat: no-repeat;
     background-color: #DBDBDB;
     background-position: 20px 0; }
 @media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
     .iti__flag {
-        background-image: url('{{ img("theme::images/flags@2x.png").url }}'); } }
+        background-image: url('{{ img("visiosoft.theme.base::images/flags@2x.png").url }}'); } }
 
 .iti__flag.iti__np {
-    background-color: transparent; }
+    background-color: transparent;
+}
+
+.iti--allow-dropdown {
+    width: 100%;
+}

addons/default/visiosoft/base-theme/resources/css/theme.css

@@ -19,10 +19,6 @@
     width: 100%;
 }
 
-.register-phone .iti--allow-dropdown {
-    width: 100%;
-}
-
 @media only screen and (min-width: 960px) {
     .login-section,
     .register-section {

addons/default/visiosoft/base-theme/resources/js/phonefield.js

@@ -0,0 +1,13 @@
+var inputQuery = document.querySelector("input[name=\"phone\"]");
+var iti = intlTelInput(inputQuery, {
+    hiddenInput: "full_phone",
+    class:"form-control",
+    initialCountry: "auto",
+    geoIpLookup: function (success, failure) {
+        $.get("https://ipinfo.io", function () {
+        }, "jsonp").always(function (resp) {
+            var countryCode = (resp && resp.country) ? resp.country : "";
+            success(countryCode);
+        });
+    }
+});

addons/default/visiosoft/base-theme/resources/js/theme/initialize.js

@@ -3,18 +3,3 @@
     // Go!
     
 })(window, document);
-
-
-var inputQuery = document.querySelector("input[name=\"phone\"]");
-var iti = intlTelInput(inputQuery, {
-    hiddenInput: "full_phone",
-    class:"form-control",
-    initialCountry: "auto",
-    geoIpLookup: function (success, failure) {
-        $.get("https://ipinfo.io", function () {
-        }, "jsonp").always(function (resp) {
-            var countryCode = (resp && resp.country) ? resp.country : "";
-            success(countryCode);
-        });
-    }
-});

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

@@ -103,4 +103,11 @@
             </div>
         </div>
     </div>
-{% endblock %}
+
+    {{ asset_add("scripts.js", "visiosoft.theme.base::js/intlTelInput.min.js") }}
+    {{ asset_add("scripts.js", "visiosoft.theme.base::js/utils.js") }}
+    {{ asset_add("scripts.js", "visiosoft.theme.base::js/phonefield.js") }}
+    {{ asset_add("styles.css", "visiosoft.theme.base::css/intlTelInput.css") }}
+
+{% endblock %}
+

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

@@ -1,3 +1,5 @@
+{{ addBlock('index_top')|raw }}
+
 <div class="album  bg-light">
     <div class="row p-2">
         {% if setting_value('visiosoft.theme.base::latest_and_view_all_btn') %}

addons/default/visiosoft/base-theme/resources/views/partials/assets.twig

@@ -8,8 +8,6 @@
 {{ asset_add("theme.js", "theme::js/modal_include.js") }}
 {{ asset_add("theme.js", "theme::js/select2.js") }}
 {{ asset_add("theme.js", "theme::js/params.js") }}
-{{ asset_add("theme.js", "theme::js/intlTelInput.min.js") }}
-{{ asset_add("theme.js", "theme::js/utils.js") }}
 
 {# Theme Scripts #}
 {#{{ asset_add("theme.js", "theme::js/plugins/*") }}#}

addons/default/visiosoft/base-theme/resources/views/partials/metadata.twig

@@ -36,7 +36,6 @@
 {{ asset_add("theme.css", "theme::css/theme.css") }}
 {{ asset_add("theme.css", "theme::css/select2.css") }}
 {{ asset_add("theme.css", "theme::css/font-awesome.min.css") }}
-{{ asset_add("theme.css", "theme::css/intlTelInput.css") }}
 <script src="{{ asset_path('theme::js/vendor/jquery.min.js') }}"></script>
 
 {{ asset_style("theme.css") }}

addons/default/visiosoft/profile-module/src/ProfileModuleSeeder.php

@@ -72,7 +72,7 @@ class ProfileModuleSeeder extends Seeder
                 'slug'          => 'favicon',
                 'disk'          => $disk,
                 'allowed_types' => [
-                    'ico','png'
+                    'ico','png',
                 ],
             ]
         );