Add missing location to "new bookmark" button on about:bookmarks

app/extensions/brave/locales/en-US/menu.properties

@@ -4,7 +4,10 @@ closeOtherTabs=Close other Tabs
 bookmarkPage=Bookmark Page
 bookmarkLink=Bookmark This Link
 bookmarkAdded=Bookmark Added
+bookmarkFolderAdding=New Bookmark Folder
+bookmarkFolderEditing=Edit Bookmark Folder
 bookmarkEdit=Edit Bookmark
+bookmarkCreateNew=Create New Bookmark
 openFile=Open File…
 openLocation=Open Location…
 openSearch=Search for "{{selectedVariable}}"

js/about/aboutActions.js

@@ -315,18 +315,27 @@ const aboutActions = {
   },
 
   /**
-   * Dispatches a message to set add/edit bookmark details
-   * If set, also indicates that add/edit is shown
-   * @param {Object} currentDetail - Properties of the bookmark to change to
-   * @param {Object} originalDetail - Properties of the bookmark to edit
-   * @param {Object} destinationDetail - Will move the added bookmark to the specified position
+   * Show the "Add Bookmark" control
+   * @param {Object} siteDetail - object bound to add/edit control
    */
-  openBookmarkEditor: function (currentDetail, originalDetail, destinationDetail) {
+  showAddBookmark: function (siteDetail) {
     aboutActions.dispatchAction({
       actionType: windowConstants.WINDOW_SET_BOOKMARK_DETAIL,
-      currentDetail,
-      originalDetail,
-      destinationDetail
+      currentDetail: siteDetail,
+      originalDetail: null,
+      destinationDetail: null,
+      shouldShowLocation: true
+    })
+  },
+
+  /**
+   * Show the "Add Bookmark" control for a folder
+   * @param {Object} siteDetail - object bound to add/edit control
+   */
+  showAddBookmarkFolder: function (siteDetail) {
+    aboutActions.dispatchAction({
+      actionType: windowConstants.WINDOW_SET_BOOKMARK_DETAIL,
+      currentDetail: siteDetail
     })
   },
 

js/about/bookmarks.js

@@ -144,7 +144,7 @@ class BookmarkTitleHeader extends ImmutableComponent {
       parentFolderId: this.props.selectedFolderId,
       tags: [siteTags.BOOKMARK]
     })
-    aboutActions.openBookmarkEditor(newBookmark)
+    aboutActions.showAddBookmark(newBookmark)
   }
   render () {
     return <div className='th-inner'>
@@ -320,7 +320,7 @@ class AboutBookmarks extends React.Component {
       parentFolderId: this.state.selectedFolderId,
       tags: [siteTags.BOOKMARK_FOLDER]
     })
-    aboutActions.openBookmarkEditor(newFolder)
+    aboutActions.showAddBookmarkFolder(newFolder)
   }
   componentDidMount () {
     this.refs.bookmarkSearch.focus()

js/components/addEditBookmark.js

@@ -44,6 +44,18 @@ class AddEditBookmark extends ImmutableComponent {
   get isFolder () {
     return siteUtil.isFolder(this.props.currentDetail)
   }
+  get heading () {
+    if (this.isFolder) {
+      return this.props.shouldShowLocation
+        ? 'bookmarkFolderEditing'
+        : 'bookmarkFolderAdding'
+    }
+    return this.props.shouldShowLocation
+      ? (!this.props.originalDetail || !this.props.originalDetail.has('location'))
+        ? 'bookmarkCreateNew'
+        : 'bookmarkEdit'
+      : 'bookmarkAdded'
+  }
   updateFolders (props) {
     this.folders = siteUtil.getFolders(this.props.sites, props.currentDetail.get('folderId'))
   }
@@ -143,11 +155,7 @@ class AddEditBookmark extends ImmutableComponent {
           withoutButtons: this.props.withoutButtons
         })} />
         <div className='bookmarkFormInner'>
-          {
-            !this.isFolder && this.props.shouldShowLocation
-            ? <h2 data-l10n-id='bookmarkEdit' />
-            : <h2 data-l10n-id='bookmarkAdded' />
-          }
+          <h2 data-l10n-id={this.heading} />
           <div className='bookmarkFormTable'>
             <div id='bookmarkName' className='bookmarkFormRow'>
               <label data-l10n-id='nameField' htmlFor='bookmarkName' />
@@ -162,7 +170,7 @@ class AddEditBookmark extends ImmutableComponent {
               : null
             }
             <div id='bookmarkParentFolder' className='bookmarkFormRow'>
-              <label data-l10n-id='parentFolderField' htmlFor='bookmarkParentFolderk' />
+              <label data-l10n-id='parentFolderField' htmlFor='bookmarkParentFolder' />
               <select value={this.props.currentDetail.get('parentFolderId')}
                 onChange={this.onParentFolderChange} >
                 <option value='0' data-l10n-id='bookmarksToolbar' />