phpgroupware-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Phpgroupware-cvs] [18562] switch to PHP5 and cleanup entry form - still


From: Dave Hall
Subject: [Phpgroupware-cvs] [18562] switch to PHP5 and cleanup entry form - still WIP
Date: Sun, 01 Jun 2008 04:08:58 +0000

Revision: 18562
          
http://svn.sv.gnu.org/viewvc/?view=rev&root=phpgroupware&revision=18562
Author:   skwashd
Date:     2008-06-01 04:08:57 +0000 (Sun, 01 Jun 2008)

Log Message:
-----------
switch to PHP5 and cleanup entry form - still WIP

Modified Paths:
--------------
    trunk/notes/inc/class.uinotes.inc.php
    trunk/notes/templates/base/app_data.xsl

Modified: trunk/notes/inc/class.uinotes.inc.php
===================================================================
--- trunk/notes/inc/class.uinotes.inc.php       2008-06-01 01:55:56 UTC (rev 
18561)
+++ trunk/notes/inc/class.uinotes.inc.php       2008-06-01 04:08:57 UTC (rev 
18562)
@@ -31,15 +31,15 @@
        */
        class notes_uinotes
        {
-               var $grants;
-               var $cat_id;
-               var $start;
-               var $query;
-               var $sort;
-               var $order;
-               var $filter;
+               protected $grants;
+               protected $cat_id;
+               protected $start;
+               protected $query;
+               protected $sort;
+               protected $order;
+               protected $filter;
 
-               var $public_functions = array
+               public $public_functions = array
                (
                        'index'  => true,
                        'view'   => true,
@@ -78,7 +78,7 @@
                        $this->cat_id           = $this->bonotes->cat_id;
                }
 
-               function save_sessiondata()
+               protected function save_sessiondata()
                {
                        $data = array
                        (
@@ -92,7 +92,7 @@
                        $this->bonotes->save_sessiondata($data);
                }
 
-               function index()
+               public function index()
                {
                        $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang('notes') . ': ' . lang('list notes');
 
@@ -196,7 +196,7 @@
                        
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list' => $data));
                }
 
-               function edit()
+               public function edit()
                {
                        $note_id        = phpgw::get_var('note_id', 'int');
                        $values         = phpgw::get_var('values', 'string', 
'POST');
@@ -295,7 +295,7 @@
                        
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('edit' => $data));
                }
 
-               function delete()
+               public function delete()
                {
                        $note_id        = phpgw::get_var('note_id', 'int');
                        $delete         = phpgw::get_var('delete', 'bool', 
'POST');
@@ -337,7 +337,7 @@
                        
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('delete' => $data));
                }
 
-               function view()
+               public function view()
                {
                        $note_id        = phpgw::get_var('note_id', 'int', 
'GET');
                        $action         = phpgw::get_var('action', 'string', 
'GET');

Modified: trunk/notes/templates/base/app_data.xsl
===================================================================
--- trunk/notes/templates/base/app_data.xsl     2008-06-01 01:55:56 UTC (rev 
18561)
+++ trunk/notes/templates/base/app_data.xsl     2008-06-01 04:08:57 UTC (rev 
18562)
@@ -117,49 +117,45 @@
 <!-- add / edit -->
 
        <xsl:template match="edit">
-               <xsl:variable name="edit_url"><xsl:value-of select="edit_url" 
/></xsl:variable>
-               <form method="post" action="{$edit_url}">
-                       <table cellpadding="2" cellspacing="2" width="79%" 
align="center">
-                               <xsl:choose>
-                                       <xsl:when test="msgbox_data != ''">
-                                               <tr>
-                                                       <td align="center" 
colspan="3"><xsl:call-template name="msgbox" /></td>
-                                               </tr>
-                                       </xsl:when>
-                               </xsl:choose>
-                               <tr class="row_off">
-                                       <td colspan="2">
-                                               <xsl:value-of 
select="lang_category" />
-                                       </td>
-                                       <td>
-                                               <xsl:call-template 
name="categories" />
-                                       </td>
-                               </tr>
-                               <tr class="row_on">
-                                       <td valign="top" colspan="2">
-                                               <xsl:value-of 
select="lang_content" />
-                                       </td>
-                                       <td>
-                                               <textarea cols="100" rows="10" 
name="note_content" id="note_content" wrap="soft">
-                                                       <xsl:value-of 
select="value_content" />&nbsp;
-                                               </textarea>
-                                       </td>
-                               </tr>
-                               <tr class="row_off">
-                                       <td colspan="2">
-                                               <xsl:value-of 
select="lang_access" />
-                                       </td>
-                                       <td>
-                                               <input type="checkbox" 
name="values[access]" value="True">
-                                                       <xsl:if 
test="value_access = 'private'">
-                                                               <xsl:attribute 
name="checked">
-                                                                       checked
-                                                               </xsl:attribute>
-                                                       </xsl:if>
-                                               </input>
-                                       </td>
-                               </tr>
-                       </table>
+               <xsl:if test="msgbox_data != ''">
+                       <div><xsl:call-template name="msgbox" /></div>
+               </xsl:if>
+                       <form method="post" action="{edit_url}">
+                       <fieldset>
+                               <legend><xsl:value-of select="lang_content" 
/></legend>
+                               <textarea cols="100" rows="10" 
name="note_content" id="note_content" wrap="soft">
+                                       <xsl:value-of select="value_content" 
/>&nbsp;
+                               </textarea>
+                       </fieldset>
+
+                       <fieldset>
+                               <legend><xsl:value-of select="lang_advanced" 
/></legend>
+                               <table cellpadding="2" cellspacing="2" 
width="79%" align="center">
+                                       <tr class="row_on">
+                                               <td colspan="2">
+                                                       <xsl:value-of 
select="lang_category" />
+                                               </td>
+                                               <td>
+                                                       <xsl:call-template 
name="categories" />
+                                               </td>
+                                       </tr>
+
+                                       <tr class="row_off">
+                                               <td colspan="2">
+                                                       <xsl:value-of 
select="lang_access" />
+                                               </td>
+                                               <td>
+                                                       <input type="checkbox" 
name="values[access]" value="True">
+                                                               <xsl:if 
test="value_access = 'private'">
+                                                                       
<xsl:attribute name="checked">
+                                                                               
checked
+                                                                       
</xsl:attribute>
+                                                               </xsl:if>
+                                                       </input>
+                                               </td>
+                                       </tr>
+                               </table>
+                       </fieldset>
                        <div class="button_group">
                                <input type="submit" name="apply" 
value="{lang_apply}" /> 
 






reply via email to

[Prev in Thread] Current Thread [Next in Thread]