New actions on the left bar (closed #56)

This commit is contained in:
RainLoop Team 2014-02-08 02:35:48 +04:00
parent 126b55b2d5
commit ab07d102f9
11 changed files with 259 additions and 264 deletions

View file

@ -274,24 +274,6 @@ LinkBuilder.prototype.openPgpJs = function ()
this.sVersion + '/static/js/openpgp.js'; this.sVersion + '/static/js/openpgp.js';
}; };
/**
* @return {string}
*/
LinkBuilder.prototype.ckeditorPath = function ()
{
return ('' === this.sCdnStaticDomain ? 'rainloop/v/' : this.sCdnStaticDomain) +
this.sVersion + '/static/ckeditor/';
};
/**
* @return {string}
*/
LinkBuilder.prototype.ckeditorJs = function ()
{
return ('' === this.sCdnStaticDomain ? 'rainloop/v/' : this.sCdnStaticDomain) +
this.sVersion + '/static/ckeditor/ckeditor.js';
};
/** /**
* @return {string} * @return {string}
*/ */

View file

@ -14,10 +14,20 @@
color: #fff; color: #fff;
} }
.b-footer {
position: absolute;
bottom: 20px;
right: 0;
left: 0;
height: 20px;
padding: 0 10px 0 0;
z-index: 101;
}
.b-content { .b-content {
position: absolute; position: absolute;
top: 50px + @rlLowMargin; top: 50px + @rlLowMargin;
bottom: @rlLowMargin + @rlBottomMargin; bottom: 30px + @rlLowMargin + @rlBottomMargin;
// left: @rlLowMargin; // left: @rlLowMargin;
left: 0; left: 0;
right: 0; right: 0;
@ -36,7 +46,7 @@
border-bottom: 1px solid #999; border-bottom: 1px solid #999;
} }
.e-item { .b-content .e-item {
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;

View file

@ -111,6 +111,16 @@ MailBoxFolderListViewModel.prototype.composeClick = function ()
kn.showScreenPopup(PopupsComposeViewModel); kn.showScreenPopup(PopupsComposeViewModel);
}; };
MailBoxFolderListViewModel.prototype.createFolder = function ()
{
kn.showScreenPopup(PopupsFolderCreateViewModel);
};
MailBoxFolderListViewModel.prototype.configureFolders = function ()
{
kn.setHash(RL.link().settings('folders'));
};
MailBoxFolderListViewModel.prototype.contactsClick = function () MailBoxFolderListViewModel.prototype.contactsClick = function ()
{ {
if (this.allowContacts) if (this.allowContacts)

View file

@ -16,4 +16,14 @@
</div> </div>
</div> </div>
</div> </div>
<div class="b-footer btn-toolbar">
<div class="btn-group pull-right">
<a class="btn" data-bind="click: createFolder">
<i class="icon-folder-add"></i>
</a>
<a class="btn" data-bind="click: configureFolders">
<i class="icon-cog"></i>
</a>
</div>
</div>
</div> </div>

View file

@ -6309,10 +6309,19 @@ html.rl-no-preview-pane #rl-right .ui-resizable-handle {
padding: 10px 10px 0 8px; padding: 10px 10px 0 8px;
color: #fff; color: #fff;
} }
.b-folders .b-footer {
position: absolute;
bottom: 20px;
right: 0;
left: 0;
height: 20px;
padding: 0 10px 0 0;
z-index: 101;
}
.b-folders .b-content { .b-folders .b-content {
position: absolute; position: absolute;
top: 58px; top: 58px;
bottom: 13px; bottom: 43px;
left: 0; left: 0;
right: 0; right: 0;
overflow: hidden; overflow: hidden;
@ -6326,11 +6335,11 @@ html.rl-no-preview-pane #rl-right .ui-resizable-handle {
border-top: 0px solid #000; border-top: 0px solid #000;
border-bottom: 1px solid #999; border-bottom: 1px solid #999;
} }
.b-folders .e-item { .b-folders .b-content .e-item {
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
} }
.b-folders .e-item .e-link { .b-folders .b-content .e-item .e-link {
display: block; display: block;
position: relative; position: relative;
z-index: 1; z-index: 1;
@ -6347,36 +6356,36 @@ html.rl-no-preview-pane #rl-right .ui-resizable-handle {
outline: 0; outline: 0;
text-decoration: none; text-decoration: none;
} }
.b-folders .e-item .e-link.selectable { .b-folders .b-content .e-item .e-link.selectable {
color: #000; color: #000;
cursor: pointer; cursor: pointer;
} }
.b-folders .e-item .e-link.selectable:hover, .b-folders .b-content .e-item .e-link.selectable:hover,
.b-folders .e-item .e-link.selectable.selected, .b-folders .b-content .e-item .e-link.selectable.selected,
.b-folders .e-item .e-link.selectable.droppableHover { .b-folders .b-content .e-item .e-link.selectable.droppableHover {
background-color: #555; background-color: #555;
color: #fff; color: #fff;
} }
.b-folders .e-item .e-link.system { .b-folders .b-content .e-item .e-link.system {
cursor: default; cursor: default;
color: grey; color: grey;
} }
.b-folders .e-item .e-link .count { .b-folders .b-content .e-item .e-link .count {
position: relative; position: relative;
display: none; display: none;
margin-top: 5px; margin-top: 5px;
line-height: 19px; line-height: 19px;
} }
.b-folders .e-item .e-link.print-count { .b-folders .b-content .e-item .e-link.print-count {
font-weight: bold; font-weight: bold;
} }
.b-folders .e-item .e-link.print-count .count { .b-folders .b-content .e-item .e-link.print-count .count {
display: inline; display: inline;
} }
.b-folders .e-item .e-link.unread-sub { .b-folders .b-content .e-item .e-link.unread-sub {
font-weight: bold; font-weight: bold;
} }
.b-folders .e-item .e-link .e-collapsed-sign { .b-folders .b-content .e-item .e-link .e-collapsed-sign {
cursor: pointer; cursor: pointer;
width: 22px; width: 22px;
height: 30px; height: 30px;
@ -6384,10 +6393,10 @@ html.rl-no-preview-pane #rl-right .ui-resizable-handle {
text-align: center; text-align: center;
vertical-align: inherit; vertical-align: inherit;
} }
.b-folders .e-item .hidden.e-link { .b-folders .b-content .e-item .hidden.e-link {
display: none; display: none;
} }
.b-folders .e-item .b-sub-folders.collapsed { .b-folders .b-content .e-item .b-sub-folders.collapsed {
max-height: 0; max-height: 0;
height: 0; height: 0;
display: none; display: none;

File diff suppressed because one or more lines are too long

View file

@ -3267,24 +3267,6 @@ LinkBuilder.prototype.openPgpJs = function ()
this.sVersion + '/static/js/openpgp.js'; this.sVersion + '/static/js/openpgp.js';
}; };
/**
* @return {string}
*/
LinkBuilder.prototype.ckeditorPath = function ()
{
return ('' === this.sCdnStaticDomain ? 'rainloop/v/' : this.sCdnStaticDomain) +
this.sVersion + '/static/ckeditor/';
};
/**
* @return {string}
*/
LinkBuilder.prototype.ckeditorJs = function ()
{
return ('' === this.sCdnStaticDomain ? 'rainloop/v/' : this.sCdnStaticDomain) +
this.sVersion + '/static/ckeditor/ckeditor.js';
};
/** /**
* @return {string} * @return {string}
*/ */

