diff --git a/Changelog b/Changelog index d3d4adee..6b8b1370 100644 --- a/Changelog +++ b/Changelog @@ -1,10 +1,16 @@ -Next release: +Next: + * #3911: [dcl] Integrate resend activation link into dcl landing payment page + * #3972: [hosting] Add ungleich company info to invoice footer +1.2.13: 2017-12-09 + * [cms] Introduce UngleichHeaderBackgroundImageAndTextSliderPlugin that allows to have scrolling images and texts + * [cms] Remove

tag for ungleich cms customer item template +1.2.12: 2017-12-09 + * #3594: [digitalglarus] Remove white scroll bar on the right in mobile * #3905: [ungleich] Update ungleich.ch header into a slider * [all] Enable logging custom modules 1.2.11: 2017-11-30 * [all] TravisCI: Test against python 3.4.2 only - * [ungleich] Remove data-replaced image in ungleich CMS services item - plugin template + * [ungleich] Remove data-replaced image in ungleich CMS services item plugin template 1.2.10: 2017-11-26 * #3843: [ungleich] Add generic ungleich CMS template * #3672: [all] Clean existing automated tests diff --git a/datacenterlight/templates/datacenterlight/landing_payment.html b/datacenterlight/templates/datacenterlight/landing_payment.html index d195690b..f2f75e9c 100644 --- a/datacenterlight/templates/datacenterlight/landing_payment.html +++ b/datacenterlight/templates/datacenterlight/landing_payment.html @@ -39,7 +39,7 @@

{% trans "Don't have an account yet?" %}
{% trans "You can sign up by filling in the information below." %}
- {% trans "Forgot password?" %} + {% trans "Forgot password?" %} or {% trans "Resend activation link" %}?

