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

Calendar: Move sidebox search into toolbar area

Browse Source 
Also, correct way to move favorites dropdown into toolbar
This commit is contained in:
nathangray 2021-03-24 16:16:50 -06:00
parent 98697031ab
commit 0e35c94051
8 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
calendar/inc/class.calendar_uilist.inc.php
View File

@ -147,7 +147,7 @@ class calendar_uilist extends calendar_ui
'placeholder_actions' => array('add')
);
}
$content['nm']['favorites'] = true;
$content['nm']['favorites'] = false;
$content['nm']['actions'] = $this->get_actions();
// Skip first load if view is not listview

6
calendar/js/app.js
View File

@ -3457,12 +3457,6 @@ var CalendarApp = /** @class */ (function (_super) {
}
}
if (all_loaded) {
// Move nextmatch favourite button into toolbar
var fav_button = CalendarApp.views.listview.etemplates[0].widgetContainer.getDOMWidgetById("favorite");
var toolbar_1 = jQuery("#toolbar-actionbox", "#calendar-toolbar_toolbar");
if (fav_button && toolbar_1) {
toolbar_1.after(fav_button.getDOMNode(fav_button));
}
jQuery(window).trigger('resize');
this.setState({ state: this.state });
// Hide loader after 1 second as a fallback, it will also be hidden

8
calendar/js/app.ts
View File

@ -4298,14 +4298,6 @@ class CalendarApp extends EgwApp
}
if(all_loaded)
{
// Move nextmatch favourite button into toolbar
let fav_button = (<etemplate2><unknown>CalendarApp.views.listview.etemplates[0]).widgetContainer.getDOMWidgetById("favorite");
let toolbar = jQuery("#toolbar-actionbox","#calendar-toolbar_toolbar");
if(fav_button && toolbar)
{
toolbar.after(fav_button.getDOMNode(fav_button));
}
jQuery(window).trigger('resize');
this.setState({state:this.state});

8
calendar/templates/default/app.css
View File

@ -181,12 +181,16 @@ div.calendar_conflicts {
display:flex;
align-items: center;
min-height: 26px;
justify-content: flex-end;
}
#calendar-toolbar #calendar-list_favorite_wrapper {
#calendar-toolbar #calendar-toolbar_keywords {
height: 14px;
}
#calendar-toolbar #calendar-toolbar_favorite_wrapper {
float: right;
margin-right: 5px;
}
#calendar-toolbar #calendar-list_favorite_wrapper #calendar-list_favorite_menu {
#calendar-toolbar #calendar-toolbar_favorite_wrapper #calendar-toolbar_favorite_menu {
z-index: 40;
font-weight: normal;
}

1
calendar/templates/default/sidebox.xet
View File

@ -14,7 +14,6 @@ Egroupware
<overlay>
<template id="calendar.sidebox">
<vbox parent_node="calendar-et2_target">
<textbox id="keywords" class="et2_fullWidth" blur="Search" onchange="app.calendar.update_state({view: 'listview',keywords: widget.getValue()});return false;"/>
<buttononly id="header_today" label="•" icon="nope" onclick="
var tempDate = new Date();
var today = new Date(tempDate.getFullYear(), tempDate.getMonth(), tempDate.getDate(),0,-tempDate.getTimezoneOffset(),0);

2
calendar/templates/default/toolbar.xet
View File

@ -17,6 +17,8 @@ Egroupware
<!-- Fake an app header inside the toolbar -->
<box class="egw_fw_ui_app_header_container">
<description id="app_header"/>
<textbox id="keywords" blur="Search" onchange="app.calendar.update_state({view: 'listview',keywords: widget.getValue()});return false;"/>
<favorites app="calendar"/>
</box>
</template>
</overlay>

8
calendar/templates/pixelegg/app.css
View File

@ -188,12 +188,16 @@ div.calendar_conflicts {
display: flex;
align-items: center;
min-height: 26px;
justify-content: flex-end;
}
#calendar-toolbar #calendar-list_favorite_wrapper {
#calendar-toolbar #calendar-toolbar_keywords {
height: 14px;
}
#calendar-toolbar #calendar-toolbar_favorite_wrapper {
float: right;
margin-right: 5px;
}
#calendar-toolbar #calendar-list_favorite_wrapper #calendar-list_favorite_menu {
#calendar-toolbar #calendar-toolbar_favorite_wrapper #calendar-toolbar_favorite_menu {
z-index: 40;
font-weight: normal;
}

1
calendar/templates/pixelegg/app.less
View File

@ -12,7 +12,6 @@
* @version $Id$
*/
@import (reference) "../../../pixelegg/less/definitions.less";
@import (less) "../default/app.css";