diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.mo b/datacenterlight/locale/de/LC_MESSAGES/django.mo new file mode 100644 index 00000000..668aa97b Binary files /dev/null and b/datacenterlight/locale/de/LC_MESSAGES/django.mo differ diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.po b/datacenterlight/locale/de/LC_MESSAGES/django.po index db372410..9fca2bce 100644 --- a/datacenterlight/locale/de/LC_MESSAGES/django.po +++ b/datacenterlight/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-05-30 13:47+0000\n" +"POT-Creation-Date: 2017-06-03 21:51-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,23 +18,23 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: datacenterlight/templates/datacenterlight/beta_access.html:13 +#: templates/datacenterlight/beta_access.html:13 msgid "Enter name" msgstr "Name" -#: datacenterlight/templates/datacenterlight/beta_access.html:17 +#: templates/datacenterlight/beta_access.html:17 msgid "Enter email" msgstr "E-Mail-Adresse" -#: datacenterlight/templates/datacenterlight/beta_access.html:21 +#: templates/datacenterlight/beta_access.html:21 msgid "Request Newsletter" msgstr "Newsletter abonnieren" -#: datacenterlight/templates/datacenterlight/beta_success.html:9 +#: templates/datacenterlight/beta_success.html:9 msgid "Request Sent" msgstr "Anfrage verschickt" -#: datacenterlight/templates/datacenterlight/beta_success.html:12 +#: templates/datacenterlight/beta_success.html:12 msgid "" "Thank you for your subscription! You will receive a confirmation mail from " "our team" @@ -42,27 +42,27 @@ msgstr "" "Vielen dank für Ihre Anmeldung. Sie erhalten in kürze eine Bestätigungsmail " "von unserem Team" -#: datacenterlight/templates/datacenterlight/emails/request_access_confirmation.html:99 -#: datacenterlight/templates/datacenterlight/emails/request_access_confirmation.txt:99 +#: templates/datacenterlight/emails/request_access_confirmation.html:99 +#: templates/datacenterlight/emails/request_access_confirmation.txt:99 msgid "Thank you for your request." msgstr "Vielen Dank für Ihre Anfrage." -#: datacenterlight/templates/datacenterlight/emails/request_access_confirmation.html:104 -#: datacenterlight/templates/datacenterlight/emails/request_access_confirmation.txt:104 +#: templates/datacenterlight/emails/request_access_confirmation.html:104 +#: templates/datacenterlight/emails/request_access_confirmation.txt:104 msgid "You are one step away from being our beta tester!" msgstr "" "Sie sind nur noch einen Schritt davon entfernt, unser Beta-Tester zu werden!" -#: datacenterlight/templates/datacenterlight/emails/request_access_confirmation.html:105 -#: datacenterlight/templates/datacenterlight/emails/request_access_confirmation.txt:105 +#: templates/datacenterlight/emails/request_access_confirmation.html:105 +#: templates/datacenterlight/emails/request_access_confirmation.txt:105 msgid "" "Currently we are running our tests to make sure everything runs perfectly." msgstr "" "Momentan testen wir die Beta-Umgebung um sie für Ihren Gebrauch " "sicherzustellen." -#: datacenterlight/templates/datacenterlight/emails/request_access_confirmation.html:106 -#: datacenterlight/templates/datacenterlight/emails/request_access_confirmation.txt:106 +#: templates/datacenterlight/emails/request_access_confirmation.html:106 +#: templates/datacenterlight/emails/request_access_confirmation.txt:106 msgid "" "In the meantime, we would like to ask you a little patience
until our " "team contacts you with beta access." @@ -70,77 +70,95 @@ msgstr "" "Wir werden dann sobald als möglich Ihren Beta-Zugang erstellen und Sie " "daraufhin kontaktieren.Bis dahin bitten wir Sie um etwas Geduld." -#: datacenterlight/templates/datacenterlight/emails/request_access_confirmation.html:107 -#: datacenterlight/templates/datacenterlight/emails/request_access_confirmation.txt:107 +#: templates/datacenterlight/emails/request_access_confirmation.html:107 +#: templates/datacenterlight/emails/request_access_confirmation.txt:107 msgid "Thank you!" msgstr "Vielen Dank!" -#: datacenterlight/templates/datacenterlight/index.html:62 -#: datacenterlight/templates/datacenterlight/index.html:160 -#: datacenterlight/templates/datacenterlight/index.html:346 -#: datacenterlight/templates/datacenterlight/pricing.html:62 -#: datacenterlight/templates/datacenterlight/pricing.html:190 +#: templates/datacenterlight/index.html:62 +#: templates/datacenterlight/index.html:160 +#: templates/datacenterlight/index.html:368 +#: templates/datacenterlight/pricing.html:62 +#: templates/datacenterlight/pricing.html:190 msgid "What is it" msgstr "Was ist es?" -#: datacenterlight/templates/datacenterlight/index.html:65 -#: datacenterlight/templates/datacenterlight/index.html:189 -#: datacenterlight/templates/datacenterlight/index.html:349 -#: datacenterlight/templates/datacenterlight/pricing.html:65 -#: datacenterlight/templates/datacenterlight/pricing.html:193 +#: templates/datacenterlight/index.html:65 +#: templates/datacenterlight/index.html:211 +#: templates/datacenterlight/index.html:371 +#: templates/datacenterlight/pricing.html:65 +#: templates/datacenterlight/pricing.html:193 msgid "Scale out" msgstr "Skalierung" -#: datacenterlight/templates/datacenterlight/index.html:68 -#: datacenterlight/templates/datacenterlight/index.html:215 -#: datacenterlight/templates/datacenterlight/index.html:352 -#: datacenterlight/templates/datacenterlight/pricing.html:68 -#: datacenterlight/templates/datacenterlight/pricing.html:196 +#: templates/datacenterlight/index.html:68 +#: templates/datacenterlight/index.html:237 +#: templates/datacenterlight/index.html:374 +#: templates/datacenterlight/pricing.html:68 +#: templates/datacenterlight/pricing.html:196 msgid "Reliable and light" msgstr "Zuverlässig und leicht" -#: datacenterlight/templates/datacenterlight/index.html:71 +#: templates/datacenterlight/index.html:71 msgid "Order VM" msgstr "VM bestellen" -#: datacenterlight/templates/datacenterlight/index.html:74 -#: datacenterlight/templates/datacenterlight/index.html:359 -#: datacenterlight/templates/datacenterlight/pricing.html:74 -#: datacenterlight/templates/datacenterlight/pricing.html:203 +#: templates/datacenterlight/index.html:74 +#: templates/datacenterlight/index.html:381 +#: templates/datacenterlight/pricing.html:74 +#: templates/datacenterlight/pricing.html:203 msgid "Contact" msgstr "Kontakt" -#: datacenterlight/templates/datacenterlight/index.html:127 +#: templates/datacenterlight/index.html:127 msgid "Finally, an affordable VM hosting in Switzerland!" msgstr "Endlich: bezahlbares VM Hosting in der Schweiz" -#: datacenterlight/templates/datacenterlight/index.html:131 +#: templates/datacenterlight/index.html:131 msgid "What is it?" msgstr "Was ist es?" -#: datacenterlight/templates/datacenterlight/index.html:134 +#: templates/datacenterlight/index.html:134 msgid "I want it!" msgstr "Das will ich haben!" -#: datacenterlight/templates/datacenterlight/index.html:165 -msgid "Reuse existing factory halls intead of building an expensive building." -msgstr "" -"Nachhaltigkeit: Wiederverwendung ehemaliger Fabrikhallen an Stelle der " -"Errichtung eines neuen Gebäudes" +#: templates/datacenterlight/index.html:166 +msgid "" +"Reuses existing factory halls instead of building a new expensive building." +msgstr "Verwendet ehemalige Fabrikhallen anstatt ein neues, teures Gebäude zu errichten.
" -#: datacenterlight/templates/datacenterlight/index.html:168 -msgid "Being creative, using modern and alternative design for a datacenter." -msgstr "" -"Kreativität: Verwendung eines modernen und alternativen Designs für unser " -"Datencenter" +#: templates/datacenterlight/index.html:171 +msgid "Only wants you to pay for what you actually need.\\u2028" +msgstr "Möchte, dass du nur bezahlst, was du auch wirklich brauchst: Wähle deine Ressourcen individuell aus!
" -#: datacenterlight/templates/datacenterlight/index.html:170 -msgid "Being open: Using FOSS exclusively, we can save money for licenses." -msgstr "" -"Offene Verfahrensweise: Die Benutzung eines eigenen Frameworks, FOSS, " -"erspart Lizenzgebühren" +#: templates/datacenterlight/index.html:175 +msgid "" +"Is creative, using a modern and alternative design for a data center in " +"order to make it more sustainable and affordable at the same time.\\u2028" +msgstr "Ist kreativ, indem es sich ein modernes und alternatives Layout zu Nutze macht um Nachhaltigkeit zu fördern und somit erschwingliche Preise bieten zu können.
" -#: datacenterlight/templates/datacenterlight/index.html:192 +#: templates/datacenterlight/index.html:179 +msgid "" +"Cuts down the costs for you by using FOSS (Free Open Source Software) " +"exclusively, wherefore we can save money from paying licenses." +msgstr "Sorgt dafür, dass unnötige Kosten erspart werden, indem es ausschliesslich mit FOSS (Free Open Source Software) arbeitet und wir daher auf Lizenzgebühren verzichten können.
" + +#: templates/datacenterlight/index.html:183 +msgid "" +"Is located in Glarus, Switzerland where your data is under strict privacy." +msgstr "Befindet sich in Glarus, in der Schweiz, wo deine Daten unter striktem Schutz stehen." + +#: templates/datacenterlight/index.html:187 +msgid "Has qualified workers on site who take care of the hardware.\\u2028" +msgstr "Hat qualifizierte Mitarbeiter vor Ort, die sich um die Hardware kümmern." + +#: templates/datacenterlight/index.html:191 +msgid "" +"Renounces active cooling by taking an advantage of the isolation of our " +"tight factory walls." +msgstr "Verzichtet auf aktive Kühlung, indem es sich die Isolation unserer ehemaligen Fabrikhalle zu Nutze macht." + +#: templates/datacenterlight/index.html:214 msgid "" "We don't use special hardware. We use commodity hardware: we buy computers " "that you buy. Just many more and put them in a cozy home for computers " @@ -150,7 +168,7 @@ msgstr "" "erschwingliche Systeme. Bei grösserer Auslastung werden mehr Standard " "komponenten hinzugekauft und skalieren so das Datencenter." -#: datacenterlight/templates/datacenterlight/index.html:218 +#: templates/datacenterlight/index.html:240 msgid "" "Our VMs are located in Switzerland, with reliable power supply and fast " "internet connection. Our VM costs less thanks to our featherlight " @@ -160,82 +178,84 @@ msgstr "" "Energieversorgung sowie schneller Internetverbindung ausgestattet. Unser " "Angebot ist aufgrund unserer leichten Infrastruktur überaus kostengünstig." -#: datacenterlight/templates/datacenterlight/index.html:236 -#: datacenterlight/templates/datacenterlight/pricing.html:106 +#: templates/datacenterlight/index.html:258 +#: templates/datacenterlight/pricing.html:106 msgid "We are cutting down the costs significantly!" msgstr "Wir sorgen dafür, dass die Kosten für Sie signifikant abnehmen" -#: datacenterlight/templates/datacenterlight/index.html:237 +#: templates/datacenterlight/index.html:259 msgid "Affordable VM hosting based in Switzerland" msgstr "Bezahlbares VM Hosting in der Schweiz" -#: datacenterlight/templates/datacenterlight/index.html:238 +#: templates/datacenterlight/index.html:260 msgid "More Info" msgstr "Weitere Informationen" -#: datacenterlight/templates/datacenterlight/index.html:245 -#: datacenterlight/templates/datacenterlight/pricing.html:119 +#: templates/datacenterlight/index.html:267 +#: templates/datacenterlight/pricing.html:119 msgid "VM hosting" msgstr "VM Hosting" -#: datacenterlight/templates/datacenterlight/index.html:252 +#: templates/datacenterlight/index.html:274 msgid "Based in Switzerland" msgstr "Standort des Datacenters ist in der Schweiz" -#: datacenterlight/templates/datacenterlight/index.html:261 +#: templates/datacenterlight/index.html:283 +#, fuzzy +#| msgid "10 GB Storage (SSD)" msgid "10 GB Storage (SSD)" msgstr "10 GB Storage (SSD)" -#: datacenterlight/templates/datacenterlight/index.html:264 -#: datacenterlight/templates/datacenterlight/pricing.html:161 +#: templates/datacenterlight/index.html:286 +#: templates/datacenterlight/pricing.html:161 msgid "Order Now!" msgstr "Bestelle jetzt!" -#: datacenterlight/templates/datacenterlight/index.html:280 +#: templates/datacenterlight/index.html:302 msgid "Want to know more? Subscribe to our newsletter!" msgstr "Willst du mehr wissen? Abonniere unseren Newsletter!" -#: datacenterlight/templates/datacenterlight/index.html:307 +#: templates/datacenterlight/index.html:329 msgid "Switzerland " msgstr "Schweiz" -#: datacenterlight/templates/datacenterlight/index.html:324 +#: templates/datacenterlight/index.html:346 msgid "Questions?" msgstr "Fragen?" -#: datacenterlight/templates/datacenterlight/index.html:324 +#: templates/datacenterlight/index.html:346 msgid "Contact us!" msgstr "Kontaktiere uns!" -#: datacenterlight/templates/datacenterlight/index.html:342 -#: datacenterlight/templates/datacenterlight/pricing.html:186 +#: templates/datacenterlight/index.html:364 +#: templates/datacenterlight/pricing.html:186 msgid "Home" msgstr "Home" -#: datacenterlight/templates/datacenterlight/index.html:355 -#: datacenterlight/templates/datacenterlight/pricing.html:199 +#: templates/datacenterlight/index.html:377 +#: templates/datacenterlight/pricing.html:199 msgid "Pricing" msgstr "Preise" -#: datacenterlight/templates/datacenterlight/pricing.html:71 +#: templates/datacenterlight/pricing.html:71 msgid "Buy VM" msgstr "VM Kaufen" -#: datacenterlight/templates/datacenterlight/pricing.html:127 +#: templates/datacenterlight/pricing.html:127 msgid "Hosted in Switzerland" msgstr "Standort des Datacenters ist in der Schweiz" -#: datacenterlight/templates/datacenterlight/pricing.html:144 +#: templates/datacenterlight/pricing.html:144 msgid "GB Storage (SSD)" msgstr "GB Storage (SSD)" -#: datacenterlight/templates/datacenterlight/pricing.html:168 +#: templates/datacenterlight/pricing.html:168 msgid "Simple and affordable: Try our virtual machine with featherlight price." msgstr "" -"Simpel und bezahlbar: Testen Sie unsere virtuelen Machinen mit " +"Einfach und bezahlbar: Testen Sie unsere virtuelen Machinen mit " "federleichten Preisen" -#: datacenterlight/templates/datacenterlight/pricing.html:171 +#: templates/datacenterlight/pricing.html:171 msgid "" "Our VMs are hosted in Glarus, Switzerland, and our website is currently " "running in BETA mode. If you want more information that you did not find on " @@ -254,6 +274,11 @@ msgstr "" #~ msgid "How it works" #~ msgstr "Wie es funktioniert" +#~ msgid "Being open: Using FOSS exclusively, we can save money for licenses." +#~ msgstr "" +#~ "Offene Verfahrensweise: Die Benutzung eines eigenen Frameworks, FOSS, " +#~ "erspart Lizenzgebühren" + #~ msgid "Our VMs are hosted in Glarus, Switzerland." #~ msgstr "Standort des Datacenters ist in der Schweiz" diff --git a/datacenterlight/static/datacenterlight/css/landing-page.css b/datacenterlight/static/datacenterlight/css/landing-page.css index 7705393d..56739c71 100755 --- a/datacenterlight/static/datacenterlight/css/landing-page.css +++ b/datacenterlight/static/datacenterlight/css/landing-page.css @@ -4,20 +4,16 @@ * For details, see http://www.apache.org/licenses/LICENSE-2.0. */ @font-face { - font-family: 'Montserrat-Regular'; - src: url('../fonts/Montserrat/Montserrat-Regular.ttf'); + font-family: 'Lato-Regular'; + src: url('../fonts/Lato/Lato-Regular.ttf'); } @font-face { - font-family: 'Montserrat-Bold'; - src: url('../fonts/Montserrat/Montserrat-Bold.ttf'); + font-family: 'Lato-Black'; + src: url('../fonts/Lato/Lato-Black.ttf'); } @font-face { - font-family: 'Montserrat-Medium'; - src: url('../fonts/Montserrat/Montserrat-Medium.ttf'); -} -@font-face { - font-family: 'Montserrat-Light'; - src: url('../fonts/Montserrat/Montserrat-Light.ttf'); + font-family: 'Lato-Light'; + src: url('../fonts/Lato/Lato-Light.ttf'); } body, html { @@ -32,8 +28,8 @@ h3, h4, h5, h6 { - font-family: 'Montserrat-Regular', sans-serif; - font-weight: 700; + font-family: 'Lato-Regular', sans-serif; + font-weight: 300; } /*blue light #5A74AF*/ /*blue dark #29427A*/ @@ -128,6 +124,10 @@ h6 { .navbar-transparent .navbar-nav>li>a:hover { color: #fff; } +.navbar-transparent .navbar-nav>li>a:focus, .navbar-transparent .navbar-nav>li>a:hover { + color: #fff; + background-color: transparent; +} .navbar-default .btn-link { box-shadow: none; } @@ -263,7 +263,7 @@ h6 { margin: 0; font-weight: 400; font-size: 6em; - font-family: 'Montserrat-Medium'; + font-family: 'Lato-Black'; } .intro-divider { @@ -274,7 +274,7 @@ h6 { .intro-message > h3 { font-weight: 300; - font-family: 'Montserrat-Light'; + font-family: 'Lato-Light'; } .intro-pricing{ @@ -327,7 +327,7 @@ h6 { margin-bottom: 25px; } .split-section .split-text .split-title h2{ - font-family: 'Montserrat-Bold'; + font-family: 'Lato-Black'; font-size: 50px; line-height: 50px; padding-bottom: 25px; @@ -382,6 +382,20 @@ h6 { width: 70px; left: 0; } + +.split-section.what .icon-section{ + position: relative; + min-height: 500px; +} +.split-section.what .split-text .lead { + font-size: 18px; + color: #3a3a3a; + margin-bottom: 0; + line-height: 25px; +} +.split-section.what .fa-li.fa-lg{ + font-size: 17px; +} .pricing-section{ padding: 80px 0 !important; background: -webkit-linear-gradient(top, #f0f4f7, #fff) no-repeat; @@ -405,10 +419,10 @@ h6 { } .pricing-section .card .title{ padding: 15px 40px; - font-family: 'Montserrat-Medium'; + font-family: 'Lato-Black'; } .pricing-section .card .title h3{ - font-family: 'Montserrat-Medium'; + font-family: 'Lato-Black'; } .pricing-section .card .price{ background: #5A74AF; @@ -433,7 +447,7 @@ h6 { text-align: left; } .pricing-section .text .section-heading{ - font-family: 'Montserrat-Bold'; + font-family: 'Lato-Black'; font-size: 50px; line-height: 50px; padding-bottom: 25px; @@ -460,7 +474,7 @@ h6 { padding: 70px 0; } .request-section .title h2{ - font-family: 'Montserrat-Bold'; + font-family: 'Lato-Black'; font-size: 45px; margin: 0; color: #fff; @@ -536,7 +550,7 @@ h6 { .contact-section .card .subtitle h3{ font-size: 30px; margin-bottom: 23px; - font-family: 'Montserrat-Medium'; + font-family: 'Lato-Black'; } .contact-section .card .social a:hover{ text-decoration: none; @@ -547,7 +561,7 @@ h6 { max-width: 468px; } .contact-section .title h2{ - font-family: 'Montserrat-Bold'; + font-family: 'Lato-Black'; font-size: 65px; margin: 0; color: #fff; @@ -577,7 +591,7 @@ h6 { width: 50%; } .price-calc-section .text .section-heading{ - font-family: 'Montserrat-Bold'; + font-family: 'Lato-Black'; font-size: 48px; line-height: 48px; padding-bottom: 25px; @@ -620,10 +634,10 @@ h6 { } .price-calc-section .card .title{ padding: 15px 40px; - font-family: 'Montserrat-Medium'; + font-family: 'Lato-Black'; } .price-calc-section .card .title h3{ - font-family: 'Montserrat-Medium'; + font-family: 'Lato-Black'; } .price-calc-section .card .price{ background: #5A74AF; @@ -636,24 +650,22 @@ h6 { border-bottom: 1px solid rgba(128, 128, 128, 0.3); position: relative; display: flex; - justify-content: center; + justify-content: space-around; align-items: center; } -.price-calc-section .card .description span{ - font-size: 20px; +.price-calc-section .card .description span { + font-size: 18px; margin-left: 4px; + margin-left: 0px; + /* justify-self: start; */ + width: 30%; + text-align: left; } .price-calc-section .card .description input{ font-size: 20px; text-align: center; - width: 70px; -} -.price-calc-section .card .description #coreValue{ - width: 50px; -} -.price-calc-section .card .description #ramValue{ - width: 50px; + width: 60px; } .price-calc-section .card .description i{ color: #29427A; @@ -684,11 +696,32 @@ h6 { height: 40px; width: 200px; text-align: center; - font-size: 18px; + font-size: 16px; + margin-left: 10px; } .price-calc-section .card .check-ip{ font-size: 18px; } +.price-calc-section .card .description.input{ + justify-content: center; +} +.price-calc-section .card .description.input label{ + font-size: 15px; + font-weight: 800; + font-family: 'Lato-Regular'; + margin-bottom: 0; + width: 40px; +} +.price-calc-section .card .description.input input{ + width: 200px; + font-size: 14px; + text-align: left; + padding: 5px 10px; + border-radius: 4px; + border: 1px solid #d0d0d0; + background: #fff; + margin-left: 10px; +} .price-calc-section .card .check-ip input[type=checkbox]{ font-size: 17px; @@ -771,9 +804,38 @@ h6 { border: 1px solid rgba(119, 119, 119, 0.4); box-shadow: none; } + + .navbar-default .nav-language .drop-language { + background: #fff; + /* border: 1px solid #fff; */ + z-index: 100000; + left: 9px; + border: 1px solid rgba(119, 119, 119, 0.4); + box-shadow: none; + } + .navbar-default .nav-language .select-language { + color: #777; + } + .navbar-default .nav-language .drop-language a { + color: #777; + } + .navbar-transparent .navbar-nav>li>a:focus, .navbar-transparent .navbar-nav>li>a:hover { + color: #333; + background-color: transparent; + } + .navbar-default .navbar-nav>li>a:focus, .navbar-default .navbar-nav>li>a:hover { + color: #333; + background-color: transparent; + } .split-section { padding: 10px 0; } + .split-section .icon-section { + min-height: 160px; + } + .split-section.what .icon-section{ + min-height: 160px; + } .split-section .icon-section i{ font-size: 120px; } @@ -813,7 +875,10 @@ h6 { left: 50%; transform: translate(-50%, 0); } - + .contact-section .card .social a { + color: #29427A; + font-size: 30px; + } .price-calc-section{ flex-direction: column; padding: 60px 10px !important; @@ -828,7 +893,7 @@ h6 { margin-top: 20px; } .price-calc-section .text .section-heading { - font-family: 'Montserrat-Bold'; + font-family: 'Lato-Black'; font-size: 35px; line-height: 35px; padding-bottom: 15px; @@ -842,6 +907,14 @@ h6 { font-size: 18px; text-align: center; } + + .price-calc-section .card .description input { + font-size: 17px; + text-align: center; + width: 60px; + } + + } @media(max-width:540px) { @@ -863,8 +936,8 @@ h6 { line-height: 25px; } .price-calc-section .card .description span { - font-size: 17px; - margin-left: 4px; + font-size: 15px; + margin-left: 0px; } } @@ -887,7 +960,7 @@ h6 { .section-heading { margin-bottom: 30px; - font-family: 'Montserrat-Medium'; + font-family: 'Lato-Black'; } .section-heading-spacer { diff --git a/datacenterlight/static/datacenterlight/fonts/Lato/Lato-Black.ttf b/datacenterlight/static/datacenterlight/fonts/Lato/Lato-Black.ttf new file mode 100755 index 00000000..6848db0d Binary files /dev/null and b/datacenterlight/static/datacenterlight/fonts/Lato/Lato-Black.ttf differ diff --git a/datacenterlight/static/datacenterlight/fonts/Lato/Lato-BlackItalic.ttf b/datacenterlight/static/datacenterlight/fonts/Lato/Lato-BlackItalic.ttf new file mode 100755 index 00000000..5decf129 Binary files /dev/null and b/datacenterlight/static/datacenterlight/fonts/Lato/Lato-BlackItalic.ttf differ diff --git a/datacenterlight/static/datacenterlight/fonts/Lato/Lato-Bold.ttf b/datacenterlight/static/datacenterlight/fonts/Lato/Lato-Bold.ttf new file mode 100755 index 00000000..74343694 Binary files /dev/null and b/datacenterlight/static/datacenterlight/fonts/Lato/Lato-Bold.ttf differ diff --git a/datacenterlight/static/datacenterlight/fonts/Lato/Lato-BoldItalic.ttf b/datacenterlight/static/datacenterlight/fonts/Lato/Lato-BoldItalic.ttf new file mode 100755 index 00000000..684aacf5 Binary files /dev/null and b/datacenterlight/static/datacenterlight/fonts/Lato/Lato-BoldItalic.ttf differ diff --git a/datacenterlight/static/datacenterlight/fonts/Lato/Lato-Hairline.ttf b/datacenterlight/static/datacenterlight/fonts/Lato/Lato-Hairline.ttf new file mode 100755 index 00000000..288be295 Binary files /dev/null and b/datacenterlight/static/datacenterlight/fonts/Lato/Lato-Hairline.ttf differ diff --git a/datacenterlight/static/datacenterlight/fonts/Lato/Lato-HairlineItalic.ttf b/datacenterlight/static/datacenterlight/fonts/Lato/Lato-HairlineItalic.ttf new file mode 100755 index 00000000..c2bfd335 Binary files /dev/null and b/datacenterlight/static/datacenterlight/fonts/Lato/Lato-HairlineItalic.ttf differ diff --git a/datacenterlight/static/datacenterlight/fonts/Lato/Lato-Italic.ttf b/datacenterlight/static/datacenterlight/fonts/Lato/Lato-Italic.ttf new file mode 100755 index 00000000..3d3b7a29 Binary files /dev/null and b/datacenterlight/static/datacenterlight/fonts/Lato/Lato-Italic.ttf differ diff --git a/datacenterlight/static/datacenterlight/fonts/Lato/Lato-Light.ttf b/datacenterlight/static/datacenterlight/fonts/Lato/Lato-Light.ttf new file mode 100755 index 00000000..a958067a Binary files /dev/null and b/datacenterlight/static/datacenterlight/fonts/Lato/Lato-Light.ttf differ diff --git a/datacenterlight/static/datacenterlight/fonts/Lato/Lato-LightItalic.ttf b/datacenterlight/static/datacenterlight/fonts/Lato/Lato-LightItalic.ttf new file mode 100755 index 00000000..5e45ad9a Binary files /dev/null and b/datacenterlight/static/datacenterlight/fonts/Lato/Lato-LightItalic.ttf differ diff --git a/datacenterlight/static/datacenterlight/fonts/Lato/Lato-Regular.ttf b/datacenterlight/static/datacenterlight/fonts/Lato/Lato-Regular.ttf new file mode 100755 index 00000000..04ea8efb Binary files /dev/null and b/datacenterlight/static/datacenterlight/fonts/Lato/Lato-Regular.ttf differ diff --git a/datacenterlight/static/datacenterlight/fonts/Lato/OFL.txt b/datacenterlight/static/datacenterlight/fonts/Lato/OFL.txt new file mode 100755 index 00000000..f8ca7bc3 --- /dev/null +++ b/datacenterlight/static/datacenterlight/fonts/Lato/OFL.txt @@ -0,0 +1,92 @@ +Copyright (c) 2010-2014 by tyPoland Lukasz Dziedzic (team@latofonts.com) with Reserved Font Name "Lato" +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/datacenterlight/static/datacenterlight/js/main.js b/datacenterlight/static/datacenterlight/js/main.js index 7761b248..57a802b3 100644 --- a/datacenterlight/static/datacenterlight/js/main.js +++ b/datacenterlight/static/datacenterlight/js/main.js @@ -74,7 +74,8 @@ function _initNavUrl(){ $('.url').click(function(){ var href = $(this).attr('data-url'); - console.log(href); + $('.navbar-collapse').removeClass('in'); + $('.navbar-collapse').addClass('collapsing'); $('html, body').animate({ scrollTop: $(href).offset().top }, 1000); @@ -121,8 +122,7 @@ } function _calcPricing(){ - var total = (cardPricing['cpu'].value * 5) + (2* cardPricing['ram'].value) + (0.6* cardPricing['storage'].value) - console.log(total); + var total = (cardPricing['cpu'].value * 5) + (2* cardPricing['ram'].value) + (0.6* cardPricing['storage'].value); total = parseFloat(total.toFixed(2)); $("#total").text(total); diff --git a/datacenterlight/templates/datacenterlight/index.html b/datacenterlight/templates/datacenterlight/index.html index 6650beb0..25d6e124 100755 --- a/datacenterlight/templates/datacenterlight/index.html +++ b/datacenterlight/templates/datacenterlight/index.html @@ -147,7 +147,7 @@ -
+
@@ -161,13 +161,35 @@
    -
  • -

    {% trans "Reuse existing factory halls intead of building an expensive building." %}

    +
  • + +

    {% trans "Reuses existing factory halls instead of building a new expensive building." %} +

    • -
  • -

    {% trans "Being creative, using modern and alternative design for a datacenter." %}

    • -
  • -

    {% trans "Being open: Using FOSS exclusively, we can save money for licenses." %}

    • +
  • + +

    {% trans "Only wants you to pay for what you actually need.
" %}

    +
    • +
  • + +

    {% trans "Is creative, using a modern and alternative design for a data center in order to make it more sustainable and affordable at the same time.
" %}

    +
    • +
  • + +

    {% trans "Cuts down the costs for you by using FOSS (Free Open Source Software) exclusively, wherefore we can save money from paying licenses." %}

    +
    • +
  • + +

    {% trans "Is located in Glarus, Switzerland where your data is under strict privacy." %}

    +
    • +
  • + +

    {% trans "Has qualified workers on site who take care of the hardware.
" %}

    +
    • +
  • + +

    {% trans "Renounces active cooling by taking an advantage of the isolation of our tight factory walls." %}

    +
@@ -235,6 +257,7 @@

{% trans "We are cutting down the costs significantly!" %}

{% trans "Affordable VM hosting based in Switzerland" %}

+ {% trans "More Info" %}
diff --git a/datacenterlight/templates/datacenterlight/pricing.html b/datacenterlight/templates/datacenterlight/pricing.html index 6c1be74c..8d88682c 100644 --- a/datacenterlight/templates/datacenterlight/pricing.html +++ b/datacenterlight/templates/datacenterlight/pricing.html @@ -144,9 +144,11 @@ {% trans "GB Storage (SSD)" %}
- -
+ + +
+
+ +
+ + +
+
+ + +
+ diff --git a/hosting/locale/de/LC_MESSAGES/django.mo b/hosting/locale/de/LC_MESSAGES/django.mo new file mode 100644 index 00000000..1a9bb493 Binary files /dev/null and b/hosting/locale/de/LC_MESSAGES/django.mo differ diff --git a/hosting/locale/de/LC_MESSAGES/django.po b/hosting/locale/de/LC_MESSAGES/django.po index ca06753d..9ee6f63c 100644 --- a/hosting/locale/de/LC_MESSAGES/django.po +++ b/hosting/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-06-01 21:03+0000\n" +"POT-Creation-Date: 2017-05-30 13:47+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -79,70 +79,68 @@ msgstr "Anmelden" msgid "Home" msgstr "Home" -#: hosting/templates/hosting/bill_detail.html:11 -#: hosting/templates/hosting/order_detail.html:10 +#: templates/hosting/bill_detail.html:11 templates/hosting/order_detail.html:10 msgid "Invoice" msgstr "Rechnung" -#: hosting/templates/hosting/bill_detail.html:11 -#: hosting/templates/hosting/order_detail.html:10 +#: templates/hosting/bill_detail.html:11 templates/hosting/order_detail.html:10 msgid "Order #" msgstr "Rechnung #" -#: hosting/templates/hosting/bill_detail.html:25 +#: templates/hosting/bill_detail.html:25 msgid "ungleich GmbH" msgstr "" -#: hosting/templates/hosting/bill_detail.html:26 +#: templates/hosting/bill_detail.html:26 msgid "buchhaltung@ungleich.ch" msgstr "" -#: hosting/templates/hosting/bill_detail.html:27 +#: templates/hosting/bill_detail.html:27 msgid "Hauptstrasse 14" msgstr "" -#: hosting/templates/hosting/bill_detail.html:28 +#: templates/hosting/bill_detail.html:28 msgid "CH-8775 Luchsingen" msgstr "" -#: hosting/templates/hosting/bill_detail.html:29 +#: templates/hosting/bill_detail.html:29 msgid "Mwst-Nummer: CHE-109.549.333 MWST" msgstr "" -#: hosting/templates/hosting/bill_detail.html:60 +#: templates/hosting/bill_detail.html:60 msgid "Total:" msgstr "" -#: hosting/templates/hosting/bill_detail.html:68 +#: templates/hosting/bill_detail.html:68 #, python-format msgid "Alles Preise in CHF mit 8%% Mehrwertsteuer." msgstr "All prices in CHF including 8%% VAT" -#: hosting/templates/hosting/bill_detail.html:69 +#: templates/hosting/bill_detail.html:69 msgid "Betrag zahlbar innerhalb von 30 Tagen ab Rechnungseingang." msgstr "" -#: hosting/templates/hosting/bill_detail.html:70 +#: templates/hosting/bill_detail.html:70 msgid "Kontoverbindung:" msgstr "" -#: hosting/templates/hosting/bill_detail.html:73 +#: templates/hosting/bill_detail.html:73 msgid "IBAN:" msgstr "" -#: hosting/templates/hosting/bill_detail.html:76 +#: templates/hosting/bill_detail.html:76 msgid "BIC:" msgstr "" -#: hosting/templates/hosting/bill_detail.html:81 +#: templates/hosting/bill_detail.html:81 msgid "CH02 0900 0000 6071 8848 8" msgstr "" -#: hosting/templates/hosting/bill_detail.html:84 +#: templates/hosting/bill_detail.html:84 msgid "POFICHBEXXX" msgstr "" -#: hosting/templates/hosting/bills.html:12 +#: templates/hosting/bills.html:12 msgid "Customers" msgstr "Kunden" @@ -151,27 +149,31 @@ msgstr "Kunden" msgid "Name" msgstr "" -#: hosting/templates/hosting/bills.html:17 +#: templates/hosting/bills.html:17 msgid "Email" msgstr "" -#: hosting/templates/hosting/bills.html:28 +#: templates/hosting/bills.html:28 msgid "View Bill" msgstr "Rechnung anzeigen" -#: hosting/templates/hosting/bills.html:41 -#: hosting/templates/hosting/orders.html:83 -#: hosting/templates/hosting/virtual_machines.html:70 +#: templates/hosting/bills.html:41 templates/hosting/orders.html.py:83 +#: templates/hosting/virtual_machines.html:70 msgid "previous" msgstr "vorherige" -#: hosting/templates/hosting/bills.html:47 -#: hosting/templates/hosting/orders.html:89 -#: hosting/templates/hosting/virtual_machines.html:76 +#: templates/hosting/bills.html:47 templates/hosting/orders.html.py:89 +#: templates/hosting/virtual_machines.html:76 msgid "next" msgstr "nächste" -#: hosting/templates/hosting/confirm_reset_password.html:19 +#: templates/hosting/confirm_reset_password.html:10 +#: templates/hosting/login.html:9 templates/hosting/reset_password.html.py:9 +#: templates/hosting/signup.html:8 +msgid "Your VM hosted in Switzerland" +msgstr "Ihre VM in der Schweiz" + +#: templates/hosting/confirm_reset_password.html:14 msgid "Set your new password" msgstr "Setzen Ihr neues Passwort" @@ -206,40 +208,34 @@ msgstr "Wählen Sie eine Konfiguration" msgid "CHF/Month" msgstr "CHF/Monat" -#: hosting/templates/hosting/create_virtual_machine.html:45 +#: templates/hosting/create_virtual_machine.html:45 msgid "Start VM" msgstr "Start VM" -#: hosting/templates/hosting/emails/password_reset_email.html:2 -#: hosting/templates/hosting/emails/password_reset_email.txt:2 +#: templates/hosting/emails/password_reset_email.html:2 +#: templates/hosting/emails/password_reset_email.txt:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " "user account at %(site_name)s." msgstr "" -#: hosting/templates/hosting/emails/password_reset_email.html:4 -#: hosting/templates/hosting/emails/password_reset_email.txt:4 +#: templates/hosting/emails/password_reset_email.html:4 +#: templates/hosting/emails/password_reset_email.txt:4 msgid "Please go to the following page and choose a new password:" msgstr "" -#: hosting/templates/hosting/emails/password_reset_email.html:9 -#: hosting/templates/hosting/emails/password_reset_email.txt:9 +#: templates/hosting/emails/password_reset_email.html:9 +#: templates/hosting/emails/password_reset_email.txt:9 msgid "Thanks for using our site!" msgstr "" -#: hosting/templates/hosting/emails/password_reset_email.html:11 -#: hosting/templates/hosting/emails/password_reset_email.txt:11 +#: templates/hosting/emails/password_reset_email.html:11 +#: templates/hosting/emails/password_reset_email.txt:11 #, python-format msgid "The %(site_name)s team" msgstr "" -#: hosting/templates/hosting/login.html:10 -#: hosting/templates/hosting/reset_password.html:10 -#: hosting/templates/hosting/signup.html:9 -msgid "Your VM hosted in Switzerland" -msgstr "Ihre VM gehostet in der Schweiz" - #: hosting/templates/hosting/login.html:26 msgid "You haven been logged out" msgstr "Sie wurden abgmeldet" @@ -258,44 +254,44 @@ msgstr "Registrieren" msgid "Forgot your password ? " msgstr "Passwort vergessen?" -#: hosting/templates/hosting/notifications.html:9 +#: templates/hosting/notifications.html:9 msgid "Notifications" msgstr "Benachrichtigungen" -#: hosting/templates/hosting/notifications.html:16 +#: templates/hosting/notifications.html:16 msgid "Unread" msgstr "Ungelesen" -#: hosting/templates/hosting/notifications.html:26 +#: templates/hosting/notifications.html:26 msgid "All" msgstr "Alle" -#: hosting/templates/hosting/notifications.html:38 +#: templates/hosting/notifications.html:38 msgid "Unread notifications" msgstr "Ungelesene Benachrichtigungen" -#: hosting/templates/hosting/notifications.html:48 +#: templates/hosting/notifications.html:48 msgid "Mark as read" msgstr "Als gelesen markieren" -#: hosting/templates/hosting/notifications.html:59 +#: templates/hosting/notifications.html:59 msgid "All notifications" msgstr "Alle Benachrichtigungen" -#: hosting/templates/hosting/order_detail.html:16 -#: hosting/templates/hosting/order_detail.html:24 +#: templates/hosting/order_detail.html:16 +#: templates/hosting/order_detail.html:24 msgid "Billed To:" msgstr "" -#: hosting/templates/hosting/order_detail.html:26 +#: templates/hosting/order_detail.html:26 msgid "Status:" msgstr "" -#: hosting/templates/hosting/order_detail.html:38 +#: templates/hosting/order_detail.html:38 msgid "Payment Method:" msgstr "Bezahlmethode" -#: hosting/templates/hosting/order_detail.html:49 +#: templates/hosting/order_detail.html:49 msgid "Order summary" msgstr "Bestellungsübersicht" @@ -308,6 +304,8 @@ msgstr "Prozessorkerne" #: hosting/templates/hosting/order_detail.html:54 #: hosting/templates/hosting/payment.html:20 #: hosting/templates/hosting/virtual_machine_detail.html:81 +#: templates/hosting/order_detail.html:54 +#: templates/hosting/virtual_machine_detail.html:82 msgid "Memory" msgstr "Arbeitsspeicher" @@ -316,19 +314,19 @@ msgstr "Arbeitsspeicher" msgid "Disk space" msgstr "Festplattenkapazität" -#: hosting/templates/hosting/order_detail.html:58 +#: templates/hosting/order_detail.html:58 msgid "Total" msgstr "" -#: hosting/templates/hosting/order_detail.html:64 +#: templates/hosting/order_detail.html:64 msgid "Finish Configuration" msgstr "Konfiguration beenden" -#: hosting/templates/hosting/orders.html:17 +#: templates/hosting/orders.html:17 msgid "Date" msgstr "Datum" -#: hosting/templates/hosting/orders.html:18 +#: templates/hosting/orders.html:18 msgid "Amount" msgstr "Betrag" @@ -339,32 +337,31 @@ msgstr "Betrag" msgid "Status" msgstr "" -#: hosting/templates/hosting/orders.html:30 +#: templates/hosting/orders.html:30 msgid "Approved" msgstr "Akzeptiert" -#: hosting/templates/hosting/orders.html:32 +#: templates/hosting/orders.html:32 msgid "Declined" msgstr "Abgelehnt" -#: hosting/templates/hosting/orders.html:37 -#: hosting/templates/hosting/virtual_machines.html:58 +#: templates/hosting/orders.html:37 templates/hosting/virtual_machines.html:58 msgid "View Detail" msgstr "Details anzeigen" -#: hosting/templates/hosting/orders.html:41 +#: templates/hosting/orders.html:41 msgid "Cancel Order" msgstr "Bestellung stornieren" -#: hosting/templates/hosting/orders.html:56 +#: templates/hosting/orders.html:56 msgid "Do You want do delete your order?" msgstr "Wollen Sie ihre Bestellung löschen?" -#: hosting/templates/hosting/orders.html:64 +#: templates/hosting/orders.html:64 msgid "Close" msgstr "Schliessen" -#: hosting/templates/hosting/orders.html:66 +#: templates/hosting/orders.html:66 msgid "Delete" msgstr "Löschen" @@ -405,51 +402,51 @@ msgstr "CV Code" msgid "Reset your password" msgstr "Passwort zurücksetzen" -#: hosting/templates/hosting/virtual_machine_detail.html:19 +#: templates/hosting/virtual_machine_detail.html:19 msgid "Settings" msgstr "Einstellungen" -#: hosting/templates/hosting/virtual_machine_detail.html:25 +#: templates/hosting/virtual_machine_detail.html:25 msgid "Billing" msgstr "Abrechnungen" -#: hosting/templates/hosting/virtual_machine_detail.html:60 +#: templates/hosting/virtual_machine_detail.html:60 msgid "Ip not assigned yet" msgstr "Ip nicht zugewiesen" -#: hosting/templates/hosting/virtual_machine_detail.html:87 +#: templates/hosting/virtual_machine_detail.html:89 msgid "Disk" msgstr "Festplatte" -#: hosting/templates/hosting/virtual_machine_detail.html:96 +#: templates/hosting/virtual_machine_detail.html:98 msgid "Configuration" msgstr "Konfiguration" -#: hosting/templates/hosting/virtual_machine_detail.html:106 +#: templates/hosting/virtual_machine_detail.html:108 msgid "Current pricing" msgstr "Aktueller Preis" -#: hosting/templates/hosting/virtual_machine_detail.html:115 +#: templates/hosting/virtual_machine_detail.html:117 msgid "Current status" msgstr "Aktueller Status" -#: hosting/templates/hosting/virtual_machine_detail.html:140 +#: templates/hosting/virtual_machine_detail.html:142 msgid "Terminate Virtual Machine" msgstr "Virtuelle Maschine beenden" -#: hosting/templates/hosting/virtual_machine_detail.html:161 +#: templates/hosting/virtual_machine_detail.html:163 msgid "Terminate your Virtual Machine" msgstr "Ihre virtuelle Maschine beenden" -#: hosting/templates/hosting/virtual_machine_detail.html:164 +#: templates/hosting/virtual_machine_detail.html:166 msgid "Are you sure do you want to cancel your Virtual Machine " msgstr "Sind Sie sicher, dass Sie ihre virtuelle Maschine beenden wollen " -#: hosting/templates/hosting/virtual_machine_detail.html:167 +#: templates/hosting/virtual_machine_detail.html:169 msgid "Cancel" msgstr "Beenden" -#: hosting/templates/hosting/virtual_machine_key.html:11 +#: templates/hosting/virtual_machine_key.html:11 msgid "Access Key" msgstr "Zugriffsschlüssel" @@ -511,22 +508,22 @@ msgstr "" msgid "Generate my key" msgstr "Generiere meinen Schlüssel" -#: hosting/templates/hosting/virtual_machines.html:9 +#: templates/hosting/virtual_machines.html:9 msgid "Virtual Machines" msgstr "Virtuelle Maschinen" -#: hosting/templates/hosting/virtual_machines.html:22 +#: templates/hosting/virtual_machines.html:22 msgid "Create VM" msgstr "Neue VM" -#: hosting/templates/hosting/virtual_machines.html:28 +#: templates/hosting/virtual_machines.html:28 msgid "ID" msgstr "" -#: hosting/templates/hosting/virtual_machines.html:29 +#: templates/hosting/virtual_machines.html:29 msgid "Ipv4" msgstr "" -#: hosting/templates/hosting/virtual_machines.html:30 +#: templates/hosting/virtual_machines.html:30 msgid "Ipv6" msgstr "" diff --git a/hosting/static/hosting/css/commons.css b/hosting/static/hosting/css/commons.css index 234b680f..15020543 100644 --- a/hosting/static/hosting/css/commons.css +++ b/hosting/static/hosting/css/commons.css @@ -1,7 +1,20 @@ .dashboard-container { - padding-top:70px; padding-bottom: 11%; + padding-top:70px; padding-bottom: 70px; } +.content-dashboard{ + height: 100vh; + width: 80%; + margin: 0 auto; + max-width: 1120px; +} +.container-table{ + margin-top: 35px; + overflow-y: hidden; +} +.container-table table{ + overflow-y: auto; +} .borderless td { border: none !important; } @@ -26,3 +39,19 @@ .space-above-big { margin-top: 20%; } + +.table>tbody>tr>td{ + vertical-align: middle; +} +.fa-separate{ + margin-right: 15px; +} +@media (max-width: 540px) { + select { + width: 280px; + } + .content-dashboard { + width: 90%; + } +} + diff --git a/hosting/static/hosting/css/landing-page.css b/hosting/static/hosting/css/landing-page.css index 5d4c6a90..d8812ec7 100644 --- a/hosting/static/hosting/css/landing-page.css +++ b/hosting/static/hosting/css/landing-page.css @@ -4,22 +4,20 @@ * For details, see http://www.apache.org/licenses/LICENSE-2.0. */ + @font-face { - font-family: 'Montserrat-Regular'; - src: url('../fonts/Montserrat/Montserrat-Regular.ttf'); + font-family: 'Lato-Regular'; + src: url('../fonts/Lato/Lato-Regular.ttf'); } @font-face { - font-family: 'Montserrat-Bold'; - src: url('../fonts/Montserrat/Montserrat-Bold.ttf'); + font-family: 'Lato-Black'; + src: url('../fonts/Lato/Lato-Black.ttf'); } @font-face { - font-family: 'Montserrat-Medium'; - src: url('../fonts/Montserrat/Montserrat-Medium.ttf'); -} -@font-face { - font-family: 'Montserrat-Light'; - src: url('../fonts/Montserrat/Montserrat-Light.ttf'); + font-family: 'Lato-Light'; + src: url('../fonts/Lato/Lato-Light.ttf'); } + body, html { width: 100%; @@ -33,8 +31,8 @@ h3, h4, h5, h6 { - font-family: 'Montserrat-Regular', sans-serif; - font-weight: 700; + font-family: 'Lato-Regular', sans-serif; + font-weight: 300; } .topnav { font-size: 14px; @@ -226,18 +224,24 @@ h6 { z-index: 1000; } .auth-container .auth-content{ - width: 80%; + width: 100%; margin: 0 auto; max-width: 390px; - margin-top: 60px; - } +.auth-container .auth-center{ + position: absolute; + left: 50%; + top: 50%; + transform: translate(-50%,-50%); + width: 100%; +} + .auth-container .auth-title{ - margin-top: 40px; + margin-bottom: 50px; } .auth-container .auth-title h2{ color: #fff; - font-family: 'Montserrat-Bold'; + font-family: 'Lato-Black'; font-size: 44px; text-align: center; width: 425px; @@ -276,7 +280,7 @@ h6 { font-size: 20px; border-radius: 3px 3px 0px 0px; margin: 0 auto; - font-family: 'Montserrat-Medium'; + font-family: 'Lato-Black'; } .auth-box .form{ padding: 20px; @@ -340,6 +344,19 @@ h6 { ul.banner-social-buttons > li:last-child { margin-bottom: 0; } + .auth-box .form { + padding: 15px 0px 0 0; + } + .auth-box.sign-up .form { + padding: 15px 0px 0 0; + } + .auth-box .form .form-control { + height: 44px; + font-size: 13px; + } + .auth-container .auth-title { + display: none; + } } @media (max-width: 540px) { .auth-container .auth-title h2{ @@ -347,9 +364,16 @@ h6 { width: 90%; margin-bottom: 50px; } - .auth-box .form { - padding: 15px; + .auth-container.auth-signup .auth-title h2{ + font-size: 20px; width: 90%; + margin-bottom: 50px; + } + .auth-box .form { + width: 90%; + } + .auth-box .section-heading { + font-size: 15px; } } footer { diff --git a/hosting/static/hosting/css/order.css b/hosting/static/hosting/css/order.css index 2abc47db..e8bc0328 100644 --- a/hosting/static/hosting/css/order.css +++ b/hosting/static/hosting/css/order.css @@ -1,4 +1,4 @@ -.order-detail-container {padding-top: 70px; padding-bottom: 11%;} +.order-detail-container {padding-top: 70px; padding-bottom: 70px; margin-bottom: 70px;} .order-detail-container .invoice-title h2, .invoice-title h3 { display: inline-block; diff --git a/hosting/static/hosting/css/virtual-machine.css b/hosting/static/hosting/css/virtual-machine.css index b5cd27f4..aaf5c6aa 100644 --- a/hosting/static/hosting/css/virtual-machine.css +++ b/hosting/static/hosting/css/virtual-machine.css @@ -43,4 +43,38 @@ .virtual-machine-container .right-place{ margin-top: 15px; +} +.virtual-machine-container .separate-md{ + margin-top: 35px; +} +.virtual-machine-container .box-setting{ + height: 100px; + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; +} +.virtual-machine-container .box-setting .label-success{ + padding-top: 4px; +} + +@media (max-width: 990px) { + .virtual-machine-container .tabs-left { + border-right: 0; + } + .virtual-machine-container .tabs-left>li.active>a, + .virtual-machine-container .tabs-left>li.active>a:hover, + .virtual-machine-container .tabs-left>li.active>a:focus { + border: 1px solid #ddd; + } + .virtual-machine-container .tabs-left>li>a { + border-radius: 4px; + margin-right: 0; + display:block; + } +} +@media (max-width: 420px) { + .btn-create-vm { + float: left !important; + } } \ No newline at end of file diff --git a/hosting/static/hosting/fonts/Lato/Lato-Black.ttf b/hosting/static/hosting/fonts/Lato/Lato-Black.ttf new file mode 100755 index 00000000..6848db0d Binary files /dev/null and b/hosting/static/hosting/fonts/Lato/Lato-Black.ttf differ diff --git a/hosting/static/hosting/fonts/Lato/Lato-BlackItalic.ttf b/hosting/static/hosting/fonts/Lato/Lato-BlackItalic.ttf new file mode 100755 index 00000000..5decf129 Binary files /dev/null and b/hosting/static/hosting/fonts/Lato/Lato-BlackItalic.ttf differ diff --git a/hosting/static/hosting/fonts/Lato/Lato-Bold.ttf b/hosting/static/hosting/fonts/Lato/Lato-Bold.ttf new file mode 100755 index 00000000..74343694 Binary files /dev/null and b/hosting/static/hosting/fonts/Lato/Lato-Bold.ttf differ diff --git a/hosting/static/hosting/fonts/Lato/Lato-BoldItalic.ttf b/hosting/static/hosting/fonts/Lato/Lato-BoldItalic.ttf new file mode 100755 index 00000000..684aacf5 Binary files /dev/null and b/hosting/static/hosting/fonts/Lato/Lato-BoldItalic.ttf differ diff --git a/hosting/static/hosting/fonts/Lato/Lato-Hairline.ttf b/hosting/static/hosting/fonts/Lato/Lato-Hairline.ttf new file mode 100755 index 00000000..288be295 Binary files /dev/null and b/hosting/static/hosting/fonts/Lato/Lato-Hairline.ttf differ diff --git a/hosting/static/hosting/fonts/Lato/Lato-HairlineItalic.ttf b/hosting/static/hosting/fonts/Lato/Lato-HairlineItalic.ttf new file mode 100755 index 00000000..c2bfd335 Binary files /dev/null and b/hosting/static/hosting/fonts/Lato/Lato-HairlineItalic.ttf differ diff --git a/hosting/static/hosting/fonts/Lato/Lato-Italic.ttf b/hosting/static/hosting/fonts/Lato/Lato-Italic.ttf new file mode 100755 index 00000000..3d3b7a29 Binary files /dev/null and b/hosting/static/hosting/fonts/Lato/Lato-Italic.ttf differ diff --git a/hosting/static/hosting/fonts/Lato/Lato-Light.ttf b/hosting/static/hosting/fonts/Lato/Lato-Light.ttf new file mode 100755 index 00000000..a958067a Binary files /dev/null and b/hosting/static/hosting/fonts/Lato/Lato-Light.ttf differ diff --git a/hosting/static/hosting/fonts/Lato/Lato-LightItalic.ttf b/hosting/static/hosting/fonts/Lato/Lato-LightItalic.ttf new file mode 100755 index 00000000..5e45ad9a Binary files /dev/null and b/hosting/static/hosting/fonts/Lato/Lato-LightItalic.ttf differ diff --git a/hosting/static/hosting/fonts/Lato/Lato-Regular.ttf b/hosting/static/hosting/fonts/Lato/Lato-Regular.ttf new file mode 100755 index 00000000..04ea8efb Binary files /dev/null and b/hosting/static/hosting/fonts/Lato/Lato-Regular.ttf differ diff --git a/hosting/static/hosting/fonts/Lato/OFL.txt b/hosting/static/hosting/fonts/Lato/OFL.txt new file mode 100755 index 00000000..f8ca7bc3 --- /dev/null +++ b/hosting/static/hosting/fonts/Lato/OFL.txt @@ -0,0 +1,92 @@ +Copyright (c) 2010-2014 by tyPoland Lukasz Dziedzic (team@latofonts.com) with Reserved Font Name "Lato" +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/hosting/templates/hosting/base_short.html b/hosting/templates/hosting/base_short.html index 6eda1870..75122bbb 100644 --- a/hosting/templates/hosting/base_short.html +++ b/hosting/templates/hosting/base_short.html @@ -119,51 +119,16 @@ {% endif %} - - - {% block content %} - {% endblock %} +
+ {% block content %} + {% endblock %} +
{% if request.user.is_authenticated %} {% endif %} diff --git a/hosting/templates/hosting/bill_detail.html b/hosting/templates/hosting/bill_detail.html index e34b2f11..f871e5ed 100644 --- a/hosting/templates/hosting/bill_detail.html +++ b/hosting/templates/hosting/bill_detail.html @@ -3,7 +3,7 @@ {% load i18n %} {% block content %} -
+
{# Adress bar #}
diff --git a/hosting/templates/hosting/bill_error.html b/hosting/templates/hosting/bill_error.html index 5374ecb5..b9edf86b 100644 --- a/hosting/templates/hosting/bill_error.html +++ b/hosting/templates/hosting/bill_error.html @@ -3,8 +3,8 @@ {% load i18n %} {% block content %} -
-
+
+

Error

Could not get HostingBill object for client.

Please create a HostingBill object via the admin page

diff --git a/hosting/templates/hosting/bills.html b/hosting/templates/hosting/bills.html index 1e789e12..770886f6 100644 --- a/hosting/templates/hosting/bills.html +++ b/hosting/templates/hosting/bills.html @@ -5,7 +5,7 @@ {% block content %}
-
+
diff --git a/hosting/templates/hosting/confirm_reset_password.html b/hosting/templates/hosting/confirm_reset_password.html index ce4f3ba3..c11ae931 100644 --- a/hosting/templates/hosting/confirm_reset_password.html +++ b/hosting/templates/hosting/confirm_reset_password.html @@ -3,11 +3,15 @@ {% load i18n %} {% block content %} -
-
-
 
-
-
+
+
+
+
+

{% trans "Your VM hosted in Switzerland"%}

+
+
+ +
+
+ {% trans "Already have an account ?"%} +
+
+ {% trans "Login"%} +
+
+
+
-
+
{% endblock %} diff --git a/hosting/templates/hosting/create_virtual_machine.html b/hosting/templates/hosting/create_virtual_machine.html index b2257934..aeb8bab3 100644 --- a/hosting/templates/hosting/create_virtual_machine.html +++ b/hosting/templates/hosting/create_virtual_machine.html @@ -16,7 +16,7 @@ {% endif %}
{% if not error %} -

{% trans "New Virtual Machine"%}

+

{% trans "New Virtual Machine"%}

{% csrf_token %} diff --git a/hosting/templates/hosting/login.html b/hosting/templates/hosting/login.html index e06099bd..9749b280 100644 --- a/hosting/templates/hosting/login.html +++ b/hosting/templates/hosting/login.html @@ -5,7 +5,9 @@
-
+ +
+

{% trans "Your VM hosted in Switzerland"%}

@@ -55,9 +57,8 @@
+
- - {% endblock %} diff --git a/hosting/templates/hosting/notifications.html b/hosting/templates/hosting/notifications.html index 6ba7977a..e0abb809 100644 --- a/hosting/templates/hosting/notifications.html +++ b/hosting/templates/hosting/notifications.html @@ -2,11 +2,11 @@ {% load staticfiles bootstrap3 i18n %} {% block content %}
-
+
-

{% trans "Notifications"%}

+

{% trans "Notifications"%}

diff --git a/hosting/templates/hosting/order_detail.html b/hosting/templates/hosting/order_detail.html index 7b63c927..7705a006 100644 --- a/hosting/templates/hosting/order_detail.html +++ b/hosting/templates/hosting/order_detail.html @@ -3,9 +3,9 @@ {% load i18n %} {% block content %} -
+
-
+

{% trans "Invoice"%}

{% trans "Order #"%} {{order.id}}

diff --git a/hosting/templates/hosting/orders.html b/hosting/templates/hosting/orders.html index d4a03fe8..42b77e88 100644 --- a/hosting/templates/hosting/orders.html +++ b/hosting/templates/hosting/orders.html @@ -5,11 +5,11 @@ {% block content %}
-
+
-
+
-

{% trans "My Orders"%}

+

{% trans "My Orders"%}


diff --git a/hosting/templates/hosting/payment.html b/hosting/templates/hosting/payment.html index b6af6f5f..db45c282 100644 --- a/hosting/templates/hosting/payment.html +++ b/hosting/templates/hosting/payment.html @@ -3,7 +3,7 @@ {% block content %}
-
+
diff --git a/hosting/templates/hosting/reset_password.html b/hosting/templates/hosting/reset_password.html index 63f1a669..1590a5bd 100644 --- a/hosting/templates/hosting/reset_password.html +++ b/hosting/templates/hosting/reset_password.html @@ -5,7 +5,7 @@ {% block content %}
-
+

{% trans "Your VM hosted in Switzerland"%}

@@ -32,7 +32,7 @@
+
-
{% endblock %} diff --git a/hosting/templates/hosting/signup.html b/hosting/templates/hosting/signup.html index 6cbb2969..959cf346 100644 --- a/hosting/templates/hosting/signup.html +++ b/hosting/templates/hosting/signup.html @@ -2,9 +2,9 @@ {% load staticfiles bootstrap3 i18n %} {% block content %} -
+ +
+
- {% endblock %} diff --git a/hosting/templates/hosting/user_key.html b/hosting/templates/hosting/user_key.html index b81e0fbb..3386732d 100644 --- a/hosting/templates/hosting/user_key.html +++ b/hosting/templates/hosting/user_key.html @@ -2,13 +2,13 @@ {% load staticfiles bootstrap3 i18n %} {% block content %}
-
+
-
+
{% csrf_token %} -

{% trans "Access Key"%}

+

{% trans "Access Key"%}

{% if messages %}
{% for message in messages %} diff --git a/hosting/templates/hosting/virtual_machine_detail.html b/hosting/templates/hosting/virtual_machine_detail.html index 794f8ede..11f0e4ba 100644 --- a/hosting/templates/hosting/virtual_machine_detail.html +++ b/hosting/templates/hosting/virtual_machine_detail.html @@ -4,11 +4,11 @@ {% block content %}
-
+
-

{{virtual_machine.name}}

+

{{virtual_machine.name}}

@@ -71,20 +71,22 @@
-
- {% trans "Cores"%}
+
+ + {% trans "Cores"%} {{virtual_machine.cores}}
-
+
{% trans "Memory"%}
{{virtual_machine.memory}} GiB
-
- {% trans "Disk"%}
+
+ + {% trans "Disk"%} {{virtual_machine.disk_size|floatformat:2}} GiB
@@ -130,7 +132,7 @@
{% if not virtual_machine.status == 'canceled' %}
-
+
diff --git a/hosting/templates/hosting/virtual_machines.html b/hosting/templates/hosting/virtual_machines.html index f71dac2a..2c0949af 100644 --- a/hosting/templates/hosting/virtual_machines.html +++ b/hosting/templates/hosting/virtual_machines.html @@ -2,11 +2,11 @@ {% load staticfiles bootstrap3 i18n %} {% block content %}
-
+
-
+
-

{% trans "Virtual Machines"%}

+

{% trans "Virtual Machines"%}


{% if messages %} @@ -18,7 +18,7 @@ {% endif %}
{% if not error %} -

+

{% trans "Create VM"%}