phpgroupware-cvs
[Top][All Lists]
Advanced

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

[Phpgroupware-cvs] phpgwapi/templates/desktop about.tpl, 1.1.2.3 head.in


From: skwashd
Subject: [Phpgroupware-cvs] phpgwapi/templates/desktop about.tpl, 1.1.2.3 head.inc.php, 1.1.2.2 head.tpl, 1.1.2.3 login.tpl, 1.1.2.3 footer.tpl, 1.1.2.2 about_unknown.tpl, 1.1.2.2 css.tpl, 1.1.2.2 login_denylogin.tpl, 1.1.2.3 login_selectdomain.tpl, 1.1.2.3 nextmatchs.tpl, 1.1.2.4 navbar.tpl, 1.1.2.3 navbar.inc.php, 1.1.2.2 navbar_app.tpl, 1.1.2.3 portal_main.tpl, 1.2 head_iframe.tpl, 1.2 footer_iframe.tpl, 1.2 dhtmldesktop.html, 1.2 portal_linkbox_header.tpl, 1.2 portal.tpl, 1.2 portal_linkbox.tpl, 1.2 portal_linkbox_footer.tpl, 1.2 null.php, 1.2 navbar_iframe.tpl, 1.2
Date: Sun, 27 Feb 2005 00:05:00 +0100

Update of phpgwapi/templates/desktop

Modified Files:
     Branch: Version-0_9_16-branch
            about.tpl lines: +5 -26
            head.inc.php lines: +46 -12
            head.tpl lines: +48 -6
            login.tpl lines: +55 -176
            footer.tpl lines: +11 -4
            about_unknown.tpl lines: +2 -12
            css.tpl lines: +9 -0
            login_denylogin.tpl lines: +1 -1
            login_selectdomain.tpl lines: +9 -7
            nextmatchs.tpl lines: +23 -17
            navbar.tpl lines: +37 -119
            navbar.inc.php lines: +189 -23
            navbar_app.tpl lines: +1 -3
Removed Files:
     Branch: MAIN
            portal_main.tpl
            head_iframe.tpl
            footer_iframe.tpl
            dhtmldesktop.html
            portal_linkbox_header.tpl
            portal.tpl
            portal_linkbox.tpl
            portal_linkbox_footer.tpl
            null.php
            navbar_iframe.tpl

Log Message:
make  it useable - again

====================================================
Index: phpgwapi/templates/desktop/about.tpl
diff -u phpgwapi/templates/desktop/about.tpl:1.1.2.2 
phpgwapi/templates/desktop/about.tpl:1.1.2.3
--- phpgwapi/templates/desktop/about.tpl:1.1.2.2        Sat Nov  6 15:34:27 2004
+++ phpgwapi/templates/desktop/about.tpl        Sat Feb 26 23:05:53 2005
@@ -1,26 +1,5 @@
-<table border="0" width="100%">
- <tr>
-  <td align="left">
-   <a href="http://www.phpgroupware.org"; target="_blank"><img 
src="{phpgw_logo}" border="0" alt="" /></a>
-  </td>
- </tr>
- <tr>
-  <td>&nbsp;</td>
- </tr>
- <tr>
-  <td align="center">{phpgw_version}</td>
- </tr>
- <tr>
-  <td align="center"><a href="http://www.phpgroupware.org"; 
target="_blank">phpGroupWare</a> is a multi-user, web-based groupware suite 
written in <a href="http://www.php.net"; target="_blank">PHP</a>.</td>
- </tr>
- <tr>
-  <td><hr /></td>
- </tr>
- <tr>
-  <td align="center">
-
-{phpgw_app_about}
-
-  </td>
- </tr>
-</table>
+<div id="about_box">
+       <h2><a href="http://www.phpgroupware.org"; target="_blank"><img 
src="{phpgw_logo}" />phpGroupWare</a></h2>
+       <p><a href="http://www.phpgroupware.org"; 
target="_blank">phpGroupWare</a> is a multi-user, web-based groupware suite 
written in <a href="http://www.php.net"; target="_blank">PHP</a>.</p>
+       <p>{phpgw_app_about}</p>
+</div>&nbsp;

====================================================
Index: phpgwapi/templates/desktop/head.inc.php
diff -u phpgwapi/templates/desktop/head.inc.php:1.1.2.1 
phpgwapi/templates/desktop/head.inc.php:1.1.2.2
--- phpgwapi/templates/desktop/head.inc.php:1.1.2.1     Sun Feb 22 07:08:19 2004
+++ phpgwapi/templates/desktop/head.inc.php     Sat Feb 26 23:05:53 2005
@@ -1,16 +1,50 @@
 <?php
- /**
- * phpGroupWare desktop template
- * @author Dave Hall dave.hall at mbox.com.au
- * @copyright Copyright (C) 2004 Free Software Foundation http://www.fsf.org/
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public License
- * @package phpgwapi
- * @subpackage gui
- * @version $Id$
- */
+  /**************************************************************************\
+  * phpGroupWare                                                             *
+  * http://www.phpgroupware.org                                              *
+  * --------------------------------------------                             *
+  *  This program is free software; you can redistribute it and/or modify it *
+  *  under the terms of the GNU General Public License as published by the   *
+  *  Free Software Foundation; either version 2 of the License, or (at your  *
+  *  option) any later version.                                              *
+  \**************************************************************************/

-       include_once(PHPGW_INCLUDE_ROOT . 
'/phpgwapi/templates/desktop/inc/class.desktop.inc.php');
-       $GLOBALS['desktop'] = new desktop;
+  /* $Id$ */

