rework admin templates for validity
authorTony Cook <tony@develop-help.com>
Fri, 25 Feb 2011 10:42:37 +0000 (21:42 +1100)
committerTony Cook <tony@develop-help.com>
Thu, 9 Jun 2011 13:34:10 +0000 (23:34 +1000)
This doesn't make them entirely valid, but it removes nearly all of
the inline font and other formatting tags.

120 files changed:
MANIFEST
site/cgi-bin/modules/BSE/Template.pm
site/cgi-bin/modules/BSE/UI/AdminNewsletter.pm
site/cgi-bin/modules/BSE/Util/Prereq.pm
site/cgi-bin/modules/BSE/Util/ValidateHTML.pm [new file with mode: 0644]
site/cgi-bin/modules/BSE/Util/ValidateHTML/Tidy.pm [new file with mode: 0644]
site/cgi-bin/modules/BSE/Util/ValidateHTML/W3C.pm [new file with mode: 0644]
site/docs/config.pod
site/htdocs/css/admin.css
site/htdocs/js/admin.js [new file with mode: 0644]
site/htdocs/js/admin_siteusers.js [new file with mode: 0644]
site/templates/admin/add_product.tmpl [deleted file]
site/templates/admin/addattendee1.tmpl
site/templates/admin/addattendee2.tmpl
site/templates/admin/adduser.tmpl
site/templates/admin/article_img.tmpl
site/templates/admin/back/detail.tmpl
site/templates/admin/back/list.tmpl
site/templates/admin/base.tmpl
site/templates/admin/catalog.tmpl
site/templates/admin/edit_0.tmpl
site/templates/admin/edit_1.tmpl
site/templates/admin/edit_catalog.tmpl
site/templates/admin/edit_groups.tmpl
site/templates/admin/edit_prodopts.tmpl
site/templates/admin/edit_product.tmpl
site/templates/admin/edit_seminar.tmpl
site/templates/admin/edit_semsessadd.tmpl
site/templates/admin/edit_semsessions.tmpl
site/templates/admin/edit_steps.tmpl
site/templates/admin/error.tmpl
site/templates/admin/file_edit.tmpl
site/templates/admin/filelist.tmpl
site/templates/admin/grouplist.tmpl
site/templates/admin/helpicon.tmpl
site/templates/admin/image_edit.tmpl
site/templates/admin/locations/add.tmpl
site/templates/admin/locations/delete.tmpl
site/templates/admin/locations/edit.tmpl
site/templates/admin/locations/list.tmpl
site/templates/admin/locations/view.tmpl
site/templates/admin/locations/view_sessions.tmpl
site/templates/admin/log/entry.tmpl
site/templates/admin/log/log.tmpl
site/templates/admin/logon.tmpl
site/templates/admin/memberupdate/import.tmpl
site/templates/admin/memberupdate/preview.tmpl
site/templates/admin/memberupdate/request.tmpl
site/templates/admin/menu.tmpl
site/templates/admin/modules.tmpl
site/templates/admin/msgs/index.tmpl
site/templates/admin/order_detail.tmpl
site/templates/admin/order_list.tmpl
site/templates/admin/order_list_filled.tmpl
site/templates/admin/order_list_unfilled.tmpl
site/templates/admin/pregen/show.tmpl
site/templates/admin/prodopt_delete.tmpl
site/templates/admin/prodopt_edit.tmpl
site/templates/admin/prodopt_value_delete.tmpl
site/templates/admin/prodopt_value_edit.tmpl
site/templates/admin/product_list.tmpl
site/templates/admin/product_menu.tmpl
site/templates/admin/reports/list.tmpl
site/templates/admin/reports/show1.tmpl
site/templates/admin/semcancelbooking.tmpl
site/templates/admin/semeditbooking.tmpl
site/templates/admin/semsessionbookings.tmpl
site/templates/admin/semsessiondel.tmpl
site/templates/admin/semsessionedit.tmpl
site/templates/admin/semsessionrollcall.tmpl
site/templates/admin/showgroup.tmpl
site/templates/admin/showgroup_del.tmpl
site/templates/admin/showgroup_glob.tmpl
site/templates/admin/showgroupart.tmpl
site/templates/admin/showuser.tmpl
site/templates/admin/showuser_del.tmpl
site/templates/admin/showuser_glob.tmpl
site/templates/admin/showuserart.tmpl
site/templates/admin/subs/add.tmpl [deleted file]
site/templates/admin/subs/delete.tmpl
site/templates/admin/subs/edit.tmpl
site/templates/admin/subs/list.tmpl
site/templates/admin/subs/send_error.tmpl
site/templates/admin/subs/send_form.tmpl
site/templates/admin/subs/start_send.tmpl
site/templates/admin/subscr/add.tmpl
site/templates/admin/subscr/detail.tmpl
site/templates/admin/subscr/detail_delete.tmpl
site/templates/admin/subscr/edit.tmpl
site/templates/admin/subscr/list.tmpl
site/templates/admin/userlist.tmpl
site/templates/admin/users/add.tmpl
site/templates/admin/users/add_group_file.tmpl
site/templates/admin/users/add_user_file.tmpl
site/templates/admin/users/delete.tmpl
site/templates/admin/users/delete_group_file.tmpl
site/templates/admin/users/delete_user_file.tmpl
site/templates/admin/users/edit.tmpl
site/templates/admin/users/edit_files.tmpl
site/templates/admin/users/edit_group_file.tmpl
site/templates/admin/users/edit_groups.tmpl
site/templates/admin/users/edit_orders.tmpl
site/templates/admin/users/edit_user_file.tmpl
site/templates/admin/users/fileaccess.tmpl
site/templates/admin/users/groupadd.tmpl
site/templates/admin/users/groupdelete.tmpl
site/templates/admin/users/groupedit.tmpl
site/templates/admin/users/groupedit_files.tmpl
site/templates/admin/users/grouplist.tmpl
site/templates/admin/users/groupmembers.tmpl
site/templates/admin/users/inc_add_user_file.tmpl
site/templates/admin/users/inc_group_menu.tmpl
site/templates/admin/users/list.tmpl
site/templates/admin/users/list_low.tmpl
site/templates/admin/users/view.tmpl
site/templates/admin/users/view_activity.tmpl
site/templates/admin/users/view_bookings.tmpl
site/templates/admin/users/view_confirm.tmpl
site/templates/admin/xbase.tmpl [deleted file]
site/templates/htmlemail/basic.tmpl

index 2b945e0..82b2a5a 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -260,6 +260,9 @@ site/cgi-bin/modules/BSE/Util/SQL.pm
 site/cgi-bin/modules/BSE/Util/Tags.pm
 site/cgi-bin/modules/BSE/Util/Thumb.pm
 site/cgi-bin/modules/BSE/Util/Valid.pm
+site/cgi-bin/modules/BSE/Util/ValidateHTML.pm
+site/cgi-bin/modules/BSE/Util/ValidateHTML/Tidy.pm
+site/cgi-bin/modules/BSE/Util/ValidateHTML/W3C.pm
 site/cgi-bin/modules/BSE/Validate.pm
 site/cgi-bin/modules/BSE/Version.pm
 site/cgi-bin/modules/BSE/WebUtil.pm
@@ -449,8 +452,10 @@ site/htdocs/images/trans_pixel.gif
 site/htdocs/images/videoclose.png
 site/htdocs/js/admin-ui/debug.js
 site/htdocs/js/admin-ui/menu.js
+site/htdocs/js/admin.js
 site/htdocs/js/admin_messages.js
 site/htdocs/js/admin_prodopts.js
+site/htdocs/js/admin_siteusers.js
 site/htdocs/js/admin_tools.js
 site/htdocs/js/bse.js
 site/htdocs/js/bse_adminui.js
@@ -475,7 +480,6 @@ site/htdocs/js/swfobject.js
 site/htdocs/swf/flvplayer.swf
 site/templates/1/shop_multicat.tmpl
 site/templates/1/sitemap.tmpl
-site/templates/admin/add_product.tmpl
 site/templates/admin/addattendee1.tmpl
 site/templates/admin/addattendee2.tmpl
 site/templates/admin/addgroup.tmpl
@@ -559,7 +563,6 @@ site/templates/admin/showuser.tmpl
 site/templates/admin/showuser_del.tmpl
 site/templates/admin/showuser_glob.tmpl
 site/templates/admin/showuserart.tmpl
-site/templates/admin/subs/add.tmpl
 site/templates/admin/subs/delete.tmpl
 site/templates/admin/subs/edit.tmpl
 site/templates/admin/subs/filter_preview.tmpl
index 5b999d1..ccf387d 100644 (file)
@@ -310,6 +310,13 @@ sub output_resultc {
     print STDERR "$ENV{SCRIPT_NAME}: ** No content supplied\n";
     print "** Internal error\n";
   }
+
+  if ($result->{content}
+      && $result->{type} =~ m(text/html|application/xhtml\+xml)
+      && $cfg->entry("html", "validate", 0)) {
+    require BSE::Util::ValidateHTML;
+    BSE::Util::ValidateHTML->validate($cfg, $result);
+  }
 }
 
 1;
index 815ed5c..f7ae142 100644 (file)
@@ -8,7 +8,7 @@ use BSE::Util::HTML qw(:default popup_menu);
 use BSE::Util::Iterate;
 use base 'BSE::UI::AdminDispatch';
 
