fitted editing to new card layout

svn path=/trunk/; revision=24

diff --git a/templates/attendees.css.sh b/templates/attendees.css.sh
index 126a95267e07f77dec976d39437524e22b54b04f..b86985c01ae57cc58085b18509a8ced8abacdb9e 100644 (file)
--- a/templates/attendees.css.sh
+++ b/templates/attendees.css.sh
@@ -31,15 +31,17 @@ cat <<EOF
 }
 .cardlist .card .control .item {
   margin-right: 1ex;
+  margin-top: .2em;
+}
+.cardlist .card .control a.item {
   border-style: solid double solid solid;
   border-width: 1px 3px 1px 1px;
   background: #FFF;
   padding: .1em 1ex;
   min-width: 10ex;
-  margin-top: .2em;
   border-color: #000;
 }
-.cardlist .card .control .item:hover{
+.cardlist .card .control a.item:hover{
   border-width: 1px 1px 1px 1px;
 }
 
@@ -55,6 +57,13 @@ cat <<EOF
   word-wrap: break-word;
 }
 
+.cardlist .card .section textarea.NOTE {
+  min-height: 6em;
+}
+.cardlist .card .section textarea.ADR {
+  min-height: 4em;
+}
+
 .cardlist .card .section .PHOTO {
   width: 20ex;
   max-heigth: 30ex;

diff --git a/templates/edit_attendee.sh b/templates/edit_attendee.sh
index 13b550a407ee446482203f9668b3050ca3d31a7a..72824528a164d68e06db7bfbe5b0dd8d12d0c599 100755 (executable)
--- a/templates/edit_attendee.sh
+++ b/templates/edit_attendee.sh
@@ -1,25 +1,37 @@
-edit_card() {
-  n_last="$(echo "$values[N]" |sed -r 's:^([^;]*;){0} *([^;]*);.*$:\2:')"
-  n_first="$(echo "$values[N]" |sed -r 's:^([^;]*;){1} *([^;]*);.*$:\2:')"
-  n_middle="$(echo "$values[N]" |sed -r 's:^([^;]*;){2} *([^;]*);.*$:\2:')"
-  n_pre="$(echo "$values[N]" |sed -r 's:^([^;]*;){3} *([^;]*);.*$:\2:')"
-  n_post="$(echo "$values[N]" |sed -r 's:^([^;]*;){4} *([^;]*);*$:\2:')"
+check_gen() {
+  [ "$value[GENDER]" = "$1" ] && echo 'selected="selected"'
+}
 
+edit_card() {
+  n_last="$(echo "$values[N]" |sed -rn 's:^([^;]*;){0} *([^;]*).*$:\2:p')"
+  n_first="$(echo "$values[N]" |sed -rn 's:^([^;]*;){1} *([^;]*).*$:\2:p')"
+  n_middle="$(echo "$values[N]" |sed -rn 's:^([^;]*;){2} *([^;]*).*$:\2:p')"
+  n_pre="$(echo "$values[N]" |sed -rn 's:^([^;]*;){3} *([^;]*).*$:\2:p')"
+  n_post="$(echo "$values[N]" |sed -rn 's:^([^;]*;){4} *([^;]*)*$:\2:p')"
 
   echo '  <div class="section basic">'
-  echo '    <span class="sectitle">'$(l10n NAME)'</span>'
+  echo '    <span class="sectitle">'$(l10n N)'</span>'
   echo '    <input class="item N" name="3N" placeholder="'$(l10n n_pre)'" value="'$n_pre'" />'
   echo '    <input class="item N" name="1N" placeholder="'$(l10n n_first)'" value="'$n_first'" />'
   echo '    <input class="item N" name="2N" placeholder="'$(l10n n_middle)'" value="'$n_middle'" />'
   echo '    <input class="item N" name="0N" placeholder="'$(l10n n_last)'" value="'$n_last'" />'
   echo '    <input class="item N" name="4N" placeholder="'$(l10n n_post)'" value="'$n_post'" />'
-  [ -n "$value[GENDER]" ] && \
-    echo '    <span class="item GENDER">'$(l10n $values[GENDER])'</span>'
+  if [ -n "$value[GENDER]" ]; then
+    echo '  <div class="section control">'
+    echo '    <select class="item control" name="newfield">'
+    echo '      <option value="" disabled="disabled">'$(l10n GENDER)'</option>'
+    echo '      <option value="female" disabled="disabled" '$(check_gen female)'>'$(l10n female)'</option>'
+    echo '      <option value="male" disabled="disabled"  '$(check_gen male)'>'$(l10n male)'</option>'
+    echo '      <option value="other" disabled="disabled" '$(check_gen other)'>'$(l10n gender_other)'</option>'
+    echo '    </select>'
+  fi
   for n in NICKNAME NICKNAME{0..10}; do [ -n "$values[$n]" ] &&\
-    echo '    <span class="item NICKNAME">aka. '$values[$n]'</span>'
+    echo '    <input class="item NICKNAME" name="NICKNAME" placeholder="'$(l10n NICKNAME)'" value="'$values[$n]'" />'
   done
-  [ -n "$values[BDAY]" ] &&\
-    echo '    <span class="item BDAY"><b>*:</b> '$values[BDAY]'</span>'
+  if [ -n "$values[BDAY]" ]; then
+    echo '    <span class="sectitle">'$(l10n BDAY)'</span>'
+    echo '    <input class="item BDAY" name="BDAY" value="'$values[BDAY]'" />'
+  fi
   if [ -n "$values[SOUND]" ]; then
     echo '    <audio controls="controls" class="item SOUND">'
     echo '      <source type="audio/ogg" src="data:audio/ogg;base64,'$values[SOUND]'" />'
@@ -33,39 +45,39 @@ edit_card() {
   echo ''
   echo '  <div class="section phone">'
   echo '    <span class="sectitle">'$(l10n TEL)'</span>'
-  for n in TEL TEL{0..10}; do [ -n "$values[$n]" ] &&\
-    echo '    <span class="item TEL">'$tags[${n}_TYPE]' '$values[$n]'</span>'
+  print -l ${(k)values} |egrep '^TEL[0-9]*$' |while read n; do
+    echo '    <input class="item TEL" name="TEL" value="'$values[$n]'" />'
   done
   echo '  </div>'
   echo ''
   echo '  <div class="section message">'
   echo '    <span class="sectitle">'$(l10n EMAIL)'</span>'
   for n in EMAIL EMAIL{0..10}; do [ -n "$values[$n]" ] &&\
-    echo '    <span class="item EMAIL"><a href="mailto:'$values[$n]'">'$values[$n]'</a></span>'
+    echo '    <input class="item EMAIL" name="EMAIL" value="'$values[$n]'" />'
   done
   [ -n "$values[IMPP]" ] && \
     echo '    <span class="sectitle">'$(l10n IMPP)'</span>'
   for n in IMPP IMPP{0..10}; do [ -n "$values[$n]" ] &&\
-    echo '    <span class="item IMPP">'$tags[${n}_TYPE]' <a href="'$values[$n]'">'$values[$n]'</a></span>'
+    echo '    <input class="item IMPP" name="IMPP" value="'$values[$n]'" />'
   done
   echo '  </div>'
   echo ''
   echo '  <div class="section address">'
   echo '    <span class="sectitle">'$(l10n ADR)'</span>'
   for n in ADR ADR{0..10}; do [ -n "$values[$n]" ] &&\
-    echo '    <span class="item ADR">'$values[$n]'</span>'
+    echo '    <textarea class="item ADR" name="ADR">'$values[$n]'</textarea>'
   done
   [ -n "$values[URL]" ] && \
     echo '    <span class="sectitle">'$(l10n URL)'</span>'
   for n in URL URL{0..10}; do [ -n "$values[$n]" ] &&\
-    echo '    <span class="item URL"><a href="'$values[$n]'">'$values[$n]'</a></span>'
+    echo '    <input class="item URL" name="URL" value="'$values[$n]'" />'
   done
   echo '  </div>'
   echo ''
   echo '  <div class="section note">'
   echo '    <span class="sectitle">'$(l10n NOTE)'</span>'
   for n in NOTE NOTE{0..10}; do [ -n "$values[$n]" ] &&\
-    echo '    <span class="item IMPP">'$values[$n]'</span>'
+    echo '    <textarea class="item NOTE" name="NOTE">'$values[$n]'</textarea>'
   done
   echo '  </div>'
   echo ''

diff --git a/templates/view_attendee.sh b/templates/view_attendee.sh
index c8a80fb1b623784d3fa1e0eaa572709e0df29d10..40f09926914ffd608f98b2857ba292850e7f41d0 100755 (executable)
--- a/templates/view_attendee.sh
+++ b/templates/view_attendee.sh
@@ -27,7 +27,8 @@ print_card() {
   echo '  </div>'
   echo ''
   echo '  <div class="section message">'
-  echo '    <span class="sectitle">'$(l10n EMAIL)'</span>'
+  [ -n "$values[EMAIL]" ] && \
+    echo '    <span class="sectitle">'$(l10n EMAIL)'</span>'
   for n in EMAIL EMAIL{0..10}; do [ -n "$values[$n]" ] &&\
     echo '    <span class="item EMAIL"><a href="mailto:'$values[$n]'">'$values[$n]'</a></span>'
   done
@@ -53,7 +54,7 @@ print_card() {
   echo '  <div class="section note">'
   echo '    <span class="sectitle">'$(l10n NOTE)'</span>'
   for n in NOTE NOTE{0..10}; do [ -n "$values[$n]" ] &&\
-    echo '    <span class="item IMPP">'$values[$n]'</span>'
+    echo '    <span class="item NOTE">'$values[$n]'</span>'
   done
   echo '  </div>'
   echo ''