Index: openacs-4/packages/ecommerce/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/index.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/ecommerce/www/admin/index.adp	22 Apr 2008 10:48:32 -0000	1.1
@@ -0,0 +1,58 @@
+<master>
+<property name="title">@page_title@</property>
+<property name="context_bar">@context_bar;noquote@</property>
+
+<property name="show_toolbar_p">t</property>
+
+<h2>@page_title@</h2>
+
+<hr>
+Documentation: <a href="/doc/ecommerce">/doc/ecommerce</a> or <a href="@ec_url@doc/">@ec_url@doc/</a>
+<hr>
+
+<h3>business operations</h3>
+<ul>
+<li><a href="orders/">Orders / Shipments / Refunds</a> <font size=-1>(@n_in_last_24_hours@ orders in last 24 hours; @n_in_last_7_days@ in last 7 days)</font></li>
+<li><a href="customer-service/">Customer Service</a> <font size=-1>(@num_open_issues@ open issues)</font></li>
+
+<if @user_classes_reqs_approval@>
+<li><a href="user-classes/">User Classes</a> <font size=-1>(@n_not_yet_approved@ not yet approved user@num_classes_not_yet_approved_plural@)</font></li>
+</if>
+
+<if @product_comments_allowed@>
+<li><a href="customer-reviews/">Customer Reviews</a> <font size=-1>(@num_non_approved_comments@ not yet approved)</font></li>
+</if>
+
+<li><a href="products/recommendations">Recommend Products</a> <font size=-1>(@n_products@ products; average price: @pretty_avg_price@)</font></li>
+
+</ul>
+
+<h3>website administration</h3><ul>
+
+<li><a href="problems/">Potential Problems</a> <font size=-1>(@unresolved_problem_count@ unresolved problem@unresolved_problem_count_plural@)</font></li>
+
+<if @paymentgateway_show@>
+<li><a href="/@paymentgateway_key@/admin">Payment Gateway Administration</a></li>
+</if>
+
+<li><a href="products/">Products</a> <font size=-1>(@n_products@ products; average price: @pretty_avg_price@)</font></li>
+
+<li><a href="templates/">Product Templates</a></li>
+
+<if ! @user_classes_reqs_approval@>
+<li><a href="user-classes/">User Classes</a> <font size=-1>(@n_not_yet_approved@ not yet approved user@n_not_yet_approved_plural@)</font></li>
+</if>
+
+<if @multiple_retailers_p@>
+<li><a href="retailers/">Retailers</a></li>
+<else>
+<li><a href="shipping-costs/">Shipping Costs</a></li>
+<li><a href="sales-tax/">Sales Tax</a></li>
+</if>
+
+<li><a href="mailing-lists/">Mailing Lists</a></li>
+<li><a href="email-templates/">Email Templates</a></li>
+<li><a href="searches">User Search Terms</a></li>
+<li><a href="audit-tables">Audit @ec_system_name@</a></li>
+
+</ul>
Index: openacs-4/packages/ecommerce/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/index.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/ecommerce/www/admin/index.tcl	24 Feb 2005 13:33:14 -0000	1.7
+++ openacs-4/packages/ecommerce/www/admin/index.tcl	22 Apr 2008 10:48:32 -0000	1.8
@@ -9,29 +9,17 @@
 } {
 }
 
+set page_title "[ec_system_name] Administration"
+set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar "Administration"]
+
 ad_require_permission [ad_conn package_id] admin
 
-doc_body_append "[ad_admin_header "[ec_system_name] Administration"]
+set ec_url [ec_url]
 
-<h2>[ec_system_name] Administration</h2>
-<table width=\"100%\">
-  <tr>
-   <td>[ad_context_bar Ecommerce([ec_system_name])]</td>
-   <td align=\"right\">\[ <a href=\"/doc/ecommerce/\">help</a> \]</td>
-  </tr>
-</table>
-
-<hr>
-Documentation: <a href=\"/doc/ecommerce\">/doc/ecommerce</a> or <a href=\"[ec_url]doc/\">[ec_url]doc/</a>
-<hr>
-"
-
 # get data for user class links
 set user_classes_reqs_approval [ad_parameter -package_id [ec_id] UserClassAllowSelfPlacement ecommerce]
 set n_not_yet_approved [db_string non_approved_users_select "select count(*) from ec_user_class_user_map where user_class_approved_p is null or user_class_approved_p='f'"]
 
-doc_body_append "<h3>business operations</h3><ul>"
-
 # orders
 
 db_1row num_orders_select "
@@ -40,68 +28,40 @@
       sum(one_if_within_n_days(confirmed_date,7)) as n_in_last_7_days
     from ec_orders_reportable"
 
-db_1row num_products_select "select count(*) as n_products, round(avg(price),2) as avg_price from ec_products_displayable"
+db_1row num_products_select "select count(*) as n_products, coalesce(round(avg(price),2), 0) as avg_price from ec_products_displayable"
 
 # links and info mainly related to business operations
 
