Compare commits

...

16 Commits

Author SHA1 Message Date
81e7811bc5 Merge pull request 'carto_J5 to main' (#1) from carto_J5 into main
Reviewed-on: #1
2024-11-12 12:53:08 +01:00
30beea31b3 fix : delete unused folder 2024-11-12 12:35:23 +01:00
1edc6b3842 BREAKING CHANGE : replace css with prod css 2024-11-12 12:33:54 +01:00
d40720f80c BREAKING CHANGE : replace app.js with prod app.js adapted for J5 2024-11-12 12:28:09 +01:00
a1fec90b18 BREAKING CHANGE: adapt DB connexion for J5 & query 2024-11-12 11:00:08 +01:00
67efb6efa0 fix : add '/' to the global.css relative path 2024-11-12 10:57:37 +01:00
73f0b981b0 fix : Define basics attr before browser versions 2024-11-12 10:50:39 +01:00
255c0e0ef3 fix : add images and icons for relative path 2024-11-12 10:42:26 +01:00
7fed37ee1f fix : change xml file to locate the component 2024-11-08 15:13:27 +01:00
ecfa92680a fix : add getItem function to get leaflet data 2024-11-08 15:03:29 +01:00
bab93bf3b6 fix : change xml file to locate the component 2024-11-08 14:49:47 +01:00
151b94c371 BREAKING CHANGE : adapt "media" part for J5 2024-11-08 12:02:40 +01:00
ece74b07fc BREAKING CHANGE : adapt "admin" part for J5 2024-11-08 11:37:21 +01:00
39fe6e96e0 BREAKING CHANGE : replace jquery file 2024-11-08 11:13:02 +01:00
0e94341e99 BREAKING CHANGE : adapt "site" part for J5 2024-11-08 11:06:03 +01:00
326a46370e BREAKING CHANGE : install.xml for J5 component 2024-11-08 09:53:21 +01:00
343 changed files with 602 additions and 1071 deletions

View File

@ -1,2 +0,0 @@
<html><body bgcolor="#FFFFFF"></body></html>
<!-- prevents web server from listing directory content -->

View File

@ -1 +0,0 @@
Hello World administration

View File

@ -0,0 +1,29 @@
<?php
defined('_JEXEC') or die;
use Joomla\CMS\Dispatcher\ComponentDispatcherFactoryInterface;
use Joomla\CMS\Extension\ComponentInterface;
use Joomla\CMS\Extension\MVCComponent;
use Joomla\CMS\Extension\Service\Provider\ComponentDispatcherFactory;
use Joomla\CMS\Extension\Service\Provider\MVCFactory;
use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
use Joomla\DI\Container;
use Joomla\DI\ServiceProviderInterface;
return new class implements ServiceProviderInterface {
public function register(Container $container): void {
$container->registerServiceProvider(new MVCFactory('\\Digitanie\\Component\\Leaflet'));
$container->registerServiceProvider(new ComponentDispatcherFactory('\\Digitanie\\Component\\Leaflet'));
$container->set(
ComponentInterface::class,
function (Container $container) {
$component = new MVCComponent($container->get(ComponentDispatcherFactoryInterface::class));
$component->setMVCFactory($container->get(MVCFactoryInterface::class));
return $component;
}
);
}
};

View File

@ -0,0 +1,27 @@
<?php
namespace Digitanie\Component\Leaflet\Administrator\Controller;
defined('_JEXEC') or die;
use Joomla\CMS\MVC\Controller\BaseController;
/**
* Default Controller of Leaflet component
*
* @package Joomla.Administrator
* @subpackage com_leaflet
*/
class DisplayController extends BaseController {
/**
* The default view for the display method.
*
* @var string
*/
protected $default_view = 'Leaflet';
public function display($cachable = false, $urlparams = array()) {
return parent::display($cachable, $urlparams);
}
}

View File

@ -0,0 +1,23 @@
<?php
namespace Digitanie\Component\Leaflet\Administrator\View\Leaflet;
defined('_JEXEC') or die;
use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
/**
* Main "Leaflet" Admin View
*/
class HtmlView extends BaseHtmlView {
/**
* Display the main "Leaflet" view
*
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
* @return void
*/
function display($tpl = null) {
parent::display($tpl);
}
}

View File

@ -0,0 +1,6 @@
<?php
// No direct access to this file
defined('_JEXEC') or die('Restricted Access');
?>
<h2>Leaflet administration</h2>

View File

@ -1,137 +0,0 @@
#refreshButton{
display: flex;
align-items: center;
position: absolute;
top: 20px;
right: 20px;
width: 50px;
height: 50px;
background-color: white;
border-radius: 5px;
border-color: gray;
border-style: solid;
border-width: 1px 1px 1px 1px;
opacity: 0.6;
text-align: center;
z-index: 500;
}
#refreshButton:hover{
opacity: 1;
background-color: blueviolet;
cursor: pointer;
}
.leaflet-tile-container {
background-color: red!important;
}
#mapid {
height:800px;
}
/* MAKE FILTERS INLINE */
.leaflet-panel-layer, .leaflet-panel-layers {
background : white!important;
}
.leaflet-panel-layers-grouplabel {
font-size: 16px;
font-weight: bold;
}
.leaflet-panel-layers-group {
width: 170px!important;
border:none!important;
background: white!important;
}
.leaflet-panel-layers-item {
max-width: 40px;
margin: 5px!important;
display: inline-block!important;
}
.leaflet-panel-layers-item, .leaflet-panel-layers-overlays .leaflet-panel-layers-item:hover {
border:none!important;
}
.leaflet-panel-layers-selector {
visibility: hidden;
}
.leaflet-panel-layers-selector:checked~img {
transform: scale(1.1);
border-radius: 50px;
border: 3px solid #004f90;
}
.departements, .categorie , .activite {
background-color: white;
padding: 10px;
width: 150px;
border-radius: 5px;
}
.leaflet-control h6{
cursor: pointer;
margin:0;
}
.listeProjets {
font: 16px Roboto;
background: white;
box-shadow: 0 0 15px rgba(0,0,0,0.2);
border-radius: 5px;
overflow: auto;
}
/*Margin négatif pour contrer le padding de leaflet-control */
.listeProjetsDT {
font: 16px Roboto;
margin: -8px -24px;
}
.listeArticles h3{
margin : 0;
font-size: 18px Ubuntu;
padding:10px;
}
.active {
transform: scale(1.1);
border-radius: 50px;
border: 3px solid #004f90;
}
.listeArticles:hover, .leaflet-control > img {
cursor: pointer;
}
.view , .unview{
font-size: 22px;
font-weight: bold;
}
.view, .listeProjets p{
display:none;
}
.listeProjets > :nth-child(even), .listeProjetsDT > :nth-child(even) {
background: whitesmoke;
border-left: 6px solid whitesmoke;
}
.listeProjets > :nth-child(odd), .listeProjetsDT > :nth-child(odd){
border-left: 6px solid white;
}
.listeProjets > p, .listeProjetsDT > p{
margin:0;
padding: 20px 30px 20px 20px;
}
.listeProjets > div{
padding: 5px 10px;
margin:0;
}
.listeProjets > p:hover, .listeProjetsDT > p:hover{
border-left: 6px solid #96cd32!important;
}
.leaflet-container a{
color :#35276c!important;
}
.leaflet-container a:hover{
color:#ea5153!important;
}

