Altsys version 2.32.1

xoopscube · Dec 21, 2022 · 1970f4b · 1970f4b
1 parent 7c53753
commit 1970f4b
Show file tree

Hide file tree

Showing 18 changed files with 263 additions and 130 deletions.
diff --git a/html/modules/altsys/images/module_ui_components.svg b/html/modules/altsys/images/module_ui_components.svg
diff --git a/html/modules/altsys/language/english/help/altsys_guide.html b/html/modules/altsys/language/english/help/altsys_guide.html
@@ -0,0 +1,138 @@
+
+<article id="altsys-guide">
+
+    <h2>AltSys Guide</h2>
+
+    <div class="ui-data-render view">
+
+    <div class="ui-card-block">
+
+        <div class="ui-card-block-header">
+
+            <div class="ui-card-block-info">
+                <a href="#" aria-label="Custom (plain HTML)">
+                    <svg xmlns="http://www.w3.org/2000/svg" width="24px" height="24px" viewBox="0 0 24 24" class="icon-info">
+                        <path d="M13 9h-2V7h2m0 10h-2v-6h2m-1-9A10 10 0 0 0 2 12a10 10 0 0 0 10 10a10 10 0 0 0 10-10A10 10 0 0 0 12 2z" fill="currentColor"></path>
+                    </svg>
+                </a>
+            </div>
+
+            <div class="ui-card-block-settings">
+                <a href="#" aria-label="Delete">
+                    <svg xmlns="http://www.w3.org/2000/svg" width="24px" height="24px" viewBox="0 0 24 24">
+                        <path d="M6 19a2 2 0 0 0 2 2h8a2 2 0 0 0 2-2V7H6v12m2.46-7.12l1.41-1.41L12 12.59l2.12-2.12l1.41 1.41L13.41 14l2.12 2.12l-1.41 1.41L12 15.41l-2.12 2.12l-1.41-1.41L10.59 14l-2.13-2.12M15.5 4l-1-1h-5l-1 1H5v2h14V4h-3.5z" fill="currentColor"></path>
+                    </svg>
+                </a>
+            </div>
+
+        </div>
+
+        <div class="ui-card-block-image">
+            <a href="#" class="ui-block-type" aria-label="Custom (plain HTML)">
+                <svg xmlns="http://www.w3.org/2000.svg" width="100%" height="100%" viewBox="0 0 240 100" class="ui-block-module">
+                    <g id="ui-block-module">
+                        <path class="block-icon" d="M2 10.96a.985.985 0 0 1-.37-1.37L3.13 7c.11-.2.28-.34.47-.42l7.83-4.4c.16-.12.36-.18.57-.18c.21 0 .41.06.57.18l7.9 4.44c.19.1.35.26.44.46l1.45 2.52c.28.48.11 1.09-.36 1.36l-1 .58v4.96c0 .38-.21.71-.53.88l-7.9 4.44c-.16.12-.36.18-.57.18c-.21 0-.41-.06-.57-.18l-7.9-4.44A.991.991 0 0 1 3 16.5v-5.54c-.3.17-.68.18-1 0m10-6.81v6.7l5.96-3.35L12 4.15M5 15.91l6 3.38v-6.71L5 9.21v6.7m14 0v-3.22l-5 2.9c-.33.18-.7.17-1 .01v3.69l6-3.38m-5.15-2.55l6.28-3.63l-.58-1.01l-6.28 3.63l.58 1.01z" fill="currentColor"></path>
+                        <text class="block-name" x="120px" y="50px" fill="currentColor">
+                            <tspan>Custom (plain HTML)</tspan>
+                        </text>
+                    </g>
+                </svg>
+            </a>
+        </div>
+
+        <div class="ui-card-block-content">
+
+            <div class="ui-card-block-item">
+                <input type="text" name="weights[45]" value="0" size="1" maxlength="5">
+                <input type="text" name="titles[45]" value="html-smarty" size="20" aria-label="Custom (plain HTML)">
+            </div>
+
+            <div class="ui-card-block-item">
+
+                <div aria-label="Block-Left">
+                    <input type="radio" name="sides[45]" value="0" class="blockposition" onclick="document.getElementById(&quot;extra_side_45&quot;).value=0;">
+                </div>
+                <div>-</div>
+                <div aria-label="Center-Block-Left">
+                    <input type="radio" name="sides[45]" value="3" class="blockposition" onclick="document.getElementById(&quot;extra_side_45&quot;).value=3;">
+                </div>
+                <div aria-label="Center-Block-Center">
+                    <input type="radio" name="sides[45]" value="5" class="blockposition" checked="checked" onclick="document.getElementById(&quot;extra_side_45&quot;).value=5;">
+                </div>
+                <div aria-label="Center-Block-Right">
+                    <input type="radio" name="sides[45]" value="4" class="blockposition" onclick="document.getElementById(&quot;extra_side_45&quot;).value=4;">
+                </div>
+                <div>-</div>
+                <div aria-label="Block-Right">
+                    <input type="radio" name="sides[45]" value="1" class="blockposition" onclick="document.getElementById(&quot;extra_side_45&quot;).value=1;">
+                </div>
+
+                <div style="width:45px;" aria-label="Block-Extra">
+                    <input type="text" name="extra_sides[45]" value="" class="block-extra-side" id="extra_side_45">
+                </div>
+                <div aria-label="None">
+                    <input type="radio" name="sides[45]" value="-1" class="blockposition ui-input-red" onclick="document.getElementById(&quot;extra_side_45&quot;).value=-1;">
+                </div>
+
+            </div>
+
+            <div class="ui-card-block-item">
+
+                <select name="bmodules[45][]" size="5" multiple="multiple">
+                    <option value="-1">Top Page</option>
+                    <option value="0" selected="selected">All Pages</option>
+                    <option value="7">UI Components</option>
+                    <option value="8">Private Message</option>
+                    <option value="11">xelFinder</option>
+                    <option value="16">Forum</option>
+                    <option value="18">Publish</option>
+                </select>
+
+
+                <select name="bgroups[45][]" size="5" multiple="multiple">
+                    <option value="1" selected="selected">Webmasters</option>
+                    <option value="2" selected="selected">Registered Users</option>
+                    <option value="3">Anonymous Users</option>
+                    <option value="4">Translators</option>
+                </select>
+            </div>
+
+            <div class="ui-card-block-item pad-center">
+                <select name="bcachetimes[45]" size="1">
+                    <option label="No Cache" value="0" selected="selected">No Cache</option>
+                    <option label="30 seconds" value="30">30 seconds</option>
+                    <option label="1 minute" value="60">1 minute</option>
+                    <option label="5 minutes" value="300">5 minutes</option>
+                    <option label="30 minutes" value="1800">30 minutes</option>
+                    <option label="1 hour" value="3600">1 hour</option>
+                    <option label="5 hours" value="18000">5 hours</option>
+                    <option label="1 day" value="86400">1 day</option>
+                    <option label="3 days" value="259200">3 days</option>
+                    <option label="1 week" value="604800">1 week</option>
+                    <option label="1 month" value="2592000">1 month</option>
+                </select>
+            </div>
+
+            <div class="ui-card-block-item">
+                <a href="#" class="button button-small" aria-label="Edit">
+                    <svg xmlns="http://www.w3.org/2000/svg" width="24px" height="24px" viewBox="0 0 24 24" class="svg-ui-icon">
+                        <path d="M20.71 7.04c.39-.39.39-1.04 0-1.41l-2.34-2.34c-.37-.39-1.02-.39-1.41 0l-1.84 1.83l3.75 3.75M3 17.25V21h3.75L17.81 9.93l-3.75-3.75L3 17.25z" fill="currentColor"></path>
+                    </svg> Edit
+                </a>
+
+
+                <a href="#" class="button button-small" aria-label="Clone">
+                    <svg xmlns="http://www.w3.org/2000/svg" width="24px" height="24px" viewBox="0 0 24 24" class="svg-ui-icon">
+                        <path d="M11 17H4a2 2 0 0 1-2-2V3a2 2 0 0 1 2-2h12v2H4v12h7v-2l4 3l-4 3v-2m8 4V7H8v6H6V7a2 2 0 0 1 2-2h11a2 2 0 0 1 2 2v14a2 2 0 0 1-2 2H8a2 2 0 0 1-2-2v-2h2v2h11z" fill="currentColor"></path>
+                    </svg>Clone
+                </a>
+            </div>
+
+        </div>
+    </div>
+
+
+
+</div>
+
+</article>
diff --git a/html/modules/altsys/language/english/help/help.html b/html/modules/altsys/language/english/help/help.html
@@ -1,19 +1,17 @@
-<article id="help-module">
-
-
-    <nav id="help-menu">
-        <ul>
-            <li><a href="#help-custom-block" class="button">Custom Blocks</a>
-            <li><a href="#help-templates" class="button">Templates</a>
-            <li><a href="#help-advanced" class="button">Advanced Templates</a>
-            <li><a href="#help-language" class="button">Language</a>
-            <li><a href="#help-development" class="button">Development</a>
-        </ul>
-    </nav>
-
-
-<hr>
+<div data-layout="row sm-column">
+    <div data-self="size-xxsmall">
+        <nav id="help-menu">
+            <ul data-layout="rows">
+                <li><a href="#help-custom-block" class="button">Custom Blocks</a>
+                <li><a href="#help-templates" class="button">Templates</a>
+                <li><a href="#help-advanced" class="button">Advanced Templates</a>
+                <li><a href="#help-language" class="button">Language</a>
+                <li><a href="#help-development" class="button">Development</a>
+            </ul>
+        </nav>
+    </div>
 
