From: Oleg Broytman Date: Tue, 16 Jul 2024 13:01:09 +0000 (+0300) Subject: Refactor(web): Use classes instead of inline styles X-Git-Tag: 0.4.1~2 X-Git-Url: https://git.phdru.name/?a=commitdiff_plain;h=5cbaf30fa108a6f0f89ae1b3531820b27f78d7cc;p=m_librarian.git Refactor(web): Use classes instead of inline styles [skip ci] --- diff --git a/m_librarian/web/static/style.css b/m_librarian/web/static/style.css index 5b80535..128d5ed 100644 --- a/m_librarian/web/static/style.css +++ b/m_librarian/web/static/style.css @@ -44,3 +44,11 @@ td, th { padding-right: 5px; border-left: 1px solid black; } + +.long { + width: 100%; +} + +.center { + text-align: center; +} diff --git a/m_librarian/web/views/download.py b/m_librarian/web/views/download.py index c207ccb..177c0d8 100644 --- a/m_librarian/web/views/download.py +++ b/m_librarian/web/views/download.py @@ -35,10 +35,10 @@ VFN=valueForName currentTime=time.time __CHEETAH_version__ = '3.3.1' __CHEETAH_versionTuple__ = (3, 3, 1, 'final', 0) -__CHEETAH_genTime__ = 1704845598.39619 -__CHEETAH_genTimestamp__ = 'Wed Jan 10 03:13:18 2024' +__CHEETAH_genTime__ = 1721134725.632482 +__CHEETAH_genTimestamp__ = 'Tue Jul 16 15:58:45 2024' __CHEETAH_src__ = 'download.tmpl' -__CHEETAH_srcLastModified__ = 'Wed Jan 10 03:10:53 2024' +__CHEETAH_srcLastModified__ = 'Tue Jul 16 15:57:52 2024' __CHEETAH_docstring__ = 'Autogenerated by Cheetah: The Python-Powered Template Engine' if __CHEETAH_versionTuple__ < RequiredCheetahVersionTuple: diff --git a/m_librarian/web/views/index.py b/m_librarian/web/views/index.py index e066e53..b70a326 100644 --- a/m_librarian/web/views/index.py +++ b/m_librarian/web/views/index.py @@ -35,12 +35,12 @@ VFFSL=valueFromFrameOrSearchList VFSL=valueFromSearchList VFN=valueForName currentTime=time.time -__CHEETAH_version__ = '3.1.0' -__CHEETAH_versionTuple__ = (3, 1, 0, 'final', 1) -__CHEETAH_genTime__ = 1527354191.441549 -__CHEETAH_genTimestamp__ = 'Sat May 26 20:03:11 2018' +__CHEETAH_version__ = '3.3.1' +__CHEETAH_versionTuple__ = (3, 3, 1, 'final', 0) +__CHEETAH_genTime__ = 1721134725.688713 +__CHEETAH_genTimestamp__ = 'Tue Jul 16 15:58:45 2024' __CHEETAH_src__ = 'index.tmpl' -__CHEETAH_srcLastModified__ = 'Sat May 26 20:03:09 2018' +__CHEETAH_srcLastModified__ = 'Tue Jul 16 15:57:52 2024' __CHEETAH_docstring__ = 'Autogenerated by Cheetah: The Python-Powered Template Engine' if __CHEETAH_versionTuple__ < RequiredCheetahVersionTuple: @@ -167,7 +167,7 @@ if not hasattr(index, '_initCheetahAttributes'): # CHEETAH was developed by Tavis Rudd and Mike Orr # with code, advice and input from many other volunteers. -# For more information visit http://cheetahtemplate.org/ +# For more information visit https://cheetahtemplate.org/ ################################################## ## if run from command line: diff --git a/m_librarian/web/views/layout.py b/m_librarian/web/views/layout.py index 524a0b7..feae01e 100644 --- a/m_librarian/web/views/layout.py +++ b/m_librarian/web/views/layout.py @@ -32,12 +32,12 @@ VFFSL=valueFromFrameOrSearchList VFSL=valueFromSearchList VFN=valueForName currentTime=time.time -__CHEETAH_version__ = '3.2.6' -__CHEETAH_versionTuple__ = (3, 2, 6, 'final', 0) -__CHEETAH_genTime__ = 1608677601.931249 -__CHEETAH_genTimestamp__ = 'Wed Dec 23 01:53:21 2020' +__CHEETAH_version__ = '3.3.1' +__CHEETAH_versionTuple__ = (3, 3, 1, 'final', 0) +__CHEETAH_genTime__ = 1721134725.743107 +__CHEETAH_genTimestamp__ = 'Tue Jul 16 15:58:45 2024' __CHEETAH_src__ = 'layout.tmpl' -__CHEETAH_srcLastModified__ = 'Wed Dec 23 01:52:26 2020' +__CHEETAH_srcLastModified__ = 'Tue Jul 16 15:57:52 2024' __CHEETAH_docstring__ = 'Autogenerated by Cheetah: The Python-Powered Template Engine' if __CHEETAH_versionTuple__ < RequiredCheetahVersionTuple: @@ -103,8 +103,8 @@ class layout(Template): - - +
+ diff --git a/m_librarian/web/views/layout.tmpl b/m_librarian/web/views/layout.tmpl index 10fc0b3..b3dbb4f 100644 --- a/m_librarian/web/views/layout.tmpl +++ b/m_librarian/web/views/layout.tmpl @@ -16,8 +16,8 @@ -

