[Hejes-devel] [1440] Akh11 and 12 ids in numerals.html
hejes-devel at nytud.hu
hejes-devel at nytud.hu
Mon Aug 31 18:32:03 CEST 2015
Revision: 1440
Author: mihaltz
Date: 2015-08-31 18:32:03 +0200 (Mon, 31 Aug 2015)
Log Message:
-----------
Akh11 and 12 ids in numerals.html
Modified Paths:
--------------
trunk/web2py/applications/helyesiras_webdev/controllers/default.py
trunk/web2py/applications/helyesiras_webdev/databases/storage.sqlite
trunk/web2py/applications/helyesiras_webdev/languages/hu-hu.py
trunk/web2py/applications/helyesiras_webdev/modules/util.py
trunk/web2py/applications/helyesiras_webdev/progress.log
trunk/web2py/applications/helyesiras_webdev/static/css/main.css
trunk/web2py/applications/helyesiras_webdev/views/default/numerals.html
Modified: trunk/web2py/applications/helyesiras_webdev/controllers/default.py
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/controllers/default.py 2015-08-31 12:07:56 UTC (rev 1439)
+++ trunk/web2py/applications/helyesiras_webdev/controllers/default.py 2015-08-31 16:32:03 UTC (rev 1440)
@@ -228,7 +228,7 @@
Author: MM
Returns a dictionary with the following keys:
form: a HTML form for entering the expressions to analyze
- result: if form is not submitted, an empty array, otherwise either a list of triples (stringform, reference, comment) containing the generated expressions and references, or the list [None, 'Error message'] if there was an error
+ result: if form is not submitted, an empty array, otherwise either a list of triples (stringform, [references], comment) containing the generated expressions and references, or the list [None, 'Error message'] if there was an error
NOTE: this function works both by form submission OR via a GET request using variable 'q'
"""
form=FORM(LABEL('Szám:'),
Modified: trunk/web2py/applications/helyesiras_webdev/databases/storage.sqlite
===================================================================
(Binary files differ)
Modified: trunk/web2py/applications/helyesiras_webdev/languages/hu-hu.py
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/languages/hu-hu.py 2015-08-31 12:07:56 UTC (rev 1439)
+++ trunk/web2py/applications/helyesiras_webdev/languages/hu-hu.py 2015-08-31 16:32:03 UTC (rev 1440)
@@ -211,6 +211,7 @@
'User %(id)s Logged-out': 'User %(id)s Logged-out',
'User ID': 'User ID',
'User Voice': 'User Voice',
+'value already in database or empty': 'value already in database or empty',
'value not allowed': 'value not allowed',
'Videos': 'Videos',
'View': 'Nézet',
Modified: trunk/web2py/applications/helyesiras_webdev/modules/util.py
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/modules/util.py 2015-08-31 12:07:56 UTC (rev 1439)
+++ trunk/web2py/applications/helyesiras_webdev/modules/util.py 2015-08-31 16:32:03 UTC (rev 1440)
@@ -61,3 +61,13 @@
from os import listdir
from re import match
return sorted([x for x in listdir(path) if isfile(path+'/'+x) and match('.*\.[jpg|jpeg|png|gif|bmp|tif]', x)])
+
+
+def format_akh_id(refid):
+ """refid: "AkH<VV>-<id>"
+ return: "AkH.<VV>-<id>" (or refid id it doesn't match above pattern)
+ """
+ if refid.startswith('AkH11-') or refid.startswith('AkH12-'):
+ return 'AkH.' + refid[3:]
+ else:
+ return refid
Modified: trunk/web2py/applications/helyesiras_webdev/progress.log
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/progress.log 2015-08-31 12:07:56 UTC (rev 1439)
+++ trunk/web2py/applications/helyesiras_webdev/progress.log 2015-08-31 16:32:03 UTC (rev 1440)
@@ -1344,3 +1344,61 @@
[2015-03-06 13:39:15] EDIT helyesiras_webdev/views/default/suggest.html: 0
[2015-03-06 13:49:44] EDIT helyesiras_webdev/views/layout.html: 0
[2015-03-06 13:50:16] EDIT helyesiras_webdev/views/layout.html: 0
+[2015-03-10 11:26:30] UPLOAD /usr/local/opt/web2py.2.4.6-stable/applications/helyesiras_webdev/static/blog/ser.jpg: 2032
+[2015-03-10 12:23:37] UPLOAD /usr/local/opt/web2py.2.4.6-stable/applications/helyesiras_webdev/static/blog/egiasszony.jpg: 1662
+[2015-03-20 11:00:45] UPLOAD /usr/local/opt/web2py.2.4.6-stable/applications/helyesiras_webdev/static/blog/fajdalmatlan.jpg: 20
+[2015-03-24 16:58:31] UPLOAD /usr/local/opt/web2py.2.4.6-stable/applications/helyesiras_webdev/static/blog/homero.jpg: 693
+[2015-03-31 13:09:22] UPLOAD /usr/local/opt/web2py.2.4.6-stable/applications/helyesiras_webdev/static/blog/emotikon.jpg: 234
+[2015-04-09 09:27:12] UPLOAD /usr/local/opt/web2py.2.4.6-stable/applications/helyesiras_webdev/static/blog/kerekded.jpg: 692
+[2015-04-13 10:17:35] UPLOAD /usr/local/opt/web2py.2.4.6-stable/applications/helyesiras_webdev/static/blog/csengo.jpg: 98
+[2015-04-13 12:42:15] DELETE helyesiras_webdev/static/blog/csengo.jpg: -98
+[2015-04-13 12:42:44] UPLOAD /usr/local/opt/web2py.2.4.6-stable/applications/helyesiras_webdev/static/blog/csengo.jpg: 116
+[2015-04-21 13:47:37] UPLOAD /usr/local/opt/web2py.2.4.6-stable/applications/helyesiras_webdev/static/blog/minusz.jpg: 708
+[2015-04-23 15:20:13] UPLOAD /usr/local/opt/web2py.2.4.6-stable/applications/helyesiras_webdev/static/blog/ajandek.jpg: 1510
+[2015-04-28 12:40:57] UPLOAD /usr/local/opt/web2py.2.4.6-stable/applications/helyesiras_webdev/static/blog/csuklik.jpg: 1000
+[2015-04-28 16:05:53] UPLOAD /usr/local/opt/web2py.2.4.6-stable/applications/helyesiras_webdev/static/blog/turkalda.jpg: 1887
+[2015-05-05 11:15:53] UPLOAD /usr/local/opt/web2py.2.4.6-stable/applications/helyesiras_webdev/static/blog/hazugsag.jpg: 481
+[2015-05-07 13:00:40] UPLOAD /usr/local/opt/web2py.2.4.6-stable/applications/helyesiras_webdev/static/blog/ferfi_ruhaszalon.png: 1048
+[2015-05-11 12:56:06] UPLOAD /usr/local/opt/web2py.2.4.6-stable/applications/helyesiras_webdev/static/blog/masszoz.jpg: 1818
+[2015-05-14 13:06:26] UPLOAD /usr/local/opt/web2py.2.4.6-stable/applications/helyesiras_webdev/static/blog/ketto.jpg: 10
+[2015-05-19 12:27:45] UPLOAD /usr/local/opt/web2py.2.4.6-stable/applications/helyesiras_webdev/static/blog/urholgy.jpg: 116
+[2015-05-22 10:46:27] UPLOAD /usr/local/opt/web2py.2.4.6-stable/applications/helyesiras_webdev/static/blog/szalagavato.jpg: 172
+[2015-05-22 10:52:17] UPLOAD /usr/local/opt/web2py.2.4.6-stable/applications/helyesiras_webdev/static/blog/szalagavato.jpg: 120
+[2015-05-28 13:42:38] UPLOAD /usr/local/opt/web2py.2.4.6-stable/applications/helyesiras_webdev/static/blog/bal_jobb_irany.jpg: 361
+[2015-06-04 14:59:43] UPLOAD /usr/local/opt/web2py.2.4.6-stable/applications/helyesiras_webdev/static/blog/blog_post.jpg: 566
+[2015-06-04 15:12:41] UPLOAD /usr/local/opt/web2py.2.4.6-stable/applications/helyesiras_webdev/static/blog/blog_post.jpg: 59
+[2015-06-05 09:37:10] UPLOAD /usr/local/opt/web2py.2.4.6-stable/applications/helyesiras_webdev/static/blog/palacsinta.jpg: 113
+[2015-06-09 11:00:53] UPLOAD /usr/local/opt/web2py.2.4.6-stable/applications/helyesiras_webdev/static/blog/idezojel.jpg: 63
+[2015-06-12 11:57:44] UPLOAD /usr/local/opt/web2py.2.4.6-stable/applications/helyesiras_webdev/static/blog/kutya_etterem.jpg: 99
+[2015-06-17 11:31:19] UPLOAD /usr/local/opt/web2py.2.4.6-stable/applications/helyesiras_webdev/static/blog/angry_baby.jpg: 62
+[2015-06-22 10:50:46] UPLOAD /usr/local/opt/web2py.2.4.6-stable/applications/helyesiras_webdev/static/blog/halloween_witch.jpg: 136
+[2015-07-08 17:08:30] UPLOAD /usr/local/opt/web2py.2.4.6-stable/applications/helyesiras_webdev/static/blog/frissito.jpg: 929
+[2015-07-15 14:00:26] EDIT helyesiras_webdev/views/default/howitworks.html: 0
+[2015-07-15 14:02:39] EDIT helyesiras_webdev/views/default/howitworks.html: 0
+[2015-07-15 14:03:52] EDIT helyesiras_webdev/views/default/howitworks.html: 0
+[2015-07-15 14:04:11] EDIT helyesiras_webdev/views/default/howitworks.html: 0
+[2015-07-15 14:04:30] EDIT helyesiras_webdev/views/default/howitworks.html: 0
+[2015-07-15 14:04:52] EDIT helyesiras_webdev/views/default/howitworks.html: 0
+[2015-07-15 14:06:06] EDIT helyesiras_webdev/views/default/howitworks.html: 0
+[2015-07-15 14:07:01] EDIT helyesiras_webdev/views/default/howitworks.html: 0
+[2015-07-15 14:07:34] EDIT helyesiras_webdev/views/default/howitworks.html: 0
+[2015-07-16 13:12:39] UPLOAD /usr/local/opt/web2py.2.4.6-stable/applications/helyesiras_webdev/static/blog/elseje.jpg: 183
+[2015-07-29 14:25:23] UPLOAD /usr/local/opt/web2py.2.4.6-stable/applications/helyesiras_webdev/static/blog/pedagoga.jpg: 61
+[2015-08-04 10:49:25] UPLOAD /usr/local/opt/web2py.2.4.6-stable/applications/helyesiras_webdev/static/blog/el_mexicano.jpg: 295
+[2015-08-11 11:46:48] UPLOAD /usr/local/opt/web2py.2.4.6-stable/applications/helyesiras_webdev/static/blog/halle.jpg: 2932
+[2015-08-11 12:56:37] UPLOAD /usr/local/opt/web2py.2.4.6-stable/applications/helyesiras_webdev/static/blog/eper: 1077
+[2015-08-11 12:57:40] DELETE helyesiras_webdev/static/blog/eper: -1077
+[2015-08-11 12:57:57] UPLOAD /usr/local/opt/web2py.2.4.6-stable/applications/helyesiras_webdev/static/blog/eper.jpg: 1077
+[2015-08-24 14:14:15] UPLOAD /usr/local/opt/web2py.2.4.6-stable/applications/helyesiras_webdev/static/blog/jobaratok9.jpg: 85
+[2015-08-31 17:43:02] EDIT helyesiras_webdev/views/default/numerals.html: 8
+[2015-08-31 17:43:15] EDIT helyesiras_webdev/views/default/numerals.html: 1
+[2015-08-31 17:53:59] EDIT helyesiras_webdev/views/default/numerals.html: 1
+[2015-08-31 17:56:52] EDIT helyesiras_webdev/views/default/numerals.html: 0
+[2015-08-31 17:57:34] EDIT helyesiras_webdev/views/default/numerals.html: 2
+[2015-08-31 18:06:15] EDIT helyesiras_webdev/views/default/numerals.html: 2
+[2015-08-31 18:06:34] EDIT helyesiras_webdev/views/default/numerals.html: 0
+[2015-08-31 18:08:46] EDIT helyesiras_webdev/views/default/numerals.html: 1
+[2015-08-31 18:09:03] EDIT helyesiras_webdev/views/default/numerals.html: 0
+[2015-08-31 18:11:55] EDIT helyesiras_webdev/views/default/numerals.html: 0
+[2015-08-31 18:17:31] EDIT helyesiras_webdev/views/default/numerals.html: 0
+[2015-08-31 18:30:36] EDIT helyesiras_webdev/views/default/numerals.html: 0
Modified: trunk/web2py/applications/helyesiras_webdev/static/css/main.css
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/static/css/main.css 2015-08-31 12:07:56 UTC (rev 1439)
+++ trunk/web2py/applications/helyesiras_webdev/static/css/main.css 2015-08-31 16:32:03 UTC (rev 1440)
@@ -1037,6 +1037,7 @@
.nolink:hover {text-decoration: none; cursor: default;}
#content .alink {color: #990000; text-decoration: none; font-weight: bold; font-size: 14px;}
+.akh12ref {font-size: 14px; color: #fff ; font-weight: normal}
p.bekezdesszid {position: relative; padding-left: 30px;}
p.bekezdesszid span.szid {position: absolute; left: 0px;}
Modified: trunk/web2py/applications/helyesiras_webdev/views/default/numerals.html
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/views/default/numerals.html 2015-08-31 12:07:56 UTC (rev 1439)
+++ trunk/web2py/applications/helyesiras_webdev/views/default/numerals.html 2015-08-31 16:32:03 UTC (rev 1440)
@@ -56,8 +56,23 @@
= uzrinp.replace(' ', '')
}}' betűkkel írva:</h3>
<ul class="result">
-{{for txtform, refid, remark in result:}}
-<li>{{=txtform}} [{{=A(refid, _href=URL(c='default', f='akh', anchor=refid), _target='blank')}}] {{='({0})'.format(remark) if remark else ''}}</li>
+{{for txtform, refids, remark in result:}}
+<li>{{=txtform}} [{{
+ for i, refid in enumerate(refids):
+ from util import format_akh_id
+ refid = format_akh_id(refid)
+ if refid.startswith('AkH.11-'):
+ rid = refid[7:]
+ =A(refid, _href=URL(c='default', f='akh', anchor=rid), _target='blank')
+ else:
+ =SPAN(refid, _class='akh12ref')
+ pass
+ if i < len(refids)-1:
+ =', '
+ pass
+ pass
+}}] {{='({0})'.format(remark) if remark else ''}}
+</li>
{{pass}}
</ul>
{{pass}}
More information about the Hejes-devel
mailing list