{% endif %} diff --git a/digitalglarus/static/digitalglarus/css/agency.css b/digitalglarus/static/digitalglarus/css/agency.css index 4ac531c2..7e9b0c11 100755 --- a/digitalglarus/static/digitalglarus/css/agency.css +++ b/digitalglarus/static/digitalglarus/css/agency.css @@ -235,7 +235,7 @@ fieldset[disabled] .btn-xl.active { .navbar-default .navbar-brand { font-family: "Helvetica Neue", Helvetica, Arial, cursive; color: #a1cfd7; - padding-top: 10px; + padding-top: 11px; } .navbar-default .navbar-brand:hover, diff --git a/hosting/static/hosting/css/order.css b/hosting/static/hosting/css/order.css index 8e9226e2..734566a5 100644 --- a/hosting/static/hosting/css/order.css +++ b/hosting/static/hosting/css/order.css @@ -7,7 +7,7 @@ @media(min-width: 768px) { .order-detail-container { - padding: 30px; + padding: 30px 30px 20px; } } @@ -53,7 +53,7 @@ } .order-detail-container .order-details { - margin-bottom: 30px; + margin-bottom: 15px; } .order-detail-container .order-details strong { @@ -90,3 +90,18 @@ width: 16px; } } + +.order_detail_footer { + font-size: 9px; + letter-spacing: 1px; + color: #333333; +} + +.order_detail_footer strong { + font-size: 11px; +} + + +#virtual_machine_create_form { + padding: 15px 0; +} \ No newline at end of file diff --git a/hosting/templates/hosting/order_detail.html b/hosting/templates/hosting/order_detail.html index fe200f6e..6ea4f36f 100644 --- a/hosting/templates/hosting/order_detail.html +++ b/hosting/templates/hosting/order_detail.html @@ -135,9 +135,7 @@ - {% if not order %} -
- {% endif %} +
{% if not order %} {% block submit_btn %} @@ -155,6 +153,11 @@ {% endblock submit_btn %} + {% else %} +
+ ungleich glarus ag  Bahnhotstrasse 1, 8783 Linthal, Switzerland
+ www.datacenterlight.ch  |  info@datacenterlight.ch +
{% endif %} {% endif %} diff --git a/hosting/templates/hosting/virtual_machines.html b/hosting/templates/hosting/virtual_machines.html index 6329cc10..467d9d39 100644 --- a/hosting/templates/hosting/virtual_machines.html +++ b/hosting/templates/hosting/virtual_machines.html @@ -39,27 +39,25 @@ {% for vm in vms %} - - {{vm.vm_id}} - {% if vm.ipv6 %} - {{vm.ipv4}} - {{vm.ipv6}} - {% endif %} - - - {% if vm.state == 'ACTIVE' %} - {{vm.state|title}} - {% elif vm.state == 'FAILED' %} - {{vm.state|title}} - {% else %} - {{vm.state|title}} - {% endif %} - - - - {% trans "View Detail" %} - - + + {{vm.vm_id}} + {% if vm.ipv4 %}{{vm.ipv4}}{% endif %} + {% if vm.ipv6 %}{{vm.ipv6}}{% endif %} + + + {% if vm.state == 'ACTIVE' %} + {{vm.state|title}} + {% elif vm.state == 'FAILED' %} + {{vm.state|title}} + {% else %} + {{vm.state|title}} + {% endif %} + + + + {% trans "View Detail" %} + + {% endfor %} diff --git a/hosting/urls.py b/hosting/urls.py index b00a199c..2112c493 100644 --- a/hosting/urls.py +++ b/hosting/urls.py @@ -8,7 +8,8 @@ from .views import ( MarkAsReadNotificationView, PasswordResetView, PasswordResetConfirmView, HostingPricingView, CreateVirtualMachinesView, HostingBillListView, HostingBillDetailView, SSHKeyDeleteView, SSHKeyCreateView, SSHKeyListView, - SSHKeyChoiceView, DashboardView, SettingsView, ResendActivationEmailView) + SSHKeyChoiceView, DashboardView, SettingsView, ResendActivationEmailView +) urlpatterns = [ diff --git a/ungleich_page/cms_plugins.py b/ungleich_page/cms_plugins.py index ca36ba9e..382a2f87 100644 --- a/ungleich_page/cms_plugins.py +++ b/ungleich_page/cms_plugins.py @@ -6,7 +6,9 @@ from .models import ( About, AboutItem, SectionWithImage, UngleichServiceItem, UngleichHeader, UngleichHeaderItem, UngleichProductItem, UngleichProduct, UngleichCustomer, UngleichCustomerItem, UngleichHTMLOnly, UngleichSimpleHeader, - UngleichHeaderItemWithVideo + UngleichHeaderItemWithVideo, + UngleichHeaderWithBackgroundImageSlider, + UngleichHeaderWithBackgroundImageSliderItem, ) @@ -241,6 +243,39 @@ class UngleichHeaderItemWithVideoPlugin(CMSPluginBase): context = super(UngleichHeaderItemWithVideoPlugin, self).render( context, instance, placeholder ) + + +@plugin_pool.register_plugin +class UngleichHeaderBackgroundImageAndTextSliderPlugin(CMSPluginBase): + name = "ungleich Header with Background and Image Slider Plugin" + model = UngleichHeaderWithBackgroundImageSlider + render_template = ( + 'ungleich_page/ungleich/header_with_background_image_slider.html' + ) + cache = False + allow_children = True + child_classes = ['UngleichHeaderBackgroundImageAndTextItemPlugin'] + + def render(self, context, instance, placeholder): + context['instance'] = instance + 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 diff --git a/ungleich_page/migrations/0016_ungleichheaderwithbackgroundimageslider_ungleichheaderwithbackgroundimageslideritem.py b/ungleich_page/migrations/0016_ungleichheaderwithbackgroundimageslider_ungleichheaderwithbackgroundimageslideritem.py new file mode 100644 index 00000000..acbff47b --- /dev/null +++ b/ungleich_page/migrations/0016_ungleichheaderwithbackgroundimageslider_ungleichheaderwithbackgroundimageslideritem.py @@ -0,0 +1,43 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.4 on 2017-12-02 07:30 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion +import djangocms_text_ckeditor.fields +import filer.fields.image + + +class Migration(migrations.Migration): + + dependencies = [ + ('filer', '0004_auto_20160328_1434'), + ('cms', '0014_auto_20160404_1908'), + ('ungleich_page', '0015_ungleichsimpleheader'), + ] + + operations = [ + migrations.CreateModel( + name='UngleichHeaderWithBackgroundImageSlider', + fields=[ + ('cmsplugin_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='cms.CMSPlugin')), + ('carousel_data_interval', models.IntegerField(default=2000)), + ], + options={ + 'abstract': False, + }, + bases=('cms.cmsplugin',), + ), + migrations.CreateModel( + name='UngleichHeaderWithBackgroundImageSliderItem', + fields=[ + ('cmsplugin_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='cms.CMSPlugin')), + ('description', djangocms_text_ckeditor.fields.HTMLField(default='
We Design, Configure & Maintain
Your Linux Infrastructure

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.

Learn More

')), + ('background_image', filer.fields.image.FilerImageField(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='ungleich_header_slider_item_image', to='filer.Image')), + ], + options={ + 'abstract': False, + }, + bases=('cms.cmsplugin',), + ), + ] diff --git a/ungleich_page/migrations/0016_auto_20171219_1856.py b/ungleich_page/migrations/0017_auto_20171219_1856.py similarity index 93% rename from ungleich_page/migrations/0016_auto_20171219_1856.py rename to ungleich_page/migrations/0017_auto_20171219_1856.py index 33fa4eaa..658d0ab2 100644 --- a/ungleich_page/migrations/0016_auto_20171219_1856.py +++ b/ungleich_page/migrations/0017_auto_20171219_1856.py @@ -11,7 +11,7 @@ import filer.fields.image class Migration(migrations.Migration): dependencies = [ - ('ungleich_page', '0015_ungleichsimpleheader'), + ('ungleich_page', '0016_ungleichheaderwithbackgroundimageslider_ungleichheaderwithbackgroundimageslideritem'), ] operations = [ diff --git a/ungleich_page/models.py b/ungleich_page/models.py index 1b5ab960..80eefa32 100644 --- a/ungleich_page/models.py +++ b/ungleich_page/models.py @@ -124,6 +124,27 @@ class UngleichHeader(CMSPlugin): 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='
We Design, Configure & Maintain ' + '
Your Linux Infrastructure

' + '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.

Learn More

' + ) + + +class UngleichHeaderWithBackgroundImageSlider(CMSPlugin): + carousel_data_interval = models.IntegerField(default=2000) + + class UngleichHeaderItem(CMSPlugin): image = FilerImageField( null=True, diff --git a/ungleich_page/static/ungleich_page/css/agency.css b/ungleich_page/static/ungleich_page/css/agency.css index 1a27a4e1..eca4036b 100755 --- a/ungleich_page/static/ungleich_page/css/agency.css +++ b/ungleich_page/static/ungleich_page/css/agency.css @@ -280,7 +280,10 @@ fieldset[disabled] .btn-xl.active { } .navbar-default .navbar-brand { - padding: 8px; + padding: 4px 8px 12px; + } + .navbar-default.navbar-shrink .navbar-brand { + padding: 6px 8px 10px; } } @@ -440,6 +443,7 @@ section h3.section-subheading { max-width: 400px; text-align: center; background-color: #fff; + width: 100%; } #portfolio .portfolio-item .portfolio-caption h4 { diff --git a/ungleich_page/templates/ungleich_page/ungleich/_customer_item.html b/ungleich_page/templates/ungleich_page/ungleich/_customer_item.html index 794bcb06..d49183ae 100644 --- a/ungleich_page/templates/ungleich_page/ungleich/_customer_item.html +++ b/ungleich_page/templates/ungleich_page/ungleich/_customer_item.html @@ -1,2 +1,2 @@ -

{{ instance.description }}

\ No newline at end of file +{{ instance.description }} \ No newline at end of file diff --git a/ungleich_page/templates/ungleich_page/ungleich/_header_item.html b/ungleich_page/templates/ungleich_page/ungleich/_header_item.html index a14c4451..a770d1ed 100644 --- a/ungleich_page/templates/ungleich_page/ungleich/_header_item.html +++ b/ungleich_page/templates/ungleich_page/ungleich/_header_item.html @@ -1,8 +1,14 @@ -{% if instance.image %} -
-{% endif %}
-
- {{ instance.description }} -
+
+ {% if instance.image %} + +
+ {% endif %} +
+ + {{ instance.description }} + +
+
diff --git a/ungleich_page/templates/ungleich_page/ungleich/_header_with_background_image_slider_item.html b/ungleich_page/templates/ungleich_page/ungleich/_header_with_background_image_slider_item.html new file mode 100644 index 00000000..063a0a7b --- /dev/null +++ b/ungleich_page/templates/ungleich_page/ungleich/_header_with_background_image_slider_item.html @@ -0,0 +1,4 @@ +
+
+ {{ instance.description }} +
\ No newline at end of file diff --git a/ungleich_page/templates/ungleich_page/ungleich/header_with_background_image_slider.html b/ungleich_page/templates/ungleich_page/ungleich/header_with_background_image_slider.html new file mode 100644 index 00000000..a3ee0d37 --- /dev/null +++ b/ungleich_page/templates/ungleich_page/ungleich/header_with_background_image_slider.html @@ -0,0 +1,31 @@ +{% load cms_tags %} +
+ +
\ No newline at end of file diff --git a/ungleich_page/templates/ungleich_page/ungleich/header_with_slider.html b/ungleich_page/templates/ungleich_page/ungleich/header_with_slider.html index 8231a6b3..9cf759e6 100644 --- a/ungleich_page/templates/ungleich_page/ungleich/header_with_slider.html +++ b/ungleich_page/templates/ungleich_page/ungleich/header_with_slider.html @@ -2,31 +2,20 @@
\ No newline at end of file