darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-01 12:19:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2475 from alphagov/add-folder-icons-to-list

Browse Source 
Add folder icons to list
This commit is contained in:
Rebecca Law
2018-11-12 15:26:44 +00:00
committed by GitHub
parent 6f2c4601a8 4c9f667de3
commit 302078ac28
5 changed files with 35 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,17 +24,34 @@
margin-top: $gutter;
}
.template-list-item,
.template-list-item-with-checkbox {
position: relative;
}
.template-list {
.template-list-item-with-checkbox {
&-item {
padding-left: $gutter * 2;
&-with-checkbox {
position: relative;
padding-left: $gutter * 2;
.multiple-choice {
position: absolute;
left: 0;
}
}
.multiple-choice {
position: absolute;
left: 0;
}
&-folder {
a {
text-indent: 40px;
background-image: file-url('folder-blue-bold.svg');
background-repeat: no-repeat;
background-size: auto 20px;
background-position: 0px 2px;
}
}
}

5
app/models/service.py
View File

@@ -289,7 +289,10 @@ class Service():
@cached_property
def all_template_folders(self):
return template_folder_api_client.get_template_folders(self.id)
return sorted(
template_folder_api_client.get_template_folders(self.id),
key=lambda folder: folder['name'].lower(),
)
@cached_property
def all_template_folder_ids(self):

2
app/templates/views/templates/_template_list.html
View File

@@ -10,7 +10,7 @@
value=template_folder.id,
) }}
{% endif %}
<h2 class="message-name">
<h2 class="message-name template-list-folder">
<a href="{{ url_for('.choose_template', service_id=current_service.id, template_type=template_type, template_folder_id=template_folder.id) }}">
{{ template_folder.name }}
</a>

4
tests/app/main/views/test_template_folders.py
View File

@@ -133,10 +133,10 @@ def test_should_show_templates_folder_page(
):
mock_get_template_folders.return_value = [
{'id': PARENT_FOLDER_ID, 'name': 'folder_one', 'parent_id': None},
{'id': str(uuid.uuid4()), 'name': 'folder_two', 'parent_id': None},
{'id': CHILD_FOLDER_ID, 'name': 'folder_one_one', 'parent_id': PARENT_FOLDER_ID},
{'id': PARENT_FOLDER_ID, 'name': 'folder_one', 'parent_id': None},
{'id': str(uuid.uuid4()), 'name': 'folder_one_two', 'parent_id': PARENT_FOLDER_ID},
{'id': CHILD_FOLDER_ID, 'name': 'folder_one_one', 'parent_id': PARENT_FOLDER_ID},
]
service_one['permissions'] += ['letter', 'edit_folders']

4
tests/app/main/views/test_templates.py
View File

@@ -252,10 +252,10 @@ def test_should_show_radio_buttons_for_move_destination(
assert radios == page.select('input[name=move_to]')
assert [x['value'] for x in radios] == [
PARENT_FOLDER_ID, FOLDER_TWO_ID, CHILD_FOLDER_ID, FOLDER_ONE_TWO_ID
PARENT_FOLDER_ID, CHILD_FOLDER_ID, FOLDER_ONE_TWO_ID, FOLDER_TWO_ID,
]
assert [x.text.strip() for x in labels] == [
'folder_one', 'folder_two', 'folder_one_one', 'folder_one_two'
'folder_one', 'folder_one_one', 'folder_one_two', 'folder_two',
]
assert page.select_one('button[name=operation]')['value'] == 'move'