Mercurial > libervia-web
diff src/server/blog.py @ 702:d94feb0d849e
server_side: give a better look to the static blog
| author | souliane <souliane@mailoo.org> |
|---|---|
| date | Mon, 11 May 2015 14:54:41 +0200 |
| parents | 82123705474b |
| children | 5319110a862c |
line wrap: on
line diff
--- a/src/server/blog.py Wed May 27 19:11:25 2015 +0200 +++ b/src/server/blog.py Mon May 11 14:54:41 2015 +0200 @@ -235,12 +235,20 @@ def getOption(key): return sanitizeHtml(options[key]).encode('utf-8') if key in options else '' - def getImageOption(key, alt): + def getImageOption(key, default, alt): """regexp from http://answers.oreilly.com/topic/280-how-to-validate-urls-with-regular-expressions/""" url = options[key].encode('utf-8') if key in options else '' regexp = r"^(https?|ftp)://[a-z0-9-]+(\.[a-z0-9-]+)+(/[\w-]+)*/[\w-]+\.(gif|png|jpg)$" - return "<img src='%(url)s' alt='%(alt)s'/>" % {'alt': alt, 'url': url} if re.match(regexp, url) else alt + if re.match(regexp, url): + url = url + suffix = "<br/>" + else: + url = default + suffix = "" + return "<img src='%(url)s' alt='%(alt)s'/>%(suffix)s" % {'alt': alt, 'url': url, 'suffix': suffix} + avatar = os.path.normpath(root_url + getOption('avatar')) + title = getOption(C.STATIC_BLOG_PARAM_TITLE) or user request.write(""" <html> <head> @@ -253,15 +261,17 @@ <title>%(title)s</title> </head> <body> - <div class="mblog_title"><a href="%(base)s">%(banner_elt)s</a></div> + <div class="mblog_title"><a href="%(base)s">%(banner_elt)s%(title_elt)s</a></div> """ % {'base': base_url, 'root': root_url, 'user': user, 'keywords': getOption(C.STATIC_BLOG_PARAM_KEYWORDS), 'description': getOption(C.STATIC_BLOG_PARAM_DESCRIPTION), 'title': getOption(C.STATIC_BLOG_PARAM_TITLE) or "%s's microblog" % user, - 'favicon': os.path.normpath(root_url + getOption('avatar')), - 'banner_elt': getImageOption(C.STATIC_BLOG_PARAM_BANNER, getOption(C.STATIC_BLOG_PARAM_TITLE) or user)}) + 'favicon': avatar, + 'banner_elt': getImageOption(C.STATIC_BLOG_PARAM_BANNER, avatar, title), + 'title_elt': title, + }) mblog_data, main_rsm = mblog_data display_single = len(mblog_data) == 1 @@ -273,10 +283,10 @@ before_link = ("%(base)s?before=%(item_id)s" % {'base': base_url, 'item_id': main_rsm['first']}).encode('utf-8') if display_single: before_link += '&max=1' - tmp_text = D_("Later message") + tmp_text = D_("later message") class_ = 'later_message' else: - tmp_text = D_("Later messages") + tmp_text = D_("later messages") class_ = 'later_messages' before_tag = """<a href="%(link)s" class="%(class)s">%(text)s</a>""" % {'link': before_link, 'class': class_, 'text': tmp_text} else: @@ -285,10 +295,10 @@ after_link = ("%(base)s?after=%(item_id)s" % {'base': base_url, 'item_id': main_rsm['last']}).encode('utf-8') if display_single: after_link += '&max=1' - text = D_("Older message") + text = D_("older message") class_ = 'older_message' else: - text = D_("Older messages") + text = D_("older messages") class_ = 'older_messages' after_tag = """<a href="%(link)s" class="%(class)s">%(text)s</a>""" % {'link': after_link, 'class': class_, 'text': text} else: @@ -296,12 +306,12 @@ # display navigation header request.write("""<div class="header">""") + request.write("""<div class="header_content">""") if before_tag: request.write(before_tag) - request.write(" ") if display_single and after_tag: request.write(after_tag) - request.write("""</div>""") + request.write("""</div></div>""") mblog_data = [(entry if isinstance(entry, tuple) else (entry, ([], {}))) for entry in mblog_data] mblog_data = sorted(mblog_data, key=lambda entry: (-float(entry[0].get('updated', 0)))) @@ -326,9 +336,10 @@ # display navigation footer request.write("""<div class="footer">""") + request.write("""<div class="footer_content">""") if not display_single and after_tag: request.write(after_tag) - request.write("""</div>""") + request.write("""</div></div>""") request.write('</body></html>') request.finish()