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

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

This commit is contained in:
Duncan Sommerville 2015-08-31 12:35:27 -04:00
parent 2611766498 2748f223de
commit d7d27d3c36
2 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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 id="schedule-add-show" class="tabs ui-widget ui-widget-content block-shadow alpha-block padded">
<div class="button-bar"> <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"> <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-icon ui-icon-plusthick"></span>
<span class="ui-button-text"><?php echo ($this->addNewShow ? _("Add this show") : _("Update show")); ?></span> <span class="ui-button-text"><?php echo ($this->addNewShow ? _("Add this show") : _("Update show")); ?></span>
@ -38,7 +38,7 @@
<?php echo $this->style; ?> <?php echo $this->style; ?>
</div> </div>
<div class="button-bar bottom"> <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-icon ui-icon-plusthick"></span>
<span class="ui-button-text"><?php echo ($this->addNewShow ? _("Add this show") : _("Update show")); ?></span> <span class="ui-button-text"><?php echo ($this->addNewShow ? _("Add this show") : _("Update show")); ?></span>
</button> </button>

34
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, .airtime_auth_help_icon, .custom_auth_help_icon, .stream_username_help_icon,
.playlist_type_help_icon, .repeat_tracks_help_icon, .playlist_type_help_icon, .repeat_tracks_help_icon, .show_linking_help_icon,
.admin_username_help_icon, .stream_type_help_icon, .show_linking_help_icon, .admin_username_help_icon, .stream_type_help_icon,
.show_timezone_help_icon{ .show_timezone_help_icon{
cursor: help; cursor: help;
position: relative; position: relative;
@ -2697,6 +2697,16 @@ fieldset legend .ui-icon, .ui-widget-content fieldset legend .ui-icon {
margin-top: 20px; 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] { input[type="checkbox"][disabled] {
opacity: 0.6; opacity: 0.6;
} }
@ -3288,6 +3298,13 @@ dd .stream-status {
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#868686', endColorstr='#535353', GradientType=0); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#868686', endColorstr='#535353', GradientType=0);
}---*/ }---*/
.add-show-submit.btn:hover {
background-position: 0 -30px !important;
background-color: #292929;
border: 1px solid #242424;
transition: none;
}
.btn.active, .btn.active,
.btn:active { .btn:active {
background-image: none; background-image: none;
@ -3877,4 +3894,17 @@ li .ui-state-hover {
vertical-align: top !important; 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;
}