Page MenuHomePhabricator
Files F77527

D7438.diff
All Users
Actions

D7438.diff
View Options

diff --git a/src/__celerity_resource_map__.php b/src/__celerity_resource_map__.php
--- a/src/__celerity_resource_map__.php
+++ b/src/__celerity_resource_map__.php
@@ -3804,7 +3804,7 @@
),
'phriction-document-css' =>
array(
- 'uri' => '/res/7ae003b1/rsrc/css/application/phriction/phriction-document-css.css',
+ 'uri' => '/res/97cbd7c6/rsrc/css/application/phriction/phriction-document-css.css',
'type' => 'css',
'requires' =>
array(
diff --git a/src/applications/phriction/controller/PhrictionDiffController.php b/src/applications/phriction/controller/PhrictionDiffController.php
--- a/src/applications/phriction/controller/PhrictionDiffController.php
+++ b/src/applications/phriction/controller/PhrictionDiffController.php
@@ -113,7 +113,7 @@
->setHref(PhrictionDocument::getSlugURI($slug, 'history')));
- $title = "Version $l vs $r";
+ $title = pht("Version %s vs %s", $l, $r);
$header = id(new PHUIHeaderView())
->setHeader($title);
@@ -142,22 +142,36 @@
'a',
array(
'href' => $uri->alter('l', $l - 1)->alter('r', $r - 1),
+ 'class' => 'button',
),
pht("\xC2\xAB Previous Change"));
} else {
- $link_l = pht('Original Change');
+ $link_l = phutil_tag(
+ 'a',
+ array(
+ 'href' => '#',
+ 'class' => 'button grey disabled',
+ ),
+ pht('Original Change'));
}
$link_r = null;
if ($nav_r) {
$link_r = phutil_tag(
'a',
array(
'href' => $uri->alter('l', $l + 1)->alter('r', $r + 1),
+ 'class' => 'button',
),
pht("Next Change \xC2\xBB"));
} else {
- $link_r = pht('Most Recent Change');
+ $link_r = phutil_tag(
+ 'a',
+ array(
+ 'href' => '#',
+ 'class' => 'button grey disabled',
+ ),
+ pht('Most Recent Change'));
}
$navigation_table = hsprintf(
@@ -174,7 +188,7 @@
$output = hsprintf(
'<br><div class="phriction-document-history-diff">'.
- '%s<br /><br />%s'.
+ '%s%s'.
'<table class="phriction-revert-table">'.
'<tr><td>%s</td><td>%s</td>'.
'</table>'.
@@ -187,11 +201,14 @@
$output);
+ $object_box = id(new PHUIObjectBoxView())
+ ->setHeader($header)
+ ->appendChild($output);
+
return $this->buildApplicationPage(
array(
$crumbs,
- $header,
- $output,
+ $object_box,
),
array(
'title' => pht('Document History'),
@@ -223,7 +240,7 @@
'a',
array(
'href' => '/phriction/edit/'.$document_id.'/',
- 'class' => 'button',
+ 'class' => 'button grey',
),
pht('Edit Current Version'));
}
@@ -233,7 +250,7 @@
'a',
array(
'href' => '/phriction/edit/'.$document_id.'/?revert='.$version,
- 'class' => 'button',
+ 'class' => 'button grey',
),
pht('Revert to Version %s...', $version));
}
@@ -247,6 +264,7 @@
$handles = $this->loadViewerHandles($phids);
$list = new PHUIObjectItemListView();
+ $list->setFlush(true);
$first = true;
foreach ($content as $c) {
diff --git a/webroot/rsrc/css/application/phriction/phriction-document-css.css b/webroot/rsrc/css/application/phriction/phriction-document-css.css
--- a/webroot/rsrc/css/application/phriction/phriction-document-css.css
+++ b/webroot/rsrc/css/application/phriction/phriction-document-css.css
@@ -43,8 +43,8 @@
text-shadow: 0 1px 2px #fff;
}
-.phriction-document-history-diff {
- padding: 0 2em 2em;
+.phriction-document-history-diff .phui-object-item-list-view {
+ padding: 0 16px;
}
.phriction-revert-table {
@@ -54,18 +54,26 @@
.phriction-revert-table td {
text-align: center;
width: 50%;
- padding: .5em 0;
+ padding: 8px 0;
+ margin: 0 16px;
+ background-color: {$lightbluebackground};
+ border-top: 1px solid {$lightblueborder};
}
.phriction-history-nav-table {
width: 100%;
+ margin-bottom: 20px;
}
.phriction-history-nav-table td {
width: 50%;
color: {$darkgreytext};
}
+.phriction-history-nav-table td {
+ padding: 8px 16px;
+}
+
.phriction-history-nav-table td.nav-next {
text-align: right;
}

File Metadata

Mime Type
text/x-diff
Storage Engine
amazon-s3
Storage Format
Raw Data
Storage Handle
phabricator/53/rb/c4bb66rad3hzpm2u
Default Alt Text
D7438.diff (4 KB)

Event Timeline

Phabricator · Built by Phacility