Merge branch 'master' into develop
This commit is contained in:
		
				commit
				
					
						9333532662
					
				
			
		
					 5 changed files with 334 additions and 4 deletions
				
			
		|  | @ -1,3 +1,5 @@ | ||||||
|  | 1.0.13: 2017-06-13 | ||||||
|  |     * [datacenterlight] Added translations for email and name placeholders fields | ||||||
| 1.0.12: 2017-06-13 | 1.0.12: 2017-06-13 | ||||||
|     * [datacenterlight] Added from address for EmailMessage that was missing |     * [datacenterlight] Added from address for EmailMessage that was missing | ||||||
| 1.0.11: 2017-06-12 | 1.0.11: 2017-06-12 | ||||||
|  |  | ||||||
										
											Binary file not shown.
										
									
								
							|  | @ -187,9 +187,25 @@ msgstr "Standort des Datacenters ist in der Schweiz" | ||||||
| msgid "10 GB Storage (SSD)" | msgid "10 GB Storage (SSD)" | ||||||
| msgstr "10 GB Storage (SSD)" | msgstr "10 GB Storage (SSD)" | ||||||
| 
 | 
 | ||||||
| #: templates/datacenterlight/home.html:163 | #: templates/datacenterlight/index.html:289 | ||||||
| #: templates/datacenterlight/order.html:74 | msgid "Name" | ||||||
| #: templates/datacenterlight/pricing.html:76 | msgstr "" | ||||||
|  | 
 | ||||||
|  | #: templates/datacenterlight/index.html:290 | ||||||
|  | msgid "Your Name" | ||||||
|  | msgstr "Dein Name" | ||||||
|  | 
 | ||||||
|  | #: templates/datacenterlight/index.html:293 | ||||||
|  | msgid "Email" | ||||||
|  | msgstr "E-Mail-Adresse" | ||||||
|  | 
 | ||||||
|  | #: templates/datacenterlight/index.html:294 | ||||||
|  | msgid "Your Email" | ||||||
|  | msgstr "Deine E-Mail" | ||||||
|  | 
 | ||||||
|  | #: templates/datacenterlight/index.html:297 | ||||||
|  | #: templates/datacenterlight/order.html:133 | ||||||
|  | #: templates/datacenterlight/pricing.html:161 | ||||||
| msgid "Order Now!" | msgid "Order Now!" | ||||||
| msgstr "Bestelle jetzt!" | msgstr "Bestelle jetzt!" | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
							
								
								
									
										312
									
								
								datacenterlight/templates/datacenterlight/index.html
									
										
									
									
									
										Executable file
									
								
							
							
						
						
									
										312
									
								
								datacenterlight/templates/datacenterlight/index.html
									
										
									
									
									
										Executable file
									
								
							|  | @ -0,0 +1,312 @@ | ||||||
|  | {% extends "datacenterlight/base.html" %} | ||||||
|  | {% load staticfiles i18n%} | ||||||
|  | {% get_current_language as LANGUAGE_CODE %} | ||||||
|  | 
 | ||||||
|  | {% block content %} | ||||||
|  | 
 | ||||||
|  |     <!-- Header --> | ||||||
|  |     <div class="intro-header" id="home"> | ||||||
|  |         <div class="container"> | ||||||
|  | 
 | ||||||
|  |             <div class="row"> | ||||||
|  |                 <div class="col-lg-12"> | ||||||
|  |      | ||||||
|  |                     <div class="intro-message"> | ||||||
|  |                       <h1>DataCenterLight</h1> | ||||||
|  |                         <h3>{% trans "Finally, an affordable VM hosting in Switzerland!" %}</h3> | ||||||
|  |                         <hr class="intro-divider"> | ||||||
|  |                         <ul class="list-inline intro-social-buttons"> | ||||||
|  |                             <li> | ||||||
|  |                                 <a class="btn btn-default btn-lg btn-transparent url" href="javascript:void(0)" data-url="#how"  ><i class="#Services"></i> <span class="network-name">{% trans "What is it?" %}</span></a> | ||||||
|  |                             </li> | ||||||
|  |                             <li> | ||||||
|  |                                 <a class="btn btn-primary btn-lg page-scroll url" href="javascript:void(0)" data-url="#request" ><span class="network-name">{% trans "I want it!" %}</span></a> | ||||||
|  |                             </li> | ||||||
|  |                         </ul> | ||||||
|  |                     </div> | ||||||
|  |                 </div> | ||||||
|  |             </div> | ||||||
|  | 
 | ||||||
