summaryrefslogtreecommitdiffstats
path: root/tools/pharos-dashboard/static
diff options
context:
space:
mode:
authormaxbr <maxbr@mi.fu-berlin.de>2016-08-19 17:15:28 +0200
committermaxbr <maxbr@mi.fu-berlin.de>2016-08-19 17:15:28 +0200
commitebaa05ab2b53634a7a3e738618a031fd1518d796 (patch)
tree2df4bf769f6ed52f4b9109a96d3194aa5a95e453 /tools/pharos-dashboard/static
parent54322038f766be460b676d60974886be5f04d8f3 (diff)
Use Jira Oauth for user authentication
JIRA: RELENG-12 Users can use their jira accounts for the dashboard. This also allows the dasboard to open jira tickets for bookings. Signed-off-by: maxbr <maxbr@mi.fu-berlin.de>
Diffstat (limited to 'tools/pharos-dashboard/static')
-rw-r--r--tools/pharos-dashboard/static/css/theme.css10
-rw-r--r--tools/pharos-dashboard/static/js/fullcalendar-options.js16
2 files changed, 14 insertions, 12 deletions
diff --git a/tools/pharos-dashboard/static/css/theme.css b/tools/pharos-dashboard/static/css/theme.css
index 4cec341d..bd156372 100644
--- a/tools/pharos-dashboard/static/css/theme.css
+++ b/tools/pharos-dashboard/static/css/theme.css
@@ -1,7 +1,13 @@
.blink_me {
- animation: blinker 1.5s linear infinite;
+ animation: blinker 1.5s linear infinite;
}
@keyframes blinker {
- 20% { opacity: 0.4; }
+ 20% {
+ opacity: 0.4;
+ }
+}
+
+.modal p {
+ word-wrap: break-word;
} \ No newline at end of file
diff --git a/tools/pharos-dashboard/static/js/fullcalendar-options.js b/tools/pharos-dashboard/static/js/fullcalendar-options.js
index 85423b86..c57baa6f 100644
--- a/tools/pharos-dashboard/static/js/fullcalendar-options.js
+++ b/tools/pharos-dashboard/static/js/fullcalendar-options.js
@@ -1,14 +1,8 @@
var tmpevent;
-// converts a moment to a readable fomat for the backend
-function convertInputTime(time) {
- return time;
- //return moment(time).format('YYYY-MM-DD HH:00 ZZ');
-}
-
function sendEventToForm(event) {
- $('#starttimepicker').data("DateTimePicker").date(convertInputTime(event.start));
- $('#endtimepicker').data("DateTimePicker").date(convertInputTime(event.end));
+ $('#starttimepicker').data("DateTimePicker").date(event.start);
+ $('#endtimepicker').data("DateTimePicker").date(event.end);
}
var calendarOptions = {
@@ -40,12 +34,13 @@ var calendarOptions = {
if (tmpevent != undefined) {
$('#calendar').fullCalendar('removeEvents', tmpevent.id);
$('#calendar').fullCalendar('rerenderEvents');
+ tmpevent = undefined;
}
// the times need to be converted here to make them show up in the agendaWeek view if they
// are created in the month view. If they are not converted, the tmpevent will only show
// up in the (deactivated) allDaySlot
- start = convertInputTime(start);
- end = convertInputTime(end);
+ start = moment(start);
+ end = moment(end);
tmpevent = {
id: '537818f62bc63518ece15338fb86c8be',
@@ -64,6 +59,7 @@ var calendarOptions = {
if (event.id != tmpevent.id) {
$('#calendar').fullCalendar('removeEvents', tmpevent.id);
$('#calendar').fullCalendar('rerenderEvents');
+ tmpevent = undefined;
}
}
},