-our $VERSION = "1.000";
+our $VERSION = "1.001";
 
 my %actions =
   (
@@ -218,6 +218,9 @@ sub sub_form {
   if ($sub) {
     $acts{subscription} = [ \&tag_hash, $sub ];
   }
+  else {
+    $acts{subscription} = "";
+  }
 
   return $req->dyn_response($template, \%acts);
 }
index 6aa5a8c..7c7e528 100644 (file)
@@ -1,7 +1,7 @@
 package BSE::Util::Prereq;
 use strict;
 
-our $VERSION = "1.001";
+our $VERSION = "1.002";
 
 # pre-requisites for various modules
 
@@ -11,6 +11,8 @@ our %prereqs =
    "BSE::ImportSourceXLS" => [ "Spreadsheet::ParseExcel" ],
    "BSE::ProductImportXLS" => [ "Spreadsheet::ParseExcel" ],
    "BSE::Storage::AmazonS3" => [ "Net::Amazon::S3" ],
+   "BSE::Util::ValidateHTML::Tidy" => [ "HTML::Tidy" ],
+   "BSE::Util::ValidateHTML::W3C" => [ "WebService::Validator::HTML::W3C", "XML::XPath" ],
    "Courier::Fastway" => [ "XML::Parser" ],
    "Courier::Fastway::Road" => [ "XML::Parser" ],
    "Courier::Fastway::Satchel" => [ "XML::Parser" ],
diff --git a/site/cgi-bin/modules/BSE/Util/ValidateHTML.pm b/site/cgi-bin/modules/BSE/Util/ValidateHTML.pm
new file mode 100644 (file)
index 0000000..ef1ed63
--- /dev/null
@@ -0,0 +1,36 @@
+package BSE::Util::ValidateHTML;
+use strict;
+
+our $VERSION = "1.000";
+
+sub validate {
+  my ($class, $cfg, $result) = @_;
+
+  for my $validator (split /,/, $cfg->entry("html", "validator", "Tidy")) {
+    my $real_class = "BSE::Util::ValidateHTML::$validator";
+
+    my $valid;
+    unless (eval {
+      (my $file = $real_class . ".pm") =~ s(::)(/)g;
+      require $file;
+      $valid = $real_class->validate($cfg, $result);
+      1;
+    }) {
+      require BSE::TB::AuditLog;
+      BSE::TB::AuditLog->log
+         (
+          component => "template:validatehtml:load",
+          level => "critical",
+          actor => "S",
+          msg => "Could not load $real_class",
+          dump => $@,
+         );
+      return;
+    }
+    $valid or return;
+  }
+
+  return 1;
+}
+
+1;
diff --git a/site/cgi-bin/modules/BSE/Util/ValidateHTML/Tidy.pm b/site/cgi-bin/modules/BSE/Util/ValidateHTML/Tidy.pm
new file mode 100644 (file)
index 0000000..4804744
--- /dev/null
@@ -0,0 +1,61 @@
+package BSE::Util::ValidateHTML::Tidy;
+use strict;
+use HTML::Tidy;
+
+our $VERSION = "1.000";
+
+my %ignore =
+  (
+   error => TIDY_ERROR,
+   warning => TIDY_WARNING,
+   info => TIDY_INFO,
+  );
+
+sub validate {
+  my ($class, $cfg, $result) = @_;
+
+  my %tidy_opts = $cfg->entriesCS("html tidy");
+
+  my $ignore_types = delete $tidy_opts{ignore_types};
+  my @ignore_text = delete @tidy_opts{grep /^ignore_text_/, keys %tidy_opts};
+
+  my $tidy = HTML::Tidy->new(\%tidy_opts);
+
+  if ($ignore_types) {
+    for my $key (split /,/, $ignore_types) {
+      if ($ignore{$key}) {
+       $tidy->ignore(type => $ignore{$key});
+      }
+    }
+  }
+
+  for my $ignore_text (@ignore_text) {
+    $tidy->ignore(text => qr/$ignore_text/);
+  }
+
+  # synthesize a filename
+  my $fname = $ENV{SCRIPT_NAME};
+  $fname .= $ENV{PATH_INFO} if $ENV{PATH_INFO};
+  $fname .= "?" . $ENV{QUERY_STRING} if $ENV{QUERY_STRING};
+
+  $tidy->parse($fname, $result->{content});
+
+  my @messages = $tidy->messages;
+  if (@messages) {
+    require BSE::TB::AuditLog;
+    BSE::TB::AuditLog->log
+       (
+        component => "template:validatehtml_tidy:validate",
+        level => "error",
+        actor => "S",
+        msg => "Page $fname failed HTML validation",
+        dump => join("\n", @messages),
+       );
+
+    return;
+  }
+
+  return 1;
+}
+
+1;
diff --git a/site/cgi-bin/modules/BSE/Util/ValidateHTML/W3C.pm b/site/cgi-bin/modules/BSE/Util/ValidateHTML/W3C.pm
new file mode 100644 (file)
index 0000000..3d71ba0
--- /dev/null
@@ -0,0 +1,52 @@
+package BSE::Util::ValidateHTML::W3C;
+use strict;
+use WebService::Validator::HTML::W3C;
+
+our $VERSION = "1.000";
+
+sub validate {
+  my ($self, $cfg, $result) = @_;
+
+  my $v = WebService::Validator::HTML::W3C->new(detailed => 1);
+
+  unless ($v->validate_markup($result->{content})) {
+    require BSE::TB::AuditLog;
+    BSE::TB::AuditLog->log
+       (
+        component => "template:validatehtml:request",
+        level => "crit",
+        actor => "S",
+        msg => "Cannot validate HTML: " . $v->validator_error,
+       );
+    return;
+  }
+
+  unless ($v->is_valid) {
+    # synthesize a filename
+    my $fname = $ENV{SCRIPT_NAME};
+    $fname .= $ENV{PATH_INFO} if $ENV{PATH_INFO};
+    $fname .= "?" . $ENV{QUERY_STRING} if $ENV{QUERY_STRING};
+
+    my @messages = map
+      {
+       "line " . $_->line . " col " . $_->col . ": " . $_->msg
+      } @{$v->errors};
+
+    my $resp = eval { $v->_content } || '';
+    require BSE::TB::AuditLog;
+    BSE::TB::AuditLog->log
+       (
+        component => "template:validatehtml_w3c:validate",
+        level => "error",
+        actor => "S",
+        msg => "Page $fname failed HTML validation",
+        dump => join("\n", @messages) . "\n\n$resp",
+       );
+
+    return;
+  }
+
+  return 1;
+}
+
+1;
index 18a0034..cf19c8d 100644 (file)
@@ -225,6 +225,12 @@ stealing attacks.
 The salt used in generating the has for redirect_links.  Default: an
 empty string.
 
+=item validate
+
+If non-zero then any HTML output is validated with HTML::Tidy.
+Validation errors and warnings are sent to the audit log.  See [html
+tidy].
+
 =back
 
 =head2 [basic]
@@ -2436,6 +2442,29 @@ Controls sending an email for specific events or families of events.
 If the value is true, send an email for that event.  If the value
 contains an C<@> then the value is used as the recipient address.
 
+=back
+
+with the longer keys overriding the shorter keys, and defaulting to
+all actions being logged.
+
+=head2 [html tidy]
+
+Contains options to pass to HTML::Tidy.  Anything not listed below is
+passed directly to HTML::Tidy->new.
+
+=over
+
+=item *
+
+ignore_types - types of message to ignore separated by commas, any,
+all or none of info, warning, error.
+
+=item *
+
+ignore_text_I<key> - messages to ignore, I<key> is not used, just the
+value.
+
+
 =back
 
 =head2 [email I<token>]
index 58c2c5f..1514dbd 100644 (file)
@@ -19,8 +19,8 @@ th {  font-size: 12px; font-weight: bold; background-color: #606080; color: #FFF
 h3 {  font-size: 14px}
 h4 {  font-size: 12px}
 .version { font-size: 10px }
-input.inline { border-style: none; }
-tr.inline_form { background-color: #8080C0 }
+
+input.inline { width: 90%; }
 
 .bse_arrows img {
   border: none;
@@ -99,10 +99,12 @@ tr.inline_form { background-color: #8080C0 }
   padding: 2px 0;
 }
 
-.editform {
-  border: 1px solid #000;
+table { 
   border-collapse: collapse;
   vertical-align: baseline;
+}
+
+.editform {
   width: 100%;
 }
 
@@ -114,51 +116,61 @@ table.editformtiny {
   width: auto;
 }
 
-table.editform td, table.editform th {
+table.editform td.tablenote {
+  text-align: center;
+}
+
+table td, table th {
   padding: 4px;
   border: 1px solid #000;
 }
 
-table.editform th {
+table th {
   color: #FFF;
   background-color: #606080;
   font-weight: bold;
   text-align: left;
   white-space: nowrap;
+  vertical-align: baseline;
 }
 
-table.editform td {
+table td {
   color: #000;
   background-color: #FFF;
 }
 
-table.editform tr.bad td {
+table tr.bad td {
   background-color: #FF8080;
 }
 
-table.editform tr.odd td {
+table tr.odd td {
   background-color: #E0E0FF;
 }
 
-table.editform td.help,
-table.editform td.check  {
+table td.help,
+table td.check  {
   white-space: nowrap;
-  width: 20px;
+  vertical-align: baseline;
+  /*width: 20px;*/
+}
+
+img.bse_helpicon {
+  border: none;
 }
 
-table.editform td textarea {
+table td textarea {
   width: 95%;
 }
 
-table.editform td input.wide {
+table td input.wide {
   width: 95%;
 }
 
-table.editform td.check { 
+table td.check { 
   text-align: center;
 }
 
-table.editform td.buttons { 
+table td.buttons { 
   text-align: right;
 }
 
@@ -323,13 +335,15 @@ img.bse_image_thumb {
 .meta_real { width: 10em; }
 .meta_integer { width: 5em; }
 
-#message {
+#message,
+.message {
   font-weight: bold;
   font-size: 120%;
   margin: 0.5em 0px 0.5em 0px;
 }
 
-#message.error {
+#message.error,
+.message.error {
   color: red;
 }
 
@@ -474,6 +488,9 @@ img.bse_image_thumb {
   white-space: pre-wrap;
 }
 
+/* list of page numbers for paginated displays
+   use <span> for the current page
+ */
 div.pagelist {
   margin: 6px 0px;
 }
@@ -503,3 +520,200 @@ div.pagelist {
   color: #FFF;
   font-weight: bold;
 }
+
+.children .col_title { width: 30%; }
+.children .col_summary { width: 50%; }
+.children .col_listed { text-align: center; }
+.children .col_modify,
+.children .col_move {
+  white-space: nowrap;
+}
+
+.filelist .col_size,
+.filelist .col_download,
+.filelist .col_forsale,
+.filelist .col_requireuser { 
+  text-align: center;
+}
+
+.images .col_thumbnail {
+  text-align: center;
+  vertical-align: middle;
+}
+
+.images .col_move,
+.images .col_modify {
+  vertical-align: baseline;
+  white-space: nowrap;
+}
+
+.images .col_field {
+  width: 50%;
+}
+
+table.siteusers {
+  width: 100%;
+}
+
+table.siteusers td.col_name1,
+table.siteusers td.col_name2 { 
+  width: 33%;
+  vertical-align: baseline;
+}
+
+table.siteusers td.col_id {
+  text-align: center;
+  width: 5%;
+  white-space: nowrap;
+}
+
+table.siteusers td.col_userid {
+  width: 20%;
+}
+
+table.productlist {
+  width: 100%;
+}
+
+table.productlist .col_id {
+  text-align: center;
+}
+
+table.productlist .col_name {
+  width: 100%;
+}
+
+table.productlist td.col_release,
+table.productlist td.col_expire,
+table.productlist td.col_modify { 
+  white-space: nowrap;
+}
+
+table.productlist td.col_retail,
+table.productlist td.col_wsale,
+table.productlist td.col_gst { 
+  white-space: nowrap;
+  text-align: right;
+}
+
+table.stepkids td.col_id {
+  text-align: center;
+  white-space: nowrap;
+}
+
+table.stepkids th.col_id {
+  width: 3ex;
+}
+
+table.stepkids td.col_title {
+  width: 90%;
+}
+
+table.stepkids td.col_release,
+table.stepkids td.col_expire,
+table.stepkids td.col_tools,
+table.stepkids td.col_move {
+  white-space: nowrap;
+}
+
+
+table.orderlist td.col_id {
+  text-align: center;
+  white-space: nowrap;
+}
+
+table.orderlist td.col_name {
+  width: 100%;
+}
+
+table.orderlist td.col_date,
+table.orderlist td.col_tools {
+  white-space: nowrap;
+}
+
+table.orderlist td.col_total {
+  text-align: right;
+  white-space: nowrap;
+}
+
+table.orderdetail td.col_description {
+  width: 100%;
+}
+
+table.orderdetail td.col_units,
+table.orderdetail td.col_unitprice,
+table.orderdetail td.col_extension,
+table.orderdetail td.col_unit_wsale,
+table.orderdetail td.col_ext_wsale,
+table.orderdetail td.col_unit_gst,
+table.orderdetail td.col_ext_gst {
+  white-space: nowrap;
+  text-align: right;
+}
+
+table.orderdetail th {
+  white-space: nowrap;
+}
+
+table.orderdetail td.total {
+  font-weight: bold;
+}
+
+table.orderdetail_head td.col_head,
+table.orderdetail_head th.col_head  {
+  width: 10%;
+}
+table.orderdetail_head td.col_value {
+  width: 38%;
+}
+
+table.orderdetail td.col_contact {
+  font-weight: bold;
+  text-align: right;
+}
+
+table.sessionrollcall td.col_present { width: 10%; }
+table.sessionrollcall td.col_logon { width: 30%; }
+table.sessionrollcall td.col_name { width: 30%; }
+table.sessionrollcall td.col_email { width: 30%; }
+
+span.accesskeyx {
+  text-decoration: underline;
+}
+
+.newsletters td.col_name { width: 30%; }
+.newsletters td.col_title { width: 30%; }
+.newsletters td.col_frequency { width: 10%; }
+.newsletters td.col_visible {
+  width: 5%;
+  text-align: center;
+}
+.newsletters td.col_last {
+  width: 10%;
+  white-space: nowrap;
+  text-align: center;
+}
+.newsletters td.col_num {
+  width: 5%;
+  text-align: center;
+}
+.newsletters td.col_tools {
+  width: 10%;
+  white-space: nowrap;
+}
+
+.sembookings .col_id {
+  white-space: nowrap;
+  text-align: center;
+}
+
+.sembookings .col_date,
+.sembookings .col_time {
+  white-space: nowrap;
+}
+
+.sembookings .col_seminar,
+.sembookings .col_location {
+  width: 45%;
+}
+
diff --git a/site/htdocs/js/admin.js b/site/htdocs/js/admin.js
new file mode 100644 (file)
index 0000000..052ced7
--- /dev/null
@@ -0,0 +1,32 @@
+/* stuff for every admin page */
+/* mark accesskeys */
+document.observe("dom:loaded", function() {
+  $$("label").each(function(label) {
+    if (!label.htmlFor)
+      return;
+    var inp = $(label.htmlFor);
+    if (!inp || !inp.accessKey)
+      return;
+    
+    /* look for the accesskey in the label text */
+    var kids = label.childNodes;
+    var re = new RegExp(inp.accessKey, "i");
+    for (var i = 0; i < kids.length; ++i) {
+      var kid = kids[i];
+      if (kid.nodeType &&
+         kid.nodeType == Node.TEXT_NODE &&
+         re.test(kid.data)) {
+       var next = i == kids.length-1 ? null : kids[i+1];
+       var m = re.exec(kid.data);
+       var nn = kid.splitText(m.index);
+       var nn2 = nn.splitText(1);
+       var span = new Element("span", { className: "accesskeyx" });
+       span.appendChild(nn);
+       label.insertBefore(span, nn2);
+       return;
+      }
+    }
+  });
+
+  $$(".focusme:first").each(function(element) { element.focus() });
+});
\ No newline at end of file
diff --git a/site/htdocs/js/admin_siteusers.js b/site/htdocs/js/admin_siteusers.js
new file mode 100644 (file)
index 0000000..37bafc1
--- /dev/null
@@ -0,0 +1,16 @@
+document.observe
+  ("dom:loaded",
+    function () {
+     new Form.Observer
+     ('search', 0.5, function(f) {
+       var par = '_t=low&' + f.serialize();
+       var updater = new Ajax.Updater(
+         'results',
+         '/cgi-bin/admin/siteusers.pl',
+         {
+           method: 'get',
+           parameters: par,
+            asynchronous: true
+         });
+      });
+});
\ No newline at end of file
diff --git a/site/templates/admin/add_product.tmpl b/site/templates/admin/add_product.tmpl
deleted file mode 100644 (file)
index 577a221..0000000
+++ /dev/null
@@ -1,188 +0,0 @@
-<html><head><title>Add product - Shop administration</title>
-<link rel="stylesheet" href="/css/admin.css">
-</head>
-<body>
-<h1>Shop Administration</h1>
-<:ifMessage:> 
-<p><b><:message:> </b></p>
-<:or:><:eif:> 
-<p>| <a href="/cgi-bin/admin/menu.pl">Admin menu</a> | <a href="/cgi-bin/admin/shopadmin.pl">Manage catalogs</a> 
-  | </p>
-  <h2>Add New Product</h2>
-<form action="<:script:>" enctype="multipart/form-data" method=POST>
-  <input type="hidden" name="id" value="<:product id:>">
-  <table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000" class="table">
-    <tr>
-      <td>
-        <table border=0 cellspacing="1" cellpadding="6">
-          <tr> 
-            <th nowrap align="left" bgcolor="#FFFFFF">Title:</th>
-            <td nowrap bgcolor="#FFFFFF"> 
-              <input type="text" name="title" value="<:old title:>" size=60><:error_img title:>
-            </td>
-            <td nowrap bgcolor="#FFFFFF"><:help product title:></td>
-          </tr>
-          <tr> 
-            <th nowrap align="left" bgcolor="#FFFFFF">Summary:</th>
-            <td nowrap bgcolor="#FFFFFF"> 
-              <input type="text" name="summary" value="<:old summary:>" size=60><:error_img summary:>
-            </td>
-            <td nowrap bgcolor="#FFFFFF"><:help product summary:></td>
-          </tr>
-          <tr> 
-            <th nowrap align="left" bgcolor="#FFFFFF">Description:</th>
-            <td nowrap bgcolor="#FFFFFF"> 
-              <input type="text" name="description" value="<:old description:>" size=60><:error_img description:>
-            </td>
-            <td nowrap bgcolor="#FFFFFF"><:help product description:></td>
-          </tr>
-          <tr> 
-            <th nowrap align="left" bgcolor="#FFFFFF">Product Code:</th>
-            <td nowrap bgcolor="#FFFFFF"> 
-              <input type="text" name="product_code" value="<:old product_code:>" size="40"><:error_img product_code:>
-            </td>
-            <td nowrap bgcolor="#FFFFFF"><:help product product_code:></td>
-          </tr>
-          <tr> 
-            <th nowrap align="left" bgcolor="#FFFFFF">Catalog:</th>
-            <td nowrap bgcolor="#FFFFFF"> <select name="parentid"><:list:></select><:error_img parentid:> </td>
-            <td nowrap bgcolor="#FFFFFF"><:help product catalog:></td>
-          </tr>
-          <tr> 
-            <th nowrap align="left" bgcolor="#FFFFFF">Template:</th>
-            <td nowrap bgcolor="#FFFFFF"><:templates:><:error_img template:></td>
-            <td nowrap bgcolor="#FFFFFF"><:help product template:></td>
-          </tr>
-          <tr> 
-            <th nowrap align="left" bgcolor="#FFFFFF" valign="top"> Body:</th>
-            <td nowrap bgcolor="#FFFFFF" valign="top"> 
-              <textarea name="body" rows=15 cols=60 wrap=virtual><:old body:></textarea> <:error_img body:>
-            </td>
-            <td nowrap bgcolor="#FFFFFF" valign="top"><:help body body:></td>
-          </tr>
-          <tr> 
-            <th nowrap align="left" bgcolor="#FFFFFF">Lead time:</th>
-            <td nowrap bgcolor="#FFFFFF"> 
-              <input type="text" name="leadTime" value="<:old leadTime:>" size=5>
-              days <:error_img leadTime:></td>
-            <td nowrap bgcolor="#FFFFFF"><:help product leadtime:></td>
-          </tr>
-          <tr> 
-            <th nowrap align="left" bgcolor="#FFFFFF">Retail price:</th>
-            <td nowrap bgcolor="#FFFFFF">$ 
-              <input type="text" name="retailPrice" value="<:old retailPrice money product retailPrice:>" size=7>
-              (0.00) <:error_img retailPrice:></td>
-            <td nowrap bgcolor="#FFFFFF"><:help product retail:></td>
-          </tr>
-          <tr> 
-            <th nowrap align="left" bgcolor="#FFFFFF">Wholesale price:</th>
-            <td nowrap bgcolor="#FFFFFF">$ 
-              <input type="text" name="wholesalePrice" value="<:old wholesalePrice money product wholesalePrice:>" size=7>
-              (0.00) <:error_img wholesalePrice:></td>
-            <td nowrap bgcolor="#FFFFFF"><:help product wholesale:></td>
-          </tr>
-          <tr> 
-            <th nowrap align="left" bgcolor="#FFFFFF">GST:</th>
-            <td nowrap bgcolor="#FFFFFF">$ 
-              <input type="text" name="gst" value="<:old gst money product gst:>" size=7> <:error_img gst:>
-              (0.00)</td>
-            <td nowrap bgcolor="#FFFFFF"><:help product gst:></td>
-          </tr>
-          <tr> 
-            <th nowrap align="left" bgcolor="#FFFFFF">Weight:</th>
-            <td nowrap bgcolor="#FFFFFF">
-              <input type="text" name="weight" value="<:old weight:>" size="7" /> grams <:error_img weight:>
-              (0)</td>
-            <td nowrap bgcolor="#FFFFFF"><:help product weight:></td>
-          </tr>
-          <tr> 
-            <th nowrap align="left" bgcolor="#FFFFFF">Length:</th>
-            <td nowrap bgcolor="#FFFFFF">
-              <input type="text" name="length" value="<:old length:>" size="7" /> mm<:error_img length:>
-              (0)</td>
-            <td nowrap bgcolor="#FFFFFF"><:help product length:></td>
-          </tr>
-          <tr> 
-            <th nowrap align="left" bgcolor="#FFFFFF">Width:</th>
-            <td nowrap bgcolor="#FFFFFF">
-              <input type="text" name="width" value="<:old width:>" size="7" /> mm<:error_img width:>
-              (0)</td>
-            <td nowrap bgcolor="#FFFFFF"><:help product width:></td>
-          </tr>
-          <tr> 
-            <th nowrap align="left" bgcolor="#FFFFFF">Height:</th>
-            <td nowrap bgcolor="#FFFFFF">
-              <input type="text" name="height" value="<:old height:>" size="7" /> mm<:error_img height:>
-              (0)</td>
-            <td nowrap bgcolor="#FFFFFF"><:help product height:></td>
-          </tr>
-          <tr> 
-            <th nowrap align="left" bgcolor="#FFFFFF">Release date:</th>
-            <td nowrap bgcolor="#FFFFFF"> 
-              <input type="text" name="release" value="<:date product release:>" size=11>
-              (dd/mm/yyyy)</td>
-            <td nowrap bgcolor="#FFFFFF"><:help product release:></td>
-          </tr>
-          <tr> 
-            <th nowrap align="left" bgcolor="#FFFFFF">Expiry date:</th>
-            <td nowrap bgcolor="#FFFFFF"> 
-              <input type="text" name="expire" value="<:date product expire:>" size=11>
-              (dd/mm/yyyy)</td>
-            <td nowrap bgcolor="#FFFFFF"><:help product expire:></td>
-          </tr>
-          <tr> 
-            <th nowrap align="left" bgcolor="#FFFFFF">Summary length:</th>
-            <td nowrap bgcolor="#FFFFFF"> 
-              <input type="text" name="summaryLength" size="10" maxlength="10" value="<:product summaryLength:>">
-            </td>
-            <td nowrap bgcolor="#FFFFFF"><:help product summary:></td>
-          </tr>
-          <tr> 
-            <th nowrap align="left" bgcolor="#FFFFFF">Display threshold:</th>
-            <td nowrap bgcolor="#FFFFFF"> 
-              <input type="text" name="threshold" size=10 maxlength=10 value="<:product threshold:>">
-            </td>
-            <td nowrap bgcolor="#FFFFFF"><:help product threshold:></td>
-          </tr>
-          <tr> 
-            <th align="left" bgcolor="#FFFFFF">Options:</th>
-            <td bgcolor="#FFFFFF"> 
-              <input type="text" name="options" value="<:product options:>" size=30>
-              (<:alloptions:>) </td>
-            <td bgcolor="#FFFFFF"><:help product options:></td>
-          </tr>
-          <tr> 
-            <th nowrap bgcolor="#FFFFFF" align="left">Flags:</th>
-            <td bgcolor="#FFFFFF" width="100%"><:iterator begin flags:><:if FieldPerm flags:><input type=checkbox name=flags value="<:flag id:>" <:ifFlagSet [flag id]:>checked<:or:><:eif:>><:or FieldPerm:><:ifFlagSet [flag id]:>Yes<:or:>No<:eif:><:eif FieldPerm:><:flag desc:><:iterator end flags:></td>
-            <td bgcolor="#FFFFFF"><:help edit listed:></td>
-          </tr>
-<:include admin/product_custom.tmpl optional :><:include admin/include/custom/product_custom.tmpl optional:><:include admin/include/product_custom.tmpl optional:>
-          <tr> 
-            <th nowrap align="left" bgcolor="#FFFFFF" valign="top">Thumbnail image:</th>
-            <td nowrap bgcolor="#FFFFFF"> 
-              <input type="file" name="thumbnail">
-            </td>
-            <td nowrap bgcolor="#FFFFFF" valign="top"><:help product thumb:></td>
-          </tr>
-          <tr> 
-            <th nowrap align="left" bgcolor="#FFFFFF">Purchase subscribes to:</th>
-            <td nowrap bgcolor="#FFFFFF"> 
-             <select name="subscription_id">
-                <option value="-1">(nothing)</option>
-<:iterator begin subscriptions:>
-                <option value="<:subscription subscription_id:>"><:subscription title:></option>
-<:iterator end subscriptions:>
-             </select> for <input type="text" name="subscription_period" value="<:old subscription_period" /><:error_img subscription_period:> months.
-            </td>
-            <td nowrap bgcolor="#FFFFFF"><:help product subscription_id:></td>
-          </tr>
-        </table>
-      </td>
-    </tr>
-  </table>
-  <p><font size="-1">*These fields cannot be modified once you save this form.</font></p>
-  <input type=submit name="save" value="Save product">
-</form>
-<p><font size="-1">BSE Release <:release:></font></p>
-</body>
-</html>
index 1722641..8f8a4c9 100644 (file)
@@ -1,4 +1,4 @@
-<:wrap admin/xbase.tmpl title=>"Add Seminar Attendee":>
+<:wrap admin/base.tmpl title=>"Add Seminar Attendee":>
 <h1>Add Seminar Attendee - Select a Seminar</h1>
 <:ifMessage:>
 <p><b><:message:></b></p>
@@ -26,3 +26,5 @@
     <td colspan="3"><input type="submit" name="a_addattendsession" value="Select Session &gt;&gt;" /></td>
   </tr>
 </table>
+</form>
+
index 3f4d5c1..f1ffc41 100644 (file)
@@ -1,4 +1,4 @@
-<:wrap admin/xbase.tmpl title=>"Add Seminar Attendee":>
+<:wrap admin/base.tmpl title=>"Add Seminar Attendee":>
 <h1>Add Seminar Attendee - Select a Session</h1>
 <:ifMessage:>
 <p><b><:message:></b></p>
@@ -7,8 +7,7 @@
 <a href="<:script:>?id=<:siteuser id:>">Edit user</a> |
 </p>
 <p>Adding user <:siteuser userId:> as an attendee to:</p>
-<!-- leave this as get, since submitting it just displays a new page -->
-<form action="<:script:>" method="get" name="addattendee1">
+<form action="<:script:>" method="post" name="addattendee1">
 <input type="hidden" name="siteuser_id" value="<:siteuser id:>" />
 <input type="hidden" name="seminar_id" value="<:seminar id:>" />
 <:ifCgi r:><input type="hidden" name="r" value="<:cgi r:>" /><:or:><:eif:>
@@ -48,3 +47,4 @@
     <td colspan="3"><input type="submit" name="a_addattendsave" value="Select Session &gt;&gt;" /></td>
   </tr>
 </table>
+</form>
\ No newline at end of file
index 0bf8e3f..4e88527 100644 (file)
@@ -1,14 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-
-  <title>Administration - Admin Users</title>
-
-  <link rel="stylesheet" type="text/css" href="/css/admin.css" />
-
-</head>
-
-<body>
+<:wrap admin/base.tmpl title => "Add new user":>
 <h1>Add new user</h1>
 
 <p>
 <:or:><:eif:> 
 <form method="POST" action="<:script:>">
 
-  <table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000" class="table">
-    <tr> 
-      <td> 
-        <table cellpadding="6" border="0" cellspacing="1">
+        <table>
           <tr> 
-            <th bgcolor="#FFFFFF" align="left">Logon: </th>
-            <td bgcolor="#FFFFFF"
+            <th>Logon: </th>
+            <td> 
               <input type="text" name="logon" value="<:old logon:>" />
             </td>
-            <td bgcolor="#FFFFFF"><:help adduser logon:> <:error_img logon:></td>
+            <td class="help"><:help adduser logon:> <:error_img logon:></td>
           </tr>
           <tr> 
-            <th bgcolor="#FFFFFF" align="left">Name: </th>
-            <td bgcolor="#FFFFFF"
+            <th>Name: </th>
+            <td> 
               <input type="text" name="name" value="<:old name:>" />
             </td>
-            <td bgcolor="#FFFFFF"><:help adduser name:>  <:error_img name:></td>
+            <td class="help"><:help adduser name:>  <:error_img name:></td>
           </tr>
           <tr> 
-            <th bgcolor="#FFFFFF" align="left"> Password: </th>
-            <td bgcolor="#FFFFFF"
+            <th> Password: </th>
+            <td> 
               <input type="password" name="password" />
               </td>
-            <td bgcolor="#FFFFFF"> <:help adduser password:>  <:error_img password:></td>
+            <td class="help"> <:help adduser password:>  <:error_img password:></td>
           </tr>
           <tr> 
-            <th bgcolor="#FFFFFF" align="left"> Confirm: </th>
-            <td bgcolor="#FFFFFF"
+            <th> Confirm: </th>
+            <td> 
               <input type="password" name="confirm" />
             </td>
-            <td bgcolor="#FFFFFF"><:help adduser confirm:> <:error_img confirm:> </td>
+            <td><:help adduser confirm:> <:error_img confirm:> </td>
           </tr>
           <tr> 
-            <td bgcolor="#FFFFFF" colspan="3" align="right"> 
+            <td class="buttons" colspan="3"> 
               <input type="submit" name="a_adduser" value="  Add User  " />
             </td>
           </tr>
         </table>
-      </td>
-    </tr>
-  </table>
 </form>
-<p><font size="-1">BSE Release <:release:></font></p>
-</body
-></html>
index 16e268e..1565697 100644 (file)
@@ -1,4 +1,4 @@
-<:wrap admin/xbase.tmpl title=>"Image Wizard" :>
+<:wrap admin/base.tmpl title=>"Image Wizard" :>
 <h1><:ifEq [article id] "-1":>Global<:or:><: articleType :><:eif:> Image Wizard</h1>
 <:ifMessage:> 
 <p><b><:message:> </b></p>
 <input type="hidden" name="imgtype" value="<: articleType :>" />
 <input type="hidden" name="_t" value="img" />
 <:csrfp admin_add_image hidden:>
-  <table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000" class="table">
-    <tr> 
-      <td> 
-        <table cellpadding="6" border="0" cellspacing="1">
+        <table>
           <tr> 
-            <th bgcolor="#FFFFFF" align="left">Image file to add:</th>
-            <td bgcolor="#FFFFFF"
+            <th>Image file to add:</th>
+            <td> 
               <input type="file" name="image" /> 
             </td>
-            <td nowrap="nowrap" bgcolor="#FFFFFF"><:help image file:> <:error_img image:></td>
+            <td class="help"><:help image file:> <:error_img image:></td>
           </tr>
           <tr> 
-            <th bgcolor="#FFFFFF" align="left">Alt text for image:</th>
-            <td bgcolor="#FFFFFF"
+            <th>Alt text for image:</th>
+            <td> 
               <input type="text" name="altIn" value="<:old altIn:>" />
             </td>
-            <td nowrap="nowrap" bgcolor="#FFFFFF"><:help image alt:> <:error_img altIn:></td>
+            <td class="help"><:help image alt:> <:error_img altIn:></td>
           </tr>
           <tr> 
-            <th bgcolor="#FFFFFF" align="left">URL for image:</th>
-            <td bgcolor="#FFFFFF"
+            <th>URL for image:</th>
+            <td> 
               <input type="text" name="url" value="<:old url:>" />
             </td>
-            <td nowrap="nowrap" bgcolor="#FFFFFF"><:help image url:> <:error_img url:></td>
+            <td class="help"><:help image url:> <:error_img url:></td>
           </tr>
           <tr> 
-            <th bgcolor="#FFFFFF" align="left">Identifier for image:</th>
-            <td bgcolor="#FFFFFF"
+            <th>Identifier for image:</th>
+            <td> 
               <input type="text" name="name" value="<:old name:>" />
             </td>
-            <td nowrap="nowrap" bgcolor="#FFFFFF"><:help image name:> <:error_img name:></td>
+            <td class="help"><:help image name:> <:error_img name:></td>
           </tr>
           <tr> 
-            <th bgcolor="#FFFFFF" align="left">Storage:</th>
-            <td bgcolor="#FFFFFF"
+            <th>Storage:</th>
+            <td> 
 <select name="storage">
 <option value="">(Auto)</option>
 <:iterator begin image_stores:>
 <:iterator end image_stores:>
 </select>
             </td>
-            <td nowrap="nowrap" bgcolor="#FFFFFF"><:help image storage:> <:error_img storage:></td>
+            <td class="help"><:help image storage:> <:error_img storage:></td>
           </tr>
           <tr> 
-            <td bgcolor="#FFFFFF" colspan="3" align="right"> 
+            <td  colspan="3" class="buttons"> 
               <input type="submit" name="addimg" value="Add Image" />
             </td>
           </tr>
         </table>
-      </td>
-    </tr>
-  </table>
 </form>
 <:or UserCan:><:eif UserCan:>
 
 <:csrfp admin_save_images hidden:>
   <h2>Manage images</h2>
 
-<table width="100%" border="0" cellpadding="0" cellspacing="0" bgcolor="#000000" class="table">
-    <tr>
-      <td>
-        <table width="100%" border="0" cellpadding="6" cellspacing="1">
+        <table class="editform images">
           <:if Images:><:if Eq [article id] "-1":><:or Eq:><tr> 
-            <th valign="top" bgcolor="#FFFFFF" colspan="5">First Image Position</th>
+            <th colspan="5">First Image Position</th>
           </tr>
                  <tr> 
-            <td bgcolor="#FFFFFF" colspan="5"> 
-              <table width="100%" border="0" cellspacing="0" cellpadding="0">
-                <tr>
-                  <td width="100%" align="center"><input type="radio" name="imagePos" value="tl" <: ifEq [article imagePos] "tl":>checked<:or:><:eif:>
+            <td colspan="5"> 
+<input type="radio" name="imagePos" value="tl" <: ifEq [article imagePos] "tl":>checked<:or:><:eif:>
              />Top Left &nbsp;<input type="radio" name="imagePos" value="tr"  <: ifEq [article imagePos] "tr":>checked<:or:><:eif:>
              />Top Right &nbsp; <input type="radio" name="imagePos" value="bl"  <: ifEq [article imagePos] "bl":>checked<:or:><:eif:>
              />Bottom Left &nbsp; <input type="radio" name="imagePos" value="br"  <: ifEq [article imagePos] "br":>checked<:or:><:eif:>
-             />Bottom Right</td>
-                  <td bgcolor="#FFFFFF"><:help image file:> </td>
-                </tr>
-              </table>
+             />Bottom Right <:help image position:>
 
            </td>
           </tr><:eif Eq:>
 <:if Thumbs:>
-          <tr bgcolor="#FFFFFF"
+          <tr> 
             <th>Image</th>
             <th colspan="2"> &nbsp;</th>
-            <th nowrap="nowrap"> Modify</th>
-           <th nowrap="nowrap"> Move</th>
+            <th class="col_modify"> Modify</th>
+           <th class="col_move"> Move</th>
           </tr>
 <:iterator begin images:>
        <tr>
-          <td rowspan="5" align="center" valign="center" bgcolor="#FFFFFF"><a href="#" onclick="window.open('<:image src:>', 'fullimage', 'width=<:arithmetic [image width]+20:>,height=<:arithmetic [image height] + 30:>,location=no,status=no,menubar=no,scrollbars=yes'); return false;"><:thumbimage editor:></a></th>
+          <td rowspan="5" class="col_thumbnail"><a href="#" onclick="window.open('<:image src:>', 'fullimage', 'width=<:arithmetic [image width]+20:>,height=<:arithmetic [image height] + 30:>,location=no,status=no,menubar=no,scrollbars=yes'); return false;"><:thumbimage editor:></a></td>
            <th>Alt text:</th>
-            <td valign="top" bgcolor="#FFFFFF"> 
+            <td class="col_field"> 
               <:ifUserCan edit_images_save:article:><input type="text" name="alt<:image id:>" value="<: oldi [concatenate alt [image id] ] 0 image alt :>" size="32" /><:or:><: image alt :><:eif:>
             </td>
-            <td valign="top" nowrap="nowrap" rowspan="5" bgcolor="#FFFFFF"> 
+            <td class="col_modify" rowspan="5"> 
               <:ifUserCan edit_images_delete:article:><b><a href="<:script:>?id=<:article id:>&amp;removeimg_<: image id :>=1&amp;_t=img&amp;_csrfp=<:csrfp admin_remove_image:>" onClick="return window.confirm('Are you sure you want to delete this Image')">Delete</a></b><:or:><:eif:>
-<:ifUserCan edit_images_save:article:><a href="<:script:>?a_edit_image=1&amp;id=<:article id:>&image_id=<: image id :>">Edit</a><:or:><:eif:></td>
-            <td nowrap="nowrap" bgcolor="#FFFFFF" rowspan="5"><:imgmove:></td>
+<:ifUserCan edit_images_save:article:><a href="<:script:>?a_edit_image=1&amp;id=<:article id:>&amp;image_id=<: image id :>">Edit</a><:or:><:eif:></td>
+            <td class="col_move" rowspan="5"><:imgmove:></td>
          </tr>
          <tr>        
             <th>URL:</th>
-            <td valign="top" width="50%"  bgcolor="#FFFFFF" colspan="1"> 
+            <td class="col_field"> 
               <:ifUserCan edit_images_save:article:><input type="text" name="url<:image id:>" value="<: oldi [concatenate url [image id] ] 0 image url :>" size="32" /><:or:><: image url :><:eif:>
             </td>
           </tr>
           <tr>
            <th>Identifier:</th>
-            <td valign="top" nowrap="nowrap"  bgcolor="#FFFFFF" colspan="1"> 
+            <td class="col_field"> 
               <:ifUserCan edit_images_save:article:><input type="text" name="name<:image id:>" value="<: oldi [concatenate name [image id] ] 0 image name :>" size="32" /> <:error_img [concatenate "name" [image id] ]:><:or:><: image name :><:eif:>
             </td>
         </tr>
           <tr>
            <th>Image file:</th>
-            <td valign="top" nowrap="nowrap"  bgcolor="#FFFFFF" colspan="1"> 
+            <td class="col_field"> 
               <:ifUserCan edit_images_save:article:><input type="file" name="image<:image id:>" size="32" /> <:error_img [concatenate "image" [image id] ]:><:or:><: image displayName :><:eif:>
             </td>
         </tr>
           <tr>
            <th>Stored:</th>
-            <td valign="top" nowrap="nowrap"  bgcolor="#FFFFFF" colspan="1"> 
+            <td class="col_field"> 
               <:ifUserCan edit_images_save:article:><select name="storage<:image id:>">
 <option value="">(Auto)</option>
 <:iterator begin image_stores:>
         </tr>
 <:iterator end images:>          
 <:or Thumbs:>
-          <tr bgcolor="#FFFFFF"
+          <tr> 
             <th colspan="5">Image</th>
           </tr>
           <: iterator begin images :> 
-          <tr bgcolor="#FFFFFF"
-            <td align="center" colspan="5"><:image:></td>
+          <tr> 
+            <td class="col_image" colspan="5"><:image:></td>
           </tr>
-          <tr bgcolor="#FFFFFF"
+          <tr> 
             <th> Alt Text</th>
-            <th width="50%"> URL</th>
+            <th class="col_url"> URL</th>
             <th> Identifier</th>
-            <th nowrap="nowrap"> Modify</th>
-                       <th nowrap="nowrap"> Move</th>
+            <th class="col_modify"> Modify</th>
+                       <th class="col_move"> Move</th>
           </tr>
-          <tr bgcolor="#FFFFFF"
-            <td valign="top"
+          <tr> 
+            <td> 
               <:ifUserCan edit_images_save:article:><input type="text" name="alt<:image id:>" value="<: oldi [concatenate alt [image id] ] 0 image alt :>" size="32" /><:or:><: image alt :><:eif:>
             </td>
-            <td valign="top" width="50%"> 
+            <td class="col_url"> 
               <:ifUserCan edit_images_save:article:><input type="text" name="url<:image id:>" value="<: oldi [concatenate url [image id] ] 0 image url :>" size="32" /><:or:><: image url :><:eif:>
             </td>
-            <td valign="top" nowrap="nowrap"> 
+            <td class="col_identifier"> 
               <:ifUserCan edit_images_save:article:><input type="text" name="name<:image id:>" value="<: oldi [concatenate name [image id] ] 0 image name :>" size="32" /> <:error_img [concatenate "name" [image id] ]:><:or:><: image name :><:eif:>
             </td>
-            <td valign="bottom" nowrap="nowrap"> 
+            <td class="col_modify"> 
               <:ifUserCan edit_images_delete:article:><b><a href="<:script:>?id=<:article id:>&amp;removeimg_<: image id :>=1&amp;_t=img&amp;_csrfp=<:csrfp admin_remove_image:>" onClick="return window.confirm('Are you sure you want to delete this Image')">Delete</a></b><:or:><:eif:></td>
-            <td nowrap="nowrap"><:imgmove:></td>
+            <td class="col_move"><:imgmove:></td>
           </tr>
           <: iterator separator images :> 
-          <tr bgcolor="#FFFFFF"
+          <tr> 
             <td colspan="5">&nbsp;</td>
           </tr>
           <: iterator end images :> 
 <:eif Thumbs:>
 <:ifUserCan edit_images_save:article:>
           <tr> 
-            <td align="right" bgcolor="#FFFFFF" colspan="5"> 
+            <td colspan="5" class="buttons"> 
               <input type="submit" name="process" value="Save changes" />
             </td>
          </tr>
                      are attached to this article<:eif Eq:></td>
           </tr><:eif Images:>
         </table>
-</td>
-</tr>
-</table>
 
   <p>
     <input type="submit" name="back" value=" &lt;&lt;  Back  " />
index c440711..46ecb31 100644 (file)
@@ -1,4 +1,4 @@
-<:wrap admin/xbase.tmpl title=>"Background task detail", showtitle => 1 :>
+<:wrap admin/base.tmpl title=>"Background task detail", showtitle => 1 :>
 <p>| <a href="/cgi-bin/admin/menu.pl">Admin Menu</a> |
 <a href="<:script:>">Task list</a> |
 <:if Task running:>
index 472fb15..2bbcf2e 100644 (file)
@@ -1,4 +1,4 @@
-<:wrap admin/xbase.tmpl title=>"Background tasks", showtitle => 1 :>
+<:wrap admin/base.tmpl title=>"Background tasks", showtitle => 1 :>
 <:ifMessage:><p><:message:></p><:or:><:eif:>
 <p>| <a href="/cgi-bin/admin/menu.pl">Admin Menu</a> |</p>
 <table class="editform" id="backtasklist">
index 2fbd28d..373d4fd 100644 (file)
@@ -1,9 +1,23 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><title>BSE - <:param title:></title>
-<link rel="stylesheet" href="/css/admin.css">
-</head>
-<body>
+<?xml version="1.0" encoding="<:cfg html charset iso8859-1:>"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" >  
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title>BSE - <:param title:></title>
+    <link rel="stylesheet" href="/css/admin.css" type="text/css" />
+<:ifParam css:><link rel="stylesheet" href="/css/<:param css:>" type="text/css" /><:or:><:eif:>
+<:ajax includes:>
+<script type="text/javascript" src="/js/bse.js"></script>
+<script type="text/javascript" src="/js/admin.js"></script>
+<script type="text/javascript" src="/js/swfobject.js"></script>
+<:ifParam api:><script type="text/javascript" src="/js/bse_api.js"></script><:or:><:eif:>
+<:ifParam jstools:><script type="text/javascript" src="/js/admin_tools.js"></script><:or:><:eif:>
+<:ifParam js:><script type="text/javascript" src="/js/<:param js:>"></script><:or:><:eif:>
+  </head>
+  <body<:ifParam bodyid:> id="<:param bodyid:>"<:or:><:eif:>>
+<:ifParam showtitle:><h1><:param title:></h1><:or:><:eif:>
 <:wrap here:>
-<hr />
-<p class="version">BSE Release <:release:> - page generated <:today:><:include include/admin_bottom.tmpl optional:></p>
-</body></html>
+  <hr />
+  <p class="version">BSE Release <:release:> - page generated <:today:></p>
+  </body>
+</html>
index c486541..2deebd7 100644 (file)
@@ -1,51 +1,45 @@
  
-<form name="" action="/cgi-bin/admin/add.pl" method="post">
-  <p><input type=hidden name=id value="<:catalog id:>">
-    <input type="submit" name="edit_catalog" value="Edit Catalog">
+<form action="/cgi-bin/admin/add.pl" method="post">
+  <p><input type=hidden name=id value="<:catalog id:>" />
+    <input type="submit" name="edit_catalog" value="Edit Catalog" />
   </p>
 </form>
 <:if Products:> 
 <h4>Products list</h4>
-<table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000" width="100%" class="table">
-  <tr>
-    <td>
-      <table border=0 cellpadding="6" cellspacing="1" width="100%">
+      <table class="productlist">
         <tr> 
-          <th bgcolor="#FFFFFF" nowrap>Id</th>
-          <th bgcolor="#FFFFFF" width="100%">Name</th>
-          <th bgcolor="#FFFFFF" nowrap>Release</th>
-          <th bgcolor="#FFFFFF" nowrap>Expire</th>
-          <th bgcolor="#FFFFFF" nowrap>Retail</th>
-          <th bgcolor="#FFFFFF" nowrap>Wsale</th>
-          <th bgcolor="#FFFFFF" nowrap>GST</th>
-          <th bgcolor="#FFFFFF" nowrap>Modify</th>
-          <th bgcolor="#FFFFFF">Note</th>
+          <th class="col_id">Id</th>
+          <th class="col_name">Name</th>
+          <th class="col_release">Release</th>
+          <th class="col_expire">Expire</th>
+          <th class="col_retail">Retail</th>
+          <th class="col_wsale">Wsale</th>
+          <th class="col_gst">GST</th>
+          <th class="col_modify">Modify</th>
+          <th class="col_note">Note</th>
         </tr>
         <:iterator begin products:> 
-        <tr bgcolor="#FFFFFF"
-          <td align="center" nowrap><:product id:></td>
-          <td width="100%"><a href="<:product admin:>"><:product title:></a></td>
-          <td nowrap><:date release:></td>
-          <td nowrap><:ifMatch [date expire] "31/12/9999":>Never<:or:><:date expire:><:eif:></td>
-          <td align=right nowrap>$<:money retailPrice:></td>
-          <td align=right nowrap>$<:money wholesalePrice:></td>
-          <td align=right nowrap>$<:money gst:></td>
-          <td nowrap><a href="/cgi-bin/admin/add.pl?id=<:product id:>">Edit</a> 
+        <tr> 
+          <td class="col_id"><:product id:></td>
+          <td class="col_name"><a href="<:product admin:>"><:product title:></a></td>
+          <td class="col_release"><:date release:></td>
+          <td class="col-expire"><:ifMatch [date expire] "31/12/9999":>Never<:or:><:date expire:><:eif:></td>
+          <td class="col_retail">$<:money retailPrice:></td>
+          <td class="col_wsale">$<:money wholesalePrice:></td>
+          <td class="col_gst">$<:money gst:></td>
+          <td class="col_modify"><a href="/cgi-bin/admin/add.pl?id=<:product id:>">Edit</a> 
             <:if Product listed:> <a href="/cgi-bin/admin/add.pl?hide=1&amp;id=<:product id:>&amp;_csrfp=<:csrfp admin_save_article:>&amp;r=<:cfg site url:><:script:>">Hide</a> 
             <:or Product:> <a href="/cgi-bin/admin/add.pl?unhide=1&amp;id=<:product id:>&amp;_csrfp=<:csrfp admin_save_article:>&amp;r=<:cfg site url:><:script:>">Show</a> 
-            <:eif Product:> <:move:> <:product customStr1:></td>
+            <:eif Product:> <:move:></td>
           <td><:hiddenNote:></td>
         </tr>
         <:iterator end products:> 
       </table>
-    </td>
-  </tr>
-</table>
 <:or Products:><:eif Products:>
 <:ifUserCan edit_add_child:[catalog id] :><form action="/cgi-bin/admin/add.pl">
-  <p><input type=hidden name=parentid value="<:catalog id:>"><input type=hidden name=type value="Product"><input type=submit name="add_product" value="Add Product"></p></form><:or:><:eif:>
+  <p><input type="hidden" name="parentid" value="<:catalog id:>" /><input type="hidden" name="type" value="Product" /><input type="submit" name="add_product" value="Add Product" /></p></form><:or:><:eif:>
 <h4>Sub catalogs</h4>
-<h4><:if Subcats :> <:iterator begin subcats:> </h4>
+<:if Subcats :> <:iterator begin subcats:>
 <ul>
   <h4><a name="cat<:subcat id:>"></a></h4>
   <h4>Catalog: <:subcat title:> <:movecat:></h4>
@@ -53,6 +47,6 @@
 </ul>
 <:iterator end subcats:>
 <:or Subcats:><:eif Subcats:>
-<:ifUserCan edit_add_child:[catalog id]:><form action="/cgi-bin/admin/add.pl"><input type=hidden name=type value="Catalog">
-  <input type=hidden name=parentid value="<:catalog id:>"><input type=submit value="Add Sub-catalog"></form><:or:><:eif:>
+<:ifUserCan edit_add_child:[catalog id]:><form action="/cgi-bin/admin/add.pl"><input type="hidden" name="type" value="Catalog" />
+  <input type="hidden" name="parentid" value="<:catalog id:>" /><input type="submit" value="Add Sub-catalog" /></form><:or:><:eif:>
 
index e0ea622..197aafc 100644 (file)
@@ -1,4 +1,4 @@
-<:wrap admin/xbase.tmpl title=>"Manage Sections":>
+<:wrap admin/base.tmpl title=>"Manage Sections":>
 <h1>Manage Sections</h1>
 <:ifMessage:> 
 <p><b><:message:></b></p>
@@ -9,17 +9,11 @@
 
 <:if Or [iadminuser_count] [iadmingroup_count]:>
       <form action="/cgi-bin/admin/adminusers.pl">
-  <input type=hidden name=id value="<: article id:>">
-  <table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000" class="table">
-  <tr>
-    <td>
-        <table cellpadding="6" cellspacing="1" border="0" width="100%">
+  <input type="hidden" name="id" value="<: article id:>" />
+        <table>
           <tr>
-            <th nowrap="nowrap">
-
-        <font size=2>Manage access:</font>
-        </th>
-            <td bgcolor="#FFFFFF">
+            <th>Manage access:</th>
+            <td>
               <select name=adminid>
 <:iterator begin adminusers:>
 <option value=<:iadminuser id:>>User <:iadminuser logon:>
 <option value=<:iadmingroup id:>>Group <:iadmingroup name:>
 <:iterator end admingroups:>
               </select>
-              <input type=submit name="a_showobjectart" value="Manage">
+              <input type=submit name="a_showobjectart" value="Manage" />
       </td>
-            <td bgcolor="#FFFFFF"><:help access manage:>
-        </td>
+            <td class="help"><:help access manage:></td>
           </tr>
         </table>
-    </td>
-   </tr>
-  </table>
       </form>
-<br>
+<br />
 <:or Or:><:eif Or:>
 
 <:if children:> <a name="children"></a> 
-<table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000" width="100%" class="table">
-  <tr>
-      <td>
-      <table border="0" cellpadding="6" cellspacing="1" width="100%">
-        <tr bgcolor="#FFFFFF"> 
-          <th width="30%">Title</th>
-          <th width="70%">Summary</th>
-          <th>Listed</th>
-          <th nowrap="nowrap">Modify</th>
-                 <th nowrap="nowrap">Move</th>
+      <table class="editform children">
+        <tr> 
+          <th class="col_title">Title</th>
+          <th class="col_summary">Summary</th>
+          <th class="col_listed">Listed</th>
+          <th class="col_modify">Modify</th>
+         <th class="col_move">Move</th>
         </tr>
 <:if UserCan edit_reorder_children:>
         <tr> 
-          <td colspan="5" bgcolor="#FFFFFF">Sort  by: <a href="/cgi-bin/admin/reorder.pl?parentid=<:article id:>&amp;sort=title&amp;refreshto=/cgi-bin/admin/add.pl?id=<:article id:>">title</a> | <a href="/cgi-bin/admin/reorder.pl?parentid=<:article id:>&amp;sort=date&amp;refreshto=/cgi-bin/admin/add.pl?id=<:article id:>">date</a> | <a href="/cgi-bin/admin/reorder.pl?parentid=<:article id:>&amp;reverse=1&amp;refreshto=/cgi-bin/admin/add.pl?id=<:article id:>">reverse</a></td>
+          <td colspan="5">Sort  by: <a href="/cgi-bin/admin/reorder.pl?parentid=<:article id:>&amp;sort=title&amp;refreshto=/cgi-bin/admin/add.pl?id=<:article id:>">title</a> | <a href="/cgi-bin/admin/reorder.pl?parentid=<:article id:>&amp;sort=date&amp;refreshto=/cgi-bin/admin/add.pl?id=<:article id:>">date</a> | <a href="/cgi-bin/admin/reorder.pl?parentid=<:article id:>&amp;reverse=1&amp;refreshto=/cgi-bin/admin/add.pl?id=<:article id:>">reverse</a></td>
         </tr>
 <:or UserCan:><:eif UserCan:>
         <:iterator begin children:> 
-        <tr bgcolor="#FFFFFF"
-          <td width="30%"><a href="<:child admin:>"><:child title:></a></td>
-          <td width="70%"><: summary child body :></td>
-          <td bgcolor="#FFFFFF" align="center"><: is child listed :></td>
-          <td nowrap="nowrap"> <a href="/cgi-bin/admin/add.pl?id=<:child id:>">Edit</a> 
+        <tr> 
+          <td class="col_title"><a href="<:child admin:>"><:child title:></a></td>
+          <td class="col_summary"><: summary child body :></td>
+          <td class="col_listed"><: is child listed :></td>
+          <td class="col_modify"> <a href="/cgi-bin/admin/add.pl?id=<:child id:>">Edit</a> 
             <:if UserCan edit_delete_article:child:><a href="/cgi-bin/admin/add.pl?id=<:child id:>&amp;remove=1&amp;_csrfp=<:csrfp admin_remove_article:>" onclick="return window.confirm('Are you sure you want to delete this Section')">Delete</a> <:or UserCan:><:eif UserCan:></td>
-                  <td nowrap="nowrap"><:movechild:></td>
+                  <td class="col_move"><:movechild:></td>
         </tr>
         <:iterator separator children:> <:iterator end children:> 
       </table>
-</td>
-</tr>
-</table>
 <:or children:>
 <:eif children:>
 <:if HaveChildType:>
index cc23f9b..64ab724 100644 (file)
@@ -1,4 +1,4 @@
-<:wrap admin/xbase.tmpl title=>"Edit [articleType]":>
+<:wrap admin/base.tmpl title=>[cond [ifNew] [cat "New " [articleType]] [cat "Edit " [articleType] ": " [article title]]]:>
 <h1><:ifNew:>New<:or:>Edit<:eif:> <:articleType:></h1>
 <:if Message:> 
 <div id="message" <:ifError:>class="error"<:or:><:eif:>><:message:></div>
             <th>Images: 
             </th>
             <td id="images"><:if Images:> <:iterator begin 
-              images:> <img src="/images/<: image image :>" alt="<:image alt :>" width= 
-              <:image width:> height=<:image height:>> <:iterator separator images:> 
+              images:> <img src="/images/<: image image :>" alt="<:image alt :>" width="<:image width:>" height="<:image height:>" /> <:iterator separator images:> 
               <hr noshade size="1">
               <: iterator end images :>
-              <p align="left"><a href="<:script:>?id=<:article id:>&amp;_t=img"><b>Manage Images</b></a></p>
+              <p align="left"><a href="<:script:>?id=<:article id:>&amp;_t=img">Manage Images</a></p>
               <:or Images:>
-              No images are attached to this article.  <a href="<:script:>?id=<:article id:>&amp;_t=img"><b>Manage Images</b></a>
+              No images are attached to this article.  <a href="<:script:>?id=<:article id:>&amp;_t=img">Manage Images</a>
               <:eif Images:>
            </td>
             <td class="help"><:help edit images:> <:error_img
index 6868ef1..83babac 100644 (file)
@@ -1,22 +1,11 @@
-<html>
-<head>
-
-<title>
-    <: ifNew :>Add<: or :>Edit<: eif :> Catalog - Shop Administration
-</title>
-
-  <link rel="stylesheet" type="text/css" href="/css/admin.css">
-
-</head>
-
-<body>
-<h1>Shop Administration</h1>
+<:wrap admin/base.tmpl title => "Edit Catalog":>
+<h1>Edit Catalog:</h1>
 <:ifMessage:> 
 <p><b><:message:></b></p>
 <:or:><:eif:> 
 <p>| <a href="/cgi-bin/admin/menu.pl">Admin menu</a> | <:ifNew:><:or:><a href="<:article admin:>">See 
   catalog</a> | <:eif:><:editParent:> <a href="/cgi-bin/admin/shopadmin.pl">Manage 
-  catalogs</a> | <:if New:><:or New:><a href="<:script:>?id=<:article id:>&_t=steps">Manage 
+  catalogs</a> | <:if New:><:or New:><a href="<:script:>?id=<:article id:>&amp;_t=steps">Manage 
   step children/parents</a> | 
 <a href="<:script:>?id=<:article id:>&amp;_t=groups">Manage access</a> |
 <:eif New:></p>
 <:if Or [iadminuser_count] [iadmingroup_count]:>
       <form action="/cgi-bin/admin/adminusers.pl">
   <input type="hidden" name="id" value="<: article id:>" />
-  <table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000" class="table">
-  <tr>
-    <td>
-        <table cellpadding="6" cellspacing="1" border="0" width="100%">
+        <table>
           <tr>
-            <th nowrap="nowrap">
+            <th>
 
         <font size="2">Manage access:</font>
         </th>
-            <td bgcolor="#FFFFFF">
+            <td>
               <select name="adminid">
 <:iterator begin adminusers:>
 <option value="<:iadminuser id:>">User <:iadminuser logon:>
 <option value="<:iadmingroup id:>">Group <:iadmingroup name:>
 </option><:iterator end admingroups:>
               </select>
-              <input type="submit" name="a_showobjectart" value="Manage">
+              <input type="submit" name="a_showobjectart" value="Manage" />
       </td>
-            <td bgcolor="#FFFFFF"><:help access manage:>
+            <td class="help"><:help access manage:>
         </td>
           </tr>
         </table>
-    </td>
-   </tr>
-  </table>
       </form>
-<br>
+<br />
 <:or Or:><:eif Or:>
 <:eif:>
 
   <input type="hidden" name="level" value="<: level :>" />
   <input type="hidden" name="id" value="<: article id :>" />
 <:ifNew:><:csrfp admin_add_article hidden:><:or:><:csrfp admin_save_article hidden:><:eif:>
-  <table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000" width="100%" class="table">
-    <tr>
-      <td>
-        <table cellpadding="6" border="0" cellspacing="1" width="100%">
+        <table class="editform">
           <tr> 
-            <th bgcolor="#FFFFFF" nowrap="nowrap" align="left"> Parent: </th>
-            <td bgcolor="#FFFFFF" width="100%"
+            <th> Parent: </th>
+            <td> 
               <:if FieldPerm parentid:><select name="parentid">
                 <option value="">Please Select a <: parentType :></option> <: list subsections :> 
               </select><:or FieldPerm:><:parent title:> (<:parent id:>)<:eif FieldPerm:>
             </td>
-            <td nowrap="nowrap" bgcolor="#FFFFFF"><:help catalog parent:> <:error_img parentid:></td>
+            <td class="help"><:help catalog parent:> <:error_img parentid:></td>
           </tr>
           <tr> 
-            <th bgcolor="#FFFFFF" nowrap="nowrap" align="left"> Catalog title: </th>
-            <td bgcolor="#FFFFFF" width="100%"
-              <:ifFieldPerm title:><input type="text" name="title" maxlength="64" size="64" value="<: old title default title :>"><:or:><:default title:><:eif:>
+            <th> Catalog title: </th>
+            <td> 
+              <:ifFieldPerm title:><input type="text" name="title" maxlength="64" size="64" value="<: old title default title :>" /><:or:><:default title:><:eif:>
             </td>
-            <td nowrap="nowrap" bgcolor="#FFFFFF"><:help catalog title:> <:error_img title:></td>
+            <td class="help"><:help catalog title:> <:error_img title:></td>
           </tr>
           <:if Cfg "title alias" [concatenate level [article level]]:><tr>
-            <th nowrap="nowrap" bgcolor="#FFFFFF" align="left">Alias:</th>
-            <td bgcolor="#FFFFFF" width="100%">
+            <th>Alias:</th>
+            <td>
               <:if FieldPerm titleAlias:><input type="text" name="titleAlias" maxlength="<:cfg fields alias_size 60:>" size="60" value="<:old titleAlias article titleAlias:>" /><:or FieldPerm:><:article titleAlias:><:eif FieldPerm:>
             </td>
-            <td nowrap="nowrap" bgcolor="#FFFFFF"><:help edit titleAlias:> <:error_img titleAlias:></td>
+            <td class="help"><:help edit titleAlias:> <:error_img titleAlias:></td>
           </tr><:or Cfg:><:eif Cfg:>
           <tr> 
-            <th nowrap="nowrap" bgcolor="#FFFFFF" align="left">Summary: 
+            <th>Summary: 
             </th>
-            <td bgcolor="#FFFFFF" width="100%"
+            <td> 
             <:ifFieldPerm summary:><input type="text" name="summary" maxlength="<:cfg fields summary_size 255:>" size="64" value="<: old summary default summary :>" />
             <:or:><:default summary:><:eif:></td>
-            <td nowrap="nowrap" bgcolor="#FFFFFF"><:help edit summary:> <:error_img summary:></td>
+            <td class="help"><:help edit summary:> <:error_img summary:></td>
           </tr>
           <tr> 
-            <th valign="top" bgcolor="#FFFFFF" nowrap="nowrap" align="left"> Body:</th>
-            <td bgcolor="#FFFFFF" width="100%"
-              <:ifFieldPerm body:><textarea name="body" rows="10" cols="60" wrap="virtual"><: old body default body :></textarea><:or:><:bodytext article body:><:eif:>
+            <th> Body:</th>
+            <td> 
+              <:ifFieldPerm body:><textarea name="body" rows="10" cols="60"><: old body default body :></textarea><:or:><:bodytext article body:><:eif:>
             </td>
-            <td valign="top" nowrap="nowrap" bgcolor="#FFFFFF"><:help body body:> <:error_img
+            <td class="help"><:help body body:> <:error_img
             body:></td>
           </tr>
           <:if Cfgsection [concatenate level [article level] " menus"]:><tr> 
-            <th nowrap="nowrap" bgcolor="#FFFFFF" align="left">Menu:</th>
-            <td bgcolor="#FFFFFF" width="100%"
+            <th>Menu:</th>
+            <td> 
               <:if FieldPerm menu:><select name="menu" id="menu">
                 <:iterator begin cfgsection [concatenate level [article level] " menus"] sort=key:><option value="<:cfgentry key:>"<:if Eq [old menu] [cfgentry key]:> selected="selected"<:or Eq:><:eif Eq:>><:cfgentry value:></option><:iterator separator cfgsection:>
                 <:iterator end cfgsection:>
               </select><:or FieldPerm:><:article menu:><:eif FieldPerm:>
             </td>
-            <td nowrap="nowrap" bgcolor="#FFFFFF"><:help article menu:> <:error_img menu:></td>
+            <td class="help"><:help article menu:> <:error_img menu:></td>
           </tr><:or Cfgsection:><:eif Cfgsection:>
                  <tr> 
-            <th bgcolor="#FFFFFF" nowrap="nowrap" align="left"> Template: </th>
-            <td bgcolor="#FFFFFF" width="100%"> <:ifFieldPerm titleImage:><:templates:><:or:><:article titleImage:><:eif:> </td>
-            <td nowrap="nowrap" bgcolor="#FFFFFF"><:help catalog template:> <:error_img template:></td>
+            <th> Template: </th>
+            <td> <:ifFieldPerm titleImage:><:templates:><:or:><:article titleImage:><:eif:> </td>
+            <td class="help"><:help catalog template:> <:error_img template:></td>
           </tr>
                  <tr> 
-            <th bgcolor="#FFFFFF" nowrap="nowrap" align="left">List article:</th>
-            <td bgcolor="#FFFFFF" width="100%"> <:if FieldPerm listed:><:list listed:><:or FieldPerm:><:if Article listed:><:ifEq [article listed] "1":>Yes<:or:>In Sections, but not menu<:eif:><:or Article:>No<:eif Article:><:eif FieldPerm:> </td>
-            <td nowrap="nowrap" bgcolor="#FFFFFF"><:help catalog list:> <:error_img listed:></td>
+            <th>List article:</th>
+            <td> <:if FieldPerm listed:><:list listed:><:or FieldPerm:><:if Article listed:><:ifEq [article listed] "1":>Yes<:or:>In Sections, but not menu<:eif:><:or Article:>No<:eif Article:><:eif FieldPerm:> </td>
+            <td class="help"><:help catalog list:> <:error_img listed:></td>
           </tr>
           <tr> 
-            <th nowrap bgcolor="#FFFFFF" align="left">Link alias: 
-            </th>
-            <td bgcolor="#FFFFFF" width="100%"> 
-            <:ifFieldPerm linkAlias:><input type="text" name="linkAlias" maxlength="<:cfg fields linkAlias_size 255:>" size="40" value="<: old linkAlias article linkAlias :>">
+            <th>Link alias:</th>
+            <td> 
+            <:ifFieldPerm linkAlias:><input type="text" name="linkAlias" maxlength="<:cfg fields linkAlias_size 255:>" size="40" value="<: old linkAlias article linkAlias :>" />
             <:or:><:default linkAlias:><:eif:></td>
-            <td nowrap bgcolor="#FFFFFF"><:help edit linkAlias:> <:error_img linkAlias:></td>
+            <td class="help"><:help edit linkAlias:> <:error_img linkAlias:></td>
           </tr>
                  <tr>
-            <th nowrap="nowrap" bgcolor="#FFFFFF" align="left">Flags:</th>
-            <td bgcolor="#FFFFFF" width="100%"><:iterator begin flags:><:if FieldPerm flags:>
+            <th>Flags:</th>
+            <td><:iterator begin flags:><:if FieldPerm flags:>
               <input type="checkbox" name="flags" value="<:flag id:>" <:ifFlagSet [flag id]:>checked<:or:>
               <:eif:> /><:or FieldPerm:><:ifFlagSet [flag id]:>Yes<:or:>No<:eif:>
               <:eif FieldPerm:><:flag desc:><:iterator separator flags:><br /><:iterator end flags:></td>
-            <td nowrap="nowrap" bgcolor="#FFFFFF"><:help edit flags:> <:error_img flags:></td>
+            <td class="help"><:help edit flags:> <:error_img flags:></td>
           </tr>
           <tr>
-            <th nowrap="nowrap" align="left" bgcolor="#FFFFFF">Page title:</th>
-            <td width="100%" bgcolor="#FFFFFF">
+            <th>Page title:</th>
+            <td>
               <:ifFieldPerm pageTitle:><input type="text" name="pageTitle" value='<:old pageTitle article pageTitle:>' size="60" maxlength="255" /> (alternate title)<:or:><:article pageTitle:><:eif:>
             </td>
-           <td nowrap="nowrap" bgcolor="#FFFFFF"><:help edit pageTitle:> <:error_img pageTitle:></td>
+           <td class="help"><:help edit pageTitle:> <:error_img pageTitle:></td>
           </tr>
           <tr>
-            <th nowrap="nowrap" align="left" bgcolor="#FFFFFF">Meta description:</th>
-            <td width="100%" bgcolor="#FFFFFF">
+            <th>Meta description:</th>
+            <td>
               <:ifFieldPerm metaDescription:><input type="text" name="metaDescription" value='<:old metaDescription article metaDescription:>' size="60" maxlength="255" /><:or:><:article metaDescription:><:eif:>
             </td>
-           <td nowrap="nowrap" bgcolor="#FFFFFF"><:help edit metaDescription:> <:error_img metaDescription:></td>
+           <td class="help"><:help edit metaDescription:> <:error_img metaDescription:></td>
           </tr>
           <tr>
-            <th nowrap="nowrap" align="left" bgcolor="#FFFFFF">Meta keywords:</th>
-            <td width="100%" bgcolor="#FFFFFF">
+            <th>Meta keywords:</th>
+            <td>
               <:ifFieldPerm metaKeywords:><input type="text" name="metaKeywords" value='<:old metaKeywords article metaKeywords:>' size="60" maxlength="255" /> (comma separated)<:or:><:article metaKeywords:><:eif:>
             </td>
-           <td nowrap="nowrap" bgcolor="#FFFFFF"><:help edit metaKeywords:> <:error_img metaKeywords:></td>
+           <td class="help"><:help edit metaKeywords:> <:error_img metaKeywords:></td>
           </tr>
           <tr>
-            <th nowrap="nowrap" align="left" bgcolor="#FFFFFF">Author name:</th>
-            <td width="100%" bgcolor="#FFFFFF" >
+            <th>Author name:</th>
+            <td>
               <:if FieldPerm author:><input type="text" name="author" value='<:ifCfg editor auto_author:><:old author adminuser name:><:or:><:old author:><:eif:>' size="40" maxlength="255" /><:or FieldPerm:><:article author:><:eif FieldPerm:>
             </td>
-            <td nowrap="nowrap" bgcolor="#FFFFFF" ><:help edit author:> <:error_img author:></td>
+            <td class="help"><:help edit author:> <:error_img author:></td>
           </tr>
           <tr> 
-            <th bgcolor="#FFFFFF" nowrap="nowrap" align="left"> Release date: </th>
-            <td bgcolor="#FFFFFF" width="100%"
-              <:if FieldPerm release:><input type="text" name="release" value="<: old release date "%d/%m/%Y" default release :>" size="10" maxlength="10">
+            <th> Release date: </th>
+            <td> 
+              <:if FieldPerm release:><input type="text" name="release" value="<: old release date "%d/%m/%Y" default release :>" size="10" maxlength="10" />
               (dd/mm/yyyy<: ifNew :> - default is today<: or :><: eif :>)<:or FieldPerm:><: date "%d/%m/%Y" article release :><:eif FieldPerm:></td>
-            <td nowrap="nowrap" bgcolor="#FFFFFF"><:help catalog release:> <:error_img release:></td>
+            <td class="help"><:help catalog release:> <:error_img release:></td>
           </tr>
           <tr> 
-            <th bgcolor="#FFFFFF" nowrap="nowrap" align="left"> Expiry date: </th>
-            <td bgcolor="#FFFFFF" width="100%"
-              <:if FieldPerm expire:><input type="text" name="expire" value="<: old expire date "%d/%m/%Y" default expire :>" size="10" maxlength="10">
+            <th> Expiry date: </th>
+            <td> 
+              <:if FieldPerm expire:><input type="text" name="expire" value="<: old expire date "%d/%m/%Y" default expire :>" size="10" maxlength="10" />
               (dd/mm/yyyy - <: ifNew :>default is never, <: or :><: eif :>blank 
               for never expires)<:or FieldPerm:><: date "%d/%m/%Y" article expire :><:eif FieldPerm:></td>
-            <td nowrap="nowrap" bgcolor="#FFFFFF"><:help catalog expire:> <:error_img expire:></td>
+            <td class="help"><:help catalog expire:> <:error_img expire:></td>
           </tr>
           <tr> 
-            <th bgcolor="#FFFFFF" nowrap="nowrap" align="left"> Summary length: </th>
-            <td bgcolor="#FFFFFF" width="100%"
-              <:if FieldPerm summaryLength:><input type="text" name="summaryLength" size="10" maxlength="10" value="<: old summaryLength default summaryLength :>">
+            <th> Summary length: </th>
+            <td> 
+              <:if FieldPerm summaryLength:><input type="text" name="summaryLength" size="10" maxlength="10" value="<: old summaryLength default summaryLength :>" />
               (in characters - default inherited from parent catalog or shop, zero 
               for no summary)<:or FieldPerm:><: article summaryLength :><:eif FieldPerm:></td>
-            <td nowrap="nowrap" bgcolor="#FFFFFF"><:help catalog summary:> <:error_img summaryLength:></td>
+            <td class="help"><:help catalog summary:> <:error_img summaryLength:></td>
           </tr>
           <tr> 
-            <th bgcolor="#FFFFFF" nowrap="nowrap" align="left"> Display threshold: </th>
-            <td bgcolor="#FFFFFF" width="100%"
-              <:ifFieldPerm threshold:><input type="text" name="threshold" size="10" maxlength="10" value="<: old threshold default threshold :>"><:or:><: article threshold :><:eif:>
+            <th> Display threshold: </th>
+            <td> 
+              <:ifFieldPerm threshold:><input type="text" name="threshold" size="10" maxlength="10" value="<: old threshold default threshold :>" /><:or:><: article threshold :><:eif:>
             </td>
-            <td nowrap="nowrap" bgcolor="#FFFFFF"><:help catalog threshold:> <:error_img threshold:></td>
+            <td class="help"><:help catalog threshold:> <:error_img threshold:></td>
           </tr>
           <tr> 
-            <th bgcolor="#FFFFFF" nowrap="nowrap" align="left"> Keywords: </th>
-            <td bgcolor="#FFFFFF" width="100%"
-              <:ifFieldPerm keyword:><input type="text" name="keyword" maxlength="255" size="60" value="<: old keyword default keyword :>"><:or:><: article threshold :><:eif:>
+            <th> Keywords: </th>
+            <td> 
+              <:ifFieldPerm keyword:><input type="text" name="keyword" maxlength="255" size="60" value="<: old keyword default keyword :>" /><:or:><: article threshold :><:eif:>
               (comma separated) </td>
-            <td nowrap="nowrap" bgcolor="#FFFFFF"><:help catalog keywords:> <:error_img keyword:></td>
+            <td class="help"><:help catalog keywords:> <:error_img keyword:></td>
           </tr>
           <tr> 
-            <th nowrap="nowrap" bgcolor="#FFFFFF" align="left">Always Dynamic:</th>
-            <td bgcolor="#FFFFFF" width="100%"
+            <th>Always Dynamic:</th>
+            <td> 
               <:ifFieldPerm force_dynamic:><input type="hidden" name="save_force_dynamic" value="1" /><input type="checkbox" name="force_dynamic" value="1" <:if Article force_dynamic :>checked="checked"<:or Article:><:eif Article:> />
               <:or:><:ifArticle force_dynamic :>Yes<:or Article:>No<:eif Article:><:eif:></td>
-            <td nowrap="nowrap" bgcolor="#FFFFFF"><:help edit keywords:> <:error_img keyword:></td>
+            <td class="help"><:help edit keywords:> <:error_img keyword:></td>
           </tr>
 <:include admin/catalog_custom.tmpl optional:>
           <tr> 
-            <th bgcolor="#FFFFFF" nowrap="nowrap" align="left" valign="top">Thumbnail image:</th>
-            <td width="100%" valign="top" bgcolor="#FFFFFF"
+            <th>Thumbnail image:</th>
+            <td> 
               <:ifFieldPerm thumbImage:>
               <input type="file" name="thumbnail" /><:or:><:eif:>
               <:ifArticle thumbImage:><img src="/images/<:article thumbImage:>"> 
-              <:if FieldPerm thumbImage:><input type="checkbox" name="remove_thumb">
+              <:if FieldPerm thumbImage:><input type="checkbox" name="remove_thumb" />
             Remove<:or FieldPerm:><:eif FieldPerm:><:or:><:eif:></td>
-            <td valign="top" nowrap="nowrap" bgcolor="#FFFFFF"><:help catalog thumb:> <:error_img
+            <td class="help"><:help catalog thumb:> <:error_img
             thumbImage:></td>
           </tr>
           <:if Article id:> 
           <tr> 
-            <th nowrap="nowrap" bgcolor="#FFFFFF" align="left" valign="top"><a name="files"></a>Files:</th>
-            <td nowrap="nowrap" bgcolor="#FFFFFF" width="100%"> <:if Files:> 
-              <table cellpadding="0" cellspacing="0" border="0" bgcolor="#333333">
-                <tr><td> 
-                    <table cellpadding="5" cellspacing="1" border="0">
-                      <tr bgcolor="#FFFFFF"> 
+            <th><a name="files"></a>Files:</th>
+            <td> <:if Files:> 
+              <table class="filelist">
+                      <tr> 
                         <th>Filename</th>
                         <th>Size</th>
                         <th>Type</th>
                         <th>User</th>
                       </tr>
                       <:iterator begin files:> 
-                      <tr bgcolor="#FFFFFF"
-                        <td><:file displayName:></td>
-                        <td align="center"><:kb file sizeInBytes:></td>
-                        <td><:file contentType:></td>
-                        <td align="center"><:ifFile download:>Yes<:or:>No<:eif:></td>
-                        <td align="center"><:ifFile forSale:>Yes<:or:>No<:eif:></td>
-                        <td align="center"><:ifFile requireUser:>Yes<:or:>No<:eif:></td>
+                      <tr> 
+                        <td class="col_displayname"><:file displayName:></td>
+                        <td class="col_size"><:kb file sizeInBytes:></td>
+                        <td class="col_type"><:file contentType:></td>
+                        <td class="col_download"><:ifFile download:>Yes<:or:>No<:eif:></td>
+                        <td class="col_forsale"><:ifFile forSale:>Yes<:or:>No<:eif:></td>
+                        <td class="col_requireuser"><:ifFile requireUser:>Yes<:or:>No<:eif:></td>
                       </tr>
                       <:iterator end files:> 
                     </table>
-              </td></tr></table>
-              <p><a href="<:script:>?filelist=1&id=<:article id:>"><b>Manage Files</b></a>
+              <p><a href="<:script:>?filelist=1&amp;id=<:article id:>"><b>Manage Files</b></a>
               </p>
               <:or Files:>
-              <p>No files are attached to this article. <a href="<:script:>?filelist=1&id=<:article id:>"><b>Manage Files</b></a></p><:eif Files:>
+              <p>No files are attached to this article. <a href="<:script:>?filelist=1&amp;id=<:article id:>"><b>Manage Files</b></a></p><:eif Files:>
             </td>
-            <td nowrap="nowrap" bgcolor="#FFFFFF" valign="top"><:help edit files:> <:error_img
+            <td class="help"><:help edit files:> <:error_img
             files:></td>
           </tr>
           <tr> 
-            <th valign="top" bgcolor="#FFFFFF" nowrap="nowrap" align="left"> Images: 
-            </th>
-            <td align="center" bgcolor="#FFFFFF" width="100%"> <:if Images:> <:iterator begin 
-              images:> <img src="/images/<: image image :>" alt="<:image alt :>" width= 
-              <:image width:> height=<:image height:>> <:iterator separator images:> 
+            <th>Images:</th>
+            <td> <:if Images:> <:iterator begin 
+              images:> <img src="/images/<: image image :>" alt="<:image alt :>" width="<:image width:>" height="<:image height:>" /> <:iterator separator images:> 
               <hr noshade size="1">
               <: iterator end images :>
-              <p align="left"><a href="<:script:>?id=<:article id:>&showimages=1"><b>Manage Images</b></a></p>
-             <:or Images:><p align="left">No images are attached to this article.  <a href="<:script:>?id=<:article id:>&showimages=1"><b>Manage Images</b></a></p>
+              <p><a href="<:script:>?id=<:article id:>&amp;showimages=1"><b>Manage Images</b></a></p>
+             <:or Images:><p>No images are attached to this article.  <a href="<:script:>?id=<:article id:>&amp;showimages=1"><b>Manage Images</b></a></p>
              <:eif Images:>
            </td>
-            <td valign="top" nowrap="nowrap" bgcolor="#FFFFFF"><:help catalog images:> <:error_img
+            <td class="help"><:help catalog images:> <:error_img
             images:></td>
           <:or Article:><:eif Article:> 
         </table>
-      </td>
-    </tr>
-  </table>
 
   <p><: ifNew :>
     <input type="submit" name="save" value="Add Catalog" />
 <:if children:>
 <h2>Products / Sub-catalogs</h2>
 <a name="children"></a> 
-<table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000" width="100%" class="table">
-  <tr>
-      <td>
-      <table border=0 cellpadding="6" cellspacing="1" width="100%">
-        <tr bgcolor="#FFFFFF"> 
-          <th width="30%">Title</th>
-          <th width="70%">Summary</th>
-          <th>Listed</th>
-          <th nowrap="nowrap">Modify</th>
-                 <th nowrap="nowrap">Move</th>
+      <table class="editform children">
+        <tr> 
+          <th class="col_title">Title</th>
+          <th class="col_summry">Summary</th>
+          <th class="col_listed">Listed</th>
+          <th class="col_modify">Modify</th>
+                 <th class="col_move">Move</th>
         </tr>
 <:if UserCan edit_reorder_children:article:>
         <tr> 
-          <td colspan="5" bgcolor="#FFFFFF">Sort by: <a href="/cgi-bin/admin/reorder.pl?parentid=<:article id:>&sort=title&refreshto=/cgi-bin/admin/add.pl?id=<:article id:>">            title</a> | <a href="/cgi-bin/admin/reorder.pl?parentid=<:article id:>&sort=date&refreshto=/cgi-bin/admin/add.pl?id=<:article id:>">date</a> | <a href="/cgi-bin/admin/reorder.pl?parentid=<:article id:>&reverse=1&refreshto=/cgi-bin/admin/add.pl?id=<:article id:>">reverse</a></td>
+          <td colspan="5">Sort by: <a href="/cgi-bin/admin/reorder.pl?parentid=<:article id:>&amp;sort=title&amp;refreshto=/cgi-bin/admin/add.pl?id=<:article id:>">            title</a> | <a href="/cgi-bin/admin/reorder.pl?parentid=<:article id:>&amp;sort=date&amp;refreshto=/cgi-bin/admin/add.pl?id=<:article id:>">date</a> | <a href="/cgi-bin/admin/reorder.pl?parentid=<:article id:>&amp;reverse=1&amp;refreshto=/cgi-bin/admin/add.pl?id=<:article id:>">reverse</a></td>
         </tr>
 <:or UserCan:><:eif UserCan:>
         <:iterator begin children:> 
-        <tr bgcolor="#FFFFFF"
-          <td width="30%"><a href="<:child admin:>"><:child title:></a></td>
-          <td width="70%"><: summary child body :></td>
-          <td align="center"><: is child listed :></td>
-          <td nowrap="nowrap"> <: edit child Edit :> <:if UserCan edit_delete_article:child:><a href="/cgi-bin/admin/add.pl?id=<:child id:>&amp;remove=1&amp;_csrfp=<:csrfp admin_remove_article:>" onClick="return window.confirm('Are you sure you want to delete this <:ifMatch [child generator] "Product":>Product<:or:>Sub-catalog<:eif:>')">Delete</a><:or UserCan:><:eif UserCan:></td>
-             <td nowrap="nowrap"><:movechild:></td>
+        <tr> 
+          <td class="col_title"><a href="<:child admin:>"><:child title:></a></td>
+          <td class="col_summary"><: summary child body :></td>
+          <td class="col_listed"><: is child listed :></td>
+          <td class="col_modify"> <: edit child Edit :> <:if UserCan edit_delete_article:child:><a href="/cgi-bin/admin/add.pl?id=<:child id:>&amp;remove=1&amp;_csrfp=<:csrfp admin_remove_article:>" onClick="return window.confirm('Are you sure you want to delete this <:ifMatch [child generator] "Product":>Product<:or:>Sub-catalog<:eif:>')">Delete</a><:or UserCan:><:eif UserCan:></td>
+             <td class="col_move"><:movechild:></td>
         </tr>
         <:iterator separator children:> <:iterator end children:> 
       </table>
-</td>
-</tr>
-</table>
 <:or children:>
 <:eif children:>
 <:if HaveChildType:>
 <:if New:>
 <:or New:>
 <:if UserCan edit_add_child:article:>
-<p>
 <form action="/cgi-bin/admin/add.pl" method="get">
 <input type="hidden" name="parentid" value="<:article id:>" />
 <input type="hidden" name="type" value="Catalog" />
 
-    <input type="submit" value="Add Sub-catalog">
+    <input type="submit" value="Add Sub-catalog" />
 </form>
 <form action="/cgi-bin/admin/add.pl" method="get">
 <input type="hidden" name="parentid" value="<:article id:>" />
 <input type="hidden" name="parentid" value="<:article id:>" />
 <input type="hidden" name="type" value="Seminar" />
     <input type="submit" value="Add Seminar" />
-</form><:or UserCan:><:eif UserCan:></p>
+</form><:or UserCan:><:eif UserCan:>
 <:eif New:> <:or HaveChildType:> <:eif HaveChildType:> 
-<p><font size="-1">BSE Release <:release:></font></p>
-</body
-></html>
index 78a8c4a..bdce24c 100644 (file)
@@ -1,4 +1,4 @@
-<:wrap admin/xbase.tmpl title=>"Manage Access" :>
+<:wrap admin/base.tmpl title=>"Manage Access" :>
 <h1>Manage Access</h1>
 <:ifMessage:> 
 <p><b><:message:></b></p>
@@ -15,8 +15,8 @@
 <input type="hidden" name="id" value="<:article id:>" />
 <:csrfp admin_save_article hidden:>
 <input type="hidden" name="lastModified" value="<: old lastModified article lastModified :>" />
-<table border="0" cellpadding="6" cellspacing="1">
-  <tr bgcolor="#FFFFFF"
+<table>
+  <tr> 
     <th>Group</th>
     <th>Required</th>
   </tr>
index f968da0..0a16f51 100644 (file)
@@ -1,4 +1,4 @@
-<:wrap admin/xbase.tmpl title=>"[articleType] Options", showtitle=>1, menuitem=>prodopts, js=>"admin_prodopts.js":>
+<:wrap admin/base.tmpl title=>[cat "Options for product: " [article title]], showtitle=>1, menuitem=>prodopts, js=>"admin_prodopts.js":>
 <:ifMessage:><div id="message"><:message:></div><:or:><:eif:>
 <:include admin/product_menu.tmpl:>
 
@@ -8,7 +8,7 @@
 <div id="prodoptmenu">All options:
 <a id="sortoptions" href="<:script:>?a_option_reorder=1&amp;_t=prodopts&amp;id=<:article id:>&amp;_csrfp=<:csrfp admin_move_option:>&amp;option_ids=<:arithmetic join ",", map $_->{id}, sort { lc $a->{name} cmp lc $b->{name} } Products->getByPkey([article id])->db_options:>">Sort</a>
 <a id="reverseoptions" href="<:script:>?a_option_reorder=1&amp;_t=prodopts&amp;id=<:article id:>&amp;_csrfp=<:csrfp admin_move_option:>&amp;option_ids=<:arithmetic join ",", map $_->{id}, reverse Products->getByPkey([article id])->db_options:>">Reverse</a>
-<img src="/images/admin/busy.gif" id="busy_img" style="visibility: hidden" />
+<img src="/images/admin/busy.gif" id="busy_img" style="visibility: hidden" alt="busy" />
 </div>
 <:or UserCan:><:eif UserCan:>
 <div id="productoptions" <:ifUserCan bse_edit_prodopt_move:>class="moveable"<:or:><:eif:>>
@@ -55,6 +55,7 @@
 <input type="hidden" name="_t" value="prodopts" />
 <input type="hidden" name="id" value="<:article id:>" />
 <div class="prodoptmenu">Option: <input type="text" name="name" value="<:old name:>" maxlength="255" class="editor_field" title="Enter the name of your new option here" /><:error_img name:><input type="submit" name="a_add_option" value="Add New Option" class="editor_ok_button" /></div>
+</form>
 <div class="prodoptvalues">
 <div class="valueentry"><input type="text" name="value1" value="<:old value1:>" maxlength="255" class="editor_field" title="Enter some values here" /><:error_img value1:></div>
 <div class="valueentry odd"><input type="text" name="value2" value="<:old value2:>" maxlength="255" class="editor_field" /><:error_img value2:></div>
@@ -67,7 +68,7 @@
 <a href="#" onclick="javascript: document.getElementById('addoptionform').style.display='block'; return false;">Add an option</a>
 </div>
 <:or UserCan:><:eif UserCan:>
-<script>
+<script type="text/javascript">
 
 var prodopts = <:dboptionsjson:>;
 var reorder_values_csrf = '<:csrfp admin_move_option_value:>';
index e390b4f..f7b9b87 100644 (file)
@@ -1,9 +1,8 @@
-<:wrap admin/xbase.tmpl title => "Shop Administration", menuitem=>"edit", showtitle=>"1" :>
+<:wrap admin/base.tmpl title => [cond [ifNew] "Add Product" "Edit Product"], menuitem=>"edit", showtitle=>"1" :>
 <:ifMessage:>
 <p><b><:message:></b></p>
 <:or:><:eif:> 
 <:include admin/product_menu.tmpl:>
-  <h2><:ifNew:>Add Product<:or:>Product Details<:eif:></h2>
 <:ifNew:><:or:><:if Or [iadminuser_count] [iadmingroup_count]:>
       <form action="/cgi-bin/admin/adminusers.pl">
   <input type="hidden" name="id" value="<: article id:>" />
@@ -26,7 +25,7 @@
           </tr>
         </table>
       </form>
-<br>
+<br />
 <:or Or:><:eif Or:><:eif:>
 <form action="<:script:>" enctype="multipart/form-data" method="post">
     <input type="hidden" name="lastModified" value="<:article lastModified:>" />
@@ -43,7 +42,7 @@
           </tr>
                  <tr> 
             <th>Title:</th>
-            <td><:ifFieldPerm title:><input type="text" name="title" value="<:old title default title:>" size="60"><:or:><:product title:><:eif:> </td>
+            <td><:ifFieldPerm title:><input type="text" name="title" value="<:old title default title:>" size="60" /><:or:><:product title:><:eif:> </td>
             <td class="help"><:help product title:> <:error_img title:></td>
           </tr>
           <:if Cfg "title alias" [concatenate level [article level]]:><tr>
           </tr><:or Cfg:><:eif Cfg:>
           <tr> 
             <th>Summary:</th>
-            <td><:ifFieldPerm summary:><input type="text" name="summary" value="<:old summary default summary:>" size=60><:or:><:product summary:><:eif:> </td>
+            <td><:ifFieldPerm summary:><input type="text" name="summary" value="<:old summary default summary:>" size="60" /><:or:><:product summary:><:eif:> </td>
             <td class="edit"><:help product summary:> <:error_img
             summary:></td>
           </tr>
           <tr> 
             <th>Description:</th>
-            <td><:ifFieldPerm description:><input type="text" name="description" value="<:old description default description:>" size=60><:or:><:product description:><:eif:> </td>
+            <td><:ifFieldPerm description:><input type="text" name="description" value="<:old description default description:>" size="60" /><:or:><:product description:><:eif:> </td>
             <td class="help"><:help product description:> <:error_img
             description:></td>
           </tr>
           <tr> 
             <th>Product Code:</th>
-            <td><:ifFieldPerm product_code:><input type="text" name="product_code" value="<:old product_code default product_code:>" size=60><:or:><:product product_code:><:eif:> </td>
+            <td><:ifFieldPerm product_code:><input type="text" name="product_code" value="<:old product_code default product_code:>" size="60" /><:or:><:product product_code:><:eif:> </td>
             <td class="help"><:help product product_code:> <:error_img
             product_code:></td>
           </tr>
           <tr> 
             <th> Body:</th>
             <td> 
-              <:ifFieldPerm body:><textarea name="body" rows="15" cols="60" wrap="virtual"><:old body default body:></textarea><:or:><:bodytext product body:><:eif:>
+              <:ifFieldPerm body:><textarea name="body" rows="15" cols="60" ><:old body default body:></textarea><:or:><:bodytext product body:><:eif:>
             </td>
             <td class="help"><:help body body:> <:error_img
             body:></td>
           <tr> 
             <th>Link alias:</th>
             <td> 
-            <:ifFieldPerm linkAlias:><input type="text" name="linkAlias" maxlength="<:cfg fields linkAlias_size 255:>" size="40" value="<: old linkAlias article linkAlias :>">
+            <:ifFieldPerm linkAlias:><input type="text" name="linkAlias" maxlength="<:cfg fields linkAlias_size 255:>" size="40" value="<: old linkAlias article linkAlias :>" />
             <:or:><:default linkAlias:><:eif:></td>
             <td class="help"><:help edit linkAlias:> <:error_img linkAlias:></td>
           </tr>
                  <tr>
             <th>Flags:</th>
             <td><:iterator begin flags:><:if FieldPerm flags:>
-              <input type="checkbox" name="flags" value="<:flag id:>" <:ifFlagSet [flag id]:>checked<:or:>
+              <input type="checkbox" name="flags" value="<:flag id:>" <:ifFlagSet [flag id]:>checked="checked"<:or:>
               <:eif:> /><:or FieldPerm:><:ifFlagSet [flag id]:>Yes<:or:>No<:eif:>
               <:eif FieldPerm:><:flag desc:><:iterator separator flags:><br /><:iterator end flags:></td>
             <td class="help"><:help edit flags:> <:error_img flags:></td>
           </tr>
           <tr>
             <th>Weight:</th>
-            <td><:ifFieldPerm weight:><input type="text" name="weight" value="<:old weight default weight:>" size=7><:or:><:product weight:><:eif:> grams</td>
+            <td><:ifFieldPerm weight:><input type="text" name="weight" value="<:old weight default weight:>" size="7" /><:or:><:product weight:><:eif:> grams</td>
             <td class="help"><:help product weight:> <:error_img weight:></td>
           </tr>
           <tr>
             <th>Length:</th>
-            <td><:ifFieldPerm length:><input type="text" name="length" value="<:old length default length:>" size=7><:or:><:product length:><:eif:> mm</td>
+            <td><:ifFieldPerm length:><input type="text" name="length" value="<:old length default length:>" size="7" /><:or:><:product length:><:eif:> mm</td>
             <td class="help"><:help product length:> <:error_img length:></td>
           </tr>
           <tr>
             <th>Width:</th>
-            <td><:ifFieldPerm width:><input type="text" name="width" value="<:old width default width:>" size=7><:or:><:product width:><:eif:> mm</td>
+            <td><:ifFieldPerm width:><input type="text" name="width" value="<:old width default width:>" size="7" /><:or:><:product width:><:eif:> mm</td>
             <td class="help"><:help product width:> <:error_img width:></td>
           </tr>
           <tr>
             <th>Height</th>
-            <td><:ifFieldPerm height:><input type="text" name="height" value="<:old height default height:>" size=7><:or:><:product height:><:eif:> mm</td>
+            <td><:ifFieldPerm height:><input type="text" name="height" value="<:old height default height:>" size="7" /><:or:><:product height:><:eif:> mm</td>
             <td class="help"><:help product height:> <:error_img height:></td>
           </tr>
           <tr> 
                       </tr>
                       <:iterator end files:> 
                     </table>
-              <p><a href="<:script:>?filelist=1&id=<:article id:>"><b>Manage Files</b></a>
+              <p><a href="<:script:>?filelist=1&amp;id=<:article id:>"><b>Manage Files</b></a>
               </p>
               <:or Files:>
-              No files are attached to this article. <a href="<:script:>?filelist=1&id=<:article id:>"><b>Manage Files</b></a><:eif Files:>
+              No files are attached to this article. <a href="<:script:>?filelist=1&amp;id=<:article id:>"><b>Manage Files</b></a><:eif Files:>
             </td>
             <td class="help"><:help product 
               files:> <:error_img files:></td>
               <:image width:> height=<:image height:>> <:iterator separator images:> 
               <hr noshade size="1">
               <: iterator end images :>
-              <p align="left"><a href="<:script:>?id=<:article id:>&showimages=1"><b>Manage Images</b></a></p>
-             <:or Images:>No images are attached to this article.  <a href="<:script:>?id=<:article id:>&showimages=1"><b>Manage Images</b></a>
+              <p align="left"><a href="<:script:>?id=<:article id:>&amp;showimages=1"><b>Manage Images</b></a></p>
+             <:or Images:>No images are attached to this article.  <a href="<:script:>?id=<:article id:>&amp;showimages=1"><b>Manage Images</b></a>
              <:eif Images:>
             </td>
             <td class="help"><:help product images:> <:error_img
             </td>
             <td class="help"><:help product subscription_id:></td>
           </tr>
-        </table>
-  <p><font size="-1">*These fields cannot be modified once this product has been
-      included in an order.</font></p>
+  <tr><td colspan="3">*These fields cannot be modified once this product has been
+      included in an order.</td></tr>
   <:if UserCan edit_save:article:>
-  <p>
-    <:ifNew:><input type="submit" name="save" value="Add Product" /><:or:><input type="submit" name="save" value="Update Product" /><:eif:>
-  </p><:or UserCan:><:eif UserCan:>
+  <tr>
+    <td colspan="3" class="buttons"><:ifNew:><input type="submit" name="save" value="Add Product" /><:or:><input type="submit" name="save" value="Update Product" /><:eif:>
+  </td></tr><:or UserCan:><:eif UserCan:>
+        </table>
 </form>
-
-<p><font size="-1">BSE Release <:release:></font></p>
-</body>
-</html>
index b9a299c..221fad7 100644 (file)
@@ -1,7 +1,4 @@
-<html><head><title><:ifNew:>Add<:or:>Edit<:eif:> seminar - Shop administration</title>
-  <link rel="stylesheet" type="text/css" href="/css/admin.css">
-</head>
-<body>
+<:wrap admin/base.tmpl title => "Edit Seminar":>
 <h1>Shop Administration</h1>
 <:ifMessage:>
 <p><b><:message:></b></p>
@@ -11,9 +8,9 @@
      parent</a> 
   |<:eif New:> <a href="/cgi-bin/admin/shopadmin.pl">Manage catalogs</a> |<:if
   New:><:or New:><:if UserCan edit_save:seminar,edit_field_edit_listed:seminar
-   :> <a href="/cgi-bin/admin/add.pl?id=<:seminar id:>&_t=steps">Manage
-      step parents</a> | <:if Seminar listed:> <a href="<:script:>?id=<:seminar id:>&hide=1&r=<:script:>?id=<:seminar id:>">Hide
-      seminar</a> |<:or Seminar:> <a href="<:script:>?id=<:seminar id:>&unhide=1&r=<:script:>?id=<:seminar id:>">Show
+   :> <a href="/cgi-bin/admin/add.pl?id=<:seminar id:>&amp;_t=steps">Manage
+      step parents</a> | <:if Seminar listed:> <a href="<:script:>?id=<:seminar id:>&amp;hide=1&amp;r=<:script:>?id=<:seminar id:>">Hide
+      seminar</a> |<:or Seminar:> <a href="<:script:>?id=<:seminar id:>&amp;unhide=1&amp;r=<:script:>?id=<:seminar id:>">Show
       seminar</a> |<:eif Seminar:><:or UserCan:><:eif UserCan:><:ifSeminar listed:><:or:> Hidden<:eif:>
 <a href="<:script:>?id=<:seminar id:>&amp;_t=semsessions">Manage Sessions</a> |
 <a href="<:script:>?id=<:article id:>&amp;_t=groups">Manage access</a> |
 <:ifNew:><:or:><:if Or [iadminuser_count] [iadmingroup_count]:>
       <form action="/cgi-bin/admin/adminusers.pl">
   <input type="hidden" name="id" value="<: article id:>" />
-  <table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000" class="table">
-  <tr>
-    <td>
-        <table cellpadding="6" cellspacing="1" border="0" width="100%">
+        <table>
           <tr>
-            <th nowrap="nowrap">
-
-        <font size="2">Manage access:</font>
-        </th>
-            <td bgcolor="#FFFFFF">
+            <th>Manage access:</th>
+            <td>
               <select name="adminid">
 <:iterator begin adminusers:>
 <option value="<:iadminuser id:>">User <:iadminuser logon:>
 <option value="<:iadmingroup id:>">Group <:iadmingroup name:>
 </option><:iterator end admingroups:>
               </select>
-              <input type="submit" name="a_showobjectart" value="Manage">
+              <input type="submit" name="a_showobjectart" value="Manage" />
       </td>
-            <td bgcolor="#FFFFFF"><:help access manage:>
+            <td class="help"><:help access manage:>
         </td>
           </tr>
         </table>
-    </td>
-   </tr>
-  </table>
       </form>
-<br>
+<br />
 <:or Or:><:eif Or:><:eif:>
 <form action="<:script:>" enctype="multipart/form-data" method="post">
   <input type="hidden" name="lastModified" value="<: old lastModified article lastModified :>" />
   <input type="hidden" name="id" value="<:seminar id:>" />
   <input type="hidden" name="type" value="Seminar" />
 <:ifNew:><:csrfp admin_add_article hidden:><:or:><:csrfp admin_save_article hidden:><:eif:>
-  <table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000" class="table">
-    <tr>
-      <td>
-        <table border=0 cellpadding="6" cellspacing="1" width="100%">
-                    <tr> 
-            <th align="left" bgcolor="#FFFFFF">Catalog:</th>
-            <td bgcolor="#FFFFFF">
-<:ifFieldPerm parentid:><select name="parentid"><:list:></select><:or:><:parent title:> (<:parent id:>)<:eif:></td>
-            <td nowrap="nowrap" bgcolor="#FFFFFF"><:help product catalog:> <:error_img
-              parentid:></td>
-          </tr>
-                 <tr> 
-            <th align="left" bgcolor="#FFFFFF">Title*:</th>
-            <td bgcolor="#FFFFFF"><:ifFieldPerm title:><input type="text" name="title" value="<:old title default title:>" size="60" /><:or:><:seminar title:><:eif:> </td>
-            <td nowrap="nowrap" bgcolor="#FFFFFF"><:help product title:> <:error_img title:></td>
-          </tr>
+          <table class="editform">
+            <tr> 
+              <th>Catalog:</th>
+              <td>
+               <:ifFieldPerm parentid:><select name="parentid"><:list:></select><:or:><:parent title:> (<:parent id:>)<:eif:></td>
+              <td class="help"><:help product catalog:> <:error_img parentid:></td>
+            </tr>
+           <tr> 
+              <th>Title*:</th>
+              <td><:ifFieldPerm title:><input type="text" name="title" value="<:old title default title:>" size="60" /><:or:><:seminar title:><:eif:> </td>
+              <td class="help"><:help product title:> <:error_img title:></td>
+            </tr>
           <:if Cfg "title alias" [concatenate level [article level]]:><tr>
-            <th nowrap="nowrap" bgcolor="#FFFFFF" align="left">Alias:</th>
-            <td bgcolor="#FFFFFF" width="100%">
+            <th>Alias:</th>
+            <td>
               <:if FieldPerm titleAlias:><input type="text" name="titleAlias" maxlength="<:cfg fields alias_size 60:>" size="60" value="<:old titleAlias article titleAlias:>" /><:or FieldPerm:><:article titleAlias:><:eif FieldPerm:>
             </td>
-            <td nowrap="nowrap" bgcolor="#FFFFFF"><:help edit titleAlias:> <:error_img titleAlias:></td>
+            <td class="help"><:help edit titleAlias:> <:error_img titleAlias:></td>
           </tr><:or Cfg:><:eif Cfg:>
           <tr> 
-            <th nowrap="nowrap" align="left" bgcolor="#FFFFFF">Summary:</th>
-            <td nowrap="nowrap" bgcolor="#FFFFFF"><:ifFieldPerm summary:><input type="text" name="summary" value="<:old summary default summary:>" size="60" /><:or:><:seminar summary:><:eif:> </td>
-            <td nowrap="nowrap" bgcolor="#FFFFFF"><:help product summary:> <:error_img
+            <th>Summary:</th>
+            <td><:ifFieldPerm summary:><input type="text" name="summary" value="<:old summary default summary:>" size="60" /><:or:><:seminar summary:><:eif:> </td>
+            <td class="help"><:help product summary:> <:error_img
             summary:></td>
           </tr>
           <tr> 
-            <th nowrap="nowrap" align="left" bgcolor="#FFFFFF">Description:</th>
-            <td nowrap="nowrap" bgcolor="#FFFFFF"><:ifFieldPerm description:><input type="text" name="description" value="<:old description default description:>" size="60" /><:or:><:seminar description:><:eif:> </td>
-            <td nowrap="nowrap" bgcolor="#FFFFFF"><:help product description:> <:error_img
+            <th>Description*:</th>
+            <td><:ifFieldPerm description:><input type="text" name="description" value="<:old description default description:>" size="60" /><:or:><:seminar description:><:eif:> </td>
+            <td class="help"><:help product description:> <:error_img
             description:></td>
           </tr>
           <tr> 
-            <th nowrap="nowrap" align="left" bgcolor="#FFFFFF">Product Code:</th>
-            <td nowrap="nowrap" bgcolor="#FFFFFF"><:ifFieldPerm product_code:><input type="text" name="product_code" value="<:old product_code default product_code:>" size=60><:or:><:product product_code:><:eif:> </td>
-            <td  nowrap="nowrap" bgcolor="#FFFFFF"><:help product product_code:> <:error_img
+            <th>Product Code:</th>
+            <td><:ifFieldPerm product_code:><input type="text" name="product_code" value="<:old product_code default product_code:>" size="60" /><:or:><:product product_code:><:eif:> </td>
+            <td class="help"><:help product product_code:> <:error_img
             product_code:></td>
           </tr>
           <tr> 
-            <th align="left" bgcolor="#FFFFFF" valign="top"> Body:</th>
-            <td bgcolor="#FFFFFF"
-              <:ifFieldPerm body:><textarea name="body" rows="15" cols="60" wrap="virtual"><:old body default body:></textarea><:or:><:bodytext seminar body:><:eif:>
+            <th> Body:</th>
+            <td> 
+              <:ifFieldPerm body:><textarea name="body" rows="15" cols="60"><:old body default body:></textarea><:or:><:bodytext seminar body:><:eif:>
             </td>
-            <td nowrap="nowrap" bgcolor="#FFFFFF" valign="top"><:help body body:> <:error_img body:></td>
+            <td class="help"><:help body body:> <:error_img body:></td>
           </tr>
                  <tr> 
-            <th nowrap="nowrap" align="left" bgcolor="#FFFFFF"><:cfg "seminar fields" duration "Duration":>:</th>
-            <td nowrap="nowrap" bgcolor="#FFFFFF"><:ifFieldPerm duration:><input type="text" name="duration" value="<:old duration default duration:>" size="10" /> minutes<:or:><:seminar duration:><:eif:></td>
-            <td nowrap="nowrap" bgcolor="#FFFFFF"><:help product duration:> <:error_img duration:></td>
+            <th><:cfg "seminar fields" duration "Duration":>:</th>
+            <td><:ifFieldPerm duration:><input type="text" name="duration" value="<:old duration default duration:>" size="10" /> minutes<:or:><:seminar duration:><:eif:></td>
+            <td class="help"><:help product duration:> <:error_img duration:></td>
           </tr>
           <:if Cfgsection [concatenate level [article level] " menus"]:><tr> 
-            <th nowrap="nowrap" bgcolor="#FFFFFF" align="left">Menu:</th>
-            <td bgcolor="#FFFFFF" width="100%"
+            <th>Menu:</th>
+            <td> 
               <:if FieldPerm menu:><select name="menu" id="menu">
                 <:iterator begin cfgsection [concatenate level [article level] " menus"] sort=key:><option value="<:cfgentry key:>"<:if Eq [old menu] [cfgentry key]:> selected="selected"<:or Eq:><:eif Eq:>><:cfgentry value:></option><:iterator separator cfgsection:>
                 <:iterator end cfgsection:>
               </select><:or FieldPerm:><:article menu:><:eif FieldPerm:>
             </td>
-            <td nowrap="nowrap" bgcolor="#FFFFFF"><:help article menu:> <:error_img menu:></td>
+            <td><:help article menu:> <:error_img menu:></td>
           </tr><:or Cfgsection:><:eif Cfgsection:>
                  <tr> 
-            <th nowrap="nowrap" align="left" bgcolor="#FFFFFF">Template:</th>
-            <td nowrap="nowrap" bgcolor="#FFFFFF"><:ifFieldPerm template:><:templates:><:or:><:seminar template:><:eif:></td>
-            <td nowrap="nowrap" bgcolor="#FFFFFF"><:help product template:> <:error_img template:></td>
+            <th>Template:</th>
+            <td><:ifFieldPerm template:><:templates:><:or:><:seminar template:><:eif:></td>
+            <td class="help"><:help product template:> <:error_img template:></td>
           </tr>
                  <tr> 
-            <th nowrap="nowrap" bgcolor="#FFFFFF" align="left">List article:</th>
-            <td bgcolor="#FFFFFF" width="100%"> <:if FieldPerm listed:><:list listed:><:or FieldPerm:><:if Article listed:><:ifEq [article listed] "1":>Yes<:or:>In Sections, but not menu<:eif:><:or Article:>No<:eif Article:><:eif FieldPerm:> </td>
-            <td bgcolor="#FFFFFF"><:help edit listed:> <:error_img listed:></td>
+            <th>List article:</th>
+            <td> <:if FieldPerm listed:><:list listed:><:or FieldPerm:><:if Article listed:><:ifEq [article listed] "1":>Yes<:or:>In Sections, but not menu<:eif:><:or Article:>No<:eif Article:><:eif FieldPerm:> </td>
+            <td class="help"><:help edit listed:> <:error_img listed:></td>
           </tr>
           <tr> 
-            <th nowrap bgcolor="#FFFFFF" align="left">Link alias: 
+            <th>Link alias: 
             </th>
-            <td bgcolor="#FFFFFF" width="100%"
-            <:ifFieldPerm linkAlias:><input type="text" name="linkAlias" maxlength="<:cfg fields linkAlias_size 255:>" size="40" value="<: old linkAlias article linkAlias :>">
+            <td> 
+            <:ifFieldPerm linkAlias:><input type="text" name="linkAlias" maxlength="<:cfg fields linkAlias_size 255:>" size="40" value="<: old linkAlias article linkAlias :>" />
             <:or:><:default linkAlias:><:eif:></td>
-            <td nowrap bgcolor="#FFFFFF"><:help edit linkAlias:> <:error_img linkAlias:></td>
+            <td class="help"><:help edit linkAlias:> <:error_img linkAlias:></td>
           </tr>
                  <tr>
-            <th nowrap="nowrap" bgcolor="#FFFFFF" align="left">Flags:</th>
-            <td bgcolor="#FFFFFF" width="100%"><:iterator begin flags:><:if FieldPerm flags:>
+            <th>Flags:</th>
+            <td><:iterator begin flags:><:if FieldPerm flags:>
               <input type="checkbox" name="flags" value="<:flag id:>" <:ifFlagSet [flag id]:>checked<:or:>
               <:eif:> /><:or FieldPerm:><:ifFlagSet [flag id]:>Yes<:or:>No<:eif:>
               <:eif FieldPerm:><:flag desc:><:iterator separator flags:><br /><:iterator end flags:></td>
-            <td bgcolor="#FFFFFF"><:help edit flags:> <:error_img flags:></td>
+            <td class="help"><:help edit flags:> <:error_img flags:></td>
           </tr>
           <tr>
-            <th nowrap="nowrap" align="left" bgcolor="#FFFFFF">Page title:</th>
-            <td width="100%" bgcolor="#FFFFFF">
+            <th>Page title:</th>
+            <td>
               <:ifFieldPerm pageTitle:><input type="text" name="pageTitle" value='<:old pageTitle article pageTitle:>' size="60" maxlength="255" /> (alternate title)<:or:><:article pageTitle:><:eif:>
             </td>
-           <td nowrap="nowrap" bgcolor="#FFFFFF"><:help edit pageTitle:> <:error_img pageTitle:></td>
+           <td class="help"><:help edit pageTitle:> <:error_img pageTitle:></td>
           </tr>
           <tr>
-            <th nowrap="nowrap" align="left" bgcolor="#FFFFFF">Meta description:</th>
-            <td width="100%" bgcolor="#FFFFFF">
+            <th>Meta description:</th>
+            <td>
               <:ifFieldPerm metaDescription:><input type="text" name="metaDescription" value='<:old metaDescription article metaDescription:>' size="60" maxlength="255" /><:or:><:article metaDescription:><:eif:>
             </td>
-           <td nowrap="nowrap" bgcolor="#FFFFFF"><:help edit metaDescription:> <:error_img metaDescription:></td>
+           <td class="help"><:help edit metaDescription:> <:error_img metaDescription:></td>
           </tr>
           <tr>
-            <th nowrap="nowrap" align="left" bgcolor="#FFFFFF">Meta keywords:</th>
-            <td width="100%" bgcolor="#FFFFFF">
+            <th>Meta keywords:</th>
+            <td>
               <:ifFieldPerm metaKeywords:><input type="text" name="metaKeywords" value='<:old metaKeywords article metaKeywords:>' size="60" maxlength="255" /> (comma separated)<:or:><:article metaKeywords:><:eif:>
             </td>
-           <td nowrap="nowrap" bgcolor="#FFFFFF"><:help edit metaKeywords:> <:error_img metaKeywords:></td>
+           <td class="help"><:help edit metaKeywords:> <:error_img metaKeywords:></td>
           </tr>
           <tr>
-            <th nowrap="nowrap" align="left" bgcolor="#FFFFFF">Author name:</th>
-            <td width="100%" bgcolor="#FFFFFF" >
+            <th>Author name:</th>
+            <td>
               <:if FieldPerm author:><input type="text" name="author" value='<:ifCfg editor auto_author:><:old author adminuser name:><:or:><:old author:><:eif:>' size="40" maxlength="255" /><:or FieldPerm:><:article author:><:eif FieldPerm:>
             </td>
-            <td nowrap="nowrap" bgcolor="#FFFFFF" ><:help edit author:> <:error_img author:></td>
+            <td class="help"><:help edit author:> <:error_img author:></td>
           </tr>
           <tr> 
-            <th nowrap="nowrap" align="left" bgcolor="#FFFFFF">Lead time:</th>
-            <td nowrap="nowrap" bgcolor="#FFFFFF"
+            <th>Lead time:</th>
+            <td> 
               <:ifFieldPerm leadTime:>
-              <input type="text" name="leadTime" value="<:old leadTime default leadTime:>" size="5"><:or:><:seminar leadTime:><:eif:>
+              <input type="text" name="leadTime" value="<:old leadTime default leadTime:>" size="5" /><:or:><:seminar leadTime:><:eif:>
               days</td>
-            <td nowrap="nowrap" bgcolor="#FFFFFF"><:help product leadtime:> <:error_img leadTime:></td>
+            <td class="help"><:help product leadtime:> <:error_img leadTime:></td>
           </tr>
           <tr> 
-            <th align="left" bgcolor="#FFFFFF"><:cfg "product fields" retailPrice "Retail price":>:</th>
-            <td bgcolor="#FFFFFF">$ 
-              <:ifFieldPerm retailPrice:><input type="text" name="retailPrice" value="<:old retailPrice money default retailPrice:>" size="7">
+            <th><:cfg "product fields" retailPrice "Retail price":>:</th>
+            <td>$ 
+              <:ifFieldPerm retailPrice:><input type="text" name="retailPrice" value="<:old retailPrice money default retailPrice:>" size="7" />
               (0.00)<:or:><:money seminar retailPrice:><:eif:> </td>
-            <td nowrap="nowrap" bgcolor="#FFFFFF"><:help product retail:> <:error_img retailPrice:></td>
+            <td class="help"><:help product retail:> <:error_img retailPrice:></td>
           </tr>
           <tr> 
-            <th align="left" bgcolor="#FFFFFF">Wholesale price:</th>
-            <td bgcolor="#FFFFFF">$ 
-              <:ifFieldPerm wholesalePrice:><input type="text" name="wholesalePrice" value="<:old wholesalePrice money default wholesalePrice:>" size="7">
+            <th>Wholesale price:</th>
+            <td>$ 
+              <:ifFieldPerm wholesalePrice:><input type="text" name="wholesalePrice" value="<:old wholesalePrice money default wholesalePrice:>" size="7" />
               (0.00)<:or:><:money seminar wholesalePrice:><:eif:></td>
-            <td nowrap="nowrap" bgcolor="#FFFFFF"><:help product wholesale:> <:error_img wholesalePrice:></td>
+            <td class="help"><:help product wholesale:> <:error_img wholesalePrice:></td>
           </tr>
           <tr> 
-            <th align="left" bgcolor="#FFFFFF">GST:</th>
-            <td bgcolor="#FFFFFF">$ 
+            <th>GST:</th>
+            <td>$ 
               <:ifFieldPerm gst:><input type="text" name="gst" value="<:old gst money default gst:>" size="7" />
               (0.00)<:or:><:money seminar gst:><:eif:></td>
-            <td nowrap="nowrap" bgcolor="#FFFFFF"><:help product gst:> <:error_img gst:></td>
+            <td class="help"><:help product gst:> <:error_img gst:></td>
           </tr>
           <tr> 
-            <th align="left" bgcolor="#FFFFFF">Release date:</th>
-            <td bgcolor="#FFFFFF"
+            <th>Release date:</th>
+            <td> 
               <:ifFieldPerm release:><input type="text" name="release" value="<:old release date "%d/%m/%Y" default release:>" size="11" />
               (dd/mm/yyyy)<:or:><:date "%d/%m/%Y" seminar release:><:eif:></td>
-            <td nowrap="nowrap" bgcolor="#FFFFFF"><:help product release:> <:error_img release:></td>
+            <td class="help"><:help product release:> <:error_img release:></td>
           </tr>
           <tr> 
-            <th align="left" bgcolor="#FFFFFF">Expiry date:</th>
-            <td bgcolor="#FFFFFF"
+            <th>Expiry date:</th>
+            <td> 
               <:ifFieldPerm expire:><input type="text" name="expire" value="<:old expire date "%d/%m/%Y" default expire:>" size="11" />
               (dd/mm/yyyy)<:or:><:date "%d/%m/%Y" seminar expire:><:eif:></td>
-            <td nowrap="nowrap" bgcolor="#FFFFFF"><:help product expire:> <:error_img expire:></td>
+            <td class="help"><:help product expire:> <:error_img expire:></td>
           </tr>
           <tr> 
-            <th nowrap="nowrap" align="left" bgcolor="#FFFFFF">Summary length:</th>
-            <td nowrap="nowrap" bgcolor="#FFFFFF"
+            <th>Summary length:</th>
+            <td> 
               <:ifFieldPerm summaryLength:><input type="text" name="summaryLength" size="10" maxlength="10" value="<:old summaryLength default summaryLength:>" /><:or:><:seminar summaryLength:><:eif:>
             </td>
-            <td nowrap="nowrap" bgcolor="#FFFFFF"><:help product summary:> <:error_img summaryLength:></td>
+            <td class="help"><:help product summary:> <:error_img summaryLength:></td>
           </tr>
           <tr> 
-            <th nowrap="nowrap" align="left" bgcolor="#FFFFFF">Display threshold:</th>
-            <td nowrap="nowrap" bgcolor="#FFFFFF"
+            <th>Display threshold:</th>
+            <td> 
               <:ifFieldPerm threshold:><input type="text" name="threshold" size="10" maxlength="10" value="<:old threshold default threshold:>" /><:or:><:seminar threshold:><:eif:>
             </td>
-            <td nowrap="nowrap" bgcolor="#FFFFFF"><:help product threshold:> <:error_img threshold:></td>
+            <td class="help"><:help product threshold:> <:error_img threshold:></td>
           </tr>
           <tr> 
-            <th align="left" bgcolor="#FFFFFF">Options:</th>
-            <td bgcolor="#FFFFFF"
-              <:ifFieldPerm options:><input type="text" name="options" value="<:old options default options:>" size="30">
+            <th>Options:</th>
+            <td> 
+              <:ifFieldPerm options:><input type="text" name="options" value="<:old options default options:>" size="30" />
               (<:alloptions:>)<:or:><:seminar options:><:eif:> </td>
-            <td bgcolor="#FFFFFF"><:help product options:> <:error_img options:></td>
+            <td class="help"><:help product options:> <:error_img options:></td>
           </tr>
           <tr> 
-            <th bgcolor="#FFFFFF" nowrap="nowrap" align="left"> Keywords: </th>
-            <td bgcolor="#FFFFFF" width="100%"> 
-              <:ifFieldPerm keyword:><input type="text" name="keyword" maxlength="255" size="60" value="<: old keyword default keyword :>"><:or:><: article threshold :><:eif:>
+            <th> Keywords: </th>
+            <td width="100%"> 
+              <:ifFieldPerm keyword:><input type="text" name="keyword" maxlength="255" size="60" value="<: old keyword default keyword :>" /><:or:><: article threshold :><:eif:>
               (comma separated) </td>
-            <td nowrap="nowrap" bgcolor="#FFFFFF"><:help catalog keywords:> <:error_img keyword:></td>
+            <td class="help"><:help catalog keywords:> <:error_img keyword:></td>
           </tr>
           <tr> 
-            <th nowrap="nowrap" bgcolor="#FFFFFF" align="left">Always Dynamic:</th>
-            <td bgcolor="#FFFFFF" width="100%"> 
+            <th>Always Dynamic:</th>
+            <td width="100%"> 
               <:ifFieldPerm force_dynamic:><input type="hidden" name="save_force_dynamic" value="1" /><input type="checkbox" name="force_dynamic" value="1" <:if Article force_dynamic :>checked="checked"<:or Article:><:eif Article:> />
               <:or:><:ifArticle force_dynamic :>Yes<:or Article:>No<:eif Article:><:eif:></td>
-            <td nowrap="nowrap" bgcolor="#FFFFFF"><:help edit keywords:> <:error_img keyword:></td>
+            <td class="help"><:help edit keywords:> <:error_img keyword:></td>
           </tr>
 <:include admin/seminar_custom.tmpl optional:>
           <tr> 
-            <th nowrap="nowrap" align="left" bgcolor="#FFFFFF" valign="top">Thumbnail image:</th>
-            <td nowrap="nowrap" bgcolor="#FFFFFF"
+            <th>Thumbnail image:</th>
+            <td> 
               <:ifFieldPerm thumbImage:><input type="file" name="thumbnail" /><:or:><:eif:>
               <:ifSeminar thumbImage:><img src="/images/<:seminar thumbImage:>" /> 
               <:if FieldPerm thumbImage:><input type="checkbox" name="remove_thumb" />
               Remove<:or FieldPerm:><:eif FieldPerm:><:or:><:eif:> </td>
-            <td nowrap="nowrap" bgcolor="#FFFFFF" valign="top"><:help product thumb:> <:error_img
-            thumbImage:></td>
+            <td class="help"><:help product thumb:> <:error_img thumbImage:></td>
           </tr>
                  <:if Article id:>
           <tr> 
-            <th nowrap="nowrap" align="left" bgcolor="#FFFFFF" valign="top"><a name="files"></a>Files:</th>
-            <td nowrap="nowrap" bgcolor="#FFFFFF"> <:if Files:> 
-              <table cellpadding="0" cellspacing="0" border="0" bgcolor="#333333">
-                <tr> 
-                  <td> 
-                    <table cellpadding="5" cellspacing="1" border="0">
-                      <tr bgcolor="#FFFFFF"> 
+            <th valign="top"><a name="files"></a>Files:</th>
+            <td> <:if Files:> 
+                    <table>
+                      <tr> 
                         <th>Filename</th>
                         <th>Size</th>
                         <th>Type</th>
                         <th>User</th>
                       </tr>
                       <:iterator begin files:> 
-                      <tr bgcolor="#FFFFFF"
+                      <tr> 
                         <td><:file displayName:></td>
                         <td align="center"><:kb file sizeInBytes:></td>
                         <td><:file contentType:></td>
                       </tr>
                       <:iterator end files:> 
                     </table>
-                  </td>
-                </tr>
-              </table>
-              <p><a href="<:script:>?filelist=1&id=<:article id:>"><b>Manage Files</b></a>
+              <p><a href="<:script:>?filelist=1&amp;id=<:article id:>"><b>Manage Files</b></a>
               </p>
               <:or Files:>
-              <p>No files are attached to this article. <a href="<:script:>?filelist=1&id=<:article id:>"><b>Manage Files</b></a></p><:eif Files:>
+              <p>No files are attached to this article. <a href="<:script:>?filelist=1&amp;id=<:article id:>"><b>Manage Files</b></a></p><:eif Files:>
             </td>
-            <td nowrap="nowrap" bgcolor="#FFFFFF" valign="top"><:help product 
+            <td class="help"><:help product 
               files:> <:error_img files:></td>
           </tr>
           <tr> 
-            <th valign="top" nowrap="nowrap" bgcolor="#FFFFFF" align="left"> Images: 
+            <th> Images: 
             </th>
-            <td align="center" bgcolor="#FFFFFF"> <:if Images:> <:iterator begin 
+            <td> <:if Images:> <:iterator begin 
               images:> <img src="/images/<: image image :>" alt="<:image alt :>" width= 
               <:image width:> height=<:image height:>> <:iterator separator images:> 
               <hr noshade size="1">
               <: iterator end images :>
-              <p align="left"><a href="<:script:>?id=<:article id:>&showimages=1"><b>Manage Images</b></a></p>
-             <:or Images:><p align="left">No images are attached to this article.  <a href="<:script:>?id=<:article id:>&showimages=1"><b>Manage Images</b></a></p>
+              <p><a href="<:script:>?id=<:article id:>&amp;showimages=1"><b>Manage Images</b></a></p>
+             <:or Images:><p>No images are attached to this article.  <a href="<:script:>?id=<:article id:>&amp;showimages=1"><b>Manage Images</b></a></p>
              <:eif Images:>
             </td>
-            <td valign="top" bgcolor="#FFFFFF"><:help product images:> <:error_img
+            <td class="help"><:help product images:> <:error_img
             images:></td>
           </tr>
                  <:or Article:><:eif Article:>
           <tr> 
-            <th nowrap="nowrap" align="left" bgcolor="#FFFFFF">Purchase subscribes to:</th>
-            <td nowrap="nowrap" bgcolor="#FFFFFF"
+            <th>Purchase subscribes to:</th>
+            <td> 
              <select name="subscription_id">
                 <option value="-1"<:ifEq [old subscription_id] "-1":> selected="selected"<:or:><:eif:>>(nothing)</option>
 <:iterator begin subscriptions:>
 <:iterator end subscriptions:>
              </select> for <input type="text" name="subscription_period" value="<:ifEq [old subscription_period] "":><:default subscription_period:><:or:><:old subscription_period:><:eif:>" size="3" /><:error_img subscription_period:> months.
             </td>
-            <td nowrap="nowrap" bgcolor="#FFFFFF"><:help product subscription_id:></td>
+            <td class="help"><:help product subscription_id:></td>
           </tr>
           <tr> 
-            <th nowrap="nowrap" align="left" bgcolor="#FFFFFF">Can be used to:</th>
-            <td nowrap="nowrap" bgcolor="#FFFFFF"
+            <th>Can be used to:</th>
+            <td> 
              <select name="subscription_usage">
                 <option value="3"<:ifEq [old subscription_usage] "3":> selected="selected"<:or:><:eif:>>Start or renew a subscription</option>
                 <option value="1"<:ifEq [old subscription_usage] "1":> selected="selected"<:or:><:eif:>>Start a subscription only</option>
                 <option value="2"<:ifEq [old subscription_usage] "2":> selected="selected"<:or:><:eif:>>Renew a subscription only</option>
              </select>
             </td>
-            <td nowrap="nowrap" bgcolor="#FFFFFF"><:help product subscription_usage:></td>
+            <td class="help"><:help product subscription_usage:></td>
           </tr>
           <tr> 
-            <th nowrap="nowrap" align="left" bgcolor="#FFFFFF">User must be subscribed to:</th>
-            <td nowrap="nowrap" bgcolor="#FFFFFF"
+            <th>User must be subscribed to:</th>
+            <td> 
              <select name="subscription_required">
                 <option value="-1"<:ifEq [old subscription_required] "-1":> selected="selected"<:or:><:eif:>>(nothing)</option>
 <:iterator begin subscriptions:>
 <:iterator end subscriptions:>
              </select> to purchase this product
             </td>
-            <td nowrap="nowrap" bgcolor="#FFFFFF"><:help product subscription_id:></td>
+            <td class="help"><:help product subscription_id:></td>
           </tr>
         </table>
-      </td>
-    </tr>
-  </table>
   <p><font size="-1">*These fields cannot be modified once this seminar has been
       included in an order.</font></p>
   <:if UserCan edit_save:article:>
     <:ifNew:><input type="submit" name="save" value="Add Seminar" /><:or:><input type="submit" name="save" value="Update Seminar" /><:eif:>
   </p><:or UserCan:><:eif UserCan:>
 </form>
-
-<p><font size="-1">BSE Release <:release:></font></p>
-</body>
-</html>
index 295bfe0..9ca5e66 100644 (file)
@@ -1,4 +1,4 @@
-<:wrap admin/xbase.tmpl title=>"Seminar [seminar title] - Add Session":>
+<:wrap admin/base.tmpl title=>"Seminar [seminar title] - Add Session":>
 <h1>Seminar <:seminar title:> - Add Session</h1>
 <:ifMessage:>
 <p><b><:message:></b></p>
@@ -6,6 +6,7 @@
 <p>| <a href="/cgi-bin/admin/menu.pl">Admin menu</a> 
 | <a href="<:script:>?id=<:seminar id:>">Edit seminar</a> |
   <a href="<:script:>?id=<:seminar id:>&amp;_t=semsessions">Session list</a> |
+<a href="<:adminurl admin_seminar:>">Manage Locations</a> |
 </p>
 
 <form action="<:script:>" method="post">
@@ -37,3 +38,4 @@
     <td colspan="3"><input type="submit" name="a_addsemsession" value="Add Session" /></td>
   </tr>
 </table>
+</form>
index c4ec23f..dd1f415 100644 (file)
@@ -1,4 +1,4 @@
-<:wrap admin/xbase.tmpl title=>"Seminar [seminar title] - Sessions":>
+<:wrap admin/base.tmpl title=>"Seminar [seminar title] - Sessions":>
 <h1>Seminar <:seminar title:> - Sessions</h1>
 <:ifMessage:>
 <p><b><:message:></b></p>
@@ -6,6 +6,7 @@
 <p>| <a href="/cgi-bin/admin/menu.pl">Admin menu</a> | <a href="<:script:>?id=<:seminar id:>">Edit seminar</a> | 
 Show: <:ifEq [cgi s] "all":><a href="<:script:>?id=<:seminar id:>&amp;_t=semsessions">Only new sessions</a><:or:><a href="<:script:>?id=<:seminar id:>&amp;_t=semsessions&amp;s=all">All sessions</a><:eif:> |
 <a href="<:script:>?id=<:seminar id:>&amp;_t=semsessadd">Add new session</a> |
+<a href="<:adminurl admin_seminar:>">Manage Locations</a> |
 </p>
 
 <table>
index e5016f0..03e847e 100644 (file)
@@ -1,4 +1,4 @@
-<:wrap admin/xbase.tmpl title=>"Manage Relationships" :>
+<:wrap admin/base.tmpl title=>"Manage Relationships" :>
 <h1>Manage step <:ifMatch [article generator] "Product":><:or:> children/<:eif:>parents</h1>
 <:ifMessage:> 
 <p><b><:message:></b></p>
     [article generator] "Catalog":>Edit catalog<:or:>Edit article<:eif:></a><:eif
     Eq:><:eif Match:> |</p><:if New:><:or New:> <:if Match [article generator] "Product":><:or Match:> 
 <h2><a name="step"></a>Step children</h2>
-<table border="0" cellspacing="0" cellpadding="0" bgcolor='#000000' width="100%" class="table">
-  <tr><td>
-      <table border="0" cellpadding="6" cellspacing="1" width="100%">
-        <tr bgcolor="#FFFFFF"> 
-          <th>Id</th>
-          <th width="100%">Title</th>
-          <th>Release</th>
-          <th>Expire</th>
-          <th>Modify</th>
-                 <th>Move</th>
+      <table class="editform stepkids">
+        <tr> 
+          <th class="col_id">Id</th>
+          <th class="col_title">Title</th>
+          <th class="col_release">Release</th>
+          <th class="col_expire">Expire</th>
+          <th class="col_tools">Modify</th>
+         <th class="col_move">Move</th>
         </tr>
         <:if Kids:>
-        <tr bgcolor="#FFFFFF"
-          <td colspan="6" align="center">Note: Delete only removes the stepchild 
+        <tr> 
+          <td colspan="6" class="tablenote">Note: Delete only removes the stepchild 
             relationship. It does not delete the article.</td>
         </tr>
  
 <:if UserCan edit_reorder_children:article:>
         <tr> 
-          <td colspan="6" bgcolor="#FFFFFF">Sort by: <a href="/cgi-bin/admin/reorder.pl?stepparent=<:article id:>&amp;sort=title&amp;refreshto=/cgi-bin/admin/add.pl?id=<:article id:>%26_t=steps%23step">title</a> | <a href="/cgi-bin/admin/reorder.pl?stepparent=<:article id:>&amp;sort=date&amp;refreshto=/cgi-bin/admin/add.pl?id=<:article id:>%26_t=steps%23step">date</a> | <a href="/cgi-bin/admin/reorder.pl?stepparent=<:article id:>&amp;reverse=1&amp;refreshto=/cgi-bin/admin/add.pl?id=<:article id:>%26_t=steps%23step">reverse</a></td>
+          <td colspan="6">Sort by: <a href="/cgi-bin/admin/reorder.pl?stepparent=<:article id:>&amp;sort=title&amp;refreshto=/cgi-bin/admin/add.pl?id=<:article id:>%26_t=steps%23step">title</a> | <a href="/cgi-bin/admin/reorder.pl?stepparent=<:article id:>&amp;sort=date&amp;refreshto=/cgi-bin/admin/add.pl?id=<:article id:>%26_t=steps%23step">date</a> | <a href="/cgi-bin/admin/reorder.pl?stepparent=<:article id:>&amp;reverse=1&amp;refreshto=/cgi-bin/admin/add.pl?id=<:article id:>%26_t=steps%23step">reverse</a></td>
         </tr>
 <:or UserCan:><:eif UserCan:>
         <form action="<:script:>" method="post">
           <input type="hidden" name="_t" value="steps" />
          <:csrfp admin_save_stepkids hidden:>
           <:iterator begin kids:> 
-          <tr bgcolor="#FFFFFF"
-            <td align="center" nowrap="nowrap"><:kid id:></td>
-            <td width="100%"><:kid title:></td>
-            <td nowrap="nowrap"><:ifStepKid:> 
+          <tr> 
+            <td class="col_id"><:kid id:></td>
+            <td class="col_title"><:kid title:></td>
+            <td class="col_release"><:ifStepKid:> 
               <:if UserCan edit_stepkid_save:article,edit_stepparent_save:kid :><input type="text" name="release_<:stepkid childId:>" value="<:date "%d/%m/%Y" stepkid release:>" size="10" /><:or UserCan:><:date "%d/%m/%Y" stepkid release:><:eif UserCan:>
               <:or:>&nbsp;<:eif:></td>
-            <td nowrap="nowrap"><:ifStepKid:> 
+            <td class="col_expire"><:ifStepKid:> 
               <:if UserCan edit_stepkid_save:article,edit_stepparent_save:kid :><input type="text" name="expire_<:stepkid childId:>" value="<:date "%d/%m/%Y" stepkid expire:>" size="10" /><:or UserCan:><:date "%d/%m/%Y" stepkid expire:><:eif UserCan:>
               <:or:>&nbsp;<:eif:></td>
-            <td nowrap="nowrap"><:edit kid Edit:> <:ifStepKid:><:if UserCan edit_stepkid_delete:article,edit_stepparent_delete:kid :><a href="<:script:>?del_stepkid=1&amp;id=<:stepkid parentId:>&amp;stepkid=<:stepkid childId:>&amp;_t=steps&amp;_csrfp=<:csrfp admin_remove_stepkid:>" onClick="return window.confirm('Are you sure you want to delete this Step child')">Delete</a><:or UserCan:><:eif UserCan:><:or:><:eif:> </td>
-                       <td nowrap="nowrap"><:movestepkid:></td>
+            <td class="col_tools"><:edit kid Edit:> <:ifStepKid:><:if UserCan edit_stepkid_delete:article,edit_stepparent_delete:kid :><a href="<:script:>?del_stepkid=1&amp;id=<:stepkid parentId:>&amp;stepkid=<:stepkid childId:>&amp;_t=steps&amp;_csrfp=<:csrfp admin_remove_stepkid:>" onClick="return window.confirm('Are you sure you want to delete this Step child')">Delete</a><:or UserCan:><:eif UserCan:><:or:><:eif:> </td>
+                       <td class="col_move"><:movestepkid:></td>
           </tr>
           <:iterator end kids:> 
 <:if UserCan edit_stepkid_save:article :>
-          <tr bgcolor="#FFFFFF"
-            <td colspan="6" align="center"> 
+          <tr> 
+            <td colspan="6" class="buttons"> 
               <input type="submit" name="save_stepkids" value="Save Changes" />
             </td>
           </tr>
 <:or UserCan:><:eif UserCan:>
         </form>
           <:or Kids:> 
-          <tr bgcolor="#FFFFFF"
-            <td colspan="6" align="center">No children</td>
+          <tr> 
+            <td colspan="6" class="tablenote">No children</td>
           </tr>
           <:eif Kids:> 
         <:if Possibles:> 
@@ -69,7 +67,7 @@
           <input type="hidden" name="id" value="<:article id:>" />
           <input type="hidden" name="_t" value="steps" />
          <:csrfp admin_add_stepkid hidden:>
-          <tr bgcolor="#FFFFFF"
+          <tr> 
             <td colspan="2"><:possible_stepkids:></td>
             <td> 
               <input type="text" name="release" value="01/01/2000" size="10" />
         </form>
         <:or Possibles:><:eif Possibles:> 
       </table>
-</td></tr></table>
+
 <:eif Match:> <:eif New:> <a name="stepparents"></a>
 <h2>Step parents</h2>
-<table border="0" cellspacing="0" cellpadding="0" bgcolor='#000000' width="100%" class="table">
-  <tr><td>
-      <table border=0 cellpadding="6" cellspacing="1" width="100%">
-        <tr bgcolor="#FFFFFF"> 
-          <th>Id</th>
-          <th width="100%">Title</th>
-          <th>Release</th>
-          <th>Expire</th>
-          <th>Modify</th>
-                 <th>Move</th>
+      <table class="editform stepkids">
+        <tr> 
+          <th class="col_id">Id</th>
+          <th class="col_title">Title</th>
+          <th class="col_release">Release</th>
+          <th class="col_expire">Expire</th>
+          <th class="col_tools">Modify</th>
+         <th class="col_move">Move</th>
         </tr>
         <:if StepParents:> 
-        <tr bgcolor="#FFFFFF"
-          <td colspan="6" align="center">Note: Delete only removes the stepparent 
+        <tr> 
+          <td colspan="6" class="tablenote">Note: Delete only removes the stepparent 
             relationship. It does not delete the article.</td>
         </tr>
 <:if UserCan edit_reorder_stepparents:article :>
-        <tr bgcolor="#FFFFFF"
+        <tr> 
           <td colspan="6">Sort by: <a href="/cgi-bin/admin/reorder.pl?stepchild=<:article id:>&amp;sort=title&amp;refreshto=/cgi-bin/admin/add.pl?id=<:article id:>%26_t=steps%23stepparents">title</a> | <a href="/cgi-bin/admin/reorder.pl?stepchild=<:article id:>&amp;sort=date&amp;refreshto=/cgi-bin/admin/add.pl?id=<:article id:>%26_t=steps%23stepparents">date</a> | <a href="/cgi-bin/admin/reorder.pl?stepchild=<:article id:>&amp;reverse=1&amp;refreshto=/cgi-bin/admin/add.pl?id=<:article id:>%26_t=steps%23stepparents">reverse</a></td>
         </tr>
 <:or UserCan:><:eif UserCan:>
          <input type="hidden" name="_t" value="steps" />
          <:csrfp admin_save_stepparents hidden:>
           <:iterator begin stepparents:>
-          <tr bgcolor="#FFFFFF"
-            <td align="center" nowrap="nowrap"><a href="<:stepparent_targ admin:>"><:stepparent 
+          <tr> 
+            <td  class="col_id"><a href="<:stepparent_targ admin:>"><:stepparent 
               parentId:></a></td>
-            <td width="100%"><:stepparent_targ title:></td>
-            <td nowrap="nowrap"> 
+            <td class="col_title"><:stepparent_targ title:></td>
+            <td class="col_release"> 
               <:if UserCan edit_stepparent_save:article,edit_stepkid_save:stepparent_targ :><input type="text" name="release_<:stepparent parentId:>" value="<:date "%d/%m/%Y" stepparent release:>" size="10" /><:or UserCan:><:date "%d/%m/%Y" stepparent release:><:eif UserCan:>
             </td>
-            <td nowrap="nowrap"> 
+            <td class="col_expire"> 
               <:if UserCan edit_stepparent_save:article,edit_stepkid_save:stepparent_targ:><input type="text" name="expire_<:stepparent parentId:>" value="<:date "%d/%m/%Y" stepparent expire:>" size="10" /><:or UserCan:><:date "%d/%m/%Y" stepparent expire:><:eif UserCan:>
             </td>
-            <td nowrap="nowrap"><a href="/cgi-bin/admin/add.pl?id=<:stepparent parentId:>">Edit</a> 
+            <td class="col_tools"><a href="/cgi-bin/admin/add.pl?id=<:stepparent parentId:>">Edit</a> 
               <:if UserCan edit_stepkid_delete:stepparent_targ,edit_stepparent_delete:article :><a href="<:script:>?del_stepparent=1&amp;id=<:stepparent childId:>&amp;stepparent=<:stepparent parentId:>&amp;_t=steps&amp;_csrfp=<:csrfp admin_remove_stepparent:>" onClick="return window.confirm('Are you sure you want to delete this Step parent')">Delete</a> <:or UserCan:><:eif UserCan:></td>
-                         <td nowrap="nowrap"><:movestepparent:></td>
+           <td class="col_move"><:movestepparent:></td>
           </tr>
           <:iterator end stepparents:> 
 <:if UserCan edit_stepparent_save:article :>
-          <tr bgcolor="#FFFFFF"
-            <td colspan="6" align="center"> 
+          <tr> 
+            <td colspan="6" class="buttons"> 
               <input type="submit" name="save_stepparents" value="Save Changes" />
             </td>
           </tr>
 <:or UserCan:><:eif UserCan:>
         </form>
         <:or StepParents:> 
-        <tr bgcolor="#FFFFFF"
-          <td colspan="6" align="center">No step parents</td>
+        <tr> 
+          <td colspan="6" class="tablenote">No step parents</td>
         </tr>
         <:eif StepParents:> <:if StepparentPossibles:> 
         <form action="<:script:>" method="post">
           <input type="hidden" name="id" value="<:article id:>" />
           <input type="hidden" name="_t" value="steps" />
          <:csrfp admin_add_stepparent hidden:>
-          <tr bgcolor="#FFFFFF"
-            <td colspan=2><:stepparent_possibles:></td>
-            <td> 
+          <tr> 
+            <td colspan="2"><:stepparent_possibles:></td>
+            <td class="col_release"
               <input type="text" name="release" value="01/01/2000" size="10" />
             </td>
-            <td> 
+            <td class="col_expire"
               <input type="text" name="expire" value="31/12/2999" size="10" />
             </td>
             <td colspan="2"> 
           </tr>
         </form>
         <:or StepparentPossibles:> 
-        <tr bgcolor="#FFFFFF"
-          <td colspan="6" align="center">No more possible catalogs to add.</td>
+        <tr> 
+          <td colspan="6" class="tablenote">No more possible catalogs to add.</td>
         </tr>
         <:eif StepparentPossibles:> 
       </table>
-</td></tr>
-</table>
index b987830..d8f66af 100644 (file)
@@ -1,4 +1,4 @@
-<:wrap admin/xbase.tmpl title => "Error":> 
+<:wrap admin/base.tmpl title => "Error":> 
 <h1>Error</h1>
 <p>| <a href="/cgi-bin/admin/menu.pl">Admin menu</a>|</p>
-<p><:error:></p>
\ No newline at end of file
+<p><:error:></p>
index 17eb964..acf7404 100644 (file)
@@ -1,4 +1,4 @@
-<:wrap admin/xbase.tmpl title=>"Edit Article File":>
+<:wrap admin/base.tmpl title=>"Edit Article File":>
 <h1>Edit Article File</h1>
 <:ifMessage:>
 <p><b><:message:></b></p>
             <td> 
               <:efile displayName:><br /><input type="file" name="file" size="40" /><br />Choose a file to replace the current file or leave blank to keep the current file.
             </td>
-            <td nowrap="nowrap"><:help file file:> <:error_img file:></td>
+            <td class="help"><:help file file:> <:error_img file:></td>
           </tr>
           <tr> 
             <th align="left">Description:</th>
             <td> 
               <input type="text" name="description" value="<:old description efile description:>" size="60"/>
             </td>
-            <td nowrap="nowrap"><:help file description:> <:error_img description:></td>
+            <td class="help"><:help file description:> <:error_img description:></td>
           </tr>
           <tr> 
             <th align="left">Notes:</th>
             <td> 
-              <textarea name="notes" rows="10" cols="60" wrap="virtual"><:old notes efile notes:></textarea>
+              <textarea name="notes" rows="10" cols="60"><:old notes efile notes:></textarea>
             </td>
-            <td nowrap="nowrap"><:help file notes:> <:error_img notes:></td>
+            <td class="help"><:help file notes:> <:error_img notes:></td>
           </tr>
           <tr> 
             <th align="left">Content-Type:</th>
             <td> 
               <input type="text" name="contentType" value="<:old contentType efile contentType:>" size="40" />
             </td>
-            <td nowrap="nowrap"><:help file content_type:> <:error_img contentType:></td>
+            <td class="help"><:help file content_type:> <:error_img contentType:></td>
           </tr>
           <tr> 
             <th align="left">Identifier:</th>
             <td> 
               <input type="text" name="name" value="<:old name efile name:>" /> </td>
-            <td nowrap="nowrap"><:help file name:> <:error_img name:></td>
+            <td class="help"><:help file name:> <:error_img name:></td>
           </tr>
           <tr> 
             <th align="left">Treat as download:</th>
             <td> 
               <input type="checkbox" name="download" value="1" <:ifOldChecked download:>checked="checked"<:or:><:eif:> />
             </td>
-            <td nowrap="nowrap"><:help file download:> <:error_img download:></td>
+            <td class="help"><:help file download:> <:error_img download:></td>
           </tr>
           <tr> 
             <th align="left">Require payment:</th>
             <td> 
               <input type="checkbox" name="forSale" value="1" <:ifOldChecked forSale:>checked="checked"<:or:><:eif:> />
             </td>
-            <td nowrap="nowrap"><:help file forSale:> <:error_img forSale:></td>
+            <td class="help"><:help file forSale:> <:error_img forSale:></td>
           </tr>
           <tr> 
             <th align="left">Require login:</th>
             <td> 
               <input type="checkbox" name="requireUser" value="1"  <:ifOldChecked requireUser:>checked="checked"<:or:><:eif:>/>
             </td>
-            <td nowrap="nowrap"><:help file requireUser:> <:error_img requireUser:></td>
+            <td class="help"><:help file requireUser:> <:error_img requireUser:></td>
           </tr>
           <tr> 
             <th align="left">Hide from list:</th>
             <td> 
               <input type="checkbox" name="hide_from_list" value="1"  <:ifOldChecked hide_from_list:>checked="checked"<:or:><:eif:>/>
             </td>
-            <td nowrap="nowrap"><:help file hide_from_list:> <:error_img hide_from_list:></td>
+            <td class="help"><:help file hide_from_list:> <:error_img hide_from_list:></td>
           </tr>
           <tr> 
             <th align="left">Storage:</th>
@@ -91,7 +91,7 @@
 <:iterator end file_stores:>
 </select>
             </td>
-            <td nowrap="nowrap"><:help file hide_from_list:> <:error_img hide_from_list:></td>
+            <td class="help"><:help file hide_from_list:> <:error_img hide_from_list:></td>
           </tr>
 <:if Filemetas:>
 <tr>
 <:case Eq [filemeta type] "enum":>
 <:filemeta_select_label:> <:filemeta unit:>
 <:case Eq [filemeta type] "image":>
-<:ifFilemeta_set [filemeta data_name]:><span class="file_display_trigger">Show
-<div class="file_display"><img src="<:filemeta_source [filemeta data_name]:>" width="<:filemeta_value [filemeta width_name]:>" height="<:filemeta_value [filemeta height_name]:>" /></div></span><:or:>(No image set)<:eif:>
+<:ifFilemeta_set [filemeta data_name]:><div class="file_display_trigger">Show
+<div class="file_display"><img src="<:filemeta_source [filemeta data_name]:>" width="<:filemeta_value [filemeta width_name]:>" height="<:filemeta_value [filemeta height_name]:>" /></div></div><:or:>(No image set)<:eif:>
 <:case default:>
 Unknown metadata type <:filemeta type:>
 <:endswitch:>
@@ -125,8 +125,8 @@ Unknown metadata type <:filemeta type:>
 <:filemeta_select:> <:filemeta unit:>
 <:case Eq [filemeta type] "image":>
 <input type="file" name="meta_<:filemeta name:>" />
-<:ifFilemeta_set [filemeta data_name]:><span class="file_display_trigger">Show
-<div class="file_display"><img src="<:filemeta_source [filemeta data_name]:>" width="<:filemeta_value [filemeta width_name]:>" height="<:filemeta_value [filemeta height_name]:>" /></div></span>
+<:ifFilemeta_set [filemeta data_name]:><div class="file_display_trigger">Show
+<div class="file_display"><img src="<:filemeta_source [filemeta data_name]:>" width="<:filemeta_value [filemeta width_name]:>" height="<:filemeta_value [filemeta height_name]:>" /></div></div>
 <input type="checkbox" name="delete_meta_<:filemeta name:>" value="1" />&nbsp;Delete
 <:or:>(No image set)<:eif:>
 <:case default:>
@@ -137,10 +137,10 @@ Unknown metadata type <:filemeta type:>
 <:eif Match:>
 <:eif Filemeta:>
   </td>
-  <td>
+  <td class="help">
 <:if Filemeta help:>
-<span class="help_display_trigger"><img src="/images/admin/help.gif" />
-<div class="help_display"><:filemeta help |z:></div></span>
+<div class="help_display_trigger"><img src="/images/admin/help.gif" alt="help" />
+<div class="help_display"><:filemeta help |z:></div></div>
 <:or Filemeta:><:eif Filemeta:>
   </td>
 </tr>
index e0b5534..c677ab4 100644 (file)
@@ -1,4 +1,4 @@
-<:wrap admin/xbase.tmpl title=>"File Wizard":>
+<:wrap admin/base.tmpl title=>"File Wizard":>
 <h1><:ifEq [article id] "-1":>Global<:or:><: articleType :><:eif:> File Wizard</h1>
 <:ifMessage:>
 <p><b><:message:></b></p>
@@ -16,7 +16,7 @@
 <input type="hidden" name="id" value="<: article id :>" />
 <input type="hidden" name="_t" value="file" />
 <:csrfp admin_add_file hidden:>
-        <table class="editform editformsmall">
+        <table class="editformsmall">
           <tr> 
             <th>File to add:</th>
             <td> 
@@ -34,7 +34,7 @@
           <tr> 
             <th>Notes:</th>
             <td> 
-              <textarea name="notes" rows="10" cols="60" wrap="virtual"><:old notes:></textarea>
+              <textarea name="notes" rows="10" cols="60"><:old notes:></textarea>
             </td>
             <td><:help file description:> <:error_img description:></td>
           </tr>
   
 <h2>Manage files</h2>
 
-<form method="post" action="<:script:>" enctype="multipart/form-data" id="filelist">
+<form method="post" action="<:script:>" enctype="multipart/form-data">
 <input type="hidden" name="id" value="<: article id :>" />
 <input type="hidden" name="_t" value="file" />
 <input type="hidden" name="save_file_flags" value="1" />
 <:csrfp admin_save_files hidden:>
         <table id="filelist" class="editform">
           <:if Files:><tr> 
-            <th nowrap="nowrap" bgcolor="#FFFFFF"> File</th>
-            <th nowrap="nowrap" bgcolor="#FFFFFF"> Description</th>
-            <th bgcolor="#FFFFFF" nowrap="nowrap"> Content-Type</th>
-            <th bgcolor="#FFFFFF">Notes</th>
+            <th> File</th>
+            <th> Description</th>
+            <th> Content-Type</th>
+            <th>Notes</th>
           </tr>
           <: iterator begin files :> 
-          <tr bgcolor="#FFFFFF"
-            <td nowrap="nowrap"  rowspan="2"> <:file displayName:><:ifUserCan edit_files_save:article:>
+          <tr> 
+            <td class="col_filename" rowspan="2"> <:file displayName:><:ifUserCan edit_files_save:article:>
             <br /><input type="file" name="file_<:file id:>" /><:error_img [concatenate file_ [file id]:>
 <:or:><:eif:>
 </td>
-            <td valign="top"> 
+            <td class="col_description"> 
               <:ifUserCan edit_files_save:article:><input name="description_<:file id:>" type="text" value="<: oldi [concatenate description_ [file id]] 0 file description :>" size="35" />
               <:or:><: file description :><:eif:>
             </td>
-            <td valign="top"> 
+            <td class="col_contenttype"> 
                <:ifUserCan edit_files_save:article:><input name="contentType_<:file id:>" type="text" value="<: oldi [concatenate contentType_ [file id]] 0 file contentType :>" size="20" />
                <:or:><: file contentType :><:eif:>
             </td>
-            <td valign="top" rowspan="3">
+            <td class="col_notes" rowspan="3">
               <:ifUserCan edit_files_save:article:><textarea name="notes_<:file id:>" cols="40" rows="5"><:oldi [concatenate notes_ [file id]] 0 file notes:></textarea><:or:><:replace [file notes] "
 " "<br />" :><:eif:>
             </td>
           </tr>
           <tr>
-            <td valign="top" nowrap="nowrap" bgcolor="#FFFFFF"> 
+            <td class="col_identifier"> 
                Identifier: <:ifUserCan edit_files_save:article:><input name="name_<:file id:>" type="text" value="<: oldi [concatenate name_ [file id]] 0 file name :>" size="20" /><:error_img [concatenate name_ [file id]]:>
                <:or:><: file name :><:eif:>
             </td>
-            <td valign="top" nowrap="nowrap" bgcolor="#FFFFFF"> 
+            <td class="col_storage"> 
                Storage: <:ifUserCan edit_files_save:article:><select name="storage_<:file id:>"><option value="">(Auto)</option>
 <:iterator begin file_stores:>
 <option value="<:file_store name:>" <:ifEq [oldi [concatenate storage_ [file id] ] 0 file storage] [file_store name]:>selected="selected"<:or:><:eif:>><:file_store description:></option>
                <:or:><: file storage :><:eif:>
             </td>
           </tr>
-          <tr bgcolor="#FFFFFF"
+          <tr> 
             <td colspan="3"> 
 <:if UserCan edit_files_save:article:><input type="checkbox" name="download_<:file id:>"
                     <:ifFile download:> checked<:or:><:eif:> /><:or UserCan:><img src="/images/admin/<:ifFile download:>checked.gif<:or:>unchecked.gif<:eif:>" width="16" height="16" /><:eif UserCan:>Download&nbsp;&nbsp;&nbsp;
 <:ifUserCan edit_files_save:article:><b><a href="<:script:>?a_edit_file=1&amp;id=<:article id:>&amp;file_id=<:file id:>">Edit</a></b> <:or:><:eif:>
 <:ifUserCan edit_files_delete:article:><b><a href="<:script:>?filedel=1&amp;id=<:article id:>&amp;file=<:file id:>&amp;_t=file&amp;_csrfp=<:csrfp admin_remove_file:>" onClick="return window.confirm('Are you sure you want to delete this File')">Delete</a></b> <:or:><:eif:>
                     <:movefiles:>
-<span class="file_info_trigger">Info
+<div class="file_info_trigger">Info
 <div class="file_info">
 <p>Metadata</p>
 <:iterator begin file_metas:>
 <div><:file_meta name:>: <:file_meta value:></div>
 <:iterator end file_metas:>
-</div></span>
-<span class="file_display_trigger">Display
-<div class="file_display"><:file_display:></div></span>
+</div></div>
+<div class="file_display_trigger">Display
+<div class="file_display"><:file_display:></div></div>
             </td>
           </tr>
           <: iterator separator files :> 
-          <tr bgcolor="#FFFFFF"
+          <tr> 
             <td colspan="4">&nbsp;</td>
           </tr>
           <: iterator end files :> 
 <:ifUserCan edit_files_save:article:>
           <tr> 
-            <td colspan="4" align="right" valign="bottom" bgcolor="#FFFFFF"> 
+            <td colspan="4" class="buttons"> 
               <input type="submit" name="filesave" value="  Save changes  " />
             </td>
           </tr>
 <:or:><:eif:>
           <:or Files:> 
-          <tr bgcolor="#FFFFFF"
+          <tr> 
             <td colspan="3" align="center"><:if Eq [article id] "-1":>There are no global files.<:or Eq:>No files are attached to this article<:eif Eq:></td>
           </tr>
           <:eif Files:> 
index 1020b0d..bcd5e76 100644 (file)
@@ -1,14 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-
-  <title>Administration - Admin Groups</title>
-
-  <link rel="stylesheet" type="text/css" href="/css/admin.css" />
-
-</head>
-
-<body>
+<:wrap admin/base.tmpl title => "Admin Groups":>
 <h1>Admin Groups</h1>
 <p>
 | <a href="/cgi-bin/admin/menu.pl">Admin menu</a>
 <:or:><:eif:> 
 
 <form method="post" action="<:script:>">
-<table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000" class="table">
-    <tr>
-      <td>
-        <table cellpadding="6" border="0" cellspacing="1">
+        <table>
           <tr> 
-            <th bgcolor="#FFFFFF" nowrap> Name</th>
-            <th bgcolor="#FFFFFF" nowrap> Description</th>
-            <th bgcolor="#FFFFFF" nowrap> Users</th>
-            <th bgcolor="#FFFFFF" nowrap>&nbsp;</th>
+            <th> Name</th>
+            <th> Description</th>
+            <th> Users</th>
+            <th>&nbsp;</th>
           </tr>
           <:if Groups:> <: iterator begin groups :> 
-          <tr bgcolor="#FFFFFF"
-            <td nowrap> <a href="<:script:>?a_showgroup=1&groupid=<:igroup id:>"><:igroup name:></a></td>
-            <td valign="top"><:igroup description:></td>
-            <td valign="top"><:ifGroup_users igroup:><:iterator begin group_users igroup:><:group_user logon:><:iterator separator group_users:>, <:iterator end group_users:><:or:>(none)<:eif:>
+          <tr> 
+            <td> <a href="<:script:>?a_showgroup=1&amp;groupid=<:igroup id:>"><:igroup name:></a></td>
+            <td><:igroup description:></td>
+            <td><:ifGroup_users igroup:><:iterator begin group_users igroup:><:group_user logon:><:iterator separator group_users:>, <:iterator end group_users:><:or:>(none)<:eif:>
             </td>
-            <:ifUserCan admin_group_del:><td valign="top"><a href="<:script:>?a_showgroup=1&groupid=<:igroup id:>&_t=del">Delete</a></td><:or:><:eif:>
+            <:ifUserCan admin_group_del:><td><a href="<:script:>?a_showgroup=1&amp;groupid=<:igroup id:>&amp;_t=del">Delete</a></td><:or:><:eif:>
           </tr>
           <: iterator end groups :> 
           <:or Groups:> 
-          <tr bgcolor="#FFFFFF"
-            <td colspan="4" align="center">Your system has no groups.</td>
+          <tr> 
+            <td colspan="4">Your system has no groups.</td>
           </tr>
           <:eif Groups:> 
         </table>
-</td>
-</tr>
-</table>
 </form>
-  
-<p><font size="-1">BSE Release <:release:></font></p>
-</body
-></html>
index 084bb92..dadce04 100644 (file)
@@ -1 +1 @@
-<a href="#" onclick="window.open('<:prefix:><:file:>.html#<:entry:>', 'adminhelp', 'width=400,height=300,location=no,status=no,menubar=no,scrollbars=yes'); return false;"><img src="<:stylecfg icon /images/admin/help.gif:>" width="<:stylecfg iconwidth 16:>" height="<:stylecfg iconheight 16:>" border="0" alt="help on <:entry:>" title="help on <:entry:>" /></a>
\ No newline at end of file
+<a href="#" onclick="window.open('<:prefix:><:file:>.html#<:entry:>', 'adminhelp', 'width=400,height=300,location=no,status=no,menubar=no,scrollbars=yes'); return false;"><img src="<:stylecfg icon /images/admin/help.gif:>" width="<:stylecfg iconwidth 16:>" height="<:stylecfg iconheight 16:>" alt="help on <:entry:>" title="help on <:entry:>" class="bse_helpicon" /></a>
\ No newline at end of file
index f1e68b2..82a89b3 100644 (file)
@@ -1,4 +1,4 @@
-<:wrap admin/xbase.tmpl title=>"Edit [articleType] Image":>
+<:wrap admin/base.tmpl title=>[concatenate "Edit " [articleType] " Image"]:>
 <h1>Edit <:articleType:> Image</h1>
 <:ifMessage:> 
 <p><b><:message:></b></p>
 <input type="hidden" name="image_id" value="<: eimage id :>" />
 <input type="hidden" name="r" value="/cgi-bin/admin/add.pl?id=<:article id:>&amp;_t=img" />
 <:csrfp admin_save_image hidden:>
-<table cellpadding="6" border="0" cellspacing="1">
+<table class="editform editformsmall">
   <tr> 
-    <th align="left">Replacement image file:</th>
+    <th>Replacement image file:</th>
     <td><input type="file" name="image" size="40" /><br />(leave blank to keep the current image)</td>
-     <td nowrap="nowrap"><:help image image:> <:error_img image:></td>
+     <td class="help"><:help image image:> <:error_img image:></td>
   </tr>
   <tr> 
-    <th align="left">Alt text for image:</th>
+    <th>Alt text for image:</th>
     <td><input type="text" name="alt" value="<:old alt eimage alt:>" /></td>
-    <td nowrap="nowrap"><:help image alt:> <:error_img alt:></td>
+    <td class="help"><:help image alt:> <:error_img alt:></td>
   </tr>
   <tr> 
-    <th align="left">URL for image:</th>
+    <th>URL for image:</th>
     <td><input type="text" name="url" value="<:old url eimage url:>" size="60" /></td>
-    <td nowrap="nowrap"><:help image url:> <:error_img url:></td>
+    <td class="help"><:help image url:> <:error_img url:></td>
   </tr>
   <tr> 
-    <th align="left">Identifier for image:</th>
+    <th>Identifier for image:</th>
     <td><input type="text" name="name" value="<:old name eimage name:>" /></td>
-    <td nowrap="nowrap"><:help image name:> <:error_img name:></td>
+    <td class="help"><:help image name:> <:error_img name:></td>
   </tr>
   <tr> 
-    <th align="left">Storage:</th>
+    <th>Storage:</th>
             <td> 
 <select name="storage">
 <option value="">(Auto)</option>
 <:iterator end image_stores:>
 </select>
             </td>
-            <td nowrap="nowrap"><:help image name:> <:error_img name:></td>
+            <td class="help"><:help image name:> <:error_img name:></td>
           </tr>
   <tr> 
-    <td colspan="3" align="right">
+    <td colspan="3" class="buttons">
       <input type="submit" name="a_save_image" value="Save Image" />
     </td>
   </tr>
index a20e4ff..126b911 100644 (file)
@@ -1,4 +1,4 @@
-<:wrap admin/xbase.tmpl title=>"Add Location":>
+<:wrap admin/base.tmpl title=>"Add Location":>
 <h1>Add Location</h1>
 <p>
 | <a href="/cgi-bin/admin/menu.pl">Admin menu</a> |
@@ -52,7 +52,7 @@
 </tr>
 <tr>
   <th><:field public_notes description:>:</th>
-  <td><textarea name="public_notes" rows="<:field public_notes height:>" cols="<:field public_notes width:>" wrap="virtual"><:old public_notes:></textarea></td>
+  <td><textarea name="public_notes" rows="<:field public_notes height:>" cols="<:field public_notes width:>"><:old public_notes:></textarea></td>
   <td><:error_img public_notes:><:help addlocation public_notes:></td>
 </tr>
 <tr>
@@ -93,7 +93,7 @@
 </tr>
 <tr>
   <th><:field admin_notes description:>:</th>
-  <td><textarea name="admin_notes" rows="<:field admin_notes height:>" cols="<:field admin_notes width:>" wrap="virtual"><:old admin_notes:></textarea></td>
+  <td><textarea name="admin_notes" rows="<:field admin_notes height:>" cols="<:field admin_notes width:>"><:old admin_notes:></textarea></td>
   <td><:error_img admin_notes:><:help addlocation admin_notes:></td>
 </tr>
 
index ab98575..180a936 100644 (file)
@@ -1,4 +1,4 @@
-<:wrap admin/xbase.tmpl title=>"Delete Location: [location description]":>
+<:wrap admin/base.tmpl title=>"Delete Location: [location description]":>
 <h1>Delete Location: <:location description:></h1>
 <p>
 | <a href="/cgi-bin/admin/menu.pl">Admin menu</a> |
 <p><b><:message:></b></p>
 <:or:><:eif:> 
 
-<form action="<:script:>" method="POST">
+<form action="<:script:>" method="post">
 <input type="hidden" name="id" value="<:location id:>" />
-<table>
+<table class="editform editformtiny">
 <tr>
   <th><:field description description:>:</th>
   <td><:location description:></td>
 </tr>
 <tr>
-  <td colspan="2"><input type="submit" name="a_locdelete" value="Delete Location" /></td>
+  <td colspan="2" class="buttons"><input type="submit" name="a_locdelete" value="Delete Location" /></td>
 </tr>
 </table>
 </form>
index b2b8332..37ed056 100644 (file)
@@ -1,4 +1,4 @@
-<:wrap admin/xbase.tmpl title=>"Edit Location":>
+<:wrap admin/base.tmpl title=>"Edit Location":>
 <h1>Edit Location</h1>
 <p>
 | <a href="/cgi-bin/admin/menu.pl">Admin menu</a> |
 <tr>
   <th><:field description description:>:</th>
   <td><input type="text" name="description" value="<:old description location description:>" maxlength="<:field description maxlength:>" size="<:field description width:>" />*</td>
-  <td><:error_img description:><:help addlocation description:></td>
+  <td class="help"><:error_img description:><:help addlocation description:></td>
 </tr>
 <tr>
   <th><:field room description:>:</th>
   <td><input type="text" name="room" value="<:old room location room:>" maxlength="<:field room maxlength:>" size="<:field room width:>" /><:ifField room required:>*<:or:><:eif:></td>
-  <td><:error_img room:><:help addlocation room:></td>
+  <td class="help"><:error_img room:><:help addlocation room:></td>
 </tr>
 <tr>
   <th><:field street1 description:>:</th>
   <td><input type="text" name="street1" value="<:old street1 location street1:>" maxlength="<:field street1 maxlength:>" size="<:field street1 width:>" /><:ifField street1 required:>*<:or:><:eif:></td>
-  <td><:error_img street1:><:help addlocation street1:></td>
+  <td class="help"><:error_img street1:><:help addlocation street1:></td>
 </tr>
 <tr>
   <th><:field street2 description:>:</th>
   <td><input type="text" name="street2" value="<:old street2 location street2:>" maxlength="<:field street2 maxlength:>" size="<:field street2 width:>" /><:ifField street2 required:>*<:or:><:eif:></td>
-  <td><:error_img street2:><:help addlocation street2:></td>
+  <td class="help"><:error_img street2:><:help addlocation street2:></td>
 </tr>
 <tr>
   <th><:field suburb description:>:</th>
   <td><input type="text" name="suburb" value="<:old suburb location suburb:>" maxlength="<:field suburb maxlength:>" size="<:field suburb width:>" /><:ifField suburb required:>*<:or:><:eif:></td>
-  <td><:error_img suburb:><:help addlocation suburb:></td>
+  <td class="help"><:error_img suburb:><:help addlocation suburb:></td>
 </tr>
 <tr>
   <th><:field state description:>:</th>
   <td><input type="text" name="state" value="<:old state location state:>" maxlength="<:field state maxlength:>" size="<:field state width:>" /><:ifField state required:>*<:or:><:eif:></td>
-  <td><:error_img state:><:help addlocation state:></td>
+  <td class="help"><:error_img state:><:help addlocation state:></td>
 </tr>
 <tr>
   <th><:field country description:>:</th>
   <td><input type="text" name="country" value="<:old country location country:>" maxlength="<:field country maxlength:>" size="<:field country width:>" /><:ifField country required:>*<:or:><:eif:></td>
-  <td><:error_img country:><:help addlocation country:></td>
+  <td class="help"><:error_img country:><:help addlocation country:></td>
 </tr>
 <tr>
   <th><:field postcode description:>:</th>
   <td><input type="text" name="postcode" value="<:old postcode location postcode:>" maxlength="<:field postcode maxlength:>" size="<:field postcode width:>" /><:ifField postcode required:>*<:or:><:eif:></td>
-  <td><:error_img postcode:><:help addlocation postcode:></td>
+  <td class="help"><:error_img postcode:><:help addlocation postcode:></td>
 </tr>
 <tr>
   <th><:field public_notes description:>:</th>
-  <td><textarea name="public_notes" rows="<:field public_notes height:>" cols="<:field public_notes width:>" wrap="virtual"><:old public_notes location public_notes:></textarea></td>
-  <td><:error_img public_notes:><:help addlocation public_notes:></td>
+  <td><textarea name="public_notes" rows="<:field public_notes height:>" cols="<:field public_notes width:>"><:old public_notes location public_notes:></textarea></td>
+  <td class="help"><:error_img public_notes:><:help addlocation public_notes:></td>
 </tr>
 <tr>
   <th>Disabled:</th>
   <td><input type="checkbox" name="disabled" value="1" <:ifLocation disabled:>checked="checked" <:or:><:eif:>/><input type="hidden" name="save_disabled" value="1" /></td>
-  <td><:help addlocation disabled:></td>
+  <td class="help"><:help addlocation disabled:></td>
 </tr>
 <tr>
-  <th colspan="2">Bookings</th>
+  <th colspan="3">Bookings</th>
 </tr>
 <tr>
   <th><:field bookings_name description:>:</th>
   <td><input type="text" name="bookings_name" value="<:old bookings_name location bookings_name:>" maxlength="<:field bookings_name maxlength:>" size="<:field bookings_name width:>" /><:ifField bookings_name required:>*<:or:><:eif:></td>
-  <td><:error_img bookings_name:><:help addlocation bookings_name:></td>
+  <td class="help"><:error_img bookings_name:><:help addlocation bookings_name:></td>
 </tr>
 <tr>
   <th><:field bookings_phone description:>:</th>
   <td><input type="text" name="bookings_phone" value="<:old bookings_phone location bookings_phone:>" maxlength="<:field bookings_phone maxlength:>" size="<:field bookings_phone width:>" /><:ifField bookings_phone required:>*<:or:><:eif:></td>
-  <td><:error_img bookings_phone:><:help addlocation bookings_phone:></td>
+  <td class="help"><:error_img bookings_phone:><:help addlocation bookings_phone:></td>
 </tr>
 <tr>
   <th><:field bookings_fax description:>:</th>
   <td><input type="text" name="bookings_fax" value="<:old bookings_fax location bookings_fax:>" maxlength="<:field bookings_fax maxlength:>" size="<:field bookings_fax width:>" /><:ifField bookings_fax required:>*<:or:><:eif:></td>
-  <td><:error_img bookings_fax:><:help addlocation bookings_fax:></td>
+  <td class="help"><:error_img bookings_fax:><:help addlocation bookings_fax:></td>
 </tr>
 <tr>
   <th><:field bookings_url description:>:</th>
   <td><input type="text" name="bookings_url" value="<:old bookings_url location bookings_url:>" maxlength="<:field bookings_url maxlength:>" size="<:field bookings_url width:>" /><:ifField bookings_url required:>*<:or:><:eif:></td>
-  <td><:error_img bookings_url:><:help addlocation bookings_url:></td>
+  <td class="help"><:error_img bookings_url:><:help addlocation bookings_url:></td>
 </tr>
 <tr>
-  <th colspan="2">Facilities</th>
+  <th colspan="3">Facilities</th>
 </tr>
 <tr>
   <th><:field facilities_name description:>:</th>
   <td><input type="text" name="facilities_name" value="<:old facilities_name location facilities_name:>" maxlength="<:field facilities_name maxlength:>" size="<:field facilities_name width:>" /><:ifField facilities_name required:>*<:or:><:eif:></td>
-  <td><:error_img facilities_name:><:help addlocation facilities_name:></td>
+  <td class="help"><:error_img facilities_name:><:help addlocation facilities_name:></td>
 </tr>
 <tr>
   <th><:field facilities_phone description:>:</th>
   <td><input type="text" name="facilities_phone" value="<:old facilities_phone location facilities_phone:>" maxlength="<:field facilities_phone maxlength:>" size="<:field facilities_phone width:>" /><:ifField facilities_phone required:>*<:or:><:eif:></td>
-  <td><:error_img facilities_phone:><:help addlocation facilities_phone:></td>
+  <td class="help"><:error_img facilities_phone:><:help addlocation facilities_phone:></td>
 </tr>
 <tr>
   <th><:field admin_notes description:>:</th>
-  <td><textarea name="admin_notes" rows="<:field admin_notes height:>" cols="<:field admin_notes width:>" wrap="virtual"><:old admin_notes location admin_notes:></textarea></td>
-  <td><:error_img admin_notes:><:help addlocation admin_notes:></td>
+  <td><textarea name="admin_notes" rows="<:field admin_notes height:>" cols="<:field admin_notes width:>"><:old admin_notes location admin_notes:></textarea></td>
+  <td class="help"><:error_img admin_notes:><:help addlocation admin_notes:></td>
 </tr>
 
 <tr>
-  <td colspan="2"><input type="submit" name="a_locsave" value="Save Location" /></td>
+  <td colspan="2" class="buttons"><input type="submit" name="a_locsave" value="Save Location" /></td>
   <td>&nbsp;</td>
 </tr>
 </table>
index 43c041b..ac176f2 100644 (file)
@@ -1,4 +1,4 @@
-<:wrap admin/xbase.tmpl title=>"Location List":>
+<:wrap admin/base.tmpl title=>"Location List":>
 <h1>Location List</h1>
 
 <:ifMessage:><p><b><:message:></b></p><:or:><:eif:>
@@ -6,8 +6,8 @@
 <p>| <a href="/cgi-bin/admin/menu.pl">Admin menu</a> |<:ifUserCan bse_location_add:>
 <a href="<:script:>?a_locaddform=1">Add Location</a> |<:or:><:eif:></p>
 
-<table cellpadding="6" border="0" cellspacing="1">
-   <tr bgcolor="#FFFFFF">
+<table>
+   <tr>
       <th>Description</th>
       <th>Room</th>
       <th>Street</th>
     </tr>
 <:if Locations:>
 <:iterator begin locations:>
-    <tr bgcolor="#FFFFFF">
+    <tr>
       <td><:ilocation description:></td>
       <td><:ilocation room:></td>
       <td><:ilocation street1:> <:ilocation street2:></td>
       <td><:ilocation suburb:></td>
-      <td align="center"><:ifIlocation disabled:>Disabled<:or:><:eif:></td>
+      <td><:ifIlocation disabled:>Disabled<:or:><:eif:></td>
       <td><:ifUserCan bse_location_edit:><a href="<:script:>?a_locedit=1&amp;id=<:ilocation id:>">Edit</a><:or:><:eif:> 
 <:ifUserCan bse_location_view:><a href="<:script:>?a_locview=1&amp;id=<:ilocation id:>">View</a> <a href="<:script:>?a_locview=1&amp;id=<:ilocation id:>&amp;_t=sessions">Sessions</a><:or:><:eif:> 
 <:ifAnd [ifRemovable] [ifUserCan bse_location_delete]:><a href="<:script:>?a_locdelask=1&amp;id=<:ilocation id:>">Delete</a><:or:><:eif:></td>
     </tr>
 <:iterator end locations:>
 <:or Locations:>
-    <tr bgcolor="#FFFFFF">
-      <td colspan="7" align="center">You don't have any locations defined</td>
+    <tr>
+      <td colspan="7">You don't have any locations defined</td>
     </tr>
 <:eif Locations:>
 </table>
index 61177e5..b091046 100644 (file)
@@ -1,4 +1,4 @@
-<:wrap admin/xbase.tmpl title=>"View Location":>
+<:wrap admin/base.tmpl title=>"View Location":>
 <h1>View Location</h1>
 <p>
 | <a href="/cgi-bin/admin/menu.pl">Admin menu</a> |
@@ -9,97 +9,97 @@
 <p><b><:message:></b></p>
 <:or:><:eif:> 
 
-<table>
+<table class="editform editformtiny">
 <tr>
   <th><:field description description:>:</th>
   <td><:location description:></td>
-  <td><:help addlocation description:></td>
+  <td class="help"><:help addlocation description:></td>
 </tr>
 <tr>
   <th><:field room description:>:</th>
   <td><:location room:></td>
-  <td><:help addlocation room:></td>
+  <td class="help"><:help addlocation room:></td>
 </tr>
 <tr>
   <th><:field street1 description:>:</th>
   <td><:location street1:></td>
-  <td><:help addlocation street1:></td>
+  <td class="help"><:help addlocation street1:></td>
 </tr>
 <tr>
   <th><:field street2 description:>:</th>
   <td><:location street2:></td>
-  <td><:help addlocation street2:></td>
+  <td class="help"><:help addlocation street2:></td>
 </tr>
 <tr>
   <th><:field suburb description:>:</th>
   <td><:location suburb:></td>
-  <td><:help addlocation suburb:></td>
+  <td class="help"><:help addlocation suburb:></td>
 </tr>
 <tr>
   <th><:field state description:>:</th>
   <td><:location state:></td>
-  <td><:help addlocation state:></td>
+  <td class="help"><:help addlocation state:></td>
 </tr>
 <tr>
   <th><:field country description:>:</th>
   <td><:location country:></td>
-  <td><:help addlocation country:></td>
+  <td class="help"><:help addlocation country:></td>
 </tr>
 <tr>
   <th><:field postcode description:>:</th>
   <td><:location postcode:></td>
-  <td><:help addlocation postcode:></td>
+  <td class="help"><:help addlocation postcode:></td>
 </tr>
 <tr>
   <th><:field public_notes description:>:</th>
-  <td><textarea name="public_notes" rows="<:field public_notes height:>" cols="<:field public_notes width:>" wrap="virtual" readonly="readonly"><:location public_notes:></textarea></td>
-  <td><:help addlocation public_notes:></td>
+  <td><textarea name="public_notes" rows="<:field public_notes height:>" cols="<:field public_notes width:>" readonly="readonly"><:location public_notes:></textarea></td>
+  <td class="help"><:help addlocation public_notes:></td>
 </tr>
 <tr>
   <th>Disabled:</th>
-  <td><img src="/images/admin/<:ifLocation disabled:>checked.gif<:or:>unchecked.gif<:eif:>" /></td>
-  <td><:help addlocation disabled:></td>
+  <td><img src="/images/admin/<:ifLocation disabled:>checked.gif<:or:>unchecked.gif<:eif:>" alt="<:ifLocation disabled:>checked<:or:>unchecked<:eif:>" /></td>
+  <td class="help"><:help addlocation disabled:></td>
 </tr>
 <tr>
-  <th colspan="2">Bookings</th>
+  <th colspan="3">Bookings</th>
 </tr>
 <tr>
   <th><:field bookings_name description:>:</th>
   <td><:location bookings_name:></td>
-  <td><:help addlocation bookings_name:></td>
+  <td class="help"><:help addlocation bookings_name:></td>
 </tr>
 <tr>
   <th><:field bookings_phone description:>:</th>
   <td><:location bookings_phone:></td>
-  <td><:help addlocation bookings_phone:></td>
+  <td class="help"><:help addlocation bookings_phone:></td>
 </tr>
 <tr>
   <th><:field bookings_fax description:>:</th>
   <td><:location bookings_fax:></td>
-  <td><:help addlocation bookings_fax:></td>
+  <td class="help"><:help addlocation bookings_fax:></td>
 </tr>
 <tr>
   <th><:field bookings_url description:>:</th>
   <td><:location bookings_url:></td>
-  <td><:help addlocation bookings_url:></td>
+  <td class="help"><:help addlocation bookings_url:></td>
 </tr>
 <tr>
-  <th colspan="2">Facilities</th>
+  <th colspan="3">Facilities</th>
 </tr>
 <tr>
   <th><:field facilities_name description:>:</th>
   <td><:location facilities_name:></td>
-  <td><:help addlocation facilities_name:></td>
+  <td class="help"><:help addlocation facilities_name:></td>
 </tr>
 <tr>
   <th><:field facilities_phone description:>:</th>
   <td><:location facilities_phone:></td>
-  <td><:help addlocation facilities_phone:></td>
+  <td class="help"><:help addlocation facilities_phone:></td>
 </tr>
 <tr>
   <th><:field admin_notes description:>:</th>
-  <td><textarea name="admin_notes" rows="<:field admin_notes height:>" cols="<:field admin_notes width:>" wrap="virtual" readonly="readonly"><:location admin_notes:></textarea></td>
-  <td><:help addlocation admin_notes:></td>
+  <td><textarea name="admin_notes" rows="<:field admin_notes height:>" cols="<:field admin_notes width:>" readonly="readonly"><:location admin_notes:></textarea></td>
+  <td class="help"><:help addlocation admin_notes:></td>
 </tr>
 
 </table>
index acd7f7e..18863d4 100644 (file)
@@ -1,4 +1,4 @@
-<:wrap admin/xbase.tmpl title=>"View Location Sessions":>
+<:wrap admin/base.tmpl title=>"View Location Sessions":>
 <h1>View Location Sessions: <:location description:></h1>
 <p>
 | <a href="/cgi-bin/admin/menu.pl">Admin menu</a>
index dec0686..d687d3c 100644 (file)
@@ -1,4 +1,4 @@
-<:wrap admin/xbase.tmpl title => "Audit Entry", bodyid => "auditentry":>
+<:wrap admin/base.tmpl title => "Audit Entry", bodyid => "auditentry":>
 <h1>BSE Audit Log - Entry <:auditentry id:></h1>
 <p>| <a href="/admin/">Admin Menu</a>
 | <a href="<:adminurl log:>">Return to Log</a>
index 561e969..64558e2 100644 (file)
@@ -1,4 +1,4 @@
-<:wrap admin/xbase.tmpl title => "Audit Log", bodyid => "auditlog":>
+<:wrap admin/base.tmpl title => "Audit Log", bodyid => "auditlog":>
 <h1>BSE Audit Log</h1>
 <p>| <a href="/admin/">Admin Menu</a> |</p>
 
index a54adf2..05dd054 100644 (file)
@@ -6,33 +6,27 @@
 
 <form method="post" action="<:adminbase:><:script:>">
 <:if Cgi r:>
-<input type="hidden" name="r" value="<:cgi r:>">
+<input type="hidden" name="r" value="<:cgi r:>" />
 <:or Cgi:><:eif Cgi:>
-  <table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000" class="table">
-    <tr> 
-      <td> 
-        <table cellpadding="6" border="0" cellspacing="1">
+        <table class="editform editformtiny">
           <tr> 
-            <th bgcolor="#FFFFFF" align="left">Logon: </th>
-            <td bgcolor="#FFFFFF"
-              <input type="text" name="logon" />
+            <th><label for="logon">Logon:</label> </th>
+            <td> 
+              <input type="text" name="logon" accesskey="l" tabindex="10" id="logon" class="focusme" />
             </td>
-            <td bgcolor="#FFFFFF"><:help logon logon:> <:error_img logon:></td>
+            <td class="help"><:help logon logon:> <:error_img logon:></td>
           </tr>
           <tr> 
-            <th bgcolor="#FFFFFF" align="left"> Password: </th>
-            <td bgcolor="#FFFFFF"
-              <input type="password" name="password" />
+            <th><label for="password">Password:</label></th>
+            <td> 
+              <input type="password" name="password" accesskey="p" tabindex="10" id="password" />
               </td>
-            <td bgcolor="#FFFFFF"> <:help logon password:> <:error_img password:></td>
+            <td class="help"> <:help logon password:> <:error_img password:></td>
           </tr>
           <tr> 
-            <td bgcolor="#FFFFFF" colspan="3" align="right"> 
-              <input type="submit" name="a_logon" value="  Logon  " />
+            <td colspan="3" class="buttons"> 
+              <input type="submit" name="a_logon" tabindex="30" value="  Logon  " />
             </td>
           </tr>
         </table>
-      </td>
-    </tr>
-  </table>
 </form>
index ae9e360..ff34ce8 100644 (file)
@@ -1,4 +1,4 @@
-<:wrap admin/xbase.tmpl title=>"Member Data Update":>
+<:wrap admin/base.tmpl title=>"Member Data Update":>
 <h1>Member Data Update</h1>
 <p>| <a href="/cgi-bin/admin/menu.pl">Admin menu</a> 
 |</p>
index ca851ee..3727668 100644 (file)
@@ -1,4 +1,4 @@
-<:wrap admin/xbase.tmpl title=>"Preview Member Data Update":>
+<:wrap admin/base.tmpl title=>"Preview Member Data Update":>
 <h1>Preview Member Data Update</h1>
 <p>| <a href="/cgi-bin/admin/menu.pl">Admin menu</a> 
 |</p>
index 1110c23..17efea2 100644 (file)
@@ -1,11 +1,11 @@
-<:wrap admin/xbase.tmpl title=>"Update Member Data":>
+<:wrap admin/base.tmpl title=>"Update Member Data":>
 <h1>Update Member Data</h1>
 <:ifMessage:>
 <p><b><:message:></b></p>
 <:or:><:eif:> 
-<p>| <a href="/cgi-bin/admin/menu.pl">Admin menu</a> 
+<p>| <a href="<:adminurl menu:>">Admin menu</a> 
 |</p>
-<form action="<:script:>" method="post" enctype="multipart/form-data" name="updatememberdata">
+<form action="<:adminurl userupdate:>" method="post" enctype="multipart/form-data" name="updatememberdata">
 <:ifCgi r:><input type="hidden" name="r" value="<:cgi r:>" /><:or:><:eif:>
 <table class="editform editformsmall">
   <tr>
@@ -23,7 +23,7 @@
     <td><input type="file" name="file" /></td>
     <td><:error_img file:></td>
   <tr>
-    <td colspan="3"><input type="submit" name="a_preview" value="Preview Import" /><input type="submit" name="a_import" value="Do Import" /></td>
+    <td colspan="3" class="buttons"><input type="submit" name="a_preview" value="Preview Import" /><input type="submit" name="a_import" value="Do Import" /></td>
   </tr>
 </table>
 </form>
index 411ac86..4a99d1f 100644 (file)
@@ -3,7 +3,7 @@
 <:ifFormLogon:><p>| <a href="/cgi-bin/admin/logon.pl?a_logoff=1">Logoff <:adminuser logon:></a> | <a href="/cgi-bin/admin/changepw.pl">Change Password</a> |</p><:or:><:eif:>
 <:ifMessage:><p><b><:message:></b></p><:or:><:eif:>
 
-<table class="editform menu">
+<table class="menu">
 <tr>
   <th width="33%">Content</th>
   <th width="33%">Users</th>
@@ -79,6 +79,8 @@ href="/cgi-bin/admin/generate.pl?id=extras&amp;progress=1">verbose</a>)</li></ul
 
 <p><a href="<:adminurl report:>">Reports</a></p>
 
+<p><a href="<:adminurl log:>">Audit Log</a></p>
+
 <p><a href="/cgi-bin/admin/shopadmin.pl">Shop administration</a></p>
 
 <ul>
@@ -86,7 +88,7 @@ href="/cgi-bin/admin/generate.pl?id=extras&amp;progress=1">verbose</a>)</li></ul
 <:if UserCan shop_order_list :>
 <li><a
 href="/cgi-bin/admin/shopadmin.pl?order_list=1&amp;template=order_list_unfilled">View
-current orders</a> <br>(<a
+current orders</a> <br />(<a
 href="/cgi-bin/admin/shopadmin.pl?order_list=1">all</a> or <a
 href="/cgi-bin/admin/shopadmin.pl?order_list=1&amp;template=order_list_filled">filled</a>)</li>
 <:or UserCan:><:eif UserCan:>
@@ -109,7 +111,7 @@ href="/cgi-bin/admin/shopadmin.pl?order_list=1&amp;template=order_list_filled">f
 
       <form action="/cgi-bin/admin/admin.pl">
         Jump to: 
-        <input type=text name=id size=4>
-        <input type="submit" value="Jump!">
+        <input type="text" name="id" size="4" />
+        <input type="submit" value="Jump!" />
         (Article ID eg: 1 = Home) 
       </form>
index d89976f..cabfa14 100644 (file)
@@ -1,4 +1,4 @@
-<:wrap admin/xbase.tmpl title => "BSE Modules":>
+<:wrap admin/base.tmpl title => "BSE Modules":>
 <h1>BSE Modules</h1>
 <p>
 | <a href="/cgi-bin/admin/menu.pl">Admin menu</a> 
index cc2191f..dac11f6 100644 (file)
@@ -1,4 +1,4 @@
-<:wrap admin/xbase.tmpl title => "Message Catalog", js=>"admin_messages.js", showtitle => 1, css => "admin_messages.css", api => 1, jstools=>1:>
+<:wrap admin/base.tmpl title => "Message Catalog", js=>"admin_messages.js", showtitle => 1, css => "admin_messages.css", api => 1, jstools=>1:>
 <p>| <a href="/cgi-bin/admin/menu.pl">Admin Menu</a>
 | <a href="#" id="close_all">Close all</a>
 | <a href="#" id="open_all">Open all</a>
index ec28197..2e078e5 100644 (file)
@@ -1,7 +1,4 @@
-<html><head><title>Order <:order id:> details</title>
-<link rel="stylesheet" href="/css/admin.css">
-</head>
-<body>
+<:wrap admin/base.tmpl title => [concatenate "Order " [order id] " details"]:> 
 <h1>Shop Administration</h1>
 <p>| <a href="/cgi-bin/admin/menu.pl">Admin menu</a> |
 <a href="<:adminurl shopadmin:>">Manage catalogs</a> |
 </p>
 <:ifMessage:><div class="message"><:message:></div><:or:><:eif:>
 <h2>Order details - No: #<:order id:></h2>
-<:ifOrder complete:><:or:><p><b><font size="+1">This order is incomplete and should not be filled.</font></b></p><:eif:>
-<table cellpadding="6" cellspacing="1" border="0">
+<:ifOrder complete:><:or:><p>This order is incomplete and should not be filled.</p><:eif:>
+<table class="editform orderdetail_head">
   <tr> 
-    <td align="left"><b>E-mail:</b></td>
-    <td><a href="mailto:<:order emailAddress:>"><:order emailAddress:></a></td>
-    <td>&nbsp;</td>
-    <td align="left"><b>Phone:</b></td>
-    <td><:order telephone:></td>
+    <th class="col_head">E-mail:</th>
+    <td class="col_value"><a href="mailto:<:order emailAddress:>"><:order emailAddress:></a></td>
+    <td rowspan="3">&nbsp;</td>
+    <th class="col_head">Phone:</th>
+    <td class="col_value"><:order telephone:></td>
   </tr>
   <tr> 
-    <td align="left"><b>Date:</b></td>
-    <td><:date order orderDate:></td>
-    <td>&nbsp;</td>
-    <td align="left"><b>Mobile:</b></td>
-    <td><:order delivMobile:></td>
+    <th class="col_head">Date:</th>
+    <td class="col_value"><:date order orderDate:></td>
+    <th class="col_head">Mobile:</th>
+    <td class="col_value"><:order delivMobile:></td>
   </tr>
   <tr> 
-    <td align="left"><b>Delivery:</b></td>
-    <td><:order delivFirstName:> <:order delivLastName:></td>
-    <td rowspan="6">&nbsp;&nbsp;</td>
-    <td align="left"><b>Billing:</b></td>
-    <td><:order billFirstName:> <:order billLastName:></td>
-  </tr>
-  <tr> 
-    <td rowspan="5">&nbsp;</td>
-    <td><:order delivOrganization:></td>
-    <td rowspan="5">&nbsp;</td>
-    <td><:order billOrganization:></td>
-  </tr>
-  <tr> 
-    <td><:order delivStreet:></td>
-    <td><:order billStreet:></td>
-  </tr>
-  <tr> 
-    <td><:order delivStreet2:></td>
-    <td><:order billStreet2:></td>
-  </tr>
-  <tr> 
-    <td><:order delivSuburb:> <:order delivState:> <:order delivPostCode:></td>
-    <td><:order billSuburb:> <:order billState:> <:order billPostCode:></td>
-  </tr>
-  <tr> 
-    <td><:order delivCountry:></td>
-    <td><:order billCountry:></td>
+    <th class="col_head">Delivery:</th>
+    <td class="col_value"><:order delivFirstName:> <:order delivLastName:>
+      <:ifOrder delivOrganization:><br /><:order delivOrganization:><:or:><:eif:>
+      <br /><:order delivStreet:>
+      <:ifOrder delivStreet2:><br /><:order delivStreet2:><:or:><:eif:>
+      <br /><:order delivSuburb:> <:order delivState:> <:order delivPostCode:>
+      <br /><:order delivCountry:></td>
+    <th class="col_head">Billing:</th>
+    <td class="col_value">
+      <:order billFirstName:> <:order billLastName:>
+      <:ifOrder billOrganization:><br /><:order billOrganization:><:eif:>
+      <br /><:order billStreet:>
+      <:ifOrder billStreet2:><br /><:order billStreet2:><:or:><:eif:>
+      <br /><:order billSuburb:> <:order billState:> <:order billPostCode:>
+      <br /><:order billCountry:>
+    </td>
   </tr>
   <:include custom/order_detail.include optional:><:include admin/include/custom/order_detail_custom.tmpl optional:><:include admin/include/order_detail_custom.tmpl optional:>
 </table>
 
-<br>
-      <table class="editform">
+<br />
+      <table class="editform orderdetail">
         <tr> 
-          <th width="100%">Description</th>
-          <th nowrap>Units</th>
-          <th nowrap>Unit Price</th>
-          <th nowrap>Extension</th>
-          <th nowrap>Unit Wsale</th>
-          <th nowrap>Ext Wsale</th>
-          <th nowrap>Unit GST</th>
-          <th nowrap>Ext GST</th>
+          <th class="col_description">Description</th>
+          <th class="col_units">Units</th>
+          <th class="col_unitprice">Unit Price</th>
+          <th class="col_extension">Extension</th>
+          <th class="col_unit_wsale">Unit Wsale</th>
+          <th class="col_ext_wsale">Ext Wsale</th>
+          <th class="col_unit_gst">Unit GST</th>
+          <th class="col_ext_gst">Ext GST</th>
 </tr>
 <:iterator begin items:>
         <tr> 
-          <td width="100%"><:ifOr [ifEq [item productId] -1] [ifEq [product id] ""]:><:item title:> (product deleted)<:or:><a href="<:adminurl shopadmin product_detail 1 id [product id]:>"><:product
+          <td class="col_description"><:ifOr [ifEq [item productId] -1] [ifEq [product id] ""]:><:item title:> (product deleted)<:or:><a href="<:adminurl shopadmin product_detail 1 id [product id]:>"><:product
             title:></a><:eif:> <:options:></td>
-          <td align=center nowrap><:item units:></td>
-          <td align=right nowrap><:money item price:></td>
-          <td align=right nowrap><:extension price:></td>
-          <td align=right nowrap><:money item wholesalePrice:></td>
-          <td align=right nowrap><:extension wholesalePrice:></td>
-          <td align=right nowrap><:money item gst:></td>
-          <td align=right nowrap><:extension gst:></td>
+          <td class="col_units"><:item units:></td>
+          <td class="col_unitprice"><:money item price:></td>
+          <td class="col_extension"><:extension price:></td>
+          <td class="col_unit_wsale"><:money item wholesalePrice:></td>
+          <td class="col_ext_wsale"><:extension wholesalePrice:></td>
+          <td class="col_unit_gst"><:money item gst:></td>
+          <td class="col_ext_gst"><:extension gst:></td>
 </tr>
 <:iterator end items:>
 <:if Cfg shop shipping:>
 <:if Order shipping_name:>
 
         <tr> 
-          <td colspan=3>
+          <td colspan="3" class="col_contact">
 <:if Eq [order shipping_name] "contact":>
-<b>Contact customer to make shipping arrangements</b>
+Contact customer to make shipping arrangements
 <:or Eq:>
 Shipping via <:order shipping_method:>
 <:eif Eq:>, 
@@ -106,22 +91,22 @@ Shipping via <:order shipping_method:>
     </form>
 
 </td>
-          <td align=right nowrap><:money order shipping_cost:></td>
+          <td class="col_extension"><:money order shipping_cost:></td>
           <td>&nbsp;</td>
-          <td align=right nowrap></td>
+          <td class="col_ext_wsale"></td>
           <td>&nbsp;</td>
-          <td align=right nowrap></td>
+          <td class="col_ext_gst"></td>
 </tr>
 <:or Order:><:eif Order:>
 <:or Cfg:>
 <:eif Cfg:>
-        <tr bgcolor="#FFFFFF"
-          <td colspan=3 align=right>Total:</td>
-          <td align=right nowrap><:money order total:></td>
+        <tr> 
+          <td colspan="3" class="col_total">Total:</td>
+          <td class="col_extension total"><:money order total:></td>
           <td>&nbsp;</td>
-          <td align=right nowrap><:money order wholesaleTotal:></td>
+          <td class="col_ext_wsale total"><:money order wholesaleTotal:></td>
           <td>&nbsp;</td>
-          <td align=right nowrap><:money order gst:></td>
+          <td class="col_ext_gst total"><:money order gst:></td>
 </tr>
 <:if Cfg shop shipping:><:or Cfg:>
 <tr>
@@ -195,6 +180,3 @@ Shipping via <:order shipping_method:>
 <:include admin/include/auditentry.tmpl:>
 <:iterator end auditlog:>
 </table>
-
-</table>
-</body></html>
index 7ef1c9c..6f8b74f 100644 (file)
@@ -1,58 +1,46 @@
-<html><head><title>Order list - Shop administration</title>
-<link rel="stylesheet" href="/css/admin.css">
-</head>
-<body>
+<:wrap admin/base.tmpl title => "Order list - Shop administration":>
 <h1>Shop Administration</h1>
 <p>| <a href="/cgi-bin/admin/menu.pl">Admin menu</a> | <a href="<:script:>">Manage catalogs</a> 
-  | <a href="<:script:>?order_list=1&template=order_list_unfilled">Unfilled orders</a>  [ <:order_count filter= filled==0 :> ]
-  | <a href="<:script:>?order_list=1&template=order_list_filled">Filled orders</a>   [ <:order_count filter= filled!=0 :> ]
+  | <a href="<:script:>?order_list=1&amp;template=order_list_unfilled">Unfilled orders</a>  [ <:order_count filter= filled==0 :> ]
+  | <a href="<:script:>?order_list=1&amp;template=order_list_filled">Filled orders</a>   [ <:order_count filter= filled!=0 :> ]
   |</p>
 <h2>Order list</h2>
 
-<table bgcolor="#000000" cellpadding="0" cellspacing="0" border="0" width="100%" class="table">
-  <tr>
-<td>
-      <table border=0 cellpadding="6" cellspacing="1" width="100%">
-        <tr bgcolor="#FFFFFF"> 
+      <table class="editform orderlist">
+        <tr> 
           <th>Id</th>
-          <th width="100%">Name</th>
+          <th>Name</th>
           <th>Status</th>
           <th>Date</th>
           <th>Total</th>
           <th>GST</th>
           <th>Details</th>
         </tr>
-        <tr bgcolor="#FFFFFF"
+        <tr> 
           <td colspan="7"> 
-            <form action="<:script:>" method="POST">
-              <input type="hidden" name="order_list" value="1">
+            <form action="<:script:>" method="post">
+              <input type="hidden" name="order_list" value="1" />
               From date: 
-              <input type="text" size="10" name="from" value="<:cgi from:>">
+              <input type="text" size="10" name="from" value="<:cgi from:>" />
               To date: 
-              <input type="text" size="10" name="to" value="<:cgi to:>">
-              <input type=submit value="Filter orders" name="submit">
+              <input type="text" size="10" name="to" value="<:cgi to:>" />
+              <input type=submit value="Filter orders" name="submit" />
             </form>
           </td>
         </tr>
         <:iterator begin orders:> 
-        <tr bgcolor="#FFFFFF"
-          <td align="center" nowrap><a href="<:script:>?id=<:order id:>&order_detail=1"><:order 
+        <tr> 
+          <td class="col_id"><a href="<:script:>?id=<:order id:>&amp;order_detail=1"><:order 
             id:></a></td>
-          <td width="100%"><:order delivFirstName:> <:order delivLastName:> <:ifOrder 
+          <td class="col_name"><:order delivFirstName:> <:order delivLastName:> <:ifOrder 
             userId:><font color="#CCCCCC">&#8212; (logged in)</font><:or:><:eif:></td>
-          <td nowrap bgcolor="<:ifOrder filled:>#CC0033<:or:>#66CC00<:eif:>"><:ifOrder 
-            filled:><font color="#999999">Completed</font><:or:><font color="#FFFFFF">Processing</font><:eif:></td>
-          <td nowrap><:date order orderDate:></td>
-          <td align=right nowrap>$<:money order total:></td>
-          <td align=right nowrap>$<:money order gst:></td>
-          <td nowrap> <a href="<:script:>?id=<:order id:>&order_detail=1">Order 
+          <td class="col_status <:ifOrder filled:>filled<:or:>unfilled<:eif:>"><:ifOrder 
+            filled:>Completed<:or:>Processing<:eif:></td>
+          <td class="col_date"><:date order orderDate:></td>
+          <td class="col_total">$<:money order total:></td>
+          <td class="col_gst">$<:money order gst:></td>
+          <td class="col_tools"> <a href="<:script:>?id=<:order id:>&amp;order_detail=1">Order 
             details </a> </td>
         </tr>
         <:iterator end orders:> 
       </table>
-</td>
-</tr>
-</table>
-<p><font size="-1">BSE Release <:release:></font></p>
-</body>
-</html>
index d24f829..979703c 100644 (file)
@@ -1,18 +1,12 @@
-<html><head><title>Order list - Shop administration</title>
-<link rel="stylesheet" href="/css/admin.css">
-</head>
-<body>
+<:wrap admin/base.tmpl title => "Order list - Shop administration":>
 <h1>Shop Administration</h1>
 <p>| <a href="/cgi-bin/admin/menu.pl">Admin menu</a> | <a href="<:script:>">Manage catalogs</a> 
-  | <a href="<:script:>?order_list=1&template=order_list_unfilled">Unfilled orders</a>  [ <:order_count filter= filled==0:> ]
+  | <a href="<:script:>?order_list=1&amp;template=order_list_unfilled">Unfilled orders</a>  [ <:order_count filter= filled==0:> ]
   | <a href="<:script:>?order_list=1">All orders</a>  [ <:order_count filter= id!=0:> ] |</p>
 <h2>Order list - Filled orders</h2>
 
-<table bgcolor="#000000" cellpadding="0" cellspacing="0" border="0" width="100%" class="table">
-  <tr>
-<td>
-      <table border=0 cellpadding="6" cellspacing="1" width="100%">
-        <tr bgcolor="#FFFFFF"> 
+      <table class="editform orderlist">
+        <tr> 
           <th>Id</th>
           <th width="100%">Name</th>
           <th>Date</th>
           <th>GST</th>
           <th>Details</th>
         </tr>
-        <tr bgcolor="#FFFFFF"
+        <tr> 
           <td colspan="6"> 
-            <form action="<:script:>" method="POST">
-              <input type="hidden" name="order_list" value="1">
-              <input type="hidden" name="template" value="order_list_filled">
+            <form action="<:script:>" method="post">
+              <input type="hidden" name="order_list" value="1" />
+              <input type="hidden" name="template" value="order_list_filled" />
               From date: 
-              <input type="text" size="10" name="from" value="<:cgi from:>">
+              <input type="text" size="10" name="from" value="<:cgi from:>" />
               To date: 
-              <input type="text" size="10" name="to" value="<:cgi to:>">
-              <input type=submit value="Filter orders" name="submit">
+              <input type="text" size="10" name="to" value="<:cgi to:>" />
+              <input type=submit value="Filter orders" name="submit" />
             </form>
           </td>
         </tr>
         <:iterator begin orders filter= filled!=0 :> 
-        <tr bgcolor="#FFFFFF"
-          <td align="center" nowrap><a href="<:script:>?id=<:order id:>&order_detail=1"><:order 
+        <tr> 
+          <td class="col_id"><a href="<:script:>?id=<:order id:>&amp;order_detail=1"><:order 
             id:></a></td>
-          <td width="100%"><:order delivFirstName:> <:order delivLastName:> <:ifOrder 
+          <td class="col_title"><:order delivFirstName:> <:order delivLastName:> <:ifOrder 
             userId:><font color="#CCCCCC">&#8212; (logged in)</font><:or:><:eif:></td>
-          <td nowrap><:date order orderDate:></td>
-          <td align=right nowrap>$<:money order total:></td>
-          <td align=right nowrap>$<:money order gst:></td>
-          <td nowrap> <a href="<:script:>?id=<:order id:>&order_detail=1">Order 
+          <td class="col_date"><:date order orderDate:></td>
+          <td class="col_total">$<:money order total:></td>
+          <td class="col_total">$<:money order gst:></td>
+          <td class="col_tools"> <a href="<:script:>?id=<:order id:>&amp;order_detail=1">Order 
             details </a> </td>
         </tr>
         <:iterator end orders:> 
       </table>
-</td>
-</tr>
-</table>
-<p><font size="-1">BSE Release <:release:></font></p>
-</body>
-</html>
index b61bbe3..af21bf0 100644 (file)
@@ -1,55 +1,43 @@
-<html><head><title>Order list - Shop administration</title>
-<link rel="stylesheet" href="/css/admin.css">
-</head>
-<body>
+<:wrap admin/base.tmpl title => "Order list - Shop administration":>
 <h1>Shop Administration</h1>
 <p>| <a href="/cgi-bin/admin/menu.pl">Admin menu</a> | <a href="<:script:>">Manage catalogs</a> 
-  | <a href="<:script:>?order_list=1&template=order_list_filled">Filled orders</a> [ <:order_count filter= filled!=0:> ]
+  | <a href="<:script:>?order_list=1&amp;template=order_list_filled">Filled orders</a> [ <:order_count filter= filled!=0:> ]
   | <a href="<:script:>?order_list=1">All orders</a>  [ <:order_count filter= id!=0:> ] |</p>
 <h2>Order list - Unfilled orders</h2>
 
-<table bgcolor="#000000" cellpadding="0" cellspacing="0" border="0" width="100%" class="table">
-  <tr>
-<td>
-      <table border=0 cellpadding="6" cellspacing="1" width="100%">
-        <tr bgcolor="#FFFFFF"> 
+      <table class="editform orderlist">
+        <tr> 
           <th>Id</th>
-          <th width="100%">Name</th>
+          <th>Name</th>
           <th>Date</th>
           <th>Total</th>
           <th>GST</th>
           <th>Details</th>
         </tr>
-        <tr bgcolor="#FFFFFF"
+        <tr> 
           <td colspan="6"> 
-            <form action="<:script:>" method="POST">
-              <input type="hidden" name="order_list2" value="1">
-              <input type="hidden" name="template2" value="order_list_unfilled">
+            <form action="<:script:>" method="post">
+              <input type="hidden" name="order_list2" value="1" />
+              <input type="hidden" name="template2" value="order_list_unfilled" />
               From date: 
-              <input type="text" size="10" name="from2" value="<:cgi from:>">
+              <input type="text" size="10" name="from2" value="<:cgi from:>" />
               To date: 
-              <input type="text" size="10" name="to2" value="<:cgi to:>">
-              <input type=submit value="Filter orders" name="submit2">
+              <input type="text" size="10" name="to2" value="<:cgi to:>" />
+              <input type=submit value="Filter orders" name="submit2" />
             </form>
           </td>
         </tr>
         <:iterator begin orders filter= filled==0 :> 
-        <tr bgcolor="#FFFFFF"
-          <td align="center" nowrap><a href="<:script:>?id=<:order id:>&order_detail=1"><:order 
+        <tr> 
+          <td class="col_id"><a href="<:script:>?id=<:order id:>&amp;order_detail=1"><:order 
             id:></a></td>
-          <td width="100%"><:order delivFirstName:> <:order delivLastName:> <:ifOrder 
+          <td class="col_name"><:order delivFirstName:> <:order delivLastName:> <:ifOrder 
             userId:><font color="#CCCCCC">&#8212; (logged in)</font><:or:><:eif:></td>
-          <td nowrap><:date order orderDate:></td>
-          <td align=right nowrap>$<:money order total:></td>
-          <td align=right nowrap>$<:money order gst:></td>
-          <td nowrap> <a href="<:script:>?id=<:order id:>&order_detail=1">Order 
+          <td class="col_date"><:date order orderDate:></td>
+          <td class="col_total">$<:money order total:></td>
+          <td class="col_total">$<:money order gst:></td>
+          <td class="col_tools"> <a href="<:script:>?id=<:order id:>&amp;order_detail=1">Order 
             details </a></td>
         </tr>
         <:iterator end orders:> 
       </table>
-</td>
-</tr>
-</table>
-<p><font size="-1">BSE Release <:release:></font></p>
-</body>
-</html>
index 2f33640..85b3466 100644 (file)
@@ -2,9 +2,10 @@
 <style type="text/css">
 #show {
   width: 100%;
-  height: 90%;
+  height: 40em;
+  margin-left: -4em;
 }
 </style>
-<p>Viewing: <:template id:> | <a href="<:script:>">Return to list</a> | <a href="/cgi-bin/menu.pl">Admin Menu</a> |</p>
-<iframe id="show" src="<:script:>?a_display=1&amp;template=<:template id:>">
+<p>Viewing: <:template id:> | <a href="<:adminurl pregen:>">Return to list</a> | <a href="<:adminurl menu:>">Admin Menu</a> |</p>
+<iframe id="show" src="<:adminurl pregen a_display 1 template [template id]:>">
 </iframe>
index 1c46250..a7a5adc 100644 (file)
@@ -1,20 +1,32 @@
-<:wrap admin/xbase.tmpl title => "Delete Product Option", menuitem=>none :>
+<:wrap admin/base.tmpl title => "Delete Product Option", menuitem=>"none", showtitle=>"1" :>
 <:include admin/product_menu.tmpl:>
 <form action="<:script:>" method="post">
 <input type="hidden" name="id" value="<:article id:>" />
 <input type="hidden" name="option_id" value="<:option id:>" />
 <input type="hidden" name="_t" value="prodopts" />
 <:csrfp admin_delete_option hidden:>
-<p>Option: <:option name:></p>
+<table class="editform editformtiny">
+<tr>
+  <th>Option:</th>
+  <td><:option name:></td>
+</tr>
+<tr>
+  <th>Values:</th>
+<td>
 <:if Dboptionvalues:>
-<p>Values:</p>
 <:iterator begin dboptionvalues:>
-<p>Value: <:dboptionvalue value:></p>
+<div><:dboptionvalue value:></div>
 <:iterator end dboptionvalues:>
 <:or Dboptionvalues:>
 <p>No values defined for this option</p>
 <:eif Dboptionvalues:>
-<p><input type="submit" name="a_delete_option" value="Delete" />
-<input type="submit" value="Return to product options" />
-</p>
-</form>
\ No newline at end of file
+</td>
+</tr>
+<tr>
+  <td class="buttons" colspan="2">
+  <input type="submit" name="a_delete_option" value="Delete" />
+  <input type="submit" value="Return to product options" />
+</td>
+</tr>
+</table>
+</form>
index a09f439..8636acd 100644 (file)
@@ -1,4 +1,4 @@
-<:wrap admin/xbase.tmpl title => "Edit Product Option", menuitem=>none, showtitle=>1 :>
+<:wrap admin/base.tmpl title => "Edit Product Option", menuitem=>"none", showtitle=>"1" :>
 <:include admin/product_menu.tmpl:>
 <form action="<:script:>" method="post">
 <input type="hidden" name="id" value="<:article id:>" />
@@ -6,7 +6,7 @@
 <input type="hidden" name="_t" value="prodopts" />
 <:csrfp admin_save_option hidden:>
 <input type="hidden" name="save_enabled" value="1" />
-<table class="editform">
+<table class="editform editformsmall">
 <tr>
   <th>Name:</th>
   <td><input type="text" name="name" value="<:old name option name:>" /></td>
index 5517ad9..6eb5d16 100644 (file)
@@ -1,13 +1,24 @@
-<:wrap admin/xbase.tmpl title => "Delete Product Option Value", menuitem=>"prodopt_delete" :>
+<:wrap admin/base.tmpl title => "Delete Product Option Value", menuitem=>"prodopt_delete", showtitle => "1" :>
 <:include admin/product_menu.tmpl:>
 <form action="<:script:>" method="post">
 <input type="hidden" name="id" value="<:article id:>" />
 <input type="hidden" name="value_id" value="<:option_value id:>" />
 <input type="hidden" name="_t" value="prodopts" />
 <:csrfp admin_delete_option_value hidden:>
-<p>Option: <:option name:></p>
-<p>Value: <:option_value value:></p>
-<p><input type="submit" name="a_delete_option_value" value="Delete" />
-<input type="submit" value="Return to product options" />
-</p>
+<table class="editform editformtiny">
+<tr>
+  <th>Option:</th>
+  <td><:option name:></td>
+</tr>
+<tr>
+  <th>Value:</th>
+  <td><:option_value value:></td>
+</tr>
+<tr>
+  <td colspan="2" class="buttons">
+    <input type="submit" name="a_delete_option_value" value="Delete" />
+    <input type="submit" value="Return to product options" />
+  </td>
+</tr>
+</table>
 </form>
\ No newline at end of file
index 2a6bace..af29c70 100644 (file)
@@ -1,4 +1,4 @@
-<:wrap admin/xbase.tmpl title => "Edit Product Option Value", menuitem=>none, showtitle=>1 :>
+<:wrap admin/base.tmpl title => "Edit Product Option Value", menuitem=>"none", showtitle=>"1" :>
 <:include admin/product_menu.tmpl:>
 <form action="<:script:>" method="post">
 <input type="hidden" name="id" value="<:article id:>" />
@@ -7,13 +7,15 @@
 <:csrfp admin_save_option_value hidden:>
 <table class="editform editformsmall">
 <tr>
-<th>Option:</th><td><:option name:></td></tr>
+  <th>Option:</th>
+  <td><:option name:></td>
+  <td></td>
+</tr>
 <tr>
 <th>Value:</th>
 <td><input type="text" name="value" value="<:old value option_value value:>" /></td><td class="help"><:error_img value:></td></tr>
 <tr>
-  <td class="buttons" colspan="2"><input type="submit" name="a_save_option_value" value="Save" /><input type="submit" value="Return to product options" /></td>
-  <td></td>
+  <td class="buttons" colspan="3"><input type="submit" name="a_save_option_value" value="Save" /><input type="submit" value="Return to product options" /></td>
 </tr>
 </table>
 </form>
\ No newline at end of file
index 4eeb39d..5177fad 100644 (file)
@@ -1,8 +1,4 @@
-<html><head><title>Products list - Shop administration</title>
-  <link rel="stylesheet" type="text/css" href="/css/admin.css">
-</head>
-
-<body>
+<:wrap admin/base.tmpl title => "Product list - Shop Administration":>
 <h1>Shop Administration</h1>
 <:ifMessage:><p><b><:message:></b></p>
 <:or:><:eif:> 
   ShowStepKids:> | </p>
 <:if Products:> 
 <h4>Products list</h4>
-<table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000" width="100%" class="table">
-  <tr>
-    <td>
-      <table border=0 cellpadding="6" cellspacing="1" width="100%">
+      <table class="productlist">
         <tr> 
-          <th bgcolor="#FFFFFF" nowrap>Id</th>
-          <th bgcolor="#FFFFFF" width="100%">Name</th>
-          <th bgcolor="#FFFFFF" nowrap>Release</th>
-          <th bgcolor="#FFFFFF" nowrap>Expire</th>
-          <th bgcolor="#FFFFFF" nowrap>Retail</th>
-          <th bgcolor="#FFFFFF" nowrap>Wsale</th>
-          <th bgcolor="#FFFFFF" nowrap>GST</th>
-          <th bgcolor="#FFFFFF" nowrap>Modify</th>
-          <th bgcolor="#FFFFFF">Note</th>
+          <th class="col_id">Id</th>
+          <th class="col_name">Name</th>
+          <th class="col_release">Release</th>
+          <th class="col_expire">Expire</th>
+          <th class="col_retail">Retail</th>
+          <th class="col_wsale">Wsale</th>
+          <th class="col_gst">GST</th>
+          <th>Modify</th>
+          <th class="col_note">Note</th>
         </tr>
         <:iterator begin products:> 
-        <tr bgcolor="#FFFFFF"
-          <td align="center" nowrap><:product id:></td>
-          <td width="100%"><a href="<:product admin:>"><:product title:></a></td>
-          <td nowrap><:date product release:></td>
-          <td nowrap><:ifMatch [product expire] "9999-12-31":>Never<:or:><:date product expire:><:eif:></td>
-          <td align=right nowrap>$<:money product retailPrice:></td>
-          <td align=right nowrap>$<:money product wholesalePrice:></td>
-          <td align=right nowrap>$<:money product gst:></td>
-          <td nowrap><a href="/cgi-bin/admin/add.pl?id=<:product id:>">Edit</a> 
+        <tr> 
+          <td class="col_id"><:product id:></td>
+          <td class="col_name"><a href="<:product admin:>"><:product title:></a></td>
+          <td class="col_release"><:date product release:></td>
+          <td class="col_expire"><:ifMatch [product expire] "9999-12-31":>Never<:or:><:date product expire:><:eif:></td>
+          <td class="col_retail">$<:money product retailPrice:></td>
+          <td class="col_wsale">$<:money product wholesalePrice:></td>
+          <td class="col_gst">$<:money product gst:></td>
+          <td class="col_modify"><a href="/cgi-bin/admin/add.pl?id=<:product id:>">Edit</a> 
             <:if Product listed:> <a href="/cgi-bin/admin/add.pl?hide=1&amp;id=<:product id:>&amp;_csrfp=<:csrfp admin_save_article:>&amp;r=<:cfg site url:><:script:>">Hide</a> 
             <:or Product:> <a href="/cgi-bin/admin/add.pl?unhide=1&amp;id=<:product id:>&amp;_csrfp=<:csrfp admin_save_article:>&amp;r=<:cfg site url:><:script:>">Show</a> 
             <:eif Product:> <:move:> </td>
-          <td><:ifProduct listed:>&nbsp;<:or:>Hidden<:eif:></td>
+          <td class="col_note"><:ifProduct listed:>&nbsp;<:or:>Hidden<:eif:></td>
         </tr>
         <:iterator end products:> 
       </table>
-    </td>
-  </tr>
-</table>
 <:or Products:><:eif Products:>
 <:iterator begin catalogs:> <a name="cat<:catalog id:>"></a> 
 <h2>Catalog: <:catalog title:> <:movecat:></h2>
-<p><:embed catalog catalog.tmpl:></p>
-<p>&nbsp; </p>
-<hr noshade size="1">
+<:embed catalog catalog.tmpl:>
+<hr />
 <:iterator end catalogs:> 
-<:ifUserCan edit_add_child:[cfg articles shop]:><form action="/cgi-bin/admin/add.pl"><input type=hidden name=type value="Catalog">
-  <input type=hidden name=parentid value=3><input type=submit value="Add Catalog"></form>
+<:ifUserCan edit_add_child:[cfg articles shop]:><form action="/cgi-bin/admin/add.pl"><input type="hidden" name="type" value="Catalog" />
+  <input type="hidden" name="parentid" value="3" /><input type="submit" value="Add Catalog" /></form>
 <:if Eq [shop generator] "Generate::Catalog":>
-<form action="/cgi-bin/admin/add.pl"><input type="hidden" name="type" value="Product">
-  <input type="hidden" name="parentid" value="3"><input type="submit" value="Add Product"></form><:or Eq:><:eif Eq:>
+<form action="/cgi-bin/admin/add.pl"><input type="hidden" name="type" value="Product" />
+  <input type="hidden" name="parentid" value="3" /><input type="submit" value="Add Product" /></form><:or Eq:><:eif Eq:>
 <:or:><:eif:>
-<p><font size="-1">BSE Release <:release:></font></p>
-</body>
-</html>
\ No newline at end of file
index c42fd9b..1b7fab0 100644 (file)
@@ -19,9 +19,9 @@
 <:if UserCan edit_save:product,edit_field_edit_listed:product
    :>
    <:if Product listed:>
-     <a href="<:script:>?id=<:product id:>&hide=1&r=<:script:>?id=<:product id:>">Hide product</a> |
+     <a href="<:script:>?id=<:product id:>&amp;hide=1&amp;r=<:script:>?id=<:product id:>">Hide product</a> |
   <:or Product:>
-    <a href="<:script:>?id=<:product id:>&unhide=1&r=<:script:>?id=<:product id:>">Show product</a> |
+    <a href="<:script:>?id=<:product id:>&amp;unhide=1&amp;r=<:script:>?id=<:product id:>">Show product</a> |
   <:eif Product:>
 <:or UserCan:><:eif UserCan:>
 <:or Eq:>
index e12214e..8d7a665 100644 (file)
@@ -4,7 +4,7 @@
 <:ifMessage:><p><b><:message:></b></p><:or:><:eif:>
 <:if Reports:>
 <:iterator begin reports:>
-<p><a href="<:script:>?<:ifReport has_params:>s_prompt<:or:>s_show<:eif:>=1&r=<:report id:>"><:report name:></a></p>
+<p><a href="<:script:>?<:ifReport has_params:>s_prompt<:or:>s_show<:eif:>=1&amp;r=<:report id:>"><:report name:></a></p>
 <:iterator end reports:>
 <:or Reports:>
 <p>No reports have been defined for this system.</p>
index 3ddc304..e2b4db3 100644 (file)
@@ -9,10 +9,7 @@
   <:sort_select select:><input type="submit" name="a_show" value="Re-order" />
 </form>
 <:or Sort_select:><:eif Sort_select:>
-  <table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000" class="table">
-  <tr>
-    <td>
-<table cellpadding="6" cellspacing="1" border="0" >
+<table>
   <tr>
     <:iterator begin level1_names:>
     <th <:ifSort - sortable:>onclick="window.location='<:sort - url:>'"<:or:><:eif:>>
 <:iterator begin level1:>
   <tr>
     <:iterator begin level1_cols:>
-      <td bgcolor="#FFFFFF"><:level1_col value:></td>
+      <td><:level1_col value:></td>
     <:iterator end level1_cols:>
   <:if Level1_links:>
-   <td bgcolor="#FFFFFF">
+   <td>
      <:iterator begin level1_links:><:level1_link link:> <:iterator end level1_links:>
    </td>
   <:or Level1_links:><:eif Level1_links:>
   </tr>
 <:iterator end level1:>
 <:or Level1:>
-  <tr><td bgcolor="#FFFFFF" colspan="<:add [level1_name_count] 1 :>" align="center">No rows returned</td></tr>
+  <tr><td colspan="<:add [level1_name_count] 1 :>">No rows returned</td></tr>
 <:eif Level1:>
 </table>
-    </td>
-   </tr>
-  </table>
index 658667a..6a001cf 100644 (file)
@@ -1,4 +1,4 @@
-<:wrap admin/xbase.tmpl title=>"Cancel Seminar Booking":>
+<:wrap admin/base.tmpl title=>"Cancel Seminar Booking":>
 <h1>Cancel Seminar Booking</h1>
 <p>| <a href="/cgi-bin/admin/menu.pl">Admin menu</a> | </p>
 <:ifMessage:>
@@ -30,7 +30,7 @@
     <td><:date "%I:%M %P" session when_at:></td>
   </tr>
   <tr>
-    <td colspan="3"><input type="submit" name="a_cancelbooking" value="Cancel Booking" /></td>
+    <td colspan="2"><input type="submit" name="a_cancelbooking" value="Cancel Booking" /></td>
   </tr>
 </table>
 </form>
index cb9902e..74ba03c 100644 (file)
@@ -1,4 +1,4 @@
-<:wrap admin/xbase.tmpl title=>"Edit Seminar Booking":>
+<:wrap admin/base.tmpl title=>"Edit Seminar Booking":>
 <h1>Edit Seminar Booking</h1>
 <p>| <a href="/cgi-bin/admin/menu.pl">Admin menu</a> | </p>
 <:ifMessage:>
   <tr>
     <th>Seminar:</th>
     <td><a href="<:seminar link:>"><:seminar title:></a></td>
+    <td class="help"></td>
   </tr>
   <tr>
     <th>Session:</th>
     <td><:session_popup:></td>
+    <td class="help"><:help semeditbooking session:></td>
   </tr>
 <:iterator begin options:>
   <tr>
    <th><:option desc:></th>
    <td><:option_popup:></td>
-   <td></td>
+   <td class="help"></td>
   </tr>
 <:iterator end options:>
   <tr>
    <th>Customer<br />Instructions:</th>
-   <td><textarea name="customer_instructions" cols="70" rows="10" /><:old customer_instructions booking customer_instructions:></textarea></td>
-   <td><:error_img customer_instructions:></td>
+   <td><textarea name="customer_instructions" cols="70" rows="10"><:old customer_instructions booking customer_instructions:></textarea></td>
+   <td class="help"><:help semeditbooking customer_instructions:><:error_img customer_instructions:></td>
   </tr>
   <tr>
    <th>Support<br />Notes:</th>
-   <td><textarea name="support_notes" cols="70" rows="10" /><:old support_notes booking support_notes:></textarea></td>
-   <td><:error_img support_notes:></td>
+   <td><textarea name="support_notes" cols="70" rows="10"><:old support_notes booking support_notes:></textarea></td>
+   <td class="help"><:help semeditbooking support_notes:><:error_img support_notes:></td>
   </tr>
   <tr>
-    <td colspan="3"><input type="submit" name="a_savebooking" value="Save Booking" /></td>
+    <td colspan="3" class="buttons"><input type="submit" name="a_savebooking" value="Save Booking" /></td>
   </tr>
 </table>
 </form>
index b48c8da..3491995 100644 (file)
@@ -1,4 +1,4 @@
-<:wrap admin/xbase.tmpl title=>"Seminar [seminar title] - Bookings":>
+<:wrap admin/base.tmpl title=>"Seminar [seminar title] - Bookings":>
 <h1>Seminar <:seminar title:> - Bookings</h1>
 <:ifMessage:>
 <p><b><:message:></b></p>
@@ -8,11 +8,12 @@
   <a href="<:script:>?id=<:seminar id:>&amp;_t=semsessions">Session list</a> |
 </p>
 
-<table>
+<table class="editform editformtiny">
   <tr>
     <th>Logon</th>
     <th>Name</th>
     <th>Email</th>
+    <th>Tools</th>
   </tr>
 <:if Bookedusers:>
 <:iterator begin bookedusers:>
@@ -28,7 +29,7 @@
 <:iterator end bookedusers:>
 <:or Bookedusers:>
   <tr>
-    <td colspan="3">There is no-one booked for this session</td>
+    <td colspan="4">There is no-one booked for this session</td>
   </tr>
 <:eif Bookedusers:>
 </table>
index b2323cf..6017e4e 100644 (file)
@@ -1,4 +1,4 @@
-<:wrap admin/xbase.tmpl title=>"Seminar [seminar title] - Delete Session":>
+<:wrap admin/base.tmpl title=>"Seminar [seminar title] - Delete Session":>
 <h1>Seminar <:seminar title:> - Delete Session</h1>
 <:ifMessage:>
 <p><b><:message:></b></p>
@@ -12,7 +12,7 @@
 <input type="hidden" name="id" value="<:seminar id:>" />
 <input type="hidden" name="session_id" value="<:session id:>" />
 <input type="hidden" name="r" value="<:script:>?id=<:seminar id:>&amp;_t=semsessions" />
-<table>
+<table class="editform editformtiny">
   <tr>
     <th>Location:</th>
     <td><:location description:></td>
@@ -40,9 +40,9 @@
   <tr>
     <th>Notify Booked Members</th>
     <td><input type="checkbox" name="notify" <:ifOld notify:>checked="checked"<:or:><:eif:> value="1" /> A notification email will be sent to users booked for this session if this is checked.</td>
-    <td>&nbsp;</td>
   </tr>
   <tr>
-    <td colspan="3"><input type="submit" name="a_delsemsession" value="Delete Session" /></td>
+    <td colspan="2" class="buttons"><input type="submit" name="a_delsemsession" value="Delete Session" /></td>
   </tr>
 </table>
+</form>
index d17c251..ae685ff 100644 (file)
@@ -1,4 +1,4 @@
-<:wrap admin/xbase.tmpl title=>"Seminar [seminar title] - Edit Session":>
+<:wrap admin/base.tmpl title=>"Seminar [seminar title] - Edit Session":>
 <h1>Seminar <:seminar title:> - Edit Session</h1>
 <:ifMessage:>
 <p><b><:message:></b></p>
@@ -6,6 +6,7 @@
 <p>| <a href="/cgi-bin/admin/menu.pl">Admin menu</a> 
 | <a href="<:script:>?id=<:seminar id:>">Edit seminar</a> |
   <a href="<:script:>?id=<:seminar id:>&amp;_t=semsessions">Session list</a> |
+<a href="<:adminurl admin_seminar:>">Manage Locations</a> |
 </p>
 
 <form action="<:script:>" method="post">
 <option value="<:location id:>" <:ifEq [old location_id session location_id] [location id]:>selected="selected"<:or:><:eif:>><:location description:></option>
 <:iterator end locations:>
         </select></td>
-    <td><:error_img location_id:><:help semsessadd location:></td>
+    <td class="help"><:error_img location_id:><:help semsessadd location:></td>
   </tr>
   <tr>
     <th>Date:</th>
     <td><input type="text" name="when_at_date" value ="<:old when_at_date date "%d/%m/%Y" session when_at:>" size="10" /> (dd/mm/yy)</td>
-    <td><:error_img when_at_date:><:help semsessadd date:></td>
+    <td class="help"><:error_img when_at_date:><:help semsessadd date:></td>
   </tr>
   <tr>
     <th>Time:</th>
     <td><input type="text" name="when_at_time" value ="<:old when_at_time date "%H:%M" session when_at:>" size="10" /> (HH:MM or HH:MMpm or HH:MMam)</td>
-    <td><:error_img when_at_date:><:help semsessedit time:></td>
+    <td class="help"><:error_img when_at_date:><:help semsessedit time:></td>
   </tr>
   <tr>
     <th>Notify Booked Members</th>
     <td><input type="checkbox" name="notify" <:ifOld notify:>checked="checked"<:or:><:eif:> value="1" /> A notification email will be sent to users booked for this session if this is checked.</td>
-    <td>&nbsp;</td>
+    <td class="help">&nbsp;</td>
   </tr>
   <tr>
-    <td colspan="3"><input type="submit" name="a_savesemsession" value="Save Session" /></td>
+    <td colspan="3" class="buttons"><input type="submit" name="a_savesemsession" value="Save Session" /></td>
   </tr>
 </table>
+</form>
index 1e49886..43902fb 100644 (file)
@@ -1,4 +1,4 @@
-<:wrap admin/xbase.tmpl title=>"Seminar [seminar title] - Edit Session":>
+<:wrap admin/base.tmpl title=>[cat "Seminar " [seminar title] " - Edit Session"]:>
 <h1>Seminar <:seminar title:> - Edit Session</h1>
 <:ifMessage:>
 <p><b><:message:></b></p>
 <input type="hidden" name="id" value="<:seminar id:>" />
 <input type="hidden" name="session_id" value="<:session id:>" />
 <input type="hidden" name="r" value="<:script:>?id=<:seminar id:>&amp;_t=semsessions&amp;s=all" />
-<table>
+<table class="editform editformsmall sessionrollcall">
   <tr>
-    <th>Present</th>
-    <th>Logon</th>
-    <th>Name</th>
-    <th>Email</th>
+    <th class="col_present">Present</th>
+    <th class="col_logon">Logon</th>
+    <th class="col_name">Name</th>
+    <th class="col_email">Email</th>
   </tr>
 <:iterator begin rollusers:>
   <tr>
-    <td><input type="checkbox" name="roll_present_<:rolluser id:>" <:ifRolluser roll_present:>checked="checked"<:or:><:eif:> /></td>
-    <td><a href="/cgi-bin/admin/siteusers.pl?a_edit=1&amp;id=<:rolluser id:>"><:rolluser userId:></a></td>
-    <td><:rolluser name1:> <:rolluser name2:></td>
-    <td><a href="mailto:<:rolluser email:>"><:rolluser email:></a></td>
+    <td class="col_present"><input type="checkbox" name="roll_present_<:rolluser id:>" <:ifRolluser roll_present:>checked="checked"<:or:><:eif:> /></td>
+    <td class="col_logon"><a href="/cgi-bin/admin/siteusers.pl?a_edit=1&amp;id=<:rolluser id:>"><:rolluser userId:></a></td>
+    <td class="col_name"><:rolluser name1:> <:rolluser name2:></td>
+    <td class="col_email"><a href="mailto:<:rolluser email:>"><:rolluser email:></a></td>
   </tr>
   <tr>
     <!-- separate row to distinguish these from the save button -->
   </tr>
 <:iterator end rollusers:>
   <tr>
-    <td colspan="4"><input type="submit" name="a_takesessionrolesave" value="Take Roll" /></td>
+    <td colspan="4" class="buttons"><input type="submit" name="a_takesessionrolesave" value="Take Roll" /></td>
   </tr>
 </table>
-<script>
+</form>
+<script type="text/javascript">
 function set_all_roll(set_reset) {
   var f = document.rollcall;
   for (var i = 0; i < f.elements.length; i++) {
index 4d9ad4f..1c078e5 100644 (file)
@@ -1,14 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-
-  <title>Administration - Edit Group</title>
-
-  <link rel="stylesheet" type="text/css" href="/css/admin.css" />
-
-</head>
-
-<body>
+<:wrap admin/base.tmpl title=> "Edit Group":>
 <h1>Edit Group</h1>
 <p>
 | <a href="/cgi-bin/admin/menu.pl">Admin menu</a>
@@ -17,8 +7,8 @@
 </p>
 <p>
 | Group Details
-| <a href="<:script:>?a_showgroup=1&groupid=<:group id:>&_t=glob">Global Permissions</a>
-| <a href="<:script:>?a_showgroupart=1&groupid=<:group id:>&id=-1">Article Permissions</a> |
+| <a href="<:script:>?a_showgroup=1&amp;groupid=<:group id:>&amp;_t=glob">Global Permissions</a>
+| <a href="<:script:>?a_showgroupart=1&amp;groupid=<:group id:>&amp;id=-1">Article Permissions</a> |
 </p>
 <:ifMessage:>
 <p><b><:message:></b></p>
 <form method="POST" action="<:script:>">
 <input type=hidden name=groupid value=<:group id:>>
 <input type=hidden name=saveusers value=1>
-  <table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000" class="table">
-    <tr> 
-      <td> 
-        <table cellpadding="6" border="0" cellspacing="1">
+        <table>
           <tr> 
-            <th bgcolor="#FFFFFF" align="left">Name: </th>
-            <td bgcolor="#FFFFFF"
+            <th>Name: </th>
+            <td> 
               <:ifUserCan admin_group_save:><input type="text" name="name" value="<:old name group name:>" /><:or:><:group name:><:eif:>
             </td>
-            <td bgcolor="#FFFFFF"><:help addgroup name:> <:error_img name:></td>
+            <td class="help"><:help addgroup name:> <:error_img name:></td>
           </tr>
           <tr> 
-            <th bgcolor="#FFFFFF" align="left">Description: </th>
-            <td bgcolor="#FFFFFF"
+            <th>Description: </th>
+            <td> 
               <:ifUserCan admin_group_save:><input type="text" name="description" value="<:old description group description:>" /><:or:><:group description:><:eif:>
             </td>
-            <td bgcolor="#FFFFFF"><:help addgroup description:> </td>
+            <td class="help"><:help addgroup description:> </td>
           </tr>
           <tr> 
-            <th bgcolor="#FFFFFF" align="left">Template Set: </th>
-            <td bgcolor="#FFFFFF"> 
-              <:template_set_popup:>
-            </td>
-            <td bgcolor="#FFFFFF"><:help addgroup description:> </td>
+            <th>Template Set: </th>
+            <td><:template_set_popup:></td>
+            <td class="help"><:help addgroup description:> </td>
           </tr>
           <tr> 
-            <th bgcolor="#FFFFFF" align="left"> Members: </th>
-            <td bgcolor="#FFFFFF"
+            <th> Members: </th>
+            <td> 
              <:iterator begin users:>
                <:if UserCan admin_group_save:><input type=checkbox name=users value=<:iuser id:> <:ifMemberof iuser:>checked<:or:><:eif:> /><:or UserCan:><img src="/images/admin/<:ifMemberof iuser:>checked<:or:>unchecked<:eif:>.gif"><:eif UserCan:> <a href="<:script:>?a_showuser=1&userid=<:iuser id:>"><:ifIuser name:><:iuser name:> (<:iuser logon:>)<:or:><:iuser logon:><:eif:></a>
              <:iterator separator users:>
              <br>
              <:iterator end users:>
             </td>
-            <td bgcolor="#FFFFFF" valign="top"><:help addgroup members:> </td>
+            <td class="help"><:help addgroup members:> </td>
           </tr>
 <:ifUserCan admin_group_save:>
           <tr> 
-            <td bgcolor="#FFFFFF" colspan="3" align="right"> 
+            <td colspan="3" class="buttons"> 
               <input type="submit" name="a_savegroup" value="  Save Group  " />
             </td>
           </tr>
 <:or:><:eif:>
         </table>
-      </td>
-    </tr>
-  </table>
 </form>
-  
-<p><font size="-1">BSE Release <:release:></font></p>
-</body
-></html>
index f49f8b9..c19971f 100644 (file)
@@ -1,14 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-
-  <title>Administration - Delete Group</title>
-
-  <link rel="stylesheet" type="text/css" href="/css/admin.css" />
-
-</head>
-
-<body>
+<:wrap admin/base.tmpl title => "Delete Group":>
 <h1>Delete Group</h1>
 <p>
 | <a href="/cgi-bin/admin/menu.pl">Admin menu</a>
 </p>
 
 <form method="POST" action="<:script:>">
-<input type=hidden name=groupid value=<:group id:>>
-  <table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000" class="table">
-    <tr> 
-      <td> 
-        <table cellpadding="6" border="0" cellspacing="1">
+<input type="hidden" name="groupid" value="<:group id:>" />
+        <table>
           <tr> 
-            <th bgcolor="#FFFFFF" align="left">Name: </th>
-            <td bgcolor="#FFFFFF"> 
-              <:group name:>
-            </td>
-            <td bgcolor="#FFFFFF"><:help editgroup name:> </td>
+            <th>Name: </th>
+            <td><:group name:></td>
+            <td><:help editgroup name:> </td>
           </tr>
           <tr> 
-            <th bgcolor="#FFFFFF" align="left">Description: </th>
-            <td bgcolor="#FFFFFF"> 
-              <:group description:>
-            </td>
-            <td bgcolor="#FFFFFF"><:help editgroup description:> </td>
+            <th>Description: </th>
+            <td><:group description:></td>
+            <td class="help"><:help editgroup description:> </td>
           </tr>
           <tr> 
-            <td bgcolor="#FFFFFF" colspan="3" align="right"> 
+            <td colspan="3"> 
              Are you sure you want to delete this group?
             </td>
           </tr>
           <tr> 
-            <td bgcolor="#FFFFFF" colspan="3" align="right"> 
+            <td colspan="3" class="buttons"> 
               <input type="submit" name="a_delgroup" value="  Delete Group  " />
             </td>
           </tr>
         </table>
-      </td>
-    </tr>
-  </table>
 </form>
-  
-<p><font size="-1">BSE Release <:release:></font></p>
-</body
-></html>
index 6f11820..96662ad 100644 (file)
@@ -1,14 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-
-  <title>Administration - Edit Group</title>
-
-  <link rel="stylesheet" type="text/css" href="/css/admin.css" />
-
-</head>
-
-<body>
+<:wrap admin/base.tmpl title => "Edit Group":>
 <h1>Edit Group <:group name:></h1>
 <p>
 | <a href="/cgi-bin/admin/menu.pl">Admin menu</a>
 | <a href="<:script:>?a_groups=1">Group list</a> |
 </p>
 <p>
-| <a href="<:script:>?a_showgroup=1&groupid=<:group id:>">Group Details</a> | Global Permissions
-| <a href="<:script:>?a_showgroupart=1&groupid=<:group id:>&id=-1">Article Permissions</a> |
+| <a href="<:script:>?a_showgroup=1&amp;groupid=<:group id:>">Group Details</a> | Global Permissions
+| <a href="<:script:>?a_showgroupart=1&amp;groupid=<:group id:>&amp;id=-1">Article Permissions</a> |
 </p>
 <:ifMessage:>
 <p><b><:message:></b></p>
 <:or:><:eif:> 
 
 <form method="POST" action="<:script:>">
-<input type=hidden name=groupid value=<:group id:>>
-<input type=hidden name=savegperms value=1>
-<input type="hidden" name="_t" value="glob">
-  <table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000" class="table">
-    <tr> 
-      <td> 
-        <table cellpadding="6" border="0" cellspacing="1">
+<input type="hidden" name="groupid" value="<:group id:>" />
+<input type="hidden" name="savegperms" value="1" />
+<input type="hidden" name="_t" value="glob" />
+        <table>
           <:iterator begin gperms:>
           <tr> 
-            <th bgcolor="#FFFFFF" align="left"><:gperm brief:> </th>
-            <td bgcolor="#FFFFFF"
+            <th><:gperm brief:> </th>
+            <td> 
              <:if UserCan admin_group_save:><input type=checkbox name=gperms value=<:gperm id:> <:ifGperm_set gperm:>checked <:or:><:eif:>/><:or UserCan:><img src="/images/admin/<:ifGperm_set gperm:>checked<:or:>unchecked<:eif:>.gif"><:eif UserCan:>
             </td>
-            <td bgcolor="#FFFFFF"><img src="/images/admin/help.gif" title="<:gperm help:>" /></td>
+            <td class="help"><img src="/images/admin/help.gif" title="<:gperm help:>" /></td>
           </tr>
           <:iterator end gperms:>
 <:ifUserCan admin_group_save:>
           <tr> 
-            <td bgcolor="#FFFFFF" colspan="3" align="right"> 
+            <td colspan="3" class="buttons"> 
               <input type="submit" name="a_savegroup" value="  Save Permissions  " />
             </td>
           </tr>
 <:or:><:eif:>
         </table>
-      </td>
-    </tr>
-  </table>
 </form>
-  
-<p><font size="-1">BSE Release <:release:></font></p>
-</body
-></html>
index da63b86..1c76c66 100644 (file)
@@ -1,14 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-
-  <title>Administration - Edit Group - Article permissions</title>
-
-  <link rel="stylesheet" type="text/css" href="/css/admin.css" />
-
-</head>
-
-<body>
+<:wrap admin/base.tmpl title => "Edit Group - Article Permissions":>
 <h1>Edit Group <:group name:></h1>
 <p>
 | <a href="/cgi-bin/admin/menu.pl">Admin menu</a>
 | <a href="<:script:>?a_groups=1">Group list</a> |
 </p>
 <p>
-| <a href="<:script:>?a_showgroup=1&groupid=<:group id:>">Group Details</a> 
-| <a href="<:script:>?a_showgroup=1&groupid=<:group id:>&_t=glob">Global Permissions</a>
+| <a href="<:script:>?a_showgroup=1&amp;groupid=<:group id:>">Group Details</a> 
+| <a href="<:script:>?a_showgroup=1&amp;groupid=<:group id:>&amp;_t=glob">Global Permissions</a>
 | Article Permissions |
 </p>
-<:ifParent:><p>| <a href="<:script:>?a_showgroupart=1&groupid=<:group id:>&id=<:parent id:>">Parent permissions</a> |</p><:or:><:eif:>
+<:ifParent:><p>| <a href="<:script:>?a_showgroupart=1&amp;groupid=<:group id:>&amp;id=<:parent id:>">Parent permissions</a> |</p><:or:><:eif:>
 <:ifMessage:>
 <p><b><:message:></b></p>
 <:or:><:eif:> 
 
 <h2>Permissions for <:ifEq [article id] "-1":>the site<:or:>article <:article title:><:eif:></h2>
 
-<:if Eq [article id] "-1":><:or Eq:><p>/ <a href="<:script:>?a_showgroupart=1&userid=<:user id:>&id=-1">Site</a> / <:iterator begin crumbs:> <a href="<:script:>?a_showgroupart=1&userid=<:user id:>&id=<:crumb id:>"><:crumb title:></a> /<:iterator end crumbs:></p><:eif Eq:>
+<:if Eq [article id] "-1":><:or Eq:><p>/ <a href="<:script:>?a_showgroupart=1&amp;groupid=<:group id:>&id=-1">Site</a> / <:iterator begin crumbs:> <a href="<:script:>?a_showgroupart=1&amp;groupid=<:group id:>&amp;id=<:crumb id:>"><:crumb title:></a> /<:iterator end crumbs:></p><:eif Eq:>
 
 <form method="POST" action="<:script:>">
-<input type=hidden name=groupid value=<:group id:>>
-<input type=hidden name=saveaperms value=1>
-<input type=hidden name=id value=<:article id:>>
-  <table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000" class="table">
-    <tr> 
-      <td> 
-        <table cellpadding="6" border="0" cellspacing="1">
+<input type="hidden" name="groupid" value="<:group id:>" />
+<input type="hidden" name="saveaperms" value="1" />
+<input type="hidden" name="id" value="<:article id:>" />
+        <table>
           <:iterator begin aperms:>
           <tr> 
-            <th bgcolor="#FFFFFF" align="left" width="100%"><:aperm brief:> </th>
-            <td bgcolor="#FFFFFF"
+            <th><:aperm brief:> </th>
+            <td> 
               <:if UserCan admin_group_save_artrights:><input type=checkbox name=aperms value=<:aperm id:> <:ifAperm_set aperm:>checked <:or:><:eif:>/><:or UserCan:><img src="/images/admin/<:ifAperm_set aperm:>checked<:or:>unchecked<:eif:>.gif"><:eif UserCan:>
             </td>
-            <td bgcolor="#FFFFFF"><img src="/images/admin/help.gif" title="<:aperm help:>" /></td>
+            <td class="help"><img src="/images/admin/help.gif" title="<:aperm help:>" /></td>
           </tr>
           <:iterator end aperms:>
 <:ifUserCan admin_group_save_artrights:>
           <tr> 
-            <td bgcolor="#FFFFFF" colspan="3" align="right"> 
+            <td colspan="3" class="buttons"> 
               <input type="submit" name="a_savegroupart" value="  Save Group permissions  " />
             </td>
           </tr>
 <:or:><:eif:>
         </table>
-      </td>
-    </tr>
-  </table>
 </form>
 
 <:if Children:>
 <h2>Children</h2>
-<table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000" class="table">
-  <tr>
-      <td>
-      <table border=0 cellpadding="6" cellspacing="1" width="100%">
-        <tr bgcolor="#FFFFFF"> 
+      <table>
+        <tr> 
           <th>Title</th>
           <th>Summary</th>
-          <th nowrap>Permissions</th>
+          <th>Permissions</th>
         </tr>
         <:iterator begin children:> 
-        <tr bgcolor="#FFFFFF"
+        <tr> 
           <td><a href="<:child admin:>"><:child title:></a></td>
           <td><: summary child body :></td>
-          <td nowrap><a href="<:script:>?a_showgroupart=1&groupid=<:group id:>&id=<:child id:>">Permissions</a></td>
+          <td><a href="<:script:>?a_showgroupart=1&groupid=<:group id:>&id=<:child id:>">Permissions</a></td>
         </tr>
         <:iterator separator children:> <:iterator end children:> 
       </table>
-</td>
-</tr>
-</table>
 <:or Children:><:eif Children:>
-  
-<p><font size="-1">BSE Release <:release:></font></p>
-</body
-></html>
index 4a49242..0871069 100644 (file)
@@ -1,14 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-
-  <title>Administration - Edit User</title>
-
-  <link rel="stylesheet" type="text/css" href="/css/admin.css" />
-
-</head>
-
-<body>
+<:wrap admin/base.tmpl title => "Edit User":>
 <h1>Edit User</h1>
 <p>
 | <a href="/cgi-bin/admin/menu.pl">Admin menu</a>
 <a href="<:script:>?a_groups=1">Group list</a> |
 </p>
 <p>
-| User Details | <a href="<:script:>?a_showuser=1&userid=<:user id:>&_t=glob">Global Permissions</a>
-| <a href="<:script:>?a_showuserart=1&userid=<:user id:>&id=-1">Article Permissions</a> |
+| User Details | <a href="<:script:>?a_showuser=1&amp;userid=<:user id:>&amp;_t=glob">Global Permissions</a>
+| <a href="<:script:>?a_showuserart=1&amp;userid=<:user id:>&amp;id=-1">Article Permissions</a> |
 </p>
 <:ifMessage:>
 <p><b><:message:></b></p>
 <:or:><:eif:> 
 
-<form method="POST" action="<:script:>">
-<input type=hidden name=userid value=<:user id:>>
-<input type=hidden name=savegroups value=1>
-  <table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000" class="table">
-    <tr> 
-      <td> 
-        <table cellpadding="6" border="0" cellspacing="1">
+<form method="post" action="<:script:>">
+<input type="hidden" name="userid" value="<:user id:>" />
+<input type="hidden" name="savegroups" value="1" />
+        <table>
           <tr> 
-            <th bgcolor="#FFFFFF" align="left">Logon: </th>
-            <td bgcolor="#FFFFFF"> 
-              <:user logon:>
-            </td>
-            <td bgcolor="#FFFFFF"><:help adduser logon:> </td>
+            <th>Logon: </th>
+            <td><:user logon:></td>
+            <td class="help"><:help adduser logon:> </td>
           </tr>
           <tr> 
-            <th bgcolor="#FFFFFF" align="left">Name: </th>
-            <td bgcolor="#FFFFFF"
+            <th>Name: </th>
+            <td> 
               <:ifUserCan admin_user_save:><input type="text" name="name" value="<:user name:>" /><:or:><:user name:><:eif:>
             </td>
-            <td bgcolor="#FFFFFF"><:help adduser name:> <:error_img name:></td>
+            <td class="help"><:help adduser name:> <:error_img name:></td>
           </tr>
 <:ifUserCan admin_user_save:>
           <tr> 
-            <th bgcolor="#FFFFFF" align="left"> Password: </th>
-            <td bgcolor="#FFFFFF"> 
-              <input type="password" name="password" />
-              </td>
-            <td bgcolor="#FFFFFF"> <:help adduser password:> <:error_img password:></td>
+            <th> Password: </th>
+            <td><input type="password" name="password" /></td>
+            <td class="help"> <:help adduser password:> <:error_img password:></td>
           </tr>
           <tr> 
-            <th bgcolor="#FFFFFF" align="left"> Confirm: </th>
-            <td bgcolor="#FFFFFF"> 
-              <input type="password" name="confirm" />
-            </td>
-            <td bgcolor="#FFFFFF"><:help adduser confirm:> <:error_img confirm:></td>
+            <th> Confirm: </th>
+            <td><input type="password" name="confirm" /></td>
+            <td class="help"><:help adduser confirm:> <:error_img confirm:></td>
           </tr>
 <:or:><:eif:>
           <tr> 
-            <th bgcolor="#FFFFFF" align="left" valign="top"> Groups: </th>
-            <td bgcolor="#FFFFFF"
+            <th> Groups: </th>
+            <td> 
              <:iterator begin groups:>
-               <:if UserCan admin_user_save:><input type=checkbox name=groups value=<:igroup id:> <:ifMemberof igroup:>checked<:or:><:eif:> /><:or UserCan:><img src="/images/admin/<:ifMemberof igroup:>checked<:or:>unchecked<:eif:>.gif"><:eif UserCan:> <a href="<:script:>?a_showgroup=1&groupid=<:igroup id:>"><:igroup name:></a>
+               <:if UserCan admin_user_save:><input type="checkbox" name="groups" value="<:igroup id:>" <:ifMemberof igroup:>checked="checked"<:or:><:eif:> /><:or UserCan:><img src="/images/admin/<:ifMemberof igroup:>checked<:or:>unchecked<:eif:>.gif" /><:eif UserCan:> <a href="<:script:>?a_showgroup=1&amp;groupid=<:igroup id:>"><:igroup name:></a>
              <:iterator separator groups:>
              <br>
              <:iterator end groups:>
             </td>
-            <td bgcolor="#FFFFFF" valign="top"><:help adduser groups:> </td>
+            <td class="help"><:help adduser groups:> </td>
           </tr>
 <:ifUserCan admin_user_save:>
           <tr> 
-            <td bgcolor="#FFFFFF" colspan="3" align="right"> 
+            <td colspan="3" class="buttons"> 
               <input type="submit" name="a_saveuser" value="  Save User  " />
             </td>
           </tr>
 <:or:><:eif:>
         </table>
-      </td>
-    </tr>
-  </table>
 </form>
-  
-<p><font size="-1">BSE Release <:release:></font></p>
-</body
-></html>
index 5cd3430..d66f065 100644 (file)
@@ -1,14 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-
-  <title>Administration - Delete User</title>
-
-  <link rel="stylesheet" type="text/css" href="/css/admin.css" />
-
-</head>
-
-<body>
+<:wrap admin/base.tmpl title => "Delete User":>
 <h1>Delete User</h1>
 <p>
 | <a href="/cgi-bin/admin/menu.pl">Admin menu</a>
 </p>
 <form method="POST" action="<:script:>">
 <input type=hidden name=userid value=<:user id:>>
-  <table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000" class="table">
-    <tr> 
-      <td> 
-        <table cellpadding="6" border="0" cellspacing="1">
+        <table>
           <tr> 
-            <th bgcolor="#FFFFFF" align="left">Logon: </th>
-            <td bgcolor="#FFFFFF"
+            <th>Logon: </th>
+            <td> 
               <:user logon:>
             </td>
-            <td bgcolor="#FFFFFF"><:help edituser logon:> </td>
+            <td class="help"><:help edituser logon:> </td>
           </tr>
           <tr> 
-            <th bgcolor="#FFFFFF" align="left">Name: </th>
-            <td bgcolor="#FFFFFF"
+            <th>Name: </th>
+            <td> 
               <:user name:>
             </td>
-            <td bgcolor="#FFFFFF"><:help edituser name:> </td>
+            <td class="help"><:help edituser name:> </td>
           </tr>
           <tr> 
-            <td colspan="3" bgcolor="#FFFFFF" align="left">
+            <td colspan="3">
              Are you sure you want to delete this user?
            </td>
           </tr>
           <tr> 
-            <td bgcolor="#FFFFFF" colspan="3" align="right"> 
+            <td colspan="3" class="buttons"> 
               <input type="submit" name="a_deluser" value="  Delete User  " />
             </td>
           </tr>
         </table>
-      </td>
-    </tr>
-  </table>
 </form>
   
-<p><font size="-1">BSE Release <:release:></font></p>
-</body
-></html>
index 08f7210..c7947c1 100644 (file)
@@ -1,14 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-
-  <title>Administration - Edit User</title>
-
-  <link rel="stylesheet" type="text/css" href="/css/admin.css" />
-
-</head>
-
-<body>
+<:wrap admin/base.tmpl title => "Global Permissions" :>
 <h1>Edit User <:user logon:></h1>
 <p>
 | <a href="/cgi-bin/admin/menu.pl">Admin menu</a>
@@ -16,8 +6,8 @@
 <a href="<:script:>?a_groups=1">Group list</a> |
 </p>
 <p>
-| <a href="<:script:>?a_showuser=1&userid=<:user id:>">User Details</a> | Global Permissions
-| <a href="<:script:>?a_showuserart=1&userid=<:user id:>&id=-1">Article Permissions</a> |
+| <a href="<:script:>?a_showuser=1&amp;userid=<:user id:>">User Details</a> | Global Permissions
+| <a href="<:script:>?a_showuserart=1&amp;userid=<:user id:>&amp;id=-1">Article Permissions</a> |
 </p>
 <:ifMessage:>
 <p><b><:message:></b></p>
 <input type=hidden name=userid value=<:user id:>>
 <input type=hidden name=savegperms value=1>
 <input type="hidden" name="_t" value="glob">
-  <table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000" class="table">
-    <tr> 
-      <td> 
-        <table cellpadding="6" border="0" cellspacing="1">
+        <table>
           <:iterator begin gperms:>
           <tr> 
-            <th bgcolor="#FFFFFF" align="left"><:gperm brief:> </th>
-            <td bgcolor="#FFFFFF"
+            <th><:gperm brief:> </th>
+            <td> 
               <:if UserCan admin_user_save:><input type=checkbox name=gperms value=<:gperm id:> <:ifGperm_set gperm:>checked <:or:><:eif:>/><:or UserCan:><img src="/images/admin/<:ifGperm_set gperm:>checked<:or:>unchecked<:eif:>.gif"><:eif UserCan:>
             </td>
-            <td bgcolor="#FFFFFF"><img src="/images/admin/help.gif" title="<:gperm help:>" /></td>
+            <td><img src="/images/admin/help.gif" title="<:gperm help:>" /></td>
           </tr>
           <:iterator end gperms:>
 <:ifUserCan admin_user_save:>
           <tr> 
-            <td bgcolor="#FFFFFF" colspan="3" align="right"> 
+            <td colspan="3" class="buttons"> 
               <input type="submit" name="a_saveuser" value="  Save Permissions  " />
             </td>
           </tr>
 <:or:><:eif:>
         </table>
-      </td>
-    </tr>
-  </table>
 </form>
-  
-<p><font size="-1">BSE Release <:release:></font></p>
-</body
-></html>
index c67e9f0..0bf2798 100644 (file)
@@ -1,14 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-
-  <title>Administration - Edit User - Article permissions</title>
-
-  <link rel="stylesheet" type="text/css" href="/css/admin.css" />
-
-</head>
-
-<body>
+<:wrap admin/base.tmpl title => "Edit User - Article Permissions":>
 <h1>Edit User <:user logon:></h1>
 <p>
 | <a href="/cgi-bin/admin/menu.pl">Admin menu</a>
 <a href="<:script:>?a_groups=1">Group list</a> |
 </p>
 <p>
-| <a href="<:script:>?a_showuser=1&userid=<:user id:>">User Details</a> 
-| <a href="<:script:>?a_showuser=1&userid=<:user id:>&_t=glob">Global Permissions</a>
+| <a href="<:script:>?a_showuser=1&amp;userid=<:user id:>">User Details</a> 
+| <a href="<:script:>?a_showuser=1&amp;userid=<:user id:>&amp;_t=glob">Global Permissions</a>
 | Article Permissions |
 </p>
-<:ifParent:><p>| <a href="<:script:>?a_showuserart=1&userid=<:user id:>&id=<:parent id:>">Parent permissions</a> |</p><:or:><:eif:>
+<:ifParent:><p>| <a href="<:script:>?a_showuserart=1&amp;userid=<:user id:>&amp;id=<:parent id:>">Parent permissions</a> |</p><:or:><:eif:>
 <:ifMessage:>
 <p><b><:message:></b></p>
 <:or:><:eif:> 
 
 <h2>Permissions for <:ifEq [article id] "-1":>the site<:or:>article <:article title:><:eif:></h2>
 
-<:if Eq [article id] "-1":><:or Eq:><p>/ <a href="<:script:>?a_showuserart=1&userid=<:user id:>&id=-1">Site</a> / <:iterator begin crumbs:> <a href="<:script:>?a_showuserart=1&userid=<:user id:>&id=<:crumb id:>"><:crumb title:></a> /<:iterator end crumbs:></p><:eif Eq:>
+<:if Eq [article id] "-1":><:or Eq:><p>/ <a href="<:script:>?a_showuserart=1&amp;userid=<:user id:>&amp;id=-1">Site</a> / <:iterator begin crumbs:> <a href="<:script:>?a_showuserart=1&amp;userid=<:user id:>&amp;id=<:crumb id:>"><:crumb title:></a> /<:iterator end crumbs:></p><:eif Eq:>
 
 <form method="POST" action="<:script:>">
 <input type=hidden name=userid value=<:user id:>>
 <input type=hidden name=saveaperms value=1>
 <input type=hidden name=id value=<:article id:>>
-  <table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000" class="table">
-    <tr> 
-      <td> 
-        <table cellpadding="6" border="0" cellspacing="1">
+        <table>
           <:iterator begin aperms:>
           <tr> 
-            <th bgcolor="#FFFFFF" align="left"><:aperm brief:> </th>
-            <td bgcolor="#FFFFFF"
+            <th><:aperm brief:> </th>
+            <td> 
               <:if UserCan admin_user_save_artrights:><input type=checkbox name=aperms value=<:aperm id:> <:ifAperm_set aperm:>checked <:or:><:eif:>/><:or UserCan:><img src="/images/admin/<:ifAperm_set aperm:>checked<:or:>unchecked<:eif:>.gif"><:eif UserCan:>
             </td>
-            <td bgcolor="#FFFFFF"><img src="/images/admin/help.gif" title="<:aperm help:>" /></td>
+            <td class="help"><img src="/images/admin/help.gif" title="<:aperm help:>" /></td>
           </tr>
           <:iterator end aperms:>
 <:ifUserCan admin_user_save_artrights:>
           <tr> 
-            <td bgcolor="#FFFFFF" colspan="3" align="right"> 
+            <td colspan="3" class="buttons"> 
               <input type="submit" name="a_saveuserart" value="  Save User permissions  " />
             </td>
           </tr>
 <:or:><:eif:>
         </table>
-      </td>
-    </tr>
-  </table>
 </form>
 
 <:if Children:>
 <h2>Children</h2>
-<table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000" class="table">
-  <tr>
-      <td>
-      <table border=0 cellpadding="6" cellspacing="1" width="100%">
-        <tr bgcolor="#FFFFFF"> 
+      <table>
+        <tr> 
           <th>Title</th>
           <th>Summary</th>
-          <th nowrap>Permissions</th>
+          <th>Permissions</th>
         </tr>
         <:iterator begin children:> 
-        <tr bgcolor="#FFFFFF"
+        <tr> 
           <td><a href="<:child admin:>"><:child title:></a></td>
           <td><: summary child body :></td>
-          <td nowrap><a href="<:script:>?a_showuserart=1&userid=<:user id:>&id=<:child id:>">Permissions</a></td>
+          <td><a href="<:script:>?a_showuserart=1&userid=<:user id:>&id=<:child id:>">Permissions</a></td>
         </tr>
         <:iterator separator children:> <:iterator end children:> 
       </table>
-</td>
-</tr>
-</table>
 <:or Children:><:eif Children:>
-  
-<p><font size="-1">BSE Release <:release:></font></p>
-</body
-></html>
diff --git a/site/templates/admin/subs/add.tmpl b/site/templates/admin/subs/add.tmpl
deleted file mode 100644 (file)
index afb49fd..0000000
+++ /dev/null
@@ -1,107 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-
-  <title>Administration - Add Subscription</title>
-
-  <link rel="stylesheet" type="text/css" href="/css/admin.css" />
-
-</head>
-
-<body>
-
-<h1>Add Subscription</h1>
-
-<:ifMessage:><p><b><:message:></b></p><:or:><:eif:>
-
-<p>| <a href="/admin/">Admin menu</a> | <a href="<:script:>">Subscriptions List</a> 
-  |</p>
-
-<form action="<:script:>" method="GET">
-<table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000" class="table">
-    <tr>
-      <td>
-        <table cellpadding="6" border="0" cellspacing="1">
-          <tr bgcolor="#FFFFFF"> 
-            <th align="left" nowrap>Name:</th>
-            <td> 
-              <input type="text" name="name" value="<:old name:>" size="40" />
-            </td>
-            <td><:help subs name:> <:ifError name:><img src="/images/admin/error.gif" width="16" height="16" alt="<:error name:>" /><:or:><:eif:></td>
-          </tr>
-          <tr bgcolor="#FFFFFF"> 
-            <th align="left" nowrap>Title:</th>
-            <td> 
-              <input type="text" name="title" value="<:old title:>" size="40" />
-            </td>
-            <td><:help subs title:> <:ifError title:><img src="/images/admin/error.gif" width="16" height="16" alt="<:error title:>" /><:or:><:eif:></td>
-          </tr>
-          <tr bgcolor="#FFFFFF"> 
-            <th align="left" valign="top" nowrap>Description:</th>
-            <td valign="top"> 
-              <textarea name="description" cols="60" rows="10" wrap="virtual"><:old description:></textarea>
-            </td>
-            <td valign="top"><:help subs description:> <:ifError description:><img src="/images/admin/error.gif" width="16" height="16" alt="<:error description:>" /><:or:><:eif:></td>
-          </tr>
-          <tr bgcolor="#FFFFFF"> 
-            <th align="left" nowrap>Frequency:</th>
-            <td> 
-              <input type="text" name="frequency" value="<:old frequency:>" size="40" />
-            </td>
-            <td><:help subs frequency:> <:ifError frequency:><img src="/images/admin/error.gif" width="16" height="16" alt="<:error frequency:>" /><:or:><:eif:></td>
-          </tr>
-          <tr bgcolor="#FFFFFF"> 
-            <th align="left" nowrap>HTML template:</th>
-            <td><:template html_template htmlemail 1:> </td>
-            <td><:help subs html_template:> <:ifError html_template:><img src="/images/admin/error.gif" width="16" height="16" alt="<:error html_template:>" /><:or:><:eif:></td>
-          </tr>
-          <tr bgcolor="#FFFFFF"> 
-            <th align="left" nowrap>Text template:</th>
-            <td><:template text_template textemail:> </td>
-            <td><:help subs text_template:> <:ifError text_template:><img src="/images/admin/error.gif" width="16" height="16" alt="<:error text_template:>" /><:or:><:eif:></td>
-          </tr>
-          <tr bgcolor="#FFFFFF"> 
-            <th align="left" nowrap>Visible:</th>
-            <td><input type="checkbox" name="visible" value="1"<:ifOld visible:> 
-              checked<:or:><:eif:> /> Make this subscription available</td>
-            <td><:help subs visible:></td>
-          </tr>
-          <tr bgcolor="#FFFFFF"> 
-            <th colspan="2">Archiving </th>
-            <td><:help subs archiving:></td>
-          </tr>
-          <tr bgcolor="#FFFFFF"> 
-            <th align="left" nowrap>Archive:</th>
-            <td><input type="checkbox" name="archive" value="1"<:ifOld archive:> 
-              checked<:or:><:eif:> /> Archive this subscription</td>
-            <td><:help subs archive:> </td>
-          </tr>
-          <tr bgcolor="#FFFFFF"> 
-            <th align="left" nowrap>Keywords:</th>
-            <td> 
-              <input type="text" name="keyword" value="<:old keyword:>" size="40" />
-            </td>
-            <td><:help subs keyword:></td>
-          </tr>
-          <tr bgcolor="#FFFFFF"> 
-            <th align="left" nowrap>Article template:</th>
-            <td><:template article_template:> </td>
-            <td><:help subs template:> <:ifError article_template:><img src="/images/admin/error.gif" width="16" height="16" alt="<:error article_template:>" /><:or:><:eif:></td>
-          </tr>
-          <tr bgcolor="#FFFFFF"> 
-            <th align="left" nowrap>Archive parent:</th>
-            <td><:parent:> </td>
-            <td><:help subs parent:> <:ifError parentId:><img src="/images/admin/error.gif" width="16" height="16" alt="<:error parentId:>" /><:or:><:eif:></td>
-          </tr>
-        </table>
-</td>
-</tr>
-</table>
-<p>
-    <input type="submit" name="addsave" value="Add Subscription">
-  </p>
-</form>
-
-<p><font size="-1">BSE Release <:release:></font></p>
-</body>
-</html>
index 44f784f..915bc36 100644 (file)
@@ -1,65 +1,42 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
+<:wrap admin/base.tmpl title => "Delete Newsletter" :>
+<h1>Delete Newsletter</h1>
 
-  <title>Administration - Delete Subscription</title>
+<:ifMessage:><p class="message"><:message:></p><:or:><:eif:>
 
-  <link rel="stylesheet" type="text/css" href="/css/admin.css" />
-
-</head>
-
-<body>
-
-<h1>Delete Subscription</h1>
-
-<:ifMessage:><p><b><:message:></b></p><:or:><:eif:>
-
-<p>| <a href="/admin/">Admin menu</a> | <a href="<:script:>">Subscriptions List</a> 
+<p>| <a href="/admin/">Admin menu</a> | <a href="<:script:>">Newsletter List</a> 
   |</p>
 
-<form action="<:script:>" method="POST"><input type="hidden" name="id" value="<:subscription id:>">
-<table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000" class="table">
+<form action="<:script:>" method="post">
+  <input type="hidden" name="id" value="<:subscription id:>" />
+  <table class="editform editformtiny"> 
+    <tr> 
+      <th>Name:</th>
+      <td><:subscription name:></td>
+      <td class="help"><:help subs name:> <:ifError name:><img src="/images/admin/error.gif" width="16" height="16" alt="<:error name:>" /><:or:><:eif:></td>
+    </tr>
+    <tr> 
+      <th>Title:</th>
+      <td><:subscription title:></td>
+      <td class="help"><:help subs title:> <:ifError title:><img src="/images/admin/error.gif" width="16" height="16" alt="<:error title:>" /><:or:><:eif:></td>
+    </tr>
+    <tr> 
+      <th>Description:</th>
+      <td> 
+       <:bodytext subscription description:>
+      </td>
+      <td class="help"><:help subs description:> </td>
+    </tr>
+    <tr> 
+      <th>Frequency:</th>
+      <td><:subscription frequency:></td>
+      <td class="help"><:help subs frequency:> </td>
+    </tr>
     <tr>
-      <td>
-        <table cellpadding="6" border="0" cellspacing="1">
-          <tr bgcolor="#FFFFFF"> 
-            <th align="left" nowrap>Name:</th>
-            <td> 
-              <:subscription name:>
-            </td>
-            <td nowrap><:help subs name:> <:ifError name:><img src="/images/admin/error.gif" width="16" height="16" alt="<:error name:>" /><:or:><:eif:></td>
-          </tr>
-          <tr bgcolor="#FFFFFF"> 
-            <th align="left" nowrap>Title:</th>
-            <td> 
-              <:subscription title:>
-            </td>
-            <td nowrap><:help subs title:> <:ifError title:><img src="/images/admin/error.gif" width="16" height="16" alt="<:error title:>" /><:or:><:eif:></td>
-          </tr>
-          <tr bgcolor="#FFFFFF"> 
-            <th align="left" valign="top" nowrap>Description:</th>
-            <td valign="top"> 
-              <:bodytext subscription description:>
-            </td>
-            <td valign="top" nowrap><:help subs description:> </td>
-          </tr>
-          <tr bgcolor="#FFFFFF"> 
-            <th align="left" nowrap>Frequency:</th>
-            <td> 
-              <:subscription frequency:>
-            </td>
-            <td nowrap><:help subs frequency:> </td>
-          </tr>
-        </table>
-</td>
-</tr>
-</table>
-<p>
-    <input type="submit" name="delete" value="Delete Subscription">
-    <input type="submit" name="list" value="Back to List">
-  </p>
+      <td colspan="3" class="buttons">
+       <input type="submit" name="delete" value="Delete Newsletter" />
+       <input type="submit" name="list" value="Back to List">
+      </td>
+    </tr>
+  </table>
 </form>
 
-<p><font size="-1">BSE Release <:release:></font></p>
-</body>
-</html>
index 1d3f800..cdae43e 100644 (file)
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
+<:wrap admin/base.tmpl title => [cond [ifNew] "Add Newsletter" [cat "Edit Newsletter: " [subscription name]] ]:>
+<h1><:ifNew:>Add Newsletter<:or:>Edit Newsletter: <:subscription name:><:eif:></h1>
 
-  <title>Administration - <:ifNew:>add<:or:>Edit<:eif:> Subscription</title>
+<:ifMessage:><p class="message"><:message:></p><:or:><:eif:>
 
-  <link rel="stylesheet" type="text/css" href="/css/admin.css" />
-
-</head>
-
-<body>
-
-<h1><:ifNew:>Add<:or:>Edit<:eif:> Subscription</h1>
-
-<:ifMessage:><p><b><:message:></b></p><:or:><:eif:>
-
-<p>| <a href="/admin/">Admin menu</a> | <a href="<:script:>">Subscriptions List</a> 
+<p>| <a href="/admin/">Admin menu</a> | <a href="<:script:>">Newsletter List</a> 
   |</p>
 
-<form action="<:script:>" method="POST"><input type="hidden" name="id" value="<:subscription id:>">
-<table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000" class="table">
-    <tr>
-      <td>
-        <table cellpadding="6" border="0" cellspacing="1">
-          <tr bgcolor="#FFFFFF"
-            <th align="left" nowrap>Name:</th>
-            <td> 
-              <input type="text" name="name" value="<:old name:>" size="40" />
-            </td>
-            <td nowrap><:help subs name:> <:ifError name:><img src="/images/admin/error.gif" width="16" height="16" alt="<:error name:>" /><:or:><:eif:></td>
-          </tr>
-          <tr bgcolor="#FFFFFF"
-            <th align="left" nowrap>Title:</th>
-            <td> 
-              <input type="text" name="title" value="<:old title:>" size="40" />
-            </td>
-            <td nowrap><:help subs title:> <:ifError title:><img src="/images/admin/error.gif" width="16" height="16" alt="<:error title:>" /><:or:><:eif:></td>
-          </tr>
-          <tr bgcolor="#FFFFFF"
-            <th align="left" valign="top" nowrap>Description:</th>
-            <td valign="top"> 
-              <textarea name="description" cols="60" rows="10" wrap="virtual"><:old description:></textarea>
-            </td>
-            <td valign="top" nowrap><:help subs description:> <:ifError description:><img src="/images/admin/error.gif" width="16" height="16" alt="<:error description:>" /><:or:><:eif:></td>
-          </tr>
-          <tr bgcolor="#FFFFFF"
-            <th align="left" nowrap>Frequency:</th>
-            <td> 
-              <input type="text" name="frequency" value="<:old frequency:>" size="40" />
-            </td>
-            <td nowrap><:help subs frequency:> <:ifError frequency:><img src="/images/admin/error.gif" width="16" height="16" alt="<:error frequency:>" /><:or:><:eif:></td>
-          </tr>
-          <tr bgcolor="#FFFFFF"> 
-            <th align="left" nowrap>HTML template:</th>
-            <td><:template html_template htmlemail 1:> </td>
-            <td nowrap><:help subs html_template:> <:ifError html_template:><img src="/images/admin/error.gif" width="16" height="16" alt="<:error html_template:>" /><:or:><:eif:></td>
-          </tr>
-          <tr bgcolor="#FFFFFF"> 
-            <th align="left" nowrap>Text template:</th>
-            <td><:template text_template textemail:> </td>
-            <td nowrap><:help subs text_template:> <:ifError text_template:><img src="/images/admin/error.gif" width="16" height="16" alt="<:error text_template:>" /><:or:><:eif:></td>
-          </tr>
-          <tr bgcolor="#FFFFFF"
-            <th align="left" nowrap>Visible:</th>
-            <td><input type="checkbox" name="visible" value="1"<:ifOld visible:> 
-              checked<:or:><:eif:> /> Make this subscription available</td>
-            <td nowrap><:help subs visible:></td>
-          </tr>
-          <tr bgcolor="#FFFFFF"> 
-            <th colspan="2">Archiving </th>
-            <td nowrap><:help subs archiving:></td>
-          </tr>
-          <tr bgcolor="#FFFFFF"
-            <th align="left" nowrap>Archive:</th>
-            <td><input type="checkbox" name="archive" value="1"<:ifOld archive:> 
-              checked<:or:><:eif:> /> Archive this subscription</td>
-            <td nowrap><:help subs archive:> </td>
-          </tr>
-          <tr bgcolor="#FFFFFF"
-            <th align="left" nowrap>Keywords:</th>
-            <td> 
-              <input type="text" name="keyword" value="<:old keyword:>" size="40" />
-            </td>
-            <td nowrap><:help subs keyword:></td>
-          </tr>
-          <tr bgcolor="#FFFFFF"> 
-            <th align="left" nowrap>Article template:</th>
-            <td><:template article_template:> </td>
-            <td nowrap><:help subs template:> <:ifError article_template:><img src="/images/admin/error.gif" width="16" height="16" alt="<:error article_template:>" /><:or:><:eif:></td>
-          </tr>
-          <tr bgcolor="#FFFFFF"> 
-            <th align="left" nowrap>Archive parent:</th>
-            <td><:parent:> </td>
-            <td nowrap><:help subs parent:> <:ifError parentId:><img src="/images/admin/error.gif" width="16" height="16" alt="<:error parentId:>" /><:or:><:eif:></td>
-          </tr>
-        </table>
-</td>
-</tr>
+<form action="<:script:>" method="post">
+<input type="hidden" name="id" value="<:subscription id:>" />
+<table class="editform editformsmall">
+  <tr> 
+    <th>Name:</th>
+    <td
+      <input type="text" name="name" value="<:old name:>" size="40" />
+    </td>
+    <td class="help"><:help subs name:> <:ifError name:><img src="/images/admin/error.gif" width="16" height="16" alt="<:error name:>" /><:or:><:eif:></td>
+  </tr>
+  <tr> 
+    <th>Title:</th>
+    <td
+      <input type="text" name="title" value="<:old title:>" size="40" />
+    </td>
+    <td class="help"><:help subs title:> <:ifError title:><img src="/images/admin/error.gif" width="16" height="16" alt="<:error title:>" /><:or:><:eif:></td>
+  </tr>
+  <tr> 
+    <th>Description:</th>
+    <td
+      <textarea name="description" cols="60" rows="10"><:old description:></textarea>
+    </td>
+    <td class="help"><:help subs description:> <:ifError description:><img src="/images/admin/error.gif" width="16" height="16" alt="<:error description:>" /><:or:><:eif:></td>
+  </tr>
+  <tr> 
+    <th>Frequency:</th>
+    <td
+      <input type="text" name="frequency" value="<:old frequency:>" size="40" />
+    </td>
+    <td class="help"><:help subs frequency:> <:ifError frequency:><img src="/images/admin/error.gif" width="16" height="16" alt="<:error frequency:>" /><:or:><:eif:></td>
+  </tr>
+  <tr> 
+    <th>HTML template:</th>
+    <td><:template html_template htmlemail 1:> </td>
+    <td class="help"><:help subs html_template:> <:ifError html_template:><img src="/images/admin/error.gif" width="16" height="16" alt="<:error html_template:>" /><:or:><:eif:></td>
+  </tr>
+  <tr> 
+    <th>Text template:</th>
+    <td><:template text_template textemail:> </td>
+    <td class="help"><:help subs text_template:> <:ifError text_template:><img src="/images/admin/error.gif" width="16" height="16" alt="<:error text_template:>" /><:or:><:eif:></td>
+  </tr>
+  <tr> 
+    <th align="left" nowrap>Visible:</th>
+    <td><input type="checkbox" name="visible" value="1"<:ifOld visible:
+               checked="checked"<:or:><:eif:> /> Make this subscription available</td>
+    <td class="help"><:help subs visible:></td>
+  </tr>
+  <tr> 
+    <th colspan="2">Archiving </th>
+    <td class="help"><:help subs archiving:></td>
+  </tr>
+  <tr> 
+    <th>Archive:</th>
+    <td><input type="checkbox" name="archive" value="1"<:ifOld archive:
+              checked="checked"<:or:><:eif:> /> Archive this subscription</td>
+    <td class="help"><:help subs archive:> </td>
+  </tr>
+  <tr> 
+    <th>Keywords:</th>
+    <td
+      <input type="text" name="keyword" value="<:old keyword:>" size="40" />
+    </td>
+    <td class="help"><:help subs keyword:></td>
+  </tr>