Merge branch 'release-v2.0' of https://github.com/okfn/ckanext-harvest into release-v2.0

ckanext/harvest/controllers/organization.py

@@ -55,7 +55,10 @@ class OrganizationController(GroupController):
 
         q = c.q = request.params.get('q', '')
         # Search within group
-        q += ' groups: "%s"' % c.group_dict.get('name')
+        if c.group_dict.get('is_organization'):
+            q += ' owner_org: "%s"' % c.group_dict.get('id')
+        else:
+            q += ' groups: "%s"' % c.group_dict.get('name')
 
         try:
             description_formatted = ckan.misc.MarkdownFormat().to_html(
@@ -155,7 +158,6 @@ class OrganizationController(GroupController):
                     facets[facet] = default_facet_titles[facet]
                 else:
                     facets[facet] = facet
-
             if dataset_type:
                 fq = fq + 'dataset_type:"{dataset_type}"'.format(dataset_type=dataset_type)
 

ckanext/harvest/fanstatic_library/styles/harvest.css

@@ -31,8 +31,14 @@ header.with-filter h1 {
 }
 .harvest-types label.radio {
   font-weight: normal;
-  margin-bottom: 0;
+  margin-bottom: 10px;
 }
-.harvest-types label.radio i {
-  color: #999;
+.harvest-types label.radio input {
+  top: 3px;
+}
+#source-new .controls {
+  margin-left: 135px;
+}
+#source-new .control-label {
+  width: 125px;
 }

ckanext/harvest/fanstatic_library/styles/harvest.less

@@ -42,8 +42,17 @@ header.with-filter {
 
 .harvest-types label.radio {
   font-weight: normal;
-  margin-bottom: 0;
-  i {
-    color: #999;
+  margin-bottom: 10px;
+  input {
+    top: 3px;
+  }
+}
+
+#source-new {
+  .controls {
+    margin-left: 135px;
+  }
+  .control-label {
+    width: 125px;
   }
 }

ckanext/harvest/templates_new/source/new.html

@@ -26,7 +26,7 @@
         {% trans %}
         Harvest sources allow importing metadata from other catalogues
         as CKAN datasets. These can be other CKAN instances or other
-        protocols and formats. (TODO: Review)
+        protocols and formats.
         {% endtrans %}
       </p>
     </div>

ckanext/harvest/templates_new/source/new_source_form.html

@@ -34,13 +34,13 @@
         <label class="radio">
           <input type="radio" name="source_type" value="{{ harvester['name'] }}" {{ "checked " if checked }} data-module="harvest-type-change">
           {{ harvester['title'] }}
-          <i class="icon-question-sign" title="{{ harvester['description'] }}" data-toggle="tooltip"></i>
+          <i class="icon-question-sign muted" title="{{ harvester['description'] }}" data-toggle="tooltip"></i>
         </label>
       {% endfor %}
     </div>
   </div>
 
-  {{ form.select('frequency', id='field-frequency', label=_('Frequency of update'), options=h.harvest_frequencies(), selected=data.frequency, error=errors.frequency) }}
+  {{ form.select('frequency', id='field-frequency', label=_('Update frequency'), options=h.harvest_frequencies(), selected=data.frequency, error=errors.frequency) }}
 
   {% block extra_config %}
   {{ form.textarea('config', id='field-config', label=_('Configuration'), value=data.config, error=errors.config) }}