Version 3.3.0

supportpal · Nov 9, 2020 · 743b2c0 · 743b2c0
1 parent ba29b6d
commit 743b2c0
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 68 deletions.
diff --git a/index.twig b/index.twig
@@ -63,10 +63,6 @@
                         <a href="{{ Config.get('settings.website_url') }}" class="sp-mr-4">
                             {{ Lang.get('core.back_to_website') }}
                         </a>
-                    {% elseif isModuleEnabled('Ticket') %}
-                        <a href="{{ route('ticket.frontend.ticket.createStep1') }}" class="sp-mr-4">
-                            {{ Lang.get('core.submit_ticket') }}
-                        </a>
                     {% endif %}
 
                     {% if auth_check() %}

diff --git a/navigation.twig b/navigation.twig
@@ -55,7 +55,7 @@
             </li>
         {% endif %}
         <li>
-            <a href="{{ route('user.logout') }}">
+            <a class="logout-link" data-url="{{ route('user.logout') }}" data-method="post">
                 {{ Lang.get('user.logout') }}
             </a>
         </li>

diff --git a/selfservice/article.twig b/selfservice/article.twig
@@ -1,7 +1,12 @@
 {% extends parent_template %}
 
 {% block meta %}
-    <meta name="keywords" content="{{ article.keywords }}" />
+    {% if article.keywords is not empty %}
+        <meta name="keywords" content="{{ article.keywords }}" />
+    {% endif %}
+    {% if article.excerpt is not empty %}
+        <meta name="description" content="{{ article.excerpt }}" />
+    {% endif %}
 {% endblock %}
 
 {% block title %}{{ article.title }}{% endblock %}

diff --git a/ticket/ticket_grid.twig b/ticket/ticket_grid.twig
@@ -9,17 +9,7 @@
 
 {% block content %}
 
-    <div class="sp-alert md:sp-block sp-hidden">
-        <a href="{{ route('ticket.frontend.ticket.createStep1') }}">
-            <i class="fas fa-plus"></i>&nbsp;
-            {{ Lang.get('core.submit_ticket') }}
-        </a>&nbsp;&nbsp;&nbsp;
-        <a class="sp-filter-results">
-            <i class="fas fa-filter"></i>&nbsp; {{ Lang.get('general.filter_results') }}
-        </a>
-    </div>
-
-    <div class="sp-filter-results sp-hidden">
+    <div class="sp-filter-results sp-mx-6 sp-hidden">
         <h3>{{ Lang.get('general.filter_results') }}</h3>
 
         <div class="sp-table">
@@ -44,13 +34,6 @@
                     -->{{ form_button('<i class="fas fa-fw fa-times"></i>', {'class': 'reset-filter'}) }}
                 </div>
             </div>
-            <div class="sp-table-row">
-                <label>{{ Lang.choice('general.status', 1) }}:</label>
-                <div>
-                    {{ form_select('sSearch_3', {'-1': Lang.get('general.select_value')} + statuses.pluck('name', 'id').all()) }}<!--
-                    -->{{ form_button('<i class="fas fa-fw fa-times"></i>', {'class': 'reset-filter'}) }}
-                </div>
-            </div>
             <div class="sp-table-row">
                 <label>{{ Lang.get('ticket.submitted') }}:</label>
                 <div>
@@ -80,6 +63,8 @@
                 </div>
             </div>
         </div>
+
+        {{ form_hidden('sSearch_6') }}
     </div>
 
 	{{ table.render()|raw }}
@@ -92,12 +77,5 @@
 
     <script type="text/javascript" src="{{ asset_rev('resources/assets/general/js/queryfiltering.js') }}"></script>
 
-    <script type="text/javascript">
-        $(document).ready(function() {
-            // Toggle show/hide of the filters area
-            $('a.sp-filter-results').on('click', function() {
-                $('div.sp-filter-results').toggleClass('sp-hidden');
-            });
-        });
-    </script>
+    <script type="text/javascript" src="{{ asset_rev('resources/assets/frontend/js/ticketgrid.js') }}"></script>
 {% endblock %}
diff --git a/user/forms/user_profile.twig b/user/forms/user_profile.twig
@@ -104,9 +104,16 @@
     <div class="sp-form-row">
         {{ form_label('avatar', Lang.get('user.avatar')) }}
         <div class="sp-input-container">
