Browse Source

Carto en local pour dev sur Crozet et modifs suite au passage sous windows

poi-dev
U-P231-ELECTROLL\gener 11 months ago
parent
commit
37e0162676
113 changed files with 12 additions and 12 deletions
  1. +1
    -0
      .gitignore
  2. +0
    -0
      .htaccess
  3. +0
    -0
      README.md
  4. +0
    -0
      _ressources/database_drawing
  5. +0
    -0
      _ressources/db_model.dbm
  6. +0
    -0
      _ressources/logo.svg
  7. +3
    -6
      _ressources/sql_skeleton.sql
  8. +1
    -1
      controllers/d.admin.php
  9. +0
    -0
      controllers/d.blog.php
  10. +0
    -0
      controllers/d.contact.php
  11. +0
    -0
      controllers/d.map.php
  12. +0
    -0
      controllers/d.users.php
  13. +0
    -0
      controllers/d.wiki.php
  14. +0
    -0
      includes/config.example.php
  15. +0
    -0
      includes/images.php
  16. +0
    -0
      includes/routes.php
  17. +0
    -0
      includes/session.php
  18. +0
    -0
      index.php
  19. +0
    -0
      models/d.blog.php
  20. +0
    -0
      models/d.locales.php
  21. +0
    -0
      models/d.poi.php
  22. +0
    -0
      models/d.users.php
  23. +0
    -0
      models/d.wiki.php
  24. +0
    -0
      third/Md/Markdown.inc.php
  25. +0
    -0
      third/Md/Markdown.php
  26. +0
    -0
      third/Md/MarkdownExtra.inc.php
  27. +0
    -0
      third/Md/MarkdownExtra.php
  28. +0
    -0
      third/Md/MarkdownInterface.inc.php
  29. +0
    -0
      third/Md/MarkdownInterface.php
  30. +0
    -0
      views/blocks/d.footer.html
  31. +0
    -0
      views/blocks/d.head.html
  32. +0
    -0
      views/blocks/d.nav.html
  33. +0
    -0
      views/css/d.blog.css
  34. +0
    -0
      views/css/d.index.css
  35. +0
    -0
      views/css/d.map.css
  36. +0
    -0
      views/css/d.user.css
  37. +0
    -0
      views/css/d.wiki.css
  38. +0
    -0
      views/d.admin.git-pull.html
  39. +0
    -0
      views/d.admin.html
  40. +0
    -0
      views/d.admin.logs.html
  41. +0
    -0
      views/d.blog.edit.html
  42. +0
    -0
      views/d.blog.list.html
  43. +0
    -0
      views/d.blog.list.rss
  44. +0
    -0
      views/d.blog.view.html
  45. +0
    -0
      views/d.contact.html
  46. +0
    -0
      views/d.index.html
  47. +0
    -0
      views/d.map.html
  48. +0
    -0
      views/d.user.login.html
  49. +0
    -0
      views/d.user.member_list.html
  50. +0
    -0
      views/d.user.password_lost.html
  51. +0
    -0
      views/d.user.profile.edit.html
  52. +0
    -0
      views/d.user.profile.html
  53. +0
    -0
      views/d.user.signin.html
  54. +0
    -0
      views/d.wiki.edit.html
  55. +0
    -0
      views/d.wiki.view.html
  56. +0
    -0
      views/fonts/FiraMono-Bold.eot
  57. +0
    -0
      views/fonts/FiraMono-Bold.otf
  58. +0
    -0
      views/fonts/FiraSans-Bold.ttf
  59. +0
    -0
      views/fonts/FiraSans-ExtraLight.eot
  60. +0
    -0
      views/fonts/FiraSans-ExtraLight.otf
  61. +0
    -0
      views/fonts/FiraSans-ExtraLight.ttf
  62. +0
    -0
      views/fonts/FiraSans-Light.eot
  63. +0
    -0
      views/fonts/FiraSans-Light.otf
  64. +0
    -0
      views/fonts/FiraSans-Light.ttf
  65. +0
    -0
      views/fonts/FiraSans-Medium.eot
  66. +0
    -0
      views/fonts/FiraSans-Medium.otf
  67. +0
    -0
      views/fonts/FiraSans-Medium.ttf
  68. +0
    -0
      views/fonts/FiraSans-Regular.eot
  69. +0
    -0
      views/fonts/FiraSans-Regular.otf
  70. +0
    -0
      views/fonts/FiraSans-Regular.ttf
  71. +0
    -0
      views/img/aside.jpg
  72. +0
    -0
      views/img/favicon.png
  73. +0
    -0
      views/img/header.svg
  74. +0
    -0
      views/img/header_rss.svg
  75. +0
    -0
      views/img/thumb1.jpg
  76. +0
    -0
      views/img/thumb2.jpg
  77. +0
    -0
      views/img/thumb3.jpg
  78. +0
    -0
      views/js/d.avatar.js
  79. +0
    -0
      views/js/d.captcha.js
  80. +0
    -0
      views/js/d.header.js
  81. +7
    -5
      views/js/d.map.js
  82. +0
    -0
      views/third/fontawesome-free-5.4.1-web/css/all.css
  83. +0
    -0
      views/third/fontawesome-free-5.4.1-web/css/all.min.css
  84. +0
    -0
      views/third/fontawesome-free-5.4.1-web/webfonts/fa-brands-400.eot
  85. +0
    -0
      views/third/fontawesome-free-5.4.1-web/webfonts/fa-brands-400.svg
  86. +0
    -0
      views/third/fontawesome-free-5.4.1-web/webfonts/fa-brands-400.ttf
  87. +0
    -0
      views/third/fontawesome-free-5.4.1-web/webfonts/fa-brands-400.woff
  88. +0
    -0
      views/third/fontawesome-free-5.4.1-web/webfonts/fa-brands-400.woff2
  89. +0
    -0
      views/third/fontawesome-free-5.4.1-web/webfonts/fa-regular-400.eot
  90. +0
    -0
      views/third/fontawesome-free-5.4.1-web/webfonts/fa-regular-400.svg
  91. +0
    -0
      views/third/fontawesome-free-5.4.1-web/webfonts/fa-regular-400.ttf
  92. +0
    -0
      views/third/fontawesome-free-5.4.1-web/webfonts/fa-regular-400.woff
  93. +0
    -0
      views/third/fontawesome-free-5.4.1-web/webfonts/fa-regular-400.woff2
  94. +0
    -0
      views/third/fontawesome-free-5.4.1-web/webfonts/fa-solid-900.eot
  95. +0
    -0
      views/third/fontawesome-free-5.4.1-web/webfonts/fa-solid-900.svg
  96. +0
    -0
      views/third/fontawesome-free-5.4.1-web/webfonts/fa-solid-900.ttf
  97. +0
    -0
      views/third/fontawesome-free-5.4.1-web/webfonts/fa-solid-900.woff
  98. +0
    -0
      views/third/fontawesome-free-5.4.1-web/webfonts/fa-solid-900.woff2
  99. +0
    -0
      views/third/jquery-3.3.1.min.js
  100. +0
    -0
      views/third/leaflet-easybutton/easy-button.css

