Fix #10786 Review of the home description image

build/prod-webpack.config.js

@@ -12,6 +12,8 @@ const paths = {
     code: path.join(__dirname, "..", "web", "client")
 };
 
+const favicon = path.join(__dirname, '..', 'web', 'client', 'product', 'assets', 'img', 'favicon.png');
+
 module.exports = require('./buildConfig')({
     bundles: {
         "mapstore2": path.join(paths.code, "product", "app"),
@@ -30,39 +32,44 @@ module.exports = require('./buildConfig')({
             publicPath: 'dist/',
             chunks: ['mapstore2'],
             inject: "body",
-            hash: true
+            hash: true,
+            favicon
         }),
         new HtmlWebpackPlugin({
             template: path.join(paths.framework, 'embeddedTemplate.html'),
             publicPath: 'dist/',
             chunks: ['embedded'],
             inject: "body",
             hash: true,
-            filename: 'embedded.html'
+            filename: 'embedded.html',
+            favicon
         }),
         new HtmlWebpackPlugin({
             template: path.join(paths.framework, 'apiTemplate.html'),
             publicPath: 'dist/',
             chunks: ['ms2-api'],
             inject: 'body',
             hash: true,
-            filename: 'api.html'
+            filename: 'api.html',
+            favicon
         }),
         new HtmlWebpackPlugin({
             template: path.join(paths.framework, 'geostory-embedded-template.html'),
             publicPath: 'dist/',
             chunks: ['geostory-embedded'],
             inject: "body",
             hash: true,
-            filename: 'geostory-embedded.html'
+            filename: 'geostory-embedded.html',
+            favicon
         }),
         new HtmlWebpackPlugin({
             template: path.join(paths.framework, 'dashboard-embedded-template.html'),
             publicPath: 'dist/',
             chunks: ['dashboard-embedded'],
             inject: 'body',
             hash: true,
-            filename: 'dashboard-embedded.html'
+            filename: 'dashboard-embedded.html',
+            favicon
         })
     ]
 });

docs/developer-guide/mapstore-migration-guide.md

@@ -22,6 +22,14 @@ This is a list of things to check if you want to update from a previous version
 
 ## Migration from 2024.02.00 to 2025.01.00
 
+### HomeDescription plugin configuration changes
+
+The HomeDescription plugin has been refactored and a property has been removed:
+
+- `cfg.name` removed in favor of the translation message `home.shortDescription`
+
+For downstream projects review the `.less` or `.css` files for possible conflicting style related to the `.ms-home-description` class selector
+
 ### Add TagsManager and Favorite plugins to localConfig.json
 
 The new TagsManager and Favorite plugin should be added inside the plugins `maps` section of the `localConfig.json` to visualize a new menu item in the admin menu and to to visualize the button on the resource cards

project/standard/templates/api.html

@@ -7,7 +7,6 @@
         <title>__PROJECTDESCRIPTION__</title>
         <link rel="preconnect" href="https://fonts.gstatic.com">
         <link href="https://fonts.googleapis.com/css2?family=Noto+Sans&display=swap" rel="stylesheet">
-        <link rel="shortcut icon" type="image/png" href="https://cdn.jslibs.mapstore2.geo-solutions.it/leaflet/favicon.ico" />
         <!--script src="https://maps.google.com/maps/api/js?v=3"></script-->
         <!--script src="https://cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.10/proj4.js"></script-->
         <style>

project/standard/templates/apiTemplate.html

@@ -7,7 +7,6 @@
         <title>__PROJECTDESCRIPTION__</title>
         <link rel="preconnect" href="https://fonts.gstatic.com">
         <link href="https://fonts.googleapis.com/css2?family=Noto+Sans&display=swap" rel="stylesheet">
-        <link rel="shortcut icon" type="image/png" href="https://cdn.jslibs.mapstore2.geo-solutions.it/leaflet/favicon.ico" />
         <!--script src="https://maps.google.com/maps/api/js?v=3"></script-->
         <!--script src="https://cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.10/proj4.js"></script-->
         <style>

