[display theorems
raph.levien@gmail.com**20070107003414] {
hunk ./app/log_what.py 8
+
+# Decide whether a given "what" lives in theorem space
+def thmspace(what):
+    lwhat = what.split('/')
+    return len(lwhat) > 1 and lwhat[0] not in ('wiki', 'bib', 'user')
hunk ./app/templates/base.html 57
+</html>
hunk ./app/templates/edit.html 14
-      <table>
-	{{ form }}
-      </table>
+      <div id="editbox">{{ form.ldata }}</div>
addfile ./app/templates/theorem.html
hunk ./app/templates/theorem.html 1
+{% load ghmarkup %}
+{% extends "wikibase.html" %}
+
+{% block content %}
+    <h1 class="wiki">{{ title }}</h1>
+
+{{ norm.ldata|ghmarkup:"mm/set/" }}
+<pre>
+{{ thm.ldata|escape }}
+</pre>
+
+<p>Last edited: {{ norm.mtime }} by {% filter ghlink %}user/{{ norm.muser }}{% endfilter %}</p>
+
+<p>
+<a href="/edit/{{ norm.what|urlencode }}">Edit</a>
+<a href="/history/{{ norm.what|urlencode }}">History</a>
+{{ norm.what|talklink }}
+</p>
+{% endblock %}
hunk ./app/templatetags/ghmarkup.py 4
-from ghestalt.app.log_what import wikiwhat
+from ghestalt.app.log_what import wikiwhat, thmspace
hunk ./app/templatetags/ghmarkup.py 30
-    return Log.objects.filter(what=what).count() > 0
+    if thmspace(what):
+	return Log.objects.filter(what=what+'/_thm').count() > 0
+    else:
+	return Log.objects.filter(what=what).count() > 0
hunk ./app/templatetags/ghmarkup.py 50
-def wikilink(str, exists = None, ispreblock = False):
+def wikilink(str, exists = None, ispreblock = False, ctx = None):
hunk ./app/templatetags/ghmarkup.py 59
-	url = link
-    elif re.match('user/[^/]+$', link):
+	url = linktext = link
+    elif re.match(r'user/[^/]+$', link):
hunk ./app/templatetags/ghmarkup.py 63
+	m = re.search(r'/_[a-z]+$', link)
+	if m: link = link[:m.start()]
+	linktext = link
+	if ctx and link.find('/') < 0: link = ctx + link
hunk ./app/templatetags/ghmarkup.py 75
-	if re.match('wiki/', link):
-	    body = link[5:]
-	elif re.match('bib/', link):
-	    body = '[' + link[4:] + ']'
+	if re.match('wiki/', linktext):
+	    body = linktext[5:]
+	elif re.match('bib/', linktext):
+	    body = '[' + linktext[4:] + ']'
hunk ./app/templatetags/ghmarkup.py 80
-	    body = link
+	    body = linktext
hunk ./app/templatetags/ghmarkup.py 108
-def process_ghmarkup(str):
+def process_ghmarkup(str, ctx):
hunk ./app/templatetags/ghmarkup.py 123
-        (?<!\S)            # single char markup must follow whitespace
+        (?<![^\s\"\(])     # single char markup must follow whitespace
hunk ./app/templatetags/ghmarkup.py 130
-    embeds = {'[': (r'\]', wikilink), '[[': (r'\]\]', wikilink), 
+    def my_wikilink(str, ispreblock = False):
+	return wikilink(str, ispreblock = False, ctx = ctx)
+    embeds = {'[': (r'\]', my_wikilink), '[[': (r'\]\]', my_wikilink), 
hunk ./app/templatetags/ghmarkup.py 239
-def ghmarkup(value):
-    return process_ghmarkup(value)
+def ghmarkup(value, ctx = None):
+    return process_ghmarkup(value, ctx)
hunk ./app/templatetags/ghmarkup.py 243
+    if re.search(r'/_norm', value): value = value[:-6]
hunk ./app/views.py 28
-	print `log`
hunk ./app/views.py 89
+def show_theorem(request, theorem):
+    what = theorem
+    try:
+        norm = Log.objects.filter(what=what + '/_norm').latest()
+        thm = Log.objects.filter(what=what + '/_thm').latest()
+    except:
+        return render_to_response('missing.html',{'title':wikititle(what), 'what':what},
+                                  RequestContext(request))
+    return render_to_response('theorem.html',{'title':wikititle(what), 'norm':norm, 'thm':thm},
+                              RequestContext(request))
+
hunk ./static/css/style.css 212
+#editbox { clear: both }
+
hunk ./static/css/style.css 215
-A.wiki:hover {text-decoration: underline}
hunk ./static/css/style.css 216
-A.new:hover {text-decoration: underline}
hunk ./static/css/style.css 217
-A.user:hover {text-decoration: underline}
-h1.wiki {font-family: helvetica, arial, sans}
-h2.wiki {font-family: helvetica, arial, sans}
-h3.wiki {font-family: helvetica, arial, sans}
-h4.wiki {font-family: helvetica, arial, sans}
-h5.wiki {font-family: helvetica, arial, sans}
-h6.wiki {font-family: helvetica, arial, sans}
+A.wiki:hover, A.new:hover, A.user:hover
+{
+  text-decoration: underline
+}
+h1.wiki, h2.wiki, h3.wiki, h4.wiki, h5.wiki, h6.wiki
+{
+  font-family: helvetica, arial, sans
+}
hunk ./urls.py 7
-    (r'^mm/set/(?P<theorem>[\w\-_]+)/', 'ghestalt.app.views.wiki_showpage'),
hunk ./urls.py 17
+    (r'^(?P<theorem>mm/.+)$',               'show_theorem'),
}