Merge pull request #280 from HenryGBC/develop

Fixed bugs in dcl and hosting/payment

datacenterlight/static/datacenterlight/css/landing-page.css

@@ -544,6 +544,7 @@ h6 {
     font-size: 20px;
     text-align: right;
 }
+
 .price-calc-section .text .section-heading::before{
     content: "";
     position: absolute;
@@ -592,10 +593,15 @@ h6 {
     justify-content: center;
     align-items: center;
 }
+
 .price-calc-section .card .description span{
     font-size: 20px;
     margin-left: 4px;
 }
+.price-calc-section .card .description input{
+   font-size: 20px;
+    text-align: center;
+}
 .price-calc-section .card .description i{
     color: #29427A;
     cursor: pointer;

datacenterlight/static/datacenterlight/js/main.js

@@ -15,8 +15,8 @@
         },
         'ram': {
             'id': 'ramValue',
-            'value': 1,
+            'value': 2,
-            'min':1,
+            'min':2,
             'max': 200,
             'interval': 1
         },
@@ -94,21 +94,27 @@
             var data = $(this).data('minus');
             
             if(cardPricing[data].value > cardPricing[data].min){
-                cardPricing[data].value --;
+                cardPricing[data].value = Number(cardPricing[data].value) - cardPricing[data].interval;
             }
             _fetchPricing();
         });
         $('.fa-plus-circle.right').click(function(event){
             var data = $(this).data('plus');
             if(cardPricing[data].value < cardPricing[data].max){
-                cardPricing[data].value = cardPricing[data].value + cardPricing[data].interval;
+                cardPricing[data].value = Number(cardPricing[data].value) + cardPricing[data].interval;
             }
             _fetchPricing();
         });
