Merge branch 'master' into task/4105/cms_ungleich_footer_plugin

Changelog

@@ -2,6 +2,7 @@ Next:
     * #4049: [blog] Replace header background image
     * #3670: [hosting] Shorten ssh key name
     * #4046: [hosting] Add sdd_size, hdd_size to VirtualMachineSerializer (No visual change)
+    * bgfix: [hosting] increase invoice pdf resolution
 1.3.2: 2018-01-16
     * #4000: [all] Replace all ungleich.com with ungleich.ch
     * #4067: [ungleich] mobile navbar toggle fix

hosting/static/hosting/js/html2pdf.js

@@ -1,387 +0,0 @@
-/**
- * @license
- *
- * MIT License
- *
- * Copyright (c) 2017 Erik Koopmans
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-/**
- * Generate a PDF from an HTML element or string using html2canvas and jsPDF.
- *
- * @param {Element|string} source The source element or HTML string.
- * @param {Object=} opt An object of optional settings: 'margin', 'filename',
- *    'image' ('type' and 'quality'), and 'html2canvas' / 'jspdf', which are
- *    sent as settings to their corresponding functions.
- */
-var html2pdf = (function(html2canvas, jsPDF) {
-
-  /* ---------- MAIN FUNCTION ---------- */
-
-  var html2pdf = function(source, opt) {
-    // Handle input.
-    opt = objType(opt) === 'object' ? opt : {};
-    var source = html2pdf.parseInput(source, opt);
-
-    // Determine the PDF page size.
-    var pageSize = jsPDF.getPageSize(opt.jsPDF);
-    pageSize.inner = {
-      width:  pageSize.width - opt.margin[1] - opt.margin[3],
-      height: pageSize.height - opt.margin[0] - opt.margin[2]
-    };
-    pageSize.inner.ratio = pageSize.inner.height / pageSize.inner.width;
-
-    // Copy the source element into a PDF-styled container div.
-    var container = html2pdf.makeContainer(source, pageSize);
-    var overlay = container.parentElement;
-
-    // Get the locations of all hyperlinks.
-    if (opt.enableLinks) {
-      // Find all anchor tags and get the container's bounds for reference.
-      opt.links = [];
-      var links = container.querySelectorAll('a');
-      var containerRect = unitConvert(container.getBoundingClientRect(), pageSize.k);
-
-      // Treat each client rect as a separate link (for text-wrapping).
-      Array.prototype.forEach.call(links, function(link) {
-        var clientRects = link.getClientRects();
-        for (var i=0; i<clientRects.length; i++) {
-          var clientRect = unitConvert(clientRects[i], pageSize.k);
-          clientRect.left -= containerRect.left;
-          clientRect.top -= containerRect.top;
-          opt.links.push({ el: link, clientRect: clientRect });
-        }
-      });
-    }
-
-    // Render the canvas and pass the result to makePDF.
-    var onRendered = opt.html2canvas.onrendered || function() {};
-    opt.html2canvas.onrendered = function(canvas) {
-      onRendered(canvas);
-      document.body.removeChild(overlay);
-      html2pdf.makePDF(canvas, pageSize, opt);
-    }
-    html2canvas(container, opt.html2canvas);
-  };
-
-  html2pdf.parseInput = function(source, opt) {
-    // Parse the opt object.
-    opt.jsPDF = opt.jsPDF || {};
-    opt.html2canvas = opt.html2canvas || {};
-    opt.filename = opt.filename && objType(opt.filename) === 'string' ? opt.filename : 'file.pdf';
-    opt.enableLinks = opt.hasOwnProperty('enableLinks') ? opt.enableLinks : true;
-    opt.image = opt.image || {};
-    opt.image.type = opt.image.type || 'jpeg';
-    opt.image.quality = opt.image.quality || 0.95;
-
-    // Parse the margin property of the opt object.
-    switch (objType(opt.margin)) {
-      case 'undefined':
-        opt.margin = 0;
-      case 'number':
-        opt.margin = [opt.margin, opt.margin, opt.margin, opt.margin];
-        break;
-      case 'array':
-        if (opt.margin.length === 2) {
-          opt.margin = [opt.margin[0], opt.margin[1], opt.margin[0], opt.margin[1]];
-        }
-        if (opt.margin.length === 4) {
-          break;
-        }
-      default:
-        throw 'Invalid margin array.';
-    }
-
-    // Parse the source element/string.
-    if (!source) {
-      throw 'Missing source element or string.';
-    } else if (objType(source) === 'string') {
-      source = createElement('div', { innerHTML: source });
-    } else if (objType(source) === 'element') {
-      source = cloneNode(source, opt.html2canvas.javascriptEnabled);
-    } else {
-      throw 'Invalid source - please specify an HTML Element or string.';
-    }
-
-    // Return the parsed input (opt is modified in-place, no need to return).
-    return source;
-  };
-
-  html2pdf.makeContainer = function(source, pageSize) {
-    // Define the CSS styles for the container and its overlay parent.
-    var overlayCSS = {
-      position: 'fixed', overflow: 'hidden', zIndex: 1000,
-      left: 0, right: 0, bottom: 0, top: 0,
-      backgroundColor: 'rgba(0,0,0,0.8)'
-    };
-    var containerCSS = {
-      position: 'absolute', width: pageSize.inner.width + pageSize.unit,
-      left: 0, right: 0, top: 0, height: 'auto', margin: 'auto',
-      backgroundColor: 'white'
-    };
-
-    // Set the overlay to hidden (could be changed in the future to provide a print preview).
-    overlayCSS.opacity = 0;
-
-    // Create and attach the elements.
-    var overlay = createElement('div',   { className: 'html2pdf__overlay', style: overlayCSS });
-    var container = createElement('div', { className: 'html2pdf__container', style: containerCSS });
-    container.appendChild(source);
-    overlay.appendChild(container);
-    document.body.appendChild(overlay);
-
-    // Enable page-breaks.
-    var pageBreaks = source.querySelectorAll('.html2pdf__page-break');
-    var pxPageHeight = pageSize.inner.height * pageSize.k / 72 * 96;
-    Array.prototype.forEach.call(pageBreaks, function(el) {
-      el.style.display = 'block';
-      var clientRect = el.getBoundingClientRect();
-      el.style.height = pxPageHeight - (clientRect.top % pxPageHeight) + 'px';
-    }, this);
-
-    // Return the container.
-    return container;
-  };
-
-  html2pdf.makePDF = function(canvas, pageSize, opt) {
-    // Calculate the number of pages.
-    var ctx = canvas.getContext('2d');
-    var pxFullHeight = canvas.height;
-    var pxPageHeight = Math.floor(canvas.width * pageSize.inner.ratio);
-    var nPages = Math.ceil(pxFullHeight / pxPageHeight);
-
-    // Create a one-page canvas to split up the full image.
-    var pageCanvas = document.createElement('canvas');
-    var pageCtx = pageCanvas.getContext('2d');
-    var pageHeight = pageSize.inner.height;
-    pageCanvas.width = canvas.width;
-    pageCanvas.height = pxPageHeight;
-
-    // Initialize the PDF.
-    var pdf = new jsPDF(opt.jsPDF);
-
-    for (var page=0; page<nPages; page++) {
-      // Trim the final page to reduce file size.
-      if (page === nPages-1) {
-        pageCanvas.height = pxFullHeight % pxPageHeight;
-        pageHeight = pageCanvas.height * pageSize.inner.width / pageCanvas.width;
-      }
-
-      // Display the page.
-      var w = pageCanvas.width;
-      var h = pageCanvas.height;
-      pageCtx.fillStyle = 'white';
-      pageCtx.fillRect(0, 0, w, h);
-      pageCtx.drawImage(canvas, 0, page*pxPageHeight, w, h, 0, 0, w, h);
-
-      // Add the page to the PDF.
-      if (page)  pdf.addPage();
-      var imgData = pageCanvas.toDataURL('image/' + opt.image.type, opt.image.quality);
-      pdf.addImage(imgData, opt.image.type, opt.margin[1], opt.margin[0],
-                   pageSize.inner.width, pageHeight);
-
-      // Add hyperlinks.
-      if (opt.enableLinks) {
-        var pageTop = page * pageSize.inner.height;
-        opt.links.forEach(function(link) {
-          if (link.clientRect.top > pageTop && link.clientRect.top < pageTop + pageSize.inner.height) {
-            var left = opt.margin[1] + link.clientRect.left;
-            var top = opt.margin[0] + link.clientRect.top - pageTop;
-            pdf.link(left, top, link.clientRect.width, link.clientRect.height, { url: link.el.href });
-          }
-        });
-      }
-    }
-
-    // Finish the PDF.
-    pdf.save( opt.filename );
-  }
-
-
-  /* ---------- UTILS ---------- */
-
-  // Determine the type of a variable/object.
-  var objType = function(obj) {
-    if (typeof obj === 'undefined')                             return 'undefined';
-    else if (typeof obj === 'string' || obj instanceof String)  return 'string';
-    else if (typeof obj === 'number' || obj instanceof Number)  return 'number';
-    else if (!!obj && obj.constructor === Array)                return 'array';
-    else if (obj && obj.nodeType === 1)                         return 'element';
-    else if (typeof obj === 'object')                           return 'object';
-    else                                                        return 'unknown';
-  };
-
-  // Create an HTML element with optional className, innerHTML, and style.
-  var createElement = function(tagName, opt) {
-    var el = document.createElement(tagName);
-    if (opt.className)  el.className = opt.className;
-    if (opt.innerHTML) {
-      el.innerHTML = opt.innerHTML;
-      var scripts = el.getElementsByTagName('script');
-      for (var i = scripts.length; i-- > 0; null) {
-        scripts[i].parentNode.removeChild(scripts[i]);
-      }
-    }
-    for (var key in opt.style) {
-      el.style[key] = opt.style[key];
-    }
-    return el;
-  };
-
-  // Deep-clone a node and preserve contents/properties.
-  var cloneNode = function(node, javascriptEnabled) {
-    // Recursively clone the node.
-    var clone = node.nodeType === 3 ? document.createTextNode(node.nodeValue) : node.cloneNode(false);
-    for (var child = node.firstChild; child; child = child.nextSibling) {
-      if (javascriptEnabled === true || child.nodeType !== 1 || child.nodeName !== 'SCRIPT') {
-        clone.appendChild(cloneNode(child, javascriptEnabled));
-      }
-    }
-
-    if (node.nodeType === 1) {
-      // Preserve contents/properties of special nodes.
-      if (node.nodeName === 'CANVAS') {
-        clone.width = node.width;
-        clone.height = node.height;
-        clone.getContext('2d').drawImage(node, 0, 0);
-      } else if (node.nodeName === 'TEXTAREA' || node.nodeName === 'SELECT') {
-        clone.value = node.value;
-      }
-
-      // Preserve the node's scroll position when it loads.
-      clone.addEventListener('load', function() {
-        clone.scrollTop = node.scrollTop;
-        clone.scrollLeft = node.scrollLeft;
-      }, true);
-    }
-
-    // Return the cloned node.
-    return clone;
-  }
-
-  // Convert units using the conversion value 'k' from jsPDF.
-  var unitConvert = function(obj, k) {
-    var newObj = {};
-    for (var key in obj) {
-      newObj[key] = obj[key] * 72 / 96 / k;
-    }
-    return newObj;
-  };
-
-  // Get dimensions of a PDF page, as determined by jsPDF.
-  jsPDF.getPageSize = function(orientation, unit, format) {
-    // Decode options object
-    if (typeof orientation === 'object') {
-      var options = orientation;
-      orientation = options.orientation;
-      unit = options.unit || unit;
-      format = options.format || format;
-    }
-
-    // Default options
-    unit        = unit || 'mm';
-    format      = format || 'a4';
-    orientation = ('' + (orientation || 'P')).toLowerCase();
-    var format_as_string = ('' + format).toLowerCase();
-
-    // Size in pt of various paper formats
-    pageFormats = {
-      'a0'  : [2383.94, 3370.39], 'a1'  : [1683.78, 2383.94],
-      'a2'  : [1190.55, 1683.78], 'a3'  : [ 841.89, 1190.55],
-      'a4'  : [ 595.28,  841.89], 'a5'  : [ 419.53,  595.28],
-      'a6'  : [ 297.64,  419.53], 'a7'  : [ 209.76,  297.64],
-      'a8'  : [ 147.40,  209.76], 'a9'  : [ 104.88,  147.40],
-      'a10' : [  73.70,  104.88], 'b0'  : [2834.65, 4008.19],
-      'b1'  : [2004.09, 2834.65], 'b2'  : [1417.32, 2004.09],
-      'b3'  : [1000.63, 1417.32], 'b4'  : [ 708.66, 1000.63],
-      'b5'  : [ 498.90,  708.66], 'b6'  : [ 354.33,  498.90],
-      'b7'  : [ 249.45,  354.33], 'b8'  : [ 175.75,  249.45],
-      'b9'  : [ 124.72,  175.75], 'b10' : [  87.87,  124.72],
-      'c0'  : [2599.37, 3676.54], 'c1'  : [1836.85, 2599.37],
-      'c2'  : [1298.27, 1836.85], 'c3'  : [ 918.43, 1298.27],
-      'c4'  : [ 649.13,  918.43], 'c5'  : [ 459.21,  649.13],
-      'c6'  : [ 323.15,  459.21], 'c7'  : [ 229.61,  323.15],
-      'c8'  : [ 161.57,  229.61], 'c9'  : [ 113.39,  161.57],
-      'c10' : [  79.37,  113.39], 'dl'  : [ 311.81,  623.62],
-      'letter'            : [612,   792],
-      'government-letter' : [576,   756],
-      'legal'             : [612,  1008],
-      'junior-legal'      : [576,   360],
-      'ledger'            : [1224,  792],
-      'tabloid'           : [792,  1224],
-      'credit-card'       : [153,   243]
-    };
-
-    // Unit conversion
-    switch (unit) {
-      case 'pt':  k = 1;          break;
-      case 'mm':  k = 72 / 25.4;  break;
-      case 'cm':  k = 72 / 2.54;  break;
-      case 'in':  k = 72;         break;
-      case 'px':  k = 72 / 96;    break;
-      case 'pc':  k = 12;         break;
-      case 'em':  k = 12;         break;
-      case 'ex':  k = 6;          break;
-      default:
-        throw ('Invalid unit: ' + unit);
-    }
-
-    // Dimensions are stored as user units and converted to points on output
-    if (pageFormats.hasOwnProperty(format_as_string)) {
-      pageHeight = pageFormats[format_as_string][1] / k;
-      pageWidth = pageFormats[format_as_string][0] / k;
-    } else {
-      try {
-        pageHeight = format[1];
-        pageWidth = format[0];
-      } catch (err) {
-        throw new Error('Invalid format: ' + format);
-      }
-    }
-
-    // Handle page orientation
-    if (orientation === 'p' || orientation === 'portrait') {
-      orientation = 'p';
-      if (pageWidth > pageHeight) {
-        tmp = pageWidth;
-        pageWidth = pageHeight;
-        pageHeight = tmp;
-      }
-    } else if (orientation === 'l' || orientation === 'landscape') {
-      orientation = 'l';
-      if (pageHeight > pageWidth) {
-        tmp = pageWidth;
-        pageWidth = pageHeight;
-        pageHeight = tmp;
-      }
-    } else {
-      throw('Invalid orientation: ' + orientation);
-    }
-
-    // Return information (k is the unit conversion ratio from pts)
-    var info = { 'width': pageWidth, 'height': pageHeight, 'unit': unit, 'k': k };
-    return info;
-  };
-
-
-  // Expose the html2pdf function.
-  return html2pdf;
-}(html2canvas, jsPDF));

