[pLog-svn] r4711 - in plog/trunk: class/template/smarty/plugins js/ui templates/admin templates/standard
oscar at devel.lifetype.net
oscar at devel.lifetype.net
Sat Feb 10 14:26:05 EST 2007
Author: oscar
Date: 2007-02-10 14:26:05 -0500 (Sat, 10 Feb 2007)
New Revision: 4711
Modified:
plog/trunk/class/template/smarty/plugins/function.location_display.php
plog/trunk/js/ui/overlay.js
plog/trunk/templates/admin/header.template
plog/trunk/templates/admin/resources.template
plog/trunk/templates/standard/header.template
Log:
moved the LtOverlay class to the Lifetype.UI.Overlay namespace and modified all related files and templates
Modified: plog/trunk/class/template/smarty/plugins/function.location_display.php
===================================================================
--- plog/trunk/class/template/smarty/plugins/function.location_display.php 2007-02-10 18:49:29 UTC (rev 4710)
+++ plog/trunk/class/template/smarty/plugins/function.location_display.php 2007-02-10 19:26:05 UTC (rev 4711)
@@ -37,7 +37,7 @@
$code .= "<script type=\"text/javascript\" src=\"{$baseUrl}/js/yui/dom/dom-min.js\"></script>";
$code .= "<script type=\"text/javascript\" src=\"{$baseUrl}/js/yui/event/event-min.js\"></script>";
$code .= "<a id=\"$o\" href=\"#\">".$location->getDescription()."</a>";
- $code .= "<script type=\"text/javascript\">$o=new LtOverlay({url:'".$indexUrl."?op=locationDisplay&width=".$width."&height=".$height."&locId=".$location->getId()."',width:".$width.",height:".$height.",context:'$o',showCloseButton:true});</script>";
+ $code .= "<script type=\"text/javascript\">$o=new Lifetype.UI.Overlay({url:'".$indexUrl."?op=locationDisplay&width=".$width."&height=".$height."&locId=".$location->getId()."',width:".$width.",height:".$height.",context:'$o',showCloseButton:true});</script>";
return( $code );
}
Modified: plog/trunk/js/ui/overlay.js
===================================================================
--- plog/trunk/js/ui/overlay.js 2007-02-10 18:49:29 UTC (rev 4710)
+++ plog/trunk/js/ui/overlay.js 2007-02-10 19:26:05 UTC (rev 4711)
@@ -3,7 +3,7 @@
* { url: "xxx", width: xxx, height: xxx, context: element_id, showCloseButton:true|false }
*
*/
-LtOverlay = function( params )
+Lifetype.UI.Overlay = function( params )
{
// store the parameters as an attribute
this.params = params;
@@ -28,7 +28,7 @@
* @param e The event that was generated
* @param obj The object, so that 'this' actually points to this object.
*/
-LtOverlay.prototype.toggle = function( e, obj )
+Lifetype.UI.Overlay.prototype.toggle = function( e, obj )
{
if( !this.container ) {
// render our LtOverlay if it hasn't been rendered yet
@@ -80,7 +80,7 @@
* to get the popup called right away. Otherwise everything will be handled by the
* onClick event and the toggle() method
*/
-LtOverlay.prototype.render = function()
+Lifetype.UI.Overlay.prototype.render = function()
{
// create the container and attach the iframe
this.container = document.createElement( "div" );
@@ -133,7 +133,7 @@
*
* @return An object with attributes 'width' and 'height' containing the width and height of the window
*/
-LtOverlay.prototype.getWindowSize = function()
+Lifetype.UI.Overlay.prototype.getWindowSize = function()
{
var myWidth = 0, myHeight = 0;
if( typeof( window.innerWidth ) == 'number' ) {
@@ -161,7 +161,7 @@
* @param evt An Event object
* @return An integer containing the X coordinate of the event
*/
-LtOverlay.prototype.mouseX = function( evt )
+Lifetype.UI.Overlay.prototype.mouseX = function( evt )
{
if (evt.pageX)
return evt.pageX;
@@ -177,7 +177,7 @@
* @param evt An Event object
* @return An integer containing the Y coordinate of the event
*/
-LtOverlay.prototype.mouseY = function (evt)
+Lifetype.UI.Overlay.prototype.mouseY = function (evt)
{
if (evt.pageY)
return evt.pageY;
Modified: plog/trunk/templates/admin/header.template
===================================================================
--- plog/trunk/templates/admin/header.template 2007-02-10 18:49:29 UTC (rev 4710)
+++ plog/trunk/templates/admin/header.template 2007-02-10 19:26:05 UTC (rev 4711)
@@ -31,14 +31,13 @@
<script type="text/javascript" src="js/ui/default.js"></script>
<script type="text/javascript" src="js/ui/common.js"></script>
<script type="text/javascript" src="js/ui/forms.js"></script>
-<script type="text/javascript" src="js/ui/overlay.js"></script>
<script type="text/javascript" src="js/ui/core.js"></script>
<script type="text/javascript" src="js/ui/tableeffects.js"></script>
+<script type="text/javascript" src="js/ui/overlay.js"></script>
<!-- Yahoo UI Library -->
<script type="text/javascript" src="js/yui/yahoo/yahoo-min.js"></script>
<script type="text/javascript" src="js/yui/dom/dom-min.js"></script>
<script type="text/javascript" src="js/yui/event/event-min.js"></script>
->>>>>>> .merge-right.r4709
{if $blogEnablePullDownMenu}
<script type="text/javascript" src="js/JSCookMenu/JSCookMenu.js"></script>
<link rel="stylesheet" href="js/JSCookMenu/ThemeOffice/theme.css" type="text/css" />
Modified: plog/trunk/templates/admin/resources.template
===================================================================
--- plog/trunk/templates/admin/resources.template 2007-02-10 18:49:29 UTC (rev 4710)
+++ plog/trunk/templates/admin/resources.template 2007-02-10 19:26:05 UTC (rev 4711)
@@ -121,7 +121,7 @@
<img src="imgs/admin/icon_globe-16.png" alt="Location Data" />
</a>
<script type="text/javascript">
- o = new LtOverlay( {literal}{{/literal}url:plogBaseUrl + "/" + scriptName + "?op=locationDisplay&locId={$location->getId()}&height=350&width=350",height:350,width:350,context:"res_{$resource->getId()}",showCloseButton:true{literal}}{/literal});
+ o = new Lifetype.UI.Overlay( {literal}{{/literal}url:plogBaseUrl + "/" + scriptName + "?op=locationDisplay&locId={$location->getId()}&height=350&width=350",height:350,width:350,context:"res_{$resource->getId()}",showCloseButton:true{literal}}{/literal});
</script>
{/if}
<a href="admin.php?op=resourceInfo&resourceId={$resource->getId()}">{$resource->getFileName()}</a>
Modified: plog/trunk/templates/standard/header.template
===================================================================
--- plog/trunk/templates/standard/header.template 2007-02-10 18:49:29 UTC (rev 4710)
+++ plog/trunk/templates/standard/header.template 2007-02-10 19:26:05 UTC (rev 4711)
@@ -14,6 +14,7 @@
<link rel="alternate" type="application/xml" title="RSS 0.90" href="{$url->rssLink("rss090")}" />
<link rel="alternate" type="application/atom+xml" title="Atom 0.3" href="{$url->rssLink("atom")}" />
<link rel="shortcut icon" type="image/x-icon" href="{$url->getTemplateFile("favicon.ico")}" />
+ <script type="text/javascript" src="{$url->getBaseUrl(false)}/js/ui/core.js"></script>
<script type="text/javascript" src="{$url->getBaseUrl(false)}/js/ui/overlay.js"></script>
</head>
<body>
More information about the pLog-svn
mailing list