Merge pull request #1246 from substance/backlog

Backlog

Author: oliver7654

data/kitchen-sink/manifest.xml

@@ -6,7 +6,7 @@
     <asset id="fig1" type="image/jpg" path="fig1.jpg"/>
     <asset id="fig2" type="image/jpg" path="fig2.jpg"/>
     <asset id="fig3" type="image/svg+xml" path="fig3.svg"/>
-    <asset id="placeholder" type="image/png" path="placeholder.png"/>
+    <asset id="placeholder" type="image/jpg" path="placeholder.jpg"/>
     <asset id="example" type="application/zip" path="example.zip"/>
   </assets>
 </dar>

data/kitchen-sink/manuscript.xml

@@ -369,7 +369,7 @@ def read() = in.read()
             <label>Field II</label>
             <kwd>Value C</kwd>
           </kwd-group>
-          <graphic id="fig3-graphic-1" mimetype="image" mime-subtype="jpeg" xlink:href="placeholder.png" />
+          <graphic id="fig3-graphic-1" mimetype="image" mime-subtype="jpeg" xlink:href="placeholder.jpg" />
         </fig>
       </sec>
       <sec id="sec-3-3">

data/kitchen-sink/placeholder.png data/kitchen-sink/placeholder.jpgdata/kitchen-sink/placeholder.png renamed to data/kitchen-sink/placeholder.jpg

@@ -18,8 +18,8 @@ import ManuscriptContentPackage from '../shared/ManuscriptContentPackage'
 import PersistencePackage from '../../PersistencePackage'
 
 import ReferenceListComponent from '../shared/ReferenceListComponent'
-import EditXrefTool from './EditXrefTool'
-import EditExtLinkTool from './EditExtLinkTool'
+import EditXrefTool from '../shared/EditXrefTool'
+import EditExtLinkTool from '../shared/EditExtLinkTool'
 import ManuscriptEditor from './ManuscriptEditor'
 import ManuscriptTOC from './ManuscriptTOC'
 import FigureComponent from '../shared/FigureComponent'
@@ -42,21 +42,21 @@ import EditBlockFormulaCommand from '../shared/EditBlockFormulaCommand'
 import EditDispFormulaTool from './EditDispFormulaTool'
 import EditEntityCommand from '../shared/EditEntityCommand'
 import EditInlineFormulaCommand from '../shared/EditInlineFormulaCommand'
-import EditInlineFormulaTool from './EditInlineFormulaTool'
+import EditInlineFormulaTool from '../shared/EditInlineFormulaTool'
 import EditXrefCommand from '../shared/EditXrefCommand'
 import IncreaseHeadingLevelCommand from './IncreaseHeadingLevelCommand'
-import InsertCrossReferenceCommand from './InsertCrossReferenceCommand'
+import InsertCrossReferenceCommand from '../shared/InsertCrossReferenceCommand'
 import InsertDispFormulaCommand from './InsertDispFormulaCommand'
 import InsertDispQuoteCommand from './InsertDispQuoteCommand'
-import InsertExtLinkCommand from './InsertExtLinkCommand'
+import InsertExtLinkCommand from '../shared/InsertExtLinkCommand'
 import InsertFigureCommand from './InsertFigureCommand'
 import InsertFigureTool from './InsertFigureTool'
 import InsertFigurePanelTool from '../shared/InsertFigurePanelTool'
 import InsertFootnoteCommand from '../shared/InsertFootnoteCommand'
