GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-24 16:56:36 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

remove duplicate <html> in editor, set bg on page creation

Browse source
This commit is contained in:
Damien Elmes 2017-06-22 18:01:47 +10:00
parent 59f877737e
commit a3fa2ff5ba
1 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
aqt/editor.py
View file

@ -30,7 +30,7 @@ pics = ("jpg", "jpeg", "png", "tif", "tiff", "gif", "svg", "webp")
audio = ("wav", "mp3", "ogg", "flac", "mp4", "swf", "mov", "mpeg", "mkv", "m4a", "3gp", "spx", "oga") audio = ("wav", "mp3", "ogg", "flac", "mp4", "swf", "mov", "mpeg", "mkv", "m4a", "3gp", "spx", "oga")
_html = """ _html = """
<html><head>%s<style> <style>
.field { .field {
border: 1px solid #aaa; background:#fff; color:#000; padding: 5px; border: 1px solid #aaa; background:#fff; color:#000; padding: 5px;
} }
@ -44,7 +44,8 @@ _html = """
} }
.fname { vertical-align: middle; padding: 0; } .fname { vertical-align: middle; padding: 0; }
img { max-width: 90%%; } img { max-width: 90%%; }
body { margin: 5px; } html { background: %s; }
body { margin: 5px; }
#topbuts { position: fixed; height: 24px; top: 0; padding: 2px; left:0;right:0} #topbuts { position: fixed; height: 24px; top: 0; padding: 2px; left:0;right:0}
.topbut { width: 16px; height: 16px; } .topbut { width: 16px; height: 16px; }
.rainbow { .rainbow {
@ -64,7 +65,6 @@ background-image: -webkit-gradient(linear, left top, left bottom,
</style><script> </style><script>
%s
var currentField = null; var currentField = null;
var changeTimer = null; var changeTimer = null;
@ -76,11 +76,6 @@ String.prototype.format = function() {
return args[m.match(/\d+/)]; }); return args[m.match(/\d+/)]; });
}; };
function setBG(col) {
document.body.style.backgroundColor = col;
$("#topbuts")[0].style.backgroundColor = col;
};
function setFGButton(col) { function setFGButton(col) {
$("#forecolor")[0].style.backgroundColor = col; $("#forecolor")[0].style.backgroundColor = col;
}; };
@ -406,11 +401,10 @@ $(function () {
$("button.linkb").on("mousedown", function(e) { e.preventDefault(); }); $("button.linkb").on("mousedown", function(e) { e.preventDefault(); });
}); });
</script></head><body> </script>
<div id="topbuts">%s</div> <div id="topbuts">%s</div>
<div id="fields"></div> <div id="fields"></div>
<div id="dupes" style="display:none;"><a href="#" onclick="pycmd('dupes');return false;">%s</a></div> <div id="dupes" style="display:none;"><a href="#" onclick="pycmd('dupes');return false;">%s</a></div>
</body></html>
""" """
# caller is responsible for resetting note on reset # caller is responsible for resetting note on reset
@ -479,10 +473,12 @@ class Editor:
%(rightbts)s %(rightbts)s
</div> </div>
""" % dict(flds=_("Fields"), cards=_("Cards"), rightbts="".join(righttopbtns)) """ % dict(flds=_("Fields"), cards=_("Cards"), rightbts="".join(righttopbtns))
bgcol = self.mw.app.palette().window().color().name()
# then load page
self.web.stdHtml(_html % ( self.web.stdHtml(_html % (
self.mw.baseHTML(), anki.js.jquery, bgcol,
topbuts, topbuts,
_("Show Duplicates"))) _("Show Duplicates")), js=anki.js.jquery, head=self.mw.baseHTML())
# Top buttons # Top buttons
###################################################################### ######################################################################
@ -618,9 +614,6 @@ class Editor:
def _loadFinished(self): def _loadFinished(self):
self._loaded = True self._loaded = True
# match the background colour
bgcol = self.mw.app.palette().window().color().name()
self.web.eval("setBG('%s')" % bgcol)
# setup colour button # setup colour button
self.setupForegroundButton() self.setupForegroundButton()