darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-09 02:03:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2564 from alphagov/style-template-management-controls

Browse Source 
Style template management controls
This commit is contained in:
Chris Hill-Scott
2018-12-05 17:04:13 +00:00
committed by GitHub
parent 971c64a0a9 b0f89f7fe9
commit a1f78abe43
5 changed files with 37 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/templateFolderForm.js
View File

@@ -43,7 +43,9 @@
this.addCancelButton = function(state) { this.addCancelButton = function(state) {
let $cancel = $('<a></a>') let $cancel = $('<a></a>')
.html('Cancel') .html('Cancel')
.click((event) => { .attr('class', 'page-footer-js-cancel')
.attr('tabindex', '0')
.on('click keydown', (event) => {
event.preventDefault(); event.preventDefault();
// clear existing data // clear existing data
state.$el.find('input:radio').prop('checked', false); state.$el.find('input:radio').prop('checked', false);

5
app/assets/stylesheets/components/message.scss
View File

@@ -163,5 +163,10 @@
} }
&-manage-link {
display: block;
text-align: right;
padding: ($gutter - 2px) 0 0 0;
}
} }

18
app/assets/stylesheets/components/page-footer.scss
View File

@@ -86,3 +86,21 @@
} }
} }
.page-footer-js-cancel {
text-decoration: underline;
color: $govuk-blue;
cursor: pointer;
&:hover {
color: $link-hover-colour;
}
&:focus,
&:active, {
background: $yellow;
color: $govuk-blue;
outline: 3px solid $yellow;
}
}

4
app/assets/stylesheets/components/stick-at-top-when-scrolling.scss
View File

@@ -59,6 +59,10 @@
margin: 0; margin: 0;
} }
.button-secondary {
margin-right: $gutter-half;
}
} }
.content-fixed, .content-fixed,

12
app/templates/views/templates/choose.html
View File

@@ -49,7 +49,7 @@
{% else %} {% else %}
<div class="grid-row {% if current_service.all_template_folders %}bottom-gutter-1-2{% else %}bottom-gutter-2-3{% endif %}"> <div class="grid-row {% if current_service.all_template_folders %}bottom-gutter-1-2{% else %}bottom-gutter-2-3{% endif %}">
<div class="column-two-thirds"> <div class="{% if can_manage_folders %} column-five-sixths {% else %} column-two-thirds {% endif %}">
{{ folder_path( {{ folder_path(
folders=template_folder_path, folders=template_folder_path,
service_id=current_service.id, service_id=current_service.id,
@@ -59,14 +59,16 @@
) }} ) }}
</div> </div>
{% if current_user.has_permissions('manage_templates') %} {% if current_user.has_permissions('manage_templates') %}
<div class="column-one-third">
{% if not can_manage_folders %} {% if not can_manage_folders %}
<a href="{{ url_for('.add_template_by_type', service_id=current_service.id, template_folder_id=current_template_folder_id) }}" class="button align-with-heading">Add new template</a> <div class="column-one-third">
<a href="{{ url_for('.add_template_by_type', service_id=current_service.id, template_folder_id=current_template_folder_id) }}" class="button align-with-heading">Add new template</a>
</div>
{% endif %} {% endif %}
{% if can_manage_folders and current_template_folder_id %} {% if can_manage_folders and current_template_folder_id %}
<a href="{{ url_for('.manage_template_folder', service_id=current_service.id, template_folder_id=current_template_folder_id) }}" class="align-with-heading">Manage</a> <div class="column-one-sixth">
<a href="{{ url_for('.manage_template_folder', service_id=current_service.id, template_folder_id=current_template_folder_id) }}" class="folder-heading-manage-link">Manage</a>
</div>
{% endif %} {% endif %}
</div>
{% endif %} {% endif %}
</div> </div>