Changeset 3881

Timestamp:

09/10/08 17:36:40 (2 months ago)

Author:

hans

Message:

Consolidate all HTML into one template. Remove template names from URL.
Improve Javascript-less mode.

Files:

• trunk/projects/quickhoney/src (modified) (1 prop)
• trunk/projects/quickhoney/src/config.lisp (modified) (1 diff)
• trunk/projects/quickhoney/src/init.lisp (modified) (1 diff)
• trunk/projects/quickhoney/src/tags.lisp (modified) (6 diffs)
• trunk/projects/quickhoney/src/webserver.lisp (modified) (2 diffs)
• trunk/projects/quickhoney/website/static/frontpage.css (deleted)
• trunk/projects/quickhoney/website/static/image-browse.css (deleted)
• trunk/projects/quickhoney/website/static/index.css (modified) (3 diffs)
• trunk/projects/quickhoney/website/static/javascript.js (modified) (6 diffs)
• trunk/projects/quickhoney/website/templates/frontpage.xml (deleted)
• trunk/projects/quickhoney/website/templates/image-browse.xml (deleted)
• trunk/projects/quickhoney/website/templates/index.xml (modified) (1 diff)

trunk/projects/quickhoney/src/config.lisp

@@ -10 +10 @@
-(defparameter *website-directory* (probe-file (merge-pathnames #p"website/" *root-directory*)))
-
-0
+1

trunk/projects/quickhoney/src/init.lisp

@@ -32 +32 @@
-  (actor-start (make-instance 'cron-actor))
-  (publish-quickhoney)
+  (when (probe-file "site-config.lisp")
+    (format t "; loading site configuration file~%")
+    (let ((*package* (find-package :quickhoney.config)))
+      (load "site-config.lisp")))
-  (hunchentoot:start-server :port *webserver-port*))

trunk/projects/quickhoney/src/tags.lisp

@@ -11 +11 @@
-
-(defun image-url (image)
-image-browse/
+
-          (quickhoney-image-category image)
-          (quickhoney-image-subcategory image)
@@ -17 +17 @@
-
-(defun navigation (&key previous up next)
-
+
+
+
-         (when previous
-           (html ((:div :class "previous")
@@ -30 +32 @@
-(define-bknr-tag simple-image-browser ()
-  (tbnl:handle-if-modified-since (last-image-upload-timestamp))
-
+
+
-    (cond
-      (image-name
@@ -42 +45 @@
-              (next (cadr (member image images-in-category))))
-         (navigation :previous (and previous (image-url previous))
-image-browse/
+
-                                 (quickhoney-image-category image)
-                                 (quickhoney-image-subcategory image))
-                     :next (and next (image-url next)))
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      (subcategory
-image-browse/
+
-       (html
-        (:h1 (:princ #?"$(category) / $(subcategory)"))
@@ -79 +83 @@
-                              :key #'bknr.datastore:blob-timestamp))
-           (html
-image-browse/
+
-                  (:princ (bknr.images:store-image-name image)))))))))
-      (category
-image-browse
+
-       (html
-        (:h1 (:princ category))
@@ -88 +92 @@
-         (dolist (subcategory (subcategories-of (make-keyword-from-string category)))
-           (html
-image-browse/
+
-                 (:princ subcategory)))))))
-      (t
-
-
-
-
-
-
-
-
+
-
-(define-bknr-tag login-status ()

trunk/projects/quickhoney/src/webserver.lisp

@@ -38 +38 @@
-                                        ("/json-news-archive" json-news-archive-handler)
-                                        ("/json-news" json-news-handler)
-                                        ("/" template-handler
-                                         :default-template "frontpage"
-                                         :destination ,(namestring (merge-pathnames "templates/" *website-directory*))
-                                         :command-packages (("http://quickhoney.com/" . :quickhoney.tags)
-                                                            ("http://bknr.net/" . :bknr.web)))
-                                        user
-                                        images
@@ -51 +46 @@
-                                        ("/favicon.ico" file-handler
-                                         :destination ,(merge-pathnames #p"static/favicon.ico" *website-directory*)
-
+
+
+
+
+
+
+
-                 :admin-navigation '(("user" . "/user/")
-                                     ("images" . "/edit-images")

trunk/projects/quickhoney/website/static/index.css

@@ -7 +7 @@
-a:active { outline: none }
-a:focus { -moz-outline-style: none }
-
-#logo {
-        margin: 290px 0px 305px 105px;
-}
-
-.page {
@@ -328 +324 @@
-#cue {
-        position: absolute;
-visible
+hidden
-        left: 0px;
-        background-color: white;
@@ -617 +613 @@
-}
-
+#loading #logo {
+        margin: 0px 0px 80px 105px;
+}
+
+#loading p {
+        margin: 1em;
+}
+#loading div p {
+        margin: 2em;
+}
+
+/* styles for the image detail window */
+
-#loading h1 {
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/projects/quickhoney/website/static/javascript.js

@@ -252 +252 @@
-{
-    var color = pages[item.category] ? pages[item.category].link_color : '000000';
-
-
+
-    return DIV({ 'class': 'newsentry autonews news_' + item.category },
-link_dest
+{ href: '/#' + path, onclick: function () { jump_to(path) } }
-                 IMG({ src: "/image/" + encodeURI(item.name) + '/cutout-button,,' + color + ',98,98,0,' + item.category,
-                             width: 98, height: 98 })),
@@ -261 +260 @@
-                   H1(null, item.name),
-                   item.date, ' by ', item.owner, ' | ',
-link_dest
+{ href: '/' + path, onclick: function () { jump_to(path) } }
-                   BR(),
-                   item.description));
@@ -285 +284 @@
-                   H1(null, item.title),
-                   item.date, ' by ', item.owner, ' | ',
-#
+
-                   BR(),
-                   DIV({ 'class': 'item-text' }, item.text),
@@ -1118 +1117 @@
-}
-
-/* open the main browser window */
-
-function frontpage() {
-    var index_window = window.open('index', "index", "width=720,height=872,status=no,toolbar=no,menubar=no,resizable=no,scrollbars=yes");
-    index_window.focus();
-
-    return true;
-}
-
-/* main initialization routine */
-
@@ -1154 +1144 @@
-    loadJSONDoc('/json-news-archive/quickhoney').addCallbacks(initialize_news_archive, alert);
-
-
-
-
+
+
+
+
+
+
+
-
-    poll_path();
@@ -1203 +1197 @@
-    checkboxes[i].checked = b;
-  }
-}
-
-/* robot_check() redirects to the real system if the client is not a robot */
-
-function robot_check()
-{
-    document.location.href = document.location.href.replace(/\/image-browse.*/, "index#");
-}
-

trunk/projects/quickhoney/website/templates/index.xml

@@ -67 +67 @@
-
-    <div id="loading" class="page">
-
+
+
+
+
+
+
+
+
+
+
+
+
-    </div>
-