~xibo-maintainers/xibo/tempel

« back to all changes in this revision

Viewing changes to web/theme/default/libraries/calendar/tmpls/month-day.html

  • Committer: Dan Garner
  • Date: 2016-04-05 12:44:24 UTC
  • mfrom: (487.1.67)
  • Revision ID: git-v1:3ee1212b02c722a146a00e094f0ff69f88fb5c7d
Merge pull request #149 from dasgarner/develop

Post 1.8.0-alpha3 fixes

Show diffs side-by-side

added added

removed removed

Lines of Context:
9
9
            var eventClass = "event-warning";
10
10
 
11
11
            if (event.event.dayPartId == 0) {
12
 
                if (event.sameDay) {
13
 
                    title = "[" + moment(event.event.fromDt, "X").format("HH:mm") + " - " + moment(event.event.toDt, "X").format("HH:mm") + "] " + event.title;
 
12
                if (event.event.eventTypeId == 2) {
 
13
                    title = "[" + moment(event.event.fromDt).format("HH:mm") + "] " + event.title;
 
14
                } else if (event.sameDay) {
 
15
                    title = "[" + moment(event.event.fromDt).format("HH:mm") + " - " + moment(event.event.toDt).format("HH:mm") + "] " + event.title;
14
16
                } else {
15
 
                    title = "[" + moment(event.event.fromDt, "X").format(jsDateFormat) + " - " + moment(event.event.toDt, "X").format(jsDateFormat) + "] " + event.title;
 
17
                    title = "[" + moment(event.event.fromDt).format(jsDateFormat) + " - " + moment(event.event.toDt).format(jsDateFormat) + "] " + event.title;
16
18
                }
17
19
            }
18
20
 
40
42
                eventIcon = "fa-bullseye";
41
43
            }
42
44
 
 
45
            if (event.event.eventTypeId == 2)
 
46
                eventIcon = "fa-wrench";
 
47
 
43
48
            if (!event.editable) {
44
 
                eventIcon = "fa-wrench";
 
49
                eventIcon = "fa-lock";
45
50
                eventClass = "event-inverse";
46
51
            }
47
52
            %>