Fix some missing / incorrect icons

- Addressbook advanced search was from default
- Add favorite dialog had no icons on buttons
- All dialogs using standard button sets were either missing or from default theme
- Mail confirm all was missing Yes icon
This commit is contained in:
nathangray 2016-10-27 09:03:26 -06:00
parent 2aae52e90e
commit 017e45ffd4
5 changed files with 15 additions and 10 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

View File

@ -393,7 +393,7 @@ var et2_dialog = (function(){ "use strict"; return et2_widget.extend(
}
if (button.image)
{
button.style = 'background-image: url('+this.egw().image(button.image)+')';
button.style = 'background-image: url('+this.egw().image(button.image,'etemplate')+')';
delete button.image;
}
}

View File

@ -739,6 +739,7 @@ var AppJS = (function(){ "use strict"; return Class.extend(
buttons['save'] = {
text: this.egw.lang('save'),
default: true,
style: 'background-image: url('+this.egw.image('save')+')',
click: function() {
// Add a new favorite
var name = jQuery("#name",this);
@ -807,14 +808,18 @@ var AppJS = (function(){ "use strict"; return Class.extend(
jQuery(this).dialog("close");
}
};
buttons[this.egw.lang("cancel")] = function() {
if(typeof self.favorite_popup.group !== 'undefined' && self.favorite_popup.group.set_value)
{
self.favorite_popup.group.set_value(null);
buttons['cancel'] = {
text: this.egw.lang("cancel"),
style: 'background-image: url('+this.egw.image('cancel')+')',
click: function() {
if(typeof self.favorite_popup.group !== 'undefined' && self.favorite_popup.group.set_value)
{
self.favorite_popup.group.set_value(null);
}
jQuery(this).dialog("close");
}
jQuery(this).dialog("close");
};
this.favorite_popup.dialog({
autoOpen: false,
modal: true,

View File

@ -354,8 +354,8 @@ app.classes.filemanager = AppJS.extend(
if (_data.uploaded[file].confirm && !_data.uploaded[file].confirmed)
{
var buttons = [
{text: this.egw.lang("Yes"), id: "overwrite", class: "ui-priority-primary", "default": true},
{text: this.egw.lang("Rename"), id:"rename"},
{text: this.egw.lang("Yes"), id: "overwrite", class: "ui-priority-primary", "default": true, image: 'check',},
{text: this.egw.lang("Rename"), id:"rename", image: 'edit',},
{text: this.egw.lang("Cancel"), id:"cancel"}
];
if (_data.uploaded[file].confirm === "is_dir")

View File

@ -2011,7 +2011,7 @@ app.classes.mail = AppJS.extend(
if (_confirm)
{
var buttons = [
{text: this.egw.lang("Yes"), id: "all", "class": "ui-priority-primary", "default": true},
{text: this.egw.lang("Yes"), id: "all", "class": "ui-priority-primary", "default": true, image: 'check'},
{text: this.egw.lang("Cancel"), id:"cancel"}
];
var messageToDisplay = '';