project/standard/templates/embedded.html

@@ -84,7 +84,6 @@
         </style>
         <link rel="preconnect" href="https://fonts.gstatic.com">
         <link href="https://fonts.googleapis.com/css2?family=Noto+Sans&display=swap" rel="stylesheet">
-        <link rel="shortcut icon" type="image/png" href="https://cdn.jslibs.mapstore2.geo-solutions.it/leaflet/favicon.ico" />
         <!--script src="https://maps.google.com/maps/api/js?v=3"></script-->
         <!--script src="https://cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.10/proj4.js"></script-->
     </head>

project/standard/templates/embeddedTemplate.html

@@ -84,7 +84,6 @@
         </style>
         <link rel="preconnect" href="https://fonts.gstatic.com">
         <link href="https://fonts.googleapis.com/css2?family=Noto+Sans&display=swap" rel="stylesheet">
-        <link rel="shortcut icon" type="image/png" href="https://cdn.jslibs.mapstore2.geo-solutions.it/leaflet/favicon.ico" />
         <!--script src="https://maps.google.com/maps/api/js?v=3"></script-->
         <!--script src="https://cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.10/proj4.js"></script-->
         <script src="https://unpkg.com/bowser@2.7.0/es5.js"

project/standard/templates/geostory-embedded-template.html

@@ -94,7 +94,6 @@
     </style>
     <link rel="preconnect" href="https://fonts.gstatic.com">
     <link href="https://fonts.googleapis.com/css2?family=Noto+Sans&display=swap" rel="stylesheet">
-    <link rel="shortcut icon" type="image/png" href="https://cdn.jslibs.mapstore2.geo-solutions.it/leaflet/favicon.ico" />
     <!--script src="https://maps.google.com/maps/api/js?v=3"></script-->
     <script src="https://unpkg.com/bowser@2.7.0/es5.js"
         async integrity="sha384-CWiXbo5RNu6nv9tiCWA2y1DQKjEQDDH+yFQga1FytuIZjOTcVr+4ojw2S2lShj/d" crossorigin="anonymous"

project/standard/templates/geostory-embedded.html

@@ -94,7 +94,6 @@
     </style>
     <link rel="preconnect" href="https://fonts.gstatic.com">
     <link href="https://fonts.googleapis.com/css2?family=Noto+Sans&display=swap" rel="stylesheet">
-    <link rel="shortcut icon" type="image/png" href="https://cdn.jslibs.mapstore2.geo-solutions.it/leaflet/favicon.ico" />
     <!--script src="https://maps.google.com/maps/api/js?v=3"></script-->
 </head>
 <body>

project/standard/templates/index.html

@@ -84,7 +84,6 @@
         </style>
         <link rel="preconnect" href="https://fonts.gstatic.com">
         <link href="https://fonts.googleapis.com/css2?family=Noto+Sans&display=swap" rel="stylesheet">
-        <link rel="shortcut icon" type="image/png" href="https://cdn.jslibs.mapstore2.geo-solutions.it/leaflet/favicon.ico" />
         <!--script src="https://maps.google.com/maps/api/js?v=3"></script-->
         <!--script src="https://cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.10/proj4.js"></script-->
         <!--<script src="https://www.mapquestapi.com/sdk/leaflet/v2.2/mq-map.js?key=__API_KEY_MAPQUEST__"></script>-->

project/standard/templates/indexTemplate.html

@@ -84,7 +84,6 @@
       </style>
       <link rel="preconnect" href="https://fonts.gstatic.com">
       <link href="https://fonts.googleapis.com/css2?family=Noto+Sans&display=swap" rel="stylesheet">
