diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml index 6446dd26..c1ec4aeb 100644 --- a/modules/distribution/src/assembly/bin.xml +++ b/modules/distribution/src/assembly/bin.xml @@ -1,3 +1,20 @@ + bin @@ -80,6 +97,7 @@ **/sso-idp-config.xml **/application-authentication.xml **/sso/jaggery.conf + **/sso/views/register_new_user.jag @@ -330,6 +348,7 @@ **/publisher/config/publisher-tenant.json **/sso/jaggery.conf + **/sso/views/register_new_user.jag @@ -574,6 +593,15 @@ + + src/sso + + ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/sso + + + **/* + + @@ -1119,12 +1147,5 @@ ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/publisher/config 644 - - - src/sso/jaggery.conf - ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/sso - true - - diff --git a/modules/distribution/src/assembly/dist.xml b/modules/distribution/src/assembly/dist.xml index 5d2be5cb..f41020e5 100644 --- a/modules/distribution/src/assembly/dist.xml +++ b/modules/distribution/src/assembly/dist.xml @@ -1,5 +1,5 @@ +
+
+

Create An Account

+
+
+
Enter all text fields to complete registration
+ +
+ + + +
+ + +
+
+ + +
+
+ + +
+ + <% + var claimsModule = require('account-management'); + var claims = claimsModule.getDefaultClaims(); + var renderedClaims = {}; + + var claimUriOverrides = { + USERNAME: { + render: false // because this is already rendered by default + }, + PASSWORD: { + render: false // because this is already rendered by default + }, + EMAILADDRESS: { + render: true, + customClass: 'email' + } + }; + + for (var claimIndex = 0; claimIndex < claims.length; claimIndex++) { + var override = claimUriOverrides[claims[claimIndex].claimUri.toUpperCase()]; + // render claim if it's required and not overriden to --> render:false + if (claims[claimIndex].isRequired && (!override || override.render !== false)) { + var formElementName = 'reg-' + claims[claimIndex].displayTag.toLowerCase().replace(' ', '-'); + var validationClass = ""; + var span = ""; + if(claims[claimIndex].displayTag == "Email"){ + validationClass = "email"; + span = "col-xs-12 col-sm-12 col-md-12 col-lg-12"; + }else{ + span = "col-xs-12 col-sm-12 col-md-6 col-lg-6" + } + %> +
+ + +
+ <% + renderedClaims[formElementName] = claims[claimIndex].claimUri; + } + } + %> + + + + +
+

+ +
+
+ Already have an account? + Sign in +
+
+
+
+
+
+ + + + <% include(themeModule.getThemedUrl('includes/footer_file_imports.jag')); %> + + + \ No newline at end of file diff --git a/modules/samples/virtual_firealarm/artifact/deviceType.json b/modules/samples/virtual_firealarm/artifact/deviceType.json index c9176222..0b63d563 100644 --- a/modules/samples/virtual_firealarm/artifact/deviceType.json +++ b/modules/samples/virtual_firealarm/artifact/deviceType.json @@ -9,13 +9,13 @@ "overview_name":"virtual_firealarm", "overview_url":"http://www.google.lk", "setupGuide_guideImage":"virtual_firealarm/guide.png", - "overview_actionLabel":"Download a virtual device", + "overview_actionLabel":"Create a virtual device", "sketches_Sketches":"virtual_firealarm", "ingredients_ingredients":[ "Virtual Agent that simulates an actual firealarm" ], "overview_description":"Download our Virtual Agent and try-it out for close to real simulation of the FireAlarm Device-Type", - "setupGuide_description":"sfd", + "setupGuide_description":"Extract the downloaded agent and run startservice.sh to start agent", "quickStartupSteps_stepDescription":["Download the Virtual Agent","Run the 'startservice.sh' script","Provide the push-interval and network-interface"], "quickStartupSteps_stepLabel":["1","2","3"], "images_thumbnail":"virtual_firealarm/virtual_firealarm_thumbnail.png", diff --git a/pom.xml b/pom.xml index 94a1f957..d126352f 100644 --- a/pom.xml +++ b/pom.xml @@ -823,9 +823,9 @@ - 4.4.1 + 4.4.2 [4.4.1, 4.5.0) - 4.4.1 + 4.4.2 1.5.4