Merge branch 'feature/blog-by-category' into 'master'
Set the title and header via GET params See merge request ungleich-public/dynamicweb!698
This commit is contained in:
		
				commit
				
					
						c7ebcb00cd
					
				
			
		
					 2 changed files with 3 additions and 3 deletions
				
			
		| 
						 | 
					@ -28,9 +28,9 @@
 | 
				
			||||||
			{% endif %}
 | 
								{% endif %}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		  <h1> {% page_attribute 'page_title'  %}  </h1>
 | 
							  <h1>{% if request.GET.page_title %}{{request.GET.page_title}}{% else %}{% page_attribute 'page_title'  %}{% endif %}</h1>
 | 
				
			||||||
		  <hr class="small">
 | 
							  <hr class="small">
 | 
				
			||||||
		  <span class="subheading"> {% page_attribute 'meta_description' %}</span>
 | 
							  <span class="subheading">{% if request.GET.page_subtitle %}{{request.GET.page_subtitle}}{% else %}{% page_attribute 'meta_description' %}{% endif %}</span>
 | 
				
			||||||
		</div>
 | 
							</div>
 | 
				
			||||||
      </div>
 | 
					      </div>
 | 
				
			||||||
    </div>
 | 
					    </div>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -9,7 +9,7 @@
 | 
				
			||||||
    <meta name="author" content="ungleich glarus ag">
 | 
					    <meta name="author" content="ungleich glarus ag">
 | 
				
			||||||
    <title>
 | 
					    <title>
 | 
				
			||||||
      {% block title %}
 | 
					      {% block title %}
 | 
				
			||||||
      {% page_attribute "page_title" %}
 | 
					      {% if request.GET.page_title %}{{request.GET.page_title}}{% else %}{% page_attribute "page_title" %}{% endif %}
 | 
				
			||||||
      {% endblock %}
 | 
					      {% endblock %}
 | 
				
			||||||
    </title>
 | 
					    </title>
 | 
				
			||||||
    {% addtoblock "external-css" %}
 | 
					    {% addtoblock "external-css" %}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue