diff --git a/trunk/lib/front/front.class.php b/trunk/lib/front/front.class.php index 6bdbe95c2c..cf5d86e340 100644 --- a/trunk/lib/front/front.class.php +++ b/trunk/lib/front/front.class.php @@ -358,54 +358,30 @@ EOT; } /** - * Export the createLink function of JS version. + * Export the config vars for createLink() js version. * * @static * @access public - * @return string the js code of createLink() + * @return string */ - static public function exportLinkFunc() + static public function exportConfigVars() { global $app, $config; $defaultViewType = $app->getViewType(); + $themeRoot = $app->getWebRoot() . 'theme/'; $js = << -function createLink(moduleName, methodName, vars, viewType) -{ - link = '$config->webRoot'; - requestType = '$config->requestType'; - pathType = '$config->pathType'; - requestFix = '$config->requestFix'; - moduleVar = '$config->moduleVar'; - methodVar = '$config->methodVar'; - viewVar = '$config->viewVar'; - viewType = viewType ? viewType : '$defaultViewType'; - - vars = vars.split('&'); - for(i = 0; i < vars.length; i ++) vars[i] = vars[i].split('='); - - if(requestType == 'PATH_INFO') - { - link += moduleName + requestFix + methodName; - - if(pathType == "full") - { - for(i = 0; i < vars.length; i ++) link += requestFix + vars[i][0] + requestFix + vars[i][1]; - } - else - { - for(i = 0; i < vars.length; i ++) link += requestFix + vars[i][1]; - } - link += '.' + viewType; - } - else - { - link += '?' + moduleVar + '=' + moduleName + '&' + methodVar + '=' + methodName + '&' + viewVar + '=' + viewType; - for(i = 0; i < vars.length; i ++) link += '&' + vars[i][0] + '=' + vars[i][1]; - } - return link; -} +webRoot = '$config->webRoot'; +requestType = '$config->requestType'; +pathType = '$config->pathType'; +requestFix = '$config->requestFix'; +moduleVar = '$config->moduleVar'; +methodVar = '$config->methodVar'; +viewVar = '$config->viewVar'; +defaultView = '$defaultViewType'; +themeRoot = '$themeRoot'; + EOT; return $js; } diff --git a/trunk/module/common/footer.html.php b/trunk/module/common/footer.html.php index 1e40ee1e6d..ecde5e117f 100644 --- a/trunk/module/common/footer.html.php +++ b/trunk/module/common/footer.html.php @@ -1,6 +1,6 @@ + - diff --git a/trunk/module/common/header.html.php b/trunk/module/common/header.html.php index 8bdc9e143e..6e049df787 100644 --- a/trunk/module/common/header.html.php +++ b/trunk/module/common/header.html.php @@ -13,34 +13,16 @@ $themeRoot = $webRoot . "theme/"; if(isset($header['keyword'])) echo "\n"; if(isset($header['desc'])) echo "\n"; ?> + + + ' type='text/css' media='screen' /> ' type='text/css' media='screen' /> - - - +
-
-
- welcome, $app->company->name);?> -
-
+
welcome, $app->company->name);?>
user)) echo $app->user->realname;?> zentaoSite;?>
-