[wip] app start page + dashboard + pagination

#191 #190 #189 #188 #187 #186 #185 #184
xoopscube · Dec 2, 2022 · 86809fc · 86809fc
1 parent f27b847
commit 86809fc
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 17 deletions.
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/xoops_version.php b/xoops_trust_path/libs/altsys/xoops_version.php
@@ -18,7 +18,7 @@
 $modversion['dirname']          = 'altsys';
 $modversion['name']             = _MI_ALTSYS_MODULENAME;
 $modversion['version']          = '2.31';
-$modversion['detailed_version'] = '2.31.3';
+$modversion['detailed_version'] = '2.31.4';
 $modversion['description']      = _MI_ALTSYS_MODULEDESC;
 $modversion['author']           = 'GIJ=CHECKMATE<br>PEAK Corp.(https://www.peak.ne.jp/)';
 $modversion['credits']          = 'PEAK Corp., Gigamaster (XCL/PHP7)';

diff --git a/xoops_trust_path/modules/d3forum/language/english/main.php b/xoops_trust_path/modules/d3forum/language/english/main.php
@@ -299,7 +299,7 @@
 Define( '_MD_D3FORUM_MSG_FORUMDELETED' , 'The forum has been deleted successfully');
 Define( '_MD_D3FORUM_TH_FORUMTITLE' , 'Forum title');
 Define( '_MD_D3FORUM_TH_FORUMWEIGHT' , 'Forum weight');
-Define( '_MD_D3FORUM_TH_FORUMDESC' , 'Forum desc');
+Define( '_MD_D3FORUM_TH_FORUMDESC' , 'Forum description');
 Define( '_MD_D3FORUM_TH_FORUMOPTIONS' , 'Forum options');
 Define( '_MD_D3FORUM_TH_EXTERNALLINKFORMAT' , 'Format for comment-integration');
 Define( '_MD_D3FORUM_HELP_EXTERNALLINKFORMAT' , 'leave blank for ordinary forums. If you write URI with %s started from  {XOOPS_URL}/modules/ , it will be the template linking to the sources. Native comment-integrated modules will set this field automatically.');

diff --git a/xoops_trust_path/modules/d3forum/xoops_version.php b/xoops_trust_path/modules/d3forum/xoops_version.php
@@ -29,7 +29,7 @@
 $modversion['trust_dirname']    = $mytrustdirname;
 $modversion['name']             = constant( $constpref . '_NAME' );
 $modversion['version']          = '2.31';
-$modversion['detailed_version'] = '2.31.3';
+$modversion['detailed_version'] = '2.31.4';
 $modversion['description']      = constant( $constpref . '_DESC' );
 $modversion['author']           = 'Gijoe (peak.ne.jp) and Jidaikbo, @nao-pon Naoki Sawada';
 $modversion['credits']          = '@domifara, @naao Naoki Okino, @nao-pon Naoki Sawada, @gigamaster (XCL/PHP7)';

diff --git a/xoops_trust_path/modules/pico/search.php b/xoops_trust_path/modules/pico/search.php
@@ -49,7 +49,7 @@ function pico_global_search_base( $mydirname, $keywords, $andor, $limit, $offset
 			$whr_uid = '1';
 		}
 
