From 163cc4bc16c71a55395e70949b29436e42214459 Mon Sep 17 00:00:00 2001 From: Oleg Broytman Date: Thu, 4 Jan 2024 02:28:54 +0300 Subject: [PATCH] Feat(web): Change submit buttons texts [skip ci] --- m_librarian/web/views/search_authors_form.py | 56 ++++++++-------- .../web/views/search_authors_form.tmpl | 2 +- m_librarian/web/views/search_books_form.py | 66 +++++++++---------- m_librarian/web/views/search_books_form.tmpl | 2 +- 4 files changed, 63 insertions(+), 63 deletions(-) diff --git a/m_librarian/web/views/search_authors_form.py b/m_librarian/web/views/search_authors_form.py index b5229bc..a484787 100644 --- a/m_librarian/web/views/search_authors_form.py +++ b/m_librarian/web/views/search_authors_form.py @@ -33,12 +33,12 @@ VFFSL=valueFromFrameOrSearchList VFSL=valueFromSearchList VFN=valueForName currentTime=time.time -__CHEETAH_version__ = '3.1.0' -__CHEETAH_versionTuple__ = (3, 1, 0, 'final', 1) -__CHEETAH_genTime__ = 1527353789.984589 -__CHEETAH_genTimestamp__ = 'Sat May 26 19:56:29 2018' +__CHEETAH_version__ = '3.3.3' +__CHEETAH_versionTuple__ = (3, 3, 3, 'final', 0) +__CHEETAH_genTime__ = 1704324466.0275428 +__CHEETAH_genTimestamp__ = 'Thu Jan 4 02:27:46 2024' __CHEETAH_src__ = 'search_authors_form.tmpl' -__CHEETAH_srcLastModified__ = 'Sat May 26 19:56:28 2018' +__CHEETAH_srcLastModified__ = 'Thu Jan 4 02:27:39 2024' __CHEETAH_docstring__ = 'Autogenerated by Cheetah: The Python-Powered Template Engine' if __CHEETAH_versionTuple__ < RequiredCheetahVersionTuple: @@ -87,7 +87,7 @@ class search_authors_form(Template): ## START - generated method body if VFFSL(SL,"getVar",False)('search_type', '') == VFFSL(SL,"value",True): # generated from line 4, col 1 - write(u'''checked''') + write('''checked''') ######################################## ## END - generated method body @@ -115,7 +115,7 @@ class search_authors_form(Template): ## START - generated method body if VFFSL(SL,"getVar",False)('case_sensitive', None): # generated from line 9, col 1 - write(u'''checked''') + write('''checked''') ######################################## ## END - generated method body @@ -141,38 +141,38 @@ class search_authors_form(Template): ######################################## ## START - generated method body - write(u'''
+ write('''
+ if _v is not None: write(_filter(_v, rawExpr="$html_escape($getVar('search_authors',\n ''))")) # from line 15, col 39. + write('''" type="text" style="width: 100%">
- \u041f\u043e\u0434\u0441\u0442\u0440\u043e\u043a\u0430 \u0432 \u043d\u0430\u0447\u0430\u043b\u0435 + _v = VFFSL(SL,"search_type_checked",False)('start') # "$search_type_checked('start')" on line 18, col 43 + if _v is not None: write(_filter(_v, rawExpr="$search_type_checked('start')")) # from line 18, col 43. + write(''' type="radio"> + Подстрока в начале - \u041f\u043e\u0434\u0441\u0442\u0440\u043e\u043a\u0430 + _v = VFFSL(SL,"search_type_checked",False)('substring') # "$search_type_checked('substring')" on line 20, col 47 + if _v is not None: write(_filter(_v, rawExpr="$search_type_checked('substring')")) # from line 20, col 47. + write(''' type="radio"> + Подстрока - \u0422\u043e\u0447\u043d\u043e\u0435 \u0441\u043e\u0432\u043f\u0430\u0434\u0435\u043d\u0438\u0435 + _v = VFFSL(SL,"search_type_checked",False)('full') # "$search_type_checked('full')" on line 22, col 42 + if _v is not None: write(_filter(_v, rawExpr="$search_type_checked('full')")) # from line 22, col 42. + write(''' type="radio"> + Точное совпадение
- \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,"case_sensitive_checked",True) # '$case_sensitive_checked' on line 25, col 48 + if _v is not None: write(_filter(_v, rawExpr='$case_sensitive_checked')) # from line 25, col 48. + write('''> + Различать прописные/строчные
- +
''') @@ -213,7 +213,7 @@ if not hasattr(search_authors_form, '_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.tmpl b/m_librarian/web/views/search_authors_form.tmpl index 675d7cb..721f149 100644 --- a/m_librarian/web/views/search_authors_form.tmpl +++ b/m_librarian/web/views/search_authors_form.tmpl @@ -26,6 +26,6 @@ checked#slurp Различать прописные/строчные
- +
diff --git a/m_librarian/web/views/search_books_form.py b/m_librarian/web/views/search_books_form.py index 487aaaf..01b8770 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.1.0' -__CHEETAH_versionTuple__ = (3, 1, 0, 'final', 1) -__CHEETAH_genTime__ = 1528667817.826233 -__CHEETAH_genTimestamp__ = 'Mon Jun 11 00:56:57 2018' +__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_src__ = 'search_books_form.tmpl' -__CHEETAH_srcLastModified__ = 'Mon Jun 11 00:30:36 2018' +__CHEETAH_srcLastModified__ = 'Thu Jan 4 02:27:28 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(u'''checked''') + write('''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(u'''checked''') + write('''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(u'''checked''') + write('''checked''') ######################################## ## END - generated method body @@ -169,43 +169,43 @@ class search_books_form(Template): ######################################## ## START - generated method body - write(u'''
+ write('''
+ if _v is not None: write(_filter(_v, rawExpr="$html_escape($getVar('search_books',\n ''))")) # from line 20, col 37. + write('''" type="text" style="width: 100%">
- \u041f\u043e\u0434\u0441\u0442\u0440\u043e\u043a\u0430 \u0432 \u043d\u0430\u0447\u0430\u043b\u0435 + _v = VFFSL(SL,"search_type_checked",False)('start') # "$search_type_checked('start')" on line 23, col 43 + if _v is not None: write(_filter(_v, rawExpr="$search_type_checked('start')")) # from line 23, col 43. + write(''' type="radio"> + Подстрока в начале - \u041f\u043e\u0434\u0441\u0442\u0440\u043e\u043a\u0430 + _v = VFFSL(SL,"search_type_checked",False)('substring') # "$search_type_checked('substring')" on line 25, col 47 + if _v is not None: write(_filter(_v, rawExpr="$search_type_checked('substring')")) # from line 25, col 47. + write(''' type="radio"> + Подстрока - \u0422\u043e\u0447\u043d\u043e\u0435 \u0441\u043e\u0432\u043f\u0430\u0434\u0435\u043d\u0438\u0435 + _v = VFFSL(SL,"search_type_checked",False)('full') # "$search_type_checked('full')" on line 27, col 42 + if _v is not None: write(_filter(_v, rawExpr="$search_type_checked('full')")) # from line 27, col 42. + write(''' type="radio"> + Точное совпадение
- \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,"case_sensitive_checked",True) # '$case_sensitive_checked' on line 30, col 48 + if _v is not None: write(_filter(_v, rawExpr='$case_sensitive_checked')) # from line 30, col 48. + write('''> + Различать прописные/строчные - \u0418\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c \u0444\u0438\u043b\u044c\u0442\u0440\u044b + _v = VFFSL(SL,"use_filters_check",True) # '$use_filters_check' on line 32, col 45 + if _v is not None: write(_filter(_v, rawExpr='$use_filters_check')) # from line 32, col 45. + write('''> + Использовать фильтры
- +
''') @@ -246,7 +246,7 @@ if not hasattr(search_books_form, '_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.tmpl b/m_librarian/web/views/search_books_form.tmpl index d5e0c0e..6ac0ca7 100644 --- a/m_librarian/web/views/search_books_form.tmpl +++ b/m_librarian/web/views/search_books_form.tmpl @@ -33,6 +33,6 @@ checked#slurp Использовать фильтры
- +
-- 2.39.2