header btn target accepts id, navbar optional lang dropdown
This commit is contained in:
		
					parent
					
						
							
								b3742ed3f7
							
						
					
				
			
			
				commit
				
					
						b252211a69
					
				
			
		
					 6 changed files with 60 additions and 11 deletions
				
			
		| 
						 | 
					@ -132,6 +132,10 @@ class DCLNavbarPluginModel(CMSPlugin):
 | 
				
			||||||
        related_name="dcl_navbar_logo_dark",
 | 
					        related_name="dcl_navbar_logo_dark",
 | 
				
			||||||
    )
 | 
					    )
 | 
				
			||||||
    logo_url = models.URLField(max_length=300, null=True, blank=True)
 | 
					    logo_url = models.URLField(max_length=300, null=True, blank=True)
 | 
				
			||||||
 | 
					    language_dropdown = models.BooleanField(
 | 
				
			||||||
 | 
					        default=True,
 | 
				
			||||||
 | 
					        help_text='Select to include the language selection dropdown.'
 | 
				
			||||||
 | 
					    )
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def get_logo_dark(self):
 | 
					    def get_logo_dark(self):
 | 
				
			||||||
        # used only if atleast one logo exists
 | 
					        # used only if atleast one logo exists
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -0,0 +1,20 @@
 | 
				
			||||||
 | 
					# -*- coding: utf-8 -*-
 | 
				
			||||||
 | 
					# Generated by Django 1.9.4 on 2018-03-19 20:46
 | 
				
			||||||
 | 
					from __future__ import unicode_literals
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					from django.db import migrations, models
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					class Migration(migrations.Migration):
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    dependencies = [
 | 
				
			||||||
 | 
					        ('datacenterlight', '0013_dclnavbarpluginmodel'),
 | 
				
			||||||
 | 
					    ]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    operations = [
 | 
				
			||||||
 | 
					        migrations.AddField(
 | 
				
			||||||
 | 
					            model_name='dclnavbarpluginmodel',
 | 
				
			||||||
 | 
					            name='language_dropdown',
 | 
				
			||||||
 | 
					            field=models.BooleanField(default=True, help_text='Select to include the language selection dropdown.'),
 | 
				
			||||||
 | 
					        ),
 | 
				
			||||||
 | 
					    ]
 | 
				
			||||||