-       $GLOBALS['desktop']->head_render();
+       $tpl = CreateObject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
+       $tpl->set_unknowns('remove');
+       $tpl->set_file(array('head' => 'head.tpl'));
+
+       $app = $GLOBALS['phpgw_info']['flags']['currentapp'];
+       $app = $app ? ' ['.(isset($GLOBALS['phpgw_info']['apps'][$app]) ? 
$GLOBALS['phpgw_info']['apps'][$app]['title'] : lang($app)).']':'';
+
+       if(file_exists(PHPGW_SERVER_ROOT . '/phpgwapi/templates/desktop/css/' . 
$GLOBALS['phpgw_info']['user']['preferences']['common']['theme'] . '.css'))
+        {
+                $theme_css = $GLOBALS['phpgw_info']['server']['webserver_url'] 
. 
'/phpgwapi/templates/desktop/css/'.$GLOBALS['phpgw_info']['user']['preferences']['common']['theme'].'.css';
+        }
+        else
+        {
+                $theme_css = $GLOBALS['phpgw_info']['server']['webserver_url'] 
. '/phpgwapi/templates/desktop/css/desktop.css';
+        }
+
+       if( !is_object($GLOBALS['phpgw']->js) )
+       {
+               $GLOBALS['phpgw']->js = createObject('phpgwapi.javascript');
+       }
+       $GLOBALS['phpgw']->js->set_onload('updateClock();');
+
+       $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'],
+               'website_title' => 
$GLOBALS['phpgw_info']['server']['site_title'] . $app,
+               'body_tags'     => 
$GLOBALS['phpgw']->common->get_body_attribs(),
+               'theme_css'     => $theme_css,
+               'css'           => $GLOBALS['phpgw']->common->get_css(),
+               'java_script'   => $GLOBALS['phpgw']->common->get_java_script(),
+       );
+       $tpl->set_var($var);
+       $tpl->pfp('out','head');
+       unset($tpl);
 ?>

====================================================
Index: phpgwapi/templates/desktop/head.tpl
diff -u phpgwapi/templates/desktop/head.tpl:1.1.2.2 
phpgwapi/templates/desktop/head.tpl:1.1.2.3
--- phpgwapi/templates/desktop/head.tpl:1.1.2.2 Sat Nov  6 15:34:27 2004
+++ phpgwapi/templates/desktop/head.tpl Sat Feb 26 23:05:53 2005
@@ -1,5 +1,6 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+       "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
 <!-- BEGIN head -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
        <head>
                <meta http-equiv="Content-Type" content="text/html; 
charset={charset}" />
@@ -8,11 +9,52 @@
                <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_icon}" />
-               <link href="{theme_css}" type="text/css" rel="StyleSheet" />
+               <link rel="SHORTCUT ICON" href="{img_shortcut}" />
                {css}
+               <link href="{theme_css}" type="text/css" rel="StyleSheet" />
                <title>{website_title}</title>
                {java_script}
-       </head>
-       <body {body_tags}>
-<!-- END head -->
+               <script>
+                       //<![CDATA[
+                       //lifted from A List Apart 
http://www.alistapart.com/articles/dropdowns/ :)
+                       //Improved a little by Dave Hall
+                       window.onload = function()
+                       {
+                               if( document.all && document.getElementById )
+                               {
+                                       navRoot = 
document.getElementById("#header");
+                                       for( i=0; i<navRoot.childNodes.length; 
i++ )
+                                       {
+                                               node = navRoot.childNodes[i];
+                                               if( node.nodeName == "LI" )
+                                               {
+                                                       
node.onmouseover=function()
+                                                       {
+                                                               this.className 
+= " over";
+                                                       }
+
+                                                       
node.onmouseout=function()
+                                                       {
+                                                               this.className 
= this.className.replace(" over", "");
+                                                       }
+                                               }
+                                       }
+                               }
+                       }
+                       //]]>
+
+                       function updateClock()
+                       {
+                               var oDate = new Date();
+
+                               strHr = oDate.getHours();
+                               strMin = ( oDate.getMinutes() < 10 ? "0" + 
oDate.getMinutes() : oDate.getMinutes() );
+
+                               document.getElementById('clock').innerHTML = 
strHr + ':' + strMin;
+
+                               setTimeout('updateClock()', 1000);
+                       }
+               </script>
+</head>
+<body {body_tags}>
+<!-- END Head -->

====================================================
Index: phpgwapi/templates/desktop/login.tpl
diff -u phpgwapi/templates/desktop/login.tpl:1.1.2.2 
phpgwapi/templates/desktop/login.tpl:1.1.2.3
--- phpgwapi/templates/desktop/login.tpl:1.1.2.2        Sat Nov  6 15:34:27 2004
+++ phpgwapi/templates/desktop/login.tpl        Sat Feb 26 23:05:53 2005
@@ -1,184 +1,63 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
+<!-- BEGIN login_form -->
 <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" />
+
+<meta http-equiv="Content-Type" content="text/html; charset={charset}" />
+<meta name="AUTHOR" content="phpGroupWare http://www.phpgroupware.org"; />
+<meta name="description" content="{website_title} login screen, working 
environment powered by phpGroupWare" />
+<meta name="keywords" content="{website_title} login screen, phpgroupware, 
groupware, groupware suite" />
 <meta name="ROBOTS" content="NOINDEX, NOFOLLOW" />
+<title>{website_title} - {lang_login}</title>
 </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" alt="" /></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" alt="" /></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" alt="" /></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" alt="" /></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" alt="" /></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" alt="" /></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="nowrap">Loginnaam:&nbsp;</td>
