Commit 50c6d102 authored by latham's avatar latham
Browse files

Sync some of our fixes. favicon.ico is just to

stop the 404s from new browsers that check.
parent 1c711c8e
...@@ -13,7 +13,7 @@ $module['template'] = 'module.tpl.htm'; ...@@ -13,7 +13,7 @@ $module['template'] = 'module.tpl.htm';
if(isset($_GET['go2_faq_sections_list'])) if(isset($_GET['go2_faq_sections_list']))
$module['startpage'] = 'help/faq_sections_list.php'; $module['startpage'] = 'help/faq_sections_list.php';
else else
$module['startpage'] = 'help/index.php'; $module['startpage'] = 'help/version.php';
//* The width of the tab. Normally you should leave this empty and let the browser define the width automatically. //* The width of the tab. Normally you should leave this empty and let the browser define the width automatically.
$module['tab_width'] = ''; $module['tab_width'] = '';
...@@ -94,4 +94,4 @@ $module['nav'][] = array( 'title' => 'About ISPConfig', ...@@ -94,4 +94,4 @@ $module['nav'][] = array( 'title' => 'About ISPConfig',
?> ?>
\ No newline at end of file
...@@ -78,7 +78,7 @@ $form["tabs"]['users'] = array ( ...@@ -78,7 +78,7 @@ $form["tabs"]['users'] = array (
'policy_id' => array ( 'policy_id' => array (
'datatype' => 'INTEGER', 'datatype' => 'INTEGER',
'formtype' => 'SELECT', 'formtype' => 'SELECT',
'default' => '', 'default' => '5',
'datasource' => array ( 'type' => 'SQL', 'datasource' => array ( 'type' => 'SQL',
'querystring' => 'SELECT id,policy_name FROM spamfilter_policy WHERE {AUTHSQL} ORDER BY policy_name', 'querystring' => 'SELECT id,policy_name FROM spamfilter_policy WHERE {AUTHSQL} ORDER BY policy_name',
'keyfield'=> 'id', 'keyfield'=> 'id',
...@@ -122,4 +122,4 @@ $form["tabs"]['users'] = array ( ...@@ -122,4 +122,4 @@ $form["tabs"]['users'] = array (
); );
?> ?>
\ No newline at end of file
...@@ -5,6 +5,6 @@ $wb['language_txt'] = 'Idioma'; ...@@ -5,6 +5,6 @@ $wb['language_txt'] = 'Idioma';
$wb['password_mismatch'] = 'La contraseña indicada en el segundo campo no coincide con la del primero.'; $wb['password_mismatch'] = 'La contraseña indicada en el segundo campo no coincide con la del primero.';
$wb['Form to edit the user password and language.'] = 'Formulario para editar el usuario y la contraseña.'; $wb['Form to edit the user password and language.'] = 'Formulario para editar el usuario y la contraseña.';
$wb['Settings'] = 'Configuraciones'; $wb['Settings'] = 'Configuraciones';
$wb['id_rsa_txt'] = 'id_rsa'; $wb['id_rsa_txt'] = 'De claves RSA';
$wb['ssh_rsa_txt'] = 'ssh_rsa'; $wb['ssh_rsa_txt'] = 'Claves SSH RSA';
?> ?>
...@@ -25,11 +25,11 @@ ...@@ -25,11 +25,11 @@
</select> </select>
</div> </div>
<div class="ctrlHolder"> <div class="ctrlHolder">
<label for="id_rsa">id_rsa</label> <label for="id_rsa">{tmpl_var name='id_rsa_txt'}</label>
<textarea name="id_rsa" id="id_rsa" readonly rows='10' cols='30'>{tmpl_var name='id_rsa'}</textarea> <textarea name="id_rsa" id="id_rsa" readonly rows='10' cols='30'>{tmpl_var name='id_rsa'}</textarea>
</div> </div>
<div class="ctrlHolder"> <div class="ctrlHolder">
<label for="ssh_rsa">ssh_rsa</label> <label for="ssh_rsa">{tmpl_var name='ssh_rsa_txt'}</label>
<input name="ssh_rsa" id="ssh_rsa" value="{tmpl_var name='ssh_rsa'}" size="30" maxlength="600" type="text" class="textInput" /> <input name="ssh_rsa" id="ssh_rsa" value="{tmpl_var name='ssh_rsa'}" size="30" maxlength="600" type="text" class="textInput" />
</div> </div>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment