From d37e9d4a7a99f6e1a635582cb160dc07f747674b Mon Sep 17 00:00:00 2001
From: "shiyangyangwork@yahoo.cn" <shiyangyang@cnezsoft.com>
Date: Thu, 8 Sep 2011 08:14:18 +0000
Subject: [PATCH]  * finish the task #509.

---
 module/common/view/alert.html.php        | 6 ++++--
 module/common/view/autocomplete.html.php | 6 ++++--
 module/common/view/autosuggest.html.php  | 6 ++++--
 module/common/view/colorbox.html.php     | 6 ++++--
 module/common/view/colorize.html.php     | 2 +-
 module/common/view/datepicker.html.php   | 8 +++++---
 module/common/view/table2csv.html.php    | 8 +++++---
 module/common/view/tablesorter.html.php  | 6 ++++--
 module/common/view/treetable.html.php    | 6 ++++--
 module/common/view/treeview.html.php     | 6 ++++--
 10 files changed, 39 insertions(+), 21 deletions(-)

diff --git a/module/common/view/alert.html.php b/module/common/view/alert.html.php
index b9ddc45ed8..a0332964b4 100644
--- a/module/common/view/alert.html.php
+++ b/module/common/view/alert.html.php
@@ -1,3 +1,5 @@
 <?php if($extView = $this->getExtViewFile(__FILE__)){include $extView; return helper::cd();}?>
-<link rel="stylesheet" href="<?php echo $defaultTheme;?>alert.css" />
-<script src="<?php echo $jsRoot;?>jquery/alert/raw.js" type="text/javascript"></script>
+<?php
+css::import($defaultTheme . 'alert.css');
+js::import($jsRoot . 'jquery/alert/raw.js');
+?>
diff --git a/module/common/view/autocomplete.html.php b/module/common/view/autocomplete.html.php
index 66b3a17efe..3479f8a01c 100644
--- a/module/common/view/autocomplete.html.php
+++ b/module/common/view/autocomplete.html.php
@@ -1,3 +1,5 @@
 <?php if($extView = $this->getExtViewFile(__FILE__)){include $extView; return helper::cd();}?>
-<link rel='stylesheet' href='<?php echo $defaultTheme;?>autocomplete.css' />
-<script src='<?php echo $jsRoot;?>jquery/autocomplete/autocomplete.min.js' type='text/javascript'></script>
+<?php
+css::import($defaultTheme . 'autocomplete.css');
+js::import($jsRoot . 'jquery/autocomplete/autocomplete.min.js');
+?>
diff --git a/module/common/view/autosuggest.html.php b/module/common/view/autosuggest.html.php
index 7ad76ac976..6270f6a9d7 100644
--- a/module/common/view/autosuggest.html.php
+++ b/module/common/view/autosuggest.html.php
@@ -1,6 +1,8 @@
 <?php if($extView = $this->getExtViewFile(__FILE__)){include $extView; return helper::cd();}?>
