Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-08 08:57:03 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merged from sub repository (updated ckeditor, filters - step 2)

Browse source
This commit is contained in:
RainLoop Team 2014-12-01 21:34:21 +04:00
parent a57dc3720e
commit ec7324b061
427 changed files with 10909 additions and 3336 deletions
Download patch file Download diff file Expand all files Collapse all files

13
rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsAbout.html
View file

@ -25,7 +25,12 @@
<div data-bind="visible: 'available' === statusType()">
<i class="icon-bolt" style="color: red"></i>
&nbsp;&nbsp;
New <b data-bind="text: coreRemoteVersion"></b> version is available.
New
<b data-bind="text: coreRemoteVersion"></b>
<span data-bind="visible: 'stable' !== coreType()" style="color:red">
(<span data-bind="text: coreType"></span>)
</span>
version is available.
<span data-bind="visible: '' !== coreRemoteRelease()">
(<span data-bind="text: coreRemoteRelease"></span>)
</span>
@ -56,7 +61,11 @@
<div data-bind="visible: 'up-to-date' === statusType()">
<i class="icon-ok" style="color: green"></i>
&nbsp;&nbsp;
RainLoop is up to date.
RainLoop
<span data-bind="visible: 'stable' !== coreType()" style="color:red">
(<span data-bind="text: coreType"></span>)
</span>
is up to date.
</div>
<div data-bind="visible: 'updating' === statusType()">
<i class="icon-spinner animated"></i>

21
rainloop/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html
View file

@ -20,8 +20,8 @@
<div class="row">
<div class="span5" data-bind="css: { 'testing-done': testingDone, 'testing-error': testingImapError }">
<div class="legend imap-header">
<span data-placement="bottom" data-bind="tooltip3: testingImapErrorDesc">
<span data-bind="text: sieveSettings() ? 'SIEVE' : 'IMAP'">IMAP</span>
<span data-placement="bottom" data-bind="tooltipForTest: testingImapErrorDesc">
<span data-bind="text: sieveSettings() ? 'SIEVE (Filters)' : 'IMAP'">IMAP</span>
</span>
</div>
<div data-bind="visible: !sieveSettings()">
@ -73,7 +73,7 @@
<span data-bind="command: sieveCommand">
<i class="icon-filter"></i>
&nbsp;
<a href="#" class="g-ui-link">Sieve configuration</a>
<a href="#" class="g-ui-link">Sieve (Filetrs) configuration</a>
</span>
</div>
</div>
@ -90,18 +90,7 @@
}"></div>
</div>
</div>
<div class="row" data-bind="visible: useSieve">
<div class="span5">
<div data-bind="component: {
name: 'Checkbox',
params: {
label: 'use IMAP Server',
value: useImapServerForSieve
}
}"></div>
</div>
</div>
<div data-bind="visible: !useImapServerForSieve() && useSieve()">
<div data-bind="visible: useSieve">
<br />
<div class="row">
<div class="span3">
@ -144,7 +133,7 @@
</div>
<div class="span5" data-bind="css: { 'testing-done': testingDone, 'testing-error': testingSmtpError }">
<div class="legend smtp-header">
<span data-placement="bottom" data-bind="tooltip3: testingSmtpErrorDesc">
<span data-placement="bottom" data-bind="tooltipForTest: testingSmtpErrorDesc">
SMTP
</span>
</div>