Merge remote-tracking branch 'gabbar1947/generate' into new-tutorials

changes from outstanding pull requests

Author: aparrish

Tutorials/2dlists/index.html

@@ -228,4 +228,4 @@ <h1>Two-Dimensional Lists</h1>
     </tr>
   </table>
 </body>
-</html>
+</html>

Tutorials/2dlists/tutorial.xml

@@ -6,4 +6,4 @@
     <p>How to store data in a matrix using a two-dimensional list.</p>
     <p>Level: Intermediate</p>
 </blurb>
-</root>
+</root>

Tutorials/color/tutorial.xml

@@ -2,6 +2,7 @@
 <root>
 <image>color.jpg</image>
 <title>Color</title>
+<author>Daniel Shiffman</author>
 <blurb>
     <p>An introduction to digital color.</p>
     <p>Level: Beginner</p>

Tutorials/drawing/tutorial.xml

@@ -2,6 +2,7 @@
 <root>
 <image>basics.jpg</image>
 <title>Coordinate System and Shapes</title>
+<author>Daniel Shiffman</author>
 <blurb>
     <p>Drawing simple shapes and using the coordinate system.</p>
     <p>Level: Beginner</p>

Tutorials/gettingstarted/tutorial.xml

@@ -2,6 +2,7 @@
 <root>
 <image>gettingstarted.gif</image>
 <title>Getting Started</title>
+<author> Casey Reas and Ben Fry</author>
 <blurb>
     <p>Welcome to Processing! This tutorial covers the basics of writing Python code.</p>
     <p>Level: Beginner</p>

Tutorials/objects/tutorial.xml

@@ -2,6 +2,7 @@
 <root>
 <image>objects.jpg</image>
 <title>Objects</title>
+<author>Daniel Shiffman</author>
 <blurb>
     <p>The basics of object-oriented programming.</p>
     <p>Level: Beginner</p>

Tutorials/overview/tutorial.xml

@@ -2,6 +2,7 @@
 <root>
 <image>overview.jpg</image>
 <title>Processing Overview</title>
+<author>Ben Fry and Casey Reas</author>
 <blurb>
     <p>A more detailed introduction to the different features of Processing.</p>
     <p>Level: Beginner</p>

content/css/style.css

@@ -1260,4 +1260,4 @@ ul.nostyle { margin: 0; padding: 0; list-style: none outside; }
   -webkit-border-radius: 4px;
   -moz-border-radius: 4px;
   border-radius: 4px;
-}
+}

generator.py

@@ -98,6 +98,16 @@ def __init__(self, source_xml):
         if xml.find('usage') is not None:
             self.usage = self.get_element_text(xml.find('usage'))
 
+        
+        self.parameter = None
+        if xml.find('parameter') is not None:
+            self.parameter = self.get_element_text(xml.find('parameter'))
+
+
+        self.related = None
+        if xml.find('related') is not None:
+            self.parameter = self.get_element_text(xml.find('related'))
+    
         # We store plain xml-elements for some children so that we can use convert_hypertext on them at generation time.
         # This is necessary because all ReferenceItems have to be parsed before links can be resolved.
         self.examples = []
@@ -468,6 +478,7 @@ def build_tutorials(env):
         tutorial_data = etree.parse(os.path.join(tutorials_dir, tutorial['folder'], 'tutorial.xml'))
         tutorial['image'] = os.path.join(tutorial['folder'], 'imgs', tutorial_data.find('image').text)
         tutorial['title'] = tutorial_data.find('title').text
+        tutorial['author'] = tutorial_data.find('author').text
         tutorial['blurb'] = tutorial_data.find('blurb')
         # I want to use convert_hypertext on the examples so they can use things like 'ref';
         # we can use lxml.html to parse the html into an element-tree!

template/examples_index.jinja

@@ -3,19 +3,6 @@
 
 {% block title %}Processing.py{% endblock %}
 
-{% block nav %}
-<div id="navigation">
-    <div class="navBar" id="mainnav">
-        <a href="/">Cover</a><br/>
-        <a href="/reference/">Reference</a><br/>
-        <a href="/tutorials/">Tutorials</a><br/>
-        <a href="/examples/" class="active">Examples</a><br/>
-        <a href="https://github.com/jdf/Processing.py-Bugs/issues"
-          class="bug">Bugs</a>
-    </div>
-</div> 
-{% endblock %}
-
 {% block content %}
 <h1>Processing.py Examples.</h1>
 <p>Coming soon! In the meantime, consult the examples that are included in the Python Mode download for Processing (File &gt; Examples...)</p>