-<link rel='stylesheet' href='<?php echo $defaultTheme;?>autosuggest.css' />
-<script src='<?php echo $jsRoot;?>jquery/autosuggest/min.js' type='text/javascript'></script>
+<?php
+css::import($defaultTheme . 'autosuggest.css');
+js::import($jsRoot . 'jquery/autosuggest/min.js');
+?>
 <script language='javascript'>
 $(function() {
     var data = {items: [
diff --git a/module/common/view/colorbox.html.php b/module/common/view/colorbox.html.php
index d97a07ed4e..09d8190edb 100644
--- a/module/common/view/colorbox.html.php
+++ b/module/common/view/colorbox.html.php
@@ -1,3 +1,5 @@
 <?php if($extView = $this->getExtViewFile(__FILE__)){include $extView; return helper::cd();}?>
-<link rel="stylesheet" href="<?php echo $defaultTheme;?>colorbox.css" />
-<script src="<?php echo $jsRoot;?>jquery/colorbox/min.js" type="text/javascript"></script>
+<?php 
+css::import($defaultTheme . 'colorbox.css');
+js::import($jsRoot . 'jquery/colorbox/min.js');
+?>
diff --git a/module/common/view/colorize.html.php b/module/common/view/colorize.html.php
index 2f6a652289..68488588c3 100644
--- a/module/common/view/colorize.html.php
+++ b/module/common/view/colorize.html.php
@@ -1,5 +1,5 @@
 <?php if($extView = $this->getExtViewFile(__FILE__)){include $extView; return helper::cd();}?>
-<script src='<?php echo $jsRoot;?>jquery/colorize/full.js' type='text/javascript'></script>
+<?php js::import($jsRoot . 'jquery/colorize/full.js');?>
 <script language='javascript'>
 $(function()
 {
diff --git a/module/common/view/datepicker.html.php b/module/common/view/datepicker.html.php
index 34f0c5b454..936e7b5b29 100644
--- a/module/common/view/datepicker.html.php
+++ b/module/common/view/datepicker.html.php
@@ -1,7 +1,9 @@
 <?php if($extView = $this->getExtViewFile(__FILE__)){include $extView; return helper::cd();}?>
-<link rel='stylesheet' href='<?php echo $defaultTheme;?>datepicker.css' type='text/css' />
-<script src='<?php echo $jsRoot;?>jquery/datepicker/min.js'  type='text/javascript'></script>
-<script src='<?php echo $jsRoot;?>jquery/datepicker/date.js' type='text/javascript'></script>
+<?php
+css::import($defaultTheme . 'datepicker.css');
+js::import($jsRoot . 'jquery/datepicker/min.js'); 
+js::import($jsRoot . 'jquery/datepicker/date.js');
+?>
 <script language='javascript'>
 Date.firstDayOfWeek = 1;
 Date.format = 'yyyy-mm-dd';
diff --git a/module/common/view/table2csv.html.php b/module/common/view/table2csv.html.php
index ce5a9234c9..75fec1a1e3 100644
--- a/module/common/view/table2csv.html.php
+++ b/module/common/view/table2csv.html.php
@@ -1,4 +1,6 @@
 <?php if($extView = $this->getExtViewFile(__FILE__)){include $extView; return helper::cd();}?>
-<link rel="stylesheet" href="<?php echo $defaultTheme;?>alert.css" />
-<script src="<?php echo $jsRoot;?>jquery/alert/raw.js" type="text/javascript"></script>
-<script src="<?php echo $jsRoot;?>jquery/table2csv/raw.js" type="text/javascript"></script>
+<?php
+css::import($defaultTheme . 'alert.css');
+js::import($jsRoot . 'jquery/alert/raw.js');
+js::import($jsRoot . 'jquery/table2csv/raw.js');
+?>
diff --git a/module/common/view/tablesorter.html.php b/module/common/view/tablesorter.html.php
index bde0e36da0..2f68b1e1b6 100644
--- a/module/common/view/tablesorter.html.php
+++ b/module/common/view/tablesorter.html.php
@@ -1,6 +1,8 @@
 <?php if($extView = $this->getExtViewFile(__FILE__)){include $extView; return helper::cd();}?>
-<script src='<?php echo $jsRoot;?>jquery/tablesorter/min.js' type='text/javascript'></script>
-<script src='<?php echo $jsRoot;?>jquery/tablesorter/metadata.js' type='text/javascript'></script>
+<?php 
+js::import($jsRoot . 'jquery/tablesorter/min.js');
+js::import($jsRoot . 'jquery/tablesorter/metadata.js');
+?>
 <script language='javascript'>
 $(function() {
 
diff --git a/module/common/view/treetable.html.php b/module/common/view/treetable.html.php
index a784643683..f72e6fbae0 100644
--- a/module/common/view/treetable.html.php
+++ b/module/common/view/treetable.html.php
@@ -1,4 +1,6 @@
 <?php if($extView = $this->getExtViewFile(__FILE__)){include $extView; return helper::cd();}?>
-<link rel='stylesheet' href='<?php echo $defaultTheme;?>treetable.css' type='text/css' />
-<script src='<?php echo $jsRoot;?>jquery/treetable/min.js' type='text/javascript'></script>
+<?php 
+css::import($defaultTheme . 'treetable.css');
+js::import($jsRoot . 'jquery/treetable/min.js');
+?>
 <script language='javascript'>$(function() { $("#treetable").treeTable({clickableNodeNames:true,initialState:"expanded"})})</script>
diff --git a/module/common/view/treeview.html.php b/module/common/view/treeview.html.php
index 9f7129686d..fd5604f622 100644
--- a/module/common/view/treeview.html.php
+++ b/module/common/view/treeview.html.php
@@ -1,4 +1,6 @@
 <?php if($extView = $this->getExtViewFile(__FILE__)){include $extView; return helper::cd();}?>
-<link rel='stylesheet' href='<?php echo $defaultTheme;?>treeview.css' type='text/css' />
-<script src='<?php echo $jsRoot;?>jquery/treeview/min.js' type='text/javascript'></script>
+<?php
+css::import($defaultTheme . 'treeview.css');
+js::import($jsRoot . 'jquery/treeview/min.js');
+?>
 <script language='javascript'>$(function() { $("#tree").treeview({ persist: "cookie", collapsed: true, unique: true }) })</script>