ported changes from old version

11 files changed, 31 insertions, 19 deletions

diff --git a/etherpad/src/static/css/home-opensource.css b/etherpad/src/static/css/home-opensource.css
index bb0201e..0d6da6d 100644
--- a/etherpad/src/static/css/home-opensource.css
+++ b/etherpad/src/static/css/home-opensource.css
@@ -1,8 +1,7 @@
-
 #home {
   width: 600px;
   margin: 0 auto;
-  padding: 2em;
+  padding: 4em;
   text-align: center;
 }
 
@@ -10,31 +9,36 @@
   font-size: 3.6em;
 }
 
-#home a#home-newpad{
-  display: block;
+#home #buttons {
+  padding-top: 5em;
+}
+
+#home a#home-newpad, #home a#home-newsite {
   padding: 1em;
-  margin: 12px 60px;
+  margin: 12px 40px;
   font-size: 1.6em;
   border: 1px solid black;
   background: #049;
   color: #fff;
+  width: 30%;
 }
 
-#home a#home-newpad:hover{
+#home a#home-newpad:hover, #home a#home-newsite:hover {
   background: #26b;
+  text-decoration: none;
 }
 
-#home a#home-newteam {
-  display: block;
-  padding: 1em;
-  margin: 12px 60px;
-  font-size: 1.6em;
-  border: 1px solid black;
-  background: #940;
-  color: #fff;
+#tos {
+    margin-top: 8em;
+    color: #222;
+}
+
+#tos h1, #tos p {
+    margin: 1.5em 0;
 }
 
-#home a#home-newteam:hover {
-  background: #b26;
+#tos h1 {
+    font-weight: bold;
+    font-size: 1.1em;
 }
 
diff --git a/etherpad/src/static/img/jun09/pad/editbar_h1.gif b/etherpad/src/static/img/jun09/pad/editbar_h1.gif
new file mode 100644
index 0000000..3b8799d
--- /dev/null
+++ b/etherpad/src/static/img/jun09/pad/editbar_h1.gif
diff --git a/etherpad/src/static/img/jun09/pad/editbar_h2.gif b/etherpad/src/static/img/jun09/pad/editbar_h2.gif
new file mode 100644
index 0000000..2bf8753
--- /dev/null
+++ b/etherpad/src/static/img/jun09/pad/editbar_h2.gif
diff --git a/etherpad/src/static/img/jun09/pad/editbar_h3.gif b/etherpad/src/static/img/jun09/pad/editbar_h3.gif
new file mode 100644
index 0000000..67afb63
--- /dev/null
+++ b/etherpad/src/static/img/jun09/pad/editbar_h3.gif
diff --git a/etherpad/src/static/img/jun09/pad/editbar_h4.gif b/etherpad/src/static/img/jun09/pad/editbar_h4.gif
new file mode 100644
index 0000000..606f152
--- /dev/null
+++ b/etherpad/src/static/img/jun09/pad/editbar_h4.gif
diff --git a/etherpad/src/static/img/jun09/pad/editbar_h5.gif b/etherpad/src/static/img/jun09/pad/editbar_h5.gif
new file mode 100644
index 0000000..6489b4f
--- /dev/null
+++ b/etherpad/src/static/img/jun09/pad/editbar_h5.gif
diff --git a/etherpad/src/static/img/jun09/pad/editbar_h6.gif b/etherpad/src/static/img/jun09/pad/editbar_h6.gif
new file mode 100644
index 0000000..b0ec369
--- /dev/null
+++ b/etherpad/src/static/img/jun09/pad/editbar_h6.gif
diff --git a/etherpad/src/static/img/jun09/pad/protop.png b/etherpad/src/static/img/jun09/pad/protop.png
new file mode 100644
index 0000000..740d903
--- /dev/null
+++ b/etherpad/src/static/img/jun09/pad/protop.png
diff --git a/etherpad/src/static/img/jun09/pad/protop.xcf b/etherpad/src/static/img/jun09/pad/protop.xcf
new file mode 100644
index 0000000..4f3abfd
--- /dev/null
+++ b/etherpad/src/static/img/jun09/pad/protop.xcf
diff --git a/etherpad/src/static/img/pro/header/pro-header-logo.xcf b/etherpad/src/static/img/pro/header/pro-header-logo.xcf
new file mode 100644
index 0000000..524c00f
--- /dev/null
+++ b/etherpad/src/static/img/pro/header/pro-header-logo.xcf
diff --git a/etherpad/src/themes/default/templates/pad/pad_body2.ejs b/etherpad/src/themes/default/templates/pad/pad_body2.ejs
index 5c886fb..0a8a1af 100644
--- a/etherpad/src/themes/default/templates/pad/pad_body2.ejs
+++ b/etherpad/src/themes/default/templates/pad/pad_body2.ejs
@@ -139,9 +139,6 @@ limitations under the License. */ %>
 	      <%= 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>
@@ -393,6 +390,17 @@ limitations under the License. */ %>
   <td>&nbsp;&nbsp;</td>
 
   <td><img src="/static/img/jun09/pad/editbar_groupleft.gif" width="2" height="24"></td>
+  <td class="editbarbutton editbargroupsfirst"><a href="javascript:void (window.pad&&pad.editbarClick('h1'));" title="Heading 1"><img src="/static/img/jun09/pad/editbar_h1.gif"></a></td>
+  <td class="editbarbutton"><a href="javascript:void (window.pad&&pad.editbarClick('h2'));" title="Heading 2"><img src="/static/img/jun09/pad/editbar_h2.gif"></a></td>
+  <td class="editbarbutton"><a href="javascript:void (window.pad&&pad.editbarClick('h3'));" title="Heading 3"><img src="/static/img/jun09/pad/editbar_h3.gif"></a></td>
+  <td class="editbarbutton"><a href="javascript:void (window.pad&&pad.editbarClick('h4'));" title="Heading 4"><img src="/static/img/jun09/pad/editbar_h4.gif"></a></td>
+  <td class="editbarbutton"><a href="javascript:void (window.pad&&pad.editbarClick('h5'));" title="Heading 5"><img src="/static/img/jun09/pad/editbar_h5.gif"></a></td>
+  <td class="editbarbutton"><a href="javascript:void (window.pad&&pad.editbarClick('h6'));" title="Heading 6"><img src="/static/img/jun09/pad/editbar_h6.gif"></a></td>
+  <td><img src="/static/img/jun09/pad/editbar_groupright.gif" width="2" height="24"></td>
+
+  <td>&nbsp;&nbsp;</td>
+
+  <td><img src="/static/img/jun09/pad/editbar_groupleft.gif" width="2" height="24"></td>
   <td class="editbarbutton editbargroupsfirst"><a href="javascript:void (window.pad&&pad.editbarClick('indent'));" title="Indent List"><img src="/static/img/jun09/pad/editbar_indent.gif"></a></td>
   <td class="editbarbutton"><a href="javascript:void (window.pad&&pad.editbarClick('outdent'));" title="Unindent List"><img src="/static/img/jun09/pad/editbar_outdent.gif"></a></td>
   <td><img src="/static/img/jun09/pad/editbar_groupright.gif" width="2" height="24"></td>