builder app improvements

2025-01-17 21:28:14 +01:00 · 2008-09-05 03:17:03 +00:00 · 2008-09-05 03:17:03 +00:00 · c873fbc9f0
commit c873fbc9f0
parent 66aba1fd2a
4 changed files with 115 additions and 57 deletions
--- a/min/builder/_index.html
+++ b/min/builder/_index.html
@ -1,39 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-"http://www.w3.org/TR/html4/strict.dtd">
-<head>
-    <title>Minify URI Builder</title>
-    <style type="text/css">
-#sources {margin:0; padding:0;}
-#sources li {margin:0 0 0 40px}
-#sources li input {margin-left:2px}
-#add {margin:5px 0 1em 40px}
-#update, #uriTable {display:none}
-b {color:#c00}
-    </style>
-</head>
-<h1>Minify URI Builder</h1>
-
-<p>Create a list of Javascript or CSS files and click [Update] to generate
-a URI to serve them as one file through Minify.</p>
-
-<ol id=sources><li></li></ol>
-<div id=add><button>Add file +</button></div>
-
-<p><button id=update>Update</button></p>
-
-<table id=uriTable>
-    <tr><th>URI</th><td><a id=uriA onclick="this.target='_blank'">/min</a> <small>(opens in new window)</small></td></tr>
-    <tr><th>HTML</th><td><input id=uriHtml type=text size=80 readonly></td></tr>
-</table>
-
-<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.2.6/jquery.min.js"></script>
-
-<script type="text/javascript">
-    // workaround required to test when /min isn't child of web root
-    var src = location.pathname.replace(/\/[^\/]*$/, '/_index.js').substr(1);
-    document.write('<\script type="text/javascript" src="../?f=' + src + '"><\/script>');
-</script>
-
-<!--[
-This comment remains because the "[" makes it look like an IE conditional comment
-->
--- a/min/builder/_index.js
+++ b/min/builder/_index.js
@ -46,11 +46,14 @@ var MUB = {
        $.ajax({
            url : url
            ,complete : function (xhr, stat) {
-                $('span', li).html(
-                    'success' == stat
-                        ? '&#x2713;'
-                        : '<b>file not found!</b>'
-                );
+                if ('success' == stat)
+                    $('span', li).html('&#x2713;');
+                else {
+                    $('span', li).html('<button><b>404! </b> recheck</button>')
+                        .find('button').click(function () {
+                            MUB.liUpdateTestLink.call(li);
+                        });
+                }
            }
            ,dataType : 'text'
        });
@ -125,6 +128,7 @@ var MUB = {
        });
        if (fail || ! sources.length)
            return;
+        $('#groupConfig').val("    'keyName' => '//" + sources.join("', '//") + "',");
        var uri = MUB.getBestUri(sources)
           ,uriH = uri.replace(/</, '&lt;').replace(/>/, '&gt;').replace(/&/, '&amp;');
        $('#uriA').html(uriH)[0].href = uri;
@ -133,20 +137,23 @@ var MUB = {
            ? '<script type="text/javascript" src="' + uriH + '"></script>'
            : '<link type="text/css" rel="stylesheet" href="' + uriH + '" />'
        );
-        $('#uriTable').show();
+        $('#results').show();
+    }
+    ,addButtonClick : function () {
+        MUB.addLi();
+        MUB.updateAllTestLinks();
+        $('#update').show().click(MUB.update);
    }
    ,init : function () {
        $('#sources').html('');
-        $('#add button').click(function () {
-            MUB.addLi();
-            MUB.updateAllTestLinks();
-            $('#update').show().click(MUB.update);
-        });
-        $('#uriHtml').click(function () {
+        $('#add button').click(MUB.addButtonClick);
+        $('#uriHtml, #groupConfig').click(function () {
            this.select();
        }).focus(function () {
            this.select();
        });
+        $('a.ext').attr({target:'_blank'});
+        MUB.addButtonClick();
    }
 };
 window.onload = MUB.init;
--- a/min/builder/index.php
+++ b/min/builder/index.php
@ -1,7 +1,96 @@
-<?php
+<?php 

 require dirname(__FILE__) . '/../config.php';

+ob_start();
+?>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+"http://www.w3.org/TR/html4/strict.dtd">
+<head>
+    <meta name="ROBOTS" content="NOINDEX, NOFOLLOW">
+    <title>Minify URI Builder</title>
+    <style type="text/css">
+body {margin:1em 60px;}
+h1, h2, h3 {margin-left:-25px; position:relative;}
+h1 {margin-top:0;}
+#sources {margin:0; padding:0;}
+#sources li {margin:0 0 0 40px}
+#sources li input {margin-left:2px}
+#add {margin:5px 0 1em 40px}
+#update, #results {display:none}
+#uriTable {border-collapse:collapse;}
+#uriTable td, #uriTable th {padding-top:10px;}
+#uriTable th {padding-right:10px;}
+#groupConfig {font-family:monospace;}
+b {color:#c00}
+#cachePathNote {background: #ff9; display:inline-block; padding:.5em .6em;}
+    </style>
+</head>
+
+<?php if (! isset($min_cachePath)): ?>
+<p id=cachePathNote><strong>Note:</strong> Please set <code>$min_cachePath</code> 
+in /min/config.php to improve performance.</p>
+<?php endIf; ?>
+
+<h1>Minify URI Builder</h1>
+
+<p>Create a list of Javascript or CSS files (or 1 is fine) you'd like to combine
+and click [Update].</p>
+
+<ol id=sources><li></li></ol>
+<div id=add><button>Add file +</button></div>
+
+<p><button id=update>Update</button></p>
+
+<div id=results>
+
+<h2>Minify URI</h2>
+<p>Place this URI in your HTML to serve the files above combined, minified, compressed and with cache headers.</p>
+<table id=uriTable>
+    <tr><th>URI</th><td><a id=uriA class=ext>/min</a> <small>(opens in new window)</small></td></tr>
+    <tr><th>HTML</th><td><input id=uriHtml type=text size=80 readonly></td></tr>
+</table>
+
+<h2>How to serve these files as a group</h2>
+<p>For the best performance you can serve these files as a pre-defined group with a URI like:
+<code>/min/?g=keyName</code></p>
+<p>To do this, add a line like this to /min/groupsConfig.php:</p>
+
+<pre><code>return array(
+    <span style="color:#666">... your existing groups here ...</span>
+<input id=groupConfig size=80 type=text readonly>
+);</code></pre>
+
+<p><em>Make sure to replace <code>keyName</code> with a unique key for this group.</em></p>
+</div>
+
+<hr>
+<p>Need help? Search or post to the <a class=ext href="http://groups.google.com/group/minify">Minify discussion list</a>.</p>
+<p><small>This app is minified :) <a class=ext href="http://code.google.com/p/minify/source/browse/trunk/min/builder/index.php">view source</a></small></p>
+
+<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.2.6/jquery.min.js"></script>
+
+<script type="text/javascript">
+    // workaround required to test when /min isn't child of web root
+    var src = location.pathname.replace(/\/[^\/]*$/, '/_index.js').substr(1);
+    document.write('<\script type="text/javascript" src="../?f=' + src + '"><\/script>');
+</script>
+
+<!--[ This comment remains because the "[" makes it look like an IE conditional comment :) -->
+<?php
+
+$serveOpts = array(
+    'content' => ob_get_contents()
+    ,'id' => __FILE__
+    ,'lastModifiedTime' => max(
+        // regenerate cache if either of these change
+        filemtime(__FILE__)
+        ,filemtime(dirname(__FILE__) . '/../config.php')
+    )
+    ,'minifyAll' => true
+);
+ob_end_clean();
+
 set_include_path(dirname(__FILE__) . '/../lib' . PATH_SEPARATOR . get_include_path());

 require 'Minify.php';
@ -12,7 +101,4 @@ if (0 === stripos(PHP_OS, 'win')) {
 Minify::setCache(isset($min_cachePath) ? $min_cachePath : null);
 Minify::$uploaderHoursBehind = $min_uploaderHoursBehind;

-Minify::serve('Page', array(
-    'file' => dirname(__FILE__) . '/_index.html'
-    ,'minifyAll' => true
-));
+Minify::serve('Page', $serveOpts);
--- a/min/groupsConfig.php
+++ b/min/groupsConfig.php
@ -4,8 +4,12 @@
 * @package Minify
 */

+/** 
+ * You may wish to use the Minify URI Builder app to suggest
+ * changes. http://yourdomain/min/builder/
+ **/
+
 return array(
    // 'js' => array('//js/file1.js', '//js/file2.js'),
    // 'css' => array('//css/file1.css', '//css/file2.css'),
-    'js' => array('//js/Class.js', '//js/email.js')
 );