Browse Source

move assets para sapl-frontend

pull/2485/head
Leandro Roberto 7 years ago
parent
commit
1fdec8c214
  1. 4
      sapl-frontend/package.json
  2. 0
      sapl-frontend/src/assets/audio/ring.mp3
  3. 0
      sapl-frontend/src/assets/img/arrow.png
  4. 0
      sapl-frontend/src/assets/img/authenticated.png
  5. 0
      sapl-frontend/src/assets/img/avatar.png
  6. 0
      sapl-frontend/src/assets/img/beta.png
  7. 0
      sapl-frontend/src/assets/img/brasao_transp.gif
  8. 0
      sapl-frontend/src/assets/img/down_arrow_select.jpg
  9. 0
      sapl-frontend/src/assets/img/etiqueta.png
  10. 0
      sapl-frontend/src/assets/img/favicon.ico
  11. 0
      sapl-frontend/src/assets/img/file.png
  12. 0
      sapl-frontend/src/assets/img/hand-note.png
  13. 0
      sapl-frontend/src/assets/img/icon_comissoes.png
  14. 0
      sapl-frontend/src/assets/img/icon_delete_white.png
  15. 0
      sapl-frontend/src/assets/img/icon_materia_legislativa.png
  16. 0
      sapl-frontend/src/assets/img/icon_mesa_diretora.png
  17. 0
      sapl-frontend/src/assets/img/icon_normas_juridicas.png
  18. 0
      sapl-frontend/src/assets/img/icon_parlamentares.png
  19. 0
      sapl-frontend/src/assets/img/icon_pautas.png
  20. 0
      sapl-frontend/src/assets/img/icon_plenarias.png
  21. 0
      sapl-frontend/src/assets/img/icon_relatorios.png
  22. 0
      sapl-frontend/src/assets/img/icon_save_white.png
  23. 0
      sapl-frontend/src/assets/img/lexml.gif
  24. 0
      sapl-frontend/src/assets/img/logo.png
  25. 0
      sapl-frontend/src/assets/img/logo_cc.png
  26. 0
      sapl-frontend/src/assets/img/logo_interlegis.png
  27. 0
      sapl-frontend/src/assets/img/manual.png
  28. 0
      sapl-frontend/src/assets/img/pdflogo.png
  29. 0
      sapl-frontend/src/assets/img/perfil.png
  30. 0
      sapl-frontend/src/assets/img/search-gray.png
  31. 0
      sapl-frontend/src/assets/img/search.png
  32. 0
      sapl-frontend/src/assets/img/user.png
  33. 6
      sapl-frontend/src/theme/main.js
  34. 8
      sapl-frontend/vue.config.js
  35. 5
      sapl/settings.py
  36. 97
      sapl/templates/base.html
  37. 33
      sapl/templates/index.html
  38. 10
      sapl/templates/menus/nav.html
  39. 10
      sapl/templates/menus/subnav.html

4
sapl-frontend/package.json

