moep/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

merge master and fixed migration conflict

Browse source
This commit is contained in:
Arvind Tiwari 2017-12-20 01:36:38 +05:30
commit 39d2697e30
17 changed files with 219 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ungleich_page/templates/ungleich_page/ungleich/_customer_item.html
View file

@ -1,2 +1,2 @@
<a href="{{ instance.url }}"><img class="center-block img-client img-responsive" src="{{ instance.image.url}}"></a>
<p class="carousel-text text-muted text-center">{{ instance.description }}</p>
{{ instance.description }}

18
ungleich_page/templates/ungleich_page/ungleich/_header_item.html
View file

@ -1,8 +1,14 @@
{% if instance.image %}
<div class="bg_img" style="background-image:url({{ instance.image.url }})"></div>
{% endif %}
<div class="container">
<div class="intro-cap-sans-transform">
{{ instance.description }}
</div>
<div>
{% if instance.image %}
<img src="{{ instance.image.url }}" alt=""
class="logo-image" img-responsive="" width="300"/>
<div class="header-vh"></div>
{% endif %}
<div>
<span class="intro-cap-sans-transform">
{{ instance.description }}
</span>
</div>
</div>
</div>

4
ungleich_page/templates/ungleich_page/ungleich/_header_with_background_image_slider_item.html Normal file
View file

@ -0,0 +1,4 @@
<div class="bg_img" style="background-image:url({{ instance.background_image.url }})"></div>
<div class="container">
{{ instance.description }}
</div>

31
ungleich_page/templates/ungleich_page/ungleich/header_with_background_image_slider.html Normal file
View file

@ -0,0 +1,31 @@
{% load cms_tags %}
<header class="header_slider">
<div id="carousel-header-ungleich" class="carousel slide" data-interval="{{ instance.carousel_data_interval}}">
<!-- Indicators -->
{% if instance.child_plugin_instances|length > 1 %}
<ol class="carousel-indicators">
{% for plugin in instance.child_plugin_instances %}
<li data-target="#carousel-header-ungleich" data-slide-to="{{forloop.counter0}}" {% if forloop.counter0 == 0 %}class="active" {% endif %}></li>
{% endfor %}
</ol>
{% endif %}
<!-- Wrapper for slides -->
<div class="carousel-inner" role="listbox">
{% for plugin in instance.child_plugin_instances %}
<div class="item {% if forloop.counter0 == 0 %}active{% endif %}">
{% render_plugin plugin %}
</div>
{% endfor %}
</div>
{% if instance.child_plugin_instances|length > 1 %}
<a class="left carousel-control" href="#carousel-header-ungleich" role="button" data-slide="prev">
<span class="fa fa-angle-left" aria-hidden="true"></span>
<span class="sr-only">Previous</span>
</a>
<a class="right carousel-control" href="#carousel-header-ungleich" role="button" data-slide="next">
<span class="fa fa-angle-right" aria-hidden="true"></span>
<span class="sr-only">Next</span>
</a>
{% endif %}
</div>
</header>

31
ungleich_page/templates/ungleich_page/ungleich/header_with_slider.html
View file

@ -2,31 +2,20 @@
<header class="header_slider" style="background-image: url({{ instance.background_image.url }})">
<div id="carousel-header-ungleich" class="carousel slide" data-ride="carousel" data-interval="{{ instance.carousel_data_interval}}">
<!-- Indicators -->
{% if instance.child_plugin_instances|length > 1 %}
<ol class="carousel-indicators">
{% for plugin in instance.child_plugin_instances %}
<li data-target="#carousel-header-ungleich" data-slide-to="{{forloop.counter0}}" {% if forloop.counter0 == 0 %}class="active"{% endif %}></li>
{% endfor %}
</ol>
{% endif %}
{% if instance.child_plugin_instances|length > 1 %}
<ol class="carousel-indicators">
{% for plugin in instance.child_plugin_instances %}
<li data-target="#carousel-header-ungleich" data-slide-to="{{forloop.counter0}}" {% if forloop.counter0 == 0 %}class="active" {% endif %}></li>
{% endfor %}
</ol>
{% endif %}
<!-- Wrapper for slides -->
<div class="carousel-inner" role="listbox">
{% for plugin in instance.child_plugin_instances %}
{% for plugin in instance.child_plugin_instances %}
<div class="item {% if forloop.counter0 == 0 %}active{% endif %}">
{% render_plugin plugin %}
{% render_plugin plugin %}
</div>
{% endfor %}
{% endfor %}
</div>
<!-- Control Arrows -->
{% if instance.child_plugin_instances|length > 1 %}
<a class="left carousel-control" href="#carousel-header-ungleich" role="button" data-slide="prev">
<span class="fa fa-angle-left" aria-hidden="true"></span>
<span class="sr-only">Previous</span>
</a>
<a class="right carousel-control" href="#carousel-header-ungleich" role="button" data-slide="next">
<span class="fa fa-angle-right" aria-hidden="true"></span>
<span class="sr-only">Next</span>
</a>
{% endif %}
</div>
</header>