[Phphtmllib-devel] SF.net SVN: phphtmllib:[3428] trunk/open2300/lib

[<he...@us...>]

Revision: 3428
          http://phphtmllib.svn.sourceforge.net/phphtmllib/?rev=3428&view=rev
Author:   hemna
Date:     2010-03-06 18:10:38 +0000 (Sat, 06 Mar 2010)

Log Message:
-----------
updates for showing remote metar in the banner

Modified Paths:
--------------
    trunk/open2300/lib/core/page/open2300Page.inc
    trunk/open2300/lib/modules/home/page/HomePage.inc
    trunk/open2300/lib/modules/home/widgets/RemoteMetarConditions.inc

Modified: trunk/open2300/lib/core/page/open2300Page.inc
===================================================================
--- trunk/open2300/lib/core/page/open2300Page.inc	2010-03-03 23:24:23 UTC (rev 3427)
+++ trunk/open2300/lib/core/page/open2300Page.inc	2010-03-06 18:10:38 UTC (rev 3428)
@@ -118,14 +118,18 @@
         $this->add_css_link("/css/main.css");
         $this->add_css_link("/css/fonts.css");
         $this->add_css_link("/css/menu.css");
+        $this->add_css_link("/css/prototip.css");
 
         //$this->add_js_link( '/js/scriptaculous-js-1.7.0/lib/prototype.js' );
         //$this->add_js_link( '/js/scriptaculous-js-1.7.0/src/scriptaculous.js' );
         $this->add_js_link( 'http://ajax.googleapis.com/ajax/libs/prototype/1/prototype.js' );
-        $this->add_js_link( 'http://ajax.googleapis.com/ajax/libs/scriptaculous/1/scriptaculous.js' );
+        $this->add_js_link( 'http://ajax.googleapis.com/ajax/libs/scriptaculous/1/scriptaculous.js?load=effects' );
+        $this->add_js_link( '/js/prototip.js' );
         $this->add_js_link( '/js/ajax.js' );
         $this->add_js_link( '/js/main.js' );        
         $this->add_js_link( '/js/banner.js' );
+        $this->add_head_js("Event.observe(window, 'load', main_init);");
+        $this->add_head_js("Event.observe(window, 'load', start_banner);");
     }
 
 	protected function header_block() {
@@ -134,22 +138,27 @@
 		
 		if ($this->include_ticker) {
 			$this->add_js_link( '/js/ticker.js' );
+			$this->add_head_js("Event.observe(window, 'load', start_ticker);");
 		}		
         
 
 		$header->add( new DIVtag(array('id' => 'idPageHeadText'),"Hemna's Weather Station"),
-		              new DIVtag(array('id' => 'idPageSubHeadText'),"Pilot Hill, CA")
+		              new DIVtag(array('id' => 'idPageSubHeadText'),"Pilot Hill, CA"),
+		              new DIVtag(array('id' => 'idMetarContainer'), 
+		                new Divtag(array("id" => "idMetar"), " ")
+		                )
 		               );
 		              
 		$table = TABLEtag::factory("1024",0,0,0,"center");
 
 		$table->add_row(new TDtag(array("id" => "headtopleft"), "Pilot Hill, CA  Weather"),
-		                new TDtag(array("id" => "headtopcenter"), ""),
-		                new TDtag(array("id" => "headtopright"), ""));
+		                new TDtag(array("id" => "headtopcenter"), " "),
+		                new TDtag(array("id" => "headtopright"), IMGtag::factory("/css/prototip_loader.gif")));
 
-		$table->add_row(new TDtag(array("id" => "pageheader", "colspan" => "3"),
-				        $header));
+		$table->add_row(new TDtag(array("id" => "pageheader", "colspan" => "3"),$header));
+		
 		$table->add_row(new TDtag(array('id' => self::ID_MENU, "colspan" => "3"), $this->menu_block()));
+
 		return $table;
     }
     

Modified: trunk/open2300/lib/modules/home/page/HomePage.inc
===================================================================
--- trunk/open2300/lib/modules/home/page/HomePage.inc	2010-03-03 23:24:23 UTC (rev 3427)
+++ trunk/open2300/lib/modules/home/page/HomePage.inc	2010-03-06 18:10:38 UTC (rev 3428)
@@ -31,10 +31,8 @@
 	function left_block() {
 	
 		$container = Container::factory();
-		$script = SCRIPTtag::factory();
-        $script->add("Event.observe(window, 'load', start_updates);");
+        $this->add_head_js("Event.observe(window, 'load', start_updates);");
         
-        $container->add($script);
         //$this->add_js_link("/js/cal.js");
                 
 		$left_div = new DIVtag(array('id'=> ''));

Modified: trunk/open2300/lib/modules/home/widgets/RemoteMetarConditions.inc
===================================================================
--- trunk/open2300/lib/modules/home/widgets/RemoteMetarConditions.inc	2010-03-03 23:24:23 UTC (rev 3427)
+++ trunk/open2300/lib/modules/home/widgets/RemoteMetarConditions.inc	2010-03-06 18:10:38 UTC (rev 3428)
@@ -145,10 +145,14 @@
     	//echo (var_export($tod, true)."\n");
     	$filename = "/images/banners/".$season."/".$tod."_";
     	
+    	$conditions["tod"] = $tod;
+    	
     	if ($rain) {
     		$filename .= "rain.jpg";
+    		$conditions["wx"] = "rain";
     	} else {
     		$filename .= $clouds.".jpg";
+    		$conditions["wx"] = $clouds;
     	}
     	
     	$conditions["filename"] = "http://".$GLOBALS["config"]->get("sitename").$filename;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.