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

oscar at devel.lifetype.net oscar at devel.lifetype.net
Sat Sep 22 05:42:27 EDT 2007


Author: oscar
Date: 2007-09-22 05:42:27 -0400 (Sat, 22 Sep 2007)
New Revision: 5946

Added:
   plog/trunk/class/action/admin/adminjsaction.class.php
Modified:
   plog/trunk/class/controller/admincontrollermap.properties.php
   plog/trunk/templates/admin/header.template
   plog/trunk/templates/admin/jsconfig.template
   plog/trunk/templates/admin/jslocale.template
Log:
Added the new AdminJsAction class that is used to serve 'dynamic' javascript data such as locale messages or configuration data for the javascript libraries. We also save some bandwidth because we don't have to include these in every template until so far, but instead reference this data via an <script> tag and allow the browser to cache it.


Added: plog/trunk/class/action/admin/adminjsaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminjsaction.class.php	                        (rev 0)
+++ plog/trunk/class/action/admin/adminjsaction.class.php	2007-09-22 09:42:27 UTC (rev 5946)
@@ -0,0 +1,20 @@
+<?php
+	
+	lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
+	lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
+
+	class AdminJsAction extends AdminAction
+	{
+		function perform()
+		{
+			if( $this->_request->getValue( "mode" ) == "config" )
+				$this->_view = new AdminTemplatedView( $this->_blogInfo, "jsconfig" );
+			else
+				$this->_view = new AdminTemplatedView( $this->_blogInfo, "jslocale" );
+				
+			$this->setCommonData();
+			
+			return( true );
+		}
+	}
+?>
\ No newline at end of file

Modified: plog/trunk/class/controller/admincontrollermap.properties.php
===================================================================
--- plog/trunk/class/controller/admincontrollermap.properties.php	2007-09-22 08:45:56 UTC (rev 5945)
+++ plog/trunk/class/controller/admincontrollermap.properties.php	2007-09-22 09:42:27 UTC (rev 5946)
@@ -374,5 +374,7 @@
 	$actions["copyBlogTemplateFile"] = "AdminCopyBlogTemplateFileAction";
 	$actions["copyBlogTemplateSet"] = "AdminCopyBlogTemplateSetAction";	
 	$actions["newBlogTemplateFile"] = "AdminNewBlogTemplateFileAction";	
-	$actions["uploadBlogTemplateFile"] = "AdminUploadBlogTemplateFileAction";	
+	$actions["uploadBlogTemplateFile"] = "AdminUploadBlogTemplateFileAction";
+	// returns some javascript code containing the locale strings needed by the javascript classes
+	$actions["js"] = "AdminJsAction";
 ?>
\ No newline at end of file

Modified: plog/trunk/templates/admin/header.template
===================================================================
--- plog/trunk/templates/admin/header.template	2007-09-22 08:45:56 UTC (rev 5945)
+++ plog/trunk/templates/admin/header.template	2007-09-22 09:42:27 UTC (rev 5946)
@@ -44,8 +44,8 @@
   <link rel="stylesheet" href="js/JSCookMenu/ThemeOffice/theme.css" type="text/css" />
   {js src="js/JSCookMenu/ThemeOffice/theme.js"}
 {/if}
-{include file="$admintemplatepath/jsconfig.template"}
-{include file="$admintemplatepath/jslocale.template"}
+{js src="?op=js&amp;mode=config"}
+{js src="?op=js&amp;mode=locale"}
 </head>
 <body>
 

Modified: plog/trunk/templates/admin/jsconfig.template
===================================================================
--- plog/trunk/templates/admin/jsconfig.template	2007-09-22 08:45:56 UTC (rev 5945)
+++ plog/trunk/templates/admin/jsconfig.template	2007-09-22 09:42:27 UTC (rev 5946)
@@ -1,13 +1,6 @@
-{**
-	Please place here all the global configuration settings that are
-	accessed by Javascript code. Use the Lifetype.Config class
-	to store them, do *not* use global variables!
-**}
-<script type="text/javascript">
-  	// base url where we can find the admin.php script
-	Lifetype.Config.setValue( 'base_url', "{$url->getBaseUrl(false)}" );
-	Lifetype.Config.setValue( 'script_name', "{$config->getValue("script_name")}" );	
-	Lifetype.Config.setValue( 'admin_base_url', "{$url->getBaseUrl(false)}/admin.php" );	
-	Lifetype.Config.setValue( 'blog_id', "{$blog->getId()}" );
-  	Lifetype.Config.setValue( 'htmlarea_enabled', {if $htmlarea==0 || !$htmlarea}false{else}true{/if} );	
-</script>
\ No newline at end of file
+// base url where we can find the admin.php script
+Lifetype.Config.setValue( 'base_url', "{$url->getBaseUrl(false)}" );
+Lifetype.Config.setValue( 'script_name', "{$config->getValue("script_name")}" );	
+Lifetype.Config.setValue( 'admin_base_url', "{$url->getBaseUrl(false)}/admin.php" );	
+Lifetype.Config.setValue( 'blog_id', "{$blog->getId()}" );
+Lifetype.Config.setValue( 'htmlarea_enabled', {if $htmlarea==0 || !$htmlarea}false{else}true{/if} );	
\ No newline at end of file

Modified: plog/trunk/templates/admin/jslocale.template
===================================================================
--- plog/trunk/templates/admin/jslocale.template	2007-09-22 08:45:56 UTC (rev 5945)
+++ plog/trunk/templates/admin/jslocale.template	2007-09-22 09:42:27 UTC (rev 5946)
@@ -1,5 +1,3 @@
-<script type="text/javascript">
-
 // bulk edit
 Lifetype.Locale.add( "show_massive_change_option", '{$locale->tr("show_massive_change_option")}' );
 Lifetype.Locale.add( 'hide_massive_change_option', '{$locale->tr("hide_massive_change_option")}');
@@ -54,5 +52,4 @@
 Lifetype.Locale.add( 'swfu_error_security', '{$locale->tr("swfu_error_security")}' );
 Lifetype.Locale.add( 'swfu_error_server_error', '{$locale->tr("swfu_error_server_error")}' );
 Lifetype.Locale.add( 'swfu_error_upload_failed', '{$locale->tr("swfu_error_upload_failed")}' );
-Lifetype.Locale.add( 'swfu_error_http_error', '{$locale->tr("swfu_error_http_error")}' );
-</script>
\ No newline at end of file
+Lifetype.Locale.add( 'swfu_error_http_error', '{$locale->tr("swfu_error_http_error")}' );
\ No newline at end of file



More information about the pLog-svn mailing list