13 files changed, 41 insertions, 59 deletions
diff --git a/etherpad/src/static/crossdomain.xml b/etherpad/src/static/crossdomain.xml
index 1074b2a..9e76390 100644
--- a/etherpad/src/static/crossdomain.xml
+++ b/etherpad/src/static/crossdomain.xml
@@ -3,8 +3,10 @@
   xsi:noNamespaceSchemaLocation="http://www.adobe.com/xml/schemas/PolicyFile.xsd">
 <site-control permitted-cross-domain-policies="all"/>
 <allow-http-request-headers-from domain="*" headers="*"/>
-<allow-access-from domain="*.tokbox.com" to-ports="*"/>
-<allow-access-from domain="tokbox.com" to-ports="*"/>
-<allow-access-from domain="*.etherpad.com" to-ports="*"/>
-<allow-access-from domain="etherpad.com" to-ports="*"/>
+<allow-access-from domain="*.pad.spline.de" to-ports="*"/>
+<allow-access-from domain="pad.spline.de" to-ports="*"/>
+<allow-access-from domain="*.pad.spline.inf.fu-berlin.de" to-ports="*"/>
+<allow-access-from domain="pad.spline.inf.fu-berlin.de" to-ports="*"/>
+<allow-access-from domain="*.pad.spline.nomad" to-ports="*"/>
+<allow-access-from domain="pad.spline.nomad" to-ports="*"/>
 </cross-domain-policy>
diff --git a/etherpad/src/static/css/broadcast.css b/etherpad/src/static/css/broadcast.css
index 9114f8e..afb65b8 100644
--- a/etherpad/src/static/css/broadcast.css
+++ b/etherpad/src/static/css/broadcast.css
@@ -1,6 +1,5 @@
-*,html.body,p { margin: 0; padding: 0; }
-h1, h2, h3, h4, h5, h6 { font-size: 100%; font-weight: normal; font-style: normal;
-  text-decoration: none; margin: 0; padding: 0; }
+*,html.body { margin: 0; padding: 0; }
+h1, h2, h3, h4, h5, h6 { display: inline; line-height: 2em; }
 
 .clear { clear: both; }
 
@@ -15,14 +14,14 @@ body, textarea { font-family: Arial, sans-serif; }
 #padpage { margin-left: auto; margin-right: auto; width: 914px; vertical-align: top;}
 
 #topbarleft { float: left; height: 100%; overflow: hidden;
-  background: url(/static/img/jun09/pad/padtop4.gif) no-repeat left top; width: 5px; }
+  background: url(/static/img/jun09/pad/padtop4.png) no-repeat left top; width: 5px; }
 #topbarright { float: right; height: 100%; overflow: hidden;
-  background: url(/static/img/jun09/pad/padtop4.gif) no-repeat right top; width: 5px; }
+  background: url(/static/img/jun09/pad/padtop4.png) no-repeat right top; width: 5px; }
 
 
-.propad #topbar { background: #2c2c2c url(/static/img/jun09/pad/protop.gif) repeat-x 0 -25px; }
-.propad #topbarleft { background: url(/static/img/jun09/pad/protop.gif) no-repeat left top; }
-.propad #topbarright { background: url(/static/img/jun09/pad/protop.gif) no-repeat right top; }
+.propad #topbar { background: #2c2c2c url(/static/img/jun09/pad/protop.png) repeat-x 0 -25px; }
+.propad #topbarleft { background: url(/static/img/jun09/pad/protop.png) no-repeat left top; }
+.propad #topbarright { background: url(/static/img/jun09/pad/protop.png) no-repeat right top; }
 
 a#backtoprosite, #accountnav {
   display: block; position: absolute; height: 15px; line-height: 15px;
@@ -33,11 +32,11 @@ a#backtoprosite, #accountnav a { color: #cde7ff; text-decoration: underline; }
 
 
 #topbarcenter { margin-left: 150px; margin-right: 150px; }
-a#topbaretherpad { margin-left: auto; margin-right: auto; display: block; width: 103px;
-  position: relative; top: 3px; height: 0; padding-top: 20px;
-  background: url(/static/img/jun09/pad/padtop4.gif) no-repeat -397px -3px; overflow: hidden; }
+a#topbaretherpad { margin-left: auto; margin-right: auto; display: block; width: 127px;
+  position: relative; top: 0px; height: 0; padding-top: 25px;
+  background: url(/static/img/jun09/pad/padtop4.png) no-repeat -397px 0px; overflow: hidden; }
 
-.propad a#topbaretherpad { background: url(/static/img/jun09/pad/protop.gif) no-repeat -397px -3px; }
+.propad a#topbaretherpad { background: url(/static/img/jun09/pad/protop.png) no-repeat -397px 0px; }
 
 #padmain {
   margin: 7px;
@@ -384,4 +383,4 @@ div #timeslider div#steppers div#rightstep {
 #error a {
   color: rgb(50, 132, 213);
   text-decoration: none;
