Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #615 from frecuencialibre/autoloading-playlist-icon

Browse source 
add clock icon for autoloading playlists in calendar, remove empty show alert
This commit is contained in:
Robb 2018-11-27 17:10:51 -05:00 • committed by GitHub
commit dbd71266e6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 182 additions and 179 deletions
Download patch file Download diff file Expand all files Collapse all files

1
airtime_mvc/public/css/fullcalendar.css
View file

@ -314,6 +314,7 @@ a.fc-event {
.fc-event-time,
.fc-event-title {
padding: 0 1px;
height: 12px;
}
.fc .ui-resizable-handle { /*** TODO: don't use ui-resizable anymore, change class ***/

1
airtime_mvc/public/css/images/icon-clock.svg Normal file
View file

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><g data-name="Layer 2"><g data-name="clock"><rect width="24" height="24" transform="rotate(180 12 12)" opacity="0"/><path d="M12 2a10 10 0 1 0 10 10A10 10 0 0 0 12 2zm4 11h-4a1 1 0 0 1-1-1V8a1 1 0 0 1 2 0v3h3a1 1 0 0 1 0 2z" fill="#fff"/></g></g></svg>
Side by side

After

Width:  |  Height:  |  Size: 313 B

5
airtime_mvc/public/css/styles.css
View file

@ -2272,14 +2272,15 @@ span.errors.sp-errors{
height:10px;
float:right;
margin-left:3px;
margin-top:2px;
}
.small-icon.linked {
background:url(images/icon_link.png) no-repeat 0 0;
margin-top: 0px !important;
}
.small-icon.autoplaylist {
background:url(images/icon_alert_cal_autoplaylist.png) no-repeat 0 0;
background: url(images/icon-clock.svg) black no-repeat center center;
border-radius: 2px;
background-size: contain;
}
.small-icon.recording {

8
airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js
View file

@ -218,7 +218,7 @@ function eventRender(event, element, view) {
} else if (event.show_has_auto_playlist === true) {
$(element)
.find(".fc-event-time")
.before('<span class="small-icon autoplaylist"></span><span class="small-icon show-empty"></span>');
.before('<span class="small-icon autoplaylist"></span>');
}
else {
$(element)
@ -233,7 +233,7 @@ function eventRender(event, element, view) {
} else if (event.show_has_auto_playlist === true) {
$(element)
.find(".fc-event-time")
.before('<span class="small-icon autoplaylist"></span><span class="small-icon show-partial-filled"></span>');
.before('<span class="small-icon autoplaylist"></span>');
} else {
$(element)
.find(".fc-event-time")
@ -259,7 +259,7 @@ function eventRender(event, element, view) {
} else if (event.show_has_auto_playlist === true) {
$(element)
.find(".fc-event-title")
.after('<span title="'+$.i18n._("Show has an automatic playlist")+'"class="small-icon autoplaylist"></span><span title="'+$.i18n._("Show is empty")+'" class="small-icon show-empty"></span>');
.after('<span title="' + $.i18n._("Show has an automatic playlist") + '"class="small-icon autoplaylist"></span>');
} else {
$(element)
.find(".fc-event-title")
@ -273,7 +273,7 @@ function eventRender(event, element, view) {
} else if (event.show_has_auto_playlist === true) {
$(element)
.find(".fc-event-title")
.after('<span title="'+$.i18n._("Show has an automatic playlist")+'"class="small-icon autoplaylist"></span><span title="'+$.i18n._("Show is partially filled")+'" class="small-icon show-partial-filled"></span>');
.after('<span title="' + $.i18n._("Show has an automatic playlist") + '"class="small-icon autoplaylist"></span>');
} else {
$(element)
.find(".fc-event-title")