Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
This commit is contained in:
commit
31000afbf3
|
@ -21,6 +21,7 @@
|
|||
<div id="custom_auth_div">
|
||||
<dt id="custom_username-label" class="block-display">
|
||||
<label class="optional" for="custom_username"><?php echo $this->element->getElement('custom_username')->getLabel() ?> :
|
||||
<span class='stream_username_help_icon'></span>
|
||||
</label>
|
||||
</dt>
|
||||
<dd id="custom_username-element" class="block-display">
|
||||
|
|
|
@ -33,6 +33,7 @@
|
|||
</dd>
|
||||
<dt id="master_username-label">
|
||||
<label class="optional" for="master_username"><?php echo $this->element->getElement('master_username')->getLabel() ?> :
|
||||
<span class='stream_username_help_icon'></span>
|
||||
</label>
|
||||
</dt>
|
||||
<dd id="master_username-element">
|
||||
|
|
|
@ -68,7 +68,9 @@
|
|||
</legend>
|
||||
<dl class="zend_form">
|
||||
<dt id="outputUser-label">
|
||||
<label for="outputUser"><?php echo $this->element->getElement('user')->getLabel()?> :</label>
|
||||
<label for="outputUser"><?php echo $this->element->getElement('user')->getLabel()?> :
|
||||
<span class='stream_username_help_icon'></span>
|
||||
</label>
|
||||
</dt>
|
||||
<dd id="outputUser-element">
|
||||
<?php echo $this->element->getElement('user')?>
|
||||
|
|
|
@ -104,7 +104,7 @@ select {
|
|||
line-height:16px !important;
|
||||
}
|
||||
|
||||
.airtime_auth_help_icon, .custom_auth_help_icon {
|
||||
.airtime_auth_help_icon, .custom_auth_help_icon, .stream_username_help_icon {
|
||||
cursor: help;
|
||||
position: relative;
|
||||
display:inline-block; zoom:1;
|
||||
|
|
|
@ -304,4 +304,25 @@ $(document).ready(function() {
|
|||
at: "right center"
|
||||
},
|
||||
})
|
||||
|
||||
$(".stream_username_help_icon").qtip({
|
||||
content: {
|
||||
text: "If your live streaming client does not ask for a username, this field should be 'source'."
|
||||
},
|
||||
hide: {
|
||||
delay: 500,
|
||||
fixed: true
|
||||
},
|
||||
style: {
|
||||
border: {
|
||||
width: 0,
|
||||
radius: 4
|
||||
},
|
||||
classes: "ui-tooltip-dark ui-tooltip-rounded"
|
||||
},
|
||||
position: {
|
||||
my: "left bottom",
|
||||
at: "right center"
|
||||
},
|
||||
})
|
||||
});
|
||||
|
|
|
@ -220,6 +220,26 @@ function setAddShowEvents() {
|
|||
at: "right center"
|
||||
}
|
||||
});
|
||||
form.find(".stream_username_help_icon").qtip({
|
||||
content: {
|
||||
text: "If your live streaming client does not ask for a username, this field should be 'source'."
|
||||
},
|
||||
hide: {
|
||||
delay: 500,
|
||||
fixed: true
|
||||
},
|
||||
style: {
|
||||
border: {
|
||||
width: 0,
|
||||
radius: 4
|
||||
},
|
||||
classes: "ui-tooltip-dark ui-tooltip-rounded"
|
||||
},
|
||||
position: {
|
||||
my: "left bottom",
|
||||
at: "right center"
|
||||
}
|
||||
});
|
||||
|
||||
function endDateVisibility(){
|
||||
if(form.find("#add_show_no_end").is(':checked')){
|
||||
|
|
|
@ -91,16 +91,15 @@ denise@denise-DX4860:~/airtime/airtime_mvc/public/js/fullcalendar$ diff -u fullc
|
|||
clearEvents();
|
||||
}
|
||||
- updateCells(firstTime);
|
||||
+ getOffset();
|
||||
+ getOffset(firstTime);
|
||||
}
|
||||
|
||||
-
|
||||
-
|
||||
+ function getOffset() {
|
||||
+ function getOffset(firstTime) {
|
||||
+ var timezoneOffset;
|
||||
+ $.ajax({ url: "/Api/calendar-init/format/json", dataType:"json", success:function(data) {
|
||||
+ timezoneOffset = data.calendarInit.timezoneOffset*1000;
|
||||
+ var firstTime = !body;
|
||||
+ updateCells(firstTime, timezoneOffset);
|
||||
+ }, error:function(jqXHR, textStatus, errorThrown){}});
|
||||
+ }
|
||||
|
|
|
@ -2187,14 +2187,13 @@ function BasicView(element, calendar, viewName) {
|
|||
}else{
|
||||
clearEvents();
|
||||
}
|
||||
getOffset();
|
||||
getOffset(firstTime);
|
||||
}
|
||||
|
||||
function getOffset() {
|
||||
function getOffset(firstTime) {
|
||||
var timezoneOffset;
|
||||
$.ajax({ url: "/Api/calendar-init/format/json", dataType:"json", success:function(data) {
|
||||
timezoneOffset = data.calendarInit.timezoneOffset*1000;
|
||||
var firstTime = !body;
|
||||
updateCells(firstTime, timezoneOffset);
|
||||
}, error:function(jqXHR, textStatus, errorThrown){}});
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue