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

CC-6066 - Add/Remove content screen update

Browse source
This commit is contained in:
Duncan Sommerville 2015-08-26 17:56:17 -04:00
parent ef892bb565
commit 0ebe7a85e1
3 changed files with 51 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -165,6 +165,7 @@ thead th.ui-state-default:focus {
left: -420px; left: -420px;
padding: 5px; padding: 5px;
margin-top: -2px; margin-top: -2px;
z-index: 1005;
} }
#advanced_search label, #advanced_search span { #advanced_search label, #advanced_search span {
@ -190,7 +191,7 @@ thead th.ui-state-default:focus {
#advanced-options { #advanced-options {
float: right; float: right;
z-index: 1; z-index: 1004;
} }
#advanced-options > button { #advanced-options > button {

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

@ -3525,6 +3525,10 @@ button.btn-icon-text > i.icon-white {
flex-flow: row wrap; flex-flow: row wrap;
} }
.ui-dialog-content input {
z-index: 1003;
}
.ui-dialog-content .media_type_selector { .ui-dialog-content .media_type_selector {
padding-left: 0; padding-left: 0;
flex: 1 auto; flex: 1 auto;

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

@ -115,42 +115,52 @@ var AIRTIME = (function(AIRTIME) {
mod.createToolbarButtons = function () { mod.createToolbarButtons = function () {
$menu = $("<div class='btn-toolbar' />"); $menu = $("<div class='btn-toolbar' />");
$menu if ($(".ui-dialog-content").length === 0) {
.append("<div class='btn-group' title=" + $.i18n._('New') + ">" + $menu
"<button class='btn btn-small' id='sb-new'>" + .append(
"<i class='icon-white icon-plus'></i>" + "<div class='btn-group' title=" + $.i18n._('New') + ">" +
"<span>" + $.i18n._('New') + "</span>" + "<button class='btn btn-small' id='sb-new'>" +
"</button>" + "<i class='icon-white icon-plus'></i>" +
"</div>") "<span>" + $.i18n._('New') + "</span>" +
.append("<div class='btn-group' title=" + $.i18n._('Edit') + ">" + "</button>" +
"<button class='btn btn-small' id='sb-edit'>" + "</div>"
"<i class='icon-white icon-pencil'></i>" + ).append(
"<span>" + $.i18n._('Edit') + "</span>" + "<div class='btn-group' title=" + $.i18n._('Edit') + ">" +
"</button>" + "<button class='btn btn-small' id='sb-edit'>" +
"</div>") "<i class='icon-white icon-pencil'></i>" +
"<span>" + $.i18n._('Edit') + "</span>" +
"</button>" +
"</div>"
);
}
.append("<div class='btn-group'>" + $menu
"<button class='btn btn-small' id='library-plus'>" + .append(
"<i class='icon-white icon-plus'></i>" + "<div class='btn-group'>" +
"<span id='lib-plus-text'></span>" + "<button class='btn btn-small' id='library-plus'>" +
"</button>" + "<i class='icon-white icon-plus'></i>" +
"</div>") "<span id='lib-plus-text'></span>" +
.append("<div class='btn-group' title=" + $.i18n._('Delete') + ">" + "</button>" +
"<button class='btn btn-small btn-danger' id='sb-trash'>" + "</div>"
"<i class='icon-white icon-trash'></i>" + ).append(
"<span>" + $.i18n._('Delete') + "</span>" + "<div class='btn-group' title=" + $.i18n._('Delete') + ">" +
"</button>" + "<button class='btn btn-small btn-danger' id='sb-trash'>" +
"</div>") "<i class='icon-white icon-trash'></i>" +
.append("<div class='btn-group'>" + "<span>" + $.i18n._('Delete') + "</span>" +
"<button class='btn btn-small dropdown-toggle' data-toggle='dropdown'>" + "</button>" +
$.i18n._("Select") + " <span class='caret'></span>" + "</div>"
"</button>" + ).append(
"<ul class='dropdown-menu'>" + "<div class='btn-group'>" +
"<li id='sb-select-page'><a href='#'>" + $.i18n._("Select this page") + "</a></li>" + "<button class='btn btn-small dropdown-toggle' data-toggle='dropdown'>" +
"<li id='sb-dselect-page'><a href='#'>" + $.i18n._("Deselect this page") + "</a></li>" + $.i18n._("Select") + " <span class='caret'></span>" +
"<li id='sb-dselect-all'><a href='#'>" + $.i18n._("Deselect all") + "</a></li>" + "</button>" +
"</ul>" + "<ul class='dropdown-menu'>" +
"</div>"); "<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>"
);
}; };
mod.moveSearchBarToHeader = function() { mod.moveSearchBarToHeader = function() {