remove google-webfont-stuff (just create your own theme or overwrite Sparkle to use another font); remove more inline css and remove unnecessary JS in hints-templates

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2014-12-29 21:08:01 +01:00
parent dd34ab8d9b
commit 7584b0acc4
15 changed files with 5 additions and 87 deletions
--- a/actions/admin/settings/100.panel.php
+++ b/actions/admin/settings/100.panel.php
@@ -93,23 +93,6 @@ return array(
 					'option_options' => array('Manual' => $lng['serversettings']['manual'], 'Dropdown' => $lng['serversettings']['dropdown']),
 					'save_method' => 'storeSettingField',
 					),
-				'use_webfonts' => array(
-					'label' => $lng['serversettings']['enablewebfonts'],
-					'settinggroup' => 'panel',
-					'varname' => 'use_webfonts',
-					'type' => 'bool',
-					'default' => true,
-					'save_method' => 'storeSettingField',
-					),
-				'webfont' => array(
-					'label' => $lng['serversettings']['definewebfont']['title'],
-					'settinggroup' => 'panel',
-					'varname' => 'webfont',
-					'type' => 'string',
-					'default' => 'Numans',
-					'string_emptyallowed' => false,
-					'save_method' => 'storeSettingField',
-					),
 				'panel_adminmail' => array(
 					'label' => $lng['serversettings']['adminmail'],
 					'settinggroup' => 'panel',
--- a/install/froxlor.sql
+++ b/install/froxlor.sql
@@ -525,8 +525,6 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES
 	('panel', 'allow_preset', '1'),
 	('panel', 'allow_preset_admin', '0'),
 	('panel', 'password_regex', ''),
-	('panel', 'use_webfonts', '0'),
-	('panel', 'webfont', 'Numans'),
 	('panel', 'phpconfigs_hidestdsubdomain', '0'),
 	('panel', 'allow_theme_change_admin', '1'),
 	('panel', 'allow_theme_change_customer', '1'),
--- a/install/templates/header.tpl
+++ b/install/templates/header.tpl
@@ -8,11 +8,6 @@
 	<!--[if IE]><link rel="stylesheet" href="../templates/{$theme}/css/main_ie.css" type="text/css" /><![endif]-->
 	<link href="templates/assets/img/favicon.ico" rel="icon" type="image/x-icon" />
 	<title>Froxlor Server Management Panel - Installation</title>
-	<style type="text/css">
-	body {
-        font-family: Verdana, Geneva, sans-serif;
-	}
-	</style>
 </head>
 <body>
 	<div class="installsec">
--- a/install/updates/froxlor/0.9/update_0.9.inc.php
+++ b/install/updates/froxlor/0.9/update_0.9.inc.php
@@ -2832,5 +2832,10 @@ if (isFroxlorVersion('0.9.33-dev3')) {
 	Database::query("ALTER TABLE `".TABLE_PANEL_DOMAIN_SSL_SETTINGS."` MODIFY `ssl_cert_chainfile` text");
 	lastStepStatus(0);

+	showUpdateStep("Removing old settings");
+	Database::query("DELETE FROM `".TABLE_PANEL_SETTINGS."` WHERE `settinggroup`='panel' AND `varname` = 'use_webfonts';");
+	Database::query("DELETE FROM `".TABLE_PANEL_SETTINGS."` WHERE `settinggroup`='panel' AND `varname` = 'webfont';");
+	lastStepStatus(0);
+
 	updateToVersion('0.9.33-rc1');
 }
--- a/lib/init.php
+++ b/lib/init.php
@@ -487,7 +487,6 @@ if (Settings::Get('ticket.enabled') == '1') {
 	}
 }