File diff suppressed because one or more lines are too long

View file

@ -3267,24 +3267,6 @@ LinkBuilder.prototype.openPgpJs = function ()
this.sVersion + '/static/js/openpgp.js'; this.sVersion + '/static/js/openpgp.js';
}; };
/**
* @return {string}
*/
LinkBuilder.prototype.ckeditorPath = function ()
{
return ('' === this.sCdnStaticDomain ? 'rainloop/v/' : this.sCdnStaticDomain) +
this.sVersion + '/static/ckeditor/';
};
/**
* @return {string}
*/
LinkBuilder.prototype.ckeditorJs = function ()
{
return ('' === this.sCdnStaticDomain ? 'rainloop/v/' : this.sCdnStaticDomain) +
this.sVersion + '/static/ckeditor/ckeditor.js';
};
/** /**
* @return {string} * @return {string}
*/ */
@ -10873,6 +10855,16 @@ MailBoxFolderListViewModel.prototype.composeClick = function ()
kn.showScreenPopup(PopupsComposeViewModel); kn.showScreenPopup(PopupsComposeViewModel);
}; };
MailBoxFolderListViewModel.prototype.createFolder = function ()
{
kn.showScreenPopup(PopupsFolderCreateViewModel);
};
MailBoxFolderListViewModel.prototype.configureFolders = function ()
{
kn.setHash(RL.link().settings('folders'));
};
MailBoxFolderListViewModel.prototype.contactsClick = function () MailBoxFolderListViewModel.prototype.contactsClick = function ()
{ {
if (this.allowContacts) if (this.allowContacts)

File diff suppressed because one or more lines are too long