Use sprites for (nearly) all application icons

Summary: Sprites for everyone. Test Plan: Loaded `/applications/`. Reviewers: btrahan, chad, vrana Reviewed By: vrana CC: aran Maniphest Tasks: T1569 Differential Revision: https://secure.phabricator.com/D3280
2012-08-14 14:23:55 -07:00
parent 47b96fdebe
commit 012370c6ab
34 changed files with 284 additions and 280 deletions
--- a/src/__celerity_resource_map__.php
+++ b/src/__celerity_resource_map__.php
@@ -7,13 +7,6 @@
 */

 celerity_register_resource_map(array(
-  '/rsrc/image/app/app_applications.png' =>
-  array(
-    'hash' => 'ce191dc12ab1fc0e9c0881df5e8d4535',
-    'uri' => '/res/ce191dc1/rsrc/image/app/app_applications.png',
-    'disk' => '/rsrc/image/app/app_applications.png',
-    'type' => 'png',
-  ),
  '/rsrc/image/app/app_audit.png' =>
  array(
    'hash' => '53340003d1daf306b64ed5ebb08bc204',
@@ -21,69 +14,6 @@ celerity_register_resource_map(array(
    'disk' => '/rsrc/image/app/app_audit.png',
    'type' => 'png',
  ),
-  '/rsrc/image/app/app_differential.png' =>
-  array(
-    'hash' => 'ac7f3cd87dde332b283ff83c3c7198a8',
-    'uri' => '/res/ac7f3cd8/rsrc/image/app/app_differential.png',
-    'disk' => '/rsrc/image/app/app_differential.png',
-    'type' => 'png',
-  ),
-  '/rsrc/image/app/app_diffusion.png' =>
-  array(
-    'hash' => 'd06f3b996adfe38f233851125471f43f',
-    'uri' => '/res/d06f3b99/rsrc/image/app/app_diffusion.png',
-    'disk' => '/rsrc/image/app/app_diffusion.png',
-    'type' => 'png',
-  ),
-  '/rsrc/image/app/app_fact.png' =>
-  array(
-    'hash' => 'c0bd5443c552e8d76c2adf05986c9ef6',
-    'uri' => '/res/c0bd5443/rsrc/image/app/app_fact.png',
-    'disk' => '/rsrc/image/app/app_fact.png',
-    'type' => 'png',
-  ),
-  '/rsrc/image/app/app_flags.png' =>
-  array(
-    'hash' => '574ea87812d3ebd15252889d74f39dd0',
-    'uri' => '/res/574ea878/rsrc/image/app/app_flags.png',
-    'disk' => '/rsrc/image/app/app_flags.png',
-    'type' => 'png',
-  ),
-  '/rsrc/image/app/app_maniphest.png' =>
-  array(
-    'hash' => '6f62e17097399a687892dc2e3f9abeb9',
-    'uri' => '/res/6f62e170/rsrc/image/app/app_maniphest.png',
-    'disk' => '/rsrc/image/app/app_maniphest.png',
-    'type' => 'png',
-  ),
-  '/rsrc/image/app/app_people.png' =>
-  array(
-    'hash' => 'b6c6fd4bc8b831dfd0e680f303f20d5f',
-    'uri' => '/res/b6c6fd4b/rsrc/image/app/app_people.png',
-    'disk' => '/rsrc/image/app/app_people.png',
-    'type' => 'png',
-  ),
-  '/rsrc/image/app/app_phriction.png' =>
-  array(
-    'hash' => 'f8c16c533b38b081486be48c4f1cf5bd',
-    'uri' => '/res/f8c16c53/rsrc/image/app/app_phriction.png',
-    'disk' => '/rsrc/image/app/app_phriction.png',
-    'type' => 'png',
-  ),
-  '/rsrc/image/app/app_ponder.png' =>
-  array(
-    'hash' => '9893ca3674af96884d3564ecbe101280',
-    'uri' => '/res/9893ca36/rsrc/image/app/app_ponder.png',
-    'disk' => '/rsrc/image/app/app_ponder.png',
-    'type' => 'png',
-  ),
-  '/rsrc/image/app/app_settings.png' =>
-  array(
-    'hash' => '095fa0e61ec11d3f7e543ba48f5a5adb',
-    'uri' => '/res/095fa0e6/rsrc/image/app/app_settings.png',
-    'disk' => '/rsrc/image/app/app_settings.png',
-    'type' => 'png',
-  ),
  '/rsrc/image/application/ponder/downvote.png' =>
  array(
    'hash' => '46c5644a0fccb9e237a3363e07f50487',
@@ -135,8 +65,8 @@ celerity_register_resource_map(array(
  ),
  '/rsrc/image/autosprite.png' =>
  array(
-    'hash' => 'd02cc399dc950cd70006ef2374a6da4a',
-    'uri' => '/res/d02cc399/rsrc/image/autosprite.png',
+    'hash' => 'e3a103473dad6161a7be5369c2e21276',
+    'uri' => '/res/e3a10347/rsrc/image/autosprite.png',
    'disk' => '/rsrc/image/autosprite.png',
    'type' => 'png',
  ),
@@ -147,13 +77,6 @@ celerity_register_resource_map(array(
    'disk' => '/rsrc/image/avatar.png',
    'type' => 'png',
  ),
-  '/rsrc/image/bolt.png' =>
-  array(
-    'hash' => 'f8c30376f30cf5a8675a5e683400684a',
-    'uri' => '/res/f8c30376/rsrc/image/bolt.png',
-    'disk' => '/rsrc/image/bolt.png',
-    'type' => 'png',
-  ),
  '/rsrc/image/button_apps.png' =>
  array(
    'hash' => 'cc29f793afd01b15af613562225118f3',
@@ -720,7 +643,7 @@ celerity_register_resource_map(array(
  ),
  'autosprite-css' =>
  array(
-    'uri' => '/res/ef26301d/rsrc/css/autosprite.css',
+    'uri' => '/res/e09ec93c/rsrc/css/autosprite.css',
    'type' => 'css',
    'requires' =>
    array(
@@ -1729,7 +1652,7 @@ celerity_register_resource_map(array(
  ),
  'javelin-behavior-repository-crossreference' =>
  array(
-    'uri' => '/res/d3ff7611/rsrc/js/application/repository/repository-crossreference.js',
+    'uri' => '/res/6a59668a/rsrc/js/application/repository/repository-crossreference.js',
    'type' => 'js',
    'requires' =>
    array(
@@ -2303,7 +2226,7 @@ celerity_register_resource_map(array(
  ),
  'phabricator-application-launch-view-css' =>
  array(
-    'uri' => '/res/e157830a/rsrc/css/application/base/phabricator-application-launch-view.css',
+    'uri' => '/res/effb87ee/rsrc/css/application/base/phabricator-application-launch-view.css',
    'type' => 'css',
    'requires' =>
    array(
@@ -2448,7 +2371,7 @@ celerity_register_resource_map(array(
  ),
  'phabricator-main-menu-view' =>
  array(
-    'uri' => '/res/a51c5f64/rsrc/css/application/base/main-menu-view.css',
+    'uri' => '/res/cb2796ae/rsrc/css/application/base/main-menu-view.css',
    'type' => 'css',
    'requires' =>
    array(
@@ -2468,7 +2391,7 @@ celerity_register_resource_map(array(
  ),
  'phabricator-nav-view-css' =>
  array(
-    'uri' => '/res/051b6ab6/rsrc/css/aphront/phabricator-nav-view.css',
+    'uri' => '/res/ca2744bd/rsrc/css/aphront/phabricator-nav-view.css',
    'type' => 'css',
    'requires' =>
    array(
@@ -2988,7 +2911,7 @@ celerity_register_resource_map(array(
      'uri' => '/res/pkg/19ebcc79/differential.pkg.css',
      'type' => 'css',
    ),
-    '5b33c790' =>
+    '26972e06' =>
    array(
      'name' => 'differential.pkg.js',
      'symbols' =>
@@ -3012,7 +2935,7 @@ celerity_register_resource_map(array(
        16 => 'javelin-behavior-differential-dropdown-menus',
        17 => 'javelin-behavior-buoyant',
      ),
-      'uri' => '/res/pkg/5b33c790/differential.pkg.js',
+      'uri' => '/res/pkg/26972e06/differential.pkg.js',
      'type' => 'js',
    ),
    'c8ce2d88' =>
@@ -3120,7 +3043,7 @@ celerity_register_resource_map(array(
    'aphront-typeahead-control-css' => 'edf6b149',
    'differential-changeset-view-css' => '19ebcc79',
    'differential-core-view-css' => '19ebcc79',
-    'differential-inline-comment-editor' => '5b33c790',
+    'differential-inline-comment-editor' => '26972e06',
    'differential-local-commits-view-css' => '19ebcc79',
    'differential-results-table-css' => '19ebcc79',
    'differential-revision-add-comment-css' => '19ebcc79',
@@ -3133,21 +3056,21 @@ celerity_register_resource_map(array(
    'inline-comment-summary-css' => '19ebcc79',
    'javelin-behavior' => '6fb20113',
    'javelin-behavior-aphront-basic-tokenizer' => '97f65640',
-    'javelin-behavior-aphront-drag-and-drop' => '5b33c790',
-    'javelin-behavior-aphront-drag-and-drop-textarea' => '5b33c790',
+    'javelin-behavior-aphront-drag-and-drop' => '26972e06',
+    'javelin-behavior-aphront-drag-and-drop-textarea' => '26972e06',
    'javelin-behavior-aphront-form-disable-on-submit' => '971b021e',
    'javelin-behavior-audit-preview' => '5e68be89',
-    'javelin-behavior-buoyant' => '5b33c790',
-    'javelin-behavior-differential-accept-with-errors' => '5b33c790',
-    'javelin-behavior-differential-add-reviewers-and-ccs' => '5b33c790',
-    'javelin-behavior-differential-comment-jump' => '5b33c790',
-    'javelin-behavior-differential-diff-radios' => '5b33c790',
-    'javelin-behavior-differential-dropdown-menus' => '5b33c790',
-    'javelin-behavior-differential-edit-inline-comments' => '5b33c790',
-    'javelin-behavior-differential-feedback-preview' => '5b33c790',
-    'javelin-behavior-differential-keyboard-navigation' => '5b33c790',
-    'javelin-behavior-differential-populate' => '5b33c790',
-    'javelin-behavior-differential-show-more' => '5b33c790',
+    'javelin-behavior-buoyant' => '26972e06',
+    'javelin-behavior-differential-accept-with-errors' => '26972e06',
+    'javelin-behavior-differential-add-reviewers-and-ccs' => '26972e06',
+    'javelin-behavior-differential-comment-jump' => '26972e06',
+    'javelin-behavior-differential-diff-radios' => '26972e06',
+    'javelin-behavior-differential-dropdown-menus' => '26972e06',
+    'javelin-behavior-differential-edit-inline-comments' => '26972e06',
+    'javelin-behavior-differential-feedback-preview' => '26972e06',
+    'javelin-behavior-differential-keyboard-navigation' => '26972e06',
+    'javelin-behavior-differential-populate' => '26972e06',
+    'javelin-behavior-differential-show-more' => '26972e06',
    'javelin-behavior-diffusion-commit-graph' => '5e68be89',
    'javelin-behavior-diffusion-pull-lastmodified' => '5e68be89',
    'javelin-behavior-maniphest-batch-selector' => '7707de41',
@@ -3157,12 +3080,12 @@ celerity_register_resource_map(array(
    'javelin-behavior-maniphest-transaction-preview' => '7707de41',
    'javelin-behavior-phabricator-autofocus' => '971b021e',
    'javelin-behavior-phabricator-keyboard-shortcuts' => '971b021e',
-    'javelin-behavior-phabricator-object-selector' => '5b33c790',
+    'javelin-behavior-phabricator-object-selector' => '26972e06',
    'javelin-behavior-phabricator-oncopy' => '971b021e',
    'javelin-behavior-phabricator-tooltips' => '971b021e',
    'javelin-behavior-phabricator-watch-anchor' => '971b021e',
    'javelin-behavior-refresh-csrf' => '971b021e',
-    'javelin-behavior-repository-crossreference' => '5b33c790',
+    'javelin-behavior-repository-crossreference' => '26972e06',
    'javelin-behavior-workflow' => '971b021e',
    'javelin-dom' => '6fb20113',
    'javelin-event' => '6fb20113',
@@ -3188,7 +3111,7 @@ celerity_register_resource_map(array(
    'phabricator-core-buttons-css' => 'edf6b149',
    'phabricator-core-css' => 'edf6b149',
    'phabricator-directory-css' => 'edf6b149',
-    'phabricator-drag-and-drop-file-upload' => '5b33c790',
+    'phabricator-drag-and-drop-file-upload' => '26972e06',
    'phabricator-dropdown-menu' => '971b021e',
    'phabricator-flag-css' => 'edf6b149',
    'phabricator-jump-nav' => 'edf6b149',
@@ -3200,7 +3123,7 @@ celerity_register_resource_map(array(
    'phabricator-prefab' => '971b021e',
    'phabricator-project-tag-css' => '7839ae2d',
    'phabricator-remarkup-css' => 'edf6b149',
-    'phabricator-shaped-request' => '5b33c790',
+    'phabricator-shaped-request' => '26972e06',
    'phabricator-standard-page-view' => 'edf6b149',
    'phabricator-tooltip' => '971b021e',
    'phabricator-transaction-view-css' => 'edf6b149',
--- a/src/applications/base/PhabricatorApplication.php
+++ b/src/applications/base/PhabricatorApplication.php
@@ -55,7 +55,11 @@ abstract class PhabricatorApplication {
  }

  public function getIconURI() {
-    return PhabricatorUser::getDefaultProfileImageURI();
+    return null;
+  }
+
+  public function getAutospriteName() {
+    return 'default';
  }

  public function shouldAppearInLaunchView() {
--- a/src/applications/daemon/application/PhabricatorApplicationDaemons.php
+++ b/src/applications/daemon/application/PhabricatorApplicationDaemons.php
@@ -34,6 +34,10 @@ final class PhabricatorApplicationDaemons extends PhabricatorApplication {
    return "\xE2\x98\xAF";
  }

+  public function getAutospriteName() {
+    return 'daemons';
+  }
+
  public function getRoutes() {
    return array(
      '/daemon/' => array(
--- a/src/applications/differential/application/PhabricatorApplicationDifferential.php
+++ b/src/applications/differential/application/PhabricatorApplicationDifferential.php
@@ -26,8 +26,8 @@ final class PhabricatorApplicationDifferential extends PhabricatorApplication {
    return 'Review Code';
  }

-  public function getIconURI() {
-    return celerity_get_resource_uri('/rsrc/image/app/app_differential.png');
+  public function getAutospriteName() {
+    return 'differential';
  }

  public function getFactObjectsForAnalysis() {
--- a/src/applications/diffusion/application/PhabricatorApplicationDiffusion.php
+++ b/src/applications/diffusion/application/PhabricatorApplicationDiffusion.php
@@ -26,8 +26,8 @@ final class PhabricatorApplicationDiffusion extends PhabricatorApplication {
    return '/diffusion/';
  }

-  public function getIconURI() {
-    return celerity_get_resource_uri('/rsrc/image/app/app_diffusion.png');
+  public function getAutospriteName() {
+    return 'diffusion';
  }

  public function getHelpURI() {
--- a/src/applications/fact/application/PhabricatorApplicationFact.php
+++ b/src/applications/fact/application/PhabricatorApplicationFact.php
@@ -26,8 +26,8 @@ final class PhabricatorApplicationFact extends PhabricatorApplication {
    return '/fact/';
  }

-  public function getIconURI() {
-    return celerity_get_resource_uri('/rsrc/image/app/app_fact.png');
+  public function getAutospriteName() {
+    return 'fact';
  }

  public function getRoutes() {
--- a/src/applications/flag/application/PhabricatorApplicationFlags.php
+++ b/src/applications/flag/application/PhabricatorApplicationFlags.php
@@ -26,8 +26,8 @@ final class PhabricatorApplicationFlags extends PhabricatorApplication {
    return '/flag/';
  }

-  public function getIconURI() {
-    return celerity_get_resource_uri('/rsrc/image/app/app_flags.png');
+  public function getAutospriteName() {
+    return 'flags';
  }

  public function loadStatus(PhabricatorUser $user) {
--- a/src/applications/mailinglists/application/PhabricatorApplicationMailingLists.php
+++ b/src/applications/mailinglists/application/PhabricatorApplicationMailingLists.php
@@ -30,6 +30,10 @@ final class PhabricatorApplicationMailingLists extends PhabricatorApplication {
    return 'Manage External Lists';
  }

+  public function getAutospriteName() {
+    return 'mail';
+  }
+
  public function getRoutes() {
    return array(
      '/mailinglists/' => array(
--- a/src/applications/maniphest/application/PhabricatorApplicationManiphest.php
+++ b/src/applications/maniphest/application/PhabricatorApplicationManiphest.php
@@ -30,8 +30,8 @@ final class PhabricatorApplicationManiphest extends PhabricatorApplication {
    return PhabricatorEnv::getEnvConfig('maniphest.enabled');
  }

-  public function getIconURI() {
-    return celerity_get_resource_uri('/rsrc/image/app/app_maniphest.png');
+  public function getAutospriteName() {
+    return 'maniphest';
  }

  public function getCoreApplicationOrder() {
--- a/src/applications/meta/application/PhabricatorApplicationApplications.php
+++ b/src/applications/meta/application/PhabricatorApplicationApplications.php
@@ -26,8 +26,8 @@ final class PhabricatorApplicationApplications extends PhabricatorApplication {
    return 'Manage Applications';
  }

-  public function getIconURI() {
-    return celerity_get_resource_uri('/rsrc/image/app/app_applications.png');
+  public function getAutospriteName() {
+    return 'applications';
  }

  public function getRoutes() {
--- a/src/applications/meta/view/PhabricatorApplicationLaunchView.php
+++ b/src/applications/meta/view/PhabricatorApplicationLaunchView.php
@@ -76,13 +76,34 @@ final class PhabricatorApplicationLaunchView extends AphrontView {
        phutil_escape_html($count));
    }

+
+    $classes = array();
+    $classes[] = 'phabricator-application-launch-icon';
+    $styles = array();
+
+    if ($application->getIconURI()) {
+      $styles[] = 'background-image: url('.$application->getIconURI().')';
+    } else {
+      $autosprite = $application->getAutospriteName();
+      $classes[] = 'autosprite';
+      $classes[] = 'app-'.$autosprite.'-full';
+    }
+
+    $icon = phutil_render_tag(
+      'span',
+      array(
+        'class' => implode(' ', $classes),
+        'style' => nonempty(implode('; ', $styles), null),
+      ),
+      '');
+
    return phutil_render_tag(
      'a',
      array(
        'class' => 'phabricator-application-launch-container',
-        'style' => 'background-image: url('.$application->getIconURI().')',
        'href'  => $application->getBaseURI(),
      ),
+      $icon.
      $this->renderSingleView($content));
  }
 }
--- a/src/applications/metamta/application/PhabricatorApplicationMetaMTA.php
+++ b/src/applications/metamta/application/PhabricatorApplicationMetaMTA.php
@@ -26,6 +26,10 @@ final class PhabricatorApplicationMetaMTA extends PhabricatorApplication {
    return 'View Mail Logs';
  }

+  public function getAutospriteName() {
+    return 'mail';
+  }
+
  public function getRoutes() {
    return array(
      $this->getBaseURI() => array(
--- a/src/applications/people/application/PhabricatorApplicationPeople.php
+++ b/src/applications/people/application/PhabricatorApplicationPeople.php
@@ -30,8 +30,8 @@ final class PhabricatorApplicationPeople extends PhabricatorApplication {
    return "\xE2\x99\x9F";
  }

-  public function getIconURI() {
-    return celerity_get_resource_uri('/rsrc/image/app/app_people.png');
+  public function getAutospriteName() {
+    return 'people';
  }

  public function getRoutes() {
--- a/src/applications/phriction/application/PhabricatorApplicationPhriction.php
+++ b/src/applications/phriction/application/PhabricatorApplicationPhriction.php
@@ -26,8 +26,8 @@ final class PhabricatorApplicationPhriction extends PhabricatorApplication {
    return '/w/';
  }

-  public function getIconURI() {
-    return celerity_get_resource_uri('/rsrc/image/app/app_phriction.png');
+  public function getAutospriteName() {
+    return 'phriction';
  }

  public function getHelpURI() {
--- a/src/applications/ponder/application/PhabricatorApplicationPonder.php
+++ b/src/applications/ponder/application/PhabricatorApplicationPonder.php
@@ -26,8 +26,8 @@ final class PhabricatorApplicationPonder extends PhabricatorApplication {
    return 'Find Answers';
  }

-  public function getIconURI() {
-    return celerity_get_resource_uri('/rsrc/image/app/app_ponder.png');
+  public function getAutospriteName() {
+    return 'ponder';
  }

  public function getFactObjectsForAnalysis() {
--- a/src/applications/project/application/PhabricatorApplicationProject.php
+++ b/src/applications/project/application/PhabricatorApplicationProject.php
@@ -30,6 +30,10 @@ final class PhabricatorApplicationProject extends PhabricatorApplication {
    return '/project/';
  }

+  public function getAutospriteName() {
+    return 'projects';
+  }
+
  public function getRoutes() {
    return array(
      '/project/' => array(
--- a/src/applications/settings/application/PhabricatorApplicationSettings.php
+++ b/src/applications/settings/application/PhabricatorApplicationSettings.php
@@ -26,8 +26,8 @@ final class PhabricatorApplicationSettings extends PhabricatorApplication {
    return 'User Preferences';
  }

-  public function getIconURI() {
-    return celerity_get_resource_uri('/rsrc/image/app/app_settings.png');
+  public function getAutospriteName() {
+    return 'settings';
  }

  public function getRoutes() {
--- a/src/rsrc/sprites.psd
+++ b/src/rsrc/sprites.psd
--- a/src/view/layout/AphrontSideNavView.php
+++ b/src/view/layout/AphrontSideNavView.php
@@ -240,13 +240,32 @@ final class AphrontSideNavView extends AphrontView {
        $classes[] = 'phabricator-nav-app-item-selected';
      }

+      $iclasses = array();
+      $iclasses[] = 'phabricator-nav-app-item-icon';
+      $style = null;
+      if ($application->getIconURI()) {
+        $style = 'background-image: url('.$application->getIconURI().'); '.
+                 'background-size: 30px auto;';
+      } else {
+        $iclasses[] = 'autosprite';
+        $iclasses[] = 'app-'.$application->getAutospriteName();
+      }
+
+      $icon = phutil_render_tag(
+        'span',
+        array(
+          'class' => implode(' ', $iclasses),
+          'style' => $style,
+        ),
+        '');
+
      $apps[] = phutil_render_tag(
        'a',
        array(
          'class' => implode(' ', $classes),
          'href' => $application->getBaseURI(),
-          'style' => 'background-image: url('.$application->getIconURI().')',
        ),
+        $icon.
        phutil_escape_html($application->getName()));
    }