m_Librarian

 \u0412\u044b\u0445\u043e\u0434
- +
+ diff --git a/m_librarian/web/views/list_authors.py b/m_librarian/web/views/list_authors.py index e1f0007..a7bf705 100644 --- a/m_librarian/web/views/list_authors.py +++ b/m_librarian/web/views/list_authors.py @@ -37,10 +37,10 @@ VFN=valueForName currentTime=time.time __CHEETAH_version__ = '3.3.1' __CHEETAH_versionTuple__ = (3, 3, 1, 'final', 0) -__CHEETAH_genTime__ = 1720485596.472826 -__CHEETAH_genTimestamp__ = 'Tue Jul 9 03:39:56 2024' +__CHEETAH_genTime__ = 1721134725.803056 +__CHEETAH_genTimestamp__ = 'Tue Jul 16 15:58:45 2024' __CHEETAH_src__ = 'list_authors.tmpl' -__CHEETAH_srcLastModified__ = 'Tue Jul 9 03:39:54 2024' +__CHEETAH_srcLastModified__ = 'Tue Jul 16 15:57:52 2024' __CHEETAH_docstring__ = 'Autogenerated by Cheetah: The Python-Powered Template Engine' if __CHEETAH_versionTuple__ < RequiredCheetahVersionTuple: @@ -101,7 +101,7 @@ class list_authors(layout): ''') if VFFSL(SL,"authors",True): # generated from line 12, col 1 - _orig_filter_20064572 = _filter + _orig_filter_98722638 = _filter filterName = u'WebSafe' if "WebSafe" in self._CHEETAH__filters: _filter = self._CHEETAH__currentFilter = self._CHEETAH__filters[filterName] @@ -115,11 +115,11 @@ class list_authors(layout): _ _ = VFFSL(SL,"getattr",False)(VFFSL(SL,"translations",True), 'ugettext', None) or VFFSL(SL,"translations.gettext",True) for column in VFFSL(SL,"columns",True): # generated from line 17, col 3 - write(u'''

m_Librarian

 Выход
