Commit 495cfa64 authored by BERJON Matthieu's avatar BERJON Matthieu
Browse files

Merge branch 'ui-fixes-breadcrumbs' into 'django'

fix consistency of webapp breadcrumbs

See merge request !131
parents d4f700f1 b9aa6c0d
Pipeline #40850 failed with stage
in 1 minute and 46 seconds
......@@ -4,7 +4,7 @@
{% block title %}Create a webapp{% endblock %}
{% block breadcrumb %}
<li class="breadcrumb-item"><a href="{% url 'main:user_webapp_list' user.get_username %}">My applications</a></li>
<li class="breadcrumb-item"><a href="{% url 'main:webapp_list' %}">Applications</a></li>
<li class="breadcrumb-item active" aria-current="page">Create</li>
{% endblock %}
......
......@@ -4,7 +4,7 @@
{% block title %}{{ webapp.name | fancy_webapp_name | title }} application{% endblock %}
{% block breadcrumb %}
<li class="breadcrumb-item"><a href="{% url 'main:webapp_list' %}">Application</a></li>
<li class="breadcrumb-item"><a href="{% url 'main:webapp_list' %}">Applications</a></li>
<li class="breadcrumb-item active" aria-current="page">{{ webapp.name | fancy_webapp_name | title }}</li>
{% endblock %}
......
{% extends "base.html" %}
{% load static converters humanize %}
{% block title %}Available apps{% endblock %}
{% block title %}
{% if view.kwargs.username %}
Apps by {{ view.kwargs.username }}
{% else %}
Available apps
{% endif %}
{% endblock %}
{% block breadcrumb %}
{% url 'main:webapp_list' as webapps_url %}
{% if request.get_full_path == webapps_url %}
<li class="breadcrumb-item active" aria-current="page">Applications</li>
{% if view.kwargs.username %}
<li class="breadcrumb-item"><a href="{% url 'main:webapp_list' %}">Applications</a></li>
<li class="breadcrumb-item active" aria-current="page">{{ view.kwargs.username }}</li>
{% else %}
<li class="breadcrumb-item active" aria-current="page">My Applications</li>
<li class="breadcrumb-item active" aria-current="page">Applications</li>
{% endif %}
{% endblock %}
......
{% extends "base.html" %}
{% load htmlattrs static %}
{% load htmlattrs static converters %}
{% block title %}Webapp Creation for application {{ webapp.name }}{% endblock %}
{% block breadcrumb %}
<li class="breadcrumb-item"><a href="{% url 'main:user_webapp_list' user.get_username %}">Applications</a></li>
<li class="breadcrumb-item"><a href="{% url 'main:webapp_detail' webapp.docker_name %}">{{ webapp.name }}</a></li>
<li class="breadcrumb-item"><a href="{% url 'main:webapp_list' %}">Applications</a></li>
<li class="breadcrumb-item"><a href="{% url 'main:webapp_detail' webapp.name %}">{{ webapp.name | fancy_webapp_name | title}}</a></li>
<li class="breadcrumb-item active" aria-current="page">Sandbox</li>
{% endblock %}
......
......@@ -4,8 +4,9 @@
{% block title %}Update your webapp{% endblock %}
{% block breadcrumb %}
<li class="breadcrumb-item"><a href="{% url 'main:user_webapp_list' user.get_username %}">My applications</a></li>
<li class="breadcrumb-item active" aria-current="page">Update {{ webapp.name }}</li>
<li class="breadcrumb-item"><a href="{% url 'main:webapp_list' %}">Applications</a></li>
<li class="breadcrumb-item"><a href="{% url 'main:webapp_detail' webapp.docker_name %}">{{ webapp.name | fancy_webapp_name | title }}</a></li>
<li class="breadcrumb-item active" aria-current="page">Update</li>
{% endblock %}
{% block content %}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment