refactoring block name in upper nav bar

basetheme_bootstrap/templates/basetheme_bootstrap/basePasteur.html

@@ -38,16 +38,21 @@
                 {% include_if_exists "upper_nav_bar.html"|localize_template "basetheme_bootstrap/upper_nav_bar.example.html" %}
             </ul>
             <div></div>
-            {% block form_in_nav_bar %}
+            <ul class="nav navbar-nav navbar-right">
+                {% block upper_nav_bar_right_before_form %}
+                {% include_if_exists "login_menu.html"|localize_template "basetheme_bootstrap/login_menu.html" %}
+                {% endblock upper_nav_bar_right_before_form %}
+            </ul>
+            {% block upper_nav_bar_right_form %}
             <form class="form-inline" action="search/" method="post">
                 <input class="form-control " type="text" placeholder="{%trans 'Type your search here'%}" aria-label="Search">
                 <button class="form-control btn" type="submit"><span class="d-sm-none">{% trans 'Search'%} </span><i class="fa fa-search"></i></button>
             </form>
-            {% endblock %}
+            {% endblock upper_nav_bar_right_form %}
             <ul class="nav navbar-nav navbar-right">
-                {% block li_dropdown_right_in_first_header_top %}
+                {% block upper_nav_bar_right_after_form %}
                 {% include_if_exists "login_menu.html"|localize_template "basetheme_bootstrap/login_menu.html" %}
-                {% endblock li_dropdown_right_in_first_header_top %}
+                {% endblock upper_nav_bar_right_after_form %}
             </ul>
         </div>
     </nav>

test_app_1/templates/test_app_1/mybasePasteur.html

@@ -5,7 +5,10 @@
 {% load crispy_forms_tags %}
 {% load sstatic %}
 
-{% block li_dropdown_right_in_first_header_top %}{% endblock li_dropdown_right_in_first_header_top %}
+{% block upper_nav_bar_right_before_form %}
+{% include_if_exists "login_menu.html"|localize_template "basetheme_bootstrap/login_menu.html" %}
+{% endblock upper_nav_bar_right_before_form %}
+{% block upper_nav_bar_right_after_form %}{% endblock upper_nav_bar_right_after_form %}
 
 {% block extra_li_dropdown_right %}
 <li class="nav-item bug-tracking"><a class="nav-link" href="https://gitlab.pasteur.fr/bbrancot/django-basetheme-bootstrap/issues"><i class="fa fa-bug"></i> {%trans "Bug tracking"%}</a></li>