From bfd621e98b88b2ce8983da5dcc1f38d383fbf2f8 Mon Sep 17 00:00:00 2001
From: ARvind Tiwari <tiwariav@gmail.com>
Date: Thu, 3 Aug 2017 01:27:29 +0530
Subject: [PATCH] ssh_keys table updated

---
 hosting/locale/de/LC_MESSAGES/django.po  |  2 +-
 hosting/static/hosting/css/user_keys.css | 10 +++++---
 hosting/templates/hosting/user_keys.html | 31 ++++++++++++------------
 3 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/hosting/locale/de/LC_MESSAGES/django.po b/hosting/locale/de/LC_MESSAGES/django.po
index 7e49f20f..b2110f4f 100644
--- a/hosting/locale/de/LC_MESSAGES/django.po
+++ b/hosting/locale/de/LC_MESSAGES/django.po
@@ -543,7 +543,7 @@ msgstr "Möchtest Du den Schlüssel löschen?"
 
 #: .\hosting\templates\hosting\user_keys.html:72
 msgid "Show"
-msgstr ""
+msgstr "Anzeigen"
 
 #: .\hosting\templates\hosting\user_keys.html:82
 msgid "Public ssh key"
diff --git a/hosting/static/hosting/css/user_keys.css b/hosting/static/hosting/css/user_keys.css
index 57bd6fab..6526640a 100644
--- a/hosting/static/hosting/css/user_keys.css
+++ b/hosting/static/hosting/css/user_keys.css
@@ -2,6 +2,7 @@
 .h1-thin {
     font-family: Lato, sans-serif;
     font-weight: 300;
+    font-size: 32px;
 }
 .dashboard-container .page-header {
     border: 0;
@@ -33,9 +34,11 @@
     padding-bottom: 25px;
     margin-bottom: 25px;
 }
