- added preferences for breadcrumb display

ggoffy · Apr 1, 2021 · 0826527 · 0826527
1 parent c0d4e24
commit 0826527
Show file tree

Hide file tree

Showing 24 changed files with 755 additions and 718 deletions.
diff --git a/assets/images/wedega_logo.png b/assets/images/wedega_logo.png
diff --git a/docs/changelog.txt b/docs/changelog.txt
@@ -1,3 +1,8 @@
+===================================================================
+2021/03/31 Version 1.04 RC1
+===================================================================
+ - added preferences for breadcrumb display (alain01/goffy)
+
 ===================================================================
 2021/03/31 Version 1.03 Final
 ===================================================================

diff --git a/extra/Templates for bootstrap 4/wggithub/wggithub_index.tpl b/extra/Templates for bootstrap 4/wggithub/wggithub_index.tpl
diff --git a/footer.php b/footer.php
@@ -19,7 +19,9 @@
  * @min_xoops      2.5.10
  * @author         Goffy - XOOPS Development Team - Email:<goffy@wedega.com> - Website:<https://wedega.com>
  */
-if (\count($xoBreadcrumbs) > 1) {
+
+if ($helper->getConfig('show_breadcrumbs') && \count($xoBreadcrumbs) > 1) {
+    $GLOBALS['xoopsTpl']->assign('showBreadcrumb', $helper->getConfig('show_breadcrumbs'));
     $GLOBALS['xoopsTpl']->assign('xoBreadcrumbs', $xoBreadcrumbs);
 }
 $GLOBALS['xoopsTpl']->assign('adv', $helper->getConfig('advertise'));

diff --git a/header.php b/header.php
@@ -23,11 +23,13 @@
 include \dirname(__DIR__, 2) . '/mainfile.php';
 include __DIR__ . '/include/common.php';
 $moduleDirName = \basename(__DIR__);
+
+$helper = \XoopsModules\Wggithub\Helper::getInstance();
+
 // Breadcrumbs
 $xoBreadcrumbs = [];
-$xoBreadcrumbs[] = ['title' => \_MA_WGGITHUB_TITLE, 'link' => WGGITHUB_URL . '/'];
+$xoBreadcrumbs[] = ['title' => $helper->getConfig('mname_breadcrumbs'), 'link' => WGGITHUB_URL . '/'];
 // Get instance of module
-$helper = \XoopsModules\Wggithub\Helper::getInstance();
 $settingsHandler = $helper->getHandler('Settings');
 $repositoriesHandler = $helper->getHandler('Repositories');
 $directoriesHandler = $helper->getHandler('Directories');

diff --git a/include/comment_functions.php b/include/comment_functions.php
@@ -29,16 +29,16 @@
  */
 function wggithubCommentsUpdate($itemId, $itemNumb)
 {
-	// Get instance of module
-	$helper = \XoopsModules\Wggithub\Helper::getInstance();
-	$repositoriesHandler = $helper->getHandler('Repositories');
-	$repoId = (int)$itemId;
-	$repositoriesObj = $repositoriesHandler->get($repoId);
-	$repositoriesObj->setVar('repo_comments', (int)$itemNumb);
-	if ($repositoriesHandler->insert($repositoriesObj)) {
-		return true;
-	}
-	return false;
+    // Get instance of module
+    $helper = \XoopsModules\Wggithub\Helper::getInstance();
+    $repositoriesHandler = $helper->getHandler('Repositories');
+    $repoId = (int)$itemId;
+    $repositoriesObj = $repositoriesHandler->get($repoId);
+    $repositoriesObj->setVar('repo_comments', (int)$itemNumb);
+    if ($repositoriesHandler->insert($repositoriesObj)) {
+        return true;
+    }
+    return false;
 }
 
 /**
@@ -49,21 +49,21 @@ function wggithubCommentsUpdate($itemId, $itemNumb)
  */
 function wggithubCommentsApprove($comment)
 {
-	// Notification event
-	// Get instance of module
-	$helper = \XoopsModules\Wggithub\Helper::getInstance();
-	$repositoriesHandler = $helper->getHandler('Repositories');
-	$repoId = $comment->getVar('com_itemid');
-	$repositoriesObj = $repositoriesHandler->get($repoId);
-	$repoName = $repositoriesObj->getVar('repo_name');
+    // Notification event
+    // Get instance of module
+    $helper = \XoopsModules\Wggithub\Helper::getInstance();
+    $repositoriesHandler = $helper->getHandler('Repositories');
+    $repoId = $comment->getVar('com_itemid');
+    $repositoriesObj = $repositoriesHandler->get($repoId);
+    $repoName = $repositoriesObj->getVar('repo_name');
 
-	$tags = [];
-	$tags['ITEM_NAME'] = $repoName;
-	$tags['ITEM_URL']  = \XOOPS_URL . '/modules/wggithub/repositories.php?op=show&repo_id=' . $repoId;
-	$notificationHandler = \xoops_getHandler('notification');
-	// Event modify notification
-	$notificationHandler->triggerEvent('global', 0, 'global_comment', $tags);
-	$notificationHandler->triggerEvent('repositories', $repoId, 'repository_comment', $tags);
-	return true;
+    $tags = [];
+    $tags['ITEM_NAME'] = $repoName;
+    $tags['ITEM_URL']  = \XOOPS_URL . '/modules/wggithub/repositories.php?op=show&repo_id=' . $repoId;
+    $notificationHandler = \xoops_getHandler('notification');
+    // Event modify notification
+    $notificationHandler->triggerEvent('global', 0, 'global_comment', $tags);
+    $notificationHandler->triggerEvent('repositories', $repoId, 'repository_comment', $tags);
+    return true;
 
 }
diff --git a/include/common.php b/include/common.php
@@ -41,7 +41,7 @@
 \define('WGGITHUB_UPLOAD_SHOTS_PATH', WGGITHUB_UPLOAD_PATH . '/images/shots');
 \define('WGGITHUB_UPLOAD_SHOTS_URL', WGGITHUB_UPLOAD_URL . '/images/shots');
 \define('WGGITHUB_ADMIN', WGGITHUB_URL . '/admin/index.php');
-$localLogo = WGGITHUB_IMAGE_URL . '/tdmxoops_logo.png';
+$localLogo = WGGITHUB_IMAGE_URL . '/wedega_logo.png';
 // Module Information
 $copyright = "<a href='https://wedega.com' title='XOOPS on Wedega' target='_blank'><img src='" . $localLogo . "' alt='XOOPS on Wedega' /></a>";
 include_once \XOOPS_ROOT_PATH . '/class/xoopsrequest.php';

diff --git a/language/english/modinfo.php b/language/english/modinfo.php
@@ -80,6 +80,10 @@
 \define('_MI_WGGITHUB_TABLE_TYPE_DESC', 'Table Type is the bootstrap html table.');
 \define('_MI_WGGITHUB_PANEL_TYPE', 'Panel Type');
 \define('_MI_WGGITHUB_PANEL_TYPE_DESC', 'Panel Type is the bootstrap html div.');
+\define('_MI_WGGITHUB_SHOWBCRUMBS', 'Show breadcrumb navigation');
+\define('_MI_WGGITHUB_SHOWBCRUMBS_DESC', "Breadcrumb navigation displays the current page's context within the site structure.");
+\define('_MI_WGGITHUB_MNAMEBCRUMBS', 'Module name in breadcrumb');
+\define('_MI_WGGITHUB_MNAMEBCRUMBS_DESC', 'You can define the module name in breadcrumb here. If module name should be not shown then keep it blank.');
 \define('_MI_WGGITHUB_ADVERTISE', 'Advertisement Code');
 \define('_MI_WGGITHUB_ADVERTISE_DESC', 'Insert here the advertisement code');
 \define('_MI_WGGITHUB_MAINTAINEDBY', 'Maintained By');

diff --git a/language/german/modinfo.php b/language/german/modinfo.php
@@ -80,6 +80,10 @@
 \define('_MI_WGGITHUB_TABLE_TYPE_DESC', 'Tabellentype is bootstrap html table.');
 \define('_MI_WGGITHUB_PANEL_TYPE', 'Panel Type');
 \define('_MI_WGGITHUB_PANEL_TYPE_DESC', 'Panel Type is the bootstrap html div.');
+\define('_MI_WGGITHUB_SHOWBCRUMBS', 'Brotkrumen-Navigation (breadcrumbs) anzeigen');
+\define('_MI_WGGITHUB_SHOWBCRUMBS_DESC', "Eine Brotkrumen-Navigation zeigt den aktuellen Seitenstand innerhalb der Websitestruktur");
+\define('_MI_WGGITHUB_MNAMEBCRUMBS', 'Modulname in Breadcrumbs');
+\define('_MI_WGGITHUB_MNAMEBCRUMBS_DESC', 'Sie können hier den Modulname definieren, der in der Brotkrumen-Navigation verwendet werden soll. Wenn kein Name angezeigt werden soll dann bitte leer lassen.');
 \define('_MI_WGGITHUB_ADVERTISE', 'Code Werbung');
 \define('_MI_WGGITHUB_ADVERTISE_DESC', 'Bitte hier den Code für die Werbung eingeben');
 \define('_MI_WGGITHUB_MAINTAINEDBY', 'Unterstützt von');

diff --git a/templates/admin/wggithub_admin_directories.tpl b/templates/admin/wggithub_admin_directories.tpl
@@ -2,81 +2,81 @@
 <{include file='db:wggithub_admin_header.tpl' }>
 
 <{if $directories_list|default:''}>
-	<table class='table table-bordered'>
-		<thead>
-			<tr class='head'>
-				<th class="center">&nbsp;</th>
-				<th class="center"><{$smarty.const._AM_WGGITHUB_DIRECTORY_ID}></th>
-				<th class="center"><{$smarty.const._AM_WGGITHUB_DIRECTORY_NAME}></th>
-				<th class="center"><{$smarty.const._AM_WGGITHUB_DIRECTORY_DESCR}></th>
-				<th class="center"><{$smarty.const._AM_WGGITHUB_DIRECTORY_TYPE}></th>
-				<th class="center"><{$smarty.const._AM_WGGITHUB_DIRECTORY_CONTENT}></th>
-				<th class="center"><{$smarty.const._AM_WGGITHUB_DIRECTORY_AUTOUPDATE}></th>
-				<th class="center"><{$smarty.const._AM_WGGITHUB_DIRECTORY_ONLINE}></th>
-				<th class="center"><{$smarty.const._AM_WGGITHUB_DIRECTORY_FILTERRELEASE}></th>
-				<th class="center"><{$smarty.const._AM_WGGITHUB_DIRECTORY_WEIGHT}></th>
-				<th class="center"><{$smarty.const._AM_WGGITHUB_DIRECTORY_DATECREATED}></th>
-				<th class="center"><{$smarty.const._AM_WGGITHUB_DIRECTORY_SUBMITTER}></th>
-				<th class="center width5"><{$smarty.const._AM_WGGITHUB_FORM_ACTION}></th>
-			</tr>
-		</thead>
-		<{if $directories_count|default:''}>
-		<tbody id="dir-list">
-			<{foreach item=directory from=$directories_list}>
-			<tr class='<{cycle values='odd, even'}>' id="dorder_<{$directory.id}>">
-				<td class='center'><img src="<{$wggithub_icons_url_16}>/up_down.png" alt="drag&drop" class="icon-sortable"></td>
-				<td class='center'><{$directory.id}></td>
-				<td ><{$directory.name}></td>
-				<td ><{$directory.descr}></td>
-				<td class='center'><{$directory.type_text}></td>
-				<td class='center'><{$directory.content_shorttext}></td>
-				<td class='center'>
-					<{if $directory.dir_autoupdate|default:0 == 1}>
-						<a href="directories.php?op=change_yn&amp;field=dir_autoupdate&amp;value=0&amp;dir_id=<{$directory.id}>&amp;start=<{$start}>&amp;limit=<{$limit}>" title="<{$smarty.const._AM_WGGITHUB_SETOFF}>"><img src="<{$wggithub_icons_url_16}>/on.png" alt="<{$smarty.const._AM_WGGITHUB_SETOFF}>" /></a>
-					<{else}>
-						<a href="directories.php?op=change_yn&amp;field=dir_autoupdate&amp;value=1&amp;dir_id=<{$directory.id}>&amp;start=<{$start}>&amp;limit=<{$limit}>" title="<{$smarty.const._AM_WGGITHUB_SETON}>"><img src="<{$wggithub_icons_url_16}>/off.png" alt="<{$smarty.const._AM_WGGITHUB_SETON}>" /></a>
-					<{/if}>
-				</td>
-				<td class='center'>
-					<{if $directory.dir_online|default:0 == 1}>
-						<a href="directories.php?op=change_yn&amp;field=dir_online&amp;value=0&amp;dir_id=<{$directory.id}>&amp;start=<{$start}>&amp;limit=<{$limit}>" title="<{$smarty.const._AM_WGGITHUB_SETOFF}>"><img src="<{$wggithub_icons_url_16}>/on.png" alt="<{$smarty.const._AM_WGGITHUB_SETOFF}>" /></a>
-					<{else}>
-						<a href="directories.php?op=change_yn&amp;field=dir_online&amp;value=1&amp;dir_id=<{$directory.id}>&amp;start=<{$start}>&amp;limit=<{$limit}>" title="<{$smarty.const._AM_WGGITHUB_SETON}>"><img src="<{$wggithub_icons_url_16}>/off.png" alt="<{$smarty.const._AM_WGGITHUB_SETON}>" /></a>
-					<{/if}>
-				</td>
-				<td class='center'>
-					<{if $directory.dir_filterrelease|default:0 == 1}>
-					<a href="directories.php?op=change_yn&amp;field=dir_filterrelease&amp;value=0&amp;dir_id=<{$directory.id}>&amp;start=<{$start}>&amp;limit=<{$limit}>" title="<{$smarty.const._AM_WGGITHUB_SETOFF}>"><img src="<{$wggithub_icons_url_16}>/on.png" alt="<{$smarty.const._AM_WGGITHUB_SETOFF}>" /></a>
-					<{else}>
-					<a href="directories.php?op=change_yn&amp;field=dir_filterrelease&amp;value=1&amp;dir_id=<{$directory.id}>&amp;start=<{$start}>&amp;limit=<{$limit}>" title="<{$smarty.const._AM_WGGITHUB_SETON}>"><img src="<{$wggithub_icons_url_16}>/off.png" alt="<{$smarty.const._AM_WGGITHUB_SETON}>" /></a>
-					<{/if}>
-				</td>
-				<td class='center'><{$directory.weight}></td>
-				<td class='center'><{$directory.datecreated}></td>
-				<td class='center'><{$directory.submitter}></td>
-				<td class="center  width5">
-					<a href="directories.php?op=readgh&amp;dir_id=<{$directory.id}>&amp;start=<{$start}>&amp;limit=<{$limit}>" title="<{$smarty.const._MA_WGGITHUB_READGH_DIRECTORY}>"><img src="<{$wggithub_icons_url_16}>/github.png" alt="<{$smarty.const._MA_WGGITHUB_READGH_DIRECTORY}> directories" /></a>
-					<a href="directories.php?op=edit&amp;dir_id=<{$directory.id}>&amp;start=<{$start}>&amp;limit=<{$limit}>" title="<{$smarty.const._EDIT}>"><img src="<{xoModuleIcons16 edit.png}>" alt="<{$smarty.const._EDIT}> directories" /></a>
-					<a href="directories.php?op=delete&amp;dir_id=<{$directory.id}>&amp;start=<{$start}>&amp;limit=<{$limit}>" title="<{$smarty.const._DELETE}>"><img src="<{xoModuleIcons16 delete.png}>" alt="<{$smarty.const._DELETE}> directories" /></a>
-				</td>
-			</tr>
-			<{/foreach}>
-		</tbody>
-		<{/if}>
-	</table>
-	<div class="clear">&nbsp;</div>
-	<{if $pagenav|default:''}>
-		<div class="xo-pagenav floatright"><{$pagenav}></div>
-		<div class="clear spacer"></div>
-	<{/if}>
+    <table class='table table-bordered'>
+        <thead>
+            <tr class='head'>
+                <th class="center">&nbsp;</th>
+                <th class="center"><{$smarty.const._AM_WGGITHUB_DIRECTORY_ID}></th>
+                <th class="center"><{$smarty.const._AM_WGGITHUB_DIRECTORY_NAME}></th>
+                <th class="center"><{$smarty.const._AM_WGGITHUB_DIRECTORY_DESCR}></th>
+                <th class="center"><{$smarty.const._AM_WGGITHUB_DIRECTORY_TYPE}></th>
+                <th class="center"><{$smarty.const._AM_WGGITHUB_DIRECTORY_CONTENT}></th>
+                <th class="center"><{$smarty.const._AM_WGGITHUB_DIRECTORY_AUTOUPDATE}></th>
+                <th class="center"><{$smarty.const._AM_WGGITHUB_DIRECTORY_ONLINE}></th>
+                <th class="center"><{$smarty.const._AM_WGGITHUB_DIRECTORY_FILTERRELEASE}></th>
+                <th class="center"><{$smarty.const._AM_WGGITHUB_DIRECTORY_WEIGHT}></th>
+                <th class="center"><{$smarty.const._AM_WGGITHUB_DIRECTORY_DATECREATED}></th>
+                <th class="center"><{$smarty.const._AM_WGGITHUB_DIRECTORY_SUBMITTER}></th>
+                <th class="center width5"><{$smarty.const._AM_WGGITHUB_FORM_ACTION}></th>
+            </tr>
+        </thead>
+        <{if $directories_count|default:''}>
+        <tbody id="dir-list">
+            <{foreach item=directory from=$directories_list}>
+            <tr class='<{cycle values='odd, even'}>' id="dorder_<{$directory.id}>">
+                <td class='center'><img src="<{$wggithub_icons_url_16}>/up_down.png" alt="drag&drop" class="icon-sortable"></td>
+                <td class='center'><{$directory.id}></td>
+                <td ><{$directory.name}></td>
+                <td ><{$directory.descr}></td>
+                <td class='center'><{$directory.type_text}></td>
+                <td class='center'><{$directory.content_shorttext}></td>
+                <td class='center'>
+                    <{if $directory.dir_autoupdate|default:0 == 1}>
+                        <a href="directories.php?op=change_yn&amp;field=dir_autoupdate&amp;value=0&amp;dir_id=<{$directory.id}>&amp;start=<{$start}>&amp;limit=<{$limit}>" title="<{$smarty.const._AM_WGGITHUB_SETOFF}>"><img src="<{$wggithub_icons_url_16}>/on.png" alt="<{$smarty.const._AM_WGGITHUB_SETOFF}>" /></a>
+                    <{else}>
+                        <a href="directories.php?op=change_yn&amp;field=dir_autoupdate&amp;value=1&amp;dir_id=<{$directory.id}>&amp;start=<{$start}>&amp;limit=<{$limit}>" title="<{$smarty.const._AM_WGGITHUB_SETON}>"><img src="<{$wggithub_icons_url_16}>/off.png" alt="<{$smarty.const._AM_WGGITHUB_SETON}>" /></a>
+                    <{/if}>
+                </td>
+                <td class='center'>
+                    <{if $directory.dir_online|default:0 == 1}>
+                        <a href="directories.php?op=change_yn&amp;field=dir_online&amp;value=0&amp;dir_id=<{$directory.id}>&amp;start=<{$start}>&amp;limit=<{$limit}>" title="<{$smarty.const._AM_WGGITHUB_SETOFF}>"><img src="<{$wggithub_icons_url_16}>/on.png" alt="<{$smarty.const._AM_WGGITHUB_SETOFF}>" /></a>
+                    <{else}>
+                        <a href="directories.php?op=change_yn&amp;field=dir_online&amp;value=1&amp;dir_id=<{$directory.id}>&amp;start=<{$start}>&amp;limit=<{$limit}>" title="<{$smarty.const._AM_WGGITHUB_SETON}>"><img src="<{$wggithub_icons_url_16}>/off.png" alt="<{$smarty.const._AM_WGGITHUB_SETON}>" /></a>
+                    <{/if}>
+                </td>
+                <td class='center'>
+                    <{if $directory.dir_filterrelease|default:0 == 1}>
+                    <a href="directories.php?op=change_yn&amp;field=dir_filterrelease&amp;value=0&amp;dir_id=<{$directory.id}>&amp;start=<{$start}>&amp;limit=<{$limit}>" title="<{$smarty.const._AM_WGGITHUB_SETOFF}>"><img src="<{$wggithub_icons_url_16}>/on.png" alt="<{$smarty.const._AM_WGGITHUB_SETOFF}>" /></a>
+                    <{else}>
+                    <a href="directories.php?op=change_yn&amp;field=dir_filterrelease&amp;value=1&amp;dir_id=<{$directory.id}>&amp;start=<{$start}>&amp;limit=<{$limit}>" title="<{$smarty.const._AM_WGGITHUB_SETON}>"><img src="<{$wggithub_icons_url_16}>/off.png" alt="<{$smarty.const._AM_WGGITHUB_SETON}>" /></a>
+                    <{/if}>
+                </td>
+                <td class='center'><{$directory.weight}></td>
+                <td class='center'><{$directory.datecreated}></td>
+                <td class='center'><{$directory.submitter}></td>
+                <td class="center  width5">
+                    <a href="directories.php?op=readgh&amp;dir_id=<{$directory.id}>&amp;start=<{$start}>&amp;limit=<{$limit}>" title="<{$smarty.const._MA_WGGITHUB_READGH_DIRECTORY}>"><img src="<{$wggithub_icons_url_16}>/github.png" alt="<{$smarty.const._MA_WGGITHUB_READGH_DIRECTORY}> directories" /></a>
+                    <a href="directories.php?op=edit&amp;dir_id=<{$directory.id}>&amp;start=<{$start}>&amp;limit=<{$limit}>" title="<{$smarty.const._EDIT}>"><img src="<{xoModuleIcons16 edit.png}>" alt="<{$smarty.const._EDIT}> directories" /></a>
+                    <a href="directories.php?op=delete&amp;dir_id=<{$directory.id}>&amp;start=<{$start}>&amp;limit=<{$limit}>" title="<{$smarty.const._DELETE}>"><img src="<{xoModuleIcons16 delete.png}>" alt="<{$smarty.const._DELETE}> directories" /></a>
+                </td>
+            </tr>
+            <{/foreach}>
+        </tbody>
+        <{/if}>
+    </table>
+    <div class="clear">&nbsp;</div>
+    <{if $pagenav|default:''}>
+        <div class="xo-pagenav floatright"><{$pagenav}></div>
+        <div class="clear spacer"></div>
+    <{/if}>
 <{/if}>
 <{if $form|default:''}>
-	<{$form}>
+    <{$form}>
 <{/if}>
 <{if $errors|default:''}>
-	<{foreach item=error from=$errors}>
-		<div class="errorMsg"><strong><{$error}></strong></div>
-	<{/foreach}>
+    <{foreach item=error from=$errors}>
+        <div class="errorMsg"><strong><{$error}></strong></div>
+    <{/foreach}>
 <{/if}>
 
 <!-- Footer -->

diff --git a/templates/admin/wggithub_admin_footer.tpl b/templates/admin/wggithub_admin_footer.tpl
@@ -1,6 +1,6 @@
 <div class="center">
-	<a href="https://xoops.org/" title="Visit XOOPS" target="_blank"><img src="<{xoModuleIcons32 xoopsmicrobutton.gif}>" alt="XOOPS" /></a>
+    <a href="https://xoops.org/" title="Visit XOOPS" target="_blank"><img src="<{xoModuleIcons32 xoopsmicrobutton.gif}>" alt="XOOPS" /></a>
 </div>
 <div class="center smallsmall italic pad5">
-	<strong>wgGitHub</strong><{$smarty.const._AM_WGGITHUB_MAINTAINEDBY}><a href="<{$maintainedby}>" title="Visit Support Forum" class="tooltip" rel="external">Support Forum</a>
+    <strong>wgGitHub</strong><{$smarty.const._AM_WGGITHUB_MAINTAINEDBY}><a href="<{$maintainedby}>" title="Visit Support Forum" class="tooltip" rel="external">Support Forum</a>
 </div>
diff --git a/templates/admin/wggithub_admin_header.tpl b/templates/admin/wggithub_admin_header.tpl
@@ -1,8 +1,8 @@
 <{if $navigation|default:'' || $buttons|default:''}>
-	<div class='top'>
-		<span class='left'><{$navigation|default:''}></span>
-		<{if $buttons|default:''}>
-			<span class='left'><{$buttons}></span>
-		<{/if}>
-	</div>
+    <div class='top'>
+        <span class='left'><{$navigation|default:''}></span>
+        <{if $buttons|default:''}>
+            <span class='left'><{$buttons}></span>
+        <{/if}>
+    </div>
 <{/if}>