phpgroupware-cvs
[Top][All Lists]
Advanced

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

[Phpgroupware-cvs] CVS: phpgwapi/templates/linux-at-work.de head.inc.ph


From: Lars Kneschke <address@hidden>
Subject: [Phpgroupware-cvs] CVS: phpgwapi/templates/linux-at-work.de head.inc.php,1.3,1.3.2.1 head.tpl,1.4.2.3,1.4.2.4 login.tpl,1.5.2.5,1.5.2.6 navbar.inc.php,1.6.2.2,1.6.2.3 navbar.tpl,1.3,1.3.2.1
Date: Mon, 10 Mar 2003 19:08:34 -0500

Update of /cvsroot/phpgroupware/phpgwapi/templates/linux-at-work.de
In directory subversions:/tmp/cvs-serv23195

Modified Files:
      Tag: Version-0_9_14-branch
        head.inc.php head.tpl login.tpl navbar.inc.php navbar.tpl 
Log Message:
some bugfixes


Index: head.inc.php
===================================================================
RCS file: 
/cvsroot/phpgroupware/phpgwapi/templates/linux-at-work.de/head.inc.php,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** head.inc.php        31 Dec 2001 01:17:10 -0000      1.3
--- head.inc.php        11 Mar 2003 00:08:24 -0000      1.3.2.1
***************
*** 44,47 ****
--- 44,54 ----
                fclose($fp);
        }
+ 
+         $p = createobject('phpgwapi.preferences');
+         $preferences = $p->read_repository();
+       
if(isset($preferences[$GLOBALS['phpgw_info']['flags']['currentapp']]['refreshTime']))
+       { 
+               $refreshTime = 
$preferences[$GLOBALS['phpgw_info']['flags']['currentapp']]['refreshTime']*60;
+       }
        
        $tpl = CreateObject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
***************
*** 49,52 ****
--- 56,61 ----
        $tpl->set_file(array('head' => 'head.tpl'));
        $var = Array (
+               'img_icon'      => PHPGW_IMAGES_DIR . '/favicon.ico',
+               'img_shortcut'  => PHPGW_IMAGES_DIR . '/favicon.ico',
                'charset'       => lang('charset'),
                'font_family'   => $GLOBALS['phpgw_info']['theme']['font'],
***************
*** 59,62 ****
--- 68,72 ----
                'css_vlink'     => $GLOBALS['phpgw_info']['theme']['vlink'],
                'css_hovlink'   => $csshover,
+               'refreshTime'   => $refreshTime,
                'app_css'       => $app_css
        );

Index: head.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/templates/linux-at-work.de/head.tpl,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -C2 -r1.4.2.3 -r1.4.2.4
*** head.tpl    5 Jun 2002 08:40:42 -0000       1.4.2.3
--- head.tpl    11 Mar 2003 00:08:24 -0000      1.4.2.4
***************
*** 7,11 ****
  <META NAME="description" CONTENT="phpGroupWare">
  <META NAME="keywords" CONTENT="phpGroupWare">
! <meta name="robots" content="none">
  <STYLE type="text/css">
  <!--
--- 7,14 ----
  <META NAME="description" CONTENT="phpGroupWare">
  <META NAME="keywords" CONTENT="phpGroupWare">
! <META name="robots" content="none">
! <LINK REL="ICON" href="{img_icon}" type="image/x-ico">
! <LINK REL="SHORTCUT ICON" href="{img_shortcut}">
! <MMETA http-equiv="Refresh" content="{refreshTime}">
  <STYLE type="text/css">
  <!--
***************
*** 14,17 ****
--- 17,21 ----
                color: White;
                text-decoration: none;
+               display : block;
        }
  
***************
*** 19,22 ****
--- 23,27 ----
        {
                background-color: #7C92FC;
+               display : block;
        }
  

Index: login.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/templates/linux-at-work.de/login.tpl,v
retrieving revision 1.5.2.5
retrieving revision 1.5.2.6
diff -C2 -r1.5.2.5 -r1.5.2.6
*** login.tpl   24 Oct 2002 20:58:31 -0000      1.5.2.5
--- login.tpl   11 Mar 2003 00:08:25 -0000      1.5.2.6
***************
*** 42,46 ****
  -->
  </STYLE>
! <LINK rel="stylesheet" 
href="/phpgroupware_devel/phpgwapi/templates/linux-at-work.de/copy.css">
  <TITLE>{website_title} - Login</TITLE>
  </HEAD>
--- 42,46 ----
  -->
  </STYLE>
! <LLINK rel="stylesheet" 
href="/phpgroupware_devel/phpgwapi/templates/linux-at-work.de/copy.css">
  <TITLE>{website_title} - Login</TITLE>
  </HEAD>
***************
*** 51,55 ****
  
  <center>
! <A href="http://linux-at-work.de";><img 
src="phpgwapi/templates/{template_set}/images/vater_logo.gif" alt="Vater GmbH" 
border="0"></a>
  
  <br>
--- 51,55 ----
  
  <center>
! <img 
src="/phpgroupware/phpgwapi/templates/linux-at-work.de/images/vater_logo.gif" 
border="0">
  
  <br>
***************
*** 72,80 ****
          </TR>
          <TR bgcolor="#1559a9">
!          <TD align="left"><font 
color="#FFFF99">{lang_username}:&nbsp;</font></TD>
           <TD><input name="login" value="{cookie}"></TD>
          </TR>
          <TR bgcolor="#1559a9">
!          <TD align="left"><font 
color="#FFFF99">{lang_password}:&nbsp;</font></TD>
           <TD><input name="passwd" type="password"></TD>
          </TR>
