You can subscribe to this list here.
2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(43) |
Sep
(33) |
Oct
(65) |
Nov
(61) |
Dec
(9) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2003 |
Jan
(249) |
Feb
(144) |
Mar
(5) |
Apr
(72) |
May
(329) |
Jun
(211) |
Jul
(153) |
Aug
(388) |
Sep
(288) |
Oct
(338) |
Nov
(139) |
Dec
(75) |
2004 |
Jan
(155) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <th...@us...> - 2004-01-21 21:35:12
|
Update of /cvsroot/wqdata/wqdata4/STATUS/xplanner In directory sc8-pr-cvs1:/tmp/cvs-serv27534 Removed Files: xplanner.zip Log Message: + Add files to backup database using mysqldump utility. --- xplanner.zip DELETED --- |
From: <th...@us...> - 2004-01-21 15:35:43
|
Update of /cvsroot/wqdata/wqdata4/apps/cpu/src/webtest In directory sc8-pr-cvs1:/tmp/cvs-serv3243/apps/cpu/src/webtest Modified Files: presentation.xml Log Message: + Complete webtest through Add Permit Index: presentation.xml =================================================================== RCS file: /cvsroot/wqdata/wqdata4/apps/cpu/src/webtest/presentation.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** presentation.xml 20 Jan 2004 18:14:49 -0000 1.3 --- presentation.xml 21 Jan 2004 15:35:38 -0000 1.4 *************** *** 8,14 **** <!ENTITY do-submit SYSTEM "entities/do-submit.xml"> <!ENTITY do-save SYSTEM "entities/do-save.xml"> ]> ! <project name="CPU storyboard - Canoo WebTests" basedir="." default="main"> <!-- /** --- 8,19 ---- <!ENTITY do-submit SYSTEM "entities/do-submit.xml"> <!ENTITY do-save SYSTEM "entities/do-save.xml"> + <!ENTITY is-main SYSTEM "entities/is-main.xml"> + <!ENTITY do-go SYSTEM "entities/do-submit.xml"> + <!ENTITY is-detail-main SYSTEM "entities/is-detail-main.xml"> + <!ENTITY do-again SYSTEM "entities/do-submit.xml"> + <!ENTITY go-main SYSTEM "entities/go-main.xml"> ]> ! <project name="CPU presentation - Canoo WebTests" basedir="." default="main"> <!-- /** *************** *** 21,25 **** location="/opt/Canoo/build_379" /> ! <property name="title" value=" - WQD - OK DEQ"/> <property name="data.path" value="/projects/SourceForge/wqdata/wqdata4" /> --- 26,30 ---- location="/opt/Canoo/build_379" /> ! <property name="title" value="CPU - Nexus - OK DEQ"/> <property name="data.path" value="/projects/SourceForge/wqdata/wqdata4" /> *************** *** 31,69 **** </target> ! <target name="main" depends="database.cpu.clean"> ! ! <!-- welcome page :FIXME: Error 408 can't handle ! <testSpec name="welcome"> ! &config; ! <steps> ! <invoke ! stepid="Open welcome Page" ! url="index.html" /> ! &is-menu; ! </steps> ! </testSpec> ! --> ! ! <testSpec name="slides"> ! &config; ! <steps> ! <!-- ! WebTest / Presentation outline ! + Open http://localhost/cpu/Welcome.do (or http://localhost:8080/wqdata-cpu/Welcome.do) ! + Displays "Page 1 of 2 - Search Issued Permits - CPU - Nexus - OK DEQ" page ! - ! + Enter permit ID < LA000051020010 > - + Press [GO] ("Submit") ! + Displays "Permit Detail - Main Area - CPU - Nexus - OK DEQ" page ("Date Issued: Pending") - + Press [SEARCH AGAIN] ("Submit") + Displays "Page 1 of 2 - Search Issued Permits - CPU - Nexus - OK DEQ" page --- 36,101 ---- </target> ! <!-- welcome page :FIXME: Error 408 can't handle ! <testSpec name="welcome"> ! &config; ! <steps> ! <invoke ! stepid="Open welcome Page" ! url="index.html" /> ! &is-menu; ! </steps> ! </testSpec> ! <testSpec name="welcome"> ! &config; ! <steps> ! </steps> ! </testSpec> ! --> ! <target name="main" depends="database.cpu.clean"> ! <testSpec name="welcome"> ! &config; ! <steps> ! &go-main; ! &is-main; ! </steps> ! </testSpec> ! <testSpec name="permitId"> ! &config; ! <steps> ! &go-main; ! <setinputfield ! stepid="Permit ID" ! name="code" ! value="LA000051020010" /> ! <clickbutton ! stepid="Submit" ! name="Submit" /> ! </steps> ! </testSpec> ! <testSpec name="permitId"> ! &config; ! <steps> ! &go-main; ! <setinputfield ! stepid="Permit ID" ! name="code" ! value="LA000051020010" /> ! <clickbutton ! stepid="GO" ! name="Submit"/> ! &is-detail-main; ! </steps> ! </testSpec> ! </target> ! <!-- + Displays "Page 1 of 2 - Search Issued Permits - CPU - Nexus - OK DEQ" page *************** *** 177,183 **** --> - </steps> - </testSpec> - </target> - </project> --- 209,211 ---- |
From: <th...@us...> - 2004-01-21 15:35:43
|
Update of /cvsroot/wqdata/wqdata4/apps/cpu/src/webtest/entities In directory sc8-pr-cvs1:/tmp/cvs-serv3243/apps/cpu/src/webtest/entities Modified Files: go-main.xml is-main.xml Log Message: + Complete webtest through Add Permit Index: go-main.xml =================================================================== RCS file: /cvsroot/wqdata/wqdata4/apps/cpu/src/webtest/entities/go-main.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** go-main.xml 14 Jan 2004 15:43:59 -0000 1.1 --- go-main.xml 21 Jan 2004 15:35:38 -0000 1.2 *************** *** 1,4 **** ! <clicklink ! stepid="Return" ! label="Main Menu" /> ! --- 1,3 ---- ! <invoke ! stepid="Open welcome Page" ! url="/Welcome.do" /> Index: is-main.xml =================================================================== RCS file: /cvsroot/wqdata/wqdata4/apps/cpu/src/webtest/entities/is-main.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** is-main.xml 14 Jan 2004 15:43:59 -0000 1.1 --- is-main.xml 21 Jan 2004 15:35:38 -0000 1.2 *************** *** 1,4 **** <verifytitle stepid="Main page title" ! text="Search Issued Permits - ${title}" /> --- 1,4 ---- <verifytitle stepid="Main page title" ! text="Page 1 of 2 - Search Issued Permits - ${title}" /> |
From: <th...@us...> - 2004-01-21 14:59:55
|
Update of /cvsroot/wqdata/wqdata4/STATUS/xplanner In directory sc8-pr-cvs1:/tmp/cvs-serv27262 Added Files: xplanner_dump.sql xplanner-dump.bat Log Message: + Add files to backup database using mysqldump utility. --- NEW FILE: xplanner_dump.sql --- -- MySQL dump 9.10 -- -- Host: localhost Database: xplanner -- ------------------------------------------------------ -- Server version 4.0.17-nt -- -- Table structure for table `identifier` -- CREATE TABLE identifier ( next int(5) NOT NULL default '1' ) TYPE=MyISAM; -- -- Dumping data for table `identifier` -- INSERT INTO identifier VALUES (53); -- -- Table structure for table `integration` -- CREATE TABLE integration ( id int(5) NOT NULL default '0', state char(1) default NULL, person_id int(5) default NULL, when_started timestamp(14) NOT NULL, when_requested timestamp(14) NOT NULL, when_complete timestamp(14) NOT NULL, comments varchar(255) default NULL, last_update timestamp(14) NOT NULL, PRIMARY KEY (id), KEY integration_state (state) ) TYPE=MyISAM; -- -- Dumping data for table `integration` -- -- -- Table structure for table `iteration` -- CREATE TABLE iteration ( id int(5) NOT NULL default '0', project_id int(5) NOT NULL default '0', name varchar(128) NOT NULL default '', description longtext, start_date date default '0000-00-00', end_date date default '0000-00-00', last_update datetime NOT NULL default '0000-00-00 00:00:00', PRIMARY KEY (id), KEY project_id (project_id) ) TYPE=MyISAM; -- -- Dumping data for table `iteration` -- INSERT INTO iteration VALUES (7,3,'[017] \"That\'s wizard, Harry!\"','','2003-12-31','2004-01-20','2004-01-07 16:11:40'); INSERT INTO iteration VALUES (12,3,'[000] \"Too busy driving to get gas.\"','A \"meta\" project management iteration to track internal management stories and tasks undertaken over the life of the project. ','2002-08-19','2004-08-18','2004-01-07 16:02:24'); INSERT INTO iteration VALUES (23,3,'[018] \"Details, details ...\"','[222] Administrative detail\r\n[225] Generate fill-in data for word processing templates\r\n[224] Access to legacy permits\r\n[206] Print permit information (legacy)\r\n[211] Print permit (legacy)','2004-01-21','2004-02-25','2004-01-07 18:41:49'); INSERT INTO iteration VALUES (46,3,'[007] \"Elementary, my dear Data\"','[111] Implement data access using Object Relational Mapping. \r\n[111.1] Implement datea access via DAO strategy.\r\n\r\n','2003-02-20','2004-05-09','2004-01-14 11:50:15'); -- -- Table structure for table `note` -- CREATE TABLE note ( id int(5) NOT NULL default '0', attachedto_id int(5) NOT NULL default '0', subject varchar(128) NOT NULL default '', body longtext NOT NULL, author_id int(5) NOT NULL default '0', file blob, filename varchar(128) default NULL, file_size int(8) default '0', content_type varchar(128) default NULL, submission_time datetime NOT NULL default '0000-00-00 00:00:00', last_update datetime NOT NULL default '0000-00-00 00:00:00', PRIMARY KEY (id) ) TYPE=MyISAM; -- -- Dumping data for table `note` -- -- -- Table structure for table `person` -- CREATE TABLE person ( id int(5) NOT NULL default '0', name varchar(128) NOT NULL default '', initials char(3) NOT NULL default '', email varchar(128) default '', phone varchar(128) default '', userid varchar(32) NOT NULL default '', is_hidden int(1) NOT NULL default '0', last_update datetime NOT NULL default '0000-00-00 00:00:00', password varchar(255) default NULL, PRIMARY KEY (id) ) TYPE=MyISAM; -- -- Dumping data for table `person` -- INSERT INTO person VALUES (0,'admin','ADM',NULL,NULL,'admin',0,'2003-10-03 16:12:05','1tGWp1Bdm02Sw4bD7/o0N2ao405Tf8kjxGBW/A=='); INSERT INTO person VALUES (4,'Ted Husted','th','te...@hu...','585 425-3463','thusted',0,'2003-10-03 16:17:02','BmN7iBgxcCeFssOsMMFL7M9qtIgU1wIMKFPQ7g=='); -- -- Table structure for table `personrole` -- CREATE TABLE personrole ( id int(5) NOT NULL default '0', person_id int(5) NOT NULL default '0', role varchar(16) NOT NULL default '', PRIMARY KEY (id) ) TYPE=MyISAM; -- -- Dumping data for table `personrole` -- INSERT INTO personrole VALUES (1,0,'editor'); INSERT INTO personrole VALUES (2,0,'admin'); INSERT INTO personrole VALUES (5,4,'admin'); INSERT INTO personrole VALUES (6,4,'editor'); -- -- Table structure for table `project` -- CREATE TABLE project ( id int(5) NOT NULL default '0', name varchar(64) NOT NULL default '', description longtext, last_update datetime NOT NULL default '0000-00-00 00:00:00', is_hidden int(1) NOT NULL default '0', PRIMARY KEY (id) ) TYPE=MyISAM; -- -- Dumping data for table `project` -- INSERT INTO project VALUES (3,'ok Water Quality Data','Develop tracking and reporting system for the processing, monitoring, and enforcement of permits issued by the Oklahoma State Department of Environmental Quality. System is to include a CDX gateway for the EPA and an automatic document assembly system to create and retain original permits in Word format. System is to be available as a web-based application to internal staff. Some portions may be available to the\r\npublic via the Internet at a later date.\r\n','2004-01-07 15:38:34',0); -- -- Table structure for table `story` -- CREATE TABLE story ( id int(5) NOT NULL default '0', name varchar(128) NOT NULL default '', description longtext, priority smallint(6) NOT NULL default '1', estimated_hours double NOT NULL default '0', tracker_id int(5) default '0', customer_id int(5) NOT NULL default '0', iteration_id int(5) NOT NULL default '0', last_update datetime NOT NULL default '0000-00-00 00:00:00', PRIMARY KEY (id) ) TYPE=MyISAM; -- -- Dumping data for table `story` -- INSERT INTO story VALUES (8,'[223] Multipage \"wizards\"','Some permit appplication types (\"plans\") require entry of several fields, or may require custom fields. Some facilities may also need to be added as part of creating a permit. Multipage \"wizard\" forms can be used to step through the creation of permit, requiring different fields for different plans. The wizard format can also be used to predetermine selection lists or screens, such as displaying the list of facilities appropriate to a given county and media type.\r\n',4,10,0,0,7,'2004-01-07 15:19:46'); INSERT INTO story VALUES (9,'[219] Manage Facility detail','Manage Facility detail, including owner and consulting engineer',4,10,0,0,7,'2004-01-07 15:22:05'); INSERT INTO story VALUES (10,'[230.1] Legacy data CPU','Legacy data CPU',4,10,0,0,7,'2004-01-07 15:22:49'); INSERT INTO story VALUES (47,'[111.1] Implement data access via DAO strategy','',4,10,0,0,46,'2004-01-14 11:42:55'); INSERT INTO story VALUES (15,'[098.2] Modules','Create new CVS modules when starting a new phase of development. A \"clean start\" avoids wasting time with managing obsolete code.',4,0,0,0,12,'2004-01-07 15:45:17'); INSERT INTO story VALUES (13,'[098] Source code management','Maintain program source code in a clear, consistent format\r\n\r\nThe program source code for this project will be maintained over time and may need to be accessed or reviewed by other personnel. Java source code can be formatted differently by different developers. It is essential that the source code be maintained in a clear consistent format that can be understood by any qualified practitioner. The use of an source code formatting tool to enforce this requirement is recommended.',4,10,0,0,12,'2004-01-07 15:35:51'); INSERT INTO story VALUES (14,'[098.3] Maven','The Maven Project Management system uses a standard environment designed to be shared between projects. By migrating to Maven, it will be easier to maintain the source code, and it\'s dependencies, over time. ',4,10,0,0,12,'2004-01-07 15:43:32'); INSERT INTO story VALUES (22,'[230.4] Sample data Legacy CPU','Sample data for the legacy \"CPU\" database',4,10,0,0,7,'2004-01-07 16:01:14'); INSERT INTO story VALUES (27,'[100] Manage project w/ stories and iterations','Manage project in terms of stories and iterations\r\n\r\nThere are several popular methodologies for managing a software project. One of the simplest and most effective is to frame the project in terms of \"stories\" and \"iterations\". Stories describes what the application needs to do. Iterations prioritize the order in which stories are implemented when. This methodology, along with other Extreme Programming\r\npractices, will be used to manage the wqdata project.\r\n',4,10,0,0,12,'2004-01-07 18:28:00'); -- -- Table structure for table `task` -- CREATE TABLE task ( id int(5) NOT NULL default '0', name varchar(128) NOT NULL default '', type varchar(32) NOT NULL default '', disposition varchar(16) NOT NULL default 'Planned', description longtext, acceptor_id int(5) NOT NULL default '0', pair_id int(5) NOT NULL default '0', original_estimate double NOT NULL default '0', estimated_hours double NOT NULL default '0', created_date date default '0000-00-00', story_id int(5) NOT NULL default '0', is_complete int(1) NOT NULL default '0', last_update datetime NOT NULL default '0000-00-00 00:00:00', PRIMARY KEY (id) ) TYPE=MyISAM; -- -- Dumping data for table `task` -- INSERT INTO task VALUES (16,'[098.2.4] wqdata4','Feature','Planned','Create wqdata4 module to begin a new phase of work on the main CPU application and to migrate to Maven [098.3].',0,0,10,11,'2004-01-07',15,1,'2004-01-07 18:53:10'); INSERT INTO task VALUES (28,'[100.3] Migrate to XPlanner','Feature','Planned','XPlanner is a database application designed to track stories in terms of iterations, stories, and tasks. By migrating to XPlanner, we can spend less time on tracking and generate more accurate reports.',0,0,10,10,'2004-01-07',27,1,'2004-01-07 18:40:26'); INSERT INTO task VALUES (40,'[223.1]','Feature','Planned','Develop / select workflow utility.',0,0,10,10,'2004-01-14',8,0,'2004-01-14 11:24:57'); INSERT INTO task VALUES (29,'[100.3.1] Setup XPlanner','Feature','Planned','Initial setup of application prior to data-entry.',0,0,1,1.5,'2004-01-07',27,1,'2004-01-07 18:41:01'); INSERT INTO task VALUES (30,'[100.3.2] XPlanner data-entry','Feature','Planned','Create and update iterations, stories, tasks, and enter timesheets.',0,0,10,2,'2004-01-07',27,1,'2004-01-07 18:58:42'); INSERT INTO task VALUES (33,'[098.3.1] POM and friends','Feature','Planned','Setup project.xml, build.properties, and Ant console to run Maven goals. ',0,0,2.5,10,'2004-01-07',14,1,'2004-01-14 11:31:30'); INSERT INTO task VALUES (37,'[100.2] Weekly status report','Feature','Planned','',0,0,50,50,'2004-01-07',27,0,'2004-01-07 18:55:55'); INSERT INTO task VALUES (44,'[100.1] Develop stories and tasks','Feature','Planned','',0,0,10,10,'2004-01-07',27,0,'2004-01-14 11:33:27'); INSERT INTO task VALUES (48,'[111.1.1] Setup Commons Chain','Feature','Planned','',4,0,10,10,'2004-01-07',47,0,'2004-01-14 11:43:35'); INSERT INTO task VALUES (49,'[111.1.2] Setup CommandAction','Feature','Planned','',4,0,10,10,'2004-01-07',47,0,'2004-01-14 11:43:56'); -- -- Table structure for table `time_entry` -- CREATE TABLE time_entry ( id int(5) NOT NULL default '0', task_id int(5) NOT NULL default '0', start_time datetime default '0000-00-00 00:00:00', end_time datetime default '0000-00-00 00:00:00', duration double NOT NULL default '0', person1_id int(5) NOT NULL default '0', person2_id int(5) NOT NULL default '0', last_update datetime NOT NULL default '0000-00-00 00:00:00', report_date datetime default '0000-00-00 00:00:00', PRIMARY KEY (id) ) TYPE=MyISAM; -- -- Dumping data for table `time_entry` -- INSERT INTO time_entry VALUES (24,16,NULL,NULL,1,4,0,'2004-01-07 18:54:25','2003-12-31 00:00:00'); INSERT INTO time_entry VALUES (25,16,NULL,NULL,2.5,4,0,'2004-01-07 18:23:50','2004-01-06 00:00:00'); INSERT INTO time_entry VALUES (26,16,NULL,NULL,1,4,0,'2004-01-07 18:24:49','2004-01-07 00:00:00'); INSERT INTO time_entry VALUES (31,29,NULL,NULL,1.5,4,0,'2004-01-07 18:32:31','2004-01-07 00:00:00'); INSERT INTO time_entry VALUES (32,30,NULL,NULL,2,4,0,'2004-01-07 18:58:40','2004-01-07 00:00:00'); INSERT INTO time_entry VALUES (34,33,NULL,NULL,5,4,0,'2004-01-07 18:36:52','2004-01-05 00:00:00'); INSERT INTO time_entry VALUES (35,33,NULL,NULL,2.5,4,0,'2004-01-07 18:36:52','2004-01-06 00:00:00'); INSERT INTO time_entry VALUES (36,16,NULL,NULL,5,4,0,'2004-01-07 18:53:06','2004-01-02 00:00:00'); INSERT INTO time_entry VALUES (38,37,NULL,NULL,1.5,4,0,'2004-01-07 18:55:49','2003-12-31 00:00:00'); INSERT INTO time_entry VALUES (39,37,NULL,NULL,0.5,4,0,'2004-01-07 18:58:17','2004-01-07 00:00:00'); INSERT INTO time_entry VALUES (43,33,NULL,NULL,1.5,4,0,'2004-01-14 11:47:29','2004-01-08 00:00:00'); INSERT INTO time_entry VALUES (45,44,NULL,NULL,1,4,0,'2004-01-14 11:33:51','2004-01-08 00:00:00'); INSERT INTO time_entry VALUES (50,48,NULL,NULL,2.5,4,0,'2004-01-14 11:49:38','2004-01-09 00:00:00'); INSERT INTO time_entry VALUES (51,49,NULL,NULL,2.5,4,0,'2004-01-14 11:51:19','2004-01-12 00:00:00'); INSERT INTO time_entry VALUES (52,40,NULL,NULL,2.5,4,0,'2004-01-14 11:57:08','2004-01-13 00:00:00'); --- NEW FILE: xplanner-dump.bat --- c:\mysql\bin\mysqldump xplanner >\projects\SourceForge\wqdata\wqdata4\STATUS\xplanner\xplanner_dump.sql |
From: <th...@us...> - 2004-01-20 21:34:51
|
Update of /cvsroot/wqdata/wqdata4/apps/cpu/src/webapp/pages/menu In directory sc8-pr-cvs1:/tmp/cvs-serv7753/apps/cpu/src/webapp/pages/menu Modified Files: unit.vm Log Message: + Adjustments to menus and actions to honor security constraints. Index: unit.vm =================================================================== RCS file: /cvsroot/wqdata/wqdata4/apps/cpu/src/webapp/pages/menu/unit.vm,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** unit.vm 20 Jan 2004 21:23:10 -0000 1.2 --- unit.vm 20 Jan 2004 21:34:48 -0000 1.3 *************** *** 22,26 **** <a href="${link.setAction("/unit/Add")}">Add New Permit</a> #else ! <font class="">Add New Permit</font> #end <br /><font class="note">Available to the unit secretary only.</font> --- 22,26 ---- <a href="${link.setAction("/unit/Add")}">Add New Permit</a> #else ! Add New Permit #end <br /><font class="note">Available to the unit secretary only.</font> *************** *** 29,36 **** #if("User"==$vmChoice) Print My Tracking List #else ! <a href="${link.setAction("/unit/User")}">Print My Tracking List</a> #end - <br /><font class="note">This list will contain only those permits assigned to ${user}</font> </li> <li> --- 29,38 ---- #if("User"==$vmChoice) Print My Tracking List + #elseif($request.isUserInRole("cpu.engineer")) + <a href="${link.setAction("/unit/User")}">Print My Tracking List</a><br /> + <font class="note">CPU applications assigned to ${user} only (if any)</font> #else ! Print My Tracking List #end </li> <li> *************** *** 40,47 **** <a href="${link.setAction("/unit/Track")}">Print Construction Permit Tracking List</a> #end ! <br /><font class="note">List contains all construction permits pending in house</font> </li> <li> ! <a href="${link.setAction("/Main")}">Main Menu</a> </li> </ul> --- 42,49 ---- <a href="${link.setAction("/unit/Track")}">Print Construction Permit Tracking List</a> #end ! <br /><font class="note">List of all CPU application pending in house for all engineers</font> </li> <li> ! <a href="${link.setAction("/Main")}">Main Menu</a> </li> </ul> |
From: <th...@us...> - 2004-01-20 21:23:13
|
Update of /cvsroot/wqdata/wqdata4/repo2/wqdata/jars In directory sc8-pr-cvs1:/tmp/cvs-serv5288/repo2/wqdata/jars Modified Files: wqdata-core-0.9.1.jar Log Message: + Adjustments to menus and actions to honor security constraints. Index: wqdata-core-0.9.1.jar =================================================================== RCS file: /cvsroot/wqdata/wqdata4/repo2/wqdata/jars/wqdata-core-0.9.1.jar,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 Binary files /tmp/cvsGJNbP4 and /tmp/cvsWoUsg3 differ |
From: <th...@us...> - 2004-01-20 21:23:13
|
Update of /cvsroot/wqdata/wqdata4/apps/webapp/jetty In directory sc8-pr-cvs1:/tmp/cvs-serv5288/apps/webapp/jetty Modified Files: jettyRealm.properties Log Message: + Adjustments to menus and actions to honor security constraints. Index: jettyRealm.properties =================================================================== RCS file: /cvsroot/wqdata/wqdata4/apps/webapp/jetty/jettyRealm.properties,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** jettyRealm.properties 20 Jan 2004 14:24:28 -0000 1.2 --- jettyRealm.properties 20 Jan 2004 21:23:10 -0000 1.3 *************** *** 12,17 **** patrick.rosch:******,staff,cpu,cpu.engineer sara.orwig:******,staff,cpu,cpu.engineer ! steven.wright:******,staff,cpu,cpu.engineer ! steve.webb:******,staff,cpu,cpu.engineer tomcat.admin:******,admin,manager,tomcat rance.shields:******,staff,cpu,cpu.engineer,cpu.admin --- 12,17 ---- patrick.rosch:******,staff,cpu,cpu.engineer sara.orwig:******,staff,cpu,cpu.engineer ! steven.wright:******,staff,cpu,cpu.engineer,cpu.admin ! steve.webb:******,staff,cpu,cpu.engineer,cpu.admin tomcat.admin:******,admin,manager,tomcat rance.shields:******,staff,cpu,cpu.engineer,cpu.admin *************** *** 19,20 **** --- 19,22 ---- rocky.chen:******,staff,cpu,cpu.engineer,cpu.admin cpu.admin:******,staff,system,system.admin + cpu.clerk:******,staff,cpu,cpu.clerk + cpu.manager:******,staff,cpu,cpu.manager |
From: <th...@us...> - 2004-01-20 21:23:13
|
Update of /cvsroot/wqdata/wqdata4/apps/cpu/src/webapp/pages/menu In directory sc8-pr-cvs1:/tmp/cvs-serv5288/apps/cpu/src/webapp/pages/menu Modified Files: staff.vm unit.vm Log Message: + Adjustments to menus and actions to honor security constraints. Index: staff.vm =================================================================== RCS file: /cvsroot/wqdata/wqdata4/apps/cpu/src/webapp/pages/menu/staff.vm,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** staff.vm 7 Jan 2004 13:26:46 -0000 1.1.1.1 --- staff.vm 20 Jan 2004 21:23:10 -0000 1.2 *************** *** 10,14 **** <ul> <li> ! Search in-house and issued permits. </li> <li> --- 10,14 ---- <ul> <li> ! Search in-house and issued permits </li> <li> Index: unit.vm =================================================================== RCS file: /cvsroot/wqdata/wqdata4/apps/cpu/src/webapp/pages/menu/unit.vm,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** unit.vm 7 Jan 2004 13:26:46 -0000 1.1.1.1 --- unit.vm 20 Jan 2004 21:23:10 -0000 1.2 *************** *** 9,46 **** </p> <ul> - ## :TODO: if $portal.isUserInRole("secretary,engineer,supervisor) (link) <li> ! #if("Main"==$vmChoice) ! Search Construction Permits<br /> #else <a href="${link.setAction("/unit/Main")}">Search Construction Permits</a><br /> #end - <font class="note">(Available to Unit Secretary, Engineers, and Supervisors.)</font> </li> <li> #if("Edit"==$vmChoice) ! Add New Permit<br /> #else ! <a href="${link.setAction("/unit/Add")}">Add New Permit</a><br /> #end ! <font class="note">(Available to Unit Secretary.)</font> </li> <li> #if("User"==$vmChoice) ! Print My Tracking List<br /> #else ! <a href="${link.setAction("/unit/User")}">Print My Tracking List</a><br /> #end ! <font class="note">This list will contain only those permits assigned to ${user}</font> ! <font class="note">(Available to Unit Secretary, Engineers, and Supervisors.)</font><br /> </li> <li> #if("Track"==$vmChoice) ! Print Construction Permit Tracking List<br /> #else ! <a href="${link.setAction("/unit/Track")}">Print Construction Permit Tracking List</a><br /> #end ! <font class="note">List contains all construction permits in house</font> ! <font class="note">(Available to Unit Secretary, Engineers, and Supervisors.)</font><br /> </li> <li> --- 9,44 ---- </p> <ul> <li> ! #if("Search"==$vmChoice) ! Search in-house and issued permits #else <a href="${link.setAction("/unit/Main")}">Search Construction Permits</a><br /> #end </li> <li> #if("Edit"==$vmChoice) ! Add New Permit ! #elseif($request.isUserInRole("cpu.clerk")) ! <a href="${link.setAction("/unit/Add")}">Add New Permit</a> #else ! <font class="">Add New Permit</font> #end ! <br /><font class="note">Available to the unit secretary only.</font> </li> <li> #if("User"==$vmChoice) ! Print My Tracking List #else ! <a href="${link.setAction("/unit/User")}">Print My Tracking List</a> #end ! <br /><font class="note">This list will contain only those permits assigned to ${user}</font> </li> <li> #if("Track"==$vmChoice) ! Print Construction Permit Tracking List #else ! <a href="${link.setAction("/unit/Track")}">Print Construction Permit Tracking List</a> #end ! <br /><font class="note">List contains all construction permits pending in house</font> </li> <li> |
From: <th...@us...> - 2004-01-20 21:23:13
|
Update of /cvsroot/wqdata/wqdata4/apps/cpu/src/webapp/pages/assets In directory sc8-pr-cvs1:/tmp/cvs-serv5288/apps/cpu/src/webapp/pages/assets Modified Files: base.css Log Message: + Adjustments to menus and actions to honor security constraints. Index: base.css =================================================================== RCS file: /cvsroot/wqdata/wqdata4/apps/cpu/src/webapp/pages/assets/base.css,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** base.css 7 Jan 2004 13:26:42 -0000 1.1.1.1 --- base.css 20 Jan 2004 21:23:10 -0000 1.2 *************** *** 28,31 **** --- 28,42 ---- + font.menuHint { + font-size:80%; + font-family:Verdana,Arial,Helvetica,sans-serif; + font-weight:normal; + } + + font.dimmed { + color:#CCCCCC; + } + + table.outer { background-color:#CCCC99; *************** *** 61,71 **** } - font.menuHint { - font-size:80%; - font-family:Verdana,Arial,Helvetica,sans-serif; - font-weight:normal; - } - - td.content { background-color:#FFFFFF; --- 72,75 ---- |
From: <th...@us...> - 2004-01-20 21:23:13
|
Update of /cvsroot/wqdata/wqdata4/apps/cpu/src/webapp/WEB-INF In directory sc8-pr-cvs1:/tmp/cvs-serv5288/apps/cpu/src/webapp/WEB-INF Modified Files: struts-config-wizard.xml Log Message: + Adjustments to menus and actions to honor security constraints. Index: struts-config-wizard.xml =================================================================== RCS file: /cvsroot/wqdata/wqdata4/apps/cpu/src/webapp/WEB-INF/struts-config-wizard.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** struts-config-wizard.xml 20 Jan 2004 17:54:52 -0000 1.10 --- struts-config-wizard.xml 20 Jan 2004 21:23:10 -0000 1.11 *************** *** 112,116 **** name="permit_search" validate="false" ! parameter="2,vmAction"> <forward name="0,step" path="/unit/permit/Main.do" /> <forward name="1,step" path="/vm/unit/permit/Search.do" /> --- 112,116 ---- name="permit_search" validate="false" ! parameter="2,vmAction" > <forward name="0,step" path="/unit/permit/Main.do" /> <forward name="1,step" path="/vm/unit/permit/Search.do" /> *************** *** 135,139 **** name="permit_store_wizard" validate="false" ! parameter="vmTitle,vmChoice,vmMenu,vmBody,vmFormOpen,vmFormClose,vmButtonBar"> <!-- :FIXME: There should be a way to use runtime ${variables} --> <forward name="vmTitle" path="Store Permit" /> --- 135,140 ---- name="permit_store_wizard" validate="false" ! parameter="vmTitle,vmChoice,vmMenu,vmBody,vmFormOpen,vmFormClose,vmButtonBar" ! roles="cpu.admin,cpu.clerk"> <!-- :FIXME: There should be a way to use runtime ${variables} --> <forward name="vmTitle" path="Store Permit" /> |
From: <th...@us...> - 2004-01-20 18:14:52
|
Update of /cvsroot/wqdata/wqdata4/apps/cpu/src/webtest In directory sc8-pr-cvs1:/tmp/cvs-serv25250/apps/cpu/src/webtest Modified Files: presentation.xml Log Message: + Adjustments for presentation testing. Index: presentation.xml =================================================================== RCS file: /cvsroot/wqdata/wqdata4/apps/cpu/src/webtest/presentation.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** presentation.xml 20 Jan 2004 17:54:52 -0000 1.2 --- presentation.xml 20 Jan 2004 18:14:49 -0000 1.3 *************** *** 98,110 **** + Press [NEXT] ("next") + Displays "Page 2 of 2 - Search Issued Permits - CPU - Nexus - OK DEQ" page + Click link "Maud Wastewater Treatment Plant" ! + Displays "Search Result - Issued and Pending Permits - CPU - Nexus - OK DEQ" page (2 of 2) ! + Click link "LA000046020008 " ! + Displays page "Permit Detail" - (Date Issued: Sep 1, 2002) + Press [SEARCH AGAIN] ("Submit") --- 98,111 ---- + Press [NEXT] ("next") + + Displays "Page 2 of 2 - Search Issued Permits - CPU - Nexus - OK DEQ" page + Click link "Maud Wastewater Treatment Plant" ! + Displays "Matched 2 - Search Result - Issued and Pending Permits - CPU - Nexus - OK DEQ" page ! + Click link "LA000046020008" ! + Displays page "Permit Detail - Unit Area" - (Date Issued: Sep 1, 2002) + Press [SEARCH AGAIN] ("Submit") *************** *** 116,152 **** + Click link "Staff Menu" ! + Enter User Name: < staff.person > + Press [NEXT] ("next") ! + Displays "Search Issued Permits and Pending Applications - - WQD - OK DEQ" + Press [SUBMIT] ("submit") ! + Displays "Permit Search Result (Staff) - WQD - OK DEQ" + Click link "LA00002020002" + Click [SEARCH AGAIN] ("Submit") + Select permitEngineercode "rocky.chen" ! + Displays "Permit Search Result (Staff) - WQD - OK DEQ" - ! + Select raMonth ("1"), raYear "2002" + Press [NEXT] ("next") ! + Displays "Search Issued Permits and Pending Applications - - WQD - OK DEQ" + Press [SUBMIT] ("submit") ! + Displays "Permit Search Result (Staff) - WQD - OK DEQ" (1 of 1) + Press [Reset Criteria] ! + Search All Permits (Staff) - "Search pending and issued - Staff Menu - Nexus - OK DEQ" - --- 117,171 ---- + Click link "Staff Menu" ! + Enter User Name: < staff.person > Password: ****** + Press [NEXT] ("next") ! + Displays "Page 2 of 2 - Search Issued and Pending Permits - CPU - Nexus - OK DEQ" page + Press [SUBMIT] ("submit") ! + Displays "Matched 10 - Search Result - Issued and Pending Permits - CPU - Nexus - OK DEQ" page + Click link "LA00002020002" + + Displays "Permit Detail - Staff Area - CPU - Nexus - OK DEQ" page + + Click [SEARCH AGAIN] ("Submit") + + Displays "Page 1 of 2 - Search Issued and Pending Permits - CPU - Nexus - OK DEQ" page + + - + + Select permitEngineercode "rocky.chen" ! + Press [NEXT] ("next") ! ! + Displays "Page 2 of 2 - Search Issued and Pending Permits - CPU - Nexus - OK DEQ" ! ! + Press [SUBMIT] ("submit") ! ! + Displays "Matched 3 - Search Result - Issued and Pending Permits - CPU - Nexus - OK DEQ" page - ! + Select raMonth ("1") , raYear "2002" + Press [NEXT] ("next") ! + Displays "Page 2 of 2 - Search Issued and Pending Permits - CPU - Nexus - OK DEQ" + Press [SUBMIT] ("submit") ! + Displays "Matched 2 - Search Result - Issued and Pending Permits - CPU - Nexus - OK DEQ" page + Press [Reset Criteria] ! + Page 1 of 2 - Search Issued and Pending Permits - CPU - Nexus - OK DEQ ! ! + Displays "Page 2 of 2 - Search Issued and Pending Permits - CPU - Nexus - OK DEQ" ! ! + Press [SUBMIT] ("submit") ! ! + Displays "Matched 10 - Search Result - Issued and Pending Permits - CPU - Nexus - OK DEQ" page - *************** *** 154,158 **** + Click link "Main Menu" ! + Display "Search Issued Permits" --> --- 173,177 ---- + Click link "Main Menu" ! + Display "Page 1 of 2 - Search Issued Permits - CPU - Nexus - OK DEQ" page" --> |
From: <th...@us...> - 2004-01-20 18:14:52
|
Update of /cvsroot/wqdata/wqdata4/apps/cpu/src/webapp/pages In directory sc8-pr-cvs1:/tmp/cvs-serv25250/apps/cpu/src/webapp/pages Modified Files: Printer.vm Log Message: + Adjustments for presentation testing. Index: Printer.vm =================================================================== RCS file: /cvsroot/wqdata/wqdata4/apps/cpu/src/webapp/pages/Printer.vm,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Printer.vm 7 Jan 2004 13:26:41 -0000 1.1.1.1 --- Printer.vm 20 Jan 2004 18:14:49 -0000 1.2 *************** *** 22,26 **** </style> <title> ! ${vmTitle} - WQD - OK DEQ </title> </head> --- 22,26 ---- </style> <title> ! ${vmTitle} - CPU - Nexus - OK DEQ </title> </head> *************** *** 32,36 **** <tr> <td colspan="2" class="subtitle"> ! <a href="${link.setAction("/Help")}"><img src="${link.setForward("logoImg")}" width="79" height="40" align="middle" border="0" alt="logo" /></a> Oklahoma Department of Environmental Quality · Water Quality Division </td> --- 32,36 ---- <tr> <td colspan="2" class="subtitle"> ! <a href="${link.setAction("/Main")}"><img src="${link.setForward("logoImg")}" width="79" height="40" align="middle" border="0" alt="logo" /></a> Oklahoma Department of Environmental Quality · Water Quality Division </td> |
From: <th...@us...> - 2004-01-20 17:54:56
|
Update of /cvsroot/wqdata/wqdata4/apps/cpu/src/webapp/pages/menu In directory sc8-pr-cvs1:/tmp/cvs-serv20301/apps/cpu/src/webapp/pages/menu Modified Files: main.vm Log Message: + Amend Layout to automatically insert page numbers when in a wizard. Index: main.vm =================================================================== RCS file: /cvsroot/wqdata/wqdata4/apps/cpu/src/webapp/pages/menu/main.vm,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** main.vm 20 Jan 2004 14:52:30 -0000 1.3 --- main.vm 20 Jan 2004 17:54:52 -0000 1.4 *************** *** 10,20 **** *# <p> ! Main Menu </p> <ul> <li> - Main Menu - </li> - <li> <a href="${link.setAction("/staff/Main")}">Staff Menu</a> </li> --- 10,17 ---- *# <p> ! Other Areas <br />(login required for access) </p> <ul> <li> <a href="${link.setAction("/staff/Main")}">Staff Menu</a> </li> *************** *** 22,25 **** --- 19,25 ---- <a href="${link.setAction("/unit/Main")}">Unit Staff Menu</a> </li> + <li> + Main Menu <br />(you are here) + </li> </ul> <hr /> |
From: <th...@us...> - 2004-01-20 17:54:56
|
Update of /cvsroot/wqdata/wqdata4/apps/cpu/src/webtest In directory sc8-pr-cvs1:/tmp/cvs-serv20301/apps/cpu/src/webtest Modified Files: presentation.xml Log Message: + Amend Layout to automatically insert page numbers when in a wizard. Index: presentation.xml =================================================================== RCS file: /cvsroot/wqdata/wqdata4/apps/cpu/src/webtest/presentation.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** presentation.xml 20 Jan 2004 12:47:08 -0000 1.1 --- presentation.xml 20 Jan 2004 17:54:52 -0000 1.2 *************** *** 53,59 **** WebTest / Presentation outline ! + Open http://localhost:8080/wqdata-cpu/Welcome.do ! + Displays "Search Issued Permits - - WQD - OK DEQ" page - --- 53,59 ---- WebTest / Presentation outline ! + Open http://localhost/cpu/Welcome.do (or http://localhost:8080/wqdata-cpu/Welcome.do) ! + Displays "Page 1 of 2 - Search Issued Permits - CPU - Nexus - OK DEQ" page - *************** *** 63,71 **** + Press [GO] ("Submit") ! + Displays "Permit Detail - WQD - OK DEQ" page ("Date Issued: Pending") + Press [SEARCH AGAIN] ("Submit") ! + Displays "Search Issued Permits - - WQD - OK DEQ" page - --- 63,71 ---- + Press [GO] ("Submit") ! + Displays "Permit Detail - Main Area - CPU - Nexus - OK DEQ" page ("Date Issued: Pending") + Press [SEARCH AGAIN] ("Submit") ! + Displays "Page 1 of 2 - Search Issued Permits - CPU - Nexus - OK DEQ" page - *************** *** 79,83 **** + Enter permit ID < LA > ("code") ! + Displays "Search Issued Permits - - WQD - OK DEQ" page ("Requested record not found") - --- 79,83 ---- + Enter permit ID < LA > ("code") ! + Displays same page ("Requested record not found") - *************** *** 85,91 **** + Select "Jan" ("ibMonth=01") ! + Select "31" (ibDay=31) ! + Displays "Search Issued Permits - - WQD - OK DEQ" page (First Date, County Code, Permit Code required") + Select "Jan" (iaMonth=01) --- 85,91 ---- + Select "Jan" ("ibMonth=01") ! + Select "29" (ibDay=29) (calendar control) ! + Displays same page (First Date, County Code, Permit Code required") + Select "Jan" (iaMonth=01) *************** *** 98,107 **** + Press [NEXT] ("next") ! ! + Displays "Search Issued Permits" -- Page 2 of 2 + Click link "Maud Wastewater Treatment Plant" ! + Displays page "Permit Search Result" + Click link "LA000046020008 " --- 98,106 ---- + Press [NEXT] ("next") ! + Displays "Page 2 of 2 - Search Issued Permits - CPU - Nexus - OK DEQ" page + Click link "Maud Wastewater Treatment Plant" ! + Displays "Search Result - Issued and Pending Permits - CPU - Nexus - OK DEQ" page (2 of 2) + Click link "LA000046020008 " |
From: <th...@us...> - 2004-01-20 17:54:55
|
Update of /cvsroot/wqdata/wqdata4/apps/cpu/src/webapp/WEB-INF In directory sc8-pr-cvs1:/tmp/cvs-serv20301/apps/cpu/src/webapp/WEB-INF Modified Files: struts-config-vm.xml struts-config-wizard.xml Log Message: + Amend Layout to automatically insert page numbers when in a wizard. Index: struts-config-vm.xml =================================================================== RCS file: /cvsroot/wqdata/wqdata4/apps/cpu/src/webapp/WEB-INF/struts-config-vm.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** struts-config-vm.xml 20 Jan 2004 16:43:34 -0000 1.7 --- struts-config-vm.xml 20 Jan 2004 17:54:52 -0000 1.8 *************** *** 67,71 **** <!-- **** --> <action path="/vm/staff/permit/Result" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_search" validate="false" parameter="vmTitle,vmMenu,vmBody,vmList,vmLinkAction,vmAction,vmReset,vmExtend"> ! <forward name="vmTitle" path="Search Result- Search Issued and Pending Permits" /> <forward name="vmMenu" path="/pages/menu/staff.vm" /> <forward name="vmBody" path="/pages/permit/result.vm" /> --- 67,71 ---- <!-- **** --> <action path="/vm/staff/permit/Result" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_search" validate="false" parameter="vmTitle,vmMenu,vmBody,vmList,vmLinkAction,vmAction,vmReset,vmExtend"> ! <forward name="vmTitle" path="Search Result - Issued and Pending Permits" /> <forward name="vmMenu" path="/pages/menu/staff.vm" /> <forward name="vmBody" path="/pages/permit/result.vm" /> Index: struts-config-wizard.xml =================================================================== RCS file: /cvsroot/wqdata/wqdata4/apps/cpu/src/webapp/WEB-INF/struts-config-wizard.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** struts-config-wizard.xml 20 Jan 2004 16:43:35 -0000 1.9 --- struts-config-wizard.xml 20 Jan 2004 17:54:52 -0000 1.10 *************** *** 68,72 **** </action> <action path="/vm/main/permit/Result" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_search_issued" validate="false" parameter="vmTitle,vmMenu,vmBody,vmList,vmLinkAction,vmAction,vmReset"> ! <forward name="vmTitle" path="Search Result- Search Issued Permits" /> <!-- vmMenu: default --> <forward name="vmBody" path="/pages/permit/result.vm" /> --- 68,72 ---- </action> <action path="/vm/main/permit/Result" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_search_issued" validate="false" parameter="vmTitle,vmMenu,vmBody,vmList,vmLinkAction,vmAction,vmReset"> ! <forward name="vmTitle" path="Search Result - Issued Permits" /> <!-- vmMenu: default --> <forward name="vmBody" path="/pages/permit/result.vm" /> |
From: <th...@us...> - 2004-01-20 17:54:55
|
Update of /cvsroot/wqdata/wqdata4/apps/cpu/src/webapp/pages In directory sc8-pr-cvs1:/tmp/cvs-serv20301/apps/cpu/src/webapp/pages Modified Files: Layout.vm Log Message: + Amend Layout to automatically insert page numbers when in a wizard. Index: Layout.vm =================================================================== RCS file: /cvsroot/wqdata/wqdata4/apps/cpu/src/webapp/pages/Layout.vm,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Layout.vm 20 Jan 2004 16:43:35 -0000 1.4 --- Layout.vm 20 Jan 2004 17:54:52 -0000 1.5 *************** *** 13,18 **** <link rel="stylesheet" type="text/css" href="${link.setForward("baseStyle")}" /> <title> #if($pages)Page $page of $pages - #end ! $vmTitle - Nexus - OK DEQ </title> </head> --- 13,20 ---- <link rel="stylesheet" type="text/css" href="${link.setForward("baseStyle")}" /> <title> + #if($LIST)Matched $LIST.size() - #end + #if($vmFound)Found $vmFound matches - #end #if($pages)Page $page of $pages - #end ! $vmTitle - CPU - Nexus - OK DEQ </title> </head> |
From: <th...@us...> - 2004-01-20 16:43:38
|
Update of /cvsroot/wqdata/wqdata4/repo2/wqdata/jars In directory sc8-pr-cvs1:/tmp/cvs-serv5145/repo2/wqdata/jars Modified Files: wqdata-core-0.9.1.jar Log Message: + Amend Layout to automatically insert page numbers when in a wizard. Index: wqdata-core-0.9.1.jar =================================================================== RCS file: /cvsroot/wqdata/wqdata4/repo2/wqdata/jars/wqdata-core-0.9.1.jar,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 Binary files /tmp/cvsCPVXtF and /tmp/cvsy6O9ye differ |
From: <th...@us...> - 2004-01-20 16:43:38
|
Update of /cvsroot/wqdata/wqdata4/apps/cpu/src/webapp/WEB-INF In directory sc8-pr-cvs1:/tmp/cvs-serv5145/apps/cpu/src/webapp/WEB-INF Modified Files: struts-config-vm.xml struts-config-wizard.xml Log Message: + Amend Layout to automatically insert page numbers when in a wizard. Index: struts-config-vm.xml =================================================================== RCS file: /cvsroot/wqdata/wqdata4/apps/cpu/src/webapp/WEB-INF/struts-config-vm.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** struts-config-vm.xml 20 Jan 2004 14:52:30 -0000 1.6 --- struts-config-vm.xml 20 Jan 2004 16:43:34 -0000 1.7 *************** *** 57,88 **** </action> <!-- **** --> - <action path="/vm/main/permit/Search" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_search_issued" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmLinkAction,vmReset"> - <forward name="vmTitle" path="Page 1 of 2 - Search Issued Permits" /> - <!-- vmChoice: default --> - <!-- vmMenu: default --> - <!-- vmBody: default --> - <!-- vmLinkAction: default --> - <!-- vmReset: default --> - </action> - <action path="/vm/main/permit/Search2" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_search_issued" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmFormOpen,vmFormClose,vmButtonBar,vmResult,vmParam,vmLabel,vmStep"> - <forward name="vmTitle" path="Page 2 of 2 - Search Issued Permits" /> - <forward name="vmFormClose" path="/pages/form-wizard-done.vm" /> - <forward name="vmBody" path="/pages/permit/select-facility.vm" /> - <forward name="vmResult" path="/pages/select-result.vm" /> - <forward name="vmParam" path="facilityCode" /> - <forward name="vmLabel" path="Facility Name" /> - <forward name="vmStep" path="submit" /> - <forward name="vmActionAdd" path="/vm/unit/facility/Edit" /> - </action> - <action path="/vm/main/permit/Result" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_search_issued" validate="false" parameter="vmTitle,vmMenu,vmBody,vmList,vmLinkAction,vmAction,vmReset"> - <forward name="vmTitle" path="Permit Search Result - (Main)" /> - <!-- vmMenu: default --> - <forward name="vmBody" path="/pages/permit/result.vm" /> - <!-- vmLinkAction:default --> - <!-- vmAction: default --> - <!-- vmReset: default --> - </action> <action path="/vm/main/permit/View" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_select_id" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmAction,vmActions"> ! <forward name="vmTitle" path="Permit Detail" /> <forward name="vmChoice" path="View" /> <!-- vmMenu: default --> --- 57,62 ---- </action> <!-- **** --> <action path="/vm/main/permit/View" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_select_id" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmAction,vmActions"> ! <forward name="vmTitle" path="Permit Detail - Main Area" /> <forward name="vmChoice" path="View" /> <!-- vmMenu: default --> *************** *** 92,114 **** </action> <!-- **** --> - <action path="/vm/staff/permit/Search" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_search" validate="false" parameter="vmTitle,vmMenu,vmBody,vmLinkAction,vmReset,vmExtend"> - <forward name="vmTitle" path="Search All Permits (Staff)" /> - <forward name="vmMenu" path="/pages/menu/staff.vm" /> - <!-- vmBody: default --> - <forward name="vmLinkAction" path="/staff/permit/View.do" /> - <forward name="vmReset" path="/staff/Main" /> - <forward name="vmExtend" path="/pages/permit/searchExt.vm" /> - </action> - <action path="/vm/staff/permit/Search2" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_search" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmFormOpen,vmFormClose,vmButtonBar,vmResult,vmParam,vmLabel,vmStep"> - <forward name="vmTitle" path="Search Issued Permits and Pending Applications" /> - <forward name="vmFormClose" path="/pages/form-wizard-done.vm" /> - <forward name="vmBody" path="/pages/permit/select-facility.vm" /> - <forward name="vmResult" path="/pages/select-result.vm" /> - <forward name="vmParam" path="facilityCode" /> - <forward name="vmLabel" path="Facility Name" /> - <forward name="vmStep" path="submit" /> - </action> <action path="/vm/staff/permit/Result" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_search" validate="false" parameter="vmTitle,vmMenu,vmBody,vmList,vmLinkAction,vmAction,vmReset,vmExtend"> ! <forward name="vmTitle" path="Permit Search Result (Staff)" /> <forward name="vmMenu" path="/pages/menu/staff.vm" /> <forward name="vmBody" path="/pages/permit/result.vm" /> --- 66,71 ---- </action> <!-- **** --> <action path="/vm/staff/permit/Result" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_search" validate="false" parameter="vmTitle,vmMenu,vmBody,vmList,vmLinkAction,vmAction,vmReset,vmExtend"> ! <forward name="vmTitle" path="Search Result- Search Issued and Pending Permits" /> <forward name="vmMenu" path="/pages/menu/staff.vm" /> <forward name="vmBody" path="/pages/permit/result.vm" /> *************** *** 119,123 **** </action> <action path="/vm/staff/permit/View" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_select_id" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmAction,vmActions"> ! <forward name="vmTitle" path="Permit Detail (Staff)" /> <forward name="vmChoice" path="View" /> <forward name="vmMenu" path="/pages/menu/staff.vm" /> --- 76,80 ---- </action> <action path="/vm/staff/permit/View" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_select_id" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmAction,vmActions"> ! <forward name="vmTitle" path="Permit Detail - Staff Area" /> <forward name="vmChoice" path="View" /> <forward name="vmMenu" path="/pages/menu/staff.vm" /> *************** *** 128,132 **** <!-- **** --> <action path="/vm/unit/permit/Edit" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_store" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmAction,vmFormOpen,vmFormClose,vmAction,vmActionMain"> ! <forward name="vmTitle" path="Edit Permit (Unit)" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> --- 85,89 ---- <!-- **** --> <action path="/vm/unit/permit/Edit" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_store" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmAction,vmFormOpen,vmFormClose,vmAction,vmActionMain"> ! <forward name="vmTitle" path="Edit Permit - Unit Area" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> *************** *** 136,140 **** </action> <action path="/vm/unit/permit/EditExt" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_store" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmAction,vmFormOpen,vmFormClose,vmExtend,vmActionMain"> ! <forward name="vmTitle" path="Add/Edit Permit (Unit)" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> --- 93,97 ---- </action> <action path="/vm/unit/permit/EditExt" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_store" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmAction,vmFormOpen,vmFormClose,vmExtend,vmActionMain"> ! <forward name="vmTitle" path="Add/Edit Permit - Unit Area" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> *************** *** 149,153 **** </action> <action path="/vm/unit/permit/Store" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_store" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmActions"> ! <forward name="vmTitle" path="Permit Detail (Unit)" /> <forward name="vmChoice" path="View" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> --- 106,110 ---- </action> <action path="/vm/unit/permit/Store" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_store" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmActions"> ! <forward name="vmTitle" path="Permit Detail - Unit Area" /> <forward name="vmChoice" path="View" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> *************** *** 155,160 **** <forward name="vmActions" path="/pages/permit/viewUnit.vm" /> </action> <action path="/vm/unit/permit/View" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_select_id" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmLinkAction,vmAction,vmActions,vmActionEdit,vmActionAdd,vmActionSearch,vmActionEditExt,vmActionMerge"> ! <forward name="vmTitle" path="Permit Detail (Unit)" /> <forward name="vmChoice" path="View" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> --- 112,128 ---- <forward name="vmActions" path="/pages/permit/viewUnit.vm" /> </action> + <action path="/vm/unit/permit/Result" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_search" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmList,vmLinkAction,vmAction,vmReset,vmExtend"> + <forward name="vmTitle" path="Search Result - Issued and Pending Permits - Unit Area" /> + <forward name="vmChoice" path="Search Result" /> + <forward name="vmMenu" path="/pages/menu/unit.vm" /> + <forward name="vmBody" path="/pages/permit/result.vm" /> + <forward name="vmLinkAction" path="/unit/permit/View.do" /> + <forward name="vmAction" path="/unit/permit/search/Wizard" /> + <forward name="vmLinkAction" path="/unit/permit/View" /> + <forward name="vmReset" path="/unit/Main" /> + <forward name="vmExtend" path="/pages/permit/searchExt.vm" /> + </action> <action path="/vm/unit/permit/View" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_select_id" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmLinkAction,vmAction,vmActions,vmActionEdit,vmActionAdd,vmActionSearch,vmActionEditExt,vmActionMerge"> ! <forward name="vmTitle" path="Permit Detail - Unit Area" /> <forward name="vmChoice" path="View" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> *************** *** 168,194 **** <forward name="vmActionMerge" path="/unit/permit/Merge" /> </action> - <action path="/vm/unit/permit/Search" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_search" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmLinkAction,vmReset,vmExtend"> - <forward name="vmTitle" path="Search All Permits (Unit)" /> - <forward name="vmChoice" path="Search" /> - <forward name="vmMenu" path="/pages/menu/unit.vm" /> - <!-- vmBody: default --> - <forward name="vmLinkAction" path="/unit/permit/View.do" /> - <forward name="vmReset" path="/unit/Main" /> - <forward name="vmExtend" path="/pages/permit/searchExt.vm" /> - </action> - <action path="/vm/unit/permit/Result" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_search" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmList,vmLinkAction,vmAction,vmReset,vmExtend"> - <forward name="vmTitle" path="Permit Search Result (Unit)" /> - <forward name="vmChoice" path="Search Result" /> - <forward name="vmMenu" path="/pages/menu/unit.vm" /> - <forward name="vmBody" path="/pages/permit/result.vm" /> - <forward name="vmLinkAction" path="/unit/permit/View.do" /> - <forward name="vmAction" path="/unit/permit/search/Wizard" /> - <forward name="vmLinkAction" path="/unit/permit/View" /> - <forward name="vmReset" path="/unit/Main" /> - <forward name="vmExtend" path="/pages/permit/searchExt.vm" /> - </action> <!-- **** --> <action path="/vm/unit/track/User" type="us_ok_deq_wqdata.cpu.ViewAction" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody"> ! <forward name="vmTitle" path="Your Tracking List (Unit)" /> <forward name="vmChoice" path="User" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> --- 136,142 ---- <forward name="vmActionMerge" path="/unit/permit/Merge" /> </action> <!-- **** --> <action path="/vm/unit/track/User" type="us_ok_deq_wqdata.cpu.ViewAction" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody"> ! <forward name="vmTitle" path="Your Tracking List - Unit Area" /> <forward name="vmChoice" path="User" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> *************** *** 197,201 **** <action path="/vm/unit/track/Result" type="us_ok_deq_wqdata.cpu.ViewAction" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmLinkAction"> <forward name="vmLayout" path="/pages/Printer.vm" /> ! <forward name="vmTitle" path="Master Tracking List (Unit)" /> <forward name="vmChoice" path="Track" /> <forward name="vmMenu" path="/pages/menu/printer.vm" /> --- 145,149 ---- <action path="/vm/unit/track/Result" type="us_ok_deq_wqdata.cpu.ViewAction" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmLinkAction"> <forward name="vmLayout" path="/pages/Printer.vm" /> ! <forward name="vmTitle" path="Master Tracking List - Unit Area" /> <forward name="vmChoice" path="Track" /> <forward name="vmMenu" path="/pages/menu/printer.vm" /> *************** *** 205,209 **** <!-- **** --> <action path="/vm/unit/facility/Add" type="us_ok_deq_wqdata.cpu.ViewAction" name="facility_store" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmFormOpen,vmAction"> ! <forward name="vmTitle" path="Add Facility (Unit)" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> --- 153,157 ---- <!-- **** --> <action path="/vm/unit/facility/Add" type="us_ok_deq_wqdata.cpu.ViewAction" name="facility_store" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmFormOpen,vmAction"> ! <forward name="vmTitle" path="Add Facility - Unit Area" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> *************** *** 213,217 **** </action> <action path="/vm/unit/facility/Edit" type="us_ok_deq_wqdata.cpu.ViewAction" name="facility_store" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmAction,vmFormOpen,vmFormClose,vmAction,vmActionMain"> ! <forward name="vmTitle" path="Edit Facility (Unit)" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> --- 161,165 ---- </action> <action path="/vm/unit/facility/Edit" type="us_ok_deq_wqdata.cpu.ViewAction" name="facility_store" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmAction,vmFormOpen,vmFormClose,vmAction,vmActionMain"> ! <forward name="vmTitle" path="Edit Facility - Unit Area" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> *************** *** 224,228 **** </action> <action path="/vm/unit/facility/View" type="us_ok_deq_wqdata.cpu.ViewAction" name="facility_select_id" validate="false" parameter="vmTitle,vmMenu,vmBody,vmActions,vmActionAdd,vmActionEdit,vmActionSearch"> ! <forward name="vmTitle" path="Facility Search Result (Unit)" /> <!-- vmMenu: default --> <forward name="vmBody" path="/pages/facility/view.vm" /> --- 172,176 ---- </action> <action path="/vm/unit/facility/View" type="us_ok_deq_wqdata.cpu.ViewAction" name="facility_select_id" validate="false" parameter="vmTitle,vmMenu,vmBody,vmActions,vmActionAdd,vmActionEdit,vmActionSearch"> ! <forward name="vmTitle" path="Facility Search Result - Unit Area" /> <!-- vmMenu: default --> <forward name="vmBody" path="/pages/facility/view.vm" /> *************** *** 233,237 **** </action> <action path="/vm/unit/facility/Result" type="us_ok_deq_wqdata.cpu.ViewAction" name="facility_search" validate="false" parameter="vmTitle,vmMenu,vmBody,vmList,vmLinkAction,vmAction,vmReset"> ! <forward name="vmTitle" path="Facility Search Result (Unit)" /> <!-- vmMenu: default --> <forward name="vmBody" path="/pages/facility/result.vm" /> --- 181,185 ---- </action> <action path="/vm/unit/facility/Result" type="us_ok_deq_wqdata.cpu.ViewAction" name="facility_search" validate="false" parameter="vmTitle,vmMenu,vmBody,vmList,vmLinkAction,vmAction,vmReset"> ! <forward name="vmTitle" path="Facility Search Result - Unit Area" /> <!-- vmMenu: default --> <forward name="vmBody" path="/pages/facility/result.vm" /> *************** *** 242,246 **** <!-- **** --> <action path="/vm/unit/contact/Add" type="us_ok_deq_wqdata.cpu.ViewAction" name="contact_store" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmFormOpen,vmAction"> ! <forward name="vmTitle" path="Add Contact (Unit)" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> --- 190,194 ---- <!-- **** --> <action path="/vm/unit/contact/Add" type="us_ok_deq_wqdata.cpu.ViewAction" name="contact_store" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmFormOpen,vmAction"> ! <forward name="vmTitle" path="Add Contact - Unit Area" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> *************** *** 250,254 **** </action> <action path="/vm/unit/contact/Edit" type="us_ok_deq_wqdata.cpu.ViewAction" name="contact_store" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmAction,vmFormOpen,vmFormClose,vmAction,vmActionMain"> ! <forward name="vmTitle" path="Edit Contact (Unit)" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> --- 198,202 ---- </action> <action path="/vm/unit/contact/Edit" type="us_ok_deq_wqdata.cpu.ViewAction" name="contact_store" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmAction,vmFormOpen,vmFormClose,vmAction,vmActionMain"> ! <forward name="vmTitle" path="Edit Contact - Unit Area" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> *************** *** 261,265 **** </action> <action path="/vm/unit/contact/View" type="us_ok_deq_wqdata.cpu.ViewAction" name="contact_select_id" validate="false" parameter="vmTitle,vmMenu,vmBody,vmActions,vmActionAdd,vmActionEdit,vmActionSearch"> ! <forward name="vmTitle" path="Contact Search Result (Unit)" /> <!-- vmMenu: default --> <forward name="vmBody" path="/pages/contact/view.vm" /> --- 209,213 ---- </action> <action path="/vm/unit/contact/View" type="us_ok_deq_wqdata.cpu.ViewAction" name="contact_select_id" validate="false" parameter="vmTitle,vmMenu,vmBody,vmActions,vmActionAdd,vmActionEdit,vmActionSearch"> ! <forward name="vmTitle" path="Contact Search Result - Unit Area" /> <!-- vmMenu: default --> <forward name="vmBody" path="/pages/contact/view.vm" /> *************** *** 270,274 **** </action> <action path="/vm/unit/contact/Result" type="us_ok_deq_wqdata.cpu.ViewAction" name="contact_search" validate="false" parameter="vmTitle,vmMenu,vmBody,vmList,vmLinkAction,vmAction,vmReset"> ! <forward name="vmTitle" path="Contact Search Result (Unit)" /> <!-- vmMenu: default --> <forward name="vmBody" path="/pages/contact/result.vm" /> --- 218,222 ---- </action> <action path="/vm/unit/contact/Result" type="us_ok_deq_wqdata.cpu.ViewAction" name="contact_search" validate="false" parameter="vmTitle,vmMenu,vmBody,vmList,vmLinkAction,vmAction,vmReset"> ! <forward name="vmTitle" path="Contact Search Result - Unit Area" /> <!-- vmMenu: default --> <forward name="vmBody" path="/pages/contact/result.vm" /> Index: struts-config-wizard.xml =================================================================== RCS file: /cvsroot/wqdata/wqdata4/apps/cpu/src/webapp/WEB-INF/struts-config-wizard.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** struts-config-wizard.xml 16 Jan 2004 19:38:42 -0000 1.8 --- struts-config-wizard.xml 20 Jan 2004 16:43:35 -0000 1.9 *************** *** 36,40 **** ! <!-- permit_search* --> <action path="/main/permit/search/Wizard" --- 36,40 ---- ! <!-- main: permit_search* --> <action path="/main/permit/search/Wizard" *************** *** 43,51 **** validate="false" parameter="2,vmAction"> ! <forward name="0,step" path="" /> <forward name="1,step" path="/vm/main/permit/Search.do" /> <forward name="2,step" path="/vm/main/permit/Search2.do" /> <forward name="3,submit" path="/main/permit/Search.do" redirect="true" /> </action> <action path="/staff/permit/search/Wizard" --- 43,80 ---- validate="false" parameter="2,vmAction"> ! <forward name="0,step" path="/Main.do" /> <forward name="1,step" path="/vm/main/permit/Search.do" /> <forward name="2,step" path="/vm/main/permit/Search2.do" /> <forward name="3,submit" path="/main/permit/Search.do" redirect="true" /> </action> + + <action path="/vm/main/permit/Search" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_search_issued" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmLinkAction,vmReset"> + <forward name="vmTitle" path="Search Issued Permits" /> + <!-- vmChoice: default --> + <!-- vmMenu: default --> + <!-- vmBody: default --> + <!-- vmLinkAction: default --> + <!-- vmReset: default --> + </action> + <action path="/vm/main/permit/Search2" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_search_issued" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmFormOpen,vmFormClose,vmButtonBar,vmResult,vmParam,vmLabel,vmStep"> + <forward name="vmTitle" path="Search Issued Permits" /> + <forward name="vmFormClose" path="/pages/form-wizard-done.vm" /> + <forward name="vmBody" path="/pages/permit/select-facility.vm" /> + <forward name="vmResult" path="/pages/select-result.vm" /> + <forward name="vmParam" path="facilityCode" /> + <forward name="vmLabel" path="Facility Name" /> + <forward name="vmStep" path="submit" /> + <forward name="vmActionAdd" path="/vm/unit/facility/Edit" /> + </action> + <action path="/vm/main/permit/Result" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_search_issued" validate="false" parameter="vmTitle,vmMenu,vmBody,vmList,vmLinkAction,vmAction,vmReset"> + <forward name="vmTitle" path="Search Result- Search Issued Permits" /> + <!-- vmMenu: default --> + <forward name="vmBody" path="/pages/permit/result.vm" /> + <!-- vmLinkAction:default --> + <!-- vmAction: default --> + <!-- vmReset: default --> + </action> + + <!-- staff --> <action path="/staff/permit/search/Wizard" *************** *** 59,65 **** <forward name="3,submit" path="/staff/permit/Search.do" redirect="true" /> </action> ! <!-- permit_store_wizard --> <action path="/vm/unit/permit/store/p01_county" type="us_ok_deq_wqdata.cpu.ViewAction" --- 88,134 ---- <forward name="3,submit" path="/staff/permit/Search.do" redirect="true" /> </action> + <action path="/vm/staff/permit/Search" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_search" validate="false" parameter="vmTitle,vmMenu,vmBody,vmLinkAction,vmReset,vmExtend"> + <forward name="vmTitle" path="Search Issued and Pending Permits" /> + <forward name="vmMenu" path="/pages/menu/staff.vm" /> + <!-- vmBody: default --> + <forward name="vmLinkAction" path="/staff/permit/View.do" /> + <forward name="vmReset" path="/staff/Main" /> + <forward name="vmExtend" path="/pages/permit/searchExt.vm" /> + </action> + <action path="/vm/staff/permit/Search2" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_search" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmFormOpen,vmFormClose,vmButtonBar,vmResult,vmParam,vmLabel,vmStep"> + <forward name="vmTitle" path="Search Issued and Pending Permits" /> + <forward name="vmFormClose" path="/pages/form-wizard-done.vm" /> + <forward name="vmBody" path="/pages/permit/select-facility.vm" /> + <forward name="vmResult" path="/pages/select-result.vm" /> + <forward name="vmParam" path="facilityCode" /> + <forward name="vmLabel" path="Facility Name" /> + <forward name="vmStep" path="submit" /> + </action> + <!-- unit --> + <action + path="/unit/permit/search/Wizard" + type="org_apache_struts_actions.WizardAction" + name="permit_search" + validate="false" + parameter="2,vmAction"> + <forward name="0,step" path="/unit/permit/Main.do" /> + <forward name="1,step" path="/vm/unit/permit/Search.do" /> + <forward name="2,step" path="/vm/staff/permit/Search2.do" /> + <!-- sic --> + <forward name="3,submit" path="/unit/permit/Search.do" redirect="true" /> + </action> ! <action path="/vm/unit/permit/Search" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_search" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmLinkAction,vmReset,vmExtend"> ! <forward name="vmTitle" path="Search Issued and Pending Permits - Unit Area" /> ! <forward name="vmChoice" path="Search" /> ! <forward name="vmMenu" path="/pages/menu/unit.vm" /> ! <!-- vmBody: default --> ! <forward name="vmLinkAction" path="/unit/permit/View.do" /> ! <forward name="vmReset" path="/unit/Main" /> ! <forward name="vmExtend" path="/pages/permit/searchExt.vm" /> ! </action> ! ! <!-- permit: permit_store_wizard --> <action path="/vm/unit/permit/store/p01_county" type="us_ok_deq_wqdata.cpu.ViewAction" *************** *** 67,71 **** validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmFormOpen,vmFormClose,vmButtonBar"> ! <forward name="vmTitle" path="Store Permit (Unit)" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> --- 136,141 ---- validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmFormOpen,vmFormClose,vmButtonBar"> ! <!-- :FIXME: There should be a way to use runtime ${variables} --> ! <forward name="vmTitle" path="Store Permit" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> *************** *** 76,80 **** </action> <action path="/vm/unit/permit/store/p02_applicant" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_store_wizard" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmFormOpen,vmFormClose,vmButtonBar,vmResult,vmParam,vmLabel,vmStep,vmActionAdd,vmParamAdd,vmParamAddValue"> ! <forward name="vmTitle" path="Store Permit (Unit)" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> --- 146,150 ---- </action> <action path="/vm/unit/permit/store/p02_applicant" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_store_wizard" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmFormOpen,vmFormClose,vmButtonBar,vmResult,vmParam,vmLabel,vmStep,vmActionAdd,vmParamAdd,vmParamAddValue"> ! <forward name="vmTitle" path="Store Permit" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> *************** *** 91,95 **** </action> <action path="/vm/unit/permit/store/p03_applicant_contact" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_store_wizard" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmFormOpen,vmFormClose,vmButtonBar,vmResult,vmParam,vmLabel,vmStep,vmActionAdd,vmParamAdd,vmParamAddValue"> ! <forward name="vmTitle" path="Store Permit (Unit)" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> --- 161,165 ---- </action> <action path="/vm/unit/permit/store/p03_applicant_contact" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_store_wizard" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmFormOpen,vmFormClose,vmButtonBar,vmResult,vmParam,vmLabel,vmStep,vmActionAdd,vmParamAdd,vmParamAddValue"> ! <forward name="vmTitle" path="Store Permit" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> *************** *** 106,110 **** </action> <action path="/vm/unit/permit/store/p04_fees" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_store_wizard" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmFormOpen,vmFormClose,vmButtonBar"> ! <forward name="vmTitle" path="Store Permit (Unit)" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> --- 176,180 ---- </action> <action path="/vm/unit/permit/store/p04_fees" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_store_wizard" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmFormOpen,vmFormClose,vmButtonBar"> ! <forward name="vmTitle" path="Store Permit" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> *************** *** 114,118 **** </action> <action path="/vm/unit/permit/store/p05_media_type" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_store_wizard" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmFormOpen,vmFormClose,vmButtonBar"> ! <forward name="vmTitle" path="Store Permit (Unit)" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> --- 184,188 ---- </action> <action path="/vm/unit/permit/store/p05_media_type" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_store_wizard" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmFormOpen,vmFormClose,vmButtonBar"> ! <forward name="vmTitle" path="Store Permit" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> *************** *** 122,126 **** </action> <action path="/vm/unit/permit/store/p06_plan_type" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_store_wizard" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmFormOpen,vmFormClose,vmButtonBar"> ! <forward name="vmTitle" path="Store Permit (Unit)" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> --- 192,196 ---- </action> <action path="/vm/unit/permit/store/p06_plan_type" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_store_wizard" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmFormOpen,vmFormClose,vmButtonBar"> ! <forward name="vmTitle" path="Store Permit" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> *************** *** 130,134 **** </action> <action path="/vm/unit/permit/store/p07_facility" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_store_wizard" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmFormOpen,vmFormClose,vmButtonBar,vmResult,vmParam,vmLabel,vmStep,vmActionAdd"> ! <forward name="vmTitle" path="Store Permit (Unit)" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> --- 200,204 ---- </action> <action path="/vm/unit/permit/store/p07_facility" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_store_wizard" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmFormOpen,vmFormClose,vmButtonBar,vmResult,vmParam,vmLabel,vmStep,vmActionAdd"> ! <forward name="vmTitle" path="Store Permit" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> *************** *** 143,147 **** </action> <action path="/vm/unit/permit/store/p08_consulting_engineer" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_store_wizard" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmFormOpen,vmFormClose,vmButtonBar,vmResult,vmParam,vmLabel,vmStep,vmActionAdd,vmParamAdd,vmParamAddValue"> ! <forward name="vmTitle" path="Store Permit (Unit)" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> --- 213,217 ---- </action> <action path="/vm/unit/permit/store/p08_consulting_engineer" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_store_wizard" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmFormOpen,vmFormClose,vmButtonBar,vmResult,vmParam,vmLabel,vmStep,vmActionAdd,vmParamAdd,vmParamAddValue"> ! <forward name="vmTitle" path="Store Permit" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> *************** *** 158,162 **** </action> <action path="/vm/unit/permit/store/p09_descriptions" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_store_wizard" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmFormOpen,vmFormClose,vmButtonBar"> ! <forward name="vmTitle" path="Store Permit (Unit)" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> --- 228,232 ---- </action> <action path="/vm/unit/permit/store/p09_descriptions" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_store_wizard" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmFormOpen,vmFormClose,vmButtonBar"> ! <forward name="vmTitle" path="Store Permit" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> *************** *** 166,170 **** </action> <action path="/vm/unit/permit/store/p10_numbers" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_store_wizard" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmFormOpen,vmFormClose,vmButtonBar"> ! <forward name="vmTitle" path="Store Permit (Unit)" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> --- 236,240 ---- </action> <action path="/vm/unit/permit/store/p10_numbers" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_store_wizard" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmFormOpen,vmFormClose,vmButtonBar"> ! <forward name="vmTitle" path="Store Permit" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> *************** *** 174,178 **** </action> <action path="/vm/unit/permit/store/p11_dates" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_store_wizard" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmFormOpen,vmFormClose,vmButtonBar,vmExtend"> ! <forward name="vmTitle" path="Store Permit (Unit)" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> --- 244,248 ---- </action> <action path="/vm/unit/permit/store/p11_dates" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_store_wizard" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmFormOpen,vmFormClose,vmButtonBar,vmExtend"> ! <forward name="vmTitle" path="Store Permit - Unit Area" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> *************** *** 183,187 **** </action> <action path="/vm/unit/permit/store/done" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_store_wizard" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmLinkAction,vmActions"> ! <forward name="vmTitle" path="Confirm - Store Permit (Unit)" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> --- 253,257 ---- </action> <action path="/vm/unit/permit/store/done" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_store_wizard" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmLinkAction,vmActions"> ! <forward name="vmTitle" path="Confirm - Store Permit - Unit Area" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> *************** *** 214,230 **** </action> - <action - path="/unit/permit/search/Wizard" - type="org_apache_struts_actions.WizardAction" - name="permit_search" - validate="false" - parameter="2,vmAction"> - <forward name="0,step" path="/unit/permit/Main.do" /> - <forward name="1,step" path="/vm/unit/permit/Search.do" /> - <forward name="2,step" path="/vm/staff/permit/Search2.do" /> - <!-- sic --> - <forward name="3,submit" path="/unit/permit/Search.do" redirect="true" /> - </action> - </action-mappings> --- 284,287 ---- |
From: <th...@us...> - 2004-01-20 16:43:38
|
Update of /cvsroot/wqdata/wqdata4/apps/cpu/src/webapp/pages In directory sc8-pr-cvs1:/tmp/cvs-serv5145/apps/cpu/src/webapp/pages Modified Files: Layout.vm Log Message: + Amend Layout to automatically insert page numbers when in a wizard. Index: Layout.vm =================================================================== RCS file: /cvsroot/wqdata/wqdata4/apps/cpu/src/webapp/pages/Layout.vm,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Layout.vm 20 Jan 2004 14:52:30 -0000 1.3 --- Layout.vm 20 Jan 2004 16:43:35 -0000 1.4 *************** *** 12,19 **** <base href="$link.baseRef"> <link rel="stylesheet" type="text/css" href="${link.setForward("baseStyle")}" /> ! ! <title> ! ${vmTitle} - Nexus - OK DEQ ! </title> </head> <body> --- 12,19 ---- <base href="$link.baseRef"> <link rel="stylesheet" type="text/css" href="${link.setForward("baseStyle")}" /> ! <title> ! #if($pages)Page $page of $pages - #end ! $vmTitle - Nexus - OK DEQ ! </title> </head> <body> |
From: <th...@us...> - 2004-01-20 14:52:33
|
Update of /cvsroot/wqdata/wqdata4/apps/webapp/jetty In directory sc8-pr-cvs1:/tmp/cvs-serv15273/apps/webapp/jetty Modified Files: jetty.xml Log Message: + Amend page titles to reflect position in wizard Index: jetty.xml =================================================================== RCS file: /cvsroot/wqdata/wqdata4/apps/webapp/jetty/jetty.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** jetty.xml 20 Jan 2004 14:24:28 -0000 1.2 --- jetty.xml 20 Jan 2004 14:52:30 -0000 1.3 *************** *** 23,27 **** <Call name="addContext"> <Arg>/</Arg> ! <Set name="realmName">nexusRealm</Set> <Set name="authenticator"><New class="org.mortbay.http.BasicAuthenticator"/></Set> --- 23,27 ---- <Call name="addContext"> <Arg>/</Arg> ! <Set name="realmName">CPU Permit Application Portal</Set> <Set name="authenticator"><New class="org.mortbay.http.BasicAuthenticator"/></Set> |
From: <th...@us...> - 2004-01-20 14:52:33
|
Update of /cvsroot/wqdata/wqdata4/apps/cpu/src/webapp/WEB-INF In directory sc8-pr-cvs1:/tmp/cvs-serv15273/apps/cpu/src/webapp/WEB-INF Modified Files: struts-config-vm.xml Log Message: + Amend page titles to reflect position in wizard Index: struts-config-vm.xml =================================================================== RCS file: /cvsroot/wqdata/wqdata4/apps/cpu/src/webapp/WEB-INF/struts-config-vm.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** struts-config-vm.xml 16 Jan 2004 00:36:32 -0000 1.5 --- struts-config-vm.xml 20 Jan 2004 14:52:30 -0000 1.6 *************** *** 58,62 **** <!-- **** --> <action path="/vm/main/permit/Search" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_search_issued" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmLinkAction,vmReset"> ! <forward name="vmTitle" path="Search Issued Permits -" /> <!-- vmChoice: default --> <!-- vmMenu: default --> --- 58,62 ---- <!-- **** --> <action path="/vm/main/permit/Search" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_search_issued" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmLinkAction,vmReset"> ! <forward name="vmTitle" path="Page 1 of 2 - Search Issued Permits" /> <!-- vmChoice: default --> <!-- vmMenu: default --> *************** *** 66,70 **** </action> <action path="/vm/main/permit/Search2" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_search_issued" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmFormOpen,vmFormClose,vmButtonBar,vmResult,vmParam,vmLabel,vmStep"> ! <forward name="vmTitle" path="Search Issued Permits -" /> <forward name="vmFormClose" path="/pages/form-wizard-done.vm" /> <forward name="vmBody" path="/pages/permit/select-facility.vm" /> --- 66,70 ---- </action> <action path="/vm/main/permit/Search2" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_search_issued" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmFormOpen,vmFormClose,vmButtonBar,vmResult,vmParam,vmLabel,vmStep"> ! <forward name="vmTitle" path="Page 2 of 2 - Search Issued Permits" /> <forward name="vmFormClose" path="/pages/form-wizard-done.vm" /> <forward name="vmBody" path="/pages/permit/select-facility.vm" /> *************** *** 101,105 **** </action> <action path="/vm/staff/permit/Search2" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_search" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmFormOpen,vmFormClose,vmButtonBar,vmResult,vmParam,vmLabel,vmStep"> ! <forward name="vmTitle" path="Search Issued Permits and Pending Applications -" /> <forward name="vmFormClose" path="/pages/form-wizard-done.vm" /> <forward name="vmBody" path="/pages/permit/select-facility.vm" /> --- 101,105 ---- </action> <action path="/vm/staff/permit/Search2" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_search" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmFormOpen,vmFormClose,vmButtonBar,vmResult,vmParam,vmLabel,vmStep"> ! <forward name="vmTitle" path="Search Issued Permits and Pending Applications" /> <forward name="vmFormClose" path="/pages/form-wizard-done.vm" /> <forward name="vmBody" path="/pages/permit/select-facility.vm" /> |
From: <th...@us...> - 2004-01-20 14:52:33
|
Update of /cvsroot/wqdata/wqdata4/apps/cpu/src/webapp/pages/menu In directory sc8-pr-cvs1:/tmp/cvs-serv15273/apps/cpu/src/webapp/pages/menu Modified Files: main.vm Log Message: + Amend page titles to reflect position in wizard Index: main.vm =================================================================== RCS file: /cvsroot/wqdata/wqdata4/apps/cpu/src/webapp/pages/menu/main.vm,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** main.vm 20 Jan 2004 12:40:38 -0000 1.2 --- main.vm 20 Jan 2004 14:52:30 -0000 1.3 *************** *** 15,19 **** <li> Main Menu ! <li> <li> <a href="${link.setAction("/staff/Main")}">Staff Menu</a> --- 15,19 ---- <li> Main Menu ! </li> <li> <a href="${link.setAction("/staff/Main")}">Staff Menu</a> *************** *** 21,24 **** --- 21,25 ---- <li> <a href="${link.setAction("/unit/Main")}">Unit Staff Menu</a> + </li> </ul> <hr /> |
From: <th...@us...> - 2004-01-20 14:52:33
|
Update of /cvsroot/wqdata/wqdata4/apps/cpu/src/webapp/pages In directory sc8-pr-cvs1:/tmp/cvs-serv15273/apps/cpu/src/webapp/pages Modified Files: Layout.vm Log Message: + Amend page titles to reflect position in wizard Index: Layout.vm =================================================================== RCS file: /cvsroot/wqdata/wqdata4/apps/cpu/src/webapp/pages/Layout.vm,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Layout.vm 14 Jan 2004 15:42:16 -0000 1.2 --- Layout.vm 20 Jan 2004 14:52:30 -0000 1.3 *************** *** 14,18 **** <title> ! ${vmTitle} - WQD - OK DEQ </title> </head> --- 14,18 ---- <title> ! ${vmTitle} - Nexus - OK DEQ </title> </head> |
From: <th...@us...> - 2004-01-20 14:25:47
|
Update of /cvsroot/wqdata/wqdata4/apps/webapp/tomcat In directory sc8-pr-cvs1:/tmp/cvs-serv10291 Added Files: tomcat-users.xml Log Message: + Move tomcat user file to /apps/webapps/tomcat --- NEW FILE: tomcat-users.xml --- <?xml version='1.0' encoding='utf-8'?> <tomcat-users> <role rolename="system.admin"/> <role rolename="cpu.admin"/> <role rolename="cpu.engineer"/> <role rolename="tomcat.admin"/> <role rolename="staff"/> <role rolename="cpu"/> <role rolename="manager"/> <role rolename="system"/> <role rolename="admin"/> <user username="patrick.rosch" password="" roles="staff,cpu,cpu.engineer"/> <user username="sara.orwig" password="" roles="staff,cpu,cpu.engineer"/> <user username="steven.wright" password="" roles="staff,cpu,cpu.engineer"/> <user username="steve.webb" password="" roles="staff,cpu,cpu.engineer"/> <user username="tomcat.admin" password="" roles="admin,manager,tomcat"/> <user username="rance.shields" password="" roles="staff,cpu,cpu.engineer,cpu.admin"/> <user username="tim.ward" password="" roles="staff,cpu,cpu.engineer"/> <user username="rocky.chen" password="" roles="staff,cpu,cpu.engineer,cpu.admin"/> <user username="cpu.admin" password="" roles="cpu,staff,system,system.admin"/> </tomcat-users> |
From: <th...@us...> - 2004-01-20 14:25:29
|
Update of /cvsroot/wqdata/wqdata4/apps/webapp/tomcat In directory sc8-pr-cvs1:/tmp/cvs-serv10197/tomcat Log Message: Directory /cvsroot/wqdata/wqdata4/apps/webapp/tomcat added to the repository |