Skip to content

Commit

Permalink
fix(map): ensure map view height is 100% of available area
Browse files Browse the repository at this point in the history
  • Loading branch information
sersanchus committed Nov 11, 2024
1 parent 4a6ec7c commit 649fae8
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 45 deletions.
Original file line number Diff line number Diff line change
@@ -1,45 +1,47 @@
<?xml version="1.0" encoding="utf-8" ?>
<templates>
<t t-name="base_geoengine.GeoengineController">
<Layout display="props.display" className="'h-100'">
<t t-set-slot="layout-actions">
<SearchBar
t-if="searchBarToggler.state.showSearchBar"
autofocus="firstLoad"
/>
</t>
<t t-set-slot="layout-buttons">
<t t-if="model.root.editedRecord">
<button
type="button"
class="btn btn-primary o_list_button_save"
data-hotkey="s"
t-on-click.stop="onClickSave"
>
Save
</button>
<button
type="button"
class="btn btn-secondary o_list_button_discard"
data-hotkey="j"
t-on-click.stop="onClickDiscard"
>
Discard
</button>
<div class="o_action">
<Layout display="props.display" className="'h-100'">
<t t-set-slot="layout-actions">
<SearchBar
t-if="searchBarToggler.state.showSearchBar"
autofocus="firstLoad"
/>
</t>
<t t-set-slot="layout-buttons">
<t t-if="model.root.editedRecord">
<button
type="button"
class="btn btn-primary o_list_button_save"
data-hotkey="s"
t-on-click.stop="onClickSave"
>
Save
</button>
<button
type="button"
class="btn btn-secondary o_list_button_discard"
data-hotkey="j"
t-on-click.stop="onClickDiscard"
>
Discard
</button>
</t>
</t>
</t>
<t
t-component="props.Renderer"
isSavedOrDiscarded="state.isSavedOrDiscarded"
archInfo="props.archInfo"
data="model.root"
editable="editable"
openRecord.bind="openRecord"
updateRecord.bind="updateRecord"
onClickDiscard.bind="onClickDiscard"
createRecord.bind="createRecord"
onDrawStart.bind="onDrawStart"
/>
</Layout>
<t
t-component="props.Renderer"
isSavedOrDiscarded="state.isSavedOrDiscarded"
archInfo="props.archInfo"
data="model.root"
editable="editable"
openRecord.bind="openRecord"
updateRecord.bind="updateRecord"
onClickDiscard.bind="onClickDiscard"
createRecord.bind="createRecord"
onDrawStart.bind="onDrawStart"
/>
</Layout>
</div>
</t>
</templates>
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,6 @@
height: 100%;
}

.view {
max-height: 90%;
height: 100% !important;
}

.menu {
z-index: 2;
flex-grow: 0;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<templates xml:space="preserve">
<t t-name="base_geoengine.GeoengineRenderer">
<div class="d-flex view w-100">
<div class="d-flex w-100 h-100">
<LayersPanel model="props.data.resModel" vectorModel="vectorModel.root" />
<div class="map_container">
<div id="olmap" />
Expand Down

0 comments on commit 649fae8

Please sign in to comment.