Browse Source

migra barra de navegação de parents de dispositivos

pull/2485/head
Leandro Roberto 7 years ago
parent
commit
3916961ba5
  1. 2
      sapl/settings.py
  2. 2
      sapl/static/css/compilacao.1e862898.css
  3. 240
      sapl/static/js/compilacao.7b43d770.js
  4. 240
      sapl/static/js/compilacao.f14c9577.js
  5. 4
      sapl/static/js/global.8b79c51c.js
  6. 1
      sapl/templates/compilacao/base_compilacao.html
  7. 13
      sapl/templates/compilacao/dispositivo_form.html
  8. 10
      sapl/templates/compilacao/dispositivo_form_parents.html
  9. 2
      webpack-stats.json

2
sapl/settings.py

@ -283,7 +283,7 @@ STATICFILES_DIRS = (
) )
if FRONTEND_CUSTOM: if FRONTEND_CUSTOM:
STATICFILES_DIRS = ( STATICFILES_DIRS = (
PROJECT_DIR.parent.child('sapl-frontend').child('dist') PROJECT_DIR.parent.child('sapl-frontend').child('dist'),
) )
STATICFILES_FINDERS = ( STATICFILES_FINDERS = (

2
sapl/static/css/compilacao.cffecde7.css → sapl/static/css/compilacao.1e862898.css

File diff suppressed because one or more lines are too long

240
sapl/static/js/compilacao.7b43d770.js

File diff suppressed because one or more lines are too long

240
sapl/static/js/compilacao.f14c9577.js

File diff suppressed because one or more lines are too long

4
sapl/static/js/global.2d86d14b.js → sapl/static/js/global.8b79c51c.js

File diff suppressed because one or more lines are too long

1
sapl/templates/compilacao/base_compilacao.html

@ -1,5 +1,4 @@
{% extends "base.html" %} {% extends "base.html" %}
{% load i18n %}
{% load render_bundle from webpack_loader %} {% load render_bundle from webpack_loader %}
{% block webpack_loader_css %} {% block webpack_loader_css %}

13
sapl/templates/compilacao/dispositivo_form.html

@ -19,26 +19,25 @@
{% endblock%} {% endblock%}
{% block base_content %} {% block base_content %}
<div class="btn-group btn-group-sm" role="group"> <div class="btn-group btn-group-sm" role="group">
<div class="cp-nav-parents btn-group btn-group-sm" role="group"> <div class="btn-group cp-nav-parents " role="group">
<a href="#" class="btn btn-outline-primary"> <a href="#" class="btn btn-outline-primary">
{% trans "Articulações" %} {% trans "Articulações" %}
<span class="caret"></span>
</a> </a>
<ul class="dropdown-menu"> <div class="dropdown-menu">
<li>
{%for parent in object.select_roots %} {%for parent in object.select_roots %}
<a href="{% url view.get_url_this_view parent.ta_id parent.pk %}"> <a class="dropdown-item" href="{% url view.get_url_this_view parent.ta_id parent.pk %}">
{{parent.dispositivo0}} - {{parent|nomenclatura}} {{parent.dispositivo0}} - {{parent|nomenclatura}}
</a> </a>
{%endfor %} {%endfor %}
</li>
</ul>
</div> </div>
</div>
{%for parent in object.get_parents_asc %} {%for parent in object.get_parents_asc %}
{%with node=parent active=False template_name='compilacao/dispositivo_form_parents.html' %} {%with node=parent active=False template_name='compilacao/dispositivo_form_parents.html' %}
{%include template_name%} {%include template_name%}
{%endwith%} {%endwith%}
{%endfor %} {%endfor %}
{%with node=object active=True template_name='compilacao/dispositivo_form_parents.html' %} {%with node=object active=True template_name='compilacao/dispositivo_form_parents.html' %}
{%include template_name%} {%include template_name%}
{%endwith%} {%endwith%}

10
sapl/templates/compilacao/dispositivo_form_parents.html

@ -1,20 +1,20 @@
{% load i18n compilacao_filters %} {% load i18n compilacao_filters %}
{% if not node.dispositivos_filhos_set.exists %} {% if not node.dispositivos_filhos_set.exists %}
<div class="btn-group cp-nav-parents " role="group">
<a href="{% url view.get_url_this_view node.ta_id node.pk %}" class="btn btn-outline-primary {%if active%}active{%endif%}"> <a href="{% url view.get_url_this_view node.ta_id node.pk %}" class="btn btn-outline-primary {%if active%}active{%endif%}">
{{node|nomenclatura}} {{node|nomenclatura}}
</a> </a>
</div>
{% else %} {% else %}
<div class="cp-nav-parents btn-group btn-group-sm" role="group"> <div class="btn-group cp-nav-parents " role="group">
<a href="{% url view.get_url_this_view node.ta_id node.pk %}" class="btn btn-outline-primary {%if active%}active{%endif%}"> <a href="{% url view.get_url_this_view node.ta_id node.pk %}" class="btn btn-outline-primary {%if active%}active{%endif%}">
{% if not node.rotulo and node.nivel == 0 %}{{node.dispositivo0}} - {% endif %}{{node|nomenclatura}} {% if not node.rotulo and node.nivel == 0 %}{{node.dispositivo0}} - {% endif %}{{node|nomenclatura}}
<span class="caret"></span>
</a> </a>
<div class="dropdown-menu"> <div class="dropdown-menu">
{%for parent in node.dispositivos_filhos_set.all %} {%for parent in node.dispositivos_filhos_set.all %}
<a class="dropdown-item" href="{% url view.get_url_this_view parent.ta_id parent.pk %}"> <a class="dropdown-item {%if object == parent%}active{%endif%}" href="{% url view.get_url_this_view parent.ta_id parent.pk %}">
{{parent|nomenclatura}} {% if parent.ta_publicado_id %}<small class="text-warning"> {{parent|nomenclatura}} {% if parent.ta_publicado_id %}<small class="text-primary">
{{ parent.tipo_dispositivo.nota_automatica_prefixo_html|safe }} {{ parent.tipo_dispositivo.nota_automatica_prefixo_html|safe }}
{% nota_automatica parent None %} {% nota_automatica parent None %}
{{ parent.tipo_dispositivo.nota_automatica_sufixo_html|safe }} {{ parent.tipo_dispositivo.nota_automatica_sufixo_html|safe }}

2
webpack-stats.json

@ -1 +1 @@
{"status":"done","publicPath":"/static/","chunks":{"chunk-vendors":[{"name":"css/chunk-vendors.f109b7f2.css","publicPath":"/static/css/chunk-vendors.f109b7f2.css","path":"../sapl/sapl/static/css/chunk-vendors.f109b7f2.css"},{"name":"js/chunk-vendors.c370a973.js","publicPath":"/static/js/chunk-vendors.c370a973.js","path":"../sapl/sapl/static/js/chunk-vendors.c370a973.js"}],"compilacao":[{"name":"css/compilacao.cffecde7.css","publicPath":"/static/css/compilacao.cffecde7.css","path":"../sapl/sapl/static/css/compilacao.cffecde7.css"},{"name":"js/compilacao.f14c9577.js","publicPath":"/static/js/compilacao.f14c9577.js","path":"../sapl/sapl/static/js/compilacao.f14c9577.js"}],"global":[{"name":"css/global.5d2e9934.css","publicPath":"/static/css/global.5d2e9934.css","path":"../sapl/sapl/static/css/global.5d2e9934.css"},{"name":"js/global.2d86d14b.js","publicPath":"/static/js/global.2d86d14b.js","path":"../sapl/sapl/static/js/global.2d86d14b.js"}]}} {"status":"done","publicPath":"/static/","chunks":{"chunk-vendors":[{"name":"css/chunk-vendors.f109b7f2.css","publicPath":"/static/css/chunk-vendors.f109b7f2.css","path":"../sapl/sapl/static/css/chunk-vendors.f109b7f2.css"},{"name":"js/chunk-vendors.c370a973.js","publicPath":"/static/js/chunk-vendors.c370a973.js","path":"../sapl/sapl/static/js/chunk-vendors.c370a973.js"}],"compilacao":[{"name":"css/compilacao.1e862898.css","publicPath":"/static/css/compilacao.1e862898.css","path":"../sapl/sapl/static/css/compilacao.1e862898.css"},{"name":"js/compilacao.7b43d770.js","publicPath":"/static/js/compilacao.7b43d770.js","path":"../sapl/sapl/static/js/compilacao.7b43d770.js"}],"global":[{"name":"css/global.5d2e9934.css","publicPath":"/static/css/global.5d2e9934.css","path":"../sapl/sapl/static/css/global.5d2e9934.css"},{"name":"js/global.8b79c51c.js","publicPath":"/static/js/global.8b79c51c.js","path":"../sapl/sapl/static/js/global.8b79c51c.js"}]}}
Loading…
Cancel
Save