From 8f5b513ed53ab241fc496e5728c61705e7503348 Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Mon, 22 Jun 2015 04:54:15 -0400
Subject: [PATCH] option to set the company name in the page title
---
install/tpl/system.ini.master | 1 +
interface/web/admin/lib/lang/es_system_config.lng | 1 +
interface/web/admin/lib/lang/id_system_config.lng | 1 +
interface/web/index.php | 3 +--
interface/web/admin/lib/lang/cz_system_config.lng | 1 +
interface/web/admin/lib/lang/se_system_config.lng | 1 +
interface/web/admin/lib/lang/sk_system_config.lng | 1 +
interface/web/admin/lib/lang/ja_system_config.lng | 1 +
interface/web/admin/lib/lang/bg_system_config.lng | 1 +
interface/web/admin/lib/lang/pt_system_config.lng | 1 +
interface/web/admin/lib/lang/en_system_config.lng | 1 +
interface/web/admin/lib/lang/it_system_config.lng | 1 +
interface/web/themes/default/templates/main.tpl.htm | 2 +-
interface/web/admin/lib/lang/de_system_config.lng | 1 +
interface/web/admin/lib/lang/ru_system_config.lng | 1 +
interface/web/admin/form/system_config.tform.php | 6 ++++++
interface/web/admin/lib/lang/tr_system_config.lng | 1 +
interface/web/admin/lib/lang/hr_system_config.lng | 1 +
interface/web/admin/lib/lang/el_system_config.lng | 1 +
interface/web/admin/lib/lang/fi_system_config.lng | 1 +
interface/web/admin/lib/lang/pl_system_config.lng | 1 +
interface/web/admin/lib/lang/ro_system_config.lng | 1 +
interface/web/admin/lib/lang/fr_system_config.lng | 1 +
interface/web/admin/lib/lang/ar_system_config.lng | 1 +
interface/web/admin/lib/lang/hu_system_config.lng | 1 +
interface/web/admin/lib/lang/nl_system_config.lng | 1 +
interface/web/admin/lib/lang/br_system_config.lng | 1 +
interface/web/admin/templates/system_config_misc_edit.htm | 9 ++++++++-
28 files changed, 40 insertions(+), 4 deletions(-)
diff --git a/install/tpl/system.ini.master b/install/tpl/system.ini.master
index 92ae518..eb709c8 100644
--- a/install/tpl/system.ini.master
+++ b/install/tpl/system.ini.master
@@ -40,6 +40,7 @@
new_domain_html=Please contact our support to create a new domain for you.
[misc]
+company_name=
dashboard_atom_url_admin=http://www.ispconfig.org/atom
dashboard_atom_url_reseller=http://www.ispconfig.org/atom
dashboard_atom_url_client=http://www.ispconfig.org/atom
diff --git a/interface/web/admin/form/system_config.tform.php b/interface/web/admin/form/system_config.tform.php
index fabc180..3810e52 100644
--- a/interface/web/admin/form/system_config.tform.php
+++ b/interface/web/admin/form/system_config.tform.php
@@ -460,6 +460,12 @@
//#################################
// Begin Datatable fields
//#################################
+ 'company_name' => array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'TEXT',
+ 'default' => '',
+ 'value' => ''
+ ),
'dashboard_atom_url_admin' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
diff --git a/interface/web/admin/lib/lang/ar_system_config.lng b/interface/web/admin/lib/lang/ar_system_config.lng
index 61f7a79..712eb1d 100644
--- a/interface/web/admin/lib/lang/ar_system_config.lng
+++ b/interface/web/admin/lib/lang/ar_system_config.lng
@@ -71,4 +71,5 @@
$wb['No'] = 'No';
$wb['min_password_length_txt'] = 'Minimum password length';
$wb['min_password_strength_txt'] = 'Minimum password strength';
+$wb["company_name_txt"] = "Company Name for the page title";
?>
diff --git a/interface/web/admin/lib/lang/bg_system_config.lng b/interface/web/admin/lib/lang/bg_system_config.lng
index a88c2ce..9429b7c 100644
--- a/interface/web/admin/lib/lang/bg_system_config.lng
+++ b/interface/web/admin/lib/lang/bg_system_config.lng
@@ -71,4 +71,5 @@
$wb['No'] = 'No';
$wb['min_password_length_txt'] = 'Minimum password length';
$wb['min_password_strength_txt'] = 'Minimum password strength';
+$wb["company_name_txt"] = "Company Name for the page title";
?>
diff --git a/interface/web/admin/lib/lang/br_system_config.lng b/interface/web/admin/lib/lang/br_system_config.lng
index 2a72018..c3e251c 100644
--- a/interface/web/admin/lib/lang/br_system_config.lng
+++ b/interface/web/admin/lib/lang/br_system_config.lng
@@ -71,4 +71,5 @@
$wb['No'] = 'No';
$wb['min_password_length_txt'] = 'Minimum password length';
$wb['min_password_strength_txt'] = 'Minimum password strength';
+$wb["company_name_txt"] = "Company Name for the page title";
?>
diff --git a/interface/web/admin/lib/lang/cz_system_config.lng b/interface/web/admin/lib/lang/cz_system_config.lng
index ec1fae3..ed47296 100644
--- a/interface/web/admin/lib/lang/cz_system_config.lng
+++ b/interface/web/admin/lib/lang/cz_system_config.lng
@@ -71,5 +71,6 @@
$wb['No'] = 'Ne';
$wb['min_password_length_txt'] = 'Minimální délka hesla';
$wb['min_password_strength_txt'] = 'Minimální síla hesla';
+$wb["company_name_txt"] = "Company Name for the page title";
?>
diff --git a/interface/web/admin/lib/lang/de_system_config.lng b/interface/web/admin/lib/lang/de_system_config.lng
index 862fb56..bbeeb7a 100644
--- a/interface/web/admin/lib/lang/de_system_config.lng
+++ b/interface/web/admin/lib/lang/de_system_config.lng
@@ -72,4 +72,5 @@
$wb['No'] = 'Nein';
$wb['min_password_length_txt'] = 'Minimale Passwortlänge';
$wb['min_password_strength_txt'] = 'Minimale Passwortstärke';
+$wb["company_name_txt"] = "Firmenname fuer den Seitentitel";
?>
diff --git a/interface/web/admin/lib/lang/el_system_config.lng b/interface/web/admin/lib/lang/el_system_config.lng
index aa97d1e..d4de3d8 100644
--- a/interface/web/admin/lib/lang/el_system_config.lng
+++ b/interface/web/admin/lib/lang/el_system_config.lng
@@ -71,4 +71,5 @@
$wb['No'] = 'No';
$wb['min_password_length_txt'] = 'Minimum password length';
$wb['min_password_strength_txt'] = 'Minimum password strength';
+$wb["company_name_txt"] = "Company Name for the page title";
?>
diff --git a/interface/web/admin/lib/lang/en_system_config.lng b/interface/web/admin/lib/lang/en_system_config.lng
index f446bb3..5d09b75 100644
--- a/interface/web/admin/lib/lang/en_system_config.lng
+++ b/interface/web/admin/lib/lang/en_system_config.lng
@@ -79,4 +79,5 @@
$wb["default_dnsserver_txt"] = 'Default DNS Server';
$wb["default_slave_dnsserver_txt"] = 'Default Secondary DNS Server';
$wb["default_dbserver_txt"] = 'Default Database Server';
+$wb["company_name_txt"] = "Company Name for the page title";
?>
diff --git a/interface/web/admin/lib/lang/es_system_config.lng b/interface/web/admin/lib/lang/es_system_config.lng
index e51736b..6062467 100644
--- a/interface/web/admin/lib/lang/es_system_config.lng
+++ b/interface/web/admin/lib/lang/es_system_config.lng
@@ -76,4 +76,5 @@
$wb['default_dnsserver_txt'] = 'Servidor DNS por defecto';
$wb['default_slave_dnsserver_txt'] = 'Servidor DNS secundario por defecto';
$wb['default_dbserver_txt'] = 'Servidor de bases de datos por defecto';
+$wb["company_name_txt"] = "Company Name for the page title";
?>
diff --git a/interface/web/admin/lib/lang/fi_system_config.lng b/interface/web/admin/lib/lang/fi_system_config.lng
index 6e1239e..3eff3ac 100755
--- a/interface/web/admin/lib/lang/fi_system_config.lng
+++ b/interface/web/admin/lib/lang/fi_system_config.lng
@@ -71,4 +71,5 @@
$wb['No'] = 'No';
$wb['min_password_length_txt'] = 'Minimum password length';
$wb['min_password_strength_txt'] = 'Minimum password strength';
+$wb["company_name_txt"] = "Company Name for the page title";
?>
diff --git a/interface/web/admin/lib/lang/fr_system_config.lng b/interface/web/admin/lib/lang/fr_system_config.lng
index 1fb0643..19a5d8b 100644
--- a/interface/web/admin/lib/lang/fr_system_config.lng
+++ b/interface/web/admin/lib/lang/fr_system_config.lng
@@ -71,4 +71,5 @@
$wb['No'] = 'No';
$wb['min_password_length_txt'] = 'Minimum password length';
$wb['min_password_strength_txt'] = 'Minimum password strength';
+$wb["company_name_txt"] = "Company Name for the page title";
?>
diff --git a/interface/web/admin/lib/lang/hr_system_config.lng b/interface/web/admin/lib/lang/hr_system_config.lng
index 3827e3a..0096af0 100644
--- a/interface/web/admin/lib/lang/hr_system_config.lng
+++ b/interface/web/admin/lib/lang/hr_system_config.lng
@@ -71,6 +71,7 @@
$wb['No'] = 'No';
$wb['min_password_length_txt'] = 'Minimum password length';
$wb['min_password_strength_txt'] = 'Minimum password strength';
+$wb["company_name_txt"] = "Company Name for the page title";
?>
diff --git a/interface/web/admin/lib/lang/hu_system_config.lng b/interface/web/admin/lib/lang/hu_system_config.lng
index 37ca447..c590e33 100644
--- a/interface/web/admin/lib/lang/hu_system_config.lng
+++ b/interface/web/admin/lib/lang/hu_system_config.lng
@@ -71,4 +71,5 @@
$wb['No'] = 'No';
$wb['min_password_length_txt'] = 'Minimum password length';
$wb['min_password_strength_txt'] = 'Minimum password strength';
+$wb["company_name_txt"] = "Company Name for the page title";
?>
diff --git a/interface/web/admin/lib/lang/id_system_config.lng b/interface/web/admin/lib/lang/id_system_config.lng
index d4f2625..513be30 100644
--- a/interface/web/admin/lib/lang/id_system_config.lng
+++ b/interface/web/admin/lib/lang/id_system_config.lng
@@ -71,4 +71,5 @@
$wb['No'] = 'No';
$wb['min_password_length_txt'] = 'Minimum password length';
$wb['min_password_strength_txt'] = 'Minimum password strength';
+$wb["company_name_txt"] = "Company Name for the page title";
?>
diff --git a/interface/web/admin/lib/lang/it_system_config.lng b/interface/web/admin/lib/lang/it_system_config.lng
index 9d00c8d..373ac3f 100644
--- a/interface/web/admin/lib/lang/it_system_config.lng
+++ b/interface/web/admin/lib/lang/it_system_config.lng
@@ -71,4 +71,5 @@
$wb['No'] = 'No';
$wb['min_password_length_txt'] = 'Minimum password length';
$wb['min_password_strength_txt'] = 'Minimum password strength';
+$wb["company_name_txt"] = "Company Name for the page title";
?>
diff --git a/interface/web/admin/lib/lang/ja_system_config.lng b/interface/web/admin/lib/lang/ja_system_config.lng
index e81768d..ac36d31 100644
--- a/interface/web/admin/lib/lang/ja_system_config.lng
+++ b/interface/web/admin/lib/lang/ja_system_config.lng
@@ -71,4 +71,5 @@
$wb['No'] = 'No';
$wb['min_password_length_txt'] = 'Minimum password length';
$wb['min_password_strength_txt'] = 'Minimum password strength';
+$wb["company_name_txt"] = "Company Name for the page title";
?>
diff --git a/interface/web/admin/lib/lang/nl_system_config.lng b/interface/web/admin/lib/lang/nl_system_config.lng
index 6f1a6fb..2a0ea21 100644
--- a/interface/web/admin/lib/lang/nl_system_config.lng
+++ b/interface/web/admin/lib/lang/nl_system_config.lng
@@ -74,4 +74,5 @@
$wb['No'] = 'No';
$wb['min_password_length_txt'] = 'Minimum password length';
$wb['min_password_strength_txt'] = 'Minimum password strength';
+$wb["company_name_txt"] = "Company Name for the page title";
?>
diff --git a/interface/web/admin/lib/lang/pl_system_config.lng b/interface/web/admin/lib/lang/pl_system_config.lng
index 4023906..b9cbe01 100644
--- a/interface/web/admin/lib/lang/pl_system_config.lng
+++ b/interface/web/admin/lib/lang/pl_system_config.lng
@@ -71,4 +71,5 @@
$wb['No'] = 'No';
$wb['min_password_length_txt'] = 'Minimum password length';
$wb['min_password_strength_txt'] = 'Minimum password strength';
+$wb["company_name_txt"] = "Company Name for the page title";
?>
diff --git a/interface/web/admin/lib/lang/pt_system_config.lng b/interface/web/admin/lib/lang/pt_system_config.lng
index 30d73f4..ccf91ee 100644
--- a/interface/web/admin/lib/lang/pt_system_config.lng
+++ b/interface/web/admin/lib/lang/pt_system_config.lng
@@ -71,4 +71,5 @@
$wb['No'] = 'No';
$wb['min_password_length_txt'] = 'Minimum password length';
$wb['min_password_strength_txt'] = 'Minimum password strength';
+$wb["company_name_txt"] = "Company Name for the page title";
?>
diff --git a/interface/web/admin/lib/lang/ro_system_config.lng b/interface/web/admin/lib/lang/ro_system_config.lng
index d2d9193..d6e14ae 100644
--- a/interface/web/admin/lib/lang/ro_system_config.lng
+++ b/interface/web/admin/lib/lang/ro_system_config.lng
@@ -71,4 +71,5 @@
$wb['No'] = 'No';
$wb['min_password_length_txt'] = 'Minimum password length';
$wb['min_password_strength_txt'] = 'Minimum password strength';
+$wb["company_name_txt"] = "Company Name for the page title";
?>
diff --git a/interface/web/admin/lib/lang/ru_system_config.lng b/interface/web/admin/lib/lang/ru_system_config.lng
index a3a610c..a66d1ac 100644
--- a/interface/web/admin/lib/lang/ru_system_config.lng
+++ b/interface/web/admin/lib/lang/ru_system_config.lng
@@ -71,4 +71,5 @@
$wb['No'] = 'No';
$wb['min_password_length_txt'] = 'Minimum password length';
$wb['min_password_strength_txt'] = 'Minimum password strength';
+$wb["company_name_txt"] = "Company Name for the page title";
?>
diff --git a/interface/web/admin/lib/lang/se_system_config.lng b/interface/web/admin/lib/lang/se_system_config.lng
index 0a6a60b..662ca77 100644
--- a/interface/web/admin/lib/lang/se_system_config.lng
+++ b/interface/web/admin/lib/lang/se_system_config.lng
@@ -71,4 +71,5 @@
$wb['No'] = 'Nej';
$wb['min_password_length_txt'] = 'Minsta lösenordslängd';
$wb['min_password_strength_txt'] = 'Minsta lösenordsstyrka';
+$wb["company_name_txt"] = "Company Name for the page title";
?>
diff --git a/interface/web/admin/lib/lang/sk_system_config.lng b/interface/web/admin/lib/lang/sk_system_config.lng
index 0a4c0ad..9f98b5e 100644
--- a/interface/web/admin/lib/lang/sk_system_config.lng
+++ b/interface/web/admin/lib/lang/sk_system_config.lng
@@ -71,4 +71,5 @@
$wb['No'] = 'No';
$wb['min_password_length_txt'] = 'Minimum password length';
$wb['min_password_strength_txt'] = 'Minimum password strength';
+$wb["company_name_txt"] = "Company Name for the page title";
?>
diff --git a/interface/web/admin/lib/lang/tr_system_config.lng b/interface/web/admin/lib/lang/tr_system_config.lng
index d652b91..5ba42b9 100644
--- a/interface/web/admin/lib/lang/tr_system_config.lng
+++ b/interface/web/admin/lib/lang/tr_system_config.lng
@@ -71,4 +71,5 @@
$wb['No'] = 'No';
$wb['min_password_length_txt'] = 'Minimum password length';
$wb['min_password_strength_txt'] = 'Minimum password strength';
+$wb["company_name_txt"] = "Company Name for the page title";
?>
diff --git a/interface/web/admin/templates/system_config_misc_edit.htm b/interface/web/admin/templates/system_config_misc_edit.htm
index e8b6889..f78dca7 100644
--- a/interface/web/admin/templates/system_config_misc_edit.htm
+++ b/interface/web/admin/templates/system_config_misc_edit.htm
@@ -12,8 +12,15 @@
<div class="col-sm-9" id="used_logo">{tmpl_var name='used_logo'}</div>
</div>
<div class="form-group">
+ <label for="page_title" class="col-sm-3 control-label">{tmpl_var name='company_name_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="company_name" id="company_name" value="{tmpl_var name='company_name'}" size="" maxlength="" class="form-control" /></div></div>
+ <div class="form-group">
<label for="dashboard_atom_url_admin" class="col-sm-3 control-label">{tmpl_var name='dashboard_atom_url_admin_txt'}</label>
<div class="col-sm-9"><input type="text" name="dashboard_atom_url_admin" id="dashboard_atom_url_admin" value="{tmpl_var name='dashboard_atom_url_admin'}" size="" maxlength="" class="form-control" /></div></div>
+ <div class="form-group">
+ <label for="dashboard_atom_url_admin" class="col-sm-3 control-label">{tmpl_var name='dashboard_atom_url_admin_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="dashboard_atom_url_admin" id="dashboard_atom_url_admin" value="{tmpl_var name='dashboard_atom_url_admin'}" size="" maxlength="" class="form-control" /></div></div>
+ <div class="form-group">
<div class="form-group">
<label for="dashboard_atom_url_reseller" class="col-sm-3 control-label">{tmpl_var name='dashboard_atom_url_reseller_txt'}</label>
<div class="col-sm-9"><input type="text" name="dashboard_atom_url_reseller" id="dashboard_atom_url_reseller" value="{tmpl_var name='dashboard_atom_url_reseller'}" size="" maxlength="" class="form-control" /></div></div>
@@ -183,4 +190,4 @@
});
}
-</script>
\ No newline at end of file
+</script>
diff --git a/interface/web/index.php b/interface/web/index.php
old mode 100755
new mode 100644
index bc8f1a3..7cdf5bd
--- a/interface/web/index.php
+++ b/interface/web/index.php
@@ -102,8 +102,7 @@
$app->tpl->setVar('base64_logo_txt', $base64_logo_txt);
// Title
-$server_config = $app->getconf->get_server_config(1, 'server');
-$app->tpl->setVar('server_name', $server_config['hostname']);
+$app->tpl->setVar('company_name', $sys_config['company_name']. ' :: ');
$app->tpl_defaults();
$app->tpl->pparse();
diff --git a/interface/web/themes/default/templates/main.tpl.htm b/interface/web/themes/default/templates/main.tpl.htm
index 5b654dc..c69b79d 100644
--- a/interface/web/themes/default/templates/main.tpl.htm
+++ b/interface/web/themes/default/templates/main.tpl.htm
@@ -3,7 +3,7 @@
<head>
<meta charset='utf-8' />
- <title><tmpl_var name="server_name"> :: <tmpl_var name="app_title"> [<tmpl_var name="app_version">]</title>
+ <title><tmpl_var name="company_name"><tmpl_var name="app_title"> <tmpl_var name="app_version"></title>
<meta name='viewport' content='width=device-width, user-scalable=yes'>
<meta name='description' lang='en' content='' />
--
Gitblit v1.9.1