Skip to content

Closes #43: In advanced search, textbox for "Geographic Location – Coordinates" should be located above the map, not below #2991

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JakubNejmanICM wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Closes #43: In advanced search, textbox for "Geographic Location – Coordinates" should be located above the map, not below #2991

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions fairchive-webapp/src/main/webapp/search/advanced.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,16 @@
value="#{item.fieldValue}"
rendered="#{item.searchFieldType == fieldTypeEnums.TEXT}"/>
<div jsf:rendered="#{item.searchFieldType == fieldTypeEnums.GEOBOX_COORD}">

<p:inputTextarea id="geoboxSearchValue" styleClass="form-control coord-marker margin-top"
value="#{item.fieldValue}"
onchange="
this.value = this.value.replace(/,/g, '.');
DvJS.Geo.SearchView.storeCoordinates('#{mapId}', $(this).val());
DvJS.Geo.SearchView.updateMap('#{mapId}');"
rows="5"
widgetVar="#{widgetVar}"
pt:data-handler="#{widgetVar}"/>
<c:set var="mapId" value="#{item.parent.isDefined()
? (mdb.blockName).concat('_').concat(item.getParent().get().getDisplayId()) : ''}"/>
<c:set var="widgetVar" value="#{mapId}_#{item.datasetFieldType.name}"/>
Expand All @@ -138,16 +148,6 @@
<div id="#{mapId}" class="form-col-container geo-map">
</div>

<p:inputTextarea id="geoboxSearchValue" styleClass="form-control coord-marker margin-top"
value="#{item.fieldValue}"
onchange="
this.value = this.value.replace(/,/g, '.');
DvJS.Geo.SearchView.storeCoordinates('#{mapId}', $(this).val());
DvJS.Geo.SearchView.updateMap('#{mapId}');"
rows="5"
widgetVar="#{widgetVar}"
pt:data-handler="#{widgetVar}"/>

<script>
DvJS.Geo.SearchView.prepare('#{mapId}');
DvJS.Geo.SearchView.putWidgetVar('#{mapId}', 'polygonGeo', '#{widgetVar}');
Expand Down