Merge branch 'defect-2509-organization-read'

ckanext/organizations/templates/organization_read.html

@@ -4,8 +4,9 @@
   py:strip="">
 
   <xi:include href="facets.html" />
-  <py:def function="page_title">${c.group.display_name}</py:def>
-  <py:def function="page_heading">${c.group.display_name}</py:def>
+
+  <py:def function="page_title">${c.group_dict.display_name}</py:def>
+  <py:def function="page_heading">${c.group_dict.display_name}</py:def>
   <py:if test="c.group.image_url">
     <py:def function="page_logo">${c.group.image_url}</py:def>
   </py:if>
@@ -17,8 +18,8 @@
     from ckan import model
 
     if config.get('ckan.auth.profile', '') == 'publisher':
-        group_administrators = c.group.members_of_type(model.User, 'admin')
-        group_editors = c.group.members_of_type(model.User, 'editor')
+        group_administrators = [u for u in c.group.members_of_type(model.User, 'admin')]
+        group_editors = [u for u in c.group.members_of_type(model.User, 'editor')]
         in_group = c.userobj and c.group in c.userobj.get_groups()
     else:
         group_administrators = c.group_admins
@@ -38,17 +39,17 @@ <h3>Administrators</h3>
         </li>
         </py:if>
         <py:if test='group_editors and in_group'>
-            <li>
-            <h3>Members</h3>
-              <ul class="no-break">
-                <li py:for="editor in group_editors">${h.linked_user(editor)}</li>
-              </ul>
-            </li>
+        <li>
+        <h3>Members</h3>
+          <ul class="no-break">
+            <li py:for="editor in group_editors">${h.linked_user(editor)}</li>
+          </ul>
+        </li>
         </py:if>
       </ul>
     </li>
-    ${facet_sidebar('tags')}
-    ${facet_sidebar('res_format')}
+    ${facet_div('tags', 'Tags')}
+    ${facet_div('res_format', 'Resource Formats')}
   </py:match>
 
   <py:match path="content">
@@ -59,59 +60,22 @@ <h3 py:if="c.group['state'] != 'active'">State: ${c.group['state']}</h3>
       </div>
       <div id="notes-remainder"></div>
       <div id="notes-toggle" style="display: none;">
-        <button class="more pretty-button"><img src="/images/chevron-down.png"/></button>
-        <button class="less pretty-button" style="display: none;"><img src="/images/chevron-up.png"/></button>
+        <button class="more btn"><img src="/images/chevron-down.png"/></button>
+        <button class="less btn" style="display: none;"><img src="/images/chevron-up.png"/></button>
       </div>
     </div>
     <div class="group-dataset-list">
       <h3>Datasets</h3>
 
-      <form id="dataset-search" class="dataset-search" method="GET">
-        <input type="search" class="search" name="q" value="${c.q}" autocomplete="off" results="0" placeholder="${_('Search')}..." />
-        <py:for each="(k, v) in c.fields">
-          <input type="hidden" name="${k}" value="${v}" />
-        </py:for>
-        <input type="submit" value="${_('Search')}" class="pretty-button primary button" />
-      </form>
+      <xi:include href="package/search_form.html" />
       ${field_list()}
 
       <p i18n:msg="query, number_of_results"><span py:if="c.q">You searched for "${c.q}". </span>${c.page.item_count} datasets found.</p>
       ${c.page.pager()}
-
-      <py:for each="package in c.page.items">
-        <div class="search-result ${'fullyopen' if (package.isopen and package.get('resources')) else None}">
-          <p class="extra-links">
-            <a class="view-more-link" href="${h.url_for(controller='package', action='read', id=package.get('name'))}">View</a>
-          </p>
-          <a class="main-link" href="${h.url_for(controller='package', action='read', id=package.get('name'))}">${package.get('title') or package.get('name')}</a>
-          &nbsp;&nbsp;
-          <py:if test="package.resources">
-            <py:for each="resource in package.resources">
-              <py:if test="resource.get('format')">
-                <a href="${resource.get('url')}"
-                  title="${resource.get('description')}"><span class="format-box">${resource.get('format')}</span></a>
-              </py:if>
-            </py:for>
-          </py:if>
-          <p class="result-description">${h.markdown_extract(package.notes)}</p>
-
-          <span class="result-url">
-            <py:if test="package.isopen">
-              <a href="http://opendefinition.org/okd/" title="This dataset satisfies the Open Definition.">
-                <img src="http://assets.okfn.org/images/ok_buttons/od_80x15_blue.png" alt="[Open Data]" />
-              </a>
-            </py:if>
-            <py:if test="not package.isopen">
-              ${h.icon('lock')} Not Openly Licensed
-            </py:if>
-          </span>
-        </div>
-      </py:for>
+      ${package_list_from_dict(c.page.items)}
       ${c.page.pager()}
     </div>
   </py:match>
 
   <xi:include href="organization_layout.html" />
 </html>
-
-