-      <link rel="shortcut icon" type="image/png" href="https://cdn.jslibs.mapstore2.geo-solutions.it/leaflet/favicon.ico" />
       <!--script src="https://maps.google.com/maps/api/js?v=3"></script-->
     <script src="https://unpkg.com/bowser@2.7.0/es5.js"
         async integrity="sha384-CWiXbo5RNu6nv9tiCWA2y1DQKjEQDDH+yFQga1FytuIZjOTcVr+4ojw2S2lShj/d" crossorigin="anonymous"

project/standard/templates/prod-webpack.config.js

@@ -11,6 +11,9 @@ const paths = {
     framework: path.join(__dirname, "MapStore2", "web", "client"),
     code: [path.join(__dirname, "js"), path.join(__dirname, "MapStore2", "web", "client")]
 };
+
+const favicon = path.join(__dirname, "assets", "img", "favicon.png');
+
 module.exports = require('./MapStore2/build/buildConfig')({
     bundles: {
         '__PROJECTNAME__': path.join(__dirname, "js", "app"),
@@ -31,39 +34,44 @@ module.exports = require('./MapStore2/build/buildConfig')({
             chunks: ['__PROJECTNAME__'],
             publicPath: 'dist/',
             inject: "body",
-            hash: true
+            hash: true,
+            favicon
         }),
         new HtmlWebpackPlugin({
             template: path.join(__dirname, 'embeddedTemplate.html'),
             chunks: ['__PROJECTNAME__-embedded'],
             publicPath: 'dist/',
             inject: "body",
             hash: true,
-            filename: 'embedded.html'
+            filename: 'embedded.html',
+            favicon
         }),
         new HtmlWebpackPlugin({
             template: path.join(__dirname, 'apiTemplate.html'),
             chunks: ['__PROJECTNAME__-api'],
             publicPath: 'dist/',
             inject: 'body',
             hash: true,
-            filename: 'api.html'
+            filename: 'api.html',
+            favicon
         }),
         new HtmlWebpackPlugin({
             template: path.join(__dirname, 'geostory-embedded-template.html'),
             chunks: ['geostory-embedded'],
             publicPath: 'dist/',
             inject: "body",
             hash: true,
-            filename: 'geostory-embedded.html'
+            filename: 'geostory-embedded.html',
+            favicon
         }),
         new HtmlWebpackPlugin({
             template: path.join(__dirname, 'dashboard-embedded-template.html'),
             chunks: ['dashboard-embedded'],
             publicPath: 'dist/',
             inject: 'body',
             hash: true,
-            filename: 'dashboard-embedded.html'
+            filename: 'dashboard-embedded.html',
+            favicon
         })
     ],
     alias: {

web/client/api.html

@@ -7,7 +7,6 @@
         <title>Page with MapStore API</title>
         <link rel="preconnect" href="https://fonts.gstatic.com">
         <link href="https://fonts.googleapis.com/css2?family=Noto+Sans&display=swap" rel="stylesheet">
-        <link rel="shortcut icon" type="image/png" href="https://cdn.jslibs.mapstore2.geo-solutions.it/leaflet/favicon.ico" />
         <!--script src="https://maps.google.com/maps/api/js?v=3"></script-->
         <!--script src="https://cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.10/proj4.js"></script-->
         <style>

web/client/apiTemplate.html

@@ -7,7 +7,6 @@
         <title>Page with MapStore API</title>
         <link rel="preconnect" href="https://fonts.gstatic.com">
         <link href="https://fonts.googleapis.com/css2?family=Noto+Sans&display=swap" rel="stylesheet">
-        <link rel="shortcut icon" type="image/png" href="https://cdn.jslibs.mapstore2.geo-solutions.it/leaflet/favicon.ico" />
         <!--script src="https://maps.google.com/maps/api/js?v=3"></script-->
         <!--script src="https://cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.10/proj4.js"></script-->
         <style>

web/client/components/share/api-template.raw

@@ -9,7 +9,6 @@
         <link href="https://fonts.googleapis.com/css2?family=Noto+Sans&display=swap" rel="stylesheet">
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.3.1/leaflet.css" />
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/leaflet.draw/1.0.2/leaflet.draw.css" />
-        <link rel="shortcut icon" type="image/png" href="https://cdn.jslibs.mapstore2.geo-solutions.it/leaflet/favicon.ico" />
         <script src="https://maps.google.com/maps/api/js?v=3"></script>
         <!--script src="https://cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.10/proj4.js"></script-->
         <script src="https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.3.1/leaflet.js"></script>

web/client/configs/localConfig.json

@@ -708,24 +708,7 @@
             "FeedbackMask"
         ],
         "common": [{
-          "name": "BrandNavbar",
-          "cfg": {
-            "rightMenuItems": [{
-              "type": "link",
-              "href": "https://docs.mapstore.geosolutionsgroup.com/",
-              "target": "blank",
-              "glyph": "book",
-              "labelId": "Documentation",
-              "variant": "default"
-            }, {
-              "type": "link",
-              "href": "https://github.com/geosolutions-it/MapStore2",
-              "target": "blank",
-              "label": "GitHub",
-              "glyph": "github",
-              "variant": "default"
-            }]
-          }
+          "name": "BrandNavbar"
         },
         { "name": "ManagerMenu" },
         "Login","Language", "ScrollTop", "Notifications"],

web/client/embedded.html

@@ -4,7 +4,7 @@
         <meta charset="UTF-8">
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1">
-        <title>MapStore HomePage</title>
+        <title>Map Embedded</title>
         <style>
             body {
                 margin: 0;
@@ -84,7 +84,6 @@
         </style>
         <link rel="preconnect" href="https://fonts.gstatic.com">
         <link href="https://fonts.googleapis.com/css2?family=Noto+Sans&display=swap" rel="stylesheet">
-        <link rel="shortcut icon" type="image/png" href="https://cdn.jslibs.mapstore2.geo-solutions.it/leaflet/favicon.ico" />
         <!--script src="https://maps.google.com/maps/api/js?v=3"></script-->
         <!--script src="https://cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.10/proj4.js"></script-->
     </head>

web/client/embeddedTemplate.html

@@ -4,7 +4,7 @@
         <meta charset="UTF-8">
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1">
-        <title>MapStore HomePage</title>
+        <title>Map Embedded</title>
         <style>
             body {
                 margin: 0;
@@ -84,7 +84,6 @@
         </style>
         <link rel="preconnect" href="https://fonts.gstatic.com">
         <link href="https://fonts.googleapis.com/css2?family=Noto+Sans&display=swap" rel="stylesheet">
-        <link rel="shortcut icon" type="image/png" href="https://cdn.jslibs.mapstore2.geo-solutions.it/leaflet/favicon.ico" />
         <!--script src="https://maps.google.com/maps/api/js?v=3"></script-->
         <!--script src="https://cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.10/proj4.js"></script-->
         <script src="https://unpkg.com/bowser@2.7.0/es5.js"

web/client/geostory-embedded-template.html

@@ -94,7 +94,6 @@
     </style>
     <link rel="preconnect" href="https://fonts.gstatic.com">
     <link href="https://fonts.googleapis.com/css2?family=Noto+Sans&display=swap" rel="stylesheet">
-    <link rel="shortcut icon" type="image/png" href="https://cdn.jslibs.mapstore2.geo-solutions.it/leaflet/favicon.ico" />
     <!--script src="https://maps.google.com/maps/api/js?v=3"></script-->
     <script src="https://unpkg.com/bowser@2.7.0/es5.js"
         async integrity="sha384-CWiXbo5RNu6nv9tiCWA2y1DQKjEQDDH+yFQga1FytuIZjOTcVr+4ojw2S2lShj/d" crossorigin="anonymous"

web/client/geostory-embedded.html

@@ -94,7 +94,6 @@
     </style>
     <link rel="preconnect" href="https://fonts.gstatic.com">
     <link href="https://fonts.googleapis.com/css2?family=Noto+Sans&display=swap" rel="stylesheet">
-    <link rel="shortcut icon" type="image/png" href="https://cdn.jslibs.mapstore2.geo-solutions.it/leaflet/favicon.ico" />
     <!--script src="https://maps.google.com/maps/api/js?v=3"></script-->
 </head>
 <body>

web/client/index.html

@@ -4,7 +4,7 @@
         <meta charset="UTF-8">
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1">
-        <title>MapStore HomePage</title>
+        <title>MapStore</title>
         <style>
         body {
             margin: 0;
@@ -84,7 +84,6 @@
         </style>
         <link rel="preconnect" href="https://fonts.gstatic.com">
         <link href="https://fonts.googleapis.com/css2?family=Noto+Sans&display=swap" rel="stylesheet">
-        <link rel="shortcut icon" type="image/png" href="https://cdn.jslibs.mapstore2.geo-solutions.it/leaflet/favicon.ico" />
         <!--script src="https://maps.google.com/maps/api/js?v=3"></script-->
         <!--script src="https://cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.10/proj4.js"></script-->
         <!--<script src="https://www.mapquestapi.com/sdk/leaflet/v2.2/mq-map.js?key=__API_KEY_MAPQUEST__"></script>-->

web/client/indexTemplate.html

@@ -4,7 +4,7 @@
     <meta charset="UTF-8">
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>MapStore HomePage</title>
+    <title>MapStore</title>
     <style>
     body {
       margin: 0;
@@ -84,7 +84,6 @@
     </style>
     <link rel="preconnect" href="https://fonts.gstatic.com">
     <link href="https://fonts.googleapis.com/css2?family=Noto+Sans&display=swap" rel="stylesheet">
-    <link rel="shortcut icon" type="image/png" href="https://cdn.jslibs.mapstore2.geo-solutions.it/leaflet/favicon.ico" />
     <!--script src="https://maps.google.com/maps/api/js?v=3"></script-->
     <script src="https://unpkg.com/bowser@2.7.0/es5.js"
         async integrity="sha384-CWiXbo5RNu6nv9tiCWA2y1DQKjEQDDH+yFQga1FytuIZjOTcVr+4ojw2S2lShj/d" crossorigin="anonymous"

web/client/plugins/ResourcesCatalog/BrandNavbar.jsx

@@ -16,6 +16,9 @@ import tooltip from '../../components/misc/enhancers/tooltip';
 import Spinner from './components/Spinner';
 import Icon from './components/Icon';
 import PropTypes from 'prop-types';
+import MenuNavLink from './components/MenuNavLink';
+import src from '../../product/assets/img/logo.png';
+
 const ButtonWithTooltip = tooltip(Button);
 
 function BrandNavbarMenuItem({
@@ -148,7 +151,8 @@ function BrandNavbar({
     variant,
     leftMenuItems,
     rightMenuItems,
-    items
+    items,
+    logo
 }, context) {
     const { loadedPlugins } = context;
     const configuredItems = usePluginItems({ items, loadedPlugins });
@@ -170,6 +174,11 @@ function BrandNavbar({
                 centerChildrenVertically
                 gap="sm"
             >
+                {logo ? (
+                    <MenuNavLink className="ms-brand-navbar-logo" href={logo.href || '#/'}>
+                        <img src={logo?.src} style={{ width: 'auto', height: '2rem', objectFit: 'contain', ...logo.style }}/>
+                    </MenuNavLink>
+                ) : null}
                 <FlexBox.Fill
                     component={Menu}
                     centerChildrenVertically
@@ -212,6 +221,10 @@ BrandNavbar.contextTypes = {
 };
 
 BrandNavbar.defaultProps = {
+    logo: {
+        src,
+        href: '#/'
+    },
     leftMenuItems: [],
     rightMenuItems: []
 };