CC-2484:Calendar sholdn't move down
- the fix was fairly easy. so I did complete fix.
This commit is contained in:
parent
c0b95f583a
commit
48537c3c10
4 changed files with 18 additions and 5 deletions
|
@ -5,8 +5,8 @@
|
||||||
|
|
||||||
#schedule-add-show {
|
#schedule-add-show {
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
width: 25%;
|
/*width: 25%;*/
|
||||||
min-width:340px;
|
width:310px;
|
||||||
}
|
}
|
||||||
|
|
||||||
#schedule-add-show textarea {
|
#schedule-add-show textarea {
|
||||||
|
|
|
@ -1522,10 +1522,10 @@ div.success{
|
||||||
margin-right:6px;
|
margin-right:6px;
|
||||||
}
|
}
|
||||||
.formrow-repeat li .hasDatepicker, .formrow-repeat li .input_select {
|
.formrow-repeat li .hasDatepicker, .formrow-repeat li .input_select {
|
||||||
width:160px;
|
width:95px;
|
||||||
}
|
}
|
||||||
.formrow-repeat li .hasTimepicker {
|
.formrow-repeat li .hasTimepicker {
|
||||||
width:80px;
|
width:60px;
|
||||||
}
|
}
|
||||||
.recording-show {
|
.recording-show {
|
||||||
float: right;
|
float: right;
|
||||||
|
|
|
@ -423,6 +423,15 @@ $(document).ready(function() {
|
||||||
//setAddShowEvents();
|
//setAddShowEvents();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
$(window).resize(function(){
|
||||||
|
var windowWidth = $(this).width();
|
||||||
|
// margin on showform are 16 px on each side
|
||||||
|
var calendarWidth = 100-(($("#schedule-add-show").width() + (16 * 6))/windowWidth*100);
|
||||||
|
var widthPercent = parseInt(calendarWidth)+"%";
|
||||||
|
$("#schedule_calendar").css("width", widthPercent);
|
||||||
|
$("#schedule_calendar").fullCalendar('render');
|
||||||
|
});
|
||||||
|
|
||||||
$(window).load(function() {
|
$(window).load(function() {
|
||||||
|
|
||||||
setAddShowEvents();
|
setAddShowEvents();
|
||||||
|
|
|
@ -13,7 +13,11 @@ function openAddShowForm() {
|
||||||
if($("#add-show-form").length == 1) {
|
if($("#add-show-form").length == 1) {
|
||||||
if( ($("#add-show-form").css('display')=='none')) {
|
if( ($("#add-show-form").css('display')=='none')) {
|
||||||
$("#add-show-form").show();
|
$("#add-show-form").show();
|
||||||
$("#schedule_calendar").css("width", "70%");
|
var windowWidth = $(window).width();
|
||||||
|
// margin on showform are 16 px on each side
|
||||||
|
var calendarWidth = 100-(($("#schedule-add-show").width() + (16 * 6))/windowWidth*100);
|
||||||
|
var widthPercent = parseInt(calendarWidth)+"%";
|
||||||
|
$("#schedule_calendar").css("width", widthPercent);
|
||||||
$("#schedule_calendar").fullCalendar('render');
|
$("#schedule_calendar").fullCalendar('render');
|
||||||
}
|
}
|
||||||
$("#schedule-show-what").show(0, function(){
|
$("#schedule-show-what").show(0, function(){
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue