diff --git a/Changelog b/Changelog index 7aecbec7..d3d4adee 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,10 @@ +Next release: + * #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 1.2.10: 2017-11-26 * #3843: [ungleich] Add generic ungleich CMS template * #3672: [all] Clean existing automated tests diff --git a/datacenterlight/static/datacenterlight/css/landing-page.css b/datacenterlight/static/datacenterlight/css/landing-page.css index 9b02420c..196dcda4 100755 --- a/datacenterlight/static/datacenterlight/css/landing-page.css +++ b/datacenterlight/static/datacenterlight/css/landing-page.css @@ -7,7 +7,7 @@ body, html { width: 100%; - height: 100%; + min-height: 100%; } body, diff --git a/digitalglarus/static/digitalglarus/css/agency.css b/digitalglarus/static/digitalglarus/css/agency.css index f66ce70c..4ac531c2 100755 --- a/digitalglarus/static/digitalglarus/css/agency.css +++ b/digitalglarus/static/digitalglarus/css/agency.css @@ -67,7 +67,7 @@ h6 { font-size: 18px; } -@media only screen and (max-width: 400px){ +@media only screen and (max-width: 400px){ h1, h2 { font-size: 20px; } @@ -404,8 +404,8 @@ section h3.section-subheading { @media(min-width:768px) { section { padding: 50px 0; - } -} + } +} */ .service-heading { margin: 15px 0; @@ -416,7 +416,7 @@ section h3.section-subheading { .no-padding { padding:0; -} +} .no-gutter > [class*='col-'] { padding-top:0; @@ -964,40 +964,6 @@ section h3.section-comment { color: #494949; } -small-comment { - font-family: "Open Sans", "Droid Serif", "Helvetica Neue", Helvetica, Arial, sans-serif; - margin-bottom: none; - font-transform: none; - font-size:10px; - font-weight:400; - color: #777 -} - -logo-image { - z-index: 100; - position: absolute; - left: 0; - width: 80px; - height: 80px; - margin-left: 0; - border: 7px solid #f1f1f1; - border-radius: 100%; - text-align: center; - color: #fff; - background-color: #a1cfd7; -} - - -intro-cap { - margin-bottom: 25px; - text-transform: uppercase; - font-family: 'Raleway', "Helvetica Neue", "Helvetica Neue", Helvetica,Arial,sans-serif; - font-size: 24px; - font-weight: 400; - line-height: 50px; - color:#fff - background-color: #a1cfd7; -} .intro-small { font-family: 'Montserrat' ,'Raleway', "Open Sans Bold", Helvetica, Arial, "Arial Bold", sans-serif; font-size: 20px; @@ -1006,26 +972,7 @@ intro-cap { text-transform: uppercase; color: #FFF; } -intro-headline { - margin-bottom: 25px; - text-transform: uppercase; - font-family: 'Raleway', "Helvetica Neue", "Helvetica Neue", Helvetica,Arial,sans-serif; - font-size: 24px; - font-weight: 400; - line-height: 100px; - color:#fff - background-color: #a1cfd7; -} -h6 intro-smallcap { - margin-bottom: 25px; - text-transform: none; - font-family:'Raleway' , Montserrat,"Helvetica Neue",Helvetica,Arial,sans-serif; - font-size: 18px; - font-weight: 400; - line-height: 50px; - color:#fff - background-color: #a1cfd7; -} + .darkened-container { /* Fallback for web browsers that doesn't support RGBa */ background: rgb(0, 0, 0); @@ -1043,7 +990,7 @@ h6 intro-smallcap { font-size: 14px; line-height: 1.43; height: 86px; /* this is wrong */ - /*color: #484848;*/ + /*color: #484848;*/ } .carousel-indicators li { @@ -1143,7 +1090,7 @@ body { .carousel-control { height: 100%; - + } /* Background images are set within the HTML using inline CSS, not here */ @@ -1231,7 +1178,7 @@ hr { padding-top: 2em; } -.donate { +.donate { font-weight: 600; font-size: 24px; } diff --git a/digitalglarus/static/digitalglarus/css/agency1.css b/digitalglarus/static/digitalglarus/css/agency1.css index 67154295..6178630c 100755 --- a/digitalglarus/static/digitalglarus/css/agency1.css +++ b/digitalglarus/static/digitalglarus/css/agency1.css @@ -400,8 +400,8 @@ section h3.section-subheading { @media(min-width:768px) { section { padding: 50px 0; - } -} + } +} */ .service-heading { margin: 15px 0; @@ -412,7 +412,7 @@ section h3.section-subheading { .no-padding { padding:0; -} +} .no-gutter > [class*='col-'] { padding-top:0; @@ -960,40 +960,6 @@ section h3.section-comment { color: #494949; } -small-comment { - font-family: "Open Sans", "Droid Serif", "Helvetica Neue", Helvetica, Arial, sans-serif; - margin-bottom: none; - font-transform: none; - font-size:10px; - font-weight:400; - color: #777 -} - -logo-image { - z-index: 100; - position: absolute; - left: 0; - width: 80px; - height: 80px; - margin-left: 0; - border: 7px solid #f1f1f1; - border-radius: 100%; - text-align: center; - color: #fff; - background-color: #a1cfd7; -} - - -intro-cap { - margin-bottom: 25px; - text-transform: uppercase; - font-family: 'Raleway', "Helvetica Neue", "Helvetica Neue", Helvetica,Arial,sans-serif; - font-size: 24px; - font-weight: 400; - line-height: 50px; - color:#fff - background-color: #a1cfd7; -} .intro-small { font-family: 'Montserrat' ,'Raleway', "Open Sans Bold", Helvetica, Arial, "Arial Bold", sans-serif; font-size: 20px; @@ -1002,26 +968,7 @@ intro-cap { text-transform: uppercase; color: #FFF; } -intro-headline { - margin-bottom: 25px; - text-transform: uppercase; - font-family: 'Raleway', "Helvetica Neue", "Helvetica Neue", Helvetica,Arial,sans-serif; - font-size: 24px; - font-weight: 400; - line-height: 100px; - color:#fff - background-color: #a1cfd7; -} -h6 intro-smallcap { - margin-bottom: 25px; - text-transform: none; - font-family:'Raleway' , Montserrat,"Helvetica Neue",Helvetica,Arial,sans-serif; - font-size: 18px; - font-weight: 400; - line-height: 50px; - color:#fff - background-color: #a1cfd7; -} + .darkened-container { /* Fallback for web browsers that doesn't support RGBa */ background: rgb(0, 0, 0); @@ -1039,7 +986,7 @@ h6 intro-smallcap { font-size: 14px; line-height: 1.43; height: 86px; /* this is wrong */ - /*color: #484848;*/ + /*color: #484848;*/ } .carousel-indicators li { @@ -1139,7 +1086,7 @@ body { .carousel-control { height: 100%; - + } /* Background images are set within the HTML using inline CSS, not here */ diff --git a/digitalglarus/static/digitalglarus/css/ungleich.css b/digitalglarus/static/digitalglarus/css/ungleich.css index 03a2b47c..8c8cd257 100644 --- a/digitalglarus/static/digitalglarus/css/ungleich.css +++ b/digitalglarus/static/digitalglarus/css/ungleich.css @@ -10,17 +10,13 @@ .intro-cap { font-family: 'Raleway', 'Helvetica Neue', 'Open Sans Bold', Helvetica, Arial, 'Arial Bold', sans-serif; - font-size: 26px; + font-size: 24px; font-style: normal; font-weight: 200; text-transform: uppercase; color: #FFF; } -.intro-cap { - font-size: 24px; -} - .intro-smallcap { font-family: 'Raleway' , "Open Sans Bold", Helvetica, Arial, "Arial Bold", sans-serif; font-size: 22px; diff --git a/dynamicweb/settings/base.py b/dynamicweb/settings/base.py index 19c263d5..67734052 100644 --- a/dynamicweb/settings/base.py +++ b/dynamicweb/settings/base.py @@ -573,27 +573,47 @@ if DCL_ERROR_EMAILS_TO is not None: if 'info@ungleich.ch' not in DCL_ERROR_EMAILS_TO_LIST: DCL_ERROR_EMAILS_TO_LIST.append('info@ungleich.ch') -ENABLE_DEBUG_LOGGING = bool_env('ENABLE_DEBUG_LOGGING') +ENABLE_LOGGING = bool_env('ENABLE_LOGGING') +MODULES_TO_LOG = env('MODULES_TO_LOG') +LOG_LEVEL = env('LOG_LEVEL') -if ENABLE_DEBUG_LOGGING: +if LOG_LEVEL is None: + LOG_LEVEL = 'DEBUG' + +if ENABLE_LOGGING: + loggers_dict = {} + handlers_dict = {} + if MODULES_TO_LOG is None: + # set MODULES_TO_LOG to django, if it is not set + MODULES_TO_LOG = 'django' + modules_to_log_list = MODULES_TO_LOG.split(',') + for custom_module in modules_to_log_list: + logger_item = { + custom_module: { + 'handlers': ['custom_file'], + 'level': LOG_LEVEL, + 'propagate': True + } + } + loggers_dict.update(logger_item) + + custom_handler_item = { + 'custom_file': { + 'level': LOG_LEVEL, + 'class': 'logging.FileHandler', + 'filename': + "{PROJECT_DIR}/{LEVEL}.log".format( + LEVEL=LOG_LEVEL.lower(), + PROJECT_DIR=PROJECT_DIR + ) + } + } + handlers_dict.update(custom_handler_item) LOGGING = { 'version': 1, 'disable_existing_loggers': False, - 'handlers': { - 'file': { - 'level': 'DEBUG', - 'class': 'logging.FileHandler', - 'filename': "{PROJECT_DIR}/debug.log".format( - PROJECT_DIR=PROJECT_DIR), - }, - }, - 'loggers': { - 'django': { - 'handlers': ['file'], - 'level': 'DEBUG', - 'propagate': True, - }, - }, + 'handlers': handlers_dict, + 'loggers': loggers_dict } TEST_MANAGE_SSH_KEY_PUBKEY = env('TEST_MANAGE_SSH_KEY_PUBKEY') diff --git a/opennebula_api/models.py b/opennebula_api/models.py index 33812c52..d9b0b6c2 100644 --- a/opennebula_api/models.py +++ b/opennebula_api/models.py @@ -301,12 +301,14 @@ class OpenNebulaManager(): """ - vm_id = self.client.call(oca.VmTemplate.METHODS['instantiate'], - template.id, - '', - True, - vm_specs, - False) + try: + vm_id = self.client.call( + oca.VmTemplate.METHODS['instantiate'], template.id, '', True, + vm_specs, False + ) + except OpenNebulaException as err: + logger.error("OpenNebulaException: {0}".format(err)) + return None self.oneadmin_client.call( oca.VirtualMachine.METHODS['action'], diff --git a/ungleich_page/locale/de/LC_MESSAGES/django.po b/ungleich_page/locale/de/LC_MESSAGES/django.po index c4d9510a..873bb0df 100644 --- a/ungleich_page/locale/de/LC_MESSAGES/django.po +++ b/ungleich_page/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-11-06 00:24+0530\n" +"POT-Creation-Date: 2017-11-26 00:34+0530\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -102,6 +102,15 @@ msgstr "" "ungleich startet das Projekt AlpLora, mit dem Tiere via LoRaWAN geortet werden können" +msgid "ungleich starts to give basic computer courses for refugees." +msgstr "ungleich bietet einen PC-Grundkurs für Flüchtlinge an." + +msgid "" +"ungleich starts computer learning club for locals, \"Digitale Building " +"ungleich.\"" +msgstr "" +"ungleich gründet den Verein Digitale Bildung ungleich für Ortsansässige." + msgid "" "ungleich sells Alplora to an IoT " "startup in canton Zürich." diff --git a/ungleich_page/static/ungleich_page/css/agency.css b/ungleich_page/static/ungleich_page/css/agency.css index 8e6f4155..1a27a4e1 100755 --- a/ungleich_page/static/ungleich_page/css/agency.css +++ b/ungleich_page/static/ungleich_page/css/agency.css @@ -4,9 +4,21 @@ * For details, see http://www.apache.org/licenses/LICENSE-2.0. */ +html { + overflow-x: hidden; +} + body { overflow-x: hidden; - font-family: "Ralesay" , "Helvetica Neue",Helvetica,Arial,sans-serif; + font-family: "Helvetica Neue",Helvetica,Arial,sans-serif; +} + +.row-eq-height { + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + flex-wrap: wrap; } .text-muted { @@ -198,8 +210,8 @@ fieldset[disabled] .btn-xl.active { } .navbar-default .navbar-toggle { - border-color: #fed136; - background-color: #fed136; + /*border-color: #fed136; + background-color: #fed136;*/ } .navbar-default .navbar-toggle .icon-bar { @@ -237,6 +249,10 @@ fieldset[disabled] .btn-xl.active { background-color: #fec503; } +.navbar-default .navbar-brand { + padding: 12px; +} + @media(min-width:768px) { .navbar-default { padding: 25px 0; @@ -263,23 +279,19 @@ fieldset[disabled] .btn-xl.active { background-color: #222; } - .navbar-default.navbar-shrink .navbar-brand { - font-size: 1.5em; + .navbar-default .navbar-brand { padding: 8px; } } +.navbar-default .navbar-brand > img { + height: 100%; +} + header { text-align: center; color: #fff; - background-attachment: scroll; - background-image: url(../img/header-bg.jpg); - background-position: center center; - background-repeat: none; - -webkit-background-size: cover; - -moz-background-size: cover; - background-size: cover; - -o-background-size: cover; + background: rgba(0,0,0,0.25); } header .intro-text { @@ -329,29 +341,42 @@ header .intro-text .intro-heading { } section { - padding: 100px 0; + padding: 75px 0; +} + +@media(max-width:767px) { + section { + padding: 50px 0; + } } section h2.section-heading { margin-top: 0; margin-bottom: 15px; - font-size: 40px; + font-size: 26px; color: #494949; } section h3.section-subheading { - margin-bottom: 75px; + margin-bottom: 50px; text-transform: none; font-family: 'Raleway', "Helvetica Neue", "Open Sans", "Droid Serif", Helvetica, Arial, sans-serif; - font-size: 18px; + font-size: 16px; font-weight: 400; color: #494949; - line-height: normal; + line-height: 1.4; } @media(min-width:768px) { section { - padding: 150px 0; + padding: 125px 0; + } + section h2.section-heading { + font-size: 40px; + } + section h3.section-subheading { + font-size: 18px; + margin-bottom: 75px; } } @@ -418,7 +443,7 @@ section h3.section-subheading { } #portfolio .portfolio-item .portfolio-caption h4 { - margin: 0; + margin: 0 0 17px; text-transform: none; color: #494949; } @@ -437,7 +462,7 @@ section h3.section-subheading { display: inline-block } -@media(min-width:767px) { +@media(min-width:768px) { #portfolio .portfolio-item { margin: 0 0 30px; } @@ -547,6 +572,10 @@ section h3.section-subheading { color: inherit; } +.timeline .timeline-heading h4 { + margin-bottom: 7px; +} + .timeline .timeline-heading h4.subheading { text-transform: none; } @@ -562,14 +591,14 @@ section h3.section-subheading { } .timeline>li { - margin-bottom: 100px; + margin-bottom: 75px; min-height: 100px; } .timeline>li .timeline-panel { float: left; width: 41%; - padding: 0 20px 20px 30px; + padding: 0 20px 20px; text-align: right; } @@ -588,7 +617,7 @@ section h3.section-subheading { .timeline>li.timeline-inverted>.timeline-panel { float: right; - padding: 0 30px 20px 20px; + padding: 0 20px 20px; text-align: left; } } @@ -599,7 +628,7 @@ section h3.section-subheading { } .timeline>li .timeline-panel { - padding: 0 20px 20px; + padding: 10px 20px 20px; } .timeline>li .timeline-image { @@ -615,7 +644,7 @@ section h3.section-subheading { } .timeline>li.timeline-inverted>.timeline-panel { - padding: 0 20px 20px; + padding: 10px 20px 20px; } } @@ -625,7 +654,7 @@ section h3.section-subheading { } .timeline>li .timeline-panel { - padding: 0 20px 20px 100px; + padding: 10px 20px 20px 100px; } .timeline>li .timeline-image { @@ -644,7 +673,7 @@ section h3.section-subheading { } .team-member { - margin-bottom: 50px; + margin-bottom: 25px; text-align: center; } @@ -654,11 +683,27 @@ section h3.section-subheading { } .team-member h4 { - margin-top: 25px; - margin-bottom: 0; + margin-top: 10px; + margin-bottom: 10px; text-transform: none; } +@media(max-width:767px) { + .team-member .team-member-caption p { + line-height: 1.5; + } +} + +@media(min-width:768px) { + .team-member { + margin-bottom: 50px; + } + .team-member h4 { + margin-top: 20px; + margin-bottom: 20px; + } +} + .team-member p { margin-top: 0; } @@ -668,15 +713,33 @@ aside.clients img { } section#contact { - background-color: #222; - background-image: url(../img/map-image.png); - background-position: center; - background-repeat: no-repeat; + position: relative; + background: rgba(0,0,0,0.75); +} + +section#contact .bg_img { + filter: blur(1px); +} + +section#contact a { + color: #79bcf7; } section#contact .section-heading { color: #fff; - font-size: 36px; + font-size: 32px; +} + +@media(max-width:767px) { + aside.clients img { + margin: 20px auto; + } + section#contact .section-heading { + font-size: 26px; + } + section#contact .intro-smallcap { + font-size: 18px; + } } section#contact .form-group { @@ -890,61 +953,15 @@ section h3.section-comment { color: #494949; } -small-comment { - font-family: "Open Sans", "Droid Serif", "Helvetica Neue", Helvetica, Arial, sans-serif; - margin-bottom: none; - font-transform: none; - font-size:10px; - font-weight:400; - color: #777 -} - -logo-image { - z-index: 100; - position: absolute; - left: 0; - width: 80px; - height: 80px; - margin-left: 0; - border: 7px solid #f1f1f1; - border-radius: 100%; - text-align: center; - color: #fff; - background-color: #fed136; -} - - -intro-cap { - margin-bottom: 25px; - text-transform: uppercase; - font-family: 'Raleway', "Helvetica Neue", "Helvetica Neue", Helvetica,Arial,sans-serif; - font-size: 24px; - font-weight: 400; - line-height: 50px; - color:#fff - background-color: #fed136; -} -h6 intro-smallcap { - margin-bottom: 25px; - text-transform: none; - font-family:'Raleway' , Montserrat,"Helvetica Neue",Helvetica,Arial,sans-serif; - font-size: 18px; - font-weight: 400; - line-height: 50px; - color:#fff - background-color: #fed136; -} - - .carousel-indicators li.active, .text-carousel .carousel-indicators li.active { - width: 15px; - height: 15px; border: 0; background-color: #fed136; } -@media (min-width: 740px) -.carousel-inner, .text-carousel .carousel-inner { - min-height: 225px; + +@media (min-width: 740px) { + .carousel-inner, .text-carousel .carousel-inner { + min-height: 225px; + } } .carousel-text { @@ -952,7 +969,16 @@ h6 intro-smallcap { font-family:'Raleway' , Montserrat,"Helvetica Neue",Helvetica,Arial,sans-serif; font-size : 20px; font-weight : 100; - lign-heignt: 2px; color : #666; text-align : center; } + +@media (max-width: 767px) { + .carousel-text { + height: 220px; + overflow: scroll; + } + .carousel-author { + height: 72px; + } +} \ No newline at end of file diff --git a/ungleich_page/static/ungleich_page/css/ungleich.css b/ungleich_page/static/ungleich_page/css/ungleich.css index b3296ca1..e2984c07 100644 --- a/ungleich_page/static/ungleich_page/css/ungleich.css +++ b/ungleich_page/static/ungleich_page/css/ungleich.css @@ -1,3 +1,17 @@ +.btn-trans { + color: #fff; + border: 2px solid #fff; + padding: 4px 18px; + letter-spacing: 0.6px; +} + +.btn-trans:focus, +.btn-trans:active, +.btn-trans:hover { + background: #fff; + color: #333; +} + #page-top #services .container .row .col-lg-12.text-center .section-heading { font-style: normal; color: #494949; @@ -19,18 +33,16 @@ } .intro-cap { + margin-top: 25px; + margin-bottom: 15px; font-family: 'Raleway', 'Helvetica Neue', 'Open Sans Bold', Helvetica, Arial, 'Arial Bold', sans-serif; - font-size: 26px; + font-size: 24px; font-style: normal; font-weight: 200; text-transform: uppercase; color: #FFF; } -.intro-cap { - font-size: 24px; -} - .intro-smallcap { font-family: 'Raleway' , "Open Sans Bold", Helvetica, Arial, "Arial Bold", sans-serif; font-size: 22px; @@ -90,12 +102,11 @@ #portfolio .portfolio-item .portfolio-caption { height: 250px; overflow: hidden; - paddding: 10px; } .img-client { margin: 30px auto 30px auto; - height: 64px !important; + max-height: 64px !important; } .team-member .team-member-caption { @@ -119,30 +130,138 @@ #portfolio .portfolio-item .portfolio-caption { height: auto; overflow: hidden; - paddding: 10px; } } -.header_slider { - height: 100vh; +@media (max-width: 767px) { + .intro-smallcap.sm_left, + .section-heading.sm_left, + .section-subheading.sm_left { + padding-left: 15px; + padding-right: 15px; + } } -.header_slider > .carousel { +.header_slider { + height: 95vh; +} + +.header_slider > .carousel, +.header_slider > .carousel .carousel-inner, +.header_slider > .carousel .item { + height: 100%; +} + +.header_slider .carousel-indicators li.active { + background-color: #ffffff; +} + +.header_slider .carousel-control { + display: none; +} + +.header_slider .carousel-control .fa { + font-size: 2em; + position: absolute; + top: 50%; + margin-top: -50px; +} + +.header_slider > .carousel .item .container { + overflow: auto; + padding: 50px 20px 60px; + height: 100%; display: flex; flex-direction: column; + justify-content: flex-end; +} + +.header_slider .intro-cap { + text-align: right; + line-height: 1.1; + font-size: 23px; + margin-bottom: 12px; +} + +.header_slider .btn-trans { + align-self: flex-end; + z-index: 2; + position: relative; +} + +@media (min-width: 768px) { + .header_slider .intro-cap { + font-size: 2.25em; + margin-bottom: 20px; + } + .header_slider .carousel-control { + width: 50px; + display: block; + } + .header_slider .carousel-control .fa-angle-left { + left: 25px; + } + .header_slider .carousel-control .fa-angle-right { + right: 25px; + } + .header_slider .carousel-control .fa { + font-size: 4em; + } + .header_slider > .carousel .item .container { + overflow: auto; + padding: 75px 50px; + } +} + +@media (min-width: 992px) { + .header_slider .intro-cap { + font-size: 3.25em; + } +} + +.header_slider .intro_lead { + color: #fff; + font-size: 1.55em; + text-align: right; + line-height: 1.4; + margin-bottom: 20px; +} + +@media (max-width: 768px) { + .header_slider .intro_lead { + font-size: 1.1em; + margin-bottom: 15px; + } + + .header_slider .carousel-indicators li { + margin: 1px 7px; + width: 16px; + height: 16px; + } + .header_slider .carousel-indicators li.active { + margin: 0 7px; + width: 18px; + height: 18px; + } +} + +.bg_img { + position: absolute; + top: 0; + left: 0; + z-index: -1; + width: 100%; height: 100%; - align-items: stretch; + background-size: cover; + background-position: center; } -.header_slider > .carousel .item { - padding-top: 150px; -} - - .timeline>li .timeline-panel { display: flex; + flex-direction: column; min-height: 80px; - align-items: center; + align-items: stretch; + justify-content: center; padding-bottom: 15px; } @@ -158,6 +277,12 @@ padding-bottom: 0; } +@media (max-width: 767px) { + .sm_left { + text-align: left !important; + } +} + @media (min-width: 768px) and (max-width: 991px) { .timeline>li .timeline-panel { @@ -167,7 +292,12 @@ @media (min-width: 992px) { .timeline>li .timeline-panel { - min-height: 170px; + min-height: 150px; } } +@media (min-width: 1200px) { + .timeline>li .timeline-panel { + min-height: 170px; + } +} \ No newline at end of file diff --git a/ungleich_page/static/ungleich_page/img/about/2.jpg b/ungleich_page/static/ungleich_page/img/about/2.jpg deleted file mode 100644 index 7c006dd0..00000000 Binary files a/ungleich_page/static/ungleich_page/img/about/2.jpg and /dev/null differ diff --git a/ungleich_page/static/ungleich_page/img/about/1.jpg b/ungleich_page/static/ungleich_page/img/about/2000.jpg similarity index 100% rename from ungleich_page/static/ungleich_page/img/about/1.jpg rename to ungleich_page/static/ungleich_page/img/about/2000.jpg diff --git a/ungleich_page/static/ungleich_page/img/about/2013.jpg b/ungleich_page/static/ungleich_page/img/about/2013.jpg new file mode 100644 index 00000000..b5e0bc80 Binary files /dev/null and b/ungleich_page/static/ungleich_page/img/about/2013.jpg differ diff --git a/ungleich_page/static/ungleich_page/img/about/2014.jpg b/ungleich_page/static/ungleich_page/img/about/2014.jpg new file mode 100644 index 00000000..b274040c Binary files /dev/null and b/ungleich_page/static/ungleich_page/img/about/2014.jpg differ diff --git a/ungleich_page/static/ungleich_page/img/about/2015.jpg b/ungleich_page/static/ungleich_page/img/about/2015.jpg new file mode 100644 index 00000000..4d65fe7f Binary files /dev/null and b/ungleich_page/static/ungleich_page/img/about/2015.jpg differ diff --git a/ungleich_page/static/ungleich_page/img/about/2016a.jpg b/ungleich_page/static/ungleich_page/img/about/2016a.jpg new file mode 100644 index 00000000..4a1248bd Binary files /dev/null and b/ungleich_page/static/ungleich_page/img/about/2016a.jpg differ diff --git a/ungleich_page/static/ungleich_page/img/about/7.png b/ungleich_page/static/ungleich_page/img/about/2016a.png similarity index 100% rename from ungleich_page/static/ungleich_page/img/about/7.png rename to ungleich_page/static/ungleich_page/img/about/2016a.png diff --git a/ungleich_page/static/ungleich_page/img/about/2016b.jpg b/ungleich_page/static/ungleich_page/img/about/2016b.jpg new file mode 100644 index 00000000..8be67f0e Binary files /dev/null and b/ungleich_page/static/ungleich_page/img/about/2016b.jpg differ diff --git a/ungleich_page/static/ungleich_page/img/about/6.jpg b/ungleich_page/static/ungleich_page/img/about/2017a.jpg similarity index 100% rename from ungleich_page/static/ungleich_page/img/about/6.jpg rename to ungleich_page/static/ungleich_page/img/about/2017a.jpg diff --git a/ungleich_page/static/ungleich_page/img/about/2017b.jpg b/ungleich_page/static/ungleich_page/img/about/2017b.jpg new file mode 100644 index 00000000..f813f251 Binary files /dev/null and b/ungleich_page/static/ungleich_page/img/about/2017b.jpg differ diff --git a/ungleich_page/static/ungleich_page/img/about/8.png b/ungleich_page/static/ungleich_page/img/about/8.png deleted file mode 100644 index d7291944..00000000 Binary files a/ungleich_page/static/ungleich_page/img/about/8.png and /dev/null differ diff --git a/ungleich_page/static/ungleich_page/img/logos/CentOS.jpg b/ungleich_page/static/ungleich_page/img/logos/CentOS.jpg index acdcfa86..408b0522 100644 Binary files a/ungleich_page/static/ungleich_page/img/logos/CentOS.jpg and b/ungleich_page/static/ungleich_page/img/logos/CentOS.jpg differ diff --git a/ungleich_page/static/ungleich_page/img/logos/Gentoo-site_logo.jpg b/ungleich_page/static/ungleich_page/img/logos/Gentoo-site_logo.jpg new file mode 100644 index 00000000..fabf8d79 Binary files /dev/null and b/ungleich_page/static/ungleich_page/img/logos/Gentoo-site_logo.jpg differ diff --git a/ungleich_page/static/ungleich_page/img/logos/Gentoo-site_logo.png b/ungleich_page/static/ungleich_page/img/logos/Gentoo-site_logo.png deleted file mode 100755 index 8ff911e0..00000000 Binary files a/ungleich_page/static/ungleich_page/img/logos/Gentoo-site_logo.png and /dev/null differ diff --git a/ungleich_page/static/ungleich_page/img/logos/NetBSD.jpg b/ungleich_page/static/ungleich_page/img/logos/NetBSD.jpg new file mode 100644 index 00000000..0a561304 Binary files /dev/null and b/ungleich_page/static/ungleich_page/img/logos/NetBSD.jpg differ diff --git a/ungleich_page/static/ungleich_page/img/logos/NetBSD.png b/ungleich_page/static/ungleich_page/img/logos/NetBSD.png deleted file mode 100755 index e31c3d00..00000000 Binary files a/ungleich_page/static/ungleich_page/img/logos/NetBSD.png and /dev/null differ diff --git a/ungleich_page/static/ungleich_page/img/logos/Puppet.jpg b/ungleich_page/static/ungleich_page/img/logos/Puppet.jpg new file mode 100644 index 00000000..4962b5c1 Binary files /dev/null and b/ungleich_page/static/ungleich_page/img/logos/Puppet.jpg differ diff --git a/ungleich_page/static/ungleich_page/img/logos/Puppet.png b/ungleich_page/static/ungleich_page/img/logos/Puppet.png deleted file mode 100755 index 62da452b..00000000 Binary files a/ungleich_page/static/ungleich_page/img/logos/Puppet.png and /dev/null differ diff --git a/ungleich_page/static/ungleich_page/img/logos/apache.jpg b/ungleich_page/static/ungleich_page/img/logos/apache.jpg new file mode 100644 index 00000000..08895521 Binary files /dev/null and b/ungleich_page/static/ungleich_page/img/logos/apache.jpg differ diff --git a/ungleich_page/static/ungleich_page/img/logos/apache.png b/ungleich_page/static/ungleich_page/img/logos/apache.png deleted file mode 100644 index 31c7d84f..00000000 Binary files a/ungleich_page/static/ungleich_page/img/logos/apache.png and /dev/null differ diff --git a/ungleich_page/static/ungleich_page/img/logos/cdistbyungleich.jpg b/ungleich_page/static/ungleich_page/img/logos/cdistbyungleich.jpg index 5e994a6d..c5cb18c5 100644 Binary files a/ungleich_page/static/ungleich_page/img/logos/cdistbyungleich.jpg and b/ungleich_page/static/ungleich_page/img/logos/cdistbyungleich.jpg differ diff --git a/ungleich_page/static/ungleich_page/img/logos/ceph.jpg b/ungleich_page/static/ungleich_page/img/logos/ceph.jpg index eda7cbb5..f13f2e12 100644 Binary files a/ungleich_page/static/ungleich_page/img/logos/ceph.jpg and b/ungleich_page/static/ungleich_page/img/logos/ceph.jpg differ diff --git a/ungleich_page/static/ungleich_page/img/logos/debian.jpg b/ungleich_page/static/ungleich_page/img/logos/debian.jpg index 4bd7da90..5af41857 100755 Binary files a/ungleich_page/static/ungleich_page/img/logos/debian.jpg and b/ungleich_page/static/ungleich_page/img/logos/debian.jpg differ diff --git a/ungleich_page/static/ungleich_page/img/logos/freebsd.jpg b/ungleich_page/static/ungleich_page/img/logos/freebsd.jpg new file mode 100644 index 00000000..27dba9e8 Binary files /dev/null and b/ungleich_page/static/ungleich_page/img/logos/freebsd.jpg differ diff --git a/ungleich_page/static/ungleich_page/img/logos/freebsd.png b/ungleich_page/static/ungleich_page/img/logos/freebsd.png deleted file mode 100755 index b712c9fc..00000000 Binary files a/ungleich_page/static/ungleich_page/img/logos/freebsd.png and /dev/null differ diff --git a/ungleich_page/static/ungleich_page/img/logos/gluster.jpg b/ungleich_page/static/ungleich_page/img/logos/gluster.jpg new file mode 100644 index 00000000..e1be7ba4 Binary files /dev/null and b/ungleich_page/static/ungleich_page/img/logos/gluster.jpg differ diff --git a/ungleich_page/static/ungleich_page/img/logos/gluster.png b/ungleich_page/static/ungleich_page/img/logos/gluster.png deleted file mode 100644 index 4c91cc42..00000000 Binary files a/ungleich_page/static/ungleich_page/img/logos/gluster.png and /dev/null differ diff --git a/ungleich_page/static/ungleich_page/img/logos/logobig.jpg b/ungleich_page/static/ungleich_page/img/logos/logobig.jpg index 5bcf5110..bc2e8154 100755 Binary files a/ungleich_page/static/ungleich_page/img/logos/logobig.jpg and b/ungleich_page/static/ungleich_page/img/logos/logobig.jpg differ diff --git a/ungleich_page/static/ungleich_page/img/logos/mysql.jpg b/ungleich_page/static/ungleich_page/img/logos/mysql.jpg new file mode 100644 index 00000000..5837d8fb Binary files /dev/null and b/ungleich_page/static/ungleich_page/img/logos/mysql.jpg differ diff --git a/ungleich_page/static/ungleich_page/img/logos/mysql.png b/ungleich_page/static/ungleich_page/img/logos/mysql.png deleted file mode 100644 index 5328f0cc..00000000 Binary files a/ungleich_page/static/ungleich_page/img/logos/mysql.png and /dev/null differ diff --git a/ungleich_page/static/ungleich_page/img/logos/openbsd.jpg b/ungleich_page/static/ungleich_page/img/logos/openbsd.jpg new file mode 100644 index 00000000..89cff09a Binary files /dev/null and b/ungleich_page/static/ungleich_page/img/logos/openbsd.jpg differ diff --git a/ungleich_page/static/ungleich_page/img/logos/openbsd.png b/ungleich_page/static/ungleich_page/img/logos/openbsd.png deleted file mode 100644 index 33b15449..00000000 Binary files a/ungleich_page/static/ungleich_page/img/logos/openbsd.png and /dev/null differ diff --git a/ungleich_page/static/ungleich_page/img/logos/opennebula.jpg b/ungleich_page/static/ungleich_page/img/logos/opennebula.jpg new file mode 100644 index 00000000..b40b3b67 Binary files /dev/null and b/ungleich_page/static/ungleich_page/img/logos/opennebula.jpg differ diff --git a/ungleich_page/static/ungleich_page/img/logos/opennebula.png b/ungleich_page/static/ungleich_page/img/logos/opennebula.png deleted file mode 100644 index bac7d61e..00000000 Binary files a/ungleich_page/static/ungleich_page/img/logos/opennebula.png and /dev/null differ diff --git a/ungleich_page/static/ungleich_page/img/logos/postsql.jpg b/ungleich_page/static/ungleich_page/img/logos/postsql.jpg index 9e50f4e5..791de7f4 100755 Binary files a/ungleich_page/static/ungleich_page/img/logos/postsql.jpg and b/ungleich_page/static/ungleich_page/img/logos/postsql.jpg differ diff --git a/ungleich_page/static/ungleich_page/img/logos/qemu.jpg b/ungleich_page/static/ungleich_page/img/logos/qemu.jpg new file mode 100644 index 00000000..a93e6bc8 Binary files /dev/null and b/ungleich_page/static/ungleich_page/img/logos/qemu.jpg differ diff --git a/ungleich_page/static/ungleich_page/img/logos/qemu.png b/ungleich_page/static/ungleich_page/img/logos/qemu.png deleted file mode 100644 index 70ec0f85..00000000 Binary files a/ungleich_page/static/ungleich_page/img/logos/qemu.png and /dev/null differ diff --git a/ungleich_page/templates/ungleich_page/includes/_about.html b/ungleich_page/templates/ungleich_page/includes/_about.html index b2bd393f..88f8a023 100644 --- a/ungleich_page/templates/ungleich_page/includes/_about.html +++ b/ungleich_page/templates/ungleich_page/includes/_about.html @@ -9,7 +9,7 @@ diff --git a/ungleich_page/templates/ungleich_page/includes/_contact_us.html b/ungleich_page/templates/ungleich_page/includes/_contact_us.html index 5d59c757..1038f358 100644 --- a/ungleich_page/templates/ungleich_page/includes/_contact_us.html +++ b/ungleich_page/templates/ungleich_page/includes/_contact_us.html @@ -2,6 +2,7 @@ {% load i18n %}
+
@@ -13,17 +14,15 @@
{% endfor %}

