Commit c69b6659 authored by Lisa Seeto's avatar Lisa Seeto Committed by Robert Lyon

Bug 1756182: delete icon not needed for primary email address

delete button for email will not be created if it is the primary email address
updated css, tpl files to reflect new design changes

behatnotneeded

Change-Id: I48d44293d5c6519a7eaaa275dda902126029054e
Signed-off-by: 's avatarLisa Seeto <lisaseeto@catalyst.net.nz>
parent e0993914
......@@ -101,17 +101,31 @@
// see emaillist.tpl
.email-list {
padding-bottom: 20px;
margin-top: 20px;
display: block;
.validation-message {
padding: 8px 0 15px 15px
.description:not(.html) {
padding: 4px 0 0 18px
}
.stacked-label {
width: auto;
margin-right: 10px;
vertical-align: super;
}
.unvalidated, .unsent, .validated {
margin-top: 20px;
&:last-of-type {
margin-bottom: 20px;
}
+ .input-group {
margin: 20px 0;
}
}
@include media-breakpoint-up(md) {
display: inline-block;
width: 420px;
min-width: 400px;
}
@include media-breakpoint-up(xl) {
width: 500px;
min-width: 500px;
}
}
......
......@@ -33,14 +33,14 @@
else {
var email = newEmail;
jQuery('#{{$name}}_list').append(jQuery('<div>', {'class': 'unsent'}).append(
jQuery('<input>', {'type': 'radio', 'class': 'text-inline', 'disabled':'true'}),
jQuery('<input>', {'type': 'hidden', 'name': '{{$name}}_unsent[]' , 'value': email}),
' ',
jQuery('<span>', {'class': 'pseudolabel no-radio'}).append(email),' ',
jQuery('<button>', {'class': 'btn btn-secondary btn-sm', 'onclick': '{{$name}}_remove(this); return false'}).append(
jQuery('<span>', {'class': 'icon icon-times left icon-lg text-danger', 'role': 'presentation'}),
jQuery('<span>', {'text': '{{str tag=delete}}'})
jQuery('<span>', {'class': 'pseudolabel'}).append(email),' ',
jQuery('<button>', {'class': 'btn btn-secondary btn-sm float-right', 'onclick': '{{$name}}_remove(this); return false'}).append(
jQuery('<span>', {'class': 'icon icon-trash icon-lg text-danger', 'role': 'presentation'})
),
jQuery('<div>', {'class': 'clearfix metadata validation-message'}).append({{$validationemailstr|safe}})
jQuery('<div>', {'class': 'clearfix description'}).append({{$validationemailstr|safe}})
));
if (typeof formchangemanager !== 'undefined') {
var form = jQuery(this).closest('form')[0];
......@@ -107,23 +107,24 @@
<label for="{{$name}}_radio_{{$i}}" class="stacked-label">
<span class="accessible-hidden sr-only">{{$title}}: </span>{{$email}}
</label>
<button class="btn btn-secondary btn-sm" onclick="{{$name}}_remove(this); return false;" title="{{str tag=delete}}">
{{if $email != $default}}
<button class="btn btn-secondary btn-sm float-right" onclick="{{$name}}_remove(this); return false;" title="{{str tag=delete}}">
<span class="icon icon-trash icon-lg text-danger" role="presentation" aria-hidden="true"></span>
<span class="sr-only">{{str tag=delete}}</span>
</button>
{{/if}}
</div>
{{/foreach}}
{{foreach from=$unvalidated item=email}}
<div class="unvalidated">
<input type="radio" class="text-inline" disabled>
<input type="hidden" name="{{$name}}_invalid[]" value="{{$email}}">
<span class="stacked-label no-radio">
<span class="stacked-label">
{{$email}}
</span>
<button class="btn btn-secondary btn-sm" onclick="{{$name}}_remove(this); return false;" title="{{str tag=delete}}">
<span class="icon icon-trash left icon-lg text-danger" role="presentation" aria-hidden="true"></span>
<span class="sr-only">{{str tag=delete}}</span>
<button class="btn btn-secondary btn-sm float-right" onclick="{{$name}}_remove(this); return false;" title="{{str tag=delete}}">
<span class="icon icon-trash icon-lg text-danger" role="presentation" aria-hidden="true"></span>
</button>
<span class="message">{{str tag=validationemailsent section=artefact.internal}}</span>
<div class="description">{{str tag=validationemailsent section=artefact.internal}}</div>
</div>
{{/foreach}}
</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment