[Hejes-devel] [1449] dates.html: both Akh 11 and 12 links work

[hejes-devel at nytud.hu]

Revision: 1449
Author:   mihaltz
Date:     2015-09-01 18:05:54 +0200 (Tue, 01 Sep 2015)
Log Message:
-----------
dates.html: both Akh 11 and 12 links work

Modified Paths:
--------------
    trunk/web2py/applications/helyesiras_webdev/progress.log
    trunk/web2py/applications/helyesiras_webdev/views/default/akh12.html
    trunk/web2py/applications/helyesiras_webdev/views/default/dates.html

Modified: trunk/web2py/applications/helyesiras_webdev/progress.log
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/progress.log	2015-09-01 15:45:38 UTC (rev 1448)
+++ trunk/web2py/applications/helyesiras_webdev/progress.log	2015-09-01 16:05:54 UTC (rev 1449)
@@ -1419,3 +1419,14 @@
 [2015-09-01 17:40:26] EDIT helyesiras_webdev/views/default/akh12.html: 1
 [2015-09-01 17:41:45] EDIT helyesiras_webdev/views/default/akh11.html: 0
 [2015-09-01 17:44:22] EDIT helyesiras_webdev/views/default/akh12.html: 0
+[2015-09-01 17:48:36] EDIT helyesiras_webdev/models/menu.py: 0
+[2015-09-01 17:49:11] EDIT helyesiras_webdev/models/menu.py: 0
+[2015-09-01 17:50:36] EDIT helyesiras_webdev/views/default/akh12.html: 0
+[2015-09-01 17:56:18] EDIT helyesiras_webdev/views/default/dates.html: -3
+[2015-09-01 17:56:34] EDIT helyesiras_webdev/views/default/dates.html: -1
+[2015-09-01 17:58:02] EDIT helyesiras_webdev/views/default/dates.html: 5
+[2015-09-01 17:58:44] EDIT helyesiras_webdev/views/default/dates.html: 0
+[2015-09-01 18:00:40] EDIT helyesiras_webdev/views/default/dates.html: 0
+[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

Modified: trunk/web2py/applications/helyesiras_webdev/views/default/akh12.html
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/views/default/akh12.html	2015-09-01 15:45:38 UTC (rev 1448)
+++ trunk/web2py/applications/helyesiras_webdev/views/default/akh12.html	2015-09-01 16:05:54 UTC (rev 1449)
@@ -7,7 +7,7 @@
 
 <p>
 <h4>A magyar helyesírás szabályai (AkH.)</h4>
-<b>Tizenkettedik</b> kiadás (2015)<br/>
+<b>Tizenkettedik</b> kiadás (2015).<br/>
 Az Akadémiai Kiadó hozzájárulásával.<br/>
 Érvényes: 2015. szeptember 1-jétől
 </p>

Modified: trunk/web2py/applications/helyesiras_webdev/views/default/dates.html
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/views/default/dates.html	2015-09-01 15:45:38 UTC (rev 1448)
+++ trunk/web2py/applications/helyesiras_webdev/views/default/dates.html	2015-09-01 16:05:54 UTC (rev 1449)
@@ -50,11 +50,14 @@
 <li>{{=txt}} [{{
     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
@@ -71,11 +74,14 @@
 <li>{{=txt}} [{{
     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