-doc_body_append "<li><a href=\"orders/\">Orders / Shipments / Refunds</a> <font size=-1>($n_in_last_24_hours orders in last 24 hours; $n_in_last_7_days in last 7 days)</font></li>"
-
 # customer service
 
-doc_body_append "<li><a href=\"customer-service/\">Customer Service</a> <font size=-1>([db_string open_issues_select "select count(*) from ec_customer_service_issues where close_date is null"] open issues)</font></li>"
+set num_open_issues [db_string open_issues_select "select count(*) from ec_customer_service_issues where close_date is null"]
 
-# customer class membership requests
-if { $user_classes_reqs_approval } {
-    doc_body_append "<li><a href=\"user-classes/\">User Classes</a> <font size=-1>($n_not_yet_approved not yet approved user[ec_decode $n_not_yet_approved 1 "" "s"])</font></li>"
-}
+# surely an easier way than this?
+set num_classes_not_yet_approved_plural [ec_decode $n_not_yet_approved 1 "" "s"]
 
-# customer reviews
-if { [ad_parameter -package_id [ec_id] ProductCommentsAllowP ecommerce] } {
-    doc_body_append "<li><a href=\"customer-reviews/\">Customer Reviews</a> <font size=-1>([db_string non_approved_comments_select "select count(*) from ec_product_comments where approved_p is null"] not yet approved)</font></li>"
-}
+set product_comments_allowed [ad_parameter -package_id [ec_id] ProductCommentsAllowP ecommerce]
+set num_non_approved_comments [db_string non_approved_comments_select "select count(*) from ec_product_comments where approved_p is null"]
 
+
 # recommend products
+set pretty_avg_price [ec_pretty_price $avg_price]
 
-doc_body_append "<li><a href=\"products/recommendations\">Recommend Products</a> <font size=-1>($n_products products; average price: [ec_pretty_price $avg_price])</font></li>"
 
-doc_body_append "</ul>"
-
 # links and info mainly related to website administration
-doc_body_append "<h3>website administration</h3><ul>"
 
 set unresolved_problem_count [db_string unresolved_problem_count_select "select count(*) from ec_problems_log where resolved_date is null"]
+set unresolved_problem_count_plural [ec_decode $unresolved_problem_count 1 "" "s"]
 
-doc_body_append "<li><a href=\"problems/\">Potential Problems</a> <font size=-1>($unresolved_problem_count unresolved problem[ec_decode $unresolved_problem_count 1 "" "s"])</font></li>"
-
 set paymentgateway_key [ad_parameter -package_id [ec_id] PaymentGateway ecommerce]
+set paymentgateway_show 0
 if { [string length $paymentgateway_key] > 1 } {
-    doc_body_append "<li><a href=\"/$paymentgateway_key/admin\">Payment Gateway Administration</a></li>"
+    set paymentgateway_show 1
 }
 
 
-doc_body_append "<li><a href=\"products/\">Products</a> <font size=-1>($n_products products; average price: [ec_pretty_price $avg_price])</font></li>"
-
-doc_body_append "<li><a href=\"templates/\">Product Templates</a></li>"
-
 # customer class membership requests
-if { !$user_classes_reqs_approval } {
-    doc_body_append "<li><a href=\"user-classes/\">User Classes</a> <font size=-1>($n_not_yet_approved not yet approved user[ec_decode $n_not_yet_approved 1 "" "s"])</font></li>"
-}
+set n_not_yet_approved_plural [ec_decode $n_not_yet_approved 1 "" "s"]
 
 set multiple_retailers_p [ad_parameter -package_id [ec_id] MultipleRetailersPerProductP ecommerce]
 
-if { $multiple_retailers_p } {
-    doc_body_append "<li><a href=\"retailers/\">Retailers</a></li>"
-} else {
-    doc_body_append "<li><a href=\"shipping-costs/\">Shipping Costs</a></li>
-    <li><a href=\"sales-tax/\">Sales Tax</a></li>"
-}
-
-doc_body_append "<li><a href=\"mailing-lists/\">Mailing Lists</a></li>
-<li><a href=\"email-templates/\">Email Templates</a></li>
-<li><a href=\"searches\">User Search Terms</a></li>
-<li><a href=\"audit-tables\">Audit [ec_system_name]</a></li>"
-
-doc_body_append "</ul>
-[ad_admin_footer]
-"
+set ec_system_name [ec_system_name]
Index: openacs-4/packages/ecommerce/www/admin/index.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/index.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/admin/index.xql	26 May 2002 04:36:50 -0000	1.2
+++ openacs-4/packages/ecommerce/www/admin/index.xql	22 Apr 2008 10:48:32 -0000	1.3
@@ -19,7 +19,7 @@
 
   <fullquery name="num_products_select">      
     <querytext>
-      select count(*) as n_products, round(avg(price),2) as avg_price 
+      select count(*) as n_products, coalesce(round(avg(price),2), 0) as avg_price 
       from ec_products_displayable
     </querytext>
   </fullquery>