tg-prepare 1.0.0__py3-none-any.whl → 1.1.0__py3-none-any.whl

{tg_prepare-1.0.0.dist-info → tg_prepare-1.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tg_prepare
-Version: 1.0.0
+Version: 1.1.0
 Summary: Simple UI to handle TextGrid imports visually.
 Author: Ralf Klammer, Moritz Wilhelm
 Author-email: ralf.klammer@tu-dresden.de, moritz.wilhelm@tu-dresden.de

{tg_prepare-1.0.0.dist-info → tg_prepare-1.1.0.dist-info}/RECORD

@@ -1,46 +1,39 @@
-tg_prepare-1.0.0.dist-info/licenses/LICENSE,sha256=deYu6g1OGKm0VUwhM4Octoh8qlzjsiHHxoI-KkCBVBE,11351
+tg_prepare-1.1.0.dist-info/licenses/LICENSE,sha256=deYu6g1OGKm0VUwhM4Octoh8qlzjsiHHxoI-KkCBVBE,11351
 tgp_backend/__init__.py,sha256=4Q_pjhWDF2eAyPa8bvgIcBIrV0qGKa3uYgvYqTCmKWs,419
 tgp_backend/auth.py,sha256=hUPd0rc01BTT003xpkdmhNc6o0JztbAdimyDb0B9oTQ,2293
 tgp_backend/cli.py,sha256=iw_gknn-_m_UFZZUKfkV9aJixG3sVcHIONybNtOG40I,551
-tgp_backend/directories.py,sha256=CjrrBOL3Hov0b5SyyPRtMfmfcb3cSsLnTpBGJcI5Dto,2564
+tgp_backend/directories.py,sha256=5w7FeEa0zcW4B_rkM0bLlaKdWUPrvtremlkgcU5W6dA,2385
 tgp_backend/interfaces.py,sha256=SO7mOdhkd1f7irUBrwFhp5aKx3UKkkUzU9QBYDl0Tvc,91
 tgp_backend/nextcloud.py,sha256=9p-YT-oN05seWo2zwnfHSbvVa4Am7qONczfR6Fx8pqM,4424
-tgp_backend/project.py,sha256=yesTH2eHDJsSmBB4SLE12PAkGE4LdgatgPpAxVraWEk,8877
-tgp_backend/tgclient.py,sha256=DXqUQcTT6nwBPzkA3_Nl49bJtLiO-V8kGAI2f46hWiY,2980
+tgp_backend/project.py,sha256=Lsxvy8DTalHqgTkyZmja7nb7icdUinp0KY9DuEVqEmo,8908
+tgp_backend/tgclient.py,sha256=QG2iFPrv2qLL4FRXoEfXzEMJriroiIaNL9rkreGtzuQ,2961
 tgp_backend/util.py,sha256=PsRO7CGhHZjGubkM39KDuTwJwyfq_Gs7HM-n0DFlIZc,2210
 tgp_ui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tgp_ui/app.py,sha256=SZp5YeTpNBLndNz4hoUCkc3voTzXNI2wsPZcIN7YLwc,12160
+tgp_ui/app.py,sha256=cso4-T7a4uGgvVaMcFpqMT8to26c-7ASCOiVXVYIaGM,12252
 tgp_ui/static/css/bootstrap-icons.min.css,sha256=XxUvYRPQvG4RTCkukUmXwvf1N0YF9KQ_ocuWV6O1dk8,85797
 tgp_ui/static/css/bootstrap.min.css,sha256=djO3wMl9GeaC_u6K-ic4Uj_LKhRUSlUFcsruzS7v5ms,155845
 tgp_ui/static/css/main.css,sha256=EK8euwgxX8I3qsBiDmIvj8UBIxkSKQZz1mo_OX4Q1FQ,2641
 tgp_ui/static/css/simpleXML.css,sha256=dfY7UZCiC79BkNOT1hM0GQ6v_yLSxhKCnmV0RZIT9S8,961
 tgp_ui/static/js/bootstrap.bundle.min.js,sha256=fh8VA992XMpeCZiRuU4xii75UIG6KvHrbUF8yIS_2_4,78743
 tgp_ui/static/js/jquery.min.js,sha256=_xUj-3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej_m4,89501
-tgp_ui/static/js/jstree.min.js,sha256=bLd6OqSD4Ff3ueyKs1cvu_mHhlFps_7SJ0P660kwuE4,141969
-tgp_ui/static/js/main.js,sha256=NB5xXJXLVLsUznce-RQjYll4pLlGI44EzzEc0gIMRzQ,15621
+tgp_ui/static/js/main.js,sha256=mTrA94R8ZeBYaFPs4NtIdTZ1RKdRnFjwqaIKdB7UW8k,17169
 tgp_ui/static/js/simpleXML.js,sha256=jEkZe3TuiHuEt6V7If_1EmqYIgTywssJ3OwOQzOFYNg,8065
 tgp_ui/templates/collection.html,sha256=WnYAH_5kJ6CzvVIqGk8XU_TZmhIrcOXggBoImyuGVZE,11416
-tgp_ui/templates/empty.html,sha256=__5AerKuSBFUn2yZGxEmjYzuGmmy81xYxm18ipU7dow,63
 tgp_ui/templates/file_tree.html,sha256=IKWp5MLUvnFF65cIUIxU4Jf5wi9Fg8koSXD96Mk328E,1640
 tgp_ui/templates/file_upload.html,sha256=fIelltVaTnqUqxBZoMy859IWbuwqNjrDZbVh9JlYl-g,1004
-tgp_ui/templates/jsfiler.html,sha256=TV27S3qWYe183zw7Bp8IGbPyyfESELpct_er_nysep0,134
-tgp_ui/templates/layout.html,sha256=6-rL9yIUoGei3M34ydTo4BUitR6y855chhClatG_0Bs,2766
-tgp_ui/templates/layout2.html,sha256=xtm3Uw-aE0iFaGsc7LvzQuPRdaQ5Lrt3tsFm6yH1_tI,4940
-tgp_ui/templates/macros.html,sha256=FFSPrllz12E6MJElpGFtZFbAS8PowAdY9Un9eqQX418,4047
-tgp_ui/templates/main.html,sha256=Aub0atvoi7f4GQWlV0P6RNHq08GHy2obyeDnrtkORo8,173
+tgp_ui/templates/layout.html,sha256=eB80fnfUw8q_PEO6wY8eefjnRUbqwZEbHCFAK8ccQaY,5026
+tgp_ui/templates/macros.html,sha256=zpbduAoTNj5OD2o_9z1IY6pPm_KX8kSOSWWN264kWB4,4253
 tgp_ui/templates/nxc_file_tree.html,sha256=i8nLf71c9vUyAP46eC6BdJJVXgAJcJd4xcIv7vW6Y9k,1275
 tgp_ui/templates/nxc_login.html,sha256=tDxqHYPZqsY2ZNnkn4a5bMOYiD8ybcNRpzSq7MvMWCo,1269
 tgp_ui/templates/nxc_tab.html,sha256=9HWCa7UZKxL0fZasT_g6uozI64L-497Y2LppPPTHF2M,517
-tgp_ui/templates/project.html,sha256=11xH5_Y3w_g0hjND1XChv84F-D5wqlcOuYfTAuo37Ng,970
-tgp_ui/templates/project_nxc.html,sha256=Id0-9gRt4QnuavhHnSe6GXNsvCk-MAsNr3r3zkU5KD4,1468
-tgp_ui/templates/projects.html,sha256=X4NBmnTOCGpDEotHYjhm0g6wqJH_2DHFp9As2m1tjq4,3345
-tgp_ui/templates/publish.html,sha256=zEB3AdT3K8qLqDec10xzftNJpkTr_NI0aN8ZvZnS844,5612
+tgp_ui/templates/project.html,sha256=35oPO8yPMXqJSjtXZrXegrhIqmutECY_nk1ZYPFwAsc,1106
+tgp_ui/templates/projects.html,sha256=zUPCTPa129aTwfo-ZpMkhkmQvcO7HPY0TXwAi7MnIOE,3344
+tgp_ui/templates/publication.html,sha256=TXCHCE2198cHFmN4_l4JNmq0nQoy8GwnESePjRfjliU,9357
 tgp_ui/templates/storage.html,sha256=ZgLIawovCTkgQy7aX3QB0cMlQj4uiby68c8aJFQ_HNw,1985
-tgp_ui/templates/tei_browser.html,sha256=Djq9GMIf3imMvYIWMWwNYCAL95pi3gV42VIdTJpZ_eM,372
 tgp_ui/templates/tei_explorer.html,sha256=YPLYZcgsqvA2AAL8NQ61Eo1ekwn3FEQf6pB58lLLL8U,2472
 tgp_ui/templates/xpath_parser_modal_content.html,sha256=Hm3VNtXbmEUIPFihGnE11AcSRdvMGro73IKjvDJAAqg,1573
-tg_prepare-1.0.0.dist-info/METADATA,sha256=6JqeJip2M-knbJylyAaYRVJoTeRVrOd5YCuVfUJk8pY,532
-tg_prepare-1.0.0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-tg_prepare-1.0.0.dist-info/entry_points.txt,sha256=mbsfiEA8_fQdrFUE_oabDi-Syw8jjli37Ms7tawDDhs,78
-tg_prepare-1.0.0.dist-info/top_level.txt,sha256=ueOyX_KdozreQJD_HRs6kAsvGNO4vfM9B_QqqhdyRPI,19
-tg_prepare-1.0.0.dist-info/RECORD,,
+tg_prepare-1.1.0.dist-info/METADATA,sha256=tJr1V2ztaQCVSpNpwO4Y9HYN2btX9knxnl7uSnBMmhE,532
+tg_prepare-1.1.0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+tg_prepare-1.1.0.dist-info/entry_points.txt,sha256=mbsfiEA8_fQdrFUE_oabDi-Syw8jjli37Ms7tawDDhs,78
+tg_prepare-1.1.0.dist-info/top_level.txt,sha256=ueOyX_KdozreQJD_HRs6kAsvGNO4vfM9B_QqqhdyRPI,19
+tg_prepare-1.1.0.dist-info/RECORD,,

tgp_backend/directories.py

@@ -28,7 +28,6 @@ def generateList(path=None):
     for name in os.listdir(path):
         fullpath = "%s/%s" % (path, name)
         if not name.startswith("."):
-            print(name)
             if os.path.isdir(fullpath):
                 dList.append({"fullpath": fullpath, "name": name})
             else:
@@ -79,7 +78,4 @@ def generateList(path=None):
 
         file_list_dict.append(temp_file)
 
-    # log.debug("generateList - dir_list_dict: %s" % dir_list_dict)
-    # print("generateList - file_list_dict: %s" % file_list_dict)
-    # print(tp_dict)
     return dir_list_dict, file_list_dict

tgp_backend/project.py

@@ -16,6 +16,8 @@ from tg_model.yaml import (  # type: ignore
     ProjectConfig,
 )
 
+from tg_model.project import Project as TGMProject
+
 from tgp_backend.tgclient import TGclient
 from tgp_backend.util import config, list_files_and_folders
 
@@ -33,6 +35,7 @@ class Project(object):
         self._main_config = None
         self._collections = None
         self._nextcloud = None
+        self.tgm_project = TGMProject(self.metadatapath)
 
     def create(self):
         if not os.path.exists(self.fullpath):
@@ -62,7 +65,6 @@ class Project(object):
                 file.save(filepath)
 
     def list_files_and_folders(self):
-        print(self.datapath)
         return list_files_and_folders(self.datapath)
 
     @property
@@ -211,17 +213,16 @@ class TGProject(object):
             return False
 
         # step 1: create required metadata
-        for c_name in self.collections:
-            collection = self.collections[c_name]
-            collection["modeler"].render_collection()
+        self.project.tgm_project.render_project()
 
         # step 2: push project to textgrid server
         for collection_name in self.collections:
             collection = self.collections[collection_name]
-            self.tg_client.put_aggregation(
-                self.tg_project_id,
-                collection["modeler"].get_collection_path(),
-            )
+            print(collection["modeler"].get_collection_path())
+            # self.tg_client.put_aggregation(
+            #     self.tg_project_id,
+            #     collection["modeler"].get_collection_path(),
+            # )
 
 
 class CollectionParser(object):
@@ -247,7 +248,6 @@ class CollectionParser(object):
         results = []
         for element in self.elements:
             result = element["tei_parser"].find(xpath)
-            print(result)
             if result is not None:
                 results.append(
                     {

tgp_backend/tgclient.py

@@ -89,4 +89,3 @@ class TGclient(object):
             threaded=True,
             ignore_warnings=True,
         )
-        print(res)

tgp_ui/app.py

@@ -106,17 +106,6 @@ def startup(path):
 # *****************
 # VIEWS
 # *****************
-@app.route(
-    "/sidebar",
-    methods=["GET", "POST"],
-)
-def sidebar():
-
-    return render_template(
-        "layout2.html",
-    )
-
-
 @app.route(
     "/xpath_parser_modal/<string:projectname>/<string:title>",
     methods=["GET", "POST"],
@@ -162,6 +151,15 @@ def collection(projectname, name):
     )
 
 
+@app.route("/publication/<string:projectname>", methods=["GET", "POST"])
+def publication(projectname):
+    project = Project(projectname)
+    return render_template(
+        "publication.html",
+        project=project,
+    )
+
+
 @app.route("/project/<string:projectname>", methods=["GET", "POST"])
 def project(projectname=None):
     params = {

tgp_ui/static/js/main.js

@@ -51,7 +51,6 @@ const checkXPath = function (e) {
     const self = $(this);
     const tab = self.closest('form').find(
         '.tab-pane.tei-explorer-content.loaded');
-    console.log(self.closest('.row').find('input[name=xpath]').val())
     $.ajax({
         url: self.data('url'),
         method: 'GET',
@@ -114,17 +113,35 @@ const saveCollectionSettings = function (e) {
         data[d.name] = d.value;
     })
 
-    // loop through multi-inputs
-    self.find('.multi-input').each(function (i, d1) {
-        console.log(d1)
-        let multi_input = $(d1);
+    self.find('.multi-input-xpath').each(function (i, mix) {
+        let multi_input = $(mix);
         if (data[multi_input.data('name')] === undefined) {
             data[multi_input.data('name')] = [];
         }
         // get all keys and values for each multi-input
         let item = {};
-        multi_input.find('input').each(function (i, d2) {
-            item[$(d2).data('key')] = $(d2).val();
+        multi_input.find('input').each(function (i, mix_input) {
+            const key = $(mix_input).data('key');
+            const type = $(mix_input).data('type');
+            if (item[key] === undefined) {
+                item[key] = {};
+            }
+            item[key][type] = $(mix_input).val();
+        });
+        console.table(item)
+        data[multi_input.data('name')].push(JSON.stringify(item))
+
+    })
+    // loop through multi-inputs with fixed values
+    self.find('.multi-input-fixed').each(function (i, mif) {
+        let multi_input = $(mif);
+        if (data[multi_input.data('name')] === undefined) {
+            data[multi_input.data('name')] = [];
+        }
+        // get all keys and values for each multi-input
+        let item = {};
+        multi_input.find('input').each(function (i, mif_input) {
+            item[$(mif_input).data('key')] = $(mif_input).val();
         });
         data[multi_input.data('name')].push(JSON.stringify(item))
     })
@@ -143,7 +160,6 @@ const saveCollectionSettings = function (e) {
     for (const [key, value] of Object.entries(_data)) {
         data[key] = JSON.stringify(value);
     }
-    console.table(data)
 
     $.ajax({
         url: self.attr('action'),
@@ -319,6 +335,22 @@ const loadCollectionTab = function (e) {
             })
     }
 }
+// Helper function to load the publication tab for a specific project
+const _loadPublicationTab = function (projectname) {
+    // Select the tab element for the given project
+    const tab = $('#tab_publish_' + projectname);
+    tab.show(); // Make the tab visible
+    $('.tab-pane.active').hide(); // Hide the currently active tab
+    // Load the tab content via AJAX with the project name as data
+    tab.load(tab.data('url'), { projectname: projectname });
+}
+
+// Event handler to load the publication tab when triggered
+const loadPublicationTab = function (e) {
+    const self = $(this); // Reference the clicked element
+    // Call the helper function with the project name from the data attribute
+    _loadPublicationTab(self.data('projectname'));
+}
 
 // this function replaces (kind of) the normal submit
 // by sending the form data via ajax and reloading the tab content
@@ -327,10 +359,10 @@ const tabSubmit = function (e) {
     const self = $(this);
     const submit_icons = self.find('button[type=submit] span');
     submit_icons.toggle();
+
     $.post(self.attr('action'), self.serialize(), function (response) {
         if (response.response === 'OK') {
-            submit_icons.toggle();
-            // console.log(response)
+            _loadPublicationTab(self.data('projectname'));
         }
     })
 }
@@ -344,6 +376,7 @@ const selectTGProject = function (e) {
         .removeClass('bi-circle');
     $.post(self.data('url'), self.data(), function (response) {
         if (response.response === 'OK') {
+            _loadPublicationTab(self.data('projectname'));
         }
     })
 }
@@ -376,8 +409,7 @@ const deleteTGProject = function (e) {
     spans.toggle();
     // send delete request to server
     $.post(self.data('url'), function () {
-        // hide spinner & show trash icon
-        self.find('span').toggle();
+        _loadPublicationTab(self.data('projectname'));
     });
     // get the hits of the project
     getTGProjectHits(
@@ -435,8 +467,10 @@ $(document).ready(function () {
     // show xpath (of a 'dynamic attribute') in TEI Explorer
     $(document).on('click', '.show-xpath-in-tei-explorer', showXPathInTEIExplorer);
 
-
     // ##PUBLISH##
+    // load publication tab content
+    $(document).on('click', '.publication-tab', loadPublicationTab);
+
     // this is generic form-submit for all forms with class 'tab-submit'
     $(document).on('submit', 'form.tab-submit', tabSubmit);
     // select a listed TextGrid-Project
@@ -444,6 +478,7 @@ $(document).ready(function () {
     // delete a listed TextGrid-Project
     $(document).on('click', 'a.delete-tg-project', deleteTGProject);
 
+    // ###PROJECTS###
     $('#deleteProject').on('show.bs.modal', function (event) {
         const pressed_button = $(event.relatedTarget);
         const target_input = $(this).find('input[name=projectname]');

tgp_ui/templates/layout.html

@@ -7,51 +7,92 @@
     <meta name="description" content="" />
     <meta name="author" content="" />
     <title>{{ title }}</title>
-    <link rel="icon" type="image/x-icon" href="{{ url_for('static', filename='favicon.ico') }}" />
+    <link rel="icon" type="image/x-icon" href="{{ url_for('static', filename='img/favicon.ico') }}" />
     <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/bootstrap.min.css') }}" />
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.min.css">
     <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/simpleXML.css') }}" />
     <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/main.css') }}" />
-
-    <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/jstree.min.css') }}" />
-    <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/jsfiler.min.css') }}" />
 </head>
 
 <body>
-    <nav class="navbar navbar-expand-md navbar-dark bg-secondary">
-        <div class="container-fluid">
-            <a class="navbar-brand" href="/">{{ title }}</a>
-            <button class="navbar-toggler" type="button" data-bs-toggle="collapse"
-                data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false"
-                aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button>
-            <div class="collapse navbar-collapse" id="navbarSupportedContent">
-                <ul class="navbar-nav ms-auto mb-2 mb-lg-0">
-                    <li class="nav-item">
-                        <a class="nav-link" href="{{ url_for('projects') }}">Projects</a>
-                    </li>
-                </ul>
+    <div class="wrapper">
+        <aside id="sidebar" class="expand">
+            <div class="d-flex">
+                <button class="toggle-btn" type="button">
+                    <i class="bi bi-grid"></i>
+                </button>
+                <div class="sidebar-logo">
+                    <a href="#">{{ title }}</a>
+                </div>
             </div>
+            <ul class="sidebar-nav">
+                <li class="sidebar-item">
+                    <a href={{ url_for("projects") }} class="sidebar-link" title="Projects">
+                        <i class="bi bi-view-list"></i>
+                        <span>Overview</span>
+                    </a>
+                </li>
+                {% for project in get_projects() %}
+                <li class="sidebar-item">
+                    <a href="{{ url_for('project', projectname=project.name) }}" class="sidebar-link"
+                        data-bs-target="#project_{{ loop.index }}" aria-expanded="false"
+                        aria-controls="project_{{ loop.index }}">
+                        {% if current_project == project.name %}
+                        <i class="bi bi-circle-fill"></i>
+                        {% else %}
+                        <i class="bi bi-circle"></i>
+                        {% endif %}
+                        <span>{{ project.name }}</span>
+                    </a>
+                    <ul id="project_{{ loop.index }}"
+                        class="sidebar-dropdown nav list-unstyled ps-3 {{ 'collapse' if current_project != project.name }}"
+                        data-bs-parent="#sidebar">
+                        <li class="sidebar-item">
+                            <a class="sidebar-link nav-link" data-bs-toggle="tab" href="#tab_storage" role="tab"
+                                aria-controls="tab_storage" aria-selected="false">
+                                <i class="bi bi-folder2-open"></i>
+                                Storage
+                            </a>
+                        </li>
+                        {% for c in project.collections %}
+                        {% set collection_config = project.collections[c]['config'] %}
+                        <li class="sidebar-item">
+                            <a class="sidebar-link nav-link collection-tab" data-bs-toggle="tab" href="#tab_{{ c }}"
+                                role="tab" aria-controls="tab_{{ c }} aria-selected=" false"
+                                data-url="{{ url_for('collection', projectname=project.name, name=c) }}"
+                                data-name="{{ c }}">
+                                <i class="spinner-border spinner-border-sm" role="status" style="display:none;"></i>
+                                <i class="bi bi-{{ loop.index }}-circle"></i>
+                                {{collection_config.short_title}}
+                            </a>
+                        </li>
+                        {% endfor %}
+                        <li class="sidebar-item">
+                            <a class="sidebar-link nav-link publication-tab" data-bs-toggle="tab" href="#tab_publish"
+                                role="tab" aria-controls="tab_publish" data-projectname="{{ project.name }}"
+                                aria-selected="false">
+                                <i class="bi bi-cloud-upload"></i>
+                                Publish
+                            </a>
+                        </li>
+                    </ul>
+                </li>
+                {% endfor %}
+        </aside>
+        <div class="main p-3">
+            <div class="text-center">
+                <h1>
+                    <span>
+                        {{ sub_title }}
+                    </span>
+                </h1>
+            </div>
+            {% block content %}{% endblock content %}
         </div>
-    </nav>
-    <div class="container mt-3">
-        <h1>
-            <span>
-                {{ sub_title }}
-            </span>
-        </h1>
-        <p> {{sub_description}} </p>
-        {% if error_msg %}
-        <div class="alert alert-danger text-center">
-            {{ error_msg }}
-        </div>
-        {% endif %}
-        {% block content %}{% endblock content %}
     </div>
     <script src="{{ url_for('static', filename='js/jquery.min.js') }}"></script>
     <script src="{{ url_for('static', filename='js/bootstrap.bundle.min.js') }}"></script>
     <script src="{{ url_for('static', filename='js/simpleXML.js') }}"></script>
-    <script src="{{ url_for('static', filename='js/jstree.min.js') }}"></script>
-    <script src="{{ url_for('static', filename='js/jsfiler.min.js') }}"></script>
     <script src="{{ url_for('static', filename='js/main.js') }}"></script>
     </script>
 </body>

tgp_ui/templates/macros.html

@@ -1,3 +1,21 @@
+{% macro form_field_with_xpath(label, field_key, elem, has_next=False) %}
+<div class="mb-2 row">
+    <div class="col-12 {{'pb-2 border-top' if has_next }}">
+        <label class="form-label">{{label}}
+            <a href="#" class="badge text-dark remove-multi-field">
+                <span class="bi bi-trash"></span>
+            </a>
+        </label>
+        <div class="input-group">
+            <input type="text" class="form-control" data-key="{{ field_key }}" data-type="value" placeholder="Value"
+                value="{{ elem['value'] if elem and elem.get('value') }}">
+            <input type="text" class="form-control" data-key="{{ field_key }}" data-type="xpath" placeholder="XPath"
+                value="{{ elem['xpath'] if elem and elem.get('xpath') }}">
+        </div>
+    </div>
+</div>
+{% endmacro %}
+
 {% macro multi_input(type, heading, elements, version=1) %}
 <div class="border-top mb-3 row">
     <label class="col-sm-12 col-form-label">
@@ -10,30 +28,15 @@
     </label>
 </div>
 {% for item in elements or [None] %}
-<div class="multi-input" data-name="{{ type }}">
-    {% if version == 1 %}
-    <div class="mb-3 row">
-        <label class="col-lg-2 col-form-label">ID
-            <a href="#" class="badge text-dark remove-multi-field">
-                <span class="bi bi-trash"></span>
-            </a>
-        </label>
-        <div class="col-lg-4">
-            <input type="text" class="form-control" data-key="id" value="{{ item['id'] if item['id'] }}">
-        </div>
-        <label class="col-lg-2 col-form-label">URL</label>
-        <div class="col-lg-4">
-            <input type="text" class="form-control" data-key="url" value="{{ item['url'] if item['url'] }}">
-        </div>
-    </div>
-    <div class="mb-3 row">
-        <label class="col-lg-2 col-form-label">Value</label>
-        <div class="col-lg-10 {{'pb-2 border-bottom' if loop.nextitem }}">
-            <input type="text" class="form-control" data-key="value" value="{{ item['value'] if item['value'] }}">
-        </div>
-    </div>
-    {% elif version == 2 %}
-    <div class="mb-3 row {{'pb-2 border-bottom' if loop.nextitem }}">
+{% if version == 1 %}
+<div class="multi-input-xpath" data-name="{{ type }}">
+    {{ form_field_with_xpath('ID', 'id', item.get('id') if item) }}
+    {{ form_field_with_xpath('URL', 'url', item.get('url') if item) }}
+    {{ form_field_with_xpath('Value', 'value', item.get('value') if item, has_next=loop.nextitem) }}
+</div>
+{% elif version == 2 %}
+<div class="multi-input-fixed" data-name="{{ type }}">
+    <div class="mb-3 row {{'pb-2 border-bottom' if not loop.last }}">
         <label class="col-lg-2 col-form-label">
             Fullname
         </label>
@@ -51,8 +54,8 @@
             </a>
         </div>
     </div>
-    {% endif %}
 </div>
+{% endif %}
 {% endfor %}
 {% endmacro %}
 

tgp_ui/templates/project.html

@@ -1,4 +1,4 @@
-{% extends 'layout2.html' %}
+{% extends 'layout.html' %}
 {% block content %}
 <div class="row">
     <div class="tab-content pt-2" id="tab-content">
@@ -10,8 +10,9 @@
         <div class="tab-pane {{ 'active' if tab==collection_config.short_title }}" id="tab_{{ c }}" role="tabpanel">
         </div>
         {% endfor %}
-        <div class="tab-pane {{'active' if tab=='publish' }}" id="tab_publish" role="tabpanel">
-            {% include 'publish.html' %}
+        <div class="tab-pane {{'active' if tab=='publish' }}" id="tab_publish_{{ project.name }}"
+            data-url="{{ url_for('publication', projectname=project.name) }}" role="tabpanel">
+            <span class="spinner-border spinner-border-sm" role="status"></span>
         </div>
     </div>
 </div>

tgp_ui/templates/projects.html

@@ -1,4 +1,4 @@
-{% extends 'layout2.html' %}
+{% extends 'layout.html' %}
 {% block content %}
 <div class="row row-cols-xxl-6 row-cols-lg-4 row-cols-md-2">
     {% for project in projects%}