+ 1
- 0
.gitignore View File

@ -1,5 +1,6 @@
/includes/config.php
/medias/*
/_maps
*.sublime-project
*.sublime-workspace
*.log

+ 0
- 0
.htaccess View File


+ 0
- 0
README.md View File


+ 0
- 0
_ressources/database_drawing View File


+ 0
- 0
_ressources/db_model.dbm View File


+ 0
- 0
_ressources/logo.svg View File


+ 3
- 6
_ressources/sql_skeleton.sql View File

@ -6,10 +6,7 @@
-- object: kabano | type: ROLE --
-- DROP ROLE IF EXISTS kabano;
CREATE ROLE kabano WITH
INHERIT
LOGIN
ENCRYPTED PASSWORD '********';
-- ddl-end --
@ -42,7 +39,7 @@ SET search_path TO pg_catalog,public,topology;
-- DROP EXTENSION IF EXISTS postgis CASCADE;
CREATE EXTENSION postgis
WITH SCHEMA public
VERSION '2.5.1';
VERSION '3.0.1';
-- ddl-end --
COMMENT ON EXTENSION postgis IS 'PostGIS geometry, geography, and raster spatial types and functions';
-- ddl-end --
@ -51,7 +48,7 @@ COMMENT ON EXTENSION postgis IS 'PostGIS geometry, geography, and raster spatial
-- DROP EXTENSION IF EXISTS postgis_topology CASCADE;
CREATE EXTENSION postgis_topology
WITH SCHEMA topology
VERSION '2.5.1';
VERSION '3.0.1';
-- ddl-end --
COMMENT ON EXTENSION postgis_topology IS 'PostGIS topology spatial types and functions';
-- ddl-end --


+ 1
- 1
controllers/d.admin.php View File

@ -34,7 +34,7 @@ if(isset($controller->splitted_url[1]) && $user->rankIsHigher("moderator")) {
}
chdir($config['logs_folder']);
exec("tail -n 200 ".$files_list[$filenb+2]." | tac", $output);
//exec("tail -n 200 ".$files_list[$filenb+2]." | tac", $output);
include ($config['views_folder']."d.admin.logs.html");
}


+ 0
- 0
controllers/d.blog.php View File


+ 0
- 0
controllers/d.contact.php View File


+ 0
- 0
controllers/d.map.php View File


+ 0
- 0
controllers/d.users.php View File


+ 0
- 0
controllers/d.wiki.php View File


+ 0
- 0
includes/config.example.php View File


+ 0
- 0
includes/images.php View File


+ 0
- 0
includes/routes.php View File


+ 0
- 0
includes/session.php View File


+ 0
- 0
index.php View File


+ 0
- 0
models/d.blog.php View File


+ 0
- 0
models/d.locales.php View File


+ 0
- 0
models/d.poi.php View File


+ 0
- 0
models/d.users.php View File


+ 0
- 0
models/d.wiki.php View File


+ 0
- 0
third/Md/Markdown.inc.php View File


+ 0
- 0
third/Md/Markdown.php View File


+ 0
- 0
third/Md/MarkdownExtra.inc.php View File


+ 0
- 0
third/Md/MarkdownExtra.php View File


+ 0
- 0
third/Md/MarkdownInterface.inc.php View File


+ 0
- 0
third/Md/MarkdownInterface.php View File


+ 0
- 0
views/blocks/d.footer.html View File


+ 0
- 0
views/blocks/d.head.html View File


+ 0
- 0
views/blocks/d.nav.html View File


+ 0
- 0
views/css/d.blog.css View File


+ 0
- 0
views/css/d.index.css View File


+ 0
- 0
views/css/d.map.css View File


+ 0
- 0
views/css/d.user.css View File


+ 0
- 0
views/css/d.wiki.css View File


+ 0
- 0
views/d.admin.git-pull.html View File


+ 0
- 0
views/d.admin.html View File


+ 0
- 0
views/d.admin.logs.html View File


+ 0
- 0
views/d.blog.edit.html View File


+ 0
- 0
views/d.blog.list.html View File


+ 0
- 0
views/d.blog.list.rss View File


+ 0
- 0
views/d.blog.view.html View File


+ 0
- 0
views/d.contact.html View File


+ 0
- 0
views/d.index.html View File


+ 0
- 0
views/d.map.html View File


+ 0
- 0
views/d.user.login.html View File


+ 0
- 0
views/d.user.member_list.html View File


+ 0
- 0
views/d.user.password_lost.html View File


+ 0
- 0
views/d.user.profile.edit.html View File


+ 0
- 0
views/d.user.profile.html View File


+ 0
- 0
views/d.user.signin.html View File


+ 0
- 0
views/d.wiki.edit.html View File


+ 0
- 0
views/d.wiki.view.html View File


+ 0
- 0
views/fonts/FiraMono-Bold.eot View File


+ 0
- 0
views/fonts/FiraMono-Bold.otf View File


+ 0
- 0
views/fonts/FiraSans-Bold.ttf View File


+ 0
- 0
views/fonts/FiraSans-ExtraLight.eot View File


+ 0
- 0
views/fonts/FiraSans-ExtraLight.otf View File


+ 0
- 0
views/fonts/FiraSans-ExtraLight.ttf View File


+ 0
- 0
views/fonts/FiraSans-Light.eot View File


+ 0
- 0
views/fonts/FiraSans-Light.otf View File


+ 0
- 0
views/fonts/FiraSans-Light.ttf View File


+ 0
- 0
views/fonts/FiraSans-Medium.eot View File


+ 0
- 0
views/fonts/FiraSans-Medium.otf View File


+ 0
- 0
views/fonts/FiraSans-Medium.ttf View File


+ 0
- 0
views/fonts/FiraSans-Regular.eot View File


+ 0
- 0
views/fonts/FiraSans-Regular.otf View File


+ 0
- 0
views/fonts/FiraSans-Regular.ttf View File


+ 0
- 0
views/img/aside.jpg View File

Before After
Width: 2000  |  Height: 320  |  Size: 44 KiB Width: 2000  |  Height: 320  |  Size: 44 KiB

+ 0
- 0
views/img/favicon.png View File

Before After
Width: 16  |  Height: 16  |  Size: 356 B Width: 16  |  Height: 16  |  Size: 356 B

+ 0
- 0
views/img/header.svg View File


+ 0
- 0
views/img/header_rss.svg View File


+ 0
- 0
views/img/thumb1.jpg View File

Before After
Width: 250  |  Height: 167  |  Size: 22 KiB Width: 250  |  Height: 167  |  Size: 22 KiB

+ 0
- 0
views/img/thumb2.jpg View File

Before After
Width: 222  |  Height: 167  |  Size: 19 KiB Width: 222  |  Height: 167  |  Size: 19 KiB

+ 0
- 0
views/img/thumb3.jpg View File

Before After
Width: 250  |  Height: 167  |  Size: 27 KiB Width: 250  |  Height: 167  |  Size: 27 KiB

+ 0
- 0
views/js/d.avatar.js View File


+ 0
- 0
views/js/d.captcha.js View File


+ 0
- 0
views/js/d.header.js View File


+ 7
- 5
views/js/d.map.js View File

@ -2,20 +2,22 @@ var mymap;
$( document ).ready(function() {
// Differents layers for the map
var osmfr = L.tileLayer('//{s}.tile.openstreetmap.fr/osmfr/{z}/{x}/{y}.png', {maxZoom: 20, attribution: 'Maps © <a href="http://www.openstreetmap.fr">OpenSreetMap France</a>, Data © <a href="http://www.openstreetmap.org/copyright">OpenStreetMap contributors</a>'});
var wikimedia = L.tileLayer('//maps.wikimedia.org/osm-intl/{z}/{x}/{y}.png', {maxZoom: 18, attribution: 'Maps © <a href="http://wikimedia.org">Wikimedia</a>, Data © <a href="http://www.openstreetmap.org/copyright">OpenStreetMap contributors</a>'});
var osmfr = L.tileLayer('//{s}.tile.openstreetmap.fr/osmfr/{z}/{x}/{y}.png', {tms: true, maxZoom: 20, attribution: 'Maps © <a href="http://www.openstreetmap.fr">OpenSreetMap France</a>, Data © <a href="http://www.openstreetmap.org/copyright">OpenStreetMap contributors</a>'});
var wikimedia = L.tileLayer('//maps.wikimedia.org/osm-intl/{z}/{x}/{y}.png', {tms: true, maxZoom: 18, attribution: 'Maps © <a href="http://wikimedia.org">Wikimedia</a>, Data © <a href="http://www.openstreetmap.org/copyright">OpenStreetMap contributors</a>'});
var crozet = L.tileLayer('/_maps/osm_cro/{z}/{x}/{y}.png', {tms: true, maxZoom: 18, attribution: 'For dev purpose only'});
// Base layers
var baseLayers = {
"OSM France": osmfr,
"OSM Wikimedia": wikimedia,
"Crozet": crozet,
};
mymap = L.map('mapid', {
zoomControl: false,
layers: [wikimedia],
}).setView([47.018, 3.142], 6);
$("#map-credits").html(wikimedia.getAttribution());
layers: [crozet],
}).setView([-46.407, 51.766], 12);
$("#map-credits").html(crozet.getAttribution());
L.control.scale({
position: "bottomleft",


+ 0
- 0
views/third/fontawesome-free-5.4.1-web/css/all.css View File


+ 0
- 0
views/third/fontawesome-free-5.4.1-web/css/all.min.css View File


+ 0
- 0
views/third/fontawesome-free-5.4.1-web/webfonts/fa-brands-400.eot View File


+ 0
- 0
views/third/fontawesome-free-5.4.1-web/webfonts/fa-brands-400.svg View File


+ 0
- 0
views/third/fontawesome-free-5.4.1-web/webfonts/fa-brands-400.ttf View File


+ 0
- 0
views/third/fontawesome-free-5.4.1-web/webfonts/fa-brands-400.woff View File


+ 0
- 0
views/third/fontawesome-free-5.4.1-web/webfonts/fa-brands-400.woff2 View File


+ 0
- 0
views/third/fontawesome-free-5.4.1-web/webfonts/fa-regular-400.eot View File


+ 0
- 0
views/third/fontawesome-free-5.4.1-web/webfonts/fa-regular-400.svg View File


+ 0
- 0
views/third/fontawesome-free-5.4.1-web/webfonts/fa-regular-400.ttf View File


+ 0
- 0
views/third/fontawesome-free-5.4.1-web/webfonts/fa-regular-400.woff View File


+ 0
- 0
views/third/fontawesome-free-5.4.1-web/webfonts/fa-regular-400.woff2 View File


+ 0
- 0
views/third/fontawesome-free-5.4.1-web/webfonts/fa-solid-900.eot View File


+ 0
- 0
views/third/fontawesome-free-5.4.1-web/webfonts/fa-solid-900.svg View File


+ 0
- 0
views/third/fontawesome-free-5.4.1-web/webfonts/fa-solid-900.ttf View File


+ 0
- 0
views/third/fontawesome-free-5.4.1-web/webfonts/fa-solid-900.woff View File


+ 0
- 0
views/third/fontawesome-free-5.4.1-web/webfonts/fa-solid-900.woff2 View File


+ 0
- 0
views/third/jquery-3.3.1.min.js View File


+ 0
- 0
views/third/leaflet-easybutton/easy-button.css View File


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

Loading…
Cancel
Save