Skip to content

Commit

Permalink
CSS/Maps: 42840, restore missing styling for OpenLayersMap and adjust…
Browse files Browse the repository at this point in the history
… references to the pointer.

Include a the new icon namend "icon_mapm.svg" (to be found in "components/ILIAS/UI/resources/images/standard") for maps because the original icon still was a PNG file. This was decided by the Iconset Task Fource on the 2th of december 2024.
The icons "mm_20_blue.png" and "mm_20_shadow.png" were deleted as they are not needed anymore.

https://mantis.ilias.de/view.php?id=42840
  • Loading branch information
lukastocker committed Dec 10, 2024
1 parent 85caa25 commit acef785
Show file tree
Hide file tree
Showing 10 changed files with 419 additions and 19 deletions.
20 changes: 17 additions & 3 deletions components/ILIAS/Maps/classes/class.ilOpenLayersMapGUI.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,23 @@
<?php

declare(strict_types=1);
/**
* This file is part of ILIAS, a powerful learning management system
* published by ILIAS open source e-Learning e.V.
*
* ILIAS is licensed with the GPL-3.0,
* see https://www.gnu.org/licenses/gpl-3.0.en.html
* You should have received a copy of said license along with the
* source code, too.
*
* If this is not the case or you just want to try ILIAS, you'll find
* us at:
* https://www.ilias.de
* https://github.com/ILIAS-eLearning
*
********************************************************************
*/

/* Copyright (c) 2018 - Richard Klees <[email protected]> - Extended GPL, see LICENSE */
declare(strict_types=1);

/**
* User interface class for OpenLayers maps
Expand Down Expand Up @@ -61,7 +76,6 @@ public function getHtml(): string
);

$this->lng->loadLanguageModule("maps");
$this->tpl->addCss("public/node_modules/ol/ol.css");
$this->tpl->addCss("components/ILIAS/Maps/css/service_openlayers.css");
$this->tpl->addJavaScript("assets/js/ServiceOpenLayers.js");

Expand Down
Binary file removed components/ILIAS/Maps/images/mm_20_blue.png
Binary file not shown.
Binary file removed components/ILIAS/Maps/images/mm_20_shadow.png
Binary file not shown.
17 changes: 16 additions & 1 deletion components/ILIAS/Maps/js/src/ServiceOpenLayers.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
/**
* This file is part of ILIAS, a powerful learning management system
* published by ILIAS open source e-Learning e.V.
*
* ILIAS is licensed with the GPL-3.0,
* see https://www.gnu.org/licenses/gpl-3.0.en.html
* You should have received a copy of said license along with the
* source code, too.
*
* If this is not the case or you just want to try ILIAS, you'll find
* us at:
* https://www.ilias.de
* https://github.com/ILIAS-eLearning
*/

import View from 'ol/View';
import Map from 'ol/Map';
import TileLayer from 'ol/layer/Tile';
Expand Down Expand Up @@ -248,7 +263,7 @@ export default class ServiceOpenLayers {
marker.setPosition(pos);
this.map.addOverlay(marker);

element.innerHTML = "<img src='./components/ILIAS/Maps/images/mm_20_blue.png'>";
element.innerHTML = "<img src='./assets/images/standard/icon_mapm.svg'>";
}

/**
Expand Down
2 changes: 1 addition & 1 deletion components/ILIAS/Maps/resources/ServiceOpenLayers.js
Original file line number Diff line number Diff line change
Expand Up @@ -21445,7 +21445,7 @@ class ServiceOpenLayers {
marker.setPosition(pos);
this.map.addOverlay(marker);

element.innerHTML = "<img src='./components/ILIAS/Maps/images/mm_20_blue.png'>";
element.innerHTML = "<img src='./assets/images/standard/icon_mapm.svg'>";
}

/**
Expand Down
24 changes: 16 additions & 8 deletions components/ILIAS/Maps/templates/default/tpl.google_map.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
/**
* This file is part of ILIAS, a powerful learning management system
* published by ILIAS open source e-Learning e.V.
*
* ILIAS is licensed with the GPL-3.0,
* see https://www.gnu.org/licenses/gpl-3.0.en.html
* You should have received a copy of said license along with the
* source code, too.
*
* If this is not the case or you just want to try ILIAS, you'll find
* us at:
* https://www.ilias.de
* https://github.com/ILIAS-eLearning
*/

