Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- 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/bin/setup-mysql-db.sh b/etherpad/bin/setup-mysql-db.sh
- index d823a9e..283b110 100755
- --- a/etherpad/bin/setup-mysql-db.sh
- +++ b/etherpad/bin/setup-mysql-db.sh
- @@ -25,6 +25,6 @@ echo "Creating etherpad ${db}..."
- echo "create database ${db};" | ${mysql} -u root
- echo "Granting priviliges..."
- -echo "grant all privileges on ${db}.* to 'etherpad'@'localhost' identified by 'password';" | ${mysql} -u root
- +echo "grant all privileges on ${db}.* to 'etherpad'@'localhost' identified by '6questions';" | ${mysql} -u root
- echo "Success"
- diff --git a/etherpad/etc/etherpad.localdev-default.properties b/etherpad/etc/etherpad.localdev-default.properties
- index 26bc8e5..a1afcee 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 = 6questions
- etherpad.SQL_USERNAME = etherpad
- listen = 9000
- logDir = ./data/logs
- @@ -14,4 +14,4 @@ modulePath = ./src
- transportPrefix = /comet
- transportUseWildcardSubdomains = true
- useVirtualFileRoot = ./src
- -motdPage = /ep/pad/view/ro.3PfHCD0ApLc/latest?fullScreen=1&slider=0&sidebar=0
- \ No newline at end of file
- +motdPage = /ep/pad/view/ro.3PfHCD0ApLc/latest?fullScreen=1&slider=0&sidebar=0
- diff --git a/etherpad/src/etherpad/globals.js b/etherpad/src/etherpad/globals.js
- index 343a989..d7267a8 100644
- --- a/etherpad/src/etherpad/globals.js
- +++ b/etherpad/src/etherpad/globals.js
- @@ -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 4b3d7e6..09dcd5e 100644
- --- a/etherpad/src/static/css/pad2_ejs.css
- +++ b/etherpad/src/static/css/pad2_ejs.css
- @@ -10,7 +10,7 @@ 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; }
- diff --git a/etherpad/src/static/favicon.ico b/etherpad/src/static/favicon.ico
- index a19a1cb..c71246a 100644
- Binary files a/etherpad/src/static/favicon.ico and b/etherpad/src/static/favicon.ico differ
- diff --git a/etherpad/src/templates/pad/pad_body2.ejs b/etherpad/src/templates/pad/pad_body2.ejs
- index ca0b3ae..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">
- @@ -330,44 +142,15 @@ limitations under the License. */ %>
- <div id="myuser">
- <div id="mycolorpicker">
- - <div>
- - <div class="pickerswatchouter n1"><div class="pickerswatch"><!-- --></div></div>
- - <div class="pickerswatchouter n2"><div class="pickerswatch"><!-- --></div></div>
- - <div class="pickerswatchouter n3"><div class="pickerswatch"><!-- --></div></div>
- - <div class="pickerswatchouter n4"><div class="pickerswatch"><!-- --></div></div>
- - <div class="pickerswatchouter n5"><div class="pickerswatch"><!-- --></div></div>
- - <div class="pickerswatchouter n6"><div class="pickerswatch"><!-- --></div></div>
- - <div class="pickerswatchouter n7"><div class="pickerswatch"><!-- --></div></div>
- - <div class="pickerswatchouter n8"><div class="pickerswatch"><!-- --></div></div>
- - </div><div>
- - <div class="pickerswatchouter n9"><div class="pickerswatch"><!-- --></div></div>
- - <div class="pickerswatchouter n10"><div class="pickerswatch"><!-- --></div></div>
- - <div class="pickerswatchouter n11"><div class="pickerswatch"><!-- --></div></div>
- - <div class="pickerswatchouter n12"><div class="pickerswatch"><!-- --></div></div>
- - <div class="pickerswatchouter n13"><div class="pickerswatch"><!-- --></div></div>
- - <div class="pickerswatchouter n14"><div class="pickerswatch"><!-- --></div></div>
- - <div class="pickerswatchouter n15"><div class="pickerswatch"><!-- --></div></div>
- - <div class="pickerswatchouter n16"><div class="pickerswatch"><!-- --></div></div>
- - </div><div>
- - <div class="pickerswatchouter n17"><div class="pickerswatch"><!-- --></div></div>
- - <div class="pickerswatchouter n18"><div class="pickerswatch"><!-- --></div></div>
- - <div class="pickerswatchouter n19"><div class="pickerswatch"><!-- --></div></div>
- - <div class="pickerswatchouter n20"><div class="pickerswatch"><!-- --></div></div>
- - <div class="pickerswatchouter n21"><div class="pickerswatch"><!-- --></div></div>
- - <div class="pickerswatchouter n22"><div class="pickerswatch"><!-- --></div></div>
- - <div class="pickerswatchouter n23"><div class="pickerswatch"><!-- --></div></div>
- - <div class="pickerswatchouter n24"><div class="pickerswatch"><!-- --></div></div>
- - </div><div>
- - <div class="pickerswatchouter n25"><div class="pickerswatch"><!-- --></div></div>
- - <div class="pickerswatchouter n26"><div class="pickerswatch"><!-- --></div></div>
- - <div class="pickerswatchouter n27"><div class="pickerswatch"><!-- --></div></div>
- - <div class="pickerswatchouter n28"><div class="pickerswatch"><!-- --></div></div>
- - <div class="pickerswatchouter n29"><div class="pickerswatch"><!-- --></div></div>
- - <div class="pickerswatchouter n30"><div class="pickerswatch"><!-- --></div></div>
- - <div class="pickerswatchouter n31"><div class="pickerswatch"><!-- --></div></div>
- - <div class="pickerswatchouter n32"><div class="pickerswatch"><!-- --></div></div>
- - </div>
- - <div id="mycolorpickersave">Save</div>
- + <div class="pickerswatchouter n1"><div class="pickerswatch"><!-- --></div></div>
- + <div class="pickerswatchouter n2"><div class="pickerswatch"><!-- --></div></div>
- + <div class="pickerswatchouter n3"><div class="pickerswatch"><!-- --></div></div>
- + <div class="pickerswatchouter n4"><div class="pickerswatch"><!-- --></div></div>
- + <div class="pickerswatchouter n5"><div class="pickerswatch"><!-- --></div></div>
- + <div class="pickerswatchouter n6"><div class="pickerswatch"><!-- --></div></div>
- + <div class="pickerswatchouter n7"><div class="pickerswatch"><!-- --></div></div>
- + <div class="pickerswatchouter n8"><div class="pickerswatch"><!-- --></div></div>
- + <div id="mycolorpickersave">Save</div>
- <div id="mycolorpickercancel">Cancel</div>
- </div>
- <div id="myswatchbox"><div id="myswatch"><!-- --></div></div>
- @@ -430,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_outer.js b/infrastructure/ace/www/ace2_outer.js
- index e6d430d..2b8448f 100644
- --- a/infrastructure/ace/www/ace2_outer.js
- +++ b/infrastructure/ace/www/ace2_outer.js
- @@ -168,7 +168,7 @@ function Ace2Editor() {
- var iframeHTML = ["'"+doctype+"<html><head>'"];
- - top.plugins.callHook(
- + parent.parent.plugins.callHook(
- "aceInitInnerdocbodyHead", {iframeHTML:iframeHTML});
- // these lines must conform to a specific format because they are passed by the build script:
- diff --git a/infrastructure/ace/www/domline.js b/infrastructure/ace/www/domline.js
- index 90e9943..9e30e1a 100644
- --- a/infrastructure/ace/www/domline.js
- +++ b/infrastructure/ace/www/domline.js
- @@ -101,7 +101,7 @@ domline.createDomLine = function(nonEmpty, doesWrap, optBrowser, optDocument) {
- var extraOpenTags = "";
- var extraCloseTags = "";
- - (function () { try { return top.plugins; } catch (e) { return plugins; }; })().callHook(
- + (function () { try { return parent.parent.plugins; } catch (e) { return plugins; }; })().callHook(
- "aceCreateDomLine", {domline:domline, cls:cls}
- ).map(function (modifier) {
- cls = modifier.cls;
- diff --git a/infrastructure/ace/www/linestylefilter.js b/infrastructure/ace/www/linestylefilter.js
- index c163120..67c0290 100644
- --- a/infrastructure/ace/www/linestylefilter.js
- +++ b/infrastructure/ace/www/linestylefilter.js
- @@ -238,7 +238,7 @@ linestylefilter.textAndClassFuncSplitter = function(func, splitPointsOpt) {
- linestylefilter.getFilterStack = function(lineText, textAndClassFunc, browser) {
- var func = linestylefilter.getURLFilter(lineText, textAndClassFunc);
- - var hookFilters = (function () { try { return top.plugins; } catch (e) { return plugins; }; })().callHook(
- + var hookFilters = (function () { try { return parent.parent.plugins; } catch (e) { return plugins; }; })().callHook(
- "aceGetFilterStack", {linestylefilter:linestylefilter, browser:browser});
- hookFilters.map(function (hookFilter) {
- func = hookFilter(lineText, func);
Add Comment
Please, Sign In to add comment