From 9b6bb4eb262427d244689e404ec10068e59f27b2 Mon Sep 17 00:00:00 2001
From: Levi <levinoelvm@gmail.com>
Date: Wed, 21 Jun 2017 11:45:35 -0500
Subject: [PATCH 01/11] changed UTC to localtime in ssh key view

---
 hosting/templates/hosting/base_short.html |  6 ++++++
 hosting/templates/hosting/user_keys.html  | 13 ++++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/hosting/templates/hosting/base_short.html b/hosting/templates/hosting/base_short.html
index 6a2037f7..57bf384b 100644
--- a/hosting/templates/hosting/base_short.html
+++ b/hosting/templates/hosting/base_short.html
@@ -164,6 +164,12 @@
     <!-- Gen SSH Key lib -->
     <script type="text/javascript" src="{% static 'hosting/js/gen-ssh-key.js' %}"></script>
 
+    <!-- Moment -->
+    <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.18.1/moment.min.js"></script>
+    <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.18.1/moment-with-locales.js"></script>
+
+
+
 </body>
 
 </html>
diff --git a/hosting/templates/hosting/user_keys.html b/hosting/templates/hosting/user_keys.html
index 6dd2c823..42f85bdf 100644
--- a/hosting/templates/hosting/user_keys.html
+++ b/hosting/templates/hosting/user_keys.html
@@ -1,5 +1,6 @@
 {% extends "hosting/base_short.html" %}
 {% load staticfiles bootstrap3 i18n %}
+{% load tz %}
 {% block content %} 
 <div>
 	<div class="container virtual-machine-container dashboard-container ">
@@ -32,7 +33,8 @@
                             {% for user_key in keys %}
                             <tr> 
                                 <td scope="row">{{user_key.name}}</td> 
-                                <td>{{user_key.created_at}}</td> 
+
+                                <td><span id="created_at">{{user_key.created_at|date:'Y-m-d H:i' }}</span></td> 
                                 <td>
                                     <span class="h3 label label-success"><strong>Active</strong></span>
                                 </td> 
@@ -92,5 +94,14 @@
     </script>
 {% endif %}
 
+<script type="text/javascript"> 
+    window.onload = function () {
+        var locale_date = new Date(document.getElementById('created_at').textContent + ' UTC');
+        locale_date =  moment(locale_date).format("YYYY-MM-DD h:mm:ss a");
+        document.getElementById('created_at').innerHTML = locale_date;
+    };
+
+</script>
+
 {%endblock%}
 

From 4f318a6f2df9f79ca59a6ba389c5aa93af3dedb6 Mon Sep 17 00:00:00 2001
From: Levi <levinoelvm@gmail.com>
Date: Wed, 21 Jun 2017 11:48:11 -0500
Subject: [PATCH 02/11] changed UTC to localtime in ssh key view

---
 hosting/templates/hosting/user_keys.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/hosting/templates/hosting/user_keys.html b/hosting/templates/hosting/user_keys.html
index 42f85bdf..8637fb81 100644
--- a/hosting/templates/hosting/user_keys.html
+++ b/hosting/templates/hosting/user_keys.html
@@ -1,6 +1,5 @@
 {% extends "hosting/base_short.html" %}
 {% load staticfiles bootstrap3 i18n %}
-{% load tz %}
 {% block content %} 
 <div>
 	<div class="container virtual-machine-container dashboard-container ">

From ed6fdcb049a2569fdc4e8d6d23227ce2bd0563dd Mon Sep 17 00:00:00 2001
From: Levi <levinoelvm@gmail.com>
Date: Wed, 21 Jun 2017 12:26:09 -0500
Subject: [PATCH 03/11] fixed ssh key time

---
 hosting/templates/hosting/user_keys.html | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/hosting/templates/hosting/user_keys.html b/hosting/templates/hosting/user_keys.html
index 8637fb81..bea285f9 100644
--- a/hosting/templates/hosting/user_keys.html
+++ b/hosting/templates/hosting/user_keys.html
@@ -33,7 +33,7 @@
                             <tr> 
                                 <td scope="row">{{user_key.name}}</td> 
 
-                                <td><span id="created_at">{{user_key.created_at|date:'Y-m-d H:i' }}</span></td> 
+                                <td><span id="ssh-created_at-{{user_key.id}}">{{user_key.created_at|date:'Y-m-d H:i' }}</span></td> 
                                 <td>
                                     <span class="h3 label label-success"><strong>Active</strong></span>
                                 </td> 
