Index: openacs-4/packages/organizations/organizations.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/organizations/organizations.info,v
diff -u -r1.7.2.1 -r1.7.2.2
--- openacs-4/packages/organizations/organizations.info	17 Sep 2005 10:24:21 -0000	1.7.2.1
+++ openacs-4/packages/organizations/organizations.info	14 Oct 2005 21:54:57 -0000	1.7.2.2
@@ -7,20 +7,20 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
     
-    <version name="0.5d3" url="http://openacs.org/repository/download/apm/organizations-0.5d3.apm">
-        <owner url="mailto:jon@mayuli.com">Jon Griffin</owner>
-        <owner url="mailto:jader@bread.com">Jade Rubick</owner>
+    <version name="0.6d1" url="http://openacs.org/repository/download/apm/organizations-0.6d1.apm">
+        <owner url="mailto:alexk@bread.com">Alex Kroman</owner>
         <summary>Implementation of HR-XML organizations datamodel.</summary>
-        <release-date>2004-06-25</release-date>
-        <vendor url="http://www.mayuli.com">Mayuli Enterprises, LLC</vendor>
+        <release-date>2005-10-14</release-date>
+        <vendor url="http://www.bread.com/">Integrated Bakery Resources</vendor>
         <description format="text/plain">Provides the datamodel for an
       implementation of the HR-XML organizations spec, but no API for
       manipulating the data.  Also note that the Oracle code is out of sync
       with the Postgres code. The source code has comments in it indicating
       what needs to be updated to make things work correctly [Jade Rubick].
         </description>
+        <maturity>0</maturity>
 
-        <provides url="organizations" version="0.5d3"/>
+        <provides url="organizations" version="0.6d1"/>
         <requires url="acs-kernel" version="5.0d13"/>
 
         <callbacks>
Index: openacs-4/packages/organizations/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/organizations/www/index.adp,v
diff -u -r1.2 -r1.2.6.1
--- openacs-4/packages/organizations/www/index.adp	26 Jan 2004 15:39:47 -0000	1.2
+++ openacs-4/packages/organizations/www/index.adp	14 Oct 2005 21:54:57 -0000	1.2.6.1
@@ -3,23 +3,8 @@
 <property name="title">@title@</property>
 <property name="context_bar">@context_bar;noquote@</property>
 
-<table cellpadding="3" cellspacing="3">
+<listfilters name="orgs" style="select-menu"></listfilters>
+<listtemplate name="orgs"></listtemplate>
 
-  <tr>
 
-    <td class="list-filter-pane" valign="top" width="200">
 
-      <listfilters name="orgs"></listfilters>
-
-    </td>
-
-    <td class="list-list-pane" valign="top">
-
-      <listtemplate name="orgs"></listtemplate>
-
-    </td>
-
-  </tr>
-
-</table>
-
Index: openacs-4/packages/organizations/www/index.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/organizations/www/index.xql,v
diff -u -r1.2 -r1.2.6.1
--- openacs-4/packages/organizations/www/index.xql	26 Jan 2004 15:39:47 -0000	1.2
+++ openacs-4/packages/organizations/www/index.xql	14 Oct 2005 21:54:57 -0000	1.2.6.1
@@ -10,10 +10,12 @@
 	o.notes,
 	ot.type as organization_type
 	FROM
-	organizations o,
-	organization_types ot,
-	organization_type_map tm
-	WHERE
+	organizations o
+        INNER JOIN acs_objects ob ON o.organization_id = ob.object_id
+        LEFT JOIN organization_type_map tm ON o.organization_id = tm.organization_id
+	INNER JOIN organization_types ot ON ot.organization_type_id = tm.organization_type_id
+        WHERE
+        ob.context_id           = :package_id and
 	o.organization_id       = tm.organization_id and
 	tm.organization_type_id = ot.organization_type_id
 	[template::list::filter_where_clauses -and -name "orgs"]
Index: openacs-4/packages/organizations/www/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/organizations/www/one.adp,v
diff -u -r1.2 -r1.2.6.1
--- openacs-4/packages/organizations/www/one.adp	26 Jan 2004 15:39:47 -0000	1.2
+++ openacs-4/packages/organizations/www/one.adp	14 Oct 2005 21:54:57 -0000	1.2.6.1
@@ -5,32 +5,32 @@
 
 <table>
 <tr>
-<th>Name:</th>
+<th align="right">Name:</th>
 <td>@name@</td>
 </tr>
 
 <tr>
-<th>Legal name:</th>
+<th align="right">Legal name:</th>
 <td>@legal_name@</td>
 </tr>
 
 <tr>
-<th>Email:</th>
+<th align="right">Email:</th>
 <td><a href="mailto:@email@">@email@</a></td>
 </tr>
 
 <tr>
-<th>Website:</th>
+<th align="right">Website:</th>
 <td><a href="@url@">@url@</a></td>
 </tr>
 
 <tr>
-<th>Registration number:</th>
+<th align="right">Registration number:</th>
 <td>@reg_number@</td>
 </tr>
 
 <tr>
-<th>Notes:</th>
+<th align="right">Notes:</th>
 <td>@notes@</td>
 </tr>
 </table>