From 7fd772c772619f38287e410f39c7f3b8c36d84c3 Mon Sep 17 00:00:00 2001 From: Graham Triggs Date: Sun, 26 Feb 2017 21:02:02 +0000 Subject: [PATCH] Updates to Tenderfoot individual display --- .../js/propertyGroupControls-bootstrap.js | 8 +++ .../individual-property-group-tabs.ftl | 67 ++++++++++--------- 2 files changed, 42 insertions(+), 33 deletions(-) create mode 100644 webapp/src/main/webapp/themes/tenderfoot/js/propertyGroupControls-bootstrap.js diff --git a/webapp/src/main/webapp/themes/tenderfoot/js/propertyGroupControls-bootstrap.js b/webapp/src/main/webapp/themes/tenderfoot/js/propertyGroupControls-bootstrap.js new file mode 100644 index 00000000..f3584742 --- /dev/null +++ b/webapp/src/main/webapp/themes/tenderfoot/js/propertyGroupControls-bootstrap.js @@ -0,0 +1,8 @@ +$(document).ready(function(){ + $("#viewAllTab").on("click",function(){ + $('[data-toggle="tab"]').parent().removeClass("active"); + $("#viewAllTab").parent().addClass("active"); + $("#viewAllTab").addClass("active"); + $(".tab-pane").addClass("fade active in"); + }); +}); diff --git a/webapp/src/main/webapp/themes/tenderfoot/templates/body/partials/individual/individual-property-group-tabs.ftl b/webapp/src/main/webapp/themes/tenderfoot/templates/body/partials/individual/individual-property-group-tabs.ftl index 21a34625..e3fe6fa9 100644 --- a/webapp/src/main/webapp/themes/tenderfoot/templates/body/partials/individual/individual-property-group-tabs.ftl +++ b/webapp/src/main/webapp/themes/tenderfoot/templates/body/partials/individual/individual-property-group-tabs.ftl @@ -8,58 +8,58 @@ <#assign sectionCount = 1 >
-
- +
-
+
<#list propertyGroups.all as group> <#if (group.properties?size > 0)> <#assign groupName = group.getName(nameForOtherGroup)> <#assign groupNameHtmlId = p.createPropertyGroupHtmlId(groupName) > <#assign verbose = (verbosePropertySwitch.currentValue)!false> -
- <#-- Display the group heading --> + <#-- Display the group heading --> <#if groupName?has_content> - <#--the function replaces spaces in the name with underscores, also called for the property group menu--> + <#--the function replaces spaces in the name with underscores, also called for the property group menu--> <#assign groupNameHtmlId = p.createPropertyGroupHtmlId(groupName) > - + <#else> - + - <#-- List the properties in the group --> + <#-- List the properties in the group --> <#include "individual-properties.ftl"> -
+
<#assign sectionCount = 2 > -
+
')} ${scripts.add('')} +${scripts.add('')}