[glade-web] Integrated survey into website

From: Juan Pablo Ugarte <jpu src gnome org>
To: commits-list gnome org
Cc:
Subject: [glade-web] Integrated survey into website
Date: Wed, 27 Nov 2013 19:09:13 +0000 (UTC)
commit b3840842bdc044c507359a51b95c0479cc71094b
Author: Juan Pablo Ugarte <juanpablougarte gmail com>
Date:   Wed Nov 27 16:08:50 2013 -0300

    Integrated survey into website

 Makefile                              |    3 +-
 default.css                           |   44 +++++++++++++--------
 head.src                              |    5 +--
 index.src                             |    2 +-
 registration.html => registration.src |   69 ++++++++++-----------------------
 5 files changed, 51 insertions(+), 72 deletions(-)
---
diff --git a/Makefile b/Makefile
index 69465c2..47a5525 100644
--- a/Makefile
+++ b/Makefile
@@ -10,12 +10,12 @@ PROCESSOR = ${PYTHON} stp.py
 SRC_PAGES =                    \
        sources.src             \
        index.src               \
+       registration.src        \
        news.src
 
 HTML_PAGES = $(patsubst %.src, ${WEBDIR}/%.html, ${SRC_PAGES})
 
 COMMON_PAGES = head.src foot.src newsitems.py feed.py
-STATIC_PAGES = registration.html
 CSS_FILES = default.css
 
 all: start_log pages finish_log
@@ -53,7 +53,6 @@ news.rss: newsitems.py feed.py
        ${PYTHON} feed.py
 
 extras: ${CSS_FILES} ${STATIC_PAGES} images/*.png images/*.svg
-       cp ${STATIC_PAGES} ${WEBDIR}
        cp ${CSS_FILES} ${WEBDIR}
        cp images/*.png ${IMGDIR}
        cp images/*.svg ${IMGDIR}
diff --git a/default.css b/default.css
index 76a4113..2fe0c1f 100644
--- a/default.css
+++ b/default.css
@@ -1,18 +1,24 @@
 /* Basic tags */
-body {
+html{
+  height: 100%;
   width: 64em;
-  margin: 0px auto;
+  margin: 0em auto;
   font-family: "Verdana", "Arial", sans-serif;
+  overflow-y: scroll;
+}
+
+body {
+  height: 100%;
+  margin: 0px;
 }
 
 #body {
-  min-height:48em;
-  margin: 3em 16em 0em 1em;
+  min-height: 48em;
+  margin: 4em 16em 1em 1em;
   padding: 0px;
   color: #000;
-  clear: left;
   background: url(images/glade-bg.svg) no-repeat bottom right;
-  background-size: 32em; 
+  background-size: 32em;
 }
 
 a img {
@@ -39,25 +45,30 @@ div.hdr_top {
   margin: 0px auto;
 }
 
-div.hdr_top a {
-  color: white;
-  text-decoration:none;
-  outline: 0;
-}
-
 #hdr {
+  position: fixed;
+  top: 0px;
+  width: 64em;
+  margin: 0px auto;
+
+  box-shadow: 1px 1px 4px gray;
+  border:1px solid black;
   background-color: #4a90d9;
-  color: #FFF;
-  border: 1px solid #000;
 }
 
 #hdr h1 {
   margin: 0em;
-  padding-top: 0.5em;
+  padding: 0.5em 0em 0.25em 0em;
   font-size: 165%;
   text-shadow: 1px 1px 2px black;
 }
 
+#hdr a {
+  color: white;
+  text-decoration:none;
+  outline: 0;
+}
+
 #hdr h2 {
   font-size: 120%;
 }
@@ -129,7 +140,7 @@ div.hdr_top a {
 #sidebar {
   position:fixed;
   width: 14em;
-  margin: 1em 0em 0em 49em;
+  margin: 0em 0em 0em 49em;
   padding: 0.5em;
   border-left: 1px dashed #ddd;
 }
