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

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

View file

@ -77,7 +77,7 @@
<tr><td class="i18n" data-i18n-text="SHORTCUTS_HELP/LABEL_OPEN_COMPOSE_POPUP"></td><td>W, C</td></tr>
<tr><td class="i18n" data-i18n-text="SHORTCUTS_HELP/LABEL_OPEN_IDENTITIES_DROPDOWN"></td><td>Ctrl + Q, Command + Q</td></tr>
<tr><td class="i18n" data-i18n-text="SHORTCUTS_HELP/LABEL_SAVE_MESSAGE"></td><td>Ctrl + S, Command + S</td></tr>
<tr><td class="i18n" data-i18n-text="SHORTCUTS_HELP/LABEL_SEND_MESSAGE"></td><td>Ctrl + Enter, Command + Enter</td></tr>
<!--<tr><td class="i18n" data-i18n-text="SHORTCUTS_HELP/LABEL_SEND_MESSAGE"></td><td>Ctrl + Enter, Command + Enter</td></tr>-->
<tr><td class="i18n" data-i18n-text="SHORTCUTS_HELP/LABEL_CLOSE_COMPOSE"></td><td>Esc</td></tr>
</tbody>
</table>

View file

@ -8,8 +8,8 @@
</div>
<div class="modal-body">
<div data-bind="foreach: languages">
<label class="lang-item" data-tooltip-placement="left" data-bind="click: function () { $root.changeLanguage(key); }, css: {'selected': selected},
tooltip2: function () { return $root.languageEnName(key); }">
<label class="lang-item" data-tooltip-i18n="off" data-tooltip-placement="left" data-bind="click: function () { $root.changeLanguage(key); }, css: {'selected': selected},
tooltip: function () { return $root.languageEnName(key); }">
<span class="flag-wrapper">
<span data-bind="css: 'flag flag-' + key" style=""></span>
</span>