static/images/icon_add.png static/images/icon_close.png static/images/icon_edit.png static/images/icon_help.png static/images/icon_help_big.png views/atom.xml @@ -1,4 +1,4 @@ -application: blog +application: aaronspotlatch version: 1 runtime: python api_version: 1 app.yaml @@ -121,6 +121,13 @@ class TagPage(BasePublicPage): self.render('views/index.html',{'entries':entries}) +class FeedHandler(BaseController): + def get(self,tags=None): + entries = Entry.all().filter('entrytype =','post').order('-date').fetch(10) + self.response.headers['Content-Type'] = 'application/atom+xml' + self.render('views/atom.xml',{'entries':entries}) + + class AdminConfig(BaseController): @requires_admin def get(self): @@ -130,6 +137,8 @@ class AdminConfig(BaseController): blogedit = blogedit[0] else: blogedit = Blog() + blogedit.save() + blogedit.initialsetup() self.render('views/setup.html',{'blogedit':blogedit,'blogclass':Blog}) def post(self): @@ -145,10 +154,11 @@ class AdminConfig(BaseController): blog.title = self.request.get('title') blog.subtitle = self.request.get('subtitle') blog.layout = self.request.get('layout') + blog.baseurl = self.request.get('baseurl') blog.area1 = self.request.get('area1') blog.area2 = self.request.get('area2') blog.area3 = self.request.get('area3') - blog.put() + blog.save() self.redirect('/admin/entry/list/post') @@ -167,7 +177,7 @@ class AdminEntry(BaseController): def post(self,entrytype='post',key=None): entry = None if key == None or key == '': - entry = Entry() + entry = Entry(blog=self.blog) entry.entrytype = self.request.get('entrytype') else: entry = db.get(db.Key(key)) @@ -178,7 +188,7 @@ class AdminEntry(BaseController): entry.content = self.request.get('content') entry.title = self.request.get('title') entry.slug = self.request.get('real_permalink') - self.tagswcommas = self.request.get('tags') + entry.tagswcommas = self.request.get('tags') entry.save() self.redirect('/admin/entry/list/%s' % entry.entrytype ) @@ -220,6 +230,7 @@ def main(): ('/admin/links/(.*)', AdminLinks), ('/admin/setup', AdminConfig), ('/tag/(.*)', TagPage), + ('/atom', FeedHandler), (r'/page/(.*)', PublicPage), (r'/entry/(.*)', MainPage), (r'/b/(.*)/(.*)', MainPage), blog.py @@ -10,13 +10,13 @@ indexes: # automatically uploaded to the admin console when you next deploy # your application using appcfg.py. -# Used 267 times in query history. +# Unused in query history -- copied from input. - kind: Entry properties: - name: date direction: desc -# Used 202 times in query history. +# Used 39 times in query history. - kind: Entry properties: - name: entrytype @@ -31,14 +31,14 @@ indexes: - name: date direction: desc -# Used 2 times in query history. +# Unused in query history -- copied from input. - kind: Entry properties: - name: entrytype= - name: date direction: desc -# Used 2 times in query history. +# Unused in query history -- copied from input. - kind: Entry properties: - name: tags index.yaml @@ -7,25 +7,36 @@ class Cache(db.Model): cachekey = db.StringProperty(multiline=False) content = db.TextProperty() -class Tag(db.Model): - author = db.UserProperty() - tag = db.StringProperty(multiline=False) - date = db.DateTimeProperty(auto_now_add=True) - class Blog(db.Model): owner = db.UserProperty() description = db.TextProperty() baseurl = db.StringProperty(multiline=False,default='http://yourapp.appspot.com') urlpath = db.StringProperty(multiline=False) - date = db.DateTimeProperty(auto_now_add=True) - tags = db.ListProperty(db.Category) title = db.StringProperty(multiline=False) subtitle = db.StringProperty(multiline=False) + entrycount = db.IntegerProperty(default=0) layout = db.StringProperty(multiline=False,default='2cola',choices=[ '3cola', '3colb', '2cola','2colb']) area1 = db.TextProperty(default='') area2 = db.TextProperty(default='') area3 = db.TextProperty(default='') + tags = db.TextProperty(default='{}') + + def save(self): + self.put() + + def initialsetup(self): + self.title = 'Your Blog Title' + self.subtitle = 'Your Blog Subtitle' + self.area1 = '<h3>Lower Left Title</h3>\nContent in lower left' + self.area2 = '<h3>Center Bottom Box</h3>\nContent in center footer' + self.area3 = '<h3>Right Footer</h3>\nContent in footer right' + + +class Tag(db.Model): + blog = db.ReferenceProperty(Blog) + tag = db.StringProperty(multiline=False) + tagcount = db.IntegerProperty(default=0) class Link(db.Model): blog = db.ReferenceProperty(Blog) @@ -35,6 +46,7 @@ class Link(db.Model): class Entry(db.Model): author = db.UserProperty() + blog = db.ReferenceProperty(Blog) content = db.TextProperty(default='') title = db.StringProperty(multiline=False,default='') date = db.DateTimeProperty(auto_now_add=True) @@ -42,14 +54,37 @@ class Entry(db.Model): slug = db.StringProperty(multiline=False,default='') entrytype = db.StringProperty(multiline=False,default='post',choices=[ 'post','page']) + commentcount = db.IntegerProperty(default=0) def get_tags(self): '''comma delimted list of tags''' return ','.join([tag for tag in self.tags]) + def set_tags(self, tags): - self.tags = [db.Category(tag.strip()) for tag in tags.split(',')] + if tags: + tagstemp = [db.Category(tag.strip()) for tag in tags.split(',')] + self.tagsnew = [tag for tag in tagstemp if not tag in self.tags] + self.tags = tagstemp + tagswcommas = property(get_tags,set_tags) def save(self): + """ + Use this instead of self.put(), as we do some other work here + """ #TODO for each tag ensure it has a tag + + # update # entry count if new + if not self.is_saved(): + self.blog.entrycount += 1 + self.blog.save() + #b = self.blog + #print b.tags + #for tag in self.tagsnew: + # if not b.tags.has_key(tag): + # b.tags.update({tag:1}) + # else: + # b.tags.update({tag:b.tags[tag]+1}) self.put() + + model.py @@ -83,7 +83,6 @@ img.alignleft {float: left;margin: 0px 10px 10px 0px;padding: 0px;border: 1px so /* Main Container Ends */ /* Featured Area Starts */ - #featured {line-height: normal;width: 966px;border: 1px solid #2583ad;margin: 0px 0px 15px;padding: 2px;} #featured h2 {background: #d54e21;padding: 10px;margin: 0px;text-align: left;font: bold 1.4em Georgia, "Times New Roman", Times, serif;} #featured h2 span {padding: 0px;width: 800px;float: left;} @@ -136,7 +135,6 @@ img.alignleft {float: left;margin: 0px 10px 10px 0px;padding: 0px;border: 1px so /* Right Sidebar Ends */ /* Sidebar Calendar Starts */ - #calendar_wrap {margin: 0px;padding: 0px 0px 10px;} #wp-calendar {width: 174px;} #today {text-align: center;background: #C4E2FB!important;} @@ -154,6 +152,30 @@ table#wp-calendar td {text-align: center;background: #e4f2fd;} .textwidget, .adrotatorwidget {margin: 0px;padding: 0px 0px 10px;} /* 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;} + /* Footer Starts */ #footer {background: #464646;padding: 0px;margin: 0px;} static/style.css @@ -55,38 +55,9 @@ </script> {% endif %} {% for entry in entries %} - <h2><a href="/admin/entry/{{ entry.entrytype }}/{{ entry.key }}" rel="bookmark" title="{{ entry.title }}">{{ entry.title }}</a> type={{ entry.entrytype }}</h2> + <h2><a href="/admin/entry/{{ entry.entrytype }}/{{ entry.key }}" rel="bookmark" title="{{ entry.title }}">{{ entry.title }}</a> </h2> {% endfor %} </div>  {% endblock %} -{% block rightsidebar %} - -<div id="rightsidebar"> - <h3>ADMIN</h3> - <ul> - {% for entry in recententries %} - <li><a href="#">{{ entry.title }} type={{ entry.entrytype }}</a></li> - {% endfor %} - </ul> - <h3>Tag Cloud</h3> - <ul> - tags - </ul> - <h3>Archives</h3> - <ul> - archives - </ul> - <h3>Blogs I Read</h3> - <ul> - <li><a href="http://cccarey.wordpress.com">Christian's</a></li> - <li><a href="http://www.carlosgabaldon.com">Carlos Gabaldon</a></li> - </ul> - <h3>Site Admin</h3> - <ul> - <li><a href="/admin/entry/list/post">Admin Logon</a></li> - </ul> -</div> - -{% endblock %} \ No newline at end of file views/admin.html @@ -7,7 +7,7 @@ <script type="text/javascript" src="/static/ui.draggable.js"></script> <script type="text/javascript" src="/static/ui.sortable.js"></script> <script type="text/javascript" src="/static/jquery.form.js"></script> -<script type="text/javascript" src="/static/jquery-uixx.min.js"></script> + <script type="text/javascript" src="/static/admin.js"></script> {% endblock %} @@ -16,10 +16,46 @@ <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> - <li class="page_item page-item-2"><a href="/admin/setup" title="About">configuration</a></li> + <li class="page_item page-item-2"><a href="/admin/setup" title="About">Configuration</a></li> <li class="page_item page-item-2" style="float:right;"><a href="{{ url }}" title="About">{{ url_linktext }}</a></li> <div class="clear"></div> </ul> <span id="hiddenmessage" style="visibilityx:hidden;displayx:none;margin:0 40 0 0;" ></span> {% endblock %} + +{% block rightsidebar %} + +<div id="rightsidebar"> + <h3>ADMIN</h3> + <ul> + {% for entry in recententries %} + <li><a href="#">{{ entry.title }} type={{ entry.entrytype }}</a></li> + {% endfor %} + </ul> + <div class="actionbar" style="heightxx:34px; "> + <div class="boxlinks" style="margin-top:-4px;"> + <ul class="boxlink"> + <li style="list-style-type:none;"><a href="/admin/entry/post" id="addpost" objid=""> + <img alt="Add New Post" src="/static/images/icon_add.png" style="vertical-align: bottom;" border="0" /> + Add New Post</a></li> + </ul> + </div> + </div> + <div class="actionbar" style="heightxx:34px; "> + <div class="boxlinks" style="margin-top:-4px;"> + <ul> + <li style="list-style-type:none;"><a href="/admin/entry/page" id="addpage" objid=""> + <img alt="Add New Page" src="/static/images/icon_add.png" style="vertical-align: bottom;" border="0" /> + Add New Page</a></li> + </ul> + </div> + </div> + <br /> + <h3>Site Admin</h3> + <ul> + <li><a href="/admin/entry/list/post">Admin Logon</a></li> + </ul> +</div> + +{% endblock %} views/admin_base.html @@ -2,9 +2,9 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head profile="http://gmpg.org/xfn/11"> <title>{% block title %} {{ blog.title }}{% endblock %}</title> - <meta name="generator" content="GAEBlog" /> + <meta name="generator" content="PotlatchBlog" /> <link rel="stylesheet" href="/static/style.css" type="text/css" media="screen" /> - <link rel="alternate" type="application/rss+xml" title="{{ blog.title }}" href="/rss" /> + <link rel="alternate" type="application/rss+atom" title="{{ blog.title }}" href="/atom" /> <link rel="pingback" href="/pingback" /> {% block head_javascript %}{% endblock %} </head> @@ -18,7 +18,7 @@ <input name="domains" type="hidden" value="{{ blog.baseurl }}"/> <input name="sitesearch" type="hidden" value="{{ blog.baseurl }}"/> </form> - <a href="/rss" 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> + <a href="/atom" 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> <div class="clear"></div> </div> </div> views/base.html @@ -49,27 +49,31 @@ <div class="meta"> <ul> <li>Written by <a href="#" title="Posts by #">{{ entry.author.nickname }}</a></li> - <li><a href="#comments" title="Read what people are saying">Read the comments</a></li> +  </ul> </div>  <div class="post" class="post-9"> - {{ entry.content|escape }} + {{ entry.content }} </div> <div class="meta"> tags: {% for tag in entry.tags %} - <a href="/entry/tags/{{ tag }}" title="View all posts in #" rel="category tag">{{ tag }}</a>, + <a href="/tag/{{ tag }}" title="View all posts in #" rel="category tag">{{ tag }}</a>{% if not forloop.last %},{% endif %} {% endfor %} </div> <div class="commentmeta"> - <a href="#comments" title="Comment on Demiauce Comment System">3 people commented already</a> + {% if entry.commentcount %} + <a href="#comments" title="Comment on Demiauce Comment System">{{ entry.commentcount }} comments</a> + {% else %} + + {% endif %} + </div>  {% endfor %} - NAVIGATION.php </div>  {% endblock %} \ No newline at end of file views/index.html @@ -51,33 +51,3 @@ </div>  {% endblock %} - -{% block rightsidebar %} - -<div id="rightsidebar"> - <h3>ADMIN</h3> - <ul> - {% for entry in recententries %} - <li><a href="#">{{ entry.title }} type={{ entry.entrytype }}</a></li> - {% endfor %} - </ul> - <h3>Tag Cloud</h3> - <ul> - tags - </ul> - <h3>Archives</h3> - <ul> - archives - </ul> - <h3>Blogs I Read</h3> - <ul> - <li><a href="http://cccarey.wordpress.com">Christian's</a></li> - <li><a href="http://www.carlosgabaldon.com">Carlos Gabaldon</a></li> - </ul> - <h3>Site Admin</h3> - <ul> - <li><a href="/admin/entry/list/post">Admin Logon</a></li> - </ul> -</div> - -{% endblock %} \ No newline at end of file views/linkadmin.html @@ -1,5 +1,13 @@ {% extends "_base_public.html" %} +{% block title %} +{% if entries %} + {% for entry in entries %} + {{ entry.title }} + {% endfor %} on +{% endif %} +{{ blog.title }} +{% endblock %} {% block content %} <h1>{{ section.title }}</h1> @@ -13,7 +21,7 @@  <div class="post" class="post-9"> - {{ entry.content|escape }} + {{ entry.content }} </div>  {% endfor %} views/page.html @@ -52,15 +52,15 @@ </fieldset> </div> <div class="optional"> - <label for="area1">Description:</label> + <label for="area1">Footer1:</label> <textarea name="area1" rows="4" cols="60" class="wide">{{ blogedit.area1 }}</textarea> </div> <div class="optional"> - <label for="area2">Description:</label> + <label for="area2">Footer2:</label> <textarea name="area2" rows="4" cols="60" class="wide">{{ blogedit.area2 }}</textarea> </div> <div class="optional"> - <label for="area3">Description:</label> + <label for="area3">Footer3:</label> <textarea name="area3" rows="4" cols="60" class="wide">{{ blogedit.area3 }}</textarea> </div> </fieldset> views/setup.html a087228a372b690d1c0985c766dec2aa77a692f0 Aaron Raddon aeraddon@Macintosh-6.local http://github.com/araddon/potlatchblog/commit/a100c64b422a69f4f81556e9b038f9af3f6a4dcf a100c64b422a69f4f81556e9b038f9af3f6a4dcf

2008-05-10T14:26:20-07:00

adding atom xml and other cleanups 07b0054954f795f4e6cef532da73d6028bee4404 Aaron Raddon aeraddon@Macintosh-6.local