[Fmsystem-commits] [8440] api: improved config admin

[Sigurd Nes]

Revision: 8440
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8440
Author:   sigurdne
Date:     2011-12-27 11:47:27 +0000 (Tue, 27 Dec 2011)
Log Message:
-----------
api: improved config admin

Modified Paths:
--------------
    trunk/admin/inc/class.soconfig.inc.php
    trunk/admin/inc/class.uiconfig2.inc.php
    trunk/admin/templates/base/config.xsl

Modified: trunk/admin/inc/class.soconfig.inc.php
===================================================================
--- trunk/admin/inc/class.soconfig.inc.php      2011-12-27 09:56:12 UTC (rev 
8439)
+++ trunk/admin/inc/class.soconfig.inc.php      2011-12-27 11:47:27 UTC (rev 
8440)
@@ -274,7 +274,7 @@
                                $querymethod = " AND name $this->like 
'%$query%'";
                        }
 
-                       $sql = "SELECT $attrib_table.id, 
$attrib_table.section_id, $value_table.id as value_id, $attrib_table.name, 
$attrib_table.input_type, $value_table.value"
+                       $sql = "SELECT $attrib_table.id, 
$attrib_table.section_id, $value_table.id as value_id, $attrib_table.name, 
$attrib_table.descr, $attrib_table.input_type, $value_table.value"
                        . " FROM ($section_table {$this->join} $attrib_table ON 
 ($section_table.id = $attrib_table.section_id))"
                        . " {$this->left_join} $value_table ON 
($attrib_table.section_id = $value_table.section_id AND $attrib_table.id = 
$value_table.attrib_id)"
                        . " WHERE location_id = {$this->location_id} AND 
$attrib_table.section_id = '$section_id' $querymethod";
@@ -312,7 +312,8 @@
                                        'section_id'    => 
$this->db->f('section_id'),
                                        'value_id'              => 
$this->db->f('value_id'),
                                        'name'                  => 
$this->db->f('name', true),
-                                       'value'                 => $value
+                                       'value'                 => $value,
+                                       'descr'                 => 
$this->db->f('descr', true),
                                );
                        }
                        return $config_info;

Modified: trunk/admin/inc/class.uiconfig2.inc.php
===================================================================
--- trunk/admin/inc/class.uiconfig2.inc.php     2011-12-27 09:56:12 UTC (rev 
8439)
+++ trunk/admin/inc/class.uiconfig2.inc.php     2011-12-27 11:47:27 UTC (rev 
8440)
@@ -376,7 +376,7 @@
                                        'text_delete'                           
=> lang('delete'),
                                        'text_value'                            
=> $entry['value']?$entry['value']:lang('no value'),
                                        'lang_delete_config_text'       => 
lang('delete the config'),
-                                       'lang_value_text'                       
=> lang('values for this config section'),
+                                       'lang_value_text'                       
=> $entry['descr']?$entry['descr']:lang('values for this config section'),
                                );
                        }
 
@@ -426,14 +426,17 @@
                                'lang_add'                              => 
lang('add'),
                                'lang_add_statustext'   => lang('add a value'),
                                'add_action'                    => 
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=> 
'admin.uiconfig2.edit_attrib', 'section_id'=> $section_id, 'location_id' => 
$this->location_id)),
+                               'lang_done'                             => 
lang('done'),
+                               'lang_done_statustext'  => lang('back to the 
list'),
+                               'done_action'                   => 
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=> 
'admin.uiconfig2.index', 'location_id' => $this->location_id)),
                        );
 
                        $msgbox_data = 
$GLOBALS['phpgw']->common->msgbox_data($receipt);
 
                        $data = array
                        (
-                               'lang_section'                                  
                => lang('section'),
-                               'value_section_name'                            
        => $section['name'],
+                               'lang_section'                                  
        => lang('section'),
+                               'value_section_name'                            
=> $section['name'],
                                'msgbox_data'                                   
        => $GLOBALS['phpgw']->common->msgbox($msgbox_data),
                                'allow_allrows'                                 
        => true,
                                'allrows'                                       
                => $this->allrows,

Modified: trunk/admin/templates/base/config.xsl
===================================================================
--- trunk/admin/templates/base/config.xsl       2011-12-27 09:56:12 UTC (rev 
8439)
+++ trunk/admin/templates/base/config.xsl       2011-12-27 11:47:27 UTC (rev 
8440)
@@ -322,6 +322,19 @@
                                                </input>
                                        </form>
                                </td>
+                               <xsl:choose>
+                                       <xsl:when test="done_action !=''">
+                                               <td>    
+                                                       <form method="post" 
action="{done_action}">
+                                                               <input 
type="submit" name="add" value="{lang_done}">
+                                                                       
<xsl:attribute name="title">
+                                                                               
<xsl:value-of select="lang_done_statustext"/>
+                                                                       
</xsl:attribute>
+                                                               </input>
+                                                       </form>
+                                               </td>
+                                       </xsl:when>
+                               </xsl:choose>
                        </tr>
        </xsl:template>