Browse files

Optimize compiling files

  • Loading branch information...
1 parent ecc8166 commit 1be289e8f52972987b89e23cd7bb3e0342e24582 @vrana committed Feb 9, 2011
Showing with 4 additions and 3 deletions.
  1. +1 −1 adminer/include/design.inc.php
  2. +1 −0 adminer/static/default.css
  3. +2 −2 compile.php
View
2 adminer/include/design.inc.php
@@ -24,7 +24,7 @@ function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") {
<meta name="robots" content="noindex">
<title><?php echo $title_page; ?></title>
<link rel="shortcut icon" type="image/x-icon" href="../adminer/static/favicon.ico">
-<link rel="stylesheet" type="text/css" href="../adminer/static/default.css<?php // Ondrej Valka, http://valka.info ?>">
+<link rel="stylesheet" type="text/css" href="../adminer/static/default.css">
<?php if (file_exists("adminer.css")) { ?>
<link rel="stylesheet" type="text/css" href="adminer.css">
<?php } ?>
View
1 adminer/static/default.css
@@ -1,3 +1,4 @@
+/** @author Ondrej Valka, http://valka.info */
body { color: #000; background: #fff; font: 90%/1.25 Verdana, Arial, Helvetica, sans-serif; margin: 0; }
a { color: blue; }
a:visited { color: navy; }
View
4 compile.php
@@ -173,7 +173,7 @@ function php_shrink($input) {
}
function minify_css($file) {
- return preg_replace('~\\s*([:;{},])\\s*~', '\\1', $file);
+ return preg_replace('~\\s*([:;{},])\\s*~', '\\1', preg_replace('~/\\*.*\\*/~sU', '', $file));
}
function compile_file($match) {
@@ -261,7 +261,7 @@ function compile_file($match) {
}
$file = str_replace('<script type="text/javascript" src="static/editing.js"></script>' . "\n", "", $file);
$file = preg_replace_callback("~compile_file\\('([^']+)', '([^']+)'\\);~", 'compile_file', $file); // integrate static files
- $replace = 'h(preg_replace("~\\\\\\\\?.*~", "", $_SERVER["REQUEST_URI"])) . "?file=\\1&amp;version=' . $VERSION;
+ $replace = 'h(preg_replace("~\\\\\\\\?.*~", "", ME)) . "?file=\\1&amp;version=' . $VERSION;
$file = preg_replace('~\\.\\./adminer/static/(loader\\.gif)~', "'+location.pathname+'?file=\\1&amp;version=$VERSION", $file);
$file = preg_replace('~\\.\\./adminer/static/(default\\.css|functions\\.js|favicon\\.ico)~', '<?php echo ' . $replace . '"; ?>', $file);
$file = preg_replace('~\\.\\./adminer/static/([^\'"]*)~', '" . ' . $replace, $file);

0 comments on commit 1be289e

Please sign in to comment.