From 8e8ec75b57abd45eece1c254740f1942467165c1 Mon Sep 17 00:00:00 2001 From: manolobevia Date: Wed, 2 Nov 2011 18:44:35 +0000 Subject: [PATCH] NIHVIVO-2288: Done css changes for data and object property forms. --- .../edit/forms/confirmDeletePropertyForm.ftl | 16 +++--- .../edit/forms/defaultDataPropertyForm.ftl | 33 +++++------- .../edit/forms/defaultDeletePropertyForm.ftl | 52 +++++++++---------- .../forms/defaultOfferCreateNewOptionForm.ftl | 39 +++++++------- .../edit/forms/defaultPropertyForm.ftl | 49 ++++++++--------- 5 files changed, 91 insertions(+), 98 deletions(-) diff --git a/webapp/web/templates/freemarker/edit/forms/confirmDeletePropertyForm.ftl b/webapp/web/templates/freemarker/edit/forms/confirmDeletePropertyForm.ftl index 07d86ac72..b52bfde4e 100644 --- a/webapp/web/templates/freemarker/edit/forms/confirmDeletePropertyForm.ftl +++ b/webapp/web/templates/freemarker/edit/forms/confirmDeletePropertyForm.ftl @@ -11,7 +11,7 @@

Are you sure you want to delete the following entry from ${editConfiguration.propertyName}?

-
+

<#if editConfiguration.objectProperty = true> <#if statement.object?has_content> <#include "propStatement-default.ftl" /> @@ -19,23 +19,23 @@ <#else> ${statement.dataValue} -

+

- - + + <#if editConfiguration.dataProperty = true> - - + + <#else> - + <#if editConfiguration.objectProperty = true>

- + or Cancel <#if editConfiguration.objectProperty = true> diff --git a/webapp/web/templates/freemarker/edit/forms/defaultDataPropertyForm.ftl b/webapp/web/templates/freemarker/edit/forms/defaultDataPropertyForm.ftl index 7d7638cc0..a1532a684 100644 --- a/webapp/web/templates/freemarker/edit/forms/defaultDataPropertyForm.ftl +++ b/webapp/web/templates/freemarker/edit/forms/defaultDataPropertyForm.ftl @@ -5,32 +5,27 @@ <#assign literalValues = "${editConfiguration.dataLiteralValuesAsString}" /> - - <#if editConfiguration.dataPredicatePublicDescription?has_content> -

${editConfiguration.dataPredicatePublicDescription}

- + + <#if editConfiguration.dataPredicatePublicDescription?has_content> + + - - + + +
+ <#--The submit label should be set within the template itself, right now + the default label for default data/object property editing is returned from Edit Configuration Template Model, + but that method may not return the correct result for other custom forms--> + + or + Cancel -
- <#--The submit label should be set within the template itself, right now - the default label for default data/object property editing is returned from Edit Configuration Template Model, - but that method may not return the correct result for other custom forms--> - - or - Cancel -
-
- <#if editConfiguration.includeDeletionForm = true> <#include "defaultDeletePropertyForm.ftl"> -<#include "defaultFormScripts.ftl"> +<#include "defaultFormScripts.ftl"> diff --git a/webapp/web/templates/freemarker/edit/forms/defaultDeletePropertyForm.ftl b/webapp/web/templates/freemarker/edit/forms/defaultDeletePropertyForm.ftl index bfb3eb804..b541fd786 100644 --- a/webapp/web/templates/freemarker/edit/forms/defaultDeletePropertyForm.ftl +++ b/webapp/web/templates/freemarker/edit/forms/defaultDeletePropertyForm.ftl @@ -1,38 +1,36 @@ -
- +<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> + + +

Delete this entry?

+ + + - <#if editConfiguration.dataProperty = true> - -
- -
- + <#if editConfiguration.dataProperty = true> + + <#--The original jsp included vinput tag with cancel=empty string for case where both select from existing - and offer create new option are true below - so leaving as Cancel for first option but not second below--> + and offer create new option are true below so leaving as Cancel for first option but not second below--> <#if editConfiguration.objectProperty = true> - - - <#if editConfiguration.propertySelectFromExisting = false - && editConfiguration.propertyOfferCreateNewOption = false> -
- - or - Cancel -
- - - <#if editConfiguration.propertySelectFromExisting = true - && editConfiguration.propertyOfferCreateNewOption = true> -
- -
- + + <#if editConfiguration.propertySelectFromExisting = false && editConfiguration.propertyOfferCreateNewOption = false> +

+ + or + Cancel +

+ + + <#if editConfiguration.propertySelectFromExisting = true && editConfiguration.propertyOfferCreateNewOption = true> +

+ +

+
diff --git a/webapp/web/templates/freemarker/edit/forms/defaultOfferCreateNewOptionForm.ftl b/webapp/web/templates/freemarker/edit/forms/defaultOfferCreateNewOptionForm.ftl index ad67a0bef..0415b145f 100644 --- a/webapp/web/templates/freemarker/edit/forms/defaultOfferCreateNewOptionForm.ftl +++ b/webapp/web/templates/freemarker/edit/forms/defaultOfferCreateNewOptionForm.ftl @@ -1,27 +1,30 @@ + <#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> + <#if editConfiguration.rangeOptionsExist = true > -

If you don't find the appropriate entry on the selection list above:

+

If you don't find the appropriate entry on the selection list above:

<#else> -

Please create a new entry.

+

Please create a new entry.

- <#if editConfiguration.objectUri?has_content> - <#assign objectUri = editConfiguration.objectUri> + <#assign objectUri = editConfiguration.objectUri> <#else> - <#assign objectUri = ""/> + <#assign objectUri = ""/> <#assign typesList = editConfiguration.offerTypesCreateNew /> -
- - - - - - -
\ No newline at end of file +
+ + + + + + + + +
\ No newline at end of file diff --git a/webapp/web/templates/freemarker/edit/forms/defaultPropertyForm.ftl b/webapp/web/templates/freemarker/edit/forms/defaultPropertyForm.ftl index 4cec0905b..69589bc99 100644 --- a/webapp/web/templates/freemarker/edit/forms/defaultPropertyForm.ftl +++ b/webapp/web/templates/freemarker/edit/forms/defaultPropertyForm.ftl @@ -3,32 +3,29 @@

${editConfiguration.formTitle}

<#if editConfiguration.propertySelectFromExisting = true> - <#if editConfiguration.rangeOptionsExist = true > - <#assign rangeOptionKeys = editConfiguration.rangeOptions?keys /> -
- - <#if editConfiguration.propertyPublicDescription?has_content> -

${editConfiguration.propertyPublicDescription}

- - -
- - or - Cancel -
- -
- <#else> -

There are no entries in the system from which to select.

- + <#if editConfiguration.rangeOptionsExist = true > + <#assign rangeOptionKeys = editConfiguration.rangeOptions?keys /> +
+ + <#if editConfiguration.propertyPublicDescription?has_content> +

${editConfiguration.propertyPublicDescription}

+ + + +

+ + or + Cancel +

+ +
+ <#else> +

There are no entries in the system from which to select.

+ <#if editConfiguration.propertyOfferCreateNewOption = true>