[Checkins] SVN: grokapps/Webpage/src/webpage/ Minor fixes to views

Peter Bengtsson zope at peterbe.com
Sun May 4 17:18:59 EDT 2008 

Log message for revision 86421:
  Minor fixes to views

Changed:
  U   grokapps/Webpage/src/webpage/app.py
  U   grokapps/Webpage/src/webpage/app_templates/headerfooter.pt
  U   grokapps/Webpage/src/webpage/app_templates/mobileheaderfooter.pt
  D   grokapps/Webpage/src/webpage/static/logo.png
  U   grokapps/Webpage/src/webpage/static/screen.css
  U   grokapps/Webpage/src/webpage/static/style.css
  A   grokapps/Webpage/src/webpage/static/webpage-logo.png

-=-
Modified: grokapps/Webpage/src/webpage/app.py
===================================================================
--- grokapps/Webpage/src/webpage/app.py	2008-05-04 20:23:16 UTC (rev 86420)
+++ grokapps/Webpage/src/webpage/app.py	2008-05-04 21:18:58 UTC (rev 86421)
@@ -1,6 +1,9 @@
 import grok
 from zope.publisher.interfaces.browser import IDefaultBrowserLayer
+from zope.app.publication.interfaces import IBeforeTraverseEvent
+from zope.publisher.browser import applySkin
 
+
 ##
 ## The application
 ##
@@ -43,5 +46,14 @@
     grok.name('headerfooter') # important
     grok.layer(MobileLayer)
 
+class MobileIndex(grok.View):
+    grok.name('index')
+    grok.layer(MobileLayer)
 
 
+        
+
+ at grok.subscribe(Webpage, IBeforeTraverseEvent)
+def handle(obj, event):
+    if event.request.get('HTTP_USER_AGENT').find('Nokia') > -1:
+        applySkin(event.request, MobileLayer)
\ No newline at end of file

Modified: grokapps/Webpage/src/webpage/app_templates/headerfooter.pt
===================================================================
--- grokapps/Webpage/src/webpage/app_templates/headerfooter.pt	2008-05-04 20:23:16 UTC (rev 86420)
+++ grokapps/Webpage/src/webpage/app_templates/headerfooter.pt	2008-05-04 21:18:58 UTC (rev 86421)
@@ -9,7 +9,6 @@
         tal:attributes="href static/style.css" />
   <link rel="stylesheet" type="text/css" media="screen"
         tal:attributes="href static/screen.css" />
-  <style metal:define-slot="extracss" tal:omit-tag=""></style>
 </head>
 <body>
 <metal:block define-slot="body">
@@ -29,13 +28,11 @@
 <div id="footer">
   <metal:block define-slot="footer">
     <p>&copy; Grok.
-    <a href="#">Switch to normal web version</a>
     </p>
   </metal:block>
 </div>
 
 </metal:block>
-<script metal:define-slot="extrajs" tal:omit-tag=""></script>
 </body>
 </html>
 </metal:block>
\ No newline at end of file

Modified: grokapps/Webpage/src/webpage/app_templates/mobileheaderfooter.pt
===================================================================
--- grokapps/Webpage/src/webpage/app_templates/mobileheaderfooter.pt	2008-05-04 20:23:16 UTC (rev 86420)
+++ grokapps/Webpage/src/webpage/app_templates/mobileheaderfooter.pt	2008-05-04 21:18:58 UTC (rev 86421)
@@ -1,5 +1,6 @@
-<metal:block define-macro="standard"><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<metal:block define-macro="standard"
+><?xml version="1.0" encoding="iso-8859-1"?><!DOCTYPE html PUBLIC "-//WAPFORUM//DTD XHTML Mobile 1.0//EN"
+  "http://www.wapforum.org/DTD/xhtml-mobile10.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
   <title>Web page (Mobile)</title>
@@ -9,7 +10,6 @@
         tal:attributes="href static/style.css" />
   <link rel="stylesheet" type="text/css"
         tal:attributes="href static/mobile.css" />
-  <style metal:define-slot="extracss" tal:omit-tag=""></style>
 </head>
 <body>
 <metal:block define-slot="body">
@@ -30,13 +30,13 @@
   <metal:block define-slot="footer">
     <p>&copy; Grok.<br />
     You are currently using the mobile version of this page.
-    <a href="#" tal:attributes="href python:view.url().replace('++skin++mobile/','')">Switch to normal web version</a>
+    <a tal:attributes="href python:view.url().replace('++skin++mobile/','')"
+      >Switch to normal web version</a>
     </p>
   </metal:block>
 </div>
 
 </metal:block>
-<script metal:define-slot="extrajs" tal:omit-tag=""></script>
 </body>
 </html>
 </metal:block>
\ No newline at end of file

Deleted: grokapps/Webpage/src/webpage/static/logo.png
===================================================================
(Binary files differ)

Modified: grokapps/Webpage/src/webpage/static/screen.css
===================================================================
--- grokapps/Webpage/src/webpage/static/screen.css	2008-05-04 20:23:16 UTC (rev 86420)
+++ grokapps/Webpage/src/webpage/static/screen.css	2008-05-04 21:18:58 UTC (rev 86421)
@@ -6,7 +6,7 @@
 #header h1 {
 	width: 419px;
 	height: 73px;
-	background-image: url(logo.png);
+	background-image: url(webpage-logo.png);
 	}
 #header h1 span {
 	display: block;

Modified: grokapps/Webpage/src/webpage/static/style.css
===================================================================
--- grokapps/Webpage/src/webpage/static/style.css	2008-05-04 20:23:16 UTC (rev 86420)
+++ grokapps/Webpage/src/webpage/static/style.css	2008-05-04 21:18:58 UTC (rev 86421)
@@ -1,5 +1,5 @@
 body {
-  font-family:"Lucida Grande",Geneva,Arial,Verdana,sans-serif;
+  font-family:"Lucida Grande",Geneva,Arial,sans-serif;
 }
 h1, h2, h3, h4 {
   color:#333333;

Copied: grokapps/Webpage/src/webpage/static/webpage-logo.png (from rev 86409, grokapps/Webpage/src/webpage/static/logo.png)
===================================================================
(Binary files differ)

More information about the Checkins mailing list