add non DD email field

- add field in form
- use field for NM page URL
- change spelling from E-Mail to Email

ddportfolioservice/templates/showform.mako

@@ -30,7 +30,7 @@ License along with this program.  If not, see
     <fieldset id="ddportfolio">
       <legend>${_('Debian Developer Portfolio')}</legend>
       <div id="emailfield">
-        <label for="email">${_('E-Mail address:')}
+        <label for="email">${_('Email address:')}
           % if 'email' in c.messages['errors']:
           <br />
           <span class="errormsg">${c.messages['errors']['email']}</span>
@@ -66,6 +66,16 @@ License along with this program.  If not, see
         ${h.text_field('username',
         value=request.params.get('username', None))}<br />
       </div>
+      <div id="nonddemailfield">
+        <label for="nonddemail">${_('Non DD email address:')}
+          % if 'nonddemail' in c.messages['errors']:
+          <br />
+          <span class="errormsg">${c.messages['errors']['nonddemail']}</span>
+          % endif
+        </label><br />
+        ${h.text_field('nonddemail',
+        value=request.params.get('nonddemail', None))}<br />
+      </div>
       <div id="aliothusernamefield">
         <label for="aliothusername">${_('Alioth user name:')}
           % if 'aliothusername' in c.messages['errors']: