From e27cdff8cca1bc4af5bbccef8f02a695e1d42f89 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Thu, 25 Feb 2016 11:12:30 -0500
Subject: [PATCH] (html) Fix fab button position in Calendar module

Fixes #3462
---
 NEWS                                        |  1 +
 UI/Templates/SchedulerUI/UIxCalMainView.wox | 24 ++++++++++-----------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/NEWS b/NEWS
index 944af02ef..b4eaa1c44 100644
--- a/NEWS
+++ b/NEWS
@@ -33,6 +33,7 @@ Bug fixes
  - [web] fixed password change (#3496)
  - [web] fixed saving of notification email for calendar changes (#3522)
  - [web] fixed ACL editor for authenticated users in Mail module
+ - [web] fixed fab button position in Calendar module (#3462)
  - [eas] allow EAS attachments get on 2nd-level mailboxes (#3505)
  - [eas] fix EAS bday shift (#3518)
 
diff --git a/UI/Templates/SchedulerUI/UIxCalMainView.wox b/UI/Templates/SchedulerUI/UIxCalMainView.wox
index 2389f9c3d..0c26f09d9 100644
--- a/UI/Templates/SchedulerUI/UIxCalMainView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalMainView.wox
@@ -589,19 +589,19 @@
               </md-list>
             </md-tab>
           </md-tabs>
-          <md-button class="md-fab md-fab-bottom-right"
-                     label:aria-label="Create a new event"
-                     ng-click="list.newComponent($event)"
-                     ng-if="list.componentType == 'events'">
-            <md-icon >event</md-icon>
-          </md-button>
-          <md-button class="md-fab md-fab-bottom-right"
-                     label:aria-label="Create a new task"
-                     ng-click="list.newComponent($event)"
-                     ng-if="list.componentType == 'tasks'">
-            <md-icon>assignment_turned_in</md-icon>
-          </md-button>
         </md-content>
+        <md-button class="md-fab md-fab-bottom-right"
+                   label:aria-label="Create a new event"
+                   ng-click="list.newComponent($event)"
+                   ng-if="list.componentType == 'events'">
+          <md-icon >event</md-icon>
+        </md-button>
+        <md-button class="md-fab md-fab-bottom-right"
+                   label:aria-label="Create a new task"
+                   ng-click="list.newComponent($event)"
+                   ng-if="list.componentType == 'tasks'">
+          <md-icon>assignment_turned_in</md-icon>
+        </md-button>
         </div>
         <div id="detailView" class="view-detail hide-xs" layout="column" ui-view="calendarView">
           <!-- calendar view -->