From 352b6d5b3abf22a81ba4b9f6f09e60b864d59ed7 Mon Sep 17 00:00:00 2001
From: Ninassi Benjamin <benjamin.ninassi@inria.fr>
Date: Wed, 27 Mar 2019 14:31:22 +0100
Subject: [PATCH] split map css from main css and json export correction
---
app/Resources/views/base.html.twig | 1 +
.../views/Structure/listAll.html.twig | 2 +-
.../views/Structure/listAll.json.twig | 2 +-
web/css/classcodeadmin.css | 96 -----------------
web/css/map.css | 100 ++++++++++++++++++
5 files changed, 103 insertions(+), 98 deletions(-)
create mode 100644 web/css/map.css
diff --git a/app/Resources/views/base.html.twig b/app/Resources/views/base.html.twig
index 633249a..ae94dbb 100644
--- a/app/Resources/views/base.html.twig
+++ b/app/Resources/views/base.html.twig
@@ -32,6 +32,7 @@
<link href="{{ asset('js/jquery/1.8.2/plugin/DataTables-1.9.4/media/css/jquery.dataTables.css') }}" rel="stylesheet" type="text/css" />
<!-- main css -->
<link rel="stylesheet" href="{{ asset('css/classcodeadmin.css') }}" />
+ <link rel="stylesheet" href="{{ asset('css/map.css') }}" />
{% block envStylesheets %}
{% endblock %}
diff --git a/src/ClassCodeBundle/Resources/views/Structure/listAll.html.twig b/src/ClassCodeBundle/Resources/views/Structure/listAll.html.twig
index 91312e5..a466130 100644
--- a/src/ClassCodeBundle/Resources/views/Structure/listAll.html.twig
+++ b/src/ClassCodeBundle/Resources/views/Structure/listAll.html.twig
@@ -15,7 +15,7 @@
<link href="{{ asset('bootstrap 3.1.1/dist/css/bootstrap-theme.css') }}" rel="stylesheet" type="text/css" />
<link href="{{ asset('bootstrap 3.1.1/docs/assets/css/docs.css') }}" rel="stylesheet" type="text/css" />
<!-- main css -->
- <link rel="stylesheet" href="{{ asset('css/classcodeadmin.css') }}" />
+ <link rel="stylesheet" href="{{ asset('css/map.css') }}" />
<!-- Open Street Map css -->
<link rel="stylesheet" href="{{ asset('js/leaflet-1.3.1/leaflet.css') }}" />
<link rel="stylesheet" href="{{ asset('js/leaflet-1.3.1/plugins/leaflet.markercluster-1.3.0/dist/MarkerCluster.Default.css') }}" />
diff --git a/src/ClassCodeBundle/Resources/views/Structure/listAll.json.twig b/src/ClassCodeBundle/Resources/views/Structure/listAll.json.twig
index 84bc877..50eaae6 100644
--- a/src/ClassCodeBundle/Resources/views/Structure/listAll.json.twig
+++ b/src/ClassCodeBundle/Resources/views/Structure/listAll.json.twig
@@ -8,7 +8,7 @@
"who" : "{{ structure.getWho }}",
"address" : "{{ structure.getAddress }}",
"location" : { "lat" : "{{structure.getLatitude }}" , "lng" :"{{ structure.getLongitude}}" },
- "email" : "{{structure.getEmail }}"
+ "email" : "{{structure.getEmail }}",
"source" : "{{structure.getDataSource }}"
}
{% if loop.last == false %}
diff --git a/web/css/classcodeadmin.css b/web/css/classcodeadmin.css
index b48a351..e57af13 100644
--- a/web/css/classcodeadmin.css
+++ b/web/css/classcodeadmin.css
@@ -636,99 +636,3 @@ li.inline {
padding: 0px;
}
-/* Map OSM */
-.map-wrapper{
- margin-top:10px;
- margin-bottom:10px;
-}
-.osMap{
- z-index: 2;
-}
-
-/* ClassCodeMapOverlay */
-#classCodeMapOverlay {
- position: absolute;
- top: 0px;
- z-index: 3;
- background-color: #fff;
- width: 400px !important;
- height: 400px !important;
- display: none;
- border: 1px solid #CCCCCC;
- overflow-wrap: break-word;
-}
-
-#classCodeMapOverlayTitle {
- background-color: #CCCCCC;
- overflow-wrap: break-word;
- color: #5E5E5E;
- padding: 10px 30px 10px 10px;
- position: relative;
-}
-
-#classCodeMapOverlayContent {
- font-size: 14px;
- padding-left: 1%;
- color: #000;
- overflow-wrap: break-word;
-}
-
-#classCodeMapOverlayContent div {
- font-size: 14px;
- margin-top: 5px;
- color: #5D5D5D;
- margin-left: 10px;
- margin-right: 10px;
-}
-
-#body_container #classCodeMapOverlayContent div a {
- text-decoration: none;
- color: #266D83;
-}
-
-#classCodeMapOverlayContent div.classCodeMapOverlayContentLogo {
- max-width: 230px;
- max-height: 240px;
- text-align: center;
- margin-left: auto;
- margin-right: auto;
-}
-
-#classCodeMapOverlayContent div.classCodeMapOverlayContentLogo img {
- border-style: none;
- max-width: 120px;
- height: auto;
-}
-
-#classCodeMapOverlayContent div.classCodeMapOverlayContentTitle {
- color: #CCCCCC;
- margin-left: 0px;
-}
-
-#classCodeMapOverlayContent div.classCodeMapOverlayEmphasis {
- font-weight: bold;
- margin-left: 0px;
-}
-
-#body_container #classCodeMapOverlayContent div a.classCodeMapOverlayLink, a.classCodeMapOverlayModifyLink {
- color: white;
- text-decoration: none;
- display: block;
- background-color: #27CFD0;
- padding: 10px 20px;
- margin: 10px 20px;
- text-align: left;
- font-weight: bold;
-}
-
-.returnIcon {
- position: absolute;
- right: 10px;
- top: 10px;
- background-image: url(../images/croix.png);
- background-repeat: no-repeat;
- background-position: center center;
- display: inline-block;
- height: 22px;
- width: 22px;
-}
\ No newline at end of file
diff --git a/web/css/map.css b/web/css/map.css
new file mode 100644
index 0000000..64ca61c
--- /dev/null
+++ b/web/css/map.css
@@ -0,0 +1,100 @@
+/**
+* Feuille de style minimale pour la carte
+* Rouge INRIA : color: #E33729;
+*/
+/* Map OSM */
+.map-wrapper{
+ margin-top:10px;
+ margin-bottom:10px;
+}
+.osMap{
+ z-index: 2;
+}
+
+/* ClassCodeMapOverlay */
+#classCodeMapOverlay {
+ position: absolute;
+ top: 0px;
+ z-index: 3;
+ background-color: #fff;
+ width: 400px !important;
+ height: 400px !important;
+ display: none;
+ border: 1px solid #CCCCCC;
+ overflow-wrap: break-word;
+}
+
+#classCodeMapOverlayTitle {
+ background-color: #CCCCCC;
+ overflow-wrap: break-word;
+ color: #5E5E5E;
+ padding: 10px 30px 10px 10px;
+ position: relative;
+}
+
+#classCodeMapOverlayContent {
+ font-size: 14px;
+ padding-left: 1%;
+ color: #000;
+ overflow-wrap: break-word;
+}
+
+#classCodeMapOverlayContent div {
+ font-size: 14px;
+ margin-top: 5px;
+ color: #5D5D5D;
+ margin-left: 10px;
+ margin-right: 10px;
+}
+
+#body_container #classCodeMapOverlayContent div a {
+ text-decoration: none;
+ color: #266D83;
+}
+
+#classCodeMapOverlayContent div.classCodeMapOverlayContentLogo {
+ max-width: 230px;
+ max-height: 240px;
+ text-align: center;
+ margin-left: auto;
+ margin-right: auto;
+}
+
+#classCodeMapOverlayContent div.classCodeMapOverlayContentLogo img {
+ border-style: none;
+ max-width: 120px;
+ height: auto;
+}
+
+#classCodeMapOverlayContent div.classCodeMapOverlayContentTitle {
+ color: #CCCCCC;
+ margin-left: 0px;
+}
+
+#classCodeMapOverlayContent div.classCodeMapOverlayEmphasis {
+ font-weight: bold;
+ margin-left: 0px;
+}
+
+#body_container #classCodeMapOverlayContent div a.classCodeMapOverlayLink, a.classCodeMapOverlayModifyLink {
+ color: white;
+ text-decoration: none;
+ display: block;
+ background-color: #27CFD0;
+ padding: 10px 20px;
+ margin: 10px 20px;
+ text-align: left;
+ font-weight: bold;
+}
+
+.returnIcon {
+ position: absolute;
+ right: 10px;
+ top: 10px;
+ background-image: url(../images/croix.png);
+ background-repeat: no-repeat;
+ background-position: center center;
+ display: inline-block;
+ height: 22px;
+ width: 22px;
+}
\ No newline at end of file
--
GitLab