diff --git a/marlo-web/src/main/webapp/WEB-INF/crp/views/projects/deliverableList.ftl b/marlo-web/src/main/webapp/WEB-INF/crp/views/projects/deliverableList.ftl index 01b2db1705..34270d3049 100644 --- a/marlo-web/src/main/webapp/WEB-INF/crp/views/projects/deliverableList.ftl +++ b/marlo-web/src/main/webapp/WEB-INF/crp/views/projects/deliverableList.ftl @@ -185,7 +185,7 @@ -
+
[@deliverableList.deliverablesList deliverables=(currentDeliverableList)![] canValidate=true canEdit=candit isReportingActive=reportingActive namespace="/clusters" defaultAction="${(crpSession)!}/deliverable" projectID=projectID/]
[#-- @@ -223,7 +223,7 @@
-
+
[@deliverableList.deliverablesList deliverables=(project.getPreviousDeliverables(actualPhase) + previousSharedDeliverableList)![] canValidate=true canEdit=candit isReportingActive=reportingActive namespace="/projects" defaultAction="${(crpSession)!}/deliverable" currentTable=false projectID=projectID/]
@@ -235,4 +235,4 @@ -[#include "/WEB-INF/global/pages/footer.ftl"] +[#include "/WEB-INF/global/pages/footer.ftl"] \ No newline at end of file diff --git a/marlo-web/src/main/webapp/WEB-INF/crp/views/projects/projectContributionsCrpList.ftl b/marlo-web/src/main/webapp/WEB-INF/crp/views/projects/projectContributionsCrpList.ftl index 9546cbfcb1..5e60d0676b 100644 --- a/marlo-web/src/main/webapp/WEB-INF/crp/views/projects/projectContributionsCrpList.ftl +++ b/marlo-web/src/main/webapp/WEB-INF/crp/views/projects/projectContributionsCrpList.ftl @@ -82,7 +82,7 @@ [#include "/WEB-INF/crp/views/projects/messages-projects.ftl" /]

[@s.text name="projectContributionsCrpList.title" /]

-
+
[#-- Your project contributes to the flagships --]

@@ -310,4 +310,4 @@ [#else] [#return false] [/#if] -[/#function] +[/#function] \ No newline at end of file diff --git a/marlo-web/src/main/webapp/WEB-INF/crp/views/projects/projectInnovationList.ftl b/marlo-web/src/main/webapp/WEB-INF/crp/views/projects/projectInnovationList.ftl index 2c831dbec4..59acc2d965 100644 --- a/marlo-web/src/main/webapp/WEB-INF/crp/views/projects/projectInnovationList.ftl +++ b/marlo-web/src/main/webapp/WEB-INF/crp/views/projects/projectInnovationList.ftl @@ -38,7 +38,7 @@ [#-- Innovations List --]

[@s.text name="projectInnovations" /]

-
+
[@innovationsTableMacro list=(projectInnovations)![] /]
@@ -57,7 +57,7 @@ [#-- Previous Innovations List --]

Previous [@s.text name="projectInnovations" /]

-
+
[@innovationsTableMacro list=(projectOldInnovations)![] currentTable=false/]
diff --git a/marlo-web/src/main/webapp/WEB-INF/crp/views/projects/projectStudies.ftl b/marlo-web/src/main/webapp/WEB-INF/crp/views/projects/projectStudies.ftl index d7981dcf09..d7a42ab200 100644 --- a/marlo-web/src/main/webapp/WEB-INF/crp/views/projects/projectStudies.ftl +++ b/marlo-web/src/main/webapp/WEB-INF/crp/views/projects/projectStudies.ftl @@ -68,7 +68,7 @@ [#-- Studies list --]

[@s.text name="projectStudies.studiesTitle" /]
[@s.text name="projectStudies.studiesSubTitle" /]

-
+
[@tableList list=(projectStudies)![] /]
[#-- Add a new --] @@ -85,7 +85,7 @@ [#-- OLD Studies list --]

[@s.text name="projectStudies.studiesTitleOldFormat" /]

-
+
[@tableList list=(projectOldStudies)![] previousTable=true /]
@@ -237,4 +237,4 @@
-[/#macro] +[/#macro] \ No newline at end of file diff --git a/marlo-web/src/main/webapp/WEB-INF/crp/views/projects/projectsList.ftl b/marlo-web/src/main/webapp/WEB-INF/crp/views/projects/projectsList.ftl index d06ad8aa35..5a0ee8c888 100644 --- a/marlo-web/src/main/webapp/WEB-INF/crp/views/projects/projectsList.ftl +++ b/marlo-web/src/main/webapp/WEB-INF/crp/views/projects/projectsList.ftl @@ -6,12 +6,12 @@ "https://cdn.datatables.net/buttons/1.3.1/js/dataTables.buttons.min.js", "//cdn.datatables.net/buttons/1.3.1/js/buttons.html5.min.js", "//cdn.datatables.net/buttons/1.3.1/js/buttons.print.min.js", - "${baseUrlMedia}/js/projects/projectsList.js?20230302" + "${baseUrlMedia}/js/projects/projectsList.js?20240226" ] /] [#assign customCSS = [ "${baseUrlCdn}/global/css/customDataTable.css", - "${baseUrlMedia}/css/projects/projectsList.css?20230724"] + "${baseUrlMedia}/css/projects/projectsList.css?20240226"] /] [#if !action.isAiccra()] @@ -115,4 +115,4 @@ [@customForm.confirmJustification action="deleteProject.do" namespace="/${currentSection}" title="Remove Project" /] -[#include "/WEB-INF/global/pages/footer.ftl"] +[#include "/WEB-INF/global/pages/footer.ftl"] \ No newline at end of file diff --git a/marlo-web/src/main/webapp/crp/js/home/dashboard.js b/marlo-web/src/main/webapp/crp/js/home/dashboard.js index 837e02c495..bbe7b4146a 100644 --- a/marlo-web/src/main/webapp/crp/js/home/dashboard.js +++ b/marlo-web/src/main/webapp/crp/js/home/dashboard.js @@ -78,6 +78,19 @@ function contentDialog(id){ } + +function updateImg() { + let name = $(this).attr("id"); + $('.itemimg'+name).show(); + $('.itemgif'+name).hide(); +} + +function updateGif() { + let name = $(this).attr("id"); + $('.itemimg'+name).hide(); + $('.itemgif'+name).show(); +} + function locateContentDialog(id){ switch (id) { @@ -134,19 +147,6 @@ function locateContentDialog(id){ } - -function updateImg() { - let name = $(this).attr("id"); - $('.itemimg'+name).show(); - $('.itemgif'+name).hide(); -} - -function updateGif() { - let name = $(this).attr("id"); - $('.itemimg'+name).hide(); - $('.itemgif'+name).show(); -} - function moveScrollRight() { const element = document.querySelector(".scroll-x-containerTimeline"); element.scrollLeft += 200; @@ -459,13 +459,41 @@ $('table.projectsList').dataTable({ var iconSearch = $("
").addClass("iconSearch"); var divDataTables_filter = $('.dataTables_filter').parent(); iconSearch.append('Imagen'); -iconSearch.prependTo(divDataTables_filter) +iconSearch.prependTo(divDataTables_filter); + + var divDataTables_length =$('.dataTables_length').parent(); divDataTables_length.css("position", "absolute"); divDataTables_length.css("bottom", "8px"); divDataTables_length.css("margin-left", "43%"); divDataTables_length.css("z-index", "1"); +var windowWidth = $(window).width(); + + +if (windowWidth < 768) { + + divDataTables_filter.css({ + "width": "100%", + }); + + divDataTables_length.css({ + "left": "30vw", + "bottom": "0", + "margin-top": "4rem", + "margin-left": "0" + }); +} + +if (windowWidth < 440) { + divDataTables_length.css({ + "left": "18vw", + "bottom": "0", + "margin-top": "32px", + "margin-left": "0" + }) +} + $('a#impact[data-toggle="tab"]').on('shown.bs.tab', function(e) { e.target // newly activated tab e.relatedTarget // previous active tab @@ -516,4 +544,4 @@ function getTimeline() { } } }); -} +} \ No newline at end of file diff --git a/marlo-web/src/main/webapp/global/bower_components/datatables.net-bs/css/dataTables.bootstrap.css b/marlo-web/src/main/webapp/global/bower_components/datatables.net-bs/css/dataTables.bootstrap.css index 60bef77ebb..7f81a36f08 100644 --- a/marlo-web/src/main/webapp/global/bower_components/datatables.net-bs/css/dataTables.bootstrap.css +++ b/marlo-web/src/main/webapp/global/bower_components/datatables.net-bs/css/dataTables.bootstrap.css @@ -1,185 +1,227 @@ table.dataTable { - clear: both; - margin-top: 6px !important; - margin-bottom: 6px !important; - max-width: none !important; - border-collapse: separate !important; + clear: both; + margin-top: 6px !important; + margin-bottom: 6px !important; + max-width: none !important; + border-collapse: separate !important; } + table.dataTable td, table.dataTable th { - -webkit-box-sizing: content-box; - -moz-box-sizing: content-box; - box-sizing: content-box; + -webkit-box-sizing: content-box; + -moz-box-sizing: content-box; + box-sizing: content-box; } + table.dataTable td.dataTables_empty, table.dataTable th.dataTables_empty { - text-align: center; + text-align: center; } + table.dataTable.nowrap th, table.dataTable.nowrap td { - white-space: nowrap; + white-space: nowrap; } div.dataTables_wrapper div.dataTables_length label { - font-weight: normal; - text-align: left; - white-space: nowrap; + font-weight: normal; + text-align: left; + white-space: nowrap; } + div.dataTables_wrapper div.dataTables_length select { - width: 75px; - display: inline-block; + width: 75px; + display: inline-block; } + div.dataTables_wrapper div.dataTables_filter { - text-align: right; + text-align: right; } + div.dataTables_wrapper div.dataTables_filter label { - font-weight: normal; - white-space: nowrap; - text-align: left; + font-weight: normal; + white-space: nowrap; + text-align: left; } + div.dataTables_wrapper div.dataTables_filter input { - margin-left: 0.5em; - display: inline-block; - width: auto; + margin-left: 0.5em; + display: inline-block; + width: auto; } + div.dataTables_wrapper div.dataTables_info { - padding-top: 8px; - white-space: nowrap; + padding-top: 8px; + white-space: nowrap; } + div.dataTables_wrapper div.dataTables_paginate { - margin: 0; - white-space: nowrap; - text-align: right; + margin: 0; + white-space: nowrap; + text-align: right; } + div.dataTables_wrapper div.dataTables_paginate ul.pagination { - margin: 2px 0; - white-space: nowrap; + margin: 2px 0; + white-space: nowrap; } + div.dataTables_wrapper div.dataTables_processing { - position: absolute; - top: 50%; - left: 50%; - width: 200px; - margin-left: -100px; - margin-top: -26px; - text-align: center; - padding: 1em 0; -} - -table.dataTable thead > tr > th.sorting_asc, table.dataTable thead > tr > th.sorting_desc, table.dataTable thead > tr > th.sorting, -table.dataTable thead > tr > td.sorting_asc, -table.dataTable thead > tr > td.sorting_desc, -table.dataTable thead > tr > td.sorting { - padding-right: 30px; -} -table.dataTable thead > tr > th:active, -table.dataTable thead > tr > td:active { - outline: none; + position: absolute; + top: 50%; + left: 50%; + width: 200px; + margin-left: -100px; + margin-top: -26px; + text-align: center; + padding: 1em 0; +} + +table.dataTable thead>tr>th.sorting_asc, +table.dataTable thead>tr>th.sorting_desc, +table.dataTable thead>tr>th.sorting, +table.dataTable thead>tr>td.sorting_asc, +table.dataTable thead>tr>td.sorting_desc, +table.dataTable thead>tr>td.sorting { + padding-right: 30px; +} + +@media only screen and (max-width:440px) { + + table.dataTable thead>tr>th.sorting_asc, + table.dataTable thead>tr>th.sorting_desc, + table.dataTable thead>tr>th.sorting, + table.dataTable thead>tr>td.sorting_asc, + table.dataTable thead>tr>td.sorting_desc, + table.dataTable thead>tr>td.sorting { + padding-right: 0; + } +} + +table.dataTable thead>tr>th:active, +table.dataTable thead>tr>td:active { + outline: none; } + table.dataTable thead .sorting, table.dataTable thead .sorting_asc, table.dataTable thead .sorting_desc, table.dataTable thead .sorting_asc_disabled, table.dataTable thead .sorting_desc_disabled { - cursor: pointer; - position: relative; + cursor: pointer; + position: relative; } + table.dataTable thead .sorting:after, table.dataTable thead .sorting_asc:after, table.dataTable thead .sorting_desc:after, table.dataTable thead .sorting_asc_disabled:after, table.dataTable thead .sorting_desc_disabled:after { - position: absolute; - bottom: 8px; - right: 8px; - display: block; - font-family: 'Glyphicons Halflings'; - opacity: 0.5; + position: absolute; + bottom: 8px; + right: 8px; + display: block; + font-family: 'Glyphicons Halflings'; + opacity: 0.5; } + table.dataTable thead .sorting:after { - opacity: 0.2; - content: "\e150"; - /* sort */ + opacity: 0.2; + content: "\e150"; + /* sort */ } + table.dataTable thead .sorting_asc:after { - content: "\e155"; - /* sort-by-attributes */ + content: "\e155"; + /* sort-by-attributes */ } + table.dataTable thead .sorting_desc:after { - content: "\e156"; - /* sort-by-attributes-alt */ + content: "\e156"; + /* sort-by-attributes-alt */ } + table.dataTable thead .sorting_asc_disabled:after, table.dataTable thead .sorting_desc_disabled:after { - color: #eee; + color: #eee; } div.dataTables_scrollHead table.dataTable { - margin-bottom: 0 !important; + margin-bottom: 0 !important; } div.dataTables_scrollBody table { - border-top: none; - margin-top: 0 !important; - margin-bottom: 0 !important; + border-top: none; + margin-top: 0 !important; + margin-bottom: 0 !important; } + div.dataTables_scrollBody table thead .sorting:after, div.dataTables_scrollBody table thead .sorting_asc:after, div.dataTables_scrollBody table thead .sorting_desc:after { - display: none; + display: none; } + div.dataTables_scrollBody table tbody tr:first-child th, div.dataTables_scrollBody table tbody tr:first-child td { - border-top: none; + border-top: none; } div.dataTables_scrollFoot table { - margin-top: 0 !important; - border-top: none; + margin-top: 0 !important; + border-top: none; } @media screen and (max-width: 767px) { - div.dataTables_wrapper div.dataTables_length, - div.dataTables_wrapper div.dataTables_filter, - div.dataTables_wrapper div.dataTables_info, - div.dataTables_wrapper div.dataTables_paginate { - text-align: center; - } + + div.dataTables_wrapper div.dataTables_length, + div.dataTables_wrapper div.dataTables_filter, + div.dataTables_wrapper div.dataTables_info, + div.dataTables_wrapper div.dataTables_paginate { + text-align: center; + } } -table.dataTable.table-condensed > thead > tr > th { - padding-right: 20px; + +table.dataTable.table-condensed>thead>tr>th { + padding-right: 20px; } + table.dataTable.table-condensed .sorting:after, table.dataTable.table-condensed .sorting_asc:after, table.dataTable.table-condensed .sorting_desc:after { - top: 6px; - right: 6px; + top: 6px; + right: 6px; } table.table-bordered.dataTable th, table.table-bordered.dataTable td { - border-left-width: 0; + border-left-width: 0; } -table.table-bordered.dataTable th:last-child, table.table-bordered.dataTable th:last-child, + +table.table-bordered.dataTable th:last-child, +table.table-bordered.dataTable th:last-child, table.table-bordered.dataTable td:last-child, table.table-bordered.dataTable td:last-child { - border-right-width: 0; + border-right-width: 0; } + table.table-bordered.dataTable tbody th, table.table-bordered.dataTable tbody td { - border-bottom-width: 0; + border-bottom-width: 0; } div.dataTables_scrollHead table.table-bordered { - border-bottom-width: 0; + border-bottom-width: 0; } -div.table-responsive > div.dataTables_wrapper > div.row { - margin: 0; -} -div.table-responsive > div.dataTables_wrapper > div.row > div[class^="col-"]:first-child { - padding-left: 0; +div.table-responsive>div.dataTables_wrapper>div.row { + margin: 0; } -div.table-responsive > div.dataTables_wrapper > div.row > div[class^="col-"]:last-child { - padding-right: 0; + +div.table-responsive>div.dataTables_wrapper>div.row>div[class^="col-"]:first-child { + padding-left: 0; } + +div.table-responsive>div.dataTables_wrapper>div.row>div[class^="col-"]:last-child { + padding-right: 0; +} \ No newline at end of file