minified css added to html

berta-cms · Jun 5, 2015 · 8f25ff8 · 8f25ff8
1 parent b586408
commit 8f25ff8
Show file tree

Hide file tree

Showing 15 changed files with 66 additions and 84 deletions.
diff --git a/INSTALL/includes/check.php b/INSTALL/includes/check.php
@@ -74,15 +74,16 @@ function getStatus($isOk, $message, $failDesc = '', $isIndented = false, $isFata
 	}
 }
 
+$int_version = $options['int_version'];
 
 ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <title><?php echo $berta->settings->get('texts', 'pageTitle') ?> / welcome</title>
-<link href="<?php echo $ENGINE_ABS_ROOT ?>css/default.css" rel="stylesheet" type="text/css" />
-<link href="<?php echo $ENGINE_ABS_ROOT ?>css/login.css" rel="stylesheet" type="text/css" />
-<link href="<?php echo $ENGINE_ABS_ROOT ?>css/editor.css.php" rel="stylesheet" type="text/css" />
+<link rel="stylesheet" href="<?php echo $ENGINE_ABS_ROOT ?>css/backend.min.css?<?php echo $int_version ?>" type="text/css" charset="utf-8" />
+<link rel="stylesheet" href="<?php echo $ENGINE_ABS_ROOT ?>css/editor.css.php?<?php echo $int_version ?>" type="text/css" charset="utf-8" />
+<link rel="stylesheet" href="<?php echo $ENGINE_ABS_ROOT ?>css/login.css?<?php echo $int_version ?>" type="text/css" />
 </head><?php
 
 if(!empty($settings['berta']['installed'])) {

diff --git a/INSTALL/includes/first_visit.php b/INSTALL/includes/first_visit.php
@@ -8,14 +8,16 @@
 	include $ENGINE_ROOT . 'inc.page.php';
 }
 
+$int_version = $options['int_version'];
+
 ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <title><?php echo $berta->settings->get('texts', 'pageTitle') ?> / <?php echo I18n::_('welcome') ?></title>
-<link href="<?php echo $ENGINE_ABS_ROOT ?>css/default.css" rel="stylesheet" type="text/css" />
-<link href="<?php echo $ENGINE_ABS_ROOT ?>css/login.css" rel="stylesheet" type="text/css" />
-<link href="<?php echo $ENGINE_ABS_ROOT ?>css/editor.css.php" rel="stylesheet" type="text/css" />
+<link rel="stylesheet" href="<?php echo $ENGINE_ABS_ROOT ?>css/backend.min.css?<?php echo $int_version ?>" type="text/css" charset="utf-8" />
+<link rel="stylesheet" href="<?php echo $ENGINE_ABS_ROOT ?>css/editor.css.php?<?php echo $int_version ?>" type="text/css" charset="utf-8" />
+<link rel="stylesheet" href="<?php echo $ENGINE_ABS_ROOT ?>css/login.css?<?php echo $int_version ?>" type="text/css" />
 </head>
 <body class="xLoginPageBody">
 	<div class="xMAlign-container xPanel">

diff --git a/INSTALL/includes/wizzard.php b/INSTALL/includes/wizzard.php
@@ -13,14 +13,16 @@
 
 include_once $ENGINE_ROOT . '_classes/class.bertaeditor.php';
 
+$int_version = $options['int_version'];
+
 ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <title><?php echo $berta->settings->get('texts', 'pageTitle') ?> / welcome</title>
-<link href="<?php echo $ENGINE_ABS_ROOT ?>css/default.css" rel="stylesheet" type="text/css" />
-<link href="<?php echo $ENGINE_ABS_ROOT ?>css/login.css" rel="stylesheet" type="text/css" />
-<link href="<?php echo $ENGINE_ABS_ROOT ?>css/editor.css.php" rel="stylesheet" type="text/css" />
+<link rel="stylesheet" href="<?php echo $ENGINE_ABS_ROOT ?>css/backend.min.css?<?php echo $int_version ?>" type="text/css" charset="utf-8" />
+<link rel="stylesheet" href="<?php echo $ENGINE_ABS_ROOT ?>css/editor.css.php?<?php echo $int_version ?>" type="text/css" charset="utf-8" />
+<link rel="stylesheet" href="<?php echo $ENGINE_ABS_ROOT ?>css/login.css?<?php echo $int_version ?>" type="text/css" />
 <?php include $ENGINE_ROOT . 'inc.header_default_scripts.php' ?>
 <script type="text/javascript" src="<?php echo $ENGINE_ABS_ROOT ?>js/Assets.js" charset="utf-8"></script>
 <script type="text/javascript" src="<?php echo $ENGINE_ABS_ROOT ?>_lib/moorainbow/mooRainbow.1.2b2.js" charset="utf-8"></script>

