Skip to content

Commit 821335a

Browse files
ggoffyggoffy
authored
Merge pull request #40 from ggoffy/master
bt4 updates
2 parents 9edf78b + 24c2cd0 commit 821335a

7 files changed

Lines changed: 180 additions & 125 deletions

File tree

‎docs/changelog.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
===================================================================
44
- added preferences for breadcrumb display (alain01/goffy)
55
- replaced index.html by index.php (alain01/goffy)
6+
- permanent display of filter with enabled/disabled buttons (alain01/goffy)
7+
- added new bt4 templates (alain01/goffy)
68

79
===================================================================
810
2021/03/31 Version 1.03 Final

‎extra/Templates for bootstrap 4/wggithub/wggithub_breadcrumbs.tpl‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<ol class='breadcrumb'>
2+
<li class='breadcrumb-item'><a href='<{xoAppUrl index.php}>' title='home'><span class="fa fa-home"></span></a></li>
3+
<{foreach item=itm from=$xoBreadcrumbs name=bcloop}>
4+
<li class='breadcrumb-item'>
5+
<{if $itm.link|default:''}>
6+
<a href='<{$itm.link}>' title='<{$itm.title}>'><{$itm.title}></a>
7+
<{else}>
8+
<{$itm.title}>
9+
<{/if}>
10+
</li>
11+
<{/foreach}>
12+
</ol>

‎extra/Templates for bootstrap 4/wggithub/wggithub_footer.tpl‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<div class=""><{$copyright}></div>
2+
3+
<{if $pagenav|default:'' != ''}>
4+
<div class='text-right'><{$pagenav}></div>
5+
<{/if}>
6+
<br>
7+
<{if $xoops_isadmin|default:'' != ''}>
8+
<hr />
9+
<p class="text-center"><a class="btn btn-danger" href="<{$admin}>"><span class="fa fa-wrench fa-lg"></span> <{$smarty.const._MA_WGGITHUB_ADMIN}></a></p>
10+
<{/if}>
11+
12+
<{if $comment_mode|default:''}>
13+
<div class='pad2 marg2'>
14+
<{if $comment_mode == "flat"}>
15+
<{include file='db:system_comments_flat.tpl' }>
16+
<{elseif $comment_mode == "thread"}>
17+
<{include file='db:system_comments_thread.tpl' }>
18+
<{elseif $comment_mode == "nest"}>
19+
<{include file='db:system_comments_nest.tpl' }>
20+
<{/if}>
21+
</div>
22+
<{/if}>
23+
<{include file='db:system_notification_select.tpl' }>

‎extra/Templates for bootstrap 4/wggithub/wggithub_header.tpl‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<{if $showBreadcrumb|default:false}>
2+
<{include file='db:wggithub_breadcrumbs.tpl' }>
3+
<{/if}>
4+
5+
<{if $ads|default:'' != ''}>
6+
<div class='text-center'><{$ads}></div>
7+
<{/if}>

‎extra/Templates for bootstrap 4/wggithub/wggithub_index.tpl‎

Lines changed: 89 additions & 85 deletions
Large diffs are not rendered by default.

‎index.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@
4242
$permReadmeUpdate = $permissionsHandler->getPermReadmeUpdate();
4343

4444
$op = Request::getCmd('op', 'list');
45-
$filterRelease = Request::getString('release', 'any');
46-
$filterSortby = Request::getString('sortby', 'update');
45+
$filterRelease = Request::getString('frelease', 'any');
46+
$filterSortby = Request::getString('fsortby', 'update');
4747

48-
$GLOBALS['xoopsTpl']->assign('release', $filterRelease);
49-
$GLOBALS['xoopsTpl']->assign('sortby', $filterSortby);
48+
$GLOBALS['xoopsTpl']->assign('frelease', $filterRelease);
49+
$GLOBALS['xoopsTpl']->assign('fsortby', $filterSortby);
5050