+<article id="help-module">
 
     <section id="help-overview">
 
@@ -253,3 +251,4 @@ <h3>Development</h3>
 
 
 </article>
+</div>
diff --git a/html/modules/altsys/language/fr_utf8/help/help.html b/html/modules/altsys/language/fr_utf8/help/help.html
@@ -1,19 +1,17 @@
-<article id="help-module">
-
-
-    <nav id="help-menu">
-        <ul>
-            <li><a href="#help-custom-block" class="button">Custom Blocks</a>
-            <li><a href="#help-templates" class="button">Templates</a>
-            <li><a href="#help-advanced" class="button">Advanced Templates</a>
-            <li><a href="#help-language" class="button">Language</a>
-            <li><a href="#help-development" class="button">Development</a>
-        </ul>
-    </nav>
-
-
-<hr>
+<div data-layout="row sm-column">
+    <div data-self="size-xxsmall">
+        <nav id="help-menu">
+            <ul data-layout="rows">
+                <li><a href="#help-custom-block" class="button">Custom Blocks</a>
+                <li><a href="#help-templates" class="button">Templates</a>
+                <li><a href="#help-advanced" class="button">Advanced Templates</a>
+                <li><a href="#help-language" class="button">Language</a>
+                <li><a href="#help-development" class="button">Development</a>
+            </ul>
+        </nav>
+    </div>
 
