Merge branch '890-button-ia'

ckan · Jun 26, 2013 · 46fbf97 · 46fbf97
2 parents 392ec18 + 53f1860
commit 46fbf97
Show file tree

Hide file tree

Showing 43 changed files with 283 additions and 315 deletions.
diff --git a/ckan/lib/helpers.py b/ckan/lib/helpers.py
@@ -611,6 +611,13 @@ def check_access(action, data_dict=None):
     return authorized
 
 
+def get_action(action_name, data_dict=None):
+    '''Calls an action function from a template.'''
+    if data_dict is None:
+        data_dict = {}
+    return logic.get_action(action_name)({}, data_dict)
+
+
 def linked_user(user, maxlength=0, avatar=20):
     if user in [model.PSEUDO_USER__LOGGED_IN, model.PSEUDO_USER__VISITOR]:
         return user
@@ -1587,6 +1594,7 @@ def SI_number_span(number):
     'subnav_named_route',
     'default_group_type',
     'check_access',
+    'get_action',
     'linked_user',
     'group_name_to_title',
     'markdown_extract',

diff --git a/ckan/logic/action/get.py b/ckan/logic/action/get.py
@@ -756,6 +756,7 @@ def package_show(context, data_dict):
 
     return package_dict
 
+
 def resource_show(context, data_dict):
     '''Return the metadata of a resource.
 

diff --git a/ckan/public/base/less/ckan.less b/ckan/public/base/less/ckan.less
@@ -138,3 +138,7 @@ iframe {
 }
 
 @import "iehacks.less";
+
+.debug {
+  display: none;
+}
diff --git a/ckan/public/base/less/layout.less b/ckan/public/base/less/layout.less
@@ -46,8 +46,8 @@
 .primary {
   .primary {
     float: left;
-    width: 479px;
-    margin-left: 20px;
+    width: 467px;
+    margin-left: 0;
     margin-bottom: 20px;
     h1, h2, h3, h4 {
       &:first-child {
@@ -153,6 +153,9 @@
       }
     }
   }
+  .follow_button {
+    margin-top: 15px;
+  }
   &.editing {
     .module-heading {
 

diff --git a/ckan/public/base/less/module.less b/ckan/public/base/less/module.less
@@ -69,6 +69,12 @@
   border-top: 1px solid @moduleHeadingBorderColor;
 }
 
+.module-content .pagination {
+  margin-left: -25px;
+  margin-right: -25px;
+  margin-bottom: -20px;
+}
+
 .module .pagination > ul {
   .border-radius(0);
   .box-shadow(none);

diff --git a/ckan/public/base/less/toolbar.less b/ckan/public/base/less/toolbar.less
@@ -5,11 +5,8 @@
   padding: 5px 0;
 }
 
-.toolbar .add_action {
-  .unstyled;
-  position: absolute;
-  top: 1px;
-  right: 0;
+.page_primary_action {
+  margin-bottom: 20px;
 }
 
 .toolbar .breadcrumb {
@@ -78,19 +75,21 @@
 }
 
 .page-header {
-  position: relative;
+  .clearfix;
   border-bottom: 1px solid @moduleHeadingBorderColor;
   background-color: @moduleHeadingBackgroundColor;
-  height: 30px;
   .border-radius(0 3px 0 0);
   .nav-tabs {
-    position: absolute;
-    left: 20px;
-    bottom: -1px;
-    margin-bottom: 0;
+    float: left;
+    margin-bottom: -1px;
     li.active a,
     a:hover {
       background-color: @moduleBackgroundColor;
     }
   }
+  .content_action {
+    float: right;
+    margin-top: -5px;
+    margin-right: -7px;
+  }
 }
diff --git a/ckan/templates/admin/base.html b/ckan/templates/admin/base.html
@@ -5,21 +5,7 @@
 {% block breadcrumb_content %}
 {% endblock %}
 
-{% block primary_content %}
-  <article class="module">
-    {% block page_header %}
-    	<header class="module-content page-header">
-        <ul class="nav nav-tabs">
-          {% block page_header_tabs %}
-            {{ h.build_nav_icon('ckanadmin_index', _('Sysadmins')) }}
-            {{ h.build_nav_icon('ckanadmin_config', _('Config')) }}
-          {% endblock %}
-        </ul>
-      </header>
-    {% endblock %}
-    <div class="module-content">
-      {% block primary_content_inner %}
-      {% endblock %}
-    </div>
-  </article>
+{% block content_primary_nav %}
+  {{ h.build_nav_icon('ckanadmin_index', _('Sysadmins')) }}
+  {{ h.build_nav_icon('ckanadmin_config', _('Config')) }}
 {% endblock %}
diff --git a/ckan/templates/group/about.html b/ckan/templates/group/about.html
@@ -1,20 +1,18 @@
-{% extends "group/read.html" %}
+{% extends "group/read_base.html" %}
 
 {% block subtitle %}{{ _('About') }} - {{ c.group_dict.display_name }}{% endblock %}
 
 {% block primary_content_inner %}
-<section class="module-content">
-	<h1>{% block page_heading %}{{ c.group_dict.display_name }}{% endblock %}</h1>
-	{% block group_description %}
-	{% if c.group_dict.description %}
-		{{ h.render_markdown(c.group_dict.description) }}
-	{% else %}
-		<p class="empty">{{ _('There is no description for this group') }}</p>
-	{% endif %}
-	{% endblock %}
+  <h1>{% block page_heading %}{{ c.group_dict.display_name }}{% endblock %}</h1>
+  {% block group_description %}
+    {% if c.group_dict.description %}
+      {{ h.render_markdown(c.group_dict.description) }}
+    {% else %}
+      <p class="empty">{{ _('There is no description for this group') }}</p>
+  	{% endif %}
+  {% endblock %}
 
-    {% block group_extras %}
-      {% snippet 'snippets/additional_info.html', extras = h.sorted_extras(c.group_dict.extras) %}
-    {% endblock %}
-</section>
+  {% block group_extras %}
+    {% snippet 'snippets/additional_info.html', extras = h.sorted_extras(c.group_dict.extras) %}
+  {% endblock %}
 {% endblock %}
diff --git a/ckan/templates/group/activity_stream.html b/ckan/templates/group/activity_stream.html
@@ -1,12 +1,10 @@
-{% extends "group/read.html" %}
+{% extends "group/read_base.html" %}
 
 {% block subtitle %}{{ _('Activity Stream') }} - {{ c.group_dict.title or c.group_dict.name }}{% endblock %}
 
 {% block primary_content_inner %}
-<section class="module-content">
-	<h2 class="hide-heading">{% block page_heading %}{{ _('Activity Stream') }}{% endblock %}</h2>
-	{% block activity_stream %}
-	{{ c.group_activity_stream | safe }}
-	{% endblock %}
-</section>
+  <h2 class="hide-heading">{% block page_heading %}{{ _('Activity Stream') }}{% endblock %}</h2>
+  {% block activity_stream %}
+    {{ c.group_activity_stream | safe }}
+  {% endblock %}
 {% endblock %}
diff --git a/ckan/templates/group/admins.html b/ckan/templates/group/admins.html
@@ -1,4 +1,4 @@
-{% extends "group/read.html" %}
+{% extends "group/read_base.html" %}
 
 {% block subtitle %}{{ _('Administrators') }} - {{ c.group_dict.title or c.group_dict.name }}{% endblock %}
 

diff --git a/ckan/templates/group/base_form_page.html b/ckan/templates/group/base_form_page.html
@@ -1,19 +1,15 @@
 {% extends "group/index.html" %}
 
-{% block add_action_content %}{% endblock %}
+{% block page_primary_action %}{% endblock %}
 
 {% block breadcrumb_content %}
   <li>{{ h.nav_link(_('Groups'), controller='group', action='index') }}</li>
   <li class="active">{% block breadcrumb_link %}{{ h.nav_link(_('Add a Group'), controller='group', action='new') }}{% endblock %}</li>
 {% endblock %}
 
-{% block primary_content %}
-  <div class="module">
-    <div class="module-content">
+{% block primary_content_inner %}
       <h1 class="page-heading">{% block page_heading %}{{ _('Group Form') }}{% endblock %}</h1>
       {% block form %}
         {{ c.form | safe }}
       {% endblock %}
-    </div>
-  </div>
 {% endblock %}
diff --git a/ckan/templates/group/followers.html b/ckan/templates/group/followers.html
@@ -1,4 +1,4 @@
-{% extends "group/read.html" %}
+{% extends "group/read_base.html" %}
 
 {% block subtitle %}{{ _('Followers') }} - {{ c.group_dict.title or c.group_dict.name }}{% endblock %}
 

diff --git a/ckan/templates/group/index.html b/ckan/templates/group/index.html
@@ -6,15 +6,15 @@
   <li class="active">{% link_for _('Groups'), controller='group', action='index' %}</li>
 {% endblock %}
 
-{% block add_action_content %}
+{% block page_header %}{% endblock %}
+
+{% block page_primary_action %}
   {% if h.check_access('group_create') %}
     {% link_for _('Add Group'), controller='group', action='new', class_='btn btn-primary', icon='plus-sign-alt' %}
   {% endif %}
 {% endblock %}
 
-{% block primary_content %}
-  <div class="module">
-    <div class="module-content">
+{% block primary_content_inner %}
       <h1 class="hide-heading">{{ _('Groups') }}</h1>
       {% block groups_search_form %}
         {% snippet 'snippets/search_form.html', type='group', query=c.q, sorting_selected=c.sort_by_selected, count=c.page.item_count, placeholder=_('Search groups...'), show_empty=request.params %}
@@ -31,11 +31,9 @@ <h1 class="hide-heading">{{ _('Groups') }}</h1>
         </p>
       {% endif %}
       {% endblock %}
-    </div>
     {% block page_pagination %}
     {{ c.page.pager() }}
     {% endblock %}
-  </div>
 {% endblock %}
 
 {% block secondary_content %}

diff --git a/ckan/templates/group/read.html b/ckan/templates/group/read.html
@@ -2,6 +2,10 @@
 
 {% block subtitle %}{{ c.group_dict.display_name }}{% endblock %}
 
+{% block page_primary_action %}
+  {% link_for _('Add Dataset'), controller='package', action='new', group=c.group_dict.id, class_='btn btn-primary', icon='plus-sign-alt' %}
+{% endblock %}
+
 {% block primary_content_inner %}
   <div class="module-content">
     {% block groups_search_form %}
@@ -14,20 +18,19 @@
       %}
       {% snippet 'snippets/search_form.html', type='dataset', query=c.q, sorting_selected=c.sort_by_selected, count=c.page.item_count, facets=facets, placeholder=_('Search datasets...'), show_empty=request.params %}
     {% endblock %}
-    {% block packages_list %}
+  {% block packages_list %}
       {% if c.page.items %}
         {{ h.snippet('snippets/package_list.html', packages=c.page.items) }}
       {% endif %}
-    {% endblock %}
-  </div>
+  {% endblock %}
   {% block page_pagination %}
-  {{ c.page.pager(q=c.q) }}
+    {{ c.page.pager(q=c.q) }}
   {% endblock %}
 {% endblock %}
 
 {% block secondary_content %}
   {{ super() }}
   {% for facet in c.facet_titles %}
-      {{ h.snippet('snippets/facet_list.html', title=c.facet_titles[facet], name=facet, extras={'id':c.group_dict.id}) }}
+    {{ h.snippet('snippets/facet_list.html', title=c.facet_titles[facet], name=facet, extras={'id':c.group_dict.id}) }}
   {% endfor %}
 {% endblock %}
diff --git a/ckan/templates/group/read_base.html b/ckan/templates/group/read_base.html
@@ -7,29 +7,16 @@
   <li class="active">{% link_for c.group_dict.display_name|truncate(35), controller='group', action='read', id=c.group_dict.name %}</li>
 {% endblock %}
 
-{% block actions_content %}
+{% block content_action %}
   {% if h.check_access('group_update', {'id': c.group_dict.id}) %}
-    <li>{% link_for _('Add Dataset'), controller='package', action='new', group=c.group_dict.id, class_='btn', icon='plus-sign-alt' %}</li>
-    <li>{% link_for _('Edit'), controller='group', action='edit', id=c.group_dict.name, class_='btn btn-primary', icon='wrench' %}</li>
+    {% link_for _('Edit'), controller='group', action='edit', id=c.group_dict.name, class_='btn', icon='wrench' %}
   {% endif %}
-  <li>{{ h.follow_button('group', c.group_dict.id) }}</li>
 {% endblock %}
 
-{% block primary_content %}
-  <section class="module">
-    {% block page_header %}
-      <header class="module-content page-header">
-        <ul class="nav nav-tabs">
-          {% block page_header_tabs %}
-            {{ h.build_nav_icon('group_read', _('Datasets'), id=c.group_dict.name) }}
-            {{ h.build_nav_icon('group_activity', _('Activity Stream'), id=c.group_dict.name, offset=0) }}
-            {{ h.build_nav_icon('group_about', _('About'), id=c.group_dict.name) }}
-          {% endblock %}
-        </ul>
-      </header>
-    {% endblock %}
-    {% block primary_content_inner %}{% endblock %}
-  </section>
+{% block content_primary_nav %}
+  {{ h.build_nav_icon('group_read', _('Datasets'), id=c.group_dict.name) }}
+  {{ h.build_nav_icon('group_activity', _('Activity Stream'), id=c.group_dict.name, offset=0) }}
+  {{ h.build_nav_icon('group_about', _('About'), id=c.group_dict.name) }}
 {% endblock %}
 
 {% block secondary_content %}
@@ -59,6 +46,9 @@ <h1 class="heading">{{ c.group_dict.display_name }}</h1>
           <dd>{{ h.SI_number_span(c.group_dict.packages|length) }}</dd>
         </dl>
       </div>
+      <div class="follow_button">
+        {{ h.follow_button('group', c.group_dict.id) }}
+      </div>
     </section>
   </div>
 {% endblock %}

diff --git a/ckan/templates/organization/about.html b/ckan/templates/organization/about.html
@@ -3,7 +3,6 @@
 {% block subtitle %}{{ _('About') }} - {{ c.group_dict.display_name }}{% endblock %}
 
 {% block primary_content_inner %}
-<section class="module-content">
 	<h1>{% block page_heading %}{{ c.group_dict.display_name }}{% endblock %}</h1>
 	{% block organization_description %}
 	{% if c.group_dict.description %}
@@ -16,5 +15,4 @@ <h1>{% block page_heading %}{{ c.group_dict.display_name }}{% endblock %}</h1>
     {% block organization_extras %}
       {% snippet 'snippets/additional_info.html', extras = h.sorted_extras(c.group_dict.extras) %}
     {% endblock %}
-</section>
 {% endblock %}
diff --git a/ckan/templates/organization/activity_stream.html b/ckan/templates/organization/activity_stream.html
@@ -3,10 +3,8 @@
 {% block subtitle %}{{ _('Activity Stream') }} - {{ c.group_dict.title or c.group_dict.name }}{% endblock %}
 
 {% block primary_content_inner %}
-<section class="module-content">
 	<h2 class="hide-heading">{% block page_heading %}{{ _('Activity Stream') }}{% endblock %}</h2>
 	{% block activity_stream %}
 	{{ c.group_activity_stream | safe }}
 	{% endblock %}
-</section>
 {% endblock %}
diff --git a/ckan/templates/organization/base_form_page.html b/ckan/templates/organization/base_form_page.html
@@ -1,12 +1,10 @@
 {% extends "organization/edit_base.html" %}
 
 {% block primary_content_inner %}
-  <div class="module-content">
     <h1 class="{% block page_heading_class %}page-heading{% endblock %}">
       {% block page_heading %}{{ _('Organization Form') }}{% endblock %}
     </h1>
     {% block form %}
       {{ c.form | safe }}
     {% endblock %}
-  </div>
 {% endblock %}
diff --git a/ckan/templates/organization/bulk_process.html b/ckan/templates/organization/bulk_process.html
@@ -2,11 +2,14 @@
 
 {% block subtitle %}{{ _('Edit datasets') }} - {{ super() }}{% endblock %}
 
+{% block page_primary_action %}
+  {% link_for _('Add dataset'), controller='package', action='new', group=c.group_dict.id, class_='btn btn-primary', icon='plus-sign-alt' %}
+{% endblock %}
+
 {% block primary_content_inner %}
   <div class="clearfix">
     <h1 class="hide-heading">{{ _('Edit datasets') }}</h1>
     <div class="primary">
-      {% link_for _('Add Dataset'), controller='package', action='new', group=c.group_dict.id, class_='btn pull-right', icon='plus-sign-alt' %}
       <h3 class="page-heading">
         {% block page_heading %}
         {%- if c.page.item_count -%}