[Hejes-devel] [1154] re-enabled ad zones in trunk

[hejes-devel at nytud.hu]

Revision: 1154
Author:   mihaltz
Date:     2014-04-22 16:19:03 +0200 (Tue, 22 Apr 2014)
Log Message:
-----------
re-enabled ad zones in trunk

Modified Paths:
--------------
    trunk/web2py/applications/helyesiras_webdev/databases/storage.sqlite
    trunk/web2py/applications/helyesiras_webdev/languages/hu-hu.py
    trunk/web2py/applications/helyesiras_webdev/progress.log
    trunk/web2py/applications/helyesiras_webdev/static/content/backtotop_block.html
    trunk/web2py/applications/helyesiras_webdev/views/layout.html
    trunk/web2py/applications/helyesiras_webdev/views/right_sidebar.html

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	2014-04-22 14:07:10 UTC (rev 1153)
+++ trunk/web2py/applications/helyesiras_webdev/languages/hu-hu.py	2014-04-22 14:19:03 UTC (rev 1154)
@@ -211,6 +211,7 @@
 'User %(id)s Logged-out': 'User %(id)s Logged-out',
 'User ID': 'User ID',
 'User Voice': 'User Voice',
+'value not allowed': 'value not allowed',
 'Videos': 'Videos',
 'View': 'Nézet',
 'Visszajelzés': 'Visszajelzés',

Modified: trunk/web2py/applications/helyesiras_webdev/progress.log
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/progress.log	2014-04-22 14:07:10 UTC (rev 1153)
+++ trunk/web2py/applications/helyesiras_webdev/progress.log	2014-04-22 14:19:03 UTC (rev 1154)
@@ -1159,3 +1159,5 @@
 [2014-04-17 17:13:36] EDIT helyesiras_webdev/controllers/default.py: 0
 [2014-04-17 17:14:07] EDIT helyesiras_webdev/controllers/default.py: 0
 [2014-04-17 17:15:56] EDIT helyesiras_webdev/controllers/default.py: 0
+[2014-04-22 16:00:33] UPLOAD /usr/local/opt/web2py.2.4.6-stable/applications/helyesiras_webdev/modules/blog/old_and_young.jpg.py: 489
+[2014-04-22 16:04:21] UPLOAD /usr/local/opt/web2py.2.4.6-stable/applications/helyesiras_webdev/static/blog/old_and_young.png: 489

Modified: trunk/web2py/applications/helyesiras_webdev/static/content/backtotop_block.html
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/static/content/backtotop_block.html	2014-04-22 14:07:10 UTC (rev 1153)
+++ trunk/web2py/applications/helyesiras_webdev/static/content/backtotop_block.html	2014-04-22 14:19:03 UTC (rev 1154)
@@ -1,7 +1,5 @@
-<!--
 <div id="ad-zone-2" class="ad-zone ad-zone-935">
     <span>hirdetés</span>
     <img src="http://placehold.it/640x360/00d900/ffffff">
 </div>
--->
 <div class="backtotop"><a href="#">▲ Vissza az oldal tetejére</a></div>

Modified: trunk/web2py/applications/helyesiras_webdev/views/layout.html
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/views/layout.html	2014-04-22 14:07:10 UTC (rev 1153)
+++ trunk/web2py/applications/helyesiras_webdev/views/layout.html	2014-04-22 14:19:03 UTC (rev 1154)
@@ -121,12 +121,10 @@
   fjs.parentNode.insertBefore(js, fjs);
 }(document, 'script', 'facebook-jssdk'));</script>
     
-      <!--
       <div id="ad-zone-1" class="ad-zone">
           <img src="http://placehold.it/970x90/00d900/ffffff">
           <span>hirdetés</span>
       </div>
-      -->
     
     <div class="flash">{{=response.flash or ''}}</div> <!-- notification div -->
 
@@ -425,12 +423,10 @@
 
 {{if request.function in ['kulegy','suggest','predict','hyph','numerals','dates','akhsort']:}}
           
-          <!--
           <div id="ad-zone-2" class="ad-zone ad-zone-935">
               <span>hirdetés</span>
               <img src="http://placehold.it/640x360/00d900/ffffff">
           </div>
-          -->
     
     <div id="footer-icons">
   {{if  request.function!='kulegy':}}

Modified: trunk/web2py/applications/helyesiras_webdev/views/right_sidebar.html
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/views/right_sidebar.html	2014-04-22 14:07:10 UTC (rev 1153)
+++ trunk/web2py/applications/helyesiras_webdev/views/right_sidebar.html	2014-04-22 14:19:03 UTC (rev 1154)
@@ -2,12 +2,10 @@
 
 <div id="helyesiras-widget-2">
 
-<!--
 <div class="ad-zone ad-zone-sidebar">
 	<span>hirdetés</span>
     <img src="http://placehold.it/300x250/00d900/ffffff">
 </div>
--->		
 		
 		<dl>
 
@@ -82,11 +80,9 @@
         
 	</dl>
 	
-	<!--
 	<div class="ad-zone ad-zone-sidebar">
 	<span>hirdetés</span>
     <img src="http://placehold.it/300x600/00d900/ffffff">
     </div>
-    -->
      
 </div>