-$webfont = str_replace('+', ' ', Settings::Get('panel.webfont'));
 $js = "";
 if (array_key_exists('js', $_themeoptions['variants'][$themevariant]) && is_array($_themeoptions['variants'][$themevariant]['js'])) {
 	foreach ($_themeoptions['variants'][$themevariant]['js'] as $jsfile) {
--- a/lng/english.lng.php
+++ b/lng/english.lng.php
@@ -1685,10 +1685,6 @@ $lng['serversettings']['apache_24']['description'] = '<strong class="red">ATTENT
 $lng['admin']['tickets_see_all'] = 'Can see all ticket-categories?';
 $lng['serversettings']['nginx_fastcgiparams']['title'] = 'Path to fastcgi_params file';
 $lng['serversettings']['nginx_fastcgiparams']['description'] = 'Specify the path to nginx\'s fastcgi_params file including filename';
-$lng['serversettings']['enablewebfonts']['title'] = 'Enable usage of a google webfont for the panel';
-$lng['serversettings']['enablewebfonts']['description'] = 'If enabled, the defined webfont is being used for the font-display';
-$lng['serversettings']['definewebfont']['title'] = 'Define a <a href="http://www.google.com/webfonts" rel="external">google-webfont</a> for the panel';
-$lng['serversettings']['definewebfont']['description'] = 'If enabled, this wefont will be used for the font-display.<br />Note: replace spaces with the "+" sign, e.g. "Open+Sans"';

 // Added in Froxlor 0.9.28-rc2
 $lng['serversettings']['documentroot_use_default_value']['title'] = 'Use domain name as default value for DocumentRoot path';
--- a/lng/german.lng.php
+++ b/lng/german.lng.php
@@ -1410,10 +1410,6 @@ $lng['serversettings']['apache_24']['description'] = '<div class="red">Achtung:
 $lng['admin']['tickets_see_all'] = 'Kann alle Ticket-Kategorien sehen?';
 $lng['serversettings']['nginx_fastcgiparams']['title'] = 'Pfad zur fastcgi_params Datei';
 $lng['serversettings']['nginx_fastcgiparams']['description'] = 'Geben Sie den Pfad zu nginx\'s fastcgi_params Datei an. Inklusive Dateiname!';
-$lng['serversettings']['enablewebfonts']['title'] = 'Verwende Google Webfonts im Panel';
-$lng['serversettings']['enablewebfonts']['description'] = 'Wenn aktiviert, wird die angegebene Google-Schriftart eingebunden und verwendet';
-$lng['serversettings']['definewebfont']['title'] = '<a href="http://www.google.com/webfonts" rel="external">Google Webfont</a> festlegen';
-$lng['serversettings']['definewebfont']['description'] = 'Wenn aktiviert, wird diese Schriftart im Panel verwendet.<br />Hinweis: Leerzeichen bitte mit einem "+" ersetzen, z. B. "Open+Sans"';

 // Added in Froxlor 0.9.28-rc2
 $lng['serversettings']['documentroot_use_default_value']['title'] = 'Verwende Domainnamen im Documentroot';
--- a/templates/Sparkle/header.tpl
+++ b/templates/Sparkle/header.tpl
@@ -21,9 +21,6 @@
 	<script type="text/javascript" src="templates/{$theme}/assets/js/tipper.min.js"></script>
 	<script type="text/javascript" src="templates/{$theme}/assets/js/jcanvas.min.js"></script>
 	<script type="text/javascript" src="templates/{$theme}/assets/js/circular.js"></script>
-	<if Settings::Get('panel.use_webfonts') == '1'>
-		<link href="//fonts.googleapis.com/css?family={$webfont}" rel="stylesheet">
-	</if>
 	{$css}
 	<!--[if IE]><link rel="stylesheet" href="templates/{$theme}/assets/css/main_ie.css" type="text/css" /><![endif]-->
 	<link href="css/jquery-ui.min.css" rel="stylesheet" type="text/css"/>
@@ -32,11 +29,6 @@
 	<link href="templates/{$theme}/assets/img/touchicon.png" rel="shortcut" />
 	<link href="templates/{$theme}/assets/img/touchicon.png" rel="apple-touch-icon" />
 	<title><if isset($userinfo['loginname']) && $userinfo['loginname'] != ''>{$userinfo['loginname']} - </if>Froxlor Server Management Panel</title>
-	<if Settings::Get('panel.use_webfonts') == '1'>
-	<style type="text/css">
-		body { font-family: {$webfont}, 'Lucida Grande', 'Lucida Sans Unicode', Helvetica, Arial, Verdana, sans-serif; }
-	</style>
-	</if>
 </head>
 <body>

--- a/templates/Sparkle/index.tpl
+++ b/templates/Sparkle/index.tpl
@@ -7,9 +7,6 @@
 	<meta name="robots" content="noindex, nofollow, noarchive" />
 	<meta name="GOOGLEBOT" content="nosnippet" />
 	{/if}
-	{if $use_webfonts == 1}
-		<link href="//fonts.googleapis.com/css?family={$webfont}" rel="stylesheet">
-	{/if}
 	<link href="templates/{$theme}/assets/img/favicon.ico" rel="icon" type="image/x-icon" />
 	<link href="templates/{$theme}/assets/img/touchicon.png" rel="shortcut" />
 	<link href="templates/{$theme}/assets/img/touchicon.png" rel="apple-touch-icon" />
@@ -19,11 +16,6 @@
 	<script type="text/javascript" src="js/jquery.min.js"></script>
 	<script type="text/javascript" src="templates/{$theme}/assets/js/main.js"></script>
 	<title>{$title}Froxlor Server Management Panel</title>
-	{if $use_webfonts == 1}
-	<style type="text/css">
-		body { font-family: {$webfont}, 'Lucida Grande', 'Lucida Sans Unicode', Helvetica, Arial, Verdana, sans-serif; }
-	</style>
-	{/if}
 </head>
 <body>

--- a/templates/Sparkle/misc/alreadyinstalledhint.tpl
+++ b/templates/Sparkle/misc/alreadyinstalledhint.tpl
@@ -6,15 +6,8 @@
 	<link rel="stylesheet" href="../templates/Sparkle/assets/css/main.css" />
 	<!--[if IE]><link rel="stylesheet" href="../templates/Sparkle/assets/css/main_ie.css" /><![endif]-->
 	<!--[if lt IE 9]><script src="js/html5shiv.min.js"></script><![endif]-->
-	<script type="text/javascript" src="js/jquery.min.js"></script>
-	<script type="text/javascript" src="../templates/Sparkle/assets/js/main.js"></script>
 	<link href="../templates/Sparkle/assets/img/favicon.ico" rel="icon" type="image/x-icon" />
 	<title>Froxlor Server Management Panel - Installation</title>
-	<style type="text/css">
-	body {
-        font-family: Verdana, Geneva, sans-serif;
-	}
-	</style>
 </head>
 <body>
 <div class="loginpage">
--- a/templates/Sparkle/misc/configurehint.tpl
+++ b/templates/Sparkle/misc/configurehint.tpl
@@ -6,15 +6,8 @@
 	<link rel="stylesheet" href="templates/Sparkle/assets/css/main.css" />
 	<!--[if IE]><link rel="stylesheet" href="templates/Sparkle/assets/css/main_ie.css" /><![endif]-->
 	<!--[if lt IE 9]><script src="js/html5shiv.min.js"></script><![endif]-->
-	<script type="text/javascript" src="js/jquery.min.js"></script>
-	<script type="text/javascript" src="templates/Sparkle/assets/js/main.js"></script>
 	<link href="templates/Sparkle/assets/img/favicon.ico" rel="icon" type="image/x-icon" />
 	<title>Froxlor Server Management Panel - Installation</title>
-	<style type="text/css">
-	body {
-		font-family: Verdana, Geneva, sans-serif;
-	}
-	</style>
 </head>
 <body>
 <div class="loginpage">
--- a/templates/Sparkle/misc/dberrornice.tpl
+++ b/templates/Sparkle/misc/dberrornice.tpl
@@ -6,15 +6,8 @@
 	<link rel="stylesheet" href="templates/Sparkle/assets/css/main.css" />
 	<!--[if IE]><link rel="stylesheet" href="templates/Sparkle/assets/css/main_ie.css" /><![endif]-->
 	<!--[if lt IE 9]><script src="js/html5shiv.min.js"></script><![endif]-->
-	<script type="text/javascript" src="js/jquery.min.js"></script>
-	<script type="text/javascript" src="templates/Sparkle/assets/js/main.js"></script>
 	<link href="templates/Sparkle/assets/img/favicon.ico" rel="icon" type="image/x-icon" />
 	<title>Froxlor Server Management Panel - Database error</title>
-	<style type="text/css">
-	body {
-        font-family: Verdana, Geneva, sans-serif;
-	}
-	</style>
 </head>
 <body>
 <div class="loginpage">
--- a/templates/Sparkle/misc/ownershiphint.tpl
+++ b/templates/Sparkle/misc/ownershiphint.tpl
@@ -6,15 +6,8 @@
 	<link rel="stylesheet" href="templates/Sparkle/assets/css/main.css" />
 	<!--[if IE]><link rel="stylesheet" href="templates/Sparkle/assets/css/main_ie.css" /><![endif]-->
 	<!--[if lt IE 9]><script src="js/html5shiv.min.js"></script><![endif]-->
-	<script type="text/javascript" src="js/jquery.min.js"></script>
-	<script type="text/javascript" src="templates/Sparkle/assets/js/main.js"></script>
 	<link href="templates/Sparkle/assets/img/favicon.ico" rel="icon" type="image/x-icon" />
 	<title>Froxlor Server Management Panel - Installation</title>
-	<style type="text/css">
-	body {
-        font-family: Verdana, Geneva, sans-serif;
-	}
-	</style>
 </head>
 <body>
 <div class="loginpage">
--- a/templates/Sparkle/webftp/webftp_main_prompt.tpl
+++ b/templates/Sparkle/webftp/webftp_main_prompt.tpl
@@ -1,11 +1,3 @@
-<style type="text/css">
-<!--
-.Stil1 {
-color: #FF0000;
-font-weight: bold;
-}
-->
-</style>
 <table cellpadding="0" cellspacing="0" class="bradius">
 	<tr>
 		<td colspan="10" align="left"><span class="Stil1">{$action_text|escape:'htmlall'|nl2br}</span></td>
--- a/webftp.php
+++ b/webftp.php
@@ -83,8 +83,6 @@ if (file_exists($hl_path.'/logo_custom.png')) {
 $smarty->assign('header_logo', $header_logo);
 $smarty->assign('theme', $theme);
 $smarty->assign('no_robots', Settings::Get('panel.no_robots'));
-$smarty->assign('use_webfonts', Settings::Get('panel.use_webfonts'));
-$smarty->assign('webfont', Settings::Get('panel.webfont'));
 $smarty->assign('show_version_login', Settings::Get('admin.show_version_login'));
 $smarty->assign('show_version_footer', Settings::Get('admin.show_version_footer'));
 $smarty->assign('version', Settings::Get('panel.version'));