diff options
| author | Alexander Sulfrian <alexander@sulfrian.net> | 2010-06-08 09:01:43 +0200 |
|---|---|---|
| committer | Alexander Sulfrian <alexander@sulfrian.net> | 2010-06-08 09:01:43 +0200 |
| commit | d1fa08fdc9cb11dccee76d668ff85df30458c295 (patch) | |
| tree | 1d19df6405103577d872902486792e8c23bce711 /trunk/infrastructure/ace/www/dev.html | |
| parent | d7c5ad7d6263fd1baf9bfdbaa4c50b70ef2fbdb2 (diff) | |
| parent | 70d1f9d6fcaefe611e778b8dbf3bafea8934aa08 (diff) | |
| download | etherpad-d1fa08fdc9cb11dccee76d668ff85df30458c295.tar.gz etherpad-d1fa08fdc9cb11dccee76d668ff85df30458c295.tar.xz etherpad-d1fa08fdc9cb11dccee76d668ff85df30458c295.zip | |
Merge remote branch 'upstream/master'
Conflicts:
etherpad/src/etherpad/control/pro/admin/pro_admin_control.js
etherpad/src/etherpad/control/pro/pro_main_control.js
etherpad/src/etherpad/control/pro_help_control.js
etherpad/src/etherpad/globals.js
etherpad/src/etherpad/legacy_urls.js
etherpad/src/etherpad/pne/pne_utils.js
etherpad/src/etherpad/pro/pro_utils.js
etherpad/src/main.js
etherpad/src/plugins/fileUpload/templates/fileUpload.ejs
etherpad/src/plugins/testplugin/templates/page.ejs
etherpad/src/static/css/pad2_ejs.css
etherpad/src/static/css/pro-help.css
etherpad/src/static/img/jun09/pad/protop.gif
etherpad/src/static/js/store.js
etherpad/src/themes/default/templates/framed/framedheader-pro.ejs
etherpad/src/themes/default/templates/main/home.ejs
etherpad/src/themes/default/templates/pro-help/main.ejs
etherpad/src/themes/default/templates/pro-help/pro-help-template.ejs
infrastructure/com.etherpad/licensing.scala
trunk/etherpad/src/etherpad/collab/ace/contentcollector.js
trunk/etherpad/src/etherpad/collab/ace/linestylefilter.js
trunk/etherpad/src/static/css/home-opensource.css
trunk/etherpad/src/static/js/ace.js
trunk/etherpad/src/static/js/linestylefilter_client.js
trunk/etherpad/src/templates/email/eepnet_license_info.ejs
trunk/etherpad/src/templates/pad/pad_body2.ejs
trunk/etherpad/src/templates/pad/pad_content.ejs
trunk/etherpad/src/templates/pad/padfull_body.ejs
trunk/etherpad/src/templates/pro/admin/pne-license-manager.ejs
Diffstat (limited to 'trunk/infrastructure/ace/www/dev.html')
| -rw-r--r-- | trunk/infrastructure/ace/www/dev.html | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/trunk/infrastructure/ace/www/dev.html b/trunk/infrastructure/ace/www/dev.html deleted file mode 100644 index 0a9768e..0000000 --- a/trunk/infrastructure/ace/www/dev.html +++ /dev/null @@ -1,39 +0,0 @@ -<!DOCTYPE html PUBLIC - "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html debug="true"> - <head> - <script src="jquery-1.2.1.js"></script> - <script src="ace2_common.js"></script> - <script src="ace2_outer.js"></script> - <script src="firebug/firebug.js"></script> - <script> -function updateHTMLDisplay(html) { - $("#htmldisplay").html(html); -} - -function addMessage(str) { - var li = document.createElement("li"); - li.innerHTML = str; - $("#messages").prepend(li); -} - </script> - <style> - #devstuff { - background-color: #ddd; - padding: 1em; - } - #iframecontainer iframe { width: 500px; height: 300px; } - </style> - </head> - <body> - <div id="iframecontainer"><!-- --></div> - <hr> - <div id="devstuff"> - <p><input type="text" id="cmdinput" size="100"> - <button onclick="$('#cmdresult').html(htmlPrettyEscape(String(eval($('#cmdinput').get(0).value))))">Execute</button></p> - <p id="cmdresult"><!-- --></p> - <p id="htmldisplay"><!-- --></p> - <ul id="messages"><!-- --></ul> - </div> - </body> -</html> |