Merge lp:~maxiberta/canonical-identity-provider/reorder-device-actions into lp:canonical-identity-provider/release

Proposed by Maximiliano Bertacchini
Status: Merged
Approved by: Maximiliano Bertacchini
Approved revision: no longer in the source branch.
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: lp:~maxiberta/canonical-identity-provider/reorder-device-actions
Merge into: lp:canonical-identity-provider/release
Diff against target: 18 lines (+3/-3)
1 file modified
src/webui/templates/device/list.html (+3/-3)
To merge this branch: bzr merge lp:~maxiberta/canonical-identity-provider/reorder-device-actions
Reviewer Review Type Date Requested Status
Daniel Manrique (community) Approve
Review via email: mp+379477@code.launchpad.net

Commit message

Reorder authentication device actions to improve visual alignment.

Description of the change

Also, change "View Codes" into "View codes" to match the general capitalization style of other text.

To post a comment you must log in.
Revision history for this message
Daniel Manrique (roadmr) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/webui/templates/device/list.html'
2--- src/webui/templates/device/list.html 2020-01-22 12:52:26 +0000
3+++ src/webui/templates/device/list.html 2020-02-19 15:20:11 +0000
4@@ -31,11 +31,11 @@
5 <td class="name" data-qa-id="device_name">{{ device.name }}</td>
6 <td class="u-align-text--right">
7 <ul class="p-inline-list u-no-margin--bottom">
8+ {% if device.device_type == 'paper' %}
9+ <li class="p-inline-list__item"><a href="{% url 'device-print' device.id %}" data-qa-id="print_device">{% trans "View codes" %}</a></li>
10+ {% endif %}
11 <li class="p-inline-list__item"><a href="{% url 'device-rename' device.id %}" data-qa-id="rename_device">{% trans "Rename" %}</a></li>
12 <li class="p-inline-list__item"><a href="{% url 'device-removal' device.id %}" data-qa-id="delete_device">{% trans "Delete" %}</a></li>
13- {% if device.device_type == 'paper' %}
14- <li class="p-inline-list__item"><a href="{% url 'device-print' device.id %}" data-qa-id="print_device">{% trans "View Codes" %}</a></li>
15- {% endif %}
16 </ul>
17 </td>
18 </tr>