WIP nextmatch column sorting UI:

- Give the dialog a new look
This commit is contained in:
Hadi Nategh 2019-11-06 16:07:48 +01:00
parent 2f5fa5def3
commit fb20fe69dd
7 changed files with 30 additions and 9 deletions

View File

@ -1568,21 +1568,24 @@ var et2_nextmatch = (function(){ "use strict"; return et2_DOMWidget.extend([et2_
$select.find('li[class^="selcolumn_sortable_"]').each(function(i,v){ $select.find('li[class^="selcolumn_sortable_"]').each(function(i,v){
jQuery(v).attr('data-value',(jQuery(v).find('input')[0].value)) jQuery(v).attr('data-value',(jQuery(v).find('input')[0].value))
}); });
var $footerWrap = jQuery(document.createElement("div"))
.addClass('dialogFooterToolbar')
.append(okButton.getDOMNode())
.append(cancelButton.getDOMNode());
this.selectPopup = jQuery(document.createElement("div")) this.selectPopup = jQuery(document.createElement("div"))
.addClass("colselection ui-dialog ui-widget-content") .addClass("colselection ui-dialog ui-widget-content")
.append(select.getDOMNode()) .append(select.getDOMNode())
.append(okButton.getDOMNode()) .append($footerWrap)
.append(cancelButton.getDOMNode())
.appendTo(this.innerDiv); .appendTo(this.innerDiv);
// Add autorefresh // Add autorefresh
this.selectPopup.append(autoRefresh.getSurroundings().getDOMNode(autoRefresh.getDOMNode())); $footerWrap.append(autoRefresh.getSurroundings().getDOMNode(autoRefresh.getDOMNode()));
// Add default checkbox for admins // Add default checkbox for admins
var apps = this.egw().user('apps'); var apps = this.egw().user('apps');
if(apps['admin']) if(apps['admin'])
{ {
this.selectPopup.append(defaultCheck.getSurroundings().getDOMNode(defaultCheck.getDOMNode())); $footerWrap.append(defaultCheck.getSurroundings().getDOMNode(defaultCheck.getDOMNode()));
} }
} }
else else

View File

@ -3159,3 +3159,21 @@ tr.disableIfNoEPL {
background-repeat: no-repeat; background-repeat: no-repeat;
border: 2px dashed silver; border: 2px dashed silver;
} }
.colselection.ui-widget-content {
width: 45%;
}
.colselection .et2_selectbox .ui-widget-header.ui-helper-clearfix {
padding: 10px;
font-size:10pt;
}
.colselection .et2_selectbox .ui-multiselect-checkboxes li {
border-bottom: 1px solid #e6e6e6;
padding-bottom: 3px;
padding-top: 3px;
}
.colselection .et2_selectbox .ui-multiselect-checkboxes li label{
cursor: grab;
}
.colselection .et2_selectbox .ui-multiselect-checkboxes li label.ui-state-hover {background: none;}

View File

@ -3769,7 +3769,7 @@ div#egwpopup_message {
visibility: hidden; visibility: hidden;
} }
.colselection.ui-widget-content { .colselection.ui-widget-content {
width: 33%; width: 45%;
} }
/*Calendar ##############*/ /*Calendar ##############*/
td.message { td.message {

View File

@ -3758,7 +3758,7 @@ div#egwpopup_message {
visibility: hidden; visibility: hidden;
} }
.colselection.ui-widget-content { .colselection.ui-widget-content {
width: 33%; width: 45%;
} }
/*Calendar ##############*/ /*Calendar ##############*/
td.message { td.message {

View File

@ -3769,7 +3769,7 @@ div#egwpopup_message {
visibility: hidden; visibility: hidden;
} }
.colselection.ui-widget-content { .colselection.ui-widget-content {
width: 33%; width: 45%;
} }
/*Calendar ##############*/ /*Calendar ##############*/
td.message { td.message {

View File

@ -269,7 +269,7 @@ div#egwpopup_message {
} }
} }
.colselection.ui-widget-content {width: 33%;} .colselection.ui-widget-content {width: 45%;}
/*Calendar ##############*/ /*Calendar ##############*/
td.message { td.message {

View File

@ -3780,7 +3780,7 @@ div#egwpopup_message {
visibility: hidden; visibility: hidden;
} }
.colselection.ui-widget-content { .colselection.ui-widget-content {
width: 33%; width: 45%;
} }
/*Calendar ##############*/ /*Calendar ##############*/
td.message { td.message {