ilMapData = Array();
ilMap = Array();
ilMapOptions = [];
Expand All @@ -12,16 +27,10 @@ ilMapUserMarker["{UMAP_ID}"][{CNT}] = new Array({ULAT},{ULONG}, "<div style='wid
if (google.maps)
{
var ilMarkerImage = new google.maps.MarkerImage(
"./components/ILIAS/Maps/images/mm_20_blue.png",
"./assets/images/standard/icon_mapm.svg",
new google.maps.Size(12, 20),
new google.maps.Point(0,0),
new google.maps.Point(6, 20));

var ilMarkerShadow = new google.maps.MarkerImage(
"./components/ILIAS/Maps/images/mm_20_shadow.png",
new google.maps.Size(22, 20),
new google.maps.Point(0,0),
new google.maps.Point(0, 32));
}

if (google.maps)
Expand Down Expand Up @@ -194,7 +203,6 @@ function ilCreateMarker(map, latitude, longitude)
var marker = new google.maps.Marker({
position: point,
icon: ilMarkerImage,
shadow: ilMarkerShadow,
map: map
});
return marker;
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 7 additions & 6 deletions templates/default/070-components/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
@use "./legacy/_component_LeftNavSpace.scss";
@use "./legacy/_component_link.scss";
@use "./legacy/_component_map.scss";
@use "./legacy/component_media-object";
@use "./legacy/_component_media-object";
@use "./legacy/_component_overlay.scss";
@use "./legacy/_component_rightPanel.scss";
@use "./legacy/_component_delostable.scss";
Expand All @@ -64,11 +64,11 @@

/* Adapted from Bootstrap 3 */

@use "./legacy/component_animated-collapse-fade";
@use "./legacy/component_btn-group";
@use "./legacy/component_carousel";
@use "./legacy/component_input-group";
@use "./legacy/component_screen-reader-only";
@use "./legacy/_component_animated-collapse-fade";
@use "./legacy/_component_btn-group";
@use "./legacy/_component_carousel";
@use "./legacy/_component_input-group";
@use "./legacy/_component_screen-reader-only";

/* Legacy Modules & Services */

Expand Down Expand Up @@ -113,6 +113,7 @@
@use "./legacy/Services/_component_learninghistory.scss";
@use "./legacy/Services/_component_like.scss";
@use "./legacy/Services/_component_mail.scss";
@use "./legacy/Services/_component_openlayers.scss";
@use "./legacy/Services/_component_mediaobjects.scss";
@use "./legacy/Services/_component_membership.scss";
@use "./legacy/Services/_component_navigation.scss";
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,181 @@
.ol-viewport, .ol-unselectable {
-webkit-touch-callout: none;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
-webkit-tap-highlight-color: rgba(0,0,0,0);
}

.ol-selectable {
-webkit-touch-callout: default;
-webkit-user-select: text;
-moz-user-select: text;
-ms-user-select: text;
user-select: text;
}

.ol-control {
position: absolute;
background-color: rgba(255,255,255,0.4);
border-radius: 4px;
padding: 2px;
}

.ol-control:hover {
background-color: rgba(255,255,255,0.6);
}

.ol-zoom {
top: .5em;
left: .5em;
}

.ol-rotate {
top: .5em;
right: .5em;
transition: opacity .25s linear, visibility 0s linear;
}

.ol-rotate.ol-hidden {
opacity: 0;
visibility: hidden;
transition: opacity .25s linear, visibility 0s linear .25s;
}

.ol-zoom-extent {
top: 4.643em;
left: .5em;
}

.ol-full-screen {
right: .5em;
top: .5em;
}

.ol-control button {
display: block;
margin: 1px;
padding: 0;
color: white;
font-weight: bold;
text-decoration: none;
font-size: inherit;
text-align: center;
height: 1.375em;
width: 1.375em;
line-height: .4em;
background-color: rgba(0,60,136,0.5);
border: none;
border-radius: 2px;
}

.ol-control button::-moz-focus-inner {
border: none;
padding: 0;
}

.ol-zoom-extent button {
line-height: 1.4em;
}

.ol-compass {
display: block;
font-weight: normal;
font-size: 1.2em;
will-change: transform;
}

.ol-touch .ol-control button {
font-size: 1.5em;
}

.ol-touch .ol-zoom-extent {
top: 5.5em;
}

.ol-control button:hover,
.ol-control button:focus {
text-decoration: none;
background-color: rgba(0,60,136,0.7);
}

.ol-zoom .ol-zoom-in {
border-radius: 2px 2px 0 0;
}

.ol-zoom .ol-zoom-out {
border-radius: 0 0 2px 2px;
}

.ol-attribution {
text-align: right;
bottom: .5em;
right: .5em;
max-width: calc(100% - 1.3em);
display: flex;
flex-flow: row-reverse;
align-items: center;
}

.ol-attribution a {
color: rgba(0,60,136,0.7);
text-decoration: none;
}

.ol-attribution ul {
margin: 0;
padding: 1px .5em;
color: #000;
text-shadow: 0 0 2px #fff;
font-size: 12px;
}

.ol-attribution li {
display: inline;
list-style: none;
}

.ol-attribution li:not(:last-child):after {
content: " ";
}

.ol-attribution img {
max-height: 2em;
max-width: inherit;
vertical-align: middle;
}

.ol-attribution button {
flex-shrink: 0;
}

.ol-attribution.ol-collapsed ul {
display: none;
}

.ol-attribution:not(.ol-collapsed) {
background: rgba(255,255,255,0.8);
}

.ol-attribution.ol-uncollapsible {
bottom: 0;
right: 0;
border-radius: 4px 0 0;
}

.ol-attribution.ol-uncollapsible img {
margin-top: -.2em;
max-height: 1.6em;
}

.ol-attribution.ol-uncollapsible button {
display: none;
}

.marker {
img {
width: 25px;
height: 25px;
}
}
Loading

0 comments on commit acef785

Please sign in to comment.