+<article id="help-module">
 
     <section id="help-overview">
 
@@ -253,3 +251,4 @@ <h3>Development</h3>
 
 
 </article>
+</div>
diff --git a/html/modules/altsys/language/ja_utf8/help/help.html b/html/modules/altsys/language/ja_utf8/help/help.html
@@ -1,19 +1,17 @@
-<article id="help-module">
-
-
-    <nav id="help-menu">
-        <ul>
-            <li><a href="#help-custom-block" class="button">Custom Blocks</a>
-            <li><a href="#help-templates" class="button">Templates</a>
-            <li><a href="#help-advanced" class="button">Advanced Templates</a>
-            <li><a href="#help-language" class="button">Language</a>
-            <li><a href="#help-development" class="button">Development</a>
-        </ul>
-    </nav>
-
-
-<hr>
+<div data-layout="row sm-column">
+    <div data-self="size-xxsmall">
+        <nav id="help-menu">
+            <ul data-layout="rows">
+                <li><a href="#help-custom-block" class="button">Custom Blocks</a>
+                <li><a href="#help-templates" class="button">Templates</a>
+                <li><a href="#help-advanced" class="button">Advanced Templates</a>
+                <li><a href="#help-language" class="button">Language</a>
+                <li><a href="#help-development" class="button">Development</a>
+            </ul>
+        </nav>
+    </div>
 
+<article id="help-module">
 
     <section id="help-overview">
 
@@ -253,3 +251,4 @@ <h3>Development</h3>
 
 
 </article>
