From 5cb579fee9d5688c55aafa105689cba0041eacee Mon Sep 17 00:00:00 2001 From: Georgy Litvinov Date: Tue, 2 Mar 2021 15:19:25 +0100 Subject: [PATCH] Refactoring rubric and rubrics templates --- .../webapp/templates/freemarker/rubric.ftl | 22 ++----------------- .../webapp/templates/freemarker/rubrics.ftl | 20 ++--------------- 2 files changed, 4 insertions(+), 38 deletions(-) diff --git a/webapp/src/main/webapp/templates/freemarker/rubric.ftl b/webapp/src/main/webapp/templates/freemarker/rubric.ftl index f2330967..70ce7bd8 100644 --- a/webapp/src/main/webapp/templates/freemarker/rubric.ftl +++ b/webapp/src/main/webapp/templates/freemarker/rubric.ftl @@ -1,6 +1,8 @@ <#import "lib-vivo-properties.ftl" as vp> <#include "individual-setup.ftl"> +${scripts.add('')} +
@@ -109,23 +111,3 @@ - - - - - diff --git a/webapp/src/main/webapp/templates/freemarker/rubrics.ftl b/webapp/src/main/webapp/templates/freemarker/rubrics.ftl index ae08ad5a..38364c94 100644 --- a/webapp/src/main/webapp/templates/freemarker/rubrics.ftl +++ b/webapp/src/main/webapp/templates/freemarker/rubrics.ftl @@ -1,3 +1,5 @@ +${scripts.add('')} + <#list rubrics as rubric> <#if !rubric.parentUri??> <#assign childs = rubric.childs?number> @@ -13,24 +15,6 @@ - - <#macro openButton childs> <#if childs > 0>
+