aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
Diffstat (limited to 'admin')
-rw-r--r--admin/themes/default/template/profile_content.tpl10
-rw-r--r--admin/themes/default/template/user_list.tpl20
-rw-r--r--admin/user_list.php8
3 files changed, 10 insertions, 28 deletions
diff --git a/admin/themes/default/template/profile_content.tpl b/admin/themes/default/template/profile_content.tpl
index 29338c3e4..e7c209222 100644
--- a/admin/themes/default/template/profile_content.tpl
+++ b/admin/themes/default/template/profile_content.tpl
@@ -45,15 +45,9 @@
<ul>
<li>
<span class="property">
- <label for="nb_image_line">{'Number of photos per row'|@translate}</label>
+ <label for="nb_image_page">{'Number of photos per page'|@translate}</label>
</span>
- <input type="text" size="3" maxlength="2" name="nb_image_line" id="nb_image_line" value="{$NB_IMAGE_LINE}">
- </li>
- <li>
- <span class="property">
- <label for="nb_line_page">{'Number of rows per page'|@translate}</label>
- </span>
- <input type="text" size="3" maxlength="2" name="nb_line_page" id="nb_line_page" value="{$NB_ROW_PAGE}" >
+ <input type="text" size="3" maxlength="2" name="nb_image_page" id="nb_image_page" value="{$NB_IMAGE_PAGE}">
</li>
{if not $SPECIAL_USER}
<li>
diff --git a/admin/themes/default/template/user_list.tpl b/admin/themes/default/template/user_list.tpl
index 9e5884b08..95214815b 100644
--- a/admin/themes/default/template/user_list.tpl
+++ b/admin/themes/default/template/user_list.tpl
@@ -183,26 +183,16 @@
<table>
<tr>
- <td>{'Number of photos per row'|@translate}</td>
+ <td>{'Number of photos per page'|@translate}</td>
<td>
- <label><input type="radio" name="nb_image_line_action" value="leave" checked="checked"> {'leave'|@translate}</label>
- <label><input type="radio" name="nb_image_line_action" value="set" id="nb_image_line_action_set"> {'set to'|@translate}</label>
- <input onmousedown="document.getElementById('nb_image_line_action_set').checked = true;"
- size="3" maxlength="2" type="text" name="nb_image_line" value="{$NB_IMAGE_LINE}">
+ <label><input type="radio" name="nb_image_page_action" value="leave" checked="checked"> {'leave'|@translate}</label>
+ <label><input type="radio" name="nb_image_page_action" value="set" id="nb_image_page_action_set"> {'set to'|@translate}</label>
+ <input onmousedown="document.getElementById('nb_image_page_action_set').checked = true;"
+ size="3" maxlength="2" type="text" name="nb_image_page" value="{$NB_IMAGE_PAGE}">
</td>
</tr>
<tr>
- <td>{'Number of rows per page'|@translate}</td>
- <td>
- <label><input type="radio" name="nb_line_page_action" value="leave" checked="checked"> {'leave'|@translate}</label>
- <label><input type="radio" name="nb_line_page_action" value="set" id="nb_line_page_action_set"> {'set to'|@translate}</label>
- <input onmousedown="document.getElementById('nb_line_page_action_set').checked = true;"
- size="3" maxlength="2" type="text" name="nb_line_page" value="{$NB_LINE_PAGE}">
- <td>
- </tr>
-
- <tr>
<td>{'Interface theme'|@translate}</td>
<td>
<label><input type="radio" name="theme_action" value="leave" checked="checked"> {'leave'|@translate}</label>
diff --git a/admin/user_list.php b/admin/user_list.php
index 18e9ce2b4..eb17f1137 100644
--- a/admin/user_list.php
+++ b/admin/user_list.php
@@ -384,7 +384,7 @@ DELETE FROM '.USER_GROUP_TABLE.'
$dbfields = array('primary' => array('user_id'), 'update' => array());
$formfields =
- array('nb_image_line', 'nb_line_page', 'theme', 'language',
+ array('nb_image_page', 'theme', 'language',
'recent_period', 'maxwidth', 'expand', 'show_nb_comments',
'show_nb_hits', 'maxheight', 'status', 'enabled_high',
'level');
@@ -559,8 +559,7 @@ if (isset($_POST['pref_submit']))
{
$template->assign(
array(
- 'NB_IMAGE_LINE' => $_POST['nb_image_line'],
- 'NB_LINE_PAGE' => $_POST['nb_line_page'],
+ 'NB_IMAGE_PAGE' => $_POST['nb_image_page'],
'MAXWIDTH' => $_POST['maxwidth'],
'MAXHEIGHT' => $_POST['maxheight'],
'RECENT_PERIOD' => $_POST['recent_period'],
@@ -571,8 +570,7 @@ else
$default_user = get_default_user_info(true);
$template->assign(
array(
- 'NB_IMAGE_LINE' => $default_user['nb_image_line'],
- 'NB_LINE_PAGE' => $default_user['nb_line_page'],
+ 'NB_IMAGE_PAGE' => $default_user['nb_image_page'],
'MAXWIDTH' => $default_user['maxwidth'],
'MAXHEIGHT' => $default_user['maxheight'],
'RECENT_PERIOD' => $default_user['recent_period'],