From c205bb05e83f4e5b826166a03e29c30e629475cc Mon Sep 17 00:00:00 2001 From: Henry Bravo Date: Tue, 23 May 2017 18:32:06 -0500 Subject: [PATCH 1/4] Fixed Pricing pages bugs --- cms_templates/detail.html.py | 11 + .../_header_post_detail.html.py | 26 ++ cms_templates/djangocms_blog/base.html.py | 19 ++ .../djangocms_blog/post_detail.html.py | 35 +++ .../djangocms_blog/post_list.html.py | 47 ++++ cms_templates/gallery.html.py | 19 ++ cms_templates/home_digitalglarus.html.py | 79 ++++++ cms_templates/includes/blog_item.html.py | 33 +++ cms_templates/includes/blog_meta.html.py | 23 ++ cms_templates/letscowork.html.py | 45 ++++ cms_templates/one_column.html.py | 18 ++ cms_templates/supporters_plugin.html.py | 8 + cms_templates/two_columns.html.py | 21 ++ .../locale/de/LC_MESSAGES/django.mo | Bin 3862 -> 4037 bytes .../locale/de/LC_MESSAGES/django.po | 102 ++++--- .../datacenterlight/css/landing-page.css | 23 +- .../static/datacenterlight/js/main.js | 21 +- .../templates/datacenterlight/index.html | 12 +- .../templates/datacenterlight/pricing.html | 6 +- design_membership/calendar.html.py | 110 ++++++++ design_membership/calendar/calendar.html.py | 107 ++++++++ docs/hosting_app_spec.rst.txt.py | 193 ++++++++++++++ .../static/font-awesome/HELP-US-OUT.txt.py | 7 + .../font-awesome/fonts/4.4.0/index.html.py | 58 ++++ .../templates/calendar/calendar.html.py | 113 ++++++++ membership/templates/confirm.html.py | 65 +++++ membership/templates/creditcard.html.py | 108 ++++++++ membership/templates/error.html.py | 55 ++++ membership/templates/login.html.py | 53 ++++ membership/templates/membership.html.py | 249 ++++++++++++++++++ membership/templates/success.html.py | 32 +++ membership/templates/validated.html.py | 39 +++ membership/templates/validated_email.html.py | 38 +++ .../design_membership/confirm.html.py | 49 ++++ .../design_membership/creditcard.html.py | 66 +++++ .../design_membership/error.html.py | 44 ++++ .../design_membership/login.html.py | 109 ++++++++ .../design_membership/membership.html.py | 193 ++++++++++++++ .../design_membership/success.html.py | 26 ++ nosystemd/templates/nosystemd/base.html.py | 116 ++++++++ .../nosystemd/confirm_reset_password.html.py | 50 ++++ .../templates/nosystemd/donation.html.py | 131 +++++++++ .../nosystemd/donation_detail.html.py | 84 ++++++ .../templates/nosystemd/donations.html.py | 91 +++++++ .../nosystemd/donator_status.html.py | 40 +++ .../nosystemd/emails/donation_charge.html.py | 136 ++++++++++ .../nosystemd/emails/donation_charge.txt.py | 136 ++++++++++ .../emails/password_reset_email.html.py | 13 + .../emails/password_reset_email.txt.py | 13 + nosystemd/templates/nosystemd/landing.html.py | 105 ++++++++ nosystemd/templates/nosystemd/login.html.py | 54 ++++ .../nosystemd/reset_password.html.py | 42 +++ nosystemd/templates/nosystemd/signup.html.py | 47 ++++ requirements.debian.txt.py | 44 ++++ requirements.txt.py | 88 +++++++ requirements_old.txt.py | 102 +++++++ templates/404.html.py | 13 + templates/505.html.py | 15 ++ templates/cms/digitalglarus/about.html.py | 57 ++++ templates/cms/digitalglarus/base.html.py | 128 +++++++++ templates/cms/digitalglarus/contact.html.py | 65 +++++ templates/cms/digitalglarus/detail.html.py | 11 + templates/cms/digitalglarus/index.html.py | 99 +++++++ .../cms/digitalglarus/letscowork.html.py | 51 ++++ templates/cms/ungleichch/_footer.html.py | 40 +++ templates/cms/ungleichch/_header_base.html.py | 23 ++ templates/cms/ungleichch/_menu.html.py | 36 +++ templates/cms/ungleichch/base.html.py | 78 ++++++ templates/cms/ungleichch/blog.html.py | 5 + templates/cms/ungleichch/index.html.py | 3 + templates/cms/ungleichch/page.html.py | 5 + .../templates/cms/ungleichch/_footer.html.py | 40 +++ .../cms/ungleichch/_header_base.html.py | 38 +++ .../templates/cms/ungleichch/_menu.html.py | 36 +++ .../cms/ungleichch/base_ungleich.html.py | 80 ++++++ .../cms/ungleichch/blog_ungleich.html.py | 5 + .../templates/cms/ungleichch/index.html.py | 3 + .../templates/cms/ungleichch/page.html.py | 5 + .../ungleich/djangocms_blog/base.html.py | 12 + .../djangocms_blog/includes/blog_item.html.py | 37 +++ .../djangocms_blog/post_detail.html.py | 48 ++++ .../djangocms_blog/post_list_ungleich.html.py | 89 +++++++ 82 files changed, 4525 insertions(+), 51 deletions(-) create mode 100644 cms_templates/detail.html.py create mode 100644 cms_templates/djangocms_blog/_header_post_detail.html.py create mode 100644 cms_templates/djangocms_blog/base.html.py create mode 100644 cms_templates/djangocms_blog/post_detail.html.py create mode 100644 cms_templates/djangocms_blog/post_list.html.py create mode 100644 cms_templates/gallery.html.py create mode 100644 cms_templates/home_digitalglarus.html.py create mode 100644 cms_templates/includes/blog_item.html.py create mode 100644 cms_templates/includes/blog_meta.html.py create mode 100644 cms_templates/letscowork.html.py create mode 100644 cms_templates/one_column.html.py create mode 100644 cms_templates/supporters_plugin.html.py create mode 100644 cms_templates/two_columns.html.py create mode 100644 design_membership/calendar.html.py create mode 100644 design_membership/calendar/calendar.html.py create mode 100644 docs/hosting_app_spec.rst.txt.py create mode 100644 membership/static/font-awesome/HELP-US-OUT.txt.py create mode 100644 membership/static/font-awesome/fonts/4.4.0/index.html.py create mode 100644 membership/templates/calendar/calendar.html.py create mode 100644 membership/templates/confirm.html.py create mode 100644 membership/templates/creditcard.html.py create mode 100644 membership/templates/error.html.py create mode 100644 membership/templates/login.html.py create mode 100644 membership/templates/membership.html.py create mode 100644 membership/templates/success.html.py create mode 100644 membership/templates/validated.html.py create mode 100644 membership/templates/validated_email.html.py create mode 100644 non_django_but_related/design_membership/confirm.html.py create mode 100644 non_django_but_related/design_membership/creditcard.html.py create mode 100644 non_django_but_related/design_membership/error.html.py create mode 100644 non_django_but_related/design_membership/login.html.py create mode 100644 non_django_but_related/design_membership/membership.html.py create mode 100644 non_django_but_related/design_membership/success.html.py create mode 100644 nosystemd/templates/nosystemd/base.html.py create mode 100644 nosystemd/templates/nosystemd/confirm_reset_password.html.py create mode 100644 nosystemd/templates/nosystemd/donation.html.py create mode 100644 nosystemd/templates/nosystemd/donation_detail.html.py create mode 100644 nosystemd/templates/nosystemd/donations.html.py create mode 100644 nosystemd/templates/nosystemd/donator_status.html.py create mode 100644 nosystemd/templates/nosystemd/emails/donation_charge.html.py create mode 100644 nosystemd/templates/nosystemd/emails/donation_charge.txt.py create mode 100644 nosystemd/templates/nosystemd/emails/password_reset_email.html.py create mode 100644 nosystemd/templates/nosystemd/emails/password_reset_email.txt.py create mode 100644 nosystemd/templates/nosystemd/landing.html.py create mode 100644 nosystemd/templates/nosystemd/login.html.py create mode 100644 nosystemd/templates/nosystemd/reset_password.html.py create mode 100644 nosystemd/templates/nosystemd/signup.html.py create mode 100644 requirements.debian.txt.py create mode 100644 requirements.txt.py create mode 100644 requirements_old.txt.py create mode 100644 templates/404.html.py create mode 100644 templates/505.html.py create mode 100644 templates/cms/digitalglarus/about.html.py create mode 100644 templates/cms/digitalglarus/base.html.py create mode 100644 templates/cms/digitalglarus/contact.html.py create mode 100644 templates/cms/digitalglarus/detail.html.py create mode 100644 templates/cms/digitalglarus/index.html.py create mode 100644 templates/cms/digitalglarus/letscowork.html.py create mode 100644 templates/cms/ungleichch/_footer.html.py create mode 100644 templates/cms/ungleichch/_header_base.html.py create mode 100644 templates/cms/ungleichch/_menu.html.py create mode 100644 templates/cms/ungleichch/base.html.py create mode 100644 templates/cms/ungleichch/blog.html.py create mode 100644 templates/cms/ungleichch/index.html.py create mode 100644 templates/cms/ungleichch/page.html.py create mode 100644 ungleich/templates/cms/ungleichch/_footer.html.py create mode 100644 ungleich/templates/cms/ungleichch/_header_base.html.py create mode 100644 ungleich/templates/cms/ungleichch/_menu.html.py create mode 100644 ungleich/templates/cms/ungleichch/base_ungleich.html.py create mode 100644 ungleich/templates/cms/ungleichch/blog_ungleich.html.py create mode 100644 ungleich/templates/cms/ungleichch/index.html.py create mode 100644 ungleich/templates/cms/ungleichch/page.html.py create mode 100644 ungleich/templates/ungleich/djangocms_blog/base.html.py create mode 100644 ungleich/templates/ungleich/djangocms_blog/includes/blog_item.html.py create mode 100644 ungleich/templates/ungleich/djangocms_blog/post_detail.html.py create mode 100644 ungleich/templates/ungleich/djangocms_blog/post_list_ungleich.html.py diff --git a/cms_templates/detail.html.py b/cms_templates/detail.html.py new file mode 100644 index 00000000..1042e660 --- /dev/null +++ b/cms_templates/detail.html.py @@ -0,0 +1,11 @@ +XXXXXXXXX + +XXXX + XXXX + XXXX + XXXX + XXXX + XXXX +XXXXX + +XXXXX XXXXXXBBB BBBBBBBBBBBBBBBBBBBBXXXXXX XX XXXXXXXX diff --git a/cms_templates/djangocms_blog/_header_post_detail.html.py b/cms_templates/djangocms_blog/_header_post_detail.html.py new file mode 100644 index 00000000..cfa0174c --- /dev/null +++ b/cms_templates/djangocms_blog/_header_post_detail.html.py @@ -0,0 +1,26 @@ +BBBB BBBBBBBB BBBBBBBBBBB +XXXX XXXX XXXXXX XXX +XXXX XXX XXXX XXXXXXXXXX XXXXX XXX XXXX XXXXXX XX XXX XXXX XXXXXX XXX +XXXXXXX XXXXXXXXXXXXXXXXXXXX + BB BBBBBBBBBBBBBBBBBB + XXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXX + BBBB + XXXXXXXXXXXXXXXXXXXXXXXX XXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBXXXX + BBBBB + X + XXXX XXXXXXXXXXXXXXXXXX + XXXX XXXXXXXXXXXX + XXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXXXXXXXXX + XXXX XXXXXXXXXXXXXXXXXXXXX + XXXX BBBBBBBBBBBB BBBB BBBBBBB XXXXX + XXX XXXXXXXXXXXXXXXXXXX + BBBBBBBBBBBB BBBB BBBBBBBBBB BB BB BBBBBBBBBBBBBBBBBBBBBBB + XXXXX + XXXXX XXXXXXXXXXXXX + XXXXXX XX FFFFFFFFFFFFFFFFFF + XXXXXXX + XXXXXX + XXXXXX + XXXXXX + XXXXXX +XXXXXXXXX diff --git a/cms_templates/djangocms_blog/base.html.py b/cms_templates/djangocms_blog/base.html.py new file mode 100644 index 00000000..228cfca7 --- /dev/null +++ b/cms_templates/djangocms_blog/base.html.py @@ -0,0 +1,19 @@ +BBBBBBB BBBBBBBBBBBBBBBBBB + +BBBBB BBBB + BB BBBB + BBBBBBB BBBBBBBBBBBBBBBBBBBBBB + BBBBB +BBBBBBBB BBBB + +XXXX XXXXXXXXXXXXXXXXXX + BBBBB BBBBBBB + XXXX XXXXXXXXXX XXXXXXXX XXXXXXX + XXXX XXXXXXXXXXXX + XXXX XXXXXXXXXXXX + BBBBB BBBBBBBBBBBBBBBBBBBB + XXXXXX + XXXXXX + XXXXXX + BBBBBBBB BBBBBBB +XXXXXX diff --git a/cms_templates/djangocms_blog/post_detail.html.py b/cms_templates/djangocms_blog/post_detail.html.py new file mode 100644 index 00000000..4bd8ab9c --- /dev/null +++ b/cms_templates/djangocms_blog/post_detail.html.py @@ -0,0 +1,35 @@ +BBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBB +BBBB BBBB BBBBBBBBB BBBBBBBB + +BBBBB BBBBBBBBBBBBBBBBBBBBBBBB BBBBBBBBBBBBBBBB +BBBBB BBBBBBBBBBBBBBBBBBBBB BBBBBBBBBBBBB +BBBBB BBBBBBBBBBBBBXXXXX XXXXXXXXXXXXXXX XXXXXXXXXBBBBBBBB BBBBBBBBBBBBB +BBBBB BBBBBBBBBBBBB + +BBBBB BBBBBBBBBBBBBBBBBBBBB +XXXXXXXX XXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXX + BB BBBBBBBBBBBBBBBBBB + XXXX XXXXXXXXXXXXXXXXXXXX + BBBBBBBBB BBBBBBBBBBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB BB BBBBB + XXXX XXXXXX XXXXXX XXXXXXXXXXXXXXXXXXXXX XXXXXXXXX XX + XXXXXX + BBBBB + XXXXXXX XXXXXXXXXXXXXXXXXXXX + XXXXXXXXX + XXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXX + XX XXXXXXBBB BBBBBBBBBBBBBBBBBBBBBBBBBBB BBBBBBBBBX XXXXXXXXXXXXXXXXX XXXXXXXXXXXXXX + XXXXXXX + XXXX + XXXXXXX + + XXXXXXXX + XXXXX + XXXXXXXXX + BBBBB BBBBBBBBB + + BBBBBBBB + XXXXXXXXX + BBBBBBBBBBBB + XXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXBBBBBBBBBBBBBBBBBB BBBBBBBBBBBBXXXXXX +XXXXXXXXXX +BBBBBBBB BBBBBBBBBBBB \ No newline at end of file diff --git a/cms_templates/djangocms_blog/post_list.html.py b/cms_templates/djangocms_blog/post_list.html.py new file mode 100644 index 00000000..32673467 --- /dev/null +++ b/cms_templates/djangocms_blog/post_list.html.py @@ -0,0 +1,47 @@ +BBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBB +BBBB BBBB BBBBBBBBBBBBBBBBBB + +BBBBB BBBBBBBBBBBBBXXXXX XXXXXXXXXXXXXXX XXXXXXXXXBBBBBBBB BBBBBBBBBBBBB + +BBBBB BBBBBBBBBBBB +XXXXXXXX XXXXXXXXXXXXXXXXXX + BBBBB BBBBBBBBBB + XXXXXXXX + XXXX + BB BBBBBB gettext('Articles by') + BBBB BBBBBBBBBBBB gettext('Archive') XXXXXXX BB BBBBBFFFFFFFF BBBBB + BBBB BBBBBBBBBBBBBB gettext('Tag') XXXXXXX FFFFFFFF + BBBB BBBBBBBB gettext('Category') XXXXXXX BBBBB + XXXXX + XXXXXXXXX + BBBBBBBB + BBB BBBB BB BBBBBBBBB + BBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB BBBB BBBBBBBBB BBBBBBBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB + BBBBB + XX XXXXXXXXXXXXXXXXXXX gettext('No article found.') XXXX + BBBBBB + BB BBBBBB BB BBBBBBBBBBBB BB BBBBBBBBBBBBBB + XX XXXXXXXXXXXXXXXXXXXX XXXXXXBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBXX gettext('Back') XXXXXXXX + BBBBB + BB BBBBBBBBBBBB + XXXX XXXXX XXX + XXX XXXXXXXXXXXXXX + BB BBBBBBBBBBBBBBBBBBBBB + XXX XXXXXXXXXXXXXXXXX + XX XXXXXXXXXX + XXXXXXX gettext('Newer Posts') + XXXX + XXXXX + BBBBB + BB BBBBBBBBBBBBBBBBB + XXX XXXXXXXXXXXXX + XX XXXXXXXXXX + gettext('Older Posts') XXXXXX + XXXX + XXXXX + BBBBB + XXXXX + BBBBB +XXXXXXXXXX +BBBBBBBB +BBBBBBBBBBBB \ No newline at end of file diff --git a/cms_templates/gallery.html.py b/cms_templates/gallery.html.py new file mode 100644 index 00000000..d15a45ce --- /dev/null +++ b/cms_templates/gallery.html.py @@ -0,0 +1,19 @@ +BBBB BBBBBBBBB +XXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXX + XXXX XXXXXXXXXX XXXXXXX XXXXXXX XXX XXXXXX XXX + XXXX XXXXXXXXXXXXXXXXXXXXXXX + BBB BBBBB BB BBBBBBBBBBBBBBBBBBBBBBBBB + XXXX XXXXXXXXXXX BB BBBBBBBBBBBBB XXXXXX BBBBB XX + XXXX XXXXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXX XXXXXXX + XXXXXX + BBBBBB + XXXXXX + + XXXX XXXXXXXX XXX + XX XXXXXXXXXXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXX + XXXXX XXXXXXXXXXXXXXXXXXXXXXXXX + XXXX + XX XXXXXXXXXXXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXX + XXXXX XXXXXXXXXXXXXXXXXXXXXXXXX + XXXX +XXXXXX diff --git a/cms_templates/home_digitalglarus.html.py b/cms_templates/home_digitalglarus.html.py new file mode 100644 index 00000000..3f188d17 --- /dev/null +++ b/cms_templates/home_digitalglarus.html.py @@ -0,0 +1,79 @@ +BBBBBBB BBBBBBBBBBBBBBBBBB +BBBB BBBBBBBBBBB BBBBBBBB + +BBBBB BBBBBBB + +XXXX XXXXXXXXXXXX + XXXX XXXXXXXXXXXX + BBBBBBBBBBB BBBBBBBBBBBBBBBBBBBBBBB + XXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXX + XXX XXXXXXXXXXXXXXXXXXXXX + XXXXXXXXXXXXXX XXXXXXXXXX + XXXXX + XXX XXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXX + XXX XXXXXXXXXXXXXXXXXXXXXXXX + XXXX + XXXXXXXXX + XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX + XXXXXXXX + XXXXX + XXXXXX + XXXXXX +XXXXXX + +XXXX XXXXXXXXXXXX + XXXX XXXXXXXXXXXX + XXXX XXXXXXXXXXXXXXXXXX + XXXX + XXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXXX + BBBBBBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB + XXXXX + XXXX + XXXX XXXXXXXXXXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXX XXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBX XXXXXXX + XXX XXXXXXXXXXXXXXXXXXX + BBBBBBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB + XXXXXXXXXXXXX + XXXXXX + XXXXXX +XXXXXX + +XXXX XXXXXXXXXXXX + XXXX XXXXXXXXXXXX + XXXX XXXXXXXXXXXXXXXXXX + XXXX + XXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXXX + BBBBBBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBB + XXXXX + XXXX + BBBBBBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB + XXXXXX + XXXXXX +XXXXXX + +XXXX XXXXXXXXXXXX + XXXX XXXXXXXXXXXX + XXXX XXXXXXXXXXXXXXXXXX + XXXX + XXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXXX + BBBBBBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB + XXXXX + XXXX + BBBBBBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB + XXXXXX + XXXXXX +XXXXXX +XXXX XXXXXXXXXXXX + XXXX XXXXXXXXXXXX + XXXX XXXXXXXXXXXXXXXXXX + XXXX + XXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXXX + BBBBBBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBB + XXXXX + XXXX + BBBBBBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB + XXXXXXXXXXXXX + XXXXXX + XXXXXX +XXXXXX + +BBBBBBBB diff --git a/cms_templates/includes/blog_item.html.py b/cms_templates/includes/blog_item.html.py new file mode 100644 index 00000000..c81016bd --- /dev/null +++ b/cms_templates/includes/blog_item.html.py @@ -0,0 +1,33 @@ +BBBB BBBB BBBBBBBBB +BBBBBBBBBBBBBBBBBBBB BB BBBBBBBBBBBBB +XXXXXXXX XXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXXXXX + BB BBBBBBBBBBBBBBB + XXXX XXXXXXXXXXXXXXXXXXXX + BBBBBBBBB BBBBBBBBBBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB BB BBBBB + XXXX XXXXXX XXXXXX XXXXXXXXXXXXXXXXXXXXX XXXXXXXXX XX + XXXXXX + BBBBB + XXXXXXXX + XXXXXXXXX + XXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXX + XX XXXXXXBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBB BBBBBBBBB BBBBBBBBBBBBBX XXXXXXXXXXXXXXXXX XXXXXXXXXXXXXX + XXXXXXX + XXXX + XXXXXXX + + XXXXXXXX + XXXXX + XXXXXXXXX + BBBBB BBBBBBBBB + + BBBBBBBB + XXXXXXXXX + XXXX XXXXXXXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXX + XXX + FFFF + XXXX + XXXXXX + XXXX XXXXXXXXXXXXXXXXXX + XX XXXXXXXXXXXX XXXXXXBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBB BBBBBBBBBXX gettext('read more') XXXXXXXXXXX + XXXXXX +XXXXXXXXXX \ No newline at end of file diff --git a/cms_templates/includes/blog_meta.html.py b/cms_templates/includes/blog_meta.html.py new file mode 100644 index 00000000..7a22ba5a --- /dev/null +++ b/cms_templates/includes/blog_meta.html.py @@ -0,0 +1,23 @@ +BBBB BBBB BBBBBBBBB + +XXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXX + BB BBBBBBBBBBB + XXXX + gettext('by') XX XXXXXXBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBXXBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBXXXX + XXXXX + BBBBB +XXXXX +XXX XXXXXXXXXXXXXXXXXX XXXX XXXXXXXXXXXXX + BB BBBBBBBBBBBBBBBBBBBBBB + BBB BBBBBBBB BB BBBBBBBBBBBBBBBBBBB + BB BBBBBBBBBBBBB + XXX XXXXXXXXXXXXXXXXXXXX XXXXXXBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB BBBBBBBBBBBBBBBBBBBBBBX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXBB BBB BBBBBBBBBBBBX BBBBBXXXXX + BBBBB + BBBBBB + BBBBB + BB BBBBBBBBBBBBBBBB + BBB BBB BB BBBBBBBBBBBBB + XXX XXXXXXXXXXXXXXX XXXXXXBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBB BBBBBBBBBBBBX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXBB BBB BBBBBBBBBBBBX BBBBBXXXXX + BBBBBB + BBBBB +XXXXX \ No newline at end of file diff --git a/cms_templates/letscowork.html.py b/cms_templates/letscowork.html.py new file mode 100644 index 00000000..c1029913 --- /dev/null +++ b/cms_templates/letscowork.html.py @@ -0,0 +1,45 @@ +BBBBBBB BBBBBBBBBBBBBBBBBB +BBBB BBBBBBBBBBB BBBBBBBB +BBBBB BBBBBXXXXXXXXXXXXBBBBBBBB + +BBBBB BBBBBBB +XXXX XXXXXXXXXXXX + XXXX XXXXXXXXXXXX + XXXX XXXXXXXXXXXXXXXXXX + XXXXXXX XXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + XXXXXX + XXXXXX +XXXXXX + + +XXXX XXXXXXXXXXXX + XXXX XXXXXXXXXXXX + XXXX XXXXXXXXXXXXXXXXXX + XXXX + XXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXXX + BBBBBBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBB + XXXXX + XXXX + XXXXXX + XXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXX + XXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBX XXXXXXX + XXXX + BBBBBBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB + XXXXX + XXXXXX + XXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXX + XXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBX XXXXXXX + BBBBBBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB + XXXXX + XXXXXX + XXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXX + XXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBX XXXXXXX + BBBBBBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB + XXXXX + XXXXXX + XXXX XXXXXXXXXXXXXXXXXXXXXXX + XXXXXX +XXXXXX + +XXXX XXXXXXXXXXX XXX +BBBBBBBB diff --git a/cms_templates/one_column.html.py b/cms_templates/one_column.html.py new file mode 100644 index 00000000..6defbfec --- /dev/null +++ b/cms_templates/one_column.html.py @@ -0,0 +1,18 @@ +BBBBBBB BBBBBBBBBBBBBBBBBB +BBBB BBBBBBBBBBB BBBBBBBB +BBBBB BBBBBXXXXXBBBBBBBB + +BBBBB BBBBBBB +XXXX XXXXXXXXXXXX + XXXX XXXXXXXXXXXX + XXXX XXXXXXXXXXXXXXXXXX + BBBBBBBBBBB BBBBBBBBBBBBBBBBBBBBBB + XXXXXX + XXXX XXXXXXXXXXXXXXXXXXXXXXX + XXXXXX +XXXXXX + +XXXXXX +XXXX XXXXXXXXXXX XXX + +BBBBBBBB diff --git a/cms_templates/supporters_plugin.html.py b/cms_templates/supporters_plugin.html.py new file mode 100644 index 00000000..22be0df9 --- /dev/null +++ b/cms_templates/supporters_plugin.html.py @@ -0,0 +1,8 @@ +XXXX XXXXXXXXXXXX + BBB BBBBBBBBB BB BBBBBBBBBBBBBB + XXXX XXXXXXXXXXXXXXXXXX + XXX XXXXXXXXXXXXXXXXXXXXXXXXX + XX XXXXXXXXXXXXXXXXXXXXXXXX + XXXXXX + BBBBBB +XXXXXX diff --git a/cms_templates/two_columns.html.py b/cms_templates/two_columns.html.py new file mode 100644 index 00000000..68743c8c --- /dev/null +++ b/cms_templates/two_columns.html.py @@ -0,0 +1,21 @@ +BBBBBBB BBBBBBBBBBBBBBBBBB +BBBB BBBBBBBBBBB BBBBBBBB +BBBBB BBBBBXXXXXBBBBBBBB + +BBBBB BBBBBBB +XXXX XXXXXXXXXXXX + XXXX XXXXXXXXXXXX + XXXX XXXXXXXXXXXXXXXXX + BBBBBBBBBBB BBBBBBBBBBBBBBB + XXXXXX + XXXX XXXXXXXXXXXXXXXXX + BBBBBBBBBBB BBBBBBBBBBBBBBB + XXXXXX + XXXX XXXXXXXXXXXXXXXXXXXXXXX + XXXXXX +XXXXXX + +XXXXXX +XXXX XXXXXXXXXXX XXX + +BBBBBBBB diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.mo b/datacenterlight/locale/de/LC_MESSAGES/django.mo index 10bfb438de912becfc97f343f0130bbd3e170fa4..8f4d30cd34bb8896e79ae7ba48b8cf312815cf33 100644 GIT binary patch delta 1086 zcmZwFOK1~87{KvKnx;)^A6Dz5_AzO#R4py(LqX8ms(2Mz_f&`OJxT89zbf%Ui^2k{V&-~pV&Fn-1o{EB7x9gku#q*NS_ zV-;qRUsm1Zx`u@rjN${d@EJz1uDGzi4QH9hQ35QjuD``<=F2FFe!~GQCL4Kw2<87z z;uai7iIc@n;;ZWnq~h1uhF|az))GY?TtKO038jK}IK?hSN(%wgL}_9D8t%mBcnUw@ z2zK!&4Am{Ya27HCGRqt^xe!^~Su25<}p2jygi^NuEi7uva z2rnQTlTTj05jmC^UH*G5U79?A-&p5H%m9Q5m>C*AtdpdXJR!S-Y zHUCSo-@hMi@w*}){if){s=rh87o+Wdr0ia0zi~a2N*R6Lco)4`?nzlF*qKVXo}NhS iX>-oenWXC)t5^4p*_M?wj?rn$1xpYAk<`<2EAR`S8=GnX delta 896 zcmXZaO=uHA6u|Mf&GsWr8f#7bHk|}}(8g+_APC}TD`*uI@e5Sam^2#AV!BckAznle zBE`i@@uG){A}G3`2=-JhNb&5gf(KC#dhq1U|J&q|+271&cHf(w`Pe&|tS|J~_k~E& zR@2s6A{#N&!iD&O>+vVXF&+{b#C5m_9qd3K+weWM<19vS9{1xH%wpOW;U`DAL`CXy zl1?W#N*Ke-Sj8I{#y>cP|4?7-wKnEI#2&^^a0$M{A^eQ`T%2l1AW2+>{iu2NVGfUA zhWv7q&NMe(Hz%ARi&kDht=Pc|U*$3OG4A5+{kR#A<5@h7Z&4E_$U;}r$Rm=$Zrp;0 zaS#Xa0ovr3IXb$6`KDhn!T2xU#xT|B_#Q6cQ>0e8MK(=v7nk8A>bw^?iXV_yNT#bX zZ!0Dl??C>NGg#kFr$T2ZKEpZuh2)S|?1wso!}tmL5W-dl1%veJg;?Amn6Jg?@iDX& zv_&+Hl?`NhQ;OB~i!7zFZNaK^tW|61>QX_kanY*v5Nc41tf5hB5c-MrAnKXW;J5^< z)xFn)ty?0yN+qXuExPC^`6_; z{aouE%m3Y0v)VVAY<62V=Z|*8ENi#d9qIF4hQCD*\n" "Language-Team: LANGUAGE \n" @@ -18,6 +18,20 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: templates/datacenterlight/beta_access.html:21 +msgid "Request Beta Access" +msgstr "Beantrage Beta-Zugang" + +#: templates/datacenterlight/beta_success.html:9 +#, fuzzy +#| msgid "Request Beta Access" +msgid "Request Sent" +msgstr "Anfrage verschickt" + +#: templates/datacenterlight/beta_success.html:12 +msgid "Thank you, we will contact you as soon as possible" +msgstr "Vielen Dank, wir werden Sie sobald als möglich kontaktieren." + #: templates/datacenterlight/emails/request_access_confirmation.html:99 #: templates/datacenterlight/emails/request_access_confirmation.txt:99 msgid "Thank you for your request." @@ -52,27 +66,35 @@ msgid "Thank you!" msgstr "Vielen Dank!" #: templates/datacenterlight/index.html:62 +#: templates/datacenterlight/pricing.html:62 msgid "What is it" msgstr "Was ist es?" #: templates/datacenterlight/index.html:65 #: templates/datacenterlight/index.html:171 -#: templates/datacenterlight/index.html:362 +#: templates/datacenterlight/index.html:331 +#: templates/datacenterlight/pricing.html:65 +#: templates/datacenterlight/pricing.html:188 msgid "Scale out" msgstr "Skalierung" #: templates/datacenterlight/index.html:68 #: templates/datacenterlight/index.html:197 -#: templates/datacenterlight/index.html:365 +#: templates/datacenterlight/index.html:334 +#: templates/datacenterlight/pricing.html:68 +#: templates/datacenterlight/pricing.html:191 msgid "Reliable and light" msgstr "Zuverlässig und leicht" #: templates/datacenterlight/index.html:71 +#: templates/datacenterlight/pricing.html:71 msgid "Buy VM" msgstr "VM Kaufen" #: templates/datacenterlight/index.html:74 -#: templates/datacenterlight/index.html:372 +#: templates/datacenterlight/index.html:341 +#: templates/datacenterlight/pricing.html:74 +#: templates/datacenterlight/pricing.html:198 msgid "Contact" msgstr "Kontakt" @@ -89,7 +111,8 @@ msgid "I want it!" msgstr "Das will ich haben!" #: templates/datacenterlight/index.html:142 -#: templates/datacenterlight/index.html:359 +#: templates/datacenterlight/index.html:328 +#: templates/datacenterlight/pricing.html:185 msgid "How it works" msgstr "Wie es funktioniert" @@ -132,6 +155,7 @@ msgstr "" "Angebot ist aufgrund unserer leichten Infrastruktur überaus kostengünstig." #: templates/datacenterlight/index.html:218 +#: templates/datacenterlight/pricing.html:101 msgid "We are cutting down the costs significantly!" msgstr "Wir sorgen dafür, dass die Kosten für Sie signifikant abnehmen" @@ -143,60 +167,70 @@ msgstr "Bezahlbares VM Hosting in der Schweiz" msgid "More Info" msgstr "Weitere Informationen" -#: templates/datacenterlight/index.html:226 +#: templates/datacenterlight/index.html:227 +#: templates/datacenterlight/pricing.html:114 msgid "VM hosting" msgstr "" -#: templates/datacenterlight/index.html:233 +#: templates/datacenterlight/index.html:234 msgid "Based in Switzerland" msgstr "Standort des Datacenters ist in der Schweiz" -#: templates/datacenterlight/index.html:242 -msgid "15 GiB storage(SSD)" -msgstr "" +#: templates/datacenterlight/index.html:243 +msgid "15 GB Storage (SSD)" +msgstr "15 GB Storage (SSD)" -#: templates/datacenterlight/index.html:245 -msgid "Buy Now!" -msgstr "Kaufe jetzt!" +#: templates/datacenterlight/index.html:246 +#: templates/datacenterlight/pricing.html:156 +msgid "Order Now!" +msgstr "Bestelle jetzt!" -#: templates/datacenterlight/index.html:259 -msgid "I want to try!" -msgstr "Das möchte ich haben" - -#: templates/datacenterlight/index.html:281 -msgid "Request Beta Access" -msgstr "Beantrage Beta-Zugang" +#: templates/datacenterlight/index.html:262 +msgid "Want to know more? Subscribe to our newsletter!" +msgstr "Willst du mehr wissen? Abonniere unseren Newsletter!" #: templates/datacenterlight/index.html:289 -#, fuzzy -#| msgid "Request Beta Access" -msgid "Request Sent" -msgstr "Anfrage verschickt" - -#: templates/datacenterlight/index.html:292 -msgid "Thank you, we will contact you as soon as possible" -msgstr "Vielen Dank, wir werden Sie sobald als möglich kontaktieren." - -#: templates/datacenterlight/index.html:320 msgid "Switzerland " msgstr "Schweiz" -#: templates/datacenterlight/index.html:337 +#: templates/datacenterlight/index.html:306 msgid "Questions?" msgstr "Fragen?" -#: templates/datacenterlight/index.html:337 +#: templates/datacenterlight/index.html:306 msgid "Contact us!" msgstr "Kontaktiere uns!" -#: templates/datacenterlight/index.html:355 +#: templates/datacenterlight/index.html:324 +#: templates/datacenterlight/pricing.html:181 msgid "Home" msgstr "Home" -#: templates/datacenterlight/index.html:368 +#: templates/datacenterlight/index.html:337 +#: templates/datacenterlight/pricing.html:194 msgid "Pricing" msgstr "Preise" +#: templates/datacenterlight/pricing.html:122 +#, fuzzy +#| msgid "Based in Switzerland" +msgid "Hosted in Switzerland" +msgstr "Standort des Datacenters ist in der Schweiz" + +#: templates/datacenterlight/pricing.html:136 +msgid "GB Storage (SSD)" +msgstr "GB Storage (SSD)" + +#: templates/datacenterlight/pricing.html:163 +msgid "Simple and affordable: Try our virtual machine with featherlight price." +msgstr "" + +#~ msgid "Buy Now!" +#~ msgstr "Kaufe jetzt!" + +#~ msgid "I want to try!" +#~ msgstr "Das möchte ich haben" + #~ msgid "How it works:" #~ msgstr "Warum können wir diese Leistung so günstig anbieten:" diff --git a/datacenterlight/static/datacenterlight/css/landing-page.css b/datacenterlight/static/datacenterlight/css/landing-page.css index 33e563ba..064003b4 100755 --- a/datacenterlight/static/datacenterlight/css/landing-page.css +++ b/datacenterlight/static/datacenterlight/css/landing-page.css @@ -123,7 +123,6 @@ h6 { } .navbar-transparent .navbar-nav>li>a { color: #fff; - font-size: 17px; cursor: pointer; } .navbar-transparent .navbar-nav>li>a:hover { @@ -139,6 +138,12 @@ h6 { .navbar-right { margin-right: 0px; } +.navbar-default .btn-link { + color: #fff; +} +.navbar-default .btn-link:hover { + color: #fff !important; +} .intro-header { height: 100vh; text-align: center; @@ -344,6 +349,13 @@ h6 { box-shadow: 0 10px 20px rgba(0,0,0,0.19), 0 6px 6px rgba(0,0,0,0.23); padding-bottom: 40px; border-radius: 7px; + position: relative; +} +.pricing-section .card .img-beta{ + position: absolute; + top: 5px; + width: 60px; + left: 3px; } .pricing-section .card .title{ padding: 15px 40px; @@ -403,7 +415,7 @@ h6 { } .request-section .title h2{ font-family: 'Montserrat-Bold'; - font-size: 65px; + font-size: 45px; margin: 0; color: #fff; padding-bottom: 25px; @@ -551,6 +563,13 @@ h6 { text-align: center; /* margin-right: auto; */ max-width: 400px; + position: relative; +} +.price-calc-section .card .img-beta{ + position: absolute; + top: 5px; + width: 60px; + left: 3px; } .price-calc-section .card .title{ padding: 15px 40px; diff --git a/datacenterlight/static/datacenterlight/js/main.js b/datacenterlight/static/datacenterlight/js/main.js index 525dce45..0b131dc4 100644 --- a/datacenterlight/static/datacenterlight/js/main.js +++ b/datacenterlight/static/datacenterlight/js/main.js @@ -9,17 +9,23 @@ 'cpu': { 'id': 'coreValue', 'value': 1, - 'limit': 48 + 'min':1, + 'max': 48, + 'interval': 1 }, 'ram': { 'id': 'ramValue', 'value': 1, - 'limit': 200 + 'min':1, + 'max': 200, + 'interval': 1 }, 'storage': { 'id': 'storageValue', - 'value': 1, - 'limit': 500 + 'value': 10, + 'min': 10, + 'max': 500, + 'interval': 10 } } $(window).load(function(){ @@ -87,15 +93,15 @@ $('.fa-minus-circle.left').click(function(event){ var data = $(this).data('minus'); - if(cardPricing[data].value > 1){ + if(cardPricing[data].value > cardPricing[data].min){ cardPricing[data].value --; } _fetchPricing(); }); $('.fa-plus-circle.right').click(function(event){ var data = $(this).data('plus'); - if(cardPricing[data].value < cardPricing[data].limit){ - cardPricing[data].value ++; + if(cardPricing[data].value < cardPricing[data].max){ + cardPricing[data].value = cardPricing[data].value + cardPricing[data].interval; } _fetchPricing(); }); @@ -110,6 +116,7 @@ function _calcPricing(){ var total = (cardPricing['cpu'].value * 5) + (2* cardPricing['ram'].value) + (0.6* cardPricing['storage'].value) + total = parseFloat(total.toFixed(2)); $("#total").text(total); $('input[name=total]').val(total); diff --git a/datacenterlight/templates/datacenterlight/index.html b/datacenterlight/templates/datacenterlight/index.html index 531bd235..caa83eab 100755 --- a/datacenterlight/templates/datacenterlight/index.html +++ b/datacenterlight/templates/datacenterlight/index.html @@ -227,25 +227,27 @@

{% trans "VM hosting" %}

- 15CHF/month + 15 CHF/month

{% trans "Based in Switzerland" %}

-

1 core,

+

1 Core,

-

2 GiB RAM,

+

2 GB RAM,

-

{% trans "15 GiB storage(SSD)" %}

+

{% trans "15 GB Storage (SSD)" %}

{% trans "Order Now!" %} + + @@ -257,7 +259,7 @@
-

{% trans "I want to try!" %}

+

{% trans "Want to know more? Subscribe to our newsletter!" %}

diff --git a/datacenterlight/templates/datacenterlight/pricing.html b/datacenterlight/templates/datacenterlight/pricing.html index 80029f71..3c5bf6b7 100644 --- a/datacenterlight/templates/datacenterlight/pricing.html +++ b/datacenterlight/templates/datacenterlight/pricing.html @@ -105,6 +105,7 @@
+
{% csrf_token %} @@ -122,7 +123,7 @@
- 1 core + 1 Core
@@ -132,14 +133,13 @@
- 15{% trans "GiB storage(SSD)" %} + 15{% trans "GB Storage (SSD)" %}