Menu
▾
▴
phpbt-dev — Developer's mailing list and cvs commits
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(34) |
Aug
(215) |
Sep
(180) |
Oct
(135) |
Nov
(105) |
Dec
(81) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(76) |
Feb
(22) |
Mar
(154) |
Apr
(149) |
May
(128) |
Jun
(94) |
Jul
(14) |
Aug
(24) |
Sep
(77) |
Oct
(52) |
Nov
(22) |
Dec
(6) |
| 2003 |
Jan
(4) |
Feb
(10) |
Mar
(6) |
Apr
(29) |
May
(10) |
Jun
(37) |
Jul
(39) |
Aug
(13) |
Sep
(23) |
Oct
(3) |
Nov
(7) |
Dec
(2) |
| 2004 |
Jan
|
Feb
(10) |
Mar
(4) |
Apr
|
May
(35) |
Jun
(4) |
Jul
(17) |
Aug
(6) |
Sep
(14) |
Oct
(18) |
Nov
(2) |
Dec
(14) |
| 2005 |
Jan
(9) |
Feb
(30) |
Mar
(6) |
Apr
|
May
(38) |
Jun
(23) |
Jul
(21) |
Aug
(76) |
Sep
(50) |
Oct
(51) |
Nov
(13) |
Dec
|
|
From: Benjamin C. <bc...@us...> - 2002-04-04 15:35:24
|
Update of /cvsroot/phpbt/phpbt/admin
In directory usw-pr-cvs1:/tmp/cvs-serv29408/admin
Modified Files:
project.php
Log Message:
Added deleting of unused versions and components
Index: project.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/admin/project.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- project.php 3 Apr 2002 00:58:26 -0000 1.37
+++ project.php 4 Apr 2002 13:30:17 -0000 1.38
@@ -25,6 +25,15 @@
define('TEMPLATE_PATH', 'admin');
include '../include.php';
+function del_version($versionid, $projectid) {
+ global $db, $me;
+
+ if (!$db->getOne('select count(*) from '.TBL_BUG." where version_id = $versionid")) {
+ $db->query("delete from ".TBL_VERSION." where version_id = $versionid");
+ }
+ header("Location: $me?op=edit&id=$projectid&");
+}
+
function save_version($versionid = 0) {
global $db, $me, $_pv, $STRING, $now, $u, $t;
@@ -69,6 +78,15 @@
$t->display('admin/version-edit.html');
}
+function del_component($componentid, $projectid) {
+ global $db, $me;
+
+ if (!$db->getOne('select count(*) from '.TBL_BUG." where component_id = $componentid")) {
+ $db->query("delete from ".TBL_COMPONENT." where component_id = $componentid");
+ }
+ header("Location: $me?op=edit&id=$projectid&");
+}
+
function save_component($componentid = 0) {
global $db, $me, $_pv, $u, $STRING, $now, $t;
@@ -207,7 +225,7 @@
}
function show_project($projectid = 0, $error = null) {
- global $db, $me, $t, $name, $description, $active, $TITLE, $_gv, $_pv;
+ global $db, $me, $t, $TITLE, $_gv, $_pv, $QUERY;
if (is_array($error)) $t->assign($error);
else $t->assign('error', $error);
@@ -218,10 +236,10 @@
$t->assign($db->getRow('select * from '.TBL_PROJECT
." where project_id = $projectid"));
$t->assign(array(
- 'components' => $db->getAll("select * from ".TBL_COMPONENT.
- " where project_id = $projectid"),
- 'versions' => $db->getAll("select * from ".TBL_VERSION.
- " where project_id = $projectid")
+ 'components' => $db->getAll(sprintf($QUERY['admin-list-components'],
+ $projectid)),
+ 'versions' => $db->getAll(sprintf($QUERY['admin-list-versions'],
+ $projectid))
));
$t->display('admin/project-edit.html');
@@ -270,6 +288,8 @@
case 'edit' : show_project($_gv['id']); break;
case 'edit_component' : show_component($_gv['id']); break;
case 'edit_version' : show_version($_gv['id']); break;
+ case 'del_component' : del_component($_gv['id'], $_gv['project_id']); break;
+ case 'del_version' : del_version($_gv['id'], $_gv['project_id']); break;
}
} elseif (isset($_pv['do'])) {
switch($_pv['do']) {
|
|
From: Benjamin C. <bc...@us...> - 2002-04-04 15:35:17
|
Update of /cvsroot/phpbt/phpbt/inc/db In directory usw-pr-cvs1:/tmp/cvs-serv3374/inc/db Modified Files: mysql.php oci8.php pgsql.php Log Message: Prevent going directly to a bug that is not visible because it belongs to a group that is not visible Index: mysql.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/inc/db/mysql.php,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- mysql.php 4 Apr 2002 13:30:17 -0000 1.5 +++ mysql.php 4 Apr 2002 13:54:03 -0000 1.6 @@ -56,7 +56,8 @@ 'left join '.TBL_RESOLUTION.' r on b.resolution_id = r.resolution_id, '. TBL_SEVERITY.' sv, '.TBL_STATUS.' st, '.TBL_OS.' os, '. TBL_VERSION.' v, '. TBL_COMPONENT.' c, '.TBL_PROJECT.' p '. - 'where bug_id = %s and b.severity_id = sv.severity_id '. + 'where bug_id = %s and b.project_id not in (%s) '. + 'and b.severity_id = sv.severity_id '. 'and b.os_id = os.os_id and b.version_id = v.version_id '. 'and b.component_id = c.component_id and b.project_id = p.project_id '. 'and b.status_id = st.status_id', @@ -83,8 +84,8 @@ 'left join '.TBL_AUTH_USER.' reporter on b.created_by = reporter.user_id '. 'left join '.TBL_RESOLUTION.' r on b.resolution_id = r.resolution_id, '. TBL_SEVERITY.' sv, '.TBL_STATUS.' st '. - 'where bug_id = %s and b.severity_id = sv.severity_id '. - 'and b.status_id = st.status_id', + 'where bug_id = %s and b.project_id not in (%s) '. + 'and b.severity_id = sv.severity_id and b.status_id = st.status_id', 'functions-bug-cc' => 'select b.user_id, login '. 'from '.TBL_BUG_CC.' b left join '. TBL_AUTH_USER.' using(user_id) '. 'where bug_id = %s', Index: oci8.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/inc/db/oci8.php,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- oci8.php 4 Apr 2002 13:30:17 -0000 1.4 +++ oci8.php 4 Apr 2002 13:54:03 -0000 1.5 @@ -62,7 +62,7 @@ 'and b.resolution_id = r.resolution_id(+) and b.os_id = os.os_id '. 'and b.version_id = v.version_id and b.component_id = c.component_id '. 'and b.project_id = p.project_id and b.severity_id = sv.severity_id '. - 'and b.status_id = st.status_id and bug_id = %s', + 'and b.status_id = st.status_id and bug_id = %s and b.project_id not in (%s)', 'bug-prev-next' => 'select b.bug_id, reporter.login as reporter, '. 'owner.login as owner '. 'from '.TBL_BUG.' b, '.TBL_AUTH_USER.' owner, '.TBL_AUTH_USER.' reporter, '. @@ -88,7 +88,7 @@ 'and b.assigned_to = owner.user_id(+) '. 'and b.created_by = reporter.user_id(+) '. 'and b.severity_id = sv.severity_id and b.status_id = st.status_id '. - 'and bug_id = %s', + 'and bug_id = %s and b.project_id not in (%s)', 'functions-bug-cc' => 'select b.user_id, login '. 'from '.TBL_BUG_CC.' b, '. TBL_AUTH_USER. ' where phpbt_auth_user.user_id = b.user_id(+) and bug_id = %s', Index: pgsql.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/inc/db/pgsql.php,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- pgsql.php 4 Apr 2002 13:30:17 -0000 1.6 +++ pgsql.php 4 Apr 2002 13:54:03 -0000 1.7 @@ -56,7 +56,8 @@ 'left join '.TBL_RESOLUTION.' r on b.resolution_id = r.resolution_id, '. TBL_SEVERITY.' sv, '.TBL_STATUS.' st, '.TBL_OS.' os, '. TBL_VERSION.' v, '. TBL_COMPONENT.' c, '.TBL_PROJECT.' p '. - 'where bug_id = %s and b.severity_id = sv.severity_id '. + 'where bug_id = %s and b.project_id not in (%s) '. + 'and b.severity_id = sv.severity_id '. 'and b.os_id = os.os_id and b.version_id = v.version_id '. 'and b.component_id = c.component_id and b.project_id = p.project_id '. 'and b.status_id = st.status_id', @@ -83,8 +84,8 @@ 'left join '.TBL_AUTH_USER.' reporter on b.created_by = reporter.user_id '. 'left join '.TBL_RESOLUTION.' r on b.resolution_id = r.resolution_id, '. TBL_SEVERITY.' sv, '.TBL_STATUS.' st '. - 'where bug_id = %s and b.severity_id = sv.severity_id '. - 'and b.status_id = st.status_id', + 'where bug_id = %s and b.project_id not in (%s) '. + 'and b.severity_id = sv.severity_id and b.status_id = st.status_id', 'functions-bug-cc' => 'select b.user_id, login '. 'from '.TBL_BUG_CC.' b left join '. TBL_AUTH_USER.' using(user_id) '. 'where bug_id = %s', |
|
From: Benjamin C. <bc...@us...> - 2002-04-04 15:35:17
|
Update of /cvsroot/phpbt/phpbt
In directory usw-pr-cvs1:/tmp/cvs-serv3374
Modified Files:
bug.php
Log Message:
Prevent going directly to a bug that is not visible because it belongs to a group that is not visible
Index: bug.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/bug.php,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- bug.php 3 Apr 2002 18:45:27 -0000 1.93
+++ bug.php 4 Apr 2002 13:54:03 -0000 1.94
@@ -537,10 +537,11 @@
}
function show_bug_printable($bugid) {
- global $db, $me, $t, $select, $TITLE, $QUERY;
+ global $db, $me, $t, $select, $TITLE, $QUERY, $restricted_projects;
if (!is_numeric($bugid) or
- !$row = $db->getRow(sprintf($QUERY['bug-printable'], $bugid))) {
+ !$row = $db->getRow(sprintf($QUERY['bug-printable'], $bugid,
+ $restricted_projects))) {
show_text($STRING['bugbadnum'],true);
exit;
}
@@ -599,10 +600,11 @@
}
function show_bug($bugid = 0, $error = array()) {
- global $db, $me, $t, $STRING, $TITLE, $u, $perm, $_gv, $QUERY;
+ global $db, $me, $t, $STRING, $TITLE, $u, $_gv, $QUERY, $restricted_projects;
if (!ereg('^[0-9]+$',$bugid) or
- !$row = $db->getRow(sprintf($QUERY['bug-show-bug'], $bugid))) {
+ !$row = $db->getRow(sprintf($QUERY['bug-show-bug'], $bugid,
+ $restricted_projects))) {
show_text($STRING['bugbadnum'],true);
return;
}
|
|
From: Benjamin C. <bc...@us...> - 2002-04-04 15:34:49
|
Update of /cvsroot/phpbt/phpbt/templates/default/admin
In directory usw-pr-cvs1:/tmp/cvs-serv2986/templates/default/admin
Modified Files:
project-edit.html
Log Message:
Added deleting of versions and components. Template cleanup
Index: project-edit.html
===================================================================
RCS file: /cvsroot/phpbt/phpbt/templates/default/admin/project-edit.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project-edit.html 3 Apr 2002 00:57:10 -0000 1.3
+++ project-edit.html 4 Apr 2002 13:53:02 -0000 1.4
@@ -18,7 +18,7 @@
<form action="{$SCRIPT_NAME}" method="post">
<input type="hidden" name="id" value="{$project_id}">
<input type="hidden" name="do" value="project">
-<table border="0" cellpadding="2" cellspacing="2" width="640">
+<table border="0" cellpadding="2" cellspacing="2" width="100%">
{if $error}
<tr>
<td colspan="2" class="error">{$error}</td>
@@ -56,54 +56,58 @@
<input type='submit' name='submit' value='Submit'>
</form>
<br>
-<table border="0">
+<table border="0" width="100%">
<tr>
- <td width="320" valign="top">
+ <td width="50%" valign="top">
<br>
<b>Versions</b> - <a href="{$SCRIPT_NAME}?op=edit_version&id=0" onClick="popupVersion(0); return false;">{$STRING.addnew} Version</a>
- <hr width="320" size="1" align="center">
- <table border="0">
+ <hr size="1">
+ <table border="0" cellpadding="2" width="100%">
<tr>
- <th width="160">Version</th>
- <th width="100">Created</th>
- <th width="60">Active</th>
+ <th>Version</th>
+ <th>Created</th>
+ <th>Active</th>
+ <th>Delete</th>
</tr>
{section name=version loop=$versions}
<tr{if $smarty.section.version.iteration is even} class="alt"{/if}>
<td><a href="{$SCRIPT_NAME}?op=edit_version&id={$versions[version].version_id}" onClick="popupVersion({$versions[version].version_id}); return false;">{$versions[version].version_name|stripslashes}</a></td>
<td align="center">{$versions[version].created_date|date:DATE_FORMAT}</td>
<td align="center">{if $versions[version].active}Yes{else}No{/if}</td>
+ <td align="center">{if not $versions[version].bug_count}<a href="{$SCRIPT_NAME}?op=del_version&id={$versions[version].version_id}&project_id={$project_id}">Delete</a>{/if}</td>
</tr>
{sectionelse}
<tr>
- <td colspan="3" align="center">{$STRING.noversions}</td>
+ <td colspan="4" align="center">{$STRING.noversions}</td>
</tr>
{/section}
</table>
</td>
- <td width="320" valign="top">
+ <td width="50%" valign="top">
<br>
<b>Components</b> - <a href="{$SCRIPT_NAME}?op=edit_component&id=0" onClick="popupComponent(0); return false;">{$STRING.addnew} Component</a>
- <hr width="320" size="1" align="center">
- <table border="0">
+ <hr size="1">
+ <table border="0" cellpadding="2" width="100%">
<tr>
- <th width="160">Component</th>
- <th width="100">Created</th>
- <th width="60">Active</th>
+ <th>Component</th>
+ <th>Created</th>
+ <th>Active</th>
+ <th>Delete</th>
</tr>
{section name=component loop=$components}
<tr{if $smarty.section.component.iteration is even} class="alt"{/if}>
<td><a href="{$SCRIPT_NAME}?op=edit_component&id={$components[component].component_id}" onClick="popupComponent({$components[component].component_id}); return false;">{$components[component].component_name|stripslashes}</a></td>
<td align="center">{$components[component].created_date|date:DATE_FORMAT}</td>
<td align="center">{if $components[component].active}Yes{else}No{/if}</td>
+ <td align="center">{if not $components[component].bug_count}<a href="{$SCRIPT_NAME}?op=del_component&id={$components[component].component_id}&project_id={$project_id}">Delete</a>{/if}</td>
</tr>
{sectionelse}
<tr>
- <td colspan="3" align="center">{$STRING.nocomponents}</td>
+ <td colspan="4" align="center">{$STRING.nocomponents}</td>
</tr>
{/section}
</table>
</td>
</tr>
</table>
-{include file="footer.html"}
+{include file="admin/footer.html"}
|
|
From: Benjamin C. <bc...@us...> - 2002-04-04 15:34:45
|
Update of /cvsroot/phpbt/phpbt In directory usw-pr-cvs1:/tmp/cvs-serv5282 Modified Files: CHANGELOG Log Message: Index: CHANGELOG =================================================================== RCS file: /cvsroot/phpbt/phpbt/CHANGELOG,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- CHANGELOG 27 Mar 2002 21:20:49 -0000 1.51 +++ CHANGELOG 4 Apr 2002 13:59:38 -0000 1.52 @@ -4,10 +4,16 @@ : Added Oracle 8.1.x support. : Added "Remember me" functionality. : Fixed bugs with losing login info. -: Added detailed project stats to the home page. +: Added detailed project stats to the home page (configurable by the admin). : Added Estonian translation (Alvar Soome) and Italian translation (Gaetano Giunta). : Added the ability for users to choose not to receive bug update emails. +: Added ability to configure color schemes from the configuration page and + updated the "black" scheme. +: Switched template class to smarty templates. +: Fixed a bug with being able to go directly to a bug that should not be + available because of project group restrictions. +: Added the ability to delete components and versions not referenced by bugs. : Fixed other minor bugs. -- 0.7.2 -- 14 Mar 2002 |
|
From: Benjamin C. <bc...@us...> - 2002-04-04 00:33:46
|
Update of /cvsroot/phpbt/phpbt/schemas
In directory usw-pr-cvs1:/tmp/cvs-serv27980/schemas
Modified Files:
oci8.in pgsql.in
Log Message:
Insert into the prefs table
Index: oci8.in
===================================================================
RCS file: /cvsroot/phpbt/phpbt/schemas/oci8.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- oci8.in 3 Apr 2002 18:18:03 -0000 1.9
+++ oci8.in 4 Apr 2002 00:33:42 -0000 1.10
@@ -279,6 +279,9 @@
INSERT INTO TBL_USER_GROUP (user_id, group_id) VALUES (1, 1);
INSERT INTO TBL_USER_GROUP (user_id, group_id) VALUES (1, 2);
+-- Add user's prefs as default values for all users defined so far (only admin)
+INSERT INTO TBL_USER_PREF (user_id) values (1);
+
INSERT INTO TBL_CONFIGURATION VALUES ('INSTALL_URL','OPTION_INSTALL_URL','The base URL of the phpBugTracker installation','string');
INSERT INTO TBL_CONFIGURATION VALUES ('JPGRAPH_PATH','','If not in the include path','string');
INSERT INTO TBL_CONFIGURATION VALUES ('CVS_WEB','http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/phpbt/phpbt/','Location of your cvs web interface (see format_comments() in bug.php)','string');
Index: pgsql.in
===================================================================
RCS file: /cvsroot/phpbt/phpbt/schemas/pgsql.in,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- pgsql.in 3 Apr 2002 18:18:03 -0000 1.24
+++ pgsql.in 4 Apr 2002 00:33:42 -0000 1.25
@@ -276,6 +276,9 @@
INSERT INTO TBL_USER_GROUP (user_id, group_id) VALUES (1, 1);
INSERT INTO TBL_USER_GROUP (user_id, group_id) VALUES (1, 2);
+-- Add user's prefs as default values for all users defined so far (only admin)
+INSERT INTO TBL_USER_PREF (user_id) values (1);
+
INSERT INTO TBL_CONFIGURATION VALUES ('INSTALL_URL','OPTION_INSTALL_URL','The base URL of the phpBugTracker installation','string');
INSERT INTO TBL_CONFIGURATION VALUES ('JPGRAPH_PATH','','If not in the include path','string');
INSERT INTO TBL_CONFIGURATION VALUES ('CVS_WEB','http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/phpbt/phpbt/','Location of your cvs web interface (see format_comments() in bug.php)','string');
|
|
From: John W. <jp...@us...> - 2002-04-03 23:21:33
|
Update of /cvsroot/phpbt/phpbt
In directory usw-pr-cvs1:/tmp/cvs-serv9943
Modified Files:
install.php
Log Message:
Undoing incorrect file commit.
Index: install.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/install.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- install.php 3 Apr 2002 23:08:43 -0000 1.20
+++ install.php 3 Apr 2002 23:21:30 -0000 1.21
@@ -25,9 +25,7 @@
define ('INSTALL_PATH', dirname(__FILE__));
-define ('SMARTY_PATH','smarty/');
-
-if (!@include(SMARTY_PATH . 'Smarty.class.php')) { // Template class
+if (!@include('Smarty.class.php')) { // Template class
die('<br><br>
<div align="center">The Smarty templates class is not in your include path.
Without this class being available, phpBugTracker will not be able to work.
@@ -259,3 +257,5 @@
}
?>
+
+
|
|
From: John W. <jp...@us...> - 2002-04-03 23:17:02
|
Update of /cvsroot/phpbt/phpbt/schemas
In directory usw-pr-cvs1:/tmp/cvs-serv8577/schemas
Modified Files:
mysql.in
Log Message:
Add initial users' (admin) prefs as default values (& commiting the correct file!)
Index: mysql.in
===================================================================
RCS file: /cvsroot/phpbt/phpbt/schemas/mysql.in,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- mysql.in 3 Apr 2002 18:18:03 -0000 1.22
+++ mysql.in 3 Apr 2002 23:16:58 -0000 1.23
@@ -280,6 +280,9 @@
INSERT INTO TBL_USER_GROUP (user_id, group_id) VALUES (1, 1);
INSERT INTO TBL_USER_GROUP (user_id, group_id) VALUES (1, 2);
+# Add user's prefs as default values for all users defined so far (only admin)
+INSERT INTO TBL_USER_PREF (user_id) SELECT USER_ID FROM TBL_AUTH_USER;
+
INSERT INTO TBL_CONFIGURATION VALUES ('INSTALL_URL','OPTION_INSTALL_URL','The base URL of the phpBugTracker installation','string');
INSERT INTO TBL_CONFIGURATION VALUES ('JPGRAPH_PATH','','If not in the include path','string');
INSERT INTO TBL_CONFIGURATION VALUES ('CVS_WEB','http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/phpbt/phpbt/','Location of your cvs web interface (see format_comments() in bug.php)','string');
|
|
From: John W. <jp...@us...> - 2002-04-03 23:08:48
|
Update of /cvsroot/phpbt/phpbt
In directory usw-pr-cvs1:/tmp/cvs-serv6875
Modified Files:
install.php
Log Message:
Add initial users' (admin) prefs as default values
Index: install.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/install.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- install.php 3 Apr 2002 01:00:52 -0000 1.19
+++ install.php 3 Apr 2002 23:08:43 -0000 1.20
@@ -25,7 +25,9 @@
define ('INSTALL_PATH', dirname(__FILE__));
-if (!@include('Smarty.class.php')) { // Template class
+define ('SMARTY_PATH','smarty/');
+
+if (!@include(SMARTY_PATH . 'Smarty.class.php')) { // Template class
die('<br><br>
<div align="center">The Smarty templates class is not in your include path.
Without this class being available, phpBugTracker will not be able to work.
|
|
From: Ben C. <php...@be...> - 2002-04-03 22:53:29
|
They need to be downloaded separately. I will not be putting them into cvs, but I will be providing a phpbt+smarty package for download when the next version is released. Installation of smarty is simple, though, just extract the archive somewhere in your include path and you're done! Smarty can be downloaded from http://www.phpinsider.com/php/code/Smarty/ On Wed, Apr 03, 2002 at 08:49:12PM +0100, John Wilkins wrote: > Ben Curtis wrote: > > > > I just committed some significant changes -- switching the templates > > over to smarty. If you have customized templates in the default > > directory that you want to keep, make sure to make a backup copy before > > updating your checkout. A _lot_ changed with this conversion, so please > > bang away on the code. This is the last major thing I'm going to do > > before the next release, which I'm planning on doing next week. Bugs > > found before the release (as opposed to after) would be much preferred! > > :) > > > > My first experience of the new "smartyied" phpbt is the message that > "The Smarty templates class is not in your include path.....". > > Are you yet to commit the smarty classes into cvs or is it now a > necessity to download, configure and install Smarty first????? > > _______________________________________________ > phpbt-dev mailing list > php...@li... > https://lists.sourceforge.net/lists/listinfo/phpbt-dev |
|
From: John W. <joh...@wi...> - 2002-04-03 19:47:56
|
Ben Curtis wrote: > > I just committed some significant changes -- switching the templates > over to smarty. If you have customized templates in the default > directory that you want to keep, make sure to make a backup copy before > updating your checkout. A _lot_ changed with this conversion, so please > bang away on the code. This is the last major thing I'm going to do > before the next release, which I'm planning on doing next week. Bugs > found before the release (as opposed to after) would be much preferred! > :) > My first experience of the new "smartyied" phpbt is the message that "The Smarty templates class is not in your include path.....". Are you yet to commit the smarty classes into cvs or is it now a necessity to download, configure and install Smarty first????? |
|
From: Benjamin C. <bc...@us...> - 2002-04-03 19:09:04
|
Update of /cvsroot/phpbt/phpbt
In directory usw-pr-cvs1:/tmp/cvs-serv28324
Modified Files:
report.php
Log Message:
Oracle tweaks
Index: report.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/report.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- report.php 3 Apr 2002 01:00:52 -0000 1.24
+++ report.php 3 Apr 2002 19:08:47 -0000 1.25
@@ -43,9 +43,9 @@
$resfields[] = 'Total';
if ($projectid && is_numeric($projectid)) {
- $projectquery = $QUERY['report-resbyeng-where']." project_id = $projectid";
+ $projectquery = $QUERY['join-where']." project_id = $projectid";
} elseif (!$perm->have_perm('Admin')) {
- $projectquery = $QUERY['report-resbyeng-where'].
+ $projectquery = $QUERY['join-where'].
" project_id not in ($restricted_projects)";
} else {
$projectquery = '';
|
|
From: Benjamin C. <bc...@us...> - 2002-04-03 19:08:57
|
Update of /cvsroot/phpbt/phpbt/inc/db In directory usw-pr-cvs1:/tmp/cvs-serv28324/inc/db Modified Files: mysql.php oci8.php pgsql.php Log Message: Oracle tweaks Index: mysql.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/inc/db/mysql.php,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mysql.php 3 Apr 2002 01:01:04 -0000 1.3 +++ mysql.php 3 Apr 2002 19:08:48 -0000 1.4 @@ -140,7 +140,7 @@ 'from '.TBL_BUG. ' b '. 'left join '.TBL_AUTH_USER.' u on assigned_to = user_id %s '. 'group by assigned_to, u.email', - 'report-resbyeng-where' => 'where', + 'join-where' => 'where', ); ?> Index: oci8.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/inc/db/oci8.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- oci8.php 3 Apr 2002 01:01:04 -0000 1.2 +++ oci8.php 3 Apr 2002 19:08:48 -0000 1.3 @@ -144,7 +144,7 @@ 'from '.TBL_BUG . ' b, '.TBL_AUTH_USER.' u '. 'where b.assigned_to = u.user_id(+) %s '. 'group by assigned_to, u.email', - 'report-resbyeng-where' => 'and', + 'join-where' => 'and', ); ?> Index: pgsql.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/inc/db/pgsql.php,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- pgsql.php 3 Apr 2002 01:01:04 -0000 1.4 +++ pgsql.php 3 Apr 2002 19:08:48 -0000 1.5 @@ -140,7 +140,7 @@ 'from '.TBL_BUG. ' b '. 'left join '.TBL_AUTH_USER.' u on assigned_to = user_id %s '. 'group by assigned_to, u.email', - 'report-resbyeng-where' => 'where', + 'join-where' => 'where', ); ?> |
|
From: Benjamin C. <bc...@us...> - 2002-04-03 19:05:49
|
Update of /cvsroot/phpbt/phpbt/templates/default/admin
In directory usw-pr-cvs1:/tmp/cvs-serv15437/templates/default/admin
Modified Files:
os-edit.html resolutionlist.html
Added Files:
resolution-edit.html
Log Message:
Smarty stuff
--- NEW FILE: resolution-edit.html ---
{if $resolution_id}
{assign var="action" value=$STRING.edit}
{else}
{assign var="action" value=$STRING.addnew}
{/if}
{if $smarty.request.use_js}
{include file="admin/header-popup.html" page_title="$action Resolution"}
{else}
{include file="admin/header.html" page_title="$action Resolution"}
{/if}
<b>{$action} Resolution </b>
<hr size="1">
<form action="{$SCRIPT_NAME}" method="post">
<input type="hidden" name="resolution_id" value="{$resolution_id}">
<input type="hidden" name="use_js" value="{$smarty.request.use_js}">
<table border='0'>
{if $error}
<tr>
<td colspan="2" class="error">{$error}</td>
</tr>
{/if}
<tr>
<td align="right" valign="top">Name:</td>
<td><input type="text" size="20" maxlength="40" name="resolution_name" value="{$resolution_name|stripslashes|htmlentities}"></td>
</tr>
<tr>
<td align="right" valign="top">Description:</td>
<td><textarea name="resolution_desc" cols=20 rows=5 wrap=virtual>{$resolution_desc|stripslashes|htmlentities}</textarea></td>
</tr>
<tr>
<td align="right" valign="top">Sort Order:</td>
<td><input type="text" size="3" maxlength="3" name="sort_order" value="{$sort_order}"></td>
</tr>
</table>
<br>
<input type='submit' name='submit' value='Submit'>
</form>
{if $smarty.request.use_js}
{include file="admin/footer-popup.html"}
{else}
{include file="admin/footer.html"}
{/if}
Index: os-edit.html
===================================================================
RCS file: /cvsroot/phpbt/phpbt/templates/default/admin/os-edit.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- os-edit.html 3 Apr 2002 00:57:10 -0000 1.1
+++ os-edit.html 3 Apr 2002 18:24:48 -0000 1.2
@@ -4,9 +4,9 @@
{assign var="action" value=$STRING.addnew}
{/if}
{if $smarty.request.use_js}
- {include file="admin/header-popup.html" page_title="$action User"}
+ {include file="admin/header-popup.html" page_title="$action OS"}
{else}
- {include file="admin/header.html" page_title="$action User"}
+ {include file="admin/header.html" page_title="$action OS"}
{/if}
<b>{$action} OS </b>
<hr size="1">
Index: resolutionlist.html
===================================================================
RCS file: /cvsroot/phpbt/phpbt/templates/default/admin/resolutionlist.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- resolutionlist.html 3 Apr 2002 00:57:10 -0000 1.4
+++ resolutionlist.html 3 Apr 2002 18:24:48 -0000 1.5
@@ -1,8 +1,20 @@
{include file="admin/header.html" page_title="Resolutions"}
+
+<script language="JavaScript">
+<!--
+ var me = '{$SCRIPT_NAME}';
+ {literal}
+
+ function popupResolution(id) {
+ window.open(me + '?op=edit&use_js=1&resolution_id='+id, 'ewin', 'dependent=yes, width=350, height=300, scrollbars=auto');
+ }
+ {/literal}
+// -->
+</script>
<table border="0" width="640">
<tr>
<td valign="top">
- <b> Resolution List</b>
+ <b> Resolution List</b> - <a href="{$SCRIPT_NAME}?op=edit&resolution_id=0" onClick="popupResolution(0); return false;">{$STRING.addnew} Resolution</a>
<hr size="1">
<table border="0" cellpadding="2" cellspacing="1">
<tr>
@@ -13,7 +25,7 @@
</tr>
{section name=resolution loop=$resolutions}
<tr{if $smarty.section.resolution.iteration is even} class="alt"{/if}>
- <td><a href="{$SCRIPT_NAME}?op=edit&resolution_id={$resolutions[resolution].resolution_id}">{$resolutions[resolution].resolution_name|stripslashes}</a></td>
+ <td><a href="{$SCRIPT_NAME}?op=edit&resolution_id={$resolutions[resolution].resolution_id}" onClick="popupResolution({$resolutions[resolution].resolution_id}); return false;">{$resolutions[resolution].resolution_name|stripslashes}</a></td>
<td> {$resolutions[resolution].resolution_desc}</td>
<td align="center">{$resolutions[resolution].sort_order}</td>
<td align="center">
@@ -39,35 +51,6 @@
<br>
Only those Resolutions that have no bugs referencing them can be deleted
</div>
- </td>
- <td valign="top">
- <b>{if $group_id}Edit{else}Add{/if} Resolution </b>
- <hr size="1">
- <form action="{$SCRIPT_NAME}" method="post">
- <input type="hidden" name="resolution_id" value="{$resolution_id}">
- <table border='0'>
- {if $error}
- <tr>
- <td colspan="2" class="error">{$error}</td>
- </tr>
- {/if}
- <tr>
- <td align="right" valign="top">Name:</td>
- <td><input type="text" size="20" maxlength="40" name="resolution_name" value="{$resolution_name|stripslashes|htmlentities}"></td>
- </tr>
- <tr>
- <td align="right" valign="top">Description:</td>
- <td><textarea name="resolution_desc" cols=20 rows=5 wrap=virtual>{$resolution_desc|stripslashes|htmlentities}</textarea></td>
- </tr>
- <tr>
- <td align="right" valign="top">Sort Order:</td>
- <td><input type="text" size="3" maxlength="3" name="sort_order" value="{$sort_order}"></td>
- </tr>
-
- </table>
- <br>
- <input type='submit' name='submit' value='Submit'>
- </form>
</td>
</tr>
</table>
|
|
From: Benjamin C. <bc...@us...> - 2002-04-03 19:04:40
|
Update of /cvsroot/phpbt/phpbt/schemas
In directory usw-pr-cvs1:/tmp/cvs-serv13740/schemas
Modified Files:
mysql.in oci8.in pgsql.in
Log Message:
Switching the location of the css file. Color scheme now selectable on the configuration page
Index: mysql.in
===================================================================
RCS file: /cvsroot/phpbt/phpbt/schemas/mysql.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- mysql.in 29 Mar 2002 18:28:54 -0000 1.21
+++ mysql.in 3 Apr 2002 18:18:03 -0000 1.22
@@ -303,6 +303,7 @@
INSERT INTO TBL_CONFIGURATION VALUES ('DATE_FORMAT','m-d-Y','See the <a href="http://www.php.net/date" target="_new">date page</a> in the PHP manual for more info','string');
INSERT INTO TBL_CONFIGURATION VALUES ('TIME_FORMAT','g:i A','See the <a href="http://www.php.net/date" target="_new">date page</a> in the PHP manual for more info','string');
INSERT INTO TBL_CONFIGURATION VALUES ('LANGUAGE','en','The language file to use for warning and error messages','multi');
+INSERT INTO TBL_CONFIGURATION VALUES ('STYLE', 'default', 'The CSS file to use (color scheme)', 'multi');
INSERT INTO TBL_OS VALUES (1,'All',1,'');
INSERT INTO TBL_OS VALUES (2,'Windows 3.1',2,'/Mozilla.*\\(Win16.*\\)/');
Index: oci8.in
===================================================================
RCS file: /cvsroot/phpbt/phpbt/schemas/oci8.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- oci8.in 29 Mar 2002 18:28:54 -0000 1.8
+++ oci8.in 3 Apr 2002 18:18:03 -0000 1.9
@@ -302,6 +302,7 @@
INSERT INTO TBL_CONFIGURATION VALUES ('DATE_FORMAT','m-d-Y','See the <a href="http://www.php.net/date" target="_new">date page</a> in the PHP manual for more info','string');
INSERT INTO TBL_CONFIGURATION VALUES ('TIME_FORMAT','g:i A','See the <a href="http://www.php.net/date" target="_new">date page</a> in the PHP manual for more info','string');
INSERT INTO TBL_CONFIGURATION VALUES ('LANGUAGE','en','The language file to use for warning and error messages','multi');
+INSERT INTO TBL_CONFIGURATION VALUES ('STYLE', 'default', 'The CSS file to use (color scheme)', 'multi');
INSERT INTO TBL_OS VALUES (1,'All',1,'');
INSERT INTO TBL_OS VALUES (2,'Windows 3.1',2,'/Mozilla.*\\(Win16.*\\)/');
Index: pgsql.in
===================================================================
RCS file: /cvsroot/phpbt/phpbt/schemas/pgsql.in,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- pgsql.in 29 Mar 2002 18:28:54 -0000 1.23
+++ pgsql.in 3 Apr 2002 18:18:03 -0000 1.24
@@ -299,7 +299,7 @@
INSERT INTO TBL_CONFIGURATION VALUES ('DATE_FORMAT','m-d-Y','See the <a href="http://www.php.net/date" target="_new">date page</a> in the PHP manual for more info','string');
INSERT INTO TBL_CONFIGURATION VALUES ('TIME_FORMAT','g:i A','See the <a href="http://www.php.net/date" target="_new">date page</a> in the PHP manual for more info','string');
INSERT INTO TBL_CONFIGURATION VALUES ('LANGUAGE','en','The language file to use for warning and error messages','multi');
-
+INSERT INTO TBL_CONFIGURATION VALUES ('STYLE', 'default', 'The CSS file to use (color scheme)', 'multi');
INSERT INTO TBL_OS VALUES (1,'All',1,'');
INSERT INTO TBL_OS VALUES (2,'Windows 3.1',2,'/Mozilla.*\\(Win16.*\\)/');
|
|
From: Benjamin C. <bc...@us...> - 2002-04-03 19:04:32
|
Update of /cvsroot/phpbt/phpbt
In directory usw-pr-cvs1:/tmp/cvs-serv13740
Modified Files:
upgrade.php
Removed Files:
css.php
Log Message:
Switching the location of the css file. Color scheme now selectable on the configuration page
Index: upgrade.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/upgrade.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- upgrade.php 3 Apr 2002 01:00:52 -0000 1.20
+++ upgrade.php 3 Apr 2002 18:18:02 -0000 1.21
@@ -75,6 +75,7 @@
$db->query("INSERT INTO ".TBL_CONFIGURATION." VALUES ('RECALL_LOGIN','0','Enable use of cookies to store username between logins','bool')");
$db->query("INSERT INTO ".TBL_CONFIGURATION." VALUES ('SHOW_PROJECT_SUMMARIES', '1', 'Itemize bug stats by project on the home page', 'bool')");
$db->query("INSERT INTO ".TBL_CONFIGURATION." VALUES ('FORCE_LOGIN', '0', 'Force users to login before being able to use the bug tracker', 'bool')");
+ $db->query("INSERT INTO ".TBL_CONFIGURATION." VALUES ('STYLE', 'default', 'The CSS file to use (color scheme)', 'multi')");
}
include 'templates/default/upgrade-finished.html';
}
--- css.php DELETED ---
|
|
From: Benjamin C. <bc...@us...> - 2002-04-03 19:04:29
|
Update of /cvsroot/phpbt/phpbt/admin
In directory usw-pr-cvs1:/tmp/cvs-serv13740/admin
Modified Files:
configure.php
Log Message:
Switching the location of the css file. Color scheme now selectable on the configuration page
Index: configure.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/admin/configure.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- configure.php 3 Apr 2002 00:58:26 -0000 1.6
+++ configure.php 3 Apr 2002 18:18:02 -0000 1.7
@@ -30,6 +30,11 @@
if (isset($_pv['submit'])) {
foreach ($_pv as $k => $v) {
$db->query('update '.TBL_CONFIGURATION." set varvalue = '$v' where varname = '$k'");
+
+ // Refresh the template variable now instead of waiting for the next page load.
+ if ($k == 'STYLE') {
+ $t->assign('STYLE', $v);
+ }
}
}
|
|
From: Benjamin C. <bc...@us...> - 2002-04-03 19:04:14
|
Update of /cvsroot/phpbt/phpbt/admin
In directory usw-pr-cvs1:/tmp/cvs-serv15437/admin
Modified Files:
resolution.php
Log Message:
Smarty stuff
Index: resolution.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/admin/resolution.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- resolution.php 3 Apr 2002 00:58:26 -0000 1.26
+++ resolution.php 3 Apr 2002 18:24:47 -0000 1.27
@@ -43,7 +43,7 @@
}
function do_form($resolutionid = 0) {
- global $db, $me, $_pv, $STRING;
+ global $db, $me, $_pv, $STRING, $t;
extract($_pv);
$error = '';
@@ -52,7 +52,7 @@
$error = $STRING['givename'];
elseif (!$resolution_desc = trim($resolution_desc))
$error = $STRING['givedesc'];
- if ($error) { list_items($resolutionid, $error); return; }
+ if ($error) { show_form($resolutionid, $error); return; }
if (!$resolutionid) {
$db->query("insert into ".TBL_RESOLUTION.
@@ -66,7 +66,11 @@
', resolution_desc = '.$db->quote(stripslashes($resolution_desc)).
", sort_order = $sort_order where resolution_id = $resolutionid");
}
- header("Location: $me?");
+ if ($use_js) {
+ $t->display('admin/edit-submit.html');
+ } else {
+ header("Location: $me?");
+ }
}
function show_form($resolutionid = 0, $error = '') {
@@ -79,6 +83,8 @@
} else {
$t->assign($_pv);
}
+ $t->assign('error', $error);
+ $t->display('admin/resolution-edit.html');
}
@@ -110,16 +116,13 @@
sorting_headers($me, $headers, $order, $sort, "page=$page");
- show_form($resolutionid, $error);
-
$t->display('admin/resolutionlist.html');
}
$perm->check('Admin');
if (isset($_gv['op'])) switch($_gv['op']) {
- case 'add' : list_items(); break;
- case 'edit' : list_items($_gv['resolution_id']); break;
+ case 'edit' : show_form($_gv['resolution_id']); break;
case 'del' : del_item($_gv['resolution_id']); break;
} elseif(isset($_pv['submit'])) {
do_form($_pv['resolution_id']);
|
|
From: Benjamin C. <bc...@us...> - 2002-04-03 19:04:08
|
Update of /cvsroot/phpbt/phpbt/templates/default/admin
In directory usw-pr-cvs1:/tmp/cvs-serv27139
Modified Files:
footer.html header.html
Log Message:
Cleanup
Index: footer.html
===================================================================
RCS file: /cvsroot/phpbt/phpbt/templates/default/admin/footer.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- footer.html 3 Apr 2002 00:57:10 -0000 1.1
+++ footer.html 3 Apr 2002 19:04:04 -0000 1.2
@@ -4,34 +4,34 @@
<td width="150" height="30" class="sidenav">
 
</td>
- <form method="post" action="{$smarty.server.REQUEST_URI}">
<td height="30" class="bottomnav">
-
- {if not $smarty.session.uid}
- {if EMAIL_IS_LOGIN}
- {assign var="loginlabel" value="Email"}
+ <form method="post" action="{$smarty.server.REQUEST_URI}">
+
+ {if not $smarty.session.uid}
+ {if EMAIL_IS_LOGIN}
+ {assign var="loginlabel" value="Email"}
+ {else}
+ {assign var="loginlabel" value="Login"}
+ {/if}
+ {$loginerror}
+ {$loginlabel}: <input type="text" name="username" class="bottomnavinput" value="{$smarty.cookies.phpbt_user}">
+ Password: <input type="password" name="password" class="bottomnavinput">
+ <input type="hidden" name="dologin" value="1">
+ <input type="submit" value="Login" class="bottomnavinput">
+ <input type="submit" name="sendpass" value="Email Password" class="bottomnavinput" title="Forgot your password? Have it sent to you">
+ {if RECALL_LOGIN}
+ <input type="checkbox" name="savecookie" value="1" {if !empty($smarty.cookies.phpbt_user)}checked{/if} class="bottomnavinput" title="Remember {$loginlabel} for next time"> Remember me
+ {/if}
{else}
- {assign var="loginlabel" value="Login"}
+ [ Bugs assigned to me: <a href="../query.php?op=mybugs&assignedto=1&open=1" title="Open">{$owner_open}</a> / <a href="../query.php?op=mybugs&assignedto=1&open=0" title="Closed">{$owner_closed}</a>
+ | Bugs reported by me: <a href="../query.php?op=mybugs&reportedby=1&open=1" title="Open">{$reporter_open}</a> / <a href="../query.php?op=mybugs&reportedby=1&open=0" title="Closed">{$reporter_closed}</a>
+ | <a href="../user.php">Personal Page</a>
+ | <a href="../logout.php">Logout {$smarty.session.uname}</a>
+ ]
{/if}
- {$loginerror}
- {$loginlabel}: <input type="text" name="username" class="bottomnavinput" value="{$smarty.cookies.phpbt_user}">
- Password: <input type="password" name="password" class="bottomnavinput">
- <input type="hidden" name="dologin" value="1">
- <input type="submit" value="Login" class="bottomnavinput">
- <input type="submit" name="sendpass" value="Email Password" class="bottomnavinput" title="Forgot your password? Have it sent to you">
- {if RECALL_LOGIN}
- <input type="checkbox" name="savecookie" value="1" {if !empty($smarty.cookies.phpbt_user)}checked{/if} class="bottomnavinput" title="Remember {$loginlabel} for next time"> Remember me
- {/if}
- {else}
- [ Bugs assigned to me: <a href="../query.php?op=mybugs&assignedto=1&open=1" title="Open">{$owner_open}</a> / <a href="../query.php?op=mybugs&assignedto=1&open=0" title="Closed">{$owner_closed}</a>
- | Bugs reported by me: <a href="../query.php?op=mybugs&reportedby=1&open=1" title="Open">{$reporter_open}</a> / <a href="../query.php?op=mybugs&reportedby=1&open=0" title="Closed">{$reporter_closed}</a>
- | <a href="../user.php">Personal Page</a>
- | <a href="../logout.php">Logout {$smarty.session.uname}</a>
- ]
- {/if}
-
+
+ </form>
</td>
- </form>
</tr>
</table>
</body>
Index: header.html
===================================================================
RCS file: /cvsroot/phpbt/phpbt/templates/default/admin/header.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- header.html 3 Apr 2002 18:18:03 -0000 1.2
+++ header.html 3 Apr 2002 19:04:04 -0000 1.3
@@ -10,13 +10,13 @@
<td width="150" height="30" class="nav">
phpBugTracker
</td>
- <form action="../bug.php">
<input type="hidden" name="op" value="show">
- <td height="30" class="nav" align="right">
- Find bug <input type="text" name="bugid" size="4" class="navinput">
-
+ <form action="../bug.php">
+ <td height="30" class="nav" align="right">
+ Find bug <input type="text" name="bugid" size="4" class="navinput">
+
+ </form>
</td>
- </form>
</tr>
<tr>
<td width="150" class="sidenav">
|
|
From: Benjamin C. <bc...@us...> - 2002-04-03 19:01:11
|
Update of /cvsroot/phpbt/phpbt/templates/default
In directory usw-pr-cvs1:/tmp/cvs-serv26191
Modified Files:
footer.html header.html user.html
Log Message:
Cleanup
Index: footer.html
===================================================================
RCS file: /cvsroot/phpbt/phpbt/templates/default/footer.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- footer.html 3 Apr 2002 00:57:51 -0000 1.1
+++ footer.html 3 Apr 2002 19:01:04 -0000 1.2
@@ -4,34 +4,34 @@
<td width="150" height="30" class="sidenav">
 
</td>
- <form method="post" action="{$smarty.server.REQUEST_URI}">
<td height="30" class="bottomnav">
-
- {if not $smarty.session.uid}
- {if EMAIL_IS_LOGIN}
- {assign var="loginlabel" value="Email"}
+ <form method="post" action="{$smarty.server.REQUEST_URI}">
+
+ {if not $smarty.session.uid}
+ {if EMAIL_IS_LOGIN}
+ {assign var="loginlabel" value="Email"}
+ {else}
+ {assign var="loginlabel" value="Login"}
+ {/if}
+ {$loginerror}
+ {$loginlabel}: <input type="text" name="username" class="bottomnavinput" value="{$smarty.cookies.phpbt_user}">
+ Password: <input type="password" name="password" class="bottomnavinput">
+ <input type="hidden" name="dologin" value="1">
+ <input type="submit" value="Login" class="bottomnavinput">
+ <input type="submit" name="sendpass" value="Email Password" class="bottomnavinput" title="Forgot your password? Have it sent to you">
+ {if RECALL_LOGIN}
+ <input type="checkbox" name="savecookie" value="1" {if !empty($smarty.cookies.phpbt_user)}checked{/if} class="bottomnavinput" title="Remember {$loginlabel} for next time"> Remember me
+ {/if}
{else}
- {assign var="loginlabel" value="Login"}
+ [ Bugs assigned to me: <a href="query.php?op=mybugs&assignedto=1&open=1" title="Open">{$owner_open}</a> / <a href="query.php?op=mybugs&assignedto=1&open=0" title="Closed">{$owner_closed}</a>
+ | Bugs reported by me: <a href="query.php?op=mybugs&reportedby=1&open=1" title="Open">{$reporter_open}</a> / <a href="query.php?op=mybugs&reportedby=1&open=0" title="Closed">{$reporter_closed}</a>
+ | <a href="user.php">Personal Page</a>
+ | <a href="logout.php">Logout {$smarty.session.uname}</a>
+ ]
{/if}
- {$loginerror}
- {$loginlabel}: <input type="text" name="username" class="bottomnavinput" value="{$smarty.cookies.phpbt_user}">
- Password: <input type="password" name="password" class="bottomnavinput">
- <input type="hidden" name="dologin" value="1">
- <input type="submit" value="Login" class="bottomnavinput">
- <input type="submit" name="sendpass" value="Email Password" class="bottomnavinput" title="Forgot your password? Have it sent to you">
- {if RECALL_LOGIN}
- <input type="checkbox" name="savecookie" value="1" {if !empty($smarty.cookies.phpbt_user)}checked{/if} class="bottomnavinput" title="Remember {$loginlabel} for next time"> Remember me
- {/if}
- {else}
- [ Bugs assigned to me: <a href="query.php?op=mybugs&assignedto=1&open=1" title="Open">{$owner_open}</a> / <a href="query.php?op=mybugs&assignedto=1&open=0" title="Closed">{$owner_closed}</a>
- | Bugs reported by me: <a href="query.php?op=mybugs&reportedby=1&open=1" title="Open">{$reporter_open}</a> / <a href="query.php?op=mybugs&reportedby=1&open=0" title="Closed">{$reporter_closed}</a>
- | <a href="user.php">Personal Page</a>
- | <a href="logout.php">Logout {$smarty.session.uname}</a>
- ]
- {/if}
-
+
+ </form>
</td>
- </form>
</tr>
</table>
</body>
Index: header.html
===================================================================
RCS file: /cvsroot/phpbt/phpbt/templates/default/header.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- header.html 3 Apr 2002 18:52:31 -0000 1.3
+++ header.html 3 Apr 2002 19:01:04 -0000 1.4
@@ -10,13 +10,13 @@
<td width="150" height="30" class="nav">
phpBugTracker
</td>
- <form action="bug.php">
- <input type="hidden" name="op" value="show">
<td height="30" class="nav" align="right">
- Find bug <input type="text" name="bugid" size="4" class="navinput">
-
+ <form action="bug.php">
+ <input type="hidden" name="op" value="show">
+ Find bug <input type="text" name="bugid" size="4" class="navinput">
+
+ </form>
</td>
- </form>
</tr>
<tr>
<td width="150" class="sidenav">
Index: user.html
===================================================================
RCS file: /cvsroot/phpbt/phpbt/templates/default/user.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- user.html 3 Apr 2002 00:57:51 -0000 1.5
+++ user.html 3 Apr 2002 19:01:04 -0000 1.6
@@ -60,7 +60,6 @@
</form>
</td>
</table>
-</form>
<br>
<form action="{$SCRIPT_NAME}" method="post">
<input type="hidden" name="do" value="changecolumnlist">
|
|
From: Benjamin C. <bc...@us...> - 2002-04-03 18:59:42
|
Update of /cvsroot/phpbt/phpbt/templates/default
In directory usw-pr-cvs1:/tmp/cvs-serv13740/templates/default
Modified Files:
header.html
Log Message:
Switching the location of the css file. Color scheme now selectable on the configuration page
Index: header.html
===================================================================
RCS file: /cvsroot/phpbt/phpbt/templates/default/header.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- header.html 3 Apr 2002 00:57:51 -0000 1.1
+++ header.html 3 Apr 2002 18:18:03 -0000 1.2
@@ -2,7 +2,7 @@
<head>
<META HTTP-EQUIV="Expires" CONTENT="-1">
<title>phpBugTracker - {$page_title}</title>
- <link rel="StyleSheet" href="css.php" type="text/css">
+ <link rel="StyleSheet" href="styles/{$STYLE}.css" type="text/css">
</head>
<body topmargin="0" leftmargin="0" marginheight="0" marginwidth="0">
<table width="100%" cellspacing="0" cellpadding="0" height="100%">
|
|
From: Benjamin C. <bc...@us...> - 2002-04-03 18:59:42
|
Update of /cvsroot/phpbt/phpbt/styles
In directory usw-pr-cvs1:/tmp/cvs-serv13740/styles
Added Files:
black.css default.css
Log Message:
Switching the location of the css file. Color scheme now selectable on the configuration page
--- NEW FILE: black.css ---
body {
font-family: "Arial","Helvetica","MS Sans Serif","Sans-Serif";
font-size: 12px;
color: #ffffff;
background: #000000;
}
a:link { text-decoration: none; color: #cecece; }
a:visited { text-decoration: none; color: #cecece; }
a:active { text-decoration: none }
a:hover { text-decoration: underline; }
td {
font-family: "Arial","Helvetica","MS Sans Serif","Sans-Serif";
font-size: 12px;
color: #ffffff;
}
tr {
background: #000000;
}
tr.alt {
background: #4e4e4e;
}
th {
font-family: "Arial","Helvetica","MS Sans Serif","Sans-Serif";
font-size: 12px;
color: #ffffff;
background: #4a4a4a;
}
th.selected {
font-weight: bold;
text-align: center;
background: #6a6a6a;
}
select {
font-family: "Arial","Helvetica","MS Sans Serif","Sans-Serif";
font-size: 12px;
}
input {
font-size: 12px;
}
input[type="file"] {
font-family: "Arial","Helvetica","MS Sans Serif","Sans-Serif";
font-size: 12px;
}
input[type="submit"] {
font-family: "Arial","Helvetica","MS Sans Serif","Sans-Serif";
}
input[type="reset"] {
font-family: "Arial","Helvetica","MS Sans Serif","Sans-Serif";
}
textarea {
font-size: 12px;
}
.navfont {
font-family: "Verdana","Arial","Helvetica","MS Sans Serif","Sans-Serif";
font-size: 10px;
}
.login-box {
vertical-align: text-bottom;
font-size: 10px;
}
input[type="text"].login-box {
padding-top: 0.1em;
padding-left: 0.2em;
padding-right: 0.2em;
}
.banner {
text-align: center;
font-weight: bold;
padding: 1.5em;
font-size: 16px;
}
.error {
text-align: center;
font-weight: bold;
color: #ff0000;
padding-bottom: 0.1em;
}
.result {
text-align: center;
font-weight: bold;
color: #0000ff;
padding-bottom: 0.1em;
}
a.sidenavlink {
color: #ffffff;
text-decoration: none;
}
.nav {
vertical-align: middle;
background: #330000;
color: #ffffff;
font-family: "Arial", sans-serif;
font-size: 16px;
font-weight: bold;
border-width: 0px 0px 3px 0px;
border-color: #4a4a4a;
border-style: solid;
}
.navinput {
vertical-align: middle;
background: #ffffff;
color: #000000;
font-family: "Arial", sans-serif;
font-size: 12px;
}
.sidenav {
vertical-align: top;
background: #330000;
color: #ffffff;
font-family: "Verdana", "Tahoma", "Helvetica", sans-serif;
font-size: 14px;
font-weight: bold;
}
.bottomnav {
vertical-align: middle;
background: #4a4a4a;
color: #ffffff;
font-family: "Arial", sans-serif;
font-size: 10px;
font-weight: bold;
}
.bottomnavinput {
vertical-align: middle;
color: #000000;
font-family: "Arial", sans-serif;
font-size: 10px;
}
.topnavbox {
vertical-align: middle;
background: #330000;
color: #000000;
font-family: "Arial", sans-serif;
font-size: 14px;
font-weight: bold;
border-width: 1px 0px 1px 0px;
border-color: #ffffff;
border-style: solid;
padding: 5px;
cursor: pointer;
cursor: hand;
}
.navbox {
vertical-align: middle;
background: #330000;
color: #000000;
font-family: "Arial", sans-serif;
font-size: 14px;
font-weight: bold;
border-width: 0px 0px 1px 0px;
border-color: #ffffff;
border-style: solid;
padding: 5px;
cursor: pointer;
cursor: hand;
}
.navboxselected {
vertical-align: middle;
background: #4a4a4a;
color: #000000;
font-family: "Arial", sans-serif;
font-size: 14px;
font-weight: bold;
border-width: 0px 0px 1px 0px;
border-color: #ffffff;
border-style: solid;
padding: 5px;
cursor: pointer;
cursor: hand;
}
.maincontent {
vertical-align: top;
padding: 5px;
}
.info {
font-size: 10px;
color: #ffffff;
background: #4a4a4a;
border-width: 1px 1px 1px 1px;
border-color: #6a6a6a;
border-style: solid;
padding: 5px;
text-align: center;
}
.header-col { font-weight: bold; }
.center-col { text-align: center; }
--- NEW FILE: default.css ---
body {
font-family: "Arial","Helvetica","MS Sans Serif","Sans-Serif";
font-size: 12px;
color: #000000;
background: #ffffff;
}
a:link { text-decoration: none; color: #006699; }
a:visited { text-decoration: none; color: #006699; }
a:active { text-decoration: none }
a:hover { text-decoration: underline; }
td {
font-family: "Arial","Helvetica","MS Sans Serif","Sans-Serif";
font-size: 12px;
color: #000000;
}
tr.alt {
background: #dddddd;
}
th {
font-family: "Arial","Helvetica","MS Sans Serif","Sans-Serif";
font-size: 12px;
color: #000000;
background-color: #eeeeee;
}
th.selected {
font-weight: bold;
text-align: center;
background-color: #bbbbbb;
}
select {
font-family: "Arial","Helvetica","MS Sans Serif","Sans-Serif";
font-size: 12px;
}
input {
font-size: 12px;
}
input[type="file"] {
font-family: "Arial","Helvetica","MS Sans Serif","Sans-Serif";
font-size: 12px;
}
input[type="submit"] {
font-family: "Arial","Helvetica","MS Sans Serif","Sans-Serif";
}
input[type="reset"] {
font-family: "Arial","Helvetica","MS Sans Serif","Sans-Serif";
}
textarea {
font-size: 12px;
}
.navfont {
font-family: "Verdana","Arial","Helvetica","MS Sans Serif","Sans-Serif";
font-size: 10px;
}
.login-box {
vertical-align: text-bottom;
font-size: 10px;
}
input[type="text"].login-box {
padding-top: 0.1em;
padding-left: 0.2em;
padding-right: 0.2em;
}
.banner {
text-align: center;
font-weight: bold;
padding: 1.5em;
font-size: 16px;
}
.error {
text-align: center;
font-weight: bold;
color: #ff0000;
padding-bottom: 0.1em;
}
.result {
text-align: center;
font-weight: bold;
color: #0000ff;
padding-bottom: 0.1em;
}
a.sidenavlink {
color: #000000;
text-decoration: none;
}
.nav {
vertical-align: middle;
background: #9999ff;
color: #ffffff;
font-family: "Arial", sans-serif;
font-size: 16px;
font-weight: bold;
border-width: 0px 0px 3px 0px;
border-color: #000000;
border-style: solid;
}
.navinput {
vertical-align: middle;
background: #ffffff;
color: #00000;
font-family: "Arial", sans-serif;
font-size: 12px;
}
.sidenav {
vertical-align: top;
background: #9999ff;
color: #ffffff;
font-family: "Verdana", "Tahoma", "Helvetica", sans-serif;
font-size: 14px;
font-weight: bold;
}
.bottomnav {
vertical-align: middle;
background: #ffffcc;
color: #000000;
font-family: "Arial", sans-serif;
font-size: 10px;
font-weight: bold;
}
.bottomnavinput {
vertical-align: middle;
color: #00000;
font-family: "Arial", sans-serif;
font-size: 10px;
}
.topnavbox {
vertical-align: middle;
background: #9999ff;
color: #ffffff;
font-family: "Arial", sans-serif;
font-size: 14px;
font-weight: bold;
border-width: 1px 0px 1px 0px;
border-color: #ffffff;
border-style: solid;
padding: 5px;
cursor: pointer;
cursor: hand;
}
.navbox {
vertical-align: middle;
background: #9999ff;
color: #ffffff;
font-family: "Arial", sans-serif;
font-size: 14px;
font-weight: bold;
border-width: 0px 0px 1px 0px;
border-color: #ffffff;
border-style: solid;
padding: 5px;
cursor: pointer;
cursor: hand;
}
.navboxselected {
vertical-align: middle;
background: #ffffcc;
color: #ffffff;
font-family: "Arial", sans-serif;
font-size: 14px;
font-weight: bold;
border-width: 0px 0px 1px 0px;
border-color: #ffffff;
border-style: solid;
padding: 5px;
cursor: pointer;
cursor: hand;
}
.maincontent {
vertical-align: top;
background: #ffffff;
color: #000000;
font-family: "Arial", sans-serif;
font-size: 12px;
padding: 5px;
}
.info {
font-size: 10px;
color: #000000;
background: #eeeeee;
border-width: 1px 1px 1px 1px;
border-color: #000000;
border-style: solid;
padding: 5px;
text-align: center;
}
.header-col { font-weight: bold; }
.center-col { text-align: center; }
|
|
From: Benjamin C. <bc...@us...> - 2002-04-03 18:59:42
|
Update of /cvsroot/phpbt/phpbt/inc
In directory usw-pr-cvs1:/tmp/cvs-serv13740/inc
Modified Files:
functions.php
Log Message:
Switching the location of the css file. Color scheme now selectable on the configuration page
Index: functions.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/inc/functions.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- functions.php 3 Apr 2002 01:01:04 -0000 1.16
+++ functions.php 3 Apr 2002 18:18:02 -0000 1.17
@@ -184,6 +184,24 @@
$text .= "<option value=\"$file\"$sel>$file</option>";
}
break;
+ case 'STYLE' :
+ $dir = opendir(INSTALL_PATH.'/styles');
+ while (false !== ($file = readdir($dir))) {
+ if ($file != '.' && $file != '..' && $file != 'CVS') {
+ $filelist[] = str_replace('.css', '', $file);
+ }
+ }
+ closedir($dir);
+ sort($filelist);
+ foreach ($filelist as $file) {
+ if ($file == $selected) {
+ $sel = ' selected';
+ } else {
+ $sel = '';
+ }
+ $text .= "<option value=\"$file\"$sel>$file</option>";
+ }
+ break;
default :
$deadarray = $select[$box];
while(list($val,$item) = each($deadarray)) {
|
|
From: Benjamin C. <bc...@us...> - 2002-04-03 18:59:42
|
Update of /cvsroot/phpbt/phpbt/templates/default/admin
In directory usw-pr-cvs1:/tmp/cvs-serv13740/templates/default/admin
Modified Files:
header-popup.html header.html
Log Message:
Switching the location of the css file. Color scheme now selectable on the configuration page
Index: header-popup.html
===================================================================
RCS file: /cvsroot/phpbt/phpbt/templates/default/admin/header-popup.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- header-popup.html 3 Apr 2002 00:57:10 -0000 1.1
+++ header-popup.html 3 Apr 2002 18:18:03 -0000 1.2
@@ -2,7 +2,7 @@
<head>
<META HTTP-EQUIV="Expires" CONTENT="-1">
<title>phpBugTracker Admin - {$page_title}</title>
- <link rel="StyleSheet" href="../css.php" type="text/css">
+ <link rel="StyleSheet" href="../styles/{$STYLE}.css" type="text/css">
</head>
<body topmargin="0" leftmargin="0" marginheight="0" marginwidth="0">
<table width="100%" cellspacing="0" cellpadding="0" height="100%">
Index: header.html
===================================================================
RCS file: /cvsroot/phpbt/phpbt/templates/default/admin/header.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- header.html 3 Apr 2002 00:57:10 -0000 1.1
+++ header.html 3 Apr 2002 18:18:03 -0000 1.2
@@ -2,7 +2,7 @@
<head>
<META HTTP-EQUIV="Expires" CONTENT="-1">
<title>phpBugTracker Admin - {$page_title}</title>
- <link rel="StyleSheet" href="../css.php" type="text/css">
+ <link rel="StyleSheet" href="../styles/{$STYLE}.css" type="text/css">
</head>
<body topmargin="0" leftmargin="0" marginheight="0" marginwidth="0">
<table width="100%" cellspacing="0" cellpadding="0" height="100%">
|
|
From: Benjamin C. <bc...@us...> - 2002-04-03 18:54:13
|
Update of /cvsroot/phpbt/phpbt
In directory usw-pr-cvs1:/tmp/cvs-serv23687
Modified Files:
include.php
Log Message:
Cleanup
Index: include.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/include.php,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- include.php 3 Apr 2002 18:45:50 -0000 1.107
+++ include.php 3 Apr 2002 18:54:08 -0000 1.108
@@ -173,7 +173,7 @@
}
-if ($u) {
+if (!empty($u)) {
list($owner_open, $owner_closed) =
$db->getRow(sprintf($QUERY['include-template-owner'], $u),
DB_FETCHMODE_ORDERED);
|
2 messages has been excluded from this view by a project administrator.
