Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Gregpac visualmods #14

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Gregpac visualmods #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8890eae
footer update : logobanner and disclaimer text.
gregpac Feb 11, 2016
be96479
added background image to welcome pane
gregpac Mar 8, 2016
c32bb35
added colors and buttons to lateral tool bar, fixed header position
gregpac Mar 17, 2016
5f630b6
Merge branch 'visualmods' of https://github.com/gregpac/cartoterra-1 …
Apr 18, 2016
828cac8
css: remove .cartoterra-header inserted by mistake
Apr 19, 2016
985de1f
remove useless whitespaces
Apr 19, 2016
38fb0f9
add "cartoterra-header-overlay" div
Apr 19, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions cartoterra/static/css/extra.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
body {
font-size: 13px;
color: #333333;
background-color: #bbaa99;
background-color: #000000;
position: relative;
}

Expand Down Expand Up @@ -108,7 +108,7 @@ input[type="color"],

.cartoterra-header {
background-color: rgb(34,34,34);
background-color: rgba(34,34,34,0.90);
background-color: rgba(34,34,34,0.60);
z-index: 300;
width: 100%;
position: relative;
Expand All @@ -117,7 +117,8 @@ input[type="color"],
.navbar {
position: relative;
width: 100%;
margin-bottom: 0;
height: auto;
margin: 0px;
}

/* BLOCKS */
Expand Down Expand Up @@ -267,3 +268,9 @@ body:before {
padding-top: 0;
padding-bottom: 0;
}

.cartoterra-header-overlay {
background-image: url('../img/backgroundimage.jpg');
background-size: cover;
/*previous image should be 1920px wide with low contrast*/
}
Binary file added cartoterra/static/img/backgroundimage.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified cartoterra/static/img/logobanner.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 3 additions & 2 deletions cartoterra/templates/_footer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@
</div>
<div class="col-md-5 col-md-offset-2 col-sm-6 col-xs-12">
<div class="legal">
<a href="{% url "home" %}">{{ SITE_NAME }}</a> {% trans "is licensed under" %} <a target="_blank" rel="license" href="http://opendatacommons.org/licenses/odbl/1.0/">Open Database License (ODbL)</a>
{% trans "Texts, opinions and informations given or made available on this website or through hyperlinks are the responsibility of their author." %}
<br />
{% trans "Website created by" %}<a href="mailto:felix.sipma@no-log.org">&lt;Félix Sipma&gt;</a>
<a href="{% url "home" %}">{{ SITE_NAME }}</a> {% trans "is licensed under" %} <a target="_blank" rel="license" href="http://opendatacommons.org/licenses/odbl/1.0/">Open Database License (ODbL)</a>
<br />
{% trans "Website created by" %}<a href="mailto:[email protected]">&lt;Félix Sipma&gt;</a> -
<a target="_blank" rel="code" href="https://github.com/linventifatelier/cartoterra">{% trans "site code under AGPL-3+" %}</a>
</div>
</div>
Expand Down
19 changes: 19 additions & 0 deletions geodata/static/css/bigmap-only.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,22 @@
min-height: 700px;
}
}

.building {
background-color: rgb(245,200,195);
}


.worksite {
background-color: rgb(250,230,180);
}


.event {
background-color: rgb(200,210,240);
}


.stakeholder {
background-color: rgb(200,250,180);
}
4 changes: 4 additions & 0 deletions geodata/static/css/geodata.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,3 +56,7 @@
.geodata-inactive-text {
opacity: 0.5;
}

.geodata-rss {
font-size: xx-small;
}
79 changes: 41 additions & 38 deletions geodata/templates/geodata/geodata_bigmap.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,12 @@ <h4 class="modal-title"></h4>

