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

Merge branch 'master' into task/4105/cms_ungleich_footer_plugin

Browse source
This commit is contained in:
Arvind Tiwari 2018-02-09 01:35:42 +05:30
commit daf8d178ad
22 changed files with 109 additions and 591 deletions
Download patch file Download diff file Expand all files Collapse all files

70
ungleich_page/cms_plugins.py
View file

@ -3,11 +3,10 @@ from cms.plugin_pool import plugin_pool
from .models import (
UngelichContactUsSection, UngelichTextSection, Service, ServiceItem,
About, AboutItem, SectionWithImage, UngleichServiceItem, UngleichHeader,
UngleichHeaderItem, UngleichProductItem, UngleichProduct, UngleichCustomer,
UngleichCustomerItem, UngleichHTMLOnly, UngleichSimpleHeader,
About, AboutItem, SectionWithImage, UngleichServiceItem,
UngleichProductItem, UngleichProduct, UngleichCustomer,
UngleichCustomerItem, UngleichHTMLOnly,
UngleichHeaderWithBackgroundImageSlider,
UngleichHeaderWithBackgroundImageSliderItem,
UngleichHeaderWithBackgroundVideoSliderItem,
UngleichFooter
)
@ -185,49 +184,6 @@ class UngleichServicesItemPlugin(CMSPluginBase):
return context
@plugin_pool.register_plugin
class UngleichHeaderWithTextAndImagePlugin(CMSPluginBase):
name = "ungleich Header with Text and Image Plugin"
model = UngleichSimpleHeader
render_template = "ungleich_page/ungleich/header.html"
cache = False
def render(self, context, instance, placeholder):
context['instance'] = instance
return context
@plugin_pool.register_plugin
class UngleichHeaderWithTextAndImageSliderPlugin(CMSPluginBase):
name = "ungleich Header with Text and Image Slider Plugin"
model = UngleichHeader
render_template = "ungleich_page/ungleich/header_with_slider.html"
cache = False
allow_children = True
child_classes = ['UngleichHeaderItemPlugin']
def render(self, context, instance, placeholder):
context['instance'] = instance
return context
@plugin_pool.register_plugin
class UngleichHeaderItemPlugin(CMSPluginBase):
name = "ungleich Header Item Plugin"
model = UngleichHeaderItem
render_template = "ungleich_page/ungleich/_header_item.html"
cache = False
require_parent = True
parent_classes = ['UngleichHeaderWithTextAndImageSliderPlugin']
def render(self, context, instance, placeholder):
context = super(UngleichHeaderItemPlugin, self).render(
context, instance, placeholder
)
context['instance'] = instance
return context
@plugin_pool.register_plugin
class UngleichHeaderBackgroundImageAndTextSliderPlugin(CMSPluginBase):
name = "ungleich Header with Background and Image Slider Plugin"
@ -238,7 +194,6 @@ class UngleichHeaderBackgroundImageAndTextSliderPlugin(CMSPluginBase):
cache = False
allow_children = True
child_classes = [
'UngleichHeaderBackgroundImageAndTextItemPlugin',
'UngleichHeaderBackgroundVideoItemPlugin',
]
@ -264,25 +219,6 @@ class UngleichHeaderBackgroundVideoItemPlugin(CMSPluginBase):
return context
@plugin_pool.register_plugin
class UngleichHeaderBackgroundImageAndTextItemPlugin(CMSPluginBase):
name = "ungleich Header with Background and Image and Text Item Plugin"
model = UngleichHeaderWithBackgroundImageSliderItem
render_template = (
'ungleich_page/ungleich/_header_with_background_image_slider_item.html'
)
cache = False
require_parent = True
parent_classes = ['UngleichHeaderBackgroundImageAndTextSliderPlugin']
def render(self, context, instance, placeholder):
context = super(
UngleichHeaderBackgroundImageAndTextItemPlugin, self
).render(context, instance, placeholder)
context['instance'] = instance
return context
@plugin_pool.register_plugin
class UngleichProductsPlugin(CMSPluginBase):
name = "ungleich Products Plugin"

64
ungleich_page/migrations/0018_auto_20180105_1826.py Normal file
View file

@ -0,0 +1,64 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.9.4 on 2018-01-05 12:56
from __future__ import unicode_literals
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('cms', '0014_auto_20160404_1908'),
('ungleich_page', '0017_auto_20171219_1856'),
]
operations = [
migrations.RemoveField(
model_name='ungleichheader',
name='background_image',
),
migrations.RemoveField(
model_name='ungleichheader',
name='cmsplugin_ptr',
),
migrations.RemoveField(
model_name='ungleichheaderitem',
name='cmsplugin_ptr',
),
migrations.RemoveField(
model_name='ungleichheaderitem',
name='image',
),
migrations.RemoveField(
model_name='ungleichheaderwithbackgroundimageslideritem',
name='background_image',
),
migrations.RemoveField(
model_name='ungleichheaderwithbackgroundimageslideritem',
name='cmsplugin_ptr',
),
migrations.RemoveField(
model_name='ungleichsimpleheader',
name='background_image',
),
migrations.RemoveField(
model_name='ungleichsimpleheader',
name='cmsplugin_ptr',
),
migrations.RemoveField(
model_name='ungleichsimpleheader',
name='image',
),
migrations.DeleteModel(
name='UngleichHeader',
),
migrations.DeleteModel(
name='UngleichHeaderItem',
),
migrations.DeleteModel(
name='UngleichHeaderWithBackgroundImageSliderItem',
),
migrations.DeleteModel(
name='UngleichSimpleHeader',
),
]