@@ -95,9 +95,12 @@
 
 <script type="text/javascript"> 
     window.onload = function () {
-        var locale_date = new Date(document.getElementById('created_at').textContent + ' UTC');
-        locale_date =  moment(locale_date).format("YYYY-MM-DD h:mm:ss a");
-        document.getElementById('created_at').innerHTML = locale_date;
+        {% for user_key in keys %}
+            var locale_date = new Date(document.getElementById('created_at-{{user_key.id}}').textContent + ' UTC');
+            locale_date =  moment(locale_date).format("YYYY-MM-DD h:mm:ss a");
+            document.getElementById('created_at-{{user_key.id}}').innerHTML = locale_date;
+
+        {% endfor %}
     };
 
 </script>

From f1f6074c78dcdacb869a0b52b76faec45f7d62b9 Mon Sep 17 00:00:00 2001
From: Levi <levinoelvm@gmail.com>
Date: Wed, 21 Jun 2017 12:49:29 -0500
Subject: [PATCH 04/11] fixed time

---
 hosting/templates/hosting/user_keys.html | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/hosting/templates/hosting/user_keys.html b/hosting/templates/hosting/user_keys.html
index bea285f9..a4a0c2cf 100644
--- a/hosting/templates/hosting/user_keys.html
+++ b/hosting/templates/hosting/user_keys.html
@@ -93,17 +93,23 @@
     </script>
 {% endif %}
 
+ 
 <script type="text/javascript"> 
+    console.log("sadas");
+
     window.onload = function () {
         {% for user_key in keys %}
-            var locale_date = new Date(document.getElementById('created_at-{{user_key.id}}').textContent + ' UTC');
+            console.log("{{user_key.id}}");
+            var locale_date = new Date(document.getElementById("ssh-created_at-{{user_key.id}}").textContent + ' UTC');
             locale_date =  moment(locale_date).format("YYYY-MM-DD h:mm:ss a");
-            document.getElementById('created_at-{{user_key.id}}').innerHTML = locale_date;
+            console.log(locale_date);
+            document.getElementById('ssh-created_at-{{user_key.id}}').innerHTML = locale_date;
 
         {% endfor %}
     };
 
 </script>
 
+
 {%endblock%}
 

From 339e20d0b7b2ca83a118964a08a86a0431e34420 Mon Sep 17 00:00:00 2001
From: Levi <levinoelvm@gmail.com>
Date: Wed, 21 Jun 2017 13:24:38 -0500
Subject: [PATCH 05/11] changd date format on orders view

---
 hosting/templates/hosting/order_detail.html | 15 ++++++++++++++-
 hosting/templates/hosting/orders.html       |  2 +-
 hosting/templates/hosting/user_keys.html    |  2 --
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/hosting/templates/hosting/order_detail.html b/hosting/templates/hosting/order_detail.html
index 1eec7f99..c212d248 100644
--- a/hosting/templates/hosting/order_detail.html
+++ b/hosting/templates/hosting/order_detail.html
@@ -35,7 +35,7 @@
                 <div class="col-xs-6 text-right">
                     <address>
                         <strong>{% trans "Billed To:"%}</strong><br>
-                        {{order.created_at}}<br><br>
+                        <span id="order-created_at">{{order.created_at}}</span><br><br>
                         <strong>{% trans "Status:"%}</strong><br>
                         <strong class="{% if order.status == 'Approved' %}text-success
                                        {%else%} text-danger
@@ -81,4 +81,17 @@
     </div>
     {% endif %}
 </div>
+
+ 
+<script type="text/javascript"> 
+
+    window.onload = function () {
+            var locale_date = new Date(document.getElementById("order-created_at").textContent + ' UTC');
+            locale_date =  moment(locale_date).format("YYYY-MM-DD h:mm:ss a");
+            document.getElementById('order-created_at').innerHTML = locale_date;
+
+    };
+
+</script>
 {%endblock%}
+
diff --git a/hosting/templates/hosting/orders.html b/hosting/templates/hosting/orders.html
index b52e7fc0..99aab23e 100644
--- a/hosting/templates/hosting/orders.html
+++ b/hosting/templates/hosting/orders.html
@@ -24,7 +24,7 @@
                         {% for order in orders %}
                             <tr>
                                 <td scope="row">{{ order.id }}</td>
-                                <td>{{ order.created_at }}</td>
+                                <td>{{ order.created_at | date:"M d, Y" }}</td>
                                 <td>{{ order.price }} CHF</td>
                                 <td>{% if order.approved %}
                                     <span class="text-success strong">{% trans "Approved"%}</span>
