diff --git a/scripts/celerity/generate_sprites.php b/scripts/celerity/generate_sprites.php index 3b41bc2da0..f3ce81d7ae 100755 --- a/scripts/celerity/generate_sprites.php +++ b/scripts/celerity/generate_sprites.php @@ -180,6 +180,7 @@ $app_map = array( 'phame' => array(8, 4), 'macro' => array(0, 31), 'releeph' => array(5, 18), + 'drydock' => array(5, 25), ); $xadj = -1; diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php index d0289f9457..dc4cb6ffc3 100644 --- a/src/__phutil_library_map__.php +++ b/src/__phutil_library_map__.php @@ -561,6 +561,7 @@ phutil_register_library_map(array( 'PhabricatorApplicationDifferential' => 'applications/differential/application/PhabricatorApplicationDifferential.php', 'PhabricatorApplicationDiffusion' => 'applications/diffusion/application/PhabricatorApplicationDiffusion.php', 'PhabricatorApplicationDiviner' => 'applications/diviner/application/PhabricatorApplicationDiviner.php', + 'PhabricatorApplicationDrydock' => 'applications/drydock/application/PhabricatorApplicationDrydock.php', 'PhabricatorApplicationFact' => 'applications/fact/application/PhabricatorApplicationFact.php', 'PhabricatorApplicationFiles' => 'applications/files/application/PhabricatorApplicationFiles.php', 'PhabricatorApplicationFlags' => 'applications/flag/application/PhabricatorApplicationFlags.php', @@ -1768,6 +1769,7 @@ phutil_register_library_map(array( 'PhabricatorApplicationDifferential' => 'PhabricatorApplication', 'PhabricatorApplicationDiffusion' => 'PhabricatorApplication', 'PhabricatorApplicationDiviner' => 'PhabricatorApplication', + 'PhabricatorApplicationDrydock' => 'PhabricatorApplication', 'PhabricatorApplicationFact' => 'PhabricatorApplication', 'PhabricatorApplicationFiles' => 'PhabricatorApplication', 'PhabricatorApplicationFlags' => 'PhabricatorApplication', diff --git a/src/aphront/configuration/AphrontDefaultApplicationConfiguration.php b/src/aphront/configuration/AphrontDefaultApplicationConfiguration.php index 7ba451b802..77905cb0ca 100644 --- a/src/aphront/configuration/AphrontDefaultApplicationConfiguration.php +++ b/src/aphront/configuration/AphrontDefaultApplicationConfiguration.php @@ -113,14 +113,6 @@ class AphrontDefaultApplicationConfiguration 'keyboardshortcut/' => 'PhabricatorHelpKeyboardShortcutController', ), - '/drydock/' => array( - '' => 'DrydockResourceListController', - 'resource/' => 'DrydockResourceListController', - 'resource/allocate/' => 'DrydockResourceAllocateController', - 'lease/' => 'DrydockLeaseListController', - 'log/' => 'DrydockLogController', - ), - '/chatlog/' => array( '' => 'PhabricatorChatLogChannelListController', diff --git a/src/applications/drydock/application/PhabricatorApplicationDrydock.php b/src/applications/drydock/application/PhabricatorApplicationDrydock.php new file mode 100644 index 0000000000..db92dcaccb --- /dev/null +++ b/src/applications/drydock/application/PhabricatorApplicationDrydock.php @@ -0,0 +1,57 @@ + array( + '' => 'DrydockResourceListController', + 'resource/' => 'DrydockResourceListController', + 'resource/allocate/' => 'DrydockResourceAllocateController', + 'lease/' => 'DrydockLeaseListController', + 'log/' => 'DrydockLogController', + ), + ); + } + +} diff --git a/webroot/rsrc/css/autosprite.css b/webroot/rsrc/css/autosprite.css index 267e535168..19c4a67865 100644 --- a/webroot/rsrc/css/autosprite.css +++ b/webroot/rsrc/css/autosprite.css @@ -708,126 +708,146 @@ background-position: 0px -7254px; } -.action-delete { +.app-drydock-large { background-position: 0px -7285px; } -.action-edit { - background-position: 0px -7302px; +.device-desktop .phabricator-application-launch-container:hover .app-drydock-large /* hover */ { + background-position: 0px -7346px; } -.action-file { - background-position: 0px -7319px; +.app-drydock { + background-position: 0px -7407px; } -.action-flag-0 { - background-position: 0px -7336px; -} - -.action-flag-1 { - background-position: 0px -7353px; -} - -.action-flag-2 { - background-position: 0px -7370px; -} - -.action-flag-3 { - background-position: 0px -7387px; -} - -.action-flag-4 { - background-position: 0px -7404px; -} - -.action-flag-5 { - background-position: 0px -7421px; -} - -.action-flag-6 { +.device-desktop .app-drydock:hover { background-position: 0px -7438px; } +.app-drydock-selected { + background-position: 0px -7469px; +} + +.action-delete { + background-position: 0px -7500px; +} + +.action-edit { + background-position: 0px -7517px; +} + +.action-file { + background-position: 0px -7534px; +} + +.action-flag-0 { + background-position: 0px -7551px; +} + +.action-flag-1 { + background-position: 0px -7568px; +} + +.action-flag-2 { + background-position: 0px -7585px; +} + +.action-flag-3 { + background-position: 0px -7602px; +} + +.action-flag-4 { + background-position: 0px -7619px; +} + +.action-flag-5 { + background-position: 0px -7636px; +} + +.action-flag-6 { + background-position: 0px -7653px; +} + .action-flag-7 { - background-position: 0px -7455px; + background-position: 0px -7670px; } .action-flag-ghost { - background-position: 0px -7472px; -} - -.action-fork { - background-position: 0px -7489px; -} - -.action-move { - background-position: 0px -7506px; -} - -.action-new { - background-position: 0px -7523px; -} - -.action-preview { - background-position: 0px -7540px; -} - -.action-subscribe-add { - background-position: 0px -7557px; -} - -.action-subscribe-auto { - background-position: 0px -7574px; -} - -.action-subscribe-delete { - background-position: 0px -7591px; -} - -.action-unpublish { - background-position: 0px -7608px; -} - -.action-world { - background-position: 0px -7625px; -} - -.remarkup-assist-b { - background-position: 0px -7642px; -} - -.remarkup-assist-code { - background-position: 0px -7657px; -} - -.remarkup-assist-i { - background-position: 0px -7672px; -} - -.remarkup-assist-image { background-position: 0px -7687px; } +.action-fork { + background-position: 0px -7704px; +} + +.action-move { + background-position: 0px -7721px; +} + +.action-new { + background-position: 0px -7738px; +} + +.action-preview { + background-position: 0px -7755px; +} + +.action-subscribe-add { + background-position: 0px -7772px; +} + +.action-subscribe-auto { + background-position: 0px -7789px; +} + +.action-subscribe-delete { + background-position: 0px -7806px; +} + +.action-unpublish { + background-position: 0px -7823px; +} + +.action-world { + background-position: 0px -7840px; +} + +.remarkup-assist-b { + background-position: 0px -7857px; +} + +.remarkup-assist-code { + background-position: 0px -7872px; +} + +.remarkup-assist-i { + background-position: 0px -7887px; +} + +.remarkup-assist-image { + background-position: 0px -7902px; +} + .remarkup-assist-ol { - background-position: 0px -7702px; + background-position: 0px -7917px; } .remarkup-assist-tag { - background-position: 0px -7717px; + background-position: 0px -7932px; } .remarkup-assist-tt { - background-position: 0px -7732px; + background-position: 0px -7947px; } .remarkup-assist-ul { - background-position: 0px -7747px; + background-position: 0px -7962px; } .remarkup-assist-help { - background-position: 0px -7762px; + background-position: 0px -7977px; } .remarkup-assist-table { - background-position: 0px -7777px; + background-position: 0px -7992px; } diff --git a/webroot/rsrc/image/autosprite.png b/webroot/rsrc/image/autosprite.png index 73aa1129b9..9648ecea6e 100644 Binary files a/webroot/rsrc/image/autosprite.png and b/webroot/rsrc/image/autosprite.png differ