X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=geekigeeki.py;h=8de46ab91cbf4d2b14e4ce25753a0848545c311c;hb=fbc4d6639e75dd726fdcadc1129ae0900468e9d2;hp=44be2a46bcc3163307d0f65d62b7421b73c130f8;hpb=a8cdeeed7e87a195c5e9e0b1e2b74e6b04da1109;p=geekigeeki.git
diff --git a/geekigeeki.py b/geekigeeki.py
index 44be2a4..8de46ab 100755
--- a/geekigeeki.py
+++ b/geekigeeki.py
@@ -110,7 +110,7 @@ def send_guru(msg_text, msg_type):
}
"""
-def send_title(name, text="Limbo", msg_text=None, msg_type='error'):
+def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=False):
global title_done
if title_done: return
@@ -125,23 +125,23 @@ def send_title(name, text="Limbo", msg_text=None, msg_type='error'):
print ' '
if not name:
print ' '
- for css in css_url:
- print ' ' % relative_url(css)
- if icon_url:
- print ' ' % relative_url(icon_url)
- if privileged_url is not None:
- print ' ' \
+ for link in link_urls:
+ rel, href = link
+ print ' ' % (rel, relative_url(href))
+
+ if name and writable and privileged_url is not None:
+ print ' ' \
% (privileged_path() + '?edit=' + name)
if history_url is not None:
print ' ' \
- % (history_url + '?a=rss')
+ % relative_url(history_url + '?a=rss')
print ''
# Body
- if name and privileged_url is not None:
+ if name and writable and privileged_url is not None:
print ''
else:
print ''
@@ -155,17 +155,21 @@ def send_title(name, text="Limbo", msg_text=None, msg_type='error'):
print ' ' + link_tag('?fullsearch=' + name, text, 'navlink') + ' '
else:
print ' ' + text + ' '
- print ' | ' + link_tag('FrontPage', 'Front Page', 'navlink')
+ print ' | ' + link_tag('FrontPage', 'Home', 'navlink')
print ' | ' + link_tag('FindPage', 'Find Page', 'navlink')
if 'history_url' in globals():
- print ' | Recent Changes'
+ print ' | Recent Changes'
if name:
- print ' | Page History'
+ print ' | Page History'
if name:
print ' | ' + link_tag('?raw=' + name, 'Raw Text', 'navlink')
if privileged_url is not None:
- print ' | ' + link_tag('?edit=' + name, 'Edit Page', 'navlink', privileged=True)
+ if writable:
+ print ' | ' + link_tag('?edit=' + name, 'Edit', 'navlink', privileged=True)
+ else:
+ print ' | ' + link_tag(name, 'Login', 'navlink', privileged=True)
+
else:
print ' | Immutable Page'
@@ -356,12 +360,11 @@ class WikiFormatter:
def _hurl_repl(self, word):
m = link_re.match(word)
name = m.group(1)
- if m.group(2) is None:
+ descr = m.group(2)
+ if descr is None:
descr = name
elif img_re.match(m.group(2)):
descr = '
'
- else:
- descr = m.group(2)
return link_tag(name, descr, 'wikilink')
@@ -618,7 +621,7 @@ class Page:
self.attrs[m.group(1)] = m.group(2).strip()
#print "bernie: attrs[" + m.group(1) + "] = " + m.group(2) + "
\n"
except IOError, er:
- if er.errno != errno.ENOENT:
+ if er.errno != errno.ENOENT and er.errno != errno.EISDIR:
raise er
return self.attrs
@@ -653,17 +656,16 @@ class Page:
send_guru("Read access denied by ACLs", "notice")
def format(self):
- page_name = None
- if self.can_write():
- page_name = self.page_name
-
- #css foo.css bar.css
- global css_url
- css_url = self.get_attr("css", "").split() + css_url
-
- send_title(page_name, self.split_title(), msg_text=self.msg_text, msg_type=self.msg_type)
+ #css foo.css
+ value = self.get_attr("css", None)
+ if value:
+ global link_urls
+ link_urls += { "stylesheet": value }
+
+ send_title(self.page_name, self.split_title(),
+ msg_text=self.msg_text, msg_type=self.msg_type, writable=self.can_write())
self.send_naked()
- send_footer(page_name, self._last_modified())
+ send_footer(self.page_name, self._last_modified())
def _last_modified(self):
try: