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

Small fixes (fixed #61)

Browse source
This commit is contained in:
RainLoop Team 2014-02-01 00:31:55 +04:00
parent ae2e2ea61e
commit 3a5d5038b9
9 changed files with 147 additions and 173 deletions
Download patch file Download diff file Expand all files Collapse all files

1
dev/Styles/MessageView.less
View file

@ -1,4 +1,3 @@
showImages
html.rl-no-preview-pane { html.rl-no-preview-pane {
.messageView { .messageView {

2
dev/ViewModels/PopupsComposeViewModel.js
View file

@ -579,7 +579,7 @@ PopupsComposeViewModel.prototype.convertSignature = function (sSignature, sFrom)
sSignature = sSignature.replace(/{{IF:FROM}}[\s\S]+{{\/IF:FROM}}/gm, ''); sSignature = sSignature.replace(/{{IF:FROM}}[\s\S]+{{\/IF:FROM}}/gm, '');
} }
sSignature = Utils.trim(sSignature.replace(/{{FROM}}/, '').replace(/{{IF:FROM}}/, '').replace(/{{\/IF:FROM}}/, '')); sSignature = "\r\n" + Utils.trim(sSignature.replace(/{{FROM}}/, '').replace(/{{IF:FROM}}/, '').replace(/{{\/IF:FROM}}/, ''));
} }
return sSignature; return sSignature;

1
plugins/recaptcha/index.php
View file

@ -30,7 +30,6 @@ class RecaptchaPlugin extends \RainLoop\Plugins\AbstractPlugin
\RainLoop\Plugins\Property::NewInstance('private_key')->SetLabel('Private Key') \RainLoop\Plugins\Property::NewInstance('private_key')->SetLabel('Private Key')
->SetDefaultValue(''), ->SetDefaultValue(''),
\RainLoop\Plugins\Property::NewInstance('error_limit')->SetLabel('Limit') \RainLoop\Plugins\Property::NewInstance('error_limit')->SetLabel('Limit')
->SetDefaultValue(0)
->SetType(\RainLoop\Enumerations\PluginPropertyType::SELECTION) ->SetType(\RainLoop\Enumerations\PluginPropertyType::SELECTION)
->SetDefaultValue(array(0, 1, 2, 3, 4, 5)) ->SetDefaultValue(array(0, 1, 2, 3, 4, 5))
->SetDescription('') ->SetDescription('')

2
rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
View file

@ -4073,7 +4073,7 @@ class Actions
if (!$bAddHiddenRcpt) if (!$bAddHiddenRcpt)
{ {
$aSmtpCredentials[] = array(); $aSmtpCredentials['HiddenRcpt'] = array();
} }
$bHookConnect = $bHookAuth = $bHookFrom = $bHookFrom = $bHookTo = $bHookData = $bHookLogoutAndDisconnect = false; $bHookConnect = $bHookAuth = $bHookFrom = $bHookFrom = $bHookTo = $bHookData = $bHookLogoutAndDisconnect = false;

26
rainloop/v/0.0.0/app/templates/Views/PopupsContacts.html
View file

@ -43,32 +43,8 @@
</div> </div>
<div class="modal-body" style="position: relative"> <div class="modal-body" style="position: relative">
<div class="b-list-toopbar"> <div class="b-list-toopbar">
<input class="i18n span3 e-search" type="text" placeholder="Search" data-18n-placeholder="CONTACS/SEARCH_INPUT_PLACEHOLDER" data-bind="value: search" /> <input class="i18n span3 e-search" type="text" placeholder="Search" data-i18n-placeholder="CONTACTS/SEARCH_INPUT_PLACEHOLDER" data-bind="value: search" />
</div> </div>
<!--
<div class="btn-toolbar b-list-toopbar g-ui-user-select-none">
<div class="btn-group">
<input class="i18n span3 e-search" type="text" placeholder="Search" data-18n-placeholder="CONTACS/SEARCH_INPUT_PLACEHOLDER" data-bind="value: search" />
</div>
<div class="btn-group pull-right">
<a class="btn dropdown-toggle button-filter" data-toggle="dropdown">
<i class="icon-bolt"></i>
</a>
<ul class="dropdown-menu g-ui-menu">
<li class="e-item">
<a class="e-link">
Personal address book
</a>
</li>
<li class="e-item">
<a class="e-link">
Collected
</a>
</li>
</ul>
</div>
</div>
-->
<div class="b-list-content g-ui-user-select-none" data-bind="nano: true, css: {'hideContactListCheckbox': !useCheckboxesInList()}"> <div class="b-list-content g-ui-user-select-none" data-bind="nano: true, css: {'hideContactListCheckbox': !useCheckboxesInList()}">
<div class="content g-scrollbox"> <div class="content g-scrollbox">
<div class="content-wrapper"> <div class="content-wrapper">

4
rainloop/v/0.0.0/static/css/app.css
View file

@ -6907,10 +6907,10 @@ html.rl-no-preview-pane .messageList.message-selected {
cursor: pointer; cursor: pointer;
cursor: move; cursor: move;
} }
showImages html.rl-no-preview-pane .messageView { html.rl-no-preview-pane .messageView {
display: none; display: none;
} }
showImages html.rl-no-preview-pane .messageView.message-selected { html.rl-no-preview-pane .messageView.message-selected {
display: block; display: block;
} }
.messageView { .messageView {

2
rainloop/v/0.0.0/static/css/app.min.css vendored
View file

File diff suppressed because one or more lines are too long

2
rainloop/v/0.0.0/static/js/app.js
View file

@ -8626,7 +8626,7 @@ PopupsComposeViewModel.prototype.convertSignature = function (sSignature, sFrom)
sSignature = sSignature.replace(/{{IF:FROM}}[\s\S]+{{\/IF:FROM}}/gm, ''); sSignature = sSignature.replace(/{{IF:FROM}}[\s\S]+{{\/IF:FROM}}/gm, '');
} }
sSignature = Utils.trim(sSignature.replace(/{{FROM}}/, '').replace(/{{IF:FROM}}/, '').replace(/{{\/IF:FROM}}/, '')); sSignature = "\r\n" + Utils.trim(sSignature.replace(/{{FROM}}/, '').replace(/{{IF:FROM}}/, '').replace(/{{\/IF:FROM}}/, ''));
} }
return sSignature; return sSignature;

2
rainloop/v/0.0.0/static/js/app.min.js vendored
View file

File diff suppressed because one or more lines are too long