holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Api: Fix some favorite widget bugs

Browse Source 
- Infolog preferred favorite was not loaded
- Fixed vertical alignment of widget 'Add current' icon
This commit is contained in:
nathangray 2020-05-22 10:50:36 -06:00
parent 8d022c5908
commit 82215f292d
6 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/js/etemplate/et2_extension_nextmatch.js
View File

@ -2435,12 +2435,11 @@ var et2_nextmatch_header_bar = /** @class */ (function (_super) {
// No favorites configured // No favorites configured
return; return;
} }
var list = et2_csvSplit(this.options.get_rows, 2, ".");
var widget_options = { var widget_options = {
default_pref: "nextmatch-" + this.nextmatch.options.settings.columnselection_pref + "-favorite", default_pref: "nextmatch-" + this.nextmatch.options.settings.columnselection_pref + "-favorite",
app: list[0], app: this.getInstanceManager().app,
filters: filters, filters: filters,
sidebox_target: 'favorite_sidebox_' + list[0] sidebox_target: 'favorite_sidebox_' + this.getInstanceManager().app
}; };
this.favorites = et2_createWidget('favorites', widget_options, this); this.favorites = et2_createWidget('favorites', widget_options, this);
// Add into header // Add into header

5
api/js/etemplate/et2_extension_nextmatch.ts
View File

@ -3140,12 +3140,11 @@ class et2_nextmatch_header_bar extends et2_DOMWidget implements et2_INextmatchHe
return; return;
} }
const list = et2_csvSplit(this.options.get_rows, 2, ".");
const widget_options = { const widget_options = {
default_pref: "nextmatch-" + this.nextmatch.options.settings.columnselection_pref + "-favorite", default_pref: "nextmatch-" + this.nextmatch.options.settings.columnselection_pref + "-favorite",
app: list[0], app: this.getInstanceManager().app,
filters: filters, filters: filters,
sidebox_target: 'favorite_sidebox_' + list[0] sidebox_target: 'favorite_sidebox_' + this.getInstanceManager().app
}; };
this.favorites = et2_createWidget('favorites', widget_options, this); this.favorites = et2_createWidget('favorites', widget_options, this);

2
api/js/etemplate/et2_widget_favorites.js
View File

@ -107,7 +107,7 @@ var et2_favorites = /** @class */ (function (_super) {
self.preferred = jQuery(this).val(); self.preferred = jQuery(this).val();
// Update sidebox, if there // Update sidebox, if there
if (self.sidebox_target.length) { if (self.sidebox_target.length) {
self.sidebox_target.find("div.ui-icon-heart") jQuery("div.ui-icon-heart", self.sidebox_target)
.replaceWith("<div class='sideboxstar'/>"); .replaceWith("<div class='sideboxstar'/>");
jQuery("li[data-id='" + self.preferred + "'] div.sideboxstar", self.sidebox_target) jQuery("li[data-id='" + self.preferred + "'] div.sideboxstar", self.sidebox_target)
.replaceWith("<div class='ui-icon ui-icon-heart'/>"); .replaceWith("<div class='ui-icon ui-icon-heart'/>");

2
api/js/etemplate/et2_widget_favorites.ts
View File

@ -151,7 +151,7 @@ class et2_favorites extends et2_dropdown_button implements et2_INextmatchHeader
// Update sidebox, if there // Update sidebox, if there
if(self.sidebox_target.length) if(self.sidebox_target.length)
{ {
self.sidebox_target.find("div.ui-icon-heart") jQuery("div.ui-icon-heart", self.sidebox_target)
.replaceWith("<div class='sideboxstar'/>"); .replaceWith("<div class='sideboxstar'/>");
jQuery("li[data-id='"+self.preferred+"'] div.sideboxstar",self.sidebox_target) jQuery("li[data-id='"+self.preferred+"'] div.sideboxstar",self.sidebox_target)
.replaceWith("<div class='ui-icon ui-icon-heart'/>"); .replaceWith("<div class='ui-icon ui-icon-heart'/>");

7
api/templates/default/etemplate2.css
View File

@ -1814,6 +1814,13 @@ div.message.floating {
.favorites img { .favorites img {
margin-right: 1ex; margin-right: 1ex;
} }
.favorites li.ui-menu-item img {
width: 12px;
height: 12px;
margin-top: -3px;
margin-left: 2px;
vertical-align: middle;
}
.favorites div.ui-icon-trash { .favorites div.ui-icon-trash {
position: relative; position: relative;
float: right; float: right;

2
infolog/inc/class.infolog_hooks.inc.php
View File

@ -90,7 +90,7 @@ class infolog_hooks
if ($location == 'sidebox_menu') if ($location == 'sidebox_menu')
{ {
// Magic etemplate2 favorites menu (from nextmatch widget) // Magic etemplate2 favorites menu (from nextmatch widget)
display_sidebox($appname, lang('Favorites'), Framework\Favorites::list_favorites($appname)); display_sidebox($appname, lang('Favorites'), Framework\Favorites::list_favorites($appname, 'nextmatch-nextmatch-infolog.index.rows-favorite'));
$file = array( $file = array(
'infolog list' => Egw::link('/index.php',array( 'infolog list' => Egw::link('/index.php',array(