Fix Registration Form. Use '<legend>' instead of '<hr>' on Sidebar Sections.…

Fix Registration Form. Use '<legend>' instead of '<hr>' on Sidebar Sections. Changed default font, and restyled font design.

app/Resources/views/base.html.twig

@@ -19,6 +19,7 @@
     <![endif]-->
 
     <link rel="icon" href="/favicon.ico" type="image/x-icon">
+    <link href='http://fonts.googleapis.com/css?family=Source+Sans+Pro:400,300,600' rel='stylesheet' type='text/css'>
 
     {% javascripts
     '@JityHomepageBundle/Resources/public/js/essentials/*.js'

src/Jity/HomepageBundle/Controller/SecurityController.php

@@ -57,7 +57,11 @@ class SecurityController extends Controller
     {
         // Create a new User Object and build a Form with it
         $user = new User();
-        $form = $this->createForm(new UserType(), $user, array(
+        $form = $this->createForm(new UserType(
+            UserType::MODE_PASSWORD
+            + UserType::MODE_CHANGE_PROFILE
+            + UserType::MODE_CHANGE_EMAIL
+        ), $user, array(
 
             // Validate Registration Group
             'validation_groups' => array('registration')

src/Jity/HomepageBundle/Form/UserType.php

@@ -18,6 +18,7 @@ class UserType extends AbstractType
     const MODE_CHANGE_PASSWORD = 1;
     const MODE_CHANGE_PROFILE  = 2;
     const MODE_CHANGE_EMAIL    = 4;
+    const MODE_PASSWORD        = 8;
     
     private $mode;
 
@@ -77,24 +78,33 @@ class UserType extends AbstractType
             ));
         }
 
-        if (self::MODE_CHANGE_PASSWORD & ($this->mode)) {
+        if ((self::MODE_PASSWORD & ($this->mode)) || (self::MODE_CHANGE_PASSWORD & ($this->mode))) {
 
-            $builder->add('password_old', 'password', array(
-                'property_path' => false,
-                'label' => 'Altes Passwort'
-            ));
+            $adj1 = '';
+            $adj2 = '';
+
+            if (self::MODE_CHANGE_PASSWORD & ($this->mode)) {
+
+                $builder->add('password_old', 'password', array(
+                    'property_path' => false,
+                    'label' => 'Altes Passwort'
+                ));
+
+                $adj1 = 'Neues ';
+                $adj2 = 'neuen ';
+            }
 
             $builder->add('password', 'repeated', array(
                 'type' => 'password',
                 'invalid_message' => 'Die angegebenen Passwörten stimmen nicht überein.',
                 'options' => array(
-                    'label' => 'Neues Passwort'
+                    'label' => $adj1 . 'Passwort'
                 ),
                 'first_options' => array(
-                    'label' => 'Neues Passwort'
+                    'label' => $adj1 . 'Passwort'
                 ),
                 'second_options' => array(
-                    'label' => 'Wiederholung des neuen Passwort'
+                    'label' => 'Wiederholung des ' . $adj2 . 'Passworts'
                 ),
             ));
         }

src/Jity/HomepageBundle/Resources/public/css/90_jity.css

@@ -3,6 +3,8 @@
  *********************************/
 html, body {
     height: 100%;
+    font-family: 'Source Sans Pro', sans-serif;
+    font-weight: 400;
 }
 
 footer {
@@ -109,6 +111,13 @@ footer {
 
 .navbar-header > .container > h1 > a {
     color: #fff;
+    font-family: 'Source Sans Pro', sans-serif;
+    font-weight: 300;
+}
+
+h1, h2, h3, h4, h5, h6 {
+    font-family: 'Source Sans Pro', sans-serif;
+    font-weight: 600;
 }
 
 a {
@@ -194,7 +203,9 @@ p {
 legend {
     color: #89827B;
     border-color: #B54718;
-    font-weight: bold;
+    /* font-weight: bold; */
+    font-family: 'Source Sans Pro', sans-serif;
+    font-weight: 300;
     font-size: 26px;
 }
 

src/Jity/HomepageBundle/Resources/views/Default/layout_page.html.twig

@@ -14,11 +14,13 @@
 
             {% if (not section.group) or (access) %}
 
-                <h3>{{ section.title }}</h3>
-
+                {#
                 {% if (loop.first != true) %}
-                    <hr>
+                    <!-- <hr> -->
                 {% endif %}
+                #}
+
+                <legend>{{ section.title }}</legend>
 
                 {{ eval(section.content)|raw }}