hosting/static/hosting/js/order.js

@@ -5,6 +5,9 @@ $(document).ready(function() {
         var fileName = $target.attr('id') + '.pdf';
         html2pdf($target[0], {
             filename: fileName,
+            html2canvas: {
+              scale: 2
+            }
         });
     });
     $('.btn-print').click(function(e) {

hosting/templates/hosting/order_detail.html

@@ -216,8 +216,8 @@
 {% block js_extra %}
     {% if order %}
         <script src="https://cdnjs.cloudflare.com/ajax/libs/jspdf/1.3.5/jspdf.min.js"></script>
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/html2canvas/0.4.1/html2canvas.min.js"></script>
+        <script src="{% static 'hosting/js/html2canvas.min.js' %}"></script>
-        <script src="{% static 'hosting/js/html2pdf.js' %}"></script>
+        <script src="{% static 'hosting/js/html2pdf.min.js' %}"></script>
         <script src="{% static 'hosting/js/order.js' %}"></script>
     {% endif %}
 {% endblock js_extra %}

ungleich_page/cms_plugins.py

@@ -3,11 +3,10 @@ from cms.plugin_pool import plugin_pool
 
 from .models import (
     UngelichContactUsSection, UngelichTextSection, Service, ServiceItem,
-    About, AboutItem, SectionWithImage, UngleichServiceItem, UngleichHeader,
+    About, AboutItem, SectionWithImage, UngleichServiceItem,
-    UngleichHeaderItem, UngleichProductItem, UngleichProduct, UngleichCustomer,
+    UngleichProductItem, UngleichProduct, UngleichCustomer,
-    UngleichCustomerItem, UngleichHTMLOnly, UngleichSimpleHeader,
+    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"

ungleich_page/migrations/0018_auto_20180105_1826.py

@@ -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',
+        ),
+    ]

ungleich_page/models.py

@@ -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,

ungleich_page/static/ungleich_page/css/agency.css

@@ -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;

ungleich_page/static/ungleich_page/css/glasfaser.css

@@ -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 {

ungleich_page/templates/ungleich_page/glasfaser.html

@@ -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>

ungleich_page/templates/ungleich_page/glasfaser/section_about.html

@@ -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>

ungleich_page/templates/ungleich_page/glasfaser/section_services.html

@@ -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>

ungleich_page/templates/ungleich_page/glasfaser/section_text_glasfaser.html

@@ -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>

ungleich_page/templates/ungleich_page/includes/_about.html

@@ -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>

ungleich_page/templates/ungleich_page/includes/_portfolio.html

@@ -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>

ungleich_page/templates/ungleich_page/includes/_services.html

@@ -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/>

ungleich_page/templates/ungleich_page/ungleich/_header_item.html

@@ -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>

ungleich_page/templates/ungleich_page/ungleich/_header_with_background_image_slider_item.html

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

ungleich_page/templates/ungleich_page/ungleich/header.html

@@ -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>

ungleich_page/templates/ungleich_page/ungleich/header_with_slider.html

@@ -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>