[pLog-svn] r1030 - in plog/trunk: class/action/admin templates/admin

[oscar at devel.plogworld.net]

Author: oscar
Date: 2005-02-10 16:02:38 +0000 (Thu, 10 Feb 2005)
New Revision: 1030

Modified:
   plog/trunk/class/action/admin/adminaddlocaleaction.class.php
   plog/trunk/templates/admin/newlocale.template
Log:
integrated the "new locale" screen


Modified: plog/trunk/class/action/admin/adminaddlocaleaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminaddlocaleaction.class.php	2005-02-10 15:28:16 UTC (rev 1029)
+++ plog/trunk/class/action/admin/adminaddlocaleaction.class.php	2005-02-10 16:02:38 UTC (rev 1030)
@@ -22,8 +22,11 @@
         {
         	$this->SiteAdminAction( $actionInfo, $request );
 
-		$this->_op = $actionInfo->getActionParamValue();
-
+        	// decide what to do based on which submit button was clicked
+        	if( $this->_request->getValue( "addLocale" ) != "" )
+        		$this->_op = "uploadLocale";
+        	else
+        		$this->_op = "scanLocales";
         }
 
         function validate()

Modified: plog/trunk/templates/admin/newlocale.template
===================================================================
--- plog/trunk/templates/admin/newlocale.template	2005-02-10 15:28:16 UTC (rev 1029)
+++ plog/trunk/templates/admin/newlocale.template	2005-02-10 16:02:38 UTC (rev 1030)
@@ -1,29 +1,23 @@
 {include file="$admintemplatepath/header.template"}
 {include file="$admintemplatepath/navigation.template" showOpt=newLocale title=$locale->tr("newLocale")}
-
- {if $viewIsError}
+<form name="uploadLocaleFile" enctype="multipart/form-data" action="admin.php" method="post">
+ <fieldset class="inputField">
+  <legend>{$locale->tr("newLocale")}</legend>
+  {include file="$admintemplatepath/successmessage.template"}
   {include file="$admintemplatepath/errormessage.template"}
- {/if}
-
- <h3>{$locale->tr("upload_locale")}</h3>
- {if $uploads_enabled}
- <p>
-  {$locale->tr("use_this_form_to_upload_locale")}
- </p>
- <form name="uploadLocaleFile" enctype="multipart/form-data" action="admin.php" method="post">
-  {$locale->tr("locale_file")}: <input type="file" name="localeFile" value="" /><br />
+  <div class="field">
+   <label for="templateFile">{$locale->tr("locale")}</label> 
+   <span class="required">*</span>
+   <div class="formHelp">{$locale->pr("add_locale_help", $templateFolder)}</div>
+   <input type="file" name="localeFile" value="" />
+  </div>
+ </fieldset>
+ <div class="buttons">
+  <input type="reset" name="reset" value="{$locale->tr("reset")}" />
   <input type="hidden" name="op" value="uploadLocale" />
-  <input type="submit" name="Add Locale" value="{$locale->tr("upload_locale")}" />
- </form>
- <h3>{$locale->tr("manually_add_locale")}</h3>
- {/if}
- <p>
-  {$locale->tr("use_this_form_if_cant_upload_locale")}
- </p>
- <form name="addLocaleCode" action="admin.php" method="post">
-  <input type="hidden" name="op" value="scanLocales" />
-  <input type="submit" name="Add Locale" value="{$locale->tr("scan_locales")}" />
- </form>
-
+  <input type="submit" name="scanLocales" value="{$locale->tr("scan_locales")}" />  
+  <input type="submit" name="addLocale" value="{$locale->tr("add")}" />    
+ </div>
+</form> 
 {include file="$admintemplatepath/footernavigation.template"}
 {include file="$admintemplatepath/footer.template"}
\ No newline at end of file