Merge pull request #68 from openjournalteam/improvement33

Improvement (33)
openjournalteam · Mar 13, 2024 · fa4effc · fa4effc
2 parents 6b1bc92 + 252520a
commit fa4effc
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 3 deletions.
diff --git a/OjtPageHandler.inc.php b/OjtPageHandler.inc.php
@@ -87,8 +87,11 @@ public function index($args, $request)
             $this->getPluginFullUrl('assets/js/main.js'),
             $this->getPluginFullUrl('assets/js/updater.js'),
             $this->getPluginFullUrl('assets/js/alpine/alpine.min.js'),
+            $this->getPluginFullUrl('assets/js/htmx.min.js'),
         ];
 
+        HookRegistry::call('OjtPageHandler::index', array(&$ojtPlugin));
+
         $templateMgr->assign('ojtPlugin', $ojtPlugin);
         $templateMgr->assign('journal', $this->contextId ? $request->getContext() : $request->getSite());
         $templateMgr->assign('pluginGalleryHtml', $templateMgr->fetch($this->ojtPlugin->getTemplateResource('plugingallery.tpl')));
@@ -108,8 +111,9 @@ public function support($args, $request)
             $user->getLocalizedFamilyName(),
             $journalName
         ];
-        $url            = 'https://ticketing.openjournaltheme.com/login/' . base64_encode(implode('+', $params));
 
+        $url            = 'https://ticketing.openjournaltheme.com/login/' . base64_encode(implode('+', $params));
+
         header('Location: ' . $url, true, 302);
 
         return;

diff --git a/assets/js/htmx.min.js b/assets/js/htmx.min.js
diff --git a/assets/js/main.js b/assets/js/main.js
@@ -115,6 +115,8 @@ async function loadAjax(name, dom = false) {
       });
     }
     dom.html(resp.html);
+
+    htmx.process('#main-menu')
   });
 
   xhr.fail((responseText, statusText, xhr, form) => {

diff --git a/templates/index.tpl b/templates/index.tpl
@@ -15,10 +15,21 @@
   <link href="{$ojtPlugin->tailwindCss}" rel="stylesheet">
   <link href="{$ojtPlugin->fontAwesomeCss}" rel="stylesheet">
   <link href="{$ojtPlugin->sweetAlertCss}" rel="stylesheet">
+  <meta name="htmx-config" content='{ "includeIndicatorStyles": false }'>
   <style>
     [x-cloak] {
       display: none;
     }
+
+    .htmx-indicator{
+      display:none;
+    }
+    .htmx-request .htmx-indicator{
+        display:block;
+    }
+    .htmx-request.htmx-indicator{
+        display:block;
+    }
   </style>
 </head>
 <div id="moduleCss"></div>

diff --git a/version.xml b/version.xml
@@ -5,8 +5,8 @@
 <version>
 	<application>ojtPlugin</application>
 	<type>plugins.generic</type>
-	<release>2.0.7.2</release>
-	<date>2023-11-28</date>
+	<release>2.0.8.0</release>
+	<date>2024-02-08</date>
 	<lazy-load>0</lazy-load>
 	<class>OjtPlugin</class>
 </version>