'.
'| '.
- self::renderSingleView($this->renderNavItems()).
+ self::renderSingleView($this->menu).
' | '.
''.
$this->renderChildren().
diff --git a/src/view/layout/PhabricatorMenuItemView.php b/src/view/layout/PhabricatorMenuItemView.php
new file mode 100644
index 0000000000..0347f778fc
--- /dev/null
+++ b/src/view/layout/PhabricatorMenuItemView.php
@@ -0,0 +1,92 @@
+key = $key;
+ return $this;
+ }
+
+ public function getKey() {
+ return $this->key;
+ }
+
+ public function setType($type) {
+ $this->type = $type;
+ return $this;
+ }
+
+ public function getType() {
+ return $this->type;
+ }
+
+ public function setHref($href) {
+ $this->href = $href;
+ return $this;
+ }
+
+ public function getHref() {
+ return $this->href;
+ }
+
+ public function setName($name) {
+ $this->name = $name;
+ return $this;
+ }
+
+ public function getName() {
+ return $this->name;
+ }
+
+ public function setIsExternal($is_external) {
+ $this->isExternal = $is_external;
+ return $this;
+ }
+
+ public function getIsExternal() {
+ return $this->isExternal;
+ }
+
+ public function addClass($class) {
+ $this->classes[] = $class;
+ return $this;
+ }
+
+ protected function canAppendChild() {
+ return false;
+ }
+
+ public function render() {
+ $classes = array(
+ 'phabricator-menu-item-view',
+ 'phabricator-menu-item-'.$this->type,
+ );
+
+ $external = null;
+ if ($this->isExternal) {
+ $external = " \xE2\x86\x97";
+ }
+
+ $classes = array_merge($classes, $this->classes);
+
+ return phutil_render_tag(
+ $this->href ? 'a' : 'div',
+ array(
+ 'class' => implode(' ', $classes),
+ 'href' => $this->href,
+ ),
+ phutil_escape_html($this->name.$external));
+ }
+
+}
diff --git a/src/view/layout/PhabricatorMenuView.php b/src/view/layout/PhabricatorMenuView.php
new file mode 100644
index 0000000000..22fb460d6c
--- /dev/null
+++ b/src/view/layout/PhabricatorMenuView.php
@@ -0,0 +1,42 @@
+getKey();
+ if ($key !== null) {
+ if (isset($this->map[$key])) {
+ throw new Exception(
+ "Menu contains duplicate items with key '{$key}'!");
+ }
+ $this->map[$key] = $item;
+ }
+
+ $this->items[] = $item;
+ $this->appendChild($item);
+
+ return $this;
+ }
+
+ public function getItem($key) {
+ return idx($this->map, $key);
+ }
+
+ public function getItems() {
+ return $this->items;
+ }
+
+ public function render() {
+ require_celerity_resource('phabricator-menu-view-css');
+ return phutil_render_tag(
+ 'div',
+ array(
+ 'class' => 'phabricator-menu-view',
+ ),
+ $this->renderChildren());
+ }
+
+}
diff --git a/webroot/rsrc/css/aphront/phabricator-nav-view.css b/webroot/rsrc/css/aphront/phabricator-nav-view.css
index ffda6019f4..0988936a44 100644
--- a/webroot/rsrc/css/aphront/phabricator-nav-view.css
+++ b/webroot/rsrc/css/aphront/phabricator-nav-view.css
@@ -59,11 +59,6 @@
display: none;
}
-.phabricator-nav-col a,
-.phabricator-nav-col span {
- display: block;
-}
-
.has-local-nav .phabricator-nav-content {
margin-left: 180px;
}
@@ -84,23 +79,6 @@
margin-left: 2.5em !important;
}
-.phabricator-nav-col span {
- display: block;
- font-weight: bold;
- padding: 6px 6px 6px 12px;
- color: #222222;
-}
-
-.phabricator-nav-col a {
- display: block;
- padding: 3px 6px 3px 24px;
- font-weight: bold;
-}
-
-.phabricator-nav-col a.aphront-side-nav-selected {
- background-color: #a1bbe5;
-}
-
.device-desktop .phabricator-nav-head {
display: none;
}
diff --git a/webroot/rsrc/css/aphront/side-nav-view.css b/webroot/rsrc/css/aphront/side-nav-view.css
index 3349744bfc..96db7fbf14 100644
--- a/webroot/rsrc/css/aphront/side-nav-view.css
+++ b/webroot/rsrc/css/aphront/side-nav-view.css
@@ -15,40 +15,5 @@ th.aphront-side-nav-navigation {
border-right: 1px solid #ccc;
padding-bottom: 8em;
background: #f7f7f7;
-}
-
-th.aphront-side-nav-navigation a,
-th.aphront-side-nav-navigation span {
- display: block;
- margin: 0 0 2px;
- min-width: 165px;
- padding: 3px 8px 3px 24px;
- font-weight: bold;
- white-space: nowrap;
- text-decoration: none;
-}
-
-th.aphront-side-nav-navigation span {
- padding-left: 12px;
- padding-top: 6px;
- color: #333;
- text-transform: uppercase;
- font-size: 11px;
-}
-
-th.aphront-side-nav-navigation a:hover {
- text-decoration: none;
- background: #e7e7e7;
-}
-
-th.aphront-side-nav-navigation hr {
- height: 1px;
- background: #eee;
- border: 0;
- margin: 12px 0px;
-}
-
-th.aphront-side-nav-navigation a.aphront-side-nav-selected,
-th.aphront-side-nav-navigation a.aphront-side-nav-selected:hover {
- background: #d7d7d7;
+ min-width: 175px;
}
diff --git a/webroot/rsrc/css/layout/phabricator-filetree-view.css b/webroot/rsrc/css/layout/phabricator-filetree-view.css
index c59882a836..ba232afea6 100644
--- a/webroot/rsrc/css/layout/phabricator-filetree-view.css
+++ b/webroot/rsrc/css/layout/phabricator-filetree-view.css
@@ -17,6 +17,7 @@
.phabricator-filetree .phabricator-filetree-item {
margin: 0;
padding: 0;
+ display: block;
}
.phabricator-filetree span.phabricator-filetree-icon {
@@ -30,7 +31,7 @@
.phabricator-filetree span.phabricator-filetree-name {
padding: 0;
- margin-left: 20px;
+ margin-left: 4px;
font-size: 11px;
font-weight: normal;
line-height: 20px;
diff --git a/webroot/rsrc/css/layout/phabricator-menu-view.css b/webroot/rsrc/css/layout/phabricator-menu-view.css
new file mode 100644
index 0000000000..87fddf0d2f
--- /dev/null
+++ b/webroot/rsrc/css/layout/phabricator-menu-view.css
@@ -0,0 +1,38 @@
+/**
+ * @provides phabricator-menu-view-css
+ */
+
+.phabricator-menu-item-view {
+ display: block;
+ margin: 0 0 2px;
+ white-space: nowrap;
+ text-decoration: none;
+ font-weight: bold;
+ font-size: 13px;
+}
+
+.phabricator-menu-item-type-link {
+ padding: 3px 8px 3px 24px;
+}
+
+.phabricator-menu-item-type-label {
+ padding: 6px 8px 3px 12px;
+ color: #333333;
+ text-transform: uppercase;
+ font-size: 11px;
+}
+
+.phabricator-menu-item-type-spacer {
+ padding: 8px 0;
+}
+
+.device-desktop a.phabricator-menu-item-type-link:hover {
+ text-decoration: none;
+ /* TODO: Swap this back to #e7e7e7? */
+ background: #a1bbe5;
+}
+
+.phabricator-menu-item-selected,
+.device-desktop a.phabricator-menu-item-selected:hover {
+ background: #d7d7d7;
+}
|