diff --git a/doc/elog.css b/doc/elog.css index c32f1998..7c653a5e 100755 --- a/doc/elog.css +++ b/doc/elog.css @@ -1,23 +1,54 @@ - diff --git a/doc/wishlist.html b/doc/wishlist.html index 52ebf58a..986bd2b6 100755 --- a/doc/wishlist.html +++ b/doc/wishlist.html @@ -1,79 +1,103 @@ - - - ELOG FAQ - - - - - - - -
  ELOG Wishlist  
-

-

 Site map :   [Home]  -  [User's Guide]   [Administrator's - Guide]   [FAQ]  -  [Wishlist]   [DEMO]  -  [Download]  -
-

-

ELOG Wishlist
-
- Here are some "wishlist - " items requested by users. I will work down the list as time permits, starting - at the items with the most votes. You can vote for a feature, or suggest one, - by sending me an email. -

-

- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- FeatureVotes
- Implement groups of users6
- Password expiration1
- Account expiration1
- Make attributes which whould be displayd selectable in "Find" page1
- Convert elog text files into XML files and comma separated files with elconv1
- Implement multi-line attributes6
- Derive attribute options from list of entries of another logbook1
- Specify date format explicitly for substitutions, like $entry date{%Y}2
- Change attributes of whole thread, like mark a thread "open" or "closed"2
- Automatic unlocking of entries after a specific time period1
- Implement PAM authentification under Linux2
- Implement attributes which are math results from others, like att3=att1+att22
-
-

-

    -
-
-
  Content by - Stefan Ritt, Web pages by Fred - Pacquier - last modified on 31/01/2003  
- - + + + + ELOG FAQ + + + + + + + +
  ELOG Wishlist  
+

+
 Site map :   [Home]   [User's Guide]   [Administrator's Guide]   [FAQ]   [Wishlist]  + [DEMO]  + [Download] 
+

+
ELOG Wishlist
+
Here are some "wishlist" items requested by users. I will +work down the list as time permits, starting at the items with the most +votes. You can vote for a feature, or suggest one, by sending me an +email. +

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
FeatureVotes
Implement groups of users6
Password expiration1
Account expiration1
Make attributes which whould be displayd selectable in +"Find" page1
Convert elog text files into XML files and comma separated +files with elconv1
Implement multi-line attributes6
Derive attribute options from list of entries of another +logbook1
Specify date format explicitly for substitutions, like +$entry date{%Y}2
Change attributes of whole thread, like mark a thread "open" +or "closed"2
Automatic unlocking of entries after a specific time period1
Implement PAM authentification under Linux2
Implement attributes which are math results from others, +like att3=att1+att22
+
+

+
    +
+
+
  Content by Stefan Ritt, Web pages by Fred Pacquier - last +modified on 31/01/2003  
+ + diff --git a/src/elogd.c b/src/elogd.c index aab70b8a..aec71f5e 100755 --- a/src/elogd.c +++ b/src/elogd.c @@ -6,6 +6,9 @@ Contents: Web server program for Electronic Logbook ELOG $Log$ + Revision 1.617 2005/04/06 19:20:57 ritt + Version 2.5.8-3 + Revision 1.616 2005/04/06 19:12:25 ritt Fixed bug with lowercase conditions @@ -963,7 +966,7 @@ \********************************************************************/ /* Version of ELOG */ -#define VERSION "2.5.8-2" +#define VERSION "2.5.8-3" char cvs_revision[] = "$Id$"; /* ELOG identification */ @@ -14171,7 +14174,9 @@ void display_line(LOGBOOK * lbs, int message_id, int number, char *mode, if (is_ascii(file_name) && !chkext(attachment[index], ".PS") && !chkext(attachment[index], ".PDF") && - !chkext(attachment[index], ".EPS") && show_attachments) { + !chkext(attachment[index], ".EPS") && + !chkext(attachment[index], ".HTM") && + !chkext(attachment[index], ".HTML") && show_attachments) { /* display attachment */ rsprintf("
", colspan);
@@ -18687,7 +18692,8 @@ void show_elog_entry(LOGBOOK * lbs, char *dec_path, char *command)
 
                /* determine if displayed inline */
                display_inline = is_image(file_name) || is_ascii(file_name);
-               if (chkext(att, ".PS") || chkext(att, ".PDF") || chkext(att, ".EPS"))
+               if (chkext(att, ".PS") || chkext(att, ".PDF") || chkext(att, ".EPS") || 
+                   chkext(att, ".HTM") || chkext(att, ".HTML"))
                   display_inline = 0;
                if (file_exist(thumb_name))
                   display_inline = 1;