diff --git a/_templates/default/editor.css.php b/_templates/default/editor.css.php
@@ -1,5 +1,4 @@
 <?php
-
 header("Content-Type: text/css");
 
 $SITE_ROOT = '../../';
@@ -13,7 +12,6 @@
 	max-width: 500px;
 }
 
-
 #additionalText .xHandle {
 	position: absolute;
 	left: 0;
@@ -44,5 +42,4 @@
 	visibility: visible;
 }
 
-
 <?php if(!1) { ?></style><?php } ?>
diff --git a/engine/_lib/berta/default.css b/engine/_lib/berta/default.css
@@ -1,5 +1,3 @@
-
-
 html { width: 100%; }
 
 body {
@@ -19,9 +17,6 @@ body {
 div.clear,
 br.clear { clear: both; }
 
-
-
-
 #allContainer {
     margin: 20px 40px 40px;
     padding: 0;

diff --git a/engine/css/mce.css.php b/engine/css/mce.css.php
@@ -1,14 +1,11 @@
 <?php
-
 header("Content-Type: text/css");
 
 $SITE_ROOT = '../../';
 define('SETTINGS_INSTALLREQUIRED', false);
 define('SETTINGS_INSTALLCHECKREQUIRED', false);
 include('../inc.page.php');
 
-
-
 if(!1) { ?><style type="text/css"><?php } ?>
 
 body {
@@ -21,59 +18,45 @@
 	font-style: <?php echo Settings::get('general-font-settings', 'font-style', $settings, $settingsDefinition) ?>;
 	font-variant: <?php echo Settings::get('general-font-settings', 'font-variant', $settings, $settingsDefinition) ?>;
 	line-height: <?php echo Settings::get('general-font-settings', 'line-height', $settings, $settingsDefinition) ?>;
-
-	/*<?php if(Settings::get('background', 'background-image-enabled', $settings, $settingsDefinition) == 'yes') { ?>
-	background-image: url(<?php echo Settings::get('background', 'background-image', $settings, $settingsDefinition) ?>);
-	background-repeat: <?php echo Settings::get('background', 'background-repeat', $settings, $settingsDefinition) ?>;
-	background-position: <?php echo Settings::get('background', 'background-position', $settings, $settingsDefinition) ?>;
-	background-attachment: <?php echo Settings::get('background', 'background-attachment', $settings, $settingsDefinition) ?>;
-	<?php } ?>*/
 	background-color: <?php echo Settings::get('background', 'background-color', $settings, $settingsDefinition) ?>;
-
 	text-align: <?php echo Settings::get('page-layout', 'content-align', $settings, $settingsDefinition) ?>;
 }
 
-
-a:link { 
+a:link {
 	color: <?php echo Settings::get('links', 'color:link', $settings, $settingsDefinition) ?>;
 	text-decoration: <?php echo Settings::get('links', 'text-decoration:link', $settings, $settingsDefinition) ?>;
 	border: <?php echo Settings::get('links', 'border:link', $settings, $settingsDefinition) ?>;
 }
-a:visited { 
+a:visited {
 	color: <?php echo Settings::get('links', 'color:visited', $settings, $settingsDefinition) ?>;
 	text-decoration: <?php echo Settings::get('links', 'text-decoration:visited', $settings, $settingsDefinition) ?>;
 	border: <?php echo Settings::get('links', 'border:visited', $settings, $settingsDefinition) ?>;
 }
-a:hover { 
+a:hover {
 	color: <?php echo Settings::get('links', 'color:hover', $settings, $settingsDefinition) ?>;
 	text-decoration: <?php echo Settings::get('links', 'text-decoration:hover', $settings, $settingsDefinition) ?>;
 	border: <?php echo Settings::get('links', 'border:hover', $settings, $settingsDefinition) ?>;
 }
-a:active { 
+a:active {
 	color: <?php echo Settings::get('links', 'color:active', $settings, $settingsDefinition) ?>;
 	text-decoration: <?php echo Settings::get('links', 'text-decoration:active', $settings, $settingsDefinition) ?>;
 	border: <?php echo Settings::get('links', 'border:active', $settings, $settingsDefinition) ?>;
 }
 
-
-
-h1 { 
+h1 {
 	color: <?php echo Settings::get('heading-1', 'color', $settings, $settingsDefinition) ?>;
 	font-family: <?php echo Settings::get('heading-1', 'font-family', $settings, $settingsDefinition) ?>;
 	font-size: <?php echo Settings::get('heading-1', 'font-size', $settings, $settingsDefinition) ?>;
 	font-weight: <?php echo Settings::get('heading-1', 'font-weight', $settings, $settingsDefinition) ?>;
 	font-style: <?php echo Settings::get('heading-1', 'font-style', $settings, $settingsDefinition) ?>;
 	font-variant: <?php echo Settings::get('heading-1', 'font-variant', $settings, $settingsDefinition) ?>;
 	line-height: <?php echo Settings::get('heading-1', 'line-height', $settings, $settingsDefinition) ?>;
-
 	margin: <?php echo Settings::get('heading-1', 'margin', $settings, $settingsDefinition) ?>;
 	padding: 0;
 }
 
-
 p {
 	margin: 0 0 6px;
 }
 
-
 <?php if(!1) { ?></style><?php } ?>
diff --git a/engine/ie.php b/engine/ie.php
@@ -3,23 +3,24 @@
 define('SETTINGS_INSTALLREQUIRED', false);
 define('BERTA_ENVIRONMENT', 'engine');
 require 'inc.page.php';
+$int_version = $options['int_version'];
 
 ?><!DOCTYPE html>
 <!--[if lt IE 7 ]> <html class="ie6 ie-old"> <![endif]-->
 <!--[if IE 7 ]>    <html class="ie7 ie-old"> <![endif]-->
 <!--[if IE 8 ]>    <html class="ie8"> <![endif]-->
 <!--[if IE 9 ]>    <html class="ie9"> <![endif]-->
-<!--[if (gt IE 9)|!(IE)]><!--> <htm> <!--<![endif]-->
+<!--[if (gt IE 9)|!(IE)]><!--> <html> <!--<![endif]-->
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <title><?php echo $berta->settings->get('texts', 'page-title') ?> / unsupported browser</title>
-<link href="<?php echo $ENGINE_ABS_ROOT ?>css/default.css" rel="stylesheet" type="text/css" />
-<link href="<?php echo $ENGINE_ABS_ROOT ?>css/login.css" rel="stylesheet" type="text/css" />
-<link href="<?php echo $ENGINE_ABS_ROOT ?>css/editor.css.php" rel="stylesheet" type="text/css" />
+<link rel="stylesheet" href="<?php echo $ENGINE_ABS_ROOT ?>css/backend.min.css?<?php echo $int_version ?>" type="text/css" charset="utf-8" />
+<link rel="stylesheet" href="<?php echo $ENGINE_ABS_ROOT ?>css/editor.css.php?<?php echo $int_version ?>" type="text/css" charset="utf-8" />
+<link rel="stylesheet" href="<?php echo $ENGINE_ABS_ROOT ?>css/login.css?<?php echo $int_version ?>" type="text/css" />
 <?php include 'inc.header_default_scripts.php' ?>
 <script type="text/javascript">
 	window.addEvent('domready', function() {
-		
+
 	});
 </script>
 
@@ -30,11 +31,11 @@
 	<div class="xMAlign-container xPanel">
 		<div class="xMAlign-outer">
 			<div class="xMAlign-inner">
-				
+
 				<h3>You can't use Internet Explorer to edit your site!</h3>
 				<h3>^_^</h3>
-				<h3>Please get <a href="http://www.mozilla.com/" target="_blank">Firefox</a>, 
-					<a href="http://www.apple.com/safari/" target="_blank">Safari</a> or 
+				<h3>Please get <a href="http://www.mozilla.com/" target="_blank">Firefox</a>,
+					<a href="http://www.apple.com/safari/" target="_blank">Safari</a> or
 					<a href="http://www.google.com/chrome" target="_blank">Chrome</a>.</h3>
 			</div>
 		</div>

diff --git a/engine/login.php b/engine/login.php
@@ -68,6 +68,8 @@
 	}
 }
 
+$int_version = $options['int_version'];
+
 ?><!DOCTYPE html>
 <!--[if lt IE 7 ]> <html class="ie6 ie-old"> <![endif]-->
 <!--[if IE 7 ]>    <html class="ie7 ie-old"> <![endif]-->
@@ -77,9 +79,9 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <title><?php echo $berta->settings->get('texts', 'page-title') ?> / login</title>
-<link href="<?php echo $ENGINE_ABS_ROOT ?>css/default.css" rel="stylesheet" type="text/css" />
-<link href="<?php echo $ENGINE_ABS_ROOT ?>css/login.css" rel="stylesheet" type="text/css" />
-<link href="<?php echo $ENGINE_ABS_ROOT ?>css/editor.css.php" rel="stylesheet" type="text/css" />
+<link rel="stylesheet" href="<?php echo $ENGINE_ABS_ROOT ?>css/backend.min.css?<?php echo $int_version ?>" type="text/css" charset="utf-8" />
+<link rel="stylesheet" href="<?php echo $ENGINE_ABS_ROOT ?>css/editor.css.php?<?php echo $int_version ?>" type="text/css" charset="utf-8" />
+<link rel="stylesheet" href="<?php echo $ENGINE_ABS_ROOT ?>css/login.css?<?php echo $int_version ?>" type="text/css" />
 <?php include 'inc.header_default_scripts.php' ?>
 <script type="text/javascript">
 	window.addEvent('domready', function() {

diff --git a/engine/logout.php b/engine/logout.php
@@ -17,14 +17,16 @@
 	}
 }
 
+$int_version = $options['int_version'];
+
 ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <title><?php echo $berta->settings->get('texts', 'page-title') ?> / logout</title>
-<link href="<?php echo $ENGINE_ABS_ROOT ?>css/default.css" rel="stylesheet" type="text/css" />
-<link href="<?php echo $ENGINE_ABS_ROOT ?>css/login.css" rel="stylesheet" type="text/css" />
-<link href="<?php echo $ENGINE_ABS_ROOT ?>css/editor.css.php" rel="stylesheet" type="text/css" />
+<link rel="stylesheet" href="<?php echo $ENGINE_ABS_ROOT ?>css/backend.min.css?<?php echo $int_version ?>" type="text/css" charset="utf-8" />
+<link rel="stylesheet" href="<?php echo $ENGINE_ABS_ROOT ?>css/editor.css.php?<?php echo $int_version ?>" type="text/css" charset="utf-8" />
+<link rel="stylesheet" href="<?php echo $ENGINE_ABS_ROOT ?>css/login.css?<?php echo $int_version ?>" type="text/css" />
 </head>
 
 <body class="xLoginPageBody" onload="setTimeout('window.location=\'<?php echo $SITE_ABS_ROOT ?>\'', 1500)">

diff --git a/engine/mobile.php b/engine/mobile.php
@@ -3,23 +3,24 @@
 define('SETTINGS_INSTALLREQUIRED', false);
 define('BERTA_ENVIRONMENT', 'engine');
 require 'inc.page.php';
+$int_version = $options['int_version'];
 
 ?><!DOCTYPE html>
 <!--[if lt IE 7 ]> <html class="ie6 ie-old"> <![endif]-->
 <!--[if IE 7 ]>    <html class="ie7 ie-old"> <![endif]-->
 <!--[if IE 8 ]>    <html class="ie8"> <![endif]-->
 <!--[if IE 9 ]>    <html class="ie9"> <![endif]-->
-<!--[if (gt IE 9)|!(IE)]><!--> <htm> <!--<![endif]-->
+<!--[if (gt IE 9)|!(IE)]><!--> <html> <!--<![endif]-->
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <title><?php echo $berta->settings->get('texts', 'page-title') ?> / unsupported mobile browser</title>
-<link href="<?php echo $ENGINE_ABS_ROOT ?>css/default.css" rel="stylesheet" type="text/css" />
-<link href="<?php echo $ENGINE_ABS_ROOT ?>css/login.css" rel="stylesheet" type="text/css" />
-<link href="<?php echo $ENGINE_ABS_ROOT ?>css/editor.css.php" rel="stylesheet" type="text/css" />
+<link rel="stylesheet" href="<?php echo $ENGINE_ABS_ROOT ?>css/backend.min.css?<?php echo $int_version ?>" type="text/css" charset="utf-8" />
+<link rel="stylesheet" href="<?php echo $ENGINE_ABS_ROOT ?>css/editor.css.php?<?php echo $int_version ?>" type="text/css" charset="utf-8" />
+<link rel="stylesheet" href="<?php echo $ENGINE_ABS_ROOT ?>css/login.css?<?php echo $int_version ?>" type="text/css" />
 <?php include 'inc.header_default_scripts.php' ?>
 <script type="text/javascript">
 	window.addEvent('domready', function() {
-		
+
 	});
 </script>
 
@@ -30,9 +31,9 @@
 	<div class="xMAlign-container xPanel">
 		<div class="xMAlign-outer">
 			<div class="xMAlign-inner">
-				
+
 				<h3><?php echo I18n::_('mobile_device_detected') ?></h3>
-				
+
 			</div>
 		</div>
 	</div>

diff --git a/engine/multisite.php b/engine/multisite.php
@@ -11,19 +11,17 @@
 }
 
 $allSites = BertaContent::getSites();
-
-// var_dump($allSites);
-
 $topPanelHTML = BertaEditor::getTopPanelHTML('multisite');
+$int_version = BertaEditor::$options['int_version'];
 
 ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <title><?php echo $berta->settings->get('texts', 'pageTitle') ?> / <?php echo I18n::_('Multisite') ?></title>
 <link rel="SHORTCUT ICON" href="favicon.ico"/>
-<link rel="stylesheet" href="<?php echo $ENGINE_ABS_ROOT ?>css/default.css" type="text/css"  charset="utf-8" />
-<link rel="stylesheet" href="<?php echo $ENGINE_ABS_ROOT ?>css/editor.css.php" type="text/css"  charset="utf-8" />
+<link rel="stylesheet" href="<?php echo $ENGINE_ABS_ROOT ?>css/backend.min.css?<?php echo $int_version ?>" type="text/css" charset="utf-8" />
+<link rel="stylesheet" href="<?php echo $ENGINE_ABS_ROOT ?>css/editor.css.php?<?php echo $int_version ?>" type="text/css" charset="utf-8" />
 <?php include 'inc.header_default_scripts.php' ?>
 <script type="text/javascript" src="<?php echo $ENGINE_ABS_ROOT ?>js/Assets.js" charset="utf-8"></script>
 <script type="text/javascript" src="<?php echo $ENGINE_ABS_ROOT ?>js/BertaEditorBase.js"></script>

diff --git a/engine/profile.php b/engine/profile.php
@@ -10,15 +10,16 @@
 
 $allSections = BertaContent::getSections();
 $topPanelHTML = BertaEditor::getTopPanelHTML('profile');
+$int_version = BertaEditor::$options['int_version'];
 
 ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <title><?php echo $berta->settings->get('texts', 'pageTitle') ?> / <?php echo I18n::_('Profile') ?></title>
 <link rel="SHORTCUT ICON" href="favicon.ico"/>
-<link rel="stylesheet" href="<?php echo $ENGINE_ABS_ROOT ?>css/default.css" type="text/css"  charset="utf-8" />
-<link rel="stylesheet" href="<?php echo $ENGINE_ABS_ROOT ?>css/editor.css.php" type="text/css"  charset="utf-8" />
+<link rel="stylesheet" href="<?php echo $ENGINE_ABS_ROOT ?>css/backend.min.css?<?php echo $int_version ?>" type="text/css" charset="utf-8" />
+<link rel="stylesheet" href="<?php echo $ENGINE_ABS_ROOT ?>css/editor.css.php?<?php echo $int_version ?>" type="text/css" charset="utf-8" />
 <?php include 'inc.header_default_scripts.php' ?>
 <script type="text/javascript" src="<?php echo $ENGINE_ABS_ROOT ?>js/Assets.js" charset="utf-8"></script>
 <script type="text/javascript" src="<?php echo $ENGINE_ABS_ROOT ?>js/BertaEditorBase.js"></script>
@@ -36,7 +37,7 @@
 			<h1 id="allPageTitle"><?php echo I18n::_('Profile') ?></h1>
 
 			<div id="xSectionsEditor">
-						
+
 				<form name="password_form" id="password_form" method="get" action="<?php echo htmlspecialchars($ENGINE_ROOT) ?>update.php" >
 					<label for="old_password"><?php echo I18n::_('Old password') ?></label><br />
 					<input type="password" name="old_password" id="old_password" value="" /><br />
@@ -45,18 +46,18 @@
 					<label for="retype_password"><?php echo I18n::_('Retype new password') ?></label><br />
 					<input type="password" name="retype_password" id="retype_password" value="" /><br />
 					<input type="submit" name="xBertaEditorChangePassword" id="xBertaEditorChangePassword" value="<?php echo I18n::_('Change password') ?>" />
-				</form>				
-			
+				</form>
+
 				<br class="clear" />
 				<hr />
-		
+
 				<div class="entry">
 					<div class="value value-long">
 						<?php echo I18n::_('password_help_text') ?>
 					</div>
 				</div>
 				<p>&nbsp; </p>
-			</div>			
+			</div>
 		</div>
 	</div>
 </body>