5151
// Define Stylesheet
5252
$GLOBALS['xoTheme']->addStylesheet($style, null);
@@ -222,9 +222,9 @@
222222
}
223223
$directories[$i]['repos'] = $repos;
224224
$directories[$i]['previousRepos'] = $dirStart[$i] > 0;
225-
$directories[$i]['previousOp'] = '&amp;dirId=' . $i . '&amp;start=' . ($dirStart[$i] - $dirLimit[$i]) . '&amp;limit=' . $dirLimit[$i] . '&amp;release=' . $filterRelease . '&amp;sortby=' . $filterSortby;
225+
$directories[$i]['previousOp'] = '&amp;dirId=' . $i . '&amp;start=' . ($dirStart[$i] - $dirLimit[$i]) . '&amp;limit=' . $dirLimit[$i] . '&amp;frelease=' . $filterRelease . '&amp;fsortby=' . $filterSortby;
226226
$directories[$i]['nextRepos'] = ($repositoriesCount - $dirStart[$i]) > $dirLimit[$i];
227-
$directories[$i]['nextOp'] = '&amp;dirId=' . $i . '&amp;start=' . ($dirStart[$i] + $dirLimit[$i]) . '&amp;limit=' . $dirLimit[$i] . '&amp;release=' . $filterRelease . '&amp;sortby=' . $filterSortby;
227+
$directories[$i]['nextOp'] = '&amp;dirId=' . $i . '&amp;start=' . ($dirStart[$i] + $dirLimit[$i]) . '&amp;limit=' . $dirLimit[$i] . '&amp;frelease=' . $filterRelease . '&amp;fsortby=' . $filterSortby;
228228
$GLOBALS['xoopsTpl']->assign('menu', $menu);
229229
$GLOBALS['xoopsTpl']->assign('directories', $directories);
230230
}
@@ -245,7 +245,7 @@
245245
require __DIR__ . '/footer.php';
246246
}
247247
$dirName = Request::getString('dir_name', '');
248-
$redir = 'index.php?op=list_afterupdate&amp;release=' . $filterRelease . '&amp;sortby=' . $filterSortby;
248+
$redir = 'index.php?op=list_afterupdate&amp;frelease=' . $filterRelease . '&amp;fsortby=' . $filterSortby;
249249
$githubClient = GithubClient::getInstance();
250250
$result = $githubClient->executeUpdate($dirName);
251251
if ($result) {
@@ -264,7 +264,7 @@
264264
$repoId = Request::getInt('repo_id', 0);
265265
$repoUser = Request::getString('repo_user', 'none');
266266
$repoName = Request::getString('repo_name', 'none');
267-
$redir = 'index.php?op=list_afterupdate&amp;release=' . $filterRelease . '&amp;sortby=' . $filterSortby;
267+
$redir = 'index.php?op=list_afterupdate&amp;frelease=' . $filterRelease . '&amp;fsortby=' . $filterSortby;
268268
$result = $helper->getHandler('Readmes')->updateReadmes($repoId, $repoUser, $repoName);
269269
if ($result) {
270270
\redirect_header($redir, 2, \_MA_WGGITHUB_READGH_SUCCESS);

‎templates/wggithub_index.tpl‎

Lines changed: 39 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,25 @@
66

77
<{if $directoriesCount|default:0 > 0}>
88
<!-- filter area -->
9-
<div id="filter_bar" class="tab-filter <{if $menu == 0}>hidden<{/if}>">
9+
<div id="filter_bar" class="tab-filter">
1010
<{$smarty.const._MA_WGGITHUB_FILTER_SORTBY}>:
1111
<div class="btn-group btn-group-sm" role="group" aria-label="Filter Sortby">
12-
<button id="sortbyname" onclick="executeClick(this, 'sortby', 'index.php?op=list&sortby=name&release=<{$release}>')" type="button" class="btn btn-primary btn-rounded <{if $sortby =='name'}>disabled<{/if}>"><{$smarty.const._MA_WGGITHUB_FILTER_SORTBY_NAME}></button>
13-
<button id="sortbyupdate" onclick="executeClick(this, 'sortby', 'index.php?op=list&sortby=update&release=<{$release}>')" type="button" class="btn btn-primary btn-rounded <{if $sortby =='update'}>disabled<{/if}>"><{$smarty.const._MA_WGGITHUB_FILTER_SORTBY_UPDATE}></button>
12+
<button id="sortbyname" onclick="executeClick('index.php?op=list&fsortby=name&frelease=<{$frelease}>')" type="button" class="btn btn-primary btn-rounded <{if $menu == 0 || $fsortby =='name'}>disabled<{/if}>"><{$smarty.const._MA_WGGITHUB_FILTER_SORTBY_NAME}></button>
13+
<button id="sortbyupdate" onclick="executeClick('index.php?op=list&fsortby=update&frelease=<{$frelease}>')" type="button" class="btn btn-primary btn-rounded <{if $menu == 0 || $fsortby =='update'}>disabled<{/if}>"><{$smarty.const._MA_WGGITHUB_FILTER_SORTBY_UPDATE}></button>
1414
</div>
1515
<span id="filter_release_label"><{$smarty.const._MA_WGGITHUB_FILTER_RELEASE}>:</span>
16-
<div id="filter_release_bar" class="btn-group btn-group-sm <{if $menu == 0}>hidden<{/if}>" role="group" aria-label="Filter Releases">
17-
<button id="relfinal" onclick="executeClick(this, 'release', 'index.php?op=list&release=final&sortby=<{$sortby}>')" type="button" class="btn btn-primary btn-rounded <{if $release =='final'}>disabled<{/if}>"><{$smarty.const._MA_WGGITHUB_FILTER_RELEASE_FINAL}></button>
18-
<button id="relany" onclick="executeClick(this, 'release', 'index.php?op=list&release=any&sortby=<{$sortby}>')" type="button" class="btn btn-primary btn-rounded <{if $release =='any'}>disabled<{/if}>"><{$smarty.const._MA_WGGITHUB_FILTER_RELEASE_ANY}></button>
16+
<div id="filter_release_bar" class="btn-group btn-group-sm" role="group" aria-label="Filter Releases">
17+
<button id="relfinal" onclick="executeClick('index.php?op=list&frelease=final&fsortby=<{$fsortby}>')" type="button" class="btn btn-primary btn-rounded <{if $menu == 0 || $frelease =='final'}>disabled<{/if}>"><{$smarty.const._MA_WGGITHUB_FILTER_RELEASE_FINAL}></button>
18+
<button id="relany" onclick="executeClick('index.php?op=list&frelease=any&fsortby=<{$fsortby}>')" type="button" class="btn btn-primary btn-rounded <{if $menu == 0 || $frelease =='any'}>disabled<{/if}>"><{$smarty.const._MA_WGGITHUB_FILTER_RELEASE_ANY}></button>
1919
<{if $showBtnAll|default:false}>
20-
<button id="relall" onclick="executeClick(this, 'release', 'index.php?op=list&release=all&sortby=<{$sortby}>')" type="button" class="btn btn-primary btn-rounded <{if $release =='all'}>disabled<{/if}>"><{$smarty.const._MA_WGGITHUB_FILTER_RELEASE_ALL}></button>
20+
<button id="relall" onclick="executeClick('index.php?op=list&frelease=all&fsortby=<{$fsortby}>')" type="button" class="btn btn-primary btn-rounded <{if $menu == 0 || $frelease =='all'}>disabled<{/if}>"><{$smarty.const._MA_WGGITHUB_FILTER_RELEASE_ALL}></button>
2121
<{/if}>
2222
</div>
2323
</div>
2424

2525
<!-- Basic Nav tabs -->
2626
<ul class="nav nav-tabs">
27-
<li class="<{if $menu == 0}>active<{/if}>"><a data-toggle="tab" onclick='javascript:toggleFilters(0)' href="#home"><{$smarty.const._MA_WGGITHUB_INDEX}></a></li>
27+
<li class="<{if $menu == 0}>active<{/if}>"><a data-toggle="tab" onclick='javascript:toggleFilters(0);toggleFilterRelease(0);' href="#home"><{$smarty.const._MA_WGGITHUB_INDEX}></a></li>
2828
<{foreach item=directory from=$directories}>
2929
<li class="<{if $menu == $directory.id}>active<{/if}>"><a data-toggle="tab" onclick='javascript:toggleFilters(1);toggleFilterRelease(<{$directory.dir_filterrelease}>)' href="#menu<{$directory.id}>"><{$directory.name}></a></li>
3030
<{/foreach}>
@@ -127,22 +127,8 @@
127127
<{/if}>
128128

129129
<script type="text/javascript">
130-
var executeClick = function(btn, group, href)
130+
var executeClick = function(href)
131131
{
132-
if ('release' == group) {
133-
document.getElementById('relfinal').classList.remove("disabled");
134-
document.getElementById('relany').classList.remove("disabled");
135-
var el_relall = document.getElementById('relall');
136-
if (typeof(el_relall) != 'undefined' && el_relall != null) {
137-
document.getElementById('relall').classList.remove("disabled");
138-
}
139-
document.getElementById(btn.id).classList.add("disabled");
140-
};
141-
if ('sortby' == group) {
142-
document.getElementById('sortbyname').classList.remove("disabled");
143-
document.getElementById('sortbyupdate').classList.remove("disabled");
144-
document.getElementById(btn.id).classList.add("disabled");
145-
};
146132
var tabid = $('.tab-content-main .maintab.active').attr('id');
147133
var url;
148134
url = href + '&menu=' + tabid;
@@ -151,20 +137,41 @@
151137
}
152138
var toggleFilterRelease = function(display)
153139
{
154-
if (display > 0) {
155-
document.getElementById("filter_release_label").classList.remove("hidden");
156-
document.getElementById("filter_release_bar").classList.remove("hidden");
157-
} else {
158-
document.getElementById("filter_release_label").classList.add("hidden");
159-
document.getElementById("filter_release_bar").classList.add("hidden");
140+
document.getElementById("relfinal").classList.add("disabled");
141+
document.getElementById("relany").classList.add("disabled");
142+
<{if $showBtnAll|default:false}>
143+
document.getElementById("relall").classList.add("disabled");
144+
<{/if}>
145+
146+
if (1 == Number(display)) {
147+
<{if $frelease == 'final'}>
148+
document.getElementById("relany").classList.remove("disabled");
149+
<{if $showBtnAll|default:false}>
150+
document.getElementById("relall").classList.remove("disabled");
151+
<{/if}>
152+
<{/if}>
153+
<{if $frelease == 'any'}>
154+
document.getElementById("relfinal").classList.remove("disabled");
155+
<{if $showBtnAll|default:false}>
156+
document.getElementById("relall").classList.remove("disabled");
157+
<{/if}>
158+
<{/if}>
159+
<{if $frelease == 'all'}>
160+
document.getElementById("relfinal").classList.remove("disabled");
161+
document.getElementById("relany").classList.remove("disabled");
162+
<{/if}>
160163
}
161164
}
162165
var toggleFilters = function(display)
163166
{
167+
document.getElementById("sortbyname").classList.add("disabled");
168+
document.getElementById("sortbyupdate").classList.add("disabled");
164169
if (1 == display) {
165-
document.getElementById("filter_bar").classList.remove("hidden");
166-
} else {
167-
document.getElementById("filter_bar").classList.add("hidden");
170+
<{if $fsortby == 'name'}>
171+
document.getElementById("sortbyupdate").classList.remove("disabled");
172+
<{else}>
173+
document.getElementById("sortbyname").classList.remove("disabled");
174+
<{/if}>
168175
}
169176
}
170177
</script>

0 commit comments

Comments
 (0)