-}
-\ No newline at end of file
+}
diff --git a/etherpad/src/static/css/pad2_ejs.css b/etherpad/src/static/css/pad2_ejs.css
index 0519a9d..71176ee 100644
--- a/etherpad/src/static/css/pad2_ejs.css
+++ b/etherpad/src/static/css/pad2_ejs.css
@@ -1,7 +1,7 @@
 
-*,html.body,p { margin: 0; padding: 0; }
-h1, h2, h3, h4, h5, h6 { font-size: 100%; font-weight: normal; font-style: normal;
-  text-decoration: none; margin: 0; padding: 0; }
+*,html.body { margin: 0; padding: 0; }
+
+h1, h2, h3, h4, h5, h6 { display: inline; line-height: 2em; }
 
 .clear { clear: both; }
 
@@ -12,21 +12,21 @@ body, textarea { font-family: Arial, sans-serif; }
 
 #padpage { margin-left: auto; margin-right: auto; width: 900px; }
 
-body.fullwidth #padpage { width: auto; margin-left: 6px; margin-right: 6px; }
-body.squish1width #padpage { width: 800px; }
-body.squish2width #padpage { width: 700px; }
+body.fullwidth #padpage { width: auto; margin-left: 6px; margin-right: 6px; min-width: 800px; }
+body.squish1width #padpage { width: 900px; }
+body.squish2width #padpage { width: 800px; }
 
 #topbar { height: 25px; background: #326cbd url(/static/img/jun09/pad/padtopback2.gif) repeat-x left top;
   position: relative; }
 
 #topbarleft { float: left; height: 100%; overflow: hidden;
-  background: url(/static/img/jun09/pad/padtop5.gif) no-repeat left top; width: 5px; }
+  background: url(/static/img/jun09/pad/padtop5.png) no-repeat left top; width: 5px; }
 #topbarright { float: right; height: 100%; overflow: hidden;
-  background: url(/static/img/jun09/pad/padtop5.gif) no-repeat right top; width: 5px; }
+  background: url(/static/img/jun09/pad/padtop5.png) no-repeat right top; width: 5px; }
 
-.propad #topbar { background: #2c2c2c url(/static/img/jun09/pad/protop.gif) repeat-x 0 -25px; }
-.propad #topbarleft { background: url(/static/img/jun09/pad/protop.gif) no-repeat left top; }
-.propad #topbarright { background: url(/static/img/jun09/pad/protop.gif) no-repeat right top; }
+.propad #topbar { background: #2c2c2c url(/static/img/jun09/pad/protop.png) repeat-x 0 -25px; }
+.propad #topbarleft { background: url(/static/img/jun09/pad/protop.png) no-repeat left top; }
+.propad #topbarright { background: url(/static/img/jun09/pad/protop.png) no-repeat right top; }
 
 a#backtoprosite, #accountnav {
   display: block; position: absolute; height: 15px; line-height: 15px;
@@ -35,15 +35,15 @@ a#backtoprosite, #accountnav {
 a#backtoprosite, #accountnav a { color: #cde7ff; text-decoration: underline; }
 
 a#backtoprosite { padding-left: 20px; left: 6px;
-  background: url(/static/img/jun09/pad/protop.gif) no-repeat -5px -6px; }
+  background: url(/static/img/jun09/pad/protop.png) no-repeat -5px -6px; }
 #accountnav { right: 10px; color: #fff; }
   
 #topbarcenter { margin-left: 150px; margin-right: 150px; }
-a#topbaretherpad { margin-left: auto; margin-right: auto; display: block; width: 103px;
-  position: relative; top: 3px; height: 0; padding-top: 20px;
-  background: url(/static/img/jun09/pad/padtop5.gif) no-repeat -397px -3px; overflow: hidden; }
+a#topbaretherpad { margin-left: auto; margin-right: auto; display: block; width: 127px;
+  position: relative; top: 0px; height: 0; padding-top: 25px;
+  background: url(/static/img/jun09/pad/padtop5.png) no-repeat -397px 0px; overflow: hidden; }
 
-.propad a#topbaretherpad { background: url(/static/img/jun09/pad/protop.gif) no-repeat -397px -3px; }
+.propad a#topbaretherpad { background: url(/static/img/jun09/pad/protop.png) no-repeat -397px 0px; }
 
 #specialkeyarea { top: 5px; left: 250px; color: yellow; font-weight: bold;
   font-size: 1.5em; position: absolute; }
@@ -489,7 +489,7 @@ table#otheruserstable { display: none; }
    down on the page in IE.  Strange but it works! */
 #docbar { z-index: 52; }
 
-#impexp-wrapper { width: 650px; right: 10px; }
+#impexp-wrapper { width: 500px; right: 10px; }
 #impexp-panel { height: 160px; }
 .docbarimpexp-closing #impexp-wrapper { z-index: 50; }
 
diff --git a/etherpad/src/static/css/pro-help.css b/etherpad/src/static/css/pro-help.css
deleted file mode 100644
index 9237b62..0000000
--- a/etherpad/src/static/css/pro-help.css
+++ /dev/null
@@ -1,19 +0,0 @@
-
-h1 {
-  font-size: 1.33em;
-  color: #555;
-  border-bottom: 1px solid #888;
-}
-
-h2 {
-  font-size: 1.1em;
-  color: #333;
-  border-bottom: 1px solid #888;
-}
-
-div.pro-help {
-  font-size: 88%;
-  width: 66%;
-}
-
-
diff --git a/etherpad/src/static/favicon.ico b/etherpad/src/static/favicon.ico
index a19a1cb..a833c3a 100644
--- a/etherpad/src/static/favicon.ico
+++ b/etherpad/src/static/favicon.ico
diff --git a/etherpad/src/static/img/jun09/pad/padtop5.png b/etherpad/src/static/img/jun09/pad/padtop5.png
new file mode 100644
index 0000000..22a0db7
--- /dev/null
+++ b/etherpad/src/static/img/jun09/pad/padtop5.png
diff --git a/etherpad/src/static/img/jun09/pad/padtop5.xcf b/etherpad/src/static/img/jun09/pad/padtop5.xcf
new file mode 100644
index 0000000..c0bf7e4
--- /dev/null
+++ b/etherpad/src/static/img/jun09/pad/padtop5.xcf
diff --git a/etherpad/src/static/img/jun09/pad/protop.gif b/etherpad/src/static/img/jun09/pad/protop.gif
deleted file mode 100644
index 9171646..0000000
--- a/etherpad/src/static/img/jun09/pad/protop.gif
+++ /dev/null
diff --git a/etherpad/src/static/img/pro/header/pro-header-logo.png b/etherpad/src/static/img/pro/header/pro-header-logo.png
index c1a003c..b36daa8 100644
--- a/etherpad/src/static/img/pro/header/pro-header-logo.png
+++ b/etherpad/src/static/img/pro/header/pro-header-logo.png
diff --git a/etherpad/src/static/js/broadcast_slider.js b/etherpad/src/static/js/broadcast_slider.js
index 8977e3d..371663e 100644
--- a/etherpad/src/static/js/broadcast_slider.js
+++ b/etherpad/src/static/js/broadcast_slider.js
@@ -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/etherpad.js b/etherpad/src/static/js/etherpad.js
index feca517..4e51dbf 100644
--- a/etherpad/src/static/js/etherpad.js
+++ b/etherpad/src/static/js/etherpad.js
@@ -47,8 +47,8 @@ etherpad.validEmail = function(x) {
 
 etherpad.deobfuscateEmails = function() {
   $("a.obfuscemail").each(function() {
-    $(this).html($(this).html().replace('e***rp*d','etherpad'));
-    this.href = this.href.replace('e***rp*d','etherpad');
+    $(this).html($(this).html().replace('p*d.sp***e','pad.spline'));
+    this.href = this.href.replace('p*d.sp***e','pad.spline');
   });
 };
 
diff --git a/etherpad/src/static/js/pad_modals.js b/etherpad/src/static/js/pad_modals.js
index 35a1155..c9f48b5 100644
--- a/etherpad/src/static/js/pad_modals.js
+++ b/etherpad/src/static/js/pad_modals.js
@@ -131,7 +131,7 @@ var padmodals = (function() {
       });
       $("#feedbackemails a").each(function() {
         var node = $(this);
-        node.attr('href', "mailto:"+node.attr('href')+"@etherpad.com");
+        node.attr('href', "mailto:"+node.attr('href')+"@pad.spline.inf.fu-berlin.de");
       });
     },
     initShareBox: function() {
@@ -280,7 +280,7 @@ var padmodals = (function() {
       }
       function error(e) {
         setSendingFeedback(false);
-        $("#feedbackbox-response").html("Could not send feedback.  Please email us at feedback"+"@"+"etherpad.com instead.").get(0).className = 'badresponse';
+        $("#feedbackbox-response").html("Could not send feedback.  Please email us at feedback"+"@"+"pad.spline.inf.fu-berlin.de instead.").get(0).className = 'badresponse';
         $("#feedbackbox-response").show();
       }
     },*/
diff --git a/etherpad/src/static/js/pro/guest-knock-client.js b/etherpad/src/static/js/pro/guest-knock-client.js
index 16424d9..bace225 100644
--- a/etherpad/src/static/js/pro/guest-knock-client.js
+++ b/etherpad/src/static/js/pro/guest-knock-client.js
@@ -44,7 +44,7 @@ function knockReply(responseText) {
 }
 
 function knockError() {
-  alert("There was an error requesting access to the pad.  Kindly report this by sending email to bugs@etherpad.com.");
+  alert("There was an error requesting access to the pad.  Kindly report this by sending email to bugs@pad.spline.inf.fu-berlin.de.");
 }
 
 $(document).ready(function() {