[bknr-cvs] r1963 - in branches/xml-class-rework/projects/quickhoney: src website/static website/templates
bknr at bknr.net
bknr at bknr.net
Sun Jul 16 08:54:31 UTC 2006
Author: hhubner
Date: 2006-07-16 04:54:30 -0400 (Sun, 16 Jul 2006)
New Revision: 1963
Added:
branches/xml-class-rework/projects/quickhoney/website/templates/frontpage.xml
branches/xml-class-rework/projects/quickhoney/website/templates/image-detail.xml
branches/xml-class-rework/projects/quickhoney/website/templates/index.xml
branches/xml-class-rework/projects/quickhoney/website/templates/user-error.xml
Removed:
branches/xml-class-rework/projects/quickhoney/website/templates/frontpage.bknr
branches/xml-class-rework/projects/quickhoney/website/templates/image-detail.bknr
branches/xml-class-rework/projects/quickhoney/website/templates/index.bknr
branches/xml-class-rework/projects/quickhoney/website/templates/user-error.bknr
Modified:
branches/xml-class-rework/projects/quickhoney/src/handlers.lisp
branches/xml-class-rework/projects/quickhoney/src/image.lisp
branches/xml-class-rework/projects/quickhoney/src/load.lisp
branches/xml-class-rework/projects/quickhoney/src/webserver.lisp
branches/xml-class-rework/projects/quickhoney/website/static/javascript.js
branches/xml-class-rework/projects/quickhoney/website/static/styles.css
Log:
Convert to current development tree, support more animation types.
Modified: branches/xml-class-rework/projects/quickhoney/src/handlers.lisp
===================================================================
--- branches/xml-class-rework/projects/quickhoney/src/handlers.lisp 2006-07-12 09:06:31 UTC (rev 1962)
+++ branches/xml-class-rework/projects/quickhoney/src/handlers.lisp 2006-07-16 08:54:30 UTC (rev 1963)
@@ -194,15 +194,19 @@
(defmethod handle ((handler upload-animation-handler) req)
(with-query-params (req client)
- (let ((uploaded-image-file (cdr (find "image-file" (request-uploaded-files req) :test #'equal :key #'car)))
- (uploaded-animation-file (cdr (find "animation-file" (request-uploaded-files req) :test #'equal :key #'car))))
+ (let* ((uploaded-files (request-uploaded-files req :all-info t))
+ (uploaded-image (find "image-file" uploaded-files :test #'equal :key #'upload-name))
+ (uploaded-animation (find "animation-file" uploaded-files :test #'equal :key #'upload-name)))
(handler-case
(progn
- (unless (and uploaded-image-file uploaded-animation-file)
+ (unless (and uploaded-image uploaded-animation)
(error "files not uploaded"))
- (cl-gd:with-image-from-file* (uploaded-image-file)
- (let* ((animation-blob (make-blob-from-file uploaded-animation-file 'blob))
- (image (make-store-image :name (pathname-name uploaded-image-file)
+ (unless (find (upload-content-type uploaded-animation) '("application/x-shockwave-flash") :test #'equal)
+ (error "Invalid content type, only Flash animations are accepted"))
+ (cl-gd:with-image-from-file* ((upload-pathname uploaded-image))
+ (let* ((animation-blob (make-blob-from-file (upload-pathname uploaded-animation) 'blob
+ :type (upload-content-type uploaded-animation)))
+ (image (make-store-image :name (pathname-name (upload-pathname uploaded-image))
:class-name 'quickhoney-animation-image
:keywords (list :upload :pixel :animation)
:initargs `(:client ,client :animation ,animation-blob))))
@@ -226,7 +230,7 @@
(:body
(:h2 "Error during upload")
(:p "Error during upload:")
- (:pre (:princ-safe e))
+ (:p (:princ-safe (apply #'format nil (simple-condition-format-control e) (simple-condition-format-arguments e))))
(:p ((:a :href "javascript:window.close()") "ok"))))))))))))
(defclass upload-button-handler (admin-only-handler page-handler)
Modified: branches/xml-class-rework/projects/quickhoney/src/image.lisp
===================================================================
--- branches/xml-class-rework/projects/quickhoney/src/image.lisp 2006-07-12 09:06:31 UTC (rev 1962)
+++ branches/xml-class-rework/projects/quickhoney/src/image.lisp 2006-07-16 08:54:30 UTC (rev 1963)
@@ -21,4 +21,7 @@
(get-keywords-intersection-store-images '(:import))))
(define-persistent-class quickhoney-animation-image (quickhoney-image)
- ((animation :update)))
\ No newline at end of file
+ ((animation :update)))
+
+(defmethod destroy-object :before ((image quickhoney-animation-image))
+ (delete-object (quickhoney-animation-image-animation image)))
\ No newline at end of file
Modified: branches/xml-class-rework/projects/quickhoney/src/load.lisp
===================================================================
--- branches/xml-class-rework/projects/quickhoney/src/load.lisp 2006-07-12 09:06:31 UTC (rev 1962)
+++ branches/xml-class-rework/projects/quickhoney/src/load.lisp 2006-07-16 08:54:30 UTC (rev 1963)
@@ -1,5 +1,8 @@
(push :cl-gd-gif *features*)
(asdf:oos 'asdf:load-op :quickhoney)
+(asdf:oos 'asdf:load-op :swank)
+(swank::create-swank-server 4085 :spawn #'swank::simple-announce-function t)
+
(mp::startup-idle-and-top-level-loops)
Modified: branches/xml-class-rework/projects/quickhoney/src/webserver.lisp
===================================================================
--- branches/xml-class-rework/projects/quickhoney/src/webserver.lisp 2006-07-12 09:06:31 UTC (rev 1962)
+++ branches/xml-class-rework/projects/quickhoney/src/webserver.lisp 2006-07-16 08:54:30 UTC (rev 1963)
@@ -10,6 +10,7 @@
(unpublish :all t)
+ (setf bknr.web::*upload-file-size-limit* (* 30 1024 1024))
(make-instance 'website
:name "Quickhoney CMS"
:handler-definitions `(("/random-image" random-image-handler)
Modified: branches/xml-class-rework/projects/quickhoney/website/static/javascript.js
===================================================================
--- branches/xml-class-rework/projects/quickhoney/website/static/javascript.js 2006-07-12 09:06:31 UTC (rev 1962)
+++ branches/xml-class-rework/projects/quickhoney/website/static/javascript.js 2006-07-16 08:54:30 UTC (rev 1963)
@@ -6,7 +6,7 @@
directory_button['pixel'] = ['birdview', 'parts', 'icons', 'editorial', 'animation', 'smallworld'];
directory_button['vector'] = ['portraits', 'celebrities', 'blackwhite', 'icons', 'editorial', 'nudes'];
-directory_button['photo'] = ['browseall', 'city', 'landscape', 'shopping', 'food', 'special'];
+directory_button['photo'] = ['browseall', 't-shirt', 'landscape', 'shopping', 'food', 'special'];
/* safari global variable - used to trigger some compatibility hacks */
@@ -527,17 +527,17 @@
document.getElementById("path").innerHTML = path_links.join(" / ");
}
-/* home image - called from homeimage.onload */
+/* home image */
function home_loaded(image) {
debug('home_loaded - image is ' + image + ' width: ' + image.width);
- image.style.left = (36 + (648 - image.width) / 2) + 'px';
- image.style.top = (114 + (648 - image.height) / 2) + 'px';
-
reveal_image(image);
+ document.getElementById("homeimage").style.left = (36 + (648 - image.width) / 2) + 'px';
+ document.getElementById("homeimage").style.top = (114 + (648 - image.height) / 2) + 'px';
+
if (logged_in) {
var current_home_image = image.src.substring(image.src.indexOf('/image/') + 7);
if (current_home_image != 'trans') {
@@ -876,6 +876,17 @@
detail_window.focus();
}
+/* nice_jobs() is a special form of a subdirectory which does not have a parent directory */
+
+function nice_jobs() {
+
+ document.getElementById("clients").style.visibility = 'hidden';
+
+ current_directory = 'clients';
+ current_image = null;
+ subdirectory('nicejobs');
+}
+
/* Used from image-detail to load the current image */
function load_image() {
@@ -953,7 +964,7 @@
document.getElementById("debugger").style.visibility = 'visible';
document.getElementById("debugger").style.left = '730px';
document.getElementById("debugger").style.width = '400px';
- document.getElementById("debugger").style.height = '640px';
+ document.getElementById("debugger").style.heigth = '640px';
} else {
document.getElementById("debugger").style.left = "1px";
document.getElementById("debugger").style.right = "1px";
Modified: branches/xml-class-rework/projects/quickhoney/website/static/styles.css
===================================================================
--- branches/xml-class-rework/projects/quickhoney/website/static/styles.css 2006-07-12 09:06:31 UTC (rev 1962)
+++ branches/xml-class-rework/projects/quickhoney/website/static/styles.css 2006-07-16 08:54:30 UTC (rev 1963)
@@ -5,6 +5,11 @@
background-color: #ffffff;
}
+#hidden-vcard {
+ visibility: hidden;
+ height: 0px;
+}
+
/* cms styles */
h1 {
Deleted: branches/xml-class-rework/projects/quickhoney/website/templates/frontpage.bknr
===================================================================
--- branches/xml-class-rework/projects/quickhoney/website/templates/frontpage.bknr 2006-07-12 09:06:31 UTC (rev 1962)
+++ branches/xml-class-rework/projects/quickhoney/website/templates/frontpage.bknr 2006-07-16 08:54:30 UTC (rev 1963)
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:bknr="http://bknr.net"
- xmlns:quickhoney="http://quickhoney.com"
- >
- <head>
- <link rel="stylesheet" href="/static/styles.css" />
- <script src="/static/javascript.js" type="text/javascript"><!-- x -->
- </script>
- <title>QuickHoney</title>
- </head>
-
- <body id="quickhoney">
-
- <table border="0" width="100%">
- <tr height="200">
- <td height="200" colspan="2">
- <img src="/image/trans" />
- </td>
- </tr>
- <tr>
- <td align="center">
- <a href="#" onclick="frontpage()">
- <img border="0" src="/image/Startscreen" width="438" height="67" />
- </a>
- </td>
- </tr>
- <tr>
- <td align="center">
- <a href="#" onclick="frontpage()">
- <img border="0" src="/image/EnterSite" width="116" height="18" />
- <img border="0" src="/image/trans" width="70" height="1"/>
- </a>
- </td>
- </tr>
- <tr height="200">
- <td height="200">
- <img src="/image/trans" />
- </td>
- </tr>
- </table>
- <br />
- <div align="center">
- Site requires Firefox, Safari or Internet Explorer and Javascript.
- </div>
- </body>
-</html>
Copied: branches/xml-class-rework/projects/quickhoney/website/templates/frontpage.xml (from rev 1962, branches/xml-class-rework/projects/quickhoney/website/templates/frontpage.bknr)
===================================================================
--- branches/xml-class-rework/projects/quickhoney/website/templates/frontpage.bknr 2006-07-12 09:06:31 UTC (rev 1962)
+++ branches/xml-class-rework/projects/quickhoney/website/templates/frontpage.xml 2006-07-16 08:54:30 UTC (rev 1963)
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:bknr="http://bknr.net"
+ xmlns:quickhoney="http://quickhoney.com"
+ >
+ <head>
+ <link rel="stylesheet" href="/static/styles.css" />
+ <script src="/static/javascript.js" type="text/javascript"><!-- x -->
+ </script>
+ <title>QuickHoney - Nana Rausch + Peter Stemmler</title>
+ </head>
+
+ <body id="quickhoney">
+ <div id="hidden-vcard">
+ <h1>QuickHoney Illustrations</h1><br />
+ <h1>Peter Stemmler</h1>Phone: 646.270.5562<br />
+ <h1>Nana Rausch</h1>Phone 646.270.5592<br />
+ Studio for Illustration, New York, Portfolio, Email<br />
+ </div>
+
+ <table border="0" width="100%">
+ <tr height="200">
+ <td height="200" colspan="2">
+ <img src="/image/trans" />
+ </td>
+ </tr>
+ <tr>
+ <td align="center">
+ <a href="#" onclick="frontpage()">
+ <img border="0" src="/image/Startscreen" width="438" height="67" />
+ </a>
+ </td>
+ </tr>
+ <tr>
+ <td align="center">
+ <a href="#" onclick="frontpage()">
+ <img border="0" src="/image/EnterSite" width="116" height="18" />
+ <img border="0" src="/image/trans" width="70" height="1"/>
+ </a>
+ </td>
+ </tr>
+ <tr height="200">
+ <td height="200">
+ <img src="/image/trans" />
+ </td>
+ </tr>
+ </table>
+ <br />
+ <div align="center">
+ Site requires Firefox, Safari or Internet Explorer and Javascript.
+ </div>
+ </body>
+</html>
Deleted: branches/xml-class-rework/projects/quickhoney/website/templates/image-detail.bknr
===================================================================
--- branches/xml-class-rework/projects/quickhoney/website/templates/image-detail.bknr 2006-07-12 09:06:31 UTC (rev 1962)
+++ branches/xml-class-rework/projects/quickhoney/website/templates/image-detail.bknr 2006-07-16 08:54:30 UTC (rev 1963)
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:bknr="http://bknr.net"
- >
- <head>
- <link rel="stylesheet" href="/static/styles.css" />
- <script src="/static/javascript.js" type="text/javascript"><!-- x -->
- </script>
- <title>QuickHoney image</title>
- </head>
- <body id="imagedetail">
- <div id="logo">
- <a href="javascript:window.close()">
- <img src="/image/quickhoney" id="the_logo" name="logo" border="0" />
- </a>
- </div>
-
- <div id="image">
- <a href="javascript:window.close()">
- <img src="/image/trans" id="the_image" name="image" border="0" />
- </a>
- </div>
- </body>
- <script language="javascript">
- load_image();
- </script>
-</html>
\ No newline at end of file
Copied: branches/xml-class-rework/projects/quickhoney/website/templates/image-detail.xml (from rev 1962, branches/xml-class-rework/projects/quickhoney/website/templates/image-detail.bknr)
Deleted: branches/xml-class-rework/projects/quickhoney/website/templates/index.bknr
===================================================================
--- branches/xml-class-rework/projects/quickhoney/website/templates/index.bknr 2006-07-12 09:06:31 UTC (rev 1962)
+++ branches/xml-class-rework/projects/quickhoney/website/templates/index.bknr 2006-07-16 08:54:30 UTC (rev 1963)
@@ -1,321 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:bknr="http://bknr.net"
- xmlns:quickhoney="http://quickhoney.com"
- >
- <head>
- <link rel="stylesheet" href="/static/styles.css" />
- <script src="/static/javascript.js" type="text/javascript"><!-- x -->
- </script>
- <title>QuickHoney</title>
- </head>
-
- <body id="quickhoney">
-
- <a onclick="show_page('quickhoney')" href="#">
- <img alt="quickhoney" class="menu" id="m_quickhoney" src="/image/quickhoney" />
- </a>
- <a onclick="show_page('pixel')" href="#">
- <img alt="pixel" class="menu" id="m_pixel" src="/image/pixel" />
- </a>
- <a onclick="show_page('vector')" href="#">
- <img alt="vector" class="menu" id="m_vector" src="/image/vector" />
- </a>
- <a onclick="show_page('photo')" href="#">
- <img alt="photo" class="menu" id="m_photo" src="/image/photo" />
- </a>
- <a onclick="show_page('clients')" href="#">
- <img alt="clients" class="menu" id="m_clients" src="/image/clients" />
- </a>
- <a onclick="show_page('contact')" href="#">
- <img alt="contact" class="menu" id="m_contact" src="/image/contact" />
- </a>
-
- <p id="path" class="text"> </p>
- <p id="version" class="text"><quickhoney:version-and-last-change /></p>
-
- <div id="elements">
- <div id="quickhoney">
- <img alt="quickhoney" class="inherited_image" id="homeimage" src="/image/trans" onload="home_loaded(this);" />
- </div>
-
- <div id="directory">
- <a href="#">
- <img alt="button" class="button" id="button0" onload="reveal_image(this);" src="/image/trans" />
- </a>
- <a href="#">
- <img alt="button" class="button" id="button1" onload="reveal_image(this);" src="/image/trans" />
- </a>
- <a href="#">
- <img alt="button" class="button" id="button2" onload="reveal_image(this);" src="/image/trans" />
- </a>
- <a href="#">
- <img alt="button" class="button" id="button3" onload="reveal_image(this);" src="/image/trans" />
- </a>
- <a href="#">
- <img alt="button" class="button" id="button4" onload="reveal_image(this);" src="/image/trans" />
- </a>
- <a href="#">
- <img alt="button" class="button" id="button5" onload="reveal_image(this);" src="/image/trans" />
- </a>
- </div>
-
- <div id="results">
- <p id="page_navbar" class="text">
- </p>
-
- <p id="result_page_count" class="text">
- </p>
-
- <div id="thumbnails">
- </div>
- </div>
-
- <div id="browse">
- <span id="image_navbar" class="text">
- </span>
- <span id="full_click" class="text">
- </span>
-
- <span id="results_navbar" class="text">
- <span id="back_to_results"><a onclick="back_to_results()" href="#">back to results</a></span>
- <span id="result_image_count"> <!-- may not be empty -->
- </span>
- </span>
-
- <div id="image_detail">
- </div>
-
- <div id="metadata" class="text">
- (not available)
- </div>
- </div>
-
- <div id="clients">
- <a href="#" onclick="return nice_jobs();">
- <img id="jobs-banner" src="/random-image/button/jobs" border="0" />
- </a>
- <img id="clients-type" src="/image/type-niceclients" />
- <p id="client_names">
- </p>
- </div>
-
- <div id="contact">
- <div id="contact-bigimage">
- <img src="/image/contact_nanapeter" />
- </div>
- <img class="contact" src="/image/type_contact_email" />
- <p class="contact">
- Peter Stemmler: <a href="mailto:p at quickhoney.com">p at quickhoney.com</a><br />
- Nana Rausch: <a href="mailto:n at quickhoney.com">n at quickhoney.com</a>
- </p>
- <img class="contact" src="/image/type_contact_phone" />
- <p class="contact">
- Peter Stemmler: 646.270.5562<br />
- Nana Rausch: 646.270.5592
- </p>
- <img class="contact" src="/image/type_contact_address" />
- <p class="contact">
- QuickHoney - New York<br />
- 536 Sixth Avenue, 2nd&3rd Floor<br />
- New York, NY 10011<br />
- USA <br />
- </p>
- </div>
-
- <div id="footer" class="text">
- ©1998-2005 QuickHoney Nana Rausch & Peter Stemmler. No part of
- this website may be reproduced in any manner without permission.
- Programming by Hübner/Odendahl <a href="http://headcraft.de/" target="_new">
- headcraft</a>
- </div>
- </div>
-
- <!-- CMS elements -->
-
- <div id="cms">
- <div id="upload_form" class="cms_form">
- <form id="upload_form_element" action="/upload-image" method="post"
- enctype="multipart/form-data" target="upload_result" onsubmit="do_upload(this.target);">
- <div class="cms_title">Upload new image</div>
- <p class="cms">
- Category: <b><span id="upload_category"> </span></b><br /><br />
- <input type="file" name="image-file" /><br />
- </p>
- <p class="cms">
- Client:<br />
- <input type="text" id="upload_client" name="upload_client" value="" /><br />
- <div id="upload_client_select">
- </div>
- </p>
- <p class="cms">
- <input type="submit" name="upload" value="upload" />
- </p>
- </form>
- </div>
-
- <div id="pixel_button_upload_form" class="cms_form">
- <form action="/upload-button" method="post"
- enctype="multipart/form-data" target="upload_result" onsubmit="do_button_upload(this.target);">
- <input type="hidden" name="directory" value="pixel" />
- <div class="cms_title">Upload new button</div>
- <p class="cms">
- Category:
- <select name="subdirectory" size="1">
- <option selected="selected"></option>
- <option>birdview</option>
- <option>parts</option>
- <option>icons</option>
- <option>editorial</option>
- <option>animation</option>
- <option>smallworld</option>
- </select>
- <br /><br />
- <input type="file" name="image-file" /><br />
- </p>
- <p class="cms">
- <input type="submit" name="upload" value="upload" />
- </p>
- </form>
- </div>
-
- <div id="upload_animation_form" class="cms_form">
- <form id="upload_form_element" action="/upload-animation" method="post"
- enctype="multipart/form-data" target="upload_result" onsubmit="do_upload(this.target);">
- <div class="cms_title">Upload new animatoin</div>
- <p class="cms">
- Image:<br />
- <input type="file" name="image-file" /><br />
- Animation (Flash File):<br />
- <input type="file" name="animation-file" /><br />
- </p>
- <p class="cms">
- Client:<br />
- <input type="text" id="upload_client" name="upload_client" value="" /><br />
- <div id="upload_animation_client_select">
- </div>
- </p>
- <p class="cms">
- <input type="submit" name="upload" value="upload" />
- </p>
- </form>
- </div>
-
- <div id="edit_form" class="cms_form">
- <form id="edit_form_element" action="/edit-image-js" target="edit_iframe" method="post"
- onsubmit="return do_edit();">
- <div class="cms_title">Edit image</div>
- <p class="cms">
- Client:<br />
- <input type="text" id="edit_client" name="client" value="" /><br />
- <div id="edit_client_select">
- </div>
- </p>
- <p class="cms">
- <input type="submit" name="action" value="edit" />
- <input type="submit" name="action" value="delete" onclick="return confirm('Really delete this image?');" />
- </p>
- </form>
- </div>
-
- <div id="edit_quickhoney_form" class="cms_form">
- <div class="cms_title">Upload home image</div>
- <form action="/upload-image/home/button" method="post"
- enctype="multipart/form-data" target="upload_result" onsubmit="do_upload(this.target);">
- <p class="cms">
- <input type="file" name="image-file" /><br />
- </p>
- <p class="cms">
- <input type="submit" name="action" value="upload" />
- </p>
- </form>
- <div class="cms_title">Delete this home image</div>
- <form id="delete_homeimage_form_element" action="/edit-image-js" target="edit_iframe" method="post">
- <input type="submit" name="action" value="delete" onclick="return confirm('Really delete this home image?');" />
- </form>
- </div>
-
- <div id="saving_edits_form" class="cms_form">
- <div class="cms_title">Saving Edits</div>
- <p class="cms">
- Your request is being processed.
- </p>
- </div>
-
- <div id="image_edited_form" class="cms_form">
- <div class="cms_title">Edits saved</div>
- <p class="cms">
- Your image edits have been saved.
- </p>
- </div>
-
- <div id="image_deleted_form" class="cms_form">
- <div class="cms_title">Image deleted</div>
- <p class="cms">
- The image has been deleted.
- </p>
- </div>
-
- <div id="login_form" class="cms_form">
- <form method="post" name="login_form" onsubmit="return send_login();">
- <b>Login</b> <br />
- Username<br />
- <input type="text" name="username" /><br />
- Password<br />
- <input type="password" name="password" /><br /><br />
- <a href="#" onclick="send_login();" class="cmslink">login</a>
- <input class="invisibleSubmit" type="submit" />
- </form>
- </div>
-
- <div id="login_failure" class="cms_form">
- <b>Login failed</b> <br />
- Please check your user name and password.
- </div>
-
- <div id="login_status" class="cms_form">
- <p>You are logged in as <b id="username"> </b></p>
- <p><a href="#" onclick="send_logout();" class="cmslink">logout</a></p>
- </div>
-
- </div>
-
- <div id="debugger" class="debugger">
- <b>Debugger</b> <br /> <br />
- <a id="clear_debug_window" href="#" onclick="clear_debug_window()" class="debugger">clear debug window</a><br /> <br />
- <p id="debugger_text" class="debugger">
- </p>
- </div>
-
- <p id="cue">
- query database
- </p>
-
- <div id="query_frame" class="hidden_iframe">
- <iframe src="about:blank" height="0" width="0" name="query_iframe"> </iframe>
- </div>
-
- <div id="buttonload_frame" class="hidden_iframe">
- <iframe src="about:blank" height="0" width="0" name="buttonload_iframe"> </iframe>
- </div>
-
- <div id="clients_frame" class="hidden_iframe">
- <iframe src="/clients-js" height="0" width="0" name="clients_iframe"> </iframe>
- </div>
-
- <div id="login_frame" class="hidden_iframe">
- <iframe src="/login-js" height="0" width="0" name="login_iframe"> </iframe>
- </div>
-
- <div id="edit_frame" class="hidden_iframe">
- <iframe src="about:blank" height="0" width="0" name="edit_iframe"> </iframe>
- </div>
-
- <script language="javascript" type="text/javascript">
- init();
- </script>
- </body>
-</html>
Copied: branches/xml-class-rework/projects/quickhoney/website/templates/index.xml (from rev 1962, branches/xml-class-rework/projects/quickhoney/website/templates/index.bknr)
===================================================================
--- branches/xml-class-rework/projects/quickhoney/website/templates/index.bknr 2006-07-12 09:06:31 UTC (rev 1962)
+++ branches/xml-class-rework/projects/quickhoney/website/templates/index.xml 2006-07-16 08:54:30 UTC (rev 1963)
@@ -0,0 +1,321 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:bknr="http://bknr.net"
+ xmlns:quickhoney="http://quickhoney.com"
+ >
+ <head>
+ <link rel="stylesheet" href="/static/styles.css" />
+ <script src="/static/javascript.js" type="text/javascript"><!-- x -->
+ </script>
+ <title>QuickHoney</title>
+ </head>
+
+ <body id="quickhoney">
+
+ <a onclick="show_page('quickhoney')" href="#">
+ <img alt="quickhoney" class="menu" id="m_quickhoney" src="/image/quickhoney" />
+ </a>
+ <a onclick="show_page('pixel')" href="#">
+ <img alt="pixel" class="menu" id="m_pixel" src="/image/pixel" />
+ </a>
+ <a onclick="show_page('vector')" href="#">
+ <img alt="vector" class="menu" id="m_vector" src="/image/vector" />
+ </a>
+ <a onclick="show_page('photo')" href="#">
+ <img alt="photo" class="menu" id="m_photo" src="/image/photo" />
+ </a>
+ <a onclick="show_page('clients')" href="#">
+ <img alt="clients" class="menu" id="m_clients" src="/image/clients" />
+ </a>
+ <a onclick="show_page('contact')" href="#">
+ <img alt="contact" class="menu" id="m_contact" src="/image/contact" />
+ </a>
+
+ <p id="path" class="text"> </p>
+ <p id="version" class="text"><quickhoney:version-and-last-change /></p>
+
+ <div id="elements">
+ <div id="quickhoney">
+ <img alt="quickhoney" class="inherited_image" id="homeimage" src="/image/trans" onload="home_loaded(this);" />
+ </div>
+
+ <div id="directory">
+ <a href="#">
+ <img alt="button" class="button" id="button0" onload="reveal_image(this);" src="/image/trans" />
+ </a>
+ <a href="#">
+ <img alt="button" class="button" id="button1" onload="reveal_image(this);" src="/image/trans" />
+ </a>
+ <a href="#">
+ <img alt="button" class="button" id="button2" onload="reveal_image(this);" src="/image/trans" />
+ </a>
+ <a href="#">
+ <img alt="button" class="button" id="button3" onload="reveal_image(this);" src="/image/trans" />
+ </a>
+ <a href="#">
+ <img alt="button" class="button" id="button4" onload="reveal_image(this);" src="/image/trans" />
+ </a>
+ <a href="#">
+ <img alt="button" class="button" id="button5" onload="reveal_image(this);" src="/image/trans" />
+ </a>
+ </div>
+
+ <div id="results">
+ <p id="page_navbar" class="text">
+ </p>
+
+ <p id="result_page_count" class="text">
+ </p>
+
+ <div id="thumbnails">
+ </div>
+ </div>
+
+ <div id="browse">
+ <span id="image_navbar" class="text">
+ </span>
+ <span id="full_click" class="text">
+ </span>
+
+ <span id="results_navbar" class="text">
+ <span id="back_to_results"><a onclick="back_to_results()" href="#">back to results</a></span>
+ <span id="result_image_count"> <!-- may not be empty -->
+ </span>
+ </span>
+
+ <div id="image_detail">
+ </div>
+
+ <div id="metadata" class="text">
+ (not available)
+ </div>
+ </div>
+
+ <div id="clients">
+ <a href="#" onclick="return nice_jobs();">
+ <img id="jobs-banner" src="/random-image/button/jobs" border="0" />
+ </a>
+ <img id="clients-type" src="/image/type-niceclients" />
+ <p id="client_names">
+ </p>
+ </div>
+
+ <div id="contact">
+ <div id="contact-bigimage">
+ <img src="/image/contact-peter-nana" />
+ </div>
+ <img class="contact" src="/image/type_contact_email" />
+ <p class="contact">
+ Peter Stemmler: <a href="mailto:p at quickhoney.com">p at quickhoney.com</a><br />
+ Nana Rausch: <a href="mailto:n at quickhoney.com">n at quickhoney.com</a>
+ </p>
+ <img class="contact" src="/image/type_contact_phone" />
+ <p class="contact">
+ Peter Stemmler: 646.270.5562<br />
+ Nana Rausch: 646.270.5592
+ </p>
+ <img class="contact" src="/image/type_contact_address" />
+ <p class="contact">
+ QuickHoney - New York<br />
+ 536 Sixth Avenue, 2nd&3rd Floor<br />
+ New York, NY 10011<br />
+ USA <br />
+ </p>
+ </div>
+
+ <div id="footer" class="text">
+ ©1998-2006 QuickHoney Nana Rausch & Peter Stemmler. No part of
+ this website may be reproduced in any manner without permission.
+ Programming by Hübner/Odendahl <a href="http://headcraft.de/" target="_new">
+ headcraft</a>
+ </div>
+ </div>
+
+ <!-- CMS elements -->
+
+ <div id="cms">
+ <div id="upload_form" class="cms_form">
+ <form id="upload_form_element" action="/upload-image" method="post"
+ enctype="multipart/form-data" target="upload_result" onsubmit="do_upload(this.target);">
+ <div class="cms_title">Upload new image</div>
+ <p class="cms">
+ Category: <b><span id="upload_category"> </span></b><br /><br />
+ <input type="file" name="image-file" /><br />
+ </p>
+ <p class="cms">
+ Client:<br />
+ <input type="text" id="upload_client" name="upload_client" value="" /><br />
+ <div id="upload_client_select">
+ </div>
+ </p>
+ <p class="cms">
+ <input type="submit" name="upload" value="upload" />
+ </p>
+ </form>
+ </div>
+
+ <div id="pixel_button_upload_form" class="cms_form">
+ <form action="/upload-button" method="post"
+ enctype="multipart/form-data" target="upload_result" onsubmit="do_button_upload(this.target);">
+ <input type="hidden" name="directory" value="pixel" />
+ <div class="cms_title">Upload new button</div>
+ <p class="cms">
+ Category:
+ <select name="subdirectory" size="1">
+ <option selected="selected"></option>
+ <option>birdview</option>
+ <option>parts</option>
+ <option>icons</option>
+ <option>editorial</option>
+ <option>animation</option>
+ <option>smallworld</option>
+ </select>
+ <br /><br />
+ <input type="file" name="image-file" /><br />
+ </p>
+ <p class="cms">
+ <input type="submit" name="upload" value="upload" />
+ </p>
+ </form>
+ </div>
+
+ <div id="upload_animation_form" class="cms_form">
+ <form id="upload_form_element" action="/upload-animation" method="post"
+ enctype="multipart/form-data" target="upload_result" onsubmit="do_upload(this.target);">
+ <div class="cms_title">Upload new animatoin</div>
+ <p class="cms">
+ Image:<br />
+ <input type="file" name="image-file" /><br />
+ Animation (Flash File):<br />
+ <input type="file" name="animation-file" /><br />
+ </p>
+ <p class="cms">
+ Client:<br />
+ <input type="text" id="upload_client" name="upload_client" value="" /><br />
+ <div id="upload_animation_client_select">
+ </div>
+ </p>
+ <p class="cms">
+ <input type="submit" name="upload" value="upload" />
+ </p>
+ </form>
+ </div>
+
+ <div id="edit_form" class="cms_form">
+ <form id="edit_form_element" action="/edit-image-js" target="edit_iframe" method="post"
+ onsubmit="return do_edit();">
+ <div class="cms_title">Edit image</div>
+ <p class="cms">
+ Client:<br />
+ <input type="text" id="edit_client" name="client" value="" /><br />
+ <div id="edit_client_select">
+ </div>
+ </p>
+ <p class="cms">
+ <input type="submit" name="action" value="edit" />
+ <input type="submit" name="action" value="delete" onclick="return confirm('Really delete this image?');" />
+ </p>
+ </form>
+ </div>
+
+ <div id="edit_quickhoney_form" class="cms_form">
+ <div class="cms_title">Upload home image</div>
+ <form action="/upload-image/home/button" method="post"
+ enctype="multipart/form-data" target="upload_result" onsubmit="do_upload(this.target);">
+ <p class="cms">
+ <input type="file" name="image-file" /><br />
+ </p>
+ <p class="cms">
+ <input type="submit" name="action" value="upload" />
+ </p>
+ </form>
+ <div class="cms_title">Delete this home image</div>
+ <form id="delete_homeimage_form_element" action="/edit-image-js" target="edit_iframe" method="post">
+ <input type="submit" name="action" value="delete" onclick="return confirm('Really delete this home image?');" />
+ </form>
+ </div>
+
+ <div id="saving_edits_form" class="cms_form">
+ <div class="cms_title">Saving Edits</div>
+ <p class="cms">
+ Your request is being processed.
+ </p>
+ </div>
+
+ <div id="image_edited_form" class="cms_form">
+ <div class="cms_title">Edits saved</div>
+ <p class="cms">
+ Your image edits have been saved.
+ </p>
+ </div>
+
+ <div id="image_deleted_form" class="cms_form">
+ <div class="cms_title">Image deleted</div>
+ <p class="cms">
+ The image has been deleted.
+ </p>
+ </div>
+
+ <div id="login_form" class="cms_form">
+ <form method="post" name="login_form" onsubmit="return send_login();">
+ <b>Login</b> <br />
+ Username<br />
+ <input type="text" name="username" /><br />
+ Password<br />
+ <input type="password" name="password" /><br /><br />
+ <a href="#" onclick="send_login();" class="cmslink">login</a>
+ <input class="invisibleSubmit" type="submit" />
+ </form>
+ </div>
+
+ <div id="login_failure" class="cms_form">
+ <b>Login failed</b> <br />
+ Please check your user name and password.
+ </div>
+
+ <div id="login_status" class="cms_form">
+ <p>You are logged in as <b id="username"> </b></p>
+ <p><a href="#" onclick="send_logout();" class="cmslink">logout</a></p>
+ </div>
+
+ </div>
+
+ <div id="debugger" class="debugger">
+ <b>Debugger</b> <br /> <br />
+ <a id="clear_debug_window" href="#" onclick="clear_debug_window()" class="debugger">clear debug window</a><br /> <br />
+ <p id="debugger_text" class="debugger">
+ </p>
+ </div>
+
+ <p id="cue">
+ query database
+ </p>
+
+ <div id="query_frame" class="hidden_iframe">
+ <iframe src="about:blank" height="0" width="0" name="query_iframe"> </iframe>
+ </div>
+
+ <div id="buttonload_frame" class="hidden_iframe">
+ <iframe src="about:blank" height="0" width="0" name="buttonload_iframe"> </iframe>
+ </div>
+
+ <div id="clients_frame" class="hidden_iframe">
+ <iframe src="/clients-js" height="0" width="0" name="clients_iframe"> </iframe>
+ </div>
+
+ <div id="login_frame" class="hidden_iframe">
+ <iframe src="/login-js" height="0" width="0" name="login_iframe"> </iframe>
+ </div>
+
+ <div id="edit_frame" class="hidden_iframe">
+ <iframe src="about:blank" height="0" width="0" name="edit_iframe"> </iframe>
+ </div>
+
+ <script language="javascript" type="text/javascript">
+ init();
+ </script>
+ </body>
+</html>
Deleted: branches/xml-class-rework/projects/quickhoney/website/templates/user-error.bknr
===================================================================
--- branches/xml-class-rework/projects/quickhoney/website/templates/user-error.bknr 2006-07-12 09:06:31 UTC (rev 1962)
+++ branches/xml-class-rework/projects/quickhoney/website/templates/user-error.bknr 2006-07-16 08:54:30 UTC (rev 1963)
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:bknr="http://bknr.net"
- xmlns:lisp-ecoop05="http://lisp-ecoop05.bknr.net"
- xmlns:menu="http://bknr.net/menu"
- >
-Your request could not be processed because an error occured:
-<pre>
-$(error-message)
-</pre>
-</html>
\ No newline at end of file
Copied: branches/xml-class-rework/projects/quickhoney/website/templates/user-error.xml (from rev 1962, branches/xml-class-rework/projects/quickhoney/website/templates/user-error.bknr)
===================================================================
--- branches/xml-class-rework/projects/quickhoney/website/templates/user-error.bknr 2006-07-12 09:06:31 UTC (rev 1962)
+++ branches/xml-class-rework/projects/quickhoney/website/templates/user-error.xml 2006-07-16 08:54:30 UTC (rev 1963)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:bknr="http://bknr.net"
+ xmlns:lisp-ecoop05="http://lisp-ecoop05.bknr.net"
+ xmlns:menu="http://bknr.net/menu"
+ >
+Your request could not be processed because an error occured:
+<p>
+$(error-message)
+</p>
+</html>
\ No newline at end of file
More information about the Bknr-cvs
mailing list