Commit 184fa11e authored by Athina Bekakou's avatar Athina Bekakou Committed by Giorgos Korfiatis

admin-ui: Fix modal for 'modify e-mail' action

parent 4466e5df
...@@ -132,7 +132,7 @@ snf = { ...@@ -132,7 +132,7 @@ snf = {
var chunks = email.split(" "); var chunks = email.split(" ");
if (chunks.length == 1) { if (chunks.length == 1) {
return (reg.test(email) || lt_gt_reg.test(email)) return (reg.test(email) || lt_gt_reg.test(email));
} else { } else {
chunk = chunks[chunks.length - 1]; chunk = chunks[chunks.length - 1];
return lt_gt_reg.test(chunk); return lt_gt_reg.test(chunk);
...@@ -203,12 +203,14 @@ snf = { ...@@ -203,12 +203,14 @@ snf = {
'<dl class="dl-horizontal info-list" data-itemid=<%= id %>> \ '<dl class="dl-horizontal info-list" data-itemid=<%= id %>> \
<dt>Name:</dt><dd><%= name %></dd> \ <dt>Name:</dt><dd><%= name %></dd> \
<dt>ID:</dt><dd><%= id %></dd> \ <dt>ID:</dt><dd><%= id %></dd> \
</dl> \
<dl class="dl-horizontal info-list with-inputs"> \
<dt>New e-mail:</dt> \ <dt>New e-mail:</dt> \
<dd> \ <dd> \
<input placeholder="new e-mail" class="new-email" name="new_email" \ <input placeholder="new e-mail" class="new-email" name="new_email"> \
<a data-error="invalid-email" data-toggle="popover" data-trigger="hover" class="error-sign snf-exclamation-sign" href="#" rel="tooltip" data-content="Invalid e&#8209mail address."></a> \ <a data-error="invalid-email" data-toggle="popover" data-trigger="hover" class="error-sign snf-exclamation-sign" href="#" rel="tooltip" data-content="Invalid e&#8209mail address."></a> \
</dd> \ </dd> \
<dl>', </dl>',
removeLogLine: removeLogLine:
'<a href="" class="remove-icon remove-log" title="Remove this line">X</a>', '<a href="" class="remove-icon remove-log" title="Remove this line">X</a>',
notifyPending: notifyPending:
......
...@@ -127,7 +127,7 @@ $(document).ready(function() { ...@@ -127,7 +127,7 @@ $(document).ready(function() {
function resetItemInfo(modal) { function resetItemInfo(modal) {
var $modal = $(modal); var $modal = $(modal);
$modal.find('.summary .info-list').remove(); $modal.find('.summary dl').remove();
} }
function drawModalSingleItem(modalID, itemName, itemID) { function drawModalSingleItem(modalID, itemName, itemID) {
......
...@@ -187,13 +187,11 @@ p.progress-area { ...@@ -187,13 +187,11 @@ p.progress-area {
font-size: 20px; font-size: 20px;
margin-left: 10px; margin-left: 10px;
position: absolute; position: absolute;
// right: 8px;
top: 6px; top: 6px;
display: none; display: none;
&:hover, &:hover,
&:focus{ &:focus{
color: red; color: red;
// color:#A80A0A;
text-decoration: none; text-decoration: none;
} }
} }
...@@ -214,15 +212,27 @@ p.progress-area { ...@@ -214,15 +212,27 @@ p.progress-area {
.table-selected { .table-selected {
th,td { th,td {
word-break: break-word; word-break: break-word;
&.td-with-input { vertical-align: middle;
width: 250px;
}
} }
td:last-child { td:last-child {
.wrap { .wrap {
padding-right: 36px; padding-right: 36px;
} }
} }
td.td-with-input {
width: 250px;
.remove {
top: 14px;
}
.error-sign {
margin-left: 6px;
right: -25px;
top: 13px;
}
input {
vertical-align: middle;
}
}
tr:nth-child(2n){ tr:nth-child(2n){
background: darken(#fff, 5%); background: darken(#fff, 5%);
} }
...@@ -238,7 +248,6 @@ p.progress-area { ...@@ -238,7 +248,6 @@ p.progress-area {
color: red; color: red;
} }
} }
.remove { .remove {
position: absolute; position: absolute;
right: 14px; right: 14px;
...@@ -248,15 +257,20 @@ p.progress-area { ...@@ -248,15 +257,20 @@ p.progress-area {
text-decoration: none; text-decoration: none;
} }
} }
.new-email {
&+.error-sign {
right: -25px;
top: 10px;
}
}
} }
.info-list dd {
position: relative; .with-inputs {
} margin-top: 10px;
dt, dd {
position: relative;
height: 34px;
line-height: 34px;
input {
max-width: 272px;
line-height: normal;
vertical-align: middle;
}
}
}
} }
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