Merge branch 'master' of github.com:dcolish/Cockerel

dcolish · Aug 18, 2010 · 518c9f6 · 518c9f6
2 parents 887574f + 66d09f2
commit 518c9f6
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/cockerel/webapp/templates/classes/view.html b/cockerel/webapp/templates/classes/view.html
@@ -9,7 +9,7 @@
 
   <ul>
     {% for lesson in lessons %}
-    <li><a href="{{ url_for('lessons.view', lesson_id = lesson.id) }}">{{ lesson.lesson_name }}</a></li>
+    <li><a href="{{ url_for('lessons.view', lesson_id=lesson.id) }}">{{ lesson.lesson_name }}</a></li>
     {% endfor %}
   </ul>
 {% endif %}

diff --git a/cockerel/webapp/views/prover/mdx_prover.py b/cockerel/webapp/views/prover/mdx_prover.py
@@ -38,7 +38,7 @@ class ProverPreprocessor(markdown.preprocessors.Preprocessor):
                     '(?P<end>^>{3,})[ ]*$',
                     re.MULTILINE | re.DOTALL)
     WRAP = """
-<a class="proofscript" href="/prover?{url}"><pre>{proof}</pre></a>"""
+<a class="proofscript" href="/prover/{id}"><pre>{proof}</pre></a>"""
 
     def __init__(self, md):
         markdown.preprocessors.Preprocessor.__init__(self, md)
@@ -58,7 +58,7 @@ def run(self, lines):
                     db.session.add(theorem)
                     db.session.commit()
                 proof = self.WRAP.format(
-                    url=urlencode(dict(theorem=theorem.id)),
+                    id=theorem.id,
                     proof=self._escape(theorem.text))
 
                 placeholder = self.markdown.htmlStash.store(proof, safe=True)

diff --git a/docs/index.rst b/docs/index.rst
@@ -84,17 +84,17 @@ shell commands to control the program output. In order to stop them
 you will eventually need to foreground them again and press Ctrl-C. A
 session could look something like this::
    
-   (dev_env)blackbox:Cockerel ∈ ζ cockerel > cockerel.log 2>&1 &
-   [1] 4199
-   (dev_env)blackbox:Cockerel ∈ ζ coqd > coqd.log 2>&1 &
-   [2] 4211
-   (dev_env)blackbox:Cockerel ∈ ζ jobs
-   [1]-  Running                 cockerel > cockerel.log 2>&1 &
-   [2]+  Running                 coqd > coqd.log 2>&1 &
-   (dev)blackbox:Cockerel ∈ ζ fg %1
-   cockerel > cockerel.log 2>&1 #NOW PRESS Ctrl-C to stop
-   (dev)blackbox:Cockerel ∈ ζ fg %2
-   coqd > coqd.log 2>& #NOW PRESS Ctrl-C to stop
+   cockerel > cockerel.log 2>&1 &
+   # [1] 4199
+   coqd > coqd.log 2>&1 &
+   # [2] 4211
+   jobs
+   # [1]-  Running                 cockerel > cockerel.log 2>&1 &
+   # [2]+  Running                 coqd > coqd.log 2>&1 &
+   fg %1
+   #NOW PRESS Ctrl-C to stop => cockerel > cockerel.log 2>&1 
+   fg %2
+   #NOW PRESS Ctrl-C to stop => coqd > coqd.log 2>&