Merge branch 'site-osm-baustelle' into site-osm-baustelle-newform

AUTHORS

@@ -4,6 +4,7 @@ MAPOSMATIC AUTHORS
 The MapOSMatic developers are, by alphabetical order:
 
   - David Decotigny <david@decotigny.fr>
+  - Hartmut Holzgraefe <hartmut@php.net>
   - Frédéric Lehobey <frederic@lehobey.net>
   - Pierre Mauduit <pierre.mauduit@gmail.com>
   - David Mentré <dmentre@linux-france.org>

manage.py

@@ -8,6 +8,7 @@
 # Copyright (C) 2009  Maxime Petazzoni
 # Copyright (C) 2009  Thomas Petazzoni
 # Copyright (C) 2009  Gaël Utard
+# Copyright (C) 2016  Hartmut Holzgraefe
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as

www/maposmatic/apis.py

@@ -1,13 +1,7 @@
 # coding: utf-8
 
 # maposmatic, the web front-end of the MapOSMatic city map generation system
-# Copyright (C) 2009  David Decotigny
-# Copyright (C) 2009  Frédéric Lehobey
-# Copyright (C) 2009  Pierre Mauduit
-# Copyright (C) 2009  David Mentré
-# Copyright (C) 2009  Maxime Petazzoni
-# Copyright (C) 2009  Thomas Petazzoni
-# Copyright (C) 2009  Gaël Utard
+# Copyright (C) 2018  Hartmut Holzgraefe
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as

www/maposmatic/context_processors.py

@@ -7,6 +7,7 @@
 # Copyright (C) 2009  Maxime Petazzoni
 # Copyright (C) 2009  Thomas Petazzoni
 # Copyright (C) 2009  Gaël Utard
+# Copyright (C) 2018  Hartmut Holzgraefe
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as

www/maposmatic/forms.py

@@ -8,6 +8,7 @@
 # Copyright (C) 2009  Maxime Petazzoni
 # Copyright (C) 2009  Thomas Petazzoni
 # Copyright (C) 2009  Gaël Utard
+# Copyright (C) 2019  Hartmut Holzgraefe
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as

www/maposmatic/helpers.py

@@ -8,6 +8,7 @@
 # Copyright (C) 2009  Maxime Petazzoni
 # Copyright (C) 2009  Thomas Petazzoni
 # Copyright (C) 2009  Gaël Utard
+# Copyright (C) 2017  Hartmut Holzgraefe
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as

www/maposmatic/models.py

@@ -7,6 +7,7 @@
 # Copyright (C) 2009  Maxime Petazzoni
 # Copyright (C) 2009  Thomas Petazzoni
 # Copyright (C) 2009  Gaël Utard
+# Copyright (C) 2018  Hartmut Holzgraefe
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as

www/maposmatic/nominatim.py

@@ -7,6 +7,7 @@
 # Copyright (C) 2009  Maxime Petazzoni
 # Copyright (C) 2009  Thomas Petazzoni
 # Copyright (C) 2009  Gaël Utard
+# Copyright (C) 2017  Hartmut Holzgraefe
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as

www/maposmatic/templates/maposmatic/about.html

@@ -11,6 +11,7 @@
  Copyright (C) 2012  Maxime Petazzoni
  Copyright (C) 2012  Thomas Petazzoni
  Copyright (C) 2012  Gaël Utard
+ Copyright (C) 2018  Hartmut Holzgraefe
 
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU Affero General Public License as
@@ -193,9 +194,17 @@ us:{% endblocktrans %}
 
 <h2>{% trans "Contributors" %}</h2>
 
-<table class="table table-striped table-condensed">
+<table class="table table-striped table-condensed" id='current-team'>
   <thead>