-		// where by keywords
+		// whereby keywords
 		if ( is_array( $keywords ) && count( $keywords ) > 0 ) {
 			switch ( strtolower( $andor ) ) {
 				case 'and':

diff --git a/xoops_trust_path/modules/pico/xoops_version.php b/xoops_trust_path/modules/pico/xoops_version.php
@@ -28,7 +28,7 @@
 $modversion['trust_dirname']    = $mytrustdirname;
 $modversion['name']             = $mydirname;
 $modversion['version']          = '2.41';
-$modversion['detailed_version'] = '2.41.3';
+$modversion['detailed_version'] = '2.41.4';
 $modversion['description']      = constant( $constpref . '_DESC' );
 $modversion['author']           = 'GIJ=CHECKMATE PEAK Corp. - peak.ne.jp';
 $modversion['credits']          = 'PEAK Corp. Update by XOOPS-X (10) and refactoring by @gigamaster (XCL PHP7)';

diff --git a/xoops_trust_path/modules/xelfinder/xoops_version.php b/xoops_trust_path/modules/xelfinder/xoops_version.php
@@ -19,6 +19,7 @@
 $langman->read( 'modinfo.php', $mydirname, $mytrustdirname, false );
 $constpref = '_MI_' . strtoupper( $mydirname );
 
+// Manifesto
 $modversion['dirname']          = $mydirname;
 $modversion['trust_dirname']    = $mytrustdirname;
 $modversion['name']             = 'xelFinder';
@@ -28,13 +29,14 @@
 $modversion['author']           = 'Naoki Sawada (aka Nao-pon) <Hypweb.net>';
 $modversion['credits']          = 'Naoki Sawada (aka Nao-pon). Nuno Luciano (aka gigamaster) 2020 XCL PHP7';
 $modversion['license']          = 'GPL';
-$modversion['image']            = '/images/module_xelfinder.svg'; // $modversion['image'] = is_file( $mydirpath.'/images/module_xelfinder.svg' ) ? '/images/module_xelfinder.svg' : 'module_icon.php' ;
+$modversion['image']            = '/images/module_xelfinder.svg';
 $modversion['icon']             = 'images/module_icon.svg';
 $modversion['help']             = 'help.html';
 $modversion['official']         = 0;
 $modversion['cube_style']       = true;
 $modversion['read_any']         = true;
 
+// SQL Install
 // Any tables can't be touched by modulesadmin.
 $modversion['sqlfile'] = false;
 $modversion['tables']  = [];

diff --git a/xoops_trust_path/modules/xupdate/admin/templates/admin_module_store.html b/xoops_trust_path/modules/xupdate/admin/templates/admin_module_store.html
@@ -329,7 +329,7 @@ <h6><{$smarty.const._AD_XUPDATE_LANG_TYPE}></h6>
 
 
     <{if $pageNavi->getPerpage() < $pageNavi->getTotalItems()}>
-    <div class="pagenavi"><{xoops_pagenavi pagenavi=$pageNavi}></div>
+    <nav class="pagination"><{xoops_pagenavi pagenavi=$pageNavi}></nav>
     <{/if}>
 
 

diff --git a/xoops_trust_path/modules/xupdate/admin/templates/admin_preload_store.html b/xoops_trust_path/modules/xupdate/admin/templates/admin_preload_store.html
@@ -314,7 +314,7 @@ <h6><{$smarty.const._AD_LEGACY_LANG_LASTUPDATE}></h6>
 
 
     <{if $pageNavi->getPerpage() < $pageNavi->getTotalItems() }>
-    <div class="pagenavi"><{xoops_pagenavi pagenavi=$pageNavi}></div>
+    <nav class="pagination"><{xoops_pagenavi pagenavi=$pageNavi}></nav>
     <{/if}>
 
 

diff --git a/xoops_trust_path/modules/xupdate/admin/templates/admin_theme_store.html b/xoops_trust_path/modules/xupdate/admin/templates/admin_theme_store.html
@@ -288,7 +288,7 @@ <h6><{$smarty.const._AD_LEGACY_LANG_PACKAGE}></h6>
 
     </form>
     <{if $pageNavi->getPerpage() < $pageNavi->getTotalItems() }>
-    <div class="pagenavi"><{xoops_pagenavi pagenavi=$pageNavi}></div>
+    <nav class="pagination"><{xoops_pagenavi pagenavi=$pageNavi}></nav>
     <{/if}>
 
     <{include file="admin_tagcloud.html"}>

diff --git a/xoops_trust_path/modules/xupdate/xoops_version.php b/xoops_trust_path/modules/xupdate/xoops_version.php
@@ -23,14 +23,13 @@
 
 $dirname  = __DIR__;
 $basename = basename( $dirname );
-//
-// Define a basic manifesto.
-//
+
+// Manifesto
 $modversion['dirname']          = $myDirName;
 $modversion['trust_dirname']    = $basename;
 $modversion['name']             = _MI_XUPDATE_LANG_XUPDATE;
-$modversion['version']          = '2.31';
-$modversion['detailed_version'] = '2.31.2';
+$modversion['version']          = '2.32';
+$modversion['detailed_version'] = '2.32.0';
 $modversion['description']      = _MI_XUPDATE_DESC_XUPDATE;
 $modversion['author']           = _MI_XUPDATE_LANG_AUTHOR;
 $modversion['credits']          = _MI_XUPDATE_LANG_CREDITS;
@@ -43,7 +42,7 @@
 $modversion['icon']             = 'images/module_icon.svg';
 $modversion['cube_style']       = true;
 
-// Install
+// SQL Install
 $modversion['legacy_installer']             = [
 	'installer'   => [
 		'class'     => 'Installer',