markdown.py templates/comment.html @@ -78,16 +78,19 @@ class RadarAddAction(Handler): result = fetch("http://www.neontology.com/retweet.php", payload=form_data, method=POST) self.redirect("/myradars") -class RadarViewAction(Handler): +class RadarViewByIdAction(Handler): def get(self): id = self.request.get("id") radar = Radar.get_by_id(int(id)) if (not radar): self.respondWithText('Invalid Radar id') - else: - self.respondWithTemplate('radar-view.html', {"radar":radar}) + return + + comments = Comment.gql("WHERE radar = :1", radar) + + self.respondWithTemplate('radar-view.html', {"radar":radar, "comments": comments}) -class RdarViewAction(Handler): +class RadarViewByNumberAction(Handler): def get(self): number = self.request.get("number") radars = Radar.gql("WHERE number = :1", number).fetch(1) @@ -97,8 +100,11 @@ class RdarViewAction(Handler): radar = radars[0] if (not radar): self.respondWithText('Invalid Radar id') - else: - self.respondWithTemplate('radar-view.html', {"radar":radar}) + return + + comments = Comment.gql("WHERE radar = :1 AND is_reply_to = :2", radar, None) + + self.respondWithTemplate('radar-view.html', {"radar":radar, "comments": comments}) class RadarEditAction(Handler): def get(self): @@ -251,12 +257,15 @@ class APISecretAction(Handler): secret.put() self.respondWithDictionaryAsJSON({"name":name, "value":value}) + + + def main(): application = webapp.WSGIApplication([ ('/', IndexAction), ('/faq', FAQAction), - ('/radar', RadarViewAction), - ('/rdar', RdarViewAction), + ('/radar', RadarViewByIdAction), + ('/rdar', RadarViewByNumberAction), ('/myradars', RadarListAction), ('/myradars/add', RadarAddAction), ('/myradars/edit', RadarEditAction), main.py @@ -32,3 +32,28 @@ class Radar(db.Model): def put(self): self.modified = datetime.datetime.now() db.Model.put(self) + +class Comment(db.Model): + user = db.UserProperty() # App Engine user who wrote the comment + subject = db.StringProperty() + body = db.TextProperty() # as markdown + posted_at = db.DateTimeProperty() + radar = db.ReferenceProperty(Radar) + is_reply_to = db.SelfReferenceProperty() + + def put(self): + self.posted_at = datetime.datetime.now() + db.Model.put(self) + + def replies(self): + return Comment.gql("WHERE is_reply_to = :1", self) + + # I know this is a bad place to put it, but my only other idea is custom django template tags, and I just couldn't get those to work + def draw(self): + from google.appengine.ext.webapp import template + import os + directory = os.path.dirname(__file__) + path = os.path.join(directory, os.path.join('templates', "comment.html")) + + return template.render(path, {"comment": self}) + \ No newline at end of file models.py @@ -205,3 +205,37 @@ input:focus, textarea:focus { margin-right:0px; } +/* @group Comments */ +div.comments { + border-bottom: 1px solid #696773; +} +div.comment { + border-top: 2px solid #9a9eaf; + border-left: 1px solid #696773; + border-right: 1px solid #696773; +} +div.indent { + border-left: 4px solid #696773; +} +.comment > h3 { + font-size: 12pt; + padding-left: 0.5em; + background-color: #e8e8e8; +} +.comment > .by { + padding-left: 0.5em; + background-color: #dfdfdf; + border-bottom: 1px solid #bebacf; +} +.comment > .commentbody { + padding-left: 0.5em; + background-color: #dcdcdc; + padding-bottom: 1em; +} +.comment > .meta { + padding-left: 0.5em; + background-color: #dcdcdc; + font-size: 10pt; +} +/* @end */ + static/css/screen.css @@ -26,7 +26,19 @@ </pre> </div> </div> -<hr/> + + +<h2>Comments</h2> +<div class="comments"> + {% for comment in comments %} + {{ comment.draw }} + {% endfor %} +</div> + + +{% endblock %} + +{% block sidebar %} <p> <strong>Please note:</strong> Reports posted here will not necessarily be seen by Apple. @@ -34,6 +46,4 @@ All problems should be submitted at bugreport.apple.com before they are posted h Please only post information for Radars that you have filed yourself, and please do not include Apple confidential information in your posts. Thank you! </p> - -{% endblock %} - +{% endblock %} \ No newline at end of file templates/radar-view.html 32fbd34300cc7322eb8803cb2885890d6734fd4d Joachim Bengtsson joachimb@gmail.com http://github.com/timburks/openradar/commit/4404b1290db8ab4101d008e1d801b74086ad40b1 4404b1290db8ab4101d008e1d801b74086ad40b1 2008-11-18T10:56:20-08:00 2008-11-18T10:56:20-08:00 Comments basics 6d6f283800bbdb6071fa577063b1ddf6f4d18876 Joachim Bengtsson joachimb@gmail.com