From 86b0d36b3ad837b62123ef9a46078ec4d85e629c Mon Sep 17 00:00:00 2001
From: Leandro Roberto <leandroroberto.br@gmail.com>
Date: Sat, 2 Feb 2019 14:32:20 -0200
Subject: [PATCH] =?UTF-8?q?ajst=20dropdown=20de=20sele=C3=A7=C3=A3o=20de?=
 =?UTF-8?q?=20editor=20de=20dispositivos?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../apps/compilacao/js/old/compilacao_edit.js |  3 +-
 .../src/apps/compilacao/scss/compilacao.scss  | 33 ++-----------------
 .../compilacao/ajax_actions_dinamic_edit.html |  9 +++--
 webpack-stats.json                            |  2 +-
 4 files changed, 10 insertions(+), 37 deletions(-)

diff --git a/sapl-frontend/src/apps/compilacao/js/old/compilacao_edit.js b/sapl-frontend/src/apps/compilacao/js/old/compilacao_edit.js
index 087176849..00d020784 100644
--- a/sapl-frontend/src/apps/compilacao/js/old/compilacao_edit.js
+++ b/sapl-frontend/src/apps/compilacao/js/old/compilacao_edit.js
@@ -26,6 +26,7 @@ window.DispositivoEdit = function () {
     let pk = dpt.attr('pk')
     instance.clearEditSelected()
     instance.triggerBtnDptEdit(pk)
+    event.preventDefault()
   }
 
   instance.bindActionsClick = function (event) {
@@ -124,9 +125,9 @@ window.DispositivoEdit = function () {
 
     let btn_fechar = _this.find('.btn-fechar')
     btn_fechar.on('click', function (event) {
-      event.preventDefault()
       instance.clearEditSelected()
       instance.triggerBtnDptEdit(_this.attr('pk'))
+      event.preventDefault()
     })
   }
 
diff --git a/sapl-frontend/src/apps/compilacao/scss/compilacao.scss b/sapl-frontend/src/apps/compilacao/scss/compilacao.scss
index 917867bfd..220a2d2d7 100644
--- a/sapl-frontend/src/apps/compilacao/scss/compilacao.scss
+++ b/sapl-frontend/src/apps/compilacao/scss/compilacao.scss
@@ -645,35 +645,6 @@ a:link:after, a:visited:after {
       opacity: 1;
     }
   }
-
-  .tipo-vigencias__old {
-    list-style: none;
-    position: fixed;
-    bottom: 0px;
-    left: 50%;
-    transform: translate(-50%, 0);
-    margin: 0;
-    padding: 0;
-    background-color: $color_buttons;
-    z-index: 1000;
-
-    opacity: 0.9;
-    transition: all 0.3s ease-in-out;
-
-    a {
-      color: white;
-      padding: 0.3em 1em 0;
-      display: inline-block;
-      font-size: 110%;
-      cursor: pointer;
-      &.selected {
-        background-color: rgba(0, 0, 0, 0.5);
-      }
-    }
-    &:hover {
-      background-color: rgba(0, 0, 0, 0.2);
-    }
-  }
   &:hover {
     opacity: 1;
   }
@@ -922,7 +893,9 @@ a:link:after, a:visited:after {
         }
       }
     }
-
+    .btns-tipos-editor {
+      padding: 0;
+    }
     .dropdown-menu {
       &.dropdown-menu-left {
         right: auto !important;
diff --git a/sapl/templates/compilacao/ajax_actions_dinamic_edit.html b/sapl/templates/compilacao/ajax_actions_dinamic_edit.html
index c8e441dc1..e533de80d 100644
--- a/sapl/templates/compilacao/ajax_actions_dinamic_edit.html
+++ b/sapl/templates/compilacao/ajax_actions_dinamic_edit.html
@@ -65,11 +65,10 @@
       <button type="button" class="btn btn-outline-primary btn-sm radius-right" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
         <i class="fa fa-edit fa-lg"></i>
       </button>
-      <ul class="dropdown-menu dropdown-menu-right">
-        <div class="arrow top"></div>
-        <li><a class="btn-editor-type" editortype="construct">Construtor</a></li>
-        <li><a class="btn-editor-type" editortype="textarea">Editor Simples</a></li>
-        <li><a class="btn-editor-type" editortype="tinymce">Editor Tinymce</a></li>
+      <ul class="dropdown-menu dropdown-menu-right btns-tipos-editor">
+        <li><a href="" class="btn-editor-type" editortype="construct">Construtor</a></li>
+        <li><a href="" class="btn-editor-type" editortype="textarea">Editor Simples</a></li>
+        <li><a href="" class="btn-editor-type" editortype="tinymce">Editor Tinymce</a></li>
         {% if perms.compilacao.change_dispositivo_edicao_avancada %}
           <li><a class="btn-editor-avancado" href="{% url 'sapl.compilacao:dispositivo_edit' object.ta_id object.pk %}" >Editor Avançado</a></li>
         {% endif %}
diff --git a/webpack-stats.json b/webpack-stats.json
index 0909a1d9c..997e8ad39 100644
--- a/webpack-stats.json
+++ b/webpack-stats.json
@@ -1 +1 @@
-{"status":"done","publicPath":"http://localhost:8080/","chunks":{"compilacao":[{"name":"compilacao.js","publicPath":"http://localhost:8080/compilacao.js","path":"../sapl/static/compilacao.js"},{"name":"compilacao.80cf4c95fe3d3b717889.hot-update.js","publicPath":"http://localhost:8080/compilacao.80cf4c95fe3d3b717889.hot-update.js","path":"../sapl/static/compilacao.80cf4c95fe3d3b717889.hot-update.js"}],"global":[{"name":"global.js","publicPath":"http://localhost:8080/global.js","path":"../sapl/static/global.js"}],"sapl-oficial-theme":[{"name":"sapl-oficial-theme.js","publicPath":"http://localhost:8080/sapl-oficial-theme.js","path":"../sapl/static/sapl-oficial-theme.js"}]}}
\ No newline at end of file
+{"status":"done","publicPath":"http://localhost:8080/","chunks":{"compilacao":[{"name":"compilacao.js","publicPath":"http://localhost:8080/compilacao.js","path":"../sapl/static/compilacao.js"}],"global":[{"name":"global.js","publicPath":"http://localhost:8080/global.js","path":"../sapl/static/global.js"}],"sapl-oficial-theme":[{"name":"sapl-oficial-theme.js","publicPath":"http://localhost:8080/sapl-oficial-theme.js","path":"../sapl/static/sapl-oficial-theme.js"}]}}
\ No newline at end of file