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

Merge branch 'saas-dev-usability-hints' of https://github.com/sourcefabric/Airtime into saas-dev-usability-hints

This commit is contained in:
drigato 2015-07-14 11:52:10 -04:00
parent e5c574229f 2693c9f02c
commit 8309289356
3 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
airtime_mvc/application/views/scripts/showbuilder/builderDialog.phtml
View File

@ -8,6 +8,7 @@
<table id="library_display" cellpadding="0" cellspacing="0" class="datatable"></table> <table id="library_display" cellpadding="0" cellspacing="0" class="datatable"></table>
</div> </div>
<div id="show_builder" class="sb-content ui-widget ui-widget-content block-shadow omega-block padded"> <div id="show_builder" class="sb-content ui-widget ui-widget-content block-shadow omega-block padded">
<div id="builder-dialog-hint"><p><?php echo _("Drag files from the library on the left to add them to your show."); ?></p></div>
<table id="show_builder_table" cellpadding="0" cellspacing="0" class="datatable"></table> <table id="show_builder_table" cellpadding="0" cellspacing="0" class="datatable"></table>
</div> </div>
</div> </div>

16
airtime_mvc/public/css/styles.css
View File

@ -567,6 +567,22 @@ input[type="text"]:focus, input[type="password"]:focus, textarea:focus, .input_t
min-width: 470px;*/ min-width: 470px;*/
} }
#builder-dialog-hint {
text-align: center;
/*line-height: 62px;*/
height: 62px;
display: table;
width: 100%;
}
#builder-dialog-hint p
{
font-size: 14px;
display: table-cell;
text-align: center;
vertical-align: middle;
}
/***** LIBRARY QTIP METADATA SPECIFIC STYLES BEGIN *****/ /***** LIBRARY QTIP METADATA SPECIFIC STYLES BEGIN *****/
table.library-track-md{ table.library-track-md{
width: 280px; width: 280px;

9
airtime_mvc/public/js/airtime/schedule/add-show.js
View File

@ -8,8 +8,11 @@ function openAddShowForm(nowOrFuture) {
if($("#add-show-form").length == 1) { if($("#add-show-form").length == 1) {
if( ($("#add-show-form").css('display')=='none')) { if( ($("#add-show-form").css('display')=='none')) {
$('#add_show_start_now-now').attr('checked', 'checked'); if (nowOrFuture === true) //true means "now"
setupStartTimeWidgets(); {
$('#add_show_start_now-now').attr('checked', 'checked');
setupStartTimeWidgets();
}
$("#add-show-form").show(); $("#add-show-form").show();
windowResize(); windowResize();
@ -180,7 +183,7 @@ function beginEditShow(data){
redrawAddShowForm($("#add-show-form"), data.newForm); redrawAddShowForm($("#add-show-form"), data.newForm);
toggleAddShowButton(); toggleAddShowButton();
openAddShowForm(); openAddShowForm(false);
} }
function onStartTimeSelect(){ function onStartTimeSelect(){