-            {% if record.avatar_url %}
-                <img class="sp-avatar sp-mb-3" src="{{ record.avatar_url }}" />
+            <img class="sp-avatar" src="{{ record.avatar_url }}" />
+            <div class="sp-mt-3 lg:sp-inline-block lg:sp-mt-0 lg:sp-ml-3">
+                {{ form_file('avatar') }}
+            </div>
+            {% if record.getOriginal('avatar') is not null %}
+                <div class="sp-mt-3">
+                    <button class="remove-avatar" type="button" data-url="{{ route('user.avatar.delete') }}">
+                        {{ Lang.get('user.remove_avatar') }}
+                    </button>
+                </div>
             {% endif %}
-            {{ form_file('avatar') }}
         </div>
     </div>
diff --git a/user/linked_account.twig b/user/linked_account.twig
@@ -11,17 +11,7 @@
 
     {% if not socialite_providers.isEmpty() %}
         <div class="sp--m-3/2 sp-text-center">
-            {% for provider, metadata in all_providers %}
-                {% if socialite_providers.contains('name', provider) %}
-                    <a href="{{ route('user.oauth_redirect', {'provider': provider}) }}"
-                       class="sp-social-login sp-px-4 sp-m-3/2" style="background-color: {{ metadata.colour }};">
-                        <span class="sp-mr-1">
-                            <i class="fab fa-{{ provider }} fa-fw"></i>
-                        </span>
-                        {{ Lang.get('user.login_via', {'provider': metadata.name }) }}
-                    </a>
-                {% endif %}
-            {% endfor %}
+            {% include 'frontend.' ~ template ~ '.user.social_login_options' %}
         </div>
 
         <hr />

diff --git a/user/login.twig b/user/login.twig
@@ -71,17 +71,7 @@
                         <span class="sp-bg-primary sp-px-4">{{ Lang.get('general.or') }}</span>
                     </div>
 
-                    {% for provider, metadata in all_providers %}
-                        {% if socialite_providers.contains('name', provider) %}
-                            <a href="{{ route('user.oauth_redirect', {'provider': provider}) }}"
-                               class="sp-social-login sp-px-4 sp-m-3/2" style="background-color: {{ metadata.colour }};">
-                                <span class="sp-mr-1">
-                                    <i class="fab fa-{{ provider }} fa-fw"></i>
-                                </span>
-                                {{ Lang.get('user.login_via', {'provider': metadata.name }) }}
-                            </a><br />
-                        {% endif %}
-                    {% endfor %}
+                    {% include 'frontend.' ~ template ~ '.user.social_login_options' with {'new_line': true} %}
                 {% endif %}
             </div>
 

diff --git a/user/profile.twig b/user/profile.twig
@@ -45,6 +45,7 @@
     <!-- Custom fields -->
     <script src="{{ asset_rev('resources/assets/general/js/customfields.js') }}"></script>
 
+    <script type="text/javascript" src="{{ asset_rev('resources/assets/general/js/user.js') }}"></script>
     <script type="text/javascript">
         $(document).ready(function() {
             // Enable hide/show password toggle

diff --git a/user/register.twig b/user/register.twig
@@ -26,17 +26,7 @@
         {% else %}
             {% if not socialite_providers.isEmpty() %}
                 <div class="sp--m-3/2 sp-text-center">
-                    {% for provider, metadata in all_providers %}
-                        {% if socialite_providers.contains('name', provider) %}
-                            <a href="{{ route('user.oauth_redirect', {'provider': provider}) }}"
-                               class="sp-social-login sp-px-4 sp-m-3/2" style="background-color: {{ metadata.colour }};">
-                            <span class="sp-mr-1">
-                                <i class="fab fa-{{ provider }} fa-fw"></i>
-                            </span>
-                                {{ Lang.get('user.login_via', {'provider': metadata.name }) }}
-                            </a>
-                        {% endif %}
-                    {% endfor %}
+                    {% include 'frontend.' ~ template ~ '.user.social_login_options' %}
                 </div>
 
                 <hr />

diff --git a/user/social_login_options.twig b/user/social_login_options.twig
@@ -0,0 +1,12 @@
+{% for provider in socialite_providers %}
+    {% if provider.integration is not empty %}
+        <a href="{{ route('user.oauth_redirect', {'provider': provider.name}) }}"
+           class="sp-social-login sp-px-4 sp-m-3/2" style="background-color: {{ provider.integration.colour }};">
+            <span class="sp-mr-1">
+                <i class="fab fa-{{ provider.name }} fa-fw"></i>
+            </span>
+            {{ Lang.get('user.login_via', {'provider': provider.integration.name }) }}
+        </a>
+        {% if new_line %}<br />{% endif %}
+    {% endif %}
+{% endfor %}