-import InsertFootnoteCrossReferenceCommand from './InsertFootnoteCrossReferenceCommand'
-import InsertInlineFormulaCommand from './InsertInlineFormulaCommand'
-import InsertInlineGraphicCommand from './InsertInlineGraphicCommand'
-import InsertInlineGraphicTool from './InsertInlineGraphicTool'
+import InsertFootnoteCrossReferenceCommand from '../shared/InsertFootnoteCrossReferenceCommand'
+import InsertInlineFormulaCommand from '../shared/InsertInlineFormulaCommand'
+import InsertInlineGraphicCommand from '../shared/InsertInlineGraphicCommand'
+import InsertInlineGraphicTool from '../shared/InsertInlineGraphicTool'
 import { CreateListCommand, ChangeListTypeCommand } from './ListCommands'
 import InsertNodeFromWorkflowCommand from './InsertNodeFromWorkflowCommand'
 import {
@@ -73,7 +73,7 @@ import {
   AddCustomMetadataFieldCommand, MoveCustomMetadataFieldCommand, RemoveCustomMetadataFieldCommand
 } from '../shared/CustomMetadataFieldCommands'
 import SwitchViewCommand from '../shared/SwitchViewCommand'
-import { BlockFormula } from '../models'
+import { BlockFormula, Figure, Reference, SupplementaryFile, Table } from '../models'
 
 export default {
   name: 'ManuscriptEditor',
@@ -209,15 +209,15 @@ export default {
       commandGroup: 'insert'
     })
     config.addCommand('insert-xref-bibr', InsertCrossReferenceCommand, {
-      refType: 'bibr',
+      refType: Reference.refType,
       commandGroup: 'insert-xref'
     })
     config.addCommand('insert-xref-figure', InsertCrossReferenceCommand, {
-      refType: 'fig',
+      refType: Figure.refType,
       commandGroup: 'insert-xref'
     })
     config.addCommand('insert-xref-file', InsertCrossReferenceCommand, {
-      refType: 'file',
+      refType: SupplementaryFile.refType,
       commandGroup: 'insert-xref'
     })
     // Note: footnote cross-references are special, because they take the current scope into account
@@ -230,7 +230,7 @@ export default {
       commandGroup: 'insert-xref'
     })
     config.addCommand('insert-xref-table', InsertCrossReferenceCommand, {
-      refType: 'table',
+      refType: Table.refType,
       commandGroup: 'insert-xref'
     })
     config.addCommand('move-down-metadata-field', MoveCustomMetadataFieldCommand, {

src/article/editor/EditorPackage.js

@@ -128,11 +128,25 @@ export default class MetadataEditor extends EditorPanel {
       sectionsEl.append(content)
     })
 
-    contentPanel.append(sectionsEl)
+    contentPanel.append(
+      sectionsEl.ref('sections'),
+      this._renderMainOverlay($$)
+    )
 
     return contentPanel
   }
 
+  _renderMainOverlay ($$) {
+    const Overlay = this.getComponent('overlay')
+    const configurator = this._getConfigurator()
+    const items = configurator.getToolPanel('main-overlay')
+    return $$(Managed(Overlay), {
+      items,
+      theme: this._getTheme(),
+      bindings: ['commandStates']
+    })
+  }
+
   _getSectionComponent (name, model) {
     return MetadataSection
   }

src/article/metadata/MetadataEditor.js

@@ -1,4 +1,4 @@
-import { AnnotationCommand, getKeyForPath } from 'substance'
+import { AnnotationCommand, EditAnnotationCommand, getKeyForPath } from 'substance'
 import {
   BasePackage, EditorBasePackage, ModelComponentPackage, FindAndReplacePackage
 } from '../../kit'
@@ -21,10 +21,25 @@ import {
   ReplaceFigurePanelImageCommand, RemoveFigurePanelCommand, OpenFigurePanelImageCommand
 } from '../shared/FigurePanelCommands'
 import EditEntityCommand from '../shared/EditEntityCommand'
+import EditExtLinkTool from '../shared/EditExtLinkTool'
+import EditInlineFormulaCommand from '../shared/EditInlineFormulaCommand'
+import EditInlineFormulaTool from '../shared/EditInlineFormulaTool'
+import EditXrefCommand from '../shared/EditXrefCommand'
+import EditXrefTool from '../shared/EditXrefTool'
 import FiguresSectionComponent from './FiguresSectionComponent'
+import InsertCrossReferenceCommand from '../shared/InsertCrossReferenceCommand'
 import InsertCustomAbstractCommand from '../shared/InsertCustomAbstractCommand'
+import InsertExtLinkCommand from '../shared/InsertExtLinkCommand'
 import InsertFigurePanelTool from '../shared/InsertFigurePanelTool'
 import InsertFootnoteCommand from '../shared/InsertFootnoteCommand'
+import InsertFootnoteCrossReferenceCommand from '../shared/InsertFootnoteCrossReferenceCommand'
+import InsertInlineFormulaCommand from '../shared/InsertInlineFormulaCommand'
+import InsertInlineGraphicCommand from '../shared/InsertInlineGraphicCommand'
+import InsertInlineGraphicTool from '../shared/InsertInlineGraphicTool'
+import {
+  InsertTableCommand, InsertCellsCommand, DeleteCellsCommand,
+  TableSelectAllCommand, ToggleCellHeadingCommand, ToggleCellMergeCommand
+} from '../editor/TableCommands'
 import OpenFigurePanelImageTool from '../shared/OpenFigurePanelImageTool'
 import ReplaceFigurePanelTool from '../shared/ReplaceFigurePanelTool'
 import TableFigureComponent from '../shared/TableFigureComponent'
