Mercurial > moin > 1.9
changeset 4066:639501065b61
Merged main
| author | Reimar Bauer <rb.proj AT googlemail DOT com> |
|---|---|
| date | Mon, 01 Sep 2008 09:18:01 +0200 |
| parents | d54e233a8784 (current diff) fd4d32812e92 (diff) |
| children | 7185d43b2504 |
| files | |
| diffstat | 5 files changed, 3 insertions(+), 69 deletions(-) [+] |
line wrap: on
line diff
--- a/MoinMoin/i18n/__init__.py Mon Sep 01 09:16:49 2008 +0200 +++ b/MoinMoin/i18n/__init__.py Mon Sep 01 09:18:01 2008 +0200 @@ -279,7 +279,7 @@ else: try: language = languages[lang]['x-language-in-english'] - dictpagename = "%sDict" % language + dictpagename = "%sDict" % language.replace(' ', '') dicts = request.dicts if dicts.has_dict(dictpagename): userdict = dicts.dict(dictpagename)
--- a/MoinMoin/server/server_standalone.py Mon Sep 01 09:16:49 2008 +0200 +++ b/MoinMoin/server/server_standalone.py Mon Sep 01 09:18:01 2008 +0200 @@ -133,6 +133,7 @@ return t = Thread(target=self.process_request_thread, args=(request, client_address)) + t.setDaemon(True) t.start() finally: self.lock.release() @@ -164,11 +165,6 @@ This server is 5 times faster than ThreadingServer for static files, and about the same for wiki pages. - - TODO: sometimes the server won't exit on Conrol-C, and continue to - run with few threads (you can kill it with kill -9). Same problem - exist with the twisted server. When the problem is finally solved, - remove the commented debug prints. """ use_threads = True @@ -186,6 +182,7 @@ from threading import Thread for dummy in range(self.poolSize): t = Thread(target=self.serve_forever_thread) + t.setDaemon(True) t.start() SimpleServer.serve_forever(self) @@ -219,7 +216,6 @@ except: self.handle_error(request, client_address) self.close_request(request) - # sys.stderr.write('thread exiting...\n') def pop_request(self): """ Pop a request from the queue @@ -240,7 +236,6 @@ self.lock.wait() finally: self.lock.release() - # sys.stderr.write('thread exiting...\n') sys.exit() def die(self): @@ -256,7 +251,6 @@ def wake_all_threads(self): self.lock.acquire() try: - # sys.stderr.write('waking up all threads...\n') self.lock.notifyAll() finally: self.lock.release()
--- a/wiki/htdocs/classic/css/msie.css Mon Sep 01 09:16:49 2008 +0200 +++ b/wiki/htdocs/classic/css/msie.css Mon Sep 01 09:18:01 2008 +0200 @@ -25,26 +25,6 @@ /* Spans for line-anchors - needed for IE6 and IE7 where omitting the "display: none" triggers rendering bugs. */ span.anchor { display: none; } -/* -This could maybe avoid screen jumping in IE with IE7 hack. - -It works (or rather: should work) like this: -First, IE sees the a.interwiki definition only as it doesn't understand neither -* > a.interwiki, nor a.interwiki:before. We use a.interwiki to reserve some -space for the icon inserted later. -Later, the IE7 hack kicks in and then IE also understands those 2 other css lines. -The * > a.interwiki line now removes the space we previously reserved and the -:before inserts the icon. - -a.interwiki {margin-left: 25px; padding-top: 25px; padding-bottom: 25px;} -* > a.interwiki {margin-left: 0px; padding-top: 25px; padding-bottom: 25px;} -a.interwiki:before {content: url(../img/moin-inter.png);} - -Problem: -While margin-left seems to work, margin-/padding-top/bottom doesnt. -After getting it to work, this has to be fine-tuned to avoid screen jumping. -*/ - /* Some * html hacks for IE6 and below only (IE7 ignores * html) */ /* IE6 has a bug with rendering of float elements. We workaround this bug by
--- a/wiki/htdocs/modern/css/msie.css Mon Sep 01 09:16:49 2008 +0200 +++ b/wiki/htdocs/modern/css/msie.css Mon Sep 01 09:18:01 2008 +0200 @@ -25,26 +25,6 @@ /* Spans for line-anchors - needed for IE6 and IE7 where omitting the "display: none" triggers rendering bugs. */ span.anchor { display: none; } -/* -This could maybe avoid screen jumping in IE with IE7 hack. - -It works (or rather: should work) like this: -First, IE sees the a.interwiki definition only as it doesn't understand neither -* > a.interwiki, nor a.interwiki:before. We use a.interwiki to reserve some -space for the icon inserted later. -Later, the IE7 hack kicks in and then IE also understands those 2 other css lines. -The * > a.interwiki line now removes the space we previously reserved and the -:before inserts the icon. - -a.interwiki {margin-left: 25px; padding-top: 25px; padding-bottom: 25px;} -* > a.interwiki {margin-left: 0px; padding-top: 25px; padding-bottom: 25px;} -a.interwiki:before {content: url(../img/moin-inter.png);} - -Problem: -While margin-left seems to work, margin-/padding-top/bottom doesnt. -After getting it to work, this has to be fine-tuned to avoid screen jumping. -*/ - /* Some * html hacks for IE6 and below only (IE7 ignores * html) */ /* IE6 has a bug with rendering of float elements. We workaround this bug by
--- a/wiki/htdocs/rightsidebar/css/msie.css Mon Sep 01 09:16:49 2008 +0200 +++ b/wiki/htdocs/rightsidebar/css/msie.css Mon Sep 01 09:18:01 2008 +0200 @@ -25,26 +25,6 @@ /* Spans for line-anchors - needed for IE6 and IE7 where omitting the "display: none" triggers rendering bugs. */ span.anchor { display: none; } -/* -This could maybe avoid screen jumping in IE with IE7 hack. - -It works (or rather: should work) like this: -First, IE sees the a.interwiki definition only as it doesn't understand neither -* > a.interwiki, nor a.interwiki:before. We use a.interwiki to reserve some -space for the icon inserted later. -Later, the IE7 hack kicks in and then IE also understands those 2 other css lines. -The * > a.interwiki line now removes the space we previously reserved and the -:before inserts the icon. - -a.interwiki {margin-left: 25px; padding-top: 25px; padding-bottom: 25px;} -* > a.interwiki {margin-left: 0px; padding-top: 25px; padding-bottom: 25px;} -a.interwiki:before {content: url(../img/moin-inter.png);} - -Problem: -While margin-left seems to work, margin-/padding-top/bottom doesnt. -After getting it to work, this has to be fine-tuned to avoid screen jumping. -*/ - /* Some * html hacks for IE6 and below only (IE7 ignores * html) */ /* IE6 has a bug with rendering of float elements. We workaround this bug by