Permalink
Browse files

Update book index.html in Wiki20 tutorial to the new quickstart

  • Loading branch information...
1 parent adc8f8f commit 5b70e1426978285c08974df336ba83aa043c5f07 @amol- amol- committed Apr 21, 2012
Showing with 65 additions and 12 deletions.
  1. +2 −2 book/conf.py
  2. +63 −10 book/part1/wiki20.rst
View
4 book/conf.py
@@ -50,9 +50,9 @@
# built documents.
#
# The short X.Y version.
-version = '2.1.4'
+version = '2.2'
# The full version, including alpha/beta/rc tags.
-release = '2.1.4'
+release = '2.2'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
View
73 book/part1/wiki20.rst
@@ -282,7 +282,7 @@ template.
Displaying The Page
-------------------
-`Wiki-20/wiki20/templates/index.html` (see below) is the template
+`Wiki-20/wiki20/templates/index.html` is the template
specified by the ``@expose()`` decorator, so it formats what you view
on the welcome screen. Look at the file; you'll see that it's standard
XHTML with some simple namespaced attributes. This makes it very
@@ -298,8 +298,68 @@ directives in the sections on :ref:`Editing pages <editing_pages>` and
:ref:`Adding views <adding_views>`.
-.. code:: Wiki-20/wiki20/templates/index.html
- :revision: a88c887745f6457f8348bac861538665f8496ff5
+The following is the content of a newly quickstarted TurboGears2 project
+at 2.2 release time:
+
+.. code-block:: html+genshi
+
+ <html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:py="http://genshi.edgewall.org/"
+ xmlns:xi="http://www.w3.org/2001/XInclude">
+
+ <xi:include href="master.html" />
+
+ <head>
+ <title>Welcome to TurboGears 2.2, standing on the shoulders of giants, since 2007</title>
+ </head>
+
+ <body>
+ <div class="row">
+ <div class="span8 hidden-phone hidden-tablet">
+ <div class="hero-unit">
+ <h1>Welcome to TurboGears 2.2</h1>
+ <p>If you see this page it means your installation was successful!</p>
+ <p>TurboGears 2 is rapid web application development toolkit designed to make your life easier.</p>
+ <p>
+ <a class="btn btn-primary btn-large" href="http://www.turbogears.org" target="_blank">
+ ${h.icon('book', True)} Learn more
+ </a>
+ </p>
+ </div>
+ </div>
+ <div class="span4">
+ <a class="btn btn-small" href="http://www.turbogears.org/2.2/docs/">${h.icon('book')} TG2 Documents</a>
+ <span class="label label-success">new</span>
+ Read the Getting Started section<br/>
+ <br/>
+ <a class="btn btn-small" href="http://www.turbogears.org/book/">${h.icon('book')} TG2 Book</a>
+ Work in progress TurboGears2 book<br/>
+ <br/>
+ <a class="btn btn-small" href="http://groups.google.com/group/turbogears">${h.icon('comment')} Join the Mail List</a>
+ for general TG use/topics
+ </div>
+ </div>
+
+ <div class="row">
+ <div class="span4">
+ <h3>Code your data model</h3>
+ <p> Design your data <code>model</code>, Create the database, and Add some bootstrap data.</p>
+ </div>
+ <div class="span4">
+ <h3>Design your URL architecture</h3>
+ <p> Decide your URLs, Program your <code>controller</code> methods, Design your
+ <code>templates</code>, and place some static files (CSS and/or Javascript). </p>
+ </div>
+ <div class="span4">
+ <h3>Distribute your app</h3>
+ <p> Test your source, Generate project documents, Build a distribution.</p>
+ </div>
+ </div>
+
+ <div class="notice"> Thank you for choosing TurboGears.</div>
+ </body>
+ </html>
+
Wiki Model and Database
=======================
@@ -522,13 +582,6 @@ template. Using includes lets you easily maintain a cohesive look and
feel throughout your site by having each page include a common master
template.
-Similarly the lines::
-
- <xi:include href="header.html" />
- <xi:include href="footer.html" />
-
-Tell Genshi to pull in the headers and footers for the page.
-
Copy the contents of `index.html` into a new file called `page.html`.
Now modify it for our purposes:

0 comments on commit 5b70e14

Please sign in to comment.