diff --git a/mgmt/utils.py b/mgmt/utils.py index 7002a2b..9adc659 100644 --- a/mgmt/utils.py +++ b/mgmt/utils.py @@ -56,13 +56,13 @@ def get_comment_url(comment): type = comment.object_type id = comment.object_id if type=='Project': - return "/projects/%s/#comment-%s" % (id,comment.id) + return settings.BASE_URL+"/projects/%s/#comment-%s" % (id,comment.id) if type=='Bug': - return "/bugs/%s/#comment-%s" % (id,comment.id) + return settings.BASE_URL+"/bugs/%s/#comment-%s" % (id,comment.id) if type=='Document': - return "/docs/%d/#comment-%s" % (id,comment.id) + return settings.BASE_URL+"/docs/%d/#comment-%s" % (id,comment.id) if type=='Request': - return "/requests/%d/#comment-%s" % (id,comment.id) + return settings.BASE_URL+"/requests/%d/#comment-%s" % (id,comment.id) def post_comment(request,type,id,redirect_to): """Try post the comment, containing in request.POST, diff --git a/run-fastcgi b/run-fastcgi index 3b7e148..0ff2dfb 100755 --- a/run-fastcgi +++ b/run-fastcgi @@ -12,5 +12,5 @@ if [ -f $PIDFILE ]; then fi export PYTHONPATH="/home/portnov/www:/home/portnov/www/projects" -exec ./manage.py runfcgi outlog="$PROJDIR/fcgi-out.log" errlog="$PROJDIR/fcgi-err.log" socket=$SOCKET pidfile=$PIDFILE +exec ./manage.py runfcgi socket=$SOCKET pidfile=$PIDFILE diff --git a/settings.py b/settings.py index a6a02d3..e8a39c6 100644 --- a/settings.py +++ b/settings.py @@ -40,6 +40,10 @@ MEDIA_ROOT = '' # Example: "http://media.lawrence.com" MEDIA_URL = '' +BASE_URL = '/ps' +LOGIN_URL=BASE_URL+'/login/' +LOGOUT_URL=BASE_URL+'/logout/' + LOCALE_PATHS = () # URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a @@ -93,7 +97,7 @@ INSTALLED_APPS = ( SHOW_BLOCKS = dict( last_comments = dict(), - login = dict(hide='/login/$',show_logged=False)) + login = dict(hide=BASE_URL+'/login/$',show_logged=False)) BUG_RIGHTS = { (1,2): 'Team', @@ -110,14 +114,14 @@ BUGS_PER_PAGE = COMMENTS_PER_PAGE RSS_MAX_ITEMS = 10 -MENU_ANONYMOUS = [(u'Главная','/'), - (u'Вход','/login/')] +MENU_ANONYMOUS = [(u'Главная',BASE_URL+'/'), + (u'Вход',BASE_URL+'/login/')] -MENU_USER = [(u'Главная','/'), - (u'Моя страница', '/my'), - (u'Git', '/git/'), - (u'KB', '/kb/'), - (u'Выход', '/logout/')] +MENU_USER = [(u'Главная',BASE_URL+'/'), + (u'Моя страница', BASE_URL+'/my'), + (u'Git', BASE_URL+'/git/'), + (u'KB', BASE_URL+'/kb/'), + (u'Выход', BASE_URL+'/logout/')] REPOS = ['/home/portnov/www/projects', '/home/portnov/www/projects/mgmt/hms', diff --git a/templates/base.html b/templates/base.html index ff708ea..de1d9d4 100644 --- a/templates/base.html +++ b/templates/base.html @@ -45,7 +45,6 @@ {% if blocks %} <div id='blocks'> - {{blocks.login|safe}} {{blocks.last_comments|safe}} {{chart|safe}} </div>