Commit 55dd635a66fa31ad873de73b8ef6da626aeba2f6
Merge branch 'spb-dev' of github.com:colab-community/colab into spb-dev
Conflicts: src/templates/includes/big_header.html
Showing
4 changed files
with
2 additions
and
2 deletions
Show diff stats
No preview for this file type
src/static/img/logo.png
src/templates/base.html
| ... | ... | @@ -14,7 +14,7 @@ |
| 14 | 14 | |
| 15 | 15 | <title>{% block title %}Colab{% endblock %} - Colab</title> |
| 16 | 16 | |
| 17 | - <link rel="shortcut icon" type="image/x-icon" href="{{ STATIC_URL }}img/interlegis.ico"> | |
| 17 | + <link rel="shortcut icon" type="image/x-icon" href="{{ STATIC_URL }}img/fav.ico"> | |
| 18 | 18 | |
| 19 | 19 | <link rel="stylesheet" href="{{ STATIC_URL }}third-party/bootstrap/css/bootstrap.min.css" type="text/css" media="screen, projection" /> |
| 20 | 20 | ... | ... |
src/templates/open-data.html
| ... | ... | @@ -3,7 +3,7 @@ |
| 3 | 3 | |
| 4 | 4 | {% block main-content %} |
| 5 | 5 | <div class="col-lg-12"> |
| 6 | - <h2>{% trans "OpenData - Communities Interlegis" %}</h2> | |
| 6 | + <h2>{% trans "OpenData - Portal do Software Público Brasileiro" %}</h2> | |
| 7 | 7 | <p>{% trans "If you are interested in any other data that is not provided by this API, please contact us via the ticketing system (you must be registered in order to create a ticket)." %}</p> |
| 8 | 8 | |
| 9 | 9 | <h3>{% trans "Retrieving data via API" %}</h3> | ... | ... |