Automatic username (#1172)

cps/templates/config_edit.html

@@ -179,7 +179,7 @@
         <label for="config_public_reg">{{_('Enable Public Registration')}}</label>
     </div>
     <div data-related="register_settings">
-      <div class="form-group">
+      <div class="form-group intend-form">
         <input type="checkbox" id="config_register_email" name="config_register_email" {% if config.config_register_email %}checked{% endif %}>
         <label for="config_register_email">{{_('Use E-Mail as Username')}}</label>
       </div>

cps/templates/register.html

@@ -3,10 +3,12 @@
 <div class="well col-sm-6 col-sm-offset-2">
   <h2 style="margin-top: 0">{{_('Register New Account')}}</h2>
   <form method="POST" role="form">
+    {% if not config.config_register_email %}
     <div class="form-group required">
       <label for="nickname">{{_('Username')}}</label>
       <input type="text" class="form-control" id="nickname" name="nickname" placeholder="{{_('Choose a username')}}" required>
     </div>
+    {% endif %}
     <div class="form-group required">
       <label for="email">{{_('E-mail Address')}}</label>
       <input type="email" class="form-control" id="email" name="email" placeholder="{{_('Your email address')}}" required>