From: ferite C. H. <fer...@li...> - 2005-09-26 18:08:33
|
Ferite CVS committal Author : boris Project : webframework Dir : webframework/Server/Pages Modified Files: ApplicationAdmin.page ApplicationAdmin.page.fe Login.page Log Message: Move from fwf: to wf: this is a good change, just say it several times ;) =================================================================== RCS file: /cvsroot/ferite/webframework/Server/Pages/ApplicationAdmin.page,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- ApplicationAdmin.page 23 Feb 2005 09:34:57 -0000 1.5 +++ ApplicationAdmin.page 26 Sep 2005 18:07:48 -0000 1.6 @@ -1,117 +1,117 @@ -<fwf:Box TextValue="Application Administration"> +<wf:Box TextValue="Application Administration"> This interface is for setting up users, managing zones, resources and cache triggers. - <fwf:Button ID="ReturnButton" Width="100" Height="30" TextValue="Return to Application" /> -</fwf:Box> + <wf:Button ID="ReturnButton" Width="100" Height="30" TextValue="Return to Application" /> +</wf:Box> <p /> -<fwf:TabView> - <fwf:TabViewItem ID="Users" TextJustify="left" TextValue="Users"> +<wf:TabView> + <wf:TabViewItem ID="Users" TextJustify="left" TextValue="Users"> - <fwf:Table ID="UsersTable" HaveSelection="true"> - <fwf:TableColumn ID="UserIDColumn" TextValue="ID#" Width="5%" /> - <fwf:TableColumn ID="UserNameColumn" TextValue="User Name" Width="20%" /> - <fwf:TableColumn ID="RealNameColumn" TextValue="Real Name" Width="40%" /> - <fwf:TableColumn ID="EmailAddressColumn" TextValue="Email Address" Width="35%" /> - </fwf:Table> + <wf:Table ID="UsersTable" HaveSelection="true"> + <wf:TableColumn ID="UserIDColumn" TextValue="ID#" Width="5%" /> + <wf:TableColumn ID="UserNameColumn" TextValue="User Name" Width="20%" /> + <wf:TableColumn ID="RealNameColumn" TextValue="Real Name" Width="40%" /> + <wf:TableColumn ID="EmailAddressColumn" TextValue="Email Address" Width="35%" /> + </wf:Table> <p/> - <fwf:Box ID="UserEdit" TextValue="Add User" Width="98%"> - <fwf:Label Width="100px" TextValue="User Name:" /> <fwf:TextField ID="UserName" Width="200px"/><br /> - <fwf:Label Width="100px" TextValue="Password:" /> <fwf:PasswordField ID="Password" Width="200px"/><br /> + <wf:Box ID="UserEdit" TextValue="Add User" Width="98%"> + <wf:Label Width="100px" TextValue="User Name:" /> <wf:TextField ID="UserName" Width="200px"/><br /> + <wf:Label Width="100px" TextValue="Password:" /> <wf:PasswordField ID="Password" Width="200px"/><br /> <p/> - <fwf:Label Width="100px" TextValue="First name:" /> <fwf:TextField ID="FirstName" Width="200px"/><br /> - <fwf:Label Width="100px" TextValue="Last name:" /> <fwf:TextField ID="LastName" Width="200px"/><br /> - <fwf:Label Width="100px" TextValue="Email Address:" /> <fwf:TextField ID="EmailAddress" Width="200px"/><br /> - <fwf:Label Width="100px" TextValue="Homepage:" /> <fwf:TextField ID="Homepage" Width="200px"/><br /> - <fwf:Label Width="100px" TextValue="Alias:" /> <fwf:TextField ID="Alias" Width="200px"/><br /> - <fwf:Label Width="100px" TextValue="AOL Address:" /> <fwf:TextField ID="AOLAddress" Width="200px"/><br /> - <fwf:Label Width="100px" TextValue="MSN Address:" /> <fwf:TextField ID="MSNAddress" Width="200px"/><br /> - <fwf:Label Width="100px" TextValue="ICQ Address:" /> <fwf:TextField ID="ICQAddress" Width="200px"/><br /> - <fwf:Label Width="100px" TextValue="Yahoo Address:" /> <fwf:TextField ID="YahooAddress" Width="200px"/><br /> + <wf:Label Width="100px" TextValue="First name:" /> <wf:TextField ID="FirstName" Width="200px"/><br /> + <wf:Label Width="100px" TextValue="Last name:" /> <wf:TextField ID="LastName" Width="200px"/><br /> + <wf:Label Width="100px" TextValue="Email Address:" /> <wf:TextField ID="EmailAddress" Width="200px"/><br /> + <wf:Label Width="100px" TextValue="Homepage:" /> <wf:TextField ID="Homepage" Width="200px"/><br /> + <wf:Label Width="100px" TextValue="Alias:" /> <wf:TextField ID="Alias" Width="200px"/><br /> + <wf:Label Width="100px" TextValue="AOL Address:" /> <wf:TextField ID="AOLAddress" Width="200px"/><br /> + <wf:Label Width="100px" TextValue="MSN Address:" /> <wf:TextField ID="MSNAddress" Width="200px"/><br /> + <wf:Label Width="100px" TextValue="ICQ Address:" /> <wf:TextField ID="ICQAddress" Width="200px"/><br /> + <wf:Label Width="100px" TextValue="Yahoo Address:" /> <wf:TextField ID="YahooAddress" Width="200px"/><br /> <p/> - <fwf:Button ID="UpdateUserButton" TextValue="Update" Width="80px" /> - <fwf:Button ID="AddUserButton" TextValue="Add New" Width="80px" /> - <fwf:Button ID="DeleteUserButton" TextValue="Delete" Width="80px" /> - </fwf:Box> + <wf:Button ID="UpdateUserButton" TextValue="Update" Width="80px" /> + <wf:Button ID="AddUserButton" TextValue="Add New" Width="80px" /> + <wf:Button ID="DeleteUserButton" TextValue="Delete" Width="80px" /> + </wf:Box> - </fwf:TabViewItem> + </wf:TabViewItem> - <fwf:TabViewItem ID="Zones" TextJustify="left" TextValue="Zones" Selected="true"> + <wf:TabViewItem ID="Zones" TextJustify="left" TextValue="Zones" Selected="true"> - <fwf:Box ID="AddZoneBox" Width="98%"> - <fwf:Table ID="ZonesTable"> - <fwf:TableColumn ID="ZoneNameColumn" TextValue="Name" Width="25%" /> - <fwf:TableColumn ID="ZoneDescriptionColumn" TextValue="Description" Width="75%" /> - </fwf:Table> + <wf:Box ID="AddZoneBox" Width="98%"> + <wf:Table ID="ZonesTable"> + <wf:TableColumn ID="ZoneNameColumn" TextValue="Name" Width="25%" /> + <wf:TableColumn ID="ZoneDescriptionColumn" TextValue="Description" Width="75%" /> + </wf:Table> <p/> - Create New Zone: <fwf:TextField ID="NewZoneName" Width="200px"/> - <fwf:Button ID="AddZoneButton" TextValue="Add New" Width="80px" /> - </fwf:Box> + Create New Zone: <wf:TextField ID="NewZoneName" Width="200px"/> + <wf:Button ID="AddZoneButton" TextValue="Add New" Width="80px" /> + </wf:Box> - <fwf:Box ID="EditZoneBox" TextValue="" Visible="false"> - <fwf:Button ID="ReturnToZoneList" TextValue="Return To Zone List" /> + <wf:Box ID="EditZoneBox" TextValue="" Visible="false"> + <wf:Button ID="ReturnToZoneList" TextValue="Return To Zone List" /> <p/> - <fwf:TabView ID="ZonesTab"> - <fwf:TabViewItem ID="ZoneEdit" TextValue="Edit Zone" Selected="true"> + <wf:TabView ID="ZonesTab"> + <wf:TabViewItem ID="ZoneEdit" TextValue="Edit Zone" Selected="true"> - <fwf:Label Width="100px" TextValue="Name:" /> - <fwf:TextField ID="ZoneNameEdit" Width="100%" /> + <wf:Label Width="100px" TextValue="Name:" /> + <wf:TextField ID="ZoneNameEdit" Width="100%" /> <p /> - <fwf:Label Width="100px" TextValue="Description:" /> - <fwf:TextView ID="ZoneDescriptionEdit" Width="100%" Height="100px" /> + <wf:Label Width="100px" TextValue="Description:" /> + <wf:TextView ID="ZoneDescriptionEdit" Width="100%" Height="100px" /> <p /> - <fwf:Button ID="UpdateZoneButton" TextValue="Update" Width="80px" /> - <fwf:Button ID="DeleteZoneButton" TextValue="Delete" Width="80px" /> + <wf:Button ID="UpdateZoneButton" TextValue="Update" Width="80px" /> + <wf:Button ID="DeleteZoneButton" TextValue="Delete" Width="80px" /> - </fwf:TabViewItem> - <fwf:TabViewItem ID="ZoneUserEdit" TextValue="Users"> + </wf:TabViewItem> + <wf:TabViewItem ID="ZoneUserEdit" TextValue="Users"> - <fwf:Table ID="ZoneUsersTable" Width="100%" HaveSelection="true"> - <fwf:TableColumn ID="ZoneUserColumn" TextValue="User" Width="60%" /> - <fwf:TableColumn ID="ZoneULevelColumn" TextValue="Permission Level" Width="40%" /> - </fwf:Table> + <wf:Table ID="ZoneUsersTable" Width="100%" HaveSelection="true"> + <wf:TableColumn ID="ZoneUserColumn" TextValue="User" Width="60%" /> + <wf:TableColumn ID="ZoneULevelColumn" TextValue="Permission Level" Width="40%" /> + </wf:Table> <p/> - User: <fwf:PopupButton ID="UserListPopup" Width="150px" /> - Level: <fwf:TextField ID="UserListLevel" Width="30px" /> + User: <wf:PopupButton ID="UserListPopup" Width="150px" /> + Level: <wf:TextField ID="UserListLevel" Width="30px" /> <p /> - <fwf:Button ID="ZoneAddUserButton" TextValue="Add" Width="50px" /> - <fwf:Button ID="ZoneUpdateUserButton" TextValue="Update" Width="70px" /> - <fwf:Button ID="ZoneRemoveUserButton" TextValue="Remove" Width="70px" /> - - </fwf:TabViewItem> - <fwf:TabViewItem ID="ZoneResourcesEdit" TextValue="Resources"> - - <fwf:Table ID="ZoneResourcesTable" Width="100%" HaveSelection="true"> - <fwf:TableColumn ID="ZoneResourceColumn" TextValue="Resource" Width="60%" /> - <fwf:TableColumn ID="ZoneRLevelColumn" TextValue="Permission Level" Width="40%" /> - </fwf:Table> + <wf:Button ID="ZoneAddUserButton" TextValue="Add" Width="50px" /> + <wf:Button ID="ZoneUpdateUserButton" TextValue="Update" Width="70px" /> + <wf:Button ID="ZoneRemoveUserButton" TextValue="Remove" Width="70px" /> + + </wf:TabViewItem> + <wf:TabViewItem ID="ZoneResourcesEdit" TextValue="Resources"> + + <wf:Table ID="ZoneResourcesTable" Width="100%" HaveSelection="true"> + <wf:TableColumn ID="ZoneResourceColumn" TextValue="Resource" Width="60%" /> + <wf:TableColumn ID="ZoneRLevelColumn" TextValue="Permission Level" Width="40%" /> + </wf:Table> <p/> - Resource: <fwf:TextField ID="ZoneResourceName" Width="150px" /> - Level: <fwf:TextField ID="ZoneResourceLevel" Width="30px" /> + Resource: <wf:TextField ID="ZoneResourceName" Width="150px" /> + Level: <wf:TextField ID="ZoneResourceLevel" Width="30px" /> <p /> - <fwf:Button ID="ZoneAddResourceButton" TextValue="Add" Width="50px" /> - <fwf:Button ID="ZoneUpdateResourceButton" TextValue="Update" Width="70px" /> - <fwf:Button ID="ZoneRemoveResourceButton" TextValue="Remove" Width="70px" /> - - </fwf:TabViewItem> - </fwf:TabView> - </fwf:Box> + <wf:Button ID="ZoneAddResourceButton" TextValue="Add" Width="50px" /> + <wf:Button ID="ZoneUpdateResourceButton" TextValue="Update" Width="70px" /> + <wf:Button ID="ZoneRemoveResourceButton" TextValue="Remove" Width="70px" /> + + </wf:TabViewItem> + </wf:TabView> + </wf:Box> - </fwf:TabViewItem> + </wf:TabViewItem> - <fwf:TabViewItem ID="Configurations" TextJustify="left" TextValue="Configuration Values"> + <wf:TabViewItem ID="Configurations" TextJustify="left" TextValue="Configuration Values"> - </fwf:TabViewItem> + </wf:TabViewItem> - <fwf:TabViewItem ID="Cache" TextJustify="left" TextValue="Cache Tools"> + <wf:TabViewItem ID="Cache" TextJustify="left" TextValue="Cache Tools"> Triggers and dependancies - </fwf:TabViewItem> + </wf:TabViewItem> -</fwf:TabView> +</wf:TabView> =================================================================== RCS file: /cvsroot/ferite/webframework/Server/Pages/ApplicationAdmin.page.fe,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- ApplicationAdmin.page.fe 21 Jun 2005 15:35:06 -0000 1.6 +++ ApplicationAdmin.page.fe 26 Sep 2005 18:07:48 -0000 1.7 @@ -185,7 +185,7 @@ { .zonesResourcesList = []; if( .ZonesTable.selected() > -1 ) { - Database.query( "SELECT * FROM ${Database.table('FWFResourcePermissions')} WHERE ZoneID=${.ZonesTable.selected()} ORDER BY Resource;" ) using ( row ){ + Database.query( "SELECT * FROM ${Database.table('WFResourcePermissions')} WHERE ZoneID=${.ZonesTable.selected()} ORDER BY Resource;" ) using ( row ){ object o = new Permissions.Resource(); o.loadObject(row); .zonesResourcesList[] = o; @@ -197,7 +197,7 @@ { .zonesUsersList = []; if( .ZonesTable.selected() > -1 ) { - Database.query( "SELECT * FROM ${Database.table('FWFUserPermissions')} WHERE ZoneID=${.ZonesTable.selected()};" ) using ( row ){ + Database.query( "SELECT * FROM ${Database.table('WFUserPermissions')} WHERE ZoneID=${.ZonesTable.selected()};" ) using ( row ){ object o = new Permissions.ZoneUser(); o.loadObject(row); .zonesUsersList[] = o; =================================================================== RCS file: /cvsroot/ferite/webframework/Server/Pages/Login.page,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- Login.page 21 Feb 2005 09:57:57 -0000 1.4 +++ Login.page 26 Sep 2005 18:07:48 -0000 1.5 @@ -1,10 +1,10 @@ -<fwf:Label ID="Message" Visible="false" /> -<fwf:Hidden ID="Location" TextValue="__NOTSET__" /> +<wf:Label ID="Message" Visible="false" /> +<wf:Hidden ID="Location" TextValue="__NOTSET__" /> -<fwf:Label TextValue="Username" Width="200px" /><fwf:TextField ID="Username" Width="200px" /> +<wf:Label TextValue="Username" Width="200px" /><wf:TextField ID="Username" Width="200px" /> <p/> -<fwf:Label TextValue="Password" Width="200px" /><fwf:PasswordField ID="Password" Width="200px" /> +<wf:Label TextValue="Password" Width="200px" /><wf:PasswordField ID="Password" Width="200px" /> <p/> -<fwf:Button ID="Login" TextValue="Login" /> +<wf:Button ID="Login" TextValue="Login" /> |