phpgroupware-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Phpgroupware-cvs] CVS: phpgwapi/templates/idots head.inc.php,1.1.2.6,1


From: Dave Hall <address@hidden>
Subject: [Phpgroupware-cvs] CVS: phpgwapi/templates/idots head.inc.php,1.1.2.6,1.1.2.7 head.tpl,1.1.2.1,1.1.2.2 login.tpl,1.1.2.1,1.1.2.2
Date: Thu, 29 May 2003 22:34:28 -0400

Update of /cvsroot/phpgroupware/phpgwapi/templates/idots
In directory subversions:/tmp/cvs-serv21085/templates/idots

Modified Files:
      Tag: Version-0_9_16-branch
        head.inc.php head.tpl login.tpl 
Log Message:
changed css in tpls and dos2unix the api

Index: head.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/templates/idots/Attic/head.inc.php,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -C2 -r1.1.2.6 -r1.1.2.7
*** head.inc.php        3 May 2003 15:40:09 -0000       1.1.2.6
--- head.inc.php        30 May 2003 02:34:26 -0000      1.1.2.7
***************
*** 16,23 ****
        {
                list($app,$class,$method) = 
explode('.',$GLOBALS['HTTP_GET_VARS']['menuaction']);
-               if(is_array($GLOBALS[$class]->public_functions) && 
$GLOBALS[$class]->public_functions['css'])
-               {
-                       $app_css = $GLOBALS[$class]->css();
-               }
                if(is_array($GLOBALS[$class]->public_functions) && 
$GLOBALS[$class]->public_functions['java_script'])
                {
--- 16,19 ----
***************
*** 25,32 ****
                }
        }
-       if (isset($GLOBALS['phpgw_info']['flags']['css']))
-       {
-               $app_css .= $GLOBALS['phpgw_info']['flags']['css'];
-       }
        if (isset($GLOBALS['phpgw_info']['flags']['java_script']))
        {
--- 21,24 ----
***************
*** 63,67 ****
                'body_tags'             => $bodyheader,
                'theme_css'             => $theme_css,
!               'app_css'               => $app_css,
                'java_script'   => $java_script
        );
--- 55,59 ----
                'body_tags'             => $bodyheader,
                'theme_css'             => $theme_css,
!               'css'                   => $GLOBALS['phpgw']->common->get_css(),
                'java_script'   => $java_script
        );

Index: head.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/templates/idots/Attic/head.tpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** head.tpl    18 Apr 2003 14:35:29 -0000      1.1.2.1
--- head.tpl    30 May 2003 02:34:26 -0000      1.1.2.2
***************
*** 11,19 ****
  <LINK REL="SHORTCUT ICON" href="{img_shortcut}">
  <LINK href="{theme_css}" type=text/css rel=StyleSheet>
! <STYLE type="text/css">
! <!--
!   {app_css}
! -->
! </STYLE>
  <TITLE>{website_title}</TITLE>
  {java_script}
--- 11,15 ----
  <LINK REL="SHORTCUT ICON" href="{img_shortcut}">
  <LINK href="{theme_css}" type=text/css rel=StyleSheet>
! {css}
  <TITLE>{website_title}</TITLE>
  {java_script}

