From: Łukasz Rekucki Date: Tue, 11 May 2010 11:40:06 +0000 (+0200) Subject: Fixed diseapearing tag. X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/1a0d01d9cdbffcf9667562502c3d2e36e5a9fa5b?ds=sidebyside Fixed diseapearing tag. --- diff --git a/deployment.py b/deployment.py index bdfbb43a..041b58cc 100644 --- a/deployment.py +++ b/deployment.py @@ -1,4 +1,4 @@ -#!/srv/internal/cas/pythonenv/bin/python +#!/srv/library/redakcja/pythonenv/bin/python from __future__ import with_statement import shutil @@ -29,7 +29,7 @@ def update_application(): os.system("pip install -r %s" % os.path.join(ROOT, 'etc', 'requirements.txt')) print "done." -ROOT = os.path.dirname(os.path.abspath(__file__)) +ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) PYTHON = os.path.join(ROOT, 'pythonenv', 'bin', 'python') PYTHON_SITE = os.path.join(ROOT, 'pythonenv', 'lib', 'python2.6', 'site-packages') diff --git a/redakcja/settings.py b/redakcja/settings.py index 8fd71c71..fb262051 100644 --- a/redakcja/settings.py +++ b/redakcja/settings.py @@ -87,7 +87,6 @@ MIDDLEWARE_CLASSES = ( 'django.middleware.doc.XViewMiddleware', 'maintenancemode.middleware.MaintenanceModeMiddleware', - # 'debug_toolbar.middleware.DebugToolbarMiddleware' # ) AUTHENTICATION_BACKENDS = ( @@ -101,6 +100,7 @@ TEMPLATE_DIRS = ( PROJECT_ROOT + '/templates', ) +FIREPYTHON_LOGGER_NAME = "fnp" # # Central Auth System diff --git a/redakcja/static/js/wiki/base.js b/redakcja/static/js/wiki/base.js index 523ad96e..61a3949b 100644 --- a/redakcja/static/js/wiki/base.js +++ b/redakcja/static/js/wiki/base.js @@ -69,7 +69,7 @@ var base_id = 'id' + Math.floor(Math.random()* 5000000000); var id = (''+klass)+'_' + base_id; var $tab = $('
  • ' - + title + '
    • '); + + title + ''); var $view = $('
    '); this.perspectives[id] = new $.wiki[klass]({ diff --git a/redakcja/static/js/wiki/xslt.js b/redakcja/static/js/wiki/xslt.js index dda12a16..532b452b 100644 --- a/redakcja/static/js/wiki/xslt.js +++ b/redakcja/static/js/wiki/xslt.js @@ -218,7 +218,8 @@ HTMLSerializer.prototype.serialize = function(rootElement, stripOuter) switch(token.node.nodeType) { case ELEMENT_NODE: - if(token.node.hasAttribute('x-pass-thru')) { + if(token.node.hasAttribute('x-pass-thru') + || token.node.hasAttribute('data-pass-thru')) { self._pushChildren(token.node); break; } diff --git a/redakcja/static/xsl/wl2html_client.xsl b/redakcja/static/xsl/wl2html_client.xsl index 6dd50806..4414b0aa 100644 --- a/redakcja/static/xsl/wl2html_client.xsl +++ b/redakcja/static/xsl/wl2html_client.xsl @@ -209,7 +209,7 @@ --> -
    +
    diff --git a/redakcja/templates/404.html b/redakcja/templates/404.html index 9902fabe..cc6c3f3c 100644 --- a/redakcja/templates/404.html +++ b/redakcja/templates/404.html @@ -43,7 +43,7 @@
    -

    +

    Nie odnaleziono strony