Skip to content
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

Jump to bottom

685 - Fix remaining issues with GMF examples #4355

Merged
merged 2 commits into from
Nov 6, 2018
Merged

685 - Fix remaining issues with GMF examples #4355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
00d35cf
685 - Fix remaining issues with GMF examples
adube Nov 5, 2018
4fb8db7
Avoid the use of \!important in CSS, introduce gmf-hidden in gmf exam…
adube Nov 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 7 additions & 5 deletions contribs/gmf/examples/displayquerygrid.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta name="viewport"
content="initial-scale=1.0, user-scalable=no, width=device-width">
<meta name="apple-mobile-web-app-capable" content="yes">
<link href="./hidelayertree.inc.css" rel="stylesheet" />
<link href="./gmf-hidden.inc.css" rel="stylesheet" />
</head>
<body ng-controller="MainController as ctrl">

Expand All @@ -29,10 +29,12 @@
</select>
</span>
</div>
<gmf-layertree
gmf-layertree-map="::ctrl.map"
gmf-layertree-openlinksinnewwindow="::true">
</gmf-layertree>
<div class="gmf-hidden">
<gmf-layertree
gmf-layertree-map="::ctrl.map"
gmf-layertree-openlinksinnewwindow="::true">
</gmf-layertree>
</div>
</div>

<div class="clear-left"></div>
Expand Down
12 changes: 7 additions & 5 deletions contribs/gmf/examples/displayquerywindow.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta name="viewport"
content="initial-scale=1.0, user-scalable=no, width=device-width">
<meta name="apple-mobile-web-app-capable" content="yes">
<link href="./hidelayertree.inc.css" rel="stylesheet" />
<link href="./gmf-hidden.inc.css" rel="stylesheet" />
</head>
<body ng-controller="MainController as ctrl">

Expand All @@ -29,10 +29,12 @@
</select>
</span>
</div>
<gmf-layertree
gmf-layertree-map="::ctrl.map"
gmf-layertree-openlinksinnewwindow="::true">
</gmf-layertree>
<div class="gmf-hidden">
<gmf-layertree
gmf-layertree-map="::ctrl.map"
gmf-layertree-openlinksinnewwindow="::true">
</gmf-layertree>
</div>
</div>

<div class="clear-left"></div>
Expand Down
12 changes: 7 additions & 5 deletions contribs/gmf/examples/editfeatureselector.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta name="viewport"
content="initial-scale=1.0, user-scalable=no, width=device-width">
<meta name="mobile-web-app-capable" content="yes">
<link href="./hidelayertree.inc.css" rel="stylesheet" />
<link href="./gmf-hidden.inc.css" rel="stylesheet" />
</head>
<body ng-controller="MainController as ctrl">
<gmf-map gmf-map-map="ctrl.map"></gmf-map>
Expand All @@ -22,10 +22,12 @@

<p><strong>Note:</strong> After logging it, you need to refresh the page</p>

<gmf-layertree
class="panel panel-default panel-body"
gmf-layertree-map="::ctrl.map">
</gmf-layertree>
<div class="gmf-hidden">
<gmf-layertree
class="panel panel-default panel-body"
gmf-layertree-map="::ctrl.map">
</gmf-layertree>
</div>

<gmf-authentication
class="panel panel-default panel-body">
Expand Down
3 changes: 3 additions & 0 deletions contribs/gmf/examples/gmf-hidden.inc.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.gmf-hidden {
display: none;
}
12 changes: 7 additions & 5 deletions contribs/gmf/examples/print.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta name="viewport"
content="initial-scale=1.0, user-scalable=no, width=device-width">
<meta name="apple-mobile-web-app-capable" content="yes">
<link href="./hidelayertree.inc.css" rel="stylesheet" />
<link href="./gmf-hidden.inc.css" rel="stylesheet" />
</head>
<body ng-controller="MainController as ctrl">

Expand All @@ -21,10 +21,12 @@
</select>
</span>
</div>
<gmf-layertree
gmf-layertree-map="::ctrl.map"
gmf-layertree-openlinksinnewwindow="::true">
</gmf-layertree>
<div class="gmf-hidden">
<gmf-layertree
gmf-layertree-map="::ctrl.map"
gmf-layertree-openlinksinnewwindow="::true">
</gmf-layertree>
</div>
</div>

<div class="clear-left"></div>
Expand Down
10 changes: 10 additions & 0 deletions contribs/gmf/examples/search.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,16 @@ span.twitter-typeahead {
.gmf-search > * {
float: left;
}
@media (max-width: 576px) {
.container-fluid gmf-search .gmf-search {
width: auto;
}
}
@media (min-width: 576px) {
.container-fluid gmf-search .gmf-search {
width: auto;
}
}
.gmf-search > .gmf-clear-button{
margin-left: -15px;
padding: 3px 0 2px;
Expand Down
2 changes: 1 addition & 1 deletion contribs/gmf/examples/share.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<gmf-share ng-if="ctrl.modalShareShown" gmf-share-email="false"/>
</ngeo-modal>
<ngeo-modal ng-model="ctrl.modalShareWithEmailShown">
<gmf-share ng-if="ctrl.modalShareShown" gmf-share-email="true"/>
<gmf-share ng-if="ctrl.modalShareWithEmailShown" gmf-share-email="true"/>
</ngeo-modal>
</body>
</html>
8 changes: 8 additions & 0 deletions contribs/gmf/examples/wfspermalink.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,3 +143,11 @@ gmf-map > div {
bottom: 0;
}
}

.gmf-displayquerywindow button::before,
.gmf-displayquerywindow button::after,
.ngeo-displaywindow button::before,
.ngeo-displaywindow button::after {
font-family: 'Font Awesome 5 Free';
font-weight: 900;
}
6 changes: 3 additions & 3 deletions src/Popover.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ exports.prototype.setMap = function(map) {

const currentMap = this.getMap();
if (currentMap) {
$(element).popover('destroy');
$(element).popover('dispose');
}

olOverlay.prototype.setMap.call(this, map);
Expand All @@ -77,8 +77,8 @@ exports.prototype.setMap = function(map) {
'template': [
'<div class="popover ngeo-popover" role="tooltip">',
' <div class="arrow"></div>',
' <h3 class="popover-title"></h3>',
' <div class="popover-content"></div>',
' <h3 class="popover-header"></h3>',
' <div class="popover-body"></div>',
'</div>'
].join('')
})
Expand Down