Added additional configuration for the minify.

exponentcms · Jul 20, 2011 · 1a25cc2 · 1a25cc2
1 parent 84a06a2
commit 1a25cc2
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 0 deletions.
diff --git a/conf/extensions/minify.defaults.php b/conf/extensions/minify.defaults.php
@@ -19,4 +19,6 @@
 if (!defined('MINIFY')) define ('MINIFY',0);
 if (!defined('MINIFY_MAXAGE')) define('MINIFY_MAXAGE', 180000);
 if (!defined('MINIFY_URL_LENGTH')) define('MINIFY_URL_LENGTH', 1500);
+if (!defined('MINIFY_ERROR_LOGGER')) define('MINIFY_ERROR_LOGGER', 0); 
+if (!defined('MINIFY_MAX_FILES')) define('MINIFY_MAX_FILES', 30);  
 ?>
diff --git a/conf/extensions/minify.structure.php b/conf/extensions/minify.structure.php
@@ -30,11 +30,22 @@
 			'description'=>$i18n['minify_maxage_desc'],
 			'control'=>new textcontrol()
 		),
+		'MINIFY_MAX_FILES'=>array(
+			'title'=>$i18n['minify_max_files'],
+			'description'=>$i18n['minify_max_files_desc'],
+			'control'=>new textcontrol()
+		),
 		'MINIFY_URL_LENGTH'=>array(
 			'title'=>$i18n['minify_url_length'],
 			'description'=>$i18n['minify_url_length_desc'],
 			'control'=>new textcontrol()
+		),
+		'MINIFY_ERROR_LOGGER'=>array(
+			'title'=>$i18n['minify_error_logger'],
+			'description'=>$i18n['minify_error_logger_desc'],
+			'control'=>new checkboxcontrol()
 		)
+
 	)
 );
 

diff --git a/framework/modules/administration/views/administration/configure_site.tpl b/framework/modules/administration/views/administration/configure_site.tpl
@@ -164,7 +164,10 @@
                     <h2>{gettext str="Minify Configuration"}</h2>
 					{help text="Learn More about minification"|gettext module="minify-configuration"}
                     {control type="text" name="sc[MINIFY_MAXAGE]" label="Maximum age of browser cache in seconds" value=$smarty.const.MINIFY_MAXAGE}
+					{control type="text" name="sc[MINIFY_MAX_FILES]" label="Maximum # of files that can be specified in the 'f' GET parameter" value=$smarty.const.MINIFY_MAX_FILES}
 					{control type="text" name="sc[MINIFY_URL_LENGTH]" label="The length of minification url" value=$smarty.const.MINIFY_URL_LENGTH}
+					{control type="checkbox" postfalse=1 name="sc[MINIFY_ERROR_LOGGER]" label="Enable logging of minify error messages to FirePHP?" checked=$smarty.const.MINIFY_ERROR_LOGGER value=1}
+
                 </div>
                 {/if}
             </div>

diff --git a/subsystems/lang/eng_US/conf/extensions/minify.structure.php b/subsystems/lang/eng_US/conf/extensions/minify.structure.php
@@ -9,6 +9,12 @@
 
 	'minify_url_length'=>'Minify URL Length',
 	'minify_url_length_desc'=>'The length of minification url',
+
+	'minify_max_files'=>'Minify Max Files',
+	'minify_max_files_desc'=>'Maximum # of files that can be specified in the "f" GET parameter',
+
+	'minify_error_logger'=>'Minify Error Logger',
+	'minify_error_logger_desc'=>'Set to true to log error messages to FirePHP',
 );
 
 ?>