<<LIST<?> tag addopted.

diff --git a/htdocs/cgi-bin/config.cgi b/htdocs/cgi-bin/config.cgi
index 5b77584e6684357b04917b53084f92d458d021f7..3db4f28310d5a4fa9399f2ff685e45b9a9410226 100755 (executable)
--- a/htdocs/cgi-bin/config.cgi
+++ b/htdocs/cgi-bin/config.cgi
@@ -363,6 +363,9 @@ my $prc_hdr = $PRC_WIDTH-2;
                                        <b>&#60;&#60;TITLE&#60;<i>{Title Text}</i><b>&#62;</b>
                                        </p>
                                        <p>
+                                       <b>&#60;&#60;LIST&#60;<i>{List of items delimited by new line to terminate item or with '~' otherwise.}</i><b>&#62;</b>
+                                       </p>
+                                       <p>
                                        <b>&#60;&#60;IMG&#60;<i>{url to image}</i><b>&#62;</b>
                                        </p>
                                        <p>

diff --git a/htdocs/cgi-bin/main.cgi b/htdocs/cgi-bin/main.cgi
index efbd4a39f95d347e32da5e7dca8cd208d1756d7a..f4dcf167f0e2b9d3547b525ccd1729c6c77808b8 100755 (executable)
--- a/htdocs/cgi-bin/main.cgi
+++ b/htdocs/cgi-bin/main.cgi
@@ -319,7 +319,7 @@ while ( my @row = $st->fetchrow_array() ) {
       my $ct  = $hshCats{ $row[1] };
       my $dt  = DateTime::Format::SQLite->parse_datetime( $row[2] );
       my $log = $row[3];
-      my $amm = camm(sprintf "%.2f", $row[4]);
+      my $am = &cam(sprintf "%.2f", $row[4]);
       my $rtf = $row[4];
 
       #Apostrophe in the log value is doubled to avoid SQL errors.
@@ -331,8 +331,8 @@ while ( my @row = $st->fetchrow_array() ) {
       if ( !$dt ) {
           $dt = $today;
       }
-      if ( !$amm ) {
-          $amm = "0.00";
+      if ( !$am ) {
+          $am = "0.00";
       }
       if ( $tbl_rc_prev == 0 ) {
           $tbl_rc_prev = $id;
@@ -420,6 +420,7 @@ while ( my @row = $st->fetchrow_array() ) {
             }
             $log = join( '', @chnks );
       }
+
       while ( $log =~ /<<B</ ) {
           my $idx = $-[0];
           my $len = index( $log, '>', $idx ) - 4;
@@ -447,10 +448,23 @@ while ( my @row = $st->fetchrow_array() ) {
           my $len = index( $log, '>', $idx ) - 7;
           my $lst = substr( $log, $idx + 7, $len - $idx );
           my $sub = "";        
-          my @arr = split(/\n/, $lst);
+          my @arr = split(/\n|\\n/, $lst);
+          my $ml  = "";
           foreach my $ln (@arr) {
               $ln =~ s/^\s*//g;
-              $sub .= "<li>$ln</li>" if length($ln)>0;
+              if($ln =~ /~$/){
+                  $ln =~ s/~$/<br>/g;
+                  $ml .= $ln.' ';
+              }else{
+                if($ml) {
+                    $ml .= $ln  if length($ln)>0;
+                    $sub .= "<li>$ml</li>\n";
+                    $ml = "";
+                }
+                else{
+                    $sub .= "<li>$ln</li>" if length($ln)>0;
+                }
+              }
           }
           
           $sub = "<div id='rz'><ul>$sub</ul></div>";
@@ -463,19 +477,10 @@ while ( my @row = $st->fetchrow_array() ) {
       $log =~ s/\\n/<br>/gs;
 
       if ( $CID_EVENT == $row[1] ) {
-          $log = "<font color='#eb4848' style='font-weight:bold'>$log</font>";
+          $log = "<font color='#eb4848' style='font-weight:bold'>$log</font>";$tagged = 1;
       }
       elsif ( 1 == $row[1] ) {
-          $log ="<font color='midnightblue' style='font-weight:bold;font-style:italic'>$log</font>";
-      }
-
-      my ( $dty, $dtf ) = $dt->ymd;
-      my $dth = $dt->hms;
-      if ( $DATE_UNI == 1 ) {
-          $dtf = $dty;
-      }
-      else {
-          $dtf = $lang->time2str( "%d %b %Y", $dt->epoch, $TIME_ZONE);
+          $log ="<font color='midnightblue' style='font-weight:bold;font-style:italic'>$log</font>";$tagged = 1;
       }
 
       #Tagged preserve originally stored entry in hidden numbered field.
@@ -483,17 +488,28 @@ while ( my @row = $st->fetchrow_array() ) {
               $log_orig =~ s/</&#60;/g;
               $log_orig =~ s/>/&#62;/g;
               $log_orig =~ s/\n/&#10;/g;
+              $log_orig =~ s/\\n/&#10;/g;
               $log_orig =~ s/\t/&#9;/g;
               $log_orig =~ s/\"/&#34;/g;
               $log_orig =~ s/\'/&#39;/g;
               $tags .= qq(<input type="hidden" id="g$id" value="$log_orig"/>\n);
       }
 
+      my ( $dty, $dtf ) = $dt->ymd;
+      my $dth = $dt->hms;
+      if ( $DATE_UNI == 1 ) {
+          $dtf = $dty;
+      }
+      else {
+          $dtf = $lang->time2str( "%d %b %Y", $dt->epoch, $TIME_ZONE);
+      }
+
+
       $tbl .= qq(<tr class="r$tfId">
                <td width="15%">$dtf<input id="y$id" type="hidden" value="$dty"/></td>
                <td id="t$id" width="10%" class="tbl">$dth</td>
                <td id="v$id" class="log" width="40%">$log</td>
-               <td id="a$id" width="10%" class="tbl">$amm</td>
+               <td id="a$id" width="10%" class="tbl">$am</td>
                <td id="c$id" width="10%" class="tbl">$ct</td>
                <td width="20%">
         <input id="r$id" type="hidden" value="$rtf"/>
@@ -722,7 +738,7 @@ sub processSubmit {
       my $log  = $cgi->param('log');
       my $cat  = $cgi->param('ec')
         ;    #Used to be cat v.1.3, tag id and name should be kept same.
-      my $amm = $cgi->param('am');
+      my $am = $cgi->param('am');
 
       my $edit_mode = $cgi->param('submit_is_edit');
       my $view_mode = $cgi->param('submit_is_view');
@@ -747,7 +763,7 @@ sub processSubmit {
                           LOG='"
                 . $log
                 . "', AMMOUNT='"
-                . $amm
+                . $am
                 . "' WHERE rowid="
                 . $edit_mode . ";";
               my $st = $db->prepare($stm);
@@ -794,7 +810,7 @@ sub processSubmit {
               }
 
               $st = $db->prepare('INSERT INTO LOG VALUES (?,?,?,?,?)');             
-              $st->execute( $cat, $date, $log, $amm, $rtf );
+              $st->execute( $cat, $date, $log, $am, $rtf );
               #
               # After Insert renumeration check
               #
@@ -1008,11 +1024,11 @@ sub getConfiguration {
     }
 }
 
-sub camm {
-            my $amm = sprintf("%.2f", shift @_);
+sub cam {
+            my $am = sprintf("%.2f", shift @_);
             # Add one comma each time through the do-nothing loop
-            1 while $amm =~ s/^(-?\d+)(\d\d\d)/$1,$2/;
-return $amm;
+            1 while $am =~ s/^(-?\d+)(\d\d\d)/$1,$2/;
+return $am;
 }
 
 sub quill {

diff --git a/htdocs/cgi-bin/wsrc/main.css b/htdocs/cgi-bin/wsrc/main.css
index b20cbe299c5362b45b1d8dfde7604c6b90dc20f1..c07d03bcd1576709c50da6de6ba1225990ae4bb7 100644 (file)
--- a/htdocs/cgi-bin/wsrc/main.css
+++ b/htdocs/cgi-bin/wsrc/main.css
@@ -201,7 +201,8 @@ img {
 }
 
 #editor-container {
-    height: 480px;
+    height: 140px;
+    max-height: 480px;
     border-top: 1px solid gray;
     border-right: 1px solid gray;
     background-color: #e6ffff;

diff --git a/htdocs/cgi-bin/wsrc/main.js b/htdocs/cgi-bin/wsrc/main.js
index 6ce971bc2b9087f83625d0cc1faa3a3034242157..5b1bd16c1854286672a3b9941b5e9613ef0a8482 100644 (file)
--- a/htdocs/cgi-bin/wsrc/main.js
+++ b/htdocs/cgi-bin/wsrc/main.js
@@ -237,7 +237,7 @@ function fix0(v) {
 }
 
 
-function decodeHTML(txt) {
+function decodeToHTMLText(txt) {
 
     txt = txt.replace("/&#60;/g", "<");
     txt = txt.replace("/&#62;/g", ">");
@@ -251,13 +251,7 @@ function decodeHTML(txt) {
     return txt;
 }
 
-function decodeToText(log) {
-
-    if (log.children.length > 0) {
-        log = log.children(0);
-    }
-
-    var txt = log.html();
+function decodeToText(txt) {
     txt = txt.replace(/<br\s*[\/]?>/gi, "\n");
     return txt;
 }
@@ -271,7 +265,7 @@ function edit(row) {
     var log = $("#v" + row); //log
     $("html, body").animate({ scrollTop: 0 }, "slow");
     if (tag.length) {
-        $("#el").val(decodeHTML(tag.val()));
+        $("#el").val(decodeToHTMLText(tag.val()));
 
     } else {
         $("#el").val(decodeToText(log));