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

Merge branch 'saas-dev' into saas-dev-publishing

Browse source 
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/controllers/plugins/Acl_plugin.php
This commit is contained in:
Duncan Sommerville 2015-10-19 16:18:19 -04:00
commit 12f6536e74
32 changed files with 4672 additions and 326 deletions
Download patch file Download diff file Expand all files Collapse all files

9
airtime_mvc/public/css/styles.css
View file

@ -288,15 +288,13 @@ select {
color:#ff5d1a;
}
.now-playing-block {
/*width:35%;*/
flex: 1 auto;
flex: 1 0;
background: url(images/masterpanel_spacer.png) no-repeat 0 0;
margin-left: 152px;
padding-left: 14px;
}
.show-block {
/*width:30%;*/
flex: 1 auto;
flex: 1 0;
}
.text-row {
height:30px;
@ -3990,3 +3988,6 @@ li .ui-state-hover {
#whatsnew li {
margin-top: 20px;
}
/* jQuery dialog */
.no-close .ui-dialog-titlebar-close {display: none }

5
airtime_mvc/public/js/airtime/nowplaying/lang-timezone-setup.js
View file

@ -7,8 +7,11 @@ $(document).ready(function() {
width: 500,
resizable: false,
modal: true,
closeOnEscape: false,
position:['center','center'],
dialogClass: 'no-close',
buttons: [
/* Testing removing the Not Now button for higher engagement
{
id: "setup-later",
text: $.i18n._("Not Now"),
@ -16,7 +19,7 @@ $(document).ready(function() {
click: function() {
$(this).dialog("close");
}
},
},*/
{
id: "help_airtime",
text: $.i18n._("OK"),

12
airtime_mvc/public/js/airtime/preferences/preferences.js
View file

@ -114,16 +114,18 @@ function setMsAuthenticationFieldsReadonly(ele) {
}
function removeLogo() {
$.post(baseUrl+'preference/remove-logo', function(json){});
// Reload without resubmitting the form
location.href = location.href.replace(location.hash,"");
$.post(baseUrl+'preference/remove-logo', {'csrf_token' : $('#csrf').val()}, function(json){
// Reload without resubmitting the form
location.href = location.href.replace(location.hash,"");
});
}
function deleteAllFiles() {
var resp = confirm($.i18n._("Are you sure you want to delete all the tracks in your library?"))
if (resp) {
$.post(baseUrl+'preference/delete-all-files', function(json){});
location.reload();
$.post(baseUrl+'preference/delete-all-files', {'csrf_token' : $('#csrf').val()}, function(json){
location.reload();
});
}
}