From b0ab910afe1f7fec143a23e96c72e4f9a66db2bf Mon Sep 17 00:00:00 2001 From: paul Date: Wed, 1 Jun 2016 12:28:27 +0000 Subject: [PATCH] simplify distinction between attendees and clients svn path=/trunk/; revision=109 --- templates/attendees.css.sh | 228 ---------------------------------- templates/attendees.html.sh | 76 ------------ templates/cards.css.sh | 236 ++++++++++++++++++++++++++++++++++-- templates/cards.html.sh | 87 ++++++++++++- templates/clients.html.sh | 76 ------------ 5 files changed, 313 insertions(+), 390 deletions(-) delete mode 100755 templates/attendees.css.sh delete mode 100755 templates/attendees.html.sh delete mode 100755 templates/clients.html.sh diff --git a/templates/attendees.css.sh b/templates/attendees.css.sh deleted file mode 100755 index b7c800e..0000000 --- a/templates/attendees.css.sh +++ /dev/null @@ -1,228 +0,0 @@ -# Copyright 2014, 2015 Paul Hänsch -# -# This file is part of Confetti. -# -# Confetti is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Confetti is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Confetti. If not, see . - -cat <. - -check_type(){ - [ "${_GET[filtertype]}" = "$1" ] && echo 'checked="checked"' -} -check_order(){ - [ "${_GET[order]}" = "$1" ] && echo 'checked="checked"' -} - -edit="${_GET[edit]}" -[ \! -f "vcard/$edit" -a \! -f "temp/$edit" ] && edit='' -[ -z "${_GET[filtertype]}" ] && _GET[filtertype]="any" -[ -z "${_GET[order]}" ] && _GET[order]="firstname" - -cat < -

$(l10n filter_label)

- - -
-
- $(l10n filter_type): - - - - - - - -
-
- $(l10n filter_order): - - - -
- - - - -
- -
- -${edit:+$(edit_card "$edit")} -EOF - -listcards |grep ${edit:+-v} "$edit" \ -| while read card; do - cat <<-ENDCARD -
- $(view_card "$card")
- $(l10n edit) - $(l10n vcf_export) -
-
- ENDCARD -done - -# vi:set filetype=html: diff --git a/templates/cards.css.sh b/templates/cards.css.sh index 3edd4e2..b7c800e 100755 --- a/templates/cards.css.sh +++ b/templates/cards.css.sh @@ -1,8 +1,228 @@ -case $PROFILE in -medical) - . ${0%/*}/attendees.css.sh -;; -circus) - . ${0%/*}/attendees.css.sh -;; -esac +# Copyright 2014, 2015 Paul Hänsch +# +# This file is part of Confetti. +# +# Confetti is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Confetti is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with Confetti. If not, see . + +cat <. + +check_type(){ + [ "${_GET[filtertype]}" = "$1" ] && echo 'checked="checked"' +} +check_order(){ + [ "${_GET[order]}" = "$1" ] && echo 'checked="checked"' +} + +edit="${_GET[edit]}" +[ \! -f "vcard/$edit" -a \! -f "temp/$edit" ] && edit='' +[ -z "${_GET[filtertype]}" ] && _GET[filtertype]="any" + case $PROFILE in medical) view_card=${0%/*}/view_client.sh edit_card=${0%/*}/edit_client.sh - . ${0%/*}/clients.html.sh + _GET[order]="${_GET[order]:-lastname}" + profile_medical=x ;; circus) view_card=${0%/*}/view_attendee.sh edit_card=${0%/*}/edit_attendee.sh - . ${0%/*}/attendees.html.sh + _GET[order]="${_GET[order]:-firstname}" + profile_circus=x ;; esac + +cat < +

$(l10n filter_label)

+ + +
+
+ $(l10n filter_type): + + + + + + + ${profile_circus:+ + + } +
+
+ $(l10n filter_order): + + + +
+ + + + +
+ +
+ +${edit:+$(edit_card "$edit")} +EOF + +listcards |grep ${edit:+-v} "$edit" \ +| while read card; do + cat <<-ENDCARD +
+ $(view_card "$card")
+ $(l10n edit) + $(l10n vcf_export) + ${profile_medical:+ + $(l10n new_prescription) + } +
+
+ ENDCARD +done + +# vi:set filetype=html: diff --git a/templates/clients.html.sh b/templates/clients.html.sh deleted file mode 100755 index aef2c96..0000000 --- a/templates/clients.html.sh +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 2014 - 2016 Paul Hänsch -# -# This file is part of Confetti. -# -# Confetti is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Confetti is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Confetti. If not, see . - -check_type(){ - [ "${_GET[filtertype]}" = "$1" ] && echo 'checked="checked"' -} -check_order(){ - [ "${_GET[order]}" = "$1" ] && echo 'checked="checked"' -} - -edit="${_GET[edit]}" -[ \! -f "vcard/$edit" -a \! -f "temp/$edit" ] && edit='' -[ -z "${_GET[filtertype]}" ] && _GET[filtertype]="any" -[ -z "${_GET[order]}" ] && _GET[order]="lastname" - -cat < -

$(l10n filter_label)

- - -
-
- $(l10n filter_type): - - - - - - -
-
- $(l10n filter_order): - - - -
- - - - -
- -
- -${edit:+$(edit_card "$edit")} -EOF - -listcards |grep ${edit:+-v} "$edit" \ -| while read card; do - cat <<-ENDCARD -
- $(view_card "$card")
- $(l10n edit) - $(l10n vcf_export) - $(l10n new_prescription) -
-
- ENDCARD -done - -# vi:set filetype=html: -- 2.39.2