improved style, beautified URL display

svn path=/trunk/; revision=29

diff --git a/actions/filter_attendee.sh b/actions/filter_attendee.sh
new file mode 100755 (executable)
index 0000000..1cb074c
--- /dev/null
+++ b/actions/filter_attendee.sh
@@ -0,0 +1,15 @@
+#!/bin/zsh
+
+cgi_post
+
+case "$_POST[\"choice\"]"; in
+  new_filter)
+    filter="$_POST[\"filter\"]"
+    filtertype="$_POST[\"filtertype\"]"
+    order="$_POST[\"order\"]"
+    echo -n "Location: http://$HTTP_HOST/?page=attendees&filter=$filter&filtertype=$filtertype&order=$order\n\n"
+    ;;
+  *)
+    echo -n "Location: http://$HTTP_HOST/?page=attendees\n\n"
+    ;;
+esac

diff --git a/index.cgi b/index.cgi
index a7edbb1186378b7584e1e23e6b39a8f0aa906b19..1721280daf81b51c4b3f05f758fed17f299f620b 100755 (executable)
--- a/index.cgi
+++ b/index.cgi
@@ -15,12 +15,8 @@ debug() { #change to false to disable debugging
 # we will use the http root as object storage (data directory) and call sub
 # programs from the directory in which the real executable resides
 # therefore we need to identify the code and data directories _EXEC and _DATA
 # we will use the http root as object storage (data directory) and call sub
 # programs from the directory in which the real executable resides
 # therefore we need to identify the code and data directories _EXEC and _DATA

-call=$0
-real=$call
-while [ -L "$real" ]; do
-  real="$(stat -c %N "$real" |sed -r "s:..*. -> .(.*).$:\1:")"
-done
-
+call="$0"
+real="$(readlink -f $call)"

 _EXEC="$(dirname "$real")"  #execution directory
 _DATA="$(dirname "$call")"  #storage directory
 
 _EXEC="$(dirname "$real")"  #execution directory
 _DATA="$(dirname "$call")"  #storage directory
 

diff --git a/pages/attendees.sh b/pages/attendees.sh
index e3e27c2d9d0b9c5d0ffd3aaf4491f67e906b92ac..dfa7dfbf9d6654b3fcae9c2eccbdae9390288e5a 100755 (executable)
--- a/pages/attendees.sh
+++ b/pages/attendees.sh
@@ -1,6 +1,5 @@
 #!/bin/sh
 
 #!/bin/sh
 

-[ "$_GET[\"choice\"]" = "del_filter" ] && _GET["filter"]="" && _GET["filtertype"]="" 

 listcards() {
   case "$_GET[\"filtertype\"]" in
     any)
 listcards() {
   case "$_GET[\"filtertype\"]" in
     any)

diff --git a/templates/attendees.css.sh b/templates/attendees.css.sh
index 955e89e1ce00379845b822c4f011e78c4911510c..2639fdb53b35a334ada70c600759820739791465 100644 (file)
--- a/templates/attendees.css.sh
+++ b/templates/attendees.css.sh
@@ -5,7 +5,8 @@ cat <<EOF
   width: 128ex;
   border-width: 1px;
   border-style: solid;
   width: 128ex;
   border-width: 1px;
   border-style: solid;

-  margin: 2em 5% .5em 5%;
+  border-radius: 4px 4px 0 0;
+  margin: .5em auto .25em auto;

   padding: .25em 1ex .25em 1ex;
   background: #EFF;
 }
   padding: .25em 1ex .25em 1ex;
   background: #EFF;
 }


@@ -46,7 +47,8 @@ cat <<EOF
   width: 126ex;
   border-width: 1px;
   border-style: solid;
   width: 126ex;
   border-width: 1px;
   border-style: solid;

-  margin: .5em 5% 1em 5%;
+  border-radius: 0 0 4px 4px;
+  margin: .25em auto 1em auto;

   padding: .25em 2ex .25em 2ex;
   background: #EFF;
 }
   padding: .25em 2ex .25em 2ex;
   background: #EFF;
 }


@@ -56,9 +58,10 @@ cat <<EOF
   width: 130ex;
   border-style: solid;
   border-width: 1px;
   width: 130ex;
   border-style: solid;
   border-width: 1px;

-  margin: 4px 5%;
+  margin: .25em auto;

   padding: 0;
   overflow: auto;
   padding: 0;
   overflow: auto;

+  background: #FFF;

 }
 
 .cardlist .card .section {
 }
 
 .cardlist .card .section {


@@ -76,6 +79,7 @@ cat <<EOF
   background: #EEF;
 }
 .cardlist .card .control .item {
   background: #EEF;
 }
 .cardlist .card .control .item {

+  color: #008;

   margin-top: .2em;
   margin-right: 1ex;
 }
   margin-top: .2em;
   margin-right: 1ex;
 }

diff --git a/templates/attendees.html.sh b/templates/attendees.html.sh
index b4ca0b8e9455dd3da93f7d80390507245848da5a..df5d36c4cd252d5f1c58895d3360bc34f978ea18 100644 (file)
--- a/templates/attendees.html.sh
+++ b/templates/attendees.html.sh
@@ -12,7 +12,7 @@ edit="$_GET[\"edit\"]"
 cat <<EOF
 <div class="filter">
   <span class="label">$(l10n filter_label)</span>
 cat <<EOF
 <div class="filter">
   <span class="label">$(l10n filter_label)</span>

-  <form class="search" action="/" method="GET">
+  <form class="search" action="/?action=filter_attendee" method="POST">

     <input type="hidden" name="page" value="attendees"/>
     <input type="text" name="filter" value="$_GET["filter"]" placeholder="$(l10n filter_placeholder)"/>
     <br />
     <input type="hidden" name="page" value="attendees"/>
     <input type="text" name="filter" value="$_GET["filter"]" placeholder="$(l10n filter_placeholder)"/>
     <br />

diff --git a/templates/frame.html.sh b/templates/frame.html.sh
index c15561182d87348a5304365d5646e37fc66e3f3f..b76717bb0416eb5eb68cc48e89d68095f8fa9708 100755 (executable)
--- a/templates/frame.html.sh
+++ b/templates/frame.html.sh
@@ -6,6 +6,35 @@ cat <<EOF
     <title>$($PAGE title)</title>
     <style type="text/css">
     <!--
     <title>$($PAGE title)</title>
     <style type="text/css">
     <!--

+body {
+  background: #EEE;
+  margin: 0;
+  padding: 0;
+}
+.NAVIGATION {
+  display: inline-block;
+  height: 1.5em;
+  border-style: none solid solid solid;
+  border-width: 0 1px 1px 1px;
+  border-radius: 0 0 4px 4px;
+  margin-top: 0;
+  margin-left: 3%;
+  padding: .5em 1ex .25em 1ex;
+  background: #FFF;
+}
+.NAVIGATION a {
+  color: #008;
+  border-style: solid;
+  border-width: 1px;
+  border-color: #BBF;
+  margin: .5em .5ex .25em .5ex;
+  padding: .2em 3ex .2em 3ex;
+  background: #EFF;
+}
+.NAVIGATION a:hover {
+  border-width: 2px 1px 2px 1px;
+  background: #F3FFFF;
+}

 
 
     $(. $PAGE css)
 
 
     $(. $PAGE css)