tweaks to vcard

webapp/config.py.dist

@@ -39,6 +39,8 @@ readable_names = {
     'mobiletelephonenumber': 'Mobile Number',
     'sshpublickey': 'SSH Public Key',
     'mifareidhash': 'MIFARE ID Hash',
+    'mail': 'Email Adress',
+    'mailroutingaddress': 'Email Adress (external)',
 }
 
 full_name = {
@@ -53,14 +55,19 @@ can_add = set([
     'telephonenumber',
     'mobiletelephonenumber',
     'sshpublickey',
-    'mifareidhash',
 ])
 can_delete = can_add
 can_modify = can_add | set([
-    'givenname', 'surname', 'commonname', 'gecos',
+    'givenname',
+    'surname',
+    'commonname',
+    'gecos',
 ])
 can = { 'add': can_add, 'mod': can_modify, 'del': can_delete }
 admin_required = set()
 
 default_field = (wtforms.fields.StringField, {})
-fields = { 'telephonenumber': (wtforms.fields.StringField, {'validators': [wtforms.validators.Regexp(r'[+0-9 ]+')]})}
+fields = {
+    'mobiletelephonenumber': (wtforms.fields.StringField, {'validators': [wtforms.validators.Regexp(r'[+0-9 ]+')]}),
+    'telephonenumber': (wtforms.fields.StringField, {'validators': [wtforms.validators.Regexp(r'[+0-9 ]+')]}),
+}

webapp/templates/basic.html

@@ -30,7 +30,7 @@ body {
                            <span class="icon-bar"></span>
                            <span class="icon-bar"></span>
                        </button>
-                       <a class="navbar-brand" href="#">{{ hackerspace_name }} Membership Manager</a>
+                       <a class="navbar-brand" href="/">{{ hackerspace_name }} Membership Manager</a>
                    </div>
                    <div id="navbar" class="navbar-collapse collapse">
                        <ul class="nav navbar-nav navbar-right">

webapp/templates/vcard.html

@@ -54,6 +54,7 @@
   {{ field('loginshell') }}
   {{ multifield('telephonenumber') }}
   {{ multifield('mobiletelephonenumber') }}
+  {{ multifield('mailroutingaddress', width=8) }}
   {{ multifield('sshpublickey', code=True, width=12) }}
   {{ multifield('mifareidhash', code=True, width=12) }}
 </div>