drop most of the per-card formatting

This commit is contained in:
Damien Elmes 2010-11-29 22:27:19 +09:00
parent 74a0998a36
commit b349a96fa5
2 changed files with 7 additions and 8 deletions

View file

@ -1658,12 +1658,10 @@ facts.id = cards.factId""", id=model.id))
return t return t
css = "".join([_genCSS(".fm", row) for row in self.s.all(""" css = "".join([_genCSS(".fm", row) for row in self.s.all("""
select id, quizFontFamily, quizFontSize, quizFontColour, -1, features from fieldModels""")]) select id, quizFontFamily, quizFontSize, quizFontColour, -1, features from fieldModels""")])
css += "".join([_genCSS("#cmq", row) for row in self.s.all(""" cardRows = self.s.all("""
select id, questionFontFamily, questionFontSize, questionFontColour, select id, null, null, null, questionAlign, 0 from cardModels""")
questionAlign, 0 from cardModels""")]) css += "".join([_genCSS("#cmq", row) for row in cardRows])
css += "".join([_genCSS("#cma", row) for row in self.s.all(""" css += "".join([_genCSS("#cma", row) for row in cardRows])
select id, answerFontFamily, answerFontSize, answerFontColour,
answerAlign, 0 from cardModels""")])
css += "".join([".cmb%s {background:%s;}\n" % css += "".join([".cmb%s {background:%s;}\n" %
(hexifyID(row[0]), row[1]) for row in self.s.all(""" (hexifyID(row[0]), row[1]) for row in self.s.all("""
select id, lastFontColour from cardModels""")]) select id, lastFontColour from cardModels""")])

View file

@ -89,16 +89,17 @@ cardModelsTable = Table(
Column('qedformat', UnicodeText), Column('qedformat', UnicodeText),
Column('aedformat', UnicodeText), Column('aedformat', UnicodeText),
Column('questionInAnswer', Boolean, nullable=False, default=False), Column('questionInAnswer', Boolean, nullable=False, default=False),
# display # unused
Column('questionFontFamily', UnicodeText, default=u"Arial"), Column('questionFontFamily', UnicodeText, default=u"Arial"),
Column('questionFontSize', Integer, default=20), Column('questionFontSize', Integer, default=20),
Column('questionFontColour', String(7), default=u"#000000"), Column('questionFontColour', String(7), default=u"#000000"),
# used for both question & answer
Column('questionAlign', Integer, default=0), Column('questionAlign', Integer, default=0),
# ununsed
Column('answerFontFamily', UnicodeText, default=u"Arial"), Column('answerFontFamily', UnicodeText, default=u"Arial"),
Column('answerFontSize', Integer, default=20), Column('answerFontSize', Integer, default=20),
Column('answerFontColour', String(7), default=u"#000000"), Column('answerFontColour', String(7), default=u"#000000"),
Column('answerAlign', Integer, default=0), Column('answerAlign', Integer, default=0),
# not used
Column('lastFontFamily', UnicodeText, default=u"Arial"), Column('lastFontFamily', UnicodeText, default=u"Arial"),
Column('lastFontSize', Integer, default=20), Column('lastFontSize', Integer, default=20),
# used as background colour # used as background colour