Resolved conflicts
This commit is contained in:
PCoder
commit
94bc552f75
26 changed files with 1114 additions and 599 deletions
|
|
@ -8,7 +8,7 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2017-07-31 18:27+0000\n"
|
||||
"POT-Creation-Date: 2017-08-03 03:10+0530\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
|
|
@ -18,23 +18,18 @@ msgstr ""
|
|||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
|
||||
|
||||
#: templates/datacenterlight/beta_access.html:13
|
||||
msgid "Enter name"
|
||||
msgstr "Name"
|
||||
|
||||
#: templates/datacenterlight/beta_access.html:17
|
||||
msgid "Enter email"
|
||||
msgstr "E-Mail-Adresse"
|
||||
|
||||
#: templates/datacenterlight/beta_access.html:21
|
||||
msgid "Request Beta Access"
|
||||
msgstr "Beantrage Beta-Zugang"
|
||||
|
||||
#: templates/datacenterlight/beta_success.html:10
|
||||
msgid "Request Sent"
|
||||
msgstr "Anfrage verschickt"
|
||||
|
||||
#: templates/datacenterlight/beta_success.html:13
|
||||
msgid ""
|
||||
"Thank you for your subscription! You will receive a confirmation mail from "
|
||||
"our team"
|
||||
|
|
@ -42,91 +37,64 @@ msgstr ""
|
|||
"Vielen dank für Ihre Anmeldung. Sie erhalten in kürze eine Bestätigungsmail "
|
||||
"von unserem Team"
|
||||
|
||||
#: templates/datacenterlight/calculator_form.html:5
|
||||
#: templates/datacenterlight/pricing.html:22
|
||||
msgid "VM hosting"
|
||||
msgstr ""
|
||||
|
||||
#: templates/datacenterlight/calculator_form.html:9
|
||||
msgid "month"
|
||||
msgstr "Monat"
|
||||
|
||||
#: templates/datacenterlight/calculator_form.html:11
|
||||
#: templates/datacenterlight/pricing.html:28
|
||||
msgid "VAT included"
|
||||
msgstr "MwSt. inklusive"
|
||||
|
||||
#: templates/datacenterlight/calculator_form.html:16
|
||||
#: templates/datacenterlight/pricing.html:33
|
||||
msgid "Hosted in Switzerland"
|
||||
msgstr "Standort: Schweiz"
|
||||
|
||||
#: templates/datacenterlight/calculator_form.html:22
|
||||
msgid "Please enter a value in range 1 - 48."
|
||||
msgstr "Bitte gib einen Wert von 1 bis 48 ein."
|
||||
|
||||
#: templates/datacenterlight/calculator_form.html:40
|
||||
msgid "Please enter a value in range 2 - 200."
|
||||
msgstr "Bitte gib einen Wert von 2 bis 200 ein."
|
||||
|
||||
#: templates/datacenterlight/calculator_form.html:58
|
||||
msgid "Please enter a value in range 10 - 2000."
|
||||
msgstr "Bitte gib einen Wert von 10 bis 200 ein."
|
||||
|
||||
#: templates/datacenterlight/calculator_form.html:59
|
||||
#: templates/datacenterlight/pricing.html:50
|
||||
msgid "GB Storage (SSD)"
|
||||
msgstr "GB Storage (SSD)"
|
||||
|
||||
#: templates/datacenterlight/calculator_form.html:86
|
||||
msgid "Name"
|
||||
msgstr ""
|
||||
|
||||
#: templates/datacenterlight/calculator_form.html:87
|
||||
msgid "Your Name"
|
||||
msgstr "Dein Name"
|
||||
|
||||
#: templates/datacenterlight/calculator_form.html:88
|
||||
msgid "Please enter your name."
|
||||
msgstr "Bitte gib Deinen Namen ein."
|
||||
|
||||
#: templates/datacenterlight/calculator_form.html:104
|
||||
msgid "Email"
|
||||
msgstr "E-Mail-Adresse"
|
||||
|
||||
#: templates/datacenterlight/calculator_form.html:106
|
||||
msgid "Your Email"
|
||||
msgstr "Deine E-Mail"
|
||||
|
||||
#: templates/datacenterlight/calculator_form.html:107
|
||||
msgid "Please enter a valid email address."
|
||||
msgstr "Bitte gib eine gültige E-Mailadresse ein."
|
||||
|
||||
#: templates/datacenterlight/calculator_form.html:122
|
||||
msgid "Continue"
|
||||
msgstr "Weiter"
|
||||
|
||||
#: 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."
|
||||
|
||||
#: 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!"
|
||||
|
||||
#: 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."
|
||||
|
||||
#: 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<br/> until our "
|
||||
"team contacts you with beta access."
|
||||
|
|
@ -134,17 +102,12 @@ msgstr ""
|
|||
"Wir werden dann sobald als möglich Ihren Beta-Zugang erstellen und Sie "
|
||||
"daraufhin kontaktieren.Bis dahin bitten wir Sie um etwas Geduld."
|
||||
|
||||
#: templates/datacenterlight/emails/request_access_confirmation.html:107
|
||||
#: templates/datacenterlight/emails/request_access_confirmation.txt:107
|
||||
msgid "Thank you!"
|
||||
msgstr "Vielen Dank!"
|
||||
|
||||
#: templates/datacenterlight/emails/user_activation.html:99
|
||||
#: templates/datacenterlight/emails/user_activation.txt:3
|
||||
msgid "account activation"
|
||||
msgstr "Accountaktivierung"
|
||||
|
||||
#: templates/datacenterlight/emails/user_activation.html:105
|
||||
#, python-format
|
||||
msgid ""
|
||||
"\n"
|
||||
|
|
@ -165,17 +128,12 @@ msgstr ""
|
|||
" %(base_url)s%(activation_link)s\n"
|
||||
" "
|
||||
|
||||
#: templates/datacenterlight/emails/user_activation.html:123
|
||||
#: templates/datacenterlight/emails/user_activation.txt:11
|
||||
msgid "Your"
|
||||
msgstr "Dein"
|
||||
|
||||
#: templates/datacenterlight/emails/user_activation.html:123
|
||||
#: templates/datacenterlight/emails/user_activation.txt:11
|
||||
msgid "team"
|
||||
msgstr "Team"
|
||||
|
||||
#: templates/datacenterlight/emails/user_activation.txt:5
|
||||
#, python-format
|
||||
msgid ""
|
||||
"\n"
|
||||
|
|
@ -190,79 +148,50 @@ msgstr ""
|
|||
"Du kannst deinen %(dcl_text)s Account aktivieren, indem du hier klickst "
|
||||
"%(base_url)s%(activation_link)s\n"
|
||||
|
||||
#: templates/datacenterlight/includes/_footer.html:11
|
||||
#: templates/datacenterlight/includes/_footer.html:31
|
||||
#: templates/datacenterlight/includes/_navbar.html:25
|
||||
#: templates/datacenterlight/includes/_navbar.html:26
|
||||
#: templates/datacenterlight/index.html:19
|
||||
#: templates/datacenterlight/index.html:46
|
||||
msgid "Highlights"
|
||||
msgstr ""
|
||||
|
||||
#: templates/datacenterlight/includes/_footer.html:14
|
||||
#: templates/datacenterlight/includes/_footer.html:34
|
||||
#: templates/datacenterlight/includes/_navbar.html:28
|
||||
#: templates/datacenterlight/index.html:85
|
||||
msgid "Scale out"
|
||||
msgstr "Skalierung"
|
||||
|
||||
#: templates/datacenterlight/includes/_footer.html:17
|
||||
#: templates/datacenterlight/includes/_footer.html:37
|
||||
#: templates/datacenterlight/includes/_navbar.html:29
|
||||
#: templates/datacenterlight/index.html:111
|
||||
msgid "Reliable and light"
|
||||
msgstr "Zuverlässig und leicht"
|
||||
|
||||
#: templates/datacenterlight/includes/_footer.html:20
|
||||
#: templates/datacenterlight/includes/_navbar.html:30
|
||||
msgid "Order VM"
|
||||
msgstr "VM bestellen"
|
||||
|
||||
#: templates/datacenterlight/includes/_footer.html:23
|
||||
#: templates/datacenterlight/includes/_footer.html:44
|
||||
#: templates/datacenterlight/includes/_navbar.html:37
|
||||
msgid "Contact"
|
||||
msgstr "Kontakt"
|
||||
|
||||
#: templates/datacenterlight/includes/_footer.html:27
|
||||
msgid "Home"
|
||||
msgstr "Home"
|
||||
|
||||
#: templates/datacenterlight/includes/_footer.html:40
|
||||
msgid "Pricing"
|
||||
msgstr "Preise"
|
||||
|
||||
#: templates/datacenterlight/includes/_footer.html:49
|
||||
msgid "All Rights Reserved"
|
||||
msgstr "Alle Rechte vorbehalten"
|
||||
|
||||
#: templates/datacenterlight/includes/_navbar.html:34
|
||||
#: templates/datacenterlight/whydatacenterlight.html:12
|
||||
msgid "Why Data Center Light?"
|
||||
msgstr "Warum Data Center Light?"
|
||||
|
||||
#: templates/datacenterlight/index.html:15
|
||||
msgid "Finally, an affordable VM hosting in Switzerland!"
|
||||
msgstr "Endlich: bezahlbares VM Hosting in der Schweiz"
|
||||
|
||||
#: templates/datacenterlight/index.html:22
|
||||
msgid "I want it!"
|
||||
msgstr "Das will ich haben!"
|
||||
|
||||
#: templates/datacenterlight/index.html:52
|
||||
msgid ""
|
||||
"Reuses existing factory halls instead of building a new expensive building."
|
||||
msgstr ""
|
||||
"Verwendet ehemalige Fabrikhallen anstatt ein neues, teures Gebäude zu "
|
||||
"errichten.
"
|
||||
|
||||
#: templates/datacenterlight/index.html:57
|
||||
msgid "Only wants you to pay for what you actually need."
|
||||
msgstr ""
|
||||
"Möchte, dass du nur bezahlst, was du auch wirklich brauchst: Wähle deine "
|
||||
"Ressourcen individuell aus!
"
|
||||
|
||||
#: templates/datacenterlight/index.html:61
|
||||
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."
|
||||
|
|
@ -271,7 +200,6 @@ msgstr ""
|
|||
"macht um Nachhaltigkeit zu fördern und somit erschwingliche Preise bieten zu "
|
||||
"können.
"
|
||||
|
||||
#: templates/datacenterlight/index.html:65
|
||||
msgid ""
|
||||
"Cuts down the costs for you by using FOSS (Free Open Source Software) "
|
||||
"exclusively, wherefore we can save money from paying licenses."
|
||||
|
|
@ -280,7 +208,6 @@ msgstr ""
|
|||
"mit FOSS (Free Open Source Software) arbeitet und wir daher auf "
|
||||
"Lizenzgebühren verzichten können.
"
|
||||
|
||||
#: templates/datacenterlight/index.html:88
|
||||
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 "
|
||||
|
|
@ -290,7 +217,6 @@ msgstr ""
|
|||
"erschwingliche Systeme. Bei grösserer Auslastung werden mehr "
|
||||
"Standardkomponenten hinzugekauft und skalieren so das Datencenter."
|
||||
|
||||
#: templates/datacenterlight/index.html:114
|
||||
msgid ""
|
||||
"Our VMs are located in Switzerland, with reliable power supply and fast "
|
||||
"internet connection. Our VM costs less thanks to our featherlight "
|
||||
|
|
@ -300,86 +226,65 @@ msgstr ""
|
|||
"Energieversorgung, sowie schneller Internetverbindung ausgestattet. Unser "
|
||||
"Angebot ist aufgrund unserer leichten Infrastruktur überaus kostengünstig."
|
||||
|
||||
#: templates/datacenterlight/index.html:132
|
||||
#: templates/datacenterlight/pricing.html:86
|
||||
msgid "Simple and affordable: Try our virtual machine with featherlight price."
|
||||
msgstr ""
|
||||
"Einfach und bezahlbar: Teste nun unsere virtuellen Maschinen mit "
|
||||
"federleichten Preisen."
|
||||
|
||||
#: templates/datacenterlight/index.html:133
|
||||
msgid "Affordable VM hosting based in Switzerland"
|
||||
msgstr "Bezahlbares VM Hosting in der Schweiz"
|
||||
|
||||
#: templates/datacenterlight/index.html:166
|
||||
msgid "Switzerland "
|
||||
msgstr "Schweiz"
|
||||
|
||||
#: templates/datacenterlight/index.html:177
|
||||
msgid "Questions?"
|
||||
msgstr "Fragen?"
|
||||
|
||||
#: templates/datacenterlight/index.html:177
|
||||
msgid "Contact us!"
|
||||
msgstr "Kontaktiere uns!"
|
||||
|
||||
#: templates/datacenterlight/order_detail.html:24
|
||||
msgid "Confirm Order"
|
||||
msgstr "Bestellung Bestätigen"
|
||||
|
||||
#: templates/datacenterlight/order_detail.html:30
|
||||
msgid "Date"
|
||||
msgstr "Datum"
|
||||
|
||||
#: templates/datacenterlight/order_detail.html:36
|
||||
msgid "Billed To:"
|
||||
msgstr "Rechnungsadresse"
|
||||
|
||||
#: templates/datacenterlight/order_detail.html:47
|
||||
msgid "Payment Method:"
|
||||
msgstr "Bezahlmethode"
|
||||
|
||||
#: templates/datacenterlight/order_detail.html:48
|
||||
msgid "ending"
|
||||
msgstr "endend in"
|
||||
|
||||
#: templates/datacenterlight/order_detail.html:58
|
||||
msgid "Order summary"
|
||||
msgstr "Bestellungsübersicht"
|
||||
|
||||
#: templates/datacenterlight/order_detail.html:62
|
||||
msgid "Cores"
|
||||
msgstr "Prozessorkerne"
|
||||
|
||||
#: templates/datacenterlight/order_detail.html:64
|
||||
msgid "Memory"
|
||||
msgstr "Arbeitsspeicher"
|
||||
|
||||
#: templates/datacenterlight/order_detail.html:66
|
||||
msgid "Disk space"
|
||||
msgstr "Festplattenkapazität"
|
||||
|
||||
#: templates/datacenterlight/order_detail.html:68
|
||||
msgid "Configuration"
|
||||
msgstr "Konfiguration"
|
||||
|
||||
#: templates/datacenterlight/order_detail.html:70
|
||||
msgid "Total"
|
||||
msgstr ""
|
||||
|
||||
#: templates/datacenterlight/order_detail.html:77
|
||||
msgid "Place order"
|
||||
msgstr "Bestellen"
|
||||
|
||||
#: templates/datacenterlight/pricing.html:9
|
||||
msgid "We are cutting down the costs significantly!"
|
||||
msgstr "Wir sorgen dafür, dass die Kosten für Dich signifikant abnehmen"
|
||||
|
||||
#: templates/datacenterlight/pricing.html:79
|
||||
msgid "Order Now!"
|
||||
msgstr "Bestelle jetzt!"
|
||||
|
||||
#: templates/datacenterlight/pricing.html:89
|
||||
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 "
|
||||
|
|
@ -395,25 +300,20 @@ msgstr ""
|
|||
"uns unter support@datacenterlight.ch. Unser Team wird sich umgehend um dein "
|
||||
"Anliegen kümmern!"
|
||||
|
||||
#: templates/datacenterlight/success.html:8
|
||||
msgid "Thank you for order! Our team will contact you via email"
|
||||
msgstr ""
|
||||
"Vielen Dank für die Bestellung. Unser Team setzt sich sobald wie möglich mit "
|
||||
"Ihnen via E-Mail in Verbindung."
|
||||
|
||||
#: templates/datacenterlight/success.html:10
|
||||
msgid "as soon as possible!"
|
||||
msgstr ""
|
||||
|
||||
#: templates/datacenterlight/whydatacenterlight.html:26
|
||||
msgid "Tech Stack"
|
||||
msgstr "Tech Stack"
|
||||
|
||||
#: templates/datacenterlight/whydatacenterlight.html:29
|
||||
msgid "We are seriously open source."
|
||||
msgstr "Wir sind vollends opensource."
|
||||
|
||||
#: templates/datacenterlight/whydatacenterlight.html:30
|
||||
msgid ""
|
||||
" Our full software stack is open source – We don't use anything that isn't "
|
||||
"open source. <br>Yes, we are that cool. "
|
||||
|
|
@ -421,43 +321,33 @@ msgstr ""
|
|||
"Unser gesamter Softwaresstack ist Open-Source – Wir verwenden nichts, das "
|
||||
"nicht Open-Source ist.<br/>Yep, so cool sind wir."
|
||||
|
||||
#: templates/datacenterlight/whydatacenterlight.html:37
|
||||
msgid "Our services run on"
|
||||
msgstr "Unsere Dienste läuft auf"
|
||||
|
||||
#: templates/datacenterlight/whydatacenterlight.html:41
|
||||
msgid "Our monitoring"
|
||||
msgstr "Unser Monitoring"
|
||||
|
||||
#: templates/datacenterlight/whydatacenterlight.html:45
|
||||
msgid "Our storage layer"
|
||||
msgstr "Unser Storage-Layer"
|
||||
|
||||
#: templates/datacenterlight/whydatacenterlight.html:49
|
||||
msgid "Our web frontend"
|
||||
msgstr "Unser Web-Frontend"
|
||||
|
||||
#: templates/datacenterlight/whydatacenterlight.html:53
|
||||
msgid "Our cloud"
|
||||
msgstr "Unsere Cloud"
|
||||
|
||||
#: templates/datacenterlight/whydatacenterlight.html:57
|
||||
msgid "Our configuration management system"
|
||||
msgstr "Unser Konfigurationsmanagementsystem"
|
||||
|
||||
#: templates/datacenterlight/whydatacenterlight.html:61
|
||||
msgid "Our awesome juice"
|
||||
msgstr "Unser Treibstoff"
|
||||
|
||||
#: templates/datacenterlight/whydatacenterlight.html:65
|
||||
msgid "Our NAT64 gateway"
|
||||
msgstr "Unser NAT64 Gateway"
|
||||
|
||||
#: templates/datacenterlight/whydatacenterlight.html:90
|
||||
msgid "We believe in giving back to the FOSS community."
|
||||
msgstr "Wir unterstützen die FOSS Community."
|
||||
|
||||
#: templates/datacenterlight/whydatacenterlight.html:91
|
||||
msgid ""
|
||||
"Data Center Light is the child of free and open source software (FOSS) "
|
||||
"movement. <br>We grew up with it, live by it, and believe in it.<br> The "
|
||||
|
|
@ -469,22 +359,18 @@ msgstr ""
|
|||
"<br/> Je weiter wir mit unserem Data Center Light vorankommen, desto mehr "
|
||||
"können wir etwas an die FOSS Community zurückgeben."
|
||||
|
||||
#: templates/datacenterlight/whydatacenterlight.html:104
|
||||
msgid "We bring the future to you."
|
||||
msgstr "Wir bringen die Zukunft zu dir."
|
||||
|
||||
#: templates/datacenterlight/whydatacenterlight.html:107
|
||||
msgid ""
|
||||
" Data Center Light uses the most modern technologies out there.<br>\n"
|
||||
" Your VM needs only IPv6. Data Center Light "
|
||||
"provides<br> transparent two-way IPv6/IPv4 translation.\n"
|
||||
" "
|
||||
"Data Center Light uses the most modern technologies out there.<br>Your VM "
|
||||
"needs only IPv6. Data Center Light provides<br> transparent two-way IPv6/"
|
||||
"IPv4 translation."
|
||||
msgstr ""
|
||||
"Data Center Light verwendet die zur Zeit modernsten Technologien.<br/>Deine "
|
||||
"VM läuft mit IPv6. Data Center Light bietet eine transparente IPv6/IPv4-"
|
||||
"Zweiweglösung."
|
||||
|
||||
#: templates/datacenterlight/whydatacenterlight.html:122
|
||||
msgid ""
|
||||
" No more spinning metal plates! Data Center Light uses only SSDs. We keep "
|
||||
"things faster and lighter. "
|
||||
|
|
@ -492,43 +378,27 @@ msgstr ""
|
|||
"Keine drehenden Metallplatten mehr! Data Center Light verwendet "
|
||||
"ausschliesslich SSDs. Wir halten die Dinge schnell, leicht und effizient."
|
||||
|
||||
#: templates/datacenterlight/whydatacenterlight.html:138
|
||||
msgid "Starting from only 15CHF per month. Try now."
|
||||
msgstr "Unser Angebot beginnt bei 15 CHF pro Monat. Probier's jetzt aus!"
|
||||
|
||||
#: templates/datacenterlight/whydatacenterlight.html:139
|
||||
msgid "Actions speak louder than words. Let's do it, try our VM now."
|
||||
msgstr "Tagen sagen mehr als Worte – Teste jetzt unsere VM!"
|
||||
|
||||
#: views.py:199
|
||||
msgid "Invalid number of cores"
|
||||
msgstr "Ungültige Anzahle CPU-Kerne"
|
||||
|
||||
#: views.py:203
|
||||
msgid "Invalid RAM size"
|
||||
msgstr "Ungültige RAM-Grösse"
|
||||
|
||||
#: views.py:207
|
||||
msgid "Invalid storage size"
|
||||
msgstr "Ungültige Speicher-Grösse"
|
||||
|
||||
#: views.py:262
|
||||
msgid "is not a proper name"
|
||||
msgstr "ist kein gültiger Name"
|
||||
|
||||
#: views.py:269
|
||||
msgid "is not a proper email"
|
||||
msgstr "ist keine gültige E-Mailadresse"
|
||||
|
||||
#~ msgid "Not a proper cores number"
|
||||
#~ msgstr "ist kein gültiger cores number"
|
||||
|
||||
#~ msgid "Not a proper ram number"
|
||||
#~ msgstr "ist kein gültiger ram number"
|
||||
|
||||
#~ msgid "Not a proper storage number"
|
||||
#~ msgstr "ist kein gültiger storage number"
|
||||
|
||||
#~ msgid "Please enter a value greater than or equal to 1."
|
||||
#~ msgstr "Bitte gib einen Wert größer oder gleich 1 ein."
|
||||
|
||||
|
|
|
|||
|
|
@ -786,6 +786,7 @@ tech-sub-sec h2 {
|
|||
}
|
||||
|
||||
.percent-text {
|
||||
font-family: 'Lato', sans-serif;
|
||||
font-size: 50px;
|
||||
color: #999;
|
||||
}
|
||||
|
|
@ -794,17 +795,20 @@ tech-sub-sec h2 {
|
|||
font-size: 40px;
|
||||
line-height: 55px;
|
||||
}
|
||||
|
||||
.space-middle {
|
||||
padding: 45px 0;
|
||||
.space-middle{
|
||||
padding: 45px 0;
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
.padding-vertical {
|
||||
padding: 35px 0;
|
||||
.ssdimg {
|
||||
vertical-align: middle;
|
||||
display: inline-block;
|
||||
}
|
||||
.padding-vertical{
|
||||
padding: 30px 9px;
|
||||
}
|
||||
|
||||
.percent-text img {
|
||||
margin-left: 20px;
|
||||
/* margin-left: 20px; */
|
||||
}
|
||||
|
||||
.space-block {
|
||||
|
|
@ -1085,24 +1089,24 @@ tech-sub-sec h2 {
|
|||
}
|
||||
|
||||
@media(max-width:767px) {
|
||||
.percent-text {
|
||||
font-size: 50px;
|
||||
}
|
||||
#tech_stack h3 {
|
||||
font-size: 30px;
|
||||
line-height: 40px;
|
||||
width: 100%;
|
||||
}
|
||||
.navbar-nav .open .dropdown-menu {
|
||||
text-align: left;
|
||||
font-size: 12px;
|
||||
}
|
||||
.visible-mobile {
|
||||
display: block;
|
||||
}
|
||||
.visible-desktop {
|
||||
display: none !important;
|
||||
}
|
||||
.percent-text {
|
||||
/* font-size: 50px; */
|
||||
}
|
||||
#tech_stack h3 {
|
||||
font-size: 30px;
|
||||
line-height: 40px;
|
||||
width: 100%;
|
||||
}
|
||||
.navbar-nav .open .dropdown-menu {
|
||||
text-align: left;
|
||||
font-size: 12px;
|
||||
}
|
||||
.visible-mobile {
|
||||
display:block;
|
||||
}
|
||||
.visible-desktop {
|
||||
display:none !important;
|
||||
}
|
||||
.navbar-default .navbar-nav>.open>a,
|
||||
.navbar-default .navbar-nav>.open>a:focus,
|
||||
.navbar-default .navbar-nav>.open>a:hover {
|
||||
|
|
@ -1158,11 +1162,12 @@ tech-sub-sec h2 {
|
|||
|
||||
@media(max-width:768px) {
|
||||
.percent-text {
|
||||
font-size: 43px;
|
||||
/* font-size: 43px; */
|
||||
}
|
||||
.tech-sub-sec h2 {
|
||||
font-size: 30px;
|
||||
line-height: 40px;
|
||||
.tech-sub-sec h2 {
|
||||
/* font-size: 30px; */
|
||||
/* line-height: 40px; */
|
||||
/* font-weight: 500; */
|
||||
}
|
||||
.single-heading h2 {
|
||||
font-size: 50px;
|
||||
|
|
@ -1348,7 +1353,9 @@ tech-sub-sec h2 {
|
|||
padding: 30px;
|
||||
}
|
||||
.percent-text {
|
||||
text-align: center;
|
||||
font-family: 'Lato';
|
||||
font-size: 31px;
|
||||
/* text-align: center; */
|
||||
}
|
||||
.pricing-section .card {
|
||||
width: 90%;
|
||||
|
|
@ -1472,3 +1479,33 @@ a#forgotpassword {
|
|||
.error-message-box {
|
||||
margin-top: 20px;
|
||||
}
|
||||
|
||||
.flex-row-rev {
|
||||
margin-top: 25px;
|
||||
}
|
||||
|
||||
@media (min-width: 768px) {
|
||||
.flex-row {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
}
|
||||
.flex-row .percent-text {
|
||||
flex-shrink : 0;
|
||||
padding: 0 15px;
|
||||
}
|
||||
.flex-row .percent-text,
|
||||
.flex-row .desc-text {
|
||||
max-width: 600px;
|
||||
}
|
||||
.flex-row-rev .percent-text {
|
||||
order: 2;
|
||||
}
|
||||
.flex-row-rev {
|
||||
margin-bottom: 25px;
|
||||
}
|
||||
}
|
||||
|
||||
.w380 {
|
||||
max-width: 380px !important;
|
||||
}
|
||||
|
|
@ -2,19 +2,18 @@
|
|||
{% load i18n %}
|
||||
|
||||
<div class="modal fade bs-example-modal-sm" style="color:black;" id="successModal" tabindex="-1" role="dialog">
|
||||
<div class="vertical-alignment-helper">
|
||||
<div class="modal-dialog vertical-align-center">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
|
||||
<h4 class="modal-title">{% trans "Request Sent" %}</h4>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<p>{% trans "Thank you for your subscription! You will receive a confirmation mail from our team" %}</p>
|
||||
</div>
|
||||
</div><!-- /.modal-content -->
|
||||
</div>
|
||||
</div>
|
||||
<div class="modal-dialog">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<div class="modal-icon"><i class="fa fa-check" aria-hidden="true"></i></div>
|
||||
<h4 class="modal-title">{% trans "Request Sent" %}</h4>
|
||||
<p class="modal-text">{% trans "Thank you for your subscription! You will receive a confirmation mail from our team" %}</p>
|
||||
</div>
|
||||
</div><!-- /.modal-content -->
|
||||
</div>
|
||||
</div><!-- /.modal -->
|
||||
<script>
|
||||
// Show modal
|
||||
|
|
@ -22,7 +21,7 @@
|
|||
// close the modal after 3 seconds
|
||||
setTimeout(function() {
|
||||
$('#successModal').modal('hide');
|
||||
}, 5000);
|
||||
}, 5000);
|
||||
</script>
|
||||
<style>
|
||||
.vertical-alignment-helper {
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@
|
|||
<img class="img-responsive btm-space-tayga" src="{% static 'datacenterlight/img/tayga.png' %}" alt="Tayga">
|
||||
<span class="logo-caption">{% trans "Our NAT64 gateway" %}</span>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -98,30 +98,23 @@
|
|||
<hr class="thick-divider"/><!-- Divider -->
|
||||
<div class="space">
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
|
||||
<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12 tech-sub-sec">
|
||||
<h2>{% trans "We bring the future to you." %}</h2>
|
||||
</div>
|
||||
<div class="col-xs-12 col-sm-7 col-md-8 col-lg-8 text-left tech-sub-sec landscape-xs-6">
|
||||
<p class="lead new-lead">{% blocktrans %} Data Center Light uses the most modern technologies out there.<br>
|
||||
Your VM needs only IPv6. Data Center Light provides<br> transparent two-way IPv6/IPv4 translation.
|
||||
{% endblocktrans %}</p>
|
||||
</div>
|
||||
<div class="col-xs-12 col-sm-5 col-md-4 col-lg-4 percent-text text-right landscape-xs-6">
|
||||
100% <strong>IPv6</strong>
|
||||
</div>
|
||||
<div class="tech-sub-sec">
|
||||
<h2>{% trans "We bring the future to you." %}</h2>
|
||||
</div>
|
||||
<div class="flex-row flex-row-rev">
|
||||
<div class="percent-text">
|
||||
100% <strong>IPv6</strong>
|
||||
</div>
|
||||
<div class="col-lg-12 space-block"></div>
|
||||
<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
|
||||
<div class="col-xs-12 col-sm-7 col-md-8 col-lg-8 percent-text landscape-xs-8">
|
||||
<span class="pull-left space-middle"> 100% <strong>SSD</strong></span> <span class="pull-left ssdimg"><img class="img-responsive" src="{% static 'datacenterlight/img/ssd.jpg' %}" alt="SSD"></span>
|
||||
</div>
|
||||
<div class="col-xs-12 col-sm-5 col-md-4 col-lg-4 text-right tech-sub-sec padding-vertical landscape-xs-4">
|
||||
<div>
|
||||
<p class="lead new-lead">{% blocktrans %} No more spinning metal plates! Data Center Light uses only SSDs. We keep things faster and lighter. {% endblocktrans %}</p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="desc-text padding-vertical">
|
||||
<p class="lead new-lead">{% blocktrans %}Data Center Light uses the most modern technologies out there.<br>Your VM needs only IPv6. Data Center Light provides<br> transparent two-way IPv6/IPv4 translation.{% endblocktrans %}</p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="flex-row">
|
||||
<div class="percent-text">
|
||||
<span class="space-middle"> 100% <strong>SSD</strong></span> <span class="ssdimg"><img class="img-responsive" src="{% static 'datacenterlight/img/ssd.jpg' %}" alt="SSD"></span>
|
||||
</div>
|
||||
<div class="desc-text padding-vertical w380">
|
||||
<p class="lead new-lead">{% blocktrans %} No more spinning metal plates! Data Center Light uses only SSDs. We keep things faster and lighter. {% endblocktrans %}</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -154,6 +147,6 @@
|
|||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
<!-- End Why Data Center Light? -->
|
||||
{% endblock %}
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@ from hosting.models import HostingOrder, HostingBill
|
|||
from utils.stripe_utils import StripeUtils
|
||||
from datetime import datetime
|
||||
from membership.models import CustomUser, StripeCustomer
|
||||
|
||||
from opennebula_api.models import OpenNebulaManager
|
||||
from opennebula_api.serializers import VirtualMachineTemplateSerializer, VirtualMachineSerializer, VMTemplateSerializer
|
||||
|
||||
|
|
@ -34,6 +33,7 @@ class SuccessView(TemplateView):
|
|||
def get(self, request, *args, **kwargs):
|
||||
if 'specs' not in request.session or 'user' not in request.session:
|
||||
return HttpResponseRedirect(reverse('datacenterlight:index'))
|
||||
|
||||
elif 'token' not in request.session:
|
||||
return HttpResponseRedirect(reverse('datacenterlight:payment'))
|
||||
elif 'order_confirmation' not in request.session:
|
||||
|
|
@ -79,7 +79,8 @@ class PricingView(TemplateView):
|
|||
manager = OpenNebulaManager()
|
||||
template = manager.get_template(template_id)
|
||||
|
||||
request.session['template'] = VirtualMachineTemplateSerializer(template).data
|
||||
request.session['template'] = VirtualMachineTemplateSerializer(
|
||||
template).data
|
||||
|
||||
if not request.user.is_authenticated():
|
||||
request.session['next'] = reverse('hosting:payment')
|
||||
|
|
@ -131,7 +132,8 @@ class BetaAccessView(FormView):
|
|||
email = BaseEmail(**email_data)
|
||||
email.send()
|
||||
|
||||
messages.add_message(self.request, messages.SUCCESS, self.success_message)
|
||||
messages.add_message(
|
||||
self.request, messages.SUCCESS, self.success_message)
|
||||
return render(self.request, 'datacenterlight/beta_success.html', {})
|
||||
|
||||
|
||||
|
|
@ -183,7 +185,8 @@ class BetaProgramView(CreateView):
|
|||
email = BaseEmail(**email_data)
|
||||
email.send()
|
||||
|
||||
messages.add_message(self.request, messages.SUCCESS, self.success_message)
|
||||
messages.add_message(
|
||||
self.request, messages.SUCCESS, self.success_message)
|
||||
return HttpResponseRedirect(self.get_success_url())
|
||||
|
||||
|
||||
|
|
@ -227,7 +230,8 @@ class IndexView(CreateView):
|
|||
storage_field = forms.IntegerField(validators=[self.validate_storage])
|
||||
price = request.POST.get('total')
|
||||
template_id = int(request.POST.get('config'))
|
||||
template = VMTemplate.objects.filter(opennebula_vm_template_id=template_id).first()
|
||||
template = VMTemplate.objects.filter(
|
||||
opennebula_vm_template_id=template_id).first()
|
||||
template_data = VMTemplateSerializer(template).data
|
||||
|
||||
name = request.POST.get('name')
|
||||
|
|
@ -239,35 +243,40 @@ class IndexView(CreateView):
|
|||
cores = cores_field.clean(cores)
|
||||
except ValidationError as err:
|
||||
msg = '{} : {}.'.format(cores, str(err))
|
||||
messages.add_message(self.request, messages.ERROR, msg, extra_tags='cores')
|
||||
messages.add_message(
|
||||
self.request, messages.ERROR, msg, extra_tags='cores')
|
||||
return HttpResponseRedirect(reverse('datacenterlight:index') + "#order_form")
|
||||
|
||||
try:
|
||||
memory = memory_field.clean(memory)
|
||||
except ValidationError as err:
|
||||
msg = '{} : {}.'.format(memory, str(err))
|
||||
messages.add_message(self.request, messages.ERROR, msg, extra_tags='memory')
|
||||
messages.add_message(
|
||||
self.request, messages.ERROR, msg, extra_tags='memory')
|
||||
return HttpResponseRedirect(reverse('datacenterlight:index') + "#order_form")
|
||||
|
||||
try:
|
||||
storage = storage_field.clean(storage)
|
||||
except ValidationError as err:
|
||||
msg = '{} : {}.'.format(storage, str(err))
|
||||
messages.add_message(self.request, messages.ERROR, msg, extra_tags='storage')
|
||||
messages.add_message(
|
||||
self.request, messages.ERROR, msg, extra_tags='storage')
|
||||
return HttpResponseRedirect(reverse('datacenterlight:index') + "#order_form")
|
||||
|
||||
try:
|
||||
name = name_field.clean(name)
|
||||
except ValidationError as err:
|
||||
msg = '{} {}.'.format(name, _('is not a proper name'))
|
||||
messages.add_message(self.request, messages.ERROR, msg, extra_tags='name')
|
||||
messages.add_message(
|
||||
self.request, messages.ERROR, msg, extra_tags='name')
|
||||
return HttpResponseRedirect(reverse('datacenterlight:index') + "#order_form")
|
||||
|
||||
try:
|
||||
email = email_field.clean(email)
|
||||
except ValidationError as err:
|
||||
msg = '{} {}.'.format(email, _('is not a proper email'))
|
||||
messages.add_message(self.request, messages.ERROR, msg, extra_tags='email')
|
||||
messages.add_message(
|
||||
self.request, messages.ERROR, msg, extra_tags='email')
|
||||
return HttpResponseRedirect(reverse('datacenterlight:index') + "#order_form")
|
||||
|
||||
specs = {
|
||||
|
|
@ -332,7 +341,8 @@ class IndexView(CreateView):
|
|||
email = BaseEmail(**email_data)
|
||||
email.send()
|
||||
|
||||
messages.add_message(self.request, messages.SUCCESS, self.success_message)
|
||||
messages.add_message(
|
||||
self.request, messages.SUCCESS, self.success_message)
|
||||
return super(IndexView, self).form_valid(form)
|
||||
|
||||
|
||||
|
|
@ -401,6 +411,7 @@ class PaymentOrderView(FormView):
|
|||
|
||||
# Create Billing Address
|
||||
billing_address = form.save()
|
||||
|
||||
request.session['billing_address_data'] = billing_address_data
|
||||
request.session['billing_address'] = billing_address.id
|
||||
request.session['token'] = token
|
||||
|
|
@ -425,7 +436,8 @@ class OrderConfirmationView(DetailView):
|
|||
stripe_customer_id = request.session.get('customer')
|
||||
customer = StripeCustomer.objects.filter(id=stripe_customer_id).first()
|
||||
stripe_utils = StripeUtils()
|
||||
card_details = stripe_utils.get_card_details(customer.stripe_id, request.session.get('token'))
|
||||
card_details = stripe_utils.get_card_details(
|
||||
customer.stripe_id, request.session.get('token'))
|
||||
context = {
|
||||
'site_url': reverse('datacenterlight:index'),
|
||||
'cc_last4': card_details.get('response_object').get('last4'),
|
||||
|
|
@ -441,7 +453,8 @@ class OrderConfirmationView(DetailView):
|
|||
customer = StripeCustomer.objects.filter(id=stripe_customer_id).first()
|
||||
billing_address_data = request.session.get('billing_address_data')
|
||||
billing_address_id = request.session.get('billing_address')
|
||||
billing_address = BillingAddress.objects.filter(id=billing_address_id).first()
|
||||
billing_address = BillingAddress.objects.filter(
|
||||
id=billing_address_id).first()
|
||||
vm_template_id = template.get('id', 1)
|
||||
final_price = specs.get('price')
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue