Skip to content

Commit efd8b22

Browse files
committed
layout changes, hide datapicker components when not needed
1 parent a243b37 commit efd8b22

File tree

2 files changed

+12
-0
lines changed

2 files changed

+12
-0
lines changed

web-ui/src/main/resources/catalog/components/edit/datepicker/partials/datepicker.html

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,14 @@
3737
class="form-control"
3838
data-ng-model="year"
3939
data-ng-show="mode === DATE_MODE.YEAR"
40+
data-ng-disabled="withIndeterminatePosition && (indeterminatePosition === 'now' || indeterminatePosition === 'unknown')"
4041
/>
4142
<input
4243
type="month"
4344
class="form-control"
4445
data-ng-model="month"
4546
data-ng-show="mode === DATE_MODE.MONTH"
47+
data-ng-disabled="withIndeterminatePosition && (indeterminatePosition === 'now' || indeterminatePosition === 'unknown')"
4648
/>
4749
<input
4850
type="date"
@@ -51,6 +53,7 @@
5153
data-ng-show="mode === DATE_MODE.DATE || mode === DATE_MODE.DATETIME"
5254
data-ng-class="hideTime == 'true' ? 'gn-notime' : ''"
5355
data-ng-disabled="withIndeterminatePosition && (indeterminatePosition === 'now' || indeterminatePosition === 'unknown')"
56+
style="width: 100%"
5457
/>
5558
<!-- Time input -->
5659
<input
@@ -66,6 +69,7 @@
6669
data-ng-model="timezoneObj"
6770
data-ng-show="mode === DATE_MODE.DATETIME && !hideTime"
6871
data-ng-options="t as (t.name + ' ' + t.offset) for t in timezoneNames"
72+
data-ng-disabled="withIndeterminatePosition && (indeterminatePosition === 'now' || indeterminatePosition === 'unknown')"
6973
></select>
7074

7175
<!-- Date mode selector -->
@@ -74,6 +78,7 @@
7478
type="button"
7579
class="btn btn-default dropdown-toggle"
7680
data-toggle="dropdown"
81+
data-ng-disabled="withIndeterminatePosition && (indeterminatePosition === 'now' || indeterminatePosition === 'unknown')"
7782
>
7883
<i class="fa fa-cog"></i>&nbsp;<span class="caret"></span>
7984
</button>

web-ui/src/main/resources/catalog/views/default/less/gn_editor_default.less

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,13 @@
99
visibility: visible !important;
1010
font-size: 14px !important;
1111
}
12+
.row {
13+
display: flex;
14+
}
15+
16+
.gn-control {
17+
margin-top: auto;
18+
}
1219
}
1320

1421
.gn-results-editor {

0 commit comments

Comments
 (0)