[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: wcm/inc class.bosite.inc.php,1.17,1.18 class.sop
|
From: |
Miles Lott <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: wcm/inc class.bosite.inc.php,1.17,1.18 class.sopage.inc.php,1.16,1.17 class.sosite.inc.php,1.9,1.10 class.uipage.inc.php,1.19,1.20 class.uisite.inc.php,1.13,1.14 |
|
Date: |
Sat, 23 Mar 2002 09:25:09 -0500 |
Update of /cvsroot/phpgroupware/wcm/inc
In directory subversions:/tmp/cvs-serv5825/inc
Modified Files:
class.bosite.inc.php class.sopage.inc.php class.sosite.inc.php
class.uipage.inc.php class.uisite.inc.php
Log Message:
Add color selection and setting for pages and sites
Index: class.bosite.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.bosite.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** class.bosite.inc.php 23 Mar 2002 13:36:19 -0000 1.17
--- class.bosite.inc.php 23 Mar 2002 14:25:06 -0000 1.18
***************
*** 242,245 ****
--- 242,254 ----
$tpl->set_var('phpgwdir',PHPGW_SERVER_ROOT . SEP);
+ if(@$wcm->site['site_bgcolor'])
+ {
+ $tpl->set_var('bgcolor',
$wcm->site['site_bgcolor']);
+ }
+ else
+ {
+ $tpl->set_var('bgcolor', '#FFFFFF');
+ }
+
while(list(,$page) = each($this->site['site_pages']))
{
***************
*** 256,259 ****
--- 265,273 ----
$tpl->set_var('mid_img_width', $site_mid ?
$site_mid : '350');
$tpl->set_var('right_width', $site_right ?
$site_right : '130');
+
+ if(@$page['page_bgcolor'])
+ {
+ $tpl->set_var('bgcolor',
$page['page_bgcolor']);
+ }
$out = "<?php
\$GLOBALS['phpgw_info']['user']['account_id'] = $acctid; "
Index: class.sopage.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.sopage.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** class.sopage.inc.php 25 Feb 2002 03:05:37 -0000 1.16
--- class.sopage.inc.php 23 Mar 2002 14:25:06 -0000 1.17
***************
*** 77,80 ****
--- 77,81 ----
$this->page['page_version'] =
$GLOBALS['phpgw']->db->f('page_version');
$this->page['page_expire'] =
$GLOBALS['phpgw']->db->f('page_expire');
+ $this->page['page_bgcolor'] =
$GLOBALS['phpgw']->db->f('page_bgcolor');
}
if($full)
***************
*** 122,127 ****
. "page_right=" .
intval($this->page['page_right']) . ","
. "page_version='" .
$this->page['page_version'] . "',"
! . "page_expire='" .
intval($this->page['page_expire']) . "'"
! . " WHERE page_id=" . intval($pageid);
$GLOBALS['phpgw']->db->query($sql,__LINE__,__FILE__);
return $pageid;
--- 123,129 ----
. "page_right=" .
intval($this->page['page_right']) . ","
. "page_version='" .
$this->page['page_version'] . "',"
! . "page_expire='" .
intval($this->page['page_expire']) . "',"
! . "page_bgcolor='" .
$this->page['page_bgcolor'] . "'"
! . " WHERE page_id=" . intval($pageid);
$GLOBALS['phpgw']->db->query($sql,__LINE__,__FILE__);
return $pageid;
***************
*** 139,143 ****
$sql = "INSERT INTO $this->table
(page_name,page_title,page_url,page_elements,"
! .
"page_header,page_footer,page_left,page_mid,page_right,page_version,page_expire)
VALUES('"
.
$GLOBALS['phpgw']->db->db_addslashes($page_info['page_name']) . "','"
.
$GLOBALS['phpgw']->db->db_addslashes($page_info['page_title']) . "','"
--- 141,145 ----
$sql = "INSERT INTO $this->table
(page_name,page_title,page_url,page_elements,"
! .
"page_header,page_footer,page_left,page_mid,page_right,page_version,page_expire,page_bgcolor)
VALUES('"
.
$GLOBALS['phpgw']->db->db_addslashes($page_info['page_name']) . "','"
.
$GLOBALS['phpgw']->db->db_addslashes($page_info['page_title']) . "','"
***************
*** 148,152 ****
. intval($page_info['page_right']) . ",'"
. $page_info['page_version'] . "','"
! . intval($page_info['page_expire']) . "')";
$GLOBALS['phpgw']->db->query($sql,__LINE__,__FILE__);
--- 150,155 ----
. intval($page_info['page_right']) . ",'"
. $page_info['page_version'] . "','"
! . intval($page_info['page_expire']) . "','"
! . $page_info['page_bgcolor'] . "')";
$GLOBALS['phpgw']->db->query($sql,__LINE__,__FILE__);
***************
*** 223,226 ****
--- 226,230 ----
$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');
+
$this->pages[$GLOBALS['phpgw']->db->f('page_name')]['page_bgcolor'] =
$GLOBALS['phpgw']->db->f('page_bgcolor');
}
}
Index: class.sosite.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.sosite.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** class.sosite.inc.php 24 Feb 2002 22:36:39 -0000 1.9
--- class.sosite.inc.php 23 Mar 2002 14:25:06 -0000 1.10
***************
*** 90,93 ****
--- 90,94 ----
$this->site['site_puburl'] =
$GLOBALS['phpgw']->db->f('site_puburl');
$this->site['site_pubport'] =
$GLOBALS['phpgw']->db->f('site_pubport');
+ $this->site['site_bgcolor'] =
$GLOBALS['phpgw']->db->f('site_bgcolor');
}
if($full)
***************
*** 137,141 ****
. "site_pubtype='" .
$this->site['site_pubtype'] . "',"
. "site_puburl='" .
$this->site['site_puburl'] . "',"
! . "site_pubport=" .
intval($this->site['site_pubport'])
. " WHERE site_id=" . intval($siteid);
$GLOBALS['phpgw']->db->query($sql,__LINE__,__FILE__);
--- 138,143 ----
. "site_pubtype='" .
$this->site['site_pubtype'] . "',"
. "site_puburl='" .
$this->site['site_puburl'] . "',"
! . "site_pubport=" .
intval($this->site['site_pubport']) . ","
! . "site_bgcolor='" .
$this->site['site_bgcolor'] . "'"
. " WHERE site_id=" . intval($siteid);
$GLOBALS['phpgw']->db->query($sql,__LINE__,__FILE__);
***************
*** 155,159 ****
.
"username,password,admin_name,admin_email,site_left,site_mid,site_right,"
.
"site_pages,site_header,site_footer,site_version,site_paneo,"
! . "site_pubtype,site_puburl,site_pubport)
VALUES('"
.
$GLOBALS['phpgw']->db->db_addslashes($site_info['site_name']) . "','"
.
$GLOBALS['phpgw']->db->db_addslashes($site_info['site_title']) . "','"
--- 157,161 ----
.
"username,password,admin_name,admin_email,site_left,site_mid,site_right,"
.
"site_pages,site_header,site_footer,site_version,site_paneo,"
! .
"site_pubtype,site_puburl,site_pubport,site_bgcolor) VALUES('"
.
$GLOBALS['phpgw']->db->db_addslashes($site_info['site_name']) . "','"
.
$GLOBALS['phpgw']->db->db_addslashes($site_info['site_title']) . "','"
***************
*** 173,177 ****
. $site_info['site_pubtype'] . "','"
. $site_info['site_puburl'] . "',"
! . intval($site_info['site_pubport']) . ")";
$GLOBALS['phpgw']->db->query($sql,__LINE__,__FILE__);
--- 175,180 ----
. $site_info['site_pubtype'] . "','"
. $site_info['site_puburl'] . "',"
! . intval($site_info['site_pubport']) . ",'"
! . $site_info['site_bgcolor'] . ")";
$GLOBALS['phpgw']->db->query($sql,__LINE__,__FILE__);
Index: class.uipage.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.uipage.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** class.uipage.inc.php 23 Mar 2002 13:36:19 -0000 1.19
--- class.uipage.inc.php 23 Mar 2002 14:25:06 -0000 1.20
***************
*** 304,308 ****
'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)
--- 304,309 ----
'page_left' =>
$GLOBALS['HTTP_POST_VARS']['page_left'],
'page_mid' =>
$GLOBALS['HTTP_POST_VARS']['page_mid'],
! 'page_right' =>
$GLOBALS['HTTP_POST_VARS']['page_right'],
! 'page_bgcolor' =>
$GLOBALS['HTTP_POST_VARS']['page_bgcolor']
);
if($page_id)
***************
*** 363,366 ****
--- 364,369 ----
$GLOBALS['phpgw']->template->set_var('lang_footer',lang('Footer'));
$GLOBALS['phpgw']->template->set_var('lang_version',lang('Version'));
+
$GLOBALS['phpgw']->template->set_var('lang_bgcolor',lang('Background Color'));
+
$GLOBALS['phpgw']->template->set_var('lang_chart',lang('Chart'));
$GLOBALS['phpgw']->template->set_var('lang_left',lang('Left'));
***************
*** 395,398 ****
--- 398,402 ----
$GLOBALS['phpgw']->template->set_var('page_footer',$this->formatted_list('page_footer',$footers,$page['page_footer'],'---'));
$GLOBALS['phpgw']->template->set_var('page_version',$page['page_version']);
+
$GLOBALS['phpgw']->template->set_var('page_bgcolor',$page['page_bgcolor']);
$list_top = $this->boelements->list_top(True,True);
Index: class.uisite.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.uisite.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** class.uisite.inc.php 28 Feb 2002 04:40:20 -0000 1.13
--- class.uisite.inc.php 23 Mar 2002 14:25:06 -0000 1.14
***************
*** 255,259 ****
'site_paneo' => $site_paneo,
'site_puburl' =>
$GLOBALS['HTTP_POST_VARS']['site_puburl'],
! 'site_pubtype' =>
$GLOBALS['HTTP_POST_VARS']['site_pubtype']
);
if($GLOBALS['HTTP_GET_VARS']['site_id'])
--- 255,260 ----
'site_paneo' => $site_paneo,
'site_puburl' =>
$GLOBALS['HTTP_POST_VARS']['site_puburl'],
! 'site_pubtype' =>
$GLOBALS['HTTP_POST_VARS']['site_pubtype'],
! 'site_bgcolor' =>
$GLOBALS['HTTP_POST_VARS']['site_bgcolor']
);
if($GLOBALS['HTTP_GET_VARS']['site_id'])
***************
*** 320,323 ****
--- 321,326 ----
$GLOBALS['phpgw']->template->set_var('lang_add_page',lang('Add Page'));
$GLOBALS['phpgw']->template->set_var('lang_publish',lang('Publish'));
+
$GLOBALS['phpgw']->template->set_var('lang_bgcolor',lang('Background Color'));
+
$GLOBALS['phpgw']->template->set_var('lang_chart',lang('Chart'));
$GLOBALS['phpgw']->template->set_var('site_left',$site['site_left'] ?
$site['site_left'] : '130');
***************
*** 344,347 ****
--- 347,351 ----
$GLOBALS['phpgw']->template->set_var('site_footer',$site['site_footer']);
$GLOBALS['phpgw']->template->set_var('site_version',$site['site_version']);
+
$GLOBALS['phpgw']->template->set_var('site_bgcolor',$site['site_bgcolor']);
$list_pages = $this->bopages->list_pages(True);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: wcm/inc class.bosite.inc.php,1.17,1.18 class.sopage.inc.php,1.16,1.17 class.sosite.inc.php,1.9,1.10 class.uipage.inc.php,1.19,1.20 class.uisite.inc.php,1.13,1.14,
Miles Lott <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: wcm/templates/default page_form.tpl,1.11,1.12 site_form.tpl,1.9,1.10
- Next by Date:
[Phpgroupware-cvs] CVS: wcm/inc class.bosite.inc.php,1.18,1.19
- Previous by thread:
[Phpgroupware-cvs] CVS: wcm/templates/default page_form.tpl,1.11,1.12 site_form.tpl,1.9,1.10
- Next by thread:
[Phpgroupware-cvs] CVS: wcm/inc class.bosite.inc.php,1.18,1.19
- Index(es):