Merged revisions 1730,1733,1735-1737 from trunk.

tbrehm

2010-05-26 daf1529c8536ff0fa523584e68492b27e1191ea1

Merged revisions 1730,1733,1735-1737 from trunk.

 CODING_NOTES.php.txt

@@ -12,7 +12,7 @@
* Add documentation about access levels (public, private, protected).
* Make function / var names on the following way, first word lower, next word(s) first letter upper like. getFirstResult();

Pear coding guiidelines
Pear coding guidelines

//*****************************************************************************
// Commenting style

 interface/web/sites/lib/lang/br.lng

@@ -1,5 +1,5 @@
<?php
$wb['Database'] = 'Banco de Dados';
$wb['Database'] = 'Bancos de Dados';
$wb['Options'] = 'Opções';
$wb['Shell User'] = 'Usuário de Shell';
$wb['Domain'] = 'Website';

 interface/web/sites/lib/lang/br_database_list.lng

@@ -1,8 +1,9 @@
<?php
$wb['list_head_txt'] = 'Banco de Dados';
$wb['list_head_txt'] = 'Bancos de Dados';
$wb['active_txt'] = 'Ativo';
$wb['remote_access_txt'] = 'Acesso Remoto';
$wb['server_id_txt'] = 'Servidor';
$wb['database_user_txt'] = 'Usuário do Banco';
$wb['database_name_txt'] = 'Nome do banco';
$wb['add_new_record_txt'] = 'Adcionar um novo banco';
?>

 interface/web/sites/lib/lang/en_database_list.lng

@@ -3,6 +3,7 @@
$wb["active_txt"] = 'Active';
$wb["remote_access_txt"] = 'Remote Access';
$wb["server_id_txt"] = 'Server';
$wb["database_user_txt"] = 'Database user';
$wb["database_name_txt"] = 'Database name';
$wb["add_new_record_txt"] = 'Add new Database';
?>

 interface/web/sites/list/database.list.php

@@ -80,7 +80,7 @@
                            'width'        => "",
                            'value'        => "");

$liste["item"][] = array(    'field'        => "database_name",
$liste["item"][] = array(    'field'        => "database_user",
                            'datatype'    => "VARCHAR",
                            'formtype'    => "TEXT",
                            'op'        => "like",
@@ -89,5 +89,13 @@
                            'width'        => "",
                            'value'        => "");

$liste["item"][] = array(    'field'        => "database_name",
                            'datatype'    => "VARCHAR",
                            'formtype'    => "TEXT",
                            'op'        => "like",
                            'prefix'    => "%",
                            'suffix'    => "%",
                            'width'        => "",
                            'value'        => "");

?>

 interface/web/sites/templates/database_list.htm

@@ -21,6 +21,7 @@
            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
            <th class="tbl_col_remote_access" scope="col"><tmpl_var name="remote_access_txt"></th>
            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
            <th class="tbl_col_database_name" scope="col"><tmpl_var name="database_user_txt"></th>
            <th class="tbl_col_database_name" scope="col"><tmpl_var name="database_name_txt"></th>
            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
          </tr>
@@ -28,6 +29,7 @@
            <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','sites/database_list.php');">{tmpl_var name='search_active'}</select></td>
            <td class="tbl_col_remote_access"><select name="search_remote_access" onChange="submitForm('pageForm','sites/database_list.php');">{tmpl_var name='search_remote_access'}</select></td>
            <td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','sites/database_list.php');">{tmpl_var name='search_server_id'}</select></td>
            <td class="tbl_col_database_user"><input type="text" name="search_database_user" value="{tmpl_var name='search_database_user'}" /></td>
            <td class="tbl_col_database_name"><input type="text" name="search_database_name" value="{tmpl_var name='search_database_name'}" /></td>
            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/database_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
          </tr>
@@ -38,6 +40,7 @@
            <td class="tbl_col_active"><a href="#" onClick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
            <td class="tbl_col_remote_access"><a href="#" onClick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="remote_access"}</a></td>
            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
            <td class="tbl_col_database_user"><a href="#" onClick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="database_user"}</a></td>
            <td class="tbl_col_database_name"><a href="#" onClick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="database_name"}</a></td>
            <td class="tbl_col_buttons">
              <div class="buttons icons16">    
@@ -51,7 +54,7 @@
        </tbody>
        <tfoot>
          <tr>
            <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
            <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
          </tr>
        </tfoot>
      </table>