Skip to content

Commit

Permalink
[GeoNode#7740] Use URL reversing
Browse files Browse the repository at this point in the history
  • Loading branch information
etj committed Jul 9, 2021
1 parent f035a3f commit d519c60
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 14 deletions.
2 changes: 1 addition & 1 deletion geonode/base/templates/base/_resourcebase_info_panel.html
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@

{% if resource.group %}
<dt>{% trans "Group" %}</dt>
<dd><a href="/groups/group/{{ resource.group.name }}/activity/">{{ group }}</a> </dd>
<dd><a href="{% url 'group_activity' resource.group.name %}">{{ group }}</a> </dd>
{% endif %}

{% if resource.doi %}
Expand Down
2 changes: 1 addition & 1 deletion geonode/layers/templates/layers/layer_change_poc.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

{% load i18n %}

{% block breadcrumbs %}<div class="breadcrumbs"><a href="/">{% trans "Home" %}</a> &rsaquo; {% trans "Change point of contact" %}</div>{% endblock %}
{% block breadcrumbs %}<div class="breadcrumbs"><a href="{% url 'home' %}">{% trans "Home" %}</a> &rsaquo; {% trans "Change point of contact" %}</div>{% endblock %}

{% block title %}{% trans 'Change point of contact' %}{% endblock %}

Expand Down
4 changes: 2 additions & 2 deletions geonode/templates/500.html
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ <h3>{% trans "There was a problem loading this page" %}</h3>
<li><a href="{% url "geonode.invitations:geonode-send-invite" %}">{% trans "Invite Users" %}</a></li>
{% endif %}
{% if user.is_superuser and not READ_ONLY_MODE %}
<li><a href="/admin/people/profile/add/">{% trans "Add User" %}</a></li>
<li><a href="{% url 'people_profile_add' %}">{% trans "Add User" %}</a></li>
<li><a href="{% url "group_create" %}">{% trans "Create Group" %}</a></li>
{% endif %}
</ul>
Expand Down Expand Up @@ -292,7 +292,7 @@ <h4 class="modal-title" id="myModalLabel">{% trans "Menu" %}</h4>
{% block extra_user_menu %}
{% endblock %}
<li class="modal-divider"></li>
<li><a title="{% trans "Help" %}" rel="tooltip" href="/help/"><i class="fa fa-question-circle"></i> {% trans "Help" %}</a></li>
<li><a title="{% trans "Help" %}" rel="tooltip" href="{% url 'help' %}"><i class="fa fa-question-circle"></i> {% trans "Help" %}</a></li>
</ul>
</div>
<div class="modal-footer">
Expand Down
19 changes: 12 additions & 7 deletions geonode/templates/help.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,25 +11,30 @@ <h2>{% trans "GeoNode Help" %}</h2>
<div class="col-md-8">
<p class="lead">{% trans "This page provides helpful information about how to use the GeoNode. You can use the sidebar links to navigate to what you want to know." %}</p>

{% url 'layer_browse' as url_layer_browse %}"
{% url 'maps_browse' as url_maps_browse %}
{% url 'new_map' as url_new_map %}
{% url 'developer' as url_developer %}

{% blocktrans %}
<p>The GeoNode provides access to data sets and a map editing application allows users to browse existing maps and contribute their own.</p>

<h4 id="browsing-data">Browsing Layers</h4>
<p>The <a href="/layers">Layers</a> tab allows you to browse data uploaded to this GeoNode.</p>
<p>The <a href="{{ url_layer_browse }}">Layers</a> tab allows you to browse data uploaded to this GeoNode.</p>
<p>All data can be downloaded in a variety of formats, for use in other applications.</p>

<h4 id="developer-access">Developer Access</h4>
<p>The <a href="/developer"> Developer</a> page is the place for developers to get started building applications against the GeoNode. It includes instructions on using the web services, links to the source code of the GeoNode, and information about the open source projects used to create it.</p>
<p>The <a href="{{ url_developer ]}"> Developer</a> page is the place for developers to get started building applications against the GeoNode. It includes instructions on using the web services, links to the source code of the GeoNode, and information about the open source projects used to create it.</p>

<h4 id="browsing-maps">Browsing Maps</h4>
<p>The GeoNode allows users to create and share maps with one another.</p>
<p>The <a href="/maps">Maps</a> tab is a gateway to map exploration on GeoNode. From here you can <strong>search for a map</strong> or <strong>create a map</strong>, which will open the <a href="/maps/new">Map Composer</a>.</p>
<p>The <a href="{{ url_maps_browse ]}">Maps</a> tab is a gateway to map exploration on GeoNode. From here you can <strong>search for a map</strong> or <strong>create a map</strong>, which will open the <a href="{{ url_new_map }}">Map Composer</a>.</p>
<h5>Google Earth Mode</h5>
<p>Any map viewed in the interactive map editor can be seen in 3D mode with the Google Earth plugin. To switch to 3D mode select the Google Earth globe logo, the rightmost button on top toolbar. If you do not have the Google Earth plugin installed you will be prompted to install it.</p>

<h4 id="creating-a-map">Creating a Map</h4>
<p>To create a new map go to the <a href="/maps">Contributed Maps</a> tab and click the <a href="/maps/new">create your own map</a> link.</p>
<p>This will take you to the <a href="/maps/new">Map Composer</a> with a base layer loaded.</p>
<p>To create a new map go to the <a href="{{ url_maps_browse ]}">Contributed Maps</a> tab and click the <a href="{{ url_new_map }}">create your own map</a> link.</p>
<p>This will take you to the <a href="{{ url_new_map }}">Map Composer</a> with a base layer loaded.</p>
<p>To add data layers from the GeoNode click on the green plus button located below the layers tab on the left hand side of the screen. This will open a dialog listing all the layers available on the GeoNode.</p>
<p>To add layers to your map select them and hit the <strong>Add Layers</strong> button. When finished you may hit <strong>Done</strong> to close the dialog and go back to the map.</p>

Expand All @@ -47,7 +52,7 @@ <h4 id="exporting-a-map">Publishing a Map</h4>
<li>Copy the HTML snippet provided in the wizard to any HTML page or iFrame-supporting blog post.</li>
</ol>
<p>This will put an interactive widget showing you map in your web page or blog post.</p>
<p>Note that the <a href="/maps/new">Map Composer</a> also has a button to publish the map. Just be sure to save the map before publishing if there are changes that you want others to see. It publishes the last saved version, not the last viewed version.</p>
<p>Note that the <a href="{{ url_new_map }}">Map Composer</a> also has a button to publish the map. Just be sure to save the map before publishing if there are changes that you want others to see. It publishes the last saved version, not the last viewed version.</p>

<h4 id="remixing-a-map">Remixing a Map</h4>
<p>Any map available can serve as a starting point for a new map.</p>
Expand All @@ -58,7 +63,7 @@ <h4 id="remixing-a-map">Remixing a Map</h4>
<li><strong>IMPORTANT:</strong> Update the title, abstract, contact info and tags to reflect the new map.</li>
<li>Save the map.</li>
</ol>
<p>You will be able to see your new map when you search for it from the <a href="/maps">Maps</a> tab.</p>
<p>You will be able to see your new map when you search for it from the <a href="{{ url_maps_browse ]}">Maps</a> tab.</p>
{% endblocktrans %}
</div>
<div class="col-md-4">
Expand Down
4 changes: 2 additions & 2 deletions geonode/templates/metadata_detail.html
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ <h2 class="page-title">{% trans "Metadata" %} : {{ resource.title }}</h2>
{% block category %}
{% if resource.category %}
<dt>{% trans "Category" %}</dt>
<dd><a href="/search/?category__identifier__in={{ resource.category.identifier }}">{{ resource.category }}</a> {% if resource.category.description %}<a href="#category-more" data-toggle="collapse" data-target=".category-more"><i class="fa fa-info-circle"></i></a>{% endif %}</dd>
<dd><a href="{% url 'search' %}/?category__identifier__in={{ resource.category.identifier }}">{{ resource.category }}</a> {% if resource.category.description %}<a href="#category-more" data-toggle="collapse" data-target=".category-more"><i class="fa fa-info-circle"></i></a>{% endif %}</dd>
{% if resource.category.description %}
<dd class="category-more collapse">
{{ resource.category.description }}
Expand Down Expand Up @@ -154,7 +154,7 @@ <h2 class="page-title">{% trans "Metadata" %} : {{ resource.title }}</h2>
{% block group %}
{% if resource.group %}
<dt>{% trans "Group" %}</dt>
<dd><a href="/groups/group/{{ resource.group.name }}/activity/">{{ group }}</a> </dd>
<dd><a href="{% url 'group_activity' resource.group.name %}">{{ group }}</a> </dd>
{% endif %}
{% endblock group %}

Expand Down
2 changes: 1 addition & 1 deletion geonode/templates/privacy-cookies.html
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,6 @@ <h2>{% trans "Privacy &#038; Cookies Policy" %}</h2>
<p style="text-align: justify;"><strong>This site</strong> will keep this information constantly updated. The &#8220;LAST UPDATE&#8221; section at the bottom of the page indicates the date on which the information was updated.</p>
<p style="text-align: justify;"><strong>LAST UPDATE</strong></p>
<p style="text-align: justify;">This information was updated on: <strong>03/05/2019</strong></p>
<p style="text-align: justify;"><a class="navbar-brand" style="background-color: #028BAF" href="/">GeoNode</a></p>
<p style="text-align: justify;"><a class="navbar-brand" style="background-color: #028BAF" href="{% url 'home' %}">GeoNode</a></p>

{% endblock %}

0 comments on commit d519c60

Please sign in to comment.