@@ -170,7 +181,6 @@ div.hdr_top a {
 #copyright {
   text-align: center;
   font-size: small;
-  clear: both;
   background-color: #4a90d9;
   color: #FFF;
   margin: 0px;
diff --git a/head.src b/head.src
index fe65351..0373d24 100644
--- a/head.src
+++ b/head.src
@@ -15,13 +15,10 @@
 
 <body>
 
-    <div id="hdr" class="hdr_top">
+    <div id="hdr">
         <a href="index.html"><img alt="logo" 
src="https://git.gnome.org/browse/glade/plain/data/icons/hicolor/48x48/apps/glade.png"; style="margin: 0px 
1em;"/>
         <h1>Glade - A User Interface Designer</h1></a>
     </div>
-    <div id="hdr">
-        <h1>G</h1>
-    </div>
 
     <div id="sidebar">
         <h1>Current Version: <strong>3.16</strong></h1>
diff --git a/index.src b/index.src
index c82ce8e..12880ec 100644
--- a/index.src
+++ b/index.src
@@ -1,7 +1,7 @@
 <!--stp:include('head.src') -->
 
     <div id="body">
-
+    <br>
     <p class="thumb">
     <a class="thumb" href="images/glade-main-page.png" title="Glade main page screenshot">
         <img style="float: left; margin-right: 20px;" src="images/glade-main-page-thumb.png"
diff --git a/registration.html b/registration.src
similarity index 96%
rename from registration.html
rename to registration.src
index 8d5148c..4d14941 100644
--- a/registration.html
+++ b/registration.src
@@ -1,3 +1,5 @@
+<!--stp:include('head.src') -->
+
 <!--
  * registration.html: Glade registration and survey form
  *
@@ -20,44 +22,21 @@
  * Authors:
  *   Juan Pablo Ugarte
 -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-<head>
-  <meta charset="utf-8" content="Glade survey"/>
 
-  <title>Glade Survey</title>
   <style media="screen" type="text/css">
 
-body {
-  width: 768px;
-  margin: 12px auto;
-  background: gray;
-  background: -webkit-repeating-linear-gradient(#888, #888 4px, #7B7B7B 4px, #7B7B7B 8px) fixed;
-  background: -o-repeating-linear-gradient(#888, #888 4px, #7B7B7B 4px, #7B7B7B 8px) fixed;
-  background: -moz-repeating-linear-gradient(#888, #888 4px, #7B7B7B 4px, #7B7B7B 8px) fixed;
-  background: repeating-linear-gradient(#888, #888 4px, #7B7B7B 4px, #7B7B7B 8px) fixed;
-}
-
-div.body {
-  border: solid #61605e 4px;
+#body {
+  padding: 0.5em;
+  border: solid gray 4px;
   border-radius: 16px;
-  background-color: white;
-}
-
-div.bodybg {
   background: url(images/glade-bg.svg) no-repeat bottom center fixed;
-  background-size: 768px; 
-}
-
-div.bodypadd {
-  padding: 12px;
+  background-size: 42em;
 }
 
 h2 {
   margin: 0;
   color: white;
-  text-shadow: 2px 2px 2px black;
+  text-shadow: 1px 1px 2px black;
   background-color: #4a90d9;
   border-radius: 8px;
   padding: 12px;
@@ -111,11 +90,15 @@ div.submit {
 }
 
 div.footnotes {
-  color: white;
-  text-shadow: 1px 1px 1px black;
   text-align:right;
 }
 
+div.textbox a, a:hover, a:focus, a:active{
+  border: none;
+  text-decoration: none;
+  color: white;
+}
+
 a.whitelink {
   color: white;
   text-shadow: 1px 1px 1px #3a80c9;
@@ -246,15 +229,10 @@ function check_set_visibility ()
 
   //-->
   </script>
-</head>
-<body>
-
+<div id="body">
 <form name="GladeForm" action="https://people.gnome.org/~jpu/glade/registration.php"; onsubmit="return 
validate_form ();" method="post" enctype="application/x-www-form-urlencoded">
-<div class="body">
-<div class="bodybg">
-<div class="bodypadd">
 
-<h2>Glade User Information</h2><br>
+<h2>User Information</h2><br>
 
 <table summary="">
 <tr><td>
@@ -476,11 +454,6 @@ All the data will be stored in a private location and will not be shared with th
 <button name="send_request_button" type="submit">Submit</button>
 information to glade.gnome.org (See below for details)
 </div>
-
-</div></div></div>
-
-</form>
-
 <br>
 <div class="textbox">
 <b><a id="privacy">Privacy Note:</a></b><br><br>
@@ -490,10 +463,10 @@ in case you want to modify something or add extra comments.<br>
 Only statistics compiled from the whole dataset will be shared publicly.<br>
 Individual data will be stored in a private database and it will not be shared with the public or any other 
third party.
 </div>
-<br><br>
-<div class="footnotes">
-* Required fields<br>
-</div>
+<br>
+<div class="footnotes">* Required fields</div>
 
-</body>
-</html>
+</div>
+</form>
+</div>
+<!--stp:include('foot.src') -->
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]