public/ws-vacation Changeset - r25:96a33a39362a

Changeset - r25:96a33a39362a

Parent rev.

Child rev.

[Not reviewed]

default

1 16 3

Wolfgang Scherer (ws) - 13 years ago 2012-03-31 20:39:11
wolfgang.scherer@gmx.de

index.php: Expert mode to use pre-formatted email implemented.

13 files changed:

README.txt

doc/Makefile

doc/README-de.html

doc/README-de.pdf

doc/README-de.txt

doc/README.html

doc/README.pdf

doc/index.txt

doc/ws-vacation-expert-t.jpg

bin+new file

doc/ws-vacation-expert.jpg

bin+new file

doc/ws-vacation-t.jpg

bin+mod

doc/ws-vacation-user-t.jpg

bin+mod

doc/ws-vacation-user.jpg

bin+mod

Changeset was too big and was cut off... Show full diff anyway

0 comments (0 inline, 0 general)

README.txt

➞

Show inline comments

@@ @@ -93,6 +93,9 @@ It is possible to fine-tune the standard @@
 * $INVALID_USERS: invalid users, which are always ignored.
 * $ADMIN_USERS: administrators.
 The configuraton setting `$EXPERT_ENABLED` allows to globally disable
 *Expert Mode*.
 The file `lib/language.php` contains language specific translation and
 also the default vacation(1) message text.

doc/Makefile

➞

Show inline comments

@@ @@ -19,9 +19,10 @@ HTML_TXTS += README-GFDL.txt @@
 HTML_TXTS += README-COPYING.txt
 JPGS += ws-vacation.jpg
 JPGS += ws-vacation-t.jpg
 JPGS += ws-vacation-user.jpg
 JPGS += ws-vacation-user-t.jpg
 JPGS += ws-vacation-expert.jpg
 JPG_THUMBS = $(patsubst %.jpg, %-t.jpg, $(JPGS))
 # use cp for Windows
 LN_S = cp
@@ @@ -39,7 +40,8 @@ DISTFILES += Makefile @@
 DISTFILES += $(TXTS)
 DISTFILES += $(TXT_PDFS)
 DISTFILES += $(TXT_HTMLS)
 DISTFILES += $(JPEGS)
 DISTFILES += $(JPGS)
 DISTFILES += $(JPG_THUMBS)
 DISTFILES += $(EXTRA_DIST)
 %: %.in
@@ @@ -54,6 +56,9 @@ DISTFILES += $(EXTRA_DIST) @@
 	cat $< | PYTHONPATH="$$( pwd )" tools/ws_rst2pdf -e ws_docutils.raw_role >$@
 	test -s $@ || (rm -f $@ && exit 1)
 %-t.jpg: %.jpg
 	convert $< -resize 200 $@
 default: all
 index.html: index.txt index-template.txt docutils.conf
@@ @@ -88,6 +93,11 @@ install: all @@
 	    echo "cp $$file $(install_dir)/";		\
 	    cp $$file $(install_dir)/;			\
 	done;						\
 	list='$(JPG_THUMBS)'; test -z "$$list" ||	\
 	for file in $$list; do				\
 	    echo "cp $$file $(install_dir)/";		\
 	    cp $$file $(install_dir)/;			\
 	done;						\
 	)						\
+	)

doc/README-de.html

➞

Show inline comments

@@ @@ -111,6 +111,8 @@ Grundeinstellungen:</p> @@
 <li>$INVALID_USERS: Ungültige Benutzer.</li>
 <li>$ADMIN_USERS: Administratoren.</li>
 </ul>
 <p>Über die Konfiguratonseinstellung <cite>$EXPERT_ENABLED</cite> kann der
 <em>Expertenmodus</em> global ausgeschaltet werden.</p>
 <p>Die Vorlage für einen neuen Abwesenheitstext ist in der Datei
 <cite>lib/language.php</cite> zu finden.</p>
 <p>HTML Kopf- und Fußabschnitt sind in der Datei <cite>lib/templates.php</cite>.</p>

doc/README-de.pdf

➞

Show inline comments

@@ @@ -228,9 +228,9 @@ 16 0 obj @@
 ]
  /Rect [ 251.1715
-.5736
+.5736
 .0215
-.5736 ]
+.5736 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ @@ -243,9 +243,9 @@ 17 0 obj @@
 ]
  /Rect [ 448.1127
-.5736
+.5736
 .179
-.5736 ]
+.5736 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ @@ -258,9 +258,9 @@ 18 0 obj @@
 ]
  /Rect [ 62.69291
-.5736
+.5736
 .58291
-.5736 ]
+.5736 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ @@ -298,7 +298,7 @@ endobj @@
 % 'R21': class PDFInfo
 0 obj
 << /Author (Wolfgang Scherer)
- /CreationDate (D:20120331141359-01'00')
+ /CreationDate (D:20120331201430-01'00')
  /Creator (\(unspecified\))
  /Keywords ()
  /Producer (ReportLab PDF Library - www.reportlab.com)
@@ @@ -753,7 +753,7 @@ endobj @@
 % 'R28': class PDFStream
 0 obj
 % page stream
-<< /Length 3892 >>
+<< /Length 4183 >>
 stream
 0 0 1 0 0 cm  BT /F1 12 Tf 14.4 TL ET
+q
@@ @@ -908,38 +908,44 @@ q @@
 0 0 1 62.69291 519.8236 cm
+Q
+q
 0 0 1 62.69291 501.8236 cm
 0 0 1 62.69291 489.8236 cm
+q
 BT 1 0 0 1 0 14 Tm 1.34872 Tw 12 TL /F1 10 Tf 0 0 0 rg (\334ber die Konfiguratonseinstellung ) Tj /F4 10 Tf ($EXPERT_ENABLED ) Tj /F1 10 Tf (kann der ) Tj /F4 10 Tf (Expertenmodus ) Tj /F1 10 Tf (global ausgeschaltet) Tj T* 0 Tw (werden.) Tj T* ET
+Q
+Q
+q
 0 0 1 62.69291 471.8236 cm
+q
 BT 1 0 0 1 0 2 Tm 12 TL /F1 10 Tf 0 0 0 rg (Die Vorlage f\374r einen neuen Abwesenheitstext ist in der Datei ) Tj /F4 10 Tf (lib/language.php ) Tj /F1 10 Tf (zu finden.) Tj T* ET
+Q
+Q
+q
-0 0 1 62.69291 483.8236 cm
+0 0 1 62.69291 453.8236 cm
+q
 BT 1 0 0 1 0 2 Tm 12 TL /F1 10 Tf 0 0 0 rg (HTML Kopf- und Fu\337abschnitt sind in der Datei ) Tj /F4 10 Tf (lib/templates.php) Tj /F1 10 Tf (.) Tj T* ET
+Q
+Q
+q
-0 0 1 62.69291 465.8236 cm
+0 0 1 62.69291 435.8236 cm
+q
 0 0 rg
 BT 1 0 0 1 0 2 Tm /F2 10 Tf 12 TL (Copyright) Tj T* ET
+Q
+Q
+q
-0 0 1 62.69291 435.8236 cm
+0 0 1 62.69291 405.8236 cm
+q
 BT 1 0 0 1 0 14 Tm 1.40372 Tw 12 TL /F1 10 Tf 0 0 0 rg (Copyright \(C\) 2012, Wolfgang Scherer, <) Tj 0 0 .501961 rg (sw@wiedenmann-seile.de) Tj 0 0 0 rg (>) Tj (. Sponsored by ) Tj 0 0 .501961 rg (Wiedenmann-Seile) Tj T* 0 Tw (GmbH) Tj 0 0 0 rg (.) Tj T* ET
+Q
+Q
+q
-0 0 1 62.69291 405.8236 cm
+0 0 1 62.69291 375.8236 cm
+q
 BT 1 0 0 1 0 14 Tm 1.131647 Tw 12 TL /F1 10 Tf 0 0 0 rg (Siehe Abschnitt ) Tj /F4 10 Tf (GNU Free Documentation License ) Tj /F1 10 Tf (in der Datei ) Tj /F4 10 Tf (GFDL.txt ) Tj /F1 10 Tf (f\374r Nutzungsbedingungen der) Tj T* 0 Tw (Dokumentation.) Tj T* ET
+Q
+Q
+q
-0 0 1 62.69291 375.8236 cm
+0 0 1 62.69291 345.8236 cm
+q
 BT 1 0 0 1 0 14 Tm 2.56748 Tw 12 TL /F1 10 Tf 0 0 0 rg (Siehe Abschnitt ) Tj /F4 10 Tf (GNU General Public License ) Tj /F1 10 Tf (in der Datei ) Tj /F4 10 Tf (COPYING ) Tj /F1 10 Tf (f\374r Nutzungsbedingungen des) Tj T* 0 Tw (Programms.) Tj T* ET
+Q
@@ @@ -998,17 +1004,17 @@ 0000005444 00000 n @@
 0000005598 00000 n
 0000005715 00000 n
 0000012937 00000 n
 0000016932 00000 n
 0000017038 00000 n
 0000017115 00000 n
 0000017223 00000 n
 0000017329 00000 n
 0000017406 00000 n
 trailer
 << /ID
  % ReportLab generated PDF document -- digest (http://www.reportlab.com)
- [(\000\257\177\373F\374\340\234t|\342\011R\\%\346) (\000\257\177\373F\374\340\234t|\342\011R\\%\346)]
+ [(.b\264HGI\304JB$\323S\004\011\177c) (.b\264HGI\304JB$\323S\004\011\177c)]
  /Info 21 0 R
  /Root 20 0 R
  /Size 32 >>
 startxref
 %%EOF

doc/README-de.txt

➞

Show inline comments

@@ @@ -99,6 +99,9 @@ Grundeinstellungen: @@
 * $INVALID_USERS: Ungültige Benutzer.
 * $ADMIN_USERS: Administratoren.
 Über die Konfiguratonseinstellung `$EXPERT_ENABLED` kann der
 *Expertenmodus* global ausgeschaltet werden.
 Die Vorlage für einen neuen Abwesenheitstext ist in der Datei
 `lib/language.php` zu finden.

doc/README.html

➞

Show inline comments

@@ @@ -103,6 +103,8 @@ repeated to update the <cite>.htpasswd</ @@
 <li>$INVALID_USERS: invalid users, which are always ignored.</li>
 <li>$ADMIN_USERS: administrators.</li>
 </ul>
 <p>The configuraton setting <cite>$EXPERT_ENABLED</cite> allows to globally disable
 <em>Expert Mode</em>.</p>
 <p>The file <cite>lib/language.php</cite> contains language specific translation and
 also the default vacation(1) message text.</p>
 <p>The HTML header and footer can be modified in <cite>lib/templates.php</cite>.</p>

doc/README.pdf

➞

Show inline comments

@@ @@ -212,9 +212,9 @@ 15 0 obj @@
 ]
  /Rect [ 251.1715
-.8161
+.8161
 .0215
-.8161 ]
+.8161 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ @@ -227,9 +227,9 @@ 16 0 obj @@
 ]
  /Rect [ 448.1127
-.8161
+.8161
 .179
-.8161 ]
+.8161 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ @@ -242,9 +242,9 @@ 17 0 obj @@
 ]
  /Rect [ 62.69291
-.8161
+.8161
 .58291
-.8161 ]
+.8161 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ @@ -282,7 +282,7 @@ endobj @@
 % 'R20': class PDFInfo
 0 obj
 << /Author ()
- /CreationDate (D:20120331141358-01'00')
+ /CreationDate (D:20120331201430-01'00')
  /Creator (\(unspecified\))
  /Keywords ()
  /Producer (ReportLab PDF Library - www.reportlab.com)
@@ @@ -721,7 +721,7 @@ endobj @@
 % 'R27': class PDFStream
 0 obj
 % page stream
-<< /Length 4093 >>
+<< /Length 4335 >>
 stream
 0 0 1 0 0 cm  BT /F1 12 Tf 14.4 TL ET
+q
@@ @@ -881,38 +881,44 @@ q @@
 0 0 1 62.69291 517.0661 cm
