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
This commit is contained in:
Albert Santoni 2015-08-31 15:03:25 -04:00
commit e0cb33b89c
10 changed files with 127 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

2
airtime_mvc/application/forms/EditAudioMD.php
View file

@ -173,7 +173,7 @@ class Application_Form_EditAudioMD extends Zend_Form
$this->addElement('button', 'editmdsave', array(
'ignore' => true,
'class' => 'btn md-save right-floated',
'label' => _('Save'),
'label' => _('OK'),
'decorators' => array(
'ViewHelper'
)

3
airtime_mvc/application/layouts/scripts/layout.phtml
View file

@ -55,9 +55,6 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
<div id="media_type_nav"> <!-- class="content-pane" -->
<div class="btn-group">
<button id="new_media_selector" class="btn btn-small dropdown-toggle dashboard-btn" data-toggle="dropdown">
New <span class="caret"></span>
</button>
<ul class="dropdown-menu">
<li id="new-playlist">
<a href="#"><?php echo _("Playlist") ?></a>

4
airtime_mvc/application/views/scripts/schedule/add-show-form.phtml
View file

@ -1,6 +1,6 @@
<div id="schedule-add-show" class="tabs ui-widget ui-widget-content block-shadow alpha-block padded">
<div class="button-bar">
<a href="#" id="add-show-close" class="icon-link add-show-close"><span class="ui-icon ui-icon-circle-close"></span><?php echo _("Close") ?></a>
<a href="#" id="add-show-close" class="add-show-close"><i class="icon-remove-sign icon-white"></i><span><?php echo _("Close") ?></span></a>
<button data-action="<?php echo isset($this->action) ? $this->action : "add-show" ?>" aria-disabled="false" role="button" class="add-show-submit right-floated ui-button ui-widget ui-state-default ui-button-text-icon-primary btn btn-small">
<span class="ui-icon ui-icon-plusthick"></span>
<span class="ui-button-text"><?php echo ($this->addNewShow ? _("Add this show") : _("Update show")); ?></span>
@ -38,7 +38,7 @@
<?php echo $this->style; ?>
</div>
<div class="button-bar bottom">
<button data-action="<?php echo isset($this->action) ? $this->action : "add-show" ?>" aria-disabled="false" role="button" class="add-show-submit right-floated ui-button ui-widget ui-state-default ui-button-text-icon-primary">
<button data-action="<?php echo isset($this->action) ? $this->action : "add-show" ?>" aria-disabled="false" role="button" class="add-show-submit right-floated ui-button ui-widget ui-state-default ui-button-text-icon-primary btn btn-small">
<span class="ui-icon ui-icon-plusthick"></span>
<span class="ui-button-text"><?php echo ($this->addNewShow ? _("Add this show") : _("Update show")); ?></span>
</button>

8
airtime_mvc/public/css/add-show.css
View file

@ -193,10 +193,10 @@ label.wrapp-label input[type="checkbox"] {
.add-button[disabled] {
cursor: auto;
color: #e7e7e7;
border: 1px solid #a1a1a1;
background-color: #b1b1b1;
background: -moz-linear-gradient(top, #c7c7c7 0, #c7c7c7 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #c7c7c7), color-stop(100%, #c7c7c7));
/*border: 1px solid #a1a1a1;*/
/*background-color: #b1b1b1;*/
/*background: -moz-linear-gradient(top, #c7c7c7 0, #c7c7c7 100%);*/
/*background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #c7c7c7), color-stop(100%, #c7c7c7));*/
}

11
airtime_mvc/public/css/dashboard.css
View file

@ -20,6 +20,17 @@
background-color: #242424;
}
@media screen and (max-width: 1600px) {
#library_display_wrapper button:not(.dropdown-toggle):not(.btn-new) > span,
#show_builder button:not(.dropdown-toggle):not(.btn-new) > span {
display: none;
}
#library_display_wrapper button:not(.dropdown-toggle):not(.btn-new) > i,
#show_builder button:not(.dropdown-toggle):not(.btn-new) > i {
margin-right: 0 !important;
}
}
@media screen and (max-width: 1280px) {
.wrapper {
-webkit-flex-flow: column !important;

20
airtime_mvc/public/css/masterpanel.css
View file

@ -3,10 +3,11 @@
/*---//////////////////// SOURCE INFO ////////////////////---*/
.source-info-block {
padding:0 0 0 2px;
padding: 0;
background: url(images/masterpanel_spacer.png) no-repeat 0 0;
margin-right: 0;
}
flex: 0 0 0;
}
.source-info-block h3, .on-air-block h3 {
margin: 0 0 10px -1px;
padding:3px 0 2px 8px;
@ -226,6 +227,7 @@
.source-info-block + .on-air-block {
padding-right:2px;
flex: 0 100px;
}
.source-info-block + .on-air-block .on-air-info, .source-info-block + .on-air-block .listen-control-button {
@ -301,9 +303,17 @@
.personal-block.solo {
width: auto;
height:auto;
margin: 0;
width: 200px;
line-height: 32px;
margin: 0;
}
.personal-block.solo span {
display: inline-block;
width: 100px;
text-overflow: ellipsis;
text-decoration: underline;
overflow: hidden;
float: left;
}
.personal-block.solo ol {
margin-top: 6px;

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

@ -189,8 +189,8 @@ select {
}
.airtime_auth_help_icon, .custom_auth_help_icon, .stream_username_help_icon,
.playlist_type_help_icon, .repeat_tracks_help_icon,
.admin_username_help_icon, .stream_type_help_icon, .show_linking_help_icon,
.playlist_type_help_icon, .repeat_tracks_help_icon, .show_linking_help_icon,
.admin_username_help_icon, .stream_type_help_icon,
.show_timezone_help_icon{
cursor: help;
position: relative;
@ -231,6 +231,14 @@ select {
}
#master-panel {
display: -webkit-box;
display: -moz-box;
display: -ms-flexbox;
display: -webkit-flex;
display: flex;
-webkit-flex-flow: row wrap;
flex-flow: row wrap;
position:relative;
height:100px;
background:#3d3d3d url(images/masterpanel_bg.png) repeat-x 0 0;
@ -249,9 +257,9 @@ select {
}
.source-info-block {
height:100px;
float:left;
min-width:170px;
height:100px;
float:left;
min-width:170px;
}
.personal-block {
@ -283,17 +291,19 @@ select {
color:#ff5d1a;
}
.now-playing-block {
width:35%;
/*width:35%;*/
flex: 1 auto;
background: url(images/masterpanel_spacer.png) no-repeat 0 0;
margin-left: 152px;
padding-left: 14px;
}
.show-block {
width:30%;
/*width:30%;*/
flex: 1 auto;
}
.text-row {
height:30px;
padding:0px 0 0;
padding:0;
font-size:12px;
text-wrap:none;
text-indent:2px;
@ -368,66 +378,34 @@ select {
background:url(images/masterpanel_spacer.png) no-repeat right 0;
}
.time-info-block {
position: absolute;
top: 0;
right: 0;
flex: 0 150px;
/*position: absolute;*/
/*top: 0;*/
/*right: 0;*/
}
#navlist {
padding: 0;
margin: 0;
}
@media screen and (max-width: 1575px) {
.now-playing-block {
width: 30%;
}
.show-block {
width: 25%;
}
}
@media screen and (max-width: 1250px) {
.now-playing-block {
width: 50%;
}
.show-block {
display: none;
}
.personal-block.solo {
right: 10px !important;
}
}
@media screen and (max-width: 1075px) {
.now-playing-block {
width: 40%;
}
}
@media screen and (max-width: 900px) {
.now-playing-block {
width: 30%;
/*display: none;*/
}
/*#nav li.top {*/
/*display: -webkit-box;*/
/*display: -moz-box;*/
/*display: -ms-flexbox;*/
/*display: -webkit-flex;*/
/*display: flex;*/
/*width: 110px;*/
/*}*/
}
@media screen and (max-width: 775px) {
@media screen and (max-width: 875px) {
.now-playing-block {
display: none;
}
.source-info-block {
margin-left: 152px;
}
}
@media screen and (max-width: 520px) {
.logo {
display: none;
.time-info-block {
flex: 1 150px;
}
.source-info-block {
margin-left: 0;
}
@media screen and (max-width: 630px) {
#master-panel {
min-width: 630px;
}
}
.time-info-block ul {
@ -491,7 +469,6 @@ select {
border:1px solid #555555;
border-width:1px 0;
border-bottom-color:#1e1e1e;
color:#fff;
color:#0C0;
text-shadow: #000 0px -1px;
display:block;
@ -1110,8 +1087,7 @@ input[type="checkbox"] {
width:420px;
border:1px solid #181818;
border-width: 0 0 1px 0;
padding:0;
padding-top:60px;
padding: 60px 0 0;
}
.login_box h2 {
@ -1176,8 +1152,6 @@ input[type="checkbox"] {
text-align:left;
}
.login-content dl, .login-content dl.zend_form {
margin: 12px 0 0 0;
margin-bottom:8px;
margin:0;
padding:0;
width:100%;
@ -1363,10 +1337,6 @@ input[type="checkbox"] {
margin: 0;
}
.dataTables_scrolling {
/*min-height: 150px;*/
}
.ui-dialog #schedule_playlist_dialog.ui-dialog-content {
padding:0;
}
@ -1512,10 +1482,6 @@ div.ui-datepicker {
min-width: 150px;
}
.sh_pl_creator {
}
#schedule_playlist_chosen li > h3 > div.sh_pl_time {
float:right;
margin-right:22px;
@ -1593,10 +1559,6 @@ h2#scheduled_playlist_name span {
/* --- Add show Dialog --- */
#add_show_name {
}
#add_show_description {
width: 400px;
height: 200px;
@ -2697,6 +2659,16 @@ fieldset legend .ui-icon, .ui-widget-content fieldset legend .ui-icon {
margin-top: 20px;
}
#add-show-close {
color: #ffffff !important;
text-decoration: none;
}
#add-show-close span {
padding-top: 1px;
position: absolute;
}
input[type="checkbox"][disabled] {
opacity: 0.6;
}
@ -3288,6 +3260,17 @@ dd .stream-status {
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#868686', endColorstr='#535353', GradientType=0);
}---*/
#add_media_btn {
width: 100%;
}
.add-show-submit.btn:hover {
background-position: 0 -30px !important;
background-color: #292929;
border: 1px solid #242424;
transition: none;
}
.btn.active,
.btn:active {
background-image: none;
@ -3300,16 +3283,12 @@ dd .stream-status {
}
.btn-new {
background: none;
background-color: #237686;
background: #237686;
}
.btn-new:hover {
background: none;
.btn-new:active, .btn-new:hover,
.btn-new[disabled], .btn-new[disabled]:active {
background-color: #1c606e;
}
.btn-new[disabled]:hover {
background: inherit;
}
.dark_class
{
@ -3863,4 +3842,31 @@ li .ui-state-hover {
flex: 1;
}
#users_datatable_wrapper {
position: absolute;
min-height: 300px;
}
#users_datatable {
overflow: auto;
}
#users_datatable tbody {
vertical-align: top !important;
}
.show_linking_help_icon {
position: inherit;
}
#add_show_linked-element {
display: inline-block;
}
#add_show_no_end-element, #add_show_end_date-element {
float: left;
}

21
airtime_mvc/public/js/airtime/library/events/library_showbuilder.js
View file

@ -18,17 +18,11 @@ var AIRTIME = (function(AIRTIME) {
check = true;
}
if (shows.length === 0) {
check = false;
}
if (check) {
AIRTIME.button.enableButton("btn-group #library-plus", false);
} else {
AIRTIME.button.disableButton("btn-group #library-plus", false);
}
if ($("#show_builder_table").is(":visible")) {
if (shows.length === 0) {
check = false;
}
if ($cursor.length !== 0) {
btnText = $.i18n._('Add after selected items');
} else if (current.length !== 0) {
@ -42,6 +36,13 @@ var AIRTIME = (function(AIRTIME) {
btnText = $.i18n._('Add to current playlist');
}
}
if (check) {
AIRTIME.button.enableButton("btn-group #library-plus", false);
} else {
AIRTIME.button.disableButton("btn-group #library-plus", false);
}
AIRTIME.library.changeAddButtonText($('.btn-group #library-plus #lib-plus-text'), btnText);
};

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

@ -149,17 +149,6 @@ var AIRTIME = (function(AIRTIME) {
"<span>" + $.i18n._('Delete') + "</span>" +
"</button>" +
"</div>"
).append(
"<div class='btn-group'>" +
"<button class='btn btn-small dropdown-toggle' data-toggle='dropdown'>" +
$.i18n._("Select") + " <span class='caret'></span>" +
"</button>" +
"<ul class='dropdown-menu'>" +
"<li id='sb-select-page'><a href='#'>" + $.i18n._("Select this page") + "</a></li>" +
"<li id='sb-dselect-page'><a href='#'>" + $.i18n._("Deselect this page") + "</a></li>" +
"<li id='sb-dselect-all'><a href='#'>" + $.i18n._("Deselect all") + "</a></li>" +
"</ul>" +
"</div>"
);
};
@ -845,7 +834,7 @@ var AIRTIME = (function(AIRTIME) {
AIRTIME.library.setupLibraryToolbar(oTable);
$libTable.find("tbody").on("dblclick", "tr[class*='lib'] > td:not(.dataTables_empty)", function(ev) {
var tr = $(this).parent, data = tr.data("aData");
var tr = $(this).parent(), data = tr.data("aData");
AIRTIME.library.dblClickAdd(data, data.ftype);
});
@ -968,7 +957,7 @@ var AIRTIME = (function(AIRTIME) {
function processMenuItems(oItems) {
// define an add to playlist callback.
// define an add to playlist callback.
if (oItems.pl_add !== undefined) {
var aItems = [];

1
airtime_mvc/public/js/airtime/library/spl.js
View file

@ -925,7 +925,6 @@ var AIRTIME = (function(AIRTIME){
var $ws_id = $("#ws_delete");
$ws_id.show();
editName();
var length = $(".side_playlist.active-tab .ws_length");
length.text(json.length);