Commit of recent work in preperation for Kiriwrite 0.5.0

[kiriwrite/.git] / cgi-files / Modules / Presentation / HTML4S.pm

diff --git a/cgi-files/Modules/Presentation/HTML4S.pm b/cgi-files/Modules/Presentation/HTML4S.pm
index 74d7004..99fb0ea 100644 (file)
--- a/cgi-files/Modules/Presentation/HTML4S.pm
+++ b/cgi-files/Modules/Presentation/HTML4S.pm
@@ -21,7 +21,7 @@
 
 # Define the package (perl module) name.
 
-package Kiriwrite::Presentation::HTML4S;
+package Modules::Presentation::HTML4S;
 
 # Enable strict and use warnings.
 
@@ -30,7 +30,7 @@ use warnings;
 
 # Set the following values.
 
-our $VERSION = "0.1.0";
+our $VERSION = "0.5.0";
 my $pagedata = "";
 my $tablevel = 0;
 
@@ -44,7 +44,7 @@ sub new{
 #                                                                              #
 # Usage:                                                                       #
 #                                                                              #
-# $presmodule = Modules::Output::HTML4S->new();                                        #
+# $presmodule = Kiriwrite::Presentation::HTML4S->new();                                #
 #################################################################################
        
        # Get the perl module name.
@@ -1035,6 +1035,7 @@ sub addinputbox{
 # MaxLength    Specifies the maximum length of the input text box.             #
 # Style                Specifies the CSS style to use.                                 #
 # Value                Specifies a value for the input box.                            #
+# Password     Specifies the input box is a password box.                      #
 #################################################################################
 
        # Get the options recieved.
@@ -1242,7 +1243,7 @@ sub addtextbox{
        }       
 
        $tagdata = $tagdata . ">";
-       $tagdata = $tagdata . $value;
+       $tagdata = $tagdata . $class->convert($value, "content");
        $tagdata = $tagdata . "</textarea>" . "\r\n";
 
        # Append the tag data to the page data.
@@ -1785,7 +1786,7 @@ sub addboldtext{
        # Add some bold text.
 
        if ($style ne ""){
-               $tagdata = $tagdata . "<span class=\"\">" . $class->convert($text, "content") . "</span>";
+               $tagdata = $tagdata . "<span class=\"" . $style . "\">" . $class->convert($text, "content") . "</span>";
        } else {
                $tagdata = $tagdata . "<b>" . $class->convert($text, "content") . "</b>";
        }