-    <tr><th width="25%">{% trans "Core team" %}</th><th></th></tr>
+    <tr><th width="25%">{% trans "Current team" %}</th><th></th></tr>
+  </thead>
+  <tbody>
+    <tr><td>Hartmut Holzgraefe</td><td>{% trans "Developer, running instance on https://print.get-map-org/" %}</td></tr>
+  </tbody>
+</table>
+<table class="table table-striped table-condensed" id='original-team'>
+  <thead>
+    <tr><th width="25%">{% trans "Original team" %}</th><th></th></tr>
   </thead>
   <tbody>
     <tr><td>David Decotigny</td><td>{% trans "Developer" %}</td></tr>
@@ -209,7 +218,7 @@ us:{% endblocktrans %}
   </tbody>
 </table>
 
-<table class="table table-striped table-condensed">
+<table class="table table-striped table-condensed" id='other-contirbutors'>
   <thead>
     <tr><th width="25%">{% trans "Other contributors" %}</th><th></th></tr>
   </thead>

www/maposmatic/templates/maposmatic/base.html

@@ -8,6 +8,7 @@
  Copyright (C) 2009  Maxime Petazzoni
  Copyright (C) 2009  Thomas Petazzoni
  Copyright (C) 2009  Gaël Utard
+ Copyright (C) 2018  Hartmut Holzgraefe
 
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU Affero General Public License as

www/maposmatic/templates/maposmatic/documentation-api.html

@@ -11,6 +11,7 @@
  Copyright (C) 2012  Maxime Petazzoni
  Copyright (C) 2012  Thomas Petazzoni
  Copyright (C) 2012  Gaël Utard
+ Copyright (C) 2018  Hartmut Holzgraefe
 
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU Affero General Public License as

www/maposmatic/templates/maposmatic/documentation-user-guide.html

@@ -11,6 +11,7 @@
  Copyright (C) 2012  Maxime Petazzoni
  Copyright (C) 2012  Thomas Petazzoni
  Copyright (C) 2012  Gaël Utard
+ Copyright (C) 2018  Hartmut Holzgraefe
 
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU Affero General Public License as

www/maposmatic/templates/maposmatic/donate-thanks.html

@@ -11,6 +11,7 @@
  Copyright (C) 2012  Maxime Petazzoni
  Copyright (C) 2012  Thomas Petazzoni
  Copyright (C) 2012  Gaël Utard
+ Copyright (C) 2018  Hartmut Holzgraefe
 
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU Affero General Public License as

www/maposmatic/templates/maposmatic/donate.html

@@ -11,6 +11,7 @@
  Copyright (C) 2012  Maxime Petazzoni
  Copyright (C) 2012  Thomas Petazzoni
  Copyright (C) 2012  Gaël Utard
+ Copyright (C) 2018  Hartmut Holzgraefe
 
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU Affero General Public License as

www/maposmatic/templates/maposmatic/index.html

@@ -11,6 +11,7 @@
  Copyright (C) 2012  Maxime Petazzoni
  Copyright (C) 2012  Thomas Petazzoni
  Copyright (C) 2012  Gaël Utard
+ Copyright (C) 2018  Hartmut Holzgraefe
 
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU Affero General Public License as

www/maposmatic/templates/maposmatic/map-full.html

@@ -11,6 +11,7 @@
  Copyright (C) 2012  Maxime Petazzoni
  Copyright (C) 2012  Thomas Petazzoni
  Copyright (C) 2012  Gaël Utard
+ Copyright (C) 2018  Hartmut Holzgraefe
 
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU Affero General Public License as

www/maposmatic/templates/maposmatic/maps.html

@@ -11,6 +11,7 @@
  Copyright (C) 2012  Maxime Petazzoni
  Copyright (C) 2012  Thomas Petazzoni
  Copyright (C) 2012  Gaël Utard
+ Copyright (C) 2018  Hartmut Holzgraefe
 
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU Affero General Public License as

www/maposmatic/templates/maposmatic/new.html

@@ -11,6 +11,7 @@
  Copyright (C) 2012  Maxime Petazzoni
  Copyright (C) 2012  Thomas Petazzoni
  Copyright (C) 2012  Gaël Utard
+ Copyright (C) 2018  Hartmut Holzgraefe
 
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU Affero General Public License as

