Merge "Fix table HTML"

8 files changed, 84 insertions, 82 deletions

diff --git a/tools/pharos-dashboard/static/js/flot-pie-chart.js b/tools/pharos-dashboard/static/js/flot-pie-chart.js
index 98d174e4..cf8d9769 100644
--- a/tools/pharos-dashboard/static/js/flot-pie-chart.js
+++ b/tools/pharos-dashboard/static/js/flot-pie-chart.js
@@ -4,14 +4,12 @@ function loadChartData(chart_id, url) {
         type: 'get',
         success: function (data) {
             var data = data['data'];
-            $(function () {
-                var plotObj = $.plot($("#" + chart_id), data, {
-                    series: {
-                        pie: {
-                            show: true
-                        }
+            var plotObj = $.plot($("#" + chart_id), data, {
+                series: {
+                    pie: {
+                        show: true
                     }
-                });
+                }
             });
         },
         failure: function (data) {
diff --git a/tools/pharos-dashboard/templates/account/user_list.html b/tools/pharos-dashboard/templates/account/user_list.html
index 7618dc95..c2b81938 100644
--- a/tools/pharos-dashboard/templates/account/user_list.html
+++ b/tools/pharos-dashboard/templates/account/user_list.html
@@ -13,18 +13,22 @@
     <tbody>
     {% for user in users %}
         <tr>
-            <th>
+            <td>
                 {{ user.username }}
-            </th>
-            <th>
+            </td>
+            <td>
                 {{ user.userprofile.company }}
-            </th>
-            <th>
-                <a href={{ user.userprofile.ssh_public_key.url }}>Download</a>
-            </th>
-            <th>
-                <a href={{ user.userprofile.pgp_public_key.url }}>Download</a>
-            </th>
+            </td>
+            <td>
+		{% if user.userprofile.ssh_public_key %}
+                <a href={{ user.userprofile.ssh_public_key.url }}>SSH</a>
+		{% endif %}
+            </td>
+            <td>
+		{% if user.userprofile.pgp_public_key %}
+                <a href={{ user.userprofile.pgp_public_key.url }}>GPG</a>
+		{% endif %}
+            </td>
         </tr>
     {% endfor %}
     </tbody>
@@ -39,4 +43,4 @@
             });
         });
     </script>
-{% endblock tablejs %}
\ No newline at end of file
+{% endblock tablejs %}
diff --git a/tools/pharos-dashboard/templates/booking/booking_table.html b/tools/pharos-dashboard/templates/booking/booking_table.html
index 3d0b7575..216eaf57 100644
--- a/tools/pharos-dashboard/templates/booking/booking_table.html
+++ b/tools/pharos-dashboard/templates/booking/booking_table.html
@@ -13,21 +13,21 @@
 <tbody>
 {% for booking in bookings %}
     <tr>
-        <th>
+        <td>
             {{ booking.user.username }}
-        </th>
-        <th>
+        </td>
+        <td>
             {{ booking.purpose }}
-        </th>
-        <th>
+        </td>
+        <td>
             {{ booking.start }}
-        </th>
-        <th>
+        </td>
+        <td>
             {{ booking.end }}
-        </th>
-        <th><a target='_blank'
+        </td>
+        <td><a target='_blank'
                href={{ booking.get_jira_issue | jira_issue_url }}>{{ booking.get_jira_issue }}</a>
-        </th>
+        </td>
     </tr>
 {% endfor %}
 </tbody>
\ No newline at end of file
diff --git a/tools/pharos-dashboard/templates/dashboard/ci_pods.html b/tools/pharos-dashboard/templates/dashboard/ci_pods.html
index a754252c..7ef62a43 100644
--- a/tools/pharos-dashboard/templates/dashboard/ci_pods.html
+++ b/tools/pharos-dashboard/templates/dashboard/ci_pods.html
@@ -17,29 +17,29 @@
     <tbody>
     {% for pod in ci_pods %}
         <tr>
-            <th>
+            <td>
                 <a target='_blank' href={{ pod.url }}>{{ pod.name }}</a>
-            </th>
-            <th>
+            </td>
+            <td>
                 <a target='_blank' href={{ pod.slave.url }}>{{ pod.slave.name }}</a>
-            </th>
-            <th style="background-color:{{ pod.slave.status | jenkins_status_color }}">
+            </td>
+            <td style="background-color:{{ pod.slave.status | jenkins_status_color }}">
                 {{ pod.slave.status }}
-            </th>
-            <th {{ pod.slave.last_job_result | jenkins_job_blink }}>
+            </td>
+            <td {{ pod.slave.last_job_result | jenkins_job_blink }}>
                 {{ pod.slave.last_job_installer }}
-            </th>
-            <th {{ pod.slave.last_job_result | jenkins_job_blink }}>
+            </td>
+            <td {{ pod.slave.last_job_result | jenkins_job_blink }}>
                 {{ pod.slave.last_job_scenario }}
-            </th>
-            <th {{ pod.slave.last_job_result | jenkins_job_blink }}>
+            </td>
+            <td {{ pod.slave.last_job_result | jenkins_job_blink }}>
                 {{ pod.slave.last_job_branch }}
-            </th>
-            <th><a {{ pod.slave.last_job_result | jenkins_job_blink }}
+            </td>
+            <td><a {{ pod.slave.last_job_result | jenkins_job_blink }}
                     style="color:{{ pod.slave.last_job_result | jenkins_job_color }}"
                     target='_blank'
                     href={{ pod.slave.last_job_url }}>{{ pod.slave.last_job_name }}</a>
-            </th>
+            </td>
         </tr>
     {% endfor %}
     </tbody>
diff --git a/tools/pharos-dashboard/templates/dashboard/dev_pods.html b/tools/pharos-dashboard/templates/dashboard/dev_pods.html
index c4cb1ba7..2b4b0177 100644
--- a/tools/pharos-dashboard/templates/dashboard/dev_pods.html
+++ b/tools/pharos-dashboard/templates/dashboard/dev_pods.html
@@ -19,37 +19,37 @@
     <tbody>
     {% for pod, booking, utilization in dev_pods %}
         <tr>
-            <th>
+            <td>
                 <a href={% url 'dashboard:resource' resource_id=pod.id %}>{{ pod.name }}</a>
-            </th>
-            <th>
+            </td>
+            <td>
                 <a target='_blank' href={{ pod.slave.url }}>{{ pod.slave.name }}</a>
-            </th>
-            <th>
+            </td>
+            <td>
                 {{ booking.user.username }}
-            </th>
-            <th>
+            </td>
+            <td>
                 {{ booking.end }}
-            </th>
-            <th>
+            </td>
+            <td>
                 {{ booking.purpose }}
-            </th>
-            <th>
+            </td>
+            <td>
                 {{ utilization }}
-            </th>
-            <th style="background-color:{{ pod.slave.status | jenkins_status_color }}">
+            </td>
+            <td style="background-color:{{ pod.slave.status | jenkins_status_color }}">
                 {{ pod.slave.status }}
-            </th>
-            <th>
+            </td>
+            <td>
                 <a href="{% url 'booking:create' resource_id=pod.id %}" class="btn btn-primary">
                     Book
                 </a>
-            </th>
-            <th>
+            </td>
+            <td>
                 <a href="{% url 'dashboard:resource' resource_id=pod.id %}" class="btn btn-primary">
                     Info
                 </a>
-            </th>
+            </td>
         </tr>
     {% endfor %}
     </tbody>
diff --git a/tools/pharos-dashboard/templates/dashboard/jenkins_slaves.html b/tools/pharos-dashboard/templates/dashboard/jenkins_slaves.html
index 830ed198..aa74507c 100644
--- a/tools/pharos-dashboard/templates/dashboard/jenkins_slaves.html
+++ b/tools/pharos-dashboard/templates/dashboard/jenkins_slaves.html
@@ -14,17 +14,17 @@
     <tbody>
     {% for slave in slaves %}
         <tr>
-            <th><a target='_blank'
+            <td><a target='_blank'
                    href={{ slave.url }}>{{ slave.name }}</a>
-            </th>
-            <th style="background-color:{{ slave.status | jenkins_status_color }}">
+            </td>
+            <td style="background-color:{{ slave.status | jenkins_status_color }}">
                 {{ slave.status }}
-            </th>
-            <th><a {{ slave.last_job_result | jenkins_job_blink }}
+            </td>
+            <td><a {{ slave.last_job_result | jenkins_job_blink }}
                     style="color:{{ slave.last_job_result | jenkins_job_color }}"
                     target="_blank" href={{ slave.last_job_url }}>
                 {{ slave.last_job_name }}</a>
-            </th>
+            </td>
         </tr>
     {% endfor %}
     </tbody>
diff --git a/tools/pharos-dashboard/templates/dashboard/resource_detail.html b/tools/pharos-dashboard/templates/dashboard/resource_detail.html
index 6067e1ea..657d5656 100644
--- a/tools/pharos-dashboard/templates/dashboard/resource_detail.html
+++ b/tools/pharos-dashboard/templates/dashboard/resource_detail.html
@@ -164,15 +164,15 @@
                         <tbody>
                         {% for user in resource.vpn_users.all %}
                             <tr>
-                                <th>
+                                <td>
                                     {{ user.username }}
-                                </th>
-                                <th>
+                                </td>
+                                <td>
                                     {{ user.email }}
-                                </th>
-                                <th>
+                                </td>
+                                <td>
                                     {{ user.userprofile.company }}
-                                </th>
+                                </td>
                             </tr>
                         {% endfor %}
                     </table>
diff --git a/tools/pharos-dashboard/templates/dashboard/server_table.html b/tools/pharos-dashboard/templates/dashboard/server_table.html
index fee7e8b1..f01bd603 100644
--- a/tools/pharos-dashboard/templates/dashboard/server_table.html
+++ b/tools/pharos-dashboard/templates/dashboard/server_table.html
@@ -10,21 +10,21 @@
 <tbody>
 {% for server in resource.server_set.all %}
     <tr>
-        <th>
+        <td>
             {{ server.name }}
-        </th>
-        <th>
+        </td>
+        <td>
             {{ server.model }}
-        </th>
-        <th>
+        </td>
+        <td>
             {{ server.cpu }}
-        </th>
-        <th>
+        </td>
+        <td>
             {{ server.ram }}
-        </th>
-        <th>
+        </td>
+        <td>
             {{ server.storage }}
-        </th>
+        </td>
     </tr>
 {% endfor %}
 </tbody>
\ No newline at end of file