Skip to content

Commit

Permalink
Merge pull request #128 from liomj/master
Browse files Browse the repository at this point in the history
Merge Updates
  • Loading branch information
liomj committed May 1, 2020
2 parents a5d8dac + 30e679b commit 050f9a4
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 43 deletions.
3 changes: 3 additions & 0 deletions language/english/blocks.php
Expand Up @@ -26,3 +26,6 @@
define('_MB_SUICO_ENABLEPM', 'Show Private Message Button');
define('_MB_SUICO_PRIVATEMESSAGE', 'Private Message');
define('_MB_SUICO_PM', 'PM');
define('_MB_SUICO_FINDFRIENDS', 'Find Friends');
define('_MB_SUICO_FINDMOREFRIENDS', 'Find More Friends');

6 changes: 4 additions & 2 deletions templates/blocks/suico_block_friends.tpl
Expand Up @@ -27,8 +27,10 @@
<{if $block.friends}>
<a href="<{$xoops_url}>/modules/suico/friends.php" class="btn btn-primary btn-sm"> <i class='fa fa-arrow-circle-right'></i> <{$block.lang_allfriends}></a>
<{else}>
<{$block.lang_nofriends}>
<{/if}>
<div class="alert alert-primary text-center"><{$block.lang_nofriends}><br><br>
<a href="memberslist.php" class="btn btn-primary btn-sm" role="button"><i class="fa fa-address-card-o"></i> <{$smarty.const._MB_SUICO_FINDFRIENDS}></a>
</div>
<{/if}>

</div>
</div>
49 changes: 8 additions & 41 deletions templates/suico_groups.tpl
Expand Up @@ -51,7 +51,7 @@


<{if $countGroups!=0}>
<table id="mygroups1" class="display table table-striped">
<table id="" class="display no-wrap table table-striped">
<thead class="thead-dark">
<tr>
<th><{$lang_groupslist}></th>
Expand Down Expand Up @@ -123,12 +123,10 @@
<{/if}>

<{if $countGroups_all!=0}>
<div class="table-responsive">
<table id='allgroups1' class="display table table-striped table-hover table-bordered">
<table id="" class="display no-wrap table table-striped table-hover table-bordered">
<thead class="thead-light">
<tr>
<th><{$lang_groupslist}></th>

</tr>
</thead>
<tbody>
Expand Down Expand Up @@ -179,7 +177,6 @@
<{/section}>
</tbody>
</table>
</div>
<!--<div>
<{$navigationBar}>
</div>-->
Expand All @@ -188,42 +185,12 @@

<script>
$(document).ready(function () {
$('#mygroups1').DataTable({
"ordering": false,
"lengthChange": false,
"displayLength": <{$groupsperpage}>,
"language": {
"decimal": "<{$smarty.const._MD_SUICO_DTABLE_DECIMAL}>",
"emptyTable": "<{$smarty.const._MD_SUICO_DTABLE_EMPTYTABLE}>",
"info": "<{$smarty.const._MD_SUICO_DTABLE_INFOSHOWING}> _START_ <{$smarty.const._MD_SUICO_DTABLE_INFOTO}> _END_ <{$smarty.const._MD_SUICO_DTABLE_INFOOF}> _TOTAL_ <{$smarty.const._MD_SUICO_DTABLE_INFOENTRIES}>",
"infoEmpty": "<{$smarty.const._MD_SUICO_DTABLE_INFOEMPTY}>",
"infoFiltered": "(<{$smarty.const._MD_SUICO_DTABLE_INFOFILTEREDFROM}> _MAX_ <{$smarty.const._MD_SUICO_DTABLE_INFOFILTEREDTOTALENTRIES}>)",
"infoPostFix": "<{$smarty.const._MD_SUICO_DTABLE_INFOPOSTFIX}>",
"thousands": "<{$smarty.const._MD_SUICO_DTABLE_THOUSANDS}>",
"lengthMenu": "<{$smarty.const._MD_SUICO_DTABLE_LENGTHMENUSHOW}> _MENU_ <{$smarty.const._MD_SUICO_DTABLE_LENGTHMENUENTRIES}>",
"loadingRecords": "<{$smarty.const._MD_SUICO_DTABLE_LOADINGRECORDS}>",
"processing": "<{$smarty.const._MD_SUICO_DTABLE_PROCESSING}>",
"search": "<{$smarty.const._MD_SUICO_DTABLE_SEARCH}>",
"zeroRecords": "<{$smarty.const._MD_SUICO_DTABLE_ZERORECORDS}>",
"paginate": {
"first": "<{$smarty.const._MD_SUICO_DTABLE_FIRST}>",
"last": "<{$smarty.const._MD_SUICO_DTABLE_LAST}>",
"next": "<{$smarty.const._MD_SUICO_DTABLE_NEXT}>",
"previous": "<{$smarty.const._MD_SUICO_DTABLE_PREVIOUS}>"
},
"aria": {
"sortAscending": "<{$smarty.const._MD_SUICO_DTABLE_SORT_ASCENDING}>",
"sortDescending": "<{$smarty.const._MD_SUICO_DTABLE_SORT_DESCENSING}>"
}
}
});
});
</script>

<script>
$(document).ready(function () {
$('#allgroups1').DataTable({
"ordering": false,
$('table.display').DataTable({
//dom: "<'row'<'col-sm-12 col-md-5'i><'col-sm-12 col-md-7'p>>" +
//"<'row'<'col-sm-12'tr>>" +
//"<'row'<'col-sm-12 col-md-5'i><'col-sm-12 col-md-7'p>>",
"responsive": true,
"ordering": false,
"lengthChange": false,
"displayLength": <{$groupsperpage}>,
"language": {
Expand Down

0 comments on commit 050f9a4

Please sign in to comment.