diff --git a/Makefile b/Makefile index b959bce756..dc0ab4370f 100644 --- a/Makefile +++ b/Makefile @@ -78,6 +78,15 @@ rpm: rpmbuild -ba ~/rpmbuild/SPECS/zentaopms.spec cp ~/rpmbuild/RPMS/noarch/zentaopms-${VERSION}-1.noarch.rpm ./ rm -rf ~/rpmbuild +en: + unzip ZenTaoPMS.${VERSION}.zip + cd zentaopms/; grep -rl 'zentao.net'|xargs sed -i 's/zentao.net/zentao.pm/g'; + zip -r -9 ZenTaoPMS.$(VERSION).int.zip zentaopms + rm -fr zentaopms + echo $(VERSION).int > VERSION + make deb + make rpm + echo $(VERSION) > VERSION patchphpdoc: sudo cp misc/doc/phpdoc/*.tpl /usr/share/php/data/PhpDocumentor/phpDocumentor/Converters/HTML/frames/templates/phphtmllib/templates/ phpdoc: diff --git a/module/common/model.php b/module/common/model.php index 5dc2531776..368c5a97bf 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -437,6 +437,7 @@ class commonModel extends model { global $lang, $app; + if(isset($lang->menugroup->$moduleName)) $moduleName = $lang->menugroup->$moduleName; if(!isset($lang->$moduleName->menu)) { echo ""; diff --git a/module/common/view/footer.html.php b/module/common/view/footer.html.php index d7d1d9b834..12ef130006 100755 --- a/module/common/view/footer.html.php +++ b/module/common/view/footer.html.php @@ -55,14 +55,6 @@ $(function() }, 60 * 1000); }) -global->novice) and $this->loadModel('tutorial')->checkNovice() and $config->global->flow == 'full'):?> -novice = confirm('tutorial->novice?>'); -$.get(createLink('tutorial', 'ajaxSaveNovice', 'novice=' + (novice ? 'true' : 'false')), function() -{ - if(novice) location.href=createLink('tutorial', 'index'); -}); - - config->sso->redirect)):?> config->sso->addr; diff --git a/module/user/view/login.html.php b/module/user/view/login.html.php index 5ece86e16b..43575e9658 100644 --- a/module/user/view/login.html.php +++ b/module/user/view/login.html.php @@ -81,7 +81,7 @@ if(empty($config->notMd5Pwd))js::import($jsRoot . 'md5.js');
checkVersion):?> - app->getClientLang() == 'en' ? 'http://api.zentao.pm' : 'http://api.zentao.net';?> +