diff --git a/fiduswriter/book/static/js/modules/books/accessrights/index.js b/fiduswriter/book/static/js/modules/books/accessrights/index.js index 24225b6..e02ebb3 100644 --- a/fiduswriter/book/static/js/modules/books/accessrights/index.js +++ b/fiduswriter/book/static/js/modules/books/accessrights/index.js @@ -1,16 +1,16 @@ import { ContentMenu, - setCheckableLabel, - addAlert, Dialog, + addAlert, + findTarget, postJson, - findTarget + setCheckableLabel } from "../../common" import {AddContactDialog} from "../../contacts/add_dialog" import { + bookAccessRightOverviewTemplate, bookCollaboratorsTemplate, - bookContactsTemplate, - bookAccessRightOverviewTemplate + bookContactsTemplate } from "./templates" /** * Helper functions to deal with the book access rights dialog. diff --git a/fiduswriter/book/static/js/modules/books/actions.js b/fiduswriter/book/static/js/modules/books/actions.js index 287ec57..f6cab96 100644 --- a/fiduswriter/book/static/js/modules/books/actions.js +++ b/fiduswriter/book/static/js/modules/books/actions.js @@ -1,33 +1,33 @@ import { - bookDialogTemplate, + ContentMenu, + Dialog, + FileSelector, + addAlert, + escapeText, + findTarget, + longFilePath, + post, + postJson +} from "../common" +import {ImageSelectionDialog} from "../images/selection_dialog" +import {exportMenuModel} from "./menu" +import {bookSanityCheck} from "./sanity_check" +import { bookBasicInfoTemplate, - bookDialogChaptersTemplate, bookBibliographyDataTemplate, - bookEpubDataTemplate, - bookPrintDataTemplate, - bookChapterListTemplate, bookChapterDialogTemplate, - bookEpubDataCoverTemplate, - bookSanityCheckTemplate, - bookDOCXDataTemplate, + bookChapterListTemplate, bookDOCXDataRowTemplate, + bookDOCXDataTemplate, + bookDialogChaptersTemplate, + bookDialogTemplate, + bookEpubDataCoverTemplate, + bookEpubDataTemplate, + bookODTDataRowTemplate, bookODTDataTemplate, - bookODTDataRowTemplate + bookPrintDataTemplate, + bookSanityCheckTemplate } from "./templates" -import {exportMenuModel} from "./menu" -import {bookSanityCheck} from "./sanity_check" -import {ImageSelectionDialog} from "../images/selection_dialog" -import { - addAlert, - postJson, - post, - Dialog, - findTarget, - FileSelector, - longFilePath, - escapeText, - ContentMenu -} from "../common" function emptyMetadata() { return { diff --git a/fiduswriter/book/static/js/modules/books/exporter/bits/index.js b/fiduswriter/book/static/js/modules/books/exporter/bits/index.js index f2eff6e..a223d20 100644 --- a/fiduswriter/book/static/js/modules/books/exporter/bits/index.js +++ b/fiduswriter/book/static/js/modules/books/exporter/bits/index.js @@ -1,12 +1,12 @@ import download from "downloadjs" import pretty from "pretty" -import {createSlug} from "../../../exporter/tools/file" +import {addAlert} from "../../../common" import {JATSExporterConverter} from "../../../exporter/jats/convert" -import {ZipFileCreator} from "../../../exporter/tools/zip" import {darManifest} from "../../../exporter/jats/templates" +import {createSlug} from "../../../exporter/tools/file" +import {ZipFileCreator} from "../../../exporter/tools/zip" import {getMissingChapterData} from "../tools" -import {addAlert} from "../../../common" import {bitsTemplate} from "./templates" diff --git a/fiduswriter/book/static/js/modules/books/exporter/docx/index.js b/fiduswriter/book/static/js/modules/books/exporter/docx/index.js index 8f4fa35..4710b4c 100644 --- a/fiduswriter/book/static/js/modules/books/exporter/docx/index.js +++ b/fiduswriter/book/static/js/modules/books/exporter/docx/index.js @@ -1,22 +1,22 @@ import download from "downloadjs" -import {removeHidden, fixTables} from "../../../exporter/tools/doc_content" +import {addAlert} from "../../../common" +import {fixTables, removeHidden } from "../../../exporter/tools/doc_content" import {createSlug} from "../../../exporter/tools/file" import {XmlZip} from "../../../exporter/tools/xml_zip" import {getMissingChapterData} from "../tools" -import {addAlert} from "../../../common" import {DOCXExporterCitations} from "../../../exporter/docx/citations" -import {moveFootnoteComments} from "../../../exporter/docx/tools" import {DOCXExporterComments} from "../../../exporter/docx/comments" -import {DOCXExporterImages} from "../../../exporter/docx/images" -import {DOCXExporterRichtext} from "../../../exporter/docx/richtext" -import {DOCXExporterRels} from "../../../exporter/docx/rels" import {DOCXExporterFootnotes} from "../../../exporter/docx/footnotes" -import {DOCXExporterMetadata} from "../../../exporter/docx/metadata" +import {DOCXExporterImages} from "../../../exporter/docx/images" +import {DOCXExporterLists} from "../../../exporter/docx/lists" import {DOCXExporterMath} from "../../../exporter/docx/math" +import {DOCXExporterMetadata} from "../../../exporter/docx/metadata" +import {DOCXExporterRels} from "../../../exporter/docx/rels" +import {DOCXExporterRichtext} from "../../../exporter/docx/richtext" import {DOCXExporterTables} from "../../../exporter/docx/tables" -import {DOCXExporterLists} from "../../../exporter/docx/lists" +import {moveFootnoteComments} from "../../../exporter/docx/tools" import {DOCXBookExporterRender} from "./render" diff --git a/fiduswriter/book/static/js/modules/books/exporter/epub/index.js b/fiduswriter/book/static/js/modules/books/exporter/epub/index.js index b349e44..5592a31 100644 --- a/fiduswriter/book/static/js/modules/books/exporter/epub/index.js +++ b/fiduswriter/book/static/js/modules/books/exporter/epub/index.js @@ -1,40 +1,40 @@ -import {DOMSerializer} from "prosemirror-model" import download from "downloadjs" import pretty from "pretty" +import {DOMSerializer} from "prosemirror-model" +import { + addCategoryLabels, + getTimestamp, + orderLinks, + setLinks, + styleEpubFootnotes +} from "../../../exporter/epub/tools" +import {DOMExporter} from "../../../exporter/tools/dom_export" +import {mathliveOpfIncludes} from "../../../mathlive/opf_includes" import {BIBLIOGRAPHY_HEADERS} from "../../../schema/i18n" import {bookTerm} from "../../i18n" import {getMissingChapterData, uniqueObjects} from "../tools" import { - epubBookOpfTemplate, + epubBookCopyrightTemplate, epubBookCoverTemplate, - epubBookTitlepageTemplate, - epubBookCopyrightTemplate + epubBookOpfTemplate, + epubBookTitlepageTemplate } from "./templates" -import {mathliveOpfIncludes} from "../../../mathlive/opf_includes" -import {DOMExporter} from "../../../exporter/tools/dom_export" -import { - setLinks, - orderLinks, - getTimestamp, - styleEpubFootnotes, - addCategoryLabels -} from "../../../exporter/epub/tools" +import {RenderCitations} from "../../../citations/render" +import {addAlert} from "../../../common" import { - ncxTemplate, - ncxItemTemplate, - navTemplate, containerTemplate, + navTemplate, + ncxItemTemplate, + ncxTemplate, xhtmlTemplate } from "../../../exporter/epub/templates" -import {node2Obj, obj2Node} from "../../../exporter/tools/json" import {removeHidden} from "../../../exporter/tools/doc_content" -import {modifyImages} from "../../../exporter/tools/html" import {createSlug} from "../../../exporter/tools/file" +import {modifyImages} from "../../../exporter/tools/html" +import {node2Obj, obj2Node} from "../../../exporter/tools/json" import {ZipFileCreator} from "../../../exporter/tools/zip" -import {RenderCitations} from "../../../citations/render" -import {addAlert} from "../../../common" export class EpubBookExporter extends DOMExporter { constructor(schema, csl, bookStyles, book, user, docList, updated) { diff --git a/fiduswriter/book/static/js/modules/books/exporter/html/multifile.js b/fiduswriter/book/static/js/modules/books/exporter/html/multifile.js index 5ce6b7d..54834bc 100644 --- a/fiduswriter/book/static/js/modules/books/exporter/html/multifile.js +++ b/fiduswriter/book/static/js/modules/books/exporter/html/multifile.js @@ -2,18 +2,18 @@ import download from "downloadjs" import pretty from "pretty" import {DOMSerializer} from "prosemirror-model" -import {getMissingChapterData, uniqueObjects} from "../tools" -import {htmlBookExportTemplate, htmlBookIndexTemplate} from "./templates" +import {RenderCitations} from "../../../citations/render" +import {addAlert} from "../../../common" +import {orderLinks, setLinks } from "../../../exporter/epub/tools" import {removeHidden} from "../../../exporter/tools/doc_content" -import {setLinks, orderLinks} from "../../../exporter/epub/tools" import {DOMExporter} from "../../../exporter/tools/dom_export" import {createSlug} from "../../../exporter/tools/file" import {modifyImages} from "../../../exporter/tools/html" import {ZipFileCreator} from "../../../exporter/tools/zip" -import {RenderCitations} from "../../../citations/render" -import {addAlert} from "../../../common" -import {BIBLIOGRAPHY_HEADERS, CATS} from "../../../schema/i18n" import {LANGUAGES} from "../../../schema/const" +import {BIBLIOGRAPHY_HEADERS, CATS} from "../../../schema/i18n" +import {getMissingChapterData, uniqueObjects} from "../tools" +import {htmlBookExportTemplate, htmlBookIndexTemplate} from "./templates" export class HTMLBookExporter extends DOMExporter { constructor(schema, csl, bookStyles, book, user, docList, updated) { diff --git a/fiduswriter/book/static/js/modules/books/exporter/html/singlefile.js b/fiduswriter/book/static/js/modules/books/exporter/html/singlefile.js index 933262c..3d709f7 100644 --- a/fiduswriter/book/static/js/modules/books/exporter/html/singlefile.js +++ b/fiduswriter/book/static/js/modules/books/exporter/html/singlefile.js @@ -1,11 +1,11 @@ import pretty from "pretty" +import {HTMLBookExporter} from "./multifile" import { - singleFileHTMLBookTemplate, + htmlBookIndexBodyTemplate, singleFileHTMLBookChapterTemplate, - htmlBookIndexBodyTemplate + singleFileHTMLBookTemplate } from "./templates" -import {HTMLBookExporter} from "./multifile" const CSS_PAPER_SIZES = { folio: "12in 15in", diff --git a/fiduswriter/book/static/js/modules/books/exporter/latex/index.js b/fiduswriter/book/static/js/modules/books/exporter/latex/index.js index b650ede..34c4b49 100644 --- a/fiduswriter/book/static/js/modules/books/exporter/latex/index.js +++ b/fiduswriter/book/static/js/modules/books/exporter/latex/index.js @@ -1,12 +1,12 @@ import {BibLatexExporter} from "biblatex-csl-converter" import download from "downloadjs" -import {getMissingChapterData} from "../tools" import {LatexExporterConvert} from "../../../exporter/latex/convert" -import {bookTexTemplate} from "./templates" -import {createSlug} from "../../../exporter/tools/file" import {removeHidden} from "../../../exporter/tools/doc_content" +import {createSlug} from "../../../exporter/tools/file" import {ZipFileCreator} from "../../../exporter/tools/zip" +import {getMissingChapterData} from "../tools" +import {bookTexTemplate} from "./templates" export class LatexBookExporter { constructor(schema, book, user, docList, updated) { diff --git a/fiduswriter/book/static/js/modules/books/exporter/odt/index.js b/fiduswriter/book/static/js/modules/books/exporter/odt/index.js index 6b389d7..090b40e 100644 --- a/fiduswriter/book/static/js/modules/books/exporter/odt/index.js +++ b/fiduswriter/book/static/js/modules/books/exporter/odt/index.js @@ -1,20 +1,20 @@ import download from "downloadjs" -import {removeHidden, fixTables} from "../../../exporter/tools/doc_content" +import {addAlert} from "../../../common" +import {fixTables, removeHidden } from "../../../exporter/tools/doc_content" import {createSlug} from "../../../exporter/tools/file" import {XmlZip} from "../../../exporter/tools/xml_zip" import {getMissingChapterData} from "../tools" -import {addAlert} from "../../../common" import {ODTExporterCitations} from "../../../exporter/odt/citations" import {ODTExporterImages} from "../../../exporter/odt/images" -import {ODTExporterRichtext} from "../../../exporter/odt/richtext" import {ODTExporterFootnotes} from "../../../exporter/odt/footnotes" +import {ODTExporterMath} from "../../../exporter/odt/math" import {ODTExporterMetadata} from "../../../exporter/odt/metadata" +import {ODTExporterRichtext} from "../../../exporter/odt/richtext" import {ODTExporterStyles} from "../../../exporter/odt/styles" -import {ODTExporterMath} from "../../../exporter/odt/math" import {ODTExporterTracks} from "../../../exporter/odt/track" import {ODTBookExporterRender} from "./render" diff --git a/fiduswriter/book/static/js/modules/books/exporter/print/index.js b/fiduswriter/book/static/js/modules/books/exporter/print/index.js index 73a1abb..b376b56 100644 --- a/fiduswriter/book/static/js/modules/books/exporter/print/index.js +++ b/fiduswriter/book/static/js/modules/books/exporter/print/index.js @@ -1,7 +1,7 @@ import {printHTML} from "@vivliostyle/print" -import {printHTMLTemplate, chapterTemplate} from "./templates" import {HTMLBookExporter, htmlBookIndexBodyTemplate} from "../html" +import {chapterTemplate, printHTMLTemplate } from "./templates" const CSS_PAPER_SIZES = { folio: "12in 15in", diff --git a/fiduswriter/book/static/js/modules/books/exporter/tools.js b/fiduswriter/book/static/js/modules/books/exporter/tools.js index 75a2c74..fa774cc 100644 --- a/fiduswriter/book/static/js/modules/books/exporter/tools.js +++ b/fiduswriter/book/static/js/modules/books/exporter/tools.js @@ -1,5 +1,5 @@ -import {getMissingDocumentListData} from "../../documents/tools" import {addAlert} from "../../common" +import {getMissingDocumentListData} from "../../documents/tools" export const getMissingChapterData = function( book, diff --git a/fiduswriter/book/static/js/modules/books/index.js b/fiduswriter/book/static/js/modules/books/index.js index bc9f3b6..560f2de 100644 --- a/fiduswriter/book/static/js/modules/books/index.js +++ b/fiduswriter/book/static/js/modules/books/index.js @@ -1,31 +1,31 @@ -import {DataTable} from "simple-datatables" import deepEqual from "fast-deep-equal" +import {DataTable} from "simple-datatables" import * as plugins from "../../plugins/books_overview" -import {BookActions} from "./actions" -import {BookAccessRightsDialog} from "./accessrights" -import {ImageDB} from "../images/database" import { + DatatableBulk, + Dialog, OverviewMenuView, - escapeText, - findTarget, - whenReady, - postJson, activateWait, - deactivateWait, addAlert, + avatarTemplate, baseBodyTemplate, + deactivateWait, ensureCSS, + escapeText, + findTarget, + postJson, setDocTitle, - DatatableBulk, shortFileTitle, - Dialog, - avatarTemplate + whenReady } from "../common" -import {SiteMenu} from "../menu" -import {menuModel, bulkMenuModel} from "./menu" import {FeedbackTab} from "../feedback" +import {ImageDB} from "../images/database" +import {SiteMenu} from "../menu" import {docSchema} from "../schema/document" +import {BookAccessRightsDialog} from "./accessrights" +import {BookActions} from "./actions" +import {bulkMenuModel, menuModel } from "./menu" import {dateCell, deleteFolderCell} from "./templates" export class BookOverview { diff --git a/fiduswriter/book/static/js/modules/books/menu.js b/fiduswriter/book/static/js/modules/books/menu.js index 513af8f..7d2e38d 100644 --- a/fiduswriter/book/static/js/modules/books/menu.js +++ b/fiduswriter/book/static/js/modules/books/menu.js @@ -1,12 +1,12 @@ +import {FileDialog, NewFolderDialog, addAlert } from "../common" import {BookAccessRightsDialog} from "./accessrights" import {BITSBookExporter} from "./exporter/bits" +import {DOCXBookExporter} from "./exporter/docx" +import {EpubBookExporter} from "./exporter/epub" import {HTMLBookExporter, SingleFileHTMLBookExporter} from "./exporter/html" import {LatexBookExporter} from "./exporter/latex" -import {EpubBookExporter} from "./exporter/epub" -import {PrintBookExporter} from "./exporter/print" -import {DOCXBookExporter} from "./exporter/docx" import {ODTBookExporter} from "./exporter/odt" -import {addAlert, FileDialog, NewFolderDialog} from "../common" +import {PrintBookExporter} from "./exporter/print" let currentlySearching = false diff --git a/fiduswriter/book/static/js/modules/books/templates.js b/fiduswriter/book/static/js/modules/books/templates.js index eac4c4b..9df8a25 100644 --- a/fiduswriter/book/static/js/modules/books/templates.js +++ b/fiduswriter/book/static/js/modules/books/templates.js @@ -1,4 +1,4 @@ -import {escapeText, longFilePath, localizeDate} from "../common" +import {escapeText, localizeDate, longFilePath } from "../common" import {LANGUAGES} from "../schema/const" /** A template for the basic info book template pane */