CatalogueRevamping
/
harvester-d4science
14
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
kindly 2013-03-21 02:32:11 +00:00
parent b676fb02e1 15c44d9aa8
commit a7583a7b8b
5 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ckanext/harvest/controllers/organization.py
View File

@ -55,7 +55,10 @@ class OrganizationController(GroupController):
q = c.q = request.params.get('q', '') q = c.q = request.params.get('q', '')
# Search within group # 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: try:
description_formatted = ckan.misc.MarkdownFormat().to_html( description_formatted = ckan.misc.MarkdownFormat().to_html(
@ -155,7 +158,6 @@ class OrganizationController(GroupController):
facets[facet] = default_facet_titles[facet] facets[facet] = default_facet_titles[facet]
else: else:
facets[facet] = facet facets[facet] = facet
if dataset_type: if dataset_type:
fq = fq + 'dataset_type:"{dataset_type}"'.format(dataset_type=dataset_type) fq = fq + 'dataset_type:"{dataset_type}"'.format(dataset_type=dataset_type)

12
ckanext/harvest/fanstatic_library/styles/harvest.css
View File

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

15
ckanext/harvest/fanstatic_library/styles/harvest.less
View File

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

2
ckanext/harvest/templates_new/source/new.html
View File

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

4
ckanext/harvest/templates_new/source/new_source_form.html
View File

@ -34,13 +34,13 @@
<label class="radio"> <label class="radio">
<input type="radio" name="source_type" value="{{ harvester['name'] }}" {{ "checked " if checked }} data-module="harvest-type-change"> <input type="radio" name="source_type" value="{{ harvester['name'] }}" {{ "checked " if checked }} data-module="harvest-type-change">
{{ harvester['title'] }} {{ 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> </label>
{% endfor %} {% endfor %}
</div> </div>
</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 %} {% block extra_config %}
{{ form.textarea('config', id='field-config', label=_('Configuration'), value=data.config, error=errors.config) }} {{ form.textarea('config', id='field-config', label=_('Configuration'), value=data.config, error=errors.config) }}