+.choice-container .choice-btn {
+    margin-top: 25px;
+}
 .choice-btn {
     min-width: 110px;
-    margin-top: 25px;
     background-color: #3C5480;
     color: #fff;
     border: 2px solid #3C5480;
@@ -55,7 +58,7 @@
 
 @media (max-width: 767px) {
     .h1-thin {
-        font-size: 29px;
+        font-size: 27px;
     }
     .dashboard-choice-container h2 {
         font-size: 20px;
@@ -73,7 +76,7 @@
     color: #717274;
     text-align: center;
     border-bottom: 1px solid #cbcbcb;
-
+    vertical-align: middle;
 }
 .ssh-keys-table tbody tr{
     border-bottom: 1px solid #cbcbcb;
@@ -100,6 +103,7 @@
     .ssh-header-container {
         display: flex;
         justify-content: space-between;
+        align-items: flex-start;
     }
     .ssh-header-container p{
         margin-bottom: 0;
diff --git a/hosting/templates/hosting/user_keys.html b/hosting/templates/hosting/user_keys.html
index ae57e547..47dec19e 100644
--- a/hosting/templates/hosting/user_keys.html
+++ b/hosting/templates/hosting/user_keys.html
@@ -3,7 +3,7 @@
 {% block content %}
 <div>
 	<div class="container virtual-machine-container dashboard-container ">
-        <h2><i class="fa fa-key" aria-hidden="true"></i>&nbsp;{% trans "Your SSH Keys"%}</h2>
+        <h2><i class="fa fa-key" aria-hidden="true"></i>&nbsp;{% trans "Your SSH Keys" %}</h2>
         {% if messages %}
         <div class="alert alert-warning">
             {% for message in messages %}
@@ -14,7 +14,7 @@
          <div class="ssh-header-container">
             <p>{% trans "To generate a new key pair or to upload your existing key, click 'Add Key'" %}</p>
             <a class="btn choice-btn" href="{% url 'hosting:choice_ssh_keys' %}" >
-                <span class="fa fa-plus"></span>&nbsp;&nbsp;{% trans "Add SSH Key"%}
+                <span class="fa fa-plus"></span>&nbsp;&nbsp;{% trans "Add SSH Key" %}
             </a>
          </div>
 
@@ -22,22 +22,21 @@
             <br/>
             <thead>
             <tr>
-                <th>{% trans "Name"%}</th>
-                <th>{% trans "Delete Key"%}</th>
-                <th>{% trans "Public Key"%}</th>
-                <th>{% trans "Private Key"%}</th>
+                <th>{% trans "Name" %}</th>
+                <th>{% trans "Delete Key" %}</th>
+                <th>{% trans "Public Key" %}</th>
+                <th>{% trans "Private Key" %}</th>
             </tr>
             </thead>
             <tbody>
                 {% for user_key in keys %}
                 <tr>
                     <td scope="row">{{user_key.name}}</td>
-
                     <td>
                         <button type="button" class="btn btn-default btn-custom-delete" data-toggle="modal"
                                 data-target="#Modal{{ user_key.id }}" style="color: #717274">
-
-                                {% trans "Delete"%}
+                            <span class="pc-only">{% trans "Delete" %}</span>
+                            <span class="mob-only"><i class="fa fa-trash"></i></span>
                         </button>
 
                         <div class="modal fade" id="Modal{{user_key.id }}" tabindex="-1" role="dialog">
@@ -50,15 +49,15 @@
                                         </button>
                                     </div>
                                     <div class="modal-body">
-                                        <h4 class="modal-title" id="ModalLabel">{% trans "Do You want to delete this key?"%}</h4>
+                                        <h4 class="modal-title" id="ModalLabel">{% trans "Do You want to delete this key?" %}</h4>
                                         <form method="post" action="{% url 'hosting:delete_ssh_key' user_key.id %}">
                                             {% csrf_token %}
                                             <div class="modal-footer">
                                                 <button type="button" class="btn btn-default"
                                                         data-dismiss="modal">
-                                                    {% trans "Close"%}
+                                                    {% trans "Close" %}
                                                 </button>
-                                                <button type="submit" class="btn btn-primary">{% trans "Delete"%}
+                                                <button type="submit" class="btn btn-primary">{% trans "Delete" %}
                                                 </button>
                                             </div>
                                         </form>
@@ -69,7 +68,7 @@
                      </td>
                     <td>
                         <p type="button"  data-toggle="modal" style="margin: 0" data-target="#Modal_public_key{{ user_key.id }}">
-                            <a href="#">{% trans "Show"%}</a>
+                            <a href="#">{% trans "Show" %}</a>
                         </p>
                         <div class="modal fade" id="Modal_public_key{{user_key.id }}" tabindex="-1" role="dialog">
                             <div class="modal-dialog" role="document">
@@ -79,14 +78,14 @@
                                                 aria-label="Confirm"><span
                                                 aria-hidden="true">&times;</span>
                                         </button>
-                                        <h4 class="modal-title" id="ModalLabel_Public_Key">{% trans "Public ssh key"%}</h4>
+                                        <h4 class="modal-title" id="ModalLabel_Public_Key">{% trans "Public ssh key" %}</h4>
                                     </div>
                                     <div class="modal-body">
                                         <p>{{ user_key.public_key }}</p>
                                         <div class="modal-footer">
                                             <button type="button" class="btn btn-default"
                                                     data-dismiss="modal">
-                                                {% trans "Close"%}
+                                                {% trans "Close" %}
                                             </button>
                                         </div>
                                     </div>
@@ -100,7 +99,7 @@
                         <form action="{{ user_key.private_key.url }}">
                             <button style="color: #717274" type="submit" class="btn btn-default" data-toggle="modal"
                                     >
-                                    <span class="pc-only">{% trans "Download"%}</span>
+                                    <span class="pc-only">{% trans "Download" %}</span>
                                     <span class="mob-only"><i class="fa fa-download"></i></span>
                             </button>
                         </form>