[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: wcm/inc class.sopage.inc.php,1.9,1.10 class.sosi
|
From: |
Miles Lott <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: wcm/inc class.sopage.inc.php,1.9,1.10 class.sosite.inc.php,1.7,1.8 class.uielement.inc.php,1.8,1.9 class.uipage.inc.php,1.11,1.12 class.uisite.inc.php,1.6,1.7 |
|
Date: |
Sun, 17 Feb 2002 12:11:32 -0500 |
Update of /cvsroot/phpgroupware/wcm/inc
In directory subversions:/tmp/cvs-serv2161/inc
Modified Files:
class.sopage.inc.php class.sosite.inc.php
class.uielement.inc.php class.uipage.inc.php
class.uisite.inc.php
Log Message:
Add per-page pane size settings; adjust redirects;
Index: class.sopage.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.sopage.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** class.sopage.inc.php 16 Feb 2002 15:09:40 -0000 1.9
--- class.sopage.inc.php 17 Feb 2002 17:11:29 -0000 1.10
***************
*** 117,120 ****
--- 117,123 ----
. "page_header='" .
$this->page['page_header'] . "',"
. "page_footer='" .
$this->page['page_footer'] . "',"
+ . "page_left=" .
intval($this->page['page_left']) . ","
+ . "page_mid=" .
intval($this->page['page_mid']) . ","
+ . "page_right=" .
intval($this->page['page_right']) . ","
. "page_version='" .
$this->page['page_version'] . "' "
. "WHERE page_id=" . intval($pageid);
***************
*** 138,142 ****
.
$GLOBALS['phpgw']->db->db_addslashes($page_info['page_title']) . "','"
. $page_info['page_url'] . "','" . $tmp .
"','"
! . $page_info['page_header'] . "','" .
$page_info['page_footer'] . "','"
. $page_info['page_version'] . "')";
$GLOBALS['phpgw']->db->query($sql,__LINE__,__FILE__);
--- 141,148 ----
.
$GLOBALS['phpgw']->db->db_addslashes($page_info['page_title']) . "','"
. $page_info['page_url'] . "','" . $tmp .
"','"
! . $page_info['page_header'] . "','" .
$page_info['page_footer'] . "',"
! . intval($page_info['page_left']) . ","
! . intval($page_info['page_mid']) . ","
! . intval($page_info['page_right']) . ",'"
. $page_info['page_version'] . "')";
$GLOBALS['phpgw']->db->query($sql,__LINE__,__FILE__);
***************
*** 211,214 ****
--- 217,223 ----
$this->pages[$GLOBALS['phpgw']->db->f('page_name')]['page_footer'] =
$GLOBALS['phpgw']->db->f('page_footer');
$this->pages[$GLOBALS['phpgw']->db->f('page_name')]['page_version'] =
$GLOBALS['phpgw']->db->f('page_version');
+
$this->pages[$GLOBALS['phpgw']->db->f('page_name')]['page_left'] =
$GLOBALS['phpgw']->db->f('page_left');
+
$this->pages[$GLOBALS['phpgw']->db->f('page_name')]['page_mid'] =
$GLOBALS['phpgw']->db->f('page_mid');
+
$this->pages[$GLOBALS['phpgw']->db->f('page_name')]['page_right'] =
$GLOBALS['phpgw']->db->f('page_right');
}
}
Index: class.sosite.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.sosite.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** class.sosite.inc.php 16 Feb 2002 23:05:44 -0000 1.7
--- class.sosite.inc.php 17 Feb 2002 17:11:29 -0000 1.8
***************
*** 86,89 ****
--- 86,90 ----
$this->site['site_mid'] =
$GLOBALS['phpgw']->db->f('site_mid');
$this->site['site_right'] =
$GLOBALS['phpgw']->db->f('site_right');
+ $this->site['site_paneo'] =
$GLOBALS['phpgw']->db->f('site_paneo');
}
if($full)
***************
*** 129,134 ****
. "site_mid=" .
intval($this->site['site_mid']) . ","
. "site_right=" .
intval($this->site['site_right']) . ","
! . "site_version='" .
$this->site['site_version'] . "' "
! . "WHERE site_id=" . intval($siteid);
$GLOBALS['phpgw']->db->query($sql,__LINE__,__FILE__);
return True;
--- 130,136 ----
. "site_mid=" .
intval($this->site['site_mid']) . ","
. "site_right=" .
intval($this->site['site_right']) . ","
! . "site_version='" .
$this->site['site_version'] . "',"
! . "site_paneo=" .
intval($this->site['site_paneo'])
! . " WHERE site_id=" . intval($siteid);
$GLOBALS['phpgw']->db->query($sql,__LINE__,__FILE__);
return True;
***************
*** 146,150 ****
$sql = "INSERT INTO $this->table
(site_name,site_title,site_url,site_root,site_security,"
.
"username,password,admin_name,admin_email,site_left,site_mid,site_right,"
! .
"site_pages,site_header,site_footer,site_version) VALUES('"
.
$GLOBALS['phpgw']->db->db_addslashes($site_info['site_name']) . "','"
.
$GLOBALS['phpgw']->db->db_addslashes($site_info['site_title']) . "','"
--- 148,152 ----
$sql = "INSERT INTO $this->table
(site_name,site_title,site_url,site_root,site_security,"
.
"username,password,admin_name,admin_email,site_left,site_mid,site_right,"
! .
"site_pages,site_header,site_footer,site_version,site_paneo) VALUES('"
.
$GLOBALS['phpgw']->db->db_addslashes($site_info['site_name']) . "','"
.
$GLOBALS['phpgw']->db->db_addslashes($site_info['site_title']) . "','"
***************
*** 160,164 ****
. $tmp . "','"
. $site_info['site_header'] . "','"
! . $site_info['site_footer'] . "','" .
$site_info['site_version'] . "')";
$GLOBALS['phpgw']->db->query($sql,__LINE__,__FILE__);
--- 162,167 ----
. $tmp . "','"
. $site_info['site_header'] . "','"
! . $site_info['site_footer'] . "','" .
$site_info['site_version'] . "',"
! . intval($site_info['site_paneo']) . ")";
$GLOBALS['phpgw']->db->query($sql,__LINE__,__FILE__);
Index: class.uielement.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.uielement.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** class.uielement.inc.php 16 Feb 2002 15:09:40 -0000 1.8
--- class.uielement.inc.php 17 Feb 2002 17:11:29 -0000 1.9
***************
*** 140,144 ****
$GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php','menuaction=wcm.uielement.index'));
$GLOBALS['phpgw']->template->set_var('lang_done',lang('Done'));
!
$GLOBALS['phpgw']->template->set_var('doneurl',$GLOBALS['phpgw']->link('/wcm/index.php'));
if(!$this->start)
--- 140,144 ----
$GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php','menuaction=wcm.uielement.index'));
$GLOBALS['phpgw']->template->set_var('lang_done',lang('Done'));
!
$GLOBALS['phpgw']->template->set_var('doneurl',$GLOBALS['phpgw']->link('/wcm/index.php','menuaction=wcm.uiwcm.index'));
if(!$this->start)
Index: class.uipage.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.uipage.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** class.uipage.inc.php 16 Feb 2002 15:09:40 -0000 1.11
--- class.uipage.inc.php 17 Feb 2002 17:11:29 -0000 1.12
***************
*** 122,126 ****
$GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php','menuaction=wcm.uipage.index'));
$GLOBALS['phpgw']->template->set_var('lang_done',lang('Done'));
!
$GLOBALS['phpgw']->template->set_var('doneurl',$GLOBALS['phpgw']->link('/wcm/index.php'));
if(!$this->start)
--- 122,126 ----
$GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php','menuaction=wcm.uipage.index'));
$GLOBALS['phpgw']->template->set_var('lang_done',lang('Done'));
!
$GLOBALS['phpgw']->template->set_var('doneurl',$GLOBALS['phpgw']->link('/wcm/index.php','menuaction=wcm.uiwcm.index'));
if(!$this->start)
***************
*** 281,285 ****
'page_header' =>
$GLOBALS['HTTP_POST_VARS']['page_header'],
'page_footer' =>
$GLOBALS['HTTP_POST_VARS']['page_footer'],
! 'page_version' =>
$page['page_version']
);
if($page_id)
--- 281,288 ----
'page_header' =>
$GLOBALS['HTTP_POST_VARS']['page_header'],
'page_footer' =>
$GLOBALS['HTTP_POST_VARS']['page_footer'],
! 'page_version' =>
$page['page_version'],
! 'page_left' =>
$GLOBALS['HTTP_POST_VARS']['page_left'],
! 'page_mid' =>
$GLOBALS['HTTP_POST_VARS']['page_mid'],
! 'page_right' =>
$GLOBALS['HTTP_POST_VARS']['page_right']
);
if($page_id)
***************
*** 343,346 ****
--- 346,357 ----
$GLOBALS['phpgw']->template->set_var('lang_top',lang('Top'));
$GLOBALS['phpgw']->template->set_var('lang_bottom',lang('Bottom'));
+
+
$GLOBALS['phpgw']->template->set_var('page_left',$page['page_left'] ?
$page['page_left'] : '130');
+
$GLOBALS['phpgw']->template->set_var('page_mid',$page['page_mid'] ?
$page['page_mid'] : '*');
+
$GLOBALS['phpgw']->template->set_var('page_right',$page['page_right'] ?
$page['page_right'] : '120');
+
$GLOBALS['phpgw']->template->set_var('lang_left_pane',lang('Left Pane Width'));
+
$GLOBALS['phpgw']->template->set_var('lang_mid_pane',lang('Middle Pane Width'));
+
$GLOBALS['phpgw']->template->set_var('lang_right_pane',lang('Right Pane
Width'));
+
$GLOBALS['phpgw']->template->set_var('lang_pixels',lang('Pixels'));
$GLOBALS['phpgw']->template->set_var('page_name',$page['page_name']);
Index: class.uisite.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.uisite.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** class.uisite.inc.php 16 Feb 2002 23:05:44 -0000 1.6
--- class.uisite.inc.php 17 Feb 2002 17:11:29 -0000 1.7
***************
*** 121,125 ****
$GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php','menuaction=wcm.uisite.index'));
$GLOBALS['phpgw']->template->set_var('lang_done',lang('Done'));
!
$GLOBALS['phpgw']->template->set_var('doneurl',$GLOBALS['phpgw']->link('/wcm/index.php'));
if(!$this->start)
--- 121,125 ----
$GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php','menuaction=wcm.uisite.index'));
$GLOBALS['phpgw']->template->set_var('lang_done',lang('Done'));
!
$GLOBALS['phpgw']->template->set_var('doneurl',$GLOBALS['phpgw']->link('/wcm/index.php','menuaction=wcm.uiwcm.index'));
if(!$this->start)
***************
*** 228,231 ****
--- 228,235 ----
if (!$error)
{
+
if($GLOBALS['HTTP_POST_VARS']['site_paneo'])
+ {
+ $site_paneo = True;
+ }
$site_info = array(
'site_name' =>
$GLOBALS['HTTP_POST_VARS']['site_name'],
***************
*** 244,248 ****
'site_left' =>
$GLOBALS['HTTP_POST_VARS']['site_left'],
'site_mid' =>
$GLOBALS['HTTP_POST_VARS']['site_mid'],
! 'site_right' =>
$GLOBALS['HTTP_POST_VARS']['site_right']
);
if($GLOBALS['HTTP_GET_VARS']['site_id'])
--- 248,253 ----
'site_left' =>
$GLOBALS['HTTP_POST_VARS']['site_left'],
'site_mid' =>
$GLOBALS['HTTP_POST_VARS']['site_mid'],
! 'site_right' =>
$GLOBALS['HTTP_POST_VARS']['site_right'],
! 'site_paneo' => $site_paneo
);
if($GLOBALS['HTTP_GET_VARS']['site_id'])
***************
*** 281,285 ****
$GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php','menuaction=wcm.uisite.edit&site_id='
. $site_id));
$GLOBALS['phpgw']->template->set_var('deleteurl',$GLOBALS['phpgw']->link('/index.php','menuaction=wcm.uisite.delete&site_id='
. $site_id));
!
$GLOBALS['phpgw']->template->set_var('doneurl',$GLOBALS['phpgw']->link('/index.php','menuaction=wcm.uisite.index'));
$GLOBALS['phpgw']->template->set_var('lang_name',lang('Site name'));
--- 286,290 ----
$GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php','menuaction=wcm.uisite.edit&site_id='
. $site_id));
$GLOBALS['phpgw']->template->set_var('deleteurl',$GLOBALS['phpgw']->link('/index.php','menuaction=wcm.uisite.delete&site_id='
. $site_id));
!
$GLOBALS['phpgw']->template->set_var('doneurl',$GLOBALS['phpgw']->link('/wcm/index.php','menuaction=wcm.uisite.index'));
$GLOBALS['phpgw']->template->set_var('lang_name',lang('Site name'));
***************
*** 311,314 ****
--- 316,321 ----
$GLOBALS['phpgw']->template->set_var('lang_right_pane',lang('Right Pane
Width'));
$GLOBALS['phpgw']->template->set_var('lang_pixels',lang('Pixels'));
+
$GLOBALS['phpgw']->template->set_var('lang_site_paneo',lang('Allow pages to
override pane widths'));
+
$GLOBALS['phpgw']->template->set_var('site_paneo',$site['site_paneo'] ? '
checked' : '');
$GLOBALS['phpgw']->template->set_var('site_name',$site['site_name']);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: wcm/inc class.sopage.inc.php,1.9,1.10 class.sosite.inc.php,1.7,1.8 class.uielement.inc.php,1.8,1.9 class.uipage.inc.php,1.11,1.12 class.uisite.inc.php,1.6,1.7,
Miles Lott <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: wcm/templates/default listelements.tpl,1.2,1.3 listpages.tpl,1.2,1.3 listsites.tpl,1.1.1.1,1.2 page_form.tpl,1.7,1.8 site_form.tpl,1.4,1.5
- Next by Date:
[Phpgroupware-cvs] CVS: wcm/templates/default page_form.tpl,1.8,1.9 site_form.tpl,1.5,1.6
- Previous by thread:
[Phpgroupware-cvs] CVS: wcm/templates/default listelements.tpl,1.2,1.3 listpages.tpl,1.2,1.3 listsites.tpl,1.1.1.1,1.2 page_form.tpl,1.7,1.8 site_form.tpl,1.4,1.5
- Next by thread:
[Phpgroupware-cvs] CVS: wcm/templates/default page_form.tpl,1.8,1.9 site_form.tpl,1.5,1.6
- Index(es):