Merge branch 'develop'
This commit is contained in:
		
				commit
				
					
						eb9a337be5
					
				
			
		
					 3 changed files with 20 additions and 0 deletions
				
			
		| 
						 | 
				
			
			@ -5,6 +5,7 @@ TEMPLATES = {
 | 
			
		|||
    'digitalglarus/contact.html': _('DG.Contact'),
 | 
			
		||||
    'digitalglarus/index.html': _('DG.Home'),
 | 
			
		||||
    'digitalglarus/letscowork.html': _('DG.CoWork'),
 | 
			
		||||
    'digitalglarus/one_column.html': _('DG.OneColumn'),
 | 
			
		||||
    'ungleichch/blog.html': _('Blog'),
 | 
			
		||||
    'ungleichch/page.html': _('Page'),
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -6,4 +6,5 @@ TEMPLATES = {
 | 
			
		|||
    'index.html': _('DG.Home'),
 | 
			
		||||
    'letscowork.html': _('DG.CoWork'),
 | 
			
		||||
    'detail.html': _('DG.Detail'),
 | 
			
		||||
    'one_column.html': _('DG.OneColumn'),
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										18
									
								
								templates/cms/digitalglarus/one_column.html
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										18
									
								
								templates/cms/digitalglarus/one_column.html
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,18 @@
 | 
			
		|||
{% extends "cms/digitalglarus/base.html" %}
 | 
			
		||||
{% load staticfiles cms_tags %}
 | 
			
		||||
{% block title %}About{% endblock %}
 | 
			
		||||
 | 
			
		||||
{% block content %}
 | 
			
		||||
<div class="row">
 | 
			
		||||
  <div class="box">
 | 
			
		||||
    <div class="col-lg-12">
 | 
			
		||||
      {% placeholder 'digitalglarus_why_us' %}
 | 
			
		||||
    </div>
 | 
			
		||||
    <div class="clearfix"></div>
 | 
			
		||||
  </div>
 | 
			
		||||
</div>
 | 
			
		||||
 | 
			
		||||
</div>
 | 
			
		||||
<!-- /.container -->
 | 
			
		||||
 | 
			
		||||
{% endblock %}
 | 
			
		||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue