Skip to content

Instantly share code, notes, and snippets.

@holtzermann17

holtzermann17/etherpad google gadget #2

Created April 16, 2010 17:45
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save holtzermann17/368720 to your computer and use it in GitHub Desktop.
Save holtzermann17/368720 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
etherpad google gadget #2
diff --git a/etherpad/bin/run-local.sh b/etherpad/bin/run-local.sh
index 72b0cc1..7f78a10 100755
--- a/etherpad/bin/run-local.sh
+++ b/etherpad/bin/run-local.sh
@@ -16,7 +16,7 @@
mkdir -p data/appjet
-MXRAM="1G"
+MXRAM="256m"
if [ ! -z $1 ]; then
if [ ! '-' = `echo $1 | head -c 1` ]; then
MXRAM="$1";
@@ -48,6 +48,7 @@ echo "Using config file: ${cfg_file}"
$JAVA -classpath $CP \
-server \
+ -verbose \
-Xmx${MXRAM} \
-Xms${MXRAM} \
-Djava.awt.headless=true \
diff --git a/etherpad/etc/etherpad.localdev-default.properties b/etherpad/etc/etherpad.localdev-default.properties
index c2a2122..fd9ecab 100644
--- a/etherpad/etc/etherpad.localdev-default.properties
+++ b/etherpad/etc/etherpad.localdev-default.properties
@@ -6,7 +6,7 @@ etherpad.fakeProduction = false
etherpad.isProduction = false
etherpad.SQL_JDBC_DRIVER = com.mysql.jdbc.Driver
etherpad.SQL_JDBC_URL = jdbc:mysql://localhost:3306/etherpad
-etherpad.SQL_PASSWORD = password
+etherpad.SQL_PASSWORD = elided
etherpad.SQL_USERNAME = etherpad
listen = 9000
logDir = ./data/logs
@@ -14,3 +14,4 @@ modulePath = ./src
transportPrefix = /comet
transportUseWildcardSubdomains = true
useVirtualFileRoot = ./src
+motdPage = /ep/pad/view/ro.3PfHCD0ApLc/latest?fullScreen=1&slider=0&sidebar=0
diff --git a/etherpad/src/etherpad/collab/ace/contentcollector.js b/etherpad/src/etherpad/collab/ace/contentcollector.js
index 22e552a..c8ae8d7 100644
--- a/etherpad/src/etherpad/collab/ace/contentcollector.js
+++ b/etherpad/src/etherpad/collab/ace/contentcollector.js
@@ -1,4 +1,5 @@
// DO NOT EDIT THIS FILE, edit infrastructure/ace/www/contentcollector.js
+// THIS FILE IS ALSO AN APPJET MODULE: etherpad.collab.ace.contentcollector
import("etherpad.collab.ace.easysync2.Changeset")
/**
diff --git a/etherpad/src/etherpad/collab/ace/domline.js b/etherpad/src/etherpad/collab/ace/domline.js
index de2e7d3..fdf7714 100644
--- a/etherpad/src/etherpad/collab/ace/domline.js
+++ b/etherpad/src/etherpad/collab/ace/domline.js
@@ -1,4 +1,5 @@
// DO NOT EDIT THIS FILE, edit infrastructure/ace/www/domline.js
+// THIS FILE IS ALSO AN APPJET MODULE: etherpad.collab.ace.domline
/**
* Copyright 2009 Google Inc.
diff --git a/etherpad/src/etherpad/collab/ace/easysync1.js b/etherpad/src/etherpad/collab/ace/easysync1.js
index 4f40aa0..0877487 100644
--- a/etherpad/src/etherpad/collab/ace/easysync1.js
+++ b/etherpad/src/etherpad/collab/ace/easysync1.js
@@ -1,4 +1,5 @@
// DO NOT EDIT THIS FILE, edit infrastructure/ace/www/easy_sync.js
+// THIS FILE IS ALSO AN APPJET MODULE: etherpad.collab.ace.easysync1
/**
* Copyright 2009 Google Inc.
diff --git a/etherpad/src/etherpad/collab/ace/easysync2.js b/etherpad/src/etherpad/collab/ace/easysync2.js
index 0fa1ec4..9abf713 100644
--- a/etherpad/src/etherpad/collab/ace/easysync2.js
+++ b/etherpad/src/etherpad/collab/ace/easysync2.js
@@ -1,4 +1,5 @@
// DO NOT EDIT THIS FILE, edit infrastructure/ace/www/easysync2.js
+// THIS FILE IS ALSO AN APPJET MODULE: etherpad.collab.ace.easysync2
jimport("com.etherpad.Easysync2Support");
/**
diff --git a/etherpad/src/etherpad/collab/ace/easysync2_tests.js b/etherpad/src/etherpad/collab/ace/easysync2_tests.js
index 7a23dc0..1972700 100644
--- a/etherpad/src/etherpad/collab/ace/easysync2_tests.js
+++ b/etherpad/src/etherpad/collab/ace/easysync2_tests.js
@@ -1,4 +1,5 @@
// DO NOT EDIT THIS FILE, edit infrastructure/ace/www/easysync2_tests.js
+// THIS FILE IS ALSO AN APPJET MODULE: etherpad.collab.ace.easysync2_tests
import("etherpad.collab.ace.easysync2.*")
/**
diff --git a/etherpad/src/etherpad/collab/ace/linestylefilter.js b/etherpad/src/etherpad/collab/ace/linestylefilter.js
index ffc8034..b24146e 100644
--- a/etherpad/src/etherpad/collab/ace/linestylefilter.js
+++ b/etherpad/src/etherpad/collab/ace/linestylefilter.js
@@ -1,4 +1,5 @@
// DO NOT EDIT THIS FILE, edit infrastructure/ace/www/linestylefilter.js
+// THIS FILE IS ALSO AN APPJET MODULE: etherpad.collab.ace.linestylefilter
import("etherpad.collab.ace.easysync2.Changeset");
/**
diff --git a/etherpad/src/etherpad/globals.js b/etherpad/src/etherpad/globals.js
index 3475b88..d7267a8 100644
--- a/etherpad/src/etherpad/globals.js
+++ b/etherpad/src/etherpad/globals.js
@@ -20,7 +20,7 @@
var COMETPATH = "/comet";
-var COLOR_PALETTE = ['#ffc6c6','#ffe2bf','#fffcbf','#cbffb3','#b3fff1','#c6e7ff','#dcccff','#ffd9fb'];
+var COLOR_PALETTE = ['#ffc7c7','#fff1c7','#e3ffc7','#c7ffd5','#c7ffff','#c7d5ff','#e3c7ff','#ffc7f1','#ff8f8f','#ffe38f','#c7ff8f','#8fffab','#8fffff','#8fabff','#c78fff','#ff8fe3','#d97979','#d9c179','#a9d979','#79d991','#79d9d9','#7991d9','#a979d9','#d979c1','#d9a9a9','#d9cda9','#c1d9a9','#a9d9b5','#a9d9d9','#a9b5d9','#c1a9d9','#d9a9cd'];
function isProduction() {
return (appjet.config['etherpad.isProduction'] == "true");
@@ -29,7 +29,7 @@ function isProduction() {
var SUPERDOMAINS = {
'localbox.info': true,
'localhost': true,
- 'etherpad.com': true
+ 'metameso.org': true
};
var PNE_RELEASE_VERSION = "1.1.3";
diff --git a/etherpad/src/static/css/pad2_ejs.css b/etherpad/src/static/css/pad2_ejs.css
index 3b9269e..2979286 100644
--- a/etherpad/src/static/css/pad2_ejs.css
+++ b/etherpad/src/static/css/pad2_ejs.css
@@ -10,11 +10,12 @@ html { font-size: 62.5%; }
body { background: #ebebeb url(/static/img/jun09/pad/backgrad.gif) repeat-x left top; }
body, textarea { font-family: Arial, sans-serif; }
-#padpage { margin-left: auto; margin-right: auto; width: 900px; }
+#padpage { margin-left: auto; margin-right: auto; width: 100%; }
body.fullwidth #padpage { width: auto; margin-left: 6px; margin-right: 6px; }
body.squish1width #padpage { width: 800px; }
-body.squish2width #padpage { width: 700px; }
+/* changing this from 700px to 300px in attempt to make it work better in small window */
+body.squish2width #padpage { width: 100%; }
#topbar { height: 25px; background: #326cbd url(/static/img/jun09/pad/padtopback2.gif) repeat-x left top;
position: relative; }
@@ -147,7 +148,7 @@ a#docbarslider { display: block; height: 0; padding-top: 30px; position: absolut
width: 207px; display: none;
}
-#padmain { margin-top: 6px; position: relative; zoom: 1; }
+#padmain { margin-top: 0px; position: relative; zoom: 1; }
#padeditor { margin-right: 300px; zoom: 1; }
.hidesidebar #padeditor { margin-right: 0; }
@@ -720,7 +721,8 @@ form#reconnectform { display: none; }
<% feedbackbox = {width:400, height:270}; %>
#feedbackbox {
position: absolute; display: none;
- width: <%=feedbackbox.width%>px; height: <%=feedbackbox.height%>px;
+ /* width: <%=feedbackbox.width%>px; height: <%=feedbackbox.height%>px; */
+ width: <%=feedbackbox.width%>px; height: 0px;
left: 100px/*set in code*/; bottom: 50px;
z-index: 501; zoom: 1;
}
@@ -740,7 +742,7 @@ form#reconnectform { display: none; }
background-position: left bottom; }
#feedbackbox-br { width: 8px; height: 8px; bottom: 0; right: 0;
background-position: right bottom; }
-#feedbackbox-hide { width: 22px; height: 22px; right: 9px; top: 7px;
+#feedbackbox-hide { width: 22px; height: 0px; right: 9px; top: 7px;
background-position: -569px -6px;
}
#feedbackbox-back { width: <%=feedbackbox.width-16%>px;
@@ -751,7 +753,7 @@ form#reconnectform { display: none; }
height: <%=feedbackbox.height-16%>px; left: 8px; top: 8px;
position: absolute; font-size: 1.4em; color: #444; }
#feedbackbox-contentsinner { padding: 10px; }
-#feedbackbox-send { width: 50px; height: 22px; right: 15px; bottom: 15px;
+#feedbackbox-send { width: 50px; height: 0px; right: 15px; bottom: 15px;
background-position: -535px -363px;
}
#feedbackbox-email { left: 90px; top: 48px; width: 356px; height: auto; }
@@ -786,10 +788,10 @@ form#reconnectform { display: none; }
background-image: url(/static/img/jun09/pad/sharebox4.gif);
}
#sharebox-hide, #sharebox-send { display: block; }
-#sharebox-hide { width: 22px; height: 22px; right: 9px; top: 7px;
+#sharebox-hide { width: 22px; height: 0px; right: 9px; top: 7px;
background-position: <%= -(shareboxfull.width-31) %>px -6px;
}
-#sharebox-send { width: 87px; height: 22px; right: 15px; top: <%= shareboxfull.height-22-15 %>px;
+#sharebox-send { width: 87px; height: 0px; right: 15px; top: <%= shareboxfull.height-22-15 %>px;
background-position: <%= -(shareboxfull.width-87-15) %>px <%= -(shareboxfull.height-22-15) %>px;
}
#sharebox-url { position: absolute; left: 20px; top: 42px; width: 440px; height: 18px;
@@ -803,7 +805,7 @@ form#reconnectform { display: none; }
#sharebox .goodresponse { font-weight: bold; color: green; }
#sharebox .badresponse { font-weight: bold; color: red; }
#sharebox-dislink { position: absolute; left: 12px; top: 78px;
- height: 22px; width: 220px; cursor: pointer;
+ height: 0px; width: 220px; cursor: pointer;
background-image: url(/static/img/jun09/pad/sharedistri.gif);
background-repeat: no-repeat;
background-position: 0 5px;
@@ -838,33 +840,33 @@ form#reconnectform { display: none; }
.nonprouser #sharebox-forms { top: 0; }
#viewbarcontents { display: none; }
-#viewzoomtitle {
- position: absolute; left: 10px; top: 4px; height: 20px; line-height: 20px;
- width: auto;
-}
-#viewzoommenu {
- position: absolute; top: 3px; left: 50px;
- width: 65px;
-}
-#bottomarea { height: 28px; overflow: hidden; position: relative;
- font-size: 1.2em; color: #444; }
-#widthprefcheck { position: absolute;
- background-image: url(/static/img/jun09/pad/layoutbuttons.gif);
- background-repeat: no-repeat; cursor: pointer;
- width: 86px; height: 20px; top: 4px; right: 2px; }
-.widthprefunchecked { background-position: -1px -1px; }
-.widthprefchecked { background-position: -1px -23px; }
-#sidebarcheck { position: absolute;
- background-image: url(/static/img/jun09/pad/layoutbuttons.gif);
- background-repeat: no-repeat; cursor: pointer;
- width: 86px; height: 20px; top: 4px; right: 90px; }
-.sidebarunchecked { background-position: -1px -45px; }
-.sidebarchecked { background-position: -1px -67px; }
-#feedbackbutton { display: block; position: absolute; width: 68px;
- height: 0; padding-top: 17px; overflow: hidden;
- background: url(/static/img/jun09/pad/bottomareagfx.gif);
- top: 5px; right: 220px;
-}
+/* #viewzoomtitle { */
+/* position: absolute; left: 10px; top: 4px; height: 20px; line-height: 20px; */
+/* width: auto; */
+/* } */
+/* #viewzoommenu { */
+/* position: absolute; top: 3px; left: 50px; */
+/* width: 65px; */
+/* } */
+/* #bottomarea { height: 0px; overflow: hidden; position: relative; */
+/* font-size: 1.2em; color: #444; } */
+/* #widthprefcheck { position: absolute; */
+/* background-image: url(/static/img/jun09/pad/layoutbuttons.gif); */
+/* background-repeat: no-repeat; cursor: pointer; */
+/* width: 86px; height: 20px; top: 4px; right: 2px; } */
+/* .widthprefunchecked { background-position: -1px -1px; } */
+/* .widthprefchecked { background-position: -1px -23px; } */
+/* #sidebarcheck { position: absolute; */
+/* background-image: url(/static/img/jun09/pad/layoutbuttons.gif); */
+/* background-repeat: no-repeat; cursor: pointer; */
+/* width: 86px; height: 20px; top: 4px; right: 90px; } */
+/* .sidebarunchecked { background-position: -1px -45px; } */
+/* .sidebarchecked { background-position: -1px -67px; } */
+/* #feedbackbutton { display: block; position: absolute; width: 68px; */
+/* height: 0; padding-top: 17px; overflow: hidden; */
+/* background: url(/static/img/jun09/pad/bottomareagfx.gif); */
+/* top: 5px; right: 220px; */
+/* } */
#modaloverlay {
z-index: 500; display: none;
diff --git a/etherpad/src/static/js/broadcast_slider.js b/etherpad/src/static/js/broadcast_slider.js
index 255d7f2..371663e 100644
--- a/etherpad/src/static/js/broadcast_slider.js
+++ b/etherpad/src/static/js/broadcast_slider.js
@@ -138,7 +138,7 @@ var global = this;
swatchtd.append(swatch);
tr.append(swatchtd);
var nametd = $('<td></td>');
- nametd.html(author.name || "unnamed");
+ nametd.text(author.name || "unnamed");
tr.append(nametd);
$("#authorstable").append(tr);
} else {
@@ -398,4 +398,4 @@ var global = this;
BroadcastSlider.onSlider(function(loc) {
$("#viewlatest").html(loc==BroadcastSlider.getSliderLength()?"Viewing latest content":"View latest content");
-})
\ No newline at end of file
+})
diff --git a/etherpad/src/static/js/colorutils.js b/etherpad/src/static/js/colorutils.js
index e745f8e..31c26c9 100644
--- a/etherpad/src/static/js/colorutils.js
+++ b/etherpad/src/static/js/colorutils.js
@@ -1,4 +1,5 @@
// DO NOT EDIT THIS FILE, edit infrastructure/ace/www/colorutils.js
+// THIS FILE IS ALSO SERVED AS CLIENT-SIDE JS
/**
* Copyright 2009 Google Inc.
diff --git a/etherpad/src/static/js/cssmanager_client.js b/etherpad/src/static/js/cssmanager_client.js
index 04ed641..91c99ee 100644
--- a/etherpad/src/static/js/cssmanager_client.js
+++ b/etherpad/src/static/js/cssmanager_client.js
@@ -1,5 +1,6 @@
// DO NOT EDIT THIS FILE, edit infrastructure/ace/www/cssmanager.js
+
/**
* Copyright 2009 Google Inc.
*
diff --git a/etherpad/src/static/js/domline_client.js b/etherpad/src/static/js/domline_client.js
index de2e7d3..fdf7714 100644
--- a/etherpad/src/static/js/domline_client.js
+++ b/etherpad/src/static/js/domline_client.js
@@ -1,4 +1,5 @@
// DO NOT EDIT THIS FILE, edit infrastructure/ace/www/domline.js
+// THIS FILE IS ALSO AN APPJET MODULE: etherpad.collab.ace.domline
/**
* Copyright 2009 Google Inc.
diff --git a/etherpad/src/static/js/easysync2_client.js b/etherpad/src/static/js/easysync2_client.js
index 043099c..d5298f7 100644
--- a/etherpad/src/static/js/easysync2_client.js
+++ b/etherpad/src/static/js/easysync2_client.js
@@ -1,4 +1,5 @@
// DO NOT EDIT THIS FILE, edit infrastructure/ace/www/easysync2.js
+// THIS FILE IS ALSO AN APPJET MODULE: etherpad.collab.ace.easysync2
/**
* Copyright 2009 Google Inc.
diff --git a/etherpad/src/static/js/linestylefilter_client.js b/etherpad/src/static/js/linestylefilter_client.js
index df35c3c..46ede33 100644
--- a/etherpad/src/static/js/linestylefilter_client.js
+++ b/etherpad/src/static/js/linestylefilter_client.js
@@ -1,4 +1,5 @@
// DO NOT EDIT THIS FILE, edit infrastructure/ace/www/linestylefilter.js
+// THIS FILE IS ALSO AN APPJET MODULE: etherpad.collab.ace.linestylefilter
/**
* Copyright 2009 Google Inc.
diff --git a/etherpad/src/static/js/pad2.js b/etherpad/src/static/js/pad2.js
index 14ac762..a5e61db 100644
--- a/etherpad/src/static/js/pad2.js
+++ b/etherpad/src/static/js/pad2.js
@@ -153,7 +153,7 @@ var pad = {
if (pageHeight < MIN_PAGE_HEIGHT) {
pageHeight = MIN_PAGE_HEIGHT;
}
- var bottomAreaHeight = 28;
+ var bottomAreaHeight = 1;
padeditor.setBottom(pageHeight - bottomAreaHeight);
sidebarSplit.setBottom(pageHeight - bottomAreaHeight);
paddocbar.handleResizePage();
diff --git a/etherpad/src/templates/pad/pad_body2.ejs b/etherpad/src/templates/pad/pad_body2.ejs
index a49f453..15e145e 100644
--- a/etherpad/src/templates/pad/pad_body2.ejs
+++ b/etherpad/src/templates/pad/pad_body2.ejs
@@ -70,29 +70,7 @@ limitations under the License. */ %>
<div id="padpage">
<div id="padtop">
- <div id="topbar">
- <% /* floated left */ %>
- <div id="topbarleft"><!-- --></div>
- <% /* <a href="#" id="topbarnewpad">New Pad</a> */ %>
- <% /* floated right */ %>
- <div id="topbarright"><!-- --></div>
- <% /* <a href="#" id="topbarfullwidth">Toggle Width</a> */ %>
- <% /* non-floated */ %>
- <div id="topbarcenter">
- <a href="/" id="topbaretherpad">EtherPad</a>
- </div>
-<% if (isProAccountHolder) { %>
- <a id="backtoprosite" href="/ep/padlist/">Return to pad list</a>
- <div id="accountnav"><%= toHTML(account.email) %>
- <a href="/ep/account/sign-out">(sign out)</a>
- </div>
-<% } else if (isPro) { %>
- <div id="accountnav">
- <a href="<%= signinUrl %>">sign in</a>
- </div>
-<% } %>
- <div id="specialkeyarea"><!-- --></div>
- </div>
+<!--TOPBAR REMOVED -->
<!--
<div id="shuttingdown">
<strong style="color:red">Note: EtherPad.com is shutting down March 31, 2010.</strong>
@@ -106,173 +84,7 @@ limitations under the License. */ %>
<p id="servermsgtext"><!-- --></p>
</div>
</div>
-
- <div id="docbar">
- <div id="docbarleft"><!-- --></div>
- <div id="docbarpadtitle"><span><%= initialTitle %></span></div>
-<% if (isProAccountHolder) { %>
- <div id="docbarsecurity-outer"><a href="javascript:void(0)" id="docbarsecurity">Security</a></div>
-<% } /* isProAccountHolder */ %>
- <div id="docbaroptions-outer"><a href="javascript:void(0)" id="docbaroptions">Pad Options</a></div>
- <div id="docbarsavedrevs-outer"><a href="javascript:void(0)" id="docbarsavedrevs">Saved revisions</a></div>
- <div id="docbarimpexp-outer"><a href="javascript:void(0)" id="docbarimpexp">Import/Export</a></div>
- <div id="docbarslider-outer"><a target="_blank" href="/ep/pad/view/<%= localPadId %>/latest" id="docbarslider">Time Slider</a></div>
-<% if (isProAccountHolder) { %>
- <div id="docbarrenamelink">
- <a href="javascript:void(0)">(rename)</a>
- </div>
-<% } /* isProAccountHolder */ %>
- <input type="text" id="padtitleedit"/>
- <div id="padtitlebuttons">
- <a id="padtitlesave" href="javascript:void(0)">Save</a>
- <a id="padtitlecancel" href="javascript:void(0)">Cancel</a>
- </div>
- <div id="impexp-wrapper" class="dbpanel-wrapper">
- <div id="impexp-panel" class="dbpanel-panel">
- <div class="dbpanel-leftedge"><!-- --></div>
- <div class="dbpanel-rightedge"><!-- --></div>
- <div class="dbpanel-botleftcorner"><!-- --></div>
- <div class="dbpanel-botrightcorner"><!-- --></div>
- <div class="dbpanel-middle">
- <div class="dbpanel-inner">
- <div class="dbpanel-top"><!-- --></div>
- </div>
- <div class="dbpanel-bottom"><!-- --></div>
- <div id="importexport">
- <div id="impexp-import">
- <div id="impexp-importlabel"><b>Import</b> from text file, HTML, Word, or RTF:</div>
- <form id="importform" method="post" action="/ep/pad/impexp/import"
- target="importiframe" enctype="multipart/form-data">
- <div class="importformdiv" id="importformfilediv">
- <input type="file" name="file" size="20" id="importfileinput" />
- <div class="importmessage" id="importmessagefail"></div>
- </div>
- <div class="importmessage" id="importmessagesuccess">Successful!</div>
- <div class="importformdiv" id="importformsubmitdiv">
- <input type="hidden" name="padId" value="<%= encodeURIComponent(localPadId) %>" />
- <span class="nowrap">
- <input type="submit" name="submit" value="Import Now" disabled="disabled" id="importsubmitinput" />
- <img alt="" id="importstatusball" src="/static/img/misc/status-ball.gif" align="top" />
- <img alt="" id="importarrow" src="/static/img/may09/leftarrow2.gif" align="top" />
- </span>
- </div>
- </form>
- </div><!-- /impexp-import -->
- <div id="impexp-export">
- <div id="impexp-exportlabel"><b>Export</b> current pad as:</div>
- <div id="exportlinks">
- <%= exportLink('html', 1, 'HTML', false) %>
- <%= exportLink('txt', 2, 'Plain text', false) %>
- <%= exportLink('link', 3, 'Bookmark file', false, '/ep/pad/linkfile?padId='+localPadId, 'This will save a file that, when opened, takes you to this pad.') %>
- <%= exportLink('doc', 4, 'Microsoft Word', true) %>
- <%= exportLink('pdf', 5, 'PDF', true) %>
- <%= exportLink('odt', 6, 'OpenDocument', true) %>
- </div>
- </div><!-- /impexp-export -->
- <div id="impexp-divider"><!-- --></div>
- <div id="impexp-disabled-clickcatcher"><!-- --></div>
- <a id="impexp-close" href="javascript:void(0)">Hide</a>
- </div><!-- /importexport -->
- </div>
- </div>
- </div>
- <div id="savedrevs-wrapper" class="dbpanel-wrapper">
- <div id="savedrevs-panel" class="dbpanel-panel">
- <div class="dbpanel-leftedge"><!-- --></div>
- <div class="dbpanel-rightedge"><!-- --></div>
- <div class="dbpanel-botleftcorner"><!-- --></div>
- <div class="dbpanel-botrightcorner"><!-- --></div>
- <div class="dbpanel-middle">
- <div class="dbpanel-inner">
- <div class="dbpanel-top"><!-- --></div>
- </div>
- <div class="dbpanel-bottom"><!-- --></div>
- </div>
- <div id="savedrevisions">
- <a href="javascript:void(0)" id="savedrevs-savenow">
- Save Now
- </a>
- <div id="savedrevs-scrolly">
- <div id="savedrevs-scrollleft" class="disabledscrollleft"><!-- --></div>
- <div id="savedrevs-scrollright" class="disabledscrollright"><!-- --></div>
- <div id="savedrevs-scrollouter">
- <div id="savedrevs-scrollinner">
- <!-- -->
- </div>
- </div>
- </div>
- <a id="savedrevs-close" href="javascript:void(0)">Hide</a>
- </div><!-- /savedrevs close -->
- </div>
- </div><!-- /savedrevs-wrapper -->
- <div id="revision-notifier"><span class="label">Saved:</span> <span class="name">Revision 1</span></div>
- <div id="options-wrapper" class="dbpanel-wrapper">
- <div id="options-panel" class="dbpanel-panel">
- <div class="dbpanel-leftedge"><!-- --></div>
- <div class="dbpanel-rightedge"><!-- --></div>
- <div class="dbpanel-botleftcorner"><!-- --></div>
- <div class="dbpanel-botrightcorner"><!-- --></div>
- <div class="dbpanel-middle">
- <div class="dbpanel-inner">
- <div class="dbpanel-top"><!-- --></div>
- </div>
- <div class="dbpanel-bottom"><!-- --></div>
- </div>
- <div id="padoptions">
- <div id="options-viewhead">Shared view options:</div>
- <input type="checkbox" id="options-colorscheck" />
- <label for="options-colorscheck" id="options-colorslabel">Authorship colors</label>
- <input type="checkbox" id="options-linenoscheck" />
- <label for="options-linenoscheck" id="options-linenoslabel">Line numbers</label>
- <div id="options-fontlabel">Display font:</div>
- <select id="viewfontmenu"><option value="normal">Normal</option><option value="monospace">Monospaced</option></select>
- <div id="options-viewexplain">These options affect everyone's view of the pad.</div>
- <a id="options-close" href="javascript:void(0)">Hide</a>
- </div>
- </div>
- </div><!-- /options-wrapper -->
-<% if (isProAccountHolder) { %>
- <div id="security-wrapper" class="dbpanel-wrapper">
- <div id="security-panel" class="dbpanel-panel">
- <div class="dbpanel-leftedge"><!-- --></div>
- <div class="dbpanel-rightedge"><!-- --></div>
- <div class="dbpanel-botleftcorner"><!-- --></div>
- <div class="dbpanel-botrightcorner"><!-- --></div>
- <div class="dbpanel-middle">
- <div class="dbpanel-inner">
- <div class="dbpanel-top"><!-- --></div>
- </div>
- <div class="dbpanel-bottom"><!-- --></div>
- </div>
- <div id="padsecurity">
- <div id="security-access">
- <div id="security-accesshead">Pad Access:</div>
- <input type="radio" name="padaccess" id="access-private" value="deny"/>
- <label for="access-private" id="access-private-label"><strong>Private</strong> (Team account-holders only)</label>
- <input type="radio" name="padaccess" id="access-public" value="allow"/>
- <label for="access-public" id="access-public-label"><strong>Public</strong> (Allow Internet guests)</label>
- </div>
- <div id="security-password">
- <div id="security-passhead">Password:</div>
- <div id="security-passbody">
- <div class="nopassword" id="password-nonedit">
- <div id="password-display">None</div>
- <a href="javascript:void(0)" id="password-setlink">Set...</a>
- <a href="javascript:void(0)" id="password-clearlink">Clear</a>
- </div>
- <div id="password-inedit">
- <a href="javascript:void(0)" id="password-savelink">Save</a>
- <a href="javascript:void(0)" id="password-cancellink">Cancel</a>
- <input type="text" id="security-passwordedit" maxlength="31" />
- </div>
- </div>
- </div>
- <a id="security-close" href="javascript:void(0)">Hide</a>
- </div>
- </div>
- </div><!-- /security-wrapper -->
-<% } /* isProAccountHolder */ %>
- </div><!-- /docbar -->
+<!-- DOCBAR REMOVED -->
</div>
<div id="padmain">
@@ -401,21 +213,10 @@ limitations under the License. */ %>
</div>
</div><!-- /padeditor -->
- <div id="bottomarea">
- <div id="viewbarcontents">
- <div id="viewzoomtitle">Zoom:</div>
- <select id="viewzoommenu"><option value="z85">85%</option><option value="z100">100%</option><option value="z115">115%</option><option value="z150">150%</option><option value="z200">200%</option><option value="z300">300%</option></select>
- </div>
-
- <div id="widthprefcheck"
- class="<%= (prefs.isFullWidth?'widthprefchecked':'widthprefunchecked') %>"
- ><!-- --></div>
- <div id="sidebarcheck"
- class="<%= (prefs.hideSidebar?'sidebarunchecked':'sidebarchecked') %>"
- ><!-- --></div>
- </div>
-
-</div><!-- /padmain -->
+ <!-- BOTTOM AREA REMOVED -->
+
+</div>
+<!-- /padmain -->
</div><!-- /padpage -->
diff --git a/infrastructure/ace/www/ace2_inner.js b/infrastructure/ace/www/ace2_inner.js
index afd1e35..e46c667 100644
--- a/infrastructure/ace/www/ace2_inner.js
+++ b/infrastructure/ace/www/ace2_inner.js
@@ -2800,8 +2800,9 @@ function OUTER(gscope) {
while (n && n.parentNode && ! isLink(n)) { n = n.parentNode; }
if (n && isLink(n)) {
try {
- var newWindow = window.open(n.href, '_blank');
- newWindow.focus();
+ // alert("Browsing a link");
+ var newWindow = window.open(n.href, '_blank');
+ newWindow.focus();
}
catch (e) {
// absorb "user canceled" error in IE for certain prompts
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment