bug:3122

removed admin files profile.tpl and profile_content.tpl, integrated in configuration.tpl
take into account default_user_id with a message
prefix for template var, to avoid overwriting of already existing vars especially in admin panel

git-svn-id: http://piwigo.org/svn/trunk@29221 68402e56-0260-453c-a942-63ccdbb3a9ee

3 files changed, 50 insertions, 99 deletions

diff --git a/admin/themes/default/template/configuration.tpl b/admin/themes/default/template/configuration.tpl
index f11390878..0f0a80e20 100644
--- a/admin/themes/default/template/configuration.tpl
+++ b/admin/themes/default/template/configuration.tpl
@@ -854,6 +854,55 @@ jQuery("input[name='mail_theme']").change(function() {
 
 {if isset($default)}
 <div id="configContent">
-{$PROFILE_CONTENT}
+<form method="post" name="profile" action="{$GUEST_F_ACTION}" id="profile" class="properties">
+
+{if $GUEST_USERNAME!='guest'}
+  <fieldset>
+      {'The settings for the guest are from the %s user'|@translate:$GUEST_USERNAME}
+  </fieldset>
+{/if}
+
+  <fieldset>
+    <legend>{'Preferences'|@translate}</legend>
+    <input type="hidden" name="redirect" value="{$GUEST_REDIRECT}">
+
+    <ul>
+      <li>
+        <span class="property">
+          <label for="nb_image_page">{'Number of photos per page'|@translate}</label>
+        </span>
+        <input type="text" size="4" maxlength="3" name="nb_image_page" id="nb_image_page" value="{$GUEST_NB_IMAGE_PAGE}">
+      </li>
+      <li>
+        <span class="property">
+          <label for="recent_period">{'Recent period'|@translate}</label>
+        </span>
+        <input type="text" size="3" maxlength="2" name="recent_period" id="recent_period" value="{$GUEST_RECENT_PERIOD}">
+      </li>
+      <li>
+        <span class="property">{'Expand all albums'|@translate}</span>
+        {html_radios name='expand' options=$radio_options selected=$GUEST_EXPAND}
+      </li>
+    {if $GUEST_ACTIVATE_COMMENTS}
+      <li>
+        <span class="property">{'Show number of comments'|@translate}</span>
+        {html_radios name='show_nb_comments' options=$radio_options selected=$GUEST_NB_COMMENTS}
+      </li>
+    {/if}
+      <li>
+        <span class="property">{'Show number of hits'|@translate}</span>
+        {html_radios name='show_nb_hits' options=$radio_options selected=$GUEST_NB_HITS}
+      </li>
+    </ul>
+  </fieldset>
+
+  <p class="bottomButtons">
+    <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}">
+    <input class="submit" type="submit" name="validate" value="{'Submit'|@translate}">
+    <input class="submit" type="reset" name="reset" value="{'Reset'|@translate}">
+  </p>
+
+</form>
+
 </div>
 {/if}
diff --git a/admin/themes/default/template/profile.tpl b/admin/themes/default/template/profile.tpl
deleted file mode 100644
index 6eac82e44..000000000
--- a/admin/themes/default/template/profile.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="titrePage">
-  <h2>{'Profile'|@translate}</h2>
-</div>
-
-{$PROFILE_CONTENT}
diff --git a/admin/themes/default/template/profile_content.tpl b/admin/themes/default/template/profile_content.tpl
deleted file mode 100644
index 3c22dd386..000000000
--- a/admin/themes/default/template/profile_content.tpl
+++ /dev/null
@@ -1,93 +0,0 @@
-<form method="post" name="profile" action="{$F_ACTION}" id="profile" class="properties">
-
-  <fieldset>
-    <legend>{'Registration'|@translate}</legend>
-    <input type="hidden" name="redirect" value="{$REDIRECT}">
-    <ul>
-      <li>
-        <span class="property">
-          <label for="username">{'Username'|@translate}</label>
-        </span>
-      {if not $SPECIAL_USER}
-        <input type="text" name="username" id="username" value="{$USERNAME}">
-      {else}
-        {$USERNAME}
-      {/if}
-      </li>
-    {if not $SPECIAL_USER} {* can modify password + email*}
-      <li>
-        <span class="property">
-          <label for="mail_address">{'Email address'|@translate}</label>
-        </span>
-        <input type="text" name="mail_address" id="mail_address" value="{$EMAIL}">
-      </li>
-      <li>
-        <span class="property">
-          <label for="use_new_pwd">{'New password'|@translate}</label>
-        </span>
-        <input type="password" name="use_new_pwd" id="use_new_pwd" value="">
-      </li>
-      <li>
-        <span class="property">
-          <label for="passwordConf">{'Confirm Password'|@translate}</label>
-        </span>
-        <input type="password" name="passwordConf" id="passwordConf" value="">
-      </li>
-    {/if}
-    </ul>
-  </fieldset>
-
-  <fieldset>
-    <legend>{'Preferences'|@translate}</legend>
-
-    <ul>
-      <li>
-        <span class="property">
-          <label for="nb_image_page">{'Number of photos per page'|@translate}</label>
-        </span>
-        <input type="text" size="4" maxlength="3" name="nb_image_page" id="nb_image_page" value="{$NB_IMAGE_PAGE}">
-      </li>
-    {if not $SPECIAL_USER}
-      <li>
-        <span class="property">
-          <label for="template">{'Theme'|@translate}</label>
-        </span>
-        {html_options id=template name=theme options=$template_options selected=$template_selection}
-      </li>
-      <li>
-        <span class="property">
-          <label for="language">{'Language'|@translate}</label>
-        </span>
-        {html_options id=language name=language options=$language_options selected=$language_selection}
-      </li>
-    {/if}
-      <li>
-        <span class="property">
-          <label for="recent_period">{'Recent period'|@translate}</label>
-        </span>
-        <input type="text" size="3" maxlength="2" name="recent_period" id="recent_period" value="{$RECENT_PERIOD}">
-      </li>
-      <li>
-        <span class="property">{'Expand all albums'|@translate}</span>
-        {html_radios name='expand' options=$radio_options selected=$EXPAND}
-      </li>
-    {if $ACTIVATE_COMMENTS}
-      <li>
-        <span class="property">{'Show number of comments'|@translate}</span>
-        {html_radios name='show_nb_comments' options=$radio_options selected=$NB_COMMENTS}
-      </li>
-    {/if}
-      <li>
-        <span class="property">{'Show number of hits'|@translate}</span>
-        {html_radios name='show_nb_hits' options=$radio_options selected=$NB_HITS}
-      </li>
-    </ul>
-  </fieldset>
-
-  <p class="bottomButtons">
-    <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}">
-    <input class="submit" type="submit" name="validate" value="{'Submit'|@translate}">
-    <input class="submit" type="reset" name="reset" value="{'Reset'|@translate}">
-  </p>
-
-</form>