Commit d4c3b9c6 authored by Emmanuel Raviart's avatar Emmanuel Raviart

Manually merge elements from pull request https://github.com/ogptoolbox/ogptoolbox-ui/pull/17.

parent 7f6ee910
module Authenticator.SignUp.View exposing (..)
import Authenticator.Routes
import Authenticator.SignUp.Types exposing (..)
import Authenticator.ViewsParts exposing (..)
import Dict exposing (Dict)
......@@ -11,6 +12,7 @@ import Html.Helpers exposing (aForPath)
import Http exposing (Error(BadStatus))
import Http.Error
import I18n
import Json.Decode
view : I18n.Language -> Model -> Html Msg
......@@ -46,36 +48,9 @@ view language model =
in
div [ class "modal-body" ]
[ div [ class "row" ]
[ div [ class "col-xs-7" ]
[ div [ class "well" ]
[ Html.form [ onSubmit (ForSelf <| Submit) ]
[ viewUsernameControl
(ForSelf << UsernameInput)
language
(Dict.get "username" model.errors)
model.username
, viewEmailControl
(ForSelf << EmailInput)
language
(Dict.get "email" model.errors)
model.email
, viewPasswordControl
(ForSelf << PasswordInput)
language
(Dict.get "password" model.errors)
model.password
, alert
, button
[ class "btn btn-block btn-default grey", type_ "submit" ]
[ text (I18n.translate language I18n.Register) ]
]
]
]
, div [ class "col-xs-5" ]
[ div [ class "well well-right" ]
[ p [ class "lead" ]
[ text (I18n.translate language I18n.CreateAccountNow) ]
, ul [ class "list-unstyled" ]
[ div [ class "col-xs-6" ]
[ div [ class "well well-left" ]
[ ul [ class "list-unstyled" ]
[ li []
[ span [ class "fa fa-check text-success" ]
[]
......@@ -107,6 +82,40 @@ view language model =
]
]
]
, a
[ class "btn btn-block btn-default grey haveanaccount"
, href "#"
, onWithOptions
"click"
{ preventDefault = True, stopPropagation = False }
(Json.Decode.succeed (ForParent (ChangeRoute Authenticator.Routes.SignInRoute)))
]
[ text (I18n.translate language I18n.HaveAnAccount) ]
]
]
, div [ class "col-xs-6" ]
[ div [ class "well" ]
[ Html.form [ onSubmit (ForSelf <| Submit) ]
[ viewUsernameControl
(ForSelf << UsernameInput)
language
(Dict.get "username" model.errors)
model.username
, viewEmailControl
(ForSelf << EmailInput)
language
(Dict.get "email" model.errors)
model.email
, viewPasswordControl
(ForSelf << PasswordInput)
language
(Dict.get "password" model.errors)
model.password
, alert
, button
[ class "btn btn-block btn-default", type_ "submit" ]
[ text (I18n.translate language I18n.Register) ]
]
]
]
]
......
......@@ -761,18 +761,21 @@ viewEditPropertyModal language { ballots, cardId, keyId, properties, propertyIds
]
)
]
, div [ class "modal-body", style [ ( "min-height", "20em" ) ] ]
, div [ class "modal-body", style [ ( "min-height", "35em" ) ] ]
[ div [ class "row" ]
[ div [ class "col-xs-12" ]
[ div [ class "col-xs-8" ]
[ ul [ class "media-list" ]
(propertyIds
|> List.map (getProperty properties)
|> List.indexedMap viewProperty
)
, nav [ class "navbar-fixed-bottom grey" ]
[ Html.form
[ class "navbar-form navbar-left big"
, onSubmit (ForSelf (SubmitValue selectedField))
]
, div [ class "col-xs-4 grey fullheight-right" ]
[ div []
[ h5 [ attribute "aria-hidden" "true" ]
[ text (I18n.translate language I18n.AddYourContribution) ]
, Html.form
[ onSubmit (ForSelf (SubmitValue selectedField))
]
[ select
[ on "change"
......@@ -830,10 +833,10 @@ viewEditPropertyModal language { ballots, cardId, keyId, properties, propertyIds
|> List.map (\s -> option [ value s ] [ text s ])
)
, div
[ class "form-group" ]
[ class "form-group " ]
[ viewField ]
, div [ class "navbar-right" ]
[ button [ class "btn btn-default", type_ "submit" ]
, div []
[ button [ class "btn btn-default btn-block", type_ "submit" ]
[ text (I18n.translate language (I18n.Add)) ]
]
]
......
......@@ -31,6 +31,7 @@ type TranslationId
| AddTool
| AddToolOrUseCase
| AddUseCase
| AddYourContribution
| AuthenticationFailed
| AuthenticationRequired
| AuthenticationRequiredExplanation
......@@ -140,6 +141,7 @@ type TranslationId
| FooterAbout
| FooterDiscover
| GenericError
| HaveAnAccount
| HeaderTitle
| Help
| Home
......@@ -387,6 +389,12 @@ getTranslationSet translationId =
, spanish = todo
}
AddYourContribution ->
{ english = s "Add your contribution"
, french = s "Ajouter votre contribution"
, spanish = todo
}
AuthenticationFailed ->
{ english = s "Authentication failed"
, french = s "L'authentification a échoué"
......@@ -649,8 +657,8 @@ getTranslationSet translationId =
}
CreateAccountNow ->
{ english = s "Create your account now"
, french = s "Créez votre compte maintenant"
{ english = s "Create your account"
, french = s "Créez votre compte"
, spanish = todo
}
......@@ -1114,6 +1122,12 @@ getTranslationSet translationId =
, spanish = todo
}
HaveAnAccount ->
{ english = s "I already have an account"
, french = s "J'ai déjà un compte"
, spanish = todo
}
HeaderTitle ->
{ english = s "digital solutions to improve democracy"
, french = s "solutions numériques pour la démocratie"
......@@ -1222,7 +1236,7 @@ getTranslationSet translationId =
{ english = s "Logo"
, french = s "Logo"
, spanish = todo
}
}
MissingDescription ->
{ english = s "Missing description"
......@@ -1898,6 +1912,7 @@ to strengthen governance.
}
-- INTERNALS
......
This diff is collapsed.
......@@ -1525,6 +1525,10 @@ table {
margin-left: -20px;
background: white;
}
&.well-left {
margin-left: 0px;
background: white;
}
}
}
......@@ -1668,6 +1672,8 @@ table {
a.forgot {
color: grey;
margin-bottom: 40px;
display: block;
&:hover {
color: @light-blue;
......@@ -1676,11 +1682,23 @@ table {
}
}
#edit-overlay.modal-dialog .modal-body {
#edit-overlay.modal-dialog {
width: 930px;
.modal-body {
overflow: scroll;
h5 {
font-weight: bold;
margin-bottom: 20px;
margin-top: 15px;
}
input.form-control {
margin: 15px 0;
}
}
}
.grey {
background-color: @light-grey;
}
......@@ -1691,6 +1709,19 @@ table {
.modal-backdrop{
z-index: 1000040;
}
.text-success {
color: #52b370;
margin-right: 2px;
}
.haveanaccount {
margin-top: 67px;
}
.fullheight-right {
position: absolute;
bottom: 0;
top: 0;
right: 0;
}
//FULL SCREEN BROWSE PAGE
body, html, #main, .main-container {
......@@ -2517,27 +2548,44 @@ h3.user-mail {
/* Page presse */
section.bloc-citation {
padding: 60px 0 60px 0;
border-bottom: 2px solid #f7f7f7;
}
section.quote {
padding: 50px 0;
&:first-of-type {
margin-top: 80px;
}
&:last-of-type {
margin-bottom: 90px;
}
h2 {
font-size: 38px;
letter-spacing: 0.02em;
color: #4b4b4b;
section h2.section-citation {
font-size: 38px;
letter-spacing: 0.02em;
color: #4b4b4b;
}
&.serif-i {font-family: 'Crimson Text', serif; font-size: 44px; font-weight: 400; font-style: italic; line-height: 1.0em; }
&.serif {font-family: 'Crimson Text', serif; font-size: 42px; font-weight: 700; line-height: 1.1em;}
&.slab {font-family: 'Slabo 27px', serif;}
&.mono {font-family: 'Space Mono', monospace; font-size: 34px;}
&.mecane {font-family: 'Alfa Slab One', cursive; font-size: 35px;}
section h2.section-citation:hover {color: #25b5ff;}
span.glyphicon {
font-size: 0.8em;
padding-left: 3px;
&:hover {
color: #25b5ff;
}
}
p {
color: #4b4b4b;
&:hover {
color: #25b5ff;
}
}
span.glyphicon {
font-size: 1em;
padding-left: 7px;
position: relative;
top: 3px;
}
}
#lemonde h2, #acteurspublics h2, #parisoss h2 {font-family: 'Crimson Text', serif; font-size: 42px; font-weight: 400; font-style: italic; line-height: 1.0em; }
#presidence h2, #sinar h2, #etalab h2, #capcol h2 {font-family: 'Crimson Text', serif; font-size: 42px; font-weight: 700; line-height: 1.1em;}
#mediapart h2, #opengov h2, #linagora h2 {font-family: 'Slabo 27px', serif;}
#joinup h2, #nuitdebout h2 {font-family: 'Space Mono', monospace;}
#huffington h2, #modernisation h2 {font-family: 'Alfa Slab One', cursive;}
This diff is collapsed.
......@@ -25,6 +25,7 @@
<!--<link rel="apple-touch-icon" href="apple-touch-icon.png">-->
<link href="https://fonts.googleapis.com/css?family=Lato:300,400,400i,700" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Alfa+Slab+One|Crimson+Text:400i,700|Slabo+27px|Space+Mono" rel="stylesheet">
</head>
<body>
<!--[if lt IE 8]>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment