From 606dd365be6158b975c85b6cba1d6bdb752199a5 Mon Sep 17 00:00:00 2001
From: wyd621 <wyd621@163.com>
Date: Sat, 3 May 2014 01:55:30 +0000
Subject: [PATCH]  * fix for minifyfront.

---
 module/common/view/m.header.lite.html.php |  2 +-
 tools/minifyfront.php                     | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/module/common/view/m.header.lite.html.php b/module/common/view/m.header.lite.html.php
index e9f7244732..176ac47b92 100755
--- a/module/common/view/m.header.lite.html.php
+++ b/module/common/view/m.header.lite.html.php
@@ -31,7 +31,7 @@ $clientTheme  = $this->app->getClientTheme();
   else
   {
       js::import($jsRoot . 'm.all.js', $config->version);
-      css::import($defaultTheme . 'm.' . $this->cookie->lang . '.' . $this->cookie->theme . '.css', $config->version);
+      css::import($defaultTheme . 'm.' . $this->cookie->lang . '.default.css', $config->version);
   }
 
   if(isset($pageCss)) css::internal($pageCss);
diff --git a/tools/minifyfront.php b/tools/minifyfront.php
index 38c97c2852..948ec6ec0c 100755
--- a/tools/minifyfront.php
+++ b/tools/minifyfront.php
@@ -13,12 +13,12 @@ $jqueryRoot = $jsRoot . 'jquery/';
 
 /* Set js files to combined. */
 $jsFiles[] = $jqueryRoot . 'lib.js'; 
+$jsFiles[] = $jsRoot     . 'zui/min.js'; 
 $jsFiles[] = $jsRoot     . 'my.full.js';
 $jsFiles[] = $jqueryRoot . 'colorbox/min.js';
 $jsFiles[] = $jqueryRoot . 'chosen/min.js';
 $jsFiles[] = $jqueryRoot . 'treeview/min.js';
-$jsFiles[] = $jqueryRoot . 'datepicker/date.js';
-$jsFiles[] = $jqueryRoot . 'datepicker/min.js';
+$jsFiles[] = $jqueryRoot . 'datetimepicker/min.js';
 $jsFiles[] = $jqueryRoot . 'alert/min.js';
 $jsFiles[] = $jqueryRoot . 'colorize/min.js';
 
@@ -58,17 +58,19 @@ $langs  = array_keys($config->langs);
 $themes = array_keys($lang->themes);
 
 /* Create css files for every them and every lang. */
+$zuiCode  = str_replace('../fonts', '../zui/fonts', file_get_contents($themeRoot . 'zui/css/min.css'));
 foreach($langs as $lang)
 {
     foreach($themes as $theme)
     {
         /* Common css files. */
-        $cssCode .= file_get_contents($themeRoot . 'default/style.css');
-        $cssCode .= file_get_contents($themeRoot . 'default/colorbox.css');
-        $cssCode .= file_get_contents($themeRoot . 'default/chosen.css');
-        $cssCode .= file_get_contents($themeRoot . 'default/treeview.css');
-        $cssCode .= file_get_contents($themeRoot . 'default/datepicker.css');
-        $cssCode .= file_get_contents($themeRoot . 'default/alert.css');
+        $cssCode  = $zuiCode;
+        $cssCode .= file_get_contents($themeRoot  . 'default/style.css');
+        $cssCode .= file_get_contents($themeRoot  . 'default/colorbox.css');
+        $cssCode .= file_get_contents($jqueryRoot . 'chosen/min.css');
+        $cssCode .= file_get_contents($themeRoot  . 'default/treeview.css');
+        $cssCode .= file_get_contents($jqueryRoot . 'datetimepicker/min.css');
+        $cssCode .= file_get_contents($themeRoot  . 'default/alert.css');
 
         /* Css file for current lang and current them. */
         $cssCode .= file_get_contents($themeRoot . "lang/$lang.css");