Page MenuHomePhabricator
Files F14035977

D9574.diff
No OneTemporary
Actions

D9574.diff
View Options

diff --git a/src/applications/pholio/view/PholioMockImagesView.php b/src/applications/pholio/view/PholioMockImagesView.php
--- a/src/applications/pholio/view/PholioMockImagesView.php
+++ b/src/applications/pholio/view/PholioMockImagesView.php
@@ -88,7 +88,7 @@
? $file->getBestURI()
: $nonimage_uri),
'pageURI' => $this->getImagePageURI($image, $mock),
- 'downloadURI' => $file->getInfoURI(),
+ 'downloadURI' => $file->getDownloadURI(),
'historyURI' => $history_uri,
'width' => $x,
'height' => $y,
@@ -105,6 +105,16 @@
$navsequence[] = $image->getID();
}
+ $full_icon = array(
+ javelin_tag('span', array('aural' => true), pht('View Raw File')),
+ id(new PHUIIconView())->setIconFont('fa-file-image-o'),
+ );
+
+ $download_icon = array(
+ javelin_tag('span', array('aural' => true), pht('Download File')),
+ id(new PHUIIconView())->setIconFont('fa-download'),
+ );
+
$login_uri = id(new PhutilURI('/login/'))
->setQueryParam('next', (string) $this->getRequestURI());
$config = array(
@@ -117,8 +127,8 @@
'loggedIn' => $this->getUser()->isLoggedIn(),
'logInLink' => (string) $login_uri,
'navsequence' => $navsequence,
- 'fullIcon' => id(new PHUIIconView())->setIconFont('fa-arrows-alt'),
- 'downloadIcon' => id(new PHUIIconView())->setIconFont('fa-download'),
+ 'fullIcon' => hsprintf('%s', $full_icon),
+ 'downloadIcon' => hsprintf('%s', $download_icon),
);
Javelin::initBehavior('pholio-mock-view', $config);
diff --git a/webroot/rsrc/css/application/pholio/pholio.css b/webroot/rsrc/css/application/pholio/pholio.css
--- a/webroot/rsrc/css/application/pholio/pholio.css
+++ b/webroot/rsrc/css/application/pholio/pholio.css
@@ -192,19 +192,29 @@
font-size: 24px;
}
-a.pholio-image-button-link:hover {
- background: {$darkgreybackground};
+button.pholio-image-button-link,
+button.pholio-image-button-link:active {
+ /* Remove button styles. */
+ box-shadow: none;
+ text-shadow: none;
+ border: none;
+ border-radius: 0;
+}
+
+.pholio-image-button-active .pholio-image-button-link .phui-icon-view {
+ color: {$lightgreytext};
}
-span.pholio-image-button-link .phui-icon-view {
+.pholio-image-button-disabled .pholio-image-button-link .phui-icon-view {
color: {$darkgreybackground};
}
-a.pholio-image-button-link .phui-icon-view {
- color: {$lightgreytext};
+.pholio-image-button-active .pholio-image-button-link:hover {
+ background: {$darkgreybackground};
}
-.device-desktop a.pholio-image-button-link:hover .phui-icon-view {
+.device-desktop .pholio-image-button-active
+ .pholio-image-button-link:hover .phui-icon-view {
color: {$sky};
}
diff --git a/webroot/rsrc/js/application/pholio/behavior-pholio-mock-view.js b/webroot/rsrc/js/application/pholio/behavior-pholio-mock-view.js
--- a/webroot/rsrc/js/application/pholio/behavior-pholio-mock-view.js
+++ b/webroot/rsrc/js/application/pholio/behavior-pholio-mock-view.js
@@ -591,11 +591,19 @@
var buttons = [];
+ var classes = ['pholio-image-button'];
+
+ if (image.isViewable) {
+ classes.push('pholio-image-button-active');
+ } else {
+ classes.push('pholio-image-button-disabled');
+ }
+
buttons.push(
JX.$N(
'div',
{
- className: 'pholio-image-button'
+ className: classes.join(' ')
},
JX.$N(
image.isViewable ? 'a' : 'span',
@@ -606,16 +614,19 @@
},
JX.$H(config.fullIcon))));
- // TODO: This should be a form which performs the download; for now, it
- // just takes the user to the info page.
+ classes = ['pholio-image-button', 'pholio-image-button-active'];
+
buttons.push(
JX.$N(
- 'div',
+ 'form',
{
- className: 'pholio-image-button'
+ className: classes.join(' '),
+ action: image.downloadURI,
+ method: 'POST',
+ sigil: 'download'
},
JX.$N(
- 'a',
+ 'button',
{
href: image.downloadURI,
className: 'pholio-image-button-link'

File Metadata

Mime Type
text/plain
Expires
Mon, Nov 11, 8:09 AM (1 d, 18 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6739561
Default Alt Text
D9574.diff (4 KB)

Event Timeline

Phabricator · Built by Phacility