static/potlatch.css @@ -1,5 +1,6 @@ -8/27/08: adding demisauce support for non js comments, etc. +8/27/08: adding demisauce support for non js comments, (remote service capability) and memcached support for remote services +8/27/08: fixing bug that showed un-published items in rss feed. 5/18/08: adding anchor tags to show comments for index page with more than one item to go to detail page 5/18/08: added preview capability to blog posts so you don't have to publish to preview 5/18/08: pushed large set of changes to include Demisauce comments in Potlatch Blog CHANGELOG @@ -1,4 +1,4 @@ -import cgi, os +import cgi, os, logging from functools import wraps import wsgiref.handlers @@ -12,6 +12,8 @@ from google.appengine.ext import db from model import * from demisaucepy import cache, cfg +log = logging.getLogger(__name__) + def rebuild_cache(blog): """ Pre-Render's and cache's html in blog object. Everything @@ -128,21 +130,18 @@ class MainPage(BasePublicPage): #@printinfo def get(self,slug=None): entries = [] + showcomments = False if slug == None: entries = Entry.allpublished().fetch(10) else: entries = Entry.all().filter('slug', slug).fetch(1) + showcomments = True if not entries or len(entries) == 0: return self.error(404) - self.render('views/index.html',{'entries':entries,'slug':slug}) + self.render('views/index.html',{'entries':entries,'slug':slug,'showcomments':showcomments}) - def xget(self,slug=None): - for name in os.environ.keys(): - self.response.out.write("%s = %s<br />\n" % (name, os.environ[name])) - print 'aaron is here' - #ln -s ~/Dropbox/demisauce/demisaucepy/trunk/demisaucepy demisaucepy class PublicPage(BasePublicPage): def get(self,slug=None): @@ -152,14 +151,23 @@ class PublicPage(BasePublicPage): class ArchivePage(BasePublicPage): def get(self,monthyear=None): + showcomments = False entries = Entry.allpublished().filter('monthyear', monthyear) - self.render('views/index.html',{'entries':entries}) + if entries and entries.count(1000) == 1: + showcomments = True + + self.render('views/index.html',{'entries':entries,'showcomments':showcomments}) class TagPage(BasePublicPage): def get(self,tags=None): + showcomments = False entries = Entry.allpublished().filter("tags =", tags) - self.render('views/index.html',{'entries':entries}) + log.info('count = %s' % entries.count(1000)) + if entries and entries.count(10000) == 1: + showcomments = True + log.info('yup, should be showing comments') + self.render('views/index.html',{'entries':entries,'showcomments':showcomments}) class FeedHandler(BaseController): @@ -347,5 +355,8 @@ def main(): ],debug=True) wsgiref.handlers.CGIHandler().run(application) +template.register_template_library('demisaucepy.demidj.templatetags.demisaucetags') + + if __name__ == "__main__": main() \ No newline at end of file blog.py @@ -10,7 +10,7 @@ indexes: # automatically uploaded to the admin console when you next deploy # your application using appcfg.py. -# Used once in query history. +# Used 4 times in query history. - kind: Archive properties: - name: date @@ -22,14 +22,14 @@ indexes: - name: date direction: desc -# Used 4 times in query history. +# Used 13 times in query history. - kind: Entry properties: - name: entrytype - name: date direction: desc -# Unused in query history -- copied from input. +# Used 6 times in query history. - kind: Entry properties: - name: entrytype @@ -38,7 +38,7 @@ indexes: - name: date direction: desc -# Used 8 times in query history. +# Used 57 times in query history. - kind: Entry properties: - name: entrytype @@ -46,7 +46,7 @@ indexes: - name: date direction: desc -# Unused in query history -- copied from input. +# Used 24 times in query history. - kind: Entry properties: - name: entrytype index.yaml @@ -11,7 +11,7 @@ from demisaucepy import cfg -cfg.CFG['demisauce.apikey'] = '173726158347a26b3836d1c6c09e6c646461517a' +cfg.CFG['demisauce.apikey'] = 'a95c21ee8e64cb5ff585b5f9b761b39d7cb9a202' cfg.CFG['demisauce.url'] = 'http://localhost:4951' cfg.CFG['demisauce.appname'] = 'djangodemo' @@ -55,7 +55,7 @@ class Blog(db.Model): blogversion = db.StringProperty(multiline=False,default='1.15') layout = db.StringProperty(multiline=False,default='2cola',choices=[ '3cola', '3colb', '2cola','2colb']) - theme = db.StringProperty(multiline=False,default='freshpress.css') + theme = db.StringProperty(multiline=False,default='potlatch.css') area1 = db.TextProperty(default='') area2 = db.TextProperty(default='') area3 = db.TextProperty(default='') @@ -193,5 +193,4 @@ class Entry(BaseModel): ).filter("published =", True).order('-date') make_declarative(Entry.__dict__) -for attr in Entry.__dict__.keys(): - print 'attr %s, %s' % (attr,Entry.__dict__[attr]) + model.py @@ -8,16 +8,7 @@ Description: Inspired by WordPress 2.5 release "Brecker". View more <a href="htt This theme was designed and built by Hyder Jaffari of Weborithm Design Studio. */ -/* Layout.css */ -/*two equal 174px right columns -#leftsidebar {width: 174px;} -#rightsidebar {width: 174px;} -#content {width: 576px;margin: 0px 15px 0px 0px;} - */ -/*one right column right columns */ -#leftsidebar {width: 0px;} -#rightsidebar {width: 274px;} -#content {width: 665px;margin: 0px 0px 0px 0px;} + body {margin: 0px;padding: 0px;font: 0.9em Tahoma, Verdana, sans-serif;} .clear {padding: 0px;margin: 0px;clear: both;} @@ -50,35 +41,7 @@ img.alignleft {float: left;margin: 0px 10px 10px 0px;padding: 0px;border: 1px so .alignleft {float: left;padding: 0px;} .navigation {display: block;text-align: center;padding: 10px;font-size: 1em;} .video {text-align:center;margin: 0px;padding: 0px 0px 20px;} -#dashboard, #nav ul li a, .fcomments a, #content .post h2 {letter-spacing: 1px;} -#content h3, #comments h3 {margin: 10px;padding: 0px;border-bottom: 1px solid #e5e5e5;font: normal 1.4em Georgia, "Times New Roman", Times, serif;color: #333;} -#comments h3 {margin: 0px 0px 2px;padding:5px;background: #ccc;border-bottom: none;} -/* Other Theme Properties Ends */ - -/* Dashboard Area Starts */ -#dashboard {padding: 10px 0px;background: #464646;color: #cccccc;} -#dashboard .dash {width: 972px;margin: auto;text-align: right;} -/* Dashboard Area Ends */ - -/* Search Elements Starts */ -#searchtop {float: left;border:1px solid #333;} -#searchtop #s {font-size: 1em;padding: 2px 5px;color: #333;border: none;} -#searchform {margin: auto;text-align:center;padding: 0px 0px 10px;} -#searchform #s {border:1px solid #333;width: 166px;padding: 2px;margin: 0px 0px 5px;} -/* Search Elements Ends */ - -/* Header Elements Starts */ -#header {background: #e4f2fd;padding: 20px 0px;border-bottom: 1px solid #c6d9e9;} -.headings {width: 972px;margin: auto;} -#header h1 {font: normal 2em Georgia, "Times New Roman", Times, serif;color: #555555;margin: 0px;padding: 0px;float: left;} -#header h2 {float: right;padding: 9px 0px 0px;margin: 0px;color: #d54e21;font: normal 1.4em Georgia, "Times New Roman", Times, serif;} -/* Header Elements Ends */ - -/* Navigation Starts */ -#nav {padding: 0px;margin: 0px 0px 15px;border-bottom: 1px solid #dadada;} -#nav ul {list-style: none;margin: 10px auto;padding: 0px;width: 972px;} -#nav ul li {float: left;display: block;font-size: 1em;font-weight: bold;color: #2583ad;padding: 0px 20px 0px 0px;margin: 0px;} -/* Navigation Ends */ + /* Main Container Starts */ #container {padding: 0px 0px 20px;margin: 0px auto 0px;width: 972px;} @@ -120,8 +83,8 @@ img.alignleft {float: left;margin: 0px 10px 10px 0px;padding: 0px;border: 1px so #content .post blockquote p {margin: 0px;padding: 5px 5px 10px;font-size: 1.1em;line-height: 24px;} #content .quoteleft {width: 200px;float: left;padding: 5px 10px;background: #f2f2f2 url(images/quote.gif) no-repeat left top;text-indent: 30px;color: #000;margin: 10px 10px 0px 0px;} #content .quoteright {width: 200px;float: right;padding: 5px 10px;background: #f2f2f2 url(images/quote.gif) no-repeat left top;text-indent: 30px;color: #000;margin: 10px 0px 0px 10px;} -#content .commentmeta {font-size: 0.8em;font-weight: bold;text-align:right;border-bottom: 1px solid #ccc;margin: 0px 0px 25px;} -#content .commentmeta a {background: #fff;padding: 5px;top: 7px;position: relative;text-decoration: none;border: 1px solid #ccc;} +#content .commentmeta {font-size: 0.8em;font-weight: bold;text-alignx:right;border-bottom: 1px solid #ccc;margin: 0px 0px 25px;} +#content .commentmetax a {background: #fff;padding: 5px;top: 7px;position: relative;text-decoration: none;border: 1px solid #ccc;} /* Content Ends */ /* Left Sidebar Starts */ @@ -155,25 +118,7 @@ table#wp-calendar td {text-align: center;background: #e4f2fd;} /* Sidebar Tags Ends */ -/* Box Links, and action bar border: red 1px solid; */ -.boxlinks {font-size: 85%;} -.inlineboxlinks {padding: 1em;margin: 1em 0;clear: left;} -.actionbar {margin: 0px;clear: right; padding: 0px;font-size: 115%;display: block; width:100%;height:33px; } -.actionbar a {font-size: 123%;background:#fafafa;height:22px;} -.right {float: right;} -.boxlinks2 {font-size: 85%;margin-top:-24px; margin-right:-11px;background-color:#ffffff;} -.boxlinks2 a {border: 1px solid #235C9D;text-decoration: none;padding: 3px 5px;} -.boxlinks a, .boxlinks span {margin-top:2px; display: block;vertical-align: bottom; float: left;padding: 0.2em 0.5em;margin-right: 0.15em;} -.boxlinks span.current {border: 1px solid #235C9D;font-weight: bold;background: #235C9D;color: #fff;} -.boxlinks a {border: 1px solid #235C9D;text-decoration: none;} -.boxlinks a:hover {background:#E1ECF9;} -.boxlinks a.nextprev {font-weight: bold;} -.boxlinks span.nextprev {color: #666;} -.boxlinks span.nextprev {border: 1px solid #ddd;color: #999;} -ul.boxlink {list-style-type:none;} -div.boxlinks a.current {border-bottom: 1px solid #E1ECF9;;background:#E1ECF9; } -.tab-spacer{background:#E1ECF9;border:0px solid #8db2e3;border-top:0 none;height:2px;font-size:1px;line-height:1px;} -div.formbox {border:1px solid #8db2e3;margin-top:20px;} + /* code formatting for posts */ .code {color: #63FF00;background: #000;overflow: auto;font: normal 12px "bitstream vera sans mono", monaco "lucida console", "courier new", courier, serif;margin: 0.9em 0; padding: 8px;} @@ -197,24 +142,25 @@ div.formbox {border:1px solid #8db2e3;margin-top:20px;} /* ADMIN area */ .secondary {color:#999999;font-size: 80%;} #editable-post-name {background-color:#FFFBCC;} -/* Comments Starts */ + +/* comments marked for deletion #comments {margin: 0px;padding: 2px 0px;border-top: 1px solid #ccc;} #respond {margin: 2px 0px;border-bottom: 1px solid #ccc;border-top: 1px solid #ccc;background: #fff;} #respond h4 {margin: 2px 0px;font: normal 1.4em Georgia, "Times New Roman", Times, serif;color: #333;padding:5px;background: #ccc;} -/* Main Comment Elements */ + ol#commentlist {margin: 0px;padding: 10px 10px 10px 30px;border-top: 1px solid #ccc;} -ol#commentlist li { /* This is for the normal entry headings */ +ol#commentlist li { font-size: 0.8em;color: #515151;margin: 0px;padding: 10px;border: 1px solid #F0F0F0;border-bottom: none;} -ol#commentlist .entry { /* This is for the normal entry comments */ +ol#commentlist .entry { background: #fff;border: 1px solid #F0F0F0;margin: 0px 0px 20px;padding: 10px;} -ol#commentlist li.alternate { /* This is for the alternate entry headings */ +ol#commentlist li.alternate { margin: 0px;padding: 10px;border: 1px solid #CCC;border-bottom: none;background: #f9f9f9;} -ol#commentlist .alternate { /* This is for the alternate entry comments */ +ol#commentlist .alternate { border: 1px solid #ccc;margin: 0px 0px 20px;padding: 10px;background: #f9f9f9;} -ol#commentlist li.author { /* This is for the author entry headings */ +ol#commentlist li.author { margin: 0px;padding: 10px;border: 1px solid #CCC;border-bottom: none;} -ol#commentlist .author { /* This is for the author entry comments */ +ol#commentlist .author { border: 1px solid #ccc;margin: 0px 0px 20px;padding: 10px;background: #e4f2fd;} ol#commentlist .entry p, ol#commentlist .author p, ol#commentlist .alternate p { font-size: 0.9em;color: #333;padding: 0px;margin: 0px;line-height: 20px;} @@ -231,8 +177,31 @@ ol#commentlist li .avatar { border: 1px solid #ccc;padding: 2px;background: #fff #comment_form #submit:hover {border: 1px solid #333;background: #d54e21;color: #fff;} #comment_form input[type="text"]:focus { background: #ffffff;border: 1px solid #d54e21;} #comment_form textarea:focus {background: #fff;border: 1px solid #d54e21;} + +*/ /* Comments Ends */ + +/* Box Links, and action bar border: red 1px solid; */ +.boxlinks {font-size: 85%;} +.inlineboxlinks {padding: 1em;margin: 1em 0;clear: left;} +.actionbar {margin: 0px;clear: right; padding: 0px;font-size: 115%;display: block; width:100%;height:33px; } +.actionbar a {font-size: 123%;background:#fafafa;height:22px;} +.right {float: right;} +.boxlinks2 {font-size: 85%;margin-top:-24px; margin-right:-11px;background-color:#ffffff;} +.boxlinks2 a {border: 1px solid #235C9D;text-decoration: none;padding: 3px 5px;} +.boxlinks a, .boxlinks span {margin-top:2px; display: block;vertical-align: bottom; float: left;padding: 0.2em 0.5em;margin-right: 0.15em;} +.boxlinks span.current {border: 1px solid #235C9D;font-weight: bold;background: #235C9D;color: #fff;} +.boxlinks a {border: 1px solid #235C9D;text-decoration: none;} +.boxlinks a:hover {background:#E1ECF9;} +.boxlinks a.nextprev {font-weight: bold;} +.boxlinks span.nextprev {color: #666;} +.boxlinks span.nextprev {border: 1px solid #ddd;color: #999;} +ul.boxlink {list-style-type:none;} +div.boxlinks a.current {border-bottom: 1px solid #E1ECF9;;background:#E1ECF9; } +.tab-spacer{background:#E1ECF9;border:0px solid #8db2e3;border-top:0 none;height:2px;font-size:1px;line-height:1px;} +div.formbox {border:1px solid #8db2e3;margin-top:20px;} + /* Form elements */ /* Colors & Style */ static/freshpress.css @@ -3,12 +3,11 @@ {% block head_javascript %} {% endblock %} {% block topmenu %} -<ul> + <li class="page_item page-item-2"><a href="/" title="Home">Home</a></li> {{ blog.topmenu }} {% if current_userisadmin %} <li class="page_item page-item-2" style="float:right;"><a href="/admin/entry/list/post">Admin</a></li> {% endif %} - <div class="clear"></div> -</ul> + {% endblock %} \ No newline at end of file views/_base_public.html @@ -12,7 +12,7 @@ {% endblock %} {% block topmenu %} -<ul> + <li class="page_item page-item-2"><a href="/" title="Public">View Site</a></li> <li class="page_item page-item-2"><a href="/admin/entry/list/post" title="Write">Posts</a></li> <li class="page_item page-item-2"><a href="/admin/links/blogroll" title="Blogroll">Blogroll</a></li> <li class="page_item page-item-2"><a href="/admin/entry/list/page" title="Pages">Pages</a></li> @@ -20,7 +20,7 @@ <li class="page_item page-item-2" style="float:right;"><a href="{{ url }}" title="Admin">{{ url_linktext }}</a></li> <li class="page_item page-item-2" style="float:right;font-size:1em"><a href="#" id="dshelp" rel="facebox" title="help">feedback</a></li> <div class="clear"></div> -</ul> + <div id="hiddenmessage" style="" ></div> views/admin_base.html @@ -4,6 +4,7 @@ <title>{% block title %} {{ blog.title }}{% endblock %}</title> <meta name="generator" content="PotlatchBlog" /> <link rel="stylesheet" href="/static/{{ blog.theme }}" type="text/css" media="screen" /> + <link rel="stylesheet" href="/static/potlatch.css" type="text/css" media="screen" /> <link rel="alternate" type="application/atom+xml" title="{{ blog.title }}" href="{{ blog.feedurl }}" /> <script type="text/javascript" src="/static/jquery-1.2.6.min.js"></script> @@ -12,67 +13,55 @@ {% block head_javascript %}{% endblock %} </head> <body> +<div id="page-wrapper"> + <div id="header"> + <ul class="nav2"> + {% block topmenu %} - -<div id="dashboard"> - <div class="dash"> - <form method="get" id="searchtop" action="http://www.google.com/search"> - <input type="text" name="q" id="q" size="28" value="to search, type and hit enter" onblur="if (this.value == '') {this.value = 'to search, type and hit enter';}" onfocus="if (this.value == 'to search, type and hit enter') {this.value = '';}" /> - <input name="domains" type="hidden" value="{{ blog.baseurl }}"/> - <input name="sitesearch" type="hidden" value="{{ blog.baseurl }}"/> - </form> - <a href="{{ blog.feedurl }}" title="Subscribe to {{ blog.title }} RSS feed">Subscribe to my RSS feed <img src="/static/images/feed-icon-16x16.png" width="16" height="16" border="0" title="Subscribe to Blog's RSS feed" alt="RSS"/></a> + {% endblock %} + <li style="float:right;"> <a href="{{ blog.feedurl }}" title="Subscribe to {{ blog.title }} RSS feed" style="color:#F89939;">Subscribe<img src="/static/images/feed-icon-16x16.png" width="16" height="16" border="0" title="Subscribe to Blog's RSS feed" alt="RSS"/></a></li> + <li style="float:right;"> + <div style="margin-top:15px;"><form method="get" id="searchtop"action="http://www.google.com/search"> + <input type="text" name="q" id="q" size="24" value="to search, type and hit enter" onblur="if (this.value == '') {this.value = 'to search, type and hit enter';}" onfocus="if (this.value == 'to search, type and hit enter') {this.value = '';}" /> + <input name="domains" type="hidden" value="{{ blog.baseurl }}"/> + <input name="sitesearch" type="hidden" value="{{ blog.baseurl }}"/> + </form></div> + </li> +  + </ul> <div class="clear"></div> </div> -</div> - - - -<div id="header"> - <div class="headings"> - <h1><a href="/" >{{ blog.title }}</a></h1> - <h2>{{ blog.subtitle }}</h2> - <div class="clear"></div> - </div> -</div> - - - -<div id="nav"> - {% block topmenu %} - - {% endblock %} -  -</div> - - - -<div id="container"> -  + <div id="doc2" class="yui-t6"> + <div> +  + {% block featured %} + {% endblock %} +  + </div> + <div id="bd"> + <div id="yui-main"> + <div class="yui-b"> + {% block content %} + + {% endblock %} + </div> + </div> + {% block rightsidebar %} + <div id="rightsidebar" class="yui-b"> +  + <h1><a href="/" >{{ blog.title }}</a></h1> + {{ blog.sidebar }} + {% dsview "poll" "what-should-the-new-features-be" %} +  + </div> + {% endblock %} + </div> </div> - LeftSidebar Ends --> - -  - {% block featured %} - {% endblock %} -  - - {% block content %}{% endblock %} - - - {% block rightsidebar %} -  - {{ blog.sidebar }} -  - {% endblock %} - -<div class="clear"></div> +  </div> -  <div id="footer"> @@ -86,17 +75,15 @@ </div> <div class="footercalt"> + {% dsview "feedback" "badge" %} {{ blog.area3 }} + </div> <div class="clear"></div> </div> <div class="footerinner"> <div id="credits"> -  - <img src="/static/images/freshlogo.gif" alt="FreshPress Themes" title="visit www.freshpressthemes.com" width="85" height="29" border="0" /> - <span>Theme from: <a href="http://www.freshpressthemes.com" title="See more fresh themes" target="_blank">FreshPress Themes</a> {% now "Y" %}</span> -  </div> <div valign="bottom" align="center"> <a href="http://code.google.com/appengine/" > @@ -105,7 +92,7 @@ </div> </div> </div> - + {{ blog.analyticsjs }} </body> views/base.html @@ -38,26 +38,19 @@ {% block content %} -<h1>{{ section.title }}</h1> + <h1>{{ section.title }}</h1>  <div id="content"> {% for entry in entries %} -  - <div class="date">Posted: {{ entry.date|date:"F jS, Y " }}</div> - <h2><a href="/entry/{{ entry.slug }}" rel="bookmark" title="{{ entry.title }}">{{ entry.title }}</a> </h2> - <div class="meta"> - <ul> - <li>Written by <a href="#" title="Posts by #">{{ entry.author.nickname }}</a></li> -  - </ul> - </div> -  <div class="post" class="post-9"> + <h3><a href="/entry/{{ entry.slug }}" rel="bookmark" title="{{ entry.title }}">{{ entry.title }}</a> </h3> {{ entry.content }} </div> <div class="meta"> + <span class="post-author"><a href="#" title="Posts by #">{{ entry.author.nickname }}</a></span> + <span class="post-date">Posted: {{ entry.date|date:"F jS, Y " }}</span> {% if entry.tags %} tags: {% for tag in entry.tags %} @@ -67,11 +60,8 @@ </div> <div class="commentmeta"> - {{ entry.comments.views.summary }} - {% if entry.commentcount %} - <a href="#comments" title="Comment on Demiauce Comment System">{{ entry.commentcount }} comments</a> - {% else %} - <a href="/entry/{{ entry.slug }}#demisauce-comments" title="Comment on Demiauce Comment System">show comments</a> + {% if showcomments %} + {{ entry.comments.views.summary }} {% endif %} </div> views/index.html @@ -1,4 +1,4 @@ -<div id="rightsidebar"> + <h3>Recent Posts</h3> <ul> {% for entry in recententries %} @@ -23,4 +23,3 @@ <li><a href="{{ link.href }}">{{ link.linktext }}</a></li> {% endfor %} </ul> -</div> \ No newline at end of file views/sidebar.html b289ea8f3f111fb2f50bad4bae140bd5f12fefb7 Aaron Raddon araddon@yahoo.com http://github.com/araddon/potlatchblog/commit/909ae4d1b0637b0ad327f205b1fa56db9ed774f5 909ae4d1b0637b0ad327f205b1fa56db9ed774f5

2008-09-01T10:20:46-07:00

adding demisaucepy to, ui mods to new theme 49fa4dcda6287a5b741412598aa166db4034edc7 Aaron Raddon araddon@yahoo.com