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

Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder

Browse source 
Conflicts:
	airtime_mvc/public/js/airtime/common/common.js
This commit is contained in:
Duncan Sommerville 2015-08-14 10:54:53 -04:00
commit 12c4e4a374
18 changed files with 318 additions and 171 deletions
Download patch file Download diff file Expand all files Collapse all files

2
airtime_mvc/public/js/airtime/common/common.js
View file

@ -206,4 +206,4 @@ $(document).mouseup(function (e) {
if (!mb.is(e.target) && mb.has(e.target).length === 0 && w <= 970) {
$('#nav').find('.responsive-menu').slideUp();
}
});
});

10
airtime_mvc/public/js/airtime/dashboard/dashboard.js
View file

@ -480,12 +480,12 @@ function setCurrentUserPseudoPassword() {
$('#cu_passwordVerify').val("xxxxxx");
}
$(window).resize(function() {
/* If we don't do this, the menu can stay hidden after resizing */
/*$(window).resize(function() {
*//* If we don't do this, the menu can stay hidden after resizing *//*
if ($(this).width() > 970) {
$("#nav .responsive-menu").show();
}
});
});*/
$(document).ready(function() {
if ($('#master-panel').length > 0)
@ -509,7 +509,7 @@ $(document).ready(function() {
// text. This differs depending on the language setting
$('#popup-link').css('width', $('.jp-container h1').css('width'));
$('#menu-btn').click(function() {
/*$('#menu-btn').click(function() {
$('#nav .responsive-menu').slideToggle();
});
});*/
});

15
airtime_mvc/public/js/airtime/library/_library.js
View file

@ -136,7 +136,7 @@ var AIRTIME = (function(AIRTIME) {
"</button>" +
"</div>")
.append("<div class='btn-group' title=" + $.i18n._('Delete') + ">" +
"<button class='btn btn-small' id='sb-trash'>" +
"<button class='btn btn-small btn-danger' id='sb-trash'>" +
"<i class='icon-white icon-trash'></i>" +
"<span>" + $.i18n._('Delete') + "</span>" +
"</button>" +
@ -1257,6 +1257,19 @@ $(document).ready(function() {
}
});
if (location.hash === "") {
$("a[href$='#files']").parent().addClass("selected");
}
$("a[href$='"+location.hash+"']").parent().addClass("selected");
$(window).on('hashchange', function() {
$(".media_type_selector").each(function () {
$(this).removeClass("selected");
});
$("a[href$='"+location.hash+"']").parent().addClass("selected");
oTable.fnDraw();
});
$(".media_type_selector").on("click", function() {
if (!$(this).hasClass("selected")) {
AIRTIME.library.selectNone();

14
airtime_mvc/public/js/airtime/nav/nav.js Normal file
View file

@ -0,0 +1,14 @@
/*$(document).ready(function() {
$(".media_type_selector").on("click", function() {
console.log("hello");
console.log(location.hash);
if (!$(this).hasClass("selected")) {
//AIRTIME.library.selectNone();
$(".media_type_selector").each(function () {
$(this).removeClass("selected");
});
$(this).addClass("selected");
oTable.fnDraw();
}
});
});*/

24
airtime_mvc/public/js/airtime/showbuilder/_builder.js
View file

@ -1103,21 +1103,29 @@ var AIRTIME = (function(AIRTIME){
"</ul>" +
"</div>")
.append("<div class='btn-group'>" +
"<button title='"+$.i18n._("Remove overbooked tracks")+"' class='ui-state-disabled btn btn-small' disabled='disabled'>" +
"<i class='icon-white icon-cut'></i></button></div>")
"<button title='"+$.i18n._("Trim overbooked shows")+"' class='ui-state-disabled btn btn-small btn-icon-text' disabled='disabled'>" +
"<i class='icon-white icon-cut'></i>" +
"<span>" + $.i18n._('Trim overbooked shows') + "</span>" +
"</button></div>")
.append("<div class='btn-group'>" +
"<button title='"+$.i18n._("Remove selected scheduled items")+"' class='ui-state-disabled btn btn-small' disabled='disabled'>" +
"<i class='icon-white icon-trash'></i></button></div>");
"<button title='"+$.i18n._("Remove selected scheduled items")+"' class='ui-state-disabled btn btn-small btn-icon-text btn-danger' disabled='disabled'>" +
"<i class='icon-white icon-trash'></i>" +
"<span>" + $.i18n._('Remove') + "</span>" +
"</button></div>");
//if 'Add/Remove content' was chosen from the context menu
//in the Calendar do not append these buttons
if ($(".ui-dialog-content").length === 0) {
$menu.append("<div class='btn-group'>" +
"<button title='"+$.i18n._("Jump to the current playing track")+"' class='ui-state-disabled btn btn-small' disabled='disabled'>" +
"<i class='icon-white icon-step-forward'></i></button></div>")
"<button title='"+$.i18n._("Jump to the current playing track")+"' class='ui-state-disabled btn btn-small btn-icon-text' disabled='disabled'>" +
"<i class='icon-white icon-step-forward'></i>" +
"<span>" + $.i18n._('Jump to Current') + "</span>" +
"</button></div>")
.append("<div class='btn-group'>" +
"<button title='"+$.i18n._("Cancel current show")+"' class='ui-state-disabled btn btn-small btn-danger' disabled='disabled'>" +
"<i class='icon-white icon-ban-circle'></i></button></div>");
"<button title='"+$.i18n._("Cancel current show")+"' class='ui-state-disabled btn btn-small btn-icon-text btn-danger' disabled='disabled'>" +
"<i class='icon-white icon-ban-circle'></i>" +
"<span>" + $.i18n._('Cancel current show') + "</span>" +
"</button></div>");
}
if (localStorage.getItem('user-type') != 'G') {