0
@@ -41,6 +41,7 @@ import datetime
0
 import string
0
 import re
0
 import os
0
+import cgi
0
 
0
 import logging
0
 
0
@@ -65,7 +66,7 @@ permalink_funcs = {
0
 }
0
 
0
 # Module methods to handle incoming data
0
-def get_datetime(time_string):
0
+def get_datetime(time_string = None):
0
     if time_string:
0
         return datetime.datetime.strptime(time_string, '%Y-%m-%d %H:%M:%S')
0
     return datetime.datetime.now()
0
@@ -93,6 +94,24 @@ def fill_optional_properties(obj, property_dict):
0
         if value and not key in obj.__dict__:
0
             setattr(obj, key, value)
0
 
0
+def process_article_edit(handler, permalink):
0
+    # For http PUT, the parameters are passed in URIencoded string in body
0
+    body = handler.request.body
0
+    params = cgi.parse_qs(body)
0
+    logging.debug(params)
0
+
0
+    article = db.Query(model.Article).filter('permalink =', permalink).get()
0
+    if 'title' in params:
0
+        article.title = params['title'][0]
0
+    if 'tags' in params:
0
+        article.tags = get_tags(params['tags'][0])
0
+    article.body = params['body'][0]
0
+    article.html = params['body'][0]
0
+    article.updated = get_datetime()
0
+    article.put()
0
+    restful.send_successful_response(handler, '/' + article.permalink)
0
+    view.invalidate_cache()
0
+
0
 def process_article_submission(handler, article_type):
