[Phpgroupware-cvs] CVS: phpgwapi/templates/justweb phpgw.xsl,1.9,1.10 scripts.js,1.1,1.2

[Bettina Gille <address@hidden>]

Update of /cvsroot/phpgroupware/phpgwapi/templates/justweb
In directory subversions:/tmp/cvs-serv5286/justweb

Modified Files:
        phpgw.xsl scripts.js 
Log Message:
update js and css

Index: phpgw.xsl
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/templates/justweb/phpgw.xsl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** phpgw.xsl   20 Apr 2003 20:41:06 -0000      1.9
--- phpgw.xsl   24 Apr 2003 01:34:04 -0000      1.10
***************
*** 38,51 ****
                                <script type="text/javascript" 
language="javascript" 
src="{$webserver_url}/phpgwapi/templates/justweb/navcond.js"></script>
                                <script type="text/javascript" 
language="javascript" 
src="{$webserver_url}/phpgwapi/templates/justweb/scripts.js"></script>
                                <link rel="stylesheet" type="text/css" 
href="{$phpgw_css_file}"/>
                                <link rel="stylesheet" type="text/css" 
href="{$theme_css_file}"/>
-                               <xsl:value-of disable-output-escaping="yes" 
select="java_script"/>
                                <xsl:choose>
!                                       <xsl:when test="app_css">
                                                <style type="text/css">
                                                        
<xsl:text>&lt;!--</xsl:text>
                                                                <xsl:value-of 
disable-output-escaping="yes" select="app_css"/>
!                                                       <xsl:text>--></xsl:text>
                                                </style>
                                        </xsl:when>
                                </xsl:choose>
--- 38,67 ----
                                <script type="text/javascript" 
language="javascript" 
src="{$webserver_url}/phpgwapi/templates/justweb/navcond.js"></script>
                                <script type="text/javascript" 
language="javascript" 
src="{$webserver_url}/phpgwapi/templates/justweb/scripts.js"></script>
+                               <xsl:choose>
+                                       <xsl:when test="app_java_script != ''">
+                                               <xsl:value-of 
disable-output-escaping="yes" select="app_java_script"/>
+                                       </xsl:when>
+                               </xsl:choose>
+                               <xsl:choose>
+                                       <xsl:when test="app_java_script_url != 
''">
+                                               <xsl:variable 
name="app_java_script_url" select="app_java_script_url"/>
+                                               <script type="text/javascript" 
language="javascript" 
src="{$webserver_url}/{$current_app}/templates/{$app_java_script_url}"></script>
+                                       </xsl:when>
+                               </xsl:choose>
                                <link rel="stylesheet" type="text/css" 
href="{$phpgw_css_file}"/>
                                <link rel="stylesheet" type="text/css" 
href="{$theme_css_file}"/>
                                <xsl:choose>
!                                       <xsl:when test="app_css != ''">
                                                <style type="text/css">
                                                        
<xsl:text>&lt;!--</xsl:text>
                                                                <xsl:value-of 
disable-output-escaping="yes" select="app_css"/>
!                                                       
<xsl:text>--&gt;</xsl:text>
                                                </style>
+                                       </xsl:when>
+                               </xsl:choose>
+                               <xsl:choose>
+                                       <xsl:when test="app_css_url != ''">
+                                               <xsl:variable 
name="app_css_url" select="app_css_url"/>
+                                               <link rel="stylesheet" 
type="text/css" 
href="{$webserver_url}/{$current_app}/templates/{$app_css_url}"/>
                                        </xsl:when>
                                </xsl:choose>

Index: scripts.js
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/templates/justweb/scripts.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** scripts.js  8 Nov 2002 22:35:44 -0000       1.1
--- scripts.js  24 Apr 2003 01:34:04 -0000      1.2
***************
*** 1,51 ****
  