View File

@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<extension type="component" version="3.0" method="upgrade"> <extension type="component" version="4.0" method="upgrade">
<name>leaflet</name> <name>leaflet</name>
<!-- The following elements are optional and free of formatting constraints --> <!-- The following elements are optional and free of formatting constraints -->
<creationDate>January 2018</creationDate> <creationDate>January 2018</creationDate>
<author>John Doe</author> <author>Digitanie</author>
<copyright>Digitanie</copyright>
<authorEmail>john.doe@example.org</authorEmail> <authorEmail>john.doe@example.org</authorEmail>
<authorUrl>http://www.example.org</authorUrl> <authorUrl>http://www.example.org</authorUrl>
<copyright>Copyright Info</copyright>
<license>License Info</license> <license>License Info</license>
<!-- The version string is recorded in the components table --> <!-- The version string is recorded in the components table -->
<version>0.0.2</version> <version>0.0.2</version>
@ -20,19 +20,27 @@
</schemas> </schemas>
</update> </update>
<!-- code format : Digitanie\Component\Leaflet -->
<namespace path="src/">Digitanie\Component\Leaflet</namespace>
<!-- Site Main File Copy Section --> <!-- Site Main File Copy Section -->
<!-- Note the folder attribute: This attribute describes the folder <!-- Note the folder attribute: This attribute describes the folder
to copy FROM in the package to install therefore files copied to copy FROM in the package to install therefore files copied
in this section are copied from /site/ in the package --> in this section are copied from /site/ in the package -->
<files folder="site"> <files folder="site/">
<filename>index.html</filename> <file>leaflet.php</file>
<filename>leaflet.php</filename>
<filename>controller.php</filename>
<folder>views</folder>
<folder>assets</folder> <folder>assets</folder>
<folder>models</folder> <folder>services</folder>
<folder>language</folder>
<folder>src</folder>
<folder>tmpl</folder>
</files> </files>
<languages>
<language tag="fr-FR">site/language/fr-FR/fr-FR.com_leaflet.ini</language>
</languages>
<media destination="com_leaflet" folder="media"> <media destination="com_leaflet" folder="media">
<filename>index.html</filename> <filename>index.html</filename>
<folder>js</folder> <folder>js</folder>
@ -40,19 +48,25 @@
<administration> <administration>
<!-- Administration Menu Section --> <!-- Administration Menu Section -->
<menu link='index.php?option=com_leaflet'>leaflet</menu> <menu link="index.php?option=com_leaflet">Leaflet</menu>
<!-- Administration Main File Copy Section --> <!-- Administration Main File Copy Section -->
<!-- Note the folder attribute: This attribute describes the folder <!-- Note the folder attribute: This attribute describes the folder
to copy FROM in the package to install therefore files copied to copy FROM in the package to install therefore files copied
in this section are copied from /admin/ in the package --> in this section are copied from /admin/ in the package -->
<files folder="admin"> <files folder="admin/">
<!-- Admin Main File Copy Section --> <!-- Admin Main File Copy Section -->
<filename>index.html</filename>
<filename>leaflet.php</filename>
<folder>language</folder> <folder>language</folder>
<folder>services</folder>
<folder>src</folder>
<folder>tmpl</folder>
<!-- SQL files section --> <!-- SQL files section -->
<folder>sql</folder> <folder>sql</folder>
</files> </files>
<languages>
<language tag="fr-FR">admin/language/fr-FR/fr-FR.com_leaflet.ini</language>
<language tag="fr-FR">admin/language/fr-FR/fr-FR.com_leaflet.sys.ini</language>
</languages>
</administration> </administration>
</extension> </extension>

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1 @@
<html><body bgcolor="#FFFFFF"></body></html>

View File

Before

Width:  |  Height:  |  Size: 381 KiB

After

Width:  |  Height:  |  Size: 381 KiB

Some files were not shown because too many files have changed in this diff Show More