From 3f7aaeaa4adf5bbffb487ab3adab5cb5361f8fd1 Mon Sep 17 00:00:00 2001
From: "gerv%gerv.net" <gerv%gerv.net@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 15 Jan 2005 13:13:10 +0000
Subject: [PATCH] Rearrange skins files, add new skin, improved text based on
 feedback from blog, license tweaks.

git-svn-id: svn://10.0.0.236/trunk@167783 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/webtools/hendrix/index.cgi            |   3 +-
 .../hendrix/{hendrix.css => skin/default.css} |  12 ++--
 .../webtools/hendrix/{ => skin}/hendrix.jpg   | Bin
 mozilla/webtools/hendrix/skin/planet.css      |  66 ++++++++++++++++++
 .../webtools/hendrix/template/error.html.tmpl |   1 +
 .../hendrix/template/footer.html.tmpl         |   3 +-
 .../hendrix/template/header.html.tmpl         |  14 +++-
 .../webtools/hendrix/template/index.html.tmpl |  18 ++---
 .../hendrix/template/message-headers.txt.tmpl |   1 +
 .../hendrix/template/message.txt.tmpl         |   1 +
 .../template/submit-successful.html.tmpl      |   1 +
 11 files changed, 103 insertions(+), 17 deletions(-)
 rename mozilla/webtools/hendrix/{hendrix.css => skin/default.css} (96%)
 rename mozilla/webtools/hendrix/{ => skin}/hendrix.jpg (100%)
 create mode 100644 mozilla/webtools/hendrix/skin/planet.css

diff --git a/mozilla/webtools/hendrix/index.cgi b/mozilla/webtools/hendrix/index.cgi
index d02a1a16bfc..c103afe4060 100755
--- a/mozilla/webtools/hendrix/index.cgi
+++ b/mozilla/webtools/hendrix/index.cgi
@@ -23,6 +23,7 @@
 #
 # Contributor(s):
 #
+# The Initial Developer wrote this software to the Glory of God.
 # ***** END LICENSE BLOCK *****
 
 use strict;
@@ -44,7 +45,7 @@ my $form = $cgi->Vars;
 my $vars;
 $vars->{'form'} = $form;
 $vars->{'newsgroup'} = $newsgroup;
-$vars->{'stylesheet'} = $form->{'stylesheet'} || "hendrix.css";
+$vars->{'stylesheet'} = $form->{'stylesheet'} || "skin/default.css";
 
 my $template = Template->new({
     INCLUDE_PATH => ["template"],
diff --git a/mozilla/webtools/hendrix/hendrix.css b/mozilla/webtools/hendrix/skin/default.css
similarity index 96%
rename from mozilla/webtools/hendrix/hendrix.css
rename to mozilla/webtools/hendrix/skin/default.css
index d365de0bb85..46dbf5394ac 100644
--- a/mozilla/webtools/hendrix/hendrix.css
+++ b/mozilla/webtools/hendrix/skin/default.css
@@ -22,8 +22,14 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#header-img {
+.sidebar {
   float: right;
+  width: 200px;
+  font-size: small;
+  text-align: center;
+}
+
+#header-img {
   border: 1px grey solid;
   margin-left: 10px;
 }
@@ -32,10 +38,6 @@ p.error {
   color: red;
 }
 
-.footnote {
-  font-size: small;
-}
-
 h1 {
   font-size: x-large;
 }
diff --git a/mozilla/webtools/hendrix/hendrix.jpg b/mozilla/webtools/hendrix/skin/hendrix.jpg
similarity index 100%
rename from mozilla/webtools/hendrix/hendrix.jpg
rename to mozilla/webtools/hendrix/skin/hendrix.jpg
diff --git a/mozilla/webtools/hendrix/skin/planet.css b/mozilla/webtools/hendrix/skin/planet.css
new file mode 100644
index 00000000000..bd7baa2dd8f
--- /dev/null
+++ b/mozilla/webtools/hendrix/skin/planet.css
@@ -0,0 +1,66 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is a stylesheet for the Hendrix Feedback System.
+ *
+ * The Initial Developer of the Original Code is
+ * KDS Sahambi <kds.sahambi@gmail.com>.
+ * Portions created by the Initial Developer are Copyright (C) 2005
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Gervase Markham <gerv@gerv.net>
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+@import url("http://planet.mozilla.org/planet2.css");
+
+input[type="text"] {
+  font-family: monospace;
+}
+
+#name:focus, #email:focus, #subject:focus, #comments:focus{
+  background-color: #e4ecec;
+}
+
+#name, #email {
+  width: 25em;
+}
+
+#subject, #comments {
+  width: 40em;
+}
+
+#comments {
+  height: 20ex;
+}
+
+#header-img {
+  padding: 2px;
+  border: 2px solid #455372;
+  background: #e4ecec;  
+}
+
+div.sidebar {
+  float: right;
+  text-align: center;
+}
+
+.newsgroup {
+  font-family: monospace;
+}
+
+p.error {
+  color: red;
+}
+
diff --git a/mozilla/webtools/hendrix/template/error.html.tmpl b/mozilla/webtools/hendrix/template/error.html.tmpl
index a86ed6edd7c..219f741655b 100644
--- a/mozilla/webtools/hendrix/template/error.html.tmpl
+++ b/mozilla/webtools/hendrix/template/error.html.tmpl
@@ -20,6 +20,7 @@
   #
   # Contributor(s):
   #
