Skip to content
This repository
Browse code

Inculded micro and nano theme

  • Loading branch information...
commit bf63f22c63e702c1febe0aab21d215491a41d2d7 1 parent df4a0e7
authored October 11, 2010
2  etherpad/src/themes/micro/templates/framed/framedheader-pro.ejs
@@ -27,7 +27,7 @@ limitations under the License. */ %><% helpers.addBodyClass("pro-withtopbar"); %
27 27
       <% // TODO: eventually have sign-in link here. %>
28 28
     <% } %>
29 29
 
30  
-    <div id="org-name">
  30
+    <div id="pro-brand-name">
31 31
       <a href="/">
32 32
         <%= proDomainOrgName %>
33 33
       </a>
2  etherpad/src/themes/micro/templates/pad/pad_body2.ejs
@@ -128,7 +128,7 @@ limitations under the License. */ %>
128 128
     <a target="_blank" href="/ep/pad/view/<%= localPadId %>/latest" id="docbarslider" title="Time Slider">
129 129
       <img src="/static/img/jun09/pad/icon_time_slider.gif"></a>
130 130
   </td>
131  
-<% return ejs_data; }); %>
  131
+<% }); %>
132 132
 
133 133
 
134 134
 <% template.define('docBarDropdowns', function() { var ejs_data=''; %>
7  etherpad/src/themes/micro/templates/page.ejs
@@ -16,7 +16,7 @@ limitations under the License. */ %>
16 16
 <%
17 17
   helpers.setBodyId("padbody");
18 18
   helpers.addBodyClass(bodyClass);
19  
-  helpers.includeCss("pad2_ejs.css");
  19
+  helpers.includeCss("micro/pad2_ejs.css");
20 20
   helpers.includeJs("undo-xpopup.js");
21 21
   helpers.includeCometJs();
22 22
   helpers.includeJQuery();;
@@ -116,9 +116,8 @@ limitations under the License. */ %>
116 116
 
117 117
 	    <table cellpadding="0" cellspacing="0" border = "0" id="editbarsavetable">
118 118
 	      <tr>
119  
-	        <%: template.callHookStr('editBarItemsRightAll', {}, '', '', ''); %>
120  
-                <%: template.use('docBarItems'); %>
121  
-	        <%: template.use('editBarItemsRight'); %>
  119
+                <%: template.callHookStr('editBarItemsRightAll', {}, '', '', ''); %>
  120
+                <%: template.use('editBarItemsRight'); %>
122 121
 	      </tr>
123 122
 	    </table>
124 123
 	    <%: template.callHookStr('editBarDropdownsAll', {}, '', '', ''); %>
22  infrastructure/net.appjet.common.sars/sars.scala
@@ -23,7 +23,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
23 23
 
24 24
 trait SarsMessageHandler {
25 25
   def handle(s: String): Option[String] = None;
26  
-  def handle(b: Array[byte]): Option[Array[byte]] = None;
  26
+  def handle(b: Array[Byte]): Option[Array[Byte]] = None;
27 27
 }
28 28
 
29 29
 class SarsException(m: String) extends RuntimeException(m);
@@ -44,7 +44,7 @@ private[sars] trait SarsMessageReaderWriter {
44 44
     if (messageType == byteArray) {
45 45
       try {
46 46
         val len = inputStream.readInt;
47  
-        val bytes = new Array[byte](len);
  47
+        val bytes = new Array[Byte](len);
48 48
         inputStream.readFully(bytes);
49 49
         Some(bytes);
50 50
       } catch {
@@ -64,11 +64,11 @@ private[sars] trait SarsMessageReaderWriter {
64 64
     val m = readMessage;
65 65
     m.filter(_.isInstanceOf[String]).asInstanceOf[Option[String]];
66 66
   }
67  
-  def readBytes: Option[Array[byte]] = {
  67
+  def readBytes: Option[Array[Byte]] = {
68 68
     val m = readMessage;
69  
-    m.filter(_.isInstanceOf[Array[byte]]).asInstanceOf[Option[Array[byte]]];
  69
+    m.filter(_.isInstanceOf[Array[Byte]]).asInstanceOf[Option[Array[Byte]]];
70 70
   }
71  
-  def writeMessage(bytes: Array[byte]) {
  71
+  def writeMessage(bytes: Array[Byte]) {
72 72
     outputStream.writeInt(byteArray);
73 73
     outputStream.writeInt(bytes.length);
74 74
     outputStream.write(bytes);
@@ -126,8 +126,8 @@ class SarsClient(authKey: String, host: String, port: Int) {
126 126
     def message(s: String): String =
127 127
       message[String](s, readerWriter.writeMessage, Unit => readerWriter.readString);
128 128
     
129  
-    def message(b: Array[byte]): Array[byte] = 
130  
-      message[Array[byte]](b, readerWriter.writeMessage, Unit => readerWriter.readBytes);
  129
+    def message(b: Array[Byte]): Array[Byte] = 
  130
+      message[Array[Byte]](b, readerWriter.writeMessage, Unit => readerWriter.readBytes);
131 131
 
132 132
     def close() {
133 133
       if (! s.isClosed) {
@@ -166,7 +166,7 @@ class SarsClient(authKey: String, host: String, port: Int) {
166 166
     client.message(q);
167 167
   }
168 168
   
169  
-  def message(b: Array[byte]) = {
  169
+  def message(b: Array[Byte]) = {
170 170
     if (! socket.isConnected || socket.isClosed) {
171 171
       connect();
172 172
     }
@@ -210,8 +210,8 @@ class SarsServer(authKey: String, handler: SarsMessageHandler, host: Option[Stri
210 210
               } else {
211 211
                 q.get match {
212 212
                   case s: String => readerWriter.writeMessage(handler.handle(s).getOrElse(""));
213  
-                  case b: Array[byte] => 
214  
-                    readerWriter.writeMessage(handler.handle(b).getOrElse(new Array[byte](0)));
  213
+                  case b: Array[Byte] => 
  214
+                    readerWriter.writeMessage(handler.handle(b).getOrElse(new Array[Byte](0)));
215 215
                   case x: AnyRef => throw new UnknownTypeException(x.getClass.getName);
216 216
                 }
217 217
               }
@@ -320,7 +320,7 @@ object test {
320 320
           None;
321 321
         }
322 322
       }
323  
-      override def handle(b: Array[byte]) = {
  323
+      override def handle(b: Array[Byte]) = {
324 324
         var actually = new String(b, "UTF-8");
325 325
         println("SERVER: "+actually);
326 326
         if (actually == "hello!") {

0 notes on commit bf63f22

Please sign in to comment.
Something went wrong with that request. Please try again.