[Top][All Lists]
[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: |
Sun, 07 Jan 2007 01:55:57 +0000 |
CVSROOT: /cvsroot/phpgroupware
Module name: setup
Changes by: Dave Hall <skwashd> 07/01/07 01:55:57
Modified files:
. : applications.php
templates/base : applications.tpl head.tpl
Log message:
make the status show correctly, add row_on/off for the different stati,
make the ui a little clear, fix some css wackiness
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/setup/applications.php?cvsroot=phpgroupware&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/setup/templates/base/applications.tpl?cvsroot=phpgroupware&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/setup/templates/base/head.tpl?cvsroot=phpgroupware&r1=1.7&r2=1.8
Patches:
Index: applications.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/applications.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- applications.php 3 Oct 2006 08:27:42 -0000 1.34
+++ applications.php 7 Jan 2007 01:55:57 -0000 1.35
@@ -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.34 2006/10/03 08:27:42 skwashd Exp
$
+ * @version $Id: applications.php,v 1.35 2007/01/07 01:55:57 skwashd Exp
$
*/
$DEBUG = (isset($_POST['debug']) && $_POST['debug']) ||
(isset($_GET['debug']) && $_GET['debug']);
@@ -443,18 +443,20 @@
$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_class',$bg_class[$i]);
+ $setup_tpl->set_var('bg_class', $bg_class[$i]);
+ $setup_tpl->set_var('row_remove', '');
switch($value['status'])
{
case 'C':
+
$setup_tpl->set_var('row_remove', 'row_remove_' . ($i ? 'off' : 'on') );
$setup_tpl->set_var('remove','<input type="checkbox" name="remove[' .
$value['name'] . ']" />');
$setup_tpl->set_var('upgrade',' ');
if
(!$GLOBALS['phpgw_setup']->detection->check_app_tables($value['name']))
{
// App installed and
enabled, but some tables are missing
$setup_tpl->set_var('instimg','stock_database.png');
-
$setup_tpl->set_var('bg_class','row_err_table');
+
$setup_tpl->set_var('bg_class','row_err_table_' . ( $i % 1 ? 'off' : 'on') );
$setup_tpl->set_var('instalt',lang('Not Completed'));
$setup_tpl->set_var('resolution','<a href="applications.php?resolve=' .
$value['name'] . '&badinstall=True">' . lang('Potential Problem') . '</a>');
$status =
lang('Requires reinstall or manual repair') . ' - ' . $value['status'];
@@ -477,7 +479,7 @@
{
$notables = '&notables=True';
}
-
$setup_tpl->set_var('bg_class','row_err_gen');
+
$setup_tpl->set_var('bg_class','row_err_gen_' . ( $i % 1 ? 'off' : 'on') );
$setup_tpl->set_var('resolution',
'<a
href="applications.php?resolve=' . $value['name'] . $notables . '">' .
lang('Possible Reasons') . '</a>'
);
@@ -490,13 +492,17 @@
$setup_tpl->set_var('instalt',lang('Not Completed'));
if (
!isset($value['currentver']) || !$value['currentver'] )
{
+
$setup_tpl->set_var('bg_class','row_install_' . ( $i % 1 ? 'off' : 'on') );
+ $status =
"[{$value['status']}] " . lang('Please install');
if (
isset($value['tables']) && is_array($value['tables']) &&
$GLOBALS['phpgw_setup']->detection->check_app_tables($value['name'],True))
{
// Some tables
missing
+
$setup_tpl->set_var('bg_class', 'row_err_gen_' . ( $i % 1 ? 'off' : 'on') );
$setup_tpl->set_var('instimg','stock_database.png');
+
$setup_tpl->set_var('row_remove', 'row_remove_' . ($i ? 'off' : 'on') );
$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>');
- $status =
lang('Requires reinstall or manual repair') . ' - ' . $value['status'];
+ $status =
"[{$value['status']}] " . lang('Requires reinstall or manual repair');
}
else
{
@@ -504,17 +510,16 @@
$setup_tpl->set_var('resolution','');
$status =
"[{$value['status']}] " . lang('Requires upgrade');
}
-
$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',' ');
- $status =
"[{$value['status']}] " . lang('Please install');
}
else
{
-
$setup_tpl->set_var('bg_class','row_upgrade');
+
$setup_tpl->set_var('bg_class','row_upgrade_' . ( $i % 1 ? 'off' : 'on') );
$setup_tpl->set_var('install',' ');
// 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('row_remove', 'row_remove_' . ($i ? 'off' : 'on') );
$setup_tpl->set_var('remove','<input type="checkbox" name="remove[' .
$value['name'] . ']">');
$setup_tpl->set_var('resolution','');
$status =
"[{$value['status']}] " . lang('Requires upgrade');
@@ -524,13 +529,14 @@
$setup_tpl->set_var('instimg','package-generic.png');
$setup_tpl->set_var('instalt',lang('Not Completed'));
$setup_tpl->set_var('install',' ');
+
$setup_tpl->set_var('row_remove', 'row_remove_' . ($i ? 'off' : 'on') );
$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 = "[{$value['status']}]
" . lang('Version Mismatch');
break;
case 'D':
- $setup_tpl->set_var('bg_class',
'row_err_gen');
+ $setup_tpl->set_var('bg_class',
'row_err_gen_' . ( $i % 1 ? 'off' : 'on') );
$depstring =
parsedep($value['depends']);
$setup_tpl->set_var('instimg',
'stock_no.png');
$setup_tpl->set_var('instalt',lang('Dependency Failure'));
@@ -541,7 +547,7 @@
$status = "[{$value['status']}]
" . lang('Dependency Failure') . $depstring;
break;
case 'P':
- $setup_tpl->set_var('bg_class',
'row_err_gen');
+ $setup_tpl->set_var('bg_class',
'row_err_gen_' . ( $i % 1 ? 'off' : 'on') );
$depstring =
parsedep($value['depends']);
$setup_tpl->set_var('instimg',
'stock_no.png');
$setup_tpl->set_var('instalt',lang('Post-install Dependency Failure'));
Index: templates/base/applications.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/setup/templates/base/applications.tpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- templates/base/applications.tpl 3 Oct 2006 08:27:42 -0000 1.6
+++ templates/base/applications.tpl 7 Jan 2007 01:55:57 -0000 1.7
@@ -58,10 +58,10 @@
<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="{row_install} centered">{install}</td>
+ <td class="{row_upgrade} centered">{upgrade}</td>
<td class="centered">{resolution} </td>
- <td class="row_remove centered">{remove}</td>
+ <td class="{row_remove} centered">{remove}</td>
</tr>
<!-- END apps -->
Index: templates/base/head.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/setup/templates/base/head.tpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- templates/base/head.tpl 28 Dec 2006 04:55:48 -0000 1.7
+++ templates/base/head.tpl 7 Jan 2007 01:55:57 -0000 1.8
@@ -67,6 +67,11 @@
width: 75%
}
+ #apps td
+ {
+ vertical-align: middle;
+ }
+
.banner
{
background-color: #4865f1;
@@ -113,17 +118,38 @@
background-color: #fca;
}
- .row_remove
+ .row_remove_on
{
background-color: #c99;
}
- .row_err_gen
+ .row_remove_off
+ {
+ background-color: #d99;
+ }
+
+ .row_err_gen_on
{
background-color: #fcc;
}
- .row_install
+ .row_err_gen_off
+ {
+ background-color: #fdd;
+ }
+
+ .row_err_gen_on a, .row_err_gen_off a
+ {
+ color: #666;
+ font-weight: bold;
+ }
+
+ .row_install_on
+ {
+ background-color: #dfd;
+ }
+
+ .row_install_off
{
background-color: #cfc;
}
@@ -138,10 +164,15 @@
background: #eee;
}
- .row_upgrade
+ .row_upgrade_on
{
background-color: #ccf;
}
+
+ .row_upgrade_off
+ {
+ background-color: #ddf;
+ }
-->
</style>
<title>phpGroupWare {lang_setup} {page_title}</title>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] setup applications.php templates/base/applicati...,
Dave Hall <=