Skip to content

Commit

Permalink
Merge pull request ngageoint#529 in WV/opensphere from ~ROTHM/opensph…
Browse files Browse the repository at this point in the history
…ere:THIN-12440 to master

* commit '10a2c301a718c12c787d54186e645b5d0bb22311':
  fix(popover): quotes in title
  • Loading branch information
rothmike committed Nov 20, 2018
2 parents b5bf311 + 10a2c30 commit 159b343
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion views/datetime/anydate.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
data-ng-disabled="disabled">
Range
</label>
<popover class="ml-3" ng-if="help" title="help.title" content="help.content" pos="help.pos"></popover>
<popover class="ml-3" ng-if="help" data-title="help.title" content="help.content" pos="help.pos"></popover>
</div>

<div ng-form="anyDateForm">
Expand Down
2 changes: 1 addition & 1 deletion views/geo/position.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
ng-disabled="disabled" ng-class="{'active': posCtrl.mapEnabled}">
<i class="fa fa-globe" ng-class="{'text-primary': posCtrl.mapEnabled}"></i>
</button>
<popover class="mx-2" title="'Entering Position'" content="popoverContent" pos="'right'"></popover>
<popover class="mx-2" data-title="'Entering Position'" content="popoverContent" pos="'right'"></popover>
</div>
<div>
<validation-message target="form.pos"></validation-message>
Expand Down
2 changes: 1 addition & 1 deletion views/query/area/userarea.html
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
<label class="col-form-label col-3 text-right u-required">Coordinates</label>
<div class="col">
<span class="ml-auto float-right">
<popover title="'Entering Coordinates'" content="ctrl.customPopoverContent" pos="'right'"></popover>
<popover data-title="'Entering Coordinates'" content="ctrl.customPopoverContent" pos="'right'"></popover>
</span>
<textarea class="col-11 form-control flex-fill" name="coordinates" rows="5" required placeholder="Enter Coordinates" ng-model="ctrl.coordinates" ng-change="ctrl.updateArea()"></textarea>
<span class="invalid-feedback d-block" ng-if="ctrl.coordinates && !ctrl.area">
Expand Down
8 changes: 4 additions & 4 deletions views/windows/featureedit.html
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<select class="custom-select ml-2 col-2" ng-model="ctrl.semiMajorUnits" ng-change="ctrl.updatePreview()"
ng-options="unit for unit in ctrl.units">
</select>
<popover class="mx-2" title="'Semi-Major Axis'" content="ctrl.help.semiMajor" pos="'right'">
<popover class="mx-2" data-title="'Semi-Major Axis'" content="ctrl.help.semiMajor" pos="'right'">
</popover>
</div>
</div>
Expand All @@ -69,7 +69,7 @@
<select class="custom-select ml-2 col-2" ng-model="ctrl.semiMinorUnits" ng-change="ctrl.updatePreview()"
ng-options="unit for unit in ctrl.units">
</select>
<popover class="mx-2" title="'Semi-Minor Axis'" content="ctrl.help.semiMinor" pos="'right'">
<popover class="mx-2" data-title="'Semi-Minor Axis'" content="ctrl.help.semiMinor" pos="'right'">
</popover>
</div>
</div>
Expand All @@ -82,7 +82,7 @@
<label class="col-2 col-form-label text-right u-required">Orientation</label>
<div class="d-inline-flex col">
<input class="form-control col-4" type="number" name="orientation" ng-model="ctrl.orientation" ng-change="ctrl.updatePreview()" step="any" required="true" />
<popover class="mx-2" title="'Ellipse Orientation'" content="ctrl.help.orientation" pos="'right'">
<popover class="mx-2" data-title="'Ellipse Orientation'" content="ctrl.help.orientation" pos="'right'">
</popover>
</div>
</div>
Expand All @@ -94,7 +94,7 @@
<div class="d-inline-flex col">
<input class="form-control col-4" type="number" name="iconRotation" ng-model="ctrl.iconRotation" ng-change="ctrl.updatePreview()" step="any" />
<div class="mx-2">degrees</div>
<popover title="'Icon Rotation'" content="ctrl.help.iconRotation" pos="'right'">
<popover data-title="'Icon Rotation'" content="ctrl.help.iconRotation" pos="'right'">
</popover>
</div>
</div>
Expand Down

0 comments on commit 159b343

Please sign in to comment.