0
     property_hash = restful.get_hash_from_request(handler.request, 
0
         ['title',
0
@@ -213,7 +232,7 @@ class ArticleHandler(restful.Controller):
0
         # Handle legacy aliases
0
         for alias in legacy_aliases.redirects:
0
             if path.lower() == alias.lower():
0
-                self.redirect('/' + legacy_aliases.redirects[alias])
0
+                self.redirect(legacy_aliases.redirects[alias])
0
                 return
0
 
0
         # Check legacy_id_mapping if it's provided
0
@@ -232,6 +251,11 @@ class ArticleHandler(restful.Controller):
0
 
0
         render_article(self, article)
0
 
0
+    @authorized.role("admin")
0
+    def put(self, path):
0
+        logging.debug("ArticleHandler#put")
0
+        process_article_edit(self, permalink = path)
0
+
0
     @authorized.role("user")
0
     def post(self, path):
0
         article = db.Query(model.Article).filter('permalink =', path).get()
0
@@ -283,8 +307,9 @@ class BlogEntryHandler(restful.Controller):
0
 
0
     @authorized.role("admin")
0
     def put(self, year, month, perm_stem):
0
+        permalink = year + '/' + month + '/' + perm_stem
0
         logging.debug("BlogEntryHandler#put")
0
-        process_article_submission(handler=self, article_type='blog entry')
0
+        process_article_edit(handler = self, permalink = permalink)
0
 
0
     @authorized.role("admin")
0
     def delete(self, year, month, perm_stem):

0
@@ -20,7 +20,7 @@ default_blog = {
0
     "master_atom_url": "/feeds/atom.xml",
0
     # You can override this default for each page through a handler's call to 
0
     #  view.ViewPage(cache_time=...)
0
-    "cache_time": 3600,
0
+    "cache_time": 0,
0
 
0
     # We allow a mapping from some old url pattern to the current query 
0
     #  using a regex's matched string.  (See PageHandler in blog.py)

0
@@ -25,30 +25,39 @@
0
 YAHOO.namespace("bloog");
0
 YAHOO.bloog.initAdmin = function() {
0
 
0
-    var forceUpdate = function(o) {
0
-        window.location = "/";
0
-    }
0
-    var showNewRTE = function(e, isArticle) {
0
+    var showRTE = function(e) {
0
         var hdr = $('div#myDialog div.hd');
0
-        if (isArticle) {
0
-            hdr.setContent('Submit Article');
0
-        } else {
0
-            hdr.setContent('Submit Blog Entry');
0
-            var today = new Date();
0
-            var month = today.getMonth() + 1;
0
-            var year = today.getFullYear();
0
-            document.getElementById("dlgForm").action = "/" + year + "/" + month;
0
-        }
0
-        YAHOO.bloog.myDialog.show();
0
-    }
0
-    var showEditRTE = function(e) {
0
-        if (this.id == 'editbtn') {
0
-            $('div#myDialog div.hd').setContent('Edit Article');
0
-            var article_body = document.getElementById("post-").innerHTML;
0
-            $('#body').setContent(article_body);
0
+        YAHOO.bloog.http = {};
0
+        switch (this.id) {
0
+            case 'newarticle':
0
+                hdr.setContent('Submit Article');
0
+                YAHOO.bloog.http.action = '/';
0
+                YAHOO.bloog.http.verb = 'POST';
0
+                YAHOO.bloog.editor.setEditorHTML('<p>Article goes here</p>');
0
+                break;
0
+            case 'newblog':
0
+                hdr.setContent('Submit Blog Entry');
0
+                var today = new Date();
0
+                var month = today.getMonth() + 1;
0
+                var year = today.getFullYear();
0
+                YAHOO.bloog.http.action = "/" + year + "/" + month;
0
+                YAHOO.bloog.http.verb = 'POST';
0
+                YAHOO.bloog.editor.setEditorHTML('<p>Blog entry goes here</p>');
0
+                break;
0
+            case 'editbtn':
0
+                hdr.setContent('Submit Edit');
0
+                YAHOO.bloog.http.action = '#';
0
+                YAHOO.bloog.http.verb = 'PUT';
0
+                // Parse the current article HTML into title, tags, and body.
0
+                var blog_title = document.getElementById("blogtitle").innerHTML;
0
+                var blog_body =  document.getElementById("blogbody").innerHTML;
0
+                //$('#title').setContent(blog_title);
0
+                YAHOO.bloog.editor.setEditorHTML(blog_body);
0
+                break;
0
         }
0
         YAHOO.bloog.myDialog.show();
0
     }
0
+
0
     var showDeleteDialog = function(e) {
0
         YAHOO.bloog.deleteDialog.show();
0
     }
0
@@ -56,8 +65,8 @@ YAHOO.bloog.initAdmin = function() {
0
     var handleSuccess = function(o) {
0
         var response = o.responseText;
0
         response = response.split("<!")[0];
0
-        // Redirect to this new URL
0
-        window.location = response;
0
+        // Redirect to this new URL -- For some reason this has problems in Safari
0
+        window.location.href = response;
0
     };
0
     var handleFailure = function(o) {
0
         alert("Submission failed: " + o.status);
0
@@ -65,15 +74,19 @@ YAHOO.bloog.initAdmin = function() {
0
     var handleCancel = function() {
0
         this.cancel();
0
     }
0
-    var handleNewSubmit = function() {
0
-        YAHOO.bloog.editor.saveHTML();
0
-        this.submit();
0
-    }
0
-    var handleEditSubmit = function() {
0
+    var handleSubmit = function() {
0
         YAHOO.bloog.editor.saveHTML();
0
-        var formObj = document.getElementById("dlgForm");
0
-        YAHOO.util.Connect.setForm(formObj);
0
-        var cObj = YAHOO.util.Connect.asyncRequest('PUT', formObj.action, {success: handleSuccess, failure: handleFailure})
0
+        var html = YAHOO.bloog.editor.get('element').value;
0
+        var title = YAHOO.util.Dom.get('title').value;
0
+        var tags = YAHOO.util.Dom.get('tags').value;
0
+        var postData = 'title=' + encodeURIComponent(title) + '&' +
0
+                        'tags=' + encodeURIComponent(tags) + '&' +
0
+                        'body=' + encodeURIComponent(html);
0
+        var cObj = YAHOO.util.Connect.asyncRequest(
0
+            YAHOO.bloog.http.verb, 
0
+            YAHOO.bloog.http.action, 
0
+            {success: handleSuccess, failure: handleFailure},
0
+            postData);
0
     }
0
     YAHOO.namespace("bloog");
0
     YAHOO.bloog.myDialog = new YAHOO.widget.Dialog(
0
@@ -83,10 +96,11 @@ YAHOO.bloog.initAdmin = function() {
0
             visible: false,
0
             modal: true,
0
             constraintoviewpoint: true,
0
-            buttons: [ { text: "Submit", handler: handleNewSubmit, 
0
+            buttons: [ { text: "Submit", handler: handleSubmit, 
0
                          isDefault:true },
0
                        { text: "Cancel", handler: handleCancel } ]
0
         });
0
+
0
     YAHOO.bloog.editor = new YAHOO.widget.Editor(
0
         'body', {
0
             height: '300px',
0
@@ -108,6 +122,13 @@ YAHOO.bloog.initAdmin = function() {
0
                                       failure: handleFailure };
0
     YAHOO.bloog.myDialog.render();
0
 
0
+    var handleDelete = function() {
0
+        var cObj = YAHOO.util.Connect.asyncRequest(
0
+            'DELETE',
0
+            '#', 
0
+            {success: handleSuccess, failure: handleFailure}
0
+        );
0
+    }
0
     YAHOO.bloog.deleteDialog = new YAHOO.widget.SimpleDialog(
0
         "confirmDlg", {
0
             width: "20em",
0
@@ -115,30 +136,20 @@ YAHOO.bloog.initAdmin = function() {
0
             fixedcenter: true,
0
             modal: true,
0
             visible: false,
0
-            draggable: false
0
+            draggable: false,
0
+            buttons: [ { text: "Delete!", handler: handleDelete },
0
+                       { text: "Cancel", 
0
+                         handler: function() { this.hide(); },
0
+                         isDefault: true } ]
0
         })
0
     YAHOO.bloog.deleteDialog.setHeader("Warning");
0
     YAHOO.bloog.deleteDialog.setBody("Are you sure you want to delete this post?");
0
 
0
-    var handleDelete = function() {
0
-        var cObj = YAHOO.util.Connect.asyncRequest(
0
-            'DELETE',
0
-            '#', 
0
-            {success: handleSuccess, failure: handleFailure}
0
-        );
0
-    }
0
-    var myButtons = [ { text: "Delete!", 
0
-                        handler: handleDelete },
0
-                      { text: "Cancel", 
0
-                        handler: function() { this.hide(); },
0
-                        isDefault: true }
0
-                    ];
0
-    YAHOO.bloog.deleteDialog.cfg.queueProperty("buttons", myButtons);
0
     YAHOO.bloog.deleteDialog.render(document.body);
0
     
0
-    YAHOO.util.Event.addListener("newarticle", "click", showNewRTE, true);
0
-    YAHOO.util.Event.addListener("newblog", "click", showNewRTE, false);
0
-    YAHOO.util.Event.addListener("editbtn", "click", showEditRTE);
0
+    YAHOO.util.Event.addListener("newarticle", "click", showRTE);
0
+    YAHOO.util.Event.addListener("newblog", "click", showRTE);
0
+    YAHOO.util.Event.addListener("editbtn", "click", showRTE);
0
     YAHOO.util.Event.addListener("deletebtn", "click", showDeleteDialog);
0
 }
0
 

0
@@ -303,6 +303,7 @@
0
         {% endif %}
0
 
0
         {% block ajax_search_api %}
0
+        {% if notdebugging %}
0
         <script type="text/javascript" src="http://www.google.com/jsapi?key=ABQIAAAArkJQygN7d9x7IYE-cqa7pxRplEICxsDn12H6XOoG8NhvPWEaehQp5DHoozVgJSYne7zLwa0go_ST_g">
0
         </script>
0
         <style type="text/css">
0
@@ -322,6 +323,7 @@
0
             }
0
             google.setOnLoadCallback(searchInitialize);
0
         </script>
0
+        {% endif %}
0
         {% endblock %}
0
     </body>
0
 </html>

0
@@ -3,9 +3,9 @@
0
     <div class="bd">
0
         <form id="dlgForm" name="dlgForm" method="post" action="#">
0
             <br />
0
-            <p><label for="title">Title:</label>&nbsp;<input type="text" name="title" size="50" /></p>
0
+            <p><label for="title">Title:</label>&nbsp;<input type="text" id="title" name="title" size="50" /></p>
0
             <p>
0
-                <label for="title">Tags:</label>&nbsp;<input type="text" name="tags" size="50" /><br />
0
+                <label for="title">Tags:</label>&nbsp;<input type="text" id="tags" name="tags" size="50" /><br />
0
                 <sup><em>Separate tags with commas</em></sup>
0
             </p>
0
             <textarea name="body" id="body" cols="50" rows="10">

0
@@ -7,7 +7,7 @@
0
 <div id="mainCol" class="fix"><a name="main"></a>
0
 {% endif %}
0
 {% if article %}
0
-    <div class="post" id="post-{{ article.id }}">
0
+    <div id="article" class="post">
0
         <div class="postMeta">
0
             {% if user_is_admin %}
0
             <span class="articlebtn"><a id="editbtn" href="#">Edit</a></span>
0
@@ -16,9 +16,9 @@
0
             <span class="date">{{ article.published.date }}</span>
0
             <span class="comments"><a href="/{{ article.permalink }}#comments">{{ article.num_comments|default:"0" }}</a></span>
0
         </div>
0
-        <h2><a href="/{{ article.permalink }}" title="{{ article.title }}">{{ article.title }}</a></h2>
0
-        <div class="entry">
0
-            <p>{{ article.html }}</p>
0
+        <h2><a id="blogtitle" href="/{{ article.permalink }}" title="{{ article.title }}">{{ article.title }}</a></h2>
0
+        <div id="blogbody" class="entry">
0
+            {{ article.html }}
0
         </div>
0
     </div>
0
     <div id="more_reading">