From 265da6a57ebbeda60c579c81a612ac331f5bb329 Mon Sep 17 00:00:00 2001
From: mespeche <michael-espeche@Micks-iMac.local>
Date: Fri, 20 Sep 2013 12:00:39 +0200
Subject: [PATCH] Add default language & editing language default field

---
 .../Thelia/Form/ProfileModificationForm.php   | 28 +++++++++
 templates/admin/default/profile-edit.html     | 62 ++++++++++++++++---
 2 files changed, 82 insertions(+), 8 deletions(-)

diff --git a/core/lib/Thelia/Form/ProfileModificationForm.php b/core/lib/Thelia/Form/ProfileModificationForm.php
index 94ce1fba9..e3119cfee 100644
--- a/core/lib/Thelia/Form/ProfileModificationForm.php
+++ b/core/lib/Thelia/Form/ProfileModificationForm.php
@@ -58,6 +58,34 @@ class ProfileModificationForm extends BaseForm
                     "for" => "lastname"
                 )
             ))
+            ->add("default_language", "text", array(
+                "constraints" => array(
+                    new Constraints\NotBlank()
+                ),
+                "label" => Translator::getInstance()->trans("Default language"),
+                "label_attr" => array(
+                    "for" => "default_language"
+                )
+            ))
+            ->add("editing_language_default", "text", array(
+                "constraints" => array(
+                    new Constraints\NotBlank()
+                ),
+                "label" => Translator::getInstance()->trans("Editing language default"),
+                "label_attr" => array(
+                    "for" => "editing_language_default"
+                )
+            ))
+            ->add("old_password", "password", array(
+                "constraints" => array(
+                    new Constraints\NotBlank(),
+                    new Constraints\Length(array("min" => ConfigQuery::read("password.length", 4)))
+                ),
+                "label" => Translator::getInstance()->trans("Old password"),
+                "label_attr" => array(
+                    "for" => "old_password"
+                )
+            ))
             ->add("password", "password", array(
                 "constraints" => array(
                     new Constraints\NotBlank(),
diff --git a/templates/admin/default/profile-edit.html b/templates/admin/default/profile-edit.html
index 19b6c4c2d..e882dc40d 100644
--- a/templates/admin/default/profile-edit.html
+++ b/templates/admin/default/profile-edit.html
@@ -47,20 +47,55 @@
                                         </div>
                                     {/form_field}
 
-                                    {form_field form=$form field='password'}
+                                    {form_field form=$form field='default_language'}
                                         <div class="form-group {if $error}has-error{/if}">
                                             <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
-                                            <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$LASTNAME}" title="{intl l="{$label}"}" placeholder="{intl l='Password'}">
-                                        </div>
-                                    {/form_field}
 
-                                    {form_field form=$form field='password_confirm'}
-                                        <div class="form-group {if $error}has-error{/if}">
-                                            <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
-                                            <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$LASTNAME}" title="{intl l="{$label}"}" placeholder="{intl l='Password confirmation'}">
+                                            <select name="{$name}" id="{$label_attr.for}" data-toggle="selectpicker">
+                                                {loop type="lang" name="default_language" backend_context="1"}
+                                                    <option value="{$ID}" {if $ID == $TITLE}selected{/if}>{$TITLE}</option>
+                                                {/loop}
+                                            </select>
                                         </div>
                                     {/form_field}
                                     
+                                    {form_field form=$form field='editing_language_default'}
+                                        <div class="form-group {if $error}has-error{/if}">
+                                            <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+
+                                            <select name="{$name}" id="{$label_attr.for}"  data-toggle="selectpicker">
+                                                {loop type="lang" name="editing_language_default" backend_context="1"}
+                                                    <option value="{$ID}" {if $ID == $TITLE}selected{/if}>{$TITLE}</option>
+                                                {/loop}
+                                            </select>
+                                        </div>
+                                    {/form_field}
+                                    
+                                    <div class="well">
+                                        <div class="title title-without-tabs">{intl l="Change password"}</div>
+
+                                        {form_field form=$form field='old_password'}
+                                            <div class="form-group {if $error}has-error{/if}">
+                                                <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                                                <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" title="{intl l="{$label}"}" placeholder="{intl l='Old password'}">
+                                            </div>
+                                        {/form_field}
+
+                                        {form_field form=$form field='password'}
+                                            <div class="form-group {if $error}has-error{/if}">
+                                                <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                                                <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" title="{intl l="{$label}"}" placeholder="{intl l='Password'}">
+                                            </div>
+                                        {/form_field}
+
+                                        {form_field form=$form field='password_confirm'}
+                                            <div class="form-group {if $error}has-error{/if}">
+                                                <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                                                <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" title="{intl l="{$label}"}" placeholder="{intl l='Password confirmation'}">
+                                            </div>
+                                        {/form_field}
+                                    </div>
+                                    
                                     <div class="text-right">
                                         <button type="submit" class="btn btn-default btn-primary" title="{intl l='Edit profile'}">
                                             {intl l="Edit"}
@@ -77,4 +112,15 @@
 
         </div>
     </div>
+{/block}
+
+{block name="javascript-initialization"}
+
+    {javascripts file='assets/js/bootstrap-select/bootstrap-select.js'}
+        <script src="{$asset_url}"></script>
+    {/javascripts}
+    {javascripts file='assets/js/main.js'}
+        <script src="{$asset_url}"></script>
+    {/javascripts}
+
 {/block}
\ No newline at end of file