| 
						 | 
					@ -27,13 +27,15 @@
 | 
				
			||||||
          {% render_plugin plugin %}
 | 
					          {% render_plugin plugin %}
 | 
				
			||||||
        </li>
 | 
					        </li>
 | 
				
			||||||
      {% endfor %}
 | 
					      {% endfor %}
 | 
				
			||||||
      <li>
 | 
					      {% if instance.language_dropdown %}
 | 
				
			||||||
        {% if LANGUAGE_CODE == 'en-us'%}
 | 
					        <li>
 | 
				
			||||||
          <a class="on-hover-border" href="{% change_lang 'de' %}">Deutsch  <i class="fa fa-globe" aria-hidden="true"></i></a>
 | 
					          {% if LANGUAGE_CODE == 'en-us'%}
 | 
				
			||||||
        {% else %}
 | 
					            <a class="on-hover-border" href="{% change_lang 'de' %}">Deutsch  <i class="fa fa-globe" aria-hidden="true"></i></a>
 | 
				
			||||||
          <a class="on-hover-border" href="{% change_lang 'en-us' %}">English  <i class="fa fa-globe" aria-hidden="true"></i></a>
 | 
					          {% else %}
 | 
				
			||||||
        {% endif %}
 | 
					            <a class="on-hover-border" href="{% change_lang 'en-us' %}">English  <i class="fa fa-globe" aria-hidden="true"></i></a>
 | 
				
			||||||
      </li>
 | 
					          {% endif %}
 | 
				
			||||||
 | 
					        </li>
 | 
				
			||||||
 | 
					      {% endif %}
 | 
				
			||||||
      {% if not request.user.is_authenticated %}
 | 
					      {% if not request.user.is_authenticated %}
 | 
				
			||||||
        <li>
 | 
					        <li>
 | 
				
			||||||
          <a href="{% url 'hosting:login' %}">{% trans "Login" %}  <span class="fa fa-sign-in"></span></a>
 | 
					          <a href="{% url 'hosting:login' %}">{% trans "Login" %}  <span class="fa fa-sign-in"></span></a>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										20
									
								
								ungleich_page/migrations/0020_auto_20180320_0216.py
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										20
									
								
								ungleich_page/migrations/0020_auto_20180320_0216.py
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
					@ -0,0 +1,20 @@
 | 
				
			||||||
 | 
					# -*- coding: utf-8 -*-
 | 
				
			||||||
 | 
					# Generated by Django 1.9.4 on 2018-03-19 20:46
 | 
				
			||||||
 | 
					from __future__ import unicode_literals
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					from django.db import migrations, models
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					class Migration(migrations.Migration):
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    dependencies = [
 | 
				
			||||||
 | 
					        ('ungleich_page', '0019_merge'),
 | 
				
			||||||
 | 
					    ]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    operations = [
 | 
				
			||||||
 | 
					        migrations.AlterField(
 | 
				
			||||||
 | 
					            model_name='ungleichheaderwithbackgroundvideoslideritem',
 | 
				
			||||||
 | 
					            name='btn_link',
 | 
				
			||||||
 | 
					            field=models.CharField(blank=True, help_text='Url or #id to navigate on click. If this field is left empty, no button would be displayed.', max_length=100, null=True),
 | 
				
			||||||
 | 
					        ),
 | 
				
			||||||
 | 
					    ]
 | 
				
			||||||
| 
						 | 
					@ -125,9 +125,12 @@ class UngleichHeaderWithBackgroundVideoSliderItem(CMSPlugin):
 | 
				
			||||||
        blank=True, null=True,
 | 
					        blank=True, null=True,
 | 
				
			||||||
        help_text='An optional description for this slide.'
 | 
					        help_text='An optional description for this slide.'
 | 
				
			||||||
    )
 | 
					    )
 | 
				
			||||||
    btn_link = models.URLField(
 | 
					    btn_link = models.CharField(
 | 
				
			||||||
        blank=True, null=True,
 | 
					        max_length=100, blank=True, null=True,
 | 
				
			||||||
        help_text='If this field is left empty, no button would be displayed.'
 | 
					        help_text=(
 | 
				
			||||||
 | 
					            'Url or #id to navigate on click. If this field is left empty, no '
 | 
				
			||||||
 | 
					            'button would be displayed.'
 | 
				
			||||||
 | 
					        )
 | 
				
			||||||
    )
 | 
					    )
 | 
				
			||||||
    btn_text = models.CharField(
 | 
					    btn_text = models.CharField(
 | 
				
			||||||
        blank=True, null=True, max_length=50,
 | 
					        blank=True, null=True, max_length=50,
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -22,6 +22,6 @@
 | 
				
			||||||
  {% endif %}
 | 
					  {% endif %}
 | 
				
			||||||
  {% if instance.btn_link %}
 | 
					  {% if instance.btn_link %}
 | 
				
			||||||
    {% trans "Learn More" as default_btn_text %}
 | 
					    {% trans "Learn More" as default_btn_text %}
 | 
				
			||||||
    <a class="btn btn-trans" href="{{ instance.btn_link }}">{{ instance.btn_text|default:default_btn_text }}</a>
 | 
					    <a class="btn btn-trans page-scroll url" href="{{ instance.btn_link }}">{{ instance.btn_text|default:default_btn_text }}</a>
 | 
				
			||||||
  {% endif %}
 | 
					  {% endif %}
 | 
				
			||||||
</div>
 | 
					</div>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue