jeff/umap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move "demo instance warning" to dedicated div

Browse source
This commit is contained in:
Yohan Boniface 2014-02-08 08:38:40 +01:00
parent 1c84384922
commit bd6b6ca717
4 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fabfile.py vendored
View file

@ -249,7 +249,7 @@ def collect_remote_statics():
'csv2geojson': 'git://github.com/mapbox/csv2geojson.git@gh-pages', 'csv2geojson': 'git://github.com/mapbox/csv2geojson.git@gh-pages',
'togeojson': 'git://github.com/mapbox/togeojson.git@gh-pages', 'togeojson': 'git://github.com/mapbox/togeojson.git@gh-pages',
'osmtogeojson': 'git://github.com/aaronlidman/osm-and-geojson.git@master', 'osmtogeojson': 'git://github.com/aaronlidman/osm-and-geojson.git@master',
'loading': 'git://github.com/ebrelsford/Leaflet.loading.git@master', 'loading': 'git://github.com/ebrelsford/Leaflet.loading.git@master#v0.1.6',
'contextmenu': 'git://github.com/aratcliffe/Leaflet.contextmenu.git@master', 'contextmenu': 'git://github.com/aratcliffe/Leaflet.contextmenu.git@master',
'markercluster': 'git://github.com/Leaflet/Leaflet.markercluster.git@master', 'markercluster': 'git://github.com/Leaflet/Leaflet.markercluster.git@master',
'measure': 'git://github.com/makinacorpus/Leaflet.MeasureControl.git@gh-pages', 'measure': 'git://github.com/makinacorpus/Leaflet.MeasureControl.git@gh-pages',

13
umap/static/umap/umap.css
View file

@ -483,6 +483,19 @@ h2.section {
.button-bar .button.half { .button-bar .button.half {
width: calc(50% - 7px); width: calc(50% - 7px);
} }
.demo-instance-warning {
background-color: #c0392b;
color: #efefef;
margin-top: 0;
padding: 14px 0;
}
.demo-instance-warning .row {
margin-top: 0;
}
.demo-instance-warning a {
color: #efefef;
text-decoration: underline;
}
/* **************************** */ /* **************************** */

4
umap/templates/umap/about_summary.html
View file

@ -20,11 +20,7 @@
<div class="col quarter mwide"> <div class="col quarter mwide">
<img class="colophon" src="{{ STATIC_URL }}umap/img/opensource.svg" /> <img class="colophon" src="{{ STATIC_URL }}umap/img/opensource.svg" />
<p class="note"> <p class="note">
{% if DEMO_SITE %}
{% blocktrans with repo_url="https://bitbucket.org/yohanboniface/umap" stable_url="http://umap.openstreetmap.fr" %}This is a demo instance, used for tests and pre-rolling releases. If you need a stable instance, please use <a href="{{ stable_url }}">{{ stable_url }}</a>. You can also host your own instance, it's <a href="{{ repo_url }}">open source</a>!{% endblocktrans %}
{% else %}
{% blocktrans with repo_url="https://bitbucket.org/yohanboniface/umap" %}And it's <a href="{{ repo_url }}">open source</a>!{% endblocktrans %} {% blocktrans with repo_url="https://bitbucket.org/yohanboniface/umap" %}And it's <a href="{{ repo_url }}">open source</a>!{% endblocktrans %}
{% endif %}
</p> </p>
</div> </div>
</div> </div>

7
umap/templates/umap/home.html
View file

@ -4,6 +4,13 @@
{% block content %} {% block content %}
{% include "umap/search_bar.html" %} {% include "umap/search_bar.html" %}
{% if DEMO_SITE %}
<div class="wrapper demo-instance-warning">
<div class="row">
{% blocktrans with repo_url="https://bitbucket.org/yohanboniface/umap" stable_url="http://umap.openstreetmap.fr" %}This is a demo instance, used for tests and pre-rolling releases. If you need a stable instance, please use <a href="{{ stable_url }}">{{ stable_url }}</a>. You can also host your own instance, it's <a href="{{ repo_url }}">open source</a>!{% endblocktrans %}
</div>
</div>
{% endif %}
{% include "umap/about_summary.html" %} {% include "umap/about_summary.html" %}
{% if showcase_map %} {% if showcase_map %}
<div class="wrapper showcase-map"> <div class="wrapper showcase-map">