diff --git a/hosting/templates/hosting/user_keys.html b/hosting/templates/hosting/user_keys.html
index a4a0c2cf..571d423a 100644
--- a/hosting/templates/hosting/user_keys.html
+++ b/hosting/templates/hosting/user_keys.html
@@ -95,11 +95,9 @@
 
  
 <script type="text/javascript"> 
-    console.log("sadas");
 
     window.onload = function () {
         {% for user_key in keys %}
-            console.log("{{user_key.id}}");
             var locale_date = new Date(document.getElementById("ssh-created_at-{{user_key.id}}").textContent + ' UTC');
             locale_date =  moment(locale_date).format("YYYY-MM-DD h:mm:ss a");
             console.log(locale_date);

From 1897f4b5f6bfdb80db7d9968816721f4ea375ddc Mon Sep 17 00:00:00 2001
From: Levi <levinoelvm@gmail.com>
Date: Wed, 21 Jun 2017 13:28:48 -0500
Subject: [PATCH 06/11] fixing date format

---
 hosting/templates/hosting/order_detail.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hosting/templates/hosting/order_detail.html b/hosting/templates/hosting/order_detail.html
index c212d248..8b37cf03 100644
--- a/hosting/templates/hosting/order_detail.html
+++ b/hosting/templates/hosting/order_detail.html
@@ -68,7 +68,7 @@
                 <hr>
                 <p><b>{% trans "Disk space"%}</b> <span class="pull-right">{{vm.disk_size}} GB</span></p>
                 <hr>
-                <h4>{% trans "Total"%}<p class="pull-right"><b>{{vm.price}} CHF</b></p></h4>
+                                <h4>{% trans "Total"%}<p class="pull-right"><b>{{vm.price}} CHF</b></p></h4>
             </div>
             <br/>
             {% url 'hosting:payment' as payment_url %}
@@ -88,6 +88,7 @@
     window.onload = function () {
             var locale_date = new Date(document.getElementById("order-created_at").textContent + ' UTC');
             locale_date =  moment(locale_date).format("YYYY-MM-DD h:mm:ss a");
+            console.log("locale_date");
             document.getElementById('order-created_at').innerHTML = locale_date;
 
     };

From de647441208d273728b840bae417338ee0fb0032 Mon Sep 17 00:00:00 2001
From: Levi <levinoelvm@gmail.com>
Date: Wed, 21 Jun 2017 13:31:02 -0500
Subject: [PATCH 07/11] fixed issue on order view

---
 hosting/templates/hosting/order_detail.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hosting/templates/hosting/order_detail.html b/hosting/templates/hosting/order_detail.html
index 8b37cf03..5556cd67 100644
--- a/hosting/templates/hosting/order_detail.html
+++ b/hosting/templates/hosting/order_detail.html
@@ -35,7 +35,7 @@
                 <div class="col-xs-6 text-right">
                     <address>
                         <strong>{% trans "Billed To:"%}</strong><br>
-                        <span id="order-created_at">{{order.created_at}}</span><br><br>
+                        <span id="order-created_at">{{order.created_at|date:'Y-m-d H:i}}</span><br><br>
                         <strong>{% trans "Status:"%}</strong><br>
                         <strong class="{% if order.status == 'Approved' %}text-success
                                        {%else%} text-danger

From 8c7687fe7c37ddf8cfd49633620b5ee0928294a7 Mon Sep 17 00:00:00 2001
From: Levi <levinoelvm@gmail.com>
Date: Wed, 21 Jun 2017 13:32:23 -0500
Subject: [PATCH 08/11] fixed issue error 500

---
 hosting/templates/hosting/order_detail.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hosting/templates/hosting/order_detail.html b/hosting/templates/hosting/order_detail.html
index 5556cd67..fa5e5ec2 100644
--- a/hosting/templates/hosting/order_detail.html
+++ b/hosting/templates/hosting/order_detail.html
@@ -35,7 +35,7 @@
                 <div class="col-xs-6 text-right">
                     <address>
                         <strong>{% trans "Billed To:"%}</strong><br>
-                        <span id="order-created_at">{{order.created_at|date:'Y-m-d H:i}}</span><br><br>
+                        <span id="order-created_at">{{order.created_at|date:'Y-m-d H:i'}}</span><br><br>
                         <strong>{% trans "Status:"%}</strong><br>
                         <strong class="{% if order.status == 'Approved' %}text-success
                                        {%else%} text-danger

From 720270bac5120bf066ebe7c68360dcec082f5018 Mon Sep 17 00:00:00 2001
From: Levi <levinoelvm@gmail.com>
Date: Fri, 23 Jun 2017 00:30:31 -0500
Subject: [PATCH 09/11] fixed firefox issue

---
 hosting/templates/hosting/order_detail.html | 3 +--
 hosting/templates/hosting/user_keys.html    | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/hosting/templates/hosting/order_detail.html b/hosting/templates/hosting/order_detail.html
index fa5e5ec2..cb0dba4e 100644
--- a/hosting/templates/hosting/order_detail.html
+++ b/hosting/templates/hosting/order_detail.html
@@ -86,9 +86,8 @@
 <script type="text/javascript"> 
 
     window.onload = function () {
-            var locale_date = new Date(document.getElementById("order-created_at").textContent + ' UTC');
+            var locale_date = moment.utc(document.getElementById("order-created_at").textContent,'YYYY-MM-DD HH:mm').toDate();
             locale_date =  moment(locale_date).format("YYYY-MM-DD h:mm:ss a");
-            console.log("locale_date");
             document.getElementById('order-created_at').innerHTML = locale_date;
 
     };
diff --git a/hosting/templates/hosting/user_keys.html b/hosting/templates/hosting/user_keys.html
index 571d423a..1dc45e54 100644
--- a/hosting/templates/hosting/user_keys.html
+++ b/hosting/templates/hosting/user_keys.html
@@ -98,9 +98,9 @@
 
     window.onload = function () {
         {% for user_key in keys %}
-            var locale_date = new Date(document.getElementById("ssh-created_at-{{user_key.id}}").textContent + ' UTC');
+            // var locale_date = new Date(document.getElementById("ssh-created_at-{{user_key.id}}").textContent).toISOString();
+            var locale_date = moment.utc(document.getElementById("ssh-created_at-{{user_key.id}}").textContent,'YYYY-MM-DD HH:mm').toDate();
             locale_date =  moment(locale_date).format("YYYY-MM-DD h:mm:ss a");
-            console.log(locale_date);
             document.getElementById('ssh-created_at-{{user_key.id}}').innerHTML = locale_date;
 
         {% endfor %}

From b649bcd87e5d431eb7ebeb3d9d9d71eaf75f8158 Mon Sep 17 00:00:00 2001
From: Pcoder <purple.coder@yahoo.co.uk>
Date: Thu, 29 Jun 2017 21:24:04 +0200
Subject: [PATCH 10/11] Fixed a typo

---
 hosting/templates/hosting/order_detail.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hosting/templates/hosting/order_detail.html b/hosting/templates/hosting/order_detail.html
index 3f64c54d..4418ee3d 100644
--- a/hosting/templates/hosting/order_detail.html
+++ b/hosting/templates/hosting/order_detail.html
@@ -34,7 +34,7 @@
     			</div>
                 <div class="col-xs-6 text-right">
                     <address>
-                        <strong>{% trans "Billed To:"%}</strong><br>
+                        <strong>{% trans "Date"%}</strong><br>
                         <span id="order-created_at">{{order.created_at|date:'Y-m-d H:i'}}</span><br><br>
                         <strong>{% trans "Status:"%}</strong><br>
                         <strong class="{% if order.status == 'Approved' %}text-success

From 69fde64149375ffdcc0a85db71d543f2937faac2 Mon Sep 17 00:00:00 2001
From: Pcoder <purple.coder@yahoo.co.uk>
Date: Thu, 29 Jun 2017 21:24:52 +0200
Subject: [PATCH 11/11] Added missing colon

---
 hosting/templates/hosting/order_detail.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hosting/templates/hosting/order_detail.html b/hosting/templates/hosting/order_detail.html
index 4418ee3d..761550fe 100644
--- a/hosting/templates/hosting/order_detail.html
+++ b/hosting/templates/hosting/order_detail.html
@@ -34,7 +34,7 @@
     			</div>
                 <div class="col-xs-6 text-right">
                     <address>
-                        <strong>{% trans "Date"%}</strong><br>
+                        <strong>{% trans "Date"%}:</strong><br>
                         <span id="order-created_at">{{order.created_at|date:'Y-m-d H:i'}}</span><br><br>
                         <strong>{% trans "Status:"%}</strong><br>
                         <strong class="{% if order.status == 'Approved' %}text-success