[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] admin inc/class.uiconfig.inc.php templates/base...
From: |
Dave Hall |
Subject: |
[Phpgroupware-cvs] admin inc/class.uiconfig.inc.php templates/base... |
Date: |
Sun, 09 Apr 2006 13:58:41 +0000 |
CVSROOT: /cvsroot/phpgroupware
Module name: admin
Branch:
Changes by: Dave Hall <address@hidden> 06/04/09 13:58:41
Modified files:
inc : class.uiconfig.inc.php
templates/base : config.tpl
Log message:
add central imap config options, used by phpmailer, some other minor
changes along the way
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/admin/inc/class.uiconfig.inc.php.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/admin/templates/base/config.tpl.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
Patches:
Index: admin/inc/class.uiconfig.inc.php
diff -u admin/inc/class.uiconfig.inc.php:1.19
admin/inc/class.uiconfig.inc.php:1.20
--- admin/inc/class.uiconfig.inc.php:1.19 Sun Mar 26 12:47:22 2006
+++ admin/inc/class.uiconfig.inc.php Sun Apr 9 13:58:41 2006
@@ -10,7 +10,7 @@
* option) any later version. *
\**************************************************************************/
- /* $Id: class.uiconfig.inc.php,v 1.19 2006/03/26 12:47:22 skwashd Exp $ */
+ /* $Id: class.uiconfig.inc.php,v 1.20 2006/04/09 13:58:41 skwashd Exp $ */
class uiconfig
{
@@ -32,7 +32,7 @@
else
{
$referer =
$GLOBALS['phpgw']->session->appsession('session_data','admin_config');
- if($referer == '-1')
+ if($referer == -1)
{
$referer = '';
}
@@ -221,7 +221,7 @@
/* echo $config . '=' .
$current_config[$config]; */
if ($current_config[$config] ==
$setting)
{
- $t->set_var($value,'
selected');
+ $t->set_var($value,'
selected="selected"');
}
else
{
Index: admin/templates/base/config.tpl
diff -u admin/templates/base/config.tpl:1.3 admin/templates/base/config.tpl:1.4
--- admin/templates/base/config.tpl:1.3 Tue Feb 14 08:48:21 2006
+++ admin/templates/base/config.tpl Sun Apr 9 13:58:41 2006
@@ -1,19 +1,13 @@
-<!-- $Id: config.tpl,v 1.3 2006/02/14 08:48:21 skwashd Exp $ -->
-
<!-- BEGIN header -->
-
<form method="POST" action="{action_url}">
-<table border="0" align="center" width="85%">
+<table align="center" width="85%" callspacing="0" style="{ border: 1px solid
#000000; }">
<tr class="th">
<td colspan="2"> <b>{title}</b></td>
</tr>
-
<!-- END header -->
-
<!-- BEGIN body -->
-
<tr class="row_on">
-
<td>{lang_Would_you_like_phpGroupWare_to_check_for_new_application_versions_when_admins_login_?}:</td>
+ <td>{lang_Would_you_like_phpGroupWare_to_check_for_a_new_version<br
/>when_admins_login_?}:</td>
<td>
<select name="newsettings[checkfornewversion]">
<option value="">{lang_No}</option>
@@ -53,6 +47,11 @@
</tr>
<tr class="row_off">
+ <td>{lang_Maximum_entries_in_click_path_history}:</td>
+ <td><input size="8" name="newsettings[max_history]"
value="{value_max_history}"></td>
+ </tr>
+
+ <tr class="row_on">
<td>{lang_Would_you_like_to_automaticaly_load_new_langfiles_(at_login-time)_?}:</td>
<td>
<select name="newsettings[disable_autoload_langfiles]">
@@ -62,26 +61,15 @@
</td>
</tr>
-<!-- not yet implemented (.16 only atm)
+ <tr class="row_off">
+ <td>{lang_SMTP_server_hostname_(or_IP_address)}:</td>
+ <td><input name="newsettings[smtp_host]" value="{value_smtp_host}"
/></td>
+ </tr>
+
<tr class="row_on">
- <td>{lang_Maximum_entries_in_click_path_history}:</td>
- <td><input size="8" name="newsettings[max_history]"
value="{value_max_history}"></td>
+ <td>{lang_SMTP_server_port_number}:</td>
+ <td><input name="newsettings[smtp_port]" value="{value_smtp_port}"
/></td>
</tr>
--->
-<!--
- <tr class="row_off">
- <td>{lang_Default_file_system_space_per_user/lang_group_?}:</td>
- <td>
- <input type="text" name="newsettings[vfs_default_account_size_number]"
size="7" value="{value_vfs_default_account_size_number}">
- <select name="newsettings[vfs_default_account_size_type]">
- <option
value="gb"{selected_vfs_default_account_size_type_gb}>GB</option>
- <option
value="mb"{selected_vfs_default_account_size_type_mb}>MB</option>
- <option
value="kb"{selected_vfs_default_account_size_type_kb}>KB</option>
- <option value="b"{selected_vfs_default_account_size_type_b}>B</option>
- </select>
- </td>
- </tr>
--->
<tr class="th">
<td colspan="2"> <b>{lang_appearance}</b></td>
@@ -92,8 +80,7 @@
<td><input name="newsettings[site_title]" value="{value_site_title}"></td>
</tr>
-<!-- not yet implemented (.16 only atm)
- <tr class="row_off">
+ <tr class="row_off">
<td>{lang_Enter_the_background_color_for_the_site_title}:</td>
<td>#<input name="newsettings[login_bg_color_title]"
value="{value_login_bg_color_title}"></td>
</tr>
@@ -117,24 +104,40 @@
<td>{lang_Enter_the_title_of_your_logo}:</td>
<td><input name="newsettings[login_logo_title]"
value="{value_login_logo_title}"></td>
</tr>
--->
-<!--
- <tr class="row_off">
- <td>{lang_How_would_you_like_to_sort_applications_in_the_navbar?}:</td>
+
+ <tr class="row_on">
+ <td>{lang_Show_'powered_by'_logo_on}:</td>
<td>
- <select name="newsettings[app_order]">
- <option value="">{lang_Order_id}</option>
- <option
value="True"{selected_app_order_True}>{lang_Alphabetically}</option>
+ <select name="newsettings[showpoweredbyon]">
+ <option value="bottom"
{selected_showpoweredbyon_bottom}>{lang_bottom}</option>
+ <option value="top" {selected_showpoweredbyon_top}>{lang_top}</option>
+ </select>
+ </td>
+ </tr>
+
+ <tr class="row_off">
+ <td>{lang_enable_fckeditor_wysiwyg_html_editor_?}:</td><td>
+ <select name="newsettings[enable_fckeditor]">
+ <option value="">{lang_No}</option>
+ <option value="True"{selected_enable_fckeditor_True}>{lang_Yes}</option>
+ </select>
+ </td>
+ </tr>
+
+ <tr class="row_on">
+ <td>{lang_enable_tinymce_wysiwyg_html_editor_?}:</td><td>
+ <select name="newsettings[enable_tinymce]">
+ <option value="">{lang_No}</option>
+ <option value="True"{selected_enable_tinymce_True}>{lang_Yes}</option>
</select>
</td>
</tr>
--->
<tr class="th">
<td colspan="2"> <b>{lang_security}</b></td>
</tr>
- <tr class="row_off">
+ <tr class="row_on">
<td>{lang_Use_cookies_to_pass_sessionid}:</td>
<td>
<select name="newsettings[usecookies]">
@@ -144,7 +147,7 @@
</td>
</tr>
- <tr class="row_on">
+ <tr class="row_off">
<td>{lang_check_ip_address_of_all_sessions}:</td>
<td>
<select name="newsettings[sessions_checkip]">
@@ -164,38 +167,21 @@
</td>
</tr>
- <tr class="row_off">
- <td>{lang_Minimum_password_length}:</td>
- <td><input size="4" name="newsettings[pass_min_length]"
value="{value_pass_min_length}"></td>
- </tr>
- <tr class="row_on">
- <td>{lang_Require_non-alpha_characters}:</td>
- <td>
- <select name="newsettings[pass_require_non_alpha]">
- <option value="">{lang_No}</option>
- <option
value="True"{selected_pass_require_non_alpha_True}>{lang_Yes}</option>
- </select>
- </td>
- </tr>
+<!--
<tr class="row_off">
- <td>{lang_Require_numerical_characters}:</td>
- <td>
- <select name="newsettings[pass_require_numbers]">
- <option value="">{lang_No}</option>
- <option
value="True"{selected_pass_require_numbers_True}>{lang_Yes}</option>
- </select>
- </td>
- </tr>
- <tr class="row_on">
- <td>{lang_Require_special_characters}:</td>
- <td>
- <select name="newsettings[pass_require_special_char]">
- <option value="">{lang_No}</option>
- <option
value="True"{selected_pass_require_special_char_True}>{lang_Yes}</option>
- </select>
- </td>
- </tr>
+ <td>{lang_Default_file_system_space_per_user}/{lang_group_?}:</td>
+ <td>
+ <input type="text" name="newsettings[vfs_default_account_size_number]"
size="7" value="{value_vfs_default_account_size_number}">
+ <select name="newsettings[vfs_default_account_size_type]">
+ <option
value="gb"{selected_vfs_default_account_size_type_gb}>GB</option>
+ <option
value="mb"{selected_vfs_default_account_size_type_mb}>MB</option>
+ <option
value="kb"{selected_vfs_default_account_size_type_kb}>KB</option>
+ <option value="b"{selected_vfs_default_account_size_type_b}>B</option>
+ </select>
+ </td>
+ </tr>
+-->
<tr class="row_off">
<td>{lang_How_many_days_should_entries_stay_in_the_access_log,_before_they_get_deleted_(default_90)_?}:</td>
@@ -232,17 +218,15 @@
</td>
</tr>
-<!-- not yet implemented (.16 only atm)
<tr class="row_on">
<td>{lang_Disable_"auto_completion"_of_the_login_form_}:</td>
<td>
<select name="newsettings[autocomplete_login]">
<option value="">{lang_No}</option>
- <option value="True"{autocomplete_login}>{lang_Yes}</option>
+ <option
value="True"{selected_autocomplete_login_True}>{lang_Yes}</option>
</select>
</td>
</tr>
--->
<!-- END body -->
<!-- BEGIN footer -->
@@ -255,6 +239,7 @@
<td colspan="2" align="center">
<input type="submit" name="submit" value="{lang_submit}">
<input type="submit" name="cancel" value="{lang_cancel}">
+ <br />
</td>
</tr>
</table>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] admin inc/class.uiconfig.inc.php templates/base...,
Dave Hall <=