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

Calendar: Move searchbox into "toolbar", change it into proper searchbox, hide it in nextmatch header

Browse Source
This commit is contained in:
nathangray 2021-03-25 11:22:36 -06:00
parent 67ab00ad05
commit 2b9230c326
5 changed files with 34 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
calendar/inc/class.calendar_uiviews.inc.php
View File

@ -259,14 +259,6 @@ class calendar_uiviews extends calendar_ui
{ {
$group = 0; $group = 0;
$actions = array( $actions = array(
'add' => array(
'caption' => 'Add',
'icon' => 'add',
'group' => ++$group,
'onExecute' => 'javaScript:app.calendar.toolbar_action',
'hint' => 'Add',
'toolbarDefault' => true,
),
'day_view' => array( 'day_view' => array(
'caption' => 'Dayview', 'caption' => 'Dayview',
'icon' => '1_day_view', 'icon' => '1_day_view',

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

@ -173,8 +173,11 @@ div.calendar_conflicts {
#calendar-toolbar { #calendar-toolbar {
height: 30px; height: 30px;
} }
#calendar-toolbar button#toolbar-add { #calendar-toolbar > div {
margin-right: -3px; display: flex;
}
#calendar-toolbar .et2_toolbar {
background: inherit;
} }
#calendar-toolbar .egw_fw_ui_app_header_container { #calendar-toolbar .egw_fw_ui_app_header_container {
border: none; border: none;
@ -184,11 +187,16 @@ div.calendar_conflicts {
justify-content: flex-end; justify-content: flex-end;
} }
#calendar-toolbar #calendar-toolbar_keywords { #calendar-toolbar #calendar-toolbar_keywords {
margin-right: 4px;
}
#calendar-toolbar .et2_searchbox input {
height: 14px; height: 14px;
} }
#calendar-toolbar #calendar-toolbar_favorite_wrapper { #calendar-toolbar #calendar-toolbar_favorite_wrapper {
float: right; float: right;
white-space: nowrap;
margin-right: 5px; margin-right: 5px;
margin-top: -4px;
} }
#calendar-toolbar #calendar-toolbar_favorite_wrapper #calendar-toolbar_favorite_menu { #calendar-toolbar #calendar-toolbar_favorite_wrapper #calendar-toolbar_favorite_menu {
z-index: 40; z-index: 40;
@ -1615,3 +1623,7 @@ img.calendar_print_button, img.calendar_print_appicon {
#toolbar-weekend {background-image: none !important; filter:none;} #toolbar-weekend {background-image: none !important; filter:none;}
#calendar-list_nm .nextmatch_header .header_count {margin-right:-4px;} #calendar-list_nm .nextmatch_header .header_count {margin-right:-4px;}
#calendar-list_nm .nextmatch_header .search {
display: none;
}

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

@ -13,11 +13,16 @@ Egroupware
<overlay> <overlay>
<template id="calendar.toolbar"> <template id="calendar.toolbar">
<box class="et2_toolbar">
<box class="et2_toolbar_actionlist">
<buttononly id="add" background_image="true" image="add" onclick="app.calendar.toolbar_action(widget);"/>
</box>
</box>
<searchbox id="keywords" blur="Search" overlay="false" onchange="app.calendar.update_state({view: 'listview',search: widget.getValue()});return false;"/>
<toolbar id="toolbar" width="100%" flat_list="false"/> <toolbar id="toolbar" width="100%" flat_list="false"/>
<!-- Fake an app header inside the toolbar --> <!-- Fake an app header inside the toolbar -->
<box class="egw_fw_ui_app_header_container"> <box class="egw_fw_ui_app_header_container">
<description id="app_header"/> <description id="app_header"/>
<textbox id="keywords" blur="Search" onchange="app.calendar.update_state({view: 'listview',keywords: widget.getValue()});return false;"/>
<favorites app="calendar"/> <favorites app="calendar"/>
</box> </box>
</template> </template>

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

@ -180,8 +180,11 @@ div.calendar_conflicts {
#calendar-toolbar { #calendar-toolbar {
height: 30px; height: 30px;
} }
#calendar-toolbar button#toolbar-add { #calendar-toolbar > div {
margin-right: -3px; display: flex;
}
#calendar-toolbar .et2_toolbar {
background: inherit;
} }
#calendar-toolbar .egw_fw_ui_app_header_container { #calendar-toolbar .egw_fw_ui_app_header_container {
border: none; border: none;
@ -191,11 +194,16 @@ div.calendar_conflicts {
justify-content: flex-end; justify-content: flex-end;
} }
#calendar-toolbar #calendar-toolbar_keywords { #calendar-toolbar #calendar-toolbar_keywords {
margin-right: 4px;
}
#calendar-toolbar .et2_searchbox input {
height: 14px; height: 14px;
} }
#calendar-toolbar #calendar-toolbar_favorite_wrapper { #calendar-toolbar #calendar-toolbar_favorite_wrapper {
float: right; float: right;
white-space: nowrap;
margin-right: 5px; margin-right: 5px;
margin-top: -4px;
} }
#calendar-toolbar #calendar-toolbar_favorite_wrapper #calendar-toolbar_favorite_menu { #calendar-toolbar #calendar-toolbar_favorite_wrapper #calendar-toolbar_favorite_menu {
z-index: 40; z-index: 40;
@ -1582,6 +1590,9 @@ img.calendar_print_appicon {
#calendar-list_nm .nextmatch_header .header_count { #calendar-list_nm .nextmatch_header .header_count {
margin-right: -4px; margin-right: -4px;
} }
#calendar-list_nm .nextmatch_header .search {
display: none;
}
/*generell*/ /*generell*/
.egw_fw_content_browser_iframe img[src$="svg"] { .egw_fw_content_browser_iframe img[src$="svg"] {
background-color: #828282 !important; background-color: #828282 !important;

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

@ -16,6 +16,7 @@
@import (less) "../default/app.css"; @import (less) "../default/app.css";
/*generell*/ /*generell*/
// makes svg visible // makes svg visible