aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2007-06-27 22:50:36 +0000
committerrvelices <rv-github@modusoptimus.com>2007-06-27 22:50:36 +0000
commit009970bb9250bd72936beb000d1a578897287153 (patch)
treeca55b30727d0eccc63124b93259dd63df3c8b369
parent9decd4b30f53487462820846b9da5ee126102d41 (diff)
- when gallery is locked, the status header is set to 503 (Service unavailable)
- small improvement in admin template (text near checkboxes goes inside <label> element) git-svn-id: http://piwigo.org/svn/trunk@2046 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--include/common.inc.php2
-rw-r--r--template/yoga/admin/configuration.tpl24
2 files changed, 16 insertions, 10 deletions
diff --git a/include/common.inc.php b/include/common.inc.php
index c6ae8c8af..39de9a42f 100644
--- a/include/common.inc.php
+++ b/include/common.inc.php
@@ -192,6 +192,8 @@ if ($conf['gallery_locked'])
if ( script_basename() != 'identification' and !is_admin() )
{
+ set_status_header(503, 'Service Unavailable');
+ @header('Retry-After: 900');
echo $lang['gallery_locked_message']
.'<a href="'.get_absolute_root_url(false).'identification.php">.</a>';
exit();
diff --git a/template/yoga/admin/configuration.tpl b/template/yoga/admin/configuration.tpl
index a2a435342..3feafc51d 100644
--- a/template/yoga/admin/configuration.tpl
+++ b/template/yoga/admin/configuration.tpl
@@ -44,27 +44,31 @@
<fieldset id="mainConfCheck">
<ul>
<li>
- <label for="allow_user_registration">
- <span class="property">{lang:Allow user registration}</span>
- <input type="checkbox" name="allow_user_registration" id="allow_user_registration" {main.ALLOW_USER_REGISTRATION} />
+ <label>
+ <span class="property">{lang:Rating}</span>
+ <input type="checkbox" name="rate" {main.RATE} />
</label>
</li>
<li>
- <label for="obligatory_user_mail_address">
- <span class="property">{lang:obligatory_user_mail_address}</span>
- <input type="checkbox" name="obligatory_user_mail_address" id="obligatory_user_mail_address" {main.OBLIGATORY_USER_MAIL_ADDRESS} />
+ <label>
+ <span class="property">{lang:Rating by guests}</span>
+ <input type="checkbox" name="rate_anonymous" {main.RATE_ANONYMOUS} />
</label>
</li>
<li>
- <span class="property">{lang:Rating}</span>
- <input type="checkbox" name="rate" {main.RATE} />
+ <label for="allow_user_registration">
+ <span class="property">{lang:Allow user registration}</span>
+ <input type="checkbox" name="allow_user_registration" id="allow_user_registration" {main.ALLOW_USER_REGISTRATION} />
+ </label>
</li>
<li>
- <span class="property">{lang:Rating by guests}</span>
- <input type="checkbox" name="rate_anonymous" {main.RATE_ANONYMOUS} />
+ <label for="obligatory_user_mail_address">
+ <span class="property">{lang:obligatory_user_mail_address}</span>
+ <input type="checkbox" name="obligatory_user_mail_address" id="obligatory_user_mail_address" {main.OBLIGATORY_USER_MAIL_ADDRESS} />
+ </label>
</li>
<li>