diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-01-17 15:59:26 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-01-17 15:59:26 +0100 |
| commit | 5087bd017e15504b0d4cee6b2b40ce945e5a0929 (patch) | |
| tree | 7b9879d7b3d2cdc0cbc2e22b41b97cea51fdef89 /ishtar_common | |
| parent | 8975cbd94eb6b34b9ee3038041705674a092d300 (diff) | |
| download | Ishtar-5087bd017e15504b0d4cee6b2b40ce945e5a0929.tar.bz2 Ishtar-5087bd017e15504b0d4cee6b2b40ce945e5a0929.zip | |
Adapt layout for bootstrap v4-beta3
Diffstat (limited to 'ishtar_common')
| -rw-r--r-- | ishtar_common/templates/blocks/SquareMeterWidget.html | 6 | ||||
| -rw-r--r-- | ishtar_common/templates/blocks/bs_form_snippet.html | 15 | ||||
| -rw-r--r-- | ishtar_common/widgets.py | 4 |
3 files changed, 16 insertions, 9 deletions
diff --git a/ishtar_common/templates/blocks/SquareMeterWidget.html b/ishtar_common/templates/blocks/SquareMeterWidget.html index 730a918c4..09e93b425 100644 --- a/ishtar_common/templates/blocks/SquareMeterWidget.html +++ b/ishtar_common/templates/blocks/SquareMeterWidget.html @@ -1,6 +1,10 @@ <div class="input-group"> <input class="area_widget form-control" type="text"{{final_attrs|safe}}> - <span class="input-group-addon">{{unit}} (<span id="ha_{{id}}">0</span> ha)</span> + <div class="input-group-append"> + <div class="input-group-text"> + {{unit}} (<span id="ha_{{id}}">0</span> ha) + </div> + </div> </div> <script type="text/javascript"><!--// function evaluate_{{safe_id}}(){ diff --git a/ishtar_common/templates/blocks/bs_form_snippet.html b/ishtar_common/templates/blocks/bs_form_snippet.html index e58df1832..eb52fa653 100644 --- a/ishtar_common/templates/blocks/bs_form_snippet.html +++ b/ishtar_common/templates/blocks/bs_form_snippet.html @@ -20,9 +20,11 @@ <div class="form-row"> <div class="form-group col-lg-10"> <div class="input-group"> - <span class="input-group-addon"> - <i class="fa fa-search" aria-hidden="true"></i></span> - {{field|safe}} + <span class="input-group-prepend"> + <span class="input-group-text"> + <i class="fa fa-search" aria-hidden="true"></i></span> + </span> + {{field|safe}} </div> {% if field.help_text %} <small><a data-toggle="collapse" href="#{{field.auto_id}}_help" @@ -69,10 +71,11 @@ {% endif %} {{field|safe}} {% if field.help_text %} - <span class="input-group-addon"> - <a data-toggle="collapse" href="#{{field.auto_id}}_help" + <span class="input-group-append"> + <a class="input-group-text" data-toggle="collapse" + href="#{{field.auto_id}}_help" aria-expanded="false" aria-controls="{{field.auto_id}}_help"> - <i class="fa fa-question-circle" aria-hidden="true"></i> + <i class="fa fa-question-circle" aria-hidden="true"></i> </a> </span> </div> diff --git a/ishtar_common/widgets.py b/ishtar_common/widgets.py index 84a58c98c..24a87d5a8 100644 --- a/ishtar_common/widgets.py +++ b/ishtar_common/widgets.py @@ -404,8 +404,8 @@ class JQueryAutoComplete(forms.TextInput): if self.url_new: url_new = self.url_new url_new = reverse(url_new, args=args) - new = u'<span class="input-group-addon">'\ - u'<a href="#" class="add-button" '\ + new = u'<span class="input-group-append">'\ + u'<a href="#" class="add-button input-group-text" '\ u'onclick="open_window(\'%s\');">+</a></span></div>' % url_new html += u"""<input%(attrs_select)s/>%(new)s\ <input type="hidden"%(attrs_hidden)s/>\ |