+
+        $('.input-price').change(function(){
+            var data = $(this).attr("name");
+            cardPricing[data].value = $('input[name='+data+']').val();
+            _fetchPricing();
+        });
     }
     function _fetchPricing(){
         Object.keys(cardPricing).map(function(element){
-            $('#'+cardPricing[element].id).text(cardPricing[element].value);
+            //$('#'+cardPricing[element].id).val(cardPricing[element].value);
             $('input[name='+element+']').val(cardPricing[element].value);
         });
         _calcPricing();
@@ -116,6 +122,7 @@
 
     function _calcPricing(){
         var total = (cardPricing['cpu'].value * 5) + (2* cardPricing['ram'].value) + (0.6* cardPricing['storage'].value) 
+        console.log(total);
         total = parseFloat(total.toFixed(2));
 
         $("#total").text(total);

datacenterlight/templates/datacenterlight/index.html

@@ -245,7 +245,7 @@
                           </div>
 						  <a href="{% url 'datacenterlight:pricing' %}" class="btn btn-primary">{% trans "Order Now!" %}</a>
                       </div>
-                      <img class="img-beta" src="{% static 'datacenterlight/img/beta.png' %}" alt="">
+                      <img class="img-beta" src="{% static 'datacenterlight/img/beta-img.png' %}" alt="">
                     </div>
 
                 </div>

datacenterlight/templates/datacenterlight/pricing.html

@@ -105,7 +105,7 @@
 
 	<div class="price-calc-section">
 		<div class="card">
-      <img class="img-beta" src="{% static 'datacenterlight/img/beta.png' %}" alt="">
+      <img class="img-beta" src="{% static 'datacenterlight/img/beta-img.png' %}" alt="">
 			 <div class="caption">
             <form method="POST" action="">
 				{% csrf_token %}
@@ -123,17 +123,20 @@
                   </div>
                   <div class="description">
                      <i class="fa fa-minus-circle left" data-minus="cpu" aria-hidden="true"></i>
-                     <span id="coreValue">1</span><span> Core</span> 
+                     <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>
-                    <span id="ramValue">2</span><span> GiB RAM</span>
+                    <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>
-                    <span id="storageValue">15</span><span>{% trans "GB Storage (SSD)" %}</span>
+                    <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>
                  
@@ -145,9 +148,6 @@
                         {% endfor %}
                   	</select>
                   </div>
-                  <input type="hidden" name="cpu">
-                  <input type="hidden" name="ram">
-                  <input type="hidden" name="storage">
                   <input type="hidden" name="total">
                    <!--<div class="description check-ip">
                   	<input type="checkbox" name="ipv6"> Ipv6 Only<br>

hosting/static/hosting/css/landing-page.css

@@ -4,6 +4,22 @@
  * 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-face {
+    font-family: 'Montserrat-Bold';
+    src: url('../fonts/Montserrat/Montserrat-Bold.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');
+}
 body,
 html {
     width: 100%;
@@ -17,10 +33,9 @@ h3,
 h4,
 h5,
 h6 {
-    font-family: 'Raleway', "Lato", "Helvetica Neue", Helvetica, Arial, sans-serif;
+    font-family: 'Montserrat-Regular', sans-serif;
     font-weight: 700;
 }
-
 .topnav {
     font-size: 14px;
 }

hosting/static/hosting/fonts/Montserrat/OFL.txt

@@ -0,0 +1,92 @@
+Copyright 2011 The Montserrat Project Authors (julieta.ulanovsky@gmail.com)
+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.

hosting/templates/hosting/payment.html

@@ -5,7 +5,33 @@
 <div>
 	<div class="container payment-container">
 		<div class="row">
-			<div class="col-xs-12 col-md-4 col-md-offset-2 billing">
+		    <div class="col-xs-12 col-md-offset-2 col-md-4 summary-box">
+            	<form role="form" novalidate>
+            		<div class="row">
+            			<div class="col-xs-12">
+							<h3><b>Billing Amount</b></h3>
+							<hr>
+							<div class="content">
+								<!-- <p><b>Type</b> <span class="pull-right">{{request.session.vm_specs.location_code}}</span></p> -->
+								<!-- <hr> -->
+								<p><b>Cores</b> <span
+                                    class="pull-right">{{request.session.specs.cpu|floatformat}}</span></p>
+								<hr>
+								<p><b>Memory</b> <span
+                                    class="pull-right">{{request.session.specs.memory|floatformat}} GiB</span></p>
+								<hr>
+								<p><b>Disk space</b> <span
+                                    class="pull-right">{{request.session.specs.disk_size|floatformat}} GiB</span></p>
+								<hr>
+								<h4>Total<p
+                                    class="pull-right"><b>{{request.session.specs.price }} CHF</b></p></h4>
+							</div>
+						</div>
+					</div>
+				</form>
+				
+			</div>
+			<div class="col-xs-12 col-md-4  billing">
 				<h3><b>Billing Address</b></h3>
 				<hr>
 				<form role="form" id="billing-form" method="post" action="" novalidate>
@@ -18,7 +44,8 @@
 			</div>
 		</div>
 	    <div class="row">
-	        <div class="col-xs-12 col-sm-6 col-md-4 col-md-offset-2 creditcard-box">
+	    	<div class="col-xs-12 col-md-offset-2 col-md-4 "></div>
+	        <div class="col-xs-12 col-md-4 creditcard-box">
 				<h3><b>Payment Details</b></h3>
 				<hr>
 	            <div>
@@ -91,32 +118,7 @@
 	                </div>
 	            </div>
 	        </div>
-            <div class="col-xs-12 col-md-3 col-md-offset-1 summary-box">
-            	<form role="form" novalidate>
-            		<div class="row">
-            			<div class="col-xs-12">
-							<h3><b>Billing Amount</b></h3>
-							<hr>
-							<div class="content">
-								<!-- <p><b>Type</b> <span class="pull-right">{{request.session.vm_specs.location_code}}</span></p> -->
-								<!-- <hr> -->
-								<p><b>Cores</b> <span
-                                    class="pull-right">{{request.session.specs.cpu|floatformat}}</span></p>
-								<hr>
-								<p><b>Memory</b> <span
-                                    class="pull-right">{{request.session.specs.memory|floatformat}} GiB</span></p>
-								<hr>
-								<p><b>Disk space</b> <span
-                                    class="pull-right">{{request.session.specs.disk_size|floatformat}} GiB</span></p>
-								<hr>
-								<h4>Total<p
-                                    class="pull-right"><b>{{request.session.specs.price }} CHF</b></p></h4>
-							</div>
-						</div>
-					</div>
-				</form>
       
-			</div>