litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Related to VIVO-921. Server-side validation for default data property form.

Browse source
This commit is contained in:
Tim Worrall 2015-04-07 14:00:30 -04:00
parent a32ee20a40
commit 0c5d69e25e
5 changed files with 170 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

46
webapp/web/templates/freemarker/body/partials/individual/propStatement-dataDefault.ftl
View file

@ -46,47 +46,57 @@
<#if datatype?? >
<#switch datatype>
<#case "date">
<img class="invalidFormat" src="${urls.base}/images/iconAlert.png" width="18" alt="${i18n().invalid_format}" title=" ${i18n().invalid_format}"> <#-- validated above -->
<#break>
<img class="invalidFormatImg" src="${urls.base}/images/iconAlert.png" width="18" alt="${i18n().invalid_format}" title=" ${i18n().invalid_format}"> <#-- validated above -->
<span class="invalidFormatText">invalid format</span>
<#break>
<#case "dateTime">
<img class="invalidFormat" src="${urls.base}/images/iconAlert.png" width="18" alt=" ${i18n().invalid_format}" title=" ${i18n().invalid_format}"> <#-- validated above -->
<#break>
<img class="invalidFormatImg" src="${urls.base}/images/iconAlert.png" width="18" alt=" ${i18n().invalid_format}" title=" ${i18n().invalid_format}"> <#-- validated above -->
<span class="invalidFormatText">invalid format</span>
<#break>
<#case "time">
<#if !value?matches("(([0-1][0-9])|(2[0-3])):([0-5][0-9]):([0-5][0-9])") >
<img class="invalidFormat" src="${urls.base}/images/iconAlert.png" width="18" alt=" ${i18n().invalid_format}" title=" ${i18n().invalid_format}">
<img class="invalidFormatImg" src="${urls.base}/images/iconAlert.png" width="18" alt=" ${i18n().invalid_format}" title=" ${i18n().invalid_format}">
<span class="invalidFormatText">invalid format</span>
</#if>
<#break>
<#case "gYear">
<#if !value?matches("^\\d{4}") >
<img class="invalidFormat" src="${urls.base}/images/iconAlert.png" width="18" alt=" ${i18n().invalid_format}" title=" ${i18n().invalid_format}">
<img class="invalidFormatImg" src="${urls.base}/images/iconAlert.png" width="18" alt=" ${i18n().invalid_format}" title=" ${i18n().invalid_format}">
<span class="invalidFormatText">invalid format</span>
</#if>
<#break>
<#case "gMonth">
<img class="invalidFormat" src="${urls.base}/images/iconAlert.png" width="18" alt=" ${i18n().invalid_format}" title=" ${i18n().invalid_format}"> <#-- validated above -->
<#break>
<img class="invalidFormatImg" src="${urls.base}/images/iconAlert.png" width="18" alt=" ${i18n().invalid_format}" title=" ${i18n().invalid_format}"> <#-- validated above -->
<span class="invalidFormatText">invalid format</span>
<#break>
<#case "gYearMonth">
<img class="invalidFormat" src="${urls.base}/images/iconAlert.png" width="18" alt=" ${i18n().invalid_format}" title=" ${i18n().invalid_format}"> <#-- validated above -->
<#break>
<img class="invalidFormatImg" src="${urls.base}/images/iconAlert.png" width="18" alt=" ${i18n().invalid_format}" title=" ${i18n().invalid_format}"> <#-- validated above -->
<span class="invalidFormatText">invalid format</span>
<#break>
<#case "float">
<#if !value?matches("^[-+]?[0-9]*\\.?[0-9]+([eE][-+]?[0-9]+)?.") >
<img class="invalidFormat" src="${urls.base}/images/iconAlert.png" width="18" alt=" ${i18n().invalid_format}" title=" ${i18n().invalid_format}">
<img class="invalidFormatImg" src="${urls.base}/images/iconAlert.png" width="18" alt=" ${i18n().invalid_format}" title=" ${i18n().invalid_format}">
<span class="invalidFormatText">invalid format</span>
</#if>
<#break>
<#break>
<#case "integer">
<#if !value?matches("^-?\\d+$") >
<img class="invalidFormat" src="${urls.base}/images/iconAlert.png" width="18" alt=" ${i18n().invalid_format}" title=" ${i18n().invalid_format}">
<img class="invalidFormatImg" src="${urls.base}/images/iconAlert.png" width="18" alt=" ${i18n().invalid_format}" title=" ${i18n().invalid_format}">
<span class="invalidFormatText">invalid format</span>
</#if>
<#break>
<#break>
<#case "int">
<#if !value?matches("^-?\\d+$") >
<img class="invalidFormat" src="${urls.base}/images/iconAlert.png" width="18" alt=" ${i18n().invalid_format}" title=" ${i18n().invalid_format}">
<img class="invalidFormatImg" src="${urls.base}/images/iconAlert.png" width="18" alt=" ${i18n().invalid_format}" title=" ${i18n().invalid_format}">
<span class="invalidFormatText">invalid format</span>
</#if>
<#break>
<#break>
<#case "boolean">
<#if !value?matches("false") && !value?matches("true") >
<img class="invalidFormat" src="${urls.base}/images/iconAlert.png" width="18" alt=" ${i18n().invalid_format}" title=" ${i18n().invalid_format}">
<img class="invalidFormatImg" src="${urls.base}/images/iconAlert.png" width="18" alt=" ${i18n().invalid_format}" title=" ${i18n().invalid_format}">
<span class="invalidFormatText">invalid format</span>
</#if>
<#break>
<#break>
<#default>
</#switch>
</#if>

14
webapp/web/templates/freemarker/edit/forms/css/customForm.css
View file

@ -137,4 +137,16 @@ section#pubsContainer input {
img#indicator {
padding-left:60px;
}
/* for placeholder text */
::-webkit-input-placeholder { /* WebKit browsers */
opacity: .25;
}
:-moz-placeholder { /* Mozilla Firefox 4 to 18 */
opacity: .25;
}
::-moz-placeholder { /* Mozilla Firefox 19+ */
opacity: .25;
}
:-ms-input-placeholder { /* Internet Explorer 10+ */
opacity: .25;
}