From 8ee017f982ca94d3f87f631285bfa200cce76340 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Fri, 9 Apr 2021 10:38:34 +0200
Subject: [PATCH] Add new event button and move new calendar

---
 www/calendar/app-calendar.less | 19 ++++++++++++++++++
 www/calendar/inner.js          | 35 +++++++++++++++++++++++-----------
 2 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/www/calendar/app-calendar.less b/www/calendar/app-calendar.less
index ce3487eb2..55c892c37 100644
--- a/www/calendar/app-calendar.less
+++ b/www/calendar/app-calendar.less
@@ -127,6 +127,25 @@
                 justify-content: space-between;
                 padding: 5px;
                 cursor: pointer;
+                &.cp-ghost {
+                    padding: 0;
+                    button {
+                        .tools_unselectable();
+                        cursor: pointer;
+                        width: 100%;
+                        display: flex;
+                        justify-content: space-between;
+                        background: transparent;
+                        border: 1px solid @cryptpad_text_col;
+                        height: 36px;
+                        font: @colortheme_app-font;
+                        align-items: center;
+                        color: @cryptpad_text_col;
+                        &:hover {
+                            background: @cp_sidebar-left-active;
+                        }
+                    }
+                }
                 &:not(:last-child) {
                     margin-bottom: 10px;
                 }
diff --git a/www/calendar/inner.js b/www/calendar/inner.js
index 27846ac73..2128307e6 100644
--- a/www/calendar/inner.js
+++ b/www/calendar/inner.js
@@ -66,6 +66,8 @@ Messages.calendar_errorNoCalendar = "No editable calendar selected!";
 Messages.calendar_myCalendars = "My calendars";
 Messages.calendar_tempCalendar = "Temp calendar";
 Messages.calendar_import = "Import to my calendars";
+Messages.calendar_newEvent = "New event";
+Messages.calendar_new = "New calendar";
 
     var onCalendarsUpdate = Util.mkEvent();
 
@@ -505,17 +507,6 @@ Messages.calendar_import = "Import to my calendars";
         return calendar;
     };
     var makeLeftside = function (calendar, $container) {
-        var $topContainer = $(h('div.cp-calendar-new')).appendTo($container);
-        // Add new button
-        var newButton = h('button.btn.btn-primary', [
-            h('i.fa.fa-plus'),
-            h('span', Messages.newButton)
-        ]);
-        $(newButton).click(function () {
-            editCalendar();
-        });
-        $topContainer.append(newButton);
-
         // Show calendars
         var calendars = h('div.cp-calendar-list');
         var $calendars = APP.$calendars = $(calendars).appendTo($container);
@@ -559,8 +550,20 @@ Messages.calendar_import = "Import to my calendars";
                     makeCalendarEntry(id, teamId);
                 });
             });
+
+            // Add new button
+            var $newContainer = $(h('div.cp-calendar-entry.cp-ghost')).appendTo($calendars);
+            var newButton = h('button', [
+                h('i.fa.fa-plus'),
+                h('span', Messages.calendar_new),
+                h('span')
+            ]);
+            $(newButton).click(function () {
+                editCalendar();
+            }).appendTo($newContainer);
         });
         onCalendarsUpdate.fire();
+
     };
     var updateDateRange = function () {
         var range = APP.calendar._renderRange;
@@ -711,6 +714,16 @@ Messages.calendar_import = "Import to my calendars";
         });
         APP.toolbar.$bottomR.append($block);
 
+        // New event button
+        var newEvent = h('button', [
+            h('i.fa.fa-plus'),
+            h('span', Messages.calendar_newEvent)
+        ]);
+        $(newEvent).click(function (e) {
+            e.preventDefault();
+            cal.openCreationPopup({isAllDay:false});
+        }).appendTo(APP.toolbar.$bottomL);
+
         // Change page
         var goLeft = h('button.fa.fa-chevron-left');
         var goRight = h('button.fa.fa-chevron-right');