+</div>
diff --git a/html/modules/altsys/language/pt_utf8/help/help.html b/html/modules/altsys/language/pt_utf8/help/help.html
@@ -1,19 +1,17 @@
-<article id="help-module">
-
-
-    <nav id="help-menu">
-        <ul>
-            <li><a href="#help-custom-block" class="button">Custom Blocks</a>
-            <li><a href="#help-templates" class="button">Templates</a>
-            <li><a href="#help-advanced" class="button">Advanced Templates</a>
-            <li><a href="#help-language" class="button">Language</a>
-            <li><a href="#help-development" class="button">Development</a>
-        </ul>
-    </nav>
-
-
-<hr>
+<div data-layout="row sm-column">
+    <div data-self="size-xxsmall">
+        <nav id="help-menu">
+            <ul data-layout="rows">
+                <li><a href="#help-custom-block" class="button">Custom Blocks</a>
+                <li><a href="#help-templates" class="button">Templates</a>
+                <li><a href="#help-advanced" class="button">Advanced Templates</a>
+                <li><a href="#help-language" class="button">Language</a>
+                <li><a href="#help-development" class="button">Development</a>
+            </ul>
+        </nav>
+    </div>
 
+<article id="help-module">
 
     <section id="help-overview">
 
@@ -253,3 +251,4 @@ <h3>Development</h3>
 
 
 </article>
+</div>
diff --git a/xoops_trust_path/libs/altsys/blocks/block_functions.php b/xoops_trust_path/libs/altsys/blocks/block_functions.php
@@ -72,6 +72,8 @@ function b_altsys_admin_menu_show($options)
 
         $dirname = $mod->getVar('dirname');
 
+        // TODO gigamaster add module icon
+        $moduleIcon = '<img class="svg" src="'.XOOPS_URL.'/modules/'.$dirname.'/images/module_icon.svg" width="1em" height="1em">';
         $modinfo = $mod->getInfo();
 
         $submenus4assign = [];
@@ -138,15 +140,16 @@ function b_altsys_admin_menu_show($options)
                 ];
             }
         }
