[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] setup applications.php setup_demo.php templates...
|
From: |
Dave Hall |
|
Subject: |
[Phpgroupware-cvs] setup applications.php setup_demo.php templates... |
|
Date: |
Tue, 03 Oct 2006 08:27:42 +0000 |
CVSROOT: /cvsroot/phpgroupware
Module name: setup
Changes by: Dave Hall <skwashd> 06/10/03 08:27:42
Modified files:
. : applications.php setup_demo.php
templates/base : applications.tpl
Log message:
too much eye candy is never enough
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/setup/applications.php?cvsroot=phpgroupware&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/setup/setup_demo.php?cvsroot=phpgroupware&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/setup/templates/base/applications.tpl?cvsroot=phpgroupware&r1=1.5&r2=1.6
Patches:
Index: applications.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/applications.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- applications.php 3 Oct 2006 07:45:56 -0000 1.33
+++ applications.php 3 Oct 2006 08:27:42 -0000 1.34
@@ -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.33 2006/10/03 07:45:56 skwashd Exp
$
+ * @version $Id: applications.php,v 1.34 2006/10/03 08:27:42 skwashd Exp
$
*/
$DEBUG = (isset($_POST['debug']) && $_POST['debug']) ||
(isset($_GET['debug']) && $_GET['debug']);
@@ -90,7 +90,7 @@
{
if (is_array($d))
{
- $depstring .= "($c : " .
implode(',',$d) . ')';
+ $depstring .= "($c : " . implode(',
',$d) . ')';
$depver[] = $d;
}
else
@@ -139,26 +139,27 @@
{
foreach($remove as $appname => $key)
{
+ echo '<h3>' . lang('Processing: %1', $appname)
. "</h3>\n<ul>";
$terror = array();
$terror[] = $setup_info[$appname];
if ($setup_info[$appname]['tables'])
{
$GLOBALS['phpgw_setup']->process->droptables($terror,$DEBUG);
- echo '<br />' .
$setup_info[$appname]['title'] . ' ' . lang('tables dropped') . '.';
+ echo
"<li>{$setup_info[$appname]['title']} " . lang('tables dropped') . ".</li>\n";
}
$GLOBALS['phpgw_setup']->deregister_app($setup_info[$appname]['name']);
- echo '<br />' . $setup_info[$appname]['title']
. ' ' . lang('deregistered') . '.';
+ echo "<li>{$setup_info[$appname]['title']} " .
lang('deregistered') . ".</li>\n";
if ($setup_info[$appname]['hooks'])
{
$GLOBALS['phpgw_setup']->deregister_hooks($setup_info[$appname]['name']);
- echo '<br />' .
$setup_info[$appname]['title'] . ' ' . lang('hooks deregistered') . '.';
+ echo
"<li>{$setup_info[$appname]['title']} " . lang('hooks deregistered') .
".</li>\n";
}
$terror =
$GLOBALS['phpgw_setup']->process->drop_langs($terror,$DEBUG);
- echo '<br />' . $setup_info[$appname]['title']
. ' ' . lang('Translations removed') . '.';
+ echo "<li>{$setup_info[$appname]['title']} " .
lang('Translations removed') . ".</li>\n</ul>\n";
}
}
@@ -166,6 +167,7 @@
{
foreach($install as $appname => $key)
{
+ echo '<h3>' . lang('Processing: %1', $appname)
. "</h3>\n<ul>";
$terror = array();
$terror[] = $setup_info[$appname];
@@ -174,8 +176,8 @@
{
$terror =
$GLOBALS['phpgw_setup']->process->current($terror,$DEBUG);
$terror =
$GLOBALS['phpgw_setup']->process->default_records($terror,$DEBUG);
- echo '<br />' .
$setup_info[$appname]['name'] . ' '
- . lang('tables installed,
unless there are errors printed above') . '.';
+ echo
"<li>{$setup_info[$appname]['name']} "
+ . lang('tables installed,
unless there are errors printed above') . ".</h3>\n";
}
else
{
@@ -187,22 +189,22 @@
{
$GLOBALS['phpgw_setup']->register_app($setup_info[$appname]['name']);
}
- echo '<br />' .
$setup_info[$appname]['name'] . ' ' . lang('registered') . '.';
+ echo
"<li>{$setup_info[$appname]['name']} " . lang('registered') . ".</li>\n";
if (
isset($setup_info[$appname]['hooks'])
&&
is_array($setup_info[$appname]['hooks']) )
{
$GLOBALS['phpgw_setup']->register_hooks($setup_info[$appname]['name']);
- echo '<br />' .
$setup_info[$appname]['name'] . ' ' . lang('hooks registered') . '.';
+ echo
"<li>{$setup_info[$appname]['name']} " . lang('hooks registered') . ".</li>\n";
}
}
$force_en = False;
if($appname == 'phpgwapi')
{
- $force_en = True;
+ $force_en = true;
}
$terror =
$GLOBALS['phpgw_setup']->process->add_langs($terror,$DEBUG,$force_en);
- echo '<br />' . $setup_info[$appname]['name'] .
' ' . lang('Translations added') . '.';
+ echo "<li>{$setup_info[$appname]['name']} " .
lang('Translations added') . ".</li>\n</ul>\n";
}
}
@@ -210,29 +212,28 @@
{
foreach($upgrade as $appname => $key)
{
+ echo '<h3>' . lang('Processing: %1', $appname)
. "</h3>\n<ul>";
$terror = array();
$terror[] = $setup_info[$appname];
$GLOBALS['phpgw_setup']->process->upgrade($terror,$DEBUG);
if ($setup_info[$appname]['tables'])
{
- echo '<br />' .
$setup_info[$appname]['name'] . ' ' . lang('tables upgraded') . '.';
+ echo
"<li>{$setup_info[$appname]['name']} " . lang('tables upgraded') . ".</li>";
// The process_upgrade() function also
handles registration
}
else
{
- echo '<br />' .
$setup_info[$appname]['name'] . ' ' . lang('upgraded') . '.';
+ echo
"<li>{$setup_info[$appname]['name']} " . lang('upgraded') . ".</li>";
}
$terror =
$GLOBALS['phpgw_setup']->process->upgrade_langs($terror,$DEBUG);
- echo '<br />' . $setup_info[$appname]['name'] .
' ' . lang('Translations upgraded') . '.';
+ echo "<li>{$setup_info[$appname]['name']} " .
lang('Translations upgraded') . ".</li>\n</ul>\n";
}
}
- //$setup_tpl->set_var('goback',
- echo '<br /><a href="applications.php?debug='.$DEBUG.'">' .
lang('Go back') . '</a>';
- //$setup_tpl->pparse('out','submit');
- $setup_tpl->pparse('out','footer');
+ echo "<h3><a href=\"applications.php?debug={$DEBUG}\">" .
lang('Done') . "</h3>\n";
+ $setup_tpl->pfp('out','footer');
exit;
}
else
Index: setup_demo.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/setup_demo.php,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- setup_demo.php 1 Oct 2006 13:45:34 -0000 1.38
+++ setup_demo.php 3 Oct 2006 08:27:42 -0000 1.39
@@ -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: setup_demo.php,v 1.38 2006/10/01 13:45:34 skwashd Exp $
+ * @version $Id: setup_demo.php,v 1.39 2006/10/03 08:27:42 skwashd Exp $
*/
// Little file to setup a demo install
@@ -256,7 +256,7 @@
*/
function insert_default_prefs($accountid)
{
- $defaultprefs =
unserialize('a:3:{s:6:"common";a:10:{s:9:"maxmatchs";s:2:"15";s:12:"template_set";s:8:"verdilak";s:5:"theme";s:9:"submarine";s:13:"navbar_format";s:5:"icons";s:9:"tz_offset";s:0:"";s:10:"dateformat";s:5:"Y/m/d";s:10:"timeformat";s:2:"24";s:4:"lang";s:2:"en";s:11:"default_app";s:0:"";s:8:"currency";s:1:"$";}s:11:"addressbook";a:1:{s:0:"";s:4:"True";}s:8:"calendar";a:4:{s:13:"workdaystarts";s:1:"9";s:11:"workdayends";s:2:"17";s:13:"weekdaystarts";s:6:"Monday";s:15:"defaultcalendar";s:9:"month.php";}}');
+ $defaultprefs =
unserialize('a:3:{s:6:"common";a:10:{s:9:"maxmatchs";s:2:"15";s:12:"template_set";s:5:"idots";s:5:"theme";s:5:"idots";s:13:"navbar_format";s:14:"text_and_icons";s:9:"tz_offset";s:0:"";s:10:"dateformat";s:5:"Y/m/d";s:10:"timeformat";s:2:"24";s:4:"lang";s:2:"en";s:11:"default_app";s:0:"";s:8:"currency";s:1:"$";}s:11:"addressbook";a:1:{s:0:"";s:4:"True";}s:8:"calendar";a:4:{s:13:"workdaystarts";s:1:"9";s:11:"workdayends";s:2:"17";s:13:"weekdaystarts";s:6:"Monday";s:15:"defaultcalendar";s:9:"month.php";}}');
$defaultprefs['common']['show_help'] = '1';
$defaultprefs['calendar']['planner_start_with_group'] =
$defaultgroupid;
Index: templates/base/applications.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/setup/templates/base/applications.tpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- templates/base/applications.tpl 3 Oct 2006 07:45:56 -0000 1.5
+++ templates/base/applications.tpl 3 Oct 2006 08:27:42 -0000 1.6
@@ -1,29 +1,32 @@
<!-- BEGIN header -->
<script type="text/javascript">
-function check_all(which)
+function check_all(strTargetAction)
{
- for (i=0; i<document.apps.elements.length; i++)
+ var elms = document.getElementById('apps').getElementsByTagName('input');
+ var iElmsLen = elms.length;
+ var iTALen = strTargetAction.length
+ for ( var i = 0; i < iElmsLen; ++i)
{
- if (document.apps.elements[i].type == "checkbox" &&
document.apps.elements[i].name.substring(0,which.length) == which)
+ if (elms.item(i).type == "checkbox" && elms.item(i).name.substring(0,
iTALen) == strTargetAction)
{
- if (document.apps.elements[i].checked)
+ if (elms.item(i).checked)
{
- document.apps.elements[i].checked = false;
+ elms.item(i).checked = false;
}
else
{
- document.apps.elements[i].checked = true;
+ elms.item(i).checked = true;
}
}
}
}
</script>
<h1>{description}</h1>
-<form action="applications.php" method="post">
-<table id="apps">
<!-- END header -->
<!-- BEGIN app_header -->
+<form action="applications.php" method="post" id="apps">
+<table id="apps">
<thead>
<tr>
<th colspan="2">{app_info}</th>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] setup applications.php setup_demo.php templates...,
Dave Hall <=