From c79bc1ed5735f261681c65cba213308e2e37f4d3 Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Wed, 21 Dec 2022 14:34:53 +0100 Subject: [PATCH] Update Dashboard2 --- app/static/js/RessourceLists/RessourceList.js | 5 +- app/templates/_scripts.html.j2 | 1 - app/templates/main/dashboard2.html.j2 | 116 ++++++++++++++++-- 3 files changed, 108 insertions(+), 14 deletions(-) diff --git a/app/static/js/RessourceLists/RessourceList.js b/app/static/js/RessourceLists/RessourceList.js index e53367fd..e1f47f2f 100644 --- a/app/static/js/RessourceLists/RessourceList.js +++ b/app/static/js/RessourceLists/RessourceList.js @@ -10,14 +10,13 @@ class RessourceList { JobList.autoInit(); JobInputList.autoInit(); JobResultList.autoInit(); - PublicCorporaList.autoInit(); PublicUserList.autoInit(); SpaCyNLPPipelineModelList.autoInit(); TesseractOCRPipelineModelList.autoInit(); UserList.autoInit(); } - static options = {page: 5, pagination: {innerWindow: 4, outerWindow: 1}}; + static options = {page: 5, pagination: {innerWindow: 2, outerWindow: 2}}; constructor(listElement, options = {}) { if (!(listElement.hasAttribute('id'))) { @@ -29,7 +28,7 @@ class RessourceList { } } options = { - ...{pagination: {item: `
  • `}}, + ...RessourceList.options, ...options } if ('ressourceMapper' in options && typeof options.ressourceMapper === 'function') { diff --git a/app/templates/_scripts.html.j2 b/app/templates/_scripts.html.j2 index 84b03e62..b86d4cdb 100644 --- a/app/templates/_scripts.html.j2 +++ b/app/templates/_scripts.html.j2 @@ -24,7 +24,6 @@ 'js/RessourceLists/JobList.js', 'js/RessourceLists/JobInputList.js', 'js/RessourceLists/JobResultList.js', - 'js/RessourceLists/PublicCorporaList.js', 'js/RessourceLists/PublicUserList.js', 'js/RessourceLists/SpacyNLPPipelineModelList.js', 'js/RessourceLists/TesseractOCRPipelineModelList.js', diff --git a/app/templates/main/dashboard2.html.j2 b/app/templates/main/dashboard2.html.j2 index 47a7e236..c03834e3 100644 --- a/app/templates/main/dashboard2.html.j2 +++ b/app/templates/main/dashboard2.html.j2 @@ -2,6 +2,25 @@ {% from "main/_breadcrumbs.html.j2" import breadcrumbs with context %} {% block page_content %} +
    +
    +
    +
    +

    Dashboard

    +
    +
    +
    +

    Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.

    +
    + +
    +
    + +
    @@ -18,15 +37,15 @@
    -
    +
    -
    -

    My Corpora

    -

    Create a corpus to interactively perform linguistic analysis.

    -

    Or browse our users public corpora.

    +
    +

    My Corpora

    +

    Create a corpus to interactively perform linguistic analysis.

    +

    Or browse our users public corpora.

    -
    +
    @@ -50,6 +69,15 @@
    +
    +
    @@ -70,11 +98,11 @@
    -
    +
    -
    -

    My Jobs

    +
    +

    My Jobs

    A job is the execution of a service provided by nopaque. You can create any number of jobs and let them be processed simultaneously. We @@ -85,7 +113,7 @@

    Where is my Job data? Don't worry, please read this news entry

    -
    +
    @@ -108,6 +136,74 @@
    +
    + +
    +
    +
    + +
    +
    +
    +
    +
    +
    +
    + search + + +
    +
    +
    +
    +
    + +
    +
    +
    +
    +

    My Groups

    +

    Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.

    +
    +
    +
    +
    +
    + + + + + + + + + + +
    Title and DescriptionStatus
    +
      +
      +
      + +
      +
      +
      +