Index: login.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/templates/idots/Attic/login.tpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** login.tpl   18 Apr 2003 14:35:29 -0000      1.1.2.1
--- login.tpl   30 May 2003 02:34:26 -0000      1.1.2.2
***************
*** 1,183 ****
! <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
! <HTML>
! <HEAD>
! <TITLE>My i DOTS</TITLE>
! <META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
! <LINK href="phpgwapi/templates/idots/css/idots.css" type=text/css 
rel=StyleSheet>
! </HEAD>
! <BODY bgColor=#e5e5e5>
! 
! <TABLE class=box cellSpacing=0 cellPadding=1 width="100%" bgColor=#ffffff 
border=0>
!   <TR> 
!     <TD vAlign=top> <TABLE height=150 cellSpacing=0 cellPadding=0 
width="100%" bgColor=#ffffff border=0>
!         <TR> 
!           <TD width=185 rowSpan=2 align="center" vAlign=top 
class=toppannel><IMG  src="idots/img/logo.png"></TD>
!           <TD valign="top" background="idots/img/panel.png"> <TABLE 
width="100%" border=0 cellPadding=0 cellSpacing=0 
background="idots/img/panel.png" bgColor=#ffffff>
!               <TR valign="top"> 
!                 <TD width="1%"></TD>
!                 <TD align=center width="10%"><a href="login.php"><img 
src="idots/icons/login.png" width="60" height="62" border="0"></a></TD>
!                 <TD width="10%" align=center><a 
href="link.php?page=feature_tour"><img src="idots/icons/features.png" 
width="60" height="62" border="0"></a></TD>
!                 <TD width="10%" align=center><a 
href="link.php?page=demo"><img src="idots/icons/demo.png" width="60" 
height="62" border="0"></a></TD>
!                 <TD width="10%" align=center><a 
href="link.php?page=purchase_info"><img src="idots/icons/personal.png" 
width="60" height="62" border="0"></a></TD>
!                 <TD width="10%" align=center><a 
href="http://www.i-dots.nl";><img src="idots/icons/home.png" width="60" 
height="62" border="0"></a></TD>
!                 <TD width="1%" align=right></TD>
!               </TR>
!               <TR valign="top"> 
!                 <TD width="1%"></TD>
!                 <TD align=center class="mainnote"><a 
href="login.php">inloggen</a></TD>
!                 <TD width="10%" align=center class="mainnote"><a 
href="link.php?page=feature_tour">functietour</a></TD>
!                 <TD width="10%" align=center class="mainnote"><a 
href="link.php?page=demo">live 
!                   demonstratie</a></TD>
!                 <TD width="10%" align=center class="mainnote"><a 
href="link.php?page=purchase_info">info 
!                   voor uw bedrijf</a></TD>
!                 <TD width="10%" align=center class="mainnote"><a 
href="http://www.i-dots.nl";>i 
!                   DOTS home</a></TD>
!                 <TD width="3%" align=right></TD>
!               </TR>
!             </TABLE></TD>
!         </TR>
!         <TR> 
!           <TD align=left vAlign=top class=mainnote><br> <br>
!             <strong>Niet ingelogd</strong> - {today}</TD>
!         </TR>
!       </TABLE>
!       <TABLE cellSpacing=0 cellPadding=0 width="100%" border=0>
!         <TBODY>
!           <TR vAlign=top> 
!             <TD width=15></TD>
!             <TD vAlign=top width=1>
!               <!-- start blocks -->
!               <TABLE class=sidebox cellSpacing=1 cellPadding=0 width="100%" 
!             border=0>
!                 <TBODY>
!                   <TR> 
!                     <TD class=sideboxtitle align=middle height=28>My i 
DOTS</TD>
!                   </TR>
!                   <TR> 
!                     <TD class=sideboxcontent bgColor=#efefef> <TABLE 
class=sideboxtext cellSpacing=0 cellPadding=0 
!                   width="100%" border=0 valign="top">
!                         <TBODY>
!                           <TR> 
!                             <TD vAlign=top align=middle><FONT 
!                       color=#ff9933>*</FONT>&nbsp;</TD>
!                             <TD vAlign=top align=left width="100%" 
height=20><A 
!                         href="login.php">inloggen</A></TD>
!                           </TR>
!                           <TR> 
!                             <TD vAlign=top align=middle><FONT 
!                       color=#ff9933>*</FONT>&nbsp;</TD>
!                             <TD vAlign=top align=left width="100%" 
height=20><A 
!                         href="link.php?page=feature_tour">functietour</A></TD>
!                           </TR>
!                           <TR> 
!                             <TD vAlign=top align=middle><FONT 
!                       color=#ff9933>*</FONT>&nbsp;</TD>
!                             <TD vAlign=top align=left width="100%" 
height=20><A 
!                         href="link.php?page=demo">live demonstratie</A></TD>
!                           </TR>
!                           <TR> 
!                             <TD vAlign=top align=middle><FONT 
!                       color=#ff9933>*</FONT></TD>
!                             <TD vAlign=top align=left height=20><A 
!                         href="link.php?page=purchase_info">info voor uw 
bedrijf</A></TD>
!                           </TR>
!                           <TR>
!                             <TD vAlign=top align=middle><FONT 
!                       color=#ff9933>*</FONT></TD>
!                             <TD vAlign=top align=left height=20><A 
!                         href="http://www.i-dots.nl";>i 
!                               DOTS home</A></TD>
!                           </TR>
!                         </TBODY>
!                       </TABLE></TD>
!                   </TR>
!                 </TBODY>
!               </TABLE>
!               <BR>
!               <TABLE class=sidebox cellSpacing=1 cellPadding=0 width="100%" 
!             border=0>
!                 <TBODY>
!                   <TR> 
!                     <TD class=sideboxtitle align=middle height=28>Help</TD>
!                   </TR>
!                   <TR> 
!                     <TD class=sideboxcontent bgColor=#efefef>
!                               <TABLE class=sideboxtext cellSpacing=0 
cellPadding=0 width="100%" border=0 valign="top" align=center>
!                         <TBODY>
!                           <TR> 
!                             <TD vAlign=top align=middle><FONT 
!                       color=#ff9933>*</FONT>&nbsp;</TD>
!                             <TD vAlign=top align=left width="100%" 
height=20><A 
!                         href="link.php?page=help.php#passwd">wachtwoord 
!                               kwijt?</A></TD>
!                           </TR>
!                           <TR> 
!                             <TD vAlign=top align=middle><FONT 
!                       color=#ff9933>*</FONT>&nbsp;</TD>
!                             <TD vAlign=top align=left width="100%" 
height=20><A 
!                         href="link.php?page=help.php#browser">welke 
!                               browser?</A></TD>
!                           </TR>
!                         </TBODY>
!                       </TABLE>
!                                         </TD>
!                   </TR>
!                 </TBODY>
!               </TABLE>
!               <BR></TD>
!             <TD width=15><IMG src="idots/img/spacer.gif" width=1 
height="1"></TD>
!             <TD> <TABLE cellSpacing=0 cellPadding=0 width="100%" border=0>
!                 <TBODY>
!                   <TR> 
!                     <TD vAlign=top height="100%"> <TABLE class=box 
cellSpacing=1 cellPadding=0 width="100%" 
!                   align=center border=0>
!                         <TBODY>
!                           <TR> 
!                             <TD class=articletitle align=center colSpan=2 
!                         height=23>Inloggen</TD>
!                           </TR>
!                           <TR align=middle> 
!                             <TD height=20 colSpan=2 align="center" 
bgColor=#efefef class=mainnote> 
!                               <p>&nbsp;</p>
!                               <p>&nbsp; </p>
!                               <FORM method="post" action="{login_url}">
!                                                         <TABLE cellSpacing=0 
cellPadding=0 width="100" border=0 valign="top" align=center> 
!                                 <TBODY>
!                                   <TR> 
!                                     <TD align=right 
nowrap>Loginnaam:&nbsp;</TD>
!                                     <TD><INPUT style="WIDTH: 100px" 
value="{cookie}" name="login"></TD>
!                                   </TR>
!                                   <TR> 
!                                     <TD align=right 
nowrap>Wachtwoord:&nbsp;</TD>
!                                     <TD><INPUT style="WIDTH: 100px" 
type="password"  onchange="this.form.submit()" name="passwd"></TD>
!                                   </TR>
!                                   <TR align="center"> 
!                                     <TD colSpan=2>
!                                                                               
<INPUT type=hidden value=text name="passwd_type"> 
!                                                                               
<INPUT type="submit" value=Login name="submitit"> 
!                                     </TD>
!                                   </TR>
!                                 </TBODY>
!                               </TABLE>
!                                                       </form>                 
                  
