refresh layout

This commit is contained in:
Milan
2018-12-10 13:09:42 +01:00
parent 7449b53667
commit e9b17e5c91
14 changed files with 223 additions and 134 deletions

View File

@@ -205,23 +205,63 @@ function getUrlParameter(name){
return results[1];
}
function handleBars(){
var menu=$('#calcms_admin_menu');
menu.toggleClass('mobile');
if (menu.hasClass('mobile')){
$('#calcms_admin_menu div').show();
$('#content').hide();
}else{
$('#content').show();
setupMenu(1);
}
}
var oldWidth=0;
function setupMenu(update){
var xmax=960;
var menu = $('#calcms_admin_menu');
var width = menu.width();
if ( (width < xmax) && (oldWidth >= xmax) ) update=1;
if ( (width >= xmax) && (oldWidth < xmax) ) update=1;
if (oldWidth==0) update=1;
if (update == 1){
if (menu.width() < 960){
$('#calcms_admin_menu div').hide();
$('#calcms_admin_menu div.mobile').show();
}else{
$('#calcms_admin_menu div').show();
$('#calcms_admin_menu #bars').hide();
menu.removeClass('mobile');
}
}
oldWidth = width;
}
// will be overridden by calendar.js
function setupMenuHeight(){
var content=$('#content');
content.css("position", "relative");
var menu=$('#calcms_admin_menu');
$('#content').css("position", "absolute");
var top = menu.height();
$('#content').css("top", top);
content.css("top", top);
/*
console.log($(window).width()+" "+$(document).width()+" "+$('#content').width());
var left=0;
if( $(window).width() >= $(document).width() ){
left=$(document).width()-$('#content').width();
left=$(document).width() - $('#content').width();
left/=2;
if (left<40)left=0;
}
$('#content').css("left", left);
*/
return top;
}
@@ -311,10 +351,19 @@ function initLabels(){
$(document).ready(
function(){
setupMenu();
checkSession();
setMissingUrlParameters();
// will be done implicitely on adding back button
//setupMenuHeight();
$(window).resize(function() {
setupMenuHeight();
setupMenu();
});
if(getController()=='calendar'){
//use build-in localization
console.log("add back")
@@ -327,12 +376,6 @@ $(document).ready(
});
}
initLabels();
setupMenuHeight();
$(window).resize(function() {
setupMenuHeight();
});
}
);

View File

@@ -720,6 +720,7 @@ function updateTable(){
$(window).resize(function() {
resizeCalendarMenu();
setupMenu()
});
}

View File

@@ -13,15 +13,6 @@ function edit_event(event_id, series_id, studio_id, project_id, hide_series){
var url="event.cgi?project_id="+project_id+"&studio_id="+studio_id+"&series_id="+series_id+"&event_id="+event_id+"&action=edit";
if ((hide_series!=null) && (hide_series!=''))url+='&hide_series=1';
load(url);
/*
updateContainer(
'event_details_'+event_id,
url,
function(){
$('#event_container_'+event_id).slideToggle();
}
);
*/
}
}

View File

@@ -81,9 +81,9 @@ $(document).ready(
initTextWidth();
setTextWidth('.datetimepicker.start', 120);
setTextWidth('.datetimepicker.end', 120);
setTextWidth('.datetimepicker.end_date', 80);
setTextWidth('.datetimepicker.start', 130);
setTextWidth('.datetimepicker.end', 130);
setTextWidth('.datetimepicker.end_date', 90);
setTextWidth('.datetimepicker.weekday', 20);
setTextWidth('.datetimepicker.frequency', 20);