summaryrefslogtreecommitdiff
path: root/docs/tutorials/wiki2/src/views
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2015-05-24 19:15:22 -0700
committerSteve Piercy <web@stevepiercy.com>2015-05-24 19:15:22 -0700
commitee9676a8691dd18b88d3247fd8c1306c5aaa1543 (patch)
tree0e323848c78996bb624a6caec7215a3102c94d7b /docs/tutorials/wiki2/src/views
parentec753b060040a2a6df91341d6d4ed0913761adbc (diff)
downloadpyramid-ee9676a8691dd18b88d3247fd8c1306c5aaa1543.tar.gz
pyramid-ee9676a8691dd18b88d3247fd8c1306c5aaa1543.tar.bz2
pyramid-ee9676a8691dd18b88d3247fd8c1306c5aaa1543.zip
- make templates html5 compliant
- punctuation, grammar, spelling - fix linenos references - update outputs
Diffstat (limited to 'docs/tutorials/wiki2/src/views')
-rw-r--r--docs/tutorials/wiki2/src/views/tutorial/templates/edit.pt28
-rw-r--r--docs/tutorials/wiki2/src/views/tutorial/templates/view.pt24
-rw-r--r--docs/tutorials/wiki2/src/views/tutorial/views.py1
3 files changed, 25 insertions, 28 deletions
diff --git a/docs/tutorials/wiki2/src/views/tutorial/templates/edit.pt b/docs/tutorials/wiki2/src/views/tutorial/templates/edit.pt
index 5f962bbf5..9320e0a50 100644
--- a/docs/tutorials/wiki2/src/views/tutorial/templates/edit.pt
+++ b/docs/tutorials/wiki2/src/views/tutorial/templates/edit.pt
@@ -1,22 +1,20 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
- xmlns:tal="http://xml.zope.org/namespaces/tal">
+<!DOCTYPE html>
+<html lang="en">
<head>
+ <meta charset="utf-8">
<title>${page.name} - Pyramid tutorial wiki (based on
TurboGears 20-Minute Wiki)</title>
- <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
- <meta name="keywords" content="python web application" />
- <meta name="description" content="pyramid web application" />
+ <meta name="keywords" content="python web application">
+ <meta name="description" content="pyramid web application">
<link rel="shortcut icon"
- href="${request.static_url('tutorial:static/favicon.ico')}" />
+ href="${request.static_url('tutorial:static/favicon.ico')}">
<link rel="stylesheet"
href="${request.static_url('tutorial:static/pylons.css')}"
- type="text/css" media="screen" charset="utf-8" />
+ type="text/css" media="screen">
<!--[if lte IE 6]>
<link rel="stylesheet"
href="${request.static_url('tutorial:static/ie6.css')}"
- type="text/css" media="screen" charset="utf-8" />
+ type="text/css" media="screen">
<![endif]-->
</head>
<body>
@@ -25,7 +23,7 @@
<div class="top-small align-center">
<div>
<img width="220" height="50" alt="pyramid"
- src="${request.static_url('tutorial:static/pyramid-small.png')}" />
+ src="${request.static_url('tutorial:static/pyramid-small.png')}">
</div>
</div>
</div>
@@ -33,9 +31,9 @@
<div class="middle align-right">
<div id="left" class="app-welcome align-left">
Editing <b><span tal:replace="page.name">Page Name Goes
- Here</span></b><br/>
+ Here</span></b><br>
You can return to the
- <a href="${request.application_url}">FrontPage</a>.<br/>
+ <a href="${request.application_url}">FrontPage</a>.<br>
</div>
<div id="right" class="app-welcome align-right"></div>
</div>
@@ -44,8 +42,8 @@
<div class="bottom">
<form action="${save_url}" method="post">
<textarea name="body" tal:content="page.data" rows="10"
- cols="60"/><br/>
- <input type="submit" name="form.submitted" value="Save"/>
+ cols="60"><br>
+ <input type="submit" name="form.submitted" value="Save">
</form>
</div>
</div>
diff --git a/docs/tutorials/wiki2/src/views/tutorial/templates/view.pt b/docs/tutorials/wiki2/src/views/tutorial/templates/view.pt
index 78c0d2d4c..f73d92f0f 100644
--- a/docs/tutorials/wiki2/src/views/tutorial/templates/view.pt
+++ b/docs/tutorials/wiki2/src/views/tutorial/templates/view.pt
@@ -1,22 +1,20 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
- xmlns:tal="http://xml.zope.org/namespaces/tal">
+<!DOCTYPE html>
+<html lang="en">
<head>
+ <meta charset="utf-8">
<title>${page.name} - Pyramid tutorial wiki (based on
TurboGears 20-Minute Wiki)</title>
- <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
- <meta name="keywords" content="python web application" />
- <meta name="description" content="pyramid web application" />
+ <meta name="keywords" content="python web application">
+ <meta name="description" content="pyramid web application">
<link rel="shortcut icon"
- href="${request.static_url('tutorial:static/favicon.ico')}" />
+ href="${request.static_url('tutorial:static/favicon.ico')}">
<link rel="stylesheet"
href="${request.static_url('tutorial:static/pylons.css')}"
- type="text/css" media="screen" charset="utf-8" />
+ type="text/css" media="screen">
<!--[if lte IE 6]>
<link rel="stylesheet"
href="${request.static_url('tutorial:static/ie6.css')}"
- type="text/css" media="screen" charset="utf-8" />
+ type="text/css" media="screen">
<![endif]-->
</head>
<body>
@@ -25,7 +23,7 @@
<div class="top-small align-center">
<div>
<img width="220" height="50" alt="pyramid"
- src="${request.static_url('tutorial:static/pyramid-small.png')}" />
+ src="${request.static_url('tutorial:static/pyramid-small.png')}">
</div>
</div>
</div>
@@ -33,9 +31,9 @@
<div class="middle align-right">
<div id="left" class="app-welcome align-left">
Viewing <b><span tal:replace="page.name">Page Name
- Goes Here</span></b><br/>
+ Goes Here</span></b><br>
You can return to the
- <a href="${request.application_url}">FrontPage</a>.<br/>
+ <a href="${request.application_url}">FrontPage</a>.<br>
</div>
<div id="right" class="app-welcome align-right"></div>
</div>
diff --git a/docs/tutorials/wiki2/src/views/tutorial/views.py b/docs/tutorials/wiki2/src/views/tutorial/views.py
index b41d4ab40..a3707dab5 100644
--- a/docs/tutorials/wiki2/src/views/tutorial/views.py
+++ b/docs/tutorials/wiki2/src/views/tutorial/views.py
@@ -6,6 +6,7 @@ from pyramid.httpexceptions import (
HTTPFound,
HTTPNotFound,
)
+
from pyramid.view import view_config
from .models import (