Projet

Général

Profil

0001-themes-easily-move-the-nav-block-57655.patch

Thomas Jund (congés, retour le 29/04), 06 octobre 2021 16:37

Télécharger (3,27 ko)

Voir les différences: 

Subject: [PATCH] themes: easily move the nav block (#57655)

* add block 'after-header'
* move nav code into own file

 templates/combo/page_template.html |  5 ++---
 templates/includes/nav.html        | 22 ++++++++++++++++++++++
 templates/theme.html               | 30 ++++--------------------------
 3 files changed, 28 insertions(+), 29 deletions(-)
 create mode 100644 templates/includes/nav.html
templates/combo/page_template.html
100 100 
  </h1>
101 101 
{% endblock %}
102 102 

  		




  103
  
  
    
{% block menu %}

  		




  104
  
  
    
{% show_menu depth=2 ignore_visibility=True %}

  		




  105
  
  
    
{% placeholder "menu_right" %}

  		




  
  103
  
    
{% block nav %}

  		




  
  104
  
    
  {% include 'includes/nav.html' %}

  		




  106
  105
  
    
{% endblock %}

  		




  107
  106
  
    

  		




  108
  107
  
    
{% block before-main-content %}

  		












  

    
      templates/includes/nav.html
    
  





  
  1
  
    
{% load combo %}

  		




  
  2
  
    

  		




  
  3
  
    
<nav role="navigation" class="site-nav">

  		




  
  4
  
    
<div id="nav-wrapper" class="gru-nav-wrapper">

  		




  
  5
  
    
{% block nav-pre %}{% endblock %}

  		




  
  6
  
    
<div id="nav" class="gru-nav togglable">

  		




  
  7
  
    
{% block nav-top %}{% endblock %}

  		




  
  8
  
    
  <button id="nav-button" class="gru-nav-button togglable" aria-label="Menu">

  		




  
  9
  
    
    <span class="sr-only">Ouvrir le menu</span>

  		




  
  10
  
    
    <span class="icon-bar icon-bar-1"></span>

  		




  
  11
  
    
    <span class="icon-bar icon-bar-2"></span>

  		




  
  12
  
    
    <span class="icon-bar icon-bar-3"></span>

  		




  
  13
  
    
  </button>

  		




  
  14
  
    
{% block menu %}

  		




  
  15
  
    
  {% show_menu depth=2 ignore_visibility=True %}

  		




  
  16
  
    
  {% placeholder "menu_right" %}

  		




  
  17
  
    
{% endblock %}

  		




  
  18
  
    
{% block nav-bottom %}{% endblock %}

  		




  
  19
  
    
</div> <!-- nav -->

  		




  
  20
  
    
{% block nav-post %}{% endblock %}

  		




  
  21
  
    
</div> <!-- nav-wrapper -->

  		




  
  22
  
    
</nav>

  		












  

    
      templates/theme.html
    
  





  72
  72
  
    
    </div> <!-- header-wrapper -->

  		




  73
  73
  
    
    </header>

  		




  74
  74
  
    

  		




  75
  
  
    
{% block nav %}

  		




  76
  
  
    
<nav role="navigation" class="site-nav">

  		




  77
  
  
    
<div id="nav-wrapper" class="gru-nav-wrapper">

  		




  78
  
  
    
{% block nav-pre %}{% endblock %}

  		




  79
  
  
    
<div id="nav" class="gru-nav togglable">

  		




  80
  
  
    
{% block nav-top %}{% endblock %}

  		




  81
  
  
    
  <button id="nav-button" class="gru-nav-button togglable" aria-label="Menu">

  		




  82
  
  
    
    <span class="sr-only">Ouvrir le menu</span>

  		




  83
  
  
    
    <span class="icon-bar icon-bar-1"></span>

  		




  84
  
  
    
    <span class="icon-bar icon-bar-2"></span>

  		




  85
  
  
    
    <span class="icon-bar icon-bar-3"></span>

  		




  86
  
  
    
  </button>

  		




  87
  
  
    
{% block menu %}

  		




  88
  
  
    
  <ul>

  		




  89
  
  
    
    <li class="link-accueil"><a href="{{combo_url}}">Accueil</a></li>

  		




  90
  
  
    
    <li class="link-demarches"><a href="{{wcs_url}}/login">Démarches</a></li>

  		




  91
  
  
    
    <li class="link-profil"><a href="{{authentic_url}}/accounts/">Profil</a></li>

  		




  92
  
  
    
    <li class="link-aide"><a href="{{help_url}}">Aide</a></li>

  		




  93
  
  
    
  </ul>

  		




  94
  
  
    
{% endblock %}

  		




  95
  
  
    
{% block nav-bottom %}{% endblock %}

  		




  96
  
  
    
</div> <!-- nav -->

  		




  97
  
  
    
{% block nav-post %}{% endblock %}

  		




  98
  
  
    
</div> <!-- nav-wrapper -->

  		




  99
  
  
    
</nav>

  		




  100
  
  
    
{% endblock %}

  		




  
  75
  
    
  {% block after-header %}

  		




  
  76
  
    
    {% block nav %}

  		




  
  77
  
    
    {% endblock %}

  		




  
  78
  
    
  {% endblock %}

  		




  101
  79
  
    

  		




  102
  80
  
    
  {% block before-main-content %}

  		




  103
  81
  
    
  {% endblock %}

  		




  104
  
  
    
-