+Q
+q
 0 0 1 62.69291 487.0661 cm
 0 0 1 62.69291 499.0661 cm
+q
 BT 1 0 0 1 0 2 Tm 12 TL /F1 10 Tf 0 0 0 rg (The configuraton setting ) Tj /F4 10 Tf ($EXPERT_ENABLED ) Tj /F1 10 Tf (allows to globally disable ) Tj /F4 10 Tf (Expert Mode) Tj /F1 10 Tf (.) Tj T* ET
+Q
+Q
+q
 0 0 1 62.69291 469.0661 cm
+q
 BT 1 0 0 1 0 14 Tm .526647 Tw 12 TL /F1 10 Tf 0 0 0 rg (The file ) Tj /F4 10 Tf (lib/language.php ) Tj /F1 10 Tf (contains language specific translation and also the default vacation\(1\) message) Tj T* 0 Tw (text.) Tj T* ET
+Q
+Q
+q
-0 0 1 62.69291 469.0661 cm
+0 0 1 62.69291 451.0661 cm
+q
 BT 1 0 0 1 0 2 Tm 12 TL /F1 10 Tf 0 0 0 rg (The HTML header and footer can be modified in ) Tj /F4 10 Tf (lib/templates.php) Tj /F1 10 Tf (.) Tj T* ET
+Q
+Q
+q
-0 0 1 62.69291 451.0661 cm
+0 0 1 62.69291 433.0661 cm
+q
 0 0 rg
 BT 1 0 0 1 0 2 Tm /F2 10 Tf 12 TL (Copyright) Tj T* ET
+Q
+Q
+q
-0 0 1 62.69291 421.0661 cm
+0 0 1 62.69291 403.0661 cm
+q
 BT 1 0 0 1 0 14 Tm 1.40372 Tw 12 TL /F1 10 Tf 0 0 0 rg (Copyright \(C\) 2012, Wolfgang Scherer, <) Tj 0 0 .501961 rg (sw@wiedenmann-seile.de) Tj 0 0 0 rg (>) Tj (. Sponsored by ) Tj 0 0 .501961 rg (Wiedenmann-Seile) Tj T* 0 Tw (GmbH) Tj 0 0 0 rg (.) Tj T* ET
+Q
+Q
+q
-0 0 1 62.69291 403.0661 cm
+0 0 1 62.69291 385.0661 cm
+q
 BT 1 0 0 1 0 2 Tm 12 TL /F1 10 Tf 0 0 0 rg (See ) Tj /F4 10 Tf (GNU Free Documentation License ) Tj /F1 10 Tf (in file ) Tj /F4 10 Tf (GFDL.txt ) Tj /F1 10 Tf (for license conditions for the documentation.) Tj T* ET
+Q
+Q
+q
-0 0 1 62.69291 385.0661 cm
+0 0 1 62.69291 367.0661 cm
+q
 BT 1 0 0 1 0 2 Tm 12 TL /F1 10 Tf 0 0 0 rg (See ) Tj /F4 10 Tf (GNU General Public License ) Tj /F1 10 Tf (in file ) Tj /F4 10 Tf (COPYING ) Tj /F1 10 Tf (for license conditions for the program.) Tj T* ET