|  |         </div> | ||||||
|  |         <div class="triangle-left"></div> | ||||||
|  |         <div class="triangle-right"></div> | ||||||
|  |         <!-- /.container --> | ||||||
|  | 
 | ||||||
|  |     </div> | ||||||
|  |     <!-- /.intro-header --> | ||||||
|  | 
 | ||||||
|  |     <!-- Page Content --> | ||||||
|  |     <div class="split-section right" id="how"> | ||||||
|  | 
 | ||||||
|  |         <div class="container"> | ||||||
|  |             <div class="row"> | ||||||
|  |                 <div class="col-xs-12 col-sm-6 col-md-6 icon-section"> | ||||||
|  |                     <i class="fa fa-cogs" aria-hidden="true"></i> | ||||||
|  |                 </div> | ||||||
|  |                 <div class="col-xs-12 col-sm-6 col-md-6"> | ||||||
|  |                     <div class="split-text"> | ||||||
|  |                         <div class="split-title"> | ||||||
|  |                             <h2>{% trans "What is it" %}</h2> | ||||||
|  |                         </div> | ||||||
|  |                         <div class="split-description"> | ||||||
|  |                             <ul class="fa-ul"> | ||||||
|  |                               <li> | ||||||
|  |                                   <i class="fa-li fa fa-check-square-o fa-lg"></i> | ||||||
|  |                                   <p class="lead">{% trans "Reuses existing factory halls instead of building a new expensive building." %} | ||||||
|  |                                   </p> | ||||||
|  |                               </li> | ||||||
|  |                              <li> | ||||||
|  |                                 <i class="fa-li fa fa-check-square-o fa-lg"></i> | ||||||
|  |                                 <p class="lead">{% trans "Only wants you to pay for what you actually need." %}</p> | ||||||
|  |                               </li> | ||||||
|  |                               <li> | ||||||
|  |                                 <i class="fa-li fa fa-check-square-o fa-lg"></i> | ||||||
|  |                                 <p class="lead">{% 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." %}</p> | ||||||
|  |                               </li>  | ||||||
|  |                               <li> | ||||||
|  |                                 <i class="fa-li fa fa-check-square-o fa-lg"></i> | ||||||
|  |                                 <p class="lead">{% trans "Cuts down the costs for you by using FOSS (Free Open Source Software) exclusively, wherefore we can save money from paying licenses." %}</p> | ||||||
|  |                               </li>  | ||||||
|  |                              </ul> | ||||||
|  |                              | ||||||
|  |                         </div> | ||||||
|  |                     </div> | ||||||
|  |                 </div> | ||||||
|  |             </div> | ||||||
|  |         </div> | ||||||
|  |         <!-- /.container --> | ||||||
|  |         <!-- /.option 1 --> | ||||||
|  |     </div> | ||||||
|  | 
 | ||||||
|  |     <div class="split-section left" id="your"> | ||||||
|  | 
 | ||||||
|  |         <div class="container"> | ||||||
|  |             <div class="row"> | ||||||
|  |                 <div class="col-xs-12 col-sm-6 col-md-6"> | ||||||
|  |                     <div class="split-text"> | ||||||
|  |                         <div class="split-title"> | ||||||
|  |                             <h2>{% trans "Scale out" %}</h2> | ||||||
|  |                         </div> | ||||||
|  |                         <div class="split-description"> | ||||||
|  |                             <p class="lead">{% trans "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 called data center." %}</p> | ||||||
|  |                              | ||||||
|  |                         </div> | ||||||
|  |                     </div> | ||||||
|  |                 </div> | ||||||
|  |                 <div class="col-xs-12 col-sm-6 col-md-6 icon-section"> | ||||||
|  |                     <i class="fa fa-rocket" aria-hidden="true"></i> | ||||||
|  |                 </div> | ||||||
|  |             </div> | ||||||
|  |         </div> | ||||||
|  |         <!-- /.container --> | ||||||
|  |         <!-- /.option 1 --> | ||||||
|  |     </div> | ||||||
|  |     <div class="split-section right" id="our"> | ||||||
|  | 
 | ||||||
|  |         <div class="container"> | ||||||
|  |             <div class="row"> | ||||||
|  |                 <div class="col-xs-12 col-sm-6 col-md-6 icon-section"> | ||||||
|  |                     <i class="fa fa-handshake-o" aria-hidden="true"></i> | ||||||
|  |                 </div> | ||||||
|  |                 <div class="col-xs-12 col-sm-6 col-md-6"> | ||||||
|  |                     <div class="split-text"> | ||||||
|  |                         <div class="split-title"> | ||||||
|  |                             <h2>{% trans "Reliable and light" %}</h2> | ||||||
|  |                         </div> | ||||||
|  |                         <div class="split-description"> | ||||||
|  |                          <p class="lead">{% trans "Our VMs are located in Switzerland, with reliable power supply and fast internet connection. Our VM costs less thanks to our featherlight infrastructure." %}</p> | ||||||
|  |                              | ||||||
|  |                         </div> | ||||||
|  |                     </div> | ||||||
|  |                 </div> | ||||||
|  |             </div> | ||||||
|  |         </div> | ||||||
|  |         <!-- /.container --> | ||||||
|  |         <!-- /.option 1 --> | ||||||
|  |     </div> | ||||||
|  |      | ||||||
|  |     <!-- /.content-section-b --> | ||||||
|  |     <div class="content-section-a pricing-section" id="price"> | ||||||
|  | 
 | ||||||
|  |         <div class="container"> | ||||||
|  |         <!-- Page Features --> | ||||||
|  |             <div class="row text-center"> | ||||||
|  |                 <div class="col-xs-12 col-md-6 text"> | ||||||
|  |                     <h2 class="section-heading">{% trans "Simple and affordable: Try our virtual machine with featherlight price." %}</h2> | ||||||
|  |                     <p class="lead">{% trans "Affordable VM hosting based in Switzerland" %}</p> | ||||||
|  |                 </div> | ||||||
|  | 
 | ||||||
|  |                 <div class="col-xs-12 col-md-6 hero-feature"> | ||||||
|  |                     <div class="price-calc-section no-padding"> | ||||||
|  |                         <div class="landing card"> | ||||||
|  |                             <img class="img-beta" src="{% static 'datacenterlight/img/beta-img.png' %}" alt=""> | ||||||
|  |                             <div class="caption"> | ||||||
|  |                                 <form id="order_form" method="POST" action=""> | ||||||
|  |                                     {% csrf_token %} | ||||||
|  |                                     <div class="title"> | ||||||
|  |                                        <h3>{% trans "VM hosting" %} </h3> | ||||||
|  |                                     </div> | ||||||
|  |                                     <div class="price"> | ||||||
|  |                                         <span id="total">15</span> | ||||||
|  |                                         <span>CHF/{% trans "month" %}</span> | ||||||
|  |                                     </div> | ||||||
|  |                                     <div class="descriptions"> | ||||||
|  |                                         <div class="description"> | ||||||
|  |                                             <p>{% trans "Hosted in Switzerland" %}</p> | ||||||
|  |                                         </div> | ||||||
|  |                                         <div class="description"> | ||||||
|  |                                             <i class="fa fa-minus-circle left" data-minus="cpu" aria-hidden="true"></i> | ||||||
|  |                                             <input class="input-price" type="number"  min="1" max="42" id="coreValue" name="cpu"> | ||||||
|  |                                             <span> Core</span> | ||||||
|  |                                             <i class="fa fa-plus-circle right" data-plus="cpu"  aria-hidden="true"></i> | ||||||
|  |                                         </div> | ||||||
|  |                                         <div class="description"> | ||||||
|  |                                             <i class="fa fa-minus-circle left" data-minus="ram" aria-hidden="true"></i> | ||||||
|  |                                             <input id="ramValue" class="input-price" type="number"  min="2" max="200"  name="ram"> | ||||||
|  |                                             <span> GB RAM</span> | ||||||
|  |                                             <i class="fa fa-plus-circle right" data-plus="ram"  aria-hidden="true"></i> | ||||||
|  |                                         </div> | ||||||
|  |                                         <div class="description"> | ||||||
|  |                                             <i class="fa fa-minus-circle left" data-minus="storage" aria-hidden="true"></i> | ||||||
|  |                                             <input id="storageValue" class="input-price" type="number"  min="10" max="500" step="10" name="storage"> | ||||||
|  |                                             <span>{% trans "GB Storage (SSD)" %}</span> | ||||||
|  |                                             <i class="fa fa-plus-circle right" data-plus="storage"  aria-hidden="true"></i> | ||||||
|  |                                         </div> | ||||||
|  |                                         <div class="description select-configuration input"> | ||||||
|  |                                             <label for="config">OS</label> | ||||||
|  |                                             <select name="config" id=""> | ||||||
|  |                                                 {% for template in templates %} | ||||||
|  |                                                     <option value="{{template.id}}">{{template.name}} </option> | ||||||
|  |                                                 {% endfor %} | ||||||
|  |                                             </select> | ||||||
|  |                                         </div> | ||||||
|  |                                         <input type="hidden" name="total"> | ||||||
|  |                                         <!--<div class="description check-ip"> | ||||||
|  |                                             <input type="checkbox" name="ipv6"> Ipv6 Only<br> | ||||||
|  |                                         </div>--> | ||||||
|  |                                         <div class="description input"> | ||||||
|  |                                             <label for="name">{% trans "Name"%}</label> | ||||||
|  |                                             <input type="text" name="name" placeholder="{% trans "Your Name" %}"> | ||||||
|  |                                         </div> | ||||||
|  |                                         <div class="description input"> | ||||||
|  |                                             <label for="email">{% trans "Email" %}</label> | ||||||
|  |                                             <input type="email" name="email" placeholder="{% trans "Your Email" %}"> | ||||||
|  |                                         </div> | ||||||
|  |                                     </div> | ||||||
|  |                                     <input type="submit" class="btn btn-primary" value="{% trans 'Order Now!' %}"></input> | ||||||
|  |                                 </form> | ||||||
|  |                             </div> | ||||||
|  |                             <div> | ||||||
|  |                                 <div id="error_message_box" class="error-message-box"></div> | ||||||
|  |                             </div> | ||||||
|  |                         </div> | ||||||
|  |                     </div> | ||||||
|  | 
 | ||||||
|  |                 </div> | ||||||
|  |             </div> | ||||||
|  |          </div> | ||||||
|  | 
 | ||||||
|  |     </div> | ||||||
|  |         <!-- Configure --> | ||||||
|  | <!--     <div class="request-section" id="request"> | ||||||
|  |         <div class="container"> | ||||||
|  |             <div class="row"> | ||||||
|  |                 <div class="col-sm-6 col-md-6"> | ||||||
|  |                     <div class="title"> | ||||||
|  |                         <h2>{% trans "I want to have it!" %}</h2> | ||||||
|  |                     </div> | ||||||
|  |                 </div> | ||||||
|  |                 <div class="col-sm-6 col-md-6"> | ||||||
|  | 					<!-- Beta access form, will be loaded via ajax | ||||||
|  |                     <div class="form" id="beta_access_form"> | ||||||
|  | 					</div> | ||||||
|  |                 </div> | ||||||
|  |             </div> | ||||||
|  | 
 | ||||||
|  |         </div> | ||||||
|  |     </div> --> --> | ||||||
|  |     <!-- /.content-section-a --> | ||||||
|  |       <!-- / contact section --> | ||||||
|  |     <div class="full-contact-section"> | ||||||
|  |         <div class="intro-header-2 contact-section" id="contact"> | ||||||
|  |             <div class="container"> | ||||||
|  |                 <div class="row"> | ||||||
|  |                    | ||||||
|  |                     <div class="col-sm-6 col-md-6"> | ||||||
|  |                         <div class="card"> | ||||||
|  |                             <div class="subtitle"> | ||||||
|  |                                 <h3>ungleich GmbH </h3> | ||||||
|  |                             </div> | ||||||
|  |                             <div class="description"> | ||||||
|  |                                 <p><i class="fa fa-envelope-o"></i>  info@datacenterlight.ch</p> | ||||||
|  |                                 <p>In der Au 7, Schwanden 8762</p> | ||||||
|  |                                 <p>{% trans "Switzerland " %}</p> | ||||||
|  |                             </div> | ||||||
|  |                             <div class="social"> | ||||||
|  |                                 <a target="_blank" class="" href="https://twitter.com/datacenterlight"> | ||||||
|  |                                      <i class="fa fa-twitter fa-fw"></i> | ||||||
|  |                                 </a> | ||||||
|  |                                 <a  target="_blank"  class=""  href="https://github.com/ungleich"> | ||||||
|  |                                      <i class="fa fa-github fa-fw"></i> | ||||||
|  |                                 </a> | ||||||
|  |                                 <a  target="_blank"  class=""  href="https://www.facebook.com/ungleich.ch/"> | ||||||
|  |                                      <i class="fa fa-facebook fa-fw"></i> | ||||||
|  |                                 </a> | ||||||
|  |                             </div> | ||||||
|  |                         </div> | ||||||
|  |                     </div> | ||||||
|  |                     <div class="col-sm-6 col-md-6"> | ||||||
|  |                        <div class="title"> | ||||||
|  |                             <h2>{% trans "Questions?" %} {% trans "Contact us!" %}</h2> | ||||||
|  |                         </div> | ||||||
|  |                     </div> | ||||||
|  |                 </div> | ||||||
|  | 
 | ||||||
|  |             </div> | ||||||
|  |         </div> | ||||||
|  |          | ||||||
|  |     </div> | ||||||
|  |     <script type="text/javascript"> | ||||||
|  |         $(document).ready(function(){ | ||||||
|  |             $.validator.setDefaults({ | ||||||
|  |                 ignore: [] | ||||||
|  |             }); | ||||||
|  |             $('#order_form').validate({ | ||||||
|  |                 wrapper: 'div', | ||||||
|  |                 errorLabelContainer: "#error_message_box", | ||||||
|  |                 rules: { | ||||||
|  |                     name: { | ||||||
|  |                         required: true, | ||||||
|  |                         minlength: 3 | ||||||
|  |                     }, | ||||||
|  |                     email: { | ||||||
|  |                         required: true, | ||||||
|  |                         email: true | ||||||
|  |                     } | ||||||
|  |                 }, | ||||||
|  |                 messages: { | ||||||
|  |                     name: "Please enter your name", | ||||||
|  |                     email: "Please enter a valid email address" | ||||||
|  |                 }, | ||||||
|  |                 submitHandler: function (form) { | ||||||
|  |                     return true; | ||||||
|  |                 } | ||||||
|  |             }); | ||||||
|  |         }); | ||||||
|  | 
 | ||||||
|  |         window.onload=function(){ | ||||||
|  |           $('.selectpicker').selectpicker({ | ||||||
|  |                style: 'btn-link', | ||||||
|  |                windowPadding: 10, | ||||||
|  |           }); | ||||||
|  |           $.ajax({ | ||||||
|  |             url: "{% url 'datacenterlight:beta_access' %}", | ||||||
|  |                 context: document.body | ||||||
|  |             }).done(function(response) { | ||||||
|  |                 $('#beta_access_form').html(response); | ||||||
|  |           }); | ||||||
|  |         }; | ||||||
|  |     </script> | ||||||
|  | 
 | ||||||
|  |     <!-- /.banner --> | ||||||
|  |     {% endblock %} | ||||||
|  | @ -236,7 +236,7 @@ class BetaProgramView(CreateView): | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| class IndexView(CreateView): | class IndexView(CreateView): | ||||||
|     template_name = "datacenterlight/home.html" |     template_name = "datacenterlight/index.html" | ||||||
|     model = BetaAccess |     model = BetaAccess | ||||||
|     form_class = BetaAccessForm |     form_class = BetaAccessForm | ||||||
|     success_url = "/datacenterlight#requestform" |     success_url = "/datacenterlight#requestform" | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue