From 044a7fd8a682d22214af8cb7c59cd0283de0df7e Mon Sep 17 00:00:00 2001
From: Bruno Perles
Date: Wed, 6 Jan 2016 11:42:57 +0100
Subject: Remove undefined from popover and improve UI : #41594
---
app/assets/stylesheets/vendor/openlayers_style.css | 433 --------------------
.../stylesheets/vendor/openlayers_style.scss | 438 +++++++++++++++++++++
app/maps/application_map.rb | 5 +-
3 files changed, 442 insertions(+), 434 deletions(-)
delete mode 100644 app/assets/stylesheets/vendor/openlayers_style.css
create mode 100644 app/assets/stylesheets/vendor/openlayers_style.scss
(limited to 'app')
diff --git a/app/assets/stylesheets/vendor/openlayers_style.css b/app/assets/stylesheets/vendor/openlayers_style.css
deleted file mode 100644
index 25308996f..000000000
--- a/app/assets/stylesheets/vendor/openlayers_style.css
+++ /dev/null
@@ -1,433 +0,0 @@
-div.olMap {
- z-index: 0;
- padding: 0 !important;
- margin: 0 !important;
- cursor: default;
-}
-
-div.olMapViewport {
- text-align: left;
-}
-
-div.olLayerDiv {
- -moz-user-select: none;
- -khtml-user-select: none;
-}
-
-.olLayerGoogleCopyright {
- left: 2px;
- bottom: 2px;
-}
-.olLayerGoogleV3.olLayerGoogleCopyright {
- right: auto !important;
-}
-.olLayerGooglePoweredBy {
- left: 2px;
- bottom: 15px;
-}
-.olLayerGoogleV3.olLayerGooglePoweredBy {
- bottom: 15px !important;
-}
-.olControlAttribution {
- font-size: smaller;
- right: 3px;
- bottom: 0.5em;
- position: absolute;
- display: block;
-}
-.olControlScale {
- right: 3px;
- bottom: 3em;
- display: block;
- position: absolute;
- font-size: smaller;
-}
-.olControlScaleLine {
- display: block;
- position: absolute;
- left: 10px;
- bottom: 15px;
- font-size: xx-small;
-}
-.olControlScaleLineBottom {
- border: solid 2px black;
- border-bottom: none;
- margin-top:-2px;
- text-align: center;
-}
-.olControlScaleLineTop {
- border: solid 2px black;
- border-top: none;
- text-align: center;
-}
-
-.olControlPermalink {
- right: 3px;
- bottom: 1.5em;
- display: block;
- position: absolute;
- font-size: smaller;
-}
-
-div.olControlMousePosition {
- bottom: 0em;
- right: 3px;
- display: block;
- position: absolute;
- font-family: Arial;
- font-size: smaller;
-}
-
-.olControlOverviewMapContainer {
- position: absolute;
- bottom: 0;
- right: 0;
-}
-
-.olControlOverviewMapElement {
- padding: 10px 18px 10px 10px;
- background-color: #00008B;
- -moz-border-radius: 1em 0 0 0;
-}
-
-.olControlOverviewMapMinimizeButton {
- right: 0;
- bottom: 80px;
- cursor: pointer;
-}
-
-.olControlOverviewMapMaximizeButton {
- right: 0;
- bottom: 80px;
- cursor: pointer;
-}
-
-.olControlOverviewMapExtentRectangle {
- overflow: hidden;
- background-image: url( image-path('openlayers/blank.gif') );
- cursor: move;
- border: 2px dotted red;
-}
-.olControlOverviewMapRectReplacement {
- overflow: hidden;
- cursor: move;
- background-image: url( image-path('openlayers/overview_replacement.gif') );
- background-repeat: no-repeat;
- background-position: center;
-}
-
-.olLayerGeoRSSDescription {
- float:left;
- width:100%;
- overflow:auto;
- font-size:1.0em;
-}
-.olLayerGeoRSSClose {
- float:right;
- color:gray;
- font-size:1.2em;
- margin-right:6px;
- font-family:sans-serif;
-}
-.olLayerGeoRSSTitle {
- float:left;font-size:1.2em;
-}
-
-.olPopupContent {
- padding:5px;
- overflow: auto;
-}
-
-.olControlNavigationHistory {
- background-image: url( image-path('openlayers/navigation_history.png') );
- background-repeat: no-repeat;
- width: 24px;
- height: 24px;
-
-}
-.olControlNavigationHistoryPreviousItemActive {
- background-position: 0 0;
-}
-.olControlNavigationHistoryPreviousItemInactive {
- background-position: 0 -24px;
-}
-.olControlNavigationHistoryNextItemActive {
- background-position: -24px 0;
-}
-.olControlNavigationHistoryNextItemInactive {
- background-position: -24px -24px;
-}
-
-div.olControlSaveFeaturesItemActive {
- background-image: url( image-path('openlayers/save_features_on.png') );
- background-repeat: no-repeat;
- background-position: 0 1px;
-}
-div.olControlSaveFeaturesItemInactive {
- background-image: url( image-path('openlayers/save_features_off.png') );
- background-repeat: no-repeat;
- background-position: 0 1px;
-}
-
-.olHandlerBoxZoomBox {
- border: 2px solid red;
- position: absolute;
- background-color: white;
- opacity: 0.50;
- font-size: 1px;
- filter: alpha(opacity=50);
-}
-.olHandlerBoxSelectFeature {
- border: 2px solid blue;
- position: absolute;
- background-color: white;
- opacity: 0.50;
- font-size: 1px;
- filter: alpha(opacity=50);
-}
-
-.olControlPanPanel {
- top: 10px;
- left: 5px;
-}
-
-.olControlPanPanel div {
- background-image: url(/assets/openlayers/pan-panel.png);
- height: 18px;
- width: 18px;
- cursor: pointer;
- position: absolute;
-}
-
-.olControlPanPanel .olControlPanNorthItemInactive {
- top: 0;
- left: 9px;
- background-position: 0 0;
-}
-.olControlPanPanel .olControlPanSouthItemInactive {
- top: 36px;
- left: 9px;
- background-position: 18px 0;
-}
-.olControlPanPanel .olControlPanWestItemInactive {
- position: absolute;
- top: 18px;
- left: 0;
- background-position: 0 18px;
-}
-.olControlPanPanel .olControlPanEastItemInactive {
- top: 18px;
- left: 18px;
- background-position: 18px 18px;
-}
-
-.olControlZoomPanel {
- top: 71px;
- left: 14px;
-}
-
-.olControlZoomPanel div {
- background-image: url(/assets/openlayers/zoom-panel.png);
- position: absolute;
- height: 18px;
- width: 18px;
- cursor: pointer;
-}
-
-.olControlZoomPanel .olControlZoomInItemInactive {
- top: 0;
- left: 0;
- background-position: 0 0;
-}
-
-.olControlZoomPanel .olControlZoomToMaxExtentItemInactive {
- top: 18px;
- left: 0;
- background-position: 0 -18px;
-}
-
-.olControlZoomPanel .olControlZoomOutItemInactive {
- top: 36px;
- left: 0;
- background-position: 0 18px;
-}
-
-/*
- * When a potential text is bigger than the image it move the image
- * with some headers (closes #3154)
- */
-.olControlPanZoomBar div {
- font-size: 1px;
-}
-
-.olPopupCloseBox {
- background: url( image-path('openlayers/close.gif') ) no-repeat;
- cursor: pointer;
-}
-
-.olFramedCloudPopupContent {
- padding: 5px;
- overflow: auto;
-}
-
-.olControlNoSelect {
- -moz-user-select: none;
- -khtml-user-select: none;
-}
-
-.olImageLoadError {
- background-color: pink;
- opacity: 0.5;
- filter: alpha(opacity=50); /* IE */
-}
-
-/**
- * Cursor styles
- */
-
-.olCursorWait {
- cursor: wait;
-}
-.olDragDown {
- cursor: move;
-}
-.olDrawBox {
- cursor: crosshair;
-}
-.olControlDragFeatureOver {
- cursor: move;
-}
-.olControlDragFeatureActive.olControlDragFeatureOver.olDragDown {
- cursor: -moz-grabbing;
-}
-
-/**
- * Layer switcher
- */
-.olControlLayerSwitcher {
- position: absolute;
- top: 25px;
- right: 0;
- width: 20em;
- font-family: sans-serif;
- font-weight: bold;
- margin-top: 3px;
- margin-left: 3px;
- margin-bottom: 3px;
- font-size: smaller;
- color: white;
- background-color: transparent;
-}
-
-.olControlLayerSwitcher .layersDiv {
- padding-top: 5px;
- padding-left: 10px;
- padding-bottom: 5px;
- padding-right: 75px;
- background-color: darkblue;
- width: 100%;
- height: 100%;
-}
-
-.olControlLayerSwitcher .layersDiv .baseLbl,
-.olControlLayerSwitcher .layersDiv .dataLbl {
- margin-top: 3px;
- margin-left: 3px;
- margin-bottom: 3px;
-}
-
-.olControlLayerSwitcher .layersDiv .baseLayersDiv,
-.olControlLayerSwitcher .layersDiv .dataLayersDiv {
- padding-left: 10px;
-}
-
-.olControlLayerSwitcher .maximizeDiv,
-.olControlLayerSwitcher .minimizeDiv {
- top: 5px;
- right: 0;
- cursor: pointer;
-}
-
-.olBingAttribution {
- color: #DDD;
-}
-.olBingAttribution.road {
- color: #333;
-}
-
-.olGoogleAttribution.hybrid, .olGoogleAttribution.satellite {
- color: #EEE;
-}
-.olGoogleAttribution {
- color: #333;
-}
-span.olGoogleAttribution a {
- color: #77C;
-}
-span.olGoogleAttribution.hybrid a, span.olGoogleAttribution.satellite a {
- color: #EEE;
-}
-
-/**
- * Editing and navigation icons.
- * (using the editing_tool_bar.png sprint image)
- */
-.olControlNavToolbar ,
-.olControlEditingToolbar {
- margin: 5px 5px 0 0;
-}
-.olControlNavToolbar div,
-.olControlEditingToolbar div {
- background-image: url( image-path('openlayers/editing_tool_bar.png') );
- background-repeat: no-repeat;
- margin: 0 0 5px 5px;
- width: 24px;
- height: 22px;
- cursor: pointer
-}
-/* positions */
-.olControlEditingToolbar {
- right: 0;
- top: 0;
-}
-.olControlNavToolbar {
- top: 295px;
- left: 9px;
-}
-/* layouts */
-.olControlEditingToolbar div {
- float: right;
-}
-/* individual controls */
-.olControlNavToolbar .olControlNavigationItemInactive,
-.olControlEditingToolbar .olControlNavigationItemInactive {
- background-position: -103px -1px;
-}
-.olControlNavToolbar .olControlNavigationItemActive ,
-.olControlEditingToolbar .olControlNavigationItemActive {
- background-position: -103px -24px;
-}
-.olControlNavToolbar .olControlZoomBoxItemInactive {
- background-position: -128px -1px;
-}
-.olControlNavToolbar .olControlZoomBoxItemActive {
- background-position: -128px -24px;
-}
-.olControlEditingToolbar .olControlDrawFeaturePointItemInactive {
- background-position: -77px -1px;
-}
-.olControlEditingToolbar .olControlDrawFeaturePointItemActive {
- background-position: -77px -24px;
-}
-.olControlEditingToolbar .olControlDrawFeaturePathItemInactive {
- background-position: -51px -1px;
-}
-.olControlEditingToolbar .olControlDrawFeaturePathItemActive {
- background-position: -51px -24px;
-}
-.olControlEditingToolbar .olControlDrawFeaturePolygonItemInactive{
- background-position: -26px -1px;
-}
-.olControlEditingToolbar .olControlDrawFeaturePolygonItemActive {
- background-position: -26px -24px;
-}
diff --git a/app/assets/stylesheets/vendor/openlayers_style.scss b/app/assets/stylesheets/vendor/openlayers_style.scss
new file mode 100644
index 000000000..68e60da55
--- /dev/null
+++ b/app/assets/stylesheets/vendor/openlayers_style.scss
@@ -0,0 +1,438 @@
+div.olMap {
+ z-index: 0;
+ padding: 0 !important;
+ margin: 0 !important;
+ cursor: default;
+}
+
+div.olMapViewport {
+ text-align: left;
+}
+
+div.olLayerDiv {
+ -moz-user-select: none;
+ -khtml-user-select: none;
+}
+
+.olLayerGoogleCopyright {
+ left: 2px;
+ bottom: 2px;
+}
+.olLayerGoogleV3.olLayerGoogleCopyright {
+ right: auto !important;
+}
+.olLayerGooglePoweredBy {
+ left: 2px;
+ bottom: 15px;
+}
+.olLayerGoogleV3.olLayerGooglePoweredBy {
+ bottom: 15px !important;
+}
+.olControlAttribution {
+ font-size: smaller;
+ right: 3px;
+ bottom: 0.5em;
+ position: absolute;
+ display: block;
+}
+.olControlScale {
+ right: 3px;
+ bottom: 3em;
+ display: block;
+ position: absolute;
+ font-size: smaller;
+}
+.olControlScaleLine {
+ display: block;
+ position: absolute;
+ left: 10px;
+ bottom: 15px;
+ font-size: xx-small;
+}
+.olControlScaleLineBottom {
+ border: solid 2px black;
+ border-bottom: none;
+ margin-top:-2px;
+ text-align: center;
+}
+.olControlScaleLineTop {
+ border: solid 2px black;
+ border-top: none;
+ text-align: center;
+}
+
+.olControlPermalink {
+ right: 3px;
+ bottom: 1.5em;
+ display: block;
+ position: absolute;
+ font-size: smaller;
+}
+
+div.olControlMousePosition {
+ bottom: 0em;
+ right: 3px;
+ display: block;
+ position: absolute;
+ font-family: Arial;
+ font-size: smaller;
+}
+
+.olControlOverviewMapContainer {
+ position: absolute;
+ bottom: 0;
+ right: 0;
+}
+
+.olControlOverviewMapElement {
+ padding: 10px 18px 10px 10px;
+ background-color: #00008B;
+ -moz-border-radius: 1em 0 0 0;
+}
+
+.olControlOverviewMapMinimizeButton {
+ right: 0;
+ bottom: 80px;
+ cursor: pointer;
+}
+
+.olControlOverviewMapMaximizeButton {
+ right: 0;
+ bottom: 80px;
+ cursor: pointer;
+}
+
+.olControlOverviewMapExtentRectangle {
+ overflow: hidden;
+ background-image: url( image-path('openlayers/blank.gif') );
+ cursor: move;
+ border: 2px dotted red;
+}
+.olControlOverviewMapRectReplacement {
+ overflow: hidden;
+ cursor: move;
+ background-image: url( image-path('openlayers/overview_replacement.gif') );
+ background-repeat: no-repeat;
+ background-position: center;
+}
+
+.olLayerGeoRSSDescription {
+ float:left;
+ width:100%;
+ overflow:auto;
+ font-size:1.0em;
+}
+.olLayerGeoRSSClose {
+ float:right;
+ color:gray;
+ font-size:1.2em;
+ margin-right:6px;
+ font-family:sans-serif;
+}
+.olLayerGeoRSSTitle {
+ float:left;font-size:1.2em;
+}
+
+.olPopup {
+ border-radius: 5px;
+ box-shadow: 0 0 6px #AAA;
+}
+
+.olPopupContent {
+ padding:5px;
+ overflow: auto;
+}
+
+.olControlNavigationHistory {
+ background-image: url( image-path('openlayers/navigation_history.png') );
+ background-repeat: no-repeat;
+ width: 24px;
+ height: 24px;
+
+}
+.olControlNavigationHistoryPreviousItemActive {
+ background-position: 0 0;
+}
+.olControlNavigationHistoryPreviousItemInactive {
+ background-position: 0 -24px;
+}
+.olControlNavigationHistoryNextItemActive {
+ background-position: -24px 0;
+}
+.olControlNavigationHistoryNextItemInactive {
+ background-position: -24px -24px;
+}
+
+div.olControlSaveFeaturesItemActive {
+ background-image: url( image-path('openlayers/save_features_on.png') );
+ background-repeat: no-repeat;
+ background-position: 0 1px;
+}
+div.olControlSaveFeaturesItemInactive {
+ background-image: url( image-path('openlayers/save_features_off.png') );
+ background-repeat: no-repeat;
+ background-position: 0 1px;
+}
+
+.olHandlerBoxZoomBox {
+ border: 2px solid red;
+ position: absolute;
+ background-color: white;
+ opacity: 0.50;
+ font-size: 1px;
+ filter: alpha(opacity=50);
+}
+.olHandlerBoxSelectFeature {
+ border: 2px solid blue;
+ position: absolute;
+ background-color: white;
+ opacity: 0.50;
+ font-size: 1px;
+ filter: alpha(opacity=50);
+}
+
+.olControlPanPanel {
+ top: 10px;
+ left: 5px;
+}
+
+.olControlPanPanel div {
+ background-image: url(/assets/openlayers/pan-panel.png);
+ height: 18px;
+ width: 18px;
+ cursor: pointer;
+ position: absolute;
+}
+
+.olControlPanPanel .olControlPanNorthItemInactive {
+ top: 0;
+ left: 9px;
+ background-position: 0 0;
+}
+.olControlPanPanel .olControlPanSouthItemInactive {
+ top: 36px;
+ left: 9px;
+ background-position: 18px 0;
+}
+.olControlPanPanel .olControlPanWestItemInactive {
+ position: absolute;
+ top: 18px;
+ left: 0;
+ background-position: 0 18px;
+}
+.olControlPanPanel .olControlPanEastItemInactive {
+ top: 18px;
+ left: 18px;
+ background-position: 18px 18px;
+}
+
+.olControlZoomPanel {
+ top: 71px;
+ left: 14px;
+}
+
+.olControlZoomPanel div {
+ background-image: url(/assets/openlayers/zoom-panel.png);
+ position: absolute;
+ height: 18px;
+ width: 18px;
+ cursor: pointer;
+}
+
+.olControlZoomPanel .olControlZoomInItemInactive {
+ top: 0;
+ left: 0;
+ background-position: 0 0;
+}
+
+.olControlZoomPanel .olControlZoomToMaxExtentItemInactive {
+ top: 18px;
+ left: 0;
+ background-position: 0 -18px;
+}
+
+.olControlZoomPanel .olControlZoomOutItemInactive {
+ top: 36px;
+ left: 0;
+ background-position: 0 18px;
+}
+
+/*
+ * When a potential text is bigger than the image it move the image
+ * with some headers (closes #3154)
+ */
+.olControlPanZoomBar div {
+ font-size: 1px;
+}
+
+.olPopupCloseBox {
+ background: url( image-path('openlayers/close.gif') ) no-repeat;
+ cursor: pointer;
+}
+
+.olFramedCloudPopupContent {
+ padding: 5px;
+ overflow: auto;
+}
+
+.olControlNoSelect {
+ -moz-user-select: none;
+ -khtml-user-select: none;
+}
+
+.olImageLoadError {
+ background-color: pink;
+ opacity: 0.5;
+ filter: alpha(opacity=50); /* IE */
+}
+
+/**
+ * Cursor styles
+ */
+
+.olCursorWait {
+ cursor: wait;
+}
+.olDragDown {
+ cursor: move;
+}
+.olDrawBox {
+ cursor: crosshair;
+}
+.olControlDragFeatureOver {
+ cursor: move;
+}
+.olControlDragFeatureActive.olControlDragFeatureOver.olDragDown {
+ cursor: -moz-grabbing;
+}
+
+/**
+ * Layer switcher
+ */
+.olControlLayerSwitcher {
+ position: absolute;
+ top: 25px;
+ right: 0;
+ width: 20em;
+ font-family: sans-serif;
+ font-weight: bold;
+ margin-top: 3px;
+ margin-left: 3px;
+ margin-bottom: 3px;
+ font-size: smaller;
+ color: white;
+ background-color: transparent;
+}
+
+.olControlLayerSwitcher .layersDiv {
+ padding-top: 5px;
+ padding-left: 10px;
+ padding-bottom: 5px;
+ padding-right: 75px;
+ background-color: darkblue;
+ width: 100%;
+ height: 100%;
+}
+
+.olControlLayerSwitcher .layersDiv .baseLbl,
+.olControlLayerSwitcher .layersDiv .dataLbl {
+ margin-top: 3px;
+ margin-left: 3px;
+ margin-bottom: 3px;
+}
+
+.olControlLayerSwitcher .layersDiv .baseLayersDiv,
+.olControlLayerSwitcher .layersDiv .dataLayersDiv {
+ padding-left: 10px;
+}
+
+.olControlLayerSwitcher .maximizeDiv,
+.olControlLayerSwitcher .minimizeDiv {
+ top: 5px;
+ right: 0;
+ cursor: pointer;
+}
+
+.olBingAttribution {
+ color: #DDD;
+}
+.olBingAttribution.road {
+ color: #333;
+}
+
+.olGoogleAttribution.hybrid, .olGoogleAttribution.satellite {
+ color: #EEE;
+}
+.olGoogleAttribution {
+ color: #333;
+}
+span.olGoogleAttribution a {
+ color: #77C;
+}
+span.olGoogleAttribution.hybrid a, span.olGoogleAttribution.satellite a {
+ color: #EEE;
+}
+
+/**
+ * Editing and navigation icons.
+ * (using the editing_tool_bar.png sprint image)
+ */
+.olControlNavToolbar ,
+.olControlEditingToolbar {
+ margin: 5px 5px 0 0;
+}
+.olControlNavToolbar div,
+.olControlEditingToolbar div {
+ background-image: url( image-path('openlayers/editing_tool_bar.png') );
+ background-repeat: no-repeat;
+ margin: 0 0 5px 5px;
+ width: 24px;
+ height: 22px;
+ cursor: pointer
+}
+/* positions */
+.olControlEditingToolbar {
+ right: 0;
+ top: 0;
+}
+.olControlNavToolbar {
+ top: 295px;
+ left: 9px;
+}
+/* layouts */
+.olControlEditingToolbar div {
+ float: right;
+}
+/* individual controls */
+.olControlNavToolbar .olControlNavigationItemInactive,
+.olControlEditingToolbar .olControlNavigationItemInactive {
+ background-position: -103px -1px;
+}
+.olControlNavToolbar .olControlNavigationItemActive ,
+.olControlEditingToolbar .olControlNavigationItemActive {
+ background-position: -103px -24px;
+}
+.olControlNavToolbar .olControlZoomBoxItemInactive {
+ background-position: -128px -1px;
+}
+.olControlNavToolbar .olControlZoomBoxItemActive {
+ background-position: -128px -24px;
+}
+.olControlEditingToolbar .olControlDrawFeaturePointItemInactive {
+ background-position: -77px -1px;
+}
+.olControlEditingToolbar .olControlDrawFeaturePointItemActive {
+ background-position: -77px -24px;
+}
+.olControlEditingToolbar .olControlDrawFeaturePathItemInactive {
+ background-position: -51px -1px;
+}
+.olControlEditingToolbar .olControlDrawFeaturePathItemActive {
+ background-position: -51px -24px;
+}
+.olControlEditingToolbar .olControlDrawFeaturePolygonItemInactive{
+ background-position: -26px -1px;
+}
+.olControlEditingToolbar .olControlDrawFeaturePolygonItemActive {
+ background-position: -26px -24px;
+}
diff --git a/app/maps/application_map.rb b/app/maps/application_map.rb
index 25b1fc10a..fb2cd897a 100644
--- a/app/maps/application_map.rb
+++ b/app/maps/application_map.rb
@@ -137,10 +137,13 @@ class ApplicationMap
var feature = e.feature ;
if (feature.attributes.inactive != undefined)
return;
+ var stop_area_type_label = '';
+ if (feature.attributes.stop_area_type_label != undefined)
+ stop_area_type_label = feature.attributes.stop_area_type_label;
var popup = new OpenLayers.Popup.Anchored('chicken',
new OpenLayers.LonLat(feature.geometry.x, feature.geometry.y),
null,
- \" \", null, false, null);
+ \" \", null, false, null);
popup.autoSize = true;
popup.displayClass = 'popup_hover';
--
cgit v1.2.3