-                                    <td><input style="WIDTH: 100px" 
value="{cookie}" name="login"></td>
-                                  </tr>
-                                  <tr>
-                                    <td align="right" 
nowrap="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>
-                      <be /></td>
-                    <td
-  width="15"></td>
-                  </tr>
-                </tbody>
-              </table></td>
-          </tr>
-        </tbody>
-      </table></tr>
+<body bgcolor="#{bg_color}">
+<a href="http://{logo_url}";><img 
src="phpgwapi/templates/{template_set}/images/{logo_file}" alt="{logo_title}" 
title="{logo_title}" border="0" /></a>
+<p>&nbsp;</p>
+<center>{lang_message}</center>
+<p>&nbsp;</p>
+
+<table bgcolor="#000000" border="0" cellpadding="0" cellspacing="0" 
width="40%" align="center">
+ <tr>
+  <td>
+   <table border="0" width="100%" bgcolor="#486591" cellpadding="2" 
cellspacing="1">
+    <tr bgcolor="#{bg_color_title}">
+     <td align="left" valign="middle">
+      <font color="#FEFEFE">&nbsp;{website_title}</font>
+     </td>
+    </tr>
+    <tr bgcolor="#e6e6e6">
+     <td valign="baseline">
+
+               <form name="login" method="post" action="{login_url}" 
{autocomplete}>
+               <input type="hidden" name="passwd_type" value="text" />
+                       <table border="0" align="center" bgcolor="#486591" 
width="100%" cellpadding="0" cellspacing="0">
+                               <tr bgcolor="#e6e6e6">
+                                       <td colspan="2" align="center">{cd}</td>
+                               </tr>
+                               <tr bgcolor="#e6e6e6">
+                                       <td align="right"><font 
color="#000000">{lang_username}:&nbsp;</font></td>
+                                       <td><input name="login" 
value="{cookie}" />{logindomain}</td>
+                               </tr>
+                               <tr bgcolor="#e6e6e6">
+                                       <td align="right"><font 
color="#000000">{lang_password}:&nbsp;</font></td>
+                                       <td><input name="passwd" 
type="password" onchange="this.form.submit();" /></td>
+                               </tr>
+                               <tr bgcolor="#e6e6e6">
+                                       <td colspan="2" align="center"><input 
type="submit" value="{lang_login}" name="submitit" /></td>
+                               </tr>
+                               <tr bgcolor="#e6e6e6">
+                                       <td colspan="2" align="right"><font 
color="#000000" size="-1">phpGroupWare {version}</font></td>
+                               </tr>
+                       </table>
+               </form>
+
+     </td>
+    </tr>
+   </table>
+  </td>
+ </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>
+<!-- END login_form -->
 </html>

====================================================
Index: phpgwapi/templates/desktop/footer.tpl
diff -u phpgwapi/templates/desktop/footer.tpl:1.1.2.1 
phpgwapi/templates/desktop/footer.tpl:1.1.2.2
--- phpgwapi/templates/desktop/footer.tpl:1.1.2.1       Sun Feb 22 07:08:19 2004
+++ phpgwapi/templates/desktop/footer.tpl       Sat Feb 26 23:05:53 2005
@@ -1,7 +1,14 @@
-                                       </body>
-                               </html>
-                       </iframe>
+<!-- BEGIN footer -->
+                       </div>
                </div>
+               <div id="footer">
+                       <ul>
+                               <li class="first">{powered_by}</li>
+                               <li>&nbsp;</li>
+                               <li class="last">{current_users}</li>
+                       </ul>
+               </div>
+<!-- END footer -->
        </body>
 </html>
-<!-- END footer -->
+

====================================================
Index: phpgwapi/templates/desktop/about_unknown.tpl
diff -u phpgwapi/templates/desktop/about_unknown.tpl:1.1.2.1 
phpgwapi/templates/desktop/about_unknown.tpl:1.1.2.2
--- phpgwapi/templates/desktop/about_unknown.tpl:1.1.2.1        Sun Feb 22 
07:08:19 2004
+++ phpgwapi/templates/desktop/about_unknown.tpl        Sat Feb 26 23:05:53 2005
@@ -1,12 +1,2 @@
- <tr>
-  <td align="center"><font size="5"><b>{app_header}<b></font></td>
- </tr>
- <tr>
-  <td>&nbsp;</td>
- </tr>
- <tr>
-  <td>&nbsp;</td>
- </tr>
- <tr>
-  <td align="center"><b>Sorry, no further information is available on this 
application.</b></td>
- </tr>
+<h3>{app_header}</h3>
+<p>Sorry, no further information is available on this application.</p>

====================================================
Index: phpgwapi/templates/desktop/css.tpl
diff -u phpgwapi/templates/desktop/css.tpl:1.1.2.1 
phpgwapi/templates/desktop/css.tpl:1.1.2.2
--- phpgwapi/templates/desktop/css.tpl:1.1.2.1  Sun Feb 22 07:08:19 2004
+++ phpgwapi/templates/desktop/css.tpl  Sat Feb 26 23:05:53 2005
@@ -1,5 +1,14 @@
 <style type="text/css">
 <!--