@ -17,7 +17,9 @@
"vue-router": "^3.0.1",
"vuex": "^3.0.1",
"webpack": "^4.28.4",
"webpack-bundle-tracker": "^0.4.2-beta"
"webpack-bundle-tracker": "^0.4.2-beta",
"sapl-oficial-theme": "../../sapl-oficial-theme"
},
"devDependencies": {
"@vue/cli-plugin-babel": "^3.3.0",

0
sapl/static/audio/ring.mp3 → sapl-frontend/src/assets/audio/ring.mp3

0
sapl/static/img/arrow.png → sapl-frontend/src/assets/img/arrow.png

Before

Width:  |  Height:  |  Size: 262 B

After

Width:  |  Height:  |  Size: 262 B

0
sapl/static/img/authenticated.png → sapl-frontend/src/assets/img/authenticated.png

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 30 KiB

0
sapl/static/img/avatar.png → sapl-frontend/src/assets/img/avatar.png

Before

Width:  |  Height:  |  Size: 59 KiB

After

Width:  |  Height:  |  Size: 59 KiB

0
sapl/static/img/beta.png → sapl-frontend/src/assets/img/beta.png

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 6.6 KiB

0
sapl/static/img/brasao_transp.gif → sapl-frontend/src/assets/img/brasao_transp.gif

Before

Width:  |  Height:  |  Size: 7.5 KiB

After

Width:  |  Height:  |  Size: 7.5 KiB

0
sapl/static/img/down_arrow_select.jpg → sapl-frontend/src/assets/img/down_arrow_select.jpg

Before

Width:  |  Height:  |  Size: 682 B

After

Width:  |  Height:  |  Size: 682 B

0
sapl/static/img/etiqueta.png → sapl-frontend/src/assets/img/etiqueta.png

Before

Width:  |  Height:  |  Size: 694 B

After

Width:  |  Height:  |  Size: 694 B

0
sapl/static/img/favicon.ico → sapl-frontend/src/assets/img/favicon.ico

Before

Width:  |  Height:  |  Size: 975 B

After

Width:  |  Height:  |  Size: 975 B

0
sapl/static/img/file.png → sapl-frontend/src/assets/img/file.png

Before

Width:  |  Height:  |  Size: 1021 B

After

Width:  |  Height:  |  Size: 1021 B

0
sapl/static/img/hand-note.png → sapl-frontend/src/assets/img/hand-note.png

Before

Width:  |  Height:  |  Size: 502 B

After

Width:  |  Height:  |  Size: 502 B

0
sapl/static/img/icon_comissoes.png → sapl-frontend/src/assets/img/icon_comissoes.png

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

0
sapl/static/img/icon_delete_white.png → sapl-frontend/src/assets/img/icon_delete_white.png

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

0
sapl/static/img/icon_materia_legislativa.png → sapl-frontend/src/assets/img/icon_materia_legislativa.png

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

0
sapl/static/img/icon_mesa_diretora.png → sapl-frontend/src/assets/img/icon_mesa_diretora.png

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

0
sapl/static/img/icon_normas_juridicas.png → sapl-frontend/src/assets/img/icon_normas_juridicas.png

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 4.9 KiB

0
sapl/static/img/icon_parlamentares.png → sapl-frontend/src/assets/img/icon_parlamentares.png

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

0
sapl/static/img/icon_pautas.png → sapl-frontend/src/assets/img/icon_pautas.png

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

0
sapl/static/img/icon_plenarias.png → sapl-frontend/src/assets/img/icon_plenarias.png

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

0
sapl/static/img/icon_relatorios.png → sapl-frontend/src/assets/img/icon_relatorios.png

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

0
sapl/static/img/icon_save_white.png → sapl-frontend/src/assets/img/icon_save_white.png

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

0
sapl/static/img/lexml.gif → sapl-frontend/src/assets/img/lexml.gif

Before

Width:  |  Height:  |  Size: 568 B

After

Width:  |  Height:  |  Size: 568 B

0
sapl/static/img/logo.png → sapl-frontend/src/assets/img/logo.png

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

0
sapl/static/img/logo_cc.png → sapl-frontend/src/assets/img/logo_cc.png

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

0
sapl/static/img/logo_interlegis.png → sapl-frontend/src/assets/img/logo_interlegis.png

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

0
sapl/static/img/manual.png → sapl-frontend/src/assets/img/manual.png

Before

Width:  |  Height:  |  Size: 343 B

After

Width:  |  Height:  |  Size: 343 B

0
sapl/static/img/pdflogo.png → sapl-frontend/src/assets/img/pdflogo.png

Before

Width:  |  Height:  |  Size: 238 KiB

After

Width:  |  Height:  |  Size: 238 KiB

0
sapl/static/img/perfil.png → sapl-frontend/src/assets/img/perfil.png

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 6.2 KiB

0
sapl/static/img/search-gray.png → sapl-frontend/src/assets/img/search-gray.png

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

0
sapl/static/img/search.png → sapl-frontend/src/assets/img/search.png

Before

Width:  |  Height:  |  Size: 367 B

After

Width:  |  Height:  |  Size: 367 B

0
sapl/static/img/user.png → sapl-frontend/src/assets/img/user.png

Before

Width:  |  Height:  |  Size: 290 B

After

Width:  |  Height:  |  Size: 290 B

6
sapl-frontend/src/theme/main.js

@ -1,5 +1,9 @@
import "./scss/app.scss";
//import "./scss/app.scss";
//import 'bootstrap';
import "sapl-oficial-theme/src/main";
//eslint-disable-next-line
let theme_lib = THEME_CUSTOM
console.log(theme_lib);

8
sapl-frontend/vue.config.js

@ -1,4 +1,5 @@
const webpack = require('webpack')
const path = require('path')
const BundleTracker = require('webpack-bundle-tracker')
const dotenv = require('dotenv')
@ -24,10 +25,13 @@ module.exports = {
.public('')
.host('localhost')
.port(8080)
.hotOnly(true)
.watchOptions({ poll: 1000 })
.hot(true)
.watchOptions({ poll: true })
.watchContentBase( true )
.https(false)
.headers({ 'Access-Control-Allow-Origin': '\*' })
.contentBase( [path.join(__dirname, 'public'), path.join(__dirname, 'src', 'assets')] )
config.entryPoints.delete('app')

5
sapl/settings.py

@ -269,6 +269,9 @@ WEBPACK_LOADER = {
'CACHE': not DEBUG,
'BUNDLE_DIR_NAME': 'bundle/dist/',
'STATS_FILE': FRONTEND_DIR.child('webpack-stats.json'),
'POLL_INTERVAL': 0.1,
'TIMEOUT': None,
'IGNORE': [r'.+\.hot-update.js', r'.+\.map']
}
}
@ -282,7 +285,7 @@ STATIC_ROOT = PROJECT_DIR.child("collected_static")
STATICFILES_DIRS = (
# BASE_DIR.child("static"),
FRONTEND_DIR.child('bundle').child('dist'),
FRONTEND_DIR.child('dist'),
)

97
sapl/templates/base.html

@ -2,6 +2,7 @@
{% load i18n staticfiles menus %}
{% load common_tags %}
{% load render_bundle from webpack_loader %}
{% load webpack_static from webpack_loader %}
<!--[if IE 8]> <html class="no-js lt-ie9" lang="en"> <![endif]-->
<!--[if gt IE 8]><!-->
@ -13,7 +14,7 @@
<title>{% block head_title %}{% trans 'SAPL - Sistema de Apoio ao Processo Legislativo' %}{% endblock %}</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
{% block head_content %}
<link rel="icon" href="{% static 'img/favicon.ico' %}" type="image/png" >
<link rel="icon" href="{% webpack_static 'img/favicon.ico' %}" type="image/png" >
{# Styles #}
{% comment "" %}
@ -39,55 +40,49 @@
{% if not request|has_iframe %}
{% block navigation %}
<nav class="navbar navbar-inverse navbar-static-top">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
</div>
<div id="navbar" class="navbar-collapse collapse">
{% block sections_navbar %} {% navbar 'navbar.yaml' %}{% endblock sections_navbar %}
<ul class="nav navbar-nav navbar-right" id="autenticacao">
<li class="dropdown pesquisa">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><img src="{% static 'img/search.png' %}"><span class="caret"></span></a>
<ul class="dropdown-menu">
<li class="nav__sub-item">
<form class="navbar-form search-form" method="get" action="http://sapl3.interlegis.leg.br/generico/lexml_pesquisar">
<input type="text" class="form-control" placeholder="Pesquisar no LexML" />
</form>
</li>
</ul>
</li>
<li><a href="/sistema/ajuda"><img src="{% static 'img/manual.png' %}"></a></li>
{% if not user.is_authenticated %}
<li><a href="{% url 'sapl.base:login' %}"><img src="{% static 'img/user.png' %}"></a></li>
{% else %}
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><img height="30" width="30" src="{% static 'img/authenticated.png' %}"><span class="caret"></span></a>
</a>
<ul class="dropdown-menu">
<li><a>{{user.username}}</a></li>
{% if 'parlamentares.can_vote' in request.user.get_all_permissions %}
<li><a href="" onclick="window.open('{% url 'sapl.painel:voto_individual' %}','Voto Individual','width=1000, height=800, scrollbars=yes')";>
Votar Matéria
</a></li>
{% endif %}
<li><a href="{% url 'sapl.base:alterar_senha' %}">Alterar senha</a></li>
<li><a href="{% url 'sapl.base:logout' %}">Sair</a></li>
</ul>
<nav class="navbar navbar-expand-lg navbar-dark bg-dark">
<div class="container">
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarNav">
{% block sections_navbar %} {% navbar 'navbar.yaml' %}{% endblock sections_navbar %}
<ul class="nav navbar-nav navbar-right" id="autenticacao">
<li class="nav-item dropdown pesquisa">
<a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><img src="{% webpack_static 'img/search.png' %}"><span class="caret"></span></a>
<ul class="dropdown-menu">
<li class="dropdown-item">
<form class="navbar-form search-form" method="get" action="http://sapl3.interlegis.leg.br/generico/lexml_pesquisar">
<input type="text" class="form-control" placeholder="Pesquisar no LexML" />
</form>
</li>
</ul>
</li>
{% endif %}
</ul>
<li class="nav-item"><a class="nav-link"href="/sistema/ajuda"><img src="{% webpack_static 'img/manual.png' %}"></a></li>
{% if not user.is_authenticated %}
<li class="nav-item"><a class="nav-link" href="{% url 'sapl.base:login' %}"><img src="{% webpack_static 'img/user.png' %}"></a></li>
{% else %}
<li class="nav-item dropdown">
<a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><img height="30" width="30" src="{% webpack_static 'img/authenticated.png' %}"><span class="caret"></span></a>
</a>
<ul class="dropdown-menu">
<li class="dropdown-item"><a>{{user.username}}</a></li>
{% if 'parlamentares.can_vote' in request.user.get_all_permissions %}
<li class="dropdown-item"><a href="" onclick="window.open('{% url 'sapl.painel:voto_individual' %}','Voto Individual','width=1000, height=800, scrollbars=yes')";>
Votar Matéria
</a></li>
{% endif %}
<li class="dropdown-item"><a href="{% url 'sapl.base:alterar_senha' %}">Alterar senha</a></li>
<li class="dropdown-item"><a href="{% url 'sapl.base:logout' %}">Sair</a></li>
</ul>
</li>
{% endif %}
</ul>
</div><!--/.nav-collapse -->
</div>
</nav>
</div><!--/.nav-collapse -->
</div>
</nav>
{% endblock navigation %}
{# Header #}
@ -96,7 +91,7 @@
<div class="container">
<div class="navbar-header">
<a class="navbar-brand" href="/">
<img src="{% if logotipo %}{{ MEDIA_URL }}{{ logotipo }}{% else %}{% static 'img/logo.png' %}{% endif %}"
<img src="{% if logotipo %}{{ MEDIA_URL }}{{ logotipo }}{% else %}{% webpack_static 'img/logo.png' %}{% endif %}"
alt="Logo" class="img-responsive" >
<span class="vcenter">
{# XXX Make better use of translation tags in html blocks ie. actually use the proper blocktrans tag efficiently #}
@ -187,7 +182,7 @@
<a class="footer__logo" href="#">
<a href="http://www.interlegis.leg.br/">
<img src="{% static 'img/logo_interlegis.png' %}" alt="{% trans 'Logo do Interlegis' %} ">
<img src="{% webpack_static 'img/logo_interlegis.png' %}" alt="{% trans 'Logo do Interlegis' %} ">
</a>
</a>
<p>
@ -199,7 +194,7 @@
</div>
<div class="col-md-4">
<a class="footer__logo" href="#">
<img src="{% static 'img/logo_cc.png' %}" alt="{% trans 'Logo do Creative Commons BY SA' %}">
<img src="{% webpack_static 'img/logo_cc.png' %}" alt="{% trans 'Logo do Creative Commons BY SA' %}">
</a>
<p>
<small>

33
sapl/templates/index.html

@ -1,5 +1,6 @@
{% extends "base.html" %}
{% load i18n staticfiles %}
{% load webpack_static from webpack_loader %}
{% block title %}
@ -10,13 +11,13 @@
<div class="homeBlock">
<div class="homeFront">
<div class="homeIcon">
<img src="{% static 'img/icon_mesa_diretora.png' %}" alt="Mesa Diretora">
<img src="{% webpack_static 'img/icon_mesa_diretora.png' %}" alt="Mesa Diretora">
</div>
<h2>Mesa Diretora</h2>
</div>
<div class="homeContent">
<div class="homeTitle">
<img src="{% static 'img/icon_mesa_diretora.png' %}">
<img src="{% webpack_static 'img/icon_mesa_diretora.png' %}">
<h2>Mesa Diretora</h2>
</div>
<p>
@ -33,13 +34,13 @@
<div class="homeBlock">
<div class="homeFront">
<div class="homeIcon">
<img src="{% static 'img/icon_comissoes.png' %}" alt="Comissões">
<img src="{% webpack_static 'img/icon_comissoes.png' %}" alt="Comissões">
</div>
<h2>Comissões</h2>
</div>
<div class="homeContent">
<div class="homeTitle">
<img src="{% static 'img/icon_comissoes.png' %}">
<img src="{% webpack_static 'img/icon_comissoes.png' %}">
<h2>Comissões</h2>
</div>
<p>
@ -56,13 +57,13 @@
<div class="homeBlock">
<div class="homeFront">
<div class="homeIcon">
<img src="{% static 'img/icon_parlamentares.png' %}" alt="Parlamentares">
<img src="{% webpack_static 'img/icon_parlamentares.png' %}" alt="Parlamentares">
</div>
<h2>Parlamentares</h2>
</div>
<div class="homeContent">
<div class="homeTitle">
<img src="{% static 'img/icon_parlamentares.png' %}">
<img src="{% webpack_static 'img/icon_parlamentares.png' %}">
<h2>Parlamentares</h2>
</div>
<p>
@ -79,13 +80,13 @@
<div class="homeBlock">
<div class="homeFront">
<div class="homeIcon">
<img src="{% static 'img/icon_pautas.png' %}" alt="Pautas das Sessões">
<img src="{% webpack_static 'img/icon_pautas.png' %}" alt="Pautas das Sessões">
</div>
<h2>Pautas das Sessões</h2>
</div>
<div class="homeContent">
<div class="homeTitle">
<img src="{% static 'img/icon_pautas.png' %}">
<img src="{% webpack_static 'img/icon_pautas.png' %}">
<h2>Pautas das<br>Sessões</h2>
</div>
<p>
@ -103,13 +104,13 @@
<div class="homeBlock">
<div class="homeFront">
<div class="homeIcon">
<img src="{% static 'img/icon_plenarias.png' %}" alt="Sessão Plenária">
<img src="{% webpack_static 'img/icon_plenarias.png' %}" alt="Sessão Plenária">
</div>
<h2>Sessão Plenária</h2>
</div>
<div class="homeContent">
<div class="homeTitle">
<img src="{% static 'img/icon_plenarias.png' %}">
<img src="{% webpack_static 'img/icon_plenarias.png' %}">
<h2>Sessão Plenária</h2>
</div>
<p>
@ -128,13 +129,13 @@
<div class="homeBlock">
<div class="homeFront">
<div class="homeIcon">
<img src="{% static 'img/icon_materia_legislativa.png' %}" alt="Matérias Legislativas">
<img src="{% webpack_static 'img/icon_materia_legislativa.png' %}" alt="Matérias Legislativas">
</div>
<h2>Matérias Legislativas</h2>
</div>
<div class="homeContent">
<div class="homeTitle">
<img src="{% static 'img/icon_materia_legislativa.png' %}">
<img src="{% webpack_static 'img/icon_materia_legislativa.png' %}">
<h2>Matérias<br>Legislativas</h2>
</div>
<p>
@ -151,13 +152,13 @@
<div class="homeBlock">
<div class="homeFront">
<div class="homeIcon">
<img src="{% static 'img/icon_normas_juridicas.png' %}" alt="Normas Jurídicas">
<img src="{% webpack_static 'img/icon_normas_juridicas.png' %}" alt="Normas Jurídicas">
</div>
<h2>Normas Jurídicas</h2>
</div>
<div class="homeContent">
<div class="homeTitle">
<img src="{% static 'img/icon_normas_juridicas.png' %}">
<img src="{% webpack_static 'img/icon_normas_juridicas.png' %}">
<h2>Normas Jurídicas</h2>
</div>
<p>
@ -172,13 +173,13 @@
<div class="homeBlock">
<div class="homeFront">
<div class="homeIcon">
<img src="{% static 'img/icon_relatorios.png' %}" alt="Relatórios">
<img src="{% webpack_static 'img/icon_relatorios.png' %}" alt="Relatórios">
</div>
<h2>Relatórios</h2>
</div>
<div class="homeContent">
<div class="homeTitle">
<img src="{% static 'img/icon_relatorios.png' %}">
<img src="{% webpack_static 'img/icon_relatorios.png' %}">
<h2>Relatórios</h2>
</div>
<p>

10
sapl/templates/menus/nav.html

@ -1,25 +1,25 @@
{% load i18n %}
{% if menu %}
<ul class="nav navbar-nav">
<ul class="navbar-nav">
{% for item in menu %}
{% if item.children %}
<li class="dropdown">
<a class="dropdown-toggle"href="#fakeLink" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle"href="#fakeLink" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
{{ item.title }}
<span class="caret"></span>
</a>
<ul class="dropdown-menu" role="menu">
{% for subitem in item.children %}
{% if subitem.url %}
<li><a href="{{ subitem.url }}">{{ subitem.title }}</a></li>
<li class="dropdown-item"><a href="{{ subitem.url }}">{{ subitem.title }}</a></li>
{% endif %}
{% endfor %}
</ul>
</li>
{% else %}
{% if item.url %}
<li><a href="{{ item.url }}">{% trans item.title %}</a></li>
<li class="nav-item"><a class="nav-link" href="{{ item.url }}">{% trans item.title %}</a></li>
{% endif %}
{% endif %}
{% endfor %}

10
sapl/templates/menus/subnav.html

@ -2,25 +2,25 @@
{% load i18n %}
{% if menu %}
<ul class="nav nav-pills navbar-right">
<ul class="navbar-nav">
{% for item in menu %}
{% if item.children %}
<li class="dropdown {{item.active}}">
<a class="dropdown-toggle" data-toggle="dropdown" href="#fakeLink">
<li class="nav-item dropdown {{item.active}}">
<a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#fakeLink">
{% trans item.title %}
<span class="fa-chevron-down fa"></span>
</a>
<ul class="dropdown-menu" role="menu">
{% for subitem in item.children %}
{% if subitem.url %}
<li class="{{subitem.active}}"><a href="{{ subitem.url }}">{% trans subitem.title %}</a></li>
<li class="dropdown-item{{subitem.active}}"><a href="{{ subitem.url }}">{% trans subitem.title %}</a></li>
{% endif %}
{% endfor %}
</ul>
</li>
{% else %}
{% if item.url %}
<li class="{{item.active}}"><a href="{{ item.url }}">{% trans item.title %}</a></li>
<li class="nav-item {{item.active}}"><a class="nav-link" href="{{ item.url }}">{% trans item.title %}</a></li>
{% endif %}
{% endif %}
{% endfor %}

Loading…
Cancel
Save