From 6b25830afcec7461d0c38b446fe1cb1525c83d28 Mon Sep 17 00:00:00 2001
From: Nicolas Le Goff <legoff.n@gmail.com>
Date: Tue, 11 Jun 2013 15:26:31 +0200
Subject: [PATCH] Add oauth& provider forms

---
 templates/web/login/oauth/login.html.twig     | 18 ++++++----
 templates/web/login/providers/bind.html.twig  | 18 ++++++----
 .../web/login/providers/mapping.html.twig     | 18 ++++++----
 www/scripts/apps/login/home/bind.js           | 34 +++++++++++++++++++
 www/scripts/apps/login/home/mapping.js        | 34 +++++++++++++++++++
 www/scripts/apps/login/home/oauthLogin.js     | 34 +++++++++++++++++++
 6 files changed, 135 insertions(+), 21 deletions(-)
 create mode 100644 www/scripts/apps/login/home/bind.js
 create mode 100644 www/scripts/apps/login/home/mapping.js
 create mode 100644 www/scripts/apps/login/home/oauthLogin.js

diff --git a/templates/web/login/oauth/login.html.twig b/templates/web/login/oauth/login.html.twig
index 2344dc6e79..47546fa69b 100644
--- a/templates/web/login/oauth/login.html.twig
+++ b/templates/web/login/oauth/login.html.twig
@@ -31,19 +31,18 @@
             <div class="span12">
                 {{ auth_macro.flashes() }}
                 <form
-                     ng-controller="LoginFormController"
                      novalidate
                      name="loginForm"
-                     ng-submit="submit();"
                      method="POST"
                      action="{{ path("login_authenticate") }}"
-                     check-form-submission
                 >
-                    <div class="row-fluid">
-                        <div class="span12">
-                            {{ form_errors(form) }}
+                    {% if form.vars.errors|length > 0 %}
+                        <div class="row-fluid">
+                            <div class="span12">
+                                {{ form_errors(form) }}
+                            </div>
                         </div>
-                    </div>
+                    {% endif %}
                     <div class="row-fluid">
                         <div class="span12">
                             {{ auth_macro.fieldInput(form.email, "loginForm", 'icon-envelope') }}
