phpgroupware-cvs
[Top][All Lists]
Advanced

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

[Phpgroupware-cvs] setup applications.php templates/base/applicati...


From: Dave Hall
Subject: [Phpgroupware-cvs] setup applications.php templates/base/applicati...
Date: Tue, 03 Oct 2006 07:45:56 +0000

CVSROOT:        /cvsroot/phpgroupware
Module name:    setup
Changes by:     Dave Hall <skwashd>     06/10/03 07:45:56

Modified files:
        .              : applications.php 
        templates/base : applications.tpl head.tpl login_main.tpl 
                         login_stage_header.tpl 

Log message:
        more ui improvements, could do more, but this will do for now

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/setup/applications.php?cvsroot=phpgroupware&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/setup/templates/base/applications.tpl?cvsroot=phpgroupware&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/setup/templates/base/head.tpl?cvsroot=phpgroupware&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/setup/templates/base/login_main.tpl?cvsroot=phpgroupware&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/setup/templates/base/login_stage_header.tpl?cvsroot=phpgroupware&r1=1.1&r2=1.2

Patches:
Index: applications.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/applications.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- applications.php    3 Oct 2006 02:55:41 -0000       1.32
+++ applications.php    3 Oct 2006 07:45:56 -0000       1.33
@@ -5,7 +5,7 @@
        * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc. 
http://www.fsf.org/
        * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
        * @package setup
-       * @version $Id: applications.php,v 1.32 2006/10/03 02:55:41 skwashd Exp 
$
+       * @version $Id: applications.php,v 1.33 2006/10/03 07:45:56 skwashd Exp 
$
        */
 
        $DEBUG = (isset($_POST['debug']) && $_POST['debug']) || 