53
ungleich_page/models.py
View file

@ -98,63 +98,10 @@ class UngleichServiceItem(ServiceItem):
)
class UngleichSimpleHeader(CMSPlugin):
background_image = FilerImageField(
null=True,
blank=True,
related_name="ungleich_simple_header_background_image",
on_delete=models.SET_NULL
)
image = FilerImageField(
null=True,
blank=True,
related_name="ungleich_simple_header_image",
on_delete=models.SET_NULL
)
text = HTMLField()
class UngleichHeader(CMSPlugin):
background_image = FilerImageField(
null=True,
blank=True,
related_name="ungleich_header_background_image",
on_delete=models.SET_NULL
)
carousel_data_interval = models.IntegerField(default=5000)
class UngleichHeaderWithBackgroundImageSliderItem(CMSPlugin):
background_image = FilerImageField(
null=True, blank=True,
related_name="ungleich_header_slider_item_image",
on_delete=models.SET_NULL
)
description = HTMLField(
default='<div class="intro-cap">We Design, Configure &amp; Maintain '
'<br>Your Linux Infrastructure</div><p class="intro_lead">'
'Ruby on Rails, Django, Java, Webserver, Mailserver, any '
'infrastructure that needs to configured, we provide '
'comprehensive solutions. Amazon, rackspace or bare metal '
'servers, we configure for you.</p><p style="text-align: '
'right;"><a class="btn btn-trans" href="">Learn More</a></p>'
)
class UngleichHeaderWithBackgroundImageSlider(CMSPlugin):
carousel_data_interval = models.IntegerField(default=2000)
class UngleichHeaderItem(CMSPlugin):
image = FilerImageField(
null=True,
blank=True,
related_name="ungleich_header_item_image",
on_delete=models.SET_NULL
)
description = HTMLField()
class UngleichHeaderWithBackgroundVideoSliderItem(CMSPlugin):
image = FilerImageField(
null=True,

26
ungleich_page/static/ungleich_page/css/agency.css
View file

@ -209,11 +209,6 @@ fieldset[disabled] .btn-xl.active {
border-color: rgba(255,255,255,.02);
}
.navbar-default .navbar-toggle {
/*border-color: #fed136;
background-color: #fed136;*/
}
.navbar-default .navbar-toggle .icon-bar {
background-color: #fff;
}
@ -280,7 +275,7 @@ fieldset[disabled] .btn-xl.active {
}
.navbar-default .navbar-brand {
padding: 4px 8px 12px;
padding: 8px 8px;
}
.navbar-default.navbar-shrink .navbar-brand {
padding: 6px 8px 10px;
@ -345,6 +340,7 @@ header .intro-text .intro-heading {
section {
padding: 75px 0;
border-bottom: 1px solid #f3f4f5;
}
@media(max-width:767px) {
@ -353,6 +349,16 @@ section {
}
}
section .section-heading-contain {
margin-bottom: 50px;
}
@media(min-width:767px) {
section .section-heading-contain {
margin-bottom: 75px;
}
}
section h2.section-heading {
margin-top: 0;
margin-bottom: 15px;
@ -361,7 +367,6 @@ section h2.section-heading {
}
section h3.section-subheading {
margin-bottom: 50px;
text-transform: none;
font-family: 'Raleway', "Helvetica Neue", "Open Sans", "Droid Serif", Helvetica, Arial, sans-serif;
font-size: 16px;
@ -371,15 +376,11 @@ section h3.section-subheading {
}
@media(min-width:768px) {
section {
padding: 80px 0;
}
section h2.section-heading {
font-size: 40px;
}
section h3.section-subheading {
font-size: 18px;
margin-bottom: 75px;
}
}
@ -699,9 +700,6 @@ section h3.section-subheading {
}
@media(min-width:768px) {
.team-member {
margin-bottom: 50px;
}
.team-member h4 {
margin-top: 20px;
margin-bottom: 20px;

2
ungleich_page/static/ungleich_page/css/glasfaser.css
View file

@ -124,7 +124,7 @@
overflow: hidden;
}
.split-section.right {
padding: 100px 0;
/* padding: 100px 0; */
background: rgba(0,0,0,0.03);
}
.split-section.right .split-description {

11
ungleich_page/templates/ungleich_page/glasfaser.html
View file

@ -83,7 +83,7 @@
</div>
</div>
<div class="split-section left" id="your">
<section class="split-section left" id="your">
<div class="container">
<div class="split-text">
<div class="split-title">
@ -96,13 +96,12 @@
</div>
</div>
</div>
</div>
</section>
<section class="split-section right" id="our">
<div class="container">
<div class="split-text text-center">
<div class="wow fadeInDown">
<div class="wow section-heading-contain fadeInDown">
<h2 class="section-heading text-center">Was ist es?</h2>
<h3 class="section-subheading text-muted"></h3>
</div>
<div class="split-description text-center wow fadeInUp">
<p class="lead">Bei diesem Angebot handelt es sich um einen Internetzugang für Firmenkunden.</p>
@ -114,7 +113,7 @@
<section id="services">
<div class="container">
<div class="text-center wow fadeInDown">
<div class="text-center section-heading-contain wow fadeInDown">
<h2 class="section-heading">Technische Details</h2>
<h3 class="section-subheading text-muted">Im Angebot enthalten sind</h3>
</div>
@ -156,7 +155,7 @@
<!-- About Section -->
<section id="about">
<div class="container">
<div class="text-center wow fadeInDown">
<div class="text-center wow fadeInDown section-heading-contain">
<h2 class="section-heading">Wie funktioniert es?</h2>
<h3 class="section-subheading text-muted">So kommen Sie in wenigen einfachen Schritten zu Ihrem High-Speed-Internet</h3>
</div>

2
ungleich_page/templates/ungleich_page/glasfaser/section_about.html
View file

@ -1,7 +1,7 @@
{% load cms_tags %}
<section id="{{section_id}}">
<div class="container">
<div class="text-center wow fadeInDown">
<div class="text-center section-heading-contain wow fadeInDown">
<h2 class="section-heading">{{ about_instance.title }}</h2>
<h3 class="section-subheading text-muted">{{ about_instance.sub_title }}</h3>
</div>

2
ungleich_page/templates/ungleich_page/glasfaser/section_services.html
View file

@ -1,7 +1,7 @@
{% load static i18n cms_tags %}
<section id="{{section_id}}" class="custom-padding-bottom">
<div class="container">
<div class="text-center wow fadeInDown">
<div class="text-center section-heading-contain wow fadeInDown">
<h2 class="section-heading">{{ service_instance.title }}</h2>
<h3 class="section-subheading text-muted">{{ service_instance.sub_title }}</h3>
</div>

3
ungleich_page/templates/ungleich_page/glasfaser/section_text_glasfaser.html
View file

@ -1,9 +1,8 @@
<section class="split-section right" id="{{section_id}}">
<div class="container">
<div class="split-text text-center">
<div class="wow fadeInDown">
<div class="wow fadeInDown section-heading-contain">
<h2 class="section-heading text-center">{{instance.title}}</h2>
<h3 class="section-subheading text-muted"></h3>
</div>
<div class="split-description text-center wow fadeInUp">
<p class="lead">{{instance.description}}</p>

2
ungleich_page/templates/ungleich_page/includes/_about.html
View file

@ -2,7 +2,7 @@
<section id="about">
<div class="container">
<div class="text-center wow fadeInDown">
<div class="text-center section-heading-contain wow fadeInDown">
<h2 class="section-heading">{% trans "ABOUT" %}</h2>
<h3 class="section-subheading text-muted">{% trans "The timeline of ungleich" %}</h3>
</div>

2
ungleich_page/templates/ungleich_page/includes/_portfolio.html
View file

@ -3,7 +3,7 @@
<section id="portfolio" class="bg-light-gray">
<div class="container">
<div class="text-center wow fadeInUp">
<div class="text-center section-heading-contain wow fadeInUp">
<h2 class="section-heading">{% trans "Our Products" %}</h2>
<h3 class="section-subheading text-muted sm_left" style="line-height: 1.5;">{% blocktrans %}Our products include an innovative datacenter,<br>affordable VM hosting, and high speed fiber internet for canton Glarus.{% endblocktrans %}</h3>
</div>

2
ungleich_page/templates/ungleich_page/includes/_services.html
View file

@ -3,7 +3,7 @@
<section id="services">
<div class="container">
<div class="text-center wow fadeInDown">
<div class="text-center section-heading-contain wow fadeInDown">
<h2 class="section-heading">{% trans "our services" %}</h2>
<h3 class="section-subheading text-muted sm_left">
{% trans "We support our clients in all areas of Unix infrastructure." %}<br/>

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

@ -1,14 +0,0 @@
<div class="container">
<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
View file

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

15
ungleich_page/templates/ungleich_page/ungleich/header.html
View file

@ -1,15 +0,0 @@
{% load cms_tags %}
<!-- Header -->
<header style="background-image: url({{ instance.background_image.url }})">
<div class="container">
<div class="intro-text">
<img src="{{ instance.image.url }}" alt="" class="logo-image" img-responsive="" width="300" />
<p></p><p></p><br>
<div class="intro-cap">
<span class="intro-cap">
{{ instance.text }}
</span>
</div>
</div>
</div>
</header>

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

@ -1,21 +0,0 @@
{% load cms_tags %}
<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 %}
<!-- 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>
</div>
</header>