www/maposmatic/templates/maposmatic/pagination.html

@@ -9,6 +9,7 @@
  Copyright (C) 2012  Maxime Petazzoni
  Copyright (C) 2012  Thomas Petazzoni
  Copyright (C) 2012  Gaël Utard
+ Copyright (C) 2018  Hartmut Holzgraefe
 
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU Affero General Public License as

www/maposmatic/templates/maposmatic/suggest.js

@@ -9,6 +9,7 @@
  Copyright (C) 2012  Maxime Petazzoni
  Copyright (C) 2012  Thomas Petazzoni
  Copyright (C) 2012  Gaël Utard
+ Copyright (C) 2018  Hartmut Holzgraefe
 
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU Affero General Public License as

www/maposmatic/templates/maposmatic/wizard.js

@@ -9,6 +9,7 @@
  Copyright (C) 2012  Maxime Petazzoni
  Copyright (C) 2012  Thomas Petazzoni
  Copyright (C) 2012  Gaël Utard
+ Copyright (C) 2018  Hartmut Holzgraefe
 
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU Affero General Public License as

www/maposmatic/templatetags/extratags.py

@@ -7,6 +7,7 @@
 # Copyright (C) 2009  Maxime Petazzoni
 # Copyright (C) 2009  Thomas Petazzoni
 # Copyright (C) 2009  Gaël Utard
+# Copyright (C) 2018  Hartmut Holzgraefe
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as

www/maposmatic/views.py

@@ -8,6 +8,7 @@
 # Copyright (C) 2009  Maxime Petazzoni
 # Copyright (C) 2009  Thomas Petazzoni
 # Copyright (C) 2009  Gaël Utard
+# Copyright (C) 2019  Hartmut Holzgraefe
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as

www/settings.py

@@ -7,6 +7,7 @@
 # Copyright (C) 2009  Maxime Petazzoni
 # Copyright (C) 2009  Thomas Petazzoni
 # Copyright (C) 2009  Gaël Utard
+# Copyright (C) 2019  Hartmut Holzgraefe
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as

www/settings_local.py.dist

@@ -8,6 +8,7 @@
 # Copyright (C) 2009  Maxime Petazzoni
 # Copyright (C) 2009  Thomas Petazzoni
 # Copyright (C) 2009  Gaël Utard
+# Copyright (C) 2019  Hartmut Holzgraefe
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as

www/static/css/maposmatic.css

@@ -6,6 +6,7 @@
  Copyright (C) 2009  Maxime Petazzoni
  Copyright (C) 2009  Thomas Petazzoni
  Copyright (C) 2009  Gaël Utard
+ Copyright (C) 2019  Hartmut Holzgraefe
 
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU Affero General Public License as

www/templates/404.html

@@ -11,6 +11,7 @@
  Copyright (C) 2009  Maxime Petazzoni
  Copyright (C) 2009  Thomas Petazzoni
  Copyright (C) 2009  Gaël Utard
+ Copyright (C) 2018  Hartmut Holzgraefe
 
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU Affero General Public License as

www/templates/500.html

@@ -11,6 +11,7 @@
  Copyright (C) 2009  Maxime Petazzoni
  Copyright (C) 2009  Thomas Petazzoni
  Copyright (C) 2009  Gaël Utard
+ Copyright (C) 2018  Hartmut Holzgraefe
 
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU Affero General Public License as

www/templates/503.html

@@ -11,6 +11,7 @@
  Copyright (C) 2009  Maxime Petazzoni
  Copyright (C) 2009  Thomas Petazzoni
  Copyright (C) 2009  Gaël Utard
+ Copyright (C) 2018  Hartmut Holzgraefe
 
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU Affero General Public License as

www/urls.py

@@ -8,6 +8,7 @@
 # Copyright (C) 2009  Maxime Petazzoni
 # Copyright (C) 2009  Thomas Petazzoni
 # Copyright (C) 2009  Gaël Utard
+# Copyright (C) 2018  Hartmut Holzgraefe
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as