diff --git a/src/applications/conpherence/view/ConpherenceMenuItemView.php b/src/applications/conpherence/view/ConpherenceMenuItemView.php index 44ec161179..c69d7c502d 100644 --- a/src/applications/conpherence/view/ConpherenceMenuItemView.php +++ b/src/applications/conpherence/view/ConpherenceMenuItemView.php @@ -139,6 +139,14 @@ final class ConpherenceMenuItemView extends AphrontTagView { (int)$this->unreadCount); } - return $image.$title.$subtitle.$message.$epoch.$unread_count; + return $this->renderHTMLView( + array( + $image, + $title, + $subtitle, + $message, + $epoch, + $unread_count, + )); } } diff --git a/src/applications/directory/controller/PhabricatorDirectoryController.php b/src/applications/directory/controller/PhabricatorDirectoryController.php index 70391fa2d7..a1ce71b876 100644 --- a/src/applications/directory/controller/PhabricatorDirectoryController.php +++ b/src/applications/directory/controller/PhabricatorDirectoryController.php @@ -96,9 +96,9 @@ abstract class PhabricatorDirectoryController extends PhabricatorController { $nav->addMenuItem($show_item); $nav->addCustomBlock( - '
'); + hsprintf( + ''); + $nav->addCustomBlock(hsprintf('
')); } } diff --git a/src/view/AphrontTagView.php b/src/view/AphrontTagView.php index 0b3f17a099..8e9595f0b6 100644 --- a/src/view/AphrontTagView.php +++ b/src/view/AphrontTagView.php @@ -87,7 +87,7 @@ abstract class AphrontTagView extends AphrontView { } protected function getTagContent() { - return $this->renderChildren(); + return $this->renderHTMLChildren(); } protected function willRender() { @@ -150,7 +150,7 @@ abstract class AphrontTagView extends AphrontView { } } - return javelin_render_tag( + return javelin_tag( $this->getTagName(), $attributes, $this->getTagContent()); diff --git a/src/view/control/PhabricatorObjectListView.php b/src/view/control/PhabricatorObjectListView.php index b5c8d163ed..ec352334b8 100644 --- a/src/view/control/PhabricatorObjectListView.php +++ b/src/view/control/PhabricatorObjectListView.php @@ -26,27 +26,34 @@ final class PhabricatorObjectListView extends AphrontView { foreach ($handles as $handle) { $buttons = idx($this->buttons, $handle->getPHID(), array()); if ($buttons) { - $buttons = - '
'. - implode('', $buttons). - '
'; + $buttons = phutil_tag( + 'div', + array( + 'class' => 'phabricator-object-list-view-buttons', + ), + $buttons); } else { $buttons = null; } - $out[] = javelin_render_tag( + $out[] = javelin_tag( 'div', array( 'class' => 'phabricator-object-list-view-item', 'style' => 'background-image: url('.$handle->getImageURI().');', ), - $handle->renderLink().$buttons); + array( + $handle->renderLink(), + $buttons, + )); } - return - '
'. - implode("\n", $out). - '
'; + return phutil_tag( + 'div', + array( + 'class' => 'phabricator-object-list-view', + ), + $out); } } diff --git a/src/view/layout/AphrontSideNavFilterView.php b/src/view/layout/AphrontSideNavFilterView.php index ad7cd815a8..933d23b50d 100644 --- a/src/view/layout/AphrontSideNavFilterView.php +++ b/src/view/layout/AphrontSideNavFilterView.php @@ -220,14 +220,17 @@ final class AphrontSideNavFilterView extends AphrontView { ), ''); - $local_menu = $menu_background.phutil_render_tag( - 'div', + $local_menu = $this->renderHTMLView( array( - 'class' => 'phabricator-nav-local phabricator-side-menu', - 'id' => $local_id, - ), - self::renderSingleView($this->menu->setID($this->getMenuID())) - ); + $menu_background, + phutil_tag( + 'div', + array( + 'class' => 'phabricator-nav-local phabricator-side-menu', + 'id' => $local_id, + ), + self::renderSingleView($this->menu->setID($this->getMenuID()))), + )); } $crumbs = null; diff --git a/src/view/layout/PhabricatorMenuItemView.php b/src/view/layout/PhabricatorMenuItemView.php index ab5e21c410..913674abfd 100644 --- a/src/view/layout/PhabricatorMenuItemView.php +++ b/src/view/layout/PhabricatorMenuItemView.php @@ -126,7 +126,11 @@ final class PhabricatorMenuItemView extends AphrontTagView { $this->name.$external); } - return $this->renderChildren().$name; + return $this->renderHTMLView( + array( + $this->renderHTMLChildren(), + $name, + )); } } diff --git a/src/view/page/menu/PhabricatorMainMenuGroupView.php b/src/view/page/menu/PhabricatorMainMenuGroupView.php index 98f3048b80..31473aed4d 100644 --- a/src/view/page/menu/PhabricatorMainMenuGroupView.php +++ b/src/view/page/menu/PhabricatorMainMenuGroupView.php @@ -28,12 +28,12 @@ final class PhabricatorMainMenuGroupView extends AphrontView { $classes = array_merge($classes, $this->classes); } - return phutil_render_tag( + return phutil_tag( 'div', array( 'class' => implode(' ', $classes), ), - $this->renderChildren()); + $this->renderHTMLChildren()); } }