use new icon set

adopt UI to use new icon set
This commit is contained in:
Milan
2018-10-05 00:20:45 +02:00
parent 1f9cd04914
commit 8eb6a64209
26 changed files with 4232 additions and 77 deletions

View File

@@ -207,12 +207,13 @@ function getUrlParameter(name){
// will be overridden by calendar.js
function setupMenuHeight(){
//$('#content').css("position", "absolute");
var menu=$('#calcms_admin_menu');
/*
var top = $('#calcms_admin_menu').height();
$('#content').css("position", "absolute");
var top = menu.height();
$('#content').css("top", top);
var left=0;
if( $(window).width() >= $(document).width() ){
left=$(document).width()-$('#content').width();
@@ -220,7 +221,7 @@ function setupMenuHeight(){
if (left<40)left=0;
}
$('#content').css("left", left);
*/
return top;
}
@@ -326,10 +327,11 @@ $(document).ready(
});
}
initLabels();
//setupMenuHeight();
//$(window).resize(function() {
//setupMenuHeight();
//});
setupMenuHeight();
$(window).resize(function() {
setupMenuHeight();
});
}
);

View File

@@ -407,19 +407,24 @@ function checkStudio(){
function setIcons(){
var img='';
img='<img class="img_live" src="image/live.png" title="live">'
//img='<img class="img_live" src="image/live.png" title="live">'
img='<i class="fas fa-microphone-alt" title="live"></i>';
$('#calendar div.event.live.no_rerun div.icons').append(img);
img='<img class="img_preproduced" src="image/preproduced.png" title="preproduced">'
img='<i class="fas fa-microphone-slash" title="preproduced"></i>';
//img='<img class="img_preproduced" src="image/preproduced.png" title="preproduced">'
$('#calendar div.event.preproduced.no_rerun div.icons').append(img);
img='<img class="img_rerun" src="image/rerun.png" title="rerun">'
img='<i class="fas fa-redo" title="rerun"></i>';
//img='<img class="img_rerun" src="image/rerun.png" title="rerun">'
$('#calendar div.event.rerun div.icons').append(img);
img='<img class="img_playout" src="image/playout.png" title="playout">'
img='<i class="fas fa-play" title="playout"></i>';
//img='<img class="img_playout" src="image/playout.png" title="playout">'
$('#calendar div.event.playout div.icons').append(img);
img='<img class="img_archived" src="image/archived.png" title="archived">'
img='<i class="fas fa-archive" title="archived"></i>';
//img='<img class="img_archived" src="image/archived.png" title="archived">'
$('#calendar div.event.archived div.icons').append(img);
}

View File

@@ -133,11 +133,16 @@ function addBackButton(){
// add back button if history exists
var history=getHistory();
//console.log(history.length);
if (history.length>1) $('#calcms_admin_menu').first().prepend(
'<div><a id="backButton" href="#" onclick="getBack();">'
+loc['button_back']
+'</a></div>'
);
if (history.length>1){
$('#calcms_admin_menu').first().prepend(
'<div><a id="backButton" href="#" onclick="getBack();">'
+'<i class="fas fa-caret-square-left fa-1g"></i>'
+'&nbsp'
+loc['button_back']
+'</a></div>'
);
}
setupMenuHeight();
//showHistory();
}