From 116cce62b5d54c096a08d79937856bcc4545d906 Mon Sep 17 00:00:00 2001
From: LeandroRoberto <leandroroberto.br@gmail.com>
Date: Mon, 17 Oct 2016 18:39:27 -0200
Subject: [PATCH] Corrige falha cometida no rebase

---
 sapl/templates/base.html                      |  2 --
 .../bootstrap3/layout/radioselect.html        | 19 -------------------
 2 files changed, 21 deletions(-)
 delete mode 100644 sapl/templates/bootstrap3/layout/radioselect.html

diff --git a/sapl/templates/base.html b/sapl/templates/base.html
index 80ad94f38..7e651469f 100644
--- a/sapl/templates/base.html
+++ b/sapl/templates/base.html
@@ -277,8 +277,6 @@
       <!-- Placed at the end of the document so the pages load faster -->
       <script type="text/javascript" src="{% static 'jquery/dist/jquery.min.js' %}"></script>
       <script type="text/javascript" src="{% static 'bootstrap-sass/assets/javascripts/bootstrap.min.js' %}"></script>
-      <script type="text/javascript" src="{% static 'drunken-parrot-flat-ui/js/checkbox.js' %}"></script>
-      <script type="text/javascript" src="{% static 'drunken-parrot-flat-ui/js/radio.js' %}"></script>
 
 
       <script type="text/javascript" src="{% static 'jquery-ui/jquery-ui.min.js' %}"></script>
diff --git a/sapl/templates/bootstrap3/layout/radioselect.html b/sapl/templates/bootstrap3/layout/radioselect.html
deleted file mode 100644
index b3e6b589e..000000000
--- a/sapl/templates/bootstrap3/layout/radioselect.html
+++ /dev/null
@@ -1,19 +0,0 @@
-{% load crispy_forms_filters %}
-{% load l10n %}
-
-<div class="controls controls-radio {{ field_class }}"{% if flat_attrs %} {{ flat_attrs|safe }}{% endif %}>
-    {% include 'bootstrap3/layout/field_errors_block.html' %}
-
-    {% for choice in field.field.choices %}
-        <label class="radio{% if field.field.inline_class %} radio-inline{% endif %}{% if choice.0 in field.value or choice.0|stringformat:"s" in field.value or choice.0|stringformat:"s" == field.value|stringformat:"s" %} checked{% endif %}" for="id_{{ field.html_name }}_{{ forloop.counter }}">
-            <span class="icons">
-              <span class="first-icon"></span>
-              <span class="second-icon"></span>
-            </span>
-
-            <input type="radio"{% if choice.0 in field.value or choice.0|stringformat:"s" in field.value or choice.0|stringformat:"s" == field.value|stringformat:"s" %} checked="checked"{% endif %} name="{{ field.html_name }}" id="id_{{ field.html_name }}_{{ forloop.counter }}" value="{{ choice.0|unlocalize }}" {{ field.field.widget.attrs|flatatt }}>{{ choice.1|unlocalize }}
-        </label>
-    {% endfor %}
-
-    {% include 'bootstrap3/layout/help_text.html' %}
-</div>