@@ -122,3 +121,8 @@
 {% block footer_scaffholding %}
     {# empty footer #}
 {% endblock footer_scaffholding %}
+
+{% block scripts %}
+    {{ parent() }}
+    <script type="text/javascript" src="/scripts/apps/login/home/oauthLogin.js"></script>
+{% endblock %}
diff --git a/templates/web/login/providers/bind.html.twig b/templates/web/login/providers/bind.html.twig
index 7f23c2b90b..59110b92d9 100644
--- a/templates/web/login/providers/bind.html.twig
+++ b/templates/web/login/providers/bind.html.twig
@@ -37,19 +37,18 @@
             <div class="span12">
                 {{ auth_macro.flashes() }}
                 <form
-                    ng-controller="LoginFormController"
                     novalidate
                     name="loginForm"
-                    ng-submit="submit();"
                     action="{{ path('login_authentication_provider_do_bind', { 'providerId' : provider.getId() }) }}"
                     method="POST"
-                    check-form-submission
                 >
-                    <div class="row-fluid">
-                        <div class="span12">
-                            {{ form_errors(form) }}
+                    {% if form.vars.errors|length > 0 %}
+                        <div class="row-fluid">
+                            <div class="span12">
+                                {{ form_errors(form) }}
+                            </div>
                         </div>
-                    </div>
+                    {% endif %}
                     <div class="row-fluid">
                         <div class="span12">
                             {{ auth_macro.fieldInput(form.login, "loginForm", 'icon-envelope') }}
@@ -86,3 +85,8 @@
     </div>
     {% include "login/include/register-link-block.html.twig" with {"login" : login, "last_item" : app['registration.enabled']} %}
 {% endblock %}
+
+{% block scripts %}
+    {{ parent() }}
+    <script type="text/javascript" src="/scripts/apps/login/home/bind.js"></script>
+{% endblock %}
diff --git a/templates/web/login/providers/mapping.html.twig b/templates/web/login/providers/mapping.html.twig
index 113651917d..9803dab83a 100644
--- a/templates/web/login/providers/mapping.html.twig
+++ b/templates/web/login/providers/mapping.html.twig
@@ -55,19 +55,18 @@
             <div class="span12">
                 {{ auth_macro.flashes() }}
                 <form
-                    ng-controller="LoginFormController"
                     novalidate
                     name="loginForm"
-                    ng-submit="submit();"
                     action="{{ path('login_authentication_provider_do_mapping', { 'providerId' : provider.getId() }) }}"
                     method="POST"
-                    check-form-submission
                 >
-                    <div class="row-fluid">
-                        <div class="span12">
-                            {{ form_errors(form) }}
+                    {% if form.vars.errors|length > 0 %}
+                        <div class="row-fluid">
+                            <div class="span12">
+                                {{ form_errors(form) }}
+                            </div>
                         </div>
-                    </div>
+                    {% endif %}
                     <div class="row-fluid hidden">
                         <div class="span12">
                             {{ auth_macro.fieldInput(form.login, "loginForm", 'icon-envelope', {'value' : 'nard', 'autocomplete' : 'off' }) }}
@@ -118,3 +117,8 @@
     </div>
     {% include "login/include/register-link-block.html.twig" with {"login" : login, "last_item" : app['registration.enabled']} %}
 {% endblock %}
+
+{% block scripts %}
+    {{ parent() }}
+    <script type="text/javascript" src="/scripts/apps/login/home/mapping.js"></script>
+{% endblock %}
diff --git a/www/scripts/apps/login/home/bind.js b/www/scripts/apps/login/home/bind.js
new file mode 100644
index 0000000000..d80ab2a03a
--- /dev/null
+++ b/www/scripts/apps/login/home/bind.js
@@ -0,0 +1,34 @@
+/*
+ * This file is part of Phraseanet
+ *
+ * (c) 2005-2013 Alchemy
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+require([
+    "jquery",
+    "i18n",
+    "apps/login/home/common",
+    "apps/login/home/views/form"
+], function($, i18n, Common, LoginForm) {
+    Common.initialize();
+
+    i18n.init({
+        resGetPath: Common.languagePath
+    }, function() {
+          new LoginForm({
+            el : $("form[name=loginForm]"),
+            rules: [{
+                name: "login",
+                rules: "required",
+                message: i18n.t("validation_blank")
+            },{
+                name: "password",
+                rules: "required",
+                message: i18n.t("validation_blank")
+            }]
+        });
+    });
+});
diff --git a/www/scripts/apps/login/home/mapping.js b/www/scripts/apps/login/home/mapping.js
new file mode 100644
index 0000000000..d80ab2a03a
--- /dev/null
+++ b/www/scripts/apps/login/home/mapping.js
@@ -0,0 +1,34 @@
+/*
+ * This file is part of Phraseanet
+ *
+ * (c) 2005-2013 Alchemy
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+require([
+    "jquery",
+    "i18n",
+    "apps/login/home/common",
+    "apps/login/home/views/form"
+], function($, i18n, Common, LoginForm) {
+    Common.initialize();
+
+    i18n.init({
+        resGetPath: Common.languagePath
+    }, function() {
+          new LoginForm({
+            el : $("form[name=loginForm]"),
+            rules: [{
+                name: "login",
+                rules: "required",
+                message: i18n.t("validation_blank")
+            },{
+                name: "password",
+                rules: "required",
+                message: i18n.t("validation_blank")
+            }]
+        });
+    });
+});
diff --git a/www/scripts/apps/login/home/oauthLogin.js b/www/scripts/apps/login/home/oauthLogin.js
new file mode 100644
index 0000000000..d80ab2a03a
--- /dev/null
+++ b/www/scripts/apps/login/home/oauthLogin.js
@@ -0,0 +1,34 @@
+/*
+ * This file is part of Phraseanet
+ *
+ * (c) 2005-2013 Alchemy
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+require([
+    "jquery",
+    "i18n",
+    "apps/login/home/common",
+    "apps/login/home/views/form"
+], function($, i18n, Common, LoginForm) {
+    Common.initialize();
+
+    i18n.init({
+        resGetPath: Common.languagePath
+    }, function() {
+          new LoginForm({
+            el : $("form[name=loginForm]"),
+            rules: [{
+                name: "login",
+                rules: "required",
+                message: i18n.t("validation_blank")
+            },{
+                name: "password",
+                rules: "required",
+                message: i18n.t("validation_blank")
+            }]
+        });
+    });
+});