From 8e4d0b180c3c351ca6e7edec7fbc5e27f5d21dc5 Mon Sep 17 00:00:00 2001
From: Michel Felipe <mfelipeof@gmail.com>
Date: Fri, 15 Jul 2016 16:50:10 -0300
Subject: [PATCH] Refactory html template + new environment service property

---
 src/app/account/register-component.html | 41 ++++++++++++++++++++++++++---------------
 src/app/account/register.component.ts   | 12 ++++++++++--
 src/languages/en.json                   |  9 ++++-----
 src/languages/pt.json                   |  1 -
 4 files changed, 40 insertions(+), 23 deletions(-)

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 @@
 <div class="register-page">
   <div class="welcome-message">
     <h1>{{"account.register.welcomeMessageTitle" | translate }}</h1>
-    <p>{{"account.register.welcomeMessage" | translate }}</p>
-    <p>{{"account.register.seeMoreMessage" | translate}}<a href="#">{{"account.register.informationsMessage" | translate}}</a></p>
+    <div class="environment-signup-intro" ng-bind-html="ctrl.environment.signup_intro"></div>
+    <p>{{"account.register.seeMoreMessage" | translate}} <a href="#">{{"account.register.informationsMessage" | translate}} </a></p>
   </div>
   <form>
     <div class="row">
       <div class="col-md-6 register-field">
-        <label for="name">{{"account.register.firstNameLabel" | translate }}</label>
-        <input type="text" class="form-control" id="name" placeholder="joao" ng-model="ctrl.account.name">
+        <div class="input-group">
+          <span class="input-group-addon"><i class="fa fa-male"></i><i class="fa fa-female"></i></span>
+          <input type="text" class="form-control" id="name" placeholder="{{'account.register.firstNameLabel' | translate }}" ng-model="ctrl.account.name">
+        </div>
       </div>
 
       <div class="col-md-6 register-field">
-        <label for="lastName">{{"account.register.lastNameLabel" | translate }}</label>
-        <input type="text" class="form-control" id="lastName" placeholder="silva" ng-model="ctrl.account.lastName">
+        <div class="input-group">
+          <span class="input-group-addon"><i class="fa fa-male"></i><i class="fa fa-female"></i></span>
+          <input type="text" class="form-control" id="lastName" placeholder="{{'account.register.lastNameLabel' | translate }}" ng-model="ctrl.account.lastName">
+        </div>
       </div>
 
       <div class="col-md-12 register-field">
-        <label for="login">{{"account.register.usernameLabel" | translate }}</label>
-        <input type="text" class="form-control" id="login" placeholder="username" ng-model="ctrl.account.login">
-        <p class="light-text">ex: ola.coop.br/joaosilva</p>
+        <div class="input-group">
+          <span class="input-group-addon" style="font-weight: bold;"><i class="fa fa-globe"></i>&nbsp;http://ola.coop.br/</span>
+          <input type="text" class="form-control" id="login" placeholder="{{'account.register.usernameLabel' | translate }}" ng-model="ctrl.account.login">
+        </div>
       </div>
 
       <div class="col-md-12 register-field">
-        <label for="email">{{"account.register.emailLabel" | translate }}</label>
-        <input type="text" class="form-control" id="email" placeholder="Email" ng-model="ctrl.account.email">
+        <div class="input-group">
+          <span class="input-group-addon"><i class="fa fa-envelope"></i></span>
+          <input type="text" class="form-control" id="email" placeholder="{{'account.register.emailLabel' | translate }}" ng-model="ctrl.account.email">
+        </div>
       </div>
 
       <div class="col-md-6 register-field">
-        <label for="password">{{"account.register.passwordLabel" | translate }}</label>
-        <input type="password" class="form-control" id="password" placeholder="Password" ng-model="ctrl.account.password">
+        <div class="input-group">
+          <span class="input-group-addon"><i class="fa fa-lock"></i></span>
+          <input type="password" class="form-control" id="password" placeholder="{{'account.register.passwordLabel' | translate }}" ng-model="ctrl.account.password">
+        </div>
       </div>
 
       <div class="col-md-6 register-field">
-        <label for="password-confirmation">{{"account.register.passwordConfirmationLabel" | translate}}</label>
-        <input type="password" class="form-control" id="passwordConfirmation" placeholder="Password Confirmation" ng-model="ctrl.account.password_confirmation">
+        <div class="input-group">
+          <span class="input-group-addon"><i class="fa fa-unlock-alt"></i></span>
+          <input type="password" class="form-control" id="passwordConfirmation" placeholder="{{'account.register.passwordConfirmationLabel' | translate}}" ng-model="ctrl.account.password_confirmation">
+        </div>
       </div>
 
       <div class="col-md-12">
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 5e367d9..3d1b471 100644
--- a/src/languages/en.json
+++ b/src/languages/en.json
@@ -100,17 +100,16 @@
   "block.edition.display_user.not_logged": "Not logged",
   "block.edition.language.label": "Show for:",
   "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.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.passwordConfirmationLabel": "Password confirmation",
   "account.register.accountCreatingMessage": "By creating an account, you are agreeing with the ",
-  "account.register.signupMessage": "Create Account",
+  "account.register.signupMessage": "Register",
   "account.register.haveAccountMessage": "Already have an account?",
   "account.register.termsOfUseMessage": "terms of use",
   "account.register.success.title": "Good job!",
diff --git a/src/languages/pt.json b/src/languages/pt.json
index 81b489b..171ae52 100644
--- a/src/languages/pt.json
+++ b/src/languages/pt.json
@@ -100,7 +100,6 @@
   "block.edition.display_user.not_logged": "Não logados",
   "block.edition.language.label": "Exibir para:",
   "account.register.welcomeMessageTitle": "Ótimo ter você aqui!",
-  "account.register.welcomeMessage": "Neque porro quisquam est qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit...",
   "account.register.seeMoreMessage": "Saiba mais ",
   "account.register.informationsMessage": "informações",
   "account.register.firstNameLabel": "Nome",
--
libgit2 0.21.2