Merge branch 'master' into phutil_tag

(Final sync.)
2013-02-05 10:23:16 -08:00
parent 94f6b6ca4e 742ee44960
commit 8f1311bbc1
41 changed files with 589 additions and 201 deletions
--- a/src/applications/conpherence/controller/ConpherenceListController.php
+++ b/src/applications/conpherence/controller/ConpherenceListController.php
@@ -77,15 +77,17 @@ final class ConpherenceListController extends
            'class' => 'conpherence-header-pane',
            'id' => 'conpherence-header-pane',
          ),
-          ''),
+          ''
+        ),
        phutil_tag(
          'div',
          array(
            'class' => 'conpherence-widget-pane',
            'id' => 'conpherence-widget-pane'
          ),
-          ''),
-        phutil_tag(
+          ''
+        ),
+        javelin_tag(
          'div',
          array(
            'class' => 'conpherence-message-pane',
@@ -98,15 +100,19 @@ final class ConpherenceListController extends
                'class' => 'conpherence-messages',
                'id' => 'conpherence-messages'
              ),
-              ''),
+              ''
+            ),
            phutil_tag(
              'div',
              array(
                'id' => 'conpherence-form'
              ),
-              ''),
-          )),
-      ));
+              ''
+            )
+          )
+        )
+      )
+    );
  }