[Hejes-devel] [1450] numerals.html: both AkH 11 and 12 links work

[hejes-devel at nytud.hu]

Revision: 1450
Author:   mihaltz
Date:     2015-09-01 18:10:35 +0200 (Tue, 01 Sep 2015)
Log Message:
-----------
numerals.html: both AkH 11 and 12 links work

Modified Paths:
--------------
    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/progress.log
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/progress.log	2015-09-01 16:05:54 UTC (rev 1449)
+++ trunk/web2py/applications/helyesiras_webdev/progress.log	2015-09-01 16:10:35 UTC (rev 1450)
@@ -1430,3 +1430,5 @@
 [2015-09-01 18:02:17] EDIT helyesiras_webdev/views/default/dates.html: 2
 [2015-09-01 18:02:57] EDIT helyesiras_webdev/views/default/dates.html: 3
 [2015-09-01 18:04:26] EDIT helyesiras_webdev/views/default/dates.html: 0
+[2015-09-01 18:08:38] EDIT helyesiras_webdev/views/default/numerals.html: 2
+[2015-09-01 18:09:09] 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-09-01 16:05:54 UTC (rev 1449)
+++ trunk/web2py/applications/helyesiras_webdev/static/css/main.css	2015-09-01 16:10:35 UTC (rev 1450)
@@ -1037,7 +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}
+.otherref {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-09-01 16:05:54 UTC (rev 1449)
+++ trunk/web2py/applications/helyesiras_webdev/views/default/numerals.html	2015-09-01 16:10:35 UTC (rev 1450)
@@ -56,22 +56,26 @@
 = uzrinp.replace(' ', '')
 }}' betűkkel írva:</h3>
 <ul class="result">
+
 {{for txtform, refids, remark in result:}}
 <li>{{=txtform}} [{{
     for i, refid in enumerate(refids):
     	if refid.startswith('AkH11-'):
-            rid = refid[7:]
-    		=A(refid, _href=URL(c='default', f='akh', anchor=rid), _target='blank')
+    		rid = refid[6:]
+  			= A(refid, _href=URL(c='default', f='akh11', anchor=rid), _target='_blank')
+    	elif refid.startswith('AkH12-'):
+    		rid = refid[6:]
+  			= A(refid, _href=URL(c='default', f='akh12', anchor=rid), _target='_blank')
     	else:
-    		=SPAN(refid, _class='akh12ref')
-    	pass
+    		=SPAN(refid, _class='otherref')    	
+	  	pass
     	if i < len(refids)-1:
     		=', '
     	pass
-    pass
-}}] {{='({0})'.format(remark) if remark else ''}}
+    pass}}] {{='({0})'.format(remark) if remark else ''}}
 </li>
 {{pass}}
+
 </ul>
 {{pass}}
 {{pass}}