Skip to content

Commit

Permalink
[#844] Tweaks to blocks from new templates
Browse files Browse the repository at this point in the history
  • Loading branch information
@johnmartin
johnmartin committed Jun 26, 2013
1 parent 344d99e commit 1b22212
Show file tree
Hide file tree
Showing 4 changed files with 74 additions and 79 deletions.
6 changes: 3 additions & 3 deletions ckan/templates/group/edit_base.html
View file
Expand Up @@ -10,11 +10,11 @@
{% endblock %}
{% endblock %}

{% block actions_content %}
<li>{% link_for _('View group'), controller='group', action='read', id=c.group_dict.name, class_='btn', icon='eye-open' %}</li>
{% block content_action %}
{% link_for _('View group'), controller='group', action='read', id=c.group_dict.name, class_='btn', icon='eye-open' %}
{% endblock %}

{% block page_header_tabs %}
{% block content_primary_nav %}
{{ h.build_nav_icon('group_edit', _('Edit'), id=c.group_dict.name) }}
{{ h.build_nav_icon('group_members', _('Members'), id=c.group_dict.name) }}
{% endblock %}
58 changes: 28 additions & 30 deletions ckan/templates/group/member_new.html
View file
Expand Up @@ -5,39 +5,37 @@
{% set user = c.user_dict %}

{% block primary_content_inner %}
<div class="module-content">
{% link_for _('Back to all members'), controller='group', action='members', id=group.name, class_='btn pull-right', icon='arrow-left' %}
<h1 class="page-heading">
{% block page_heading %}{{ _('Edit Member') if user else _('Add Member') }}{% endblock %}
</h1>
{% block form %}
<form class="dataset-form form-horizontal" method='post'>
{% link_for _('Back to all members'), controller='group', action='members', id=group.name, class_='btn pull-right', icon='arrow-left' %}
<h1 class="page-heading">
{% block page_heading %}{{ _('Edit Member') if user else _('Add Member') }}{% endblock %}
</h1>
{% block form %}
<form class="dataset-form form-horizontal" method='post'>
{% if user %}
<input type="hidden" name="username" value="{{ user.name }}" />
{% set format_attrs = {'disabled': true} %}
{{ form.input('username', label=_('User'), value=user.name, classes=['control-medium'], attrs=format_attrs) }}
{% else %}
{% set format_attrs = {'data-module': 'autocomplete', 'data-module-source': '/api/2/util/user/autocomplete?q=?'} %}
{{ form.input('username', id='field-username', label=_('User'), placeholder=_('Username'), value='', error='', classes=['control-medium'], attrs=format_attrs) }}
{% endif %}
{% set format_attrs = {'data-module': 'autocomplete'} %}
{{ form.select('role', label=_('Role'), options=c.roles, selected=c.user_role, error='', attrs=format_attrs) }}
<div class="form-actions">
{% if user %}
<input type="hidden" name="username" value="{{ user.name }}" />
{% set format_attrs = {'disabled': true} %}
{{ form.input('username', label=_('User'), value=user.name, classes=['control-medium'], attrs=format_attrs) }}
{% set locale = h.dump_json({'content': _('Are you sure you want to delete this member?')}) %}
<a href="{% url_for controller='group', action='member_delete', id=c.group_dict.id, user=user.id %}" class="btn btn-danger pull-left" data-module="confirm-action" data-module-i18n="{{ locale }}">{{ _('Delete') }}</a>
<button class="btn btn-primary" type="submit" name="submit" >
{{ _('Save') }}
</button>
{% else %}
{% set format_attrs = {'data-module': 'autocomplete', 'data-module-source': '/api/2/util/user/autocomplete?q=?'} %}
{{ form.input('username', id='field-username', label=_('User'), placeholder=_('Username'), value='', error='', classes=['control-medium'], attrs=format_attrs) }}
<button class="btn btn-primary" type="submit" name="submit" >
{{ _('Add') }}
</button>
{% endif %}
{% set format_attrs = {'data-module': 'autocomplete'} %}
{{ form.select('role', label=_('Role'), options=c.roles, selected=c.user_role, error='', attrs=format_attrs) }}
<div class="form-actions">
{% if user %}
{% set locale = h.dump_json({'content': _('Are you sure you want to delete this member?')}) %}
<a href="{% url_for controller='group', action='member_delete', id=c.group_dict.id, user=user.id %}" class="btn btn-danger pull-left" data-module="confirm-action" data-module-i18n="{{ locale }}">{{ _('Delete') }}</a>
<button class="btn btn-primary" type="submit" name="submit" >
{{ _('Save') }}
</button>
{% else %}
<button class="btn btn-primary" type="submit" name="submit" >
{{ _('Add') }}
</button>
{% endif %}
</div>
</form>
{% endblock %}
</div>
</div>
</form>
{% endblock %}
{% endblock %}

{% block secondary_content %}
Expand Down
68 changes: 33 additions & 35 deletions ckan/templates/group/members.html
View file
Expand Up @@ -3,39 +3,37 @@
{% block subtitle %}{{ _('Members') }} - {{ c.group_dict.display_name }}{% endblock %}

{% block primary_content_inner %}
<div class="module-content">
{% link_for _('Add Member'), controller='group', action='member_new', id=c.group_dict.id, class_='btn pull-right', icon='plus-sign-alt' %}
<h3 class="page-heading">{{ _('{0} members'.format(c.members|length)) }}</h3>
<table class="table table-header table-hover table-bordered">
<col width="70" />
<col width="40" />
<col width="20" />
<thead>
<tr>
<th scope="col">{{ _('User') }}</th>
<th scope="col">{{ _('Role') }}</th>
<th scope="col"></th>
</tr>
</thead>
<tbody>
{% for user_id, user, role in c.members %}
<tr>
<td class="media">
{{ h.linked_user(user_id, maxlength=20) }}
</td>
<td>{{ role }}</td>
<td>
{% set locale = h.dump_json({'content': _('Are you sure you want to delete this member?')}) %}
<div class="btn-group pull-right">
<a class="btn btn-small" href="{% url_for controller='group', action='member_new', id=c.group_dict.id, user=user_id %}" title="{{ _('Edit') }}">
<i class="icon-wrench"></i>
</a>
<a class="btn btn-danger btn-small" href="{% url_for controller='group', action='member_delete', id=c.group_dict.id, user=user_id %}" data-module="confirm-action" data-module-i18n="{{ locale }}" title="{{ _('Delete') }}">{% block delete_button_text %}<i class="icon-remove"></i>{% endblock %}</a>
</div>
</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
{% link_for _('Add Member'), controller='group', action='member_new', id=c.group_dict.id, class_='btn pull-right', icon='plus-sign-alt' %}
<h3 class="page-heading">{{ _('{0} members'.format(c.members|length)) }}</h3>
<table class="table table-header table-hover table-bordered">
<col width="70" />
<col width="40" />
<col width="20" />
<thead>
<tr>
<th scope="col">{{ _('User') }}</th>
<th scope="col">{{ _('Role') }}</th>
<th scope="col"></th>
</tr>
</thead>
<tbody>
{% for user_id, user, role in c.members %}
<tr>
<td class="media">
{{ h.linked_user(user_id, maxlength=20) }}
</td>
<td>{{ role }}</td>
<td>
{% set locale = h.dump_json({'content': _('Are you sure you want to delete this member?')}) %}
<div class="btn-group pull-right">
<a class="btn btn-small" href="{% url_for controller='group', action='member_new', id=c.group_dict.id, user=user_id %}" title="{{ _('Edit') }}">
<i class="icon-wrench"></i>
</a>
<a class="btn btn-danger btn-small" href="{% url_for controller='group', action='member_delete', id=c.group_dict.id, user=user_id %}" data-module="confirm-action" data-module-i18n="{{ locale }}" title="{{ _('Delete') }}">{% block delete_button_text %}<i class="icon-remove"></i>{% endblock %}</a>
</div>
</td>
</tr>
{% endfor %}
</tbody>
</table>
{% endblock %}
21 changes: 10 additions & 11 deletions ckan/templates/group/read.html
View file
Expand Up @@ -7,17 +7,16 @@
{% endblock %}

{% block primary_content_inner %}
<div class="module-content">
{% block groups_search_form %}
{% set facets = {
'fields': c.fields_grouped,
'search': c.search_facets,
'titles': c.facet_titles,
'translated_fields': c.translated_fields,
'remove_field': c.remove_field }
%}
{% 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 groups_search_form %}
{% set facets = {
'fields': c.fields_grouped,
'search': c.search_facets,
'titles': c.facet_titles,
'translated_fields': c.translated_fields,
'remove_field': c.remove_field }
%}
{% 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 %}
{% if c.page.items %}
{{ h.snippet('snippets/package_list.html', packages=c.page.items) }}
Expand Down

0 comments on commit 1b22212

Please sign in to comment.