moparisthebest
/
mail
mirror of https://github.com/moparisthebest/mail
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #217 from whiteout-io/dev/WO-751 

[WO-751] Change naming from favorite to flag
This commit is contained in:
Tankred Hase 2014-12-03 15:58:39 +01:00
parent fee1151952 5e29c707e0
commit e06fff4385
6 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/js/controller/app/action-bar.js
View File

@ -169,7 +169,7 @@ var ActionBarCtrl = function($scope, email, dialog, statusDisplay) {
return;
}
statusDisplay.update(flagged ? 'Adding message to favorites...' : 'Removing message from favorites');
statusDisplay.update(flagged ? 'Adding star to message...' : 'Removing star from message');
var originalState = message.flagged;
message.flagged = flagged;
@ -180,7 +180,7 @@ var ActionBarCtrl = function($scope, email, dialog, statusDisplay) {
if (err && err.code === 42) {
// offline, restore
message.unread = originalState;
statusDisplay.update('Unable to ' + (flagged ? 'add message to' : 'remove message from') + ' favorites in offline mode!');
statusDisplay.update('Unable to ' + (flagged ? 'add star to' : 'remove star from') + ' message in offline mode!');
return;
}

4
src/sass/blocks/views/_mail-list.scss
View File

@ -220,7 +220,7 @@
&__flags-checked {
display: none; // feature on touch layout not available for now
}
&__flags-favorite {
&__flags-flagged {
display: none; // feature on touch layout not available for now
}
&__flags-encrypted {
@ -373,7 +373,7 @@
padding: 0.5em 0 0.5em 1em;
}
}
&__flags-favorite {
&__flags-flagged {
// add invisible padding to increase clickable area around star
margin: -0.5em 0 -0.5em;
padding: 0.5em 0 0.5em;

4
src/tpl/action-bar.html
View File

@ -37,7 +37,7 @@
<ul id="dropdown-more" class="dropdown">
<li><button wo-touch="state.read.open ? markMessage(state.mailList.selected, false) : markCheckedMessages(false)">Mark as read</button></li>
<li><button wo-touch="state.read.open ? markMessage(state.mailList.selected, true) : markCheckedMessages(true)">Mark as unread</button></li>
<li><button wo-touch="state.read.open ? flagMessage(state.mailList.selected, true) : flagCheckedMessages(true)">Flag message</button></li>
<li><button wo-touch="state.read.open ? flagMessage(state.mailList.selected, false) : flagCheckedMessages(false)">Unflag message</button></li>
<li><button wo-touch="state.read.open ? flagMessage(state.mailList.selected, true) : flagCheckedMessages(true)">Add star</button></li>
<li><button wo-touch="state.read.open ? flagMessage(state.mailList.selected, false) : flagCheckedMessages(false)">Remove star</button></li>
</ul><!--/dropdown-->
</div>

6
src/tpl/mail-list.html
View File

@ -37,9 +37,9 @@
<span><svg role="presentation"><use xlink:href="#icon-check" /></svg></span>
</label>
</li>
<li class="mail-list-entry__flags-favorite" wo-touch="flag(email, !email.flagged); $event.stopPropagation()">
<svg ng-show="email.flagged"><use xlink:href="#icon-star_filled" /><title>Favorited</title></svg>
<svg ng-show="!email.flagged"><use xlink:href="#icon-star" /><title>Not Favorited</title></svg>
<li class="mail-list-entry__flags-flagged" wo-touch="flag(email, !email.flagged); $event.stopPropagation()">
<svg ng-show="email.flagged"><use xlink:href="#icon-star_filled" /><title>Starred</title></svg>
<svg ng-show="!email.flagged"><use xlink:href="#icon-star" /><title>Not Starred</title></svg>
</li>
<li class="mail-list-entry__flags-encrypted">
<svg ng-show="email.encrypted"><use xlink:href="#icon-encrypted" /><title>Encrypted</title></svg>

2
src/tpl/nav.html
View File

@ -26,7 +26,7 @@
<svg ng-if="folder.type === 'Flagged'" role="presentation">
<use xlink:href="#icon-star" />
</svg>
{{folder.type}}
{{folder.type === 'Flagged' ? 'Starred' : folder.type}}
<span ng-show="folder.count > 0" class="nav__counter">{{folder.count}}</span>
</a>
<!--<button class="btn-icon-very-light">

12
src/tpl/read.html
View File

@ -16,9 +16,9 @@
<header class="read__header">
<div class="read__controls">
<span class="u-hidden-lg" ng-controller="ActionBarCtrl">
<button wo-touch="flagMessage(state.mailList.selected, !state.mailList.selected.flagged)" class="btn-icon-light" title="{{state.mailList.selected.flagged ? 'Remove from Favorites' : 'Add to Favorites'}}">
<svg ng-show="state.mailList.selected.flagged"><use xlink:href="#icon-star_filled" /><title>Favorited</title></svg>
<svg ng-show="!state.mailList.selected.flagged"><use xlink:href="#icon-star" /><title>Not Favorited</title></svg>
<button wo-touch="flagMessage(state.mailList.selected, !state.mailList.selected.flagged)" class="btn-icon-light" title="{{state.mailList.selected.flagged ? 'Remove Star' : 'Add Star'}}">
<svg ng-show="state.mailList.selected.flagged"><use xlink:href="#icon-star_filled" /><title>Starred</title></svg>
<svg ng-show="!state.mailList.selected.flagged"><use xlink:href="#icon-star" /><title>Not Starred</title></svg>
</button>
<button class="btn-icon-light" title="Move mail" wo-dropdown="#read-dropdown-folder" wo-dropdown-position="center">
<svg><use xlink:href="#icon-folder" /><title>Move mail</title></svg>
@ -128,9 +128,9 @@
<div class="toolbar">
<ul class="toolbar__actions">
<li>
<button wo-touch="flagMessage(state.mailList.selected, !state.mailList.selected.flagged)" class="btn-icon-light" title="{{state.mailList.selected.flagged ? 'Remove from Favorites' : 'Add to Favorites'}}">
<svg ng-show="state.mailList.selected.flagged"><use xlink:href="#icon-star_filled" /><title>Favorited</title></svg>
<svg ng-show="!state.mailList.selected.flagged"><use xlink:href="#icon-star" /><title>Not Favorited</title></svg>
<button wo-touch="flagMessage(state.mailList.selected, !state.mailList.selected.flagged)" class="btn-icon-light" title="{{state.mailList.selected.flagged ? 'Remove Star' : 'Add Star'}}">
<svg ng-show="state.mailList.selected.flagged"><use xlink:href="#icon-star_filled" /><title>Starred</title></svg>
<svg ng-show="!state.mailList.selected.flagged"><use xlink:href="#icon-star" /><title>Not Starred</title></svg>
</button>
</li>
<li>