mirror of
https://github.com/the-djmaze/snappymail.git
synced 2026-06-27 00:36:44 +03:00
Improved sieve filter editor with less pull-right
This commit is contained in:
djmaze
parent
54c2ba7b6e
commit
ac7370103e
8 changed files with 44 additions and 55 deletions
|
|
@ -13,9 +13,9 @@
|
|||
@import "../../vendors/bootstrap/less/button-groups.less";
|
||||
@import "../../vendors/bootstrap/less/alerts.less";
|
||||
@import "../../vendors/bootstrap/less/code.less";
|
||||
@import "../../vendors/bootstrap/less/utilities.less";
|
||||
@import "../../vendors/bootstrap/less/dropdowns.less";
|
||||
@import "../../vendors/bootstrap/less/navs.less";
|
||||
@import "../../vendors/bootstrap/less/utilities.less";
|
||||
|
||||
@import "_FontasticToBoot.less";
|
||||
@import "_BootstrapFix.less";
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ html.rl-no-preview-pane {
|
|||
|
||||
.checkboxCheckAll {
|
||||
cursor: pointer;
|
||||
margin: 0.5em 0.5em 0 0;
|
||||
margin: 0.45em 0.5em 0 0;
|
||||
}
|
||||
|
||||
.search-input-wrp {
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
</div>
|
||||
|
||||
<div class="legend" data-i18n="POPUPS_FILTER/LEGEND_CONDITIONS"></div>
|
||||
<div data-bind="visible: 1 < conditions().length">
|
||||
<div class="control-group" data-bind="visible: 1 < conditions().length">
|
||||
<select class="span4" data-bind="value: conditionsType">
|
||||
<option value="Any"
|
||||
data-i18n="POPUPS_FILTER/SELECT_MATCH_ANY"></option>
|
||||
|
|
@ -29,16 +29,21 @@
|
|||
</select>
|
||||
</div>
|
||||
<div data-bind="visible: 0 < conditions().length, foreach: conditions">
|
||||
<div data-bind="template: {'name': template(), 'data': $data}"></div>
|
||||
<div class="control-group" data-bind="css: {'error': valueError}" style="display:flex">
|
||||
<div style="flex-grow:1" data-bind="css: {'error': valueError}, template: {'name': template(), 'data': $data}"></div>
|
||||
<span class="delete-action button-delete fontastic" style="margin-top: 5px;"
|
||||
data-bind="click: function (oCondition) { $root.removeCondition(oCondition); }">🗑</span>
|
||||
</div>
|
||||
</div>
|
||||
<div data-bind="visible: 0 === conditions().length"
|
||||
<div class="control-group" data-bind="visible: 0 === conditions().length"
|
||||
data-i18n="POPUPS_FILTER/ALL_INCOMING_MESSAGES_DESC"></div>
|
||||
<br />
|
||||
<a class="btn" data-bind="click: addCondition, i18nInit: true">
|
||||
<i class="fontastic">✚</i>
|
||||
<span data-i18n="POPUPS_FILTER/BUTTON_ADD_CONDITION"></span>
|
||||
</a>
|
||||
<br />
|
||||
<div class="control-group">
|
||||
<a class="btn" data-bind="click: addCondition, i18nInit: true">
|
||||
<i class="fontastic">✚</i>
|
||||
<span data-i18n="POPUPS_FILTER/BUTTON_ADD_CONDITION"></span>
|
||||
</a>
|
||||
</div>
|
||||
|
||||
<div class="legend" data-i18n="POPUPS_FILTER/LEGEND_ACTIONS"></div>
|
||||
<select class="span3" data-bind="options: $root.actionTypeOptions, value: actionType, optionsText: 'name', optionsValue: 'id'"></select>
|
||||
<div data-bind="template: {'name': actionTemplate()}, i18nUpdate: actionTemplate"></div>
|
||||
|
|
|
|||
|
|
@ -1,10 +1,5 @@
|
|||
<div class="control-group" data-bind="css: {'error': valueError}" style="margin-bottom: 0">
|
||||
<select class="span3" data-bind="options: $root.fieldOptions, value: field, optionsText: 'name', optionsValue: 'id'"></select>
|
||||
|
||||
<select class="span2" data-bind="options: $root.typeOptionsBody, value: type, optionsText: 'name', optionsValue: 'id'"></select>
|
||||
|
||||
<input class="span3" type="text" data-bind="value: value" />
|
||||
|
||||
<span class="delete-action button-delete pull-right fontastic" style="margin-top: 5px;"
|
||||
data-bind="click: function (oCondition) { $root.removeCondition(oCondition); }">🗑</span>
|
||||
</div>
|
||||
<select class="span3" data-bind="options: $root.fieldOptions, value: field, optionsText: 'name', optionsValue: 'id'"></select>
|
||||
|
||||
<select class="span2" data-bind="options: $root.typeOptionsBody, value: type, optionsText: 'name', optionsValue: 'id'"></select>
|
||||
|
||||
<input class="span3" type="text" data-bind="value: value" />
|
||||
|
|
|
|||
|
|
@ -1,10 +1,5 @@
|
|||
<div class="control-group" data-bind="css: {'error': valueError}" style="margin-bottom: 0">
|
||||
<select class="span3" data-bind="options: $root.fieldOptions, value: field, optionsText: 'name', optionsValue: 'id'"></select>
|
||||
|
||||
<select class="span2" data-bind="options: $root.typeOptions, value: type, optionsText: 'name', optionsValue: 'id'"></select>
|
||||
|
||||
<input class="span3" type="text" data-bind="value: value" />
|
||||
|
||||
<span class="delete-action button-delete pull-right fontastic" style="margin-top: 5px;"
|
||||
data-bind="click: function (oCondition) { $root.removeCondition(oCondition); }">🗑</span>
|
||||
</div>
|
||||
<select class="span3" data-bind="options: $root.fieldOptions, value: field, optionsText: 'name', optionsValue: 'id'"></select>
|
||||
|
||||
<select class="span2" data-bind="options: $root.typeOptions, value: type, optionsText: 'name', optionsValue: 'id'"></select>
|
||||
|
||||
<input class="span3" type="text" data-bind="value: value" />
|
||||
|
|
|
|||
|
|
@ -1,12 +1,7 @@
|
|||
<div class="control-group" data-bind="css: {'error': valueError}" style="margin-bottom: 0">
|
||||
<select class="span2" data-bind="options: $root.fieldOptions, value: field, optionsText: 'name', optionsValue: 'id'"></select>
|
||||
|
||||
<input class="span2" type="text" data-bind="value: valueSecond" />
|
||||
|
||||
<select class="span2" data-bind="options: $root.typeOptions, value: type, optionsText: 'name', optionsValue: 'id'"></select>
|
||||
|
||||
<input class="span3" type="text" data-bind="value: value" />
|
||||
|
||||
<span class="delete-action button-delete pull-right fontastic" style="margin-top: 5px;"
|
||||
data-bind="click: function (oCondition) { $root.removeCondition(oCondition); }">🗑</span>
|
||||
</div>
|
||||
<select class="span2" data-bind="options: $root.fieldOptions, value: field, optionsText: 'name', optionsValue: 'id'"></select>
|
||||
|
||||
<input class="span2" type="text" data-bind="value: valueSecond" />
|
||||
|
||||
<select class="span2" data-bind="options: $root.typeOptions, value: type, optionsText: 'name', optionsValue: 'id'"></select>
|
||||
|
||||
<input class="span3" type="text" data-bind="value: value" />
|
||||
|
|
|
|||
|
|
@ -1,10 +1,5 @@
|
|||
<div class="control-group" data-bind="css: {'error': valueError}" style="margin-bottom: 0">
|
||||
<select class="span3" data-bind="options: $root.fieldOptions, value: field, optionsText: 'name', optionsValue: 'id'"></select>
|
||||
|
||||
<select class="span2" data-bind="options: $root.typeOptionsSize, value: type, optionsText: 'name', optionsValue: 'id'"></select>
|
||||
|
||||
<input class="span3" type="text" data-bind="value: value" />
|
||||
|
||||
<span class="delete-action button-delete pull-right fontastic" style="margin-top: 5px;"
|
||||
data-bind="click: function (oCondition) { $root.removeCondition(oCondition); }">🗑</span>
|
||||
</div>
|
||||
<select class="span3" data-bind="options: $root.fieldOptions, value: field, optionsText: 'name', optionsValue: 'id'"></select>
|
||||
|
||||
<select class="span2" data-bind="options: $root.typeOptionsSize, value: type, optionsText: 'name', optionsValue: 'id'"></select>
|
||||
|
||||
<input class="span3" type="text" data-bind="value: value" />
|
||||
|
|
|
|||
|
|
@ -30,7 +30,9 @@
|
|||
<span class="open-pgp-key-user" data-bind="foreach: users">
|
||||
<div class="open-pgp-key-user-address" data-bind="text: $data"></div>
|
||||
</span>
|
||||
<a class="btn btn-small btn-small-small btn-danger pull-right button-confirm-delete" data-bind="css: {'delete-access': deleteAccess()}, click: function(openPgpKey) { $root.deleteOpenPgpKey(openPgpKey); }"
|
||||
</td>
|
||||
<td>
|
||||
<a class="btn btn-small btn-small-small btn-danger button-confirm-delete" data-bind="css: {'delete-access': deleteAccess()}, click: function(openPgpKey) { $root.deleteOpenPgpKey(openPgpKey); }"
|
||||
data-i18n="GLOBAL/ARE_YOU_SURE"></a>
|
||||
</td>
|
||||
<td>
|
||||
|
|
@ -47,7 +49,9 @@
|
|||
<span data-bind="text: $data"></span> (<span class="open-pgp-key-id" data-bind="text: $parent.id"></span>)
|
||||
</div>
|
||||
</span>
|
||||
<a class="btn btn-small btn-small-small btn-danger pull-right button-confirm-delete" data-bind="css: {'delete-access': deleteAccess()}, click: function(oOpenPGP) { $root.deleteOpenPgpKey(oOpenPGP); }"
|
||||
</td>
|
||||
<td>
|
||||
<a class="btn btn-small btn-small-small btn-danger button-confirm-delete" data-bind="css: {'delete-access': deleteAccess()}, click: function(oOpenPGP) { $root.deleteOpenPgpKey(oOpenPGP); }"
|
||||
data-i18n="GLOBAL/ARE_YOU_SURE"></a>
|
||||
</td>
|
||||
<td>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue