From 7909181f326fed7e1a4096d9487686c145a10c69 Mon Sep 17 00:00:00 2001
From: Damien Elmes <git@ichi2.net>
Date: Thu, 1 Dec 2011 20:06:56 +0900
Subject: [PATCH] move remaining to middle; hide timer for now

---
 aqt/overview.py |  2 ++
 aqt/reviewer.py | 17 ++++++++++-------
 aqt/toolbar.py  |  2 +-
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/aqt/overview.py b/aqt/overview.py
index 1a6187a75..03f28d30b 100644
--- a/aqt/overview.py
+++ b/aqt/overview.py
@@ -25,6 +25,7 @@ class Overview(object):
     def refresh(self):
         self._renderPage()
         self._renderBottom()
+        self.mw.web.setFocus()
 
     # Handlers
     ############################################################
@@ -112,6 +113,7 @@ class Overview(object):
 h3 { margin-bottom: 0; }
 .fin { font-size: 12px; font-weight: normal; }
 td { font-size: 14px; }
+button { font-weight: bold; }
 """
 
     # Bottom area
diff --git a/aqt/reviewer.py b/aqt/reviewer.py
index 3377e4788..d08ff7553 100644
--- a/aqt/reviewer.py
+++ b/aqt/reviewer.py
@@ -361,11 +361,11 @@ padding-left: 5px; padding-right: 5px;
 td { font-weight: bold; font-size: 12px; }
 .hitem { margin-top: 2px; }
 .stat { padding-top: 5px; }
+.stat2 { padding-top: 3px; font-weight: normal; }
 .stattxt { padding-left: 5px; padding-right: 5px; white-space: nowrap; }
-.nobold { font-weight: normal; display: inline-block; padding-top: 3px; }
+.nobold { font-weight: normal; display: inline-block; padding-top: 4px; }
 .spacer { height: 18px; }
 .spacer2 { height: 16px; }
-button { font-weight: normal; }
 """
 
     def _bottomHTML(self, middle):
@@ -373,12 +373,12 @@ button { font-weight: normal; }
 <table width=100%% cellspacing=0 cellpadding=0>
 <tr>
 <td align=left width=50 valign=top class=stat>
-<span class=stattxt>%(rem)s</span><br>
+<br>
 <button onclick="py.link('edit');">%(edit)s</button></td>
 <td align=center valign=top>
 %(middle)s
 </td>
-<td width=75 align=right valign=top class=stat><span id=time class=stattxt>
+<td width=50 align=right valign=top class=stat><span id=time class=stattxt>
 </span><br>
 <button onclick="py.link('more');">%(more)s &#9662;</button>
 </td>
@@ -393,6 +393,7 @@ setInterval(function () { time += 1; updateTime() }, 1000);
 });
 
 var updateTime = function () {
+    return;
     var m = Math.floor(time / 60);
     var s = time %% 60;
     if (s < 10) {
@@ -408,10 +409,12 @@ var updateTime = function () {
     def _showAnswerButton(self):
         self.bottom.web.setFocus()
         middle = '''
-<div class=spacer2></div>
-<button id=ansbut onclick='py.link(\"ans\");'>%s</button>''' % _("Show Answer")
+<span class=stattxt>%s</span><br>
+<button id=ansbut onclick='py.link(\"ans\");'>%s</button>''' % (
+        self._remaining(), _("Show Answer"))
         # wrap it in a table so it has the same top margin as the ease buttons
-        middle = "<table cellpadding=0><tr><td>%s</td></tr></table>" % middle
+        middle = "<table cellpadding=0><tr><td class=stat2 align=center>%s</td></tr></table>" % middle
+
         self.bottom.web.stdHtml(
             self._bottomHTML(middle),
             self.bottom._css + self._bottomCSS)
diff --git a/aqt/toolbar.py b/aqt/toolbar.py
index 59d5ad10a..d8ceff041 100644
--- a/aqt/toolbar.py
+++ b/aqt/toolbar.py
@@ -117,7 +117,7 @@ text-decoration: underline;
 }
 
 button {
-font-weight: normal;
+font-weight: bold;
 }
 """