<div class="map-overlay">
{% if not request.user.is_authenticated %}
<div class="cartoterra-header text-center alert alert-dismissible">
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<div class="container">
{% include "_sidebar.html" %}
<div class="cartoterra-header-overlay">
<div class="cartoterra-header text-center alert alert-dismissible">
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<div class="container">
{% include "_sidebar.html" %}
</div>
</div>
</div>
{% endif %}
Expand All @@ -83,15 +85,14 @@ <h4 class="modal-title"></h4>
</a>
</div>
<div id="collapse-building" class="panel-collapse collapse">
<div class="panel-body">
<ul>
<li><a href="{% url "show_building_all" %}"><img src="{% static "img/building_icon_h25.png" %}" width="10" height="10" alt="" /> {% trans "All buildings" %}</a></li>
<li><a href="{% url "show_building_isceah" %}"><img src="{% static "img/building_dot.png" %}" width="10" height="10" alt="" /> {% trans "ICOMOS-ISCEAH" %}</a></li>
<li><a href="{% url "show_building_unesco" %}"><img src="{% static "img/building_dot.png" %}" width="10" height="10" alt="" /> {% trans "World Heritage" %}</a></li>
<li><a href="{% url "show_building_of_status" "contemporary" %}"><img src="{% static "img/building_dot.png" %}" width="10" height="10" alt="" /> {% trans "Contemporary" %}</a></li>
<li><a href="{% url "show_building_of_status" "heritage" %}"><img src="{% static "img/building_dot.png" %}" width="10" height="10" alt="" /> {% trans "Heritage" %}</a></li>
<li><a href="{% url "show_building_normal" %}"><img src="{% static "img/building_dot.png" %}" width="10" height="10" alt="" /> {% trans "Other" %}</a></li>
</ul>
<div class="panel-body building">
<a class="btn btn-danger btn-lg btn-sm btn-block" href="{% url "show_building_all" %}" role="button">{% trans "All buildings" %}</a>
<a class="btn btn-danger btn-lg btn-sm btn-block" href="{% url "show_building_isceah" %}" role="button">{% trans "ICOMOS-ISCEAH" %}</a>
<a class="btn btn-danger btn-lg btn-sm btn-block" href="{% url "show_building_unesco" %}" role="button">{% trans "World Heritage" %}</a>
<a class="btn btn-danger btn-lg btn-sm btn-block" href="{% url "show_building_of_status" "contemporary" %}" role="button">{% trans "Contemporary" %}</a>
<a class="btn btn-danger btn-lg btn-sm btn-block" href="{% url "show_building_of_status" "heritage" %}" role="button">{% trans "Heritage" %}</a>
<a class="btn btn-danger btn-lg btn-sm btn-block" href="{% url "show_building_normal" %}" role="button">{% trans "Other" %}</a>
</br>
<div class="geodata-rss">
<a rel="rss" href="{% url "feed_building" %}"><img src="{% static "img/feed-icon-14x14.png" %}" width="15" heigth="15" alt="" /> {% trans "Buildings" %}</a>
</div>
Expand All @@ -103,12 +104,11 @@ <h4 class="modal-title"></h4>
<a href="#collapse-worksite" class="panel-title accordion-toggle tooltip-geodata collapsed" title="{% trans "Worksites" %}" data-toggle="collapse" data-parent="#geodata-list"><img src="{% static "img/worksite_icon_h25.png" %}" width="25" height="25" alt="" /> {% trans "Worksites" %}</a>
</div>
<div id="collapse-worksite" class="panel-collapse collapse">
<div class="panel-body">
<ul>
<li><a href="{% url "show_worksite_all" %}"><img src="{% static "img/worksite_icon_h25.png" %}" width="10" height="10" alt="" /> {% trans "All worksites" %}</a></li>
<li><a href="{% url "show_worksite_participative" %}"><img src="{% static "img/worksite_dot.png" %}" width="10" height="10" alt="" /> {% trans "Participative" %}</a></li>
<li><a href="{% url "show_worksite_normal" %}"><img src="{% static "img/worksite_dot.png" %}" width="10" height="10" alt="" /> {% trans "Normal" %}</a></li>
</ul>
<div class="panel-body worksite">
<a class="btn btn-warning btn-lg btn-sm btn-block" href="{% url "show_worksite_all" %}" role="button">{% trans "All worksites" %}</a>
<a class="btn btn-warning btn-lg btn-sm btn-block" href="{% url "show_worksite_participative" %}" role="button">{% trans "Participative" %}</a>
<a class="btn btn-warning btn-lg btn-sm btn-block" href="{% url "show_worksite_normal" %}" role="button">{% trans "Normal" %}</a>
</br>
<div class="geodata-rss">
<a rel="rss" href="{% url "feed_worksite" %}"><img src="{% static "img/feed-icon-14x14.png" %}" width="15" heigth="15" alt="" /> {% trans "Worksites" %}</a>
</div>
Expand All @@ -120,14 +120,13 @@ <h4 class="modal-title"></h4>
<a href="#collapse-event" class="panel-title accordion-toggle tooltip-geodata collapsed" title="{% trans "Events" %}" data-toggle="collapse" data-parent="#geodata-list"><img src="{% static "img/event_icon_h25.png" %}" width="25" height="25" alt="" /> {% trans "Events" %}</a>
</div>
<div id="collapse-event" class="panel-collapse collapse">
<div class="panel-body">
<ul>
<li><a href="{% url "show_event_all" %}"><img src="{% static "img/event_icon_h25.png" %}" width="10" height="10" alt="" /> {% trans "All events" %}</a></li>
<li><a href="{% url "show_event_of_type" "seminar" %}"><img src="{% static "img/event_dot.png" %}" width="10" height="10" alt="" /> {% trans "Seminar" %}</a></li>
<li><a href="{% url "show_event_of_type" "training" %}"><img src="{% static "img/event_dot.png" %}" width="10" height="10" alt="" /> {% trans "Training" %}</a></li>
<li><a href="{% url "show_event_of_type" "conference" %}"><img src="{% static "img/event_dot.png" %}" width="10" height="10" alt="" /> {% trans "Conference" %}</a></li>
<li><a href="{% url "show_event_of_type" "exhibition" %}"><img src="{% static "img/event_dot.png" %}" width="10" height="10" alt="" /> {% trans "Exhibition" %}</a></li>
</ul>
<div class="panel-body event">
<a class="btn btn-primary btn-lg btn-sm btn-block" href="{% url "show_event_all" %}" role="button">{% trans "All events" %}</a>
<a class="btn btn-primary btn-lg btn-sm btn-block" href="{% url "show_event_of_type" "seminar" %}" role="button">{% trans "Seminar" %}</a>
<a class="btn btn-primary btn-lg btn-sm btn-block" href="{% url "show_event_of_type" "training" %}" role="button">{% trans "Training" %}</a>
<a class="btn btn-primary btn-lg btn-sm btn-block" href="{% url "show_event_of_type" "conference" %}" role="button">{% trans "Conference" %}</a>
<a class="btn btn-primary btn-lg btn-sm btn-block" href="{% url "show_event_of_type" "exhibition" %}" role="button">{% trans "Exhibition" %}</a>
</br>
<div class="geodata-rss">
<a rel="rss" href="{% url "feed_event" %}"><img src="{% static "img/feed-icon-14x14.png" %}" width="15" heigth="15" alt="" /> {% trans "Events" %}</a>
</div>
Expand All @@ -139,12 +138,16 @@ <h4 class="modal-title"></h4>
<a href="#collapse-stakeholder" class="panel-title accordion-toggle tooltip-geodata collapsed" title="{% trans "Stakeholders" %}" data-toggle="collapse" data-parent="#geodata-list"><img src="{% static "img/stakeholder_icon_h25.png" %}" width="25" height="25" alt="" /> {% trans "Stakeholders" %}</a>
</div>
<div id="collapse-stakeholder" class="panel-collapse collapse">
<div class="panel-body">
<ul>
<li><a href="{% url "show_stakeholder_all" %}"><img src="{% static "img/stakeholder_icon_h25.png" %}" width="10" height="10" alt="" /> {% trans "All stakeholders" %}</a></li>
<li><a href="{% url "show_stakeholder_isceah" %}"><img src="{% static "img/stakeholder_dot.png" %}" width="10" height="10" alt="" /> {% trans "ICOMOS-ISCEAH" %}</a></li>
<li><a href="{% url "show_stakeholder_of_role" "architect" %}"><img src="{% static "img/stakeholder_dot.png" %}" width="10" height="10" alt="" /> {% trans "Architects" %}</a></li>
</ul>
<div class="panel-body stakeholder">
<a class="btn btn-success btn-lg btn-sm btn-block" href="{% url "show_stakeholder_all" %}" role="button">{% trans "All stakeholders" %}</a>
<a class="btn btn-success btn-lg btn-sm btn-block" href="{% url "show_stakeholder_isceah" %}" role="button">{% trans "ICOMOS-ISCEAH" %}</a>
<a class="btn btn-success btn-lg btn-sm btn-block" href="{% url "show_stakeholder_of_role" "architect" %}" role="button">{% trans "Architects" %}</a>
<a class="btn btn-success btn-lg btn-sm btn-block" href="{% url "show_stakeholder_of_role" "builder" %}" role="button">{% trans "Builders" %}</a>
<a class="btn btn-success btn-lg btn-sm btn-block" href="{% url "show_stakeholder_of_role" "ngo" %}" role="button">{% trans "NGOs" %}</a>
<a class="btn btn-success btn-lg btn-sm btn-block" href="{% url "show_stakeholder_of_role" "university" %}" role="button">{% trans "Universities" %}</a>
<a class="btn btn-success btn-lg btn-sm btn-block" href="{% url "show_stakeholder_of_role" "school" %}" role="button">{% trans "Schools" %}</a>
<a class="btn btn-success btn-lg btn-sm btn-block" href="{% url "show_stakeholder_of_role" "producer" %}" role="button">{% trans "Producers" %}</a>
</br>
<div class="geodata-rss">
<a rel="rss" href="{% url "feed_stakeholder" %}"><img src="{% static "img/feed-icon-14x14.png" %}" width="15" heigth="15" alt="" /> {% trans "Stakeholders" %}</a>
</div>
Expand All @@ -159,11 +162,11 @@ <h4 class="modal-title"></h4>
</div>
<div id="collapse-toolbox" class="panel-collapse collapse">
<div class="panel-body">
<ul id="collapse-add">
<li><a href="{% url "add_building" %}"><img src="{% static "img/building_icon_h25.png" %}" width="15" height="15" alt="{% trans "Add Building" %}" /> {% trans "Building" %}</a></li>
<li><a href="{% url "add_worksite" %}"><img src="{% static "img/worksite_icon_h25.png" %}" width="15" height="15" alt="{% trans "Add Worksite" %}" /> {% trans "Worksite" %}</a></li>
<li><a href="{% url "add_event" %}"><img src="{% static "img/event_icon_h25.png" %}" width="15" height="15" alt="{% trans "Add Event" %}" /> {% trans "Event" %}</a></li>
<li><a href="{% url "add_stakeholder" %}"><img src="{% static "img/stakeholder_icon_h25.png" %}" width="15" height="15" alt="{% trans "Add Stakeholder" %}" /> {% trans "Stakeholder" %}</a></li>
<ul id="collapse-add" class="list-unstyled">
<li><a href="{% url "add_building" %}"><img src="{% static "img/building_icon_h25.png" %}" width="20" height="20" alt="{% trans "Add Building" %}" /> {% trans "Building" %}...</a></li>
<li><a href="{% url "add_worksite" %}"><img src="{% static "img/worksite_icon_h25.png" %}" width="20" height="20" alt="{% trans "Add Worksite" %}" /> {% trans "Worksite" %}...</a></li>
<li><a href="{% url "add_event" %}"><img src="{% static "img/event_icon_h25.png" %}" width="20" height="20" alt="{% trans "Add Event" %}" /> {% trans "Event" %}...</a></li>
<li><a href="{% url "add_stakeholder" %}"><img src="{% static "img/stakeholder_icon_h25.png" %}" width="20" height="20" alt="{% trans "Add Stakeholder" %}" /> {% trans "Stakeholder" %}...</a></li>
</ul>
{% block extra_geodata_toolbox %}
{% endblock %}
Expand Down
Binary file modified locale/fr/LC_MESSAGES/django.mo
View file
Open in desktop
Binary file not shown.
Loading