!                                                         <p>&nbsp;</p>
!                               <p><br>
!                               </p></TD>
!                           </TR>
!                         </TBODY>
!                       </TABLE>
!                       <BR></TD>
!                     <TD 
!   width=15></TD>
!                   </TR>
!                 </TBODY>
!               </TABLE></TD>
!           </TR>
!         </TBODY>
!       </TABLE></TR>
! </TABLE>
! <p align="center" class="copyright"><a href="link.php?page=copyright">&copy; 
Copyright 
!   2003 i DOTS</a> | <a href="link.php?page=privacy">privacyverklaring</a> |  
<a href="link.php?page=contact">contactgegevens</a> 
!   | <a href="mailto:address@hidden";>e-mail de beheerder</a></p>
! </BODY>
! </HTML>
--- 1,183 ----
! <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
! <HTML>
! <HEAD>
! <TITLE>My i DOTS</TITLE>
! <META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
! <LINK href="phpgwapi/templates/idots/css/idots.css" type=text/css 
rel=StyleSheet>
! </HEAD>
! <BODY bgColor=#e5e5e5>
! 
! <TABLE class=box cellSpacing=0 cellPadding=1 width="100%" bgColor=#ffffff 
border=0>
!   <TR> 
!     <TD vAlign=top> <TABLE height=150 cellSpacing=0 cellPadding=0 
width="100%" bgColor=#ffffff border=0>
!         <TR> 
!           <TD width=185 rowSpan=2 align="center" vAlign=top 
class=toppannel><IMG  src="idots/img/logo.png"></TD>
!           <TD valign="top" background="idots/img/panel.png"> <TABLE 
width="100%" border=0 cellPadding=0 cellSpacing=0 
background="idots/img/panel.png" bgColor=#ffffff>
!               <TR valign="top"> 
!                 <TD width="1%"></TD>
!                 <TD align=center width="10%"><a href="login.php"><img 
src="idots/icons/login.png" width="60" height="62" border="0"></a></TD>
!                 <TD width="10%" align=center><a 
href="link.php?page=feature_tour"><img src="idots/icons/features.png" 
width="60" height="62" border="0"></a></TD>
!                 <TD width="10%" align=center><a 
href="link.php?page=demo"><img src="idots/icons/demo.png" width="60" 
height="62" border="0"></a></TD>
!                 <TD width="10%" align=center><a 
href="link.php?page=purchase_info"><img src="idots/icons/personal.png" 
width="60" height="62" border="0"></a></TD>
!                 <TD width="10%" align=center><a 
href="http://www.i-dots.nl";><img src="idots/icons/home.png" width="60" 
height="62" border="0"></a></TD>
!                 <TD width="1%" align=right></TD>
!               </TR>
!               <TR valign="top"> 
!                 <TD width="1%"></TD>
!                 <TD align=center class="mainnote"><a 
href="login.php">inloggen</a></TD>
!                 <TD width="10%" align=center class="mainnote"><a 
href="link.php?page=feature_tour">functietour</a></TD>
!                 <TD width="10%" align=center class="mainnote"><a 
href="link.php?page=demo">live 
!                   demonstratie</a></TD>
!                 <TD width="10%" align=center class="mainnote"><a 
href="link.php?page=purchase_info">info 
!                   voor uw bedrijf</a></TD>
!                 <TD width="10%" align=center class="mainnote"><a 
href="http://www.i-dots.nl";>i 
!                   DOTS home</a></TD>
!                 <TD width="3%" align=right></TD>
!               </TR>
!             </TABLE></TD>
!         </TR>
!         <TR> 
!           <TD align=left vAlign=top class=mainnote><br> <br>
!             <strong>Niet ingelogd</strong> - {today}</TD>
!         </TR>
!       </TABLE>
!       <TABLE cellSpacing=0 cellPadding=0 width="100%" border=0>
!         <TBODY>
!           <TR vAlign=top> 
!             <TD width=15></TD>
!             <TD vAlign=top width=1>
!               <!-- start blocks -->
!               <TABLE class=sidebox cellSpacing=1 cellPadding=0 width="100%" 
!             border=0>
!                 <TBODY>
!                   <TR> 
!                     <TD class=sideboxtitle align=middle height=28>My i 
DOTS</TD>
!                   </TR>
!                   <TR> 
!                     <TD class=sideboxcontent bgColor=#efefef> <TABLE 
class=sideboxtext cellSpacing=0 cellPadding=0 
!                   width="100%" border=0 valign="top">
!                         <TBODY>
!                           <TR> 
!                             <TD vAlign=top align=middle><FONT 
!                       color=#ff9933>*</FONT>&nbsp;</TD>
!                             <TD vAlign=top align=left width="100%" 
height=20><A 
!                         href="login.php">inloggen</A></TD>
!                           </TR>
!                           <TR> 
!                             <TD vAlign=top align=middle><FONT 
!                       color=#ff9933>*</FONT>&nbsp;</TD>
!                             <TD vAlign=top align=left width="100%" 
height=20><A 
!                         href="link.php?page=feature_tour">functietour</A></TD>
!                           </TR>
!                           <TR> 
!                             <TD vAlign=top align=middle><FONT 
!                       color=#ff9933>*</FONT>&nbsp;</TD>
!                             <TD vAlign=top align=left width="100%" 
height=20><A 
!                         href="link.php?page=demo">live demonstratie</A></TD>
!                           </TR>
!                           <TR> 
!                             <TD vAlign=top align=middle><FONT 
!                       color=#ff9933>*</FONT></TD>
!                             <TD vAlign=top align=left height=20><A 
!                         href="link.php?page=purchase_info">info voor uw 
bedrijf</A></TD>
!                           </TR>
!                           <TR>
!                             <TD vAlign=top align=middle><FONT 
!                       color=#ff9933>*</FONT></TD>
!                             <TD vAlign=top align=left height=20><A 
!                         href="http://www.i-dots.nl";>i 
!                               DOTS home</A></TD>
!                           </TR>
!                         </TBODY>
!                       </TABLE></TD>
!                   </TR>
!                 </TBODY>
!               </TABLE>
!               <BR>
!               <TABLE class=sidebox cellSpacing=1 cellPadding=0 width="100%" 
!             border=0>
!                 <TBODY>
!                   <TR> 
!                     <TD class=sideboxtitle align=middle height=28>Help</TD>
!                   </TR>
!                   <TR> 
!                     <TD class=sideboxcontent bgColor=#efefef>
!                               <TABLE class=sideboxtext cellSpacing=0 
cellPadding=0 width="100%" border=0 valign="top" align=center>
!                         <TBODY>
!                           <TR> 
!                             <TD vAlign=top align=middle><FONT 
!                       color=#ff9933>*</FONT>&nbsp;</TD>
!                             <TD vAlign=top align=left width="100%" 
height=20><A 
!                         href="link.php?page=help.php#passwd">wachtwoord 
!                               kwijt?</A></TD>
!                           </TR>
!                           <TR> 
!                             <TD vAlign=top align=middle><FONT 
!                       color=#ff9933>*</FONT>&nbsp;</TD>
!                             <TD vAlign=top align=left width="100%" 
height=20><A 
!                         href="link.php?page=help.php#browser">welke 
!                               browser?</A></TD>
!                           </TR>
!                         </TBODY>
!                       </TABLE>
!                                         </TD>
!                   </TR>
!                 </TBODY>
!               </TABLE>
!               <BR></TD>
!             <TD width=15><IMG src="idots/img/spacer.gif" width=1 
height="1"></TD>
!             <TD> <TABLE cellSpacing=0 cellPadding=0 width="100%" border=0>
!                 <TBODY>
!                   <TR> 
!                     <TD vAlign=top height="100%"> <TABLE class=box 
cellSpacing=1 cellPadding=0 width="100%" 
!                   align=center border=0>
!                         <TBODY>
!                           <TR> 
!                             <TD class=articletitle align=center colSpan=2 
!                         height=23>Inloggen</TD>
!                           </TR>
!                           <TR align=middle> 
!                             <TD height=20 colSpan=2 align="center" 
bgColor=#efefef class=mainnote> 
!                               <p>&nbsp;</p>
!                               <p>&nbsp; </p>
!                               <FORM method="post" action="{login_url}">
!                                                         <TABLE cellSpacing=0 
cellPadding=0 width="100" border=0 valign="top" align=center> 
!                                 <TBODY>
!                                   <TR> 
!                                     <TD align=right 
nowrap>Loginnaam:&nbsp;</TD>
!                                     <TD><INPUT style="WIDTH: 100px" 
value="{cookie}" name="login"></TD>
!                                   </TR>
!                                   <TR> 
!                                     <TD align=right 
nowrap>Wachtwoord:&nbsp;</TD>
!                                     <TD><INPUT style="WIDTH: 100px" 
type="password"  onchange="this.form.submit()" name="passwd"></TD>
!                                   </TR>
!                                   <TR align="center"> 
!                                     <TD colSpan=2>
!                                                                               
<INPUT type=hidden value=text name="passwd_type"> 
!                                                                               
<INPUT type="submit" value=Login name="submitit"> 
!                                     </TD>
!                                   </TR>
!                                 </TBODY>
!                               </TABLE>
!                                                       </form>                 
                  
!                                                         <p>&nbsp;</p>
!                               <p><br>
!                               </p></TD>
!                           </TR>
!                         </TBODY>
!                       </TABLE>
!                       <BR></TD>
!                     <TD 
!   width=15></TD>
!                   </TR>
!                 </TBODY>
!               </TABLE></TD>
!           </TR>
!         </TBODY>
!       </TABLE></TR>
! </TABLE>
! <p align="center" class="copyright"><a href="link.php?page=copyright">&copy; 
Copyright 
!   2003 i DOTS</a> | <a href="link.php?page=privacy">privacyverklaring</a> |  
<a href="link.php?page=contact">contactgegevens</a> 
!   | <a href="mailto:address@hidden";>e-mail de beheerder</a></p>
! </BODY>
! </HTML>





reply via email to

[Prev in Thread] Current Thread [Next in Thread]