diff --git a/NEWS b/NEWS index 0d2b53b4a..83e2dbbff 100644 --- a/NEWS +++ b/NEWS @@ -5,6 +5,7 @@ Enhancements - [web] improve action progress when login in or sending a message (#3765, #3761) - [web] don't allow to send the message while an upload is in progress - [web] notify when successfuly copied or moved some messages + - [web] restored indicator in the top banner when a vacation message (auto-reply) is active Bug fixes - [web] fixed refresh of addressbook when deleting one or many cards diff --git a/UI/Common/UIxPageFrame.m b/UI/Common/UIxPageFrame.m index e7506182f..1f35c9ff1 100644 --- a/UI/Common/UIxPageFrame.m +++ b/UI/Common/UIxPageFrame.m @@ -518,15 +518,6 @@ return [ud language]; } -- (BOOL) userHasVacationEnabled -{ - NSDictionary *vacationOptions; - - vacationOptions = [[[context activeUser] userDefaults] vacationOptions]; - - return (vacationOptions && [[vacationOptions objectForKey: @"enabled"] boolValue]); -} - /* UserDefaults, UserSettings */ - (NSString *) _dictionaryWithKeys: (NSArray *) keys fromSource: (SOGoDefaultsSource *) source diff --git a/UI/Common/UIxTopnavToolbar.m b/UI/Common/UIxTopnavToolbar.m index 7e1363cee..87fa63526 100644 --- a/UI/Common/UIxTopnavToolbar.m +++ b/UI/Common/UIxTopnavToolbar.m @@ -18,6 +18,11 @@ * Boston, MA 02111-1307, USA. */ +#import + +#import +#import + #import "UIxTopnavToolbar.h" @implementation UIxTopnavToolbar @@ -48,4 +53,13 @@ return navButtonClick; } +- (BOOL) userHasVacationEnabled +{ + NSDictionary *vacationOptions; + + vacationOptions = [[[context activeUser] userDefaults] vacationOptions]; + + return (vacationOptions && [[vacationOptions objectForKey: @"enabled"] boolValue]); +} + @end diff --git a/UI/Templates/UIxTopnavToolbar.wox b/UI/Templates/UIxTopnavToolbar.wox index 73950a582..cda1ad635 100644 --- a/UI/Templates/UIxTopnavToolbar.wox +++ b/UI/Templates/UIxTopnavToolbar.wox @@ -49,6 +49,9 @@ var:ng-click="navButtonClick" ng-href="{{activeUser.path.mail}}"> email + + forward +