--- 72,80 ----
          </TR>
          <TR bgcolor="#1559a9">
!          <TD align="left"><font 
color="#FFFF99">Benutzername:&nbsp;</font></TD>
           <TD><input name="login" value="{cookie}"></TD>
          </TR>
          <TR bgcolor="#1559a9">
!          <TD align="left"><font color="#FFFF99">Passwort:&nbsp;</font></TD>
           <TD><input name="passwd" type="password"></TD>
          </TR>
***************
*** 86,90 ****
          <TR bgcolor="#1559a9">
           <TD colspan="2" align="CENTER">
!           <input class="submit" type="submit" value="{lang_login}" 
name="submit">
           </TD>
          </TR>
--- 86,90 ----
          <TR bgcolor="#1559a9">
           <TD colspan="2" align="CENTER">
!           <input class="submit" type="submit" value="Anmelden" name="submit">
           </TD>
          </TR>
***************
*** 96,100 ****
          <TR bgcolor="#1559a9">
           <TD colspan="2" align="RIGHT">
!           <font color="000000" size="-1">{lang_based_on} phpGroupWare 
{version}</font>
           </TD>
          </TR>       
--- 96,100 ----
          <TR bgcolor="#1559a9">
           <TD colspan="2" align="RIGHT">
!           <font color="000000" size="-1">basierend auf PHPGroupware 
{version}</font>
           </TD>
          </TR>       
***************
*** 109,113 ****
  //-->
  </script>
! 
  <!-- END login_form -->
  </HTML>
--- 109,113 ----
  //-->
  </script>
!      
  <!-- END login_form -->
  </HTML>

Index: navbar.inc.php
===================================================================
RCS file: 
/cvsroot/phpgroupware/phpgwapi/templates/linux-at-work.de/navbar.inc.php,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -C2 -r1.6.2.2 -r1.6.2.3
*** navbar.inc.php      5 Mar 2003 00:13:07 -0000       1.6.2.2
--- navbar.inc.php      11 Mar 2003 00:08:26 -0000      1.6.2.3
***************
*** 69,73 ****
                if ($GLOBALS['phpgw_info']['server']['showpoweredbyon'] == 
'top')
                {
!                       $var['powered_by'] = lang('Powered by phpGroupWare 
version %1',$GLOBALS['phpgw_info']['server']['versions']['phpgwapi']);
                        $tpl->set_var($var);
                }
--- 69,73 ----
                if ($GLOBALS['phpgw_info']['server']['showpoweredbyon'] == 
'top')
                {
!                       $var['powered_by'] = lang('Powered by phpGroupWare 
version x',$GLOBALS['phpgw_info']['server']['versions']['phpgwapi']);
                        $tpl->set_var($var);
                }
***************
*** 114,118 ****
                elseif ($GLOBALS['phpgw_info']['user']['lastpasswd_change'] < 
time() - (86400*30))
                {
!                       $api_messages = lang('it has been more then %1 days 
since you changed your password',30);
                }
   
--- 114,118 ----
                elseif ($GLOBALS['phpgw_info']['user']['lastpasswd_change'] < 
time() - (86400*30))
                {
!                       $api_messages = lang('it has been more then x days 
since you changed your password',30);
                }
   
***************
*** 149,153 ****
  #             {
  #                     $var = Array(
! #                             'powered'       => lang('Powered by 
phpGroupWare version %1', 
$GLOBALS['phpgw_info']['server']['versions']['phpgwapi']),
  #                             'img_root'      => PHPGW_IMAGES_DIR,
  #                             'power_backcolor'       => 
$GLOBALS['phpgw_info']['theme']['navbar_bg'],
--- 149,153 ----
  #             {
  #                     $var = Array(
! #                             'powered'       => lang('Powered by 
phpGroupWare version x', 
$GLOBALS['phpgw_info']['server']['versions']['phpgwapi']),
  #                             'img_root'      => PHPGW_IMAGES_DIR,
  #                             'power_backcolor'       => 
$GLOBALS['phpgw_info']['theme']['navbar_bg'],

Index: navbar.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/templates/linux-at-work.de/navbar.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** navbar.tpl  31 Dec 2001 01:17:10 -0000      1.3
--- navbar.tpl  11 Mar 2003 00:08:26 -0000      1.3.2.1
***************
*** 1,3 ****
! <div class="main_menu" style="width : 15% ; height : 100% ; left : 0px ; top 
: 0px ;">
        <table summary="" style="width : 100%; ">
                <tr >
--- 1,3 ----
! <div class="main_menu" style="width : 150px ; height : 100% ; left : 0px ; 
top : 0px ;">
        <table summary="" style="width : 100%; ">
                <tr >
***************
*** 31,35 ****
  </div>
  
! <div class="main_menu" style="width : 15% ; height : 50px ; left : 0px ; 
bottom : 0px ;">
        <table summary="" style="width : 100%; ">
                <tr>
--- 31,35 ----
  </div>
  
! <div class="main_menu" style="width : 150px ; height : 50px ; left : 0px ; 
bottom : 0px ;">
        <table summary="" style="width : 100%; ">
                <tr>
***************
*** 43,47 ****
  </div>
  
! <div class="main_body" style="position: absolute; padding: 0px; height:100%; 
left:15% ; top :0px ;
! width:85%; overflow : auto">
  <!-- END navbar -->
--- 43,47 ----
  </div>
  
! <div class="main_body" style="position: absolute; padding: 0px; height:100%; 
left:150px ; top :0px ;
! right:0px; overflow : auto">
  <!-- END navbar -->





reply via email to

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