Merge pull request #405 from AcclaroInc/Update/plugin-for-craft-cms-r…

…elease-4.3.0-changes Updated: craft release 4.3.0 UI changes in plugin UI
AcclaroInc · Nov 2, 2022 · f0039e7 · f0039e7
2 parents 0f86bbc + 0d3a574
commit f0039e7
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 17 deletions.
diff --git a/src/elements/Order.php b/src/elements/Order.php
@@ -183,6 +183,14 @@ protected static function defineActions(string $source): array
 
         return $actions;
     }
+
+    /**
+     * @inheritdoc
+     */
+    public static function sources(string $context): array
+    {
+        return static::defineSources($context);;
+    }
 
     protected static function defineSources(string $context): array
     {

diff --git a/src/elements/StaticTranslations.php b/src/elements/StaticTranslations.php
@@ -80,6 +80,14 @@ public function getTranslateStatus()
         return Constants::STATUS_STATIC_TRANSLATION_UNTRANSLATED;
     }
 
+    /**
+     * @inheritdoc
+     */
+    public static function sources(string $context): array
+    {
+        return static::defineSources($context);;
+    }
+
     /**
      * @param string|null $context
      * @return array

diff --git a/src/elements/Translator.php b/src/elements/Translator.php
@@ -24,6 +24,14 @@ class Translator extends Element
 {
     protected $elementType = 'Translator';
 
+    /**
+     * @inheritdoc
+     */
+    public static function sources(string $context): array
+    {
+        return static::defineSources($context);;
+    }
+
     /**
      * Properties
      */

diff --git a/src/templates/orders/_index.twig b/src/templates/orders/_index.twig
@@ -60,16 +60,11 @@
 
 {% block sidebar %}
     {% if sources is not empty %}
-        <nav>
+        <nav aria-label="{{ 'Sources'|t('app') }}">
             {% include "_elements/sources" %}
         </nav>
 
-        {% if customizableSources %}
-            <a class="customize-sources">
-                <span class="settings icon"></span>
-                <span class="label">{{ 'Customize'|t('app') }}</span>
-            </a>
-        {% endif %}
+        <div id="source-actions" class="buttons"></div>
     {% endif %}
 {% endblock %}
 
@@ -81,13 +76,18 @@
 
 {% block content %}
     <div class="main">
-        <div class="elements"></div>
+        <a class="skip-link btn" href="#footer">{{ 'Skip to {title}'|t('app', { title: 'Footer'|t }) }}</a>
+        <div class="elements busy">
+            <div class="update-spinner spinner spinner-absolute"></div>
+        </div>
     </div>
 {% endblock %}
 
 
 {% block footer %}
+    <div id="count-spinner" class="spinner small hidden"></div>
     <div id="count-container" class="light flex-grow">&nbsp;</div>
+    <div id="actions-container" class="flex"></div>
     <div id="export-files" class="btn">{{ 'Export…'|t('app') }}</div>
     {% js "new Craft.Translations.CustomExporters('export-files')" %}
 {% endblock %}

diff --git a/src/templates/static-translations/index.twig b/src/templates/static-translations/index.twig
@@ -29,12 +29,7 @@
             {% include "_elements/sources" %}
         </nav>
 
-        {% if customizableSources %}
-            <a class="customize-sources">
-                <span class="settings icon"></span>
-                <span class="label">{{ 'Customize'|t('app') }}</span>
-            </a>
-        {% endif %}
+        <div id="source-actions" class="buttons"></div>
     {% endif %}
 {% endblock %}
 
@@ -51,21 +46,26 @@
         <input type="hidden" name="action" value="translations/static-translations/save">
 
         <div class="main">
-            <div class="elements"></div>
+            <a class="skip-link btn" href="#footer">{{ 'Skip to {title}'|t('app', { title: 'Footer'|t }) }}</a>
+            <div class="elements busy">
+                <div class="update-spinner spinner spinner-absolute"></div>
+            </div>
         </div>
     </form>
 {% endblock %}
 
 {% block footer %}
+    <div id="count-spinner" class="spinner small hidden"></div>
     <div id="count-container" class="light flex-grow static-trans-footer">&nbsp;</div>
-    <div id="translate-export" class="btn">{{ 'Export'|t('app') }}</div>
-
     <form method="post" enctype="multipart/form-data">
         <input type="file" accept=".csv" name="trans-import" style="display: none" />
         <input type="hidden" name="action" value="translations/static-translations/import">
         <input type="hidden" name="siteId" value="{{ elementInstance.siteId }}" id="siteId" >
         {{ csrfInput() }}
     </form>
+    <div id="actions-container" class="flex"></div>
+    <div id="translate-export" class="btn">{{ 'Export'|t('app') }}</div>
+
     <div class="btn translate-import">{{ "Import"|t('app') }}</div>
 
 {% endblock %}