mirror of
https://github.com/the-djmaze/snappymail.git
synced 2026-08-25 18:19:22 +03:00
Pre release fixes and improvements
This commit is contained in:
parent
67c5e31e58
commit
abddb3d828
61 changed files with 378 additions and 57 deletions
|
|
@ -7,7 +7,7 @@
|
|||
<div class="controls">
|
||||
<div data-bind="component: {
|
||||
name: 'Checkbox',
|
||||
params: { value: capaTwoFactorAuth, label: 'Allow 2-Step Verification (Google Authenticator)' }
|
||||
params: { value: capaTwoFactorAuth, label: 'Allow 2-Step Verification' }
|
||||
}"></div>
|
||||
<div data-bind="component: {
|
||||
name: 'Checkbox',
|
||||
|
|
|
|||
|
|
@ -1,3 +1,7 @@
|
|||
<!-- ko if: preLabeled -->
|
||||
<span class="i18n" data-bind="attr: {'data-i18n-text': preLabel}"></span>
|
||||
|
||||
<!-- /ko -->
|
||||
<select data-bind="options: options, value: value, optionsText: optionsText, optionsValue: optionsValue,
|
||||
css: className, optionsAfterRender: defautOptionsAfterRender"></select>
|
||||
<!-- ko if: labeled -->
|
||||
|
|
|
|||
|
|
@ -24,6 +24,8 @@
|
|||
<tr class="account-item">
|
||||
<td class="e-action" data-bind="css: {'e-action': canBeEdit}">
|
||||
<span class="account-img icon-user"></span>
|
||||
<i class="icon-braille drag-handle"></i>
|
||||
|
||||
<span class="account-name" data-bind="text: email"></span>
|
||||
</td>
|
||||
<td>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
</div>
|
||||
</div>
|
||||
<div class="row" data-bind="visible: inited() && !serverError()">
|
||||
<div class="span8">
|
||||
<div class="span4">
|
||||
<a class="btn" data-bind="click: addFilter">
|
||||
<i class="icon-plus"></i>
|
||||
|
||||
|
|
@ -22,7 +22,8 @@
|
|||
|
||||
<span class="i18n" data-i18n-text="SETTINGS_FILTERS/BUTTON_SAVE"></span>
|
||||
</a>
|
||||
|
||||
</div>
|
||||
<div class="span4" style="margin-left: 0;">
|
||||
<span data-bind="text: saveErrorText"style="color:red"></span>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -66,20 +67,24 @@
|
|||
data-bind="visible: inited() && (!filterRaw.active() || !filterRaw.active()), i18nUpdate: filters">
|
||||
<colgroup>
|
||||
<col style="width: 30px" />
|
||||
<col style="width: 16px" />
|
||||
<col />
|
||||
<col style="width: 140px" />
|
||||
<col style="width: 1%" />
|
||||
</colgroup>
|
||||
<tbody data-bind="sortable: {data: filters, options: scrollableOptions()}">
|
||||
<tbody data-bind="sortable: {data: filters, options: scrollableOptions()}" style="width: 600px">
|
||||
<tr class="filter-item">
|
||||
<td>
|
||||
<span class="disabled-filter" data-bind="click: function () { $root.haveChanges(true); enabled(!enabled()); }">
|
||||
<i data-bind="css: {'icon-checkbox-checked': enabled, 'icon-checkbox-unchecked': !enabled()}"></i>
|
||||
</span>
|
||||
</td>
|
||||
<td class="drag-wrapper">
|
||||
<i class="icon-braille drag-handle"></i>
|
||||
</td>
|
||||
<td class="e-action">
|
||||
<span class="filter-name" data-bind="text: name()"></span>
|
||||
|
||||
|
||||
<span class="filter-sub-name" data-bind="text: nameSub()"></span>
|
||||
</td>
|
||||
<td>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,14 @@
|
|||
<div class="control-group" style="margin-bottom: 0">
|
||||
<div class="controls">
|
||||
<div data-bind="component: {
|
||||
name: 'Select',
|
||||
params: {
|
||||
options: [1, 2, 3, 7, 30],
|
||||
label: 'POPUPS_FILTER/REPLY_INTERVAL_LABEL',
|
||||
value: actionValueThird,
|
||||
size: 1
|
||||
}
|
||||
}"></div>
|
||||
<input type="text" class="span5 i18n" data-bind="value: actionValueSecond" placeholder=""
|
||||
data-i18n-placeholder="POPUPS_FILTER/VACATION_SUBJECT_LABEL" />
|
||||
</div>
|
||||
|
|
@ -9,4 +18,15 @@
|
|||
<textarea class="span5 i18n" data-bind="value: actionValue" style="height: 100px;"
|
||||
placeholder="" data-i18n-placeholder="POPUPS_FILTER/VACATION_MESSAGE_LABEL"></textarea>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="control-group">
|
||||
<div class="controls">
|
||||
<div data-bind="component: {
|
||||
name: 'Checkbox',
|
||||
params: {
|
||||
label: 'POPUPS_FILTER/STOP_LABEL',
|
||||
value: actionNoStop
|
||||
}
|
||||
}"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue