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

Release commit
This commit is contained in:
RainLoop Team 2014-12-06 01:01:33 +04:00
parent ec7324b061
commit 42b8a446c6
464 changed files with 10395 additions and 1303 deletions

View file

@ -102,7 +102,7 @@
})
.script(function () {
return window.rainloopAppData['PluginsLink'] ?
{'src': '{{BaseAppMainScriptLink}}', 'type': 'text/javascript', 'charset': 'utf-8'} : null;
{'src': window.rainloopAppData['PluginsLink'], 'type': 'text/javascript', 'charset': 'utf-8'} : null;
})
.wait(function () {
__simplePace(5);

View file

@ -5,10 +5,10 @@
<button type="button" class="close" data-bind="click: function () { submitError('') }">&times;</button>
<span data-bind="text: submitError"></span>
</div>
<form class="form-horizontal span4 wrapper loginForm thm-login" action="#/" data-bind="submit: submitForm">
<div class="control-group" data-bind="css: {'error': loginError}">
<form class="wrapper loginForm thm-login" action="#/" data-bind="submit: submitForm">
<div class="controls" data-bind="css: {'error': loginError}">
<div class="input-append">
<input type="text" class="inputLogin span4 checkAutocomplete" placeholder="Login" name="RainLoopAdminLogin" id="RainLoopAdminLogin"
<input type="text" class="input-block-level inputLogin checkAutocomplete" placeholder="Login" name="RainLoopAdminLogin" id="RainLoopAdminLogin"
autocorrect="off" autocapitalize="off" spellcheck="false"
data-bind="textInput: login, hasFocus: loginFocus" />
<span class="add-on">
@ -16,9 +16,9 @@
</span>
</div>
</div>
<div class="control-group" data-bind="css: {'error': passwordError}">
<div class="controls" data-bind="css: {'error': passwordError}">
<div class="input-append">
<input type="password" class="inputPassword span4 checkAutocomplete" placeholder="Password" name="RainLoopAdminPassword" id="RainLoopAdminPassword"
<input type="password" class="input-block-level inputPassword checkAutocomplete" placeholder="Password" name="RainLoopAdminPassword" id="RainLoopAdminPassword"
autocorrect="off" autocapitalize="off" spellcheck="false"
data-bind="textInput: password" />
<span class="add-on">
@ -26,8 +26,8 @@
</span>
</div>
</div>
<div class="control-group">
<button type="submit" class="btn btn-large span4 buttonLogin" data-bind="command: submitCommand">
<div class="controls">
<button type="submit" class="btn btn-large btn-block buttonLogin" data-bind="command: submitCommand">
<i class="icon-spinner animated" data-bind="visible: submitRequest"></i>
<span data-bind="visible: !submitRequest()">Log into the admin panel</span>
</button>

View file

@ -16,11 +16,11 @@
<button type="button" class="close" data-bind="click: function () { submitError('') }">&times;</button>
<span data-bind="text: submitError"></span>
</div>
<form class="form-horizontal span4 wrapper loginForm thm-login" action="#/" data-bind="submit: submitForm">
<form class="wrapper loginForm thm-login" action="#/" data-bind="submit: submitForm">
{{INCLUDE/TopControlGroup/PLACE}}
<div class="control-group" data-bind="css: {'error': emailError}">
<div class="controls" data-bind="css: {'error': emailError}">
<div class="input-append">
<input type="email" class="i18n inputEmail span4 checkAutocomplete" name="RainLoopEmail" id="RainLoopEmail"
<input type="email" class="i18n input-block-level inputEmail checkAutocomplete" name="RainLoopEmail" id="RainLoopEmail"
autocorrect="off" autocapitalize="off" spellcheck="false"
data-bind="textInput: email, hasFocus: emailFocus" data-i18n-placeholder="LOGIN/LABEL_EMAIL" />
<span class="add-on">
@ -28,9 +28,9 @@
</span>
</div>
</div>
<div class="control-group" data-bind="css: {'error': passwordError}">
<div class="controls" data-bind="css: {'error': passwordError}">
<div class="input-append">
<input type="password" class="i18n inputPassword span4 checkAutocomplete" name="RainLoopPassword" id="RainLoopPassword"
<input type="password" class="i18n input-block-level inputPassword checkAutocomplete" name="RainLoopPassword" id="RainLoopPassword"
autocorrect="off" autocapitalize="off" spellcheck="false"
data-bind="textInput: password" data-i18n-placeholder="LOGIN/LABEL_PASSWORD" />
<span class="add-on">
@ -38,16 +38,16 @@
</span>
</div>
</div>
<div class="control-group" data-bind="visible: additionalCode.visibility(), css: {'error': additionalCode.error}">
<div class="controls" data-bind="visible: additionalCode.visibility(), css: {'error': additionalCode.error}">
<div class="input-append">
<input type="text" class="i18n inputAdditionalCode span4" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
<input type="text" class="i18n input-block-level inputAdditionalCode" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
data-bind="textInput: additionalCode, hasFocus: additionalCode.focused" data-i18n-placeholder="LOGIN/LABEL_VERIFICATION_CODE" />
<span class="add-on">
<i class="icon-key"></i>
</span>
</div>
</div>
<div class="control-group" data-bind="visible: additionalCode.visibility()">
<div class="controls" data-bind="visible: additionalCode.visibility()">
<label class="pull-left additionalCodeSignMeLabel" data-bind="click: function () { additionalCodeSignMe(!additionalCodeSignMe()); }">
<i data-bind="css: additionalCodeSignMe() ? 'checkboxAdditionalCodeSignMe icon-checkbox-checked' : 'checkboxAdditionalCodeSignMe icon-checkbox-unchecked'"></i>
&nbsp;&nbsp;
@ -55,18 +55,13 @@
</label>
</div>
{{INCLUDE/BottomControlGroup/PLACE}}
<div class="control-group">
<button type="submit" class="btn btn-large span4 buttonLogin" data-bind="command: submitCommand">
<div class="controls">
<button type="submit" class="btn btn-large btn-block buttonLogin" data-bind="command: submitCommand">
<i class="icon-spinner animated" data-bind="visible: submitRequest"></i>
<span class="i18n i18n-animation" data-i18n-text="LOGIN/BUTTON_SIGN_IN" data-bind="visible: !submitRequest()"></span>
</button>
</div>
<div class="control-group">
<label class="pull-left signMeLabel" data-bind="click: function () { signMe(!signMe()); }, visible: signMeVisibility">
<i data-bind="css: signMe() ? 'checkboxSignMe icon-checkbox-checked' : 'checkboxSignMe icon-checkbox-unchecked'"></i>
&nbsp;&nbsp;
<span class="i18n i18n-animation" data-i18n-text="LOGIN/LABEL_SIGN_ME"></span>
</label>
<div class="controls">
<div class="pull-right social-buttons">
<a href="#" tabindex="-1" class="social-button" data-bind="command: facebookCommand, visible: facebookLoginEnabled, tooltip: 'LOGIN/TITLE_SIGN_IN_FACEBOOK'">
<i class="icon-facebook-alt"></i>
@ -82,8 +77,13 @@
<i data-bind="css: langRequest() ? 'icon-spinner animated' : 'icon-world'"></i>
</a>
</div>
<label class="signMeLabel inline" data-bind="click: function () { signMe(!signMe()); }, visible: signMeVisibility">
<i data-bind="css: signMe() ? 'checkboxSignMe icon-checkbox-checked' : 'checkboxSignMe icon-checkbox-unchecked'"></i>
&nbsp;&nbsp;
<span class="i18n i18n-animation" data-i18n-text="LOGIN/LABEL_SIGN_ME"></span>
</label>
</div>
<div class="control-group" data-bind="visible: '' !== forgotPasswordLinkUrl || '' !== registrationLinkUrl">
<div class="controls" data-bind="visible: '' !== forgotPasswordLinkUrl || '' !== registrationLinkUrl">
<div class="forgot-link thm-forgot" data-bind="visible: '' !== forgotPasswordLinkUrl" style="text-align: center">
<a href="#" target="_blank" class="g-ui-link" data-bind="attr: {href: forgotPasswordLinkUrl}, css: {'pull-right': '' !== registrationLinkUrl}"
><span class="i18n" data-i18n-text="LOGIN/LABEL_FORGOT_PASSWORD"></span></a>

View file

@ -1,3 +1,4 @@
<!-- ko template: { name: 'PhotoSwipe' } --><!-- /ko -->
<div id="rl-sub-right">
<div class="messageView" data-bind="css: {'message-selected': isMessageSelected, 'message-focused': message.focused}">
<div class="toolbar g-ui-user-select-none">
@ -270,8 +271,8 @@
<span class="attachmentName" data-bind="text: fileName"></span>
</div>
<div>
<a class="attachmentPreview magnificPopupImage pull-left"
data-bind="visible: isImage(), attr: {href: linkPreview(), title: fileName}" target="_blank">
<a class="attachmentPreview attachmentImagePreview magnificPopupImage pull-left"
data-bind="visible: isImage(), attr: {href: linkPreview(), title: fileName, 'data-index': $index}" target="_blank">
<i class="icon-eye"></i>
</a>
<a class="attachmentPreview pull-left"
@ -290,7 +291,6 @@
</div>
</li>
</ul>
<hr />
</div>
<div class="bodyText g-ui-min-height-300" data-bind="initDom: messagesBodiesDom"></div>
</div>

View file

@ -0,0 +1,33 @@
<div class="pswp" tabindex="-1" role="dialog" aria-hidden="true">
<div class="pswp__bg"></div>
<div class="pswp__scroll-wrap">
<div class="pswp__container">
<div class="pswp__item"></div>
<div class="pswp__item"></div>
<div class="pswp__item"></div>
</div>
<div class="pswp__ui pswp__ui--hidden">
<div class="pswp__top-bar">
<div class="pswp__counter"></div>
<button class="pswp__button pswp__button--close i18n" title="Close (Esc)" data-i18n-title="PREVIEW_POPUP/CLOSE"></button>
<button class="pswp__button pswp__button--fs i18n" title="Toggle fullscreen" data-i18n-title="PREVIEW_POPUP/FULLSCREEN"></button>
<button class="pswp__button pswp__button--zoom i18n" title="Zoom in/out" data-i18n-title="PREVIEW_POPUP/ZOOM"></button>
<div class="pswp__preloader">
<div class="pswp__preloader__icn">
<div class="pswp__preloader__cut">
<div class="pswp__preloader__donut"></div>
</div>
</div>
</div>
</div>
<div class="pswp__share-modal pswp__share-modal--hidden pswp__single-tap">
<div class="pswp__share-tooltip"></div>
</div>
<button class="pswp__button pswp__button--arrow--left i18n" title="Previous (arrow left)" data-i18n-title="PREVIEW_POPUP/GALLERY_PREV"></button>
<button class="pswp__button pswp__button--arrow--right i18n" title="Next (arrow right)" data-i18n-title="PREVIEW_POPUP/GALLERY_NEXT"></button>
<div class="pswp__caption">
<div class="pswp__caption__center"></div>
</div>
</div>
</div>
</div>