Projet

Général

Profil

0001-templates-introduce-columns-top-columns-bottom-block.patch

Thomas Jund (congés, retour le 29/04), 21 octobre 2020 14:37

Télécharger (3,87 ko)

Voir les différences: 

Subject: [PATCH] templates: introduce columns-top & columns-bottom blocks in
 page_template (#47913)


 static/includes/_layout.scss                     |  4 ++--
 templates/combo/page_template.html               | 13 ++++++++++---
 templates/combo/page_template_2cols.html         |  4 +---
 templates/combo/page_template_2cols_sidebar.html | 10 ++--------
 templates/combo/page_template_sidebar.html       |  6 +-----
 5 files changed, 16 insertions(+), 21 deletions(-)
static/includes/_layout.scss
92 92 
	width: 50%;
93 93 
}
94 94 

  		




  95
  
  
    
#columns {

  		




  
  95
  
    
#columns-wrapper {

  		




  96
  96
  
    
	flex-grow: 1;

  		




  97
  97
  
    
	max-width: 100%;

  		




  98
  98
  
    
}

  		




  ......




  121
  121
  
    
}

  		




  122
  122
  
    

  		




  123
  123
  
    
@media screen and ($max-mobile-viewport) {

  		




  124
  
  
    
	#columns {

  		




  
  124
  
    
	#columns-wrapper {

  		




  125
  125
  
    
		padding: 0 0.7em;

  		




  126
  126
  
    
		max-width: 100%;

  		




  127
  127
  
    
	}

  		












  

    
      templates/combo/page_template.html
    
  





  111
  111
  
    
{% block content %}

  		




  112
  112
  
    
  {% block combo-content %}

  		




  113
  113
  
    
    {% block page-content %}

  		




  114
  
  
    
      <div id="columns">

  		




  115
  
  
    
      {% trans "Content" as name %}

  		




  116
  
  
    
      {% placeholder "content" name=name %}

  		




  
  114
  
    
      {% block sidebar %}{% endblock %}

  		




  
  115
  
    
      <div id="columns-wrapper">

  		




  
  116
  
    
        {% block columns-top %}{% endblock %}

  		




  
  117
  
    
        <div id="columns" class="clearfix">

  		




  
  118
  
    
          {% block columns %}

  		




  
  119
  
    
          {% trans "Content" as name %}

  		




  
  120
  
    
          {% placeholder "content" name=name %}

  		




  
  121
  
    
          {% endblock %}

  		




  
  122
  
    
        </div>

  		




  
  123
  
    
        {% block columns-bottom %}{% endblock %}

  		




  117
  124
  
    
      </div>

  		




  118
  125
  
    
    {% endblock %}

  		




  119
  126
  
    
  {% endblock %}

  		












  

    
      templates/combo/page_template_2cols.html
    
  





  1
  1
  
    
{% extends "combo/page_template.html" %}

  		




  2
  2
  
    
{% load combo i18n %}

  		




  3
  3
  
    

  		




  4
  
  
    
{% block combo-content %}

  		




  5
  
  
    
<div id="columns">

  		




  
  4
  
    
{% block columns %}

  		




  6
  5
  
    
<div id="left">

  		




  7
  6
  
    
{% trans "Left column" as name %}

  		




  8
  7
  
    
{% placeholder "content" name=name %}

  		




  ......




  11
  10
  
    
{% trans "Right column" as name %}

  		




  12
  11
  
    
{% placeholder "right" name=name %}

  		




  13
  12
  
    
</div>

  		




  14
  
  
    
</div>

  		




  15
  13
  
    
{% endblock %}

  		












  

    
      templates/combo/page_template_2cols_sidebar.html
    
  





  1
  
  
    
{% extends "combo/page_template.html" %}

  		




  
  1
  
    
{% extends "combo/page_template_sidebar.html" %}

  		




  2
  2
  
    
{% load combo i18n %}

  		




  3
  3
  
    

  		




  4
  
  
    
{% block combo-content %}

  		




  5
  
  
    
<div id="sidebar">

  		




  6
  
  
    
{% trans "Sidebar" as name %}

  		




  7
  
  
    
{% placeholder "sidebar" name=name %}

  		




  8
  
  
    
</div>

  		




  9
  
  
    
<div id="columns">

  		




  
  4
  
    
{% block columns %}

  		




  10
  5
  
    
<div id="left">

  		




  11
  6
  
    
{% trans "Left column" as name %}

  		




  12
  7
  
    
{% placeholder "content" name=name %}

  		




  ......




  15
  10
  
    
{% trans "Right column" as name %}

  		




  16
  11
  
    
{% placeholder "right" name=name %}

  		




  17
  12
  
    
</div>

  		




  18
  
  
    
</div>

  		




  19
  13
  
    
{% endblock %}

  		












  

    
      templates/combo/page_template_sidebar.html
    
  





  1
  1
  
    
{% extends "combo/page_template.html" %}

  		




  2
  2
  
    
{% load combo i18n %}

  		




  3
  3
  
    

  		




  4
  
  
    
{% block combo-content %}

  		




  
  4
  
    
{% block sidebar %}

  		




  5
  5
  
    
<div id="sidebar">

  		




  6
  6
  
    
{% trans "Sidebar" as name %}

  		




  7
  7
  
    
{% placeholder "sidebar" name=name %}

  		




  8
  8
  
    
</div>

  		




  9
  
  
    
<div id="columns">

  		




  10
  
  
    
{% trans "Content" as name %}

  		




  11
  
  
    
{% placeholder "content" name=name %}

  		




  12
  
  
    
</div>

  		




  13
  9
  
    
{% endblock %}

  		




  14
  
  
    
-