From 01398f762b20b177370ef478dca20c62da3a85a7 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Wed, 6 Nov 2013 02:08:28 +0100 Subject: [PATCH] Better looks and css for welcome.html. For reference, __celerity_resource_map__.php was updated with this command. ./scripts/celerity_mapper.php --with-custom webroot --- scripts/celerity_mapper.php | 2 + src/__celerity_resource_map__.php | 196 ++++++++++-------- .../PhabricatorDirectoryMainController.php | 4 +- .../custom/css/phabricator-welcome-page.css | 61 ++++++ webroot/rsrc/custom/static/welcome.html | 74 +++---- 5 files changed, 202 insertions(+), 135 deletions(-) create mode 100644 webroot/rsrc/custom/css/phabricator-welcome-page.css diff --git a/scripts/celerity_mapper.php b/scripts/celerity_mapper.php index a8281252be..259da2369a 100755 --- a/scripts/celerity_mapper.php +++ b/scripts/celerity_mapper.php @@ -81,6 +81,8 @@ $package_spec = array( 'phabricator-jump-nav', + 'phabricator-welcome-page', + 'phabricator-remarkup-css', 'syntax-highlighting-css', 'aphront-pager-view-css', diff --git a/src/__celerity_resource_map__.php b/src/__celerity_resource_map__.php index d266852b22..352bf114f8 100644 --- a/src/__celerity_resource_map__.php +++ b/src/__celerity_resource_map__.php @@ -7,6 +7,13 @@ */ celerity_register_resource_map(array( + '/rsrc/custom/image/blender_logo.png' => + array( + 'hash' => '098abd520f2ba8d1370299e7e4e01758', + 'uri' => '/res/098abd52/rsrc/custom/image/blender_logo.png', + 'disk' => '/rsrc/custom/image/blender_logo.png', + 'type' => 'png', + ), '/rsrc/image/actions/edit.png' => array( 'hash' => 'ae90914d120ac3838ddc633b480343f3', @@ -569,22 +576,22 @@ celerity_register_resource_map(array( ), '/rsrc/image/sprite-apps-X2.png' => array( - 'hash' => '68bbb3f409d0eb42d65dd94769813044', - 'uri' => '/res/68bbb3f4/rsrc/image/sprite-apps-X2.png', + 'hash' => '67e8a6bf2d7fbb0b7961f1a0dcf8592b', + 'uri' => '/res/67e8a6bf/rsrc/image/sprite-apps-X2.png', 'disk' => '/rsrc/image/sprite-apps-X2.png', 'type' => 'png', ), '/rsrc/image/sprite-apps-large-X2.png' => array( - 'hash' => '15368afbac0e1402c20f99f3166cdb11', - 'uri' => '/res/15368afb/rsrc/image/sprite-apps-large-X2.png', + 'hash' => '9bed1778022e2bd25d658842be54844d', + 'uri' => '/res/9bed1778/rsrc/image/sprite-apps-large-X2.png', 'disk' => '/rsrc/image/sprite-apps-large-X2.png', 'type' => 'png', ), '/rsrc/image/sprite-apps-large.png' => array( - 'hash' => 'b1f1de55803cf22eb3beb391fff17b04', - 'uri' => '/res/b1f1de55/rsrc/image/sprite-apps-large.png', + 'hash' => '518d6e5487c8d3758921ad85c1bb7d60', + 'uri' => '/res/518d6e54/rsrc/image/sprite-apps-large.png', 'disk' => '/rsrc/image/sprite-apps-large.png', 'type' => 'png', ), @@ -597,8 +604,8 @@ celerity_register_resource_map(array( ), '/rsrc/image/sprite-apps.png' => array( - 'hash' => 'bf7feaae848d44a461e63123c28e402f', - 'uri' => '/res/bf7feaae/rsrc/image/sprite-apps.png', + 'hash' => '9024ab95247f936f41c0b51c75e2e228', + 'uri' => '/res/9024ab95/rsrc/image/sprite-apps.png', 'disk' => '/rsrc/image/sprite-apps.png', 'type' => 'png', ), @@ -3352,7 +3359,7 @@ celerity_register_resource_map(array( ), 'phabricator-main-menu-view' => array( - 'uri' => '/res/95ff522a/rsrc/css/application/base/main-menu-view.css', + 'uri' => '/res/f45115e5/rsrc/css/application/base/main-menu-view.css', 'type' => 'css', 'requires' => array( @@ -3735,6 +3742,15 @@ celerity_register_resource_map(array( ), 'disk' => '/rsrc/js/application/uiexample/ReactorSendPropertiesExample.js', ), + 'phabricator-welcome-page' => + array( + 'uri' => '/res/c7e1ddad/rsrc/custom/css/phabricator-welcome-page.css', + 'type' => 'css', + 'requires' => + array( + ), + 'disk' => '/rsrc/custom/css/phabricator-welcome-page.css', + ), 'phabricator-zindex-css' => array( 'uri' => '/res/b443d508/rsrc/css/core/z-index.css', @@ -3868,7 +3884,7 @@ celerity_register_resource_map(array( ), 'phui-form-view-css' => array( - 'uri' => '/res/3621b05d/rsrc/css/phui/phui-form-view.css', + 'uri' => '/res/18392610/rsrc/css/phui/phui-form-view.css', 'type' => 'css', 'requires' => array( @@ -4183,7 +4199,7 @@ celerity_register_resource_map(array( ), 'sprite-apps-css' => array( - 'uri' => '/res/37c55e75/rsrc/css/sprite-apps.css', + 'uri' => '/res/774f4bad/rsrc/css/sprite-apps.css', 'type' => 'css', 'requires' => array( @@ -4192,7 +4208,7 @@ celerity_register_resource_map(array( ), 'sprite-apps-large-css' => array( - 'uri' => '/res/8ddded36/rsrc/css/sprite-apps-large.css', + 'uri' => '/res/b547fab1/rsrc/css/sprite-apps-large.css', 'type' => 'css', 'requires' => array( @@ -4255,7 +4271,7 @@ celerity_register_resource_map(array( ), 'sprite-menu-css' => array( - 'uri' => '/res/764ab039/rsrc/css/sprite-menu.css', + 'uri' => '/res/05b9ad87/rsrc/css/sprite-menu.css', 'type' => 'css', 'requires' => array( @@ -4328,7 +4344,7 @@ celerity_register_resource_map(array( ), array( 'packages' => array( - 'f350af41' => + '650e555b' => array( 'name' => 'core.pkg.css', 'symbols' => @@ -4345,39 +4361,40 @@ celerity_register_resource_map(array( 9 => 'aphront-typeahead-control-css', 10 => 'aphront-list-filter-view-css', 11 => 'phabricator-jump-nav', - 12 => 'phabricator-remarkup-css', - 13 => 'syntax-highlighting-css', - 14 => 'aphront-pager-view-css', - 15 => 'phabricator-transaction-view-css', - 16 => 'aphront-tooltip-css', - 17 => 'phabricator-flag-css', - 18 => 'aphront-error-view-css', - 19 => 'sprite-icons-css', - 20 => 'sprite-gradient-css', - 21 => 'sprite-menu-css', - 22 => 'sprite-apps-large-css', - 23 => 'sprite-status-css', - 24 => 'phabricator-main-menu-view', - 25 => 'phabricator-notification-css', - 26 => 'phabricator-notification-menu-css', - 27 => 'lightbox-attachment-css', - 28 => 'phui-header-view-css', - 29 => 'phabricator-filetree-view-css', - 30 => 'phabricator-nav-view-css', - 31 => 'phabricator-side-menu-view-css', - 32 => 'phabricator-crumbs-view-css', - 33 => 'phui-object-item-list-view-css', - 34 => 'global-drag-and-drop-css', - 35 => 'phui-spacing-css', - 36 => 'phui-form-css', - 37 => 'phui-icon-view-css', - 38 => 'phabricator-application-launch-view-css', - 39 => 'phabricator-action-list-view-css', - 40 => 'phui-property-list-view-css', - 41 => 'phabricator-tag-view-css', - 42 => 'phui-list-view-css', + 12 => 'phabricator-welcome-page', + 13 => 'phabricator-remarkup-css', + 14 => 'syntax-highlighting-css', + 15 => 'aphront-pager-view-css', + 16 => 'phabricator-transaction-view-css', + 17 => 'aphront-tooltip-css', + 18 => 'phabricator-flag-css', + 19 => 'aphront-error-view-css', + 20 => 'sprite-icons-css', + 21 => 'sprite-gradient-css', + 22 => 'sprite-menu-css', + 23 => 'sprite-apps-large-css', + 24 => 'sprite-status-css', + 25 => 'phabricator-main-menu-view', + 26 => 'phabricator-notification-css', + 27 => 'phabricator-notification-menu-css', + 28 => 'lightbox-attachment-css', + 29 => 'phui-header-view-css', + 30 => 'phabricator-filetree-view-css', + 31 => 'phabricator-nav-view-css', + 32 => 'phabricator-side-menu-view-css', + 33 => 'phabricator-crumbs-view-css', + 34 => 'phui-object-item-list-view-css', + 35 => 'global-drag-and-drop-css', + 36 => 'phui-spacing-css', + 37 => 'phui-form-css', + 38 => 'phui-icon-view-css', + 39 => 'phabricator-application-launch-view-css', + 40 => 'phabricator-action-list-view-css', + 41 => 'phui-property-list-view-css', + 42 => 'phabricator-tag-view-css', + 43 => 'phui-list-view-css', ), - 'uri' => '/res/pkg/f350af41/core.pkg.css', + 'uri' => '/res/pkg/650e555b/core.pkg.css', 'type' => 'css', ), '2c1dba03' => @@ -4569,15 +4586,15 @@ celerity_register_resource_map(array( ), 'reverse' => array( - 'aphront-dialog-view-css' => 'f350af41', - 'aphront-error-view-css' => 'f350af41', - 'aphront-list-filter-view-css' => 'f350af41', - 'aphront-pager-view-css' => 'f350af41', - 'aphront-panel-view-css' => 'f350af41', - 'aphront-table-view-css' => 'f350af41', - 'aphront-tokenizer-control-css' => 'f350af41', - 'aphront-tooltip-css' => 'f350af41', - 'aphront-typeahead-control-css' => 'f350af41', + 'aphront-dialog-view-css' => '650e555b', + 'aphront-error-view-css' => '650e555b', + 'aphront-list-filter-view-css' => '650e555b', + 'aphront-pager-view-css' => '650e555b', + 'aphront-panel-view-css' => '650e555b', + 'aphront-table-view-css' => '650e555b', + 'aphront-tokenizer-control-css' => '650e555b', + 'aphront-tooltip-css' => '650e555b', + 'aphront-typeahead-control-css' => '650e555b', 'differential-changeset-view-css' => '1084b12b', 'differential-core-view-css' => '1084b12b', 'differential-inline-comment-editor' => '5e9e5c4e', @@ -4591,7 +4608,7 @@ celerity_register_resource_map(array( 'differential-table-of-contents-css' => '1084b12b', 'diffusion-commit-view-css' => '7aa115b4', 'diffusion-icons-css' => '7aa115b4', - 'global-drag-and-drop-css' => 'f350af41', + 'global-drag-and-drop-css' => '650e555b', 'inline-comment-summary-css' => '1084b12b', 'javelin-aphlict' => '2c1dba03', 'javelin-behavior' => '3e3be199', @@ -4666,56 +4683,57 @@ celerity_register_resource_map(array( 'javelin-util' => '3e3be199', 'javelin-vector' => '3e3be199', 'javelin-workflow' => '3e3be199', - 'lightbox-attachment-css' => 'f350af41', + 'lightbox-attachment-css' => '650e555b', 'maniphest-task-summary-css' => '49898640', - 'phabricator-action-list-view-css' => 'f350af41', - 'phabricator-application-launch-view-css' => 'f350af41', + 'phabricator-action-list-view-css' => '650e555b', + 'phabricator-application-launch-view-css' => '650e555b', 'phabricator-busy' => '2c1dba03', 'phabricator-content-source-view-css' => '1084b12b', - 'phabricator-core-css' => 'f350af41', - 'phabricator-crumbs-view-css' => 'f350af41', + 'phabricator-core-css' => '650e555b', + 'phabricator-crumbs-view-css' => '650e555b', 'phabricator-drag-and-drop-file-upload' => '5e9e5c4e', 'phabricator-dropdown-menu' => '2c1dba03', 'phabricator-file-upload' => '2c1dba03', - 'phabricator-filetree-view-css' => 'f350af41', - 'phabricator-flag-css' => 'f350af41', + 'phabricator-filetree-view-css' => '650e555b', + 'phabricator-flag-css' => '650e555b', 'phabricator-hovercard' => '2c1dba03', - 'phabricator-jump-nav' => 'f350af41', + 'phabricator-jump-nav' => '650e555b', 'phabricator-keyboard-shortcut' => '2c1dba03', 'phabricator-keyboard-shortcut-manager' => '2c1dba03', - 'phabricator-main-menu-view' => 'f350af41', + 'phabricator-main-menu-view' => '650e555b', 'phabricator-menu-item' => '2c1dba03', - 'phabricator-nav-view-css' => 'f350af41', + 'phabricator-nav-view-css' => '650e555b', 'phabricator-notification' => '2c1dba03', - 'phabricator-notification-css' => 'f350af41', - 'phabricator-notification-menu-css' => 'f350af41', + 'phabricator-notification-css' => '650e555b', + 'phabricator-notification-menu-css' => '650e555b', 'phabricator-object-selector-css' => '1084b12b', 'phabricator-phtize' => '2c1dba03', 'phabricator-prefab' => '2c1dba03', 'phabricator-project-tag-css' => '49898640', - 'phabricator-remarkup-css' => 'f350af41', + 'phabricator-remarkup-css' => '650e555b', 'phabricator-shaped-request' => '5e9e5c4e', - 'phabricator-side-menu-view-css' => 'f350af41', - 'phabricator-standard-page-view' => 'f350af41', - 'phabricator-tag-view-css' => 'f350af41', + 'phabricator-side-menu-view-css' => '650e555b', + 'phabricator-standard-page-view' => '650e555b', + 'phabricator-tag-view-css' => '650e555b', 'phabricator-textareautils' => '2c1dba03', 'phabricator-tooltip' => '2c1dba03', - 'phabricator-transaction-view-css' => 'f350af41', - 'phabricator-zindex-css' => 'f350af41', - 'phui-button-css' => 'f350af41', - 'phui-form-css' => 'f350af41', - 'phui-form-view-css' => 'f350af41', - 'phui-header-view-css' => 'f350af41', - 'phui-icon-view-css' => 'f350af41', - 'phui-list-view-css' => 'f350af41', - 'phui-object-item-list-view-css' => 'f350af41', - 'phui-property-list-view-css' => 'f350af41', - 'phui-spacing-css' => 'f350af41', - 'sprite-apps-large-css' => 'f350af41', - 'sprite-gradient-css' => 'f350af41', - 'sprite-icons-css' => 'f350af41', - 'sprite-menu-css' => 'f350af41', - 'sprite-status-css' => 'f350af41', - 'syntax-highlighting-css' => 'f350af41', + 'phabricator-transaction-view-css' => '650e555b', + 'phabricator-welcome-page' => '650e555b', + 'phabricator-zindex-css' => '650e555b', + 'phui-button-css' => '650e555b', + 'phui-form-css' => '650e555b', + 'phui-form-view-css' => '650e555b', + 'phui-header-view-css' => '650e555b', + 'phui-icon-view-css' => '650e555b', + 'phui-list-view-css' => '650e555b', + 'phui-object-item-list-view-css' => '650e555b', + 'phui-property-list-view-css' => '650e555b', + 'phui-spacing-css' => '650e555b', + 'sprite-apps-large-css' => '650e555b', + 'sprite-gradient-css' => '650e555b', + 'sprite-icons-css' => '650e555b', + 'sprite-menu-css' => '650e555b', + 'sprite-status-css' => '650e555b', + 'syntax-highlighting-css' => '650e555b', ), )); diff --git a/src/applications/directory/controller/PhabricatorDirectoryMainController.php b/src/applications/directory/controller/PhabricatorDirectoryMainController.php index 10afe20c7f..6524a29a95 100644 --- a/src/applications/directory/controller/PhabricatorDirectoryMainController.php +++ b/src/applications/directory/controller/PhabricatorDirectoryMainController.php @@ -282,12 +282,14 @@ final class PhabricatorDirectoryMainController private function buildWelcomePanelFromFile() { $webroot = dirname(phutil_get_library_root('phabricator')).'/webroot/'; - $panel = new AphrontMiniPanelView(); + $panel = new AphrontPanelView(); + $panel->addClass('project-list'); $panel->appendChild( phutil_safe_html( FileSystem::readFile($webroot . PhabricatorEnv::getEnvConfig('welcome.file')))); + require_celerity_resource('phabricator-welcome-page'); return $panel; } diff --git a/webroot/rsrc/custom/css/phabricator-welcome-page.css b/webroot/rsrc/custom/css/phabricator-welcome-page.css new file mode 100644 index 0000000000..edd8bf6209 --- /dev/null +++ b/webroot/rsrc/custom/css/phabricator-welcome-page.css @@ -0,0 +1,61 @@ +/** + * @provides phabricator-welcome-page + */ + + +.project-list { + padding: 0; + background: #FFF; + + border: none; + background: none; + margin-bottom: 20px; +} + +.project-list .aphront-panel-header { + display: none; +} + +.project-item { + float: left; + text-align: center; + background: #FFF; + height: 130px; + border: 1px solid #C7CCD9; + border-bottom: 1px solid #A1A6B0; +} + +.project-item h2 { + width: 100%; + padding: 3px 0px; + color: #333; + font-size: 13pt; + font-weight: normal; + margin-bottom: 8px; + border-bottom: 1px solid #CCC; +} + +.project-item li { + margin-bottom: 5px; +} + +.project-item.span4 { + width: 24%; + margin-right: 1%; +} + +.project-item.span8 { + float: left; + width: 49%; +} + +@media all and (max-width: 800px) { + .project-item.span8 { + width: 48%; + } +} + +.project-item.span8 ul { + float: left; + width: 50%; +} \ No newline at end of file diff --git a/webroot/rsrc/custom/static/welcome.html b/webroot/rsrc/custom/static/welcome.html index fc45f6c095..4e76d2c7a0 100644 --- a/webroot/rsrc/custom/static/welcome.html +++ b/webroot/rsrc/custom/static/welcome.html @@ -1,52 +1,36 @@ -
- - - - - - - - -
- -

BF Blender

-		 - -

Addons

-		 - -

All Projects

- - -		 - - - -
- +
+

All Projects

+ +
+