diff --git a/src/app/account/register-component.html b/src/app/account/register-component.html index 9c784b7..a3cb400 100644 --- a/src/app/account/register-component.html +++ b/src/app/account/register-component.html @@ -1,40 +1,51 @@

{{"account.register.welcomeMessageTitle" | translate }}

-

{{"account.register.welcomeMessage" | translate }}

-

{{"account.register.seeMoreMessage" | translate}}{{"account.register.informationsMessage" | translate}}

+ +

{{"account.register.seeMoreMessage" | translate}} {{"account.register.informationsMessage" | translate}}

- - +
+ + +
- - +
+ + +
- - -

ex: ola.coop.br/joaosilva

+
+  http://ola.coop.br/ + +
- - +
+ + +
- - +
+ + +
- - +
+ + +
diff --git a/src/app/account/register.component.ts b/src/app/account/register.component.ts index 0e6e9c2..0abf24b 100644 --- a/src/app/account/register.component.ts +++ b/src/app/account/register.component.ts @@ -1,6 +1,7 @@ import { Inject, Input, Component, Output, EventEmitter, provide } from 'ng-forward'; import { RegisterService } from "./../../lib/ng-noosfero-api/http/register.service"; import { NotificationService } from "./../shared/services/notification.service"; +import { EnvironmentService } from "../../lib/ng-noosfero-api/http/environment.service"; @Component({ selector: 'noosfero-register', @@ -10,12 +11,19 @@ import { NotificationService } from "./../shared/services/notification.service"; ] }) -@Inject("$state", RegisterService, NotificationService) +@Inject("$state", RegisterService, NotificationService, EnvironmentService) export class RegisterComponent { @Input() account: any; + environment: noosfero.Environment; - constructor(private $state: ng.ui.IStateService, public registerService: RegisterService, private notificationService: NotificationService) { + constructor( + private $state: ng.ui.IStateService, + public registerService: RegisterService, + private notificationService: NotificationService, + private environmentService: EnvironmentService + ) { this.account = {}; + this.environment = environmentService.getCurrentEnvironment(); } signup() { diff --git a/src/languages/en.json b/src/languages/en.json index 7257bbe..a899d57 100644 --- a/src/languages/en.json +++ b/src/languages/en.json @@ -31,23 +31,6 @@ "auth.createAccount": "Create account", "navbar.content_viewer_actions.new_item": "New Item", "navbar.profile_actions.new_item": "New Item", - "account.register.welcomeMessageTitle": "Nice to have you there!", - "account.register.welcomeMessage": "Neque porro quisquam est qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit...", - "account.register.seeMoreMessage": "See more ", - "account.register.informationsMessage": "informations", - "account.register.firstNameLabel": "First Name", - "account.register.lastNameLabel": "Last Name", - "account.register.usernameLabel": "Username", - "account.register.emailLabel": "Email", - "account.register.passwordLabel": "Password", - "account.register.passwordConfirmationLabel": "Password Confirmation", - "account.register.accountCreatingMessage": "By creating an account, you are agreeing with the ", - "account.register.signupMessage": "Create Account", - "account.register.haveAccountMessage": "Already have an account?", - "account.register.termsOfUseMessage": "terms of use", - "account.register.success.title": "Good job!", - "account.register.success.message": "Account created!", - "account.register.passwordConfirmation.failed": "Wrong password confirmation" "navbar.content_viewer_actions.new_post": "New Post", "navbar.content_viewer_actions.new_discussion": "New Discussion", "navbar.profile_actions.new_discussion": "New Discussion", @@ -118,5 +101,21 @@ "block.edition.language.label": "Show for:", "activities.event.description": "Event on", "time.at": "at", - "date.on": "On" + "date.on": "On", + "account.register.welcomeMessageTitle": "Nice to have you there!", + "account.register.seeMoreMessage": "See more ", + "account.register.informationsMessage": "informations", + "account.register.firstNameLabel": "First name", + "account.register.lastNameLabel": "Last name", + "account.register.usernameLabel": "Username", + "account.register.emailLabel": "Email", + "account.register.passwordLabel": "Password", + "account.register.passwordConfirmationLabel": "Password confirmation", + "account.register.accountCreatingMessage": "By creating an account, you are agreeing with the ", + "account.register.signupMessage": "Register", + "account.register.haveAccountMessage": "Already have an account?", + "account.register.termsOfUseMessage": "terms of use", + "account.register.success.title": "Good job!", + "account.register.success.message": "Account created!", + "account.register.passwordConfirmation.failed": "Wrong password confirmation" } -- libgit2 0.21.2