diff --git a/aqt/deckbrowser.py b/aqt/deckbrowser.py index 850dbce95..f2246c85e 100644 --- a/aqt/deckbrowser.py +++ b/aqt/deckbrowser.py @@ -50,14 +50,14 @@ class DeckBrowser(object): _css = """ .sub { color: #555; } -a.deck { color: #000; text-decoration: none; font-size: 16px; } +a.deck { color: #000; text-decoration: none; font-size: 12px; } .num { text-align: right; padding: 0 5 0 5; } td.opts { white-space: nowrap; } td.deck { width: 90% } a { font-size: 80%; } .extra { font-size: 90%; } .due { vertical-align: text-bottom; } -table { margin: 1em; } +body { margin: 1em; } """ _body = """ @@ -92,7 +92,7 @@ table { margin: 1em; } buf += " %s"% (did, name) # options buf += "%s" % self.mw.button( - link="opts:%d"%did, name=_("Options")+'▼') + link="opts:%d"%did, name=_("Options")+'▾') # children buf += self._renderDeckTree(children, depth+1) return buf diff --git a/aqt/main.py b/aqt/main.py index fb8e8f4d9..fec4bddfd 100755 --- a/aqt/main.py +++ b/aqt/main.py @@ -286,7 +286,7 @@ Are you sure?"""): sharedCSS = """ body { -background: #eee; +background: #f3f3f3; margin: 2em; } a:hover { background-color: #aaa; } diff --git a/aqt/overview.py b/aqt/overview.py index 5ad9463d9..39e894e02 100644 --- a/aqt/overview.py +++ b/aqt/overview.py @@ -42,14 +42,16 @@ class Overview(object): if url == "study": self.mw.col.reset() self.mw.moveToState("review") + elif url == "anki": + print "anki menu" elif url == "cram": return showInfo("not yet implemented") #self.mw.col.cramGroups() #self.mw.moveToState("review") elif url == "opts": self.mw.onStudyOptions() - elif url == "chgrp": - self.mw.onGroups() + elif url == "decks": + self.mw.moveToState("deckBrowser") # HTML ############################################################ @@ -60,12 +62,30 @@ class Overview(object): tbl = self._overviewTable() but = self.mw.button deck = self.mw.col.decks.current() - dname = deck['name'] sid = deck.get("sharedFrom") if True: # sid: shareLink = 'Reviews and Updates' else: shareLink = "" + header = """ + + + + + +
+""" #% deck['name'] + self.web.stdHtml(self._overviewBody % dict( title=_("Overview"), table=tbl, @@ -73,10 +93,12 @@ class Overview(object): deck=deck['name'], shareLink=shareLink, desc="", + header=header, fcdata=fc, ), css) _overviewBody = """ +%(header)s

%(deck)s

%(shareLink)s @@ -112,6 +134,29 @@ $(function () { .sub { font-size: 80%; color: #555; } .smallLink { font-size: 12px; } h3 { margin-bottom: 0; } +#headerSpace { height: 22px; } +#header { +z-index: 100; +position: fixed; +height: 22px; +font-size: 12px; +margin:0; +background: -webkit-gradient(linear, left top, left bottom, +from(#ddd), to(#fff)); +border-bottom: 1px solid #ccc; +font-weight: bold; +} +body { margin: 0; } +.deck { } +.hitem { display: inline-block; padding: 4px; padding-right: 6px; +text-decoration: none; color: #000; +} +.hborder { border: 1px solid #ddd; } +.hitem:hover { +background: #333; +color: #fff; +} +.icon { padding-top: 2px; } """ def _overviewTable(self): diff --git a/designer/icons.qrc b/designer/icons.qrc index 078c24e3b..afc539d1d 100644 --- a/designer/icons.qrc +++ b/designer/icons.qrc @@ -11,6 +11,7 @@ icons/layout.png icons/generate_07.png icons/view-sort-descending.png + icons/view-refresh.png icons/emblem-important.png icons/view-sort-ascending.png icons/media-playback-start2.png diff --git a/designer/icons/view-refresh.png b/designer/icons/view-refresh.png new file mode 100644 index 000000000..f1bce46bf Binary files /dev/null and b/designer/icons/view-refresh.png differ diff --git a/designer/icons/view-statistics.png b/designer/icons/view-statistics.png index 08b59446e..1242645d1 100644 Binary files a/designer/icons/view-statistics.png and b/designer/icons/view-statistics.png differ