Permalink
Browse files

Inculded micro and nano theme

  • Loading branch information...
1 parent df4a0e7 commit bf63f22c63e702c1febe0aab21d215491a41d2d7 root committed Oct 11, 2010
View
2 etherpad/src/themes/micro/templates/framed/framedheader-pro.ejs
@@ -27,7 +27,7 @@ limitations under the License. */ %><% helpers.addBodyClass("pro-withtopbar"); %
<% // TODO: eventually have sign-in link here. %>
<% } %>
- <div id="org-name">
+ <div id="pro-brand-name">
<a href="/">
<%= proDomainOrgName %>
</a>
View
2 etherpad/src/themes/micro/templates/pad/pad_body2.ejs
@@ -128,7 +128,7 @@ limitations under the License. */ %>
<a target="_blank" href="/ep/pad/view/<%= localPadId %>/latest" id="docbarslider" title="Time Slider">
<img src="/static/img/jun09/pad/icon_time_slider.gif"></a>
</td>
-<% return ejs_data; }); %>
+<% }); %>
<% template.define('docBarDropdowns', function() { var ejs_data=''; %>
View
7 etherpad/src/themes/micro/templates/page.ejs
@@ -16,7 +16,7 @@ limitations under the License. */ %>
<%
helpers.setBodyId("padbody");
helpers.addBodyClass(bodyClass);
- helpers.includeCss("pad2_ejs.css");
+ helpers.includeCss("micro/pad2_ejs.css");
helpers.includeJs("undo-xpopup.js");
helpers.includeCometJs();
helpers.includeJQuery();;
@@ -116,9 +116,8 @@ limitations under the License. */ %>
<table cellpadding="0" cellspacing="0" border = "0" id="editbarsavetable">
<tr>
- <%: template.callHookStr('editBarItemsRightAll', {}, '', '', ''); %>
- <%: template.use('docBarItems'); %>
- <%: template.use('editBarItemsRight'); %>
+ <%: template.callHookStr('editBarItemsRightAll', {}, '', '', ''); %>
+ <%: template.use('editBarItemsRight'); %>
</tr>
</table>
<%: template.callHookStr('editBarDropdownsAll', {}, '', '', ''); %>
View
22 infrastructure/net.appjet.common.sars/sars.scala
@@ -23,7 +23,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
trait SarsMessageHandler {
def handle(s: String): Option[String] = None;
- def handle(b: Array[byte]): Option[Array[byte]] = None;
+ def handle(b: Array[Byte]): Option[Array[Byte]] = None;
}
class SarsException(m: String) extends RuntimeException(m);
@@ -44,7 +44,7 @@ private[sars] trait SarsMessageReaderWriter {
if (messageType == byteArray) {
try {
val len = inputStream.readInt;
- val bytes = new Array[byte](len);
+ val bytes = new Array[Byte](len);
inputStream.readFully(bytes);
Some(bytes);
} catch {
@@ -64,11 +64,11 @@ private[sars] trait SarsMessageReaderWriter {
val m = readMessage;
m.filter(_.isInstanceOf[String]).asInstanceOf[Option[String]];
}
- def readBytes: Option[Array[byte]] = {
+ def readBytes: Option[Array[Byte]] = {
val m = readMessage;
- m.filter(_.isInstanceOf[Array[byte]]).asInstanceOf[Option[Array[byte]]];
+ m.filter(_.isInstanceOf[Array[Byte]]).asInstanceOf[Option[Array[Byte]]];
}
- def writeMessage(bytes: Array[byte]) {
+ def writeMessage(bytes: Array[Byte]) {
outputStream.writeInt(byteArray);
outputStream.writeInt(bytes.length);
outputStream.write(bytes);
@@ -126,8 +126,8 @@ class SarsClient(authKey: String, host: String, port: Int) {
def message(s: String): String =
message[String](s, readerWriter.writeMessage, Unit => readerWriter.readString);
- def message(b: Array[byte]): Array[byte] =
- message[Array[byte]](b, readerWriter.writeMessage, Unit => readerWriter.readBytes);
+ def message(b: Array[Byte]): Array[Byte] =
+ message[Array[Byte]](b, readerWriter.writeMessage, Unit => readerWriter.readBytes);
def close() {
if (! s.isClosed) {
@@ -166,7 +166,7 @@ class SarsClient(authKey: String, host: String, port: Int) {
client.message(q);
}
- def message(b: Array[byte]) = {
+ def message(b: Array[Byte]) = {
if (! socket.isConnected || socket.isClosed) {
connect();
}
@@ -210,8 +210,8 @@ class SarsServer(authKey: String, handler: SarsMessageHandler, host: Option[Stri
} else {
q.get match {
case s: String => readerWriter.writeMessage(handler.handle(s).getOrElse(""));
- case b: Array[byte] =>
- readerWriter.writeMessage(handler.handle(b).getOrElse(new Array[byte](0)));
+ case b: Array[Byte] =>
+ readerWriter.writeMessage(handler.handle(b).getOrElse(new Array[Byte](0)));
case x: AnyRef => throw new UnknownTypeException(x.getClass.getName);
}
}
@@ -320,7 +320,7 @@ object test {
None;
}
}
- override def handle(b: Array[byte]) = {
+ override def handle(b: Array[Byte]) = {
var actually = new String(b, "UTF-8");
println("SERVER: "+actually);
if (actually == "hello!") {

0 comments on commit bf63f22

Please sign in to comment.