[Move markdown editor and weblog admin code into their own files
clinton@unknownlamer.org**20090427180413
 Ignore-this: 5d30a1fc51de9f3b1344535b95d94e3a
] hunk ./beesknees.asd 21
+     (:file "markdown-editor" :depends-on ("packages" "web-common"))
hunk ./beesknees.asd 23
-     (:file "web-admin" :depends-on ("packages" "web-common"
-				     "admin-common" "image-manager"))
+     (:file "admin-weblog" :depends-on ("packages" "admin-common"
+					"markdown-editor"))
+     (:file "web-admin" :depends-on ("packages" "admin-common"
+				     "admin-weblog" "markdown-editor"
+				     "image-manager"))
addfile ./src/admin-weblog.lisp
hunk ./src/admin-weblog.lisp 1
+(in-package :beesknees.web)
+
+(define-html-form weblog-entry-editor (markdown-content-editor)
+  ((title (string-field :input-size 80
+			:validators (make-validators 'not-empty-validator))))
+  ((entry :initarg :entry :accessor edited-entry :initform nil))
+  (:default-initargs :field-order '(title content)))
+
+(defmethod initialize-instance :after ((editor weblog-entry-editor) &rest keys)
+  (declare (ignore keys))
+  (when-bind entry (edited-entry editor)
+    (with-slots (title content)
+	editor
+      (setf (value title)   (beesknees.weblog:entry-title entry)
+	    (value content) (beesknees.weblog:entry-body entry)))))
+
+(defaction process-form ((editor weblog-entry-editor))
+  (elephant:ensure-transaction ()
+    (let ((entry (or (edited-entry editor)
+		     (make-instance 'beesknees.weblog:weblog-entry
+				    :posted (get-universal-time)
+				    :author (session-user)))))
+      (with-slots (title content)
+	  editor
+	(setf (beesknees.weblog:entry-title entry) (value title)
+	      (beesknees.weblog:entry-body entry)  (value content)))
+      (answer entry))))
+
+(defcomponent weblog-entry-list (bee-admin-list)
+  ()
+  (:default-initargs
+   :index-class 'beesknees.weblog:weblog-entry
+   :index-slot 'beesknees.weblog::posted
+   :page-size 10
+   :reverse t))
+
+(defmethod golgonooza:render-query-view-result ((entry weblog-entry)
+						(list bee-admin-list))
+  (<:progn (<:format "~A by ~A: "
+		     (metatilities:date-and-time-string
+		      (entry-posted entry))
+		     (beesknees.auth:username (entry-author entry)))
+	   (<ucw:a :action (call 'weblog-entry-editor :entry entry)
+		   (<:ah (entry-title entry)))
+	   (<ucw:form :action (refresh-component list)
+		      :method "post"
+		      :style "display: inline;"
+		      (<ucw:submit :action (elephant:drop-instances (list entry))
+				   "Delete"))))
+
+(defmethod render :after ((self bee-admin-list))
+  ;; mark with css classes
+  (<:p :class "ranged-show-list-pager"
+       (<:format "Page ~D of ~D"
+		 (1+ (golgonooza:page-offset self))
+		 (1+ (golgonooza:page-count self)))
+       (<:as-html " ")
+       (if (golgonooza:have-previous-page-p self)
+	   (<ucw:a :action (golgonooza:scroll-backward self)
+		   (<:as-html "Previous"))
+	   (<:as-html "Previous"))
+       (<:as-html " ")
+       (if (golgonooza:have-next-page-p self)
+	   (<ucw:a :action (golgonooza:scroll-forward self)
+		   (<:as-html "Next"))
+	   (<:as-html "Next"))
+       (<:as-html " ")
+       (<ucw:a :action (golgonooza:scroll-start self)
+	       (<:as-html "First"))
+       (<:as-html " ")      
+       (<ucw:a :action (golgonooza:scroll-end self)
+	       (<:as-html "Last"))))
addfile ./src/markdown-editor.lisp
hunk ./src/markdown-editor.lisp 1
+(in-package :beesknees.web)
+
+(defcomponent markdown-preview (bee-widget)
+  ((text :initarg :text :reader text)))
+
+(defmethod render ((m markdown-preview))
+  (<:div
+   (cl-markdown:markdown (text m) :stream yaclml:*yaclml-stream* :format :html))
+  (<ucw:form :action (answer)
+	     (<ucw:submit :action (answer) :value "Ok")))
+
+(define-html-form markdown-content-editor ()
+  ((content (textarea-field :rows 30 :cols 80 :dom-id "content-editor")))
+  ())
+
+(defvar *last-image-upload* nil)
+
+(defmethod render :before ((e markdown-content-editor))
+  (with-slots (content) e
+    (<:fieldset
+     (<:legend "Markdown")
+     (<:script :src "static/js/jquery/ui/ui.core.js")
+     (<:script :src "static/js/jquery/ui/ui.draggable.js")
+     (<:script :src "static/js/jquery/ui/ui.droppable.js")
+     (<ucw:submit :value "Preview" :action (call 'markdown-preview
+						 :text (value content)))
+     (<ucw:submit
+      :value "Upload Image"
+      :action (setf *last-image-upload*
+		    (let ((path (call 'image-upload)))
+		      (format nil "~A.~A" (pathname-name path)
+			      (pathname-type path)))))
+     (<:a :href "http://daringfireball.net/projects/markdown/syntax"
+	  :target "_new"
+	  (<:as-html "Markdown Syntax Reference"))
+     (when *last-image-upload*
+       (<:p (<:img :id "last-image-upload"
+		   :class "droppable-image-link"
+		   :alt "last uploaded image"
+		   :style "max-width: 200px;"
+		   :title *last-image-upload*
+		   :src (format nil
+				"/static/img/uploaded/~A" *last-image-upload*))
+	    (<:ah "Drag the image into the document where you want to display it."))
+       (<ucw:script
+	`(.data (.draggable ($ "#last-image-upload")
+			    (ps:create :revert true))
+		"markdown-text"
+		,(format nil "{image ~S}" *last-image-upload*)))
+       (setf *last-image-upload* nil)))))
hunk ./src/web-admin.lisp 3
-(defcomponent markdown-preview (bee-widget)
-  ((text :initarg :text :reader text)))
-
-(defmethod render ((m markdown-preview))
-  (<:div
-   (cl-markdown:markdown (text m) :stream yaclml:*yaclml-stream* :format :html))
-  (<ucw:form :action (answer)
-	     (<ucw:submit :action (answer) :value "Ok")))
-
-(define-html-form markdown-content-editor ()
-  ((content (textarea-field :rows 30 :cols 80 :dom-id "content-editor")))
-  ())
-
-(defvar *last-image-upload* nil)
-
-(defmethod render :before ((e markdown-content-editor))
-  (with-slots (content) e
-    (<:fieldset
-     (<:legend "Markdown")
-     (<:script :src "static/js/jquery/ui/ui.core.js")
-     (<:script :src "static/js/jquery/ui/ui.draggable.js")
-     (<:script :src "static/js/jquery/ui/ui.droppable.js")
-     (<ucw:submit :value "Preview" :action (call 'markdown-preview
-						 :text (value content)))
-     (<ucw:submit
-      :value "Upload Image"
-      :action (setf *last-image-upload*
-		    (let ((path (call 'image-upload)))
-		      (format nil "~A.~A" (pathname-name path)
-			      (pathname-type path)))))
-     (<:a :href "http://daringfireball.net/projects/markdown/syntax"
-	  :target "_new"
-	  (<:as-html "Markdown Syntax Reference"))
-     (when *last-image-upload*
-       (<:p (<:img :id "last-image-upload"
-		   :class "droppable-image-link"
-		   :alt "last uploaded image"
-		   :style "max-width: 200px;"
-		   :title *last-image-upload*
-		   :src (format nil
-				"/static/img/uploaded/~A" *last-image-upload*))
-	    (<:ah "Drag the image into the document where you want to display it."))
-       (<ucw:script
-	`(.data (.draggable ($ "#last-image-upload")
-			    (ps:create :revert true))
-		"markdown-text"
-		,(format nil "{image ~S}" *last-image-upload*)))
-       (setf *last-image-upload* nil)))))
-
-(define-html-form weblog-entry-editor (markdown-content-editor)
-  ((title (string-field :input-size 80
-			:validators (make-validators 'not-empty-validator))))
-  ((entry :initarg :entry :accessor edited-entry :initform nil))
-  (:default-initargs :field-order '(title content)))
-
-(defmethod initialize-instance :after ((editor weblog-entry-editor) &rest keys)
-  (declare (ignore keys))
-  (when-bind entry (edited-entry editor)
-    (with-slots (title content)
-	editor
-      (setf (value title)   (beesknees.weblog:entry-title entry)
-	    (value content) (beesknees.weblog:entry-body entry)))))
-
-(defaction process-form ((editor weblog-entry-editor))
-  (elephant:ensure-transaction ()
-    (let ((entry (or (edited-entry editor)
-		     (make-instance 'beesknees.weblog:weblog-entry
-				    :posted (get-universal-time)
-				    :author (session-user)))))
-      (with-slots (title content)
-	  editor
-	(setf (beesknees.weblog:entry-title entry) (value title)
-	      (beesknees.weblog:entry-body entry)  (value content)))
-      (answer entry))))
-
-(defcomponent weblog-entry-list (bee-admin-list)
-  ()
-  (:default-initargs
-   :index-class 'beesknees.weblog:weblog-entry
-   :index-slot 'beesknees.weblog::posted
-   :page-size 10
-   :reverse t))
-
-(defmethod golgonooza:render-query-view-result ((entry weblog-entry)
-						(list bee-admin-list))
-  (<:progn (<:format "~A by ~A: "
-		     (metatilities:date-and-time-string
-		      (entry-posted entry))
-		     (beesknees.auth:username (entry-author entry)))
-	   (<ucw:a :action (call 'weblog-entry-editor :entry entry)
-		   (<:ah (entry-title entry)))
-	   (<ucw:form :action (refresh-component list)
-		      :method "post"
-		      :style "display: inline;"
-		      (<ucw:submit :action (elephant:drop-instances (list entry))
-				   "Delete"))))
-
-(defmethod render :after ((self bee-admin-list))
-  ;; mark with css classes
-  (<:p :class "ranged-show-list-pager"
-       (<:format "Page ~D of ~D"
-		 (1+ (golgonooza:page-offset self))
-		 (1+ (golgonooza:page-count self)))
-       (<:as-html " ")
-       (if (golgonooza:have-previous-page-p self)
-	   (<ucw:a :action (golgonooza:scroll-backward self)
-		   (<:as-html "Previous"))
-	   (<:as-html "Previous"))
-       (<:as-html " ")
-       (if (golgonooza:have-next-page-p self)
-	   (<ucw:a :action (golgonooza:scroll-forward self)
-		   (<:as-html "Next"))
-	   (<:as-html "Next"))
-       (<:as-html " ")
-       (<ucw:a :action (golgonooza:scroll-start self)
-	       (<:as-html "First"))
-       (<:as-html " ")      
-       (<ucw:a :action (golgonooza:scroll-end self)
-	       (<:as-html "Last"))))
-