From 82511a6fe2d29d50c1cdca4b2abb23ff681a1943 Mon Sep 17 00:00:00 2001 From: Sebastian Silva Date: Wed, 16 Nov 2011 07:56:19 +0000 Subject: Major improvements in IDE usability. --- (limited to 'websdk') diff --git a/websdk/werkzeug/debug/shared/FONT_LICENSE b/websdk/werkzeug/debug/shared/FONT_LICENSE deleted file mode 100644 index ae78a8f..0000000 --- a/websdk/werkzeug/debug/shared/FONT_LICENSE +++ /dev/null @@ -1,96 +0,0 @@ -------------------------------- -UBUNTU FONT LICENCE Version 1.0 -------------------------------- - -PREAMBLE -This licence allows the licensed fonts to be used, studied, modified and -redistributed freely. The fonts, including any derivative works, can be -bundled, embedded, and redistributed provided the terms of this licence -are met. The fonts and derivatives, however, cannot be released under -any other licence. The requirement for fonts to remain under this -licence does not require any document created using the fonts or their -derivatives to be published under this licence, as long as the primary -purpose of the document is not to be a vehicle for the distribution of -the fonts. - -DEFINITIONS -"Font Software" refers to the set of files released by the Copyright -Holder(s) under this licence and clearly marked as such. This may -include source files, build scripts and documentation. - -"Original Version" refers to the collection of Font Software components -as received under this licence. - -"Modified Version" refers to any derivative made by adding to, deleting, -or substituting -- in part or in whole -- any of the components of the -Original Version, by changing formats or by porting the Font Software to -a new environment. - -"Copyright Holder(s)" refers to all individuals and companies who have a -copyright ownership of the Font Software. - -"Substantially Changed" refers to Modified Versions which can be easily -identified as dissimilar to the Font Software by users of the Font -Software comparing the Original Version with the Modified Version. - -To "Propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification and with or without charging -a redistribution fee), making available to the public, and in some -countries other activities as well. - -PERMISSION & CONDITIONS -This licence does not grant any rights under trademark law and all such -rights are reserved. - -Permission is hereby granted, free of charge, to any person obtaining a -copy of the Font Software, to propagate the Font Software, subject to -the below conditions: - -1) Each copy of the Font Software must contain the above copyright -notice and this licence. These can be included either as stand-alone -text files, human-readable headers or in the appropriate machine- -readable metadata fields within text or binary files as long as those -fields can be easily viewed by the user. - -2) The font name complies with the following: -(a) The Original Version must retain its name, unmodified. -(b) Modified Versions which are Substantially Changed must be renamed to -avoid use of the name of the Original Version or similar names entirely. -(c) Modified Versions which are not Substantially Changed must be -renamed to both (i) retain the name of the Original Version and (ii) add -additional naming elements to distinguish the Modified Version from the -Original Version. The name of such Modified Versions must be the name of -the Original Version, with "derivative X" where X represents the name of -the new work, appended to that name. - -3) The name(s) of the Copyright Holder(s) and any contributor to the -Font Software shall not be used to promote, endorse or advertise any -Modified Version, except (i) as required by this licence, (ii) to -acknowledge the contribution(s) of the Copyright Holder(s) or (iii) with -their explicit written permission. - -4) The Font Software, modified or unmodified, in part or in whole, must -be distributed entirely under this licence, and must not be distributed -under any other licence. The requirement for fonts to remain under this -licence does not affect any document created using the Font Software, -except any version of the Font Software extracted from a document -created using the Font Software may only be distributed under this -licence. - -TERMINATION -This licence becomes null and void if any of the above conditions are -not met. - -DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF -COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE -COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER -DEALINGS IN THE FONT SOFTWARE. diff --git a/websdk/werkzeug/debug/shared/console.png b/websdk/werkzeug/debug/shared/console.png index c28dd63..6f39d1b 100755 --- a/websdk/werkzeug/debug/shared/console.png +++ b/websdk/werkzeug/debug/shared/console.png Binary files differ diff --git a/websdk/werkzeug/debug/shared/debug.png b/websdk/werkzeug/debug/shared/debug.png new file mode 100644 index 0000000..1a4b861 --- /dev/null +++ b/websdk/werkzeug/debug/shared/debug.png Binary files differ diff --git a/websdk/werkzeug/debug/shared/source.png b/websdk/werkzeug/debug/shared/source.png index f7ea904..22ffb04 100755 --- a/websdk/werkzeug/debug/shared/source.png +++ b/websdk/werkzeug/debug/shared/source.png Binary files differ diff --git a/websdk/werkzeug/debug/shared/style.css b/websdk/werkzeug/debug/shared/style.css index 53a107e..6aabc19 100644 --- a/websdk/werkzeug/debug/shared/style.css +++ b/websdk/werkzeug/debug/shared/style.css @@ -1,16 +1,10 @@ -@font-face { - font-family: 'Ubuntu'; - font-style: normal; - font-weight: normal; - src: local('Ubuntu'), local('Ubuntu-Regular'), - url('?__debugger__=yes&cmd=resource&f=ubuntu.ttf') format('truetype'); -} -body, input { font-family: 'Lucida Grande', 'Lucida Sans Unicode', 'Geneva', - 'Verdana', sans-serif; color: #000; text-align: center; +body, input { + background-color: #c0c0c0; + font-family: 'DejaVu Sans'; margin: 1em; padding: 0; font-size: 15px; } -h1, h2, h3 { font-family: 'Ubuntu', 'Lucida Grande', 'Lucida Sans Unicode', - 'Geneva', 'Verdana', sans-serif; font-weight: normal; } + +h1, h2, h3 { font-weight: normal; } input { background-color: #fff; margin: 0; text-align: left; outline: none !important; } @@ -21,18 +15,29 @@ textarea { font-family: 'Consolas', 'Monaco', 'Bitstream Vera Sans Mono', monospace; font-size: 14px; } div.debugger { text-align: left; padding: 12px; margin: auto; - background-color: white; } -h1 { font-size: 36px; margin: 0 0 0.3em 0; } + background-color: #9e9e9e; + border-top-left-radius: 15px 15px; + border-top-right-radius: 15px 15px; + border-bottom-left-radius: 15px 15px; + border-bottom-right-radius: 15px 15px; + } + +#tb-header { + border-top-left-radius: 15px 15px; + border-top-right-radius: 15px 15px; +} + +h1 { margin: 0 0 0.3em 0; } div.detail p { margin: 0 0 8px 13px; font-size: 14px; white-space: pre-wrap; } div.explanation { margin: 20px 13px; font-size: 15px; color: #555; } div.footer { font-size: 13px; text-align: right; margin: 30px 0; color: #86989B; } h2 { font-size: 16px; margin: 1.3em 0 0.0 0; padding: 9px; - background-color: #11557C; color: white; } -h2 em, h3 em { font-style: normal; color: #A5D6D9; font-weight: normal; } + background-color: black; color: white; } +h2 em, h3 em { font-style: normal; color: gray; font-weight: bold; } -div.traceback, div.plain { border: 1px solid #ddd; margin: 0 0 1em 0; padding: 10px; } +div.traceback, div.plain { border: 1px solid #ddd; margin: 0 0 1em 0; padding: 10px; background-color: #e5e5e5 ;} div.plain p { margin: 0; } div.plain textarea, div.plain pre { margin: 10px 0 0 0; padding: 4px; @@ -42,7 +47,7 @@ div.traceback h3 { font-size: 1em; margin: 0 0 0.8em 0; } div.traceback ul { list-style: none; margin: 0; padding: 0 0 0 1em; } div.traceback h4 { font-size: 13px; font-weight: normal; margin: 0.7em 0 0.1em 0; } div.traceback pre { margin: 0; padding: 5px 0 3px 15px; - background-color: #E8EFF0; border: 1px solid #D3E7E9; } + background-color: #e5e5e5; border: 1px solid #D3E7E9; } div.traceback pre, div.box table.source { white-space: pre-wrap; /* css-3 should we be so lucky... */ white-space: -moz-pre-wrap; /* Mozilla, since 1999 */ @@ -51,15 +56,25 @@ div.box table.source { white-space: pre-wrap; /* css-3 should we be so luc word-wrap: break-word; /* Internet Explorer 5.5+ */ _white-space: pre; /* IE only hack to re-specify in addition to word-wrap */ } -div.traceback pre:hover { background-color: #DDECEE; color: black; cursor: pointer; } +div.traceback pre:hover { background-color: #c0c0c0; color: black; cursor: pointer; } div.traceback blockquote { margin: 1em 0 0 0; padding: 0; } div.traceback img { float: right; padding: 2px; margin: -3px 2px 0 0; display: none; } div.traceback img:hover { background-color: #ddd; cursor: pointer; border-color: #BFDDE0; } -div.traceback pre:hover img { display: block; } -div.traceback cite.filename { font-style: normal; color: #3B666B; } +div.traceback pre:hover img { display: block; background-color:#9e9e9e; padding:10px; + border-top-left-radius: 15px 15px; + border-top-right-radius: 15px 15px; + border-bottom-left-radius: 15px 15px; + border-bottom-right-radius: 15px 15px; +} +div.traceback cite.filename { font-style: normal; color: gray; } -pre.console { border: 1px solid #ccc; background: white!important; +pre.console {width:85%; + border-top-left-radius: 15px 15px; + border-top-right-radius: 15px 15px; + border-bottom-left-radius: 15px 15px; + border-bottom-right-radius: 15px 15px; + border: 1px solid #ccc; background: white!important; color: black; padding: 5px!important; margin: 3px 0 0 0!important; cursor: default!important; max-height: 400px; overflow: auto; } @@ -111,3 +126,13 @@ div.box table.source td.lineno { color: #999; padding-right: 10px; width: 1px; } div.box table.source tr.in-frame { background-color: white; } div.box table.source tr.current { background-color: #EEF7F8; color: #23707E; } div.sourceview { max-height: 400px; overflow: auto; border: 1px solid #ccc; } +#debug_logo { + border-top-left-radius: 15px 15px; + border-top-right-radius: 15px 15px; + border-bottom-left-radius: 15px 15px; + border-bottom-right-radius: 15px 15px; + float:left; + width:32px;height:32px;padding:5px; + background-repeat:no-repeat; + background-position:center; + background-image: url(?__debugger__=yes&cmd=resource&f=debug.png); } diff --git a/websdk/werkzeug/debug/shared/ubuntu.ttf b/websdk/werkzeug/debug/shared/ubuntu.ttf deleted file mode 100644 index 8079f93..0000000 --- a/websdk/werkzeug/debug/shared/ubuntu.ttf +++ /dev/null Binary files differ diff --git a/websdk/werkzeug/debug/tbtools.py b/websdk/werkzeug/debug/tbtools.py index 4bcba21..78bf089 100644 --- a/websdk/werkzeug/debug/tbtools.py +++ b/websdk/werkzeug/debug/tbtools.py @@ -37,6 +37,7 @@ HEADER = u'''\ %(title)s // Werkzeug Debugger +