(isset($_GET['debug']) && $_GET['debug']);
@@ -72,7 +72,7 @@
        $setup_tpl->set_block('T_setup_main','footer','footer');
        $setup_tpl->set_var('lang_cookies_must_be_enabled', lang('<b>NOTE:</b> 
You must have cookies enabled to use setup and header admin!') );
 
-       $bgcolor = array('row_on', 'row_off');
+       $bg_class = array('row_on', 'row_off');
 
        /**
         * Parse dependencies
@@ -83,24 +83,23 @@
         */
        function parsedep($depends,$main=True)
        {
-               $depstring = '(';
-               foreach($depends as $a => $b)
+               $depstring = '';
+               foreach($depends as $b)
                {
                        foreach($b as $c => $d)
                        {
                                if (is_array($d))
                                {
-                                       $depstring .= $c . ': ' 
.implode(',',$d) . '; ';
+                                       $depstring .= "($c : " . 
implode(',',$d) . ')';
                                        $depver[] = $d;
                                }
                                else
                                {
-                                       $depstring .= $c . ': ' . $d . '; ';
+                                       $depstring .= "<br>\n$d ";
                                        $depapp[] = $d;
                                }
                        }
                }
-               $depstring .= ')';
                if ($main)
                {
                        return $depstring;
@@ -245,7 +244,7 @@
        $resolve = get_var('resolve',Array('GET')); 
        if($detail)
        {
-               @ksort($setup_info[$detail]);
+               ksort($setup_info[$detail]);
                $setup_tpl->set_var('description','<a 
href="applications.php?debug='.$DEBUG.'">' . lang('Go back') . '</a>');
                $setup_tpl->pparse('out','header');
 
@@ -254,7 +253,7 @@
                         : lang($setup_info[$detail]['name']));
                $setup_tpl->set_var('name',lang('application'));
                $setup_tpl->set_var('details', $name);
-               $setup_tpl->set_var('bg_color', 'th');
+               $setup_tpl->set_var('bg_class', 'th');
                $setup_tpl->pparse('out','detail');
        
                $i = 1;
@@ -269,15 +268,27 @@
                                        $tblcnt = 
count($setup_info[$detail][$key]);
                                        if(is_array($val))
                                        {
-                                               $key = '<a 
href="sqltoarray.php?appname=' . $detail . '&submit=True">' . $key . '(' . 
$tblcnt . ')</a>' . "\n";
+                                               $key = '<a 
href="sqltoarray.php?appname=' . $detail . '&amp;submit=True">' . $key . '(' . 
$tblcnt . ')</a>' . "\n";
                                                $val = implode(',' . "\n",$val);
                                        }
                                }
-                               if ($key == 'hooks')   { $val = 
implode(',',$val); }
-                               if ($key == 'depends') { $val = parsedep($val); 
}
-                               if (is_array($val))    { $val = 
implode(',',$val); }
 
-                               $setup_tpl->set_var('bg_color', $bgcolor[$i]);
+                               if ($key == 'hooks')
+                               {
+                                       $val = implode(',',$val);
+                               }
+                               
+                               if ($key == 'depends')
+                               {
+                                       $val = parsedep($val);
+                               }
+                               
+                               if (is_array($val))
+                               {
+                                       $val = implode(',',$val);
+                               }
+
+                               $setup_tpl->set_var('bg_class', $bg_class[$i]);
                                $setup_tpl->set_var('name',$key);
                                $setup_tpl->set_var('details',$val);
                                $setup_tpl->pparse('out','detail');
@@ -390,8 +401,6 @@
                $setup_tpl->pparse('out','detail');
        
                $setup_tpl->set_var('bg_color','row_on');
-               $setup_tpl->set_var('name',lang('register globals = %1',
-                       lang($_GET['globals'])));
                $setup_tpl->set_var('details', lang('register_globals_' . 
$_GET['globals']));
                $setup_tpl->pparse('out','detail');
                $setup_tpl->pparse('out','footer');
@@ -405,8 +414,8 @@
                $setup_tpl->set_var('appdata',lang('Application Data'));
                $setup_tpl->set_var('actions',lang('Actions'));
                $setup_tpl->set_var('action_url','applications.php');
-               $setup_tpl->set_var('app_info',lang('Application Name and 
Status Information'));
-               $setup_tpl->set_var('app_title',lang('Application Title'));
+               $setup_tpl->set_var('app_info',lang('Application Name'));
+               $setup_tpl->set_var('app_status',lang('Application Status'));
                $setup_tpl->set_var('app_currentver',lang('Current Version'));
                $setup_tpl->set_var('app_version',lang('Available Version'));
                $setup_tpl->set_var('app_install',lang('Install'));
@@ -419,7 +428,7 @@
                $setup_tpl->set_var('remove_all',lang('Remove All'));
                $setup_tpl->set_var('lang_debug',lang('enable debug messages'));
                $setup_tpl->set_var('debug','<input type="checkbox" 
name="debug" value="True"' .($DEBUG ? ' checked' : '') . '>');
-               $setup_tpl->set_var('bg_color',$bgcolor[0]);
+               $setup_tpl->set_var('bg_class',$bg_class[0]);
 
                $setup_tpl->pparse('out','app_header');
 
@@ -433,7 +442,7 @@
                                $setup_tpl->set_var('apptitle',$value['title']);
                                $setup_tpl->set_var('currentver', 
isset($value['currentver']) ? $value['currentver'] : '');
                                
$setup_tpl->set_var('version',$value['version']);
-                               $setup_tpl->set_var('bg_color',$bgcolor[$i]);
+                               $setup_tpl->set_var('bg_class',$bg_class[$i]);
                         
                                switch($value['status'])
                                {
@@ -444,7 +453,7 @@
                                                {
                                                        // App installed and 
enabled, but some tables are missing
                                                        
$setup_tpl->set_var('instimg','stock_database.png');
-                                                       
$setup_tpl->set_var('bg_color','row_err_table');
+                                                       
$setup_tpl->set_var('bg_class','row_err_table');
                                                        
$setup_tpl->set_var('instalt',lang('Not Completed'));
                                                        
$setup_tpl->set_var('resolution','<a href="applications.php?resolve=' . 
$value['name'] . '&amp;badinstall=True">' . lang('Potential Problem') . '</a>');
                                                        $status = 
lang('Requires reinstall or manual repair') . ' - ' . $value['status'];
@@ -457,7 +466,7 @@
                                                        if($value['enabled'])
                                                        {
                                                                
$setup_tpl->set_var('resolution','');
-                                                               $status = 
lang('OK') . ' - ' . $value['status'];
+                                                               $status = 
"[{$value['status']}] " . lang('OK');
                                                        }
                                                        else
                                                        {
@@ -467,11 +476,11 @@
                                                                {
                                                                        
$notables = '&amp;notables=True';
                                                                }
-                                                               
$setup_tpl->set_var('bg_color','row_err_gen');
+                                                               
$setup_tpl->set_var('bg_class','row_err_gen');
                                                                
$setup_tpl->set_var('resolution',
                                                                        '<a 
href="applications.php?resolve=' . $value['name'] .  $notables . '">' . 
lang('Possible Reasons') . '</a>'
                                                                );
-                                                               $status = 
lang('Disabled') . ' - ' . $value['status'];
+                                                               $status = 
"[{$value['status']}] " . lang('Disabled');
                                                        }
                                                }
                                                break;
@@ -485,29 +494,29 @@
                                                                // Some tables 
missing
                                                                
$setup_tpl->set_var('instimg','stock_database.png');
                                                                
$setup_tpl->set_var('remove','<input type="checkbox" name="remove[' . 
$value['name'] . ']" />');
-                                                               
$setup_tpl->set_var('resolution','<a href="applications.php?resolve=' . 
$value['name'] . '&badinstall=True">' . lang('Potential Problem') . '</a>');
+                                                               
$setup_tpl->set_var('resolution','<a href="applications.php?resolve=' . 
$value['name'] . '&amp;badinstall=True">' . lang('Potential Problem') . '</a>');
                                                                $status = 
lang('Requires reinstall or manual repair') . ' - ' . $value['status'];
                                                        }
                                                        else
                                                        {
                                                                
$setup_tpl->set_var('remove','&nbsp;');
                                                                
$setup_tpl->set_var('resolution','');
-                                                               $status = 
lang('Requires upgrade') . ' - ' . $value['status'];
+                                                               $status = 
"[{$value['status']}] " . lang('Requires upgrade');
                                                        }
-                                                       
$setup_tpl->set_var('bg_color','row_install');
+                                                       
$setup_tpl->set_var('bg_class','row_install');
                                                        
$setup_tpl->set_var('install','<input type="checkbox" name="install[' . 
$value['name'] . ']" />');
                                                        
$setup_tpl->set_var('upgrade','&nbsp;');
-                                                       $status = lang('Please 
install') . ' - ' . $value['status'];
+                                                       $status = 
"[{$value['status']}] " . lang('Please install');
                                                }
                                                else
                                                {
-                                                       
$setup_tpl->set_var('bg_color','row_upgrade');
+                                                       
$setup_tpl->set_var('bg_class','row_upgrade');
                                                        
$setup_tpl->set_var('install','&nbsp;');
                                                        // TODO display some 
info about breakage if you mess with this app
                                                        
$setup_tpl->set_var('upgrade','<input type="checkbox" name="upgrade[' . 
$value['name'] . ']">');
                                                        
$setup_tpl->set_var('remove','<input type="checkbox" name="remove[' . 
$value['name'] . ']">');
                                                        
$setup_tpl->set_var('resolution','');
-                                                       $status = 
lang('Requires upgrade') . ' - ' . $value['status'];
+                                                       $status = 
"[{$value['status']}] " . lang('Requires upgrade');
                                                }
                                                break;
                                        case 'V':
@@ -516,32 +525,30 @@
                                                
$setup_tpl->set_var('install','&nbsp;');
                                                
$setup_tpl->set_var('remove','<input type="checkbox" name="remove[' . 
$value['name'] . ']">');
                                                
$setup_tpl->set_var('upgrade','<input type="checkbox" name="upgrade[' . 
$value['name'] . ']">');
-                                               
$setup_tpl->set_var('resolution','<a href="applications.php?resolve=' . 
$value['name'] . '&version=True">' . lang('Possible Solutions') . '</a>');
-                                               $status = lang('Version 
Mismatch') . ' - ' . $value['status'];
+                                               
$setup_tpl->set_var('resolution','<a href="applications.php?resolve=' . 
$value['name'] . '&amp;version=True">' . lang('Possible Solutions') . '</a>');
+                                               $status = "[{$value['status']}] 
" . lang('Version Mismatch');
                                                break;
                                        case 'D':
-                                               
$setup_tpl->set_var('bg_color','FFCCCC');
+                                               $setup_tpl->set_var('bg_class', 
'row_err_gen');
                                                $depstring = 
parsedep($value['depends']);
-                                               $depstring .= ')';
                                                $setup_tpl->set_var('instimg', 
'stock_no.png');
                                                
$setup_tpl->set_var('instalt',lang('Dependency Failure'));
                                                
$setup_tpl->set_var('install','&nbsp;');
                                                
$setup_tpl->set_var('remove','&nbsp;');
                                                
$setup_tpl->set_var('upgrade','&nbsp;');
                                                
$setup_tpl->set_var('resolution','<a href="applications.php?resolve=' . 
$value['name'] . '">' . lang('Possible Solutions') . '</a>');
-                                               $status = lang('Dependency 
Failure') . ':' . $depstring . $value['status'];
+                                               $status = "[{$value['status']}] 
" . lang('Dependency Failure') . $depstring;
                                                break;
                                        case 'P':
-                                               
$setup_tpl->set_var('bg_color','FFCCFF');
+                                               $setup_tpl->set_var('bg_class', 
'row_err_gen');
                                                $depstring = 
parsedep($value['depends']);
-                                               $depstring .= ')';
                                                $setup_tpl->set_var('instimg', 
'stock_no.png');
                                                
$setup_tpl->set_var('instalt',lang('Post-install Dependency Failure'));
                                                
$setup_tpl->set_var('install','&nbsp;');
                                                
$setup_tpl->set_var('remove','&nbsp;');
                                                
$setup_tpl->set_var('upgrade','&nbsp;');
                                                
$setup_tpl->set_var('resolution','<a href="applications.php?resolve=' . 
$value['name'] . '&post=True">' . lang('Possible Solutions') . '</a>');
-                                               $status = lang('Post-install 
Dependency Failure') . ':' . $depstring . $value['status'];
+                                               $status = "[{$value['status']}] 
" . lang('Post-install Dependency Failure') . $depstring;
                                                break;
                                        default:
                                                
$setup_tpl->set_var('instimg','package-generic.png');
@@ -553,7 +560,7 @@
                                                $status = '';
                                                break;
                                }
-                               $setup_tpl->set_var('appinfo',"{$value['name']} 
- {$status}");
+                               $setup_tpl->set_var('appinfo', $status);
                                $setup_tpl->set_var('appname', $value['name']);
 
                                $setup_tpl->pparse('out','apps');

Index: templates/base/applications.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/setup/templates/base/applications.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- templates/base/applications.tpl     3 Oct 2006 02:55:41 -0000       1.4
+++ templates/base/applications.tpl     3 Oct 2006 07:45:56 -0000       1.5
@@ -18,65 +18,47 @@
   }
 }
 </script>
-<style type="text/css">
-       img
-       {
-               border: 0;
-       }
-</style>
-
-<br>
-<div align="center">
-<table border="0" width="100%" cellspacing="0" cellpadding="2">
-  <tr>
-    <td align="center">{description}</td>
-  </tr>
-</table>
-<table width="70%" cellspacing="0" cellpadding="2" style="{ border: 1px solid 
#000000; }">
+<h1>{description}</h1>
+<form action="applications.php" method="post">
+<table id="apps">
 <!-- END header -->
 
 <!-- BEGIN app_header -->
-<form name="apps" method="POST" action="{action_url}">
-  <tr class="th">
-    <td colspan="5" align="center">{appdata}</td>
-    <td colspan="4" align="center">{actions}</td>
-  </tr>
-  <tr class="row_on">
-    <td colspan="2">{app_info}</td>
-    <td align="center">{app_title}</td>
-    <td align="center">{app_currentver}</td>
-    <td align="center">{app_version}</td>
-    <td align="center">{app_install}</td>
-    <td align="center">{app_upgrade}</td>
-    <td align="center">{app_resolve}</td>
-    <td align="center">{app_remove}</td>
-  </tr>
-  <tr class="row_on">
-    <td colspan="5">&nbsp;</td>
-    <td align="center">
+       <thead>
+               <tr>
+                       <th colspan="2">{app_info}</th>
+                       <th>{app_status}</th>
+                       <th>{app_currentver}</th>
+                       <th>{app_version}</th>
+                       <th>
+                               {app_install}<br>
      <a href="javascript:check_all('install')"><img 
src="../phpgwapi/templates/base/images/{check}" title="{install_all}" 
alt="{install_all}"></a>
-    </td>
-    <td align="center">
-     <a href="javascript:check_all('upgrade')"><img 
src="../phpgwapi/templates/base/images/{check}" title="{upgrade_all}" 
alt="{upgrade_all}"></a>
-    </td>
-    <td>&nbsp;</td>
-    <td align="center">
-      <a href="javascript:check_all('remove')"><img 
src="../phpgwapi/templates/base/images/{check}" title="{remove_all}" 
alt="{remove_all}"></a>
-    </td>
+                       </th>
+                       <th>
+                               {app_upgrade}<br>
+                               <a href="javascript:check_all('upgrade')"><img 
src="../phpgwapi/templates/base/images/{check}" title="{install_all}" 
alt="{install_all}"></a>
+                       </th>
+                       <th>{app_resolve}</th>
+                       <th>
+                               {app_remove}<br>
+                               <a href="javascript:check_all('remove')"><img 
src="../phpgwapi/templates/base/images/{check}" title="{install_all}" 
alt="{install_all}"></a>
+                       </th>
   </tr>
+       </thead>
+       <tbody>
 <!-- END app_header -->
 
 <!-- BEGIN apps -->
-  <tr class="{bg_color}">
-    <td><a href="applications.php?detail={appname}"><img 
src="../phpgwapi/templates/base/images/{instimg}" alt="{instalt}" 
title="{instalt}" border="0"></a></td>
-    <td>{appinfo}&nbsp;</td>
-    <td>{apptitle}&nbsp;</td>
-    <td>{currentver}&nbsp;</td>
-    <td>{version}&nbsp;</td>
-    <td bgcolor="#CCFFCC" align="center">{install}</td>
-    <td bgcolor="#CCCCFF" align="center">{upgrade}</td>
-    <td align="center">{resolution}&nbsp;</td>
-    <td bgcolor="#CCAAAA" align="center">{remove}</td>
+               <tr class="{bg_class}">
+                       <td class="appicon"><a 
href="applications.php?detail={appname}"><img 
src="../phpgwapi/templates/base/images/{instimg}" alt="{instalt}" 
title="{instalt}" border="0"></a></td>
+                       <td><strong>{appname}</strong></td>
+                       <td>{appinfo}</td>
+                       <td>{currentver}</td>
+                       <td>{version}</td>
+                       <td class="row_install centered" 
align="center">{install}</td>
+                       <td class="row_upgrade centered">{upgrade}</td>
+                       <td class="centered">{resolution}&nbsp;</td>
+                       <td class="row_remove centered">{remove}</td>
   </tr>
 <!-- END apps -->
 
@@ -116,7 +98,8 @@
 <!-- END submit -->
 
 <!-- BEGIN app_footer -->
-  <tr class="{bg_color}">
+  </tbody>
+  <tr class="th">
     <td colspan="5">{debug} {lang_debug}</td>
     <td align="center">
      <a href="javascript:check_all('install')"><img 
src="../phpgwapi/templates/base/images/{check}" title="{install_all}" 
alt="{install_all}"></a>
@@ -130,25 +113,14 @@
     </td>
   </tr>
 </table>
-<table border="0" width="70%" cellspacing="0" cellpadding="2">
-  <tr>
-    <td colspan="2" align="center">
+<div class="button_group">
      <input type="submit" name="submit" value="{submit}">
      <input type="submit" name="cancel" value="{cancel}">
-    </td>
-  </tr>
-</table>
+</div>
 </form>
 <!-- END app_footer -->
 
 <!-- BEGIN footer -->
-  </tr>
-</table>
-<br>
-<table width="100%" cellspacing="0">
-  <tr class="banner">
-    <td>&nbsp;</td>
-  </tr>
-</table>
+       <div class="banner"> </div>
 </div>
 <!-- END footer -->

Index: templates/base/head.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/setup/templates/base/head.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- templates/base/head.tpl     24 Apr 2006 09:49:07 -0000      1.2
+++ templates/base/head.tpl     3 Oct 2006 07:45:56 -0000       1.3
@@ -1,44 +1,161 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
-<head>
+       <head>
 
-<META name="AUTHOR" content="phpGroupWare http://www.phpgroupware.org";>
-<META NAME="description" CONTENT="phpGroupWare">
-<META NAME="keywords" CONTENT="phpGroupWare">
-<META HTTP-EQUIV="Pragma" CONTENT="no-cache">
-<META HTTP-EQUIV="Cache-control" CONTENT="no-cache">
-<META HTTP-EQUIV="content-type" CONTENT="text/html;charset=utf-8">
+               <META name="AUTHOR" content="phpGroupWare 
http://www.phpgroupware.org";>
+               <META NAME="description" CONTENT="phpGroupWare">
+               <META NAME="keywords" CONTENT="phpGroupWare">
+               <META HTTP-EQUIV="Pragma" CONTENT="no-cache">
+               <META HTTP-EQUIV="Cache-control" CONTENT="no-cache">
+               <META HTTP-EQUIV="content-type" 
CONTENT="text/html;charset=utf-8">
 
   <style type="text/css">
   <!-- 
-  a, body, tr, th, td, input, select { font-family: Verdana, Arial, Helvetica, 
sans-serif; font-size: 10pt; text-decoration: none; }
-  a:hover, a:active { text-decoration: underline; }
-  .banner { background-color: {banner_bg}; color: {th_text}; font-weight: 
bold; }
-  .centered { text-align: center; }
-  .msg { color: {msg}; }
-  .link { color: #FFFFFF; }
-  .th { background: {th_bg}; font-weight: bold; color: {th_text} }
-  .row_err_table {background-color: #FFCCAA;}
-  .row_err_gen {background-color: #CCCCFF;}
-  .row_install {background-color: #CCFFCC;}
-  .row_on,.th_bright { background: {row_on}; }
-  .row_off { background: {row_off}; }
-  .row_upgrade {background-color: #CCCCFF;}
+                       a, body, tr, th, td, input, select
+                       {
+                               font-family: Verdana, Arial, Helvetica, 
sans-serif;
+                               font-size: 12px;
+                               text-decoration: none;
+                       }
+
+                       a:hover, a:active
+                       {
+                               text-decoration: underline;
+                       }
+
+                       body
+                       {
+                               background-color: #fff;
+                       }
+
+                       img
+                       {
+                               border: 0;
+                       }
+
+                       td, th
+                       {
+                               vertical-align: top;
+                       }
+
+                       td.appicon
+                       {
+                               vertical-align: middle;
+                       }
+                       thead, tfoot, .th
+                       {
+                               background: #486591;
+                               font-weight: bold;
+                               color: #fff;
+                       }
+
+                       tr
+                       {
+                               border-bottom: 1px solid #000;
+                       }
+
+                       #apps
+                       {
+                               border: 0;
+                               border-collapse: collapse;
+                               margin: 0;
+                               padding: 2px;
+                               margin: 10px auto;
+                               width: 75%
+                       }
+
+                       .banner
+                       {
+                               background-color: #4865f1;
+                               color: #fff;
+                               font-weight: bold;
+                               height: 20px;
+                               vertical-align: middle;
+                               width: 100%;
+                       }
+
+                       .button_group
+                       {
+                               text-align: center;
+                       }
+
+                       .feedback, .msg
+                       {
+                               color: #f00;
+                               font-weight: bold;
+                               padding: 5px;
+                               text-align: center;
+                       }
+                       
+                       .msg
+                       {
+                               background-color: #fcc;
+                               border: 1px solid #f00;
+                               height: 20px;
+                               margin: 10 auto;
+                               min-height: 20px;
+                               width: 75%;
+                       }
+                       
+                       .link
+                       {
+                               color: #fff;
+                       }
+
+                       .centered
+                       {
+                               text-align: center;
+                       }
+                       
+                       .row_err_table
+                       {
+                               background-color: #fca;
+                       }
+
+                       .row_remove
+                       {
+                               background-color: #c99;
+                       }
+
+                       .row_err_gen
+                       {
+                               background-color: #fcc;
+                       }
+
+                       .row_install
+                       {
+                               background-color: #cfc;
+                       }
+
+                       .row_on, .th_bright
+                       {
+                               background: #ddd;
+                       }
+                       
+                       .row_off
+                       {
+                               background: #eee;
+                       }
+
+                       .row_upgrade
+                       {
+                               background-color: #ccf;
+                       }
   -->
   </style>
   <title>phpGroupWare {lang_setup} {page_title}</title>
-</head>
+       </head>
 
-<body bgcolor="#FFFFFF">
+       <body>
 
-<table width="100%" border="0" cellspacing="0" cellpadding="2">
-<tr class="banner">
+               <table width="100%" border="0" cellspacing="0" cellpadding="2">
+               <tr class="banner">
        <td align="left">
                &nbsp;phpGroupWare version {pgw_ver} {lang_setup} {configdomain}
        </td>
        <td align="right">{logoutbutton}</td>
-</tr>
-</table>
-<p class="msg centered">{lang_cookies_must_be_enabled}</p>
-<!-- end head.tpl -->
+               </tr>
+               </table>
+               <div class="msg">{lang_cookies_must_be_enabled}</div>
+               <!-- end head.tpl -->
 

Index: templates/base/login_main.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/setup/templates/base/login_main.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- templates/base/login_main.tpl       30 Dec 2004 11:35:10 -0000      1.1
+++ templates/base/login_main.tpl       3 Oct 2006 07:45:56 -0000       1.2
@@ -8,7 +8,7 @@
        <td colspan="2">&nbsp;<b>Header Admin Login</b></td>
 </tr>
 <tr class="row_off">
-       <td colspan="2" class="msg" align="center">{HeaderLoginMSG}</td>
+       <td colspan="2" class="feedback">{HeaderLoginMSG}</td>
 </tr>
 <form action="manageheader.php" method="POST" name="admin">
 <tr class="row_off">

Index: templates/base/login_stage_header.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/setup/templates/base/login_stage_header.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- templates/base/login_stage_header.tpl       30 Dec 2004 11:35:10 -0000      
1.1
+++ templates/base/login_stage_header.tpl       3 Oct 2006 07:45:56 -0000       
1.2
@@ -5,7 +5,7 @@
        </td>
 </tr>
 <tr class="row_on">
-       <td colspan="2" class="msg" align="center">{ConfigLoginMSG}</td>
+       <td colspan="2" class="feedback">{ConfigLoginMSG}</td>
 </tr>
 <tr class="row_on">
        <td colspan="2">




reply via email to

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