[Fmsystem-commits] [7651]

[Erik Holm-Larsen]

Revision: 7651
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7651
Author:   erikhl
Date:     2011-09-20 05:15:52 +0000 (Tue, 20 Sep 2011)
Log Message:
-----------


Modified Paths:
--------------
    trunk/controller/inc/class.uiprocedure.inc.php
    trunk/controller/setup/tables_current.inc.php
    trunk/controller/templates/base/css/base.css
    trunk/controller/templates/base/procedure_item.xsl

Modified: trunk/controller/inc/class.uiprocedure.inc.php
===================================================================
--- trunk/controller/inc/class.uiprocedure.inc.php      2011-09-19 21:29:49 UTC 
(rev 7650)
+++ trunk/controller/inc/class.uiprocedure.inc.php      2011-09-20 05:15:52 UTC 
(rev 7651)
@@ -106,9 +106,9 @@
                                if(isset($procedure)) // Edit procedure
                                {
                                        
$procedure->set_title(phpgw::get_var('title'));
-                                       
$procedure->set_purpose(phpgw::get_var('purpose'));
+                                       
$procedure->set_purpose(phpgw::get_var('purpose','html'));
                                        
$procedure->set_responsibility(phpgw::get_var('responsibility'));
-                                       
$procedure->set_description(phpgw::get_var('description'));
+                                       
$procedure->set_description(phpgw::get_var('description','html'));
                                        
$procedure->set_reference(phpgw::get_var('reference'));
                                        
$procedure->set_attachment(phpgw::get_var('attachment'));
                                        

Modified: trunk/controller/setup/tables_current.inc.php
===================================================================
--- trunk/controller/setup/tables_current.inc.php       2011-09-19 21:29:49 UTC 
(rev 7650)
+++ trunk/controller/setup/tables_current.inc.php       2011-09-20 05:15:52 UTC 
(rev 7651)
@@ -81,9 +81,9 @@
                        'fd' => array(
                                'id' => array('type' => 'auto','precision' => 
4,'nullable' => False),
                                'title' => array('type' => 'varchar', 
'precision' => 255, 'nullable' => False),
-                               'purpose' => array('type' => 'varchar', 
'precision' => 255, 'nullable' => True),
+                               'purpose' => array('type' => 'text', 'nullable' 
=> True),
                                'responsibility' => array('type' => 'varchar', 
'precision' => 255, 'nullable' => True),
-                               'description' => array('type' => 'varchar', 
'precision' => 255, 'nullable' => True),
+                               'description' => array('type' => 'text', 
'nullable' => True),
                                'reference' => array('type' => 'varchar', 
'precision' => 255, 'nullable' => True),
                                'attachment' => array('type' => 'varchar', 
'precision' => 255, 'nullable' => True)
                        ),

Modified: trunk/controller/templates/base/css/base.css
===================================================================
--- trunk/controller/templates/base/css/base.css        2011-09-19 21:29:49 UTC 
(rev 7650)
+++ trunk/controller/templates/base/css/base.css        2011-09-20 05:15:52 UTC 
(rev 7651)
@@ -163,7 +163,7 @@
 
 dl.proplist-col,
 dl.form-col {
-    width: 18em;
+/*    width: 18em; */
     float: left;
 }
 

Modified: trunk/controller/templates/base/procedure_item.xsl
===================================================================
--- trunk/controller/templates/base/procedure_item.xsl  2011-09-19 21:29:49 UTC 
(rev 7650)
+++ trunk/controller/templates/base/procedure_item.xsl  2011-09-20 05:15:52 UTC 
(rev 7651)
@@ -34,10 +34,10 @@
                                        <dd>
                                        <xsl:choose>
                                                <xsl:when test="editable">
-                                                       <textarea id="purpose" 
name="purpose" rows="5" cols="60"><xsl:value-of select="procedure/purpose" 
/></textarea>
+                                                       <textarea id="purpose" 
name="purpose" rows="5" cols="60"><xsl:value-of select="procedure/purpose" 
disable-output-escaping="yes"/></textarea>
                                                </xsl:when>
                                                <xsl:otherwise>
-                                                       <xsl:value-of 
select="procedure/purpose" />
+                                                       <xsl:value-of 
select="procedure/purpose" disable-output-escaping="yes"/>
                                                </xsl:otherwise>
                                        </xsl:choose>
                                        </dd>
@@ -60,10 +60,10 @@
                                        <dd>
                                        <xsl:choose>
                                                <xsl:when test="editable">
-                                                       <textarea 
id="description" name="description" rows="5" cols="60"><xsl:value-of 
select="procedure/description" /></textarea>
+                                                       <textarea 
id="description" name="description" rows="5" cols="60"><xsl:value-of 
select="procedure/description" disable-output-escaping="yes"/></textarea>
                                                </xsl:when>
                                                <xsl:otherwise>
-                                                       <xsl:value-of 
select="procedure/description" />
+                                                       <xsl:value-of 
select="procedure/description" disable-output-escaping="yes"/>
                                                </xsl:otherwise>
                                        </xsl:choose>
                                        </dd>