-
+        // TODO gigamaster add module icon
         $module4assign = [
             'mid' => $mid,
             'dirname' => $dirname,
             'name' => $mod->getVar('name'),
+            'icon' => $moduleIcon,
             'version_in_db' => sprintf('%.2f', $mod->getVar('version') / 100.0),
             'version_in_file' => sprintf('%.2f', $modinfo['version']),
             'description' => htmlspecialchars(@$modinfo['description'], ENT_QUOTES),
-            'image' => htmlspecialchars($modinfo['image'], ENT_QUOTES),
+//            'image' => htmlspecialchars($modinfo['image'], ENT_QUOTES),
             'isactive' => $mod->getVar('isactive'),
             'hasmain' => $mod->getVar('hasmain'),
             'hasadmin' => $mod->getVar('hasadmin'),

diff --git a/xoops_trust_path/libs/altsys/class/SetupAltsysLangMgr.class.php b/xoops_trust_path/libs/altsys/class/SetupAltsysLangMgr.class.php
@@ -100,7 +100,7 @@ public function _loadLanguage( $dirname, $fileBodyName ) {
 	/**
 	 * @param string $type
 	 */
-	public function loadPageTypeMessageCatalog(string $type ) {
+	public function loadPageTypeMessageCatalog( $type ) {
 		// I dare not to use langman...
 		if ( false === mb_strpos( $type, '.' ) && $this->langman->my_language ) {
 			$mylang_file = $this->langman->my_language . '/' . $this->mLanguageName . '/' . $type . '.php';

diff --git a/xoops_trust_path/libs/altsys/compilehookadmin.php b/xoops_trust_path/libs/altsys/compilehookadmin.php
@@ -247,7 +247,7 @@
 		dd	{ margin-left:20px; }
 	</style>
 	
-	<form action='?mode=admin&amp;lib=altsys&amp;page=compilehookadmin' method='post' class='odd' style='margin: 40px;'>
+	<form action='?mode=admin&amp;lib=altsys&amp;page=compilehookadmin' method='post'>
 \n";
 
 foreach ( $compile_hooks as $command => $compile_hook ) {
@@ -270,27 +270,27 @@
 	</form>
 
 
-	<form action='?mode=admin&amp;lib=altsys&amp;page=get_tplsvarsinfo' method='post' class='odd' style='margin: 40px;' target='_blank'>
+	<form action='?mode=admin&amp;lib=altsys&amp;page=get_tplsvarsinfo' method='post' style='margin: 40px;' target='_blank'>
 		<h3>" . _TPLSADMIN_DT_GETTPLSVARSINFO_DW . "</h3>
 		<div class='ui-card-full'>
 		<p>" . _TPLSADMIN_DD_GETTPLSVARSINFO_DW . "</p>
 		<p><input class='button download' type='submit' name='as_dw_extension_zip' value='zip'> <input class='button download' type='submit' name='as_dw_extension_tgz' value='tar.gz'></p>
 		</div>
 	</form>
 
-	<form action='?mode=admin&amp;lib=altsys&amp;page=get_templates' method='post' class='odd' style='margin: 40px;' target='_blank'>
+	<form action='?mode=admin&amp;lib=altsys&amp;page=get_templates' method='post' style='margin: 40px;' target='_blank'>
 		<h3>" . _TPLSADMIN_DT_GETTEMPLATES . "</h3>
 		<div class='ui-card-full'>
 		<p>" . _TPLSADMIN_DD_GETTEMPLATES . "</p>
 		<p><select name='tplset'>$tplset_options</select> <input class='button download' type='submit' name='download_zip' value='zip'> <input class='button download' type='submit' name='download_tgz' value='tar.gz'></p>
 		</div>
 	</form>
 
-	<form action='?mode=admin&amp;lib=altsys&amp;page=put_templates' method='post' enctype='multipart/form-data' class='odd' style='margin: 40px;'>
+	<form action='?mode=admin&amp;lib=altsys&amp;page=put_templates' method='post' enctype='multipart/form-data' style='margin: 40px;'>
 		<h3>" . _TPLSADMIN_DT_PUTTEMPLATES . "</h3>
 		<div class='ui-card-full'>
 		<p>" . _TPLSADMIN_DD_PUTTEMPLATES . "</p>
-		<p><select name='tplset'>$tplset_options</select> <input type='file' name='tplset_archive' size='60'> <input class='button upload' type='submit' value='" . _SUBMIT . "'></p>
+		<p><select name='tplset'>$tplset_options</select> <input type='file' accept='.tar' name='tplset_archive' size='60'> <input class='button upload' type='submit' value='" . _SUBMIT . "'></p>
 		</div>
     </form>";
 

diff --git a/xoops_trust_path/libs/altsys/language/english/compilehookadmin.php b/xoops_trust_path/libs/altsys/language/english/compilehookadmin.php
@@ -37,7 +37,7 @@
 
 define( '_TPLSADMIN_FMT_MSG_PUTTEMPLATES' , '%d templates are imported.');
 define( '_TPLSADMIN_DT_PUTTEMPLATES' , 'Upload templates');
-define( '_TPLSADMIN_DD_PUTTEMPLATES' , 'Select a set you want to upload/overwrite before uploading the zip/tgz archive including the template files (.html).<br> It is not necessary to check the depth of the paths in the archive.');
+define( '_TPLSADMIN_DD_PUTTEMPLATES' , 'Select a template set you want to upload/overwrite.<br>Select the file <b>tar</b> archive including the template files (.html)<br>Automatically extracts all files  from the archive to their absolute location no matter the tree structure.');
 
 
 define( '_TPLSADMIN_ERR_NOTUPLOADED' , 'No files are uploaded.');

diff --git a/xoops_trust_path/libs/altsys/language/fr_utf8/compilehookadmin.php b/xoops_trust_path/libs/altsys/language/fr_utf8/compilehookadmin.php
@@ -36,7 +36,7 @@
 
 define( '_TPLSADMIN_FMT_MSG_PUTTEMPLATES' , '%d templates are imported.');
 define( '_TPLSADMIN_DT_PUTTEMPLATES' , 'Upload templates');
-define( '_TPLSADMIN_DD_PUTTEMPLATES' , 'Select a set you want to upload/overwrite before uploading zip/tgz archive including template files (.html). You need not to check depths of the paths in the archive.');
+define( '_TPLSADMIN_DD_PUTTEMPLATES' , "Sélectionner un ensemble de modèles que vous souhaitez remplacer.<br> Sélectionner le fichier <b>tar</b> comprenant les modèles (.html)<br> Extraire automatiquement tous les modèles indépendamment de l'arborescence des répertoires.");
 
 
 define( '_TPLSADMIN_ERR_NOTUPLOADED' , 'No files are uploaded.');