[pLog-svn] r1029 - in plog/trunk: class/action/admin locale
templates/admin
oscar at devel.plogworld.net
oscar at devel.plogworld.net
Thu Feb 10 15:28:17 GMT 2005
Author: oscar
Date: 2005-02-10 15:28:16 +0000 (Thu, 10 Feb 2005)
New Revision: 1029
Modified:
plog/trunk/class/action/admin/adminaddblogtemplateaction.class.php
plog/trunk/class/action/admin/adminaddtemplateaction.class.php
plog/trunk/class/action/admin/adminnewblogtemplateaction.class.php
plog/trunk/class/action/admin/adminnewtemplateaction.class.php
plog/trunk/locale/locale_en_UK.php
plog/trunk/templates/admin/newblogtemplate.template
plog/trunk/templates/admin/newglobaltemplate.template
Log:
adapted two more screen that had not been adapted yet, the ones that allow blog users and site admins to upload new templates or tell plog to rescan the template folder and look for new templates. I've finally ended up with
two buttons: one for uploading the file and one for rescaning the folder, plus added
a lengthy but I hope understandable description informing how to add
new templates if files cannot be uploaded.
Modified: plog/trunk/class/action/admin/adminaddblogtemplateaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminaddblogtemplateaction.class.php 2005-02-10 07:31:12 UTC (rev 1028)
+++ plog/trunk/class/action/admin/adminaddblogtemplateaction.class.php 2005-02-10 15:28:16 UTC (rev 1029)
@@ -26,7 +26,11 @@
{
$this->BlogOwnerAdminAction( $actionInfo, $request );
- $this->_op = $actionInfo->getActionParamValue();
+ // decide what to do based on which submit button was pressed
+ if( $this->_request->getValue( "addBlogTemplate" ) != "" )
+ $this->_op = "addBlogTemplate";
+ else
+ $this->_op = "scanBlogTemplates";
}
function validate()
@@ -58,6 +62,7 @@
if( count($files) == 0 || $files["templateFile"]["name"] == "") {
$this->_view = new AdminTemplatedView( $this->_blogInfo, "newblogtemplate" );
+ $this->_view->setValue( "templateFolder", TemplateSetStorage::getBlogBaseTemplateFolder( $this->_blogInfo->getId()));
$this->_view->setErrorMessage( $this->_locale->tr("error_must_upload_file"));
$this->setCommonData();
return false;
Modified: plog/trunk/class/action/admin/adminaddtemplateaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminaddtemplateaction.class.php 2005-02-10 07:31:12 UTC (rev 1028)
+++ plog/trunk/class/action/admin/adminaddtemplateaction.class.php 2005-02-10 15:28:16 UTC (rev 1029)
@@ -27,7 +27,11 @@
{
$this->SiteAdminAction( $actionInfo, $request );
- $this->_op = $actionInfo->getActionParamValue();
+ // decide what to do based on which submit button was pressed
+ if( $this->_request->getValue( "addTemplateUpload" ) != "" )
+ $this->_op = "addTemplateUpload";
+ else
+ $this->_op = "scanTemplates";
}
/**
@@ -67,6 +71,14 @@
// handle the uploaded file
$files = HttpVars::getFiles();
$uploads = new FileUploads( $files );
+
+ if( count($files) == 0 || $files["templateFile"]["name"] == "") {
+ $this->_view = new AdminTemplatedView( $this->_blogInfo, "newglobaltemplate" );
+ $this->_view->setValue( "templateFolder", TemplateSetStorage::getBaseTemplateFolder());
+ $this->_view->setErrorMessage( $this->_locale->tr("error_must_upload_file"));
+ $this->setCommonData();
+ return false;
+ }
$config =& Config::getConfig();
Modified: plog/trunk/class/action/admin/adminnewblogtemplateaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminnewblogtemplateaction.class.php 2005-02-10 07:31:12 UTC (rev 1028)
+++ plog/trunk/class/action/admin/adminnewblogtemplateaction.class.php 2005-02-10 15:28:16 UTC (rev 1029)
@@ -8,6 +8,7 @@
include_once( PLOG_CLASS_PATH."class/action/admin/blogowneradminaction.class.php" );
include_once( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
include_once( PLOG_CLASS_PATH."class/view/admin/adminerrorview.class.php" );
+ include_once( PLOG_CLASS_PATH."class/template/templatesets/templatesetstorage.class.php" );
/**
* Shows a form to add a new locale file
@@ -21,8 +22,9 @@
function perform()
{
- if( $this->_config->getValue( "users_can_add_templates" ) == true ) {
+ if( $this->_config->getValue( "users_can_add_templates" ) == true ) {
$this->_view = new AdminTemplatedView( $this->_blogInfo, "newblogtemplate" );
+ $this->_view->setValue( "templateFolder", TemplateSetStorage::getBlogBaseTemplateFolder( $this->_blogInfo->getId()));
$this->setCommonData();
}
else {
Modified: plog/trunk/class/action/admin/adminnewtemplateaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminnewtemplateaction.class.php 2005-02-10 07:31:12 UTC (rev 1028)
+++ plog/trunk/class/action/admin/adminnewtemplateaction.class.php 2005-02-10 15:28:16 UTC (rev 1029)
@@ -7,6 +7,7 @@
include_once( PLOG_CLASS_PATH."class/action/admin/siteadminaction.class.php" );
include_once( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
+ include_once( PLOG_CLASS_PATH."class/template/templatesets/templatesetstorage.class.php" );
/**
* Shows a form to add a new locale file
@@ -21,6 +22,7 @@
function perform()
{
$this->_view = new AdminTemplatedView( $this->_blogInfo, "newglobaltemplate" );
+ $this->_view->setValue( "templateFolder", TemplateSetStorage::getBaseTemplateFolder());
$this->setCommonData();
return true;
Modified: plog/trunk/locale/locale_en_UK.php
===================================================================
--- plog/trunk/locale/locale_en_UK.php 2005-02-10 07:31:12 UTC (rev 1028)
+++ plog/trunk/locale/locale_en_UK.php 2005-02-10 15:28:16 UTC (rev 1029)
@@ -581,6 +581,9 @@
$messages['error_forbidden_extensions'] = 'The template set included files with forbidden extensions';
$messages['error_creating_working_folder'] = 'There was an error creating a temporary folder to unpack the files';
$messages['error_checking_template'] = 'There was an error checking the template: %s';
+$messages['template_package'] = 'Template package';
+$messages['blog_template_package_help'] = 'Use this form to upload a new template set, which will only be available to your blog. If it is not possible to upload a template package using this form, upload the template set manually and place it in <b>%s</b>, which is the folder where your blog templates are stored and click the "<b>Scan templates</b>" button. pLog will scan the folder and will automatically add any new template it can find.';
+$messages['scan_templates'] = 'Scan Templates';
// site users
$messages['user_status_active'] = 'Active';
@@ -659,6 +662,9 @@
// site templates
$messages['error_template_is_default'] = 'Template "%s" cannot be deleted because it is the default one for new blogs';
+// add template
+$messages['global_template_package_help'] = 'Use this form to upload a new template set, which will be available to all blogs in the site. If it is not possible to upload a template package using this form, upload the template set manually and place it in <b>%s</b>, which is the folder where globally available templates are stored and click the "<b>Scan templates</b>" button. pLog will scan the folder and will automatically add any new template it can find.';
+
// global settings
$messages['site_config_saved_ok'] = 'Site settings saved successfully';
$messages['error_saving_site_config'] = 'There was an error saving the site settings';
Modified: plog/trunk/templates/admin/newblogtemplate.template
===================================================================
--- plog/trunk/templates/admin/newblogtemplate.template 2005-02-10 07:31:12 UTC (rev 1028)
+++ plog/trunk/templates/admin/newblogtemplate.template 2005-02-10 15:28:16 UTC (rev 1029)
@@ -1,28 +1,23 @@
{include file="admin/header.template"}
{include file="admin/navigation.template" showOpt=newBlogTemplate title=$locale->tr("newBlogTemplate")}
+<form name="newBlogTemplate" action="admin.php" method="post" enctype="multipart/form-data">
+ <fieldset class="inputField">
+ <legend>{$locale->tr("newBlogTemplate")}</legend>
{include file="$admintemplatepath/successmessage.template"}
{include file="$admintemplatepath/errormessage.template"}
-<p>
- {$locale->tr("template_available_only_for_this_blog")}
- </p>
- {if $uploads_enabled}
- <p>
- {$locale->tr("use_form_to_upload_blog_template")}
- </p>
- <form name="uploadTemplateFile" enctype="multipart/form-data" action="admin.php" method="post">
- {$locale->tr("template_file")}: <input type="file" name="templateFile" value="" /><br />
+ <div class="field">
+ <label for="templateFile">{$locale->tr("template_package")}</label>
+ <span class="required">*</span>
+ <div class="formHelp">{$locale->pr("blog_template_package_help", $templateFolder)}</div>
+ <input type="file" name="templateFile" value="" />
+ </div>
+ </fieldset>
+ <div class="buttons">
+ <input type="reset" name="reset" value="{$locale->tr("reset")}" />
<input type="hidden" name="op" value="addBlogTemplate" />
- <input type="hidden" name="subOp" value="uploadTemplate" />
- <input type="submit" name="Upload Template" value="{$locale->tr("upload_template")}" />
- </form>
- <h3>{$locale->tr("manually_add_blog_template")}</h3>
- {/if}
- <p>
- {$locale->tr("use_form_if_cannot_upload_blog_template")}
- </p>
- <form name="addTemplateCode" action="admin.php" method="post">
- <input type="hidden" name="op" value="scanBlogTemplates" />
- <input type="submit" name="Upload Template" value="{$locale->tr("scan_templates")}" />
- </form>
+ <input type="submit" name="scanBlogTemplates" value="{$locale->tr("scan_templates")}" />
+ <input type="submit" name="addBlogTemplate" value="{$locale->tr("add")}" />
+ </div>
+</form>
{include file="admin/footernavigation.template"}
{include file="admin/footer.template"}
\ No newline at end of file
Modified: plog/trunk/templates/admin/newglobaltemplate.template
===================================================================
--- plog/trunk/templates/admin/newglobaltemplate.template 2005-02-10 07:31:12 UTC (rev 1028)
+++ plog/trunk/templates/admin/newglobaltemplate.template 2005-02-10 15:28:16 UTC (rev 1029)
@@ -1,28 +1,23 @@
{include file="admin/header.template"}
{include file="admin/navigation.template" showOpt=newTemplate title=$locale->tr("newTemplate")}
-
- {if $viewIsError}
+<form name="newTemplate" action="admin.php" method="post" enctype="multipart/form-data">
+ <fieldset class="inputField">
+ <legend>{$locale->tr("newTemplate")}</legend>
+ {include file="$admintemplatepath/successmessage.template"}
{include file="$admintemplatepath/errormessage.template"}
- {/if}
-
- {if $uploads_enabled}
- <p>
- {$locale->tr("use_this_form_to_upload_template")}
- </p>
- <form name="uploadTemplateFile" enctype="multipart/form-data" action="admin.php" method="post">
- {$locale->tr("template_file")}: <input type="file" name="templateFile" value="" /><br />
+ <div class="field">
+ <label for="templateFile">{$locale->tr("template_package")}</label>
+ <span class="required">*</span>
+ <div class="formHelp">{$locale->pr("global_template_package_help", $templateFolder)}</div>
+ <input type="file" name="templateFile" value="" />
+ </div>
+ </fieldset>
+ <div class="buttons">
+ <input type="reset" name="reset" value="{$locale->tr("reset")}" />
<input type="hidden" name="op" value="addTemplateUpload" />
- <input type="submit" name="Upload Template" value="{$locale->tr("upload_template")}" />
- </form>
- <h3>{$locale->tr("manually_add_template")}</h3>
- {/if}
- <p>
- {$locale->tr("use_this_form_if_cannot_upload_template")}
- </p>
- <form name="addTemplateCode" action="admin.php" method="post">
- <input type="hidden" name="op" value="scanTemplates" />
- <input type="submit" name="Upload Template" value="{$locale->tr("scan_templates")}" />
- </form>
-
+ <input type="submit" name="scanTemplates" value="{$locale->tr("scan_templates")}" />
+ <input type="submit" name="addTemplateUpload" value="{$locale->tr("add")}" />
+ </div>
+</form>
{include file="admin/footernavigation.template"}
-{include file="admin/footer.template"}
+{include file="admin/footer.template"}
\ No newline at end of file
More information about the pLog-svn
mailing list