{% trans "Contact Us" %}

-
- -

+

{% trans "Join us at" %} {% trans "Digital Glarus" %}, {% trans "a great co-working space in the middle of Alps!" %}
{% trans "You can contact us at" %}

-

+

info@ungleich.ch

-

(044) 534-66-22

+

(044) 534-66-22

diff --git a/ungleich_page/templates/ungleich_page/includes/_header.html b/ungleich_page/templates/ungleich_page/includes/_header.html index 545a3bb7..e9a8a62a 100644 --- a/ungleich_page/templates/ungleich_page/includes/_header.html +++ b/ungleich_page/templates/ungleich_page/includes/_header.html @@ -1,17 +1,53 @@ -{% load static %} -{% load i18n %} +{% load static i18n %} -
-
-
- -


-
- - {% trans "We Design, Configure & Maintain
Your Linux Infrastructure " %} - -
+
+ + +
+
+
+
+
+ {% trans "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 +
+
+
+
+
+
+ {% trans "We Design, Configure & Maintain
Your Linux Infrastructure " %} +
+

Ruby on Rails, Django, Nothing else.

+ Learn More +
+
+
+
+
+
+ {% trans "We Design, Configure & Maintain
Your Linux Infrastructure " %} +
+ Learn More +
+
+ + + Previous + + + + Next + +
diff --git a/ungleich_page/templates/ungleich_page/includes/_portfolio.html b/ungleich_page/templates/ungleich_page/includes/_portfolio.html index 2c439a5d..b30993be 100644 --- a/ungleich_page/templates/ungleich_page/includes/_portfolio.html +++ b/ungleich_page/templates/ungleich_page/includes/_portfolio.html @@ -3,35 +3,30 @@
-
-
-

{% trans "Our Products" %}

-

{% blocktrans %}Our products include an innovative datacenter,
affordable VM hosting, and high speed fiber internet for canton Glarus.{% endblocktrans %}

-
-
+
+

{% trans "Our Products" %}

+

{% blocktrans %}Our products include an innovative datacenter,
affordable VM hosting, and high speed fiber internet for canton Glarus.{% endblocktrans %}

+

{% trans "Data Center Light" %}

-

 

-

{% trans "We offer the most affordable hosting in Switzerland. Data Center Light has full FOSS stack, 100% IPv6 and 100% SSD. Choose any configuration among CentOS, Debian, Ubuntu, Devuan, and FreeBSD." %}

+

{% trans "We offer the most affordable hosting in Switzerland. Data Center Light has full FOSS stack, 100% IPv6 and 100% SSD. Choose any configuration among CentOS, Debian, Ubuntu, Devuan, and FreeBSD." %}

{% trans "Rails Hosting" %}

-

 

-

{% trans "Ready to go live with your Ruby on Rails application? We offer you ready-to-deploy virtual machines or configure your existing infrastructure for Ruby on Rails." %}

+

{% trans "Ready to go live with your Ruby on Rails application? We offer you ready-to-deploy virtual machines or configure your existing infrastructure for Ruby on Rails." %}

{% trans "High Speed Internet" %}

-

 

-

{% trans "We offer high speed fiber internet in Glarus Süd, Glarus and Glarus Nord. Experience 100 Mbit/s and see how speed can change everything." %}

+

{% trans "We offer high speed fiber internet in Glarus Süd, Glarus and Glarus Nord. Experience 100 Mbit/s and see how speed can change everything." %}

diff --git a/ungleich_page/templates/ungleich_page/includes/_services.html b/ungleich_page/templates/ungleich_page/includes/_services.html index 2c3a8f62..3f2311f0 100644 --- a/ungleich_page/templates/ungleich_page/includes/_services.html +++ b/ungleich_page/templates/ungleich_page/includes/_services.html @@ -5,7 +5,7 @@

{% trans "our services" %}

-

+

{% trans "We support our clients in all areas of Unix infrastructure." %}
{% trans "Our top notch configuration management is refreshingly simple and reliable." %}

@@ -16,8 +16,7 @@

{% trans "Hosting" %}

-

 

-

{% trans "Ruby on Rails. Java hosting, Django hosting, we make it everything run smooth and safe." %}

+

{% trans "Ruby on Rails. Java hosting, Django hosting, we make it everything run smooth and safe." %}

@@ -26,8 +25,7 @@

{% trans "Configuration as a Service" %}

-

 

-

{% trans "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." %}

+

{% trans "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." %}

@@ -36,7 +34,6 @@

{% trans "Linux System Engineering" %}

-

 

{% trans "Let your developers develop! We take care of your system administration. Gentoo, Archlinux, Debian, Ubuntu, and many more." %}

diff --git a/ungleich_page/templates/ungleich_page/includes/_softwares.html b/ungleich_page/templates/ungleich_page/includes/_softwares.html index b5ece4d8..669e5f32 100644 --- a/ungleich_page/templates/ungleich_page/includes/_softwares.html +++ b/ungleich_page/templates/ungleich_page/includes/_softwares.html @@ -4,112 +4,112 @@
- - + +
- - + +
- - + +
- - + +
- - + +
- - + +
- - + +
- - + +
- - + +
- - + +
- - + +
- - + +
- - + +
- - + +
- - + +
- - + +
- - + +
- - + +
- - + +
- - + +
diff --git a/ungleich_page/templates/ungleich_page/includes/_team.html b/ungleich_page/templates/ungleich_page/includes/_team.html index e207e336..339008aa 100644 --- a/ungleich_page/templates/ungleich_page/includes/_team.html +++ b/ungleich_page/templates/ungleich_page/includes/_team.html @@ -39,7 +39,7 @@ than before." {% endblocktrans %}

-

+

- Luciano Franceschina, CTO at Teralytics

@@ -55,7 +55,7 @@ saving, which is crucial for IT companies like ours." {% endblocktrans %}

-

+

- Beat Seeliger , CTO at Panter AG

@@ -76,7 +76,7 @@ solid infrastructures." {% endblocktrans %}

-

+

{% blocktrans %} - Sebastian Plattner, Teamleader Development Cyber Security Products at RUAG diff --git a/ungleich_page/templates/ungleich_page/ungleich/_services_item.html b/ungleich_page/templates/ungleich_page/ungleich/_services_item.html index 87fda196..62d462e4 100644 --- a/ungleich_page/templates/ungleich_page/ungleich/_services_item.html +++ b/ungleich_page/templates/ungleich_page/ungleich/_services_item.html @@ -1,5 +1,5 @@

- +

{{ instance.title }}