[pLog-svn] r523 - in plog/trunk: class/action/admin
class/view/admin templates/admin
oscar at devel.plogworld.net
oscar at devel.plogworld.net
Fri Dec 17 15:24:46 GMT 2004
Author: oscar
Date: 2004-12-17 15:24:46 +0000 (Fri, 17 Dec 2004)
New Revision: 523
Modified:
plog/trunk/class/action/admin/adminupdateeditblogaction.class.php
plog/trunk/class/view/admin/admineditsiteblogview.class.php
plog/trunk/templates/admin/editblog.template
Log:
cleaned up a bit the look of the "edit blog" page
Modified: plog/trunk/class/action/admin/adminupdateeditblogaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminupdateeditblogaction.class.php 2004-12-17 15:24:21 UTC (rev 522)
+++ plog/trunk/class/action/admin/adminupdateeditblogaction.class.php 2004-12-17 15:24:46 UTC (rev 523)
@@ -27,6 +27,10 @@
var $_blogTimeOffset;
var $_blogProperties;
var $_blogUsers;
+ var $_blogQuota;
+ var $_blogName;
+ var $_blogLocale;
+ var $_blogStatus;
/**
* Constructor. If nothing else, it also has to call the constructor of the parent
@@ -66,6 +70,7 @@
function perform()
{
// fetch the values from the form which have already been validated
+ $this->_blogName = $this->_request->getValue( "blogName" );
$this->_blogLocale = $this->_request->getValue( "blogLocale" );
$this->_blogTemplate = $this->_request->getValue( "blogTemplate" );
$this->_blogOwner = $this->_request->getValue( "blogOwner" );
@@ -105,9 +110,10 @@
$blogSettings = $blogInfo->getSettings();
$blogSettings->setValue( "locale", $this->_blogLocale );
$blogSettings->setValue( "template", $this->_blogTemplate );
- $blogSettings->setValue( "blog_resources_quota", $this->_blogQuota );
$blogSettings->setValue( "time_offset", $this->_blogTimeOffset );
$blogInfo->setSettings( $blogSettings );
+ $blogInfo->setResourcesQuota( $this->_blogQuota );
+ $blogInfo->setBlog( $this->_blogName );
$blogInfo->setProperties( $this->_blogProperties );
$blogInfo->setOwner( $this->_blogOwner );
$blogInfo->setStatus( $this->_blogStatus );
Modified: plog/trunk/class/view/admin/admineditsiteblogview.class.php
===================================================================
--- plog/trunk/class/view/admin/admineditsiteblogview.class.php 2004-12-17 15:24:21 UTC (rev 522)
+++ plog/trunk/class/view/admin/admineditsiteblogview.class.php 2004-12-17 15:24:46 UTC (rev 523)
@@ -43,6 +43,8 @@
$blogSettings = $this->_editBlogInfo->getSettings();
$this->setValue( "blogTimeOffset", $blogSettings->getValue( "time_offset" ));
$this->setValue( "blogOwner", $this->_editBlogInfo->getOwner());
+ $this->setValue( "blogName", $this->_editBlogInfo->getBlog());
+ $this->setValue( "blogResourcesQuota", $this->_editBlogInfo->getResourcesQuota());
// get all the users
$users = new Users();
$siteUsers = $users->getAllUsers();
Modified: plog/trunk/templates/admin/editblog.template
===================================================================
--- plog/trunk/templates/admin/editblog.template 2004-12-17 15:24:21 UTC (rev 522)
+++ plog/trunk/templates/admin/editblog.template 2004-12-17 15:24:46 UTC (rev 523)
@@ -3,64 +3,78 @@
{include file="$admintemplatepath/formvalidate.template" message=$locale->tr("error_updating_settings")}
<form name="blogSettings" action="admin.php" method="post">
- <table width="100%">
- <tr>
- <td class="none" width="25%">{$locale->tr("blog_id")}: </td>
- <td>{$editblog->getId()}</td>
- </tr>
- <tr>
- <td class="none">{$locale->tr("blog_owner")}:</td>
- <td>
- <select name="blogOwner">
+ <fieldset class="inputField">
+ <legend>{$locale->tr("editBlog")}</legend>
+
+ <div clas="field">
+ <label for="blogLink">{$locale->tr("blog_link")}</label>
+ <span class="required"></span>
+ <div class="formHelp">{$locale->tr("permanent_blog_url")}</div>
+ {assign var=editBlogUrlGenerator value=$editblog->getBlogRequestGenerator()}
+ <input style="width:100%" type="text" readonly="readonly" name="blogLink" class="readOnly" value="{$editBlogUrlGenerator->blogLink()}" />
+ </div>
+
+ <div class="field">
+ <label for="blogName">{$locale->tr("blog_name")}</label>
+ <span class="required">*</span>
+ <div class="formHelp">{$locale->tr("blog_name")}</div>
+ <input type="text" name="blogName" style="width:100%" value="{$blogName|escape:"html"}" />
+ {include file="$admintemplatepath/validate.template" field=blogName message=$locale->tr("error_no_blog_name")}
+ </div>
+
+ <div class="field">
+ <label for="blogStatus">{$locale->tr("status")}</label>
+ <span class="required">*</span>
+ <div class="formHelp">{$locale->tr("blog_status_help")}</div>
+ <select name="blogStatus">
+ {foreach from=$blogStatusList key=statusName item=blogStatusValue}
+ <option value="{$blogStatusValue}" {if $blogStatus==$blogStatusValue}selected="selected"{/if}>{$locale->tr($statusName)}</option>
+ {/foreach}
+ </select>
+ </div>
+
+ <div class="field">
+ <label for="blogOwner">{$locale->tr("owner")}</label>
+ <span class="required">*</span>
+ <div class="formHelp">{$locale->tr("blog_owner_help")}</div>
+ <select name="blogOwner">
{foreach from=$siteusers item=siteuser}
<option value="{$siteuser->getId()}" {if $blogOwner == $siteuser->getId()} selected="selected" {/if}>{$siteuser->getUsername()}</option>
{/foreach}
- </select>
- </td>
- </tr>
- <tr class="none" width="25%">
- <td>{$locale->tr("status")}</td>
- <td>
- <select name="blogStatus">
- {foreach from=$blogStatusList key=statusName item=blogStatusValue}
- <option value="{$blogStatusValue}" {if $blogStatus==$blogStatusValue}selected="selected"{/if}>{$locale->tr($statusName)}</option>
- {/foreach}
- </select>
- </td>
- </tr>
- <tr>
- <td class="none" width="25%">{$locale->tr("permanent_blog_url")}: </td>
- {assign var=editBlogUrlGenerator value=$editblog->getBlogRequestGenerator()}
- <td><input style="width:100%" type="text" readonly="readonly" name="blogLink" value="{$editBlogUrlGenerator->blogLink()}" /></td>
- </tr>
- <tr>
- <td class="none" width="25%">{$locale->tr("blog_name")}: </td>
- <td>{$editblog->getBlog()}</td>
- </tr>
- <td class="none">{$locale->tr("language_used")}: </td>
- <td>
- <select name="blogLocale">
+ </select>
+ </div>
+
+ <div class="field">
+ <label for="blogLocale">{$locale->tr("language")}</label>
+ <span class="required">*</span>
+ <div class="formHelp">{$locale->tr("language_used")}</div>
+ <select name="blogLocale" value="{$blogsettings->getValue("locale")}">
{foreach from=$locales item=localeobject}
<option value="{$localeobject->getLocaleCode()}" {if $localeobject->getLocaleCode()==$blogLocale} selected="selected" {/if}>
{$localeobject->getDescription()} ({$localeobject->getLocaleCode()} {$localeobject->getCharset()})
</option>
{/foreach}
</select>
- </td>
- </tr>
- <tr>
- <td class="none">{$locale->tr("template_used")}: </td>
- <td>
- <select name="blogTemplate">
+ {include file="$admintemplatepath/validate.template" field=blogLocale message=$locale->tr("error_invalid_locale")}
+ </div>
+
+ <div class="field">
+ <label for="blogTemplate">{$locale->tr("template")}</label>
+ <span class="required">*</span>
+ <div class="formHelp">{$locale->tr("template_used")}</div>
+ {assign var=blogTemplateSet value=$blog->getTemplateSet()}
+ <select name="blogTemplate">
{foreach from=$templates item=template}
- <option value="{$template->getName()}"{if $template->getName() == $blogTemplate} selected="selected" {/if}>{$template->getName()}</option>
+ <option value="{$template->getName()}"{if $template->getName() == $blogTemplateSet->getName()} selected="selected" {/if}>{$template->getName()}</option>
{/foreach}
- </select><br/><br/>
- </td>
- </tr>
- <tr>
- <td class="none">{$locale->tr("time_offset")}</td>
- <td>
+ </select>
+ <a href="javascript:openTemplateChooserWindow();">{$locale->tr("choose")}...</a>
+ <br/>{include file="$admintemplatepath/validate.template" field=blogTemplate message=$locale->tr("error_incorrect_template")}
+ </div>
+
+ <div class="field">
+ <label for="blogTimeOffset">{$locale->tr("time_offset")}</label>
+ <div class="formHelp">{$locale->tr("time_offset")}</div>
<select name="blogTimeOffset">
<option {if $blogTimeOffset == -20} selected="selected"{/if} value="-20">-20 {$locale->tr("hours")}</option>
<option {if $blogTimeOffset == -19} selected="selected"{/if} value="-19">-19 {$locale->tr("hours")}</option>
@@ -68,8 +82,8 @@
<option {if $blogTimeOffset == -17} selected="selected"{/if} value="-17">-17 {$locale->tr("hours")}</option>
<option {if $blogTimeOffset == -16} selected="selected"{/if} value="-16">-16 {$locale->tr("hours")}</option>
<option {if $blogTimeOffset == -15} selected="selected"{/if} value="-15">-15 {$locale->tr("hours")}</option>
- <option {if $blogTimeOffset == -14} selected="selected"{/if} value="-14">-14 {$locale->tr("hours")}</option>
- <option {if $blogTimeOffset == -13} selected="selected"{/if} value="-13">-13 {$locale->tr("hours")}</option>
+ <option {if $blogTimeOffset == -14} selected="selected"{/if} value="-14">-14 {$locale->tr("hours")}</option>
+ <option {if $blogTimeOffset == -13} selected="selected"{/if} value="-13">-13 {$locale->tr("hours")}</option>
<option {if $blogTimeOffset == -12} selected="selected"{/if} value="-12">-12 {$locale->tr("hours")}</option>
<option {if $blogTimeOffset == -11} selected="selected"{/if}value="-11">-11 {$locale->tr("hours")}</option>
<option {if $blogTimeOffset == -10} selected="selected"{/if}value="-10">-10 {$locale->tr("hours")}</option>
@@ -96,28 +110,27 @@
<option {if $blogTimeOffset == 11} selected="selected"{/if}value="11">+11 {$locale->tr("hours")}</option>
<option {if $blogTimeOffset == 12} selected="selected"{/if}value="12">+12 {$locale->tr("hours")}</option>
<option {if $blogTimeOffset == 13} selected="selected"{/if} value="13">+13 {$locale->tr("hours")}</option>
- <option {if $blogTimeOffset == 14} selected="selected"{/if} value="14">+14 {$locale->tr("hours")}</option>
+ <option {if $blogTimeOffset == 14} selected="selected"{/if} value="14">+14 {$locale->tr("hours")}</option>
<option {if $blogTimeOffset == 15} selected="selected"{/if} value="15">+15 {$locale->tr("hours")}</option>
<option {if $blogTimeOffset == 16} selected="selected"{/if} value="16">+16 {$locale->tr("hours")}</option>
<option {if $blogTimeOffset == 17} selected="selected"{/if} value="17">+17 {$locale->tr("hours")}</option>
<option {if $blogTimeOffset == 18} selected="selected"{/if} value="18">+18 {$locale->tr("hours")}</option>
<option {if $blogTimeOffset == 19} selected="selected"{/if} value="19">+19 {$locale->tr("hours")}</option>
- <option {if $blogTimeOffset == 20} selected="selected"{/if} value="20">+20 {$locale->tr("hours")}</option>
+ <option {if $blogTimeOffset == 20} selected="selected"{/if} value="20">+20 {$locale->tr("hours")}</option>
</select>
- </td>
- </tr>
- <tr>
- <td class="none">{$locale->tr("blog_resources_quota")}:</td>
- <td>
- <input type="text" name="blogResourcesQuota" value="{$blogResourcesQuota}" />
- {include file="$admintemplatepath/validate.template" field=blogResourcesQuota message=$locale->tr("error_invalid_quota")}
- </td>
- </tr>
- <tr>
- <td class="none">
- {$locale->tr("users")}:
- </td>
- <td>
+ {include file="$admintemplatepath/validate.template" field=blogTimeOffset message=$locale->tr("error_incorrect_time_offset")}
+ </div>
+
+ <div class="field">
+ <label for="blogResourcesQuota">{$locale->tr("quota")}</label>
+ <div class="formHelp">{$locale->tr("quota_help")}</div>
+ <input type="text" name="blogResourcesQuota" value="{$blogResourcesQuota}" />
+ {include file="$admintemplatepath/validate.template" field=blogResourcesQuota message=$locale->tr("error_invalid_quota")}
+ </div>
+
+ <div class="field">
+ <label for="blogUsers[]">{$locale->tr("users")}</label>
+ <div class="formHelp">{$locale->tr("blog_users_help")}</div>
<select id="availableUsers[]" name="availableUsers[]" size="10">
<option value="-1">-- {$locale->tr("please_add_or_remove")} --</option>
{foreach from=$availableusers item=siteuser}
@@ -134,17 +147,14 @@
<option value="{$bloguser->getId()}">{$bloguser->getUsername()}</option>
{/foreach}
</select>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <input type="submit" name="{$locale->tr("update")} {$editblog->getBlog()}" value="{$locale->tr("update")} {$editblog->getBlog()}" />
+ </div>
+ </fieldset>
+ <div class="buttons">
+ <input type="reset" name="reset" value="{$locale->tr("reset")}" />
+ <input type="submit" name="{$locale->tr("update")}" value="{$locale->tr("update")} {$editblog->getBlog()}" />
<input type="hidden" name="op" value="updateEditBlog" />
<input type="hidden" name="blogId" value="{$editblog->getId()}"/>
- </td>
- </tr>
- </table>
+ </div>
</form>
{include file="$admintemplatepath/footernavigation.template"}
More information about the pLog-svn
mailing list