''') + write(u''' ''') if False: _(VFFSL(SL,"column",True)) - _v = VFFSL(SL,"_",False)(VFFSL(SL,"column",True)) # u'$_($column)' on line 18, col 36 - if _v is not None: write(_filter(_v, rawExpr=u'$_($column)')) # from line 18, col 36. + _v = VFFSL(SL,"_",False)(VFFSL(SL,"column",True)) # u'$_($column)' on line 18, col 24 + if _v is not None: write(_filter(_v, rawExpr=u'$_($column)')) # from line 18, col 24. write(u''' ''') if VFFSL(SL,"sort",True) in (VFFSL(SL,"column",True), '+'+VFFSL(SL,"column",True), '-'+VFFSL(SL,"column",True)): # generated from line 19, col 5 @@ -178,7 +178,7 @@ class list_authors(layout): ''') write(u'''
''') - _filter = self._CHEETAH__currentFilter = _orig_filter_20064572 + _filter = self._CHEETAH__currentFilter = _orig_filter_98722638 else: # generated from line 52, col 1 write(u'''

\u041d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u043e \u043d\u0438 \u043e\u0434\u043d\u043e\u0433\u043e \u0430\u0432\u0442\u043e\u0440\u0430!

''') diff --git a/m_librarian/web/views/list_authors.tmpl b/m_librarian/web/views/list_authors.tmpl index 3848618..1d0c772 100644 --- a/m_librarian/web/views/list_authors.tmpl +++ b/m_librarian/web/views/list_authors.tmpl @@ -15,7 +15,7 @@ $search_authors_form(searchList=$searchList) #set $_ = $getattr($translations, 'ugettext', None) or $translations.gettext #for $column in $columns - $_($column) + $_($column) #if $sort in ($column, '+'+$column, '-'+$column) #if $sort in ($column, '+'+$column) #set $sort_param='-'+$column diff --git a/m_librarian/web/views/list_books.py b/m_librarian/web/views/list_books.py index 7a327ed..2da3e3e 100644 --- a/m_librarian/web/views/list_books.py +++ b/m_librarian/web/views/list_books.py @@ -36,10 +36,10 @@ VFN=valueForName currentTime=time.time __CHEETAH_version__ = '3.3.1' __CHEETAH_versionTuple__ = (3, 3, 1, 'final', 0) -__CHEETAH_genTime__ = 1718725757.733093 -__CHEETAH_genTimestamp__ = 'Tue Jun 18 18:49:17 2024' +__CHEETAH_genTime__ = 1721134725.866559 +__CHEETAH_genTimestamp__ = 'Tue Jul 16 15:58:45 2024' __CHEETAH_src__ = 'list_books.tmpl' -__CHEETAH_srcLastModified__ = 'Tue Jun 18 18:49:15 2024' +__CHEETAH_srcLastModified__ = 'Tue Jul 16 15:57:52 2024' __CHEETAH_docstring__ = 'Autogenerated by Cheetah: The Python-Powered Template Engine' if __CHEETAH_versionTuple__ < RequiredCheetahVersionTuple: @@ -117,7 +117,7 @@ function toggleSeries(name, value) { ''') if VFFSL(SL,"books_by_author",True): # generated from line 31, col 1 - _orig_filter_17563757 = _filter + _orig_filter_31788103 = _filter filterName = u'WebSafe' if "WebSafe" in self._CHEETAH__filters: _filter = self._CHEETAH__currentFilter = self._CHEETAH__filters[filterName] @@ -134,11 +134,11 @@ function toggleSeries(name, value) { _ _ = VFFSL(SL,"getattr",False)(VFFSL(SL,"translations",True), 'ugettext', None) or VFFSL(SL,"translations.gettext",True) for column in VFFSL(SL,"columns",True): # generated from line 39, col 3 - write(u''' ''') + write(u''' ''') if False: _(VFFSL(SL,"column",True)) - _v = VFFSL(SL,"_",False)(VFFSL(SL,"column",True)) # u'$_($column)' on line 40, col 36 - if _v is not None: write(_filter(_v, rawExpr=u'$_($column)')) # from line 40, col 36. + _v = VFFSL(SL,"_",False)(VFFSL(SL,"column",True)) # u'$_($column)' on line 40, col 24 + if _v is not None: write(_filter(_v, rawExpr=u'$_($column)')) # from line 40, col 24. write(u''' ''') write(u''' @@ -225,12 +225,12 @@ function toggleSeries(name, value) { + write(u'''" class="center"> ''') - _filter = self._CHEETAH__currentFilter = _orig_filter_17563757 + _filter = self._CHEETAH__currentFilter = _orig_filter_31788103 else: # generated from line 89, 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/list_books.tmpl b/m_librarian/web/views/list_books.tmpl index 3127fec..4a5c283 100644 --- a/m_librarian/web/views/list_books.tmpl +++ b/m_librarian/web/views/list_books.tmpl @@ -37,7 +37,7 @@ function toggleSeries(name, value) { onClick="toggleAll(this.checked)"> #set $_ = $getattr($translations, 'ugettext', None) or $translations.gettext #for $column in $columns - $_($column) + $_($column) #end for #set $columns1 = $len($columns)+1 @@ -81,7 +81,7 @@ $series, 1#slurp #end for #end for - + diff --git a/m_librarian/web/views/search_authors.py b/m_librarian/web/views/search_authors.py index cfa9083..1218736 100644 --- a/m_librarian/web/views/search_authors.py +++ b/m_librarian/web/views/search_authors.py @@ -34,12 +34,12 @@ VFFSL=valueFromFrameOrSearchList VFSL=valueFromSearchList VFN=valueForName currentTime=time.time -__CHEETAH_version__ = '3.1.0' -__CHEETAH_versionTuple__ = (3, 1, 0, 'final', 1) -__CHEETAH_genTime__ = 1522961824.208664 -__CHEETAH_genTimestamp__ = 'Thu Apr 5 23:57:04 2018' +__CHEETAH_version__ = '3.3.1' +__CHEETAH_versionTuple__ = (3, 3, 1, 'final', 0) +__CHEETAH_genTime__ = 1721134725.921719 +__CHEETAH_genTimestamp__ = 'Tue Jul 16 15:58:45 2024' __CHEETAH_src__ = 'search_authors.tmpl' -__CHEETAH_srcLastModified__ = 'Thu Apr 5 23:54:16 2018' +__CHEETAH_srcLastModified__ = 'Tue Jul 16 15:57:52 2024' __CHEETAH_docstring__ = 'Autogenerated by Cheetah: The Python-Powered Template Engine' if __CHEETAH_versionTuple__ < RequiredCheetahVersionTuple: @@ -162,7 +162,7 @@ if not hasattr(search_authors, '_initCheetahAttributes'): # CHEETAH was developed by Tavis Rudd and Mike Orr # with code, advice and input from many other volunteers. -# For more information visit http://cheetahtemplate.org/ +# For more information visit https://cheetahtemplate.org/ ################################################## ## if run from command line: diff --git a/m_librarian/web/views/search_authors_form.py b/m_librarian/web/views/search_authors_form.py index 78a1c36..0677349 100644 --- a/m_librarian/web/views/search_authors_form.py +++ b/m_librarian/web/views/search_authors_form.py @@ -35,10 +35,10 @@ VFN=valueForName currentTime=time.time __CHEETAH_version__ = '3.3.1' __CHEETAH_versionTuple__ = (3, 3, 1, 'final', 0) -__CHEETAH_genTime__ = 1720463312.154712 -__CHEETAH_genTimestamp__ = 'Mon Jul 8 21:28:32 2024' +__CHEETAH_genTime__ = 1721134725.976445 +__CHEETAH_genTimestamp__ = 'Tue Jul 16 15:58:45 2024' __CHEETAH_src__ = 'search_authors_form.tmpl' -__CHEETAH_srcLastModified__ = 'Mon Jul 8 21:28:30 2024' +__CHEETAH_srcLastModified__ = 'Tue Jul 16 15:57:52 2024' __CHEETAH_docstring__ = 'Autogenerated by Cheetah: The Python-Powered Template Engine' if __CHEETAH_versionTuple__ < RequiredCheetahVersionTuple: @@ -142,12 +142,12 @@ class search_authors_form(Template): ## START - generated method body write(u'''
-
+
+ write(u'''" type="text" class="long">
\u0420\u0430\u0437\u043b\u0438\u0447\u0430\u0442\u044c \u043f\u0440\u043e\u043f\u0438\u0441\u043d\u044b\u0435/\u0441\u0442\u0440\u043e\u0447\u043d\u044b\u0435
-
+
diff --git a/m_librarian/web/views/search_authors_form.tmpl b/m_librarian/web/views/search_authors_form.tmpl index 10fa94b..6908663 100644 --- a/m_librarian/web/views/search_authors_form.tmpl +++ b/m_librarian/web/views/search_authors_form.tmpl @@ -11,9 +11,9 @@ checked#slurp #end if #end def
-
+
+ ''))" type="text" class="long">
Подстрока в начале @@ -25,7 +25,7 @@ checked#slurp Различать прописные/строчные
-
+
diff --git a/m_librarian/web/views/search_books.py b/m_librarian/web/views/search_books.py index 2e8636b..6c4984c 100644 --- a/m_librarian/web/views/search_books.py +++ b/m_librarian/web/views/search_books.py @@ -34,12 +34,12 @@ VFFSL=valueFromFrameOrSearchList VFSL=valueFromSearchList VFN=valueForName currentTime=time.time -__CHEETAH_version__ = '3.1.0' -__CHEETAH_versionTuple__ = (3, 1, 0, 'final', 1) -__CHEETAH_genTime__ = 1527354048.738532 -__CHEETAH_genTimestamp__ = 'Sat May 26 20:00:48 2018' +__CHEETAH_version__ = '3.3.1' +__CHEETAH_versionTuple__ = (3, 3, 1, 'final', 0) +__CHEETAH_genTime__ = 1721134726.030654 +__CHEETAH_genTimestamp__ = 'Tue Jul 16 15:58:46 2024' __CHEETAH_src__ = 'search_books.tmpl' -__CHEETAH_srcLastModified__ = 'Sat May 26 19:59:55 2018' +__CHEETAH_srcLastModified__ = 'Tue Jul 16 15:57:52 2024' __CHEETAH_docstring__ = 'Autogenerated by Cheetah: The Python-Powered Template Engine' if __CHEETAH_versionTuple__ < RequiredCheetahVersionTuple: @@ -162,7 +162,7 @@ if not hasattr(search_books, '_initCheetahAttributes'): # CHEETAH was developed by Tavis Rudd and Mike Orr # with code, advice and input from many other volunteers. -# For more information visit http://cheetahtemplate.org/ +# For more information visit https://cheetahtemplate.org/ ################################################## ## if run from command line: diff --git a/m_librarian/web/views/search_books_form.py b/m_librarian/web/views/search_books_form.py index 01b8770..2046375 100644 --- a/m_librarian/web/views/search_books_form.py +++ b/m_librarian/web/views/search_books_form.py @@ -33,12 +33,12 @@ VFFSL=valueFromFrameOrSearchList VFSL=valueFromSearchList VFN=valueForName currentTime=time.time -__CHEETAH_version__ = '3.3.3' -__CHEETAH_versionTuple__ = (3, 3, 3, 'final', 0) -__CHEETAH_genTime__ = 1704324466.1203597 -__CHEETAH_genTimestamp__ = 'Thu Jan 4 02:27:46 2024' +__CHEETAH_version__ = '3.3.1' +__CHEETAH_versionTuple__ = (3, 3, 1, 'final', 0) +__CHEETAH_genTime__ = 1721134726.086564 +__CHEETAH_genTimestamp__ = 'Tue Jul 16 15:58:46 2024' __CHEETAH_src__ = 'search_books_form.tmpl' -__CHEETAH_srcLastModified__ = 'Thu Jan 4 02:27:28 2024' +__CHEETAH_srcLastModified__ = 'Tue Jul 16 15:57:52 2024' __CHEETAH_docstring__ = 'Autogenerated by Cheetah: The Python-Powered Template Engine' if __CHEETAH_versionTuple__ < RequiredCheetahVersionTuple: @@ -87,7 +87,7 @@ class search_books_form(Template): ## START - generated method body if VFFSL(SL,"getVar",False)('search_type', '') == VFFSL(SL,"value",True): # generated from line 4, col 1 - write('''checked''') + write(u'''checked''') ######################################## ## END - generated method body @@ -115,7 +115,7 @@ class search_books_form(Template): ## START - generated method body if VFFSL(SL,"getVar",False)('case_sensitive', None): # generated from line 9, col 1 - write('''checked''') + write(u'''checked''') ######################################## ## END - generated method body @@ -143,7 +143,7 @@ class search_books_form(Template): ## START - generated method body if VFFSL(SL,"getVar",False)('use_filters', VFN(VFFSL(SL,"get_config",False)(),"getint",False)('filters', 'use_in_search_forms', 1)): # generated from line 14, col 1 - write('''checked''') + write(u'''checked''') ######################################## ## END - generated method body @@ -169,43 +169,43 @@ class search_books_form(Template): ######################################## ## START - generated method body - write('''
-
+ write(u''' +
+ if _v is not None: write(_filter(_v, rawExpr=u"$html_escape($getVar('search_books',\n ''))")) # from line 20, col 37. + write(u'''" type="text" class="long">
- Подстрока в начале + _v = VFFSL(SL,"search_type_checked",False)('start') # u"$search_type_checked('start')" on line 23, col 43 + if _v is not None: write(_filter(_v, rawExpr=u"$search_type_checked('start')")) # from line 23, col 43. + write(u''' type="radio"> + \u041f\u043e\u0434\u0441\u0442\u0440\u043e\u043a\u0430 \u0432 \u043d\u0430\u0447\u0430\u043b\u0435 - Подстрока + _v = VFFSL(SL,"search_type_checked",False)('substring') # u"$search_type_checked('substring')" on line 25, col 47 + if _v is not None: write(_filter(_v, rawExpr=u"$search_type_checked('substring')")) # from line 25, col 47. + write(u''' type="radio"> + \u041f\u043e\u0434\u0441\u0442\u0440\u043e\u043a\u0430 - Точное совпадение + _v = VFFSL(SL,"search_type_checked",False)('full') # u"$search_type_checked('full')" on line 27, col 42 + if _v is not None: write(_filter(_v, rawExpr=u"$search_type_checked('full')")) # from line 27, col 42. + write(u''' type="radio"> + \u0422\u043e\u0447\u043d\u043e\u0435 \u0441\u043e\u0432\u043f\u0430\u0434\u0435\u043d\u0438\u0435
- Различать прописные/строчные + _v = VFFSL(SL,"case_sensitive_checked",True) # u'$case_sensitive_checked' on line 30, col 48 + if _v is not None: write(_filter(_v, rawExpr=u'$case_sensitive_checked')) # from line 30, col 48. + write(u'''> + \u0420\u0430\u0437\u043b\u0438\u0447\u0430\u0442\u044c \u043f\u0440\u043e\u043f\u0438\u0441\u043d\u044b\u0435/\u0441\u0442\u0440\u043e\u0447\u043d\u044b\u0435 - Использовать фильтры + _v = VFFSL(SL,"use_filters_check",True) # u'$use_filters_check' on line 32, col 45 + if _v is not None: write(_filter(_v, rawExpr=u'$use_filters_check')) # from line 32, col 45. + write(u'''> + \u0418\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c \u0444\u0438\u043b\u044c\u0442\u0440\u044b
-
- +
+
''') diff --git a/m_librarian/web/views/search_books_form.tmpl b/m_librarian/web/views/search_books_form.tmpl index 6ac0ca7..6bac07a 100644 --- a/m_librarian/web/views/search_books_form.tmpl +++ b/m_librarian/web/views/search_books_form.tmpl @@ -16,9 +16,9 @@ checked#slurp #end if #end def
-
+
+ ''))" type="text" class="long">
Подстрока в начале @@ -32,7 +32,7 @@ checked#slurp Использовать фильтры
-
+