Merge pull request #7791 from srirambv/aboutbrave

Added release notes link to about:brave
brave · Apr 4, 2017 · 8182478 · 8182478
2 parents e382111 + 07a4990
commit 8182478
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 12 deletions.
diff --git a/app/extensions/brave/locales/en-US/app.properties b/app/extensions/brave/locales/en-US/app.properties
@@ -16,6 +16,11 @@ submit=Submit
 settings=Settings
 aboutPages=About pages
 aboutBrave=About Brave
+braveInfo=Browse faster and safer with Brave.
+releaseNotes=Release Notes
+relNotesInfo1=Click
+relNotesInfo2=here
+relNotesInfo3=to view the release notes.
 versionInformation=Version Information
 listOfAboutPages=List of about pages
 history=History

diff --git a/app/localShortcuts.js b/app/localShortcuts.js
@@ -40,20 +40,20 @@ module.exports.register = (win) => {
       ['Alt+Left', messages.SHORTCUT_ACTIVE_FRAME_BACK],
       ['Alt+Right', messages.SHORTCUT_ACTIVE_FRAME_FORWARD])
   } else {
-      // Different shorcut for View Source as is common for Chrome/Safari on macOS
-      // See #7702
+    // Different shorcut for View Source as is common for Chrome/Safari on macOS
+    // See #7702
+    simpleWebContentEvents.push(
+      ['Cmd+Alt+U', messages.SHORTCUT_ACTIVE_FRAME_VIEW_SOURCE]
+    )
+
+    if (process.env.NODE_ENV !== 'development') {
+      // We're in Darwin and release or test mode...
+      // We disable for development mode because Browser level dev tools copy doesn't work.
+      // Workaround for #1060
       simpleWebContentEvents.push(
-        ['Cmd+Alt+U', messages.SHORTCUT_ACTIVE_FRAME_VIEW_SOURCE]
+        ['Cmd+C', messages.SHORTCUT_ACTIVE_FRAME_COPY]
       )
-
-      if (process.env.NODE_ENV !== 'development') {
-        // We're in Darwin and release or test mode...
-        // We disable for development mode because Browser level dev tools copy doesn't work.
-        // Workaround for #1060
-        simpleWebContentEvents.push(
-          ['Cmd+C', messages.SHORTCUT_ACTIVE_FRAME_COPY]
-        )
-      }
+    }
   }
 
   // Tab ordering shortcuts

diff --git a/js/about/brave.js b/js/about/brave.js
@@ -39,9 +39,24 @@ class AboutBrave extends React.Component {
     return <div className='siteDetailsPage'>
       <div className='siteDetailsPageHeader'>
         <div data-l10n-id='aboutBrave' className='sectionTitle' />
+        <div data-l10n-id='braveInfo' className='title' />
       </div>
 
       <div className='siteDetailsPageContent aboutBrave'>
+        <div>
+          <div className='title'>
+            <div data-l10n-id='releaseNotes' className='sectionTitle' />
+          </div>
+
+          <div className='title releaseNotes'>
+            <span data-l10n-id='relNotesInfo1' />
+            &nbsp;
+            <a className='linkText' href={`https://github.com/brave/browser-laptop/releases/tag/v${this.state.versionInformation.getIn([0, 'version'])}dev`} target='_blank' data-l10n-id='relNotesInfo2' />
+            &nbsp;
+            <span data-l10n-id='relNotesInfo3' />
+          </div>
+        </div>
+
         <div className='title'>
           <span className='sectionTitle' data-l10n-id='versionInformation' />
           <ClipboardButton
@@ -50,6 +65,7 @@ class AboutBrave extends React.Component {
             copyAction={this.onCopy}
           />
         </div>
+
         <SortableTable
           headings={['Name', 'Version']}
           rows={this.state.versionInformation.map((entry) => [

diff --git a/less/about/brave.less b/less/about/brave.less
@@ -12,5 +12,9 @@
       justify-content: space-between;
       margin-left: @aboutPageSectionPadding;
     }
+    .title.releaseNotes {
+      justify-content: inherit;
+      margin-bottom: 24px;
+    }
   }
 }