More compact view
This commit is contained in:
1 parent
c9263b1cfb
commit
0c83ed8fa7
9 files changed
+233
-113
No files matched your search
@@ -31,8 +31,8 @@
|
||||
|
||||
return _.unique(emails);
|
||||
}
|
||||
function renderAlert(msg, cssClass) {
|
||||
return nunjucks.render('alert.html', {'msg': msg, 'cssClass': cssClass});
|
||||
function renderAlert(msg, alertClass, iconClass) {
|
||||
return nunjucks.render('alert.html', {'msg': msg, 'alertClass': alertClass, 'iconClass': iconClass});
|
||||
}
|
||||
|
||||
|
||||
@@ -72,7 +72,7 @@
|
||||
var prefix = $('.new-list .prefix-select .active').attr('data-value');
|
||||
new_list_name = 'NY: ' + prefix + new_list_name + "@studentersamfundet.no";
|
||||
}
|
||||
$('.new-list .panel-heading').text(new_list_name);
|
||||
$('.js-new-list-preview').text(new_list_name);
|
||||
});
|
||||
/* Prefix select */
|
||||
$('.new-list .prefix-select a').on('click', function() {
|
||||
@@ -190,9 +190,9 @@
|
||||
var tbody = target.closest('tbody');
|
||||
var num_selected = tbody.find("[name=fwd-delete]:checked").length;
|
||||
if(num_selected > 0) {
|
||||
tbody.find('.btn-del').addClass('visible');
|
||||
tbody.find('.link-del').addClass('visible');
|
||||
} else {
|
||||
tbody.find('.btn-del').removeClass('visible');
|
||||
tbody.find('.link-del').removeClass('visible');
|
||||
}
|
||||
}
|
||||
/* Delete selected */
|
||||
@@ -220,16 +220,17 @@
|
||||
$('[data-list-name="'+list_name+'"] .result-alert').html(renderAlert('Kunne ikke fjerne epostaliaser', 'danger'));
|
||||
});
|
||||
}
|
||||
else if( target.hasClass('js-toggle-email-textarea')) {
|
||||
e.preventDefault();
|
||||
var row = target.closest('tbody').find('.textarea-row');
|
||||
row.toggleClass('visible');
|
||||
}
|
||||
/* Add new */
|
||||
else if( target.hasClass('js-new-email') ) {
|
||||
// TODO not working
|
||||
var email_field = target.parent().parent().find('[name=new-email]');
|
||||
console.log(email_field);
|
||||
if(email_field.get(0).checkValidity() === false) {
|
||||
return true;
|
||||
}
|
||||
e.preventDefault();
|
||||
console.log(email_field.val());
|
||||
// TODO refactor logic from new list and add here
|
||||
} else {
|
||||
//console.log(target);
|
||||
}
|
||||
});
|
||||
/* New list toggle display */
|
||||
|
||||
@@ -18,6 +18,9 @@ $icon-font-path: "../fonts/";
|
||||
display: block;
|
||||
}
|
||||
}
|
||||
.orgunit-list {
|
||||
margin-bottom: 40px;
|
||||
}
|
||||
|
||||
/* Sidebar navigation */
|
||||
.nav-sidebar > .active > a,
|
||||
@@ -28,30 +31,15 @@ $icon-font-path: "../fonts/";
|
||||
}
|
||||
|
||||
/* Sticky footer styles */
|
||||
html {
|
||||
position: relative;
|
||||
min-height: 100%;
|
||||
}
|
||||
body {
|
||||
/* Margin bottom by footer height */
|
||||
margin-bottom: 100px;
|
||||
}
|
||||
|
||||
.footer {
|
||||
position: absolute;
|
||||
bottom: 0;
|
||||
width: 100%;
|
||||
/* Set the fixed height of the footer here */
|
||||
height: 100px;
|
||||
background-color: #f5f5f5;
|
||||
padding-top: 20px;
|
||||
margin-top: 40px;
|
||||
}
|
||||
|
||||
/* Lists */
|
||||
.del-header {
|
||||
.del-cell {
|
||||
text-align: center;
|
||||
width: 82px;
|
||||
}
|
||||
.del-cell {
|
||||
padding: 0 !important;
|
||||
}
|
||||
.del-label {
|
||||
@@ -65,16 +53,10 @@ body {
|
||||
top: 6px;
|
||||
}
|
||||
}
|
||||
.btn-del {
|
||||
display: none;
|
||||
&.visible {
|
||||
display: block;
|
||||
}
|
||||
}
|
||||
.forwards-container table > thead > tr > th:first-child,
|
||||
.forwards-container table > tbody > tr > td:first-child
|
||||
{
|
||||
|
||||
.forwards-container table > tbody > tr > td:first-child {
|
||||
padding-left: 16px;
|
||||
padding-right: 16px;
|
||||
}
|
||||
.forwards-container .badge {
|
||||
float: right;
|
||||
@@ -93,9 +75,78 @@ body {
|
||||
float: right;
|
||||
margin-top: 10px;
|
||||
}
|
||||
/* Forward list */
|
||||
.panel-heading {
|
||||
font-weight: bold;
|
||||
font-size: 16px;
|
||||
}
|
||||
.icon-faded {
|
||||
font-size: 14px;
|
||||
color: #ccc;
|
||||
margin-right: 4px;
|
||||
top: 2px;
|
||||
}
|
||||
.forwards-container table > tbody > tr.action-row > td:first-child,
|
||||
.table-condensed > tbody > tr.action-row > td {
|
||||
padding: 0;
|
||||
}
|
||||
.fwdlist tr:nth-child(even) > td {
|
||||
background-color: #f5f5f5;
|
||||
}
|
||||
.action-row {
|
||||
.link-add {
|
||||
display: block;
|
||||
}
|
||||
.link-del {
|
||||
display: none;
|
||||
&.visible {
|
||||
display: block;
|
||||
}
|
||||
}
|
||||
a {
|
||||
padding: 10px;
|
||||
padding-left: 16px;
|
||||
&:hover {
|
||||
background-color: #f5f5f5;
|
||||
}
|
||||
}
|
||||
textarea {
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
}
|
||||
.textarea-row {
|
||||
display: none;
|
||||
td {
|
||||
padding-right: 16px;
|
||||
}
|
||||
&.visible {
|
||||
display: table-row;
|
||||
}
|
||||
.btn-add-list {
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
}
|
||||
/* Responsive fixes */
|
||||
@media(max-width: $screen-xs-max){
|
||||
@media(max-width: 500px){
|
||||
.panel-heading {
|
||||
font-size: 13px;
|
||||
font-weight: bold;
|
||||
}
|
||||
.panel-heading .icon-faded {
|
||||
display: none;
|
||||
}
|
||||
td {
|
||||
font-size: 13px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.love {
|
||||
color: #faafba;
|
||||
}
|
||||
.credits {
|
||||
margin-top: 25px;
|
||||
margin-bottom: 25px;
|
||||
text-align: center;
|
||||
color: #666;
|
||||
font-size: 12px;
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
<div class="alert alert-{{ cssClass }}">
|
||||
<div class="alert alert-{{ alertClass }}">
|
||||
<a class="close" data-dismiss="alert">×</a>
|
||||
{{ msg }}
|
||||
{% if iconClass %}<span class="glyphicon glyphicon-{{ iconClass }}"></span> {% endif %}{{ msg }}
|
||||
</div>
|
||||
@@ -1,24 +1,27 @@
|
||||
{% for list,members in lists %}
|
||||
<div class="fwdlist" data-list-name="{{ list }}">
|
||||
<div class="panel panel-default">
|
||||
<div class="panel-heading">{{ list }} <span class="badge">{{members|length}}</span></div>
|
||||
<table class="table table-striped table-condensed">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Medlem</th>
|
||||
<th class="del-header">Velg</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<div class="panel-heading"><span class="glyphicon glyphicon-list-alt icon-faded" aria-hidden="true"></span> {{ list }} <span class="badge">{{members|length}}</span></div>
|
||||
<table class="table table-condensed">
|
||||
<tbody>
|
||||
{% for member in members %}
|
||||
<tr><td>{{ member.forward }}</td><td class="del-cell"><label class="del-label" for="{{ member.dest }}={{ member.forward }}"><input id="{{ member.dest }}={{ member.forward }}" type="checkbox" name='fwd-delete' value="{{ member.dest }}={{ member.forward }}"></label></td></tr>
|
||||
{% endfor %}
|
||||
<tr><td>
|
||||
<form><div class="input-group">
|
||||
<input type="email" name="new-email" class="form-control">
|
||||
<span class="input-group-btn"><button class="btn btn-default js-new-email" type="button"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Legg til</button></span>
|
||||
</div></form>
|
||||
</td><td><button class="btn btn-default btn-del js-del-selected" type="button" data-delete-list-name="{{ list }}"><span class="glyphicon glyphicon-remove" aria-hidden="true"></span> Slett</button></td></tr>
|
||||
<tr class="action-row">
|
||||
<td>
|
||||
<a href="#" class="link-add js-toggle-email-textarea"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Legg til</a></span>
|
||||
</td>
|
||||
<td>
|
||||
<a href="#" class="link-del js-del-selected" type="button" data-delete-list-name="{{ list }}"><span class="glyphicon glyphicon-remove" aria-hidden="true"></span> Slett</a>
|
||||
</td>
|
||||
</tr>
|
||||
<tr class="textarea-row">
|
||||
<td colspan="2">
|
||||
<h4>Eposter <span class="badge email-counter"></span></h4>
|
||||
<textarea class="form-control js-add-list-textarea" data-list-name="{{ list }}" placeholder="asdf@studentersamfundet.no, qwerty@studentersamfundet.no f.eks. Klipp og lim så mye du orker" rows="4"></textarea>
|
||||
<button type="button" class="btn btn-primary btn-add-list js-new-email"><span class="glyphicon glyphicon-plus js-new-email" aria-hidden="true"></span> Opprett liste</button>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
<div class="result-alert"></div>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<div class="panel panel-default">
|
||||
<div class="panel-heading">Ny liste</div>
|
||||
<div class="panel-heading"><span class="glyphicon glyphicon-list-alt icon-faded" aria-hidden="true"></span> <span class="js-new-list-preview">Ny liste</span></div>
|
||||
<div class="panel-body">
|
||||
<div class="input-group">
|
||||
<span class="input-group-btn">
|
||||
@@ -15,6 +15,6 @@
|
||||
</div>
|
||||
<h4>Eposter <span class="badge email-counter"></span></h4>
|
||||
<textarea class="form-control" placeholder="asdf@studentersamfundet.no, qwerty@studentersamfundet.no f.eks. Klipp og lim så mye du orker" rows="4"></textarea>
|
||||
<button type="button" class="btn btn-primary btn-add-list js-add-list"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Opprett liste</button>
|
||||
<button type="button" class="btn btn-primary btn-add-list js-add-list"><span class="glyphicon glyphicon-plus js-add-list" aria-hidden="true"></span> Opprett liste</button>
|
||||
</div>
|
||||
</div>
|
||||
+13
-12
@@ -31,8 +31,8 @@
|
||||
|
||||
return _.unique(emails);
|
||||
}
|
||||
function renderAlert(msg, cssClass) {
|
||||
return nunjucks.render('alert.html', {'msg': msg, 'cssClass': cssClass});
|
||||
function renderAlert(msg, alertClass, iconClass) {
|
||||
return nunjucks.render('alert.html', {'msg': msg, 'alertClass': alertClass, 'iconClass': iconClass});
|
||||
}
|
||||
|
||||
|
||||
@@ -72,7 +72,7 @@
|
||||
var prefix = $('.new-list .prefix-select .active').attr('data-value');
|
||||
new_list_name = 'NY: ' + prefix + new_list_name + "@studentersamfundet.no";
|
||||
}
|
||||
$('.new-list .panel-heading').text(new_list_name);
|
||||
$('.js-new-list-preview').text(new_list_name);
|
||||
});
|
||||
/* Prefix select */
|
||||
$('.new-list .prefix-select a').on('click', function() {
|
||||
@@ -190,9 +190,9 @@
|
||||
var tbody = target.closest('tbody');
|
||||
var num_selected = tbody.find("[name=fwd-delete]:checked").length;
|
||||
if(num_selected > 0) {
|
||||
tbody.find('.btn-del').addClass('visible');
|
||||
tbody.find('.link-del').addClass('visible');
|
||||
} else {
|
||||
tbody.find('.btn-del').removeClass('visible');
|
||||
tbody.find('.link-del').removeClass('visible');
|
||||
}
|
||||
}
|
||||
/* Delete selected */
|
||||
@@ -220,16 +220,17 @@
|
||||
$('[data-list-name="'+list_name+'"] .result-alert').html(renderAlert('Kunne ikke fjerne epostaliaser', 'danger'));
|
||||
});
|
||||
}
|
||||
else if( target.hasClass('js-toggle-email-textarea')) {
|
||||
e.preventDefault();
|
||||
var row = target.closest('tbody').find('.textarea-row');
|
||||
row.toggleClass('visible');
|
||||
}
|
||||
/* Add new */
|
||||
else if( target.hasClass('js-new-email') ) {
|
||||
// TODO not working
|
||||
var email_field = target.parent().parent().find('[name=new-email]');
|
||||
console.log(email_field);
|
||||
if(email_field.get(0).checkValidity() === false) {
|
||||
return true;
|
||||
}
|
||||
e.preventDefault();
|
||||
console.log(email_field.val());
|
||||
// TODO refactor logic from new list and add here
|
||||
} else {
|
||||
//console.log(target);
|
||||
}
|
||||
});
|
||||
/* New list toggle display */
|
||||
|
||||
+21
-11
@@ -4,8 +4,14 @@ var colno = null;
|
||||
var output = "";
|
||||
try {
|
||||
output += "<div class=\"alert alert-";
|
||||
output += runtime.suppressValue(runtime.contextOrFrameLookup(context, frame, "cssClass"), env.autoesc);
|
||||
output += runtime.suppressValue(runtime.contextOrFrameLookup(context, frame, "alertClass"), env.autoesc);
|
||||
output += "\">\n\t<a class=\"close\" data-dismiss=\"alert\">×</a>\n\t";
|
||||
if(runtime.contextOrFrameLookup(context, frame, "iconClass")) {
|
||||
output += "<span class=\"glyphicon glyphicon-";
|
||||
output += runtime.suppressValue(runtime.contextOrFrameLookup(context, frame, "iconClass "), env.autoesc);
|
||||
output += "\"></span> ";
|
||||
;
|
||||
}
|
||||
output += runtime.suppressValue(runtime.contextOrFrameLookup(context, frame, "msg"), env.autoesc);
|
||||
output += "\n</div>";
|
||||
cb(null, output);
|
||||
@@ -44,11 +50,11 @@ frame.set("loop.last", t_1 === t_2 - 1);
|
||||
frame.set("loop.length", t_2);
|
||||
output += "\n<div class=\"fwdlist\" data-list-name=\"";
|
||||
output += runtime.suppressValue(t_4, env.autoesc);
|
||||
output += "\">\n\t<div class=\"panel panel-default\">\n\t <div class=\"panel-heading\">";
|
||||
output += "\">\n\t<div class=\"panel panel-default\">\n\t <div class=\"panel-heading\"><span class=\"glyphicon glyphicon-list-alt icon-faded\" aria-hidden=\"true\"></span> ";
|
||||
output += runtime.suppressValue(t_4, env.autoesc);
|
||||
output += " <span class=\"badge\">";
|
||||
output += runtime.suppressValue(env.getFilter("length").call(context, t_5), env.autoesc);
|
||||
output += "</span></div>\n\t\t<table class=\"table table-striped table-condensed\">\n\t\t\t<thead>\n\t\t <tr>\n\t\t\t <th>Medlem</th>\n\t\t\t <th class=\"del-header\">Velg</th>\n\t\t </tr>\n\t </thead>\n\t <tbody>\n\t\t\t";
|
||||
output += "</span></div>\n\t\t<table class=\"table table-condensed\">\n\t <tbody>\n\t\t\t";
|
||||
frame = frame.push();
|
||||
var t_8 = t_5;
|
||||
if(t_8) {var t_7 = t_8.length;
|
||||
@@ -81,9 +87,11 @@ output += "\"></label></td></tr>\n\t\t\t";
|
||||
}
|
||||
}
|
||||
frame = frame.pop();
|
||||
output += "\n\t\t\t\t<tr><td>\n\t\t\t\t<form><div class=\"input-group\">\n\t\t\t\t\t<input type=\"email\" name=\"new-email\" class=\"form-control\">\n\t\t\t\t\t<span class=\"input-group-btn\"><button class=\"btn btn-default js-new-email\" type=\"button\"><span class=\"glyphicon glyphicon-plus\" aria-hidden=\"true\"></span> Legg til</button></span>\n\t\t\t\t</div></form>\n\t\t\t\t</td><td><button class=\"btn btn-default btn-del js-del-selected\" type=\"button\" data-delete-list-name=\"";
|
||||
output += "\n\t\t\t\t<tr class=\"action-row\">\n\t\t\t\t<td>\n\t\t\t\t\t<a href=\"#\" class=\"link-add js-toggle-email-textarea\"><span class=\"glyphicon glyphicon-plus\" aria-hidden=\"true\"></span> Legg til</a></span>\n\t\t\t\t</td>\n\t\t\t\t<td>\n\t\t\t\t\t<a href=\"#\" class=\"link-del js-del-selected\" type=\"button\" data-delete-list-name=\"";
|
||||
output += runtime.suppressValue(t_4, env.autoesc);
|
||||
output += "\"><span class=\"glyphicon glyphicon-remove\" aria-hidden=\"true\"></span> Slett</button></td></tr>\n\t\t\t</tbody>\n\t\t</table>\n\t\t<div class=\"result-alert\"></div>\n\t</div>\n</div>\n";
|
||||
output += "\"><span class=\"glyphicon glyphicon-remove\" aria-hidden=\"true\"></span> Slett</a>\n\t\t\t\t</td>\n\t\t\t\t</tr>\n\t\t\t\t<tr class=\"textarea-row\">\n\t\t\t\t<td colspan=\"2\">\n\t\t\t\t\t<h4>Eposter <span class=\"badge email-counter\"></span></h4>\n \t\t\t\t<textarea class=\"form-control js-add-list-textarea\" data-list-name=\"";
|
||||
output += runtime.suppressValue(t_4, env.autoesc);
|
||||
output += "\" placeholder=\"asdf@studentersamfundet.no, qwerty@studentersamfundet.no f.eks. Klipp og lim så mye du orker\" rows=\"4\"></textarea>\n \t\t\t\t<button type=\"button\" class=\"btn btn-primary btn-add-list js-new-email\"><span class=\"glyphicon glyphicon-plus js-new-email\" aria-hidden=\"true\"></span> Opprett liste</button>\n \t\t\t</td>\n \t\t\t</tr>\n\t\t\t</tbody>\n\t\t</table>\n\t\t<div class=\"result-alert\"></div>\n\t</div>\n</div>\n";
|
||||
;
|
||||
}
|
||||
} else {
|
||||
@@ -103,11 +111,11 @@ frame.set("loop.last", t_1 === t_2 - 1);
|
||||
frame.set("loop.length", t_2);
|
||||
output += "\n<div class=\"fwdlist\" data-list-name=\"";
|
||||
output += runtime.suppressValue(t_10, env.autoesc);
|
||||
output += "\">\n\t<div class=\"panel panel-default\">\n\t <div class=\"panel-heading\">";
|
||||
output += "\">\n\t<div class=\"panel panel-default\">\n\t <div class=\"panel-heading\"><span class=\"glyphicon glyphicon-list-alt icon-faded\" aria-hidden=\"true\"></span> ";
|
||||
output += runtime.suppressValue(t_10, env.autoesc);
|
||||
output += " <span class=\"badge\">";
|
||||
output += runtime.suppressValue(env.getFilter("length").call(context, t_11), env.autoesc);
|
||||
output += "</span></div>\n\t\t<table class=\"table table-striped table-condensed\">\n\t\t\t<thead>\n\t\t <tr>\n\t\t\t <th>Medlem</th>\n\t\t\t <th class=\"del-header\">Velg</th>\n\t\t </tr>\n\t </thead>\n\t <tbody>\n\t\t\t";
|
||||
output += "</span></div>\n\t\t<table class=\"table table-condensed\">\n\t <tbody>\n\t\t\t";
|
||||
frame = frame.push();
|
||||
var t_14 = t_11;
|
||||
if(t_14) {var t_13 = t_14.length;
|
||||
@@ -140,9 +148,11 @@ output += "\"></label></td></tr>\n\t\t\t";
|
||||
}
|
||||
}
|
||||
frame = frame.pop();
|
||||
output += "\n\t\t\t\t<tr><td>\n\t\t\t\t<form><div class=\"input-group\">\n\t\t\t\t\t<input type=\"email\" name=\"new-email\" class=\"form-control\">\n\t\t\t\t\t<span class=\"input-group-btn\"><button class=\"btn btn-default js-new-email\" type=\"button\"><span class=\"glyphicon glyphicon-plus\" aria-hidden=\"true\"></span> Legg til</button></span>\n\t\t\t\t</div></form>\n\t\t\t\t</td><td><button class=\"btn btn-default btn-del js-del-selected\" type=\"button\" data-delete-list-name=\"";
|
||||
output += "\n\t\t\t\t<tr class=\"action-row\">\n\t\t\t\t<td>\n\t\t\t\t\t<a href=\"#\" class=\"link-add js-toggle-email-textarea\"><span class=\"glyphicon glyphicon-plus\" aria-hidden=\"true\"></span> Legg til</a></span>\n\t\t\t\t</td>\n\t\t\t\t<td>\n\t\t\t\t\t<a href=\"#\" class=\"link-del js-del-selected\" type=\"button\" data-delete-list-name=\"";
|
||||
output += runtime.suppressValue(t_10, env.autoesc);
|
||||
output += "\"><span class=\"glyphicon glyphicon-remove\" aria-hidden=\"true\"></span> Slett</button></td></tr>\n\t\t\t</tbody>\n\t\t</table>\n\t\t<div class=\"result-alert\"></div>\n\t</div>\n</div>\n";
|
||||
output += "\"><span class=\"glyphicon glyphicon-remove\" aria-hidden=\"true\"></span> Slett</a>\n\t\t\t\t</td>\n\t\t\t\t</tr>\n\t\t\t\t<tr class=\"textarea-row\">\n\t\t\t\t<td colspan=\"2\">\n\t\t\t\t\t<h4>Eposter <span class=\"badge email-counter\"></span></h4>\n \t\t\t\t<textarea class=\"form-control js-add-list-textarea\" data-list-name=\"";
|
||||
output += runtime.suppressValue(t_10, env.autoesc);
|
||||
output += "\" placeholder=\"asdf@studentersamfundet.no, qwerty@studentersamfundet.no f.eks. Klipp og lim så mye du orker\" rows=\"4\"></textarea>\n \t\t\t\t<button type=\"button\" class=\"btn btn-primary btn-add-list js-new-email\"><span class=\"glyphicon glyphicon-plus js-new-email\" aria-hidden=\"true\"></span> Opprett liste</button>\n \t\t\t</td>\n \t\t\t</tr>\n\t\t\t</tbody>\n\t\t</table>\n\t\t<div class=\"result-alert\"></div>\n\t</div>\n</div>\n";
|
||||
;
|
||||
}
|
||||
}
|
||||
@@ -165,7 +175,7 @@ var lineno = null;
|
||||
var colno = null;
|
||||
var output = "";
|
||||
try {
|
||||
output += "<div class=\"panel panel-default\">\n <div class=\"panel-heading\">Ny liste</div>\n <div class=\"panel-body\">\n \t<div class=\"input-group\">\n\t\t<span class=\"input-group-btn\">\n\t\t\t<button type=\"button\" class=\"btn btn-default prefix-btn dropdown-toggle\" data-toggle=\"dropdown\" aria-expanded=\"false\">";
|
||||
output += "<div class=\"panel panel-default\">\n <div class=\"panel-heading\"><span class=\"glyphicon glyphicon-list-alt icon-faded\" aria-hidden=\"true\"></span> <span class=\"js-new-list-preview\">Ny liste</span></div>\n <div class=\"panel-body\">\n \t<div class=\"input-group\">\n\t\t<span class=\"input-group-btn\">\n\t\t\t<button type=\"button\" class=\"btn btn-default prefix-btn dropdown-toggle\" data-toggle=\"dropdown\" aria-expanded=\"false\">";
|
||||
output += runtime.suppressValue(runtime.memberLookup((runtime.memberLookup((runtime.contextOrFrameLookup(context, frame, "orgunits")),0, env.autoesc)),"prefix", env.autoesc), env.autoesc);
|
||||
output += "- <span class=\"caret\"></span></button>\n\t\t\t<ul class=\"dropdown-menu prefix-select\">\n\t\t\t";
|
||||
frame = frame.push();
|
||||
@@ -195,7 +205,7 @@ output += "-</a></li>\n\t\t\t";
|
||||
}
|
||||
}
|
||||
frame = frame.pop();
|
||||
output += "\n\t\t\t</ul>\n\t\t</span>\n\t\t<input type=\"text\" class=\"form-control js-new-list-name\">\n\t\t<span class=\"input-group-addon\">@studentersamfundet.no</span>\n\t</div>\n \t<h4>Eposter <span class=\"badge email-counter\"></span></h4>\n <textarea class=\"form-control\" placeholder=\"asdf@studentersamfundet.no, qwerty@studentersamfundet.no\" rows=\"4\"></textarea>\n <button type=\"button\" class=\"btn btn-primary btn-add-list js-add-list\"><span class=\"glyphicon glyphicon-plus\" aria-hidden=\"true\"></span> Opprett liste</button>\n </div>\n</div>";
|
||||
output += "\n\t\t\t</ul>\n\t\t</span>\n\t\t<input type=\"text\" class=\"form-control js-new-list-name\">\n\t\t<span class=\"input-group-addon\">@studentersamfundet.no</span>\n\t</div>\n \t<h4>Eposter <span class=\"badge email-counter\"></span></h4>\n <textarea class=\"form-control\" placeholder=\"asdf@studentersamfundet.no, qwerty@studentersamfundet.no f.eks. Klipp og lim så mye du orker\" rows=\"4\"></textarea>\n <button type=\"button\" class=\"btn btn-primary btn-add-list js-add-list\"><span class=\"glyphicon glyphicon-plus js-add-list\" aria-hidden=\"true\"></span> Opprett liste</button>\n </div>\n</div>";
|
||||
cb(null, output);
|
||||
;
|
||||
} catch (e) {
|
||||
|
||||
+83
-30
@@ -6534,6 +6534,10 @@ button.close {
|
||||
}
|
||||
}
|
||||
|
||||
.orgunit-list {
|
||||
margin-bottom: 40px;
|
||||
}
|
||||
|
||||
/* Sidebar navigation */
|
||||
.nav-sidebar > .active > a,
|
||||
.nav-sidebar > .active > a:hover,
|
||||
@@ -6543,33 +6547,14 @@ button.close {
|
||||
}
|
||||
|
||||
/* Sticky footer styles */
|
||||
html {
|
||||
position: relative;
|
||||
min-height: 100%;
|
||||
}
|
||||
|
||||
body {
|
||||
/* Margin bottom by footer height */
|
||||
margin-bottom: 100px;
|
||||
}
|
||||
|
||||
.footer {
|
||||
position: absolute;
|
||||
bottom: 0;
|
||||
width: 100%;
|
||||
/* Set the fixed height of the footer here */
|
||||
height: 100px;
|
||||
background-color: #f5f5f5;
|
||||
padding-top: 20px;
|
||||
margin-top: 40px;
|
||||
}
|
||||
|
||||
/* Lists */
|
||||
.del-header {
|
||||
.del-cell {
|
||||
text-align: center;
|
||||
width: 82px;
|
||||
}
|
||||
|
||||
.del-cell {
|
||||
padding: 0 !important;
|
||||
}
|
||||
|
||||
@@ -6585,16 +6570,9 @@ body {
|
||||
top: 6px;
|
||||
}
|
||||
|
||||
.btn-del {
|
||||
display: none;
|
||||
}
|
||||
.btn-del.visible {
|
||||
display: block;
|
||||
}
|
||||
|
||||
.forwards-container table > thead > tr > th:first-child,
|
||||
.forwards-container table > tbody > tr > td:first-child {
|
||||
padding-left: 16px;
|
||||
padding-right: 16px;
|
||||
}
|
||||
|
||||
.forwards-container .badge {
|
||||
@@ -6618,9 +6596,84 @@ body {
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
||||
/* Forward list */
|
||||
.panel-heading {
|
||||
font-weight: bold;
|
||||
font-size: 16px;
|
||||
}
|
||||
|
||||
.icon-faded {
|
||||
font-size: 14px;
|
||||
color: #ccc;
|
||||
margin-right: 4px;
|
||||
top: 2px;
|
||||
}
|
||||
|
||||
.forwards-container table > tbody > tr.action-row > td:first-child,
|
||||
.table-condensed > tbody > tr.action-row > td {
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.fwdlist tr:nth-child(even) > td {
|
||||
background-color: #f5f5f5;
|
||||
}
|
||||
|
||||
.action-row .link-add {
|
||||
display: block;
|
||||
}
|
||||
.action-row .link-del {
|
||||
display: none;
|
||||
}
|
||||
.action-row .link-del.visible {
|
||||
display: block;
|
||||
}
|
||||
.action-row a {
|
||||
padding: 10px;
|
||||
padding-left: 16px;
|
||||
}
|
||||
.action-row a:hover {
|
||||
background-color: #f5f5f5;
|
||||
}
|
||||
.action-row textarea {
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
|
||||
.textarea-row {
|
||||
display: none;
|
||||
}
|
||||
.textarea-row td {
|
||||
padding-right: 16px;
|
||||
}
|
||||
.textarea-row.visible {
|
||||
display: table-row;
|
||||
}
|
||||
.textarea-row .btn-add-list {
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
/* Responsive fixes */
|
||||
@media (max-width: 767px) {
|
||||
@media (max-width: 500px) {
|
||||
.panel-heading {
|
||||
font-size: 13px;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
.panel-heading .icon-faded {
|
||||
display: none;
|
||||
}
|
||||
|
||||
td {
|
||||
font-size: 13px;
|
||||
}
|
||||
}
|
||||
.love {
|
||||
color: #faafba;
|
||||
}
|
||||
|
||||
.credits {
|
||||
margin-top: 25px;
|
||||
margin-bottom: 25px;
|
||||
text-align: center;
|
||||
color: #666;
|
||||
font-size: 12px;
|
||||
}
|
||||
@@ -16,7 +16,8 @@
|
||||
{% block "body" %}{% endblock %}
|
||||
<footer class="footer">
|
||||
<div class="container">
|
||||
<a href="https://studentersamfundet.no"><img src="{% static 'dist/images/DNSlogo.png' %}" width="70" height="70"></a><!--<div class="credits">Laget med <span class="love" title="kærlighed">♥</span> av <a href="http://kak.studentersamfundet.no/" title="Kommunikasjonsavdelingen">KAK</a></div>-->
|
||||
<div class="credits"><p><a href="https://studentersamfundet.no" title="Det Norske Studentersamfund"><img src="{% static 'dist/images/DNSlogo.png' %}" width="70" height="70"></a></p>
|
||||
Laget med <span class="love" title="kærlighed">♥</span> av <a href="http://kak.studentersamfundet.no/" title="Kommunikasjonsavdelingen">KAK</a></div>
|
||||
|
||||
</div>
|
||||
</footer>
|
||||
|
||||
Reference in new issue
Block a user