diff --git a/Composer/packages/client/src/pages/about/About.tsx b/Composer/packages/client/src/pages/about/About.tsx index 5497da03bc..f121a823eb 100644 --- a/Composer/packages/client/src/pages/about/About.tsx +++ b/Composer/packages/client/src/pages/about/About.tsx @@ -8,80 +8,69 @@ import { Link } from 'office-ui-fabric-react/lib/Link'; import formatMessage from 'format-message'; import { RouteComponentProps } from '@reach/router'; +import { isElectron } from '../../utils/electronUtil'; + import * as about from './styles'; export const About: React.FC = () => { return ( -
-
-

{formatMessage(`About`)}

-
-
{formatMessage(`Release: `) + (process.env.COMPOSER_VERSION || 'Unknown')}
-
-

- {formatMessage( - `Bot Framework Composer is a visual authoring canvas for building bots and other types of conversational application with the Microsoft Bot Framework technology stack. With Composer you will find everything you need to build a modern, state-of-the-art conversational experience.` - )} -

-

- {formatMessage( - `Bot Framework Composer enables developers and multi-disciplinary teams to build all kinds of conversational experiences, using the latest components from the Bot Framework: SDK, LG, LU, and declarative file formats, all without writing code.` - )} +

+
+
+ {formatMessage.rich( + 'Our privacy statement is located at https://go.microsoft.com/fwlink/?LinkID=824704. You can learn more about data collection and use in the help documentation and our privacy statement. Your use of the software operates as your consent to these practices.', + { + a: ({ children }) => {children}, + } + )} +
+
+ {formatMessage.rich( + '

Copyright (c) Microsoft Corporation.

MIT License

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

', + { p: ({ children }) =>

{children}

} + )} +
+
+ {formatMessage(`Release: `) + + (isElectron() + ? (window as any).appVersion + : `${process.env.COMPOSER_VERSION}-${process.env.GIT_SHA}` || 'Unknown')} +
+
+
+
{formatMessage(`SDK runtime packages`)}
+
- {formatMessage(`Learn more`)} + {process.env.SDK_PACKAGE_VERSION || 'Unknown'} -

-
-
-
-
{formatMessage(`SDK runtime packages`)}
-
- - {process.env.SDK_PACKAGE_VERSION || 'Unknown'} - -
+
+
+ + {formatMessage(`Getting Help`)} + +
+
+ - {formatMessage(`Getting Help`)} + {formatMessage(`Terms of Use`)}
-
-
- - - {formatMessage(`Terms of Use`)} - -
-
- - - {formatMessage(`Privacy`)} - -
-
); diff --git a/Composer/packages/client/src/pages/about/styles.js b/Composer/packages/client/src/pages/about/styles.js index 5b177bc492..d2849708e9 100644 --- a/Composer/packages/client/src/pages/about/styles.js +++ b/Composer/packages/client/src/pages/about/styles.js @@ -3,28 +3,11 @@ import { css } from '@emotion/core'; import { FontWeights, FontSizes } from 'office-ui-fabric-react/lib/Styling'; -export const outline = css` - display: flex; - flex-direction: column; - height: 100%; - margin: 32px 50px 0px 32px; - border: 1px solid #979797; - overflow-x: auto; -`; export const content = css` height: 100%; `; -export const title = css` - display: block; - height: 36px; - margin: 33px 0px 0px 42px; - font-size: ${FontSizes.xLarge}; - font-weight: ${FontWeights.semibold}; - line-height: 32px; -`; - export const body = css` width: auto; margin-top: 26px; @@ -32,43 +15,41 @@ export const body = css` `; export const version = css` - font-size: ${FontSizes.large}; + font-size: ${FontSizes.medium}; font-weight: ${FontWeights.regular}; line-height: 32px; `; -export const description = css` - font-size: ${FontSizes.mediumPlus}; - font-weight: ${FontWeights.regular}; - line-height: 32px; - width: 50%; - margin-top: 20px; -`; - -export const DiagnosticsText = css` +export const diagnosticsText = css` width: 50%; font-size: 24px; margin-top: 20px; `; export const smallText = css` - margin-top: 20px; - font-size: 13px; + margin: 20px 20px 20px 0; + font-size: 14px; +`; + +export const smallerText = css` + margin: 20px 20px 20px 0; + font-size: 12px; `; -export const DiagnosticsInfoText = css` + +export const diagnosticsInfoText = css` display: flex; justify-content: space-between; width: 550px; font-size: 24px; `; -export const DiagnosticsInfoTextAlignLeft = css` +export const diagnosticsInfoTextAlignLeft = css` text-align: left; font-size: ${FontSizes.mediumPlus}; font-weight: ${FontWeights.semibold}; `; -export const DiagnosticsInfo = css` +export const diagnosticsInfo = css` margin-top: 40px; `; diff --git a/Composer/packages/client/src/pages/setting/SettingsPage.tsx b/Composer/packages/client/src/pages/setting/SettingsPage.tsx index cf6ac83a79..6dbf09f2ec 100644 --- a/Composer/packages/client/src/pages/setting/SettingsPage.tsx +++ b/Composer/packages/client/src/pages/setting/SettingsPage.tsx @@ -106,12 +106,6 @@ const SettingPage: React.FC = () => { return settingLabels.appSettings; }, [location.pathname]); - const onRenderHeaderContent = () => { - return formatMessage( - 'This Page contains detailed information about your bot. For security reasons, they are hidden by default. To test your bot or publish to Azure, you may need to provide these settings' - ); - }; - return ( = () => { pageMode={'settings'} title={title} toolbarItems={[]} - onRenderHeaderContent={onRenderHeaderContent} > https://go.microsoft.com/fwlink/?LinkID=824704. You can learn more about data collection and use in the help documentation and our privacy statement. Your use of the software operates as your consent to these practices." + }, "output_5023cf84": { "message": "Output" }, + "p_copyright_c_microsoft_corporation_p_p_mit_licens_cd145fd6": { + "message": "

Copyright (c) Microsoft Corporation.

MIT License

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

" + }, "page_number_cdee4179": { "message": "Page number" }, @@ -3740,9 +3740,6 @@ "this_page_contains_detailed_information_about_your_224a2b04": { "message": "This Page contains detailed information about your bot. For security reasons, they are hidden by default. To test your bot or publish to Azure, you may need to provide these settings." }, - "this_page_contains_detailed_information_about_your_b2b3413b": { - "message": "This Page contains detailed information about your bot. For security reasons, they are hidden by default. To test your bot or publish to Azure, you may need to provide these settings" - }, "this_publishing_profile_profilename_is_no_longer_s_eee0f447": { "message": "This publishing profile ({ profileName }) is no longer supported. You are a member of multiple Azure tenants and the profile needs to have a tenant id associated with it. You can either edit the profile by adding the `tenantId` property to it''s configuration or create a new one." },