From 5edc1edcfbc1f55b6198355786e96a65b94e6351 Mon Sep 17 00:00:00 2001
From: Robert Martinez <mail@mray.de>
Date: Fri, 26 Oct 2018 01:42:31 +0200
Subject: [PATCH] Incorporate feedback from MR

* change wording
* correct indentation
* correct typos
* disable update button
* use semantic tag
* reduce button size
* apply consistent id-naming

Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
---
 plinth/modules/upgrades/__init__.py             |  2 +-
 plinth/modules/upgrades/templates/upgrades.html | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/plinth/modules/upgrades/__init__.py b/plinth/modules/upgrades/__init__.py
index b46bf68d5..146eda26b 100644
--- a/plinth/modules/upgrades/__init__.py
+++ b/plinth/modules/upgrades/__init__.py
@@ -35,7 +35,7 @@ managed_packages = ['unattended-upgrades']
 name = _('Update')
 
 description = [
-    _('Search for and apply the latest software and security updates. ')
+    _('Check for and apply the latest software and security updates. ')
 ]
 
 service = None
diff --git a/plinth/modules/upgrades/templates/upgrades.html b/plinth/modules/upgrades/templates/upgrades.html
index bb8954be8..2112ed74a 100644
--- a/plinth/modules/upgrades/templates/upgrades.html
+++ b/plinth/modules/upgrades/templates/upgrades.html
@@ -39,24 +39,24 @@
     <form class="form" method="post" action="{% url 'upgrades:upgrade' %}">
       {% csrf_token %}
 
-      <input type="submit" class="btn btn-primary btn-lg"
-      value="{% trans "Update now" %}"/>
+      <input type="submit" class="btn btn-primary"
+             value="{% trans "Update now" %}"/>
     </form>
   </p>
   {% endif %}
 
   {% if is_busy %}
-  <p class="running-status-parent text-center btn btn-primary btn-lg">
+  <button type="button" disabled="disabled" class="running-status-parent btn btn-default" >
     <span class="running-status loading"></span>
     {% trans "Updating..." %}
-  </p>
+  </button>
   {% endif %}
 
   <p>
     {% blocktrans trimmed %}
-      <b>This may take a long time to complete</b>. During an update, you
+      <strong>This may take a long time to complete</strong>. During an update, you
       can not install apps. Also, this web interface may be temporarily
-       unavailable and show an error. In that case refresh the page to continue.
+      unavailable and show an error. In that case, refresh the page to continue.
     {% endblocktrans %}
   </p>
 
@@ -64,11 +64,11 @@
 
   {% if log %}
   <p>
-    <a class="btn btn-default" role="button" data-toggle="collapse" href="#collapseLog" aria-expanded="false" aria-controls="collapseLog">
+    <a class="btn btn-default" role="button" data-toggle="collapse" href="#collapse-log" aria-expanded="false" aria-controls="collapse-log">
         Toggle recent update logs
     </a>
 
-    <div class="collapse" id="collapseLog">
+    <div class="collapse" id="collapse-log">
       <pre>{{ log }}</pre>
     </div>
   </p>