aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrub <rub@piwigo.org>2006-03-17 17:59:59 +0000
committerrub <rub@piwigo.org>2006-03-17 17:59:59 +0000
commit62b589964a5bd86b1ba74514cd9990d3078bf197 (patch)
treef160cc99f24498d1d2e4f5b8ed4edc1754b610f9
parent97b681f1fa58e72bacff516ac51b35577181367b (diff)
Step 8 improvement issue 0000301:
o Add $conf['allow_adviser'] git-svn-id: http://piwigo.org/svn/trunk@1087 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--admin/user_list.php8
-rw-r--r--include/config_default.inc.php3
-rw-r--r--language/en_UK.iso-8859-1/help/user_list.html15
-rw-r--r--language/fr_FR.iso-8859-1/help/user_list.html14
-rw-r--r--template/yoga/admin/user_list.tpl4
5 files changed, 35 insertions, 9 deletions
diff --git a/admin/user_list.php b/admin/user_list.php
index ed2fc77d2..532d64783 100644
--- a/admin/user_list.php
+++ b/admin/user_list.php
@@ -486,6 +486,12 @@ if (isset($_GET['id']))
$template->assign_block_vars('session', array('ID' => $_GET['id']));
}
+// Hide radio-button if not allow to assign adviser
+if ($conf['allow_adviser'])
+{
+ $template->assign_block_vars('adviser', array());
+}
+
foreach ($page['order_by_items'] as $item => $label)
{
$selected = (isset($_GET['order_by']) and $_GET['order_by'] == $item) ?
@@ -801,7 +807,7 @@ foreach ($page['filtered_users'] as $num => $local_user)
{
$checked = '';
}
-
+
$template->assign_block_vars(
'user',
array(
diff --git a/include/config_default.inc.php b/include/config_default.inc.php
index da9a9de75..cbb74ad83 100644
--- a/include/config_default.inc.php
+++ b/include/config_default.inc.php
@@ -378,6 +378,9 @@ $conf['guest_id'] = 2;
// webmaster_id : webmaster'id.
$conf['webmaster_id'] = 1;
+// allow to use adviser mode
+$conf['allow_adviser'] = false;
+
// +-----------------------------------------------------------------------+
// | upload |
// +-----------------------------------------------------------------------+
diff --git a/language/en_UK.iso-8859-1/help/user_list.html b/language/en_UK.iso-8859-1/help/user_list.html
index d9312b084..b09110537 100644
--- a/language/en_UK.iso-8859-1/help/user_list.html
+++ b/language/en_UK.iso-8859-1/help/user_list.html
@@ -21,16 +21,23 @@ or descending order.</p>
<li>delete users (require a confirmation checkbox)</li>
<li>change status</li>
-
- <li>set user like an adviser</li>
-
+
<li>associate or dissociate from groups</li>
<li>modify display properties</li>
-
+
<li>modify additional properties</li>
</ul>
<p>The target is the set users selected (by default) or all users is
asked.</p>
+<h3>Adviser</h3>
+<p>Definition of adviser user:</p>
+<ul>
+ <li>allow access of all screens permitted by this status</li>
+ <li>read-only or simulate-only access</li>
+</ul>
+
+<p>It's possible to assign adviser mode with variable $conf['allow_adviser'].</p>
+<p>If this variable is 'true', it's possible to define user like an adviser</p>
diff --git a/language/fr_FR.iso-8859-1/help/user_list.html b/language/fr_FR.iso-8859-1/help/user_list.html
index 17321cda6..98039e837 100644
--- a/language/fr_FR.iso-8859-1/help/user_list.html
+++ b/language/fr_FR.iso-8859-1/help/user_list.html
@@ -23,8 +23,6 @@ simultan�ment:</p>
<li>changer le status</li>
- <li>d�finir l'utilisateur comme un conseiller</li>
-
<li>associer ou dissocier des groupes</li>
<li>modifier les propri�t�s d'affichage</li>
@@ -34,4 +32,14 @@ simultan�ment:</p>
</ul>
<p>La cible est la liste des utilisateurs s�lectionn�s (par d�faut) ou bien
-touts les utilisateurs de la liste filtr�e.</p>
+tout les utilisateurs de la liste filtr�e.</p>
+
+<h3>Conseiller</h3>
+<p>D�finition d'un utilisateur conseiller:</p>
+<ul>
+ <li>permet d'acc�der � tous les �crans permis par son status</li>
+ <li>acc�s uniquement en consultation ou en simulation</li>
+</ul>
+
+<p>Il est possible de permettre l'assignation du mode conseiller avec la variable $conf['allow_adviser'].</p>
+<p>Si cette variable est � 'true', il sera possible de d�finir l'utilisateur comme un conseiller</p>
diff --git a/template/yoga/admin/user_list.tpl b/template/yoga/admin/user_list.tpl
index 81365b63b..1483e80f4 100644
--- a/template/yoga/admin/user_list.tpl
+++ b/template/yoga/admin/user_list.tpl
@@ -124,6 +124,7 @@
</td>
</tr>
+ <!-- BEGIN adviser -->
<tr>
<td>{lang:adviser}</td>
<td>
@@ -133,8 +134,9 @@
<label><input type="radio" name="adviser" value="false" {ADVISER_NO} />{L_NO}</label>
</td>
</tr>
- </table>
+ <!-- END adviser -->
+ </table>
</fieldset>
<!-- form to set properties for many users at once -->