+  # The Initial Developer wrote this software to the Glory of God.
   # ***** END LICENSE BLOCK ***** %]
   
 [% PROCESS header.html.tmpl 
diff --git a/mozilla/webtools/hendrix/template/footer.html.tmpl b/mozilla/webtools/hendrix/template/footer.html.tmpl
index e9e1c7e0288..c142bfb9d83 100644
--- a/mozilla/webtools/hendrix/template/footer.html.tmpl
+++ b/mozilla/webtools/hendrix/template/footer.html.tmpl
@@ -20,7 +20,8 @@
   #
   # Contributor(s):
   #
+  # The Initial Developer wrote this software to the Glory of God.
   # ***** END LICENSE BLOCK ***** %]
-  
+
   </body>
 </html>
diff --git a/mozilla/webtools/hendrix/template/header.html.tmpl b/mozilla/webtools/hendrix/template/header.html.tmpl
index 5ec7df535ba..44828bdfb7c 100644
--- a/mozilla/webtools/hendrix/template/header.html.tmpl
+++ b/mozilla/webtools/hendrix/template/header.html.tmpl
@@ -20,6 +20,7 @@
   #
   # Contributor(s):
   #
+  # The Initial Developer wrote this software to the Glory of God.
   # ***** END LICENSE BLOCK ***** %]
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
@@ -35,7 +36,6 @@
   </head>
   
   <body onload="[% onload %]">
-  <img id="header-img" src="hendrix.jpg">
   [% IF NOT h1 AND title %]
     [% h1 = title %]
   [% END %]
@@ -43,3 +43,15 @@
   [% IF h1 %] 
     <h1>[% h1 %]</h1>
   [% END %]
+
+<div class="sidebar">
+  <div>
+    <img id="header-img" src="skin/hendrix.jpg">
+    <p class="caption">
+      Why "Hendrix"? The late 
+      <a href="http://en.wikipedia.org/wiki/Jimi_Hendrix">Jimi Hendrix</a>
+      is credited with making popular the technique of using feedback
+      in the creation of music.
+    </p>
+  </div>
+</div>
diff --git a/mozilla/webtools/hendrix/template/index.html.tmpl b/mozilla/webtools/hendrix/template/index.html.tmpl
index 37987f74902..d5ee9106f09 100644
--- a/mozilla/webtools/hendrix/template/index.html.tmpl
+++ b/mozilla/webtools/hendrix/template/index.html.tmpl
@@ -20,6 +20,7 @@
   #
   # Contributor(s):
   #
+  # The Initial Developer wrote this software to the Glory of God.
   # ***** END LICENSE BLOCK ***** %]
   
 [% script = BLOCK %]
@@ -112,20 +113,19 @@ function onLoad() {
         >[% form.comments FILTER html %]</textarea>
       </td>
     </tr>
+    <tr>
+      <td></td>
+      <td>
+        <input id="send-feedback" type="submit" value="Send Feedback"/>
+      </td>
+    </tr>
   </table>
-  <input type="hidden" name="action" value="submit"/>
-  
-  [%# Add JS to only enable button when form is filled in %]
-  
-  <input id="send-feedback" type="submit" value="Send Feedback"/>
+  <input type="hidden" name="action" value="submit"/>  
+  <input type="hidden" name="stylesheet" value="[% stylesheet FILTER html %]"/>  
 </form>
 
 <p>
 Information from this form will be published to the newsgroup <span class="newsgroup">[% newsgroup %]</span> so project contributors can read it. Do not submit any information unless you wish it to be made public. Your email address will be spam-proofed.
 </p>
 
-<p class="footnote">Why "Hendrix"? The late 
-<a href="http://en.wikipedia.org/wiki/Jimi_Hendrix">Jimi Hendrix</a>
-is credited with making popular the technique of making feedback useful in the creation of music :-).</p>
-
 [% PROCESS footer.html.tmpl %]
diff --git a/mozilla/webtools/hendrix/template/message-headers.txt.tmpl b/mozilla/webtools/hendrix/template/message-headers.txt.tmpl
index 07d852c080d..eee2bfa4d0c 100644
--- a/mozilla/webtools/hendrix/template/message-headers.txt.tmpl
+++ b/mozilla/webtools/hendrix/template/message-headers.txt.tmpl
@@ -20,6 +20,7 @@
   #
   # Contributor(s):
   #
+  # The Initial Developer wrote this software to the Glory of God.
   # ***** END LICENSE BLOCK ***** %]
 [% from = form.name %]
 [% IF form.email %]
diff --git a/mozilla/webtools/hendrix/template/message.txt.tmpl b/mozilla/webtools/hendrix/template/message.txt.tmpl
index 09941e0b7f8..3f6ab540bae 100644
--- a/mozilla/webtools/hendrix/template/message.txt.tmpl
+++ b/mozilla/webtools/hendrix/template/message.txt.tmpl
@@ -20,6 +20,7 @@
   #
   # Contributor(s):
   #
+  # The Initial Developer wrote this software to the Glory of God.
   # ***** END LICENSE BLOCK ***** %]
 Name:    [% form.name %]
 [% IF form.email %]
diff --git a/mozilla/webtools/hendrix/template/submit-successful.html.tmpl b/mozilla/webtools/hendrix/template/submit-successful.html.tmpl
index 75f2bef531f..ac5994b83b8 100644
--- a/mozilla/webtools/hendrix/template/submit-successful.html.tmpl
+++ b/mozilla/webtools/hendrix/template/submit-successful.html.tmpl
@@ -20,6 +20,7 @@
   #
   # Contributor(s):
   #
+  # The Initial Developer wrote this software to the Glory of God.
   # ***** END LICENSE BLOCK ***** %]
   
 [% PROCESS header.html.tmpl