bn8/ldapsaisie
1
0
Fork 0
mirror of https://gitlab.easter-eggs.com/ee/ldapsaisie.git synced 2024-11-22 18:09:06 +01:00
Code Issues Projects Releases Wiki Activity

LSsearch : Add nbObjectsByPageChoices parameter

Browse source
This commit is contained in:
Benjamin Renard 2019-09-04 11:26:09 +02:00
parent 1a2d881322
commit 2708dd01ee
5 changed files with 69 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
doc/conf/LSobject/LSsearch.docbook
View file

@ -34,6 +34,7 @@ configuration des &LSobjects;, dans la variable <varname>LSsearch</varname>
// Paramètre d'affichage
'displayFormat' => [LSformat],
'nbObjectsByPage' => [integer],
'nbObjectsByPageChoices' => array([integer], [integer], ...),
'nbPageLinkByPage' => [integer],
'validPatternRegex' => '[regex]'
),
@ -234,6 +235,14 @@ contexte dans lequel cette recherche est effectuée.</para>
</listitem>
</varlistentry>
<varlistentry>
<term>nbObjectsByPageChoices</term>
<listitem>
<simpara>Tableau des choix proposés à l'utilisateur pour le nombre d'objets maximum affichés dans une page
de résultat de la recherche.</simpara>
</listitem>
</varlistentry>
<varlistentry>
<term>nbPageLinkByPage</term>
<listitem>

2
public_html/conf/LSobjects/config.LSobjects.LSpeople.php
View file

@ -181,6 +181,8 @@ $GLOBALS['LSobjects']['LSpeople'] = array (
),
'params' => array (
'recursive' => true,
'nbObjectsByPage' => 5,
'nbObjectsByPageChoices' => array(5, 10, 15),
),
'predefinedFilters' => array (
'(jpegPhoto=*)' => 'With photo',

23
public_html/css/default/base.css
View file

@ -236,27 +236,34 @@ td.LSobject-list-names {
*/
p.LSobject-list-page {
text-align: center;
margin: 0.5em;
margin: auto;
margin-top: 0.5em;
max-width: 20em;
}
a.LSobject-list-page {
a.LSobject-list-page, a.LSobject-list-nb-by-page {
color: #0072b8;
text-decoration: none;
}
a.LSobject-list-page:hover {
a.LSobject-list-page:hover, a.LSobject-list-nb-by-page:hover {
color: #0072b8;
}
strong.LSobject-list-page {
strong.LSobject-list-page, strong.LSobject-list-nb-by-page {
color: #0072b8;
}
#LSobject_list_nbresult, p.LSobject-list-nb-by-page {
float: right;
clear: both;
color: #333;
font-style: italic;
margin: 0;
margin-right: 20px;
}
#LSobject_list_nbresult {
float: right;
color: #333;
font-style: italic;
margin-right: 20px;
text-transform: lowercase;
}

29
public_html/includes/class/class.LSsearch.php
View file

@ -58,6 +58,7 @@ class LSsearch {
'displaySubDn' => NULL,
'displayFormat' => NULL,
'nbObjectsByPage' => NB_LSOBJECT_LIST,
'nbObjectsByPageChoices' => array(25, 50, 75, 100),
'nbPageLinkByPage' => 10,
'customInfos' => array(),
'withoutCache' => false,
@ -334,6 +335,34 @@ class LSsearch {
}
}
// nbObjectsByPageChoices
if (isset($params['nbObjectsByPageChoices'])) {
if (is_array($params['nbObjectsByPageChoices'])) {
$choices = array();
$choiceError = false;
foreach($params['nbObjectsByPageChoices'] as $choice) {
if (is_int($choice) && !in_array($choice, $choices)) {
$choices[] = $choice;
}
else {
$choiceError = true;
break;
}
}
if (!empty($choices) && !$choiceError) {
$this -> params['nbObjectsByPageChoices'] = $choices;
}
else {
LSerror :: addErrorCode('LSsearch_03','nbObjectsByPageChoices');
$OK = false;
}
}
else {
LSerror :: addErrorCode('LSsearch_03','nbObjectsByPageChoices');
$OK = false;
}
}
// Sort Limit
if (isset($params['sortlimit'])) {
if (is_int($params['sortlimit']) && $params['sortlimit']>=0 ) {

14
public_html/templates/default/viewSearch.tpl
View file

@ -113,7 +113,21 @@
</tr>
{/foreach}
</table>
<span id='LSobject_list_nbresult'>{$LSsearch->label_total|escape:"htmlall"}</span>
{if !empty($page.list)}
<p class='LSobject-list-nb-by-page'>
{tr msg='Nb / page :'}
{foreach from=$LSsearch->getParam('nbObjectsByPageChoices') item=choice}
{if $LSsearch->getParam('nbObjectsByPage') == $choice}
<strong><a href='view.php?LSobject={$LSsearch->LSobject|escape:"url"}&amp;nbObjectsByPage={$choice}' class='LSobject-list-nb-by-page'>{$choice}</a></strong>
{else}
<a href='view.php?LSobject={$LSsearch->LSobject|escape:"url"}&amp;nbObjectsByPage={$choice}' class='LSobject-list-nb-by-page'>{$choice}</a>
{/if}
{/foreach}
</p>
{/if}
{if $page.nbPages > 1}
<p class='LSobject-list-page'>