From c1515777d37c4d265677aa2795921b2f15286846 Mon Sep 17 00:00:00 2001 From: Oleg Broytman Date: Fri, 25 May 2018 04:34:50 +0300 Subject: [PATCH] =?utf8?q?Feat(web):=20=D0=A1=D0=B4=D0=B5=D0=BB=D0=B0?= =?utf8?q?=D1=82=D1=8C=20=D0=BC=D0=BD=D0=BE=D0=B6=D0=B5=D1=81=D1=82=D0=B2?= =?utf8?q?=D0=B5=D0=BD=D0=BD=D1=8B=D0=B9=20=D0=B2=D1=8B=D0=B1=D0=BE=D1=80?= =?utf8?q?=20=D0=B2=20=D1=81=D0=BF=D0=B8=D1=81=D0=BA=D0=B5=20=D0=BA=D0=BD?= =?utf8?q?=D0=B8=D0=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Сделать список книг в элементе SELECT, серии в OPTGROUP, книги в OPTION. --- m_librarian/web/static/style.css | 11 ++-- m_librarian/web/views/books_by_author.py | 64 +++++++++++----------- m_librarian/web/views/books_by_author.tmpl | 25 +++++---- 3 files changed, 51 insertions(+), 49 deletions(-) diff --git a/m_librarian/web/static/style.css b/m_librarian/web/static/style.css index 67149dc..7c3502b 100644 --- a/m_librarian/web/static/style.css +++ b/m_librarian/web/static/style.css @@ -1,4 +1,11 @@ +html { + width: 99%; + height: 99%; +} + body { + width: 99%; + height: 99%; color: #000000; font-family: sans-serif; text-decoration: none; @@ -30,7 +37,3 @@ td, th { border: 1px solid black; text-align: left; } - -td.numeric { - text-align: right; -} diff --git a/m_librarian/web/views/books_by_author.py b/m_librarian/web/views/books_by_author.py index ebb1cc6..1ae6dc1 100644 --- a/m_librarian/web/views/books_by_author.py +++ b/m_librarian/web/views/books_by_author.py @@ -35,10 +35,10 @@ VFN=valueForName currentTime=time.time __CHEETAH_version__ = '3.1.0' __CHEETAH_versionTuple__ = (3, 1, 0, 'final', 1) -__CHEETAH_genTime__ = 1523142213.339173 -__CHEETAH_genTimestamp__ = 'Sun Apr 8 02:03:33 2018' +__CHEETAH_genTime__ = 1527212249.002131 +__CHEETAH_genTimestamp__ = 'Fri May 25 04:37:29 2018' __CHEETAH_src__ = 'books_by_author.tmpl' -__CHEETAH_srcLastModified__ = 'Sun Apr 8 02:03:31 2018' +__CHEETAH_srcLastModified__ = 'Fri May 25 04:37:19 2018' __CHEETAH_docstring__ = 'Autogenerated by Cheetah: The Python-Powered Template Engine' if __CHEETAH_versionTuple__ < RequiredCheetahVersionTuple: @@ -96,42 +96,40 @@ class books_by_author(layout): ''') if VFFSL(SL,"books",True): # generated from line 7, col 1 - write(u''' + write(u''' + - - + for book in VFFSL(SL,"books",True): # generated from line 11, col 3 + if VFFSL(SL,"book.series",True) != VFFSL(SL,"series",True): # generated from line 12, col 3 + if VFFSL(SL,"series",True) is not None: # generated from line 13, col 3 + write(u''' ''') - else: # generated from line 17, col 3 - write(u''' - - + series = VFFSL(SL,"book.series",True) + write(u''' ''') - write(u''' - - - + write(u''' ''') - write(u'''
\u0421\u0435\u0440\u0438\u044f: ''') - _v = VFFSL(SL,"series",True) # u'$series' on line 15, col 26 - if _v is not None: write(_filter(_v, rawExpr=u'$series')) # from line 15, col 26. - write(u'''
\u0412\u043d\u0435 \u0441\u0435\u0440\u0438\u0439
''') - _v = VFFSL(SL,"book.ser_no",True) # u'$book.ser_no' on line 24, col 25 - if _v is not None: write(_filter(_v, rawExpr=u'$book.ser_no')) # from line 24, col 25. - write(u'''''') - _v = VFFSL(SL,"book.title",True) # u'$book.title' on line 25, col 39 - if _v is not None: write(_filter(_v, rawExpr=u'$book.title')) # from line 25, col 39. - write(u'''
+ write(u''' + + ''') - else: # generated from line 29, col 1 + else: # generated from line 30, col 1 write(u'''

\u041d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u043e \u043d\u0438 \u043e\u0434\u043d\u043e\u0439 \u043a\u043d\u0438\u0433\u0438!

''') diff --git a/m_librarian/web/views/books_by_author.tmpl b/m_librarian/web/views/books_by_author.tmpl index 240771d..96897e9 100644 --- a/m_librarian/web/views/books_by_author.tmpl +++ b/m_librarian/web/views/books_by_author.tmpl @@ -5,27 +5,28 @@

$title $author.fullname

#if $books - + + - - - + #end for -
$book.ser_no$book.title
+ + + #else

Не найдено ни одной книги!

#end if -- 2.39.2