diff --git a/src/applications/directory/controller/categorylist/PhabricatorDirectoryCategoryListController.php b/src/applications/directory/controller/categorylist/PhabricatorDirectoryCategoryListController.php index 1f0b510b4..39a67d78a 100644 --- a/src/applications/directory/controller/categorylist/PhabricatorDirectoryCategoryListController.php +++ b/src/applications/directory/controller/categorylist/PhabricatorDirectoryCategoryListController.php @@ -1,72 +1,73 @@ <?php /* * Copyright 2011 Facebook, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ class PhabricatorDirectoryCategoryListController extends PhabricatorDirectoryController { public function processRequest() { $categories = id(new PhabricatorDirectoryCategory())->loadAll(); $categories = msort($categories, 'getSequence'); $rows = array(); foreach ($categories as $category) { $rows[] = array( $category->getID(), phutil_render_tag( 'a', array( 'href' => '/directory/category/edit/'.$category->getID().'/', ), phutil_escape_html($category->getName())), - phutil_render_tag( + javelin_render_tag( 'a', array( 'href' => '/directory/category/delete/'.$category->getID().'/', 'class' => 'button grey small', + 'sigil' => 'workflow', ), 'Delete'), ); } $table = new AphrontTableView($rows); $table->setHeaders( array( 'ID', 'Name', '', )); $table->setColumnClasses( array( null, 'wide', 'action', )); $panel = new AphrontPanelView(); $panel->appendChild($table); $panel->setHeader('Directory Categories'); $panel->setCreateButton('New Category', '/directory/category/edit/'); return $this->buildStandardPageResponse($panel, array( 'title' => 'Directory Category List', 'tab' => 'categories', )); } } diff --git a/src/applications/directory/controller/categorylist/__init__.php b/src/applications/directory/controller/categorylist/__init__.php index e6aa3dae3..85fcddd51 100644 --- a/src/applications/directory/controller/categorylist/__init__.php +++ b/src/applications/directory/controller/categorylist/__init__.php @@ -1,18 +1,19 @@ <?php /** * This file is automatically generated. Lint this module to rebuild it. * @generated */ phutil_require_module('phabricator', 'applications/directory/controller/base'); phutil_require_module('phabricator', 'applications/directory/storage/category'); +phutil_require_module('phabricator', 'infrastructure/javelin/markup'); phutil_require_module('phabricator', 'view/control/table'); phutil_require_module('phabricator', 'view/layout/panel'); phutil_require_module('phutil', 'markup'); phutil_require_module('phutil', 'utils'); phutil_require_source('PhabricatorDirectoryCategoryListController.php'); diff --git a/src/applications/directory/controller/itemlist/PhabricatorDirectoryItemListController.php b/src/applications/directory/controller/itemlist/PhabricatorDirectoryItemListController.php index 0df965b6c..6fa924d1c 100644 --- a/src/applications/directory/controller/itemlist/PhabricatorDirectoryItemListController.php +++ b/src/applications/directory/controller/itemlist/PhabricatorDirectoryItemListController.php @@ -1,78 +1,79 @@ <?php /* * Copyright 2011 Facebook, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ class PhabricatorDirectoryItemListController extends PhabricatorDirectoryController { public function processRequest() { $items = id(new PhabricatorDirectoryItem())->loadAll(); $items = msort($items, 'getSortKey'); $categories = id(new PhabricatorDirectoryCategory())->loadAll(); $category_names = mpull($categories, 'getName', 'getID'); $rows = array(); foreach ($items as $item) { $rows[] = array( $item->getID(), phutil_escape_html(idx($category_names, $item->getCategoryID())), phutil_render_tag( 'a', array( 'href' => '/directory/item/edit/'.$item->getID().'/', ), phutil_escape_html($item->getName())), - phutil_render_tag( + javelin_render_tag( 'a', array( 'href' => '/directory/item/delete/'.$item->getID().'/', 'class' => 'button grey small', + 'sigil' => 'workflow', ), 'Delete'), ); } $table = new AphrontTableView($rows); $table->setHeaders( array( 'ID', 'Category', 'Name', '', )); $table->setColumnClasses( array( null, null, 'wide', 'action', )); $panel = new AphrontPanelView(); $panel->appendChild($table); $panel->setHeader('Directory Items'); $panel->setCreateButton('New Item', '/directory/item/edit/'); return $this->buildStandardPageResponse($panel, array( 'title' => 'Directory Items', 'tab' => 'items', )); } } diff --git a/src/applications/directory/controller/itemlist/__init__.php b/src/applications/directory/controller/itemlist/__init__.php index 647f26c05..cd3381ae0 100644 --- a/src/applications/directory/controller/itemlist/__init__.php +++ b/src/applications/directory/controller/itemlist/__init__.php @@ -1,19 +1,20 @@ <?php /** * This file is automatically generated. Lint this module to rebuild it. * @generated */ phutil_require_module('phabricator', 'applications/directory/controller/base'); phutil_require_module('phabricator', 'applications/directory/storage/category'); phutil_require_module('phabricator', 'applications/directory/storage/item'); +phutil_require_module('phabricator', 'infrastructure/javelin/markup'); phutil_require_module('phabricator', 'view/control/table'); phutil_require_module('phabricator', 'view/layout/panel'); phutil_require_module('phutil', 'markup'); phutil_require_module('phutil', 'utils'); phutil_require_source('PhabricatorDirectoryItemListController.php');