General reformatting of the wiki and wiki2 tutorials to eliminate

any overly long lines in the PDF rendering. Changes to .rst files: (docs/tutorials/wiki/authorization.rst) (docs/tutorials/wiki/definingviews.rst) (docs/tutorials/wiki2/authorization.rst) (docs/tutorials/wiki2/definingviews.rst) 1. For included templates, added :tab-width: 2 options. 2. wiki2/authorization.rst: Wrong markup for file names __init__.py and views.py just after the subhead "Adding security.py". Changes to .py files: Folded a few long lines. (docs/tutorials/wiki/src/basiclayout/tutorial/views.py) (docs/tutorials/wiki/src/authorization/tutorial/views.py) (docs/tutorials/wiki/src/views/tutorial/views.py) (docs/tutorials/wiki2/src/basiclayout/tutorial/models.py) (docs/tutorials/wiki2/src/models/tutorial/models.py) Changes to .pt files: Broke long lines; reformatted for 2-space indentation using tabs. (docs/tutorials/wiki/src/authorization/tutorial/templates/edit.pt) (docs/tutorials/wiki/src/authorization/tutorial/templates/login.pt) (docs/tutorials/wiki/src/authorization/tutorial/templates/view.pt) (docs/tutorials/wiki/src/views/tutorial/templates/edit.pt) (docs/tutorials/wiki/src/views/tutorial/templates/view.pt) (docs/tutorials/wiki2/src/authorization/tutorial/templates/edit.pt) (docs/tutorials/wiki2/src/authorization/tutorial/templates/login.pt) (docs/tutorials/wiki2/src/authorization/tutorial/templates/view.pt) (docs/tutorials/wiki2/src/views/tutorial/templates/edit.pt) (docs/tutorials/wiki2/src/views/tutorial/templates/view.pt)
author: John Shipman <john@rainbow.nmt.edu> 2011-01-15 14:45:17 -0700
committer: John Shipman <john@rainbow.nmt.edu> 2011-01-15 14:45:17 -0700
commit: 6471d307be249dc2aa22ab65128e8c2a0404ff79 (patch)
tree: b2fa9f8700225df0da5624a109cdfc851e0a2776 /docs/tutorials/wiki2/src/authorization
parent: a063aff1b0a9fe1f9d8c4a4baeade6453695f171 (diff)
download: pyramid-6471d307be249dc2aa22ab65128e8c2a0404ff79.tar.gz
pyramid-6471d307be249dc2aa22ab65128e8c2a0404ff79.tar.bz2
pyramid-6471d307be249dc2aa22ab65128e8c2a0404ff79.zip
3 files changed, 71 insertions, 44 deletions
diff --git a/docs/tutorials/wiki2/src/authorization/tutorial/templates/edit.pt b/docs/tutorials/wiki2/src/authorization/tutorial/templates/edit.pt
index e8c59eb10..cea9b4932 100644
--- a/docs/tutorials/wiki2/src/authorization/tutorial/templates/edit.pt
+++ b/docs/tutorials/wiki2/src/authorization/tutorial/templates/edit.pt
@@ -1,16 +1,22 @@
-<!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 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">
 <head>
-	<title>${page.name} - Pyramid tutorial wiki (based on TurboGears 20-Minute Wiki)</title>
+	<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" />
-	<link rel="shortcut icon" 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" />
-	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton&amp;subset=latin" type="text/css" media="screen" charset="utf-8" />
-	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Nobile:regular,italic,bold,bolditalic&amp;subset=latin" type="text/css" media="screen" charset="utf-8" />
+	<link rel="shortcut icon"
+				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" />
 	<!--[if lte IE 6]>
-	<link rel="stylesheet" href="${request.static_url('tutorial:static/ie6.css')}" type="text/css" media="screen" charset="utf-8" />
+	<link rel="stylesheet"
+				href="${request.static_url('tutorial:static/ie6.css')}"
+				type="text/css" media="screen" charset="utf-8" />
 	<![endif]-->
 </head>
 <body>
@@ -18,19 +24,22 @@
 		<div id="top-small">
 			<div class="top-small align-center">
 				<div>
-					<img src="${request.static_url('tutorial:static/pyramid-small.png')}" width="220" height="50" alt="pyramid" />
+					<img width="220" height="50" alt="pyramid"
+				src="${request.static_url('tutorial:static/pyramid-small.png')}" />
 				</div>
 			</div>
 		</div>
 		<div id="middle">
 			<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/>
-					You can return to the <a href="${request.application_url}">FrontPage</a>.<br/>
+					Editing <b><span tal:replace="page.name">Page Name
+						Goes Here</span></b><br/>
+					You can return to the
+					<a href="${request.application_url}">FrontPage</a>.<br/>
 				</div>
 				<div id="right" class="app-welcome align-right">
 					<span tal:condition="logged_in">
-  						<a href="${request.application_url}/logout">Logout</a>
+							<a href="${request.application_url}/logout">Logout</a>
 					</span>
 				</div>
 			</div>
@@ -38,9 +47,10 @@
 		<div id="bottom">
 			<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"/>
-    			</form>
+					<textarea name="body" tal:content="page.data" rows="10"
+										cols="60"/><br/>
+					<input type="submit" name="form.submitted" value="Save"/>
+				</form>
 			</div>
 		</div>
 	</div>
@@ -48,4 +58,4 @@
 		<div class="footer">© Copyright 2008-2011, Agendaless Consulting.</div>
 	</div>
 </body>
-</html>
-\ No newline at end of file
+</html>
diff --git a/docs/tutorials/wiki2/src/authorization/tutorial/templates/login.pt b/docs/tutorials/wiki2/src/authorization/tutorial/templates/login.pt
index 974e22f37..554b4ea87 100644
--- a/docs/tutorials/wiki2/src/authorization/tutorial/templates/login.pt
+++ b/docs/tutorials/wiki2/src/authorization/tutorial/templates/login.pt
@@ -1,16 +1,22 @@
-<!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 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">
 <head>