!                                       var myNavBar1 = new NavBar(0);
!                                       var dhtmlMenu;
!                                               //define menu items (first 
parameter of NavBarMenu specifies main category width, second specifies sub 
category width in pixels)
!                                               //add more menus simply by 
adding more "blocks" of same code below
! 
!                                               dhtmlMenu = new NavBarMenu(60, 
120);
!                                               dhtmlMenu.addItem(new 
NavBarMenuItem("Home", "{home}"));
!                                               myNavBar1.addMenu(dhtmlMenu);
! 
!                                               dhtmlMenu = new NavBarMenu(60, 
140);
!                                               dhtmlMenu.addItem(new 
NavBarMenuItem("Edit", ""));
!                                               dhtmlMenu.addItem(new 
NavBarMenuItem("Add new Appointment", "{appt}"));
!                                               dhtmlMenu.addItem(new 
NavBarMenuItem("Add new Todo", "{todo}"));
!                                               myNavBar1.addMenu(dhtmlMenu);
! 
!                                               dhtmlMenu = new NavBarMenu(125, 
140);
!                                               dhtmlMenu.addItem(new 
NavBarMenuItem("Preferences", ""));
!                                               dhtmlMenu.addItem(new 
NavBarMenuItem("General", "{prefs}"));
!                                               dhtmlMenu.addItem(new 
NavBarMenuItem("Email", "{email}"));
!                                               dhtmlMenu.addItem(new 
NavBarMenuItem("Calendar", "{calendar}"));
!                                               dhtmlMenu.addItem(new 
NavBarMenuItem("Addressbook", "{addressbook}"));
!                                               myNavBar1.addMenu(dhtmlMenu);
! 
!                                               dhtmlMenu = new NavBarMenu(62, 
120);
!                                               dhtmlMenu.addItem(new 
NavBarMenuItem("Help", ""));
!                                               dhtmlMenu.addItem(new 
NavBarMenuItem("General", ""));
!                                               myNavBar1.addMenu(dhtmlMenu);
! 
!                                               //set menu colors
!                                               myNavBar1.setColors("#343434", 
"#eeeeee", "#60707C", "#ffffff", "#888888", "#eeeeee", "#60707C", "#ffffff", 
"#777777")
!                                               myNavBar1.setFonts("Verdana", 
"Normal", "Normal", "10pt", "Verdana", "Normal", "Normal", "10pt");
! 
!                                               //uncomment below line to 
center the menu (valid values are "left", "center", and "right"
!                                               //myNavBar1.setAlign("center")
! 
!                                               var fullWidth;
! 
!                                               function init()
!                                               {
!                                                       //Get width of window, 
need to account for scrollbar width in Netscape.
! 
!                                                       fullWidth = 
getWindowWidth() 
!                                               - (isMinNS4 && 
getWindowHeight() < getPageHeight() ? 16 : 0);
! 
!                                                       myNavBar1.moveTo(10,36);
!                                                       myNavBar1.resize(500 
/*fullWidth*/);
!                                                       
myNavBar1.setSizes(0,1,1);
!                                                       myNavBar1.create();
!                                                       myNavBar1.setzIndex(2);
!                                               }
--- 1,75 ----
  
!       var myNavBar1 = new NavBar(0);
!       var dhtmlMenu;
!       //define menu items (first parameter of NavBarMenu specifies main 
category width, second specifies sub category width in pixels)
!       //add more menus simply by adding more "blocks" of same code below
! 
!       dhtmlMenu = new NavBarMenu(60, 120);
!       dhtmlMenu.addItem(new NavBarMenuItem("Home", "{home}"));
!       myNavBar1.addMenu(dhtmlMenu);
! 
!       dhtmlMenu = new NavBarMenu(60, 140);
!       dhtmlMenu.addItem(new NavBarMenuItem("Edit", ""));
!       dhtmlMenu.addItem(new NavBarMenuItem("Add new Appointment", "{appt}"));
!       dhtmlMenu.addItem(new NavBarMenuItem("Add new Todo", "{todo}"));
!       myNavBar1.addMenu(dhtmlMenu);
! 
!       dhtmlMenu = new NavBarMenu(125, 140);
!       dhtmlMenu.addItem(new NavBarMenuItem("Preferences", ""));
!       dhtmlMenu.addItem(new NavBarMenuItem("General", "{prefs}"));
!       dhtmlMenu.addItem(new NavBarMenuItem("Email", "{email}"));
!       dhtmlMenu.addItem(new NavBarMenuItem("Calendar", "{calendar}"));
!       dhtmlMenu.addItem(new NavBarMenuItem("Addressbook", "{addressbook}"));
!       myNavBar1.addMenu(dhtmlMenu);
! 
!       dhtmlMenu = new NavBarMenu(62, 120);
!       dhtmlMenu.addItem(new NavBarMenuItem("Help", ""));
!       dhtmlMenu.addItem(new NavBarMenuItem("General", ""));
!       myNavBar1.addMenu(dhtmlMenu);
! 
!       //set menu colors
!       myNavBar1.setColors("#343434", "#eeeeee", "#60707C", "#ffffff", 
"#888888", "#eeeeee", "#60707C", "#ffffff", "#777777")
!       myNavBar1.setFonts("Verdana", "Normal", "Normal", "10pt", "Verdana", 
"Normal", "Normal", "10pt");
! 
!       //uncomment below line to center the menu (valid values are "left", 
"center", and "right"
!       //myNavBar1.setAlign("center")
! 
!       var fullWidth;
! 
!       function init()
!       {
!               //Get width of window, need to account for scrollbar width in 
Netscape.
! 
!               fullWidth = getWindowWidth() 
!       - (isMinNS4 && getWindowHeight() < getPageHeight() ? 16 : 0);
! 
!               myNavBar1.moveTo(10,36);
!               myNavBar1.resize(500 /*fullWidth*/);
!               myNavBar1.setSizes(0,1,1);
!               myNavBar1.create();
!               myNavBar1.setzIndex(2);
!       }
! 
!       var popupw;
! 
!       function openwindow(url,width,height)
!       {
!               if (popupw)
!               {
!                       if (popupw.closed)
!                       {
!                               popupw.stop;
!                               popupw.close;
!                       }
!               }
!               popupw = window.open(url,"popupWindow","width=" + width + 
",height=" + height + 
",location=no,menubar=no,directories=no,toolbar=no,scrollbars=yes,resizable=yes,status=no");
!               if (popupw.opener == null)
!               {
!                       popupw.opener = window;
!               }
!       }
! 
!       function done()
!       {
!               popupw.close()
!       }