+       a { text-decoration:none; color: {link}; }
+       a:active{ text-decoration:none; color: {alink}; }
+       a:hover{ text-decoration:underline; color: {alink}; }
+       a:visted{ text-decoration:none; color: {link}; }
+       body { margin-top: 0px; margin-right: 0px; margin-left: 0px; 
font-family: {font}; }
+       .row_on { color: {row_text}; background-color: {row_on}; }
+       .row_off { color: {row_text}; background-color: {row_off}; }
+       .th { color: {th_text}; background-color: {th_bg}; }
+       .tablink { color: #000000; }
        {app_css}
 -->
 </style>

====================================================
Index: phpgwapi/templates/desktop/login_denylogin.tpl
diff -u phpgwapi/templates/desktop/login_denylogin.tpl:1.1.2.2 
phpgwapi/templates/desktop/login_denylogin.tpl:1.1.2.3
--- phpgwapi/templates/desktop/login_denylogin.tpl:1.1.2.2      Sat Nov  6 
15:34:27 2004
+++ phpgwapi/templates/desktop/login_denylogin.tpl      Sat Feb 26 23:05:53 2005
@@ -1,7 +1,7 @@

 <!-- BEGIN form -->
 <body bgcolor="#FFFFFF">
-<a href="http://www.phpgroupware.org";><img src="phpGroupWare.jpg" 
alt="phpGroupWare" border="0" /></a>
+<a href="http://www.phpgroupware.org";><img 
src="phpgwapi/templates/{template_set}/images/logo.gif" alt="phpGroupWare" 
border="0" /></a>

 <table border="0" height="94%" width="100%">
  <tr>

====================================================
Index: phpgwapi/templates/desktop/login_selectdomain.tpl
diff -u phpgwapi/templates/desktop/login_selectdomain.tpl:1.1.2.2 
phpgwapi/templates/desktop/login_selectdomain.tpl:1.1.2.3
--- phpgwapi/templates/desktop/login_selectdomain.tpl:1.1.2.2   Sat Nov  6 
15:34:27 2004
+++ phpgwapi/templates/desktop/login_selectdomain.tpl   Sat Feb 26 23:05:53 2005
@@ -12,23 +12,25 @@
 </head>

 <body bgcolor="#FFFFFF">
+<a href="http://www.phpgroupware.org";><img 
src="phpgwapi/templates/{template_set}/images/logo.gif" alt="phpGroupWare"  
border="0" /></a>
 <p>&nbsp;</p>
 <center>{lang_message}</center>
 <p>&nbsp;</p>

-<table bgcolor="#000000" border="0" cellpadding="0" cellspacing="0" 
width="60%" align="center">
+<table bgcolor="#000000" border="0" cellpadding="0" cellspacing="0" 
width="50%" align="center">
  <tr>
   <td>
    <table border="0" width="100%" bgcolor="#486591" cellpadding="2" 
cellspacing="1">
     <tr bgcolor="#486591">
-     <td align="left" valign="middel">
-      <a href="http://www.phpgroupware.org";><img 
src="phpgwapi/templates/{template_set}/images/logo.gif" alt="phpGroupWare" 
border="0" /></a>
+     <td align="left" valign="middle">
+      <font color="#fefefe">&nbsp;phpGroupWare</font>
      </td>
     </tr>
     <tr bgcolor="#e6e6e6">
      <td valign="baseline">

       <form method="post" action="{login_url}">
+         <input type="hidden" name="passwd_type" value="text" />
        <table border="0" align="center" bgcolor="#486591" width="100%" 
cellpadding="0" cellspacing="0">
         <tr bgcolor="#e6e6e6">
          <td colspan="3" align="center">
@@ -37,12 +39,12 @@
         </tr>
         <tr bgcolor="#e6e6e6">
          <td align="right"><font color="#000000">{lang_username}:</font></td>
-         <td align="right"><input name="login" value="{cookie}"></td>
-         <dt align="left">&nbsp;@&nbsp;<select 
name="logindomain">{select_domain}</select></td>
+         <td align="right"><input name="login" value="{cookie}" /></td>
+         <td align="left">&nbsp;@&nbsp;<select 
name="logindomain">{select_domain}</select></td>
         </tr>
         <tr bgcolor="#e6e6e6">
          <td align="right"><font color="#000000">{lang_password}:</font></td>
-         <td align="right"><input name="passwd" type="password" 
onchange="this.form.submit()"></td>
+         <td align="right"><input name="passwd" type="password" 
onchange="this.form.submit()" /></td>
          <td>&nbsp;</td>
         </tr>
         <tr bgcolor="#e6e6e6">
@@ -52,7 +54,7 @@
         </tr>
         <tr bgcolor="#e6e6e6">
          <td colspan="3" align="right">
-          <font color="000000" size="-1">{version}</font>
+          <font color="#000000" size="-1">{version}</font>
          </td>
         </tr>
        </table>

====================================================
Index: phpgwapi/templates/desktop/nextmatchs.tpl
diff -u phpgwapi/templates/desktop/nextmatchs.tpl:1.1.2.3 
phpgwapi/templates/desktop/nextmatchs.tpl:1.1.2.4
--- phpgwapi/templates/desktop/nextmatchs.tpl:1.1.2.3   Sat Nov  6 15:34:27 2004
+++ phpgwapi/templates/desktop/nextmatchs.tpl   Sat Feb 26 23:05:53 2005
@@ -27,11 +27,11 @@
        <table border="0" bgcolor="{th_bg}" cellspacing="0" cellpadding="0">
        <tr>
                <td align="{align}">
-                       <input type="image" src="{img}" border="{border}" 
alt="{label}" name="start" value="{start}" />
+                       <input type="image" src="{img}" border="{border}" 
alt="{label}" width="12" height="12" name="start" value="{start}" />
                </td>
        </tr>
        </table>
-       </form>
+</form>
 </td>
 <!-- END form -->

@@ -46,7 +46,7 @@
        <table border="0" bgcolor="{th_bg}" cellspacing="0" cellpadding="0">
        <tr>
                <td align="{align}">
-                       <img src="{img}" border="{border}" alt="{label}" />
+                       <img src="{img}" border="{border}" width="12" 
height="12" alt="{label}" />
                </td>
        </tr>
        </table>
@@ -55,14 +55,12 @@


 <!-- BEGIN search -->
-       <td>
-        <input type="text" name="query" value="{query_value}" 
/>&nbsp;{searchby}<input type="submit" name="Search" value="{lang_search}" />
-       </td>
+        <input type="text" name="query" 
value="{query_value}">&nbsp;{searchby}<input type="submit" name="Search" 
value="{lang_search}">
 <!-- END search -->

 <!-- BEGIN cats -->
        <td>
-        {lang_category}&nbsp;&nbsp;<select name="{cat_field}" 
onChange="this.form.submit();">
+        {lang_category}&nbsp;&nbsp;<select name="{cat_field}" 
onchange="this.form.submit();">
          <option value="0">{lang_all}</option>
          {categories}
         </select>
@@ -71,15 +69,18 @@
 <!-- END cats -->

 <!-- BEGIN search_filter -->
-     <form method="post" action="{form_action}" name="filter">
-      <input type="hidden" name="filter" value="{filter_value}" />
-      <input type="hidden" name="qfield" value="{qfield_value}" />
-      <input type="hidden" name="start" value="{start_value}" />
-      <input type="hidden" name="order" value="{order_value}" />
-      <input type="hidden" name="sort" value="{sort_value}" />
-      <input type="hidden" name="query" value="{query_value}" />
-      <table border="0" bgcolor="{th_bg}" cellspacing="0" cellpadding="0">
-       <tr>{search}<td>&nbsp;</td>{filter}
+    <form method="post" action="{form_action}" name="filter">
+     <input type="hidden" name="filter" value="{filter_value}" />
+     <input type="hidden" name="qfield" value="{qfield_value}" />
+     <input type="hidden" name="start" value="{start_value}" />
+     <input type="hidden" name="order" value="{order_value}" />
+     <input type="hidden" name="sort" value="{sort_value}" />
+     <input type="hidden" name="query" value="{query_value}" />
+     <table border="0" bgcolor="{th_bg}" cellspacing="0" cellpadding="0">
+      <tr>
+               <td>{search}</td>
+               <td>&nbsp;</td>
+               {filter}
       </tr>
      </table>
     </form>
@@ -94,7 +95,12 @@
      <input type="hidden" name="sort" value="{sort_value}" />
      <input type="hidden" name="query" value="{query_value}" />
      <table border="0" bgcolor="{th_bg}" cellspacing="0" cellpadding="0">
-      <tr>{cats}<td>&nbsp;</td>{search}<td>&nbsp;&nbsp;</td>{filter}
+      <tr>
+               {cats}
+               <td>&nbsp;</td>
+               <td>{search}</td>
+               <td>&nbsp;&nbsp;</td>
+               {filter}
       </tr>
      </table>
     </form>

====================================================
Index: phpgwapi/templates/desktop/navbar.tpl
diff -u phpgwapi/templates/desktop/navbar.tpl:1.1.2.2 
phpgwapi/templates/desktop/navbar.tpl:1.1.2.3
--- phpgwapi/templates/desktop/navbar.tpl:1.1.2.2       Sat Nov  6 15:34:27 2004
+++ phpgwapi/templates/desktop/navbar.tpl       Sat Feb 26 23:05:53 2005
@@ -1,119 +1,37 @@
-<!-- Written by Dave Hall, Copyright FSF Inc -->
-               <div id="menupopup">
-                       <table class="menu">
-                               <tr>
-                                       <td><img src="{img_root}/logo.png" 
/></td>
-
-                                       <td colspan="2" 
class="phpgw_title">{username}</td>
-                               </tr>
-                               <tr style="font-size: 1px; height: 1px;">
-                                       <td rowspan="{no_rows}" 
width="20">&nbsp;</td>
-                                       <td>&nbsp;</td>
-                               </tr>
-                               <tr id="menu_home" 
onclick="appWin.openWin('{lang_home}', '{icon_home}', '{url_home}');" 
onmouseover="menu.hiLite('menu_home');" onoouseout="menu.normal('menu_home');">
-
-                                       <td width="20"><img src="{img_home}" 
height="16" width="16" alt="{lang_home}" /></td>
-                                       <td>{lang_home}</td>
-
-                               </tr>
-                               <!-- BEGIN appmenu -->
-                               <tr id="menu_{id_app}" 
onclick="appWin.openWin('{lang_app}', '{img_app}', '{url_app}');" 
onmouseover="menu.hiLite('menu_{id_app}');" 
onmouseout="menu.normal('menu_{id_app}');">
-                                       <td width="20"><img src="{img_app}" 
height="16" width="16" alt="{lang_app}" /></td>
-                                       <td>{lang_app}</td>
-                               </tr>
-                               <!-- END appmenu -->
-                               <!-- TODO FIX THIS
-                               <tr id="menu_about" 
onclick="appWin.openWin('{lang_about}', '{icon_about}', '{url_about}');" 
onmouseover="menu.hiLite('menu_about');" 
onmouseout="menu.normal('menu_about');">
-                                       <td width="20"><img src="{img_about}" 
height="16" width="16" alt="{lang_about}" /></td>
-                                       <td>{lang_about}</td>
-                               </tr>
-                               -->
-                               <tr id="menu_logout" 
onclick="window.location='{url_logout}'" 
onmouseover="menu.hiLite('menu_logout');" 
onmouseout="menu.normal('menu_logout');">
-                                       <td><img src="{img_logout}" height="16" 
width="16" alt="{lang_logout}" /></td>
-                                       <td>{lang_logout}</td>
-                               </tr>
-                       </table>
-               </div>
-               <div id="menubar">
-                       <div id="menubutton" onclick="menu.toggle();" 
title="{lang_go_title}"><b><img src="{img_root}/logo.png" 
style="vertical-align: middle;" alt="{lang_go_title}" />{lang_go}</b></div>
-                       <div id="menurun"></div>
-                       <!--
-                               <div id="menuactive"></div>
-                               <div id="menucopyright">{powered_by}</div>
-                       </div>-->
-                       <div id="menuclock">
-                               <span id="clock" class="menutext"></span>
-                       </div>
-               </div>
-               <script type="text/javascript">
-               <!--
-                       /* This is a hack - but it works - skwashd */
-                       var items = {items};
-                       var loadURL = '{loadURL}';
-                       var urlNull = '{url_null}';
-               -->
-               </script>
-               <div id="messages">{messages}</div>
-               <div id="wallpaper">&nbsp;</div>
-               <div id="content1">
-                       <div class="apptitle">
-                               <div class="apptitlestrip">&nbsp;</div>
-                               <div class="appcuricon"><img 
src="{img_root}/blank.png" id="content1img" height="16" width="16" 
alt="shutuptidy" /></div>
-                               <div id="content1apptitle" 
class="appcurtitle">&nbsp;</div>
-                               <div class="appmin" onclick="appWin.min(1);" 
title="{lang_minimize}"><img src="{img_root}/minimize.png" height="16" 
width="16" alt="{lang_minimize}" /></div>
-                               <div class="appclose" 
onclick="appWin.close(1);" title="{lang_close}"><img src="{img_root}/close.png" 
height="16" width="16" alt="{lang_close}" /></div>
-                       </div>
-                       <div class="appcontent">
-                               <iframe id="ifrcontent1" src="{url_null}" 
style="height: 100%; width:100%;"></iframe>
-                       </div>
-               </div>
-               <div id="content2">
-                       <div class="apptitle">
-                               <div class="apptitlestrip">&nbsp;</div>
-                               <div class="appcuricon"><img 
src="{img_root}/blank.png" id="content2img" height="16" width="16" 
alt="shutuptidy"/></div>
-                               <div id="content2apptitle" 
class="appcurtitle">&nbsp;</div>
-                               <div class="appmin" onclick="appWin.min(2);" 
title="{lang_minimize}"><img src="{img_root}/minimize.png" height="16" 
width="16" alt="{lang_minimize}" /></div>
-                               <div class="appclose" 
onclick="appWin.close(2);" title="{lang_close}"><img src="{img_root}/close.png" 
height="16" width="16" alt="{lang_close}" /></div>
-                       </div>
-                       <div class="appcontent">
-                               <iframe id="ifrcontent2" src="{url_null}" 
style="height: 100%; width:100%;"></iframe>
-                       </div>
-               </div>
-               <div id="content3">
-                       <div class="apptitle">
-                               <div class="apptitlestrip">&nbsp;</div>
-                               <div class="appcuricon"><img 
src="{img_root}/blank.png" id="content3img" height="16" width="16" 
alt="shutuptidy"/></div>
-                               <div id="content3apptitle" 
class="appcurtitle">&nbsp;</div>
-                               <div class="appmin" onclick="appWin.min(3);" 
title="{lang_minimize}"><img src="{img_root}/minimize.png" height="16" 
width="16" alt="{lang_minimize}" /></div>
-                               <div class="appclose" 
onclick="appWin.close(3);" title="{lang_close}"><img src="{img_root}/close.png" 
height="16" width="16" alt="{lang_close}" /></div>
-                       </div>
-                       <div class="appcontent">
-                               <iframe id="ifrcontent3" src="{url_null}" 
style="height: 100%; width:100%;"></iframe>
-                       </div>
-               </div>
-               <div id="content4">
-                       <div class="apptitle">
-                               <div class="apptitlestrip">&nbsp;</div>
-                               <div class="appcuricon"><img 
src="{img_root}/blank.png" id="content4img" height="16" width="16" 
alt="shutuptidy"/></div>
-                               <div id="content4apptitle" 
class="appcurtitle">&nbsp;</div>
-                               <div class="appmin" onclick="appWin.min(4);" 
title="{lang_minimize}"><img src="{img_root}/minimize.png" height="16" 
width="16" alt="{lang_minimize}" /></div>
-                               <div class="appclose" 
onclick="appWin.close(4);" title="{lang_close}"><img src="{img_root}/close.png" 
height="16" width="16" alt="{lang_close}" /></div>
-                       </div>
-                       <div class="appcontent">
-                               <iframe id="ifrcontent4" src="{url_null}" 
style="height: 100%; width:100%;"></iframe>
-                       </div>
-               </div>
-               <div id="content5">
-                       <div class="apptitle">
-                               <div class="apptitlestrip">&nbsp;</div>
-                               <div class="appcuricon"><img 
src="{img_root}/blank.png" id="content5img" height="16" width="16" 
alt="shutuptidy"/></div>
-                               <div id="content5apptitle" 
class="appcurtitle">&nbsp;</div>
-                               <div class="appmin" onclick="appWin.min(5);" 
title="{lang_minimize}"><img src="{img_root}/minimize.png" height="16" 
width="16" alt="{lang_minimize}" /></div>
-                               <div class="appclose" 
onclick="appWin.close(5);" title="{lang_close}"><img src="{img_root}/close.png" 
height="16" width="16" alt="{lang_close}" /></div>
-                       </div>
-                       <div class="appcontent">
-                               <iframe id="ifrcontent5" src="{url_null}" 
style="height: 100%; width:100%;"></iframe>
-                       </div>
-               </div>
-       </body>
-</html>
+<!-- BEGIN navbar -->
+               <div id="header">
+                       <div id="navbar">
+                               <ul>
+                                       <li><img src="{img_base_url}logo.png" 
alt="phpGroupWare Logo" height="21" width="25" />{lang_applications}
+                                               <ul>
+                                                       <!-- BEGIN app_both -->
+                                                       <li><a 
href="{url}"{target}><img src="{icon}" alt="{title}"
+                                                               title="{title}" 
height="16" width="16" /> {title}</a></li>
+                                                       <!-- END app_both -->
+                                                       <!-- BEGIN app_text -->
+                                                       <li><a 
href="{url}"{target}>{title}</a></li>
+                                                       <!-- END app_text -->
+                                                       <!-- BEGIN app_icon -->
+                                                       <li><a 
href="{url}"{target}><img src="{icon}" alt="{title}"
+                                                               title="{title}" 
height="16" width="16" /></a></li>
+                                                       <!-- END app_icon -->
+                                               </ul>
+                                       </li>
+                                       <!-- BEGIN prefs -->
+                                       <li><a 
href="{prefs_url}">{lang_prefs}</a></li>
+                                       <!-- END prefs -->
+                                       <li><a 
href="{logout_url}">{lang_logout}</a></li>
+                               </ul>
+                       </div>
+                       <div id="about"><a href="{about_url}">?</a></div>
+                       <div id="user">{user_info} <span 
id="clock"></span></div>
+               </div>
+               <div id="content">
+                       <div id="content_title">
+                               <img src="{cur_app_icon}" alt="{cur_app_title} 
icon" height="16" width="16" /> {cur_app_title}</div>
+                       <!-- BEGIN app_header -->
+                               <strong>{current_app_header}</strong><hr />
+                       <!-- END app_header -->
+                       {messages}<br />
+                       <div id="content_body">
+<!-- END navbar -->

====================================================
Index: phpgwapi/templates/desktop/navbar.inc.php
diff -u phpgwapi/templates/desktop/navbar.inc.php:1.1.2.1 
phpgwapi/templates/desktop/navbar.inc.php:1.1.2.2
--- phpgwapi/templates/desktop/navbar.inc.php:1.1.2.1   Sun Feb 22 07:08:19 2004
+++ phpgwapi/templates/desktop/navbar.inc.php   Sat Feb 26 23:05:53 2005
@@ -1,31 +1,197 @@
 <?php
- /**
- * phpGroupWare desktop template
- * @author Dave Hall dave.hall at mbox.com.au
- * @copyright Copyright (C) 2004 Free Software Foundation http://www.fsf.org/
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public License
- * @package phpgwapi
- * @subpackage gui
- * @version $Id$
- */
+  /**************************************************************************\
+  * phpGroupWare                                                             *
+  * http://www.phpgroupware.org                                              *
+  * --------------------------------------------                             *
+  *  This program is free software; you can redistribute it and/or modify it *
+  *  under the terms of the GNU General Public License as published by the   *
+  *  Free Software Foundation; either version 2 of the License, or (at your  *
+  *  option) any later version.                                              *
+  \**************************************************************************/

-       function parse_navbar($force = False)
-       {
-               $GLOBALS['desktop']->navbar_render();
-       }
+  /* $Id$ */

-
-       function display_sidebox($appname, $menu_title, $file, $use_lang = True)
-       {
-               //TODO Make this work
-       }
+  function parse_navbar($force = False)
+  {
+               $tpl = createobject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
+               $tpl->set_unknowns('remove');

-       function sidebox_menu_item($item_link='', $item_text='', 
$item_image='', $use_lang = True)
-       {
-               //TODO Make this work
+               $tpl->set_file(
+                       array(
+                               'navbar'        => 'navbar.tpl',
+                               'navbar_app'    => 'navbar_app.tpl'
+                       )
+               );
+
+               $tpl->set_block('navbar', 'app_text', 'apps_text');
+               $tpl->set_block('navbar', 'app_icon', 'apps_icon');
+               $tpl->set_block('navbar', 'app_both', 'apps_both');
+               $tpl->set_block('navbar', 'prefs', 'prefs_block');
+
+               switch 
($GLOBALS['phpgw_info']['user']['preferences']['common']['navbar_format'])
+               {
+                       case 'text':
+                               $block = 'app_text';
+                               $block_out = 'apps_text';
+                               $tpl->set_var(
+                                               array(
+                                                       'apps_icon'     => '',
+                                                       'apps_both'     => ''
+                                               )
+                               );
+                               break;
+
+                       case 'icons':
+                               $block = 'app_icon';
+                               $block_out = 'apps_icon';
+                               $tpl->set_var(
+                                               array(
+                                                       'apps_text'     => '',
+                                                       'apps_both'     => ''
+                                               )
+                               );
+
+                               break;
+
+                       default:
+                               $block = 'app_both';
+                               $block_out = 'apps_both';
+                               $tpl->set_var(
+                                               array(
+                                                       'apps_text'     => '',
+                                                       'apps_icon'     => ''
+                                               )
+                               );
+                               break;
+               }
+
+               if ($GLOBALS['phpgw_info']['flags']['navbar_target'])
+               {
+                       $target = ' target="' . 
$GLOBALS['phpgw_info']['flags']['navbar_target'] . '"';
+               }
+
+               $prefs_ok = False;
+               foreach($GLOBALS['phpgw_info']['navbar'] as $app => $app_data)
+               {
+                       if($app == 'preferences')
+                       {
+                               $tpl->set_var(
+                                       array(
+                                               'prefs_url'     => 
$app_data['url'],
+                                               'lang_prefs'    => 
$app_data['title']
+                                       )
+                               );
+                               $tpl->parse('prefs_block', 'prefs');
+                               $prefs_ok = True;
+                               continue;
+                       }
+
+                       if($app == 'logout' || $app == 'about')
+                       {
+                               continue;
+                       }
+
+                       $app_data['target'] = $target;
+                       $tpl->set_var($app_data);
+                       $tpl->parse($block_out, $block, True);
+               }
+
+               if( !$prefs_ok )
+               {
+                       $tpl->set_var('prefs', '');
+               }
+
+               $var = array();
+               $var['lang_applications'] = lang('applications');
+               $var['img_base_url'] = 
$GLOBALS['phpgw_info']['server']['webserver_url'] . 
'/phpgwapi/templates/desktop/images/';
+               $var['lang_logout'] = lang('logout');
+               $var['logout_url'] = 
$GLOBALS['phpgw_info']['navbar']['logout']['url'];
+               $var['lang_about'] = lang('about');
+               $var['about_url'] = 
$GLOBALS['phpgw_info']['navbar']['about']['url'];
+               $var['cur_app_title'] = 
$GLOBALS['phpgw_info']['navbar'][$GLOBALS['phpgw_info']['flags']['currentapp']]['title'];
+               $var['cur_app_icon'] = 
$GLOBALS['phpgw_info']['navbar'][$GLOBALS['phpgw_info']['flags']['currentapp']]['icon'];
+
+               if ($GLOBALS['phpgw_info']['server']['showpoweredbyon'] == 
'top')
+               {
+                       $var['powered_by'] = lang('Powered by phpGroupWare 
version %1',$GLOBALS['phpgw_info']['server']['versions']['phpgwapi']);
+               }
+               if (isset($GLOBALS['phpgw_info']['navbar']['admin']) && 
$GLOBALS['phpgw_info']['user']['preferences']['common']['show_currentusers'])
+               {
+                       $var['current_users'] = '<a href="' . 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicurrentsessions.list_sessions')
+                               . '">&nbsp;' . lang('Current users') . ': ' . 
$GLOBALS['phpgw']->session->total() . '</a>';
+               }
+               $now = time();
+               $var['user_info'] = 
$GLOBALS['phpgw']->common->display_fullname() . ' - '
+                               . 
lang($GLOBALS['phpgw']->common->show_date($now,'l')) . ' '
+                               . 
$GLOBALS['phpgw']->common->show_date($now,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
+
+               // Maybe we should create a common function in the 
phpgw_accounts_shared.inc.php file
+               // to get rid of duplicate code.
+               if ($GLOBALS['phpgw_info']['user']['lastpasswd_change'] == 0)
+               {
+                       $api_messages = lang('You are required to change your 
password during your first login')
+                               . '<br /> Click this image on the navbar: <img 
src="'
+                               . 
$GLOBALS['phpgw']->common->image('preferences','navbar.gif').'">';
+               }
+               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);
+               }
+
+               // This is gonna change
+               if (isset($cd))
+               {
+                       $var['messages'] = $api_messages . '<br />' . 
checkcode($cd);
+               }
+
+               if (isset($GLOBALS['phpgw_info']['flags']['app_header']))
+               {
+                       $var['current_app_header'] = 
$GLOBALS['phpgw_info']['flags']['app_header'];
+                       $var['th_bg'] = 
$GLOBALS['phpgw_info']['theme']['th_bg'];
+               }
+               else
+               {
+                       $tpl->set_block('navbar','app_header','app_header');
+                       $var['app_header'] = '';
+               }
+
+               $tpl->set_var($var);
+               $tpl->pfp('out','navbar');
+               // If the application has a header include, we now include it
+               if( !$GLOBALS['phpgw_info']['flags']['noappheader'] && 
isset($_GET['menuaction']) )
+               {
+                       list($app,$class,$method) = 
explode('.',$_GET['menuaction']);
+                       if (is_array($GLOBALS[$class]->public_functions) && 
$GLOBALS[$class]->public_functions['header'])
+                       {
+                               $GLOBALS[$class]->header();
+                       }
+               }
+               $GLOBALS['phpgw']->hooks->process('after_navbar');
+               return;
        }
-
+
        function parse_navbar_end()
        {
-               $GLOBALS['desktop']->footer_render();
+               $tpl = createobject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
+               $tpl->set_unknowns('remove');
+
+               $tpl->set_file(
+                       array(
+                               'footer' => 'footer.tpl'
+                       )
+               );
+               $var = array();
+               $var['powered_by'] = lang('Powered by phpGroupWare version 
%1',$GLOBALS['phpgw_info']['server']['versions']['phpgwapi']);
+               if (isset($GLOBALS['phpgw_info']['navbar']['admin']) && 
$GLOBALS['phpgw_info']['user']['preferences']['common']['show_currentusers'])
+               {
+                       $var['current_users'] = '<a href="' . 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicurrentsessions.list_sessions')
+                               . '">' . lang('Current users') . ': ' . 
$GLOBALS['phpgw']->session->total() . '</a>';
+               }
+               $now = time();
+               $var['user_info'] = 
$GLOBALS['phpgw']->common->display_fullname() . ' - '
+                               . 
lang($GLOBALS['phpgw']->common->show_date($now,'l')) . ' '
+                               . $GLOBALS['phpgw']->common->show_date($now, 
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
+               $tpl->set_var($var);
+               $GLOBALS['phpgw']->hooks->process('navbar_end');
+               $tpl->pfp('out','footer');
        }

====================================================
Index: phpgwapi/templates/desktop/navbar_app.tpl
diff -u phpgwapi/templates/desktop/navbar_app.tpl:1.1.2.2 
phpgwapi/templates/desktop/navbar_app.tpl:1.1.2.3
--- phpgwapi/templates/desktop/navbar_app.tpl:1.1.2.2   Sat Nov  6 15:34:27 2004
+++ phpgwapi/templates/desktop/navbar_app.tpl   Sat Feb 26 23:05:53 2005
@@ -1,3 +1 @@
-       <td width="10%" align="center"><img src="{img_root}/admin.jpg" 
width="60" height="62" alt="" /></td>
-
-<!--<td align="center" width="{width}">{value}</td>-->
+<div>{value}</div>






reply via email to

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