[phpwebapp-commits] CVS: web_app class.WebApp.php,1.7,1.8

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/phpwebapp/web_app
In directory sc8-pr-cvs1:/tmp/cvs-serv19302

Modified Files:
	class.WebApp.php 
Log Message:
'eventhandler/on.firstTime.php'   was replaced by 'init.php'
'eventhandler/on.beforePage.php'  was replaced by 'before_page.php'
Fixed webapp_styles.

Index: class.WebApp.php
===================================================================
RCS file: /cvsroot/phpwebapp/web_app/class.WebApp.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** class.WebApp.php	7 Aug 2003 16:12:22 -0000	1.7
--- class.WebApp.php	15 Aug 2003 07:01:19 -0000	1.8
***************
*** 57,67 ****
        $webPage->timer->Start("WebApp", $comment);

!       //call the handler 'on_beforePage' if it exists           
!       $fname = EVENTHANDLER_PATH."on.beforePage.php";
!       if (file_exists($fname))
!         {
!           include_once $fname;
!           on_beforePage($event);
!         }

        //construct the structure of the web page 
--- 57,63 ----
        $webPage->timer->Start("WebApp", $comment);

!       //include 'before_page.php' if it exists           
!       $fname = APP_PATH."before_page.php";
!       if (file_exists($fname))  include_once $fname;

        //construct the structure of the web page 
***************
*** 70,73 ****
--- 66,77 ----
        $parser->parse_main($tpl_file);

+       //append to <head> the JS code that initiates the JS timer
+       $webPage->append_to_head($webPage->timer->JSTimer());
+ 
+       //add also the stylesheet of the framework
+       $webapp_styles = '  <link rel="stylesheet" type="text/css" '
+         . 'href="'.WEBAPP_URL.'styles.css">'."\n";
+       $webPage->append_to_head($webapp_styles);
+ 
        //parse and add the append.html after the MainTpl
        $tpl = $parser->parse_file(APPEND_PATH."append.html");
***************
*** 75,81 ****
        $webPage->append_to_body($tpl->id."\n");

-       //append to <head> the JS code that initiates the JS timer
-       $webPage->append_to_head($webPage->timer->JSTimer());
- 
        //render the html page
        global $render;
--- 79,82 ----
***************
*** 84,94 ****
        $render->render_MainTpl($webPage->rootTpl);

!       //call the handler 'on_afterPage' if it exists            
!       $fname = EVENTHANDLER_PATH."on.afterPage.php";
!       if (file_exists($fname))
!         {
!           include_once $fname;
!           on_afterPage($event);
!         }

        if ($collect)  return $render->html_page;
--- 85,91 ----
        $render->render_MainTpl($webPage->rootTpl);

!       //include 'after_page.php' if it exists            
!       $fname = APP_PATH."after_page.php";
!       if (file_exists($fname))  include_once $fname;

        if ($collect)  return $render->html_page;