+Q
@@ @@ -970,17 +976,17 @@ 0000005167 00000 n @@
 0000005325 00000 n
 0000005442 00000 n
 0000012500 00000 n
 0000016696 00000 n
 0000016802 00000 n
 0000016879 00000 n
 0000016938 00000 n
 0000017044 00000 n
 0000017121 00000 n
 trailer
 << /ID
  % ReportLab generated PDF document -- digest (http://www.reportlab.com)
- [(c3\350\001\203\206\012\013\323\346_P\302\031\210\265) (c3\350\001\203\206\012\013\323\346_P\302\031\210\265)]
+ [(\305\365\347\336\255\317X\216\2051RpGW\225\234) (\305\365\347\336\255\317X\216\2051RpGW\225\234)]
  /Info 20 0 R
  /Root 19 0 R
  /Size 31 >>
 startxref
 %%EOF

doc/index.txt

➞

Show inline comments

@@ @@ -58,37 +58,70 @@ deleted. @@
 :rem:`|||:sec:|||`\ Screenshot
 ==================================================
 ============= =======================================================
 |imageuser|_  Regular user interface:
 	      - the user cannot be changed
 	      - the link to the manual is omitted
 ============== =======================================================
 |imageuser|_   Regular user interface:
                - the user cannot be changed
                - the link to the manual is omitted
 |imageadmin|_  Administrator interface.
 |imageadmin|_ Administrator interface.
 	      - the user can be selected
 	      - a link to the administrator manual is shown
 ============= =======================================================
                - the user can be selected
                - a link to the administrator manual is shown
 |imageexpert|_ *Expert Mode* active.
                - *Automatic Conversion* mode no longer available
                - Use **Clear** to load default message and enable
                  \ *Automatic Conversion* mode.
 ============== =======================================================
 ==================================================
 :rem:`|||:sec:|||`\ Features
 ==================================================
 The edited message is converted to a message file using
 - In *Automatic Conversion* mode the edited message is converted to a
   message file using
   - Content-Type: text/plain; charset="utf-8"
   - Content-Transfer-Encoding: quoted-printable
   Therefore international characters do not pose a problem.
 - Content-Type: text/plain; charset="utf-8"
 - Content-Transfer-Encoding: quoted-printable
 - In *Expert Mode*, a preformatted mail can be used.
 - If the filter is activated, file $HOME/.forward is created from the
   settings, otherwise the .forward file is deleted.
 Therefore international characters do not pose a problem.
 - The program comes with a preconfigured sudoers(5) configuration file,
   which allows the www server user to execute the vacation(1) command on
   behalf of a system user.
 - There is also an apache2(8) configuration file included.
 If the filter is activated, file $HOME/.forward is created from the
 settings, otherwise the .forward file is deleted.
 ==================================================
 :rem:`|||:sec:|||`\ Expert Mode
 ==================================================
 In *Expert Mode*, a preformatted mail can be used.
 You can, e.g., compose a multipart/alternative mail that contains both
 plain text and HTML in your favorite mail client. (Thunderbird does an
 excellent job). Make sure to use character set UTF-8!
 The program comes with a preconfigured sudoers(5) configuration file,
 which allows the www server user to execute the vacation(1) command on
 behalf of a system user.
 - Save the mail in a file or view the source code.
 - Copy and paste the mail source into the expert text area.
 - Save the mail.
 - Since a standard set of inapplicable email headers is removed upon
   saving, you can edit the result to clean up the rest.
 There is also an apache2(8) configuration file included.
 .. note:: Once a mail is saved in *Expert Mode*, *Automatic
    Conversion* mode is no longer available. Use the **Clear** button
    to go back to the internal defaults, which also restores *Automatic
    Conversion* mode.
 The configuraton setting `$EXPERT_ENABLED` in `lib/config.php` allows
 to globally disable *Expert Mode*.
 ==================================================
 :rem:`|||:sec:|||`\ Source Code and Installation
@@ @@ -119,6 +152,8 @@ See the `Administrator Manual`_ for inst @@
 .. _imageuser: ws-vacation-user.jpg
 .. |imageadmin|  image:: ws-vacation-t.jpg
 .. _imageadmin: ws-vacation.jpg
 .. |imageexpert|  image:: ws-vacation-expert-t.jpg
 .. _imageexpert: ws-vacation-expert.jpg
 .. _`Administrator Manual`: README.html
 .. _`ws-vacation`: https://bitbucket.org/wolfmanx/ws-vacation

doc/ws-vacation-expert-t.jpg

➞

Show inline comments

		new file 100644
		binary diff not shown

Show images

doc/ws-vacation-expert.jpg

➞

Show inline comments

		new file 100644
		binary diff not shown

Show images

doc/ws-vacation-t.jpg

➞

Show inline comments

binary diff not shown

Show images

doc/ws-vacation-user-t.jpg

➞

Show inline comments

binary diff not shown

Show images

doc/ws-vacation-user.jpg

➞

Show inline comments

binary diff not shown

Show images

Changeset was too big and was cut off... Show full diff anyway

0 comments (0 inline, 0 general)