-	<title>Login - Pyramid tutorial wiki (based on TurboGears 20-Minute Wiki)</title>
+	<title>Login - 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" />
-	<link rel="shortcut icon" 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" />
-	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton&amp;subset=latin" type="text/css" media="screen" charset="utf-8" />
-	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Nobile:regular,italic,bold,bolditalic&amp;subset=latin" type="text/css" media="screen" charset="utf-8" />
+	<link rel="shortcut icon"
+				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" />
 	<!--[if lte IE 6]>
-	<link rel="stylesheet" href="${request.static_url('tutorial:static/ie6.css')}" type="text/css" media="screen" charset="utf-8" />
+	<link rel="stylesheet"
+				href="${request.static_url('tutorial:static/ie6.css')}"
+				type="text/css" media="screen" charset="utf-8" />
 	<![endif]-->
 </head>
 <body>
@@ -18,7 +24,8 @@
 		<div id="top-small">
 			<div class="top-small align-center">
 				<div>
-					<img src="${request.static_url('tutorial:static/pyramid-small.png')}" width="220" height="50" alt="pyramid" />
+					<img width="220" height="50" alt="pyramid"
+				src="${request.static_url('tutorial:static/pyramid-small.png')}" />
 				</div>
 			</div>
 		</div>
@@ -34,11 +41,12 @@
 		<div id="bottom">
 			<div class="bottom">
 				<form action="${url}" method="post">
-    				<input type="hidden" name="came_from" value="${came_from}"/>
-    				<input type="text" name="login" value="${login}"/><br/>
-    				<input type="password" name="password" value="${password}"/><br/>
-    				<input type="submit" name="form.submitted" value="Log In"/>
-  				</form>
+					<input type="hidden" name="came_from" value="${came_from}"/>
+					<input type="text" name="login" value="${login}"/><br/>
+					<input type="password" name="password"
+								 value="${password}"/><br/>
+					<input type="submit" name="form.submitted" value="Log In"/>
+				</form>
 			</div>
 		</div>
 	</div>
@@ -46,4 +54,4 @@
 		<div class="footer">© Copyright 2008-2011, Agendaless Consulting.</div>
 	</div>
 </body>
-</html>
-\ No newline at end of file
+</html>
diff --git a/docs/tutorials/wiki2/src/authorization/tutorial/templates/view.pt b/docs/tutorials/wiki2/src/authorization/tutorial/templates/view.pt
index d0360429c..7d01aefb9 100644
--- a/docs/tutorials/wiki2/src/authorization/tutorial/templates/view.pt
+++ b/docs/tutorials/wiki2/src/authorization/tutorial/templates/view.pt
@@ -1,16 +1,22 @@
-<!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 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">
 <head>
-	<title>${page.name} - Pyramid tutorial wiki (based on TurboGears 20-Minute Wiki)</title>
+	<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" />
-	<link rel="shortcut icon" 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" />
-	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton&amp;subset=latin" type="text/css" media="screen" charset="utf-8" />
-	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Nobile:regular,italic,bold,bolditalic&amp;subset=latin" type="text/css" media="screen" charset="utf-8" />
+	<link rel="shortcut icon"
+				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" />
 	<!--[if lte IE 6]>
-	<link rel="stylesheet" href="${request.static_url('tutorial:static/ie6.css')}" type="text/css" media="screen" charset="utf-8" />
+	<link rel="stylesheet"
+				href="${request.static_url('tutorial:static/ie6.css')}"
+				type="text/css" media="screen" charset="utf-8" />
 	<![endif]-->
 </head>
 <body>
@@ -18,19 +24,22 @@
 		<div id="top-small">
 			<div class="top-small align-center">
 				<div>
-					<img src="${request.static_url('tutorial:static/pyramid-small.png')}" width="220" height="50" alt="pyramid" />
+					<img width="220" height="50" alt="pyramid"
+				src="${request.static_url('tutorial:static/pyramid-small.png')}" />
 				</div>
 			</div>
 		</div>
 		<div id="middle">
 			<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/>
-					You can return to the <a href="${request.application_url}">FrontPage</a>.<br/>
+					Viewing <b><span tal:replace="page.name">Page Name
+						Goes Here</span></b><br/>
+					You can return to the
+					<a href="${request.application_url}">FrontPage</a>.<br/>
 				</div>
 				<div id="right" class="app-welcome align-right">
 					<span tal:condition="logged_in">
-  						<a href="${request.application_url}/logout">Logout</a>
+						<a href="${request.application_url}/logout">Logout</a>
 					</span>
 				</div>
 			</div>
@@ -52,4 +61,4 @@
 		<div class="footer">© Copyright 2008-2011, Agendaless Consulting.</div>
 	</div>
 </body>
-</html>
-\ No newline at end of file
+</html>
author	John Shipman <john@rainbow.nmt.edu>	2011-01-15 14:45:17 -0700
committer	John Shipman <john@rainbow.nmt.edu>	2011-01-15 14:45:17 -0700
commit	6471d307be249dc2aa22ab65128e8c2a0404ff79 (patch)
tree	b2fa9f8700225df0da5624a109cdfc851e0a2776 /docs/tutorials/wiki2/src/authorization
parent	a063aff1b0a9fe1f9d8c4a4baeade6453695f171 (diff)
download	pyramid-6471d307be249dc2aa22ab65128e8c2a0404ff79.tar.gz pyramid-6471d307be249dc2aa22ab65128e8c2a0404ff79.tar.bz2 pyramid-6471d307be249dc2aa22ab65128e8c2a0404ff79.zip