@@ -35,6 +50,7 @@ import {
 import RemoveReferenceCommand from './RemoveReferenceCommand'
 import RemoveItemCommand from '../shared/RemoveItemCommand'
 import SwitchViewCommand from '../shared/SwitchViewCommand'
+import { BlockFormula, Figure, Reference, SupplementaryFile, Table } from '../models'
 
 export default {
   name: 'ArticleMetadata',
@@ -111,14 +127,91 @@ export default {
     config.addCommand('add-figure-panel', AddFigurePanelCommand, {
       commandGroup: 'figure-panel'
     })
+    config.addCommand('create-external-link', InsertExtLinkCommand, {
+      nodeType: 'external-link',
+      accelerator: 'CommandOrControl+K',
+      commandGroup: 'formatting'
+    })
+    config.addCommand('delete-columns', DeleteCellsCommand, {
+      spec: { dim: 'col' },
+      commandGroup: 'table-delete'
+    })
+    config.addCommand('delete-rows', DeleteCellsCommand, {
+      spec: { dim: 'row' },
+      commandGroup: 'table-delete'
+    })
     config.addCommand('edit-author', EditEntityCommand, {
       selectionType: 'author',
       commandGroup: 'author'
     })
+    config.addCommand('edit-external-link', EditAnnotationCommand, {
+      nodeType: 'external-link',
+      commandGroup: 'prompt'
+    })
+    config.addCommand('edit-formula', EditInlineFormulaCommand, {
+      nodeType: 'inline-formula',
+      commandGroup: 'prompt'
+    })
     config.addCommand('edit-reference', EditEntityCommand, {
       selectionType: 'reference',
       commandGroup: 'reference'
     })
+    config.addCommand('edit-xref', EditXrefCommand, {
+      nodeType: 'xref',
+      commandGroup: 'prompt'
+    })
+    config.addCommand('insert-columns-left', InsertCellsCommand, {
+      spec: { dim: 'col', pos: 'left' },
+      commandGroup: 'table-insert'
+    })
+    config.addCommand('insert-columns-right', InsertCellsCommand, {
+      spec: { dim: 'col', pos: 'right' },
+      commandGroup: 'table-insert'
+    })
+    config.addCommand('insert-inline-formula', InsertInlineFormulaCommand, {
+      commandGroup: 'insert'
+    })
+    config.addCommand('insert-inline-graphic', InsertInlineGraphicCommand, {
+      nodeType: 'inline-graphic',
+      commandGroup: 'insert'
+    })
+    config.addCommand('insert-rows-above', InsertCellsCommand, {
+      spec: { dim: 'row', pos: 'above' },
+      commandGroup: 'table-insert'
+    })
+    config.addCommand('insert-rows-below', InsertCellsCommand, {
+      spec: { dim: 'row', pos: 'below' },
+      commandGroup: 'table-insert'
+    })
+    config.addCommand('insert-table', InsertTableCommand, {
+      nodeType: 'table-figure',
+      commandGroup: 'insert'
+    })
+    config.addCommand('insert-xref-bibr', InsertCrossReferenceCommand, {
+      refType: Reference.refType,
+      commandGroup: 'insert-xref'
+    })
+    config.addCommand('insert-xref-figure', InsertCrossReferenceCommand, {
+      refType: Figure.refType,
+      commandGroup: 'insert-xref'
+    })
+    config.addCommand('insert-xref-file', InsertCrossReferenceCommand, {
+      refType: SupplementaryFile.refType,
+      commandGroup: 'insert-xref'
+    })
+    // Note: footnote cross-references are special, because they take the current scope into account
+    // i.e. whether to create a footnote on article level, or inside a table-figure
+    config.addCommand('insert-xref-footnote', InsertFootnoteCrossReferenceCommand, {
+      commandGroup: 'insert-xref'
+    })
+    config.addCommand('insert-xref-formula', InsertCrossReferenceCommand, {
+      refType: BlockFormula.refType,
+      commandGroup: 'insert-xref'
+    })
+    config.addCommand('insert-xref-table', InsertCrossReferenceCommand, {
+      refType: Table.refType,
+      commandGroup: 'insert-xref'
+    })
     config.addCommand('move-down-col-item', MoveCollectionItemCommand, {
       direction: 'down',
       commandGroup: 'collection'
@@ -173,11 +266,18 @@ export default {
     config.addCommand('replace-figure-panel-image', ReplaceFigurePanelImageCommand, {
       commandGroup: 'figure-panel'
     })
+    config.addCommand('table:select-all', TableSelectAllCommand)
     config.addCommand('toggle-bold', AnnotationCommand, {
       nodeType: 'bold',
       accelerator: 'CommandOrControl+B',
       commandGroup: 'formatting'
     })
+    config.addCommand('toggle-cell-heading', ToggleCellHeadingCommand, {
+      commandGroup: 'table'
+    })
+    config.addCommand('toggle-cell-merge', ToggleCellMergeCommand, {
+      commandGroup: 'table'
+    })
     config.addCommand('toggle-italic', AnnotationCommand, {
       nodeType: 'italic',
       accelerator: 'CommandOrControl+I',
@@ -212,8 +312,25 @@ export default {
       commandGroup: 'formatting'
     })
 
+    // Toolpanels
+    config.addToolPanel('main-overlay', [
+      {
+        name: 'prompt',
+        type: 'prompt',
+        style: 'minimal',
+        hideDisabled: true,
+        items: [
+          { type: 'command-group', name: 'prompt' }
+        ]
+      }
+    ])
+
     // Tools
     config.addComponent('add-figure-panel', InsertFigurePanelTool)
+    config.addComponent('edit-external-link', EditExtLinkTool)
+    config.addComponent('edit-xref', EditXrefTool)
+    config.addComponent('edit-formula', EditInlineFormulaTool)
+    config.addComponent('insert-inline-graphic', InsertInlineGraphicTool)
     config.addComponent('open-figure-panel-image', OpenFigurePanelImageTool)
     config.addComponent('replace-figure-panel-image', ReplaceFigurePanelTool)
 
@@ -261,10 +378,12 @@ export default {
     config.addLabel('article-metadata', 'Article Metadata')
     config.addLabel('subtitle', 'Subtitle')
     config.addLabel('empty-figure-metadata', 'No fields specified')
+    config.addLabel('open-link', 'Open Link')
     // Icons
-    config.addIcon('move-down-figure-panel', { 'fontawesome': 'fa-caret-square-o-down' })
-    config.addIcon('input-loading', { 'fontawesome': 'fa-spinner fa-spin' })
     config.addIcon('input-error', { 'fontawesome': 'fa-exclamation-circle' })
+    config.addIcon('input-loading', { 'fontawesome': 'fa-spinner fa-spin' })
+    config.addIcon('move-down-figure-panel', { 'fontawesome': 'fa-caret-square-o-down' })
+    config.addIcon('open-link', { 'fontawesome': 'fa-external-link' })
 
     // TODO: need to rethink this a some point
     registerCollectionCommand(config, 'author', ['metadata', 'authors'], { keyboardShortcut: 'CommandOrControl+Alt+A', nodeType: 'person' })

src/article/metadata/MetadataPackage.js

@@ -32,6 +32,10 @@ export default class Figure extends DocumentNode {
       ))
     }
   }
+
+  static get refType () {
+    return 'fig'
+  }
 }
 Figure.schema = {
   type: 'figure',

src/article/models/Figure.js

@@ -1,7 +1,11 @@
 import { DocumentNode } from 'substance'
 
 // Note: this is used as a indicator class for all types of references
-export default class Reference extends DocumentNode {}
+export default class Reference extends DocumentNode {
+  static get refType () {
+    return 'bibr'
+  }
+}
 
 Reference.schema = {
   type: 'reference'

src/article/models/Reference.js

@@ -7,6 +7,10 @@ export default class SupplementaryFile extends DocumentNode {
       legend: [{ type: 'paragraph' }]
     }
   }
+
+  static get refType () {
+    return 'file'
+  }
 }
 
 SupplementaryFile.schema = {

src/article/models/SupplementaryFile.js

@@ -163,6 +163,10 @@ export default class Table extends DocumentNode {
       }
     })
   }
+
+  static get refType () {
+    return 'table'
+  }
 }
 
 Table.schema = {