[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] sitemgr templates/default/site_form.tpl inc/cla... [s
|
From: |
Dave Hall |
|
Subject: |
[Phpgroupware-cvs] sitemgr templates/default/site_form.tpl inc/cla... [skwashd-16-compat] |
|
Date: |
Fri, 29 Sep 2006 10:51:45 +0000 |
CVSROOT: /cvsroot/phpgroupware
Module name: sitemgr
Branch: skwashd-16-compat
Changes by: Dave Hall <skwashd> 06/09/29 10:51:44
Modified files:
templates/default: site_form.tpl
inc : class.Common_BO.inc.php class.Common_UI.inc.php
Log message:
tpl issues, layout and notices
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/sitemgr/templates/default/site_form.tpl?cvsroot=phpgroupware&only_with_tag=skwashd-16-compat&r1=1.1.2.1&r2=1.1.2.1.4.1
http://cvs.savannah.gnu.org/viewcvs/sitemgr/inc/class.Common_BO.inc.php?cvsroot=phpgroupware&only_with_tag=skwashd-16-compat&r1=1.1.2.4.4.2&r2=1.1.2.4.4.3
http://cvs.savannah.gnu.org/viewcvs/sitemgr/inc/class.Common_UI.inc.php?cvsroot=phpgroupware&only_with_tag=skwashd-16-compat&r1=1.8.2.5.4.3&r2=1.8.2.5.4.4
Patches:
Index: inc/class.Common_BO.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.Common_BO.inc.php,v
retrieving revision 1.1.2.4.4.2
retrieving revision 1.1.2.4.4.3
diff -u -b -r1.1.2.4.4.2 -r1.1.2.4.4.3
--- inc/class.Common_BO.inc.php 29 Sep 2006 10:00:52 -0000 1.1.2.4.4.2
+++ inc/class.Common_BO.inc.php 29 Sep 2006 10:51:44 -0000 1.1.2.4.4.3
@@ -14,7 +14,8 @@
$this->cats =
CreateObject('sitemgr.Categories_BO',True);
$this->content =
CreateObject('sitemgr.Content_BO',True);
$this->modules =
CreateObject('sitemgr.Modules_BO',True);
- $this->state = array(
+ $this->state = array
+ (
SITEMGR_STATE_DRAFT => lang('draft'),
SITEMGR_STATE_PREPUBLISH =>
lang('prepublished'),
SITEMGR_STATE_PUBLISH => lang('published'),
@@ -94,7 +95,7 @@
if ($GLOBALS['Common_BO']->acl->is_admin())
{
$file[] = array('text' => 'Configure Website',
- 'url' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=sitemgr.Common_UI.DisplayPrefs'));
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'sitemgr.Common_UI.DisplayPrefs')));
$link_data['cat_id'] = CURRENT_SITE_ID;
$link_data['menuaction'] =
"sitemgr.Modules_UI.manage";
$file[] = array('text' => 'Manage site-wide
module properties',
@@ -106,13 +107,13 @@
'url' =>
$GLOBALS['phpgw']->link('/index.php',$link_data));
}
$file[] = array('text' => 'Manage Categories and pages',
- 'url' =>
$GLOBALS['phpgw']->link('/index.php', 'menuaction=sitemgr.Outline_UI.manage'));
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'sitemgr.Outline_UI.manage')));
$file[] = array('text' => 'Manage Translations',
- 'url' =>
$GLOBALS['phpgw']->link('/index.php',
'menuaction=sitemgr.Translations_UI.manage'));
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'sitemgr.Translations_UI.manage')));
$file[] = array('text' => 'Commit Changes',
- 'url' =>
$GLOBALS['phpgw']->link('/index.php', 'menuaction=sitemgr.Content_UI.commit'));
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'sitemgr.Content_UI.commit')));
$file[] = array('text' => 'Manage archived content',
- 'url' =>
$GLOBALS['phpgw']->link('/index.php', 'menuaction=sitemgr.Content_UI.archive'));
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'sitemgr.Content_UI.archive')));
$file[] = array('text' => '_NewLine_');
$file[] = array('text' => 'View Generated Site',
'url' =>
$GLOBALS['phpgw']->link('/sitemgr-link/', array('site_id' => CURRENT_SITE_ID)));
@@ -149,7 +150,7 @@
if ($isadmin)
{
$file[] = array('text' => 'Define websites',
- 'url' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=sitemgr.Sites_UI.list_sites'));
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'sitemgr.Sites_UI.list_sites')));
}
return $file;
}
Index: inc/class.Common_UI.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.Common_UI.inc.php,v
retrieving revision 1.8.2.5.4.3
retrieving revision 1.8.2.5.4.4
diff -u -b -r1.8.2.5.4.3 -r1.8.2.5.4.4
--- inc/class.Common_UI.inc.php 29 Sep 2006 10:00:52 -0000 1.8.2.5.4.3
+++ inc/class.Common_UI.inc.php 29 Sep 2006 10:51:44 -0000 1.8.2.5.4.4
@@ -7,7 +7,7 @@
* Free Software Foundation; either version 2 of the License, or (at
your *
* option) any later version.
*
\***************************************************************************/
- /* $Id: class.Common_UI.inc.php,v 1.8.2.5.4.3 2006/09/29 10:00:52
skwashd Exp $ */
+ /* $Id: class.Common_UI.inc.php,v 1.8.2.5.4.4 2006/09/29 10:51:44
skwashd Exp $ */
class Common_UI
{
@@ -155,7 +155,7 @@
echo lang('Do
you want to delete them?'). '<br>';
}
echo '<form action="' .
-
$GLOBALS['phpgw']->link('/index.php','menuaction=sitemgr.Common_UI.DisplayPrefs')
.
+
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'sitemgr.Common_UI.DisplayPrefs')) .
'"
method="post"><table>';
foreach ($replacedlang
as $oldlang)
{
@@ -220,7 +220,7 @@
$this->t->set_file('sitemgr_prefs','sitemgr_preferences.tpl');
$this->t->set_var('formaction',$GLOBALS['phpgw']->link(
-
'/index.php','menuaction=sitemgr.Common_UI.DisplayPrefs'));
+ '/index.php', array('menuaction' =>
'sitemgr.Common_UI.DisplayPrefs')));
$this->t->set_var(Array('setup_instructions' =>
lang('SiteMgr Setup Instructions'),
'options' =>
lang('SiteMgr Options'),
'lang_save' =>
lang('Save'),
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] sitemgr templates/default/site_form.tpl inc/cla... [skwashd-16-compat],
Dave Hall <=