Your account has been disabled.
'); + $failure_view->setHeader(pht('Account Disabled')); + $failure_view->appendChild( + ''.pht('Your account has been disabled.').'
'); return $this->buildStandardPageResponse( $failure_view, array( - 'title' => 'Account Disabled', + 'title' => pht('Account Disabled'), )); } } diff --git a/src/applications/auth/controller/PhabricatorEmailLoginController.php b/src/applications/auth/controller/PhabricatorEmailLoginController.php index bf142ea23e..e6cc6372df 100644 --- a/src/applications/auth/controller/PhabricatorEmailLoginController.php +++ b/src/applications/auth/controller/PhabricatorEmailLoginController.php @@ -1,153 +1,159 @@ getRequest(); if (!PhabricatorEnv::getEnvConfig('auth.password-auth-enabled')) { return new Aphront400Response(); } $e_email = true; $e_captcha = true; $errors = array(); $is_serious = PhabricatorEnv::getEnvConfig('phabricator.serious-business'); if ($request->isFormPost()) { $e_email = null; - $e_captcha = 'Again'; + $e_captcha = pht('Again'); $captcha_ok = AphrontFormRecaptchaControl::processCaptcha($request); if (!$captcha_ok) { - $errors[] = "Captcha response is incorrect, try again."; - $e_captcha = 'Invalid'; + $errors[] = pht("Captcha response is incorrect, try again."); + $e_captcha = pht('Invalid'); } $email = $request->getStr('email'); if (!strlen($email)) { - $errors[] = "You must provide an email address."; - $e_email = 'Required'; + $errors[] = pht("You must provide an email address."); + $e_email = pht('Required'); } if (!$errors) { // NOTE: Don't validate the email unless the captcha is good; this makes // it expensive to fish for valid email addresses while giving the user // a better error if they goof their email. $target_email = id(new PhabricatorUserEmail())->loadOneWhere( 'address = %s', $email); $target_user = null; if ($target_email) { $target_user = id(new PhabricatorUser())->loadOneWhere( 'phid = %s', $target_email->getUserPHID()); } if (!$target_user) { - $errors[] = "There is no account associated with that email address."; - $e_email = "Invalid"; + $errors[] = + pht("There is no account associated with that email address."); + $e_email = pht("Invalid"); } if (!$errors) { $uri = $target_user->getEmailLoginURI($target_email); if ($is_serious) { $body = <<An email has been sent with a link you can use to login.
'); + ''.pht( + 'An email has been sent with a link you can use to login.' + ).'
'); return $this->buildStandardPageResponse( $view, array( - 'title' => 'Email Sent', + 'title' => pht('Email Sent'), )); } } } $email_auth = new AphrontFormView(); $email_auth ->setAction('/login/email/') ->setUser($request->getUser()) ->appendChild( id(new AphrontFormTextControl()) - ->setLabel('Email') + ->setLabel(pht('Email')) ->setName('email') ->setValue($request->getStr('email')) ->setError($e_email)) ->appendChild( id(new AphrontFormRecaptchaControl()) - ->setLabel('Captcha') + ->setLabel(pht('Captcha')) ->setError($e_captcha)) ->appendChild( id(new AphrontFormSubmitControl()) - ->setValue('Send Email')); + ->setValue(pht('Send Email'))); $error_view = null; if ($errors) { $error_view = new AphrontErrorView(); - $error_view->setTitle('Login Error'); + $error_view->setTitle(pht('Login Error')); $error_view->setErrors($errors); } $panel = new AphrontPanelView(); $panel->setWidth(AphrontPanelView::WIDTH_FORM); - $panel->appendChild('The authentication information in the link you clicked is '. + '
'.pht('The authentication information in the link you clicked is '. 'invalid or out of date. Make sure you are copy-and-pasting the '. 'entire link into your browser. You can try again, or request '. - 'a new email.
'); + 'a new email.').''); $view->appendChild( 'The LDAP account you just authorized is already linked to '. - 'another Phabricator account. Before you can link it to a '. - 'different LDAP account, you must unlink the old account.
' + ''.pht('The LDAP account you just authorized is already '. + 'linked toanother Phabricator account. Before you can link it '. + 'to a different LDAP account, you must unlink the old '. + 'account.').'
' ); $dialog->addCancelButton('/settings/panel/ldap/'); return id(new AphrontDialogResponse())->setDialog($dialog); } else { return id(new AphrontRedirectResponse()) ->setURI('/settings/panel/ldap/'); } } if (!$request->isDialogFormPost()) { $dialog = new AphrontDialogView(); $dialog->setUser($current_user); - $dialog->setTitle('Link LDAP Account'); + $dialog->setTitle(pht('Link LDAP Account')); $dialog->appendChild( - 'Link your LDAP account to your Phabricator account?
'); + ''. + pht('Link your LDAP account to your Phabricator account?'). + '
'); $dialog->addHiddenInput('username', $request->getStr('username')); $dialog->addHiddenInput('password', $request->getStr('password')); - $dialog->addSubmitButton('Link Accounts'); + $dialog->addSubmitButton(pht('Link Accounts')); $dialog->addCancelButton('/settings/panel/ldap/'); return id(new AphrontDialogResponse())->setDialog($dialog); } $ldap_info->setUserID($current_user->getID()); $this->saveLDAPInfo($ldap_info); return id(new AphrontRedirectResponse()) ->setURI('/settings/panel/ldap/'); } if ($ldap_info->getID()) { $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites(); $known_user = id(new PhabricatorUser())->load( $ldap_info->getUserID()); $session_key = $known_user->establishSession('web'); $this->saveLDAPInfo($ldap_info); $request->setCookie('phusr', $known_user->getUsername()); $request->setCookie('phsid', $session_key); $uri = new PhutilURI('/login/validate/'); $uri->setQueryParams( array( 'phusr' => $known_user->getUsername(), )); return id(new AphrontRedirectResponse())->setURI((string)$uri); } $controller = newv('PhabricatorLDAPRegistrationController', array($this->getRequest())); $controller->setLDAPProvider($this->provider); $controller->setLDAPInfo($ldap_info); return $this->delegateToController($controller); } } $ldap_form = new AphrontFormView(); $ldap_form ->setUser($request->getUser()) ->setAction('/ldap/login/') ->appendChild( id(new AphrontFormTextControl()) - ->setLabel('LDAP username') + ->setLabel(pht('LDAP username')) ->setName('username') ->setValue($ldap_username)) ->appendChild( id(new AphrontFormPasswordControl()) - ->setLabel('Password') + ->setLabel(pht('Password')) ->setName('password')); $ldap_form ->appendChild( id(new AphrontFormSubmitControl()) - ->setValue('Login')); + ->setValue(pht('Login'))); $panel = new AphrontPanelView(); $panel->setWidth(AphrontPanelView::WIDTH_FORM); - $panel->appendChild('You will not be able to login using this account '. - 'once you unlink it. Continue?
'); - $dialog->addSubmitButton('Unlink Account'); + ''.pht('You will not be able to login using this account '. + 'once you unlink it. Continue?').'
'); + $dialog->addSubmitButton(pht('Unlink Account')); $dialog->addCancelButton('/settings/panel/ldap/'); return id(new AphrontDialogResponse())->setDialog($dialog); } $ldap_info->delete(); return id(new AphrontRedirectResponse()) ->setURI('/settings/panel/ldap/'); } } diff --git a/src/applications/auth/controller/PhabricatorLoginController.php b/src/applications/auth/controller/PhabricatorLoginController.php index 6bc87c5aab..c4bda38a77 100644 --- a/src/applications/auth/controller/PhabricatorLoginController.php +++ b/src/applications/auth/controller/PhabricatorLoginController.php @@ -1,306 +1,311 @@ getRequest(); $user = $request->getUser(); if ($user->isLoggedIn()) { // Kick the user out if they're already logged in. return id(new AphrontRedirectResponse())->setURI('/'); } if ($request->isAjax()) { // We end up here if the user clicks a workflow link that they need to // login to use. We give them a dialog saying "You need to login..". if ($request->isDialogFormPost()) { return id(new AphrontRedirectResponse())->setURI( $request->getRequestURI()); } $dialog = new AphrontDialogView(); $dialog->setUser($user); - $dialog->setTitle('Login Required'); - $dialog->appendChild('You must login to continue.
'); - $dialog->addSubmitButton('Login'); - $dialog->addCancelButton('/', 'Cancel'); + $dialog->setTitle(pht('Login Required')); + $dialog->appendChild(''.pht('You must login to continue.').'
'); + $dialog->addSubmitButton(pht('Login')); + $dialog->addCancelButton('/', pht('Cancel')); return id(new AphrontDialogResponse())->setDialog($dialog); } if ($request->isConduit()) { // A common source of errors in Conduit client configuration is getting // the request path wrong. The client will end up here, so make some // effort to give them a comprehensible error message. $request_path = $this->getRequest()->getPath(); $conduit_path = '/api/'.$body.'
') ->appendChild( id(new AphrontFormSubmitControl()) ->setValue("{$button} \xC2\xBB")); $forms[$title] = $auth_form; } $panel = new AphrontPanelView(); $panel->setWidth(AphrontPanelView::WIDTH_FORM); $panel->setNoBackground(); foreach ($forms as $name => $form) { $panel->appendChild('Login failed:
'. + ''.pht('Login failed:').'
'. $list. - 'Clear your cookies and try again.
'); + ''.pht('Clear your cookies and try again.').'
'); $view->appendChild( 'Are you sure you want to log out?
') - ->addSubmitButton('Log Out') + ->setTitle(pht('Log out of Phabricator?')) + ->appendChild(''.pht('Are you sure you want to log out?').'
') + ->addSubmitButton(pht('Logout')) ->addCancelButton('/'); return id(new AphrontDialogResponse())->setDialog($dialog); } return id(new AphrontRedirectResponse())->setURI('/'); } } diff --git a/src/applications/auth/controller/PhabricatorMustVerifyEmailController.php b/src/applications/auth/controller/PhabricatorMustVerifyEmailController.php index 58655c2e8b..21af745ed2 100644 --- a/src/applications/auth/controller/PhabricatorMustVerifyEmailController.php +++ b/src/applications/auth/controller/PhabricatorMustVerifyEmailController.php @@ -1,74 +1,79 @@ getRequest(); $user = $request->getUser(); $email = $user->loadPrimaryEmail(); if ($email->getIsVerified()) { return id(new AphrontRedirectResponse())->setURI('/'); } $email_address = $email->getAddress(); $sent = null; if ($request->isFormPost()) { $email->sendVerificationEmail($user); $sent = new AphrontErrorView(); $sent->setSeverity(AphrontErrorView::SEVERITY_NOTICE); - $sent->setTitle('Email Sent'); - $sent->appendChild( - 'Another verification email was sent to '. - phutil_escape_html($email_address).'.
'); + $sent->setTitle(pht('Email Sent')); + $sent->appendChild(''. + pht('Another verification email was sent to %s.', + phutil_escape_html($email_address)).'
'); } $error_view = new AphrontRequestFailureView(); - $error_view->setHeader('Check Your Email'); + $error_view->setHeader(pht('Check Your Email')); $error_view->appendChild( - 'You must verify your email address to login. You should have a new '. + '
'. + pht('You must verify your email address to login. You should have a new '. 'email message from Phabricator with verification instructions in your '. - 'inbox ('.phutil_escape_html($email_address).').
'); + 'inbox (%s).', phutil_escape_html($email_address)). + ''); $error_view->appendChild( - 'If you did not receive an email, you can click the button below '. - 'to try sending another one.
'); + ''. + pht('If you did not receive an email, you can click the button below '. + 'to try sending another one.'). + '
'); $error_view->appendChild( 'The %s account you just authorized is already linked to '. + $dialog->setTitle(pht('Already Linked to Another Account')); + $dialog->appendChild('
'. + pht( + 'The %s account you just authorized is already linked to '. 'another Phabricator account. Before you can associate your %s '. 'account with this Phabriactor account, you must unlink it from '. 'the Phabricator account it is currently linked to.
', - $provider_name, - $provider_name)); + phutil_escape_html($provider_name), + phutil_escape_html($provider_name))).''; $dialog->addCancelButton($provider->getSettingsPanelURI()); return id(new AphrontDialogResponse())->setDialog($dialog); } else { $this->saveOAuthInfo($oauth_info); // Refresh token. return id(new AphrontRedirectResponse()) ->setURI($provider->getSettingsPanelURI()); } } $existing_oauth = id(new PhabricatorUserOAuthInfo())->loadOneWhere( 'userID = %d AND oauthProvider = %s', $current_user->getID(), $provider_key); if ($existing_oauth) { $dialog = new AphrontDialogView(); $dialog->setUser($current_user); - $dialog->setTitle('Already Linked to an Account From This Provider'); - $dialog->appendChild( - hsprintf( - 'The account you are logged in with is already linked to a %s '. + $dialog->setTitle( + pht('Already Linked to an Account From This Provider')); + $dialog->appendChild('
'. + pht( + 'The account you are logged in with is already linked to a %s '. 'account. Before you can link it to a different %s account, you '. 'must unlink the old account.
', - $provider_name, - $provider_name)); + phutil_escape_html($provider_name), + phutil_escape_html($provider_name))).''; $dialog->addCancelButton($provider->getSettingsPanelURI()); return id(new AphrontDialogResponse())->setDialog($dialog); } if (!$request->isDialogFormPost()) { $dialog = new AphrontDialogView(); $dialog->setUser($current_user); - $dialog->setTitle('Link '.$provider_name.' Account'); + $dialog->setTitle(pht('Link %s Account', $provider_name)); $dialog->appendChild( - hsprintf( + pht( 'Link your %s account to your Phabricator account?
', - $provider_name)); + phutil_escape_html($provider_name))); $dialog->addHiddenInput('confirm_token', $provider->getAccessToken()); $dialog->addHiddenInput('expires', $oauth_info->getTokenExpires()); $dialog->addHiddenInput('state', $this->oauthState); $dialog->addHiddenInput('scope', $oauth_info->getTokenScope()); $dialog->addSubmitButton('Link Accounts'); $dialog->addCancelButton($provider->getSettingsPanelURI()); return id(new AphrontDialogResponse())->setDialog($dialog); } $oauth_info->setUserID($current_user->getID()); $this->saveOAuthInfo($oauth_info); return id(new AphrontRedirectResponse()) ->setURI($provider->getSettingsPanelURI()); } // Login with known auth. if ($oauth_info->getID()) { $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites(); $known_user = id(new PhabricatorUser())->load($oauth_info->getUserID()); $request->getApplicationConfiguration()->willAuthenticateUserWithOAuth( $known_user, $oauth_info, $provider); $session_key = $known_user->establishSession('web'); $this->saveOAuthInfo($oauth_info); $request->setCookie('phusr', $known_user->getUsername()); $request->setCookie('phsid', $session_key); $uri = new PhutilURI('/login/validate/'); $uri->setQueryParams( array( 'phusr' => $known_user->getUsername(), )); return id(new AphrontRedirectResponse())->setURI((string)$uri); } $oauth_email = $provider->retrieveUserEmail(); if ($oauth_email) { $known_email = id(new PhabricatorUserEmail()) ->loadOneWhere('address = %s', $oauth_email); if ($known_email) { $dialog = new AphrontDialogView(); $dialog->setUser($current_user); - $dialog->setTitle('Already Linked to Another Account'); - $dialog->appendChild( - hsprintf( - 'The %s account you just authorized has an email address which '. + $dialog->setTitle(pht('Already Linked to Another Account')); + $dialog->appendChild('
'. + pht( + 'The %s account you just authorized has an email address which '. 'is already in use by another Phabricator account. To link the '. 'accounts, log in to your Phabricator account and then go to '. - 'Settings.
', - $provider_name)); + 'Settings.', + phutil_escape_html($provider_name))).''; $user = id(new PhabricatorUser()) ->loadOneWhere('phid = %s', $known_email->getUserPHID()); $oauth_infos = id(new PhabricatorUserOAuthInfo()) ->loadAllWhere('userID = %d', $user->getID()); if ($oauth_infos) { $providers = array(); foreach ($oauth_infos as $info) { $provider = $info->getOAuthProvider(); $providers[] = PhabricatorOAuthProvider::newProvider($provider) ->getProviderName(); } $dialog->appendChild( - hsprintf( + pht( 'The account is associated with: %s.
', - implode(', ', $providers))); + implode(', ', phutil_escape_html($providers)))); } $dialog->addCancelButton('/login/'); return id(new AphrontDialogResponse())->setDialog($dialog); } } if (!$provider->isProviderRegistrationEnabled()) { $dialog = new AphrontDialogView(); $dialog->setUser($current_user); - $dialog->setTitle('No Account Registration With '.$provider_name); - $dialog->appendChild( - hsprintf( - 'You can not register a new account using %s; you can only use '. + $dialog->setTitle(pht('No Account Registration with %s', $provider_name)); + $dialog->appendChild('
'. + pht( + 'You can not register a new account using %s; you can only use '. 'your %s account to log into an existing Phabricator account which '. - 'you have registered through other means.
', - $provider_name, - $provider_name)); + 'you have registered through other means.', + phutil_escape_html($provider_name), + phutil_escape_html($provider_name))).''; $dialog->addCancelButton('/login/'); return id(new AphrontDialogResponse())->setDialog($dialog); } $controller = PhabricatorEnv::newObjectFromConfig( 'controller.oauth-registration', array($this->getRequest())); $controller->setOAuthProvider($provider); $controller->setOAuthInfo($oauth_info); $controller->setOAuthState($this->oauthState); return $this->delegateToController($controller); } private function buildErrorResponse(PhabricatorOAuthFailureView $view, Exception $e = null) { $provider = $this->provider; $provider_name = $provider->getProviderName(); $view->setOAuthProvider($provider); if ($e) { $view->setException($e); } return $this->buildStandardPageResponse( $view, array( - 'title' => $provider_name.' Auth Failed', + 'title' => pht('Auth Failed'), )); } private function retrieveAccessToken(PhabricatorOAuthProvider $provider) { $request = $this->getRequest(); $token = $request->getStr('confirm_token'); if ($token) { $this->tokenExpires = $request->getInt('expires'); $this->accessToken = $token; $this->oauthState = $request->getStr('state'); return null; } $client_id = $provider->getClientID(); $client_secret = $provider->getClientSecret(); $redirect_uri = $provider->getRedirectURI(); $auth_uri = $provider->getTokenURI(); $code = $request->getStr('code'); $query_data = array( 'client_id' => $client_id, 'client_secret' => $client_secret, 'redirect_uri' => $redirect_uri, 'code' => $code, ) + $provider->getExtraTokenParameters(); $future = new HTTPSFuture($auth_uri, $query_data); $future->setMethod('POST'); try { list($response) = $future->resolvex(); } catch (Exception $ex) { return $this->buildErrorResponse(new PhabricatorOAuthFailureView()); } $data = $provider->decodeTokenResponse($response); $token = idx($data, 'access_token'); if (!$token) { return $this->buildErrorResponse(new PhabricatorOAuthFailureView()); } $this->tokenExpires = $provider->getTokenExpiryFromArray($data); $this->accessToken = $token; $this->oauthState = $request->getStr('state'); return null; } private function retrieveOAuthInfo(PhabricatorOAuthProvider $provider) { $oauth_info = id(new PhabricatorUserOAuthInfo())->loadOneWhere( 'oauthProvider = %s and oauthUID = %s', $provider->getProviderKey(), $provider->retrieveUserID()); $scope = $this->getRequest()->getStr('scope'); if (!$oauth_info) { $oauth_info = new PhabricatorUserOAuthInfo(); $oauth_info->setOAuthProvider($provider->getProviderKey()); $oauth_info->setOAuthUID($provider->retrieveUserID()); // some providers don't tell you what scope you got, so default // to the minimum Phabricator requires rather than assuming no scope if (!$scope) { $scope = $provider->getMinimumScope(); } } $oauth_info->setAccountURI($provider->retrieveUserAccountURI()); $oauth_info->setAccountName($provider->retrieveUserAccountName()); $oauth_info->setToken($provider->getAccessToken()); $oauth_info->setTokenStatus(PhabricatorUserOAuthInfo::TOKEN_STATUS_GOOD); $oauth_info->setTokenScope($scope); // If we have out-of-date expiration info, just clear it out. Then replace // it with good info if the provider gave it to us. $expires = $oauth_info->getTokenExpires(); if ($expires <= time()) { $expires = null; } if ($this->tokenExpires) { $expires = $this->tokenExpires; } $oauth_info->setTokenExpires($expires); return $oauth_info; } private function saveOAuthInfo(PhabricatorUserOAuthInfo $info) { // UNGUARDED WRITES: Logging-in users don't have their CSRF set up yet. $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites(); $info->save(); } } diff --git a/src/applications/auth/controller/PhabricatorOAuthUnlinkController.php b/src/applications/auth/controller/PhabricatorOAuthUnlinkController.php index 816dae4bba..bff01b251b 100644 --- a/src/applications/auth/controller/PhabricatorOAuthUnlinkController.php +++ b/src/applications/auth/controller/PhabricatorOAuthUnlinkController.php @@ -1,52 +1,52 @@ provider = PhabricatorOAuthProvider::newProvider($data['provider']); } public function processRequest() { $request = $this->getRequest(); $user = $request->getUser(); $provider = $this->provider; if ($provider->isProviderLinkPermanent()) { throw new Exception( - "You may not unlink accounts from this OAuth provider."); + pht("You may not unlink accounts from this OAuth provider.")); } $provider_key = $provider->getProviderKey(); $oauth_info = id(new PhabricatorUserOAuthInfo())->loadOneWhere( 'userID = %d AND oauthProvider = %s', $user->getID(), $provider_key); if (!$oauth_info) { return new Aphront400Response(); } if (!$request->isDialogFormPost()) { $dialog = new AphrontDialogView(); $dialog->setUser($user); - $dialog->setTitle('Really unlink account?'); + $dialog->setTitle(pht('Really unlink account?')); $dialog->appendChild( - 'You will not be able to login using this account '. - 'once you unlink it. Continue?
'); - $dialog->addSubmitButton('Unlink Account'); + ''.pht('You will not be able to login using this account '. + 'once you unlink it. Continue?').'
'); + $dialog->addSubmitButton(pht('Unlink Account')); $dialog->addCancelButton($provider->getSettingsPanelURI()); return id(new AphrontDialogResponse())->setDialog($dialog); } $oauth_info->delete(); return id(new AphrontRedirectResponse()) ->setURI($provider->getSettingsPanelURI()); } } diff --git a/src/applications/auth/controller/oauthregistration/PhabricatorOAuthDefaultRegistrationController.php b/src/applications/auth/controller/oauthregistration/PhabricatorOAuthDefaultRegistrationController.php index a88c27fd91..6b81024bf7 100644 --- a/src/applications/auth/controller/oauthregistration/PhabricatorOAuthDefaultRegistrationController.php +++ b/src/applications/auth/controller/oauthregistration/PhabricatorOAuthDefaultRegistrationController.php @@ -1,223 +1,225 @@ getOAuthProvider(); $oauth_info = $this->getOAuthInfo(); $request = $this->getRequest(); $errors = array(); $e_username = true; $e_email = true; $e_realname = true; $user = new PhabricatorUser(); $user->setUsername($provider->retrieveUserAccountName()); $user->setRealName($provider->retrieveUserRealName()); $new_email = $provider->retrieveUserEmail(); if ($new_email) { // If the user's OAuth provider account has an email address but the // email address domain is not allowed by the Phabricator configuration, // we just pretend the provider did not supply an address. // // For instance, if the user uses Google OAuth and their Google address // is "joe@personal.com" but Phabricator is configured to require users // use "@company.com" addresses, we show a prompt below and tell the user // to provide their "@company.com" address. They can still use the OAuth // account to login, they just need to associate their account with an // allowed address. // // If the OAuth address is fine, we just use it and don't prompt the user. if (!PhabricatorUserEmail::isAllowedAddress($new_email)) { $new_email = null; } } $show_email_input = ($new_email === null); if ($request->isFormPost()) { $user->setUsername($request->getStr('username')); $username = $user->getUsername(); if (!strlen($user->getUsername())) { - $e_username = 'Required'; - $errors[] = 'Username is required.'; + $e_username = pht('Required'); + $errors[] = pht('Username is required.'); } else if (!PhabricatorUser::validateUsername($username)) { - $e_username = 'Invalid'; + $e_username = pht('Invalid'); $errors[] = PhabricatorUser::describeValidUsername(); } else { $e_username = null; } if (!$new_email) { $new_email = trim($request->getStr('email')); if (!$new_email) { - $e_email = 'Required'; - $errors[] = 'Email is required.'; + $e_email = pht('Required'); + $errors[] = pht('Email is required.'); } else { $e_email = null; } } if ($new_email) { $email_ok = PhabricatorUserEmail::isAllowedAddress($new_email); if (!$email_ok) { - $e_email = 'Invalid'; + $e_email = pht('Invalid'); $errors[] = PhabricatorUserEmail::describeAllowedAddresses(); } } if (!strlen($user->getRealName())) { $user->setRealName($request->getStr('realname')); if (!strlen($user->getRealName())) { - $e_realname = 'Required'; - $errors[] = 'Real name is required.'; + $e_realname = pht('Required'); + $errors[] = pht('Real name is required.'); } else { $e_realname = null; } } if (!$errors) { $image = $provider->retrieveUserProfileImage(); if ($image) { $file = PhabricatorFile::newFromFileData( $image, array( 'name' => $provider->getProviderKey().'-profile.jpg', 'authorPHID' => $user->getPHID(), )); $xformer = new PhabricatorImageTransformer(); // Resize OAuth image to a reasonable size $small_xformed = $xformer->executeProfileTransform( $file, $width = 50, $min_height = 50, $max_height = 50); $user->setProfileImagePHID($small_xformed->getPHID()); } try { // NOTE: We don't verify OAuth email addresses by default because // OAuth providers might associate email addresses with accounts that // haven't actually verified they own them. We could selectively // auto-verify some providers that we trust here, but the stakes for // verifying an email address are high because having a corporate // address at a company is sometimes the key to the castle. $email_obj = id(new PhabricatorUserEmail()) ->setAddress($new_email) ->setIsVerified(0); id(new PhabricatorUserEditor()) ->setActor($user) ->createNewUser($user, $email_obj); $oauth_info->setUserID($user->getID()); $oauth_info->save(); $session_key = $user->establishSession('web'); $request->setCookie('phusr', $user->getUsername()); $request->setCookie('phsid', $session_key); $email_obj->sendVerificationEmail($user); return id(new AphrontRedirectResponse())->setURI('/'); } catch (AphrontQueryDuplicateKeyException $exception) { $same_username = id(new PhabricatorUser())->loadOneWhere( 'userName = %s', $user->getUserName()); $same_email = id(new PhabricatorUserEmail())->loadOneWhere( 'address = %s', $new_email); if ($same_username) { - $e_username = 'Duplicate'; - $errors[] = 'That username or email is not unique.'; + $e_username = pht('Duplicate'); + $errors[] = pht('That username or email is not unique.'); } else if ($same_email) { - $e_email = 'Duplicate'; - $errors[] = 'That email is not unique.'; + $e_email = pht('Duplicate'); + $errors[] = pht('That email is not unique.'); } else { throw $exception; } } } } $error_view = null; if ($errors) { $error_view = new AphrontErrorView(); - $error_view->setTitle('Registration Failed'); + $error_view->setTitle(pht('Registration Failed')); $error_view->setErrors($errors); } // Strip the URI down to the path, because otherwise we'll trigger // external CSRF protection (by having a protocol in the form "action") // and generate a form with no CSRF token. $action_uri = new PhutilURI($provider->getRedirectURI()); $action_path = $action_uri->getPath(); $form = new AphrontFormView(); $form ->addHiddenInput('confirm_token', $provider->getAccessToken()) ->addHiddenInput('expires', $oauth_info->getTokenExpires()) ->addHiddenInput('state', $this->getOAuthState()) ->setUser($request->getUser()) ->setAction($action_path) ->appendChild( id(new AphrontFormTextControl()) - ->setLabel('Username') + ->setLabel(pht('Username')) ->setName('username') ->setValue($user->getUsername()) ->setError($e_username)); if ($show_email_input) { $form->appendChild( id(new AphrontFormTextControl()) - ->setLabel('Email') + ->setLabel(pht('Email')) ->setName('email') ->setValue($request->getStr('email')) ->setCaption(PhabricatorUserEmail::describeAllowedAddresses()) ->setError($e_email)); } if ($provider->retrieveUserRealName() === null) { $form->appendChild( id(new AphrontFormTextControl()) - ->setLabel('Real Name') + ->setLabel(pht('Real Name')) ->setName('realname') ->setValue($request->getStr('realname')) ->setError($e_realname)); } $form ->appendChild( id(new AphrontFormSubmitControl()) - ->setValue('Create Account')); + ->setValue(pht('Create Account'))); $panel = new AphrontPanelView(); - $panel->setHeader('Create New Account'); + $panel->setHeader(pht('Create New Account')); $panel->setWidth(AphrontPanelView::WIDTH_FORM); $panel->appendChild($form); + $panel->setNoBackground(); - return $this->buildStandardPageResponse( + return $this->buildApplicationPage( array( $error_view, $panel, ), array( - 'title' => 'Create New Account', + 'title' => pht('Create New Account'), + 'device' => true )); } } diff --git a/src/applications/auth/view/PhabricatorOAuthFailureView.php b/src/applications/auth/view/PhabricatorOAuthFailureView.php index 4853410dbd..b8fa2afd2f 100644 --- a/src/applications/auth/view/PhabricatorOAuthFailureView.php +++ b/src/applications/auth/view/PhabricatorOAuthFailureView.php @@ -1,88 +1,88 @@ request = $request; return $this; } public function setOAuthProvider($provider) { $this->provider = $provider; return $this; } public function setException(Exception $e) { $this->exception = $e; return $this; } public function render() { $request = $this->request; $provider = $this->provider; $provider_name = $provider->getProviderName(); $diagnose = null; $view = new AphrontRequestFailureView(); - $view->setHeader($provider_name.' Auth Failed'); + $view->setHeader(pht('%s Auth Failed', $provider_name)); if ($this->request) { $view->appendChild( hsprintf( 'Description: %s
', $request->getStr('error_description'))); $view->appendChild( hsprintf( 'Error: %s
', $request->getStr('error'))); $view->appendChild( hsprintf( 'Error Reason: %s
', $request->getStr('error_reason'))); } else if ($this->exception) { $view->appendChild( hsprintf( 'Error Details: %s
', $this->exception->getMessage())); } else { // TODO: We can probably refine this. $view->appendChild( hsprintf( 'Unable to authenticate with %s. '. 'There are several reasons this might happen:
'. 'You can try again, or login using another method.
', $provider_name, $provider_name, $provider_name, $provider_name)); $provider_key = $provider->getProviderKey(); $diagnose = hsprintf( ''. 'Diagnose %s OAuth Problems'. '', $provider_name); } $view->appendChild( 'This form will simulate '. 'sending mail to an object.
') ->appendChild( id(new AphrontFormTextControl()) ->setLabel('To') ->setName('obj') ->setCaption('e.g. D1234 or T1234')) ->appendChild( id(new AphrontFormTextAreaControl()) ->setLabel('Body') ->setName('body')) ->appendChild( id(new AphrontFormSubmitControl()) ->setValue('Receive Mail')); $panel = new AphrontPanelView(); $panel->setHeader('Receive Email'); $panel->appendChild($form); $panel->setWidth(AphrontPanelView::WIDTH_FORM); $nav = $this->buildSideNavView(); $nav->selectFilter('receive'); $nav->appendChild($panel); return $this->buildApplicationPage( $nav, array( 'title' => 'Receive Test', )); } } diff --git a/src/applications/metamta/controller/PhabricatorMetaMTASendGridReceiveController.php b/src/applications/metamta/controller/PhabricatorMetaMTASendGridReceiveController.php index 4b81a3c08b..fbd86a2871 100644 --- a/src/applications/metamta/controller/PhabricatorMetaMTASendGridReceiveController.php +++ b/src/applications/metamta/controller/PhabricatorMetaMTASendGridReceiveController.php @@ -1,66 +1,68 @@ getRequest(); $user = $request->getUser(); $raw_headers = $request->getStr('headers'); $raw_headers = explode("\n", rtrim($raw_headers)); $raw_dict = array(); foreach (array_filter($raw_headers) as $header) { list($name, $value) = explode(':', $header, 2); $raw_dict[$name] = ltrim($value); } $headers = array( 'to' => $request->getStr('to'), 'from' => $request->getStr('from'), 'subject' => $request->getStr('subject'), ) + $raw_dict; $received = new PhabricatorMetaMTAReceivedMail(); $received->setHeaders($headers); $received->setBodies(array( 'text' => $request->getStr('text'), 'html' => $request->getStr('from'), )); + $received->setMessageIDHash( + PhabricatorHash::digestForIndex($received->getMessageID())); $file_phids = array(); foreach ($_FILES as $file_raw) { try { $file = PhabricatorFile::newFromPHPUpload( $file_raw, array( 'authorPHID' => $user->getPHID(), )); $file_phids[] = $file->getPHID(); } catch (Exception $ex) { phlog($ex); } } $received->setAttachments($file_phids); $received->save(); $received->processReceivedMail(); $response = new AphrontWebpageResponse(); $response->setContent("Got it! Thanks, SendGrid!\n"); return $response; } } diff --git a/src/applications/metamta/replyhandler/PhabricatorMailReplyHandler.php b/src/applications/metamta/replyhandler/PhabricatorMailReplyHandler.php index 20d4436073..51784d7b96 100644 --- a/src/applications/metamta/replyhandler/PhabricatorMailReplyHandler.php +++ b/src/applications/metamta/replyhandler/PhabricatorMailReplyHandler.php @@ -1,316 +1,322 @@ validateMailReceiver($mail_receiver); $this->mailReceiver = $mail_receiver; return $this; } final public function getMailReceiver() { return $this->mailReceiver; } final public function setActor(PhabricatorUser $actor) { $this->actor = $actor; return $this; } final public function getActor() { return $this->actor; } final public function setExcludeMailRecipientPHIDs(array $exclude) { $this->excludePHIDs = $exclude; return $this; } final public function getExcludeMailRecipientPHIDs() { return $this->excludePHIDs; } abstract public function validateMailReceiver($mail_receiver); abstract public function getPrivateReplyHandlerEmailAddress( PhabricatorObjectHandle $handle); - abstract public function getReplyHandlerDomain(); + public function getReplyHandlerDomain() { + return PhabricatorEnv::getEnvConfig( + 'metamta.reply-handler-domain' + ); + } abstract public function getReplyHandlerInstructions(); abstract protected function receiveEmail( PhabricatorMetaMTAReceivedMail $mail); public function processEmail(PhabricatorMetaMTAReceivedMail $mail) { $error = $this->sanityCheckEmail($mail); if ($error) { if ($this->shouldSendErrorEmail($mail)) { $this->sendErrorEmail($error, $mail); } return null; } return $this->receiveEmail($mail); } private function sanityCheckEmail(PhabricatorMetaMTAReceivedMail $mail) { $body = $mail->getCleanTextBody(); $attachments = $mail->getAttachments(); if (empty($body) && empty($attachments)) { return 'Empty email body. Email should begin with an !action and / or '. 'text to comment. Inline replies and signatures are ignored.'; } return null; } /** * Only send an error email if the user is talking to just Phabricator. We * can assume if there is only one To address it is a Phabricator address * since this code is running and everything. */ private function shouldSendErrorEmail(PhabricatorMetaMTAReceivedMail $mail) { return (count($mail->getToAddresses()) == 1) && (count($mail->getCCAddresses()) == 0); } private function sendErrorEmail($error, PhabricatorMetaMTAReceivedMail $mail) { $template = new PhabricatorMetaMTAMail(); $template->setSubject('Exception: unable to process your mail request'); $template->setBody($this->buildErrorMailBody($error, $mail)); $template->setRelatedPHID($mail->getRelatedPHID()); $phid = $this->getActor()->getPHID(); $tos = array( $phid => PhabricatorObjectHandleData::loadOneHandle($phid) ); $mails = $this->multiplexMail($template, $tos, array()); foreach ($mails as $email) { $email->saveAndSend(); } return true; } private function buildErrorMailBody($error, PhabricatorMetaMTAReceivedMail $mail) { $original_body = $mail->getRawTextBody(); $main_body = <<You did not make any changes to the document.
'); $dialog->addCancelButton($request->getRequestURI()); return id(new AphrontDialogResponse())->setDialog($dialog); } } else if (!strlen($request->getStr('content'))) { // We trigger this only for new pages. For existing pages, deleting // all the content counts as deleting the page. $dialog = new AphrontDialogView(); $dialog->setUser($user); $dialog->setTitle('Empty Page'); $dialog->appendChild( 'You can not create an empty document.
'); $dialog->addCancelButton($request->getRequestURI()); return id(new AphrontDialogResponse())->setDialog($dialog); } if (!count($errors)) { $editor = id(PhrictionDocumentEditor::newForSlug($document->getSlug())) ->setActor($user) ->setTitle($title) ->setContent($request->getStr('content')) ->setDescription($notes); $editor->save(); if ($draft) { $draft->delete(); } $uri = PhrictionDocument::getSlugURI($document->getSlug()); return id(new AphrontRedirectResponse())->setURI($uri); } } $error_view = null; if ($errors) { $error_view = id(new AphrontErrorView()) ->setTitle('Form Errors') ->setErrors($errors); } - $delete_button = null; if ($document->getID()) { $panel_header = 'Edit Phriction Document'; $submit_button = 'Save Changes'; - if ($document->getStatus() != PhrictionDocumentStatus::STATUS_DELETED) { - $delete_button = phutil_tag( - 'a', - array( - 'href' => '/phriction/delete/'.$document->getID().'/', - 'class' => 'grey button', - ), - 'Delete Document'); - } } else { $panel_header = 'Create New Phriction Document'; $submit_button = 'Create Document'; } $uri = $document->getSlug(); $uri = PhrictionDocument::getSlugURI($uri); $uri = PhabricatorEnv::getProductionURI($uri); $cancel_uri = PhrictionDocument::getSlugURI($document->getSlug()); if ($draft && strlen($draft->getDraft()) && ($draft->getDraft() != $content->getContent())) { $content_text = $draft->getDraft(); $discard = phutil_tag( 'a', array( 'href' => $request->getRequestURI()->alter('nodraft', true), ), 'discard this draft'); $draft_note = new AphrontErrorView(); $draft_note->setSeverity(AphrontErrorView::SEVERITY_NOTICE); $draft_note->setTitle('Recovered Draft'); $draft_note->appendChild( 'Showing a saved draft of your edits, you can '.$discard.'.
'); } else { $content_text = $content->getContent(); $draft_note = null; } $form = id(new AphrontFormView()) ->setUser($user) ->setWorkflow(true) ->setAction($request->getRequestURI()->getPath()) ->addHiddenInput('slug', $document->getSlug()) ->addHiddenInput('nodraft', $request->getBool('nodraft')) ->appendChild( id(new AphrontFormTextControl()) ->setLabel('Title') ->setValue($content->getTitle()) ->setError($e_title) ->setName('title')) ->appendChild( id(new AphrontFormStaticControl()) ->setLabel('URI') ->setValue($uri)) ->appendChild( id(new PhabricatorRemarkupControl()) ->setLabel('Content') ->setValue($content_text) ->setHeight(AphrontFormTextAreaControl::HEIGHT_VERY_TALL) ->setName('content') ->setID('document-textarea') ->setUser($user)) ->appendChild( id(new AphrontFormTextControl()) ->setLabel('Edit Notes') ->setValue($notes) ->setError(null) ->setName('description')) ->appendChild( id(new AphrontFormSubmitControl()) ->addCancelButton($cancel_uri) ->setValue($submit_button)); $panel = id(new AphrontPanelView()) ->setWidth(AphrontPanelView::WIDTH_WIDE) ->setHeader($panel_header) ->appendChild($form); - if ($delete_button) { - $panel->addButton($delete_button); - } - $preview_panel = 'Your changes have been saved.
'); $notice = $notice->render(); } } else { $notice = new AphrontErrorView(); $notice->setTitle('Form Errors'); $notice->setErrors($errors); $notice = $notice->render(); } $timezone_ids = DateTimeZone::listIdentifiers(); - $timezone_id_map = array_combine($timezone_ids, $timezone_ids); + $timezone_id_map = array_fuse($timezone_ids); $form = new AphrontFormView(); $form ->setUser($user) ->appendChild( id(new AphrontFormStaticControl()) ->setLabel('Username') ->setValue($user->getUsername())) ->appendChild( id(new AphrontFormTextControl()) ->setLabel('Real Name') ->setName('realname') ->setError($e_realname) ->setValue($user->getRealName()) ->setDisabled(!$editable)) ->appendChild( id(new AphrontFormSelectControl()) ->setLabel('Timezone') ->setName('timezone') ->setOptions($timezone_id_map) ->setValue($user->getTimezoneIdentifier())) ->appendChild( id(new AphrontFormSubmitControl()) ->setValue('Save')); $panel = new AphrontPanelView(); $panel->setHeader('Account Settings'); $panel->appendChild($form); $panel->setNoBackground(); return array( $notice, $panel, ); } } diff --git a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php index ec717468d3..7a3d07fd77 100644 --- a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php +++ b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php @@ -1,892 +1,906 @@ continueOnNoEffect = $continue; return $this; } public function getContinueOnNoEffect() { return $this->continueOnNoEffect; } + /** + * Not strictly necessary, but reply handlers ideally set this value to + * make email threading work better. + */ + public function setParentMessageID($parent_message_id) { + $this->parentMessageID = $parent_message_id; + return $this; + } + public function getParentMessageID() { + return $this->parentMessageID; + } + protected function getIsNewObject() { return $this->isNewObject; } protected function getMentionedPHIDs() { return $this->mentionedPHIDs; } public function setIsPreview($is_preview) { $this->isPreview = $is_preview; return $this; } public function getIsPreview() { return $this->isPreview; } public function getTransactionTypes() { $types = array(); if ($this->object instanceof PhabricatorSubscribableInterface) { $types[] = PhabricatorTransactions::TYPE_SUBSCRIBERS; } return $types; } private function adjustTransactionValues( PhabricatorLiskDAO $object, PhabricatorApplicationTransaction $xaction) { $old = $this->getTransactionOldValue($object, $xaction); $xaction->setOldValue($old); $new = $this->getTransactionNewValue($object, $xaction); $xaction->setNewValue($new); } private function getTransactionOldValue( PhabricatorLiskDAO $object, PhabricatorApplicationTransaction $xaction) { switch ($xaction->getTransactionType()) { case PhabricatorTransactions::TYPE_SUBSCRIBERS: if ($object->getPHID()) { $old_phids = PhabricatorSubscribersQuery::loadSubscribersForPHID( $object->getPHID()); } else { $old_phids = array(); } return array_values($old_phids); case PhabricatorTransactions::TYPE_VIEW_POLICY: return $object->getViewPolicy(); case PhabricatorTransactions::TYPE_EDIT_POLICY: return $object->getEditPolicy(); default: return $this->getCustomTransactionOldValue($object, $xaction); } } private function getTransactionNewValue( PhabricatorLiskDAO $object, PhabricatorApplicationTransaction $xaction) { switch ($xaction->getTransactionType()) { case PhabricatorTransactions::TYPE_SUBSCRIBERS: return $this->getPHIDTransactionNewValue($xaction); case PhabricatorTransactions::TYPE_VIEW_POLICY: case PhabricatorTransactions::TYPE_EDIT_POLICY: return $xaction->getNewValue(); default: return $this->getCustomTransactionNewValue($object, $xaction); } } protected function getCustomTransactionOldValue( PhabricatorLiskDAO $object, PhabricatorApplicationTransaction $xaction) { throw new Exception("Capability not supported!"); } protected function getCustomTransactionNewValue( PhabricatorLiskDAO $object, PhabricatorApplicationTransaction $xaction) { throw new Exception("Capability not supported!"); } protected function transactionHasEffect( PhabricatorLiskDAO $object, PhabricatorApplicationTransaction $xaction) { switch ($xaction->getTransactionType()) { case PhabricatorTransactions::TYPE_COMMENT: return $xaction->hasComment(); } return ($xaction->getOldValue() !== $xaction->getNewValue()); } private function applyInternalEffects( PhabricatorLiskDAO $object, PhabricatorApplicationTransaction $xaction) { switch ($xaction->getTransactionType()) { case PhabricatorTransactions::TYPE_COMMENT: break; case PhabricatorTransactions::TYPE_VIEW_POLICY: $object->setViewPolicy($xaction->getNewValue()); break; case PhabricatorTransactions::TYPE_EDIT_POLICY: $object->setEditPolicy($xaction->getNewValue()); break; default: return $this->applyCustomInternalTransaction($object, $xaction); } } private function applyExternalEffects( PhabricatorLiskDAO $object, PhabricatorApplicationTransaction $xaction) { switch ($xaction->getTransactionType()) { case PhabricatorTransactions::TYPE_COMMENT: break; case PhabricatorTransactions::TYPE_SUBSCRIBERS: $subeditor = id(new PhabricatorSubscriptionsEditor()) ->setObject($object) ->setActor($this->requireActor()) ->subscribeExplicit($xaction->getNewValue()) ->save(); break; default: return $this->applyCustomExternalTransaction($object, $xaction); } } protected function applyCustomInternalTransaction( PhabricatorLiskDAO $object, PhabricatorApplicationTransaction $xaction) { throw new Exception("Capability not supported!"); } protected function applyCustomExternalTransaction( PhabricatorLiskDAO $object, PhabricatorApplicationTransaction $xaction) { throw new Exception("Capability not supported!"); } public function setContentSource(PhabricatorContentSource $content_source) { $this->contentSource = $content_source; return $this; } public function getContentSource() { return $this->contentSource; } final public function applyTransactions( PhabricatorLiskDAO $object, array $xactions) { $this->object = $object; $this->xactions = $xactions; $this->isNewObject = ($object->getPHID() === null); $this->validateEditParameters($object, $xactions); $actor = $this->requireActor(); $mention_xaction = $this->buildMentionTransaction($object, $xactions); if ($mention_xaction) { $xactions[] = $mention_xaction; } $xactions = $this->combineTransactions($xactions); foreach ($xactions as $xaction) { // TODO: This needs to be more sophisticated once we have meta-policies. $xaction->setViewPolicy(PhabricatorPolicies::POLICY_PUBLIC); $xaction->setEditPolicy($actor->getPHID()); $xaction->setAuthorPHID($actor->getPHID()); $xaction->setContentSource($this->getContentSource()); } foreach ($xactions as $xaction) { $this->adjustTransactionValues($object, $xaction); } $xactions = $this->filterTransactions($object, $xactions); if (!$xactions) { return array(); } $xactions = $this->sortTransactions($xactions); if ($this->getIsPreview()) { $this->loadHandles($xactions); return $xactions; } $comment_editor = id(new PhabricatorApplicationTransactionCommentEditor()) ->setActor($actor) ->setContentSource($this->getContentSource()); $object->openTransaction(); foreach ($xactions as $xaction) { $this->applyInternalEffects($object, $xaction); } $object->save(); foreach ($xactions as $xaction) { $xaction->setObjectPHID($object->getPHID()); if ($xaction->getComment()) { $xaction->setPHID($xaction->generatePHID()); $comment_editor->applyEdit($xaction, $xaction->getComment()); } else { $xaction->save(); } } foreach ($xactions as $xaction) { $this->applyExternalEffects($object, $xaction); } $object->saveTransaction(); $this->loadHandles($xactions); $mail = null; if ($this->supportsMail()) { $mail = $this->sendMail($object, $xactions); } if ($this->supportsSearch()) { id(new PhabricatorSearchIndexer()) ->indexDocumentByPHID($object->getPHID()); } if ($this->supportsFeed()) { $mailed = array(); if ($mail) { $mailed = $mail->buildRecipientList(); } $this->publishFeedStory( $object, $xactions, $mailed); } $this->didApplyTransactions($xactions); return $xactions; } protected function didApplyTransactions(array $xactions) { // Hook for subclasses. return; } private function loadHandles(array $xactions) { $phids = array(); foreach ($xactions as $key => $xaction) { $phids[$key] = $xaction->getRequiredHandlePHIDs(); } $handles = array(); $merged = array_mergev($phids); if ($merged) { $handles = id(new PhabricatorObjectHandleData($merged)) ->setViewer($this->requireActor()) ->loadHandles(); } foreach ($xactions as $key => $xaction) { $xaction->setHandles(array_select_keys($handles, $phids[$key])); } } private function validateEditParameters( PhabricatorLiskDAO $object, array $xactions) { if (!$this->getContentSource()) { throw new Exception( "Call setContentSource() before applyTransactions()!"); } // Do a bunch of sanity checks that the incoming transactions are fresh. // They should be unsaved and have only "transactionType" and "newValue" // set. $types = array_fill_keys($this->getTransactionTypes(), true); assert_instances_of($xactions, 'PhabricatorApplicationTransaction'); foreach ($xactions as $xaction) { if ($xaction->getPHID() || $xaction->getID()) { throw new Exception( "You can not apply transactions which already have IDs/PHIDs!"); } if ($xaction->getObjectPHID()) { throw new Exception( "You can not apply transactions which already have objectPHIDs!"); } if ($xaction->getAuthorPHID()) { throw new Exception( "You can not apply transactions which already have authorPHIDs!"); } if ($xaction->getCommentPHID()) { throw new Exception( "You can not apply transactions which already have commentPHIDs!"); } if ($xaction->getCommentVersion() !== 0) { throw new Exception( "You can not apply transactions which already have commentVersions!"); } if ($xaction->getOldValue() !== null) { throw new Exception( "You can not apply transactions which already have oldValue!"); } $type = $xaction->getTransactionType(); if (empty($types[$type])) { throw new Exception("Transaction has unknown type '{$type}'."); } } // The actor must have permission to view and edit the object. $actor = $this->requireActor(); PhabricatorPolicyFilter::requireCapability( $actor, $xaction, PhabricatorPolicyCapability::CAN_VIEW); PhabricatorPolicyFilter::requireCapability( $actor, $xaction, PhabricatorPolicyCapability::CAN_EDIT); } private function buildMentionTransaction( PhabricatorLiskDAO $object, array $xactions) { if (!($object instanceof PhabricatorSubscribableInterface)) { return null; } $texts = array(); foreach ($xactions as $xaction) { $texts[] = $this->getMentionableTextsFromTransaction($xaction); } $texts = array_mergev($texts); $phids = PhabricatorMarkupEngine::extractPHIDsFromMentions($texts); $this->mentionedPHIDs = $phids; if (!$phids) { return null; } if ($object->getPHID()) { // Don't try to subscribe already-subscribed mentions: we want to generate // a dialog about an action having no effect if the user explicitly adds // existing CCs, but not if they merely mention existing subscribers. $current = PhabricatorSubscribersQuery::loadSubscribersForPHID( $object->getPHID()); $phids = array_diff($phids, $current); } if (!$phids) { return null; } $xaction = newv(get_class(head($xactions)), array()); $xaction->setTransactionType(PhabricatorTransactions::TYPE_SUBSCRIBERS); $xaction->setNewValue(array('+' => $phids)); return $xaction; } protected function getMentionableTextsFromTransaction( PhabricatorApplicationTransaction $transaction) { $texts = array(); if ($transaction->getComment()) { $texts[] = $transaction->getComment()->getContent(); } return $texts; } protected function mergeTransactions( PhabricatorApplicationTransaction $u, PhabricatorApplicationTransaction $v) { $type = $u->getTransactionType(); switch ($type) { case PhabricatorTransactions::TYPE_SUBSCRIBERS: return $this->mergePHIDTransactions($u, $v); } // By default, do not merge the transactions. return null; } /** * Attempt to combine similar transactions into a smaller number of total * transactions. For example, two transactions which edit the title of an * object can be merged into a single edit. */ private function combineTransactions(array $xactions) { $stray_comments = array(); $result = array(); $types = array(); foreach ($xactions as $key => $xaction) { $type = $xaction->getTransactionType(); if (isset($types[$type])) { foreach ($types[$type] as $other_key) { $merged = $this->mergeTransactions($result[$other_key], $xaction); if ($merged) { $result[$other_key] = $merged; if ($xaction->getComment() && ($xaction->getComment() !== $merged->getComment())) { $stray_comments[] = $xaction->getComment(); } if ($result[$other_key]->getComment() && ($result[$other_key]->getComment() !== $merged->getComment())) { $stray_comments[] = $result[$other_key]->getComment(); } // Move on to the next transaction. continue 2; } } } $result[$key] = $xaction; $types[$type][] = $key; } // If we merged any comments away, restore them. foreach ($stray_comments as $comment) { $xaction = newv(get_class(head($result)), array()); $xaction->setTransactionType(PhabricatorTransactions::TYPE_COMMENT); $xaction->setComment($comment); $result[] = $xaction; } return array_values($result); } protected function mergePHIDTransactions( PhabricatorApplicationTransaction $u, PhabricatorApplicationTransaction $v) { $result = $u->getNewValue(); foreach ($v->getNewValue() as $key => $value) { $result[$key] = array_merge($value, idx($result, $key, array())); } $u->setNewValue($result); return $u; } protected function getPHIDTransactionNewValue( PhabricatorApplicationTransaction $xaction) { - $old = array_combine($xaction->getOldValue(), $xaction->getOldValue()); + $old = array_fuse($xaction->getOldValue()); $new = $xaction->getNewValue(); $new_add = idx($new, '+', array()); unset($new['+']); $new_rem = idx($new, '-', array()); unset($new['-']); $new_set = idx($new, '=', null); if ($new_set !== null) { - $new_set = array_combine($new_set, $new_set); + $new_set = array_fuse($new_set); } unset($new['=']); if ($new) { throw new Exception( "Invalid 'new' value for PHID transaction. Value should contain only ". "keys '+' (add PHIDs), '-' (remove PHIDs) and '=' (set PHIDS)."); } $result = array(); foreach ($old as $phid) { if ($new_set !== null && empty($new_set[$phid])) { continue; } $result[$phid] = $phid; } if ($new_set !== null) { foreach ($new_set as $phid) { $result[$phid] = $phid; } } foreach ($new_add as $phid) { $result[$phid] = $phid; } foreach ($new_rem as $phid) { unset($result[$phid]); } return array_values($result); } protected function sortTransactions(array $xactions) { $head = array(); $tail = array(); // Move bare comments to the end, so the actions preceed them. foreach ($xactions as $xaction) { $type = $xaction->getTransactionType(); if ($type == PhabricatorTransactions::TYPE_COMMENT) { $tail[] = $xaction; } else { $head[] = $xaction; } } return array_values(array_merge($head, $tail)); } protected function filterTransactions( PhabricatorLiskDAO $object, array $xactions) { $type_comment = PhabricatorTransactions::TYPE_COMMENT; $no_effect = array(); $has_comment = false; $any_effect = false; foreach ($xactions as $key => $xaction) { if ($this->transactionHasEffect($object, $xaction)) { if ($xaction->getTransactionType() != $type_comment) { $any_effect = true; } } else { $no_effect[$key] = $xaction; } if ($xaction->hasComment()) { $has_comment = true; } } if (!$no_effect) { return $xactions; } if (!$this->getContinueOnNoEffect() && !$this->getIsPreview()) { throw new PhabricatorApplicationTransactionNoEffectException( $no_effect, $any_effect, $has_comment); } if (!$any_effect && !$has_comment) { // If we only have empty comment transactions, just drop them all. return array(); } foreach ($no_effect as $key => $xaction) { if ($xaction->getComment()) { $xaction->setTransactionType($type_comment); $xaction->setOldValue(null); $xaction->setNewValue(null); } else { unset($xactions[$key]); } } return $xactions; } /* -( Sending Mail )------------------------------------------------------- */ /** * @task mail */ protected function supportsMail() { return false; } /** * @task mail */ protected function sendMail( PhabricatorLiskDAO $object, array $xactions) { $email_to = $this->getMailTo($object); $email_cc = $this->getMailCC($object); $phids = array_merge($email_to, $email_cc); $handles = id(new PhabricatorObjectHandleData($phids)) ->setViewer($this->requireActor()) ->loadHandles(); $template = $this->buildMailTemplate($object); $body = $this->buildMailBody($object, $xactions); $mail_tags = $this->getMailTags($object, $xactions); $action = $this->getStrongestAction($object, $xactions)->getActionName(); $template ->setFrom($this->requireActor()->getPHID()) ->setSubjectPrefix($this->getMailSubjectPrefix()) ->setVarySubjectPrefix('['.$action.']') ->setThreadID($object->getPHID(), $this->getIsNewObject()) ->setRelatedPHID($object->getPHID()) ->setExcludeMailRecipientPHIDs($this->getExcludeMailRecipientPHIDs()) ->setMailTags($mail_tags) ->setIsBulk(true) ->setBody($body->render()); - // TODO - // ->setParentMessageID(...) + if ($this->getParentMessageID()) { + $template->setParentMessageID($this->getParentMessageID()); + } $mails = $this ->buildReplyHandler($object) ->multiplexMail( $template, array_select_keys($handles, $email_to), array_select_keys($handles, $email_cc)); foreach ($mails as $mail) { $mail->saveAndSend(); } $template->addTos($email_to); $template->addCCs($email_cc); return $template; } /** * @task mail */ protected function getStrongestAction( PhabricatorLiskDAO $object, array $xactions) { return last(msort($xactions, 'getActionStrength')); } /** * @task mail */ protected function buildReplyHandler(PhabricatorLiskDAO $object) { throw new Exception("Capability not supported."); } /** * @task mail */ protected function getMailSubjectPrefix() { throw new Exception("Capability not supported."); } /** * @task mail */ protected function getMailTags( PhabricatorLiskDAO $object, array $xactions) { $tags = array(); foreach ($xactions as $xaction) { $tags[] = $xaction->getMailTags(); } return array_mergev($tags); } /** * @task mail */ protected function buildMailTemplate(PhabricatorLiskDAO $object) { throw new Exception("Capability not supported."); } /** * @task mail */ protected function getMailTo(PhabricatorLiskDAO $object) { throw new Exception("Capability not supported."); } /** * @task mail */ protected function getMailCC(PhabricatorLiskDAO $object) { if ($object instanceof PhabricatorSubscribableInterface) { $phid = $object->getPHID(); return PhabricatorSubscribersQuery::loadSubscribersForPHID($phid); } throw new Exception("Capability not supported."); } /** * @task mail */ protected function buildMailBody( PhabricatorLiskDAO $object, array $xactions) { $headers = array(); $comments = array(); foreach ($xactions as $xaction) { $headers[] = id(clone $xaction)->setRenderingTarget('text')->getTitle(); $comment = $xaction->getComment(); if ($comment && strlen($comment->getContent())) { $comments[] = $comment->getContent(); } } $body = new PhabricatorMetaMTAMailBody(); $body->addRawSection(implode("\n", $headers)); foreach ($comments as $comment) { $body->addRawSection($comment); } return $body; } /* -( Publishing Feed Stories )-------------------------------------------- */ /** * @task feed */ protected function supportsFeed() { return false; } /** * @task feed */ protected function getFeedStoryType() { return 'PhabricatorApplicationTransactionFeedStory'; } /** * @task feed */ protected function getFeedRelatedPHIDs( PhabricatorLiskDAO $object, array $xactions) { return array( $object->getPHID(), $this->requireActor()->getPHID(), ); } /** * @task feed */ protected function getFeedNotifyPHIDs( PhabricatorLiskDAO $object, array $xactions) { return array_merge( $this->getMailTo($object), $this->getMailCC($object)); } /** * @task feed */ protected function getFeedStoryData( PhabricatorLiskDAO $object, array $xactions) { $xactions = msort($xactions, 'getActionStrength'); $xactions = array_reverse($xactions); return array( 'objectPHID' => $object->getPHID(), 'transactionPHIDs' => mpull($xactions, 'getPHID'), ); } /** * @task feed */ protected function publishFeedStory( PhabricatorLiskDAO $object, array $xactions, array $mailed_phids) { $related_phids = $this->getFeedRelatedPHIDs($object, $xactions); $subscribed_phids = $this->getFeedNotifyPHIDs($object, $xactions); $story_type = $this->getFeedStoryType(); $story_data = $this->getFeedStoryData($object, $xactions); id(new PhabricatorFeedStoryPublisher()) ->setStoryType($story_type) ->setStoryData($story_data) ->setStoryTime(time()) ->setStoryAuthorPHID($this->requireActor()->getPHID()) ->setRelatedPHIDs($related_phids) ->setPrimaryObjectPHID($object->getPHID()) ->setSubscribedPHIDs($subscribed_phids) ->setMailRecipientPHIDs($mailed_phids) ->publish(); } /* -( Search Index )------------------------------------------------------- */ /** * @task search */ protected function supportsSearch() { return false; } } diff --git a/src/docs/developer/database.diviner b/src/docs/developer/database.diviner index 027bca2db5..59a49d852e 100644 --- a/src/docs/developer/database.diviner +++ b/src/docs/developer/database.diviner @@ -1,170 +1,170 @@ @title Database Schema @group developer This document describes key components of the database schema and should answer questions like how to store new types of data. = Database System = Phabricator uses MySQL with InnoDB engine. The only exception is the `search_documentfield` table which uses MyISAM because MySQL doesn't support fulltext search in InnoDB. Let us know if you need to use other database system: @{article:Give Feedback! Get Support!}. = PHP Drivers = Phabricator supports [[ http://www.php.net/book.mysql | MySQL ]] and [[ http://www.php.net/book.mysqli | MySQLi ]] PHP extensions. Most installations use MySQL but MySQLi should work equally well. = Databases = Each Phabricator application has its own database. The names are prefixed by `phabricator_`. This design has two advantages: * Each database is easier to comprehend and to maintain. * We don't do cross-database joins so each database can live on its own machine which is useful for load-balancing. = Connections = Phabricator specifies if it will use any opened connection just for reading or also for writing. This allows opening write connections to master and read connections to slave in master/slave replication. It is useful for load-balancing. = Tables = Each table name is prefixed by its application. For example, Differential revisions are stored in database `phabricator_differential` and table `differential_revision`. This duplicity allows easy recognition of the table in DarkConsole (see @{article:Using DarkConsole}) and other places. The exception is tables which share the same schema over different databases such as `edge`. We use lower-case table names with words separated by underscores. The reason is that MySQL can be configured (with `lower_case_table_names`) to lower-case the table names anyway. = Column Names = Phabricator uses camelCase names for columns. The main advantage is that they directly map to properties in PHP classes. Don't use MySQL reserved words (such as `order`) for column names. = Data Types = Phabricator uses `int unsigned` columns for storing dates instead of `date` or `datetime`. We don't need to care about time-zones in both MySQL and PHP because of it. The other reason is that PHP internally uses numbers for storing dates. Phabricator uses UTF-8 encoding for storing all text data. We use `utf8_general_ci` collation for free-text and `utf8_bin` for identifiers. We don't use the `enum` data type because each change to the list of possible values requires altering the table (which is slow with big tables). We use numbers (or short strings in some cases) mapped to PHP constants instead. = JSON = Some data don't require structured access - you don't need to filter or order by them. We store these data as text fields in JSON format. This approach has several advantages: * If we decide to add another unstructured field then we don't need to alter the table (which is slow for big tables in MySQL). * Table structure is not cluttered by fields which could be unused most of the time. An example of such usage can be found in column `differential_diffproperty.data`. = Primary Keys = Most tables have auto-increment column named `id`. However creating such column is not required for tables which are not usually directly referenced (such as tables expressing M:N relations). Example of such table is `differential_relationship`. = Indexes = Create all indexes necessary for fast query execution in most cases. Don't create indexes which are not used. You can analyze queries @{article:Using DarkConsole}. = Foreign Keys = We don't use InnoDB's foreign keys because our application is so great that no inconsistencies can arise. It will just slow us down. = PHIDs = Each globally referencable object in Phabricator has its associated PHID (Phabricator ID) which serves as a global identifier. We use PHIDs for referencing data in different databases. We use both autoincrementing IDs and global PHIDs because each is useful in different contexts. Autoincrementing IDs are chronologically ordered and allow us to construct short, human-readable object names (like D2258) and URIs. Global PHIDs allow us to represent relationships between different types of objects in a homogenous way. For example, the concept of "subscribers" is more powerfully done with PHIDs because we could theoretically have users, projects, teams, and more all as "subscribers" of other objects. Using an ID column we would need to add a "type" column to avoid ID collision; using PHIDs does not require this additional column. = Transactions = Transactional code should be written using transactions. Example of such code is inserting multiple records where one doesn't make sense without the other or selecting data later used for update. See chapter in @{class:LiskDAO}. = Advanced Features = We don't use MySQL advanced features such as triggers, stored procedures or events because we like expressing the application logic in PHP more than in SQL. Some of these features (especially triggers) can also cause big confusion. Avoiding these advanced features is also good for supporting other database systems (which we don't support anyway). = Schema Denormalization = Phabricator uses schema denormalization for performance reasons sparingly. Try to avoid it if possible. = Changing the Schema = There are three simple steps to update the schema: # Create a `.sql` file in `resources/sql/patches/`. This file should: - Contain the approprate MySQL commands to update the schema. - Use `${NAMESPACE}` rather than `phabricator` for database names. - Use `COLLATE utf8_bin` for any columns that are to be used as identifiers, such as PHID columns. Otherwise, use `COLLATE utf8_general_ci`. - Name all indexes so it is possible to delete them later. # Edit `src/infrastructure/storage/patch/PhabricatorBuiltinPatchList.php` and add your patch to @{method@phabricator:PhabricatorBuiltinPatchList::getPatches}. -# Run `bin/storage/upgrade`. +# Run `bin/storage upgrade`. It is also possible to create more complex patches in PHP for data migration (due to schema changes or otherwise.) However, the schema changes themselves should be done in separate `.sql` files. Order can be guaranteed by editing `src/infrastructure/storage/patch/PhabricatorBuiltinPatchList.php` appropriately. See the [[https://secure.phabricator.com/rPb39175342dc5bee0c2246b05fa277e76a7e96ed3 | commit adding policy storage for Paste ]] for a reasonable example of the code changes. = See Also = * @{class:LiskDAO} * @{class:PhabricatorPHID} diff --git a/src/docs/userguide/advanced_configuration.diviner b/src/docs/userguide/advanced_configuration.diviner index 1a40c064d8..e5792ac880 100644 --- a/src/docs/userguide/advanced_configuration.diviner +++ b/src/docs/userguide/advanced_configuration.diviner @@ -1,114 +1,116 @@ @title Configuration User Guide: Advanced Configuration @group userguide Configuring Phabricator for multiple environments. = Overview = Phabricator reads configuration from multiple sources. This document explains the configuration stack and how to set up advanced configuration sources, which may be useful for deployments with multiple environments (e.g., development and production). This is a complicated topic for advanced users. You do not need to understand this topic to install Phabricator. = Configuration Sources = Phabricator supports the following configuration sources, from highest priority to lowest priority: - **Database**: Values are stored in the database and edited from the web UI by administrators. They have the highest priority and override other settings. - **Local**: Values are stored in `conf/local/config.json` and edited by running `bin/config`. - **Config Files**: Values are stored in a config file in `conf/`. The file to use is selected by writing to `conf/local/ENVIRONMENT`, or setting the PHABRICATOR_ENV configuration variable. See below for more information. - **Defaults**: Defaults hard-coded in the Phabricator source, which can not be edited. They have the lowest priority, and all other settings override them. Normally, you install and configure Phabricator by writing enough configuration into the local config to get access to the database configuration (e.g., the MySQL username, password, and hostname), then use the web interface to further configure Phabricator. = Configuration Files = Configuration files provide an alternative to database configuration, and may be appropriate if you want to deploy in multiple environments or create dynamic configuration. Configuration files are more complicated than database configuration, which is why they are not used by default. == Creating a Configuration File == To create a configuration file, first choose a name for the config (like "devserver" or "live"). For the purposes of this section, we'll assume you chose `exampleconfig`. Replace "exampleconfig" with whatever you actually chose in the examples below. First, write an `exampleconfig.conf.php` file here (rename it according to the name you chose): phabricator/conf/custom/exampleconfig.conf.php Its contents should look like this: 'examplevalue', ); For example, to specify MySQL credentials in your config file, you might create a config like this: 'localhost', 'mysql.user' => 'root', 'mysql.pass' => 'hunter2trustno1', ); == Selecting a Configuration File == To select a configuration file, write the name of the file (relative to `phabricator/conf/`) to `phabricator/conf/local/ENVIRONMENT`. For example, to select `phabricator/conf/custom/exampleconfig.conf.php`, you would write "custom/exampleconfig" to `phabrictor/conf/local/ENVIRONMENT`: phabricator/ $ echo custom/exampleconfig > conf/local/ENVIRONMENT phabricator/ $ cat conf/local/ENVIRONMENT custom/exampleconfig phabricator/ $ You can also set the environmental variable `PHABRICATOR_ENV`. This is more involved but may be easier in some deployment environments. Note that this needs to be set in your webserver environment, and also in your shell whenever you run a script: - # Shell - export PHABRICATOR_ENV=custom/exampleconfig +``` +# Shell +export PHABRICATOR_ENV=custom/exampleconfig - # Apache - SetEnv PHABRICATOR_ENV custom/exampleconfig +# Apache +SetEnv PHABRICATOR_ENV custom/exampleconfig - # nginx - fastcgi_param PHABRICATOR_ENV "custom/exampleconfig"; +# nginx +fastcgi_param PHABRICATOR_ENV "custom/exampleconfig"; - # lighttpd - setenv.add-environment = ( - "PHABRICATOR_ENV" => "custom/exampleconfig", - ) +# lighttpd +setenv.add-environment = ( + "PHABRICATOR_ENV" => "custom/exampleconfig", +) +``` After creating and selecting a configuration file, restart your webserver. Any configuration you set should take effect immediately, and your file should be visible in the Config application when examining configuration. = Next Steps = Return to the @{article:Configuration Guide}. diff --git a/src/infrastructure/celerity/CeleritySpriteGenerator.php b/src/infrastructure/celerity/CeleritySpriteGenerator.php index deaffac9c7..c6b2ac23d0 100644 --- a/src/infrastructure/celerity/CeleritySpriteGenerator.php +++ b/src/infrastructure/celerity/CeleritySpriteGenerator.php @@ -1,444 +1,453 @@ getDirectoryList('icons_1x'); $colors = array( '', 'grey', 'white', ); $scales = array( '1x' => 1, '2x' => 2, ); $template = id(new PhutilSprite()) ->setSourceSize(14, 14); $sprites = array(); foreach ($colors as $color) { foreach ($icons as $icon) { $prefix = 'icons_'; if (strlen($color)) { $prefix .= $color.'_'; } $suffix = ''; if (strlen($color)) { $suffix = '-'.$color; } $sprite = id(clone $template) ->setName('action-'.$icon.$suffix); $tcss = array(); $tcss[] = '.action-'.$icon.$suffix; if ($color == 'white') { $tcss[] = '.device-desktop .phabricator-action-view:hover '. '.action-'.$icon; if ($icon == 'new') { // Hover state for the "+" icons on homepage tiles. $tcss[] = '.phabricator-application-launch-create:hover '. '.phabricator-application-create-icon.action-new-grey'; } } $sprite->setTargetCSS(implode(', ', $tcss)); foreach ($scales as $scale_key => $scale) { $path = $this->getPath($prefix.$scale_key.'/'.$icon.'.png'); $sprite->setSourceFile($path, $scale); } $sprites[] = $sprite; } } $remarkup_icons = $this->getDirectoryList('remarkup_1x'); foreach ($remarkup_icons as $icon) { $prefix = 'remarkup_'; // Strip 'text_' from these file names. $class_name = substr($icon, 5); $sprite = id(clone $template) ->setName('remarkup-assist-'.$icon) ->setTargetCSS('.remarkup-assist-'.$class_name); foreach ($scales as $scale_key => $scale) { $path = $this->getPath($prefix.$scale_key.'/'.$icon.'.png'); $sprite->setSourceFile($path, $scale); } $sprites[] = $sprite; } $sheet = $this->buildSheet('icon', true); $sheet->setScales($scales); foreach ($sprites as $sprite) { $sheet->addSprite($sprite); } return $sheet; } public function buildMenuSheet() { $sprites = array(); $sources = array( - 'round_bubble' => array( - 'x' => 26, - 'y' => 26, - 'css' => '.phabricator-main-menu-alert-bubble' - ), - 'bubble' => array( - 'x' => 46, - 'y' => 26, - 'css' => '.phabricator-main-menu-alert-bubble.alert-unread' - ), 'seen_read_all' => array( 'x' => 14, 'y' => 14, 'css' => '.alert-notifications .phabricator-main-menu-alert-icon', ), 'seen_have_unread' => array( 'x' => 14, 'y' => 14, 'css' => '.alert-notifications:hover .phabricator-main-menu-alert-icon', ), 'unseen_any' => array( 'x' => 14, 'y' => 14, 'css' => '.alert-notifications.alert-unread .phabricator-main-menu-alert-icon', ), 'arrow-right' => array( 'x' => 9, 'y' => 31, 'css' => '.phabricator-crumb-divider', ), 'eye' => array( 'x' => 24, 'y' => 20, 'css' => '.menu-icon-eye', ), 'app' => array( 'x' => 24, 'y' => 20, 'css' => '.menu-icon-app', ), 'logo' => array( 'x' => 139, 'y' => 25, 'css' => '.phabricator-main-menu-logo-image', ), + 'conf-off' => array( + 'x' => 14, + 'y' => 14, + 'css' => + '.alert-notifications .phabricator-main-menu-message-icon', + ), + 'conf-hover' => array( + 'x' => 14, + 'y' => 14, + 'css' => + '.alert-notifications:hover .phabricator-main-menu-message-icon', + ), + 'conf-unseen' => array( + 'x' => 14, + 'y' => 14, + 'css' => + '.alert-notifications.message-unread '. + '.phabricator-main-menu-message-icon', + ), ); $scales = array( '1x' => 1, '2x' => 2, ); $template = new PhutilSprite(); foreach ($sources as $name => $spec) { $sprite = id(clone $template) ->setName($name) ->setSourceSize($spec['x'], $spec['y']) ->setTargetCSS($spec['css']); foreach ($scales as $scale_name => $scale) { $path = 'menu_'.$scale_name.'/'.$name.'.png'; $path = $this->getPath($path); $sprite->setSourceFile($path, $scale); } $sprites[] = $sprite; } $sheet = $this->buildSheet('menu', true); $sheet->setScales($scales); foreach ($sprites as $sprite) { $sheet->addSprite($sprite); } return $sheet; } public function buildGradientSheet() { $gradients = $this->getDirectoryList('gradients'); $template = new PhutilSprite(); $unusual_heights = array( 'dark-menu-label' => 25, 'breadcrumbs' => 31, 'menu-hover' => 28, 'menu-label' => 24, 'menu-selected' => 28, ); // Reorder the sprites so less-specific rules generate earlier in the sheet. // Otherwise we end up with blue "a.black" buttons because the blue rules // have the same specificity but appear later. - $gradients = array_combine($gradients, $gradients); + $gradients = array_fuse($gradients); $gradients = array_select_keys( $gradients, array( 'blue-dark', 'blue-light', )) + $gradients; $extra_css = array( 'black-dark' => ', button.black, a.black, a.black:visited', 'black-light' => ', button.black:active, a.black:active', 'blue-dark' => ', button, a.button, a.button:visited, input.inputsubmit', 'blue-light' => ', button:active, a.button:active', 'grey-dark' => ', button.grey, input.inputaux, a.grey, a.grey:visited, '. 'a.button.disabled, button[disabled], button.disabled', 'grey-light' => ', button.grey:active, a.grey:active, '. 'button.grey_active, a.dropdown-open', 'green-dark' => ', button.green, a.green, a.green:visited', 'green-light' => ', button.green:active, a.green:active', 'dark-menu-label' => ', .phabricator-dark-menu .phabricator-menu-item-type-label', 'menu-label' => ', .phabricator-side-menu .phabricator-menu-item-type-label', 'menu-hover' => ', .device-desktop .phabricator-side-menu '. 'a.phabricator-menu-item-type-link:hover, '. '.phabricator-filetree a.phabricator-filetree-item:hover', 'menu-selected' => ', .phabricator-side-menu .phabricator-menu-item-selected, '. '.device-desktop .phabricator-side-menu '. 'a.phabricator-menu-item-selected:hover, '. '.phabricator-nav-local a.phabricator-active-nav-focus', ); $sprites = array(); foreach ($gradients as $gradient) { $path = $this->getPath('gradients/'.$gradient.'.png'); $sprite = id(clone $template) ->setName('gradient-'.$gradient) ->setSourceFile($path) ->setTargetCSS('.gradient-'.$gradient.idx($extra_css, $gradient)); $sprite->setSourceSize(4, idx($unusual_heights, $gradient, 26)); $sprites[] = $sprite; } $sheet = $this->buildSheet( 'gradient', false, PhutilSpriteSheet::TYPE_REPEAT_X, ', button, a.button, a.button:visited, input.inputsubmit, '. '.phabricator-dark-menu .phabricator-menu-item-type-label, '. '.phabricator-side-menu .phabricator-menu-item-type-label, '. '.device-desktop .phabricator-side-menu '. 'a.phabricator-menu-item-type-link:hover, '. '.phabricator-side-menu .phabricator-menu-item-selected, '. '.device-desktop .phabricator-side-menu '. 'a.phabricator-menu-item-selected:hover, '. '.phabricator-filetree a.phabricator-filetree-item:hover, '. '.phabricator-filetree a.phabricator-active-nav-focus'); foreach ($sprites as $sprite) { $sheet->addSprite($sprite); } return $sheet; } public function buildAppsSheet() { return $this->buildAppsSheetVariant(1); } public function buildAppsLargeSheet() { return $this->buildAppsSheetVariant(2); } public function buildAppsXLargeSheet() { return $this->buildAppsSheetVariant(3); } private function buildAppsSheetVariant($variant) { if ($variant == 1) { $scales = array( '1x' => 1, '2x' => 2, ); $variant_name = 'apps'; $variant_short = ''; $size_x = 14; $size_y = 14; $colors = array( 'dark' => 'dark', ); } else if ($variant == 2) { $scales = array( '2x' => 1, '4x' => 2, ); $variant_name = 'apps-large'; $variant_short = '-large'; $size_x = 28; $size_y = 28; $colors = array( 'light' => 'lb', 'dark' => 'dark', 'blue' => 'blue', 'glow' => 'glow', ); } else { $scales = array( '4x' => 1, ); $variant_name = 'apps-xlarge'; $variant_short = '-xlarge'; $size_x = 56; $size_y = 56; $colors = array( 'dark' => 'dark', /* TODO: These are available but not currently used. 'blue' => 'blue', 'light' => 'lb', 'glow' => 'glow', */ ); } $apps = $this->getDirectoryList('apps_dark_1x'); $template = id(new PhutilSprite()) ->setSourceSize($size_x, $size_y); $sprites = array(); foreach ($apps as $app) { foreach ($colors as $color => $color_path) { $css = '.app-'.$app.'-'.$color.$variant_short; if ($color == 'blue' && $variant_name == 'apps-large') { $css .= ', .phabricator-crumb-view:hover .app-'.$app.'-dark-large'; } if ($color == 'glow' && $variant_name == 'apps-large') { $css .= ', .device-desktop .phabricator-dark-menu a:hover '. '.app-'.$app.'-light-large'; } $sprite = id(clone $template) ->setName('app-'.$app.'-'.$color.$variant_short) ->setTargetCSS($css); foreach ($scales as $scale_name => $scale) { $path = $this->getPath( 'apps_'.$color_path.'_'.$scale_name.'/'.$app.'.png'); $sprite->setSourceFile($path, $scale); } $sprites[] = $sprite; } } $sheet = $this->buildSheet($variant_name, count($scales) > 1); $sheet->setScales($scales); foreach ($sprites as $sprite) { $sheet->addSprite($sprite); } return $sheet; } private function getPath($to_path = null) { $root = dirname(phutil_get_library_root('phabricator')); return $root.'/resources/sprite/'.$to_path; } private function getDirectoryList($dir) { $path = $this->getPath($dir); $result = array(); $images = Filesystem::listDirectory($path, $include_hidden = false); foreach ($images as $image) { if (!preg_match('/\.png$/', $image)) { throw new Exception( "Expected file '{$image}' in '{$path}' to be a sprite source ". "ending in '.png'."); } $result[] = substr($image, 0, -4); } return $result; } private function buildSheet( $name, $has_retina, $type = null, $extra_css = '') { $sheet = new PhutilSpriteSheet(); $at = '@'; switch ($type) { case PhutilSpriteSheet::TYPE_STANDARD: default: $type = PhutilSpriteSheet::TYPE_STANDARD; $repeat_rule = 'no-repeat'; break; case PhutilSpriteSheet::TYPE_REPEAT_X: $repeat_rule = 'repeat-x'; break; case PhutilSpriteSheet::TYPE_REPEAT_Y: $repeat_rule = 'repeat-y'; break; } $retina_rules = null; if ($has_retina) { $retina_rules = <<'.$data.''; return $data; } } diff --git a/src/infrastructure/markup/rule/PhabricatorRemarkupRuleEmbedFile.php b/src/infrastructure/markup/rule/PhabricatorRemarkupRuleEmbedFile.php index 6adc7958f8..42fce61dd5 100644 --- a/src/infrastructure/markup/rule/PhabricatorRemarkupRuleEmbedFile.php +++ b/src/infrastructure/markup/rule/PhabricatorRemarkupRuleEmbedFile.php @@ -1,170 +1,180 @@ load($matches[1]); } if (!$file) { return $matches[0]; } $phid = $file->getPHID(); $engine = $this->getEngine(); $token = $engine->storeText(''); $metadata_key = self::KEY_RULE_EMBED_FILE; $metadata = $engine->getTextMetadata($metadata_key, array()); $bundle = array('token' => $token); $options = array( 'size' => 'thumb', 'layout' => 'left', 'float' => false, 'name' => null, ); if (!empty($matches[2])) { $matches[2] = trim($matches[2], ', '); $parser = new PhutilSimpleOptions(); $options = $parser->parse($matches[2]) + $options; } $file_name = coalesce($options['name'], $file->getName()); $options['name'] = $file_name; $attrs = array(); switch ((string)$options['size']) { case 'full': $attrs['src'] = $file->getBestURI(); $options['image_class'] = null; + $file_data = $file->getMetadata(); + $height = idx($file_data, PhabricatorFile::METADATA_IMAGE_HEIGHT); + if ($height) { + $attrs['height'] = $height; + } + $width = idx($file_data, PhabricatorFile::METADATA_IMAGE_WIDTH); + if ($width) { + $attrs['width'] = $width; + } break; case 'thumb': default: $attrs['src'] = $file->getPreview220URI(); + $attrs['width'] = '220'; $options['image_class'] = 'phabricator-remarkup-embed-image'; break; } $bundle['attrs'] = $attrs; $bundle['options'] = $options; $bundle['meta'] = array( 'phid' => $file->getPHID(), 'viewable' => $file->isViewableImage(), 'uri' => $file->getBestURI(), 'dUri' => $file->getDownloadURI(), 'name' => $options['name'], ); $metadata[$phid][] = $bundle; $engine->setTextMetadata($metadata_key, $metadata); return $token; } public function didMarkupText() { $engine = $this->getEngine(); $metadata_key = self::KEY_RULE_EMBED_FILE; $metadata = $engine->getTextMetadata($metadata_key, array()); if (!$metadata) { return; } $file_phids = array(); foreach ($metadata as $phid => $bundles) { foreach ($bundles as $data) { $options = $data['options']; $meta = $data['meta']; if (!$meta['viewable'] || $options['layout'] == 'link') { $link = id(new PhabricatorFileLinkView()) ->setFilePHID($meta['phid']) ->setFileName($meta['name']) ->setFileDownloadURI($meta['dUri']) ->setFileViewURI($meta['uri']) ->setFileViewable($meta['viewable']); $embed = $link->render(); $engine->overwriteStoredText($data['token'], $embed); continue; } require_celerity_resource('lightbox-attachment-css'); $img = phutil_tag('img', $data['attrs']); $embed = javelin_tag( 'a', array( 'href' => $meta['uri'], 'class' => $options['image_class'], 'sigil' => 'lightboxable', 'mustcapture' => true, 'meta' => $meta, ), $img); $layout_class = null; switch ($options['layout']) { case 'right': case 'center': case 'inline': case 'left': $layout_class = 'phabricator-remarkup-embed-layout-'. $options['layout']; break; default: $layout_class = 'phabricator-remarkup-embed-layout-left'; break; } if ($options['float']) { switch ($options['layout']) { case 'center': case 'inline': break; case 'right': $layout_class .= ' phabricator-remarkup-embed-float-right'; break; case 'left': default: $layout_class .= ' phabricator-remarkup-embed-float-left'; break; } } if ($layout_class) { $embed = phutil_tag( 'div', array( 'class' => $layout_class, ), $embed); } $engine->overwriteStoredText($data['token'], $embed); } $file_phids[] = $phid; } $engine->setTextMetadata(self::KEY_EMBED_FILE_PHIDS, $file_phids); $engine->setTextMetadata($metadata_key, array()); } } diff --git a/src/infrastructure/markup/rule/PhabricatorRemarkupRuleImageMacro.php b/src/infrastructure/markup/rule/PhabricatorRemarkupRuleImageMacro.php index 0216850355..849f537501 100644 --- a/src/infrastructure/markup/rule/PhabricatorRemarkupRuleImageMacro.php +++ b/src/infrastructure/markup/rule/PhabricatorRemarkupRuleImageMacro.php @@ -1,51 +1,62 @@ images === null) { $this->images = array(); $rows = id(new PhabricatorFileImageMacro())->loadAllWhere( 'isDisabled = 0'); foreach ($rows as $row) { $this->images[$row->getName()] = $row->getFilePHID(); } } if (array_key_exists($matches[1], $this->images)) { $phid = $this->images[$matches[1]]; $file = id(new PhabricatorFile())->loadOneWhere('phid = %s', $phid); + $style = null; + $src_uri = null; if ($file) { $src_uri = $file->getBestURI(); - } else { - $src_uri = null; + $file_data = $file->getMetadata(); + $height = idx($file_data,PhabricatorFile::METADATA_IMAGE_HEIGHT); + $width = idx($file_data, PhabricatorFile::METADATA_IMAGE_WIDTH); + if ($height && $width) { + $style = sprintf( + 'height: %dpx; width: %dpx;', + $height, + $width + ); + } } $img = phutil_tag( 'img', array( 'src' => $src_uri, 'alt' => $matches[1], 'title' => $matches[1], + 'style' => $style, )); return $this->getEngine()->storeText($img); } else { return $matches[1]; } } } diff --git a/src/infrastructure/storage/patch/PhabricatorBuiltinPatchList.php b/src/infrastructure/storage/patch/PhabricatorBuiltinPatchList.php index 5344eef6a2..9c1dee01f2 100644 --- a/src/infrastructure/storage/patch/PhabricatorBuiltinPatchList.php +++ b/src/infrastructure/storage/patch/PhabricatorBuiltinPatchList.php @@ -1,1099 +1,1103 @@ array( 'type' => 'db', 'name' => 'audit', 'after' => array( /* First Patch */ ), ), 'db.calendar' => array( 'type' => 'db', 'name' => 'calendar', ), 'db.chatlog' => array( 'type' => 'db', 'name' => 'chatlog', ), 'db.conduit' => array( 'type' => 'db', 'name' => 'conduit', ), 'db.countdown' => array( 'type' => 'db', 'name' => 'countdown', ), 'db.daemon' => array( 'type' => 'db', 'name' => 'daemon', ), 'db.differential' => array( 'type' => 'db', 'name' => 'differential', ), 'db.draft' => array( 'type' => 'db', 'name' => 'draft', ), 'db.drydock' => array( 'type' => 'db', 'name' => 'drydock', ), 'db.feed' => array( 'type' => 'db', 'name' => 'feed', ), 'db.file' => array( 'type' => 'db', 'name' => 'file', ), 'db.flag' => array( 'type' => 'db', 'name' => 'flag', ), 'db.harbormaster' => array( 'type' => 'db', 'name' => 'harbormaster', ), 'db.herald' => array( 'type' => 'db', 'name' => 'herald', ), 'db.maniphest' => array( 'type' => 'db', 'name' => 'maniphest', ), 'db.meta_data' => array( 'type' => 'db', 'name' => 'meta_data', ), 'db.metamta' => array( 'type' => 'db', 'name' => 'metamta', ), 'db.oauth_server' => array( 'type' => 'db', 'name' => 'oauth_server', ), 'db.owners' => array( 'type' => 'db', 'name' => 'owners', ), 'db.pastebin' => array( 'type' => 'db', 'name' => 'pastebin', ), 'db.phame' => array( 'type' => 'db', 'name' => 'phame', ), 'db.phriction' => array( 'type' => 'db', 'name' => 'phriction', ), 'db.project' => array( 'type' => 'db', 'name' => 'project', ), 'db.repository' => array( 'type' => 'db', 'name' => 'repository', ), 'db.search' => array( 'type' => 'db', 'name' => 'search', ), 'db.slowvote' => array( 'type' => 'db', 'name' => 'slowvote', ), 'db.timeline' => array( 'type' => 'db', 'name' => 'timeline', ), 'db.user' => array( 'type' => 'db', 'name' => 'user', ), 'db.worker' => array( 'type' => 'db', 'name' => 'worker', ), 'db.xhpastview' => array( 'type' => 'db', 'name' => 'xhpastview', ), 'db.cache' => array( 'type' => 'db', 'name' => 'cache', ), 'db.fact' => array( 'type' => 'db', 'name' => 'fact', ), 'db.ponder' => array( 'type' => 'db', 'name' => 'ponder', ), 'db.xhprof' => array( 'type' => 'db', 'name' => 'xhprof', ), 'db.pholio' => array( 'type' => 'db', 'name' => 'pholio', ), 'db.conpherence' => array( 'type' => 'db', 'name' => 'conpherence', ), '0000.legacy.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('0000.legacy.sql'), 'legacy' => 0, ), '000.project.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('000.project.sql'), 'legacy' => 0, ), '001.maniphest_projects.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('001.maniphest_projects.sql'), 'legacy' => 1, ), '002.oauth.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('002.oauth.sql'), 'legacy' => 2, ), '003.more_oauth.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('003.more_oauth.sql'), 'legacy' => 3, ), '004.daemonrepos.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('004.daemonrepos.sql'), 'legacy' => 4, ), '005.workers.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('005.workers.sql'), 'legacy' => 5, ), '006.repository.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('006.repository.sql'), 'legacy' => 6, ), '007.daemonlog.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('007.daemonlog.sql'), 'legacy' => 7, ), '008.repoopt.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('008.repoopt.sql'), 'legacy' => 8, ), '009.repo_summary.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('009.repo_summary.sql'), 'legacy' => 9, ), '010.herald.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('010.herald.sql'), 'legacy' => 10, ), '011.badcommit.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('011.badcommit.sql'), 'legacy' => 11, ), '012.dropphidtype.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('012.dropphidtype.sql'), 'legacy' => 12, ), '013.commitdetail.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('013.commitdetail.sql'), 'legacy' => 13, ), '014.shortcuts.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('014.shortcuts.sql'), 'legacy' => 14, ), '015.preferences.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('015.preferences.sql'), 'legacy' => 15, ), '016.userrealnameindex.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('016.userrealnameindex.sql'), 'legacy' => 16, ), '017.sessionkeys.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('017.sessionkeys.sql'), 'legacy' => 17, ), '018.owners.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('018.owners.sql'), 'legacy' => 18, ), '019.arcprojects.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('019.arcprojects.sql'), 'legacy' => 19, ), '020.pathcapital.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('020.pathcapital.sql'), 'legacy' => 20, ), '021.xhpastview.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('021.xhpastview.sql'), 'legacy' => 21, ), '022.differentialcommit.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('022.differentialcommit.sql'), 'legacy' => 22, ), '023.dxkeys.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('023.dxkeys.sql'), 'legacy' => 23, ), '024.mlistkeys.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('024.mlistkeys.sql'), 'legacy' => 24, ), '025.commentopt.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('025.commentopt.sql'), 'legacy' => 25, ), '026.diffpropkey.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('026.diffpropkey.sql'), 'legacy' => 26, ), '027.metamtakeys.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('027.metamtakeys.sql'), 'legacy' => 27, ), '028.systemagent.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('028.systemagent.sql'), 'legacy' => 28, ), '029.cursors.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('029.cursors.sql'), 'legacy' => 29, ), '030.imagemacro.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('030.imagemacro.sql'), 'legacy' => 30, ), '031.workerrace.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('031.workerrace.sql'), 'legacy' => 31, ), '032.viewtime.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('032.viewtime.sql'), 'legacy' => 32, ), '033.privtest.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('033.privtest.sql'), 'legacy' => 33, ), '034.savedheader.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('034.savedheader.sql'), 'legacy' => 34, ), '035.proxyimage.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('035.proxyimage.sql'), 'legacy' => 35, ), '036.mailkey.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('036.mailkey.sql'), 'legacy' => 36, ), '037.setuptest.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('037.setuptest.sql'), 'legacy' => 37, ), '038.admin.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('038.admin.sql'), 'legacy' => 38, ), '039.userlog.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('039.userlog.sql'), 'legacy' => 39, ), '040.transform.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('040.transform.sql'), 'legacy' => 40, ), '041.heraldrepetition.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('041.heraldrepetition.sql'), 'legacy' => 41, ), '042.commentmetadata.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('042.commentmetadata.sql'), 'legacy' => 42, ), '043.pastebin.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('043.pastebin.sql'), 'legacy' => 43, ), '044.countdown.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('044.countdown.sql'), 'legacy' => 44, ), '045.timezone.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('045.timezone.sql'), 'legacy' => 45, ), '046.conduittoken.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('046.conduittoken.sql'), 'legacy' => 46, ), '047.projectstatus.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('047.projectstatus.sql'), 'legacy' => 47, ), '048.relationshipkeys.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('048.relationshipkeys.sql'), 'legacy' => 48, ), '049.projectowner.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('049.projectowner.sql'), 'legacy' => 49, ), '050.taskdenormal.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('050.taskdenormal.sql'), 'legacy' => 50, ), '051.projectfilter.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('051.projectfilter.sql'), 'legacy' => 51, ), '052.pastelanguage.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('052.pastelanguage.sql'), 'legacy' => 52, ), '053.feed.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('053.feed.sql'), 'legacy' => 53, ), '054.subscribers.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('054.subscribers.sql'), 'legacy' => 54, ), '055.add_author_to_files.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('055.add_author_to_files.sql'), 'legacy' => 55, ), '056.slowvote.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('056.slowvote.sql'), 'legacy' => 56, ), '057.parsecache.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('057.parsecache.sql'), 'legacy' => 57, ), '058.missingkeys.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('058.missingkeys.sql'), 'legacy' => 58, ), '059.engines.php' => array( 'type' => 'php', 'name' => $this->getPatchPath('059.engines.php'), 'legacy' => 59, ), '060.phriction.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('060.phriction.sql'), 'legacy' => 60, ), '061.phrictioncontent.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('061.phrictioncontent.sql'), 'legacy' => 61, ), '062.phrictionmenu.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('062.phrictionmenu.sql'), 'legacy' => 62, ), '063.pasteforks.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('063.pasteforks.sql'), 'legacy' => 63, ), '064.subprojects.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('064.subprojects.sql'), 'legacy' => 64, ), '065.sshkeys.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('065.sshkeys.sql'), 'legacy' => 65, ), '066.phrictioncontent.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('066.phrictioncontent.sql'), 'legacy' => 66, ), '067.preferences.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('067.preferences.sql'), 'legacy' => 67, ), '068.maniphestauxiliarystorage.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('068.maniphestauxiliarystorage.sql'), 'legacy' => 68, ), '069.heraldxscript.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('069.heraldxscript.sql'), 'legacy' => 69, ), '070.differentialaux.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('070.differentialaux.sql'), 'legacy' => 70, ), '071.contentsource.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('071.contentsource.sql'), 'legacy' => 71, ), '072.blamerevert.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('072.blamerevert.sql'), 'legacy' => 72, ), '073.reposymbols.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('073.reposymbols.sql'), 'legacy' => 73, ), '074.affectedpath.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('074.affectedpath.sql'), 'legacy' => 74, ), '075.revisionhash.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('075.revisionhash.sql'), 'legacy' => 75, ), '076.indexedlanguages.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('076.indexedlanguages.sql'), 'legacy' => 76, ), '077.originalemail.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('077.originalemail.sql'), 'legacy' => 77, ), '078.nametoken.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('078.nametoken.sql'), 'legacy' => 78, ), '079.nametokenindex.php' => array( 'type' => 'php', 'name' => $this->getPatchPath('079.nametokenindex.php'), 'legacy' => 79, ), '080.filekeys.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('080.filekeys.sql'), 'legacy' => 80, ), '081.filekeys.php' => array( 'type' => 'php', 'name' => $this->getPatchPath('081.filekeys.php'), 'legacy' => 81, ), '082.xactionkey.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('082.xactionkey.sql'), 'legacy' => 82, ), '083.dxviewtime.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('083.dxviewtime.sql'), 'legacy' => 83, ), '084.pasteauthorkey.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('084.pasteauthorkey.sql'), 'legacy' => 84, ), '085.packagecommitrelationship.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('085.packagecommitrelationship.sql'), 'legacy' => 85, ), '086.formeraffil.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('086.formeraffil.sql'), 'legacy' => 86, ), '087.phrictiondelete.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('087.phrictiondelete.sql'), 'legacy' => 87, ), '088.audit.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('088.audit.sql'), 'legacy' => 88, ), '089.projectwiki.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('089.projectwiki.sql'), 'legacy' => 89, ), '090.forceuniqueprojectnames.php' => array( 'type' => 'php', 'name' => $this->getPatchPath('090.forceuniqueprojectnames.php'), 'legacy' => 90, ), '091.uniqueslugkey.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('091.uniqueslugkey.sql'), 'legacy' => 91, ), '092.dropgithubnotification.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('092.dropgithubnotification.sql'), 'legacy' => 92, ), '093.gitremotes.php' => array( 'type' => 'php', 'name' => $this->getPatchPath('093.gitremotes.php'), 'legacy' => 93, ), '094.phrictioncolumn.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('094.phrictioncolumn.sql'), 'legacy' => 94, ), '095.directory.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('095.directory.sql'), 'legacy' => 95, ), '096.filename.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('096.filename.sql'), 'legacy' => 96, ), '097.heraldruletypes.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('097.heraldruletypes.sql'), 'legacy' => 97, ), '098.heraldruletypemigration.php' => array( 'type' => 'php', 'name' => $this->getPatchPath('098.heraldruletypemigration.php'), 'legacy' => 98, ), '099.drydock.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('099.drydock.sql'), 'legacy' => 99, ), '100.projectxaction.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('100.projectxaction.sql'), 'legacy' => 100, ), '101.heraldruleapplied.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('101.heraldruleapplied.sql'), 'legacy' => 101, ), '102.heraldcleanup.php' => array( 'type' => 'php', 'name' => $this->getPatchPath('102.heraldcleanup.php'), 'legacy' => 102, ), '103.heraldedithistory.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('103.heraldedithistory.sql'), 'legacy' => 103, ), '104.searchkey.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('104.searchkey.sql'), 'legacy' => 104, ), '105.mimetype.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('105.mimetype.sql'), 'legacy' => 105, ), '106.chatlog.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('106.chatlog.sql'), 'legacy' => 106, ), '107.oauthserver.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('107.oauthserver.sql'), 'legacy' => 107, ), '108.oauthscope.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('108.oauthscope.sql'), 'legacy' => 108, ), '109.oauthclientphidkey.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('109.oauthclientphidkey.sql'), 'legacy' => 109, ), '110.commitaudit.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('110.commitaudit.sql'), 'legacy' => 110, ), '111.commitauditmigration.php' => array( 'type' => 'php', 'name' => $this->getPatchPath('111.commitauditmigration.php'), 'legacy' => 111, ), '112.oauthaccesscoderedirecturi.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('112.oauthaccesscoderedirecturi.sql'), 'legacy' => 112, ), '113.lastreviewer.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('113.lastreviewer.sql'), 'legacy' => 113, ), '114.auditrequest.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('114.auditrequest.sql'), 'legacy' => 114, ), '115.prepareutf8.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('115.prepareutf8.sql'), 'legacy' => 115, ), '116.utf8-backup-first-expect-wait.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('116.utf8-backup-first-expect-wait.sql'), 'legacy' => 116, ), '117.repositorydescription.php' => array( 'type' => 'php', 'name' => $this->getPatchPath('117.repositorydescription.php'), 'legacy' => 117, ), '118.auditinline.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('118.auditinline.sql'), 'legacy' => 118, ), '119.filehash.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('119.filehash.sql'), 'legacy' => 119, ), '120.noop.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('120.noop.sql'), 'legacy' => 120, ), '121.drydocklog.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('121.drydocklog.sql'), 'legacy' => 121, ), '122.flag.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('122.flag.sql'), 'legacy' => 122, ), '123.heraldrulelog.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('123.heraldrulelog.sql'), 'legacy' => 123, ), '124.subpriority.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('124.subpriority.sql'), 'legacy' => 124, ), '125.ipv6.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('125.ipv6.sql'), 'legacy' => 125, ), '126.edges.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('126.edges.sql'), 'legacy' => 126, ), '127.userkeybody.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('127.userkeybody.sql'), 'legacy' => 127, ), '128.phabricatorcom.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('128.phabricatorcom.sql'), 'legacy' => 128, ), '129.savedquery.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('129.savedquery.sql'), 'legacy' => 129, ), '130.denormalrevisionquery.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('130.denormalrevisionquery.sql'), 'legacy' => 130, ), '131.migraterevisionquery.php' => array( 'type' => 'php', 'name' => $this->getPatchPath('131.migraterevisionquery.php'), 'legacy' => 131, ), '132.phame.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('132.phame.sql'), 'legacy' => 132, ), '133.imagemacro.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('133.imagemacro.sql'), 'legacy' => 133, ), '134.emptysearch.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('134.emptysearch.sql'), 'legacy' => 134, ), '135.datecommitted.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('135.datecommitted.sql'), 'legacy' => 135, ), '136.sex.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('136.sex.sql'), 'legacy' => 136, ), '137.auditmetadata.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('137.auditmetadata.sql'), 'legacy' => 137, ), '138.notification.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('138.notification.sql'), ), 'holidays.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('holidays.sql'), ), 'userstatus.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('userstatus.sql'), ), 'emailtable.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('emailtable.sql'), ), 'emailtableport.sql' => array( 'type' => 'php', 'name' => $this->getPatchPath('emailtableport.php'), ), 'emailtableremove.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('emailtableremove.sql'), ), 'phiddrop.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('phiddrop.sql'), ), 'testdatabase.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('testdatabase.sql'), ), 'ldapinfo.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('ldapinfo.sql'), ), 'threadtopic.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('threadtopic.sql'), ), 'usertranslation.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('usertranslation.sql'), ), 'differentialbookmarks.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('differentialbookmarks.sql'), ), 'harbormasterobject.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('harbormasterobject.sql'), ), 'markupcache.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('markupcache.sql'), ), 'maniphestxcache.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('maniphestxcache.sql'), ), 'migrate-maniphest-dependencies.php' => array( 'type' => 'php', 'name' => $this->getPatchPath('migrate-maniphest-dependencies.php'), ), 'migrate-differential-dependencies.php' => array( 'type' => 'php', 'name' => $this->getPatchPath( 'migrate-differential-dependencies.php'), ), 'phameblog.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('phameblog.sql'), ), 'migrate-maniphest-revisions.php' => array( 'type' => 'php', 'name' => $this->getPatchPath('migrate-maniphest-revisions.php'), ), 'daemonstatus.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('daemonstatus.sql'), ), 'symbolcontexts.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('symbolcontexts.sql'), ), 'migrate-project-edges.php' => array( 'type' => 'php', 'name' => $this->getPatchPath('migrate-project-edges.php'), ), 'fact-raw.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('fact-raw.sql'), ), 'ponder.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('ponder.sql') ), 'policy-project.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('policy-project.sql'), ), 'daemonstatuskey.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('daemonstatuskey.sql'), ), 'edgetype.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('edgetype.sql'), ), 'ponder-comments.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('ponder-comments.sql'), ), 'pastepolicy.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('pastepolicy.sql'), ), 'xhprof.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('xhprof.sql'), ), 'draft-metadata.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('draft-metadata.sql'), ), 'phamedomain.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('phamedomain.sql'), ), 'ponder-mailkey.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('ponder-mailkey.sql'), ), 'ponder-mailkey-populate.php' => array( 'type' => 'php', 'name' => $this->getPatchPath('ponder-mailkey-populate.php'), ), 'phamepolicy.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('phamepolicy.sql'), ), 'phameoneblog.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('phameoneblog.sql'), ), 'statustxt.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('statustxt.sql'), ), 'daemontaskarchive.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('daemontaskarchive.sql'), ), 'drydocktaskid.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('drydocktaskid.sql'), ), 'drydockresoucetype.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('drydockresourcetype.sql'), ), 'liskcounters.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('liskcounters.sql'), ), 'liskcounters.php' => array( 'type' => 'php', 'name' => $this->getPatchPath('liskcounters.php'), ), 'dropfileproxyimage.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('dropfileproxyimage.sql'), ), 'repository-lint.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('repository-lint.sql'), ), 'liskcounters-task.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('liskcounters-task.sql'), ), 'pholio.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('pholio.sql'), ), 'owners-exclude.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('owners-exclude.sql'), ), '20121209.pholioxactions.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('20121209.pholioxactions.sql'), ), '20121209.xmacroadd.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('20121209.xmacroadd.sql'), ), '20121209.xmacromigrate.php' => array( 'type' => 'php', 'name' => $this->getPatchPath('20121209.xmacromigrate.php'), ), '20121209.xmacromigratekey.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('20121209.xmacromigratekey.sql'), ), '20121220.generalcache.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('20121220.generalcache.sql'), ), 'db.config' => array( 'type' => 'db', 'name' => 'config', ), '20121226.config.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('20121226.config.sql'), ), '20130101.confxaction.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('20130101.confxaction.sql'), ), '20130102.metamtareceivedmailmessageidhash.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('20130102.metamtareceivedmailmessageidhash.sql'), ), '20130103.filemetadata.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('20130103.filemetadata.sql'), ), '20130111.conpherence.sql' => array( 'type' => 'sql', 'name' => $this->getPatchPath('20130111.conpherence.sql'), ), + '20130127.altheraldtranscript.sql' => array( + 'type' => 'sql', + 'name' => $this->getPatchPath('20130127.altheraldtranscript.sql'), + ), ); } } diff --git a/src/view/form/AphrontErrorView.php b/src/view/form/AphrontErrorView.php index 0ff078261b..06fa19ceb7 100644 --- a/src/view/form/AphrontErrorView.php +++ b/src/view/form/AphrontErrorView.php @@ -1,93 +1,112 @@ insideDialogue = $inside_dialogue; + return $this; + } + public function getInsideDialogue() { + return $this->insideDialogue; + } public function setTitle($title) { $this->title = $title; return $this; } public function setSeverity($severity) { $this->severity = $severity; return $this; } public function setErrors(array $errors) { $this->errors = $errors; return $this; } public function setID($id) { $this->id = $id; return $this; } + private function getBaseClass() { + if ($this->getInsideDialogue()) { + $class = 'aphront-error-view-dialogue'; + } else { + $class = 'aphront-error-view'; + } + return $class; + } + final public function render() { require_celerity_resource('aphront-error-view-css'); $errors = $this->errors; if ($errors) { $list = array(); foreach ($errors as $error) { $list[] = phutil_tag( 'li', array(), $error); } $list = phutil_tag( 'ul', array( 'class' => 'aphront-error-view-list', ), $list); } else { $list = null; } $title = $this->title; if (strlen($title)) { $title = phutil_tag( 'h1', array( 'class' => 'aphront-error-view-head', ), $title); } else { $title = null; } $this->severity = nonempty($this->severity, self::SEVERITY_ERROR); - $more_classes = array(); - $more_classes[] = 'aphront-error-severity-'.$this->severity; - $more_classes = implode(' ', $more_classes); + $classes = array(); + $classes[] = $this->getBaseClass(); + $classes[] = 'aphront-error-severity-'.$this->severity; + $classes = implode(' ', $classes); return phutil_render_tag( 'div', array( 'id' => $this->id, - 'class' => 'aphront-error-view '.$more_classes, + 'class' => $classes, ), array( $title, phutil_render_tag( 'div', array( 'class' => 'aphront-error-view-body', ), $this->renderChildren(). $list), )); } } diff --git a/src/view/form/control/AphrontFormDateControl.php b/src/view/form/control/AphrontFormDateControl.php index afe989f854..27166c8440 100644 --- a/src/view/form/control/AphrontFormDateControl.php +++ b/src/view/form/control/AphrontFormDateControl.php @@ -1,266 +1,266 @@ initialTime = $time; return $this; } public function readValueFromRequest(AphrontRequest $request) { $user = $this->user; if (!$this->user) { throw new Exception( "Call setUser() before readValueFromRequest()!"); } $user_zone = $user->getTimezoneIdentifier(); $zone = new DateTimeZone($user_zone); $day = $request->getInt($this->getDayInputName()); $month = $request->getInt($this->getMonthInputName()); $year = $request->getInt($this->getYearInputName()); $time = $request->getStr($this->getTimeInputName()); $err = $this->getError(); if ($day || $month || $year || $time) { $this->valueDay = $day; $this->valueMonth = $month; $this->valueYear = $year; $this->valueTime = $time; // Assume invalid. $err = 'Invalid'; try { $date = new DateTime("{$year}-{$month}-{$day} {$time}", $zone); $value = $date->format('U'); } catch (Exception $ex) { $value = null; } if ($value) { $this->setValue($value); $err = null; } else { $this->setValue(null); } } else { // TODO: We could eventually allow these to be customized per install or // per user or both, but let's wait and see. switch ($this->initialTime) { case self::TIME_START_OF_DAY: default: $time = '12:00 AM'; break; case self::TIME_START_OF_BUSINESS: $time = '9:00 AM'; break; case self::TIME_END_OF_BUSINESS: $time = '5:00 PM'; break; case self::TIME_END_OF_DAY: $time = '11:59 PM'; break; } $today = $this->formatTime(time(), 'Y-m-d'); try { $date = new DateTime("{$today} {$time}", $zone); $value = $date->format('U'); } catch (Exception $ex) { $value = null; } if ($value) { $this->setValue($value); } else { $this->setValue(null); } } $this->setError($err); return $this->getValue(); } protected function getCustomControlClass() { return 'aphront-form-control-date'; } public function setValue($epoch) { $result = parent::setValue($epoch); if ($epoch === null) { return; } $readable = $this->formatTime($epoch, 'Y!m!d!g:i A'); $readable = explode('!', $readable, 4); $this->valueYear = $readable[0]; $this->valueMonth = $readable[1]; $this->valueDay = $readable[2]; $this->valueTime = $readable[3]; return $result; } private function getMinYear() { $cur_year = $this->formatTime( time(), 'Y'); $val_year = $this->getYearInputValue(); return min($cur_year, $val_year) - 3; } private function getMaxYear() { $cur_year = $this->formatTime( time(), 'Y'); $val_year = $this->getYearInputValue(); return max($cur_year, $val_year) + 3; } private function getDayInputValue() { return $this->valueDay; } private function getMonthInputValue() { return $this->valueMonth; } private function getYearInputValue() { return $this->valueYear; } private function getTimeInputValue() { return $this->valueTime; } private function formatTime($epoch, $fmt) { return phabricator_format_local_time( $epoch, $this->user, $fmt); } private function getDayInputName() { return $this->getName().'_d'; } private function getMonthInputName() { return $this->getName().'_m'; } private function getYearInputName() { return $this->getName().'_y'; } private function getTimeInputName() { return $this->getName().'_t'; } protected function renderInput() { $min_year = $this->getMinYear(); $max_year = $this->getMaxYear(); $days = range(1, 31); - $days = array_combine($days, $days); + $days = array_fuse($days); $months = array( 1 => 'Jan', 2 => 'Feb', 3 => 'Mar', 4 => 'Apr', 5 => 'May', 6 => 'Jun', 7 => 'Jul', 8 => 'Aug', 9 => 'Sep', 10 => 'Oct', 11 => 'Nov', 12 => 'Dec', ); $years = range($this->getMinYear(), $this->getMaxYear()); - $years = array_combine($years, $years); + $years = array_fuse($years); $days_sel = AphrontFormSelectControl::renderSelectTag( $this->getDayInputValue(), $days, array( 'name' => $this->getDayInputName(), 'sigil' => 'day-input', )); $months_sel = AphrontFormSelectControl::renderSelectTag( $this->getMonthInputValue(), $months, array( 'name' => $this->getMonthInputName(), 'sigil' => 'month-input', )); $years_sel = AphrontFormSelectControl::renderSelectTag( $this->getYearInputValue(), $years, array( 'name' => $this->getYearInputName(), 'sigil' => 'year-input', )); $cal_icon = javelin_tag( 'a', array( 'href' => '#', 'class' => 'calendar-button', 'sigil' => 'calendar-button', ), ''); $time_sel = phutil_tag( 'input', array( 'name' => $this->getTimeInputName(), 'sigil' => 'time-input', 'value' => $this->getTimeInputValue(), 'type' => 'text', 'class' => 'aphront-form-date-time-input', ), ''); Javelin::initBehavior('fancy-datepicker', array()); return javelin_render_tag( 'div', array( 'class' => 'aphront-form-date-container', 'sigil' => 'phabricator-date-control', ), self::renderSingleView( array( $days_sel, $months_sel, $years_sel, $cal_icon, $time_sel, ))); } } diff --git a/src/view/layout/PhabricatorObjectItemListView.php b/src/view/layout/PhabricatorObjectItemListView.php index a145b7ba43..0059f136ff 100644 --- a/src/view/layout/PhabricatorObjectItemListView.php +++ b/src/view/layout/PhabricatorObjectItemListView.php @@ -1,66 +1,78 @@ header = $header; return $this; } public function setPager($pager) { $this->pager = $pager; return $this; } public function setNoDataString($no_data_string) { $this->noDataString = $no_data_string; return $this; } public function addItem(PhabricatorObjectItemView $item) { $this->items[] = $item; return $this; } + public function setStackable() { + $this->stackable = true; + return $this; + } + public function render() { require_celerity_resource('phabricator-object-item-list-view-css'); + $classes = array(); $header = null; if (strlen($this->header)) { $header = phutil_tag( 'h1', array( 'class' => 'phabricator-object-item-list-header', ), $this->header); } if ($this->items) { $items = $this->renderSingleView($this->items); } else { $string = nonempty($this->noDataString, pht('No data.')); $items = id(new AphrontErrorView()) ->setSeverity(AphrontErrorView::SEVERITY_NODATA) ->appendChild(phutil_escape_html($string)) ->render(); } $pager = null; if ($this->pager) { $pager = $this->renderSingleView($this->pager); } + $classes[] = 'phabricator-object-item-list-view'; + if ($this->stackable) { + $classes[] = 'phabricator-object-list-stackable'; + } + return phutil_render_tag( - 'div', + 'ul', array( - 'class' => 'phabricator-object-item-list-view', + 'class' => implode(' ', $classes), ), $header.$items.$pager); } } diff --git a/src/view/layout/PhabricatorObjectItemView.php b/src/view/layout/PhabricatorObjectItemView.php index 662e63a783..fe8940320e 100644 --- a/src/view/layout/PhabricatorObjectItemView.php +++ b/src/view/layout/PhabricatorObjectItemView.php @@ -1,176 +1,176 @@ effect = $effect; return $this; } public function getEffect() { return $this->effect; } public function setObject($object) { $this->object = $object; return $this; } public function getObject() { return $this->object; } public function setHref($href) { $this->href = $href; return $this; } public function getHref() { return $this->href; } public function setHeader($header) { $this->header = $header; return $this; } public function getHeader() { return $this->header; } public function addIcon($icon, $label = null) { $this->icons[] = array( 'icon' => $icon, 'label' => $label, ); return $this; } public function setBarColor($bar_color) { $this->barColor = $bar_color; return $this; } public function getBarColor() { return $this->barColor; } public function addAttribute($attribute) { $this->attributes[] = $attribute; return $this; } public function render() { $header = phutil_tag( 'a', array( 'href' => $this->href, 'class' => 'phabricator-object-item-name', ), $this->header); $icons = null; if ($this->icons) { $icon_list = array(); foreach ($this->icons as $spec) { $icon = $spec['icon']; $icon = phutil_tag( 'span', array( 'class' => 'phabricator-object-item-icon-image '. 'sprite-icon action-'.$icon, ), ''); $label = phutil_tag( 'span', array( 'class' => 'phabricator-object-item-icon-label', ), $spec['label']); $icon_list[] = phutil_tag( 'li', array( 'class' => 'phabricator-object-item-icon', ), array($label, $icon)); } $icons = phutil_tag( 'ul', array( 'class' => 'phabricator-object-item-icons', ), $icon_list); } $attrs = null; if ($this->attributes) { $attrs = array(); $spacer = phutil_tag( 'span', array( 'class' => 'phabricator-object-item-attribute-spacer', ), "\xC2\xB7"); $first = true; foreach ($this->attributes as $attribute) { $attrs[] = phutil_render_tag( 'li', array( 'class' => 'phabricator-object-item-attribute', ), ($first ? null : $spacer).$attribute); $first = false; } $attrs = phutil_tag( 'ul', array( 'class' => 'phabricator-object-item-attributes', ), $attrs); } $classes = array(); $classes[] = 'phabricator-object-item'; if ($this->barColor) { $classes[] = 'phabricator-object-item-bar-color-'.$this->barColor; } switch ($this->effect) { case 'highlighted': $classes[] = 'phabricator-object-item-highlighted'; break; case null: break; default: throw new Exception("Invalid effect!"); } $content = phutil_render_tag( 'div', array( 'class' => 'phabricator-object-item-content', ), $header.$attrs.$this->renderChildren()); return phutil_tag( - 'div', + 'li', array( 'class' => implode(' ', $classes), ), array($icons, $content)); } } diff --git a/src/view/page/menu/PhabricatorMainMenuView.php b/src/view/page/menu/PhabricatorMainMenuView.php index b029e2cc8b..a16e813575 100644 --- a/src/view/page/menu/PhabricatorMainMenuView.php +++ b/src/view/page/menu/PhabricatorMainMenuView.php @@ -1,370 +1,419 @@ applicationMenu = $application_menu; return $this; } public function getApplicationMenu() { return $this->applicationMenu; } public function setController(PhabricatorController $controller) { $this->controller = $controller; return $this; } public function getController() { return $this->controller; } public function setDefaultSearchScope($default_search_scope) { $this->defaultSearchScope = $default_search_scope; return $this; } public function getDefaultSearchScope() { return $this->defaultSearchScope; } public function render() { $user = $this->user; require_celerity_resource('phabricator-main-menu-view'); $header_id = celerity_generate_unique_node_id(); $menus = array(); $alerts = array(); if ($user->isLoggedIn()) { list($menu, $dropdown) = $this->renderNotificationMenu(); $alerts[] = $menu; $menus[] = $dropdown; } $phabricator_menu = $this->renderPhabricatorMenu(); if ($alerts) { $alerts = phutil_render_tag( 'div', array( 'class' => 'phabricator-main-menu-alerts', ), self::renderSingleView($alerts)); } $application_menu = $this->getApplicationMenu(); if ($application_menu) { $application_menu->addClass('phabricator-dark-menu'); $application_menu->addClass('phabricator-application-menu'); } return phutil_render_tag( 'div', array( 'class' => 'phabricator-main-menu', 'id' => $header_id, ), self::renderSingleView( array( $this->renderPhabricatorMenuButton($header_id), $application_menu ? $this->renderApplicationMenuButton($header_id) : null, $this->renderPhabricatorLogo(), $alerts, $phabricator_menu, $application_menu, ))). self::renderSingleView($menus); } private function renderSearch() { $user = $this->user; $result = null; $keyboard_config = array( 'helpURI' => '/help/keyboardshortcut/', ); if ($user->isLoggedIn()) { $search = new PhabricatorMainMenuSearchView(); $search->setUser($user); $search->setScope($this->getDefaultSearchScope()); $result = $search; $pref_shortcut = PhabricatorUserPreferences::PREFERENCE_SEARCH_SHORTCUT; if ($user->loadPreferences()->getPreference($pref_shortcut, true)) { $keyboard_config['searchID'] = $search->getID(); } } Javelin::initBehavior('phabricator-keyboard-shortcuts', $keyboard_config); if ($result) { $result = id(new PhabricatorMenuItemView()) ->addClass('phabricator-main-menu-search') ->appendChild($result); } return $result; } private function renderPhabricatorMenuButton($header_id) { return javelin_tag( 'a', array( 'class' => 'phabricator-main-menu-expand-button '. 'phabricator-expand-core-menu', 'sigil' => 'jx-toggle-class', 'meta' => array( 'map' => array( $header_id => 'phabricator-core-menu-expanded', ), ), ), phutil_tag( 'span', array( 'class' => 'phabricator-menu-button-icon sprite-menu menu-icon-eye', ), '')); } public function renderApplicationMenuButton($header_id) { return javelin_tag( 'a', array( 'class' => 'phabricator-main-menu-expand-button '. 'phabricator-expand-application-menu', 'sigil' => 'jx-toggle-class', 'meta' => array( 'map' => array( $header_id => 'phabricator-application-menu-expanded', ), ), ), phutil_tag( 'span', array( 'class' => 'phabricator-menu-button-icon sprite-menu menu-icon-app', ), '')); } private function renderPhabricatorMenu() { $user = $this->getUser(); $controller = $this->getController(); $applications = PhabricatorApplication::getAllInstalledApplications(); $applications = msort($applications, 'getName'); $core = array(); $more = array(); $actions = array(); require_celerity_resource('sprite-apps-large-css'); $group_core = PhabricatorApplication::GROUP_CORE; foreach ($applications as $application) { if ($application->shouldAppearInLaunchView()) { $icon = $application->getIconName().'-light-large'; $item = id(new PhabricatorMenuItemView()) ->setName($application->getName()) ->setHref($application->getBaseURI()) ->appendChild($this->renderMenuIcon($icon)); if ($application->getApplicationGroup() == $group_core) { $core[] = $item; } else { $more[] = $item; } } $app_actions = $application->buildMainMenuItems($user, $controller); foreach ($app_actions as $action) { $actions[] = $action; } } $view = new PhabricatorMenuView(); $view->addClass('phabricator-dark-menu'); $view->addClass('phabricator-core-menu'); $search = $this->renderSearch(); $view->appendChild($search); $view ->newLabel(pht('Home')) ->addClass('phabricator-core-item-device'); $view->addMenuItem( id(new PhabricatorMenuItemView()) ->addClass('phabricator-core-item-device') ->setName(pht('Phabricator Home')) ->setHref('/') ->appendChild($this->renderMenuIcon('logo-light-large'))); if ($controller && $controller->getCurrentApplication()) { $application = $controller->getCurrentApplication(); $icon = $application->getIconName().'-light-large'; $view->addMenuItem( id(new PhabricatorMenuItemView()) ->addClass('phabricator-core-item-device') ->setName(pht('%s Home', $application->getName())) ->appendChild($this->renderMenuIcon($icon)) ->setHref($controller->getApplicationURI())); } if ($core) { $view->addMenuItem( id(new PhabricatorMenuItemView()) ->addClass('phabricator-core-item-device') ->setType(PhabricatorMenuItemView::TYPE_LABEL) ->setName(pht('Core Applications'))); foreach ($core as $item) { $item->addClass('phabricator-core-item-device'); $view->addMenuItem($item); } } if ($actions) { $actions = msort($actions, 'getSortOrder'); $view->addMenuItem( id(new PhabricatorMenuItemView()) ->addClass('phabricator-core-item-device') ->setType(PhabricatorMenuItemView::TYPE_LABEL) ->setName(pht('Actions'))); foreach ($actions as $action) { $icon = $action->getIcon(); if ($icon) { if ($action->getSelected()) { $action->appendChild($this->renderMenuIcon($icon.'-blue-large')); } else { $action->appendChild($this->renderMenuIcon($icon.'-light-large')); } } $view->addMenuItem($action); } } if ($more) { $view->addMenuItem( id(new PhabricatorMenuItemView()) ->addClass('phabricator-core-item-device') ->setType(PhabricatorMenuItemView::TYPE_LABEL) ->setName(pht('More Applications'))); foreach ($more as $item) { $item->addClass('phabricator-core-item-device'); $view->addMenuItem($item); } } return $view; } private function renderPhabricatorLogo() { return phutil_tag( 'a', array( 'class' => 'phabricator-main-menu-logo', 'href' => '/', ), phutil_tag( 'span', array( 'class' => 'sprite-menu phabricator-main-menu-logo-image', ), '')); } private function renderNotificationMenu() { $user = $this->user; require_celerity_resource('phabricator-notification-css'); require_celerity_resource('phabricator-notification-menu-css'); require_celerity_resource('sprite-menu-css'); + $container_classes = array( + 'sprite-menu', + 'alert-notifications', + ); + + $conpherence = id(new PhabricatorApplicationConpherence())->isBeta(); + $allow_beta = + PhabricatorEnv::getEnvConfig('phabricator.show-beta-applications'); + $message_tag = ''; + + if (!$conpherence || $allow_beta) { + $message_id = celerity_generate_unique_node_id(); + $message_count_id = celerity_generate_unique_node_id(); + + $unread_status = ConpherenceParticipationStatus::BEHIND; + $unread = id(new ConpherenceParticipantQuery()) + ->withParticipantPHIDs(array($user->getPHID())) + ->withParticipationStatus($unread_status) + ->execute(); + $message_count_number = count($unread); + if ($message_count_number > 999) { + $message_count_number = "\xE2\x88\x9E"; + } + + $message_count_tag = phutil_render_tag( + 'span', + array( + 'id' => $message_count_id, + 'class' => 'phabricator-main-menu-message-count' + ), + phutil_escape_html($message_count_number)); + + $message_icon_tag = phutil_render_tag( + 'span', + array( + 'class' => 'sprite-menu phabricator-main-menu-message-icon', + ), + ''); + + if ($message_count_number) { + $container_classes[] = 'message-unread'; + } + + $message_tag = phutil_render_tag( + 'a', + array( + 'href' => '/conpherence/', + 'class' => implode(' ', $container_classes), + 'id' => $message_id, + ), + $message_icon_tag.$message_count_tag); + } + $count_id = celerity_generate_unique_node_id(); $dropdown_id = celerity_generate_unique_node_id(); $bubble_id = celerity_generate_unique_node_id(); $count_number = id(new PhabricatorFeedStoryNotification()) ->countUnread($user); if ($count_number > 999) { $count_number = "\xE2\x88\x9E"; } $count_tag = phutil_tag( 'span', array( 'id' => $count_id, 'class' => 'phabricator-main-menu-alert-count' ), $count_number); $icon_tag = phutil_tag( 'span', array( 'class' => 'sprite-menu phabricator-main-menu-alert-icon', ), ''); - $container_classes = array( - 'phabricator-main-menu-alert-bubble', - 'sprite-menu', - 'alert-notifications', - ); if ($count_number) { $container_classes[] = 'alert-unread'; } $bubble_tag = phutil_tag( 'a', array( 'href' => '/notification/', 'class' => implode(' ', $container_classes), 'id' => $bubble_id, ), array($icon_tag, $count_tag)); Javelin::initBehavior( 'aphlict-dropdown', array( 'bubbleID' => $bubble_id, 'countID' => $count_id, 'dropdownID' => $dropdown_id, )); $notification_dropdown = javelin_tag( 'div', array( 'id' => $dropdown_id, 'class' => 'phabricator-notification-menu', 'sigil' => 'phabricator-notification-menu', 'style' => 'display: none;', ), ''); - return array($bubble_tag, $notification_dropdown); + return array( + $bubble_tag.$message_tag, $notification_dropdown); } private function renderMenuIcon($name) { return phutil_tag( 'span', array( 'class' => 'phabricator-core-menu-icon '. 'sprite-apps-large app-'.$name, ), ''); } } diff --git a/webroot/rsrc/css/aphront/error-view.css b/webroot/rsrc/css/aphront/error-view.css index 23b969bd35..529b4e3efb 100644 --- a/webroot/rsrc/css/aphront/error-view.css +++ b/webroot/rsrc/css/aphront/error-view.css @@ -1,67 +1,74 @@ /** * @provides aphront-error-view-css */ -.aphront-error-view { - margin: 20px; +.aphront-error-view, +.aphront-error-view-dialogue { border-style: solid; border-width: 1px; } +.aphront-error-view { + margin: 20px; +} +.aphront-error-view-dialogue { + margin: 0px 0px 16px 0px; +} + .device-phone .aphront-error-view { margin: 10px; } .aphront-error-view-body { padding: 10px; line-height: 1.6em; } .aphront-error-view-head { padding: 10px 10px 0 10px; font-weight: bold; color: #333333; } .aphront-error-view-list { margin: 0 0 0 20px; list-style: disc; } .aphront-error-severity-error { color: #b94a48; border-color: #eed3d7; background: #f2dede; } .aphront-error-severity-error .aphront-error-view-head { color: #aa0000; } .aphront-error-severity-warning { color: #bc7837; border-color: #ebdcc1; background: #fcf8e3; } .aphront-error-severity-warning .aphront-error-view-head { color: #bc7837; background: #fcf8e3; } .aphront-error-severity-notice { color: #3a87ad; border-color: #a4bdec; background: #dee7f8; } .aphront-error-severity-notice .aphront-error-view-head { color: #3a87ad; background: #dee7f8; } .aphront-error-severity-nodata { border-color: #dfdfdf; background: #f3f3f3; color: #666; } diff --git a/webroot/rsrc/css/application/base/main-menu-view.css b/webroot/rsrc/css/application/base/main-menu-view.css index cea71e0170..6ce50a0004 100644 --- a/webroot/rsrc/css/application/base/main-menu-view.css +++ b/webroot/rsrc/css/application/base/main-menu-view.css @@ -1,452 +1,436 @@ /** * @provides phabricator-main-menu-view */ /* - Main Menu ----------------------------------------------------------------- Main menu at the top of every page that has chrome. It reacts to resolution changes in order to behave reasonably on tablets and phones. */ .phabricator-main-menu { background: #2d3236; background-image: url(/rsrc/image/main_texture.png); background-repeat: repeat-x; position: relative; box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.25); min-height: 44px; } .device-desktop .phabricator-main-menu { height: 44px; } .phabricator-main-menu a:hover { text-decoration: none; } /* - Logo ---------------------------------------------------------------------- The "Phabricator" logo group in the main menu. On tablet and phone devices, this shows a "reveal" button to expand/collapse the rest of the menu. */ .device-desktop .phabricator-main-menu-group-logo { float: left; } .phabricator-main-menu-logo { display: inline-block; - position: relative; - height: 44px; width: 139px; margin-right: 6px; padding-right: 6px; padding-left: 6px; } .phabricator-main-menu-logo:hover { background-color: #3a4247; } .phabricator-main-menu-logo-image { position: absolute; width: 139px; height: 25px; top: 9px; } .device .phabricator-main-menu-logo { display: none; } /* - Expand/Collapse Button ---------------------------------------------------- On phones, the menu switches to a vertical layout and uses a button to expand or collapse the items. */ .phabricator-main-menu-expand-button { position: absolute; top: 7px; display: block; width: 40px; height: 28px; background-color: #22292d; border-radius: 6px; border: 1px solid #111111; box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); } .phabricator-menu-button-icon { position: absolute; width: 24px; height: 20px; top: 5px; left: 8px; } .phabricator-expand-core-menu { left: 10px; } .phabricator-expand-application-menu { right: 10px; } .device-desktop .phabricator-main-menu-expand-button { display: none; } .device .phabricator-main-menu-expand-button { display: block; } .phabricator-core-menu-expanded .phabricator-expand-core-menu, .phabricator-application-menu-expanded .phabricator-expand-application-menu { background-color: #55595d; } /* - Search -------------------------------------------------------------------- The main search input in the menu bar. */ .device-desktop .phabricator-main-menu-search { width: 220px; } .phabricator-main-menu-search-container { padding: 10px 0; position: relative; height: 24px; } .phabricator-main-menu-search-target { position: absolute; top: 46px; } .device-desktop .phabricator-main-menu-search-target { width: 320px; margin-left: -150px; } .device .phabricator-main-menu-search-target { width: 100%; margin-left: -25px; } .device-desktop .phabricator-main-menu-search-container { margin: 0 8px 0 50px; } .device .phabricator-main-menu-search-container { margin: 0 18px 0 60px; } .phabricator-main-menu-search input { outline: 0; margin: 0; width: 100%; right: 0; position: absolute; border: 1px solid #333333; border-radius: 12px; background: #555555; height: 12px; line-height: 12px; box-shadow: 0px 1px 1px rgba(128, 128, 128, 0.25); padding: 6px 32px 6px 10px; } .phabricator-main-menu-search input:focus { background: #c9c9c9; } .phabricator-main-menu-search input.jx-typeahead-placeholder { color: #999999; } .phabricator-main-menu-search button { position: absolute; color: transparent; background: transparent 5px 6px url(/rsrc/image/search.png) no-repeat; border: none; outline: none; box-shadow: none; text-shadow: none; min-width: 0; height: 20px; width: 20px; top: 11px; right: 6px; } .phabricator-main-menu-search-target div.jx-typeahead-results { border-radius: 4px; box-shadow: 1px 1px 4px rgba(0, 0, 0, 0.35); border: 1px solid #33393d; } .phabricator-main-menu-search-target div.jx-typeahead-results a.jx-result { border: 0; } .phabricator-main-menu-search-target div.jx-typeahead-results a.focused, .phabricator-main-menu-search-target div.jx-typeahead-results a:hover { background: #3875d7; } .phabricator-main-search-typeahead-result { display: block; padding: 4px 4px 4px 38px; background-position: 4px 4px; background-size: 25px 25px; background-repeat: no-repeat; } .phabricator-main-search-typeahead-result .result-name { display: block; font-weight: bold; color: #444444; } .focused .phabricator-main-search-typeahead-result .result-name, a:hover .phabricator-main-search-typeahead-result .result-name { color: #eeeeee; } .phabricator-main-search-typeahead-result .result-type { color: #888888; } .focused .phabricator-main-search-typeahead-result .result-type, a:hover .phabricator-main-search-typeahead-result .result-type { color: #dddddd; } /* - Alert --------------------------------------------------------------------- Alert menus are like icon menus but don't obey collapse rules. */ -.device-desktop .phabricator-main-menu-alerts { - display: inline-block; -} - .device .phabricator-main-menu-alerts { - position: absolute; - left: 60px; - right: 60px; - top: 10px; - height: 34px; - text-align: center; + margin-left: 60px; } -.phabricator-main-menu-alert-bubble { +.phabricator-main-menu-alerts { display: inline-block; - position: relative; - width: 26px; - height: 26px; - margin-bottom: 9px; -} - -.phabricator-main-menu-alert-bubble.alert-unread { - width: 46px; + border-radius: 15px; + background: rgba(0,0,0,.2); + height: 20px; + padding: 3px 10px; + margin-top: 9px; } -.phabricator-main-menu-alert-icon { - position: absolute; +.phabricator-main-menu-alert-icon, +.phabricator-main-menu-message-icon { width: 14px; height: 14px; - top: 5px; - left: 6px; + display: block; + float: left; + margin: 2px 0 0 0; } -.phabricator-main-menu-alert-count { - position: absolute; +.alert-notifications .phabricator-main-menu-message-icon { + margin: 3px 0 0 8px; +} + +.phabricator-main-menu-alert-count, +.phabricator-main-menu-message-count { font-weight: bold; - line-height: 22px; - top: 1px; - right: 8px; - left: 20px; + line-height: 20px; color: #ffffff; text-align: center; display: none; + float: left; + margin-left: 3px; } -.phabricator-main-menu-alert-item { - width: 26px; - height: 26px; - margin: 9px; - display: block; -} - -.alert-unread .phabricator-main-menu-alert-count { +.alert-unread .phabricator-main-menu-alert-count, +.message-unread .phabricator-main-menu-message-count { display: block; } /* - Dark Menu ----------------------------------------------------------------- Styles shared between the "core" menu (left button on mobile) and "application" menu (right button on mobile). These styles give the menu a white-on-black appearance. */ .device .phabricator-dark-menu, .device .phabricator-dark-menu a.phabricator-menu-item-type-link { color: #fff; } .device .phabricator-dark-menu .phabricator-menu-item-view { display: block; padding: 4px 0; } .device .phabricator-dark-menu .phabricator-menu-item-type-label { text-transform: uppercase; font-size: 11px; background-color: #151719; padding: 0 0 0 12px; height: 24px; } .device .phabricator-dark-menu .phabricator-menu-item-type-spacer { display: none; } .device .phabricator-dark-menu .phabricator-menu-item-type-label .phabricator-menu-item-name { display: block; padding: 6px 0 0; } .device .phabricator-dark-menu .phabricator-menu-item-type-link { border-width: 1px 0; border-style: solid; border-color: #34373b transparent #282c2d; background-image: url(/rsrc/image/texture/dark-menu.png); } /* - Core Menu ----------------------------------------------------------------- Styles unique to the core menu (left button on mobile). */ .phabricator-core-menu-icon { position: absolute; display: block; width: 28px; height: 28px; } .phabricator-core-menu-profile-image { background-size: 28px 28px; } .device .phabricator-core-menu { display: none; } .device .phabricator-core-menu-expanded .phabricator-core-menu { display: block; padding-top: 44px; } .device .phabricator-core-menu .phabricator-menu-item-type-link { font-size: 15px; min-height: 30px; } .device .phabricator-core-menu .phabricator-menu-item-type-link .phabricator-menu-item-name { margin-left: 40px; line-height: 28px; } .device-desktop .phabricator-core-menu { position: absolute; right: 0; top: 0; vertical-align: top; } .device-desktop .phabricator-core-menu .phabricator-menu-item-name { display: none; } .device-desktop .phabricator-core-menu .phabricator-menu-item-view { display: block; float: left; position: relative; min-width: 38px; height: 44px; } .device-desktop .phabricator-core-menu .phabricator-core-item-device { display: none; } .device-desktop .phabricator-core-menu-icon { top: 9px; left: 6px; } .device .phabricator-core-menu-icon { left: 6px; } .device-desktop .phabricator-core-menu .phabricator-core-menu-item-profile { border-width: 0 1px; border-style: solid; border-color: #44494d; margin: 0 8px; } /* - Application Menu ---------------------------------------------------------- Styles unique to the application menu (right button on mobile). */ .device .phabricator-application-menu-expanded .phabricator-application-menu { display: block; padding-top: 44px; } .phabricator-application-menu { display: none; } .phabricator-application-menu .phabricator-menu-item-type-link .phabricator-menu-item-name { padding-left: 12px; } .device .phabricator-application-menu-expanded .phabricator-application-menu { display: block; padding-top: 44px; } diff --git a/webroot/rsrc/css/application/config/config-options.css b/webroot/rsrc/css/application/config/config-options.css index f7ba294c92..e821dc57ef 100644 --- a/webroot/rsrc/css/application/config/config-options.css +++ b/webroot/rsrc/css/application/config/config-options.css @@ -1,47 +1,47 @@ /** * @provides config-options-css */ .config-option-table { width: 100%; border-collapse: collapse; border: 1px solid #cccccc; } .config-option-table th, .config-option-table td { padding: 4px 12px; border: 1px solid #cccccc; } .config-option-table th { background: #e9e9e9; text-align: right; white-space: nowrap; } .config-option-table th em { font-weight: normal; color: #666666; } .config-option-table td { color: #333333; width: 100%; } .config-option-table .column-labels th { font-weight: bold; color: #333333; text-align: center; background: #e0e0e0; } .config-options-current-value { - padding: 0 6px 2px; + padding: 0 10px 8px; white-space: pre-wrap; } .config-options-current-value span { - color: #666666; + color: #777; } diff --git a/webroot/rsrc/css/application/conpherence/header-pane.css b/webroot/rsrc/css/application/conpherence/header-pane.css index 37acd45523..d007091de3 100644 --- a/webroot/rsrc/css/application/conpherence/header-pane.css +++ b/webroot/rsrc/css/application/conpherence/header-pane.css @@ -1,41 +1,50 @@ /** * @provides conpherence-header-pane-css */ +#conpherence-main-pane { + position: relative; +} + .conpherence-header-pane { border-bottom: 1px solid #ccc; background: #fff; - height: 50px; + height: 80px; width: 100%; } .conpherence-header-pane .edit { - position: relative; float: right; margin: 16px 16px 0px 0px; + height: 50px; + width: 50px; + background-image: url('/rsrc/image/actions/edit.png'); } .conpherence-header-pane .header-image { position: absolute; + top: 15px; + left: 15px; height: 50px; width: 50px; } .conpherence-header-pane .title { position: relative; font-size: 16px; - left: 62px; - top: 6px; + font-weight: bold; + left: 77px; + top: 21px; max-width: 80%; overflow-x: auto; } .conpherence-header-pane .subtitle { position: relative; - left: 62px; - top: 6px; + left: 77px; + top: 21px; color: #bfbfbf; max-width: 80%; } diff --git a/webroot/rsrc/css/application/conpherence/menu.css b/webroot/rsrc/css/application/conpherence/menu.css index 07417b8be9..0558de8204 100644 --- a/webroot/rsrc/css/application/conpherence/menu.css +++ b/webroot/rsrc/css/application/conpherence/menu.css @@ -1,121 +1,124 @@ /** * @provides conpherence-menu-css */ .no-conpherences-menu-item { - color: #ffffff; + color: #a1a5a9; border-top: solid 1px #3B3D3E; - padding: 20px 0px 20px 66px; + padding: 20px 0; + margin: 0px auto; + width: 320px; + text-align: center; } .conpherence-menu .phabricator-nav-column-background, .conpherence-menu .phabricator-nav-local { width: 320px; } .conpherence-menu .phabricator-nav-local { top: 44px; bottom: 0px; } .conpherence-menu .phabricator-nav-drag { left: 320px; } .device-desktop .conpherence-menu .phabricator-nav-content { margin-left: 320px !important; } .conpherence-menu .phabricator-menu-view { overflow-x: hidden; overflow-y: auto; margin-bottom: 0; } .conpherence-menu .conpherence-menu-item-view { display: block; height: 70px; width: 100%; overflow: hidden; position: relative; text-decoration: none; border-top: solid 1px #3B3D3E; border-bottom: solid 1px #1C1F21; border-right: 0; border-left: 2px solid transparent; } .conpherence-menu .conpherence-selected { background: rgba(0, 0, 0, .6); border-left: 2px solid #66CCFF; } .conpherence-menu .conpherence-menu-item-view:hover { background-image: url('/rsrc/image/texture/dark-menu-hover.png'); } .conpherence-menu .conpherence-menu-item-view .conpherence-menu-item-image { top: 6px; left: 6px; display: block; position: absolute; width: 50px; height: 50px; border: 4px solid rgb(29, 32, 34); border-radius: 2px; } .conpherence-menu .conpherence-menu-item-view .conpherence-menu-item-title { display: block; margin-top: 12px; margin-left: 70px; text-align: left; font-weight: bold; font-size: 12px; color: #ffffff; text-shadow: 0px 1px 1px #000000; } .conpherence-menu .conpherence-menu-item-view .conpherence-menu-item-subtitle { display: block; color: #bfbfbf; font-size: 11px; margin-top: 2px; margin-left: 70px; font-style: italic; } .conpherence-menu .conpherence-menu-item-view .conpherence-menu-item-message-text { display: block; color: #66CCFF; font-size: 12px; margin-top: 4px; margin-left: 70px; } .conpherence-menu .conpherence-menu-item-view .conpherence-menu-item-unread-count { position: absolute; left: 48px; top: 3px; background: #f00; border-radius: 10px; color: white; font-weight: bold; padding: 1px 6px 2px; border: 1px solid #a00; font-size: 12px; } .conpherence-menu .hide-unread-count .conpherence-menu-item-unread-count, .conpherence-menu .conpherence-selected .conpherence-menu-item-unread-count { display: none; } .conpherence-menu .conpherence-menu-item-view .conpherence-menu-item-date { position: absolute; top: 10px; right: 12px; color: white; font-size: 12px; } diff --git a/webroot/rsrc/css/application/conpherence/message-pane.css b/webroot/rsrc/css/application/conpherence/message-pane.css index 25975815c3..e714b9f37f 100644 --- a/webroot/rsrc/css/application/conpherence/message-pane.css +++ b/webroot/rsrc/css/application/conpherence/message-pane.css @@ -1,95 +1,99 @@ /** * @provides conpherence-message-pane-css */ .conpherence-message-pane { position: fixed; left: 320px; top: 94px; min-width: 320px; width: auto; height: 100%; margin: 0px 320px 0px 0px; } .conpherence-message-pane .conpherence-messages { position: fixed; left: 320px; right: 321px; - top: 94px; - bottom: 225px; + top: 124px; + bottom: 142px; overflow-y: auto; + box-shadow: inset 1px 5px 5px rgba(0,0,0,0.1); } .conpherence-message-pane .phabricator-form-view { border-width: 0; background: none; - height: 224px; + height: 143px; padding: 0; position: fixed; bottom: 0; left: 320px; right: 321px; } .device-tablet .conpherence-message-pane .phabricator-form-view, .device-tablet .conpherence-message-pane .conpherence-messages, .device-tablet .conpherence-message-pane { left: 0px; } .conpherence-message-pane .aphront-form-input { margin: 0; width: 100%; } .conpherence-message-pane .phabricator-transaction-view { - margin: 1em 1.25em 1em 1.25em; - display: block; + margin: 10px 0 10px 15px; } .conpherence-message-pane .phabricator-transaction-detail { border-width: 0; } .conpherence-message-pane .phabricator-transaction-header { background: none; } .conpherence-message-pane .phabricator-transaction-info { background: none; } .conpherence-message-pane .phabricator-transaction-content { background: none; } .conpherence-message-pane .conpherence-edited .phabricator-transaction-content { - font-size: 12px; - padding: 0em 1em 0em 1em; + padding: 0 1em 0 1em; margin-top: -4px; } .conpherence-message-pane .aphront-form-control { padding: 0; } .conpherence-message-pane .aphront-form-control-submit { margin-right: 8px; } .conpherence-message-pane .remarkup-assist-bar { border-width: 1px 0 0; border-color: #CCC; + border-bottom: transparent; } .conpherence-message-pane .remarkup-assist-textarea { - border-width: 1px 0 1px 0; - border-color: #CCC; + border-width: 0 0 1px 0; + border-color: #e7e7e7; } .conpherence-message-pane .remarkup-assist-textarea:focus { outline: none; } +.conpherence-message-pane .aphront-form-input textarea { + padding: 6px; + height: 6em; +} diff --git a/webroot/rsrc/css/application/conpherence/widget-pane.css b/webroot/rsrc/css/application/conpherence/widget-pane.css index 9c5a3c0c8f..224adc2db5 100644 --- a/webroot/rsrc/css/application/conpherence/widget-pane.css +++ b/webroot/rsrc/css/application/conpherence/widget-pane.css @@ -1,19 +1,20 @@ /** * @provides conpherence-widget-pane-css */ .conpherence-widget-pane { position: fixed; right: 0px; - top: 94px; + top: 125px; width: 320px; height: 100%; border-width: 0 0 0 1px; border-color: #CCC; border-style: solid; + background: url('/rsrc/image/texture/dust_background.jpg'); } .conpherence-widget-pane .aphront-form-input { margin: 0; width: 100%; } diff --git a/webroot/rsrc/css/layout/phabricator-object-item-list-view.css b/webroot/rsrc/css/layout/phabricator-object-item-list-view.css index 25c01eabb6..adc8c3ee8a 100644 --- a/webroot/rsrc/css/layout/phabricator-object-item-list-view.css +++ b/webroot/rsrc/css/layout/phabricator-object-item-list-view.css @@ -1,179 +1,188 @@ /** * @provides phabricator-object-item-list-view-css */ .phabricator-object-item-list-view { padding: 8px 6px; background: #f4f5f6; } +.phabricator-object-item-list-view.phabricator-object-list-stackable .phabricator-object-item { + margin: -1px 0 0 0; +} + .device-desktop .phabricator-object-item-list-view { padding: 20px; } .phabricator-object-item { background: #ffffff; border-style: solid; - border-color: #d7d7d7 #e4e3e4 #bcbcbd #d7d7d7; + border-color: #c0c5d1; border-width: 1px 1px 1px 3px; - margin: 3px 0; + margin: 5px 0; overflow: hidden; box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.10); } +.phabricator-object-list-stackable .phabricator-object-item { + border-width: 1px; +} + .device-desktop .phabricator-object-item { margin: 0 0 5px 0; } .phabricator-object-item-name { display: block; - padding: 4px 8px 4px; + padding: 8px 10px 2px; font-weight: bold; + font-size: 14px; } .phabricator-object-item-content { overflow: hidden; } /* - Attribute List ------------------------------------------------------------ Object attributes, commonly used to render created date, etc. */ .phabricator-object-item-attributes { - padding: 0px 8px 4px; + padding: 0px 10px 8px; } .phabricator-object-item-attribute { display: inline; - color: #555555; - font-size: 11px; + color: #777; + font-size: 13px; } .phabricator-object-item-attribute-spacer { padding: 0 4px; } /* - Icons --------------------------------------------------------------------- Icons, which show object state. On mobile, they are rendered without labels to save space. */ .phabricator-object-item-icons { float: right; - padding: 2px 4px 0; + padding: 10px 10px 0; } /* NOTE: The main content is an "overflow: hidden" div which we give a right margin so it doesn't overlap the icons. The margin is slightly larger than the width + padding of the icon div, so the icons have some space even if the content is wider than available space. */ .device-desktop .phabricator-object-item-icons { width: 120px; } .device-desktop .phabricator-object-item-content { margin-right: 132px; } .device .phabricator-object-item-icons { width: 18px; } .device .phabricator-object-item-content { margin-right: 30px; } .device .phabricator-object-item-icon-label { display: none; vertical-align: middle; } .phabricator-object-item-icon { position: relative; font-size: 11px; color: #666666; text-align: right; white-space: nowrap; overflow: hidden; min-height: 18px; line-height: 18px; } .device-desktop .phabricator-object-item-icon { padding-right: 22px; } .phabricator-object-item-icon-image { position: absolute; right: 2px; top: 2px; width: 14px; height: 14px; } /* - Bar Colors ---------------------------------------------------------------- Colors for the left-hand border bars, used to indicate object status or other attributes. */ .phabricator-object-item-bar-color-red { border-left-color: #cc0000; } .phabricator-object-item-bar-color-orange { border-left-color: #cc7300; } .phabricator-object-item-bar-color-yellow { border-left-color: #ccc000; } .phabricator-object-item-bar-color-green { border-left-color: #009b2d; } .phabricator-object-item-bar-color-sky { border-left-color: #6498cf; } .phabricator-object-item-bar-color-blue { border-left-color: #00659a; } .phabricator-object-item-bar-color-indigo { border-left-color: #3a00cc; } .phabricator-object-item-bar-color-violet { border-left-color: #67009b; } .phabricator-object-item-bar-color-grey { border-left-color: #999999; } .phabricator-object-item-bar-color-black { border-left-color: #333333; } /* - Effects ------------------------------------------------------------------- Effects like highlighted items. */ .phabricator-object-item-highlighted { background: #ffff88; } diff --git a/webroot/rsrc/css/layout/phabricator-source-code-view.css b/webroot/rsrc/css/layout/phabricator-source-code-view.css index f12e248c2b..fcd4058225 100644 --- a/webroot/rsrc/css/layout/phabricator-source-code-view.css +++ b/webroot/rsrc/css/layout/phabricator-source-code-view.css @@ -1,45 +1,45 @@ /** * @provides phabricator-source-code-view-css */ .phabricator-source-code-container { overflow-x: auto; overflow-y: hidden; } .phabricator-source-code { white-space: pre-wrap; padding: 2px 8px 1px; } .phabricator-source-line { text-align: right; padding: 2px 6px 1px 12px; border-right: 1px solid #dbdbdb; font-weight: bold; color: #555555; /* When the user selects rows of source, don't visibly select the line numbers beside them. We use JS to strip the line numbers out when the user copies the text. */ -moz-user-select: -moz-none; -khtml-user-select: none; -webkit-user-select: none; -ms-user-select: none; user-select: none; } .phabricator-source-code-summary { - margin-bottom: 4px; + padding-bottom: 8px; } /* If a Paste has enormously long lines, truncate them in the summary on the list page. They'll be fully visible on the Paste itself. */ .phabricator-source-code-summary .phabricator-source-code-container { overflow-x: hidden; } .phabricator-source-code-summary .phabricator-source-code { white-space: nowrap; } diff --git a/webroot/rsrc/css/sprite-apps-large.css b/webroot/rsrc/css/sprite-apps-large.css index 62746eca15..6d35b7d401 100644 --- a/webroot/rsrc/css/sprite-apps-large.css +++ b/webroot/rsrc/css/sprite-apps-large.css @@ -1,627 +1,643 @@ /** * @provides sprite-apps-large-css * @generated */ .sprite-apps-large { background-image: url(/rsrc/image/sprite-apps-large.png); background-repeat: no-repeat; } @media only screen and (min-device-pixel-ratio: 1.5), only screen and (-webkit-min-device-pixel-ratio: 1.5) { .sprite-apps-large { background-image: url(/rsrc/image/sprite-apps-large-X2.png); background-size: 348px 377px; } } .app-application-light-large { background-position: 0px 0px; } .app-application-dark-large { background-position: -29px 0px; } .app-application-blue-large, .phabricator-crumb-view:hover .app-application-dark-large { background-position: -58px 0px; } .app-application-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-application-light-large { background-position: -87px 0px; } .app-audit-light-large { background-position: -116px 0px; } .app-audit-dark-large { background-position: -145px 0px; } .app-audit-blue-large, .phabricator-crumb-view:hover .app-audit-dark-large { background-position: -174px 0px; } .app-audit-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-audit-light-large { background-position: -203px 0px; } .app-calendar-light-large { background-position: -232px 0px; } .app-calendar-dark-large { background-position: -261px 0px; } .app-calendar-blue-large, .phabricator-crumb-view:hover .app-calendar-dark-large { background-position: -290px 0px; } .app-calendar-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-calendar-light-large { background-position: -319px 0px; } .app-conduit-light-large { background-position: 0px -29px; } .app-conduit-dark-large { background-position: -29px -29px; } .app-conduit-blue-large, .phabricator-crumb-view:hover .app-conduit-dark-large { background-position: -58px -29px; } .app-conduit-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-conduit-light-large { background-position: -87px -29px; } -.app-countdown-light-large { +.app-conpherence-light-large { background-position: -116px -29px; } -.app-countdown-dark-large { +.app-conpherence-dark-large { background-position: -145px -29px; } -.app-countdown-blue-large, .phabricator-crumb-view:hover .app-countdown-dark-large { +.app-conpherence-blue-large, .phabricator-crumb-view:hover .app-conpherence-dark-large { background-position: -174px -29px; } -.app-countdown-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-countdown-light-large { +.app-conpherence-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-conpherence-light-large { background-position: -203px -29px; } -.app-daemon-light-large { +.app-countdown-light-large { background-position: -232px -29px; } -.app-daemon-dark-large { +.app-countdown-dark-large { background-position: -261px -29px; } -.app-daemon-blue-large, .phabricator-crumb-view:hover .app-daemon-dark-large { +.app-countdown-blue-large, .phabricator-crumb-view:hover .app-countdown-dark-large { background-position: -290px -29px; } -.app-daemon-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-daemon-light-large { +.app-countdown-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-countdown-light-large { background-position: -319px -29px; } -.app-differential-light-large { +.app-daemon-light-large { background-position: 0px -58px; } -.app-differential-dark-large { +.app-daemon-dark-large { background-position: -29px -58px; } -.app-differential-blue-large, .phabricator-crumb-view:hover .app-differential-dark-large { +.app-daemon-blue-large, .phabricator-crumb-view:hover .app-daemon-dark-large { background-position: -58px -58px; } -.app-differential-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-differential-light-large { +.app-daemon-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-daemon-light-large { background-position: -87px -58px; } -.app-diffusion-light-large { +.app-differential-light-large { background-position: -116px -58px; } -.app-diffusion-dark-large { +.app-differential-dark-large { background-position: -145px -58px; } -.app-diffusion-blue-large, .phabricator-crumb-view:hover .app-diffusion-dark-large { +.app-differential-blue-large, .phabricator-crumb-view:hover .app-differential-dark-large { background-position: -174px -58px; } -.app-diffusion-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-diffusion-light-large { +.app-differential-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-differential-light-large { background-position: -203px -58px; } -.app-diviner-light-large { +.app-diffusion-light-large { background-position: -232px -58px; } -.app-diviner-dark-large { +.app-diffusion-dark-large { background-position: -261px -58px; } -.app-diviner-blue-large, .phabricator-crumb-view:hover .app-diviner-dark-large { +.app-diffusion-blue-large, .phabricator-crumb-view:hover .app-diffusion-dark-large { background-position: -290px -58px; } -.app-diviner-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-diviner-light-large { +.app-diffusion-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-diffusion-light-large { background-position: -319px -58px; } -.app-drydock-light-large { +.app-diviner-light-large { background-position: 0px -87px; } -.app-drydock-dark-large { +.app-diviner-dark-large { background-position: -29px -87px; } -.app-drydock-blue-large, .phabricator-crumb-view:hover .app-drydock-dark-large { +.app-diviner-blue-large, .phabricator-crumb-view:hover .app-diviner-dark-large { background-position: -58px -87px; } -.app-drydock-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-drydock-light-large { +.app-diviner-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-diviner-light-large { background-position: -87px -87px; } -.app-fact-light-large { +.app-drydock-light-large { background-position: -116px -87px; } -.app-fact-dark-large { +.app-drydock-dark-large { background-position: -145px -87px; } -.app-fact-blue-large, .phabricator-crumb-view:hover .app-fact-dark-large { +.app-drydock-blue-large, .phabricator-crumb-view:hover .app-drydock-dark-large { background-position: -174px -87px; } -.app-fact-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-fact-light-large { +.app-drydock-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-drydock-light-large { background-position: -203px -87px; } -.app-feed-light-large { +.app-fact-light-large { background-position: -232px -87px; } -.app-feed-dark-large { +.app-fact-dark-large { background-position: -261px -87px; } -.app-feed-blue-large, .phabricator-crumb-view:hover .app-feed-dark-large { +.app-fact-blue-large, .phabricator-crumb-view:hover .app-fact-dark-large { background-position: -290px -87px; } -.app-feed-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-feed-light-large { +.app-fact-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-fact-light-large { background-position: -319px -87px; } -.app-files-light-large { +.app-feed-light-large { background-position: 0px -116px; } -.app-files-dark-large { +.app-feed-dark-large { background-position: -29px -116px; } -.app-files-blue-large, .phabricator-crumb-view:hover .app-files-dark-large { +.app-feed-blue-large, .phabricator-crumb-view:hover .app-feed-dark-large { background-position: -58px -116px; } -.app-files-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-files-light-large { +.app-feed-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-feed-light-large { background-position: -87px -116px; } -.app-flags-light-large { +.app-files-light-large { background-position: -116px -116px; } -.app-flags-dark-large { +.app-files-dark-large { background-position: -145px -116px; } -.app-flags-blue-large, .phabricator-crumb-view:hover .app-flags-dark-large { +.app-files-blue-large, .phabricator-crumb-view:hover .app-files-dark-large { background-position: -174px -116px; } -.app-flags-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-flags-light-large { +.app-files-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-files-light-large { background-position: -203px -116px; } -.app-help-light-large { +.app-flags-light-large { background-position: -232px -116px; } -.app-help-dark-large { +.app-flags-dark-large { background-position: -261px -116px; } -.app-help-blue-large, .phabricator-crumb-view:hover .app-help-dark-large { +.app-flags-blue-large, .phabricator-crumb-view:hover .app-flags-dark-large { background-position: -290px -116px; } -.app-help-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-help-light-large { +.app-flags-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-flags-light-large { background-position: -319px -116px; } -.app-herald-light-large { +.app-help-light-large { background-position: 0px -145px; } -.app-herald-dark-large { +.app-help-dark-large { background-position: -29px -145px; } -.app-herald-blue-large, .phabricator-crumb-view:hover .app-herald-dark-large { +.app-help-blue-large, .phabricator-crumb-view:hover .app-help-dark-large { background-position: -58px -145px; } -.app-herald-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-herald-light-large { +.app-help-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-help-light-large { background-position: -87px -145px; } -.app-home-light-large { +.app-herald-light-large { background-position: -116px -145px; } -.app-home-dark-large { +.app-herald-dark-large { background-position: -145px -145px; } -.app-home-blue-large, .phabricator-crumb-view:hover .app-home-dark-large { +.app-herald-blue-large, .phabricator-crumb-view:hover .app-herald-dark-large { background-position: -174px -145px; } -.app-home-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-home-light-large { +.app-herald-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-herald-light-large { background-position: -203px -145px; } -.app-logo-light-large { +.app-home-light-large { background-position: -232px -145px; } -.app-logo-dark-large { +.app-home-dark-large { background-position: -261px -145px; } -.app-logo-blue-large, .phabricator-crumb-view:hover .app-logo-dark-large { +.app-home-blue-large, .phabricator-crumb-view:hover .app-home-dark-large { background-position: -290px -145px; } -.app-logo-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-logo-light-large { +.app-home-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-home-light-large { background-position: -319px -145px; } -.app-macro-light-large { +.app-logo-light-large { background-position: 0px -174px; } -.app-macro-dark-large { +.app-logo-dark-large { background-position: -29px -174px; } -.app-macro-blue-large, .phabricator-crumb-view:hover .app-macro-dark-large { +.app-logo-blue-large, .phabricator-crumb-view:hover .app-logo-dark-large { background-position: -58px -174px; } -.app-macro-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-macro-light-large { +.app-logo-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-logo-light-large { background-position: -87px -174px; } -.app-mail-light-large { +.app-macro-light-large { background-position: -116px -174px; } -.app-mail-dark-large { +.app-macro-dark-large { background-position: -145px -174px; } -.app-mail-blue-large, .phabricator-crumb-view:hover .app-mail-dark-large { +.app-macro-blue-large, .phabricator-crumb-view:hover .app-macro-dark-large { background-position: -174px -174px; } -.app-mail-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-mail-light-large { +.app-macro-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-macro-light-large { background-position: -203px -174px; } -.app-maniphest-light-large { +.app-mail-light-large { background-position: -232px -174px; } -.app-maniphest-dark-large { +.app-mail-dark-large { background-position: -261px -174px; } -.app-maniphest-blue-large, .phabricator-crumb-view:hover .app-maniphest-dark-large { +.app-mail-blue-large, .phabricator-crumb-view:hover .app-mail-dark-large { background-position: -290px -174px; } -.app-maniphest-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-maniphest-light-large { +.app-mail-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-mail-light-large { background-position: -319px -174px; } -.app-metamta-light-large { +.app-maniphest-light-large { background-position: 0px -203px; } -.app-metamta-dark-large { +.app-maniphest-dark-large { background-position: -29px -203px; } -.app-metamta-blue-large, .phabricator-crumb-view:hover .app-metamta-dark-large { +.app-maniphest-blue-large, .phabricator-crumb-view:hover .app-maniphest-dark-large { background-position: -58px -203px; } -.app-metamta-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-metamta-light-large { +.app-maniphest-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-maniphest-light-large { background-position: -87px -203px; } -.app-owners-light-large { +.app-metamta-light-large { background-position: -116px -203px; } -.app-owners-dark-large { +.app-metamta-dark-large { background-position: -145px -203px; } -.app-owners-blue-large, .phabricator-crumb-view:hover .app-owners-dark-large { +.app-metamta-blue-large, .phabricator-crumb-view:hover .app-metamta-dark-large { background-position: -174px -203px; } -.app-owners-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-owners-light-large { +.app-metamta-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-metamta-light-large { background-position: -203px -203px; } -.app-paste-light-large { +.app-owners-light-large { background-position: -232px -203px; } -.app-paste-dark-large { +.app-owners-dark-large { background-position: -261px -203px; } -.app-paste-blue-large, .phabricator-crumb-view:hover .app-paste-dark-large { +.app-owners-blue-large, .phabricator-crumb-view:hover .app-owners-dark-large { background-position: -290px -203px; } -.app-paste-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-paste-light-large { +.app-owners-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-owners-light-large { background-position: -319px -203px; } -.app-people-light-large { +.app-paste-light-large { background-position: 0px -232px; } -.app-people-dark-large { +.app-paste-dark-large { background-position: -29px -232px; } -.app-people-blue-large, .phabricator-crumb-view:hover .app-people-dark-large { +.app-paste-blue-large, .phabricator-crumb-view:hover .app-paste-dark-large { background-position: -58px -232px; } -.app-people-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-people-light-large { +.app-paste-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-paste-light-large { background-position: -87px -232px; } -.app-phame-light-large { +.app-people-light-large { background-position: -116px -232px; } -.app-phame-dark-large { +.app-people-dark-large { background-position: -145px -232px; } -.app-phame-blue-large, .phabricator-crumb-view:hover .app-phame-dark-large { +.app-people-blue-large, .phabricator-crumb-view:hover .app-people-dark-large { background-position: -174px -232px; } -.app-phame-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-phame-light-large { +.app-people-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-people-light-large { background-position: -203px -232px; } -.app-phid-light-large { +.app-phame-light-large { background-position: -232px -232px; } -.app-phid-dark-large { +.app-phame-dark-large { background-position: -261px -232px; } -.app-phid-blue-large, .phabricator-crumb-view:hover .app-phid-dark-large { +.app-phame-blue-large, .phabricator-crumb-view:hover .app-phame-dark-large { background-position: -290px -232px; } -.app-phid-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-phid-light-large { +.app-phame-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-phame-light-large { background-position: -319px -232px; } -.app-pholio-light-large { +.app-phid-light-large { background-position: 0px -261px; } -.app-pholio-dark-large { +.app-phid-dark-large { background-position: -29px -261px; } -.app-pholio-blue-large, .phabricator-crumb-view:hover .app-pholio-dark-large { +.app-phid-blue-large, .phabricator-crumb-view:hover .app-phid-dark-large { background-position: -58px -261px; } -.app-pholio-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-pholio-light-large { +.app-phid-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-phid-light-large { background-position: -87px -261px; } -.app-phpast-light-large { +.app-pholio-light-large { background-position: -116px -261px; } -.app-phpast-dark-large { +.app-pholio-dark-large { background-position: -145px -261px; } -.app-phpast-blue-large, .phabricator-crumb-view:hover .app-phpast-dark-large { +.app-pholio-blue-large, .phabricator-crumb-view:hover .app-pholio-dark-large { background-position: -174px -261px; } -.app-phpast-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-phpast-light-large { +.app-pholio-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-pholio-light-large { background-position: -203px -261px; } -.app-phriction-light-large { +.app-phpast-light-large { background-position: -232px -261px; } -.app-phriction-dark-large { +.app-phpast-dark-large { background-position: -261px -261px; } -.app-phriction-blue-large, .phabricator-crumb-view:hover .app-phriction-dark-large { +.app-phpast-blue-large, .phabricator-crumb-view:hover .app-phpast-dark-large { background-position: -290px -261px; } -.app-phriction-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-phriction-light-large { +.app-phpast-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-phpast-light-large { background-position: -319px -261px; } -.app-ponder-light-large { +.app-phriction-light-large { background-position: 0px -290px; } -.app-ponder-dark-large { +.app-phriction-dark-large { background-position: -29px -290px; } -.app-ponder-blue-large, .phabricator-crumb-view:hover .app-ponder-dark-large { +.app-phriction-blue-large, .phabricator-crumb-view:hover .app-phriction-dark-large { background-position: -58px -290px; } -.app-ponder-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-ponder-light-large { +.app-phriction-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-phriction-light-large { background-position: -87px -290px; } -.app-power-light-large { +.app-ponder-light-large { background-position: -116px -290px; } -.app-power-dark-large { +.app-ponder-dark-large { background-position: -145px -290px; } -.app-power-blue-large, .phabricator-crumb-view:hover .app-power-dark-large { +.app-ponder-blue-large, .phabricator-crumb-view:hover .app-ponder-dark-large { background-position: -174px -290px; } -.app-power-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-power-light-large { +.app-ponder-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-ponder-light-large { background-position: -203px -290px; } -.app-projects-light-large { +.app-power-light-large { background-position: -232px -290px; } -.app-projects-dark-large { +.app-power-dark-large { background-position: -261px -290px; } -.app-projects-blue-large, .phabricator-crumb-view:hover .app-projects-dark-large { +.app-power-blue-large, .phabricator-crumb-view:hover .app-power-dark-large { background-position: -290px -290px; } -.app-projects-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-projects-light-large { +.app-power-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-power-light-large { background-position: -319px -290px; } -.app-repositories-light-large { +.app-projects-light-large { background-position: 0px -319px; } -.app-repositories-dark-large { +.app-projects-dark-large { background-position: -29px -319px; } -.app-repositories-blue-large, .phabricator-crumb-view:hover .app-repositories-dark-large { +.app-projects-blue-large, .phabricator-crumb-view:hover .app-projects-dark-large { background-position: -58px -319px; } -.app-repositories-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-repositories-light-large { +.app-projects-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-projects-light-large { background-position: -87px -319px; } -.app-settings-light-large { +.app-repositories-light-large { background-position: -116px -319px; } -.app-settings-dark-large { +.app-repositories-dark-large { background-position: -145px -319px; } -.app-settings-blue-large, .phabricator-crumb-view:hover .app-settings-dark-large { +.app-repositories-blue-large, .phabricator-crumb-view:hover .app-repositories-dark-large { background-position: -174px -319px; } -.app-settings-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-settings-light-large { +.app-repositories-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-repositories-light-large { background-position: -203px -319px; } -.app-setup-light-large { +.app-settings-light-large { background-position: -232px -319px; } -.app-setup-dark-large { +.app-settings-dark-large { background-position: -261px -319px; } -.app-setup-blue-large, .phabricator-crumb-view:hover .app-setup-dark-large { +.app-settings-blue-large, .phabricator-crumb-view:hover .app-settings-dark-large { background-position: -290px -319px; } -.app-setup-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-setup-light-large { +.app-settings-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-settings-light-large { background-position: -319px -319px; } -.app-slowvote-light-large { +.app-setup-light-large { background-position: 0px -348px; } -.app-slowvote-dark-large { +.app-setup-dark-large { background-position: -29px -348px; } -.app-slowvote-blue-large, .phabricator-crumb-view:hover .app-slowvote-dark-large { +.app-setup-blue-large, .phabricator-crumb-view:hover .app-setup-dark-large { background-position: -58px -348px; } -.app-slowvote-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-slowvote-light-large { +.app-setup-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-setup-light-large { background-position: -87px -348px; } -.app-uiexamples-light-large { +.app-slowvote-light-large { background-position: -116px -348px; } -.app-uiexamples-dark-large { +.app-slowvote-dark-large { background-position: -145px -348px; } -.app-uiexamples-blue-large, .phabricator-crumb-view:hover .app-uiexamples-dark-large { +.app-slowvote-blue-large, .phabricator-crumb-view:hover .app-slowvote-dark-large { background-position: -174px -348px; } -.app-uiexamples-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-uiexamples-light-large { +.app-slowvote-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-slowvote-light-large { background-position: -203px -348px; } + +.app-uiexamples-light-large { + background-position: -232px -348px; +} + +.app-uiexamples-dark-large { + background-position: -261px -348px; +} + +.app-uiexamples-blue-large, .phabricator-crumb-view:hover .app-uiexamples-dark-large { + background-position: -290px -348px; +} + +.app-uiexamples-glow-large, .device-desktop .phabricator-dark-menu a:hover .app-uiexamples-light-large { + background-position: -319px -348px; +} diff --git a/webroot/rsrc/css/sprite-apps.css b/webroot/rsrc/css/sprite-apps.css index 3d113f1703..2ed08533c2 100644 --- a/webroot/rsrc/css/sprite-apps.css +++ b/webroot/rsrc/css/sprite-apps.css @@ -1,171 +1,175 @@ /** * @provides sprite-apps-css * @generated */ .sprite-apps { background-image: url(/rsrc/image/sprite-apps.png); background-repeat: no-repeat; } @media only screen and (min-device-pixel-ratio: 1.5), only screen and (-webkit-min-device-pixel-ratio: 1.5) { .sprite-apps { background-image: url(/rsrc/image/sprite-apps-X2.png); background-size: 90px 105px; } } .app-application-dark { background-position: 0px 0px; } .app-audit-dark { background-position: -15px 0px; } .app-calendar-dark { background-position: -30px 0px; } .app-conduit-dark { background-position: -45px 0px; } -.app-countdown-dark { +.app-conpherence-dark { background-position: -60px 0px; } -.app-daemon-dark { +.app-countdown-dark { background-position: -75px 0px; } -.app-differential-dark { +.app-daemon-dark { background-position: 0px -15px; } -.app-diffusion-dark { +.app-differential-dark { background-position: -15px -15px; } -.app-diviner-dark { +.app-diffusion-dark { background-position: -30px -15px; } -.app-drydock-dark { +.app-diviner-dark { background-position: -45px -15px; } -.app-fact-dark { +.app-drydock-dark { background-position: -60px -15px; } -.app-feed-dark { +.app-fact-dark { background-position: -75px -15px; } -.app-files-dark { +.app-feed-dark { background-position: 0px -30px; } -.app-flags-dark { +.app-files-dark { background-position: -15px -30px; } -.app-help-dark { +.app-flags-dark { background-position: -30px -30px; } -.app-herald-dark { +.app-help-dark { background-position: -45px -30px; } -.app-home-dark { +.app-herald-dark { background-position: -60px -30px; } -.app-logo-dark { +.app-home-dark { background-position: -75px -30px; } -.app-macro-dark { +.app-logo-dark { background-position: 0px -45px; } -.app-mail-dark { +.app-macro-dark { background-position: -15px -45px; } -.app-maniphest-dark { +.app-mail-dark { background-position: -30px -45px; } -.app-metamta-dark { +.app-maniphest-dark { background-position: -45px -45px; } -.app-owners-dark { +.app-metamta-dark { background-position: -60px -45px; } -.app-paste-dark { +.app-owners-dark { background-position: -75px -45px; } -.app-people-dark { +.app-paste-dark { background-position: 0px -60px; } -.app-phame-dark { +.app-people-dark { background-position: -15px -60px; } -.app-phid-dark { +.app-phame-dark { background-position: -30px -60px; } -.app-pholio-dark { +.app-phid-dark { background-position: -45px -60px; } -.app-phpast-dark { +.app-pholio-dark { background-position: -60px -60px; } -.app-phriction-dark { +.app-phpast-dark { background-position: -75px -60px; } -.app-ponder-dark { +.app-phriction-dark { background-position: 0px -75px; } -.app-power-dark { +.app-ponder-dark { background-position: -15px -75px; } -.app-projects-dark { +.app-power-dark { background-position: -30px -75px; } -.app-repositories-dark { +.app-projects-dark { background-position: -45px -75px; } -.app-settings-dark { +.app-repositories-dark { background-position: -60px -75px; } -.app-setup-dark { +.app-settings-dark { background-position: -75px -75px; } -.app-slowvote-dark { +.app-setup-dark { background-position: 0px -90px; } -.app-uiexamples-dark { +.app-slowvote-dark { background-position: -15px -90px; } + +.app-uiexamples-dark { + background-position: -30px -90px; +} diff --git a/webroot/rsrc/css/sprite-menu.css b/webroot/rsrc/css/sprite-menu.css index dfa3a84e16..367081901b 100644 --- a/webroot/rsrc/css/sprite-menu.css +++ b/webroot/rsrc/css/sprite-menu.css @@ -1,55 +1,59 @@ /** * @provides sprite-menu-css * @generated */ .sprite-menu { background-image: url(/rsrc/image/sprite-menu.png); background-repeat: no-repeat; } @media only screen and (min-device-pixel-ratio: 1.5), only screen and (-webkit-min-device-pixel-ratio: 1.5) { .sprite-menu { background-image: url(/rsrc/image/sprite-menu-X2.png); - background-size: 140px 127px; + background-size: 140px 88px; } } -.phabricator-main-menu-alert-bubble { - background-position: 0px -68px; -} - -.phabricator-main-menu-alert-bubble.alert-unread { - background-position: 0px -41px; -} - .alert-notifications .phabricator-main-menu-alert-icon { background-position: 0px 0px; } .alert-notifications:hover .phabricator-main-menu-alert-icon { background-position: -15px 0px; } .alert-notifications.alert-unread .phabricator-main-menu-alert-icon { - background-position: -27px -68px; + background-position: -30px 0px; } .phabricator-crumb-divider { - background-position: 0px -95px; + background-position: 0px -56px; } .menu-icon-eye { - background-position: -47px -41px; + background-position: -10px -56px; } .menu-icon-app { - background-position: -42px -68px; + background-position: -35px -56px; } .phabricator-main-menu-logo-image { + background-position: 0px -30px; +} + +.alert-notifications .phabricator-main-menu-message-icon { background-position: 0px -15px; } + +.alert-notifications:hover .phabricator-main-menu-message-icon { + background-position: -15px -15px; +} + +.alert-notifications.message-unread .phabricator-main-menu-message-icon { + background-position: -30px -15px; +} diff --git a/webroot/rsrc/image/actions/edit.png b/webroot/rsrc/image/actions/edit.png new file mode 100644 index 0000000000..b12c39f62c Binary files /dev/null and b/webroot/rsrc/image/actions/edit.png differ diff --git a/webroot/rsrc/image/sprite-apps-X2.png b/webroot/rsrc/image/sprite-apps-X2.png index 9c55c92c98..5557ad7d11 100644 Binary files a/webroot/rsrc/image/sprite-apps-X2.png and b/webroot/rsrc/image/sprite-apps-X2.png differ diff --git a/webroot/rsrc/image/sprite-apps-large-X2.png b/webroot/rsrc/image/sprite-apps-large-X2.png index 6502108978..9893a221f7 100644 Binary files a/webroot/rsrc/image/sprite-apps-large-X2.png and b/webroot/rsrc/image/sprite-apps-large-X2.png differ diff --git a/webroot/rsrc/image/sprite-apps-large.png b/webroot/rsrc/image/sprite-apps-large.png index 7b1dd2180d..e3fd9c766a 100644 Binary files a/webroot/rsrc/image/sprite-apps-large.png and b/webroot/rsrc/image/sprite-apps-large.png differ diff --git a/webroot/rsrc/image/sprite-apps.png b/webroot/rsrc/image/sprite-apps.png index f652203bc1..d941c561f5 100644 Binary files a/webroot/rsrc/image/sprite-apps.png and b/webroot/rsrc/image/sprite-apps.png differ diff --git a/webroot/rsrc/image/sprite-menu-X2.png b/webroot/rsrc/image/sprite-menu-X2.png index dde32caa00..7152466947 100644 Binary files a/webroot/rsrc/image/sprite-menu-X2.png and b/webroot/rsrc/image/sprite-menu-X2.png differ diff --git a/webroot/rsrc/image/sprite-menu.png b/webroot/rsrc/image/sprite-menu.png index dc89ff9ecf..4eb96afad6 100644 Binary files a/webroot/rsrc/image/sprite-menu.png and b/webroot/rsrc/image/sprite-menu.png differ diff --git a/webroot/rsrc/js/application/core/behavior-drag-and-drop.js b/webroot/rsrc/js/application/core/behavior-drag-and-drop.js index 4e115e1826..c5e8432910 100644 --- a/webroot/rsrc/js/application/core/behavior-drag-and-drop.js +++ b/webroot/rsrc/js/application/core/behavior-drag-and-drop.js @@ -1,103 +1,112 @@ /** * @provides javelin-behavior-aphront-drag-and-drop * @requires javelin-behavior * javelin-dom + * phabricator-file-upload * phabricator-drag-and-drop-file-upload */ JX.behavior('aphront-drag-and-drop', function(config) { // The control renders hidden by default; if we don't have support for // drag-and-drop just leave it hidden. if (!JX.PhabricatorDragAndDropFileUpload.isSupported()) { return; } // Show the control, since we have browser support. JX.$(config.control).style.display = ''; - var files = config.value || {}; + var files = {}; + if (config.value) { + for (var k in config.value) { + var file = config.value[k]; + files[k] = new JX.PhabricatorFileUpload() + .setPHID(file.phid) + .setMarkup(file.html); + } + } var pending = 0; var list = JX.$(config.list); var drop = new JX.PhabricatorDragAndDropFileUpload(JX.$(config.list)) .setURI(config.uri); drop.listen('didBeginDrag', function(e) { JX.DOM.alterClass(list, config.activatedClass, true); }); drop.listen('didEndDrag', function(e) { JX.DOM.alterClass(list, config.activatedClass, false); }); drop.listen('willUpload', function(f) { pending++; redraw(); }); drop.listen('didUpload', function(f) { files[f.getPHID()] = f; // This redraws "Upload complete!" pending--; redraw(true); // This redraws the instructions. setTimeout(redraw, 1000); }); drop.start(); redraw(); JX.DOM.listen( list, 'click', 'aphront-attached-file-view-remove', function(e) { e.kill(); delete files[e.getTarget().getAttribute('ref')]; redraw(); }); function redraw(completed) { var items = []; for (var k in files) { var file = files[k]; items.push(JX.$N('div', {}, JX.$H(file.getMarkup()))); items.push(JX.$N( 'input', { type: "hidden", name: config.name + "[" + file.getPHID() + "]", value: file.getPHID() })); } var status; var extra = ''; if (!pending) { if (completed) { status = JX.$H('Upload complete!'); } else { arrow = String.fromCharCode(0x21EA); status = JX.$H( arrow + ' Drag and Drop files here to upload them.'); extra = ' drag-and-drop-file-target'; } } else { status = JX.$H( 'Uploading ' + parseInt(pending, 10) + ' files...'); } status = JX.$N( 'div', {className: 'drag-and-drop-instructions' + extra}, status); items.push(status); JX.DOM.setContent(list, items); } });