Mobile template:

- Show fav icon when it's available
- Fix delete_action does not get removed after the row is deleted or deselected
- Fix some alignments for mail list header
This commit is contained in:
Hadi Nategh 2016-09-19 12:23:16 +02:00
parent 00b57feca5
commit 4fca7273af
6 changed files with 31 additions and 18 deletions

View File

@ -2457,8 +2457,8 @@ var et2_nextmatch_header_bar = (function(){ "use strict"; return et2_DOMWidget.e
.text(egw.lang(egw.app_name())) .text(egw.lang(egw.app_name()))
.appendTo(this.search_box); .appendTo(this.search_box);
this.select_counter = jQuery(document.createElement('div')) this.delete_action = jQuery(document.createElement('div'))
.addClass('nm_select_counter') .addClass('nm_delete_action')
.prependTo(this.search_box); .prependTo(this.search_box);
// toggle header // toggle header
// add new button // add new button
@ -2769,7 +2769,7 @@ var et2_nextmatch_header_bar = (function(){ "use strict"; return et2_DOMWidget.e
this.favorites = et2_createWidget('favorites', widget_options, this); this.favorites = et2_createWidget('favorites', widget_options, this);
// Add into header // Add into header
jQuery(this.favorites.getDOMNode(this.favorites)).prependTo(egwIsMobile()?this.search_box.find('.nm_favorites_div'):this.right_div); jQuery(this.favorites.getDOMNode(this.favorites)).prependTo(egwIsMobile()?this.search_box.find('.nm_favorites_div').show():this.right_div);
}, },
/** /**

View File

@ -2713,6 +2713,9 @@ div.mailComposeHeaderSection > table {
#mail-index .mail-index_vacation div { #mail-index .mail-index_vacation div {
text-align: center; text-align: center;
} }
#mail-index #mail-index_nm div.search {
margin-top: 3px;
}
#mail-index_buttonmailcreate { #mail-index_buttonmailcreate {
display: none; display: none;
} }

View File

@ -344,6 +344,10 @@
} }
} }
#mail-index_nm div.search{
margin-top:3px;
}
} }
#mail-index_buttonmailcreate {display:none;} #mail-index_buttonmailcreate {display:none;}
div.aclDetails {display:none;} div.aclDetails {display:none;}

View File

@ -1010,9 +1010,8 @@
} }
if (delete_action) if (delete_action)
{ {
_widget.header.select_counter _widget.header.delete_action
.show() .show()
.text(_widget.getSelection().ids.length)
.click(function(){ .click(function(){
if (delete_action) delete_action.actionObj.execute([sender]); if (delete_action) delete_action.actionObj.execute([sender]);
}); });
@ -1021,7 +1020,7 @@
} }
else else
{ {
_widget.header.select_counter.hide(); _widget.header.delete_action.hide();
} }
} }
}); });

View File

@ -7581,20 +7581,25 @@ form[id^="tracker-"] .dialogHeadbar {
-webkit-filter: none!important; -webkit-filter: none!important;
background-color: white !important; background-color: white !important;
} }
body .et2_nextmatch .nm-mob-header div.nm_select_counter { body .et2_nextmatch .nm-mob-header div.nm_delete_action {
background-image: url(../images/delete.svg);
-webkit-filter: brightness(0) invert(1) !important;
filter: brightness(0) invert(1) !important;
background-color: transparent !important;
background-size: 24px 24px !important;
border: none;
background-position: center; background-position: center;
background-repeat: no-repeat; background-repeat: no-repeat;
margin-right: 5px; margin-right: 5px;
border-left: 1px solid silver; border-left: 1px solid silver;
border: 0; border: 0;
color: white; color: black;
width: 50px; width: 50px;
height: 50px; height: 50px;
display: block; display: inline-block;
float: right; float: right;
text-align: center; text-align: center;
font-size: 20pt; display: none;
line-height: 40pt;
} }
body .et2_nextmatch .nm-mob-header div.nm_favorites_div { body .et2_nextmatch .nm-mob-header div.nm_favorites_div {
background-position: center; background-position: center;
@ -7605,7 +7610,7 @@ form[id^="tracker-"] .dialogHeadbar {
color: white; color: white;
width: 50px; width: 50px;
height: 50px; height: 50px;
display: block; display: none;
float: right; float: right;
} }
body .et2_nextmatch .nm-mob-header div.nm_favorites_div:focus { body .et2_nextmatch .nm-mob-header div.nm_favorites_div:focus {

View File

@ -701,20 +701,21 @@
-webkit-filter: none!important; -webkit-filter: none!important;
background-color: white !important; background-color: white !important;
} }
div.nm_select_counter { div.nm_delete_action {
background-image: url(../images/delete.svg);
.white-svg;
background-position: center; background-position: center;
background-repeat: no-repeat; background-repeat: no-repeat;
margin-right: 5px; margin-right: 5px;
border-left: 1px solid silver; border-left: 1px solid silver;
border: 0; border: 0;
color: white; color: black;
width: 50px; width: 50px;
height: 50px; height: 50px;
display: block; display: inline-block;
float: right; float: right;
text-align: center; text-align: center;
font-size: 20pt; display:none;
line-height: 40pt;
} }
div.nm_favorites_div { div.nm_favorites_div {
background-position: center; background-position: center;
@ -725,8 +726,9 @@
color: white; color: white;
width:50px; width:50px;
height:50px; height:50px;
display:block; display:none;
float:right; float:right;
&:focus{ &:focus{
outline:none; outline:none;
} }