From 70d72e5f28f85b789026eec5438cd02946876137 Mon Sep 17 00:00:00 2001
From: Jan Dittberner <jan@dittberner.info>
Date: Fri, 11 Jun 2010 23:14:30 +0200
Subject: [PATCH 1/9] handle empty email field onBlur event correctly

---
 .../templates/showformscript.mako             | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/ddportfolioservice/templates/showformscript.mako b/ddportfolioservice/templates/showformscript.mako
index 93a85bc..84202c3 100644
--- a/ddportfolioservice/templates/showformscript.mako
+++ b/ddportfolioservice/templates/showformscript.mako
@@ -65,16 +65,22 @@ function updateFields(data, textStatus) {
     }
 }
 
+function onChangeShowAll(event) {
+  alert(event);
+}
+
 function onBlurEmail() {
-    $.ajax({
-        'url' : '${h.url_for(action='fetchdddata')}',
-        'data' : {'email' : $('#email').attr('value')},
-        'dataType' : 'json',
-        'success' : updateFields,
-        'error' : function(request, textStatus, errorThrown) {
-            $('#email').focus();
-        }
-    });
+    if ($.trim($('#email').attr('value')).length > 0) {
+        $.ajax({
+            'url' : '${h.url_for(action='fetchdddata')}',
+            'data' : {'email' : $('#email').attr('value')},
+            'dataType' : 'json',
+            'success' : updateFields,
+            'error' : function(request, textStatus, errorThrown) {
+                $('#email').focus();
+            }
+        });
+    }
 }
 
 $(document).ready(function() {

From d3fe053dd31c229ddec27d6a5d79ed6428eb4578 Mon Sep 17 00:00:00 2001
From: Jan Dittberner <jan@dittberner.info>
Date: Fri, 11 Jun 2010 23:35:32 +0200
Subject: [PATCH 2/9] enable GPG fingerprint entry with disabled ECMAScript

---
 ddportfolioservice/templates/showform.mako | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ddportfolioservice/templates/showform.mako b/ddportfolioservice/templates/showform.mako
index 0458394..3ffbb36 100644
--- a/ddportfolioservice/templates/showform.mako
+++ b/ddportfolioservice/templates/showform.mako
@@ -56,7 +56,7 @@ ${h.form(h.url_for(action='urllist'), method='get')}
     ${h.text('name',
              h.escape(request.params.get('name', None)), id='name')}<br />
   </div>
-  <div id="gpgfpfield" class="hidden">
+  <div id="gpgfpfield">
     <label for="gpgfp">${_('GPG fingerprint:')}
       % if 'gpgfp' in c.messages['errors']:
       <br />
@@ -65,7 +65,7 @@ ${h.form(h.url_for(action='urllist'), method='get')}
     </label><br />
     ${h.text('gpgfp',
              h.escape(request.params.get('gpgfp', None)),
-             id='gpgfp', readonly='readonly')}<br />
+             id='gpgfp')}<br />
   </div>
   <div id="usernamefield" \
        % if 'username' in c.messages['errors']:

From 8b1613346e158afcc1a74c1ed0c5d08ca554a201 Mon Sep 17 00:00:00 2001
From: Jan Dittberner <jan@dittberner.info>
Date: Fri, 11 Jun 2010 23:36:16 +0200
Subject: [PATCH 3/9] add checkbox and ECMAScript code to toggle display of all
 fields

---
 ddportfolioservice/templates/showform.mako    |  4 +++
 .../templates/showformscript.mako             | 29 ++++++++++++++++++-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/ddportfolioservice/templates/showform.mako b/ddportfolioservice/templates/showform.mako
index 3ffbb36..a569927 100644
--- a/ddportfolioservice/templates/showform.mako
+++ b/ddportfolioservice/templates/showform.mako
@@ -42,6 +42,10 @@ ${h.form(h.url_for(action='urllist'), method='get')}
     ${h.text('email',
              h.escape(request.params.get('email', None), True), id='email')}<br />
   </div>
+  <div id="showallfield">
+    ${h.checkbox('showall', value='1', checked=False, id='showall')}
+    <label for="showall">${_(u'Show all form fields')}</label><br />
+  </div>
   <div id="namefield" \
        % if 'name' in c.messages['errors']:
        class="witherrors" \
diff --git a/ddportfolioservice/templates/showformscript.mako b/ddportfolioservice/templates/showformscript.mako
index 84202c3..ab9ba82 100644
--- a/ddportfolioservice/templates/showformscript.mako
+++ b/ddportfolioservice/templates/showformscript.mako
@@ -20,6 +20,17 @@ License along with this program.  If not, see
 <http://www.gnu.org/licenses/>.
 </%doc>
 
+var defaulthiddendivs = new Array(
+    '#gpgfpfield');
+var defaultreadonlydivs = new Array(
+    '#gpgfpfield');
+var maskedfielddivs = new Array(
+    '#namefield', '#gpgfpfield', '#usernamefield', '#nonddemailfield',
+    '#aliothusernamefield');
+var allfielddivs = new Array(
+    '#namefield', '#gpgfpfield', '#usernamefield', '#nonddemailfield',
+    '#aliothusernamefield');
+
 function updateFields(data, textStatus) {
     if (data.type == 2) { // DD
         $('#name').attr('value', data.name).attr('readonly', 'readonly');
@@ -66,7 +77,15 @@ function updateFields(data, textStatus) {
 }
 
 function onChangeShowAll(event) {
-  alert(event);
+    if ($('#showall').attr('checked')) {
+        for (var fielddiv in allfielddivs) {
+            $(allfielddivs[fielddiv]).show();
+        }
+    } else {
+        for (var fielddiv in maskedfielddivs) {
+            $(maskedfielddivs[fielddiv]).hide();
+        }
+    }
 }
 
 function onBlurEmail() {
@@ -92,6 +111,14 @@ $(document).ready(function() {
             $(fields[index]).hide();
         }
     }
+    for (var index in defaulthiddendivs) {
+        $(defaulthiddendivs[index]).hide();
+    }
+    for (var index in defaultreadonlydivs) {
+        $(defaultreadonlydivs[index]).hide();
+    }
 
     $('#email').blur(onBlurEmail).focus();
+    $('#showall').attr('checked', false);
+    $('#showall').change(onChangeShowAll);
 });

From 4902064aab084ead299d659b146b3a609da837d0 Mon Sep 17 00:00:00 2001
From: Jan Dittberner <jan@dittberner.info>
Date: Fri, 11 Jun 2010 23:40:00 +0200
Subject: [PATCH 4/9] hide showall field for non ECMAScript clients

---
 ddportfolioservice/templates/showform.mako       | 2 +-
 ddportfolioservice/templates/showformscript.mako | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ddportfolioservice/templates/showform.mako b/ddportfolioservice/templates/showform.mako
index a569927..3d12ec8 100644
--- a/ddportfolioservice/templates/showform.mako
+++ b/ddportfolioservice/templates/showform.mako
@@ -42,7 +42,7 @@ ${h.form(h.url_for(action='urllist'), method='get')}
     ${h.text('email',
              h.escape(request.params.get('email', None), True), id='email')}<br />
   </div>
-  <div id="showallfield">
+  <div id="showallfield" class="hidden">
     ${h.checkbox('showall', value='1', checked=False, id='showall')}
     <label for="showall">${_(u'Show all form fields')}</label><br />
   </div>
diff --git a/ddportfolioservice/templates/showformscript.mako b/ddportfolioservice/templates/showformscript.mako
index ab9ba82..8c21447 100644
--- a/ddportfolioservice/templates/showformscript.mako
+++ b/ddportfolioservice/templates/showformscript.mako
@@ -118,7 +118,7 @@ $(document).ready(function() {
         $(defaultreadonlydivs[index]).hide();
     }
 
+    $('#showall').attr('checked', false).change(onChangeShowAll);
+    $('#showallfield').show();
     $('#email').blur(onBlurEmail).focus();
-    $('#showall').attr('checked', false);
-    $('#showall').change(onChangeShowAll);
 });

From fe0291d59e0357c7438b3ae662a1201d74cd1ca0 Mon Sep 17 00:00:00 2001
From: Jan Dittberner <jan@dittberner.info>
Date: Fri, 11 Jun 2010 23:43:31 +0200
Subject: [PATCH 5/9] update translations

---
 .../i18n/ddportfolioservice.pot               |  34 ++++++++-------
 .../i18n/de/LC_MESSAGES/ddportfolioservice.mo | Bin 6466 -> 6532 bytes
 .../i18n/de/LC_MESSAGES/ddportfolioservice.po |  39 ++++++++++--------
 3 files changed, 41 insertions(+), 32 deletions(-)

diff --git a/ddportfolioservice/i18n/ddportfolioservice.pot b/ddportfolioservice/i18n/ddportfolioservice.pot
index 84b1240..1f186b8 100644
--- a/ddportfolioservice/i18n/ddportfolioservice.pot
+++ b/ddportfolioservice/i18n/ddportfolioservice.pot
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ddportfolioservice 0.1\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2010-06-04 00:25+0200\n"
+"POT-Creation-Date: 2010-06-11 23:41+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -240,8 +240,8 @@ msgstr ""
 msgid "Alioth user name"
 msgstr ""
 
-#: ddportfolioservice/model/urlbuilder.py:95
-#: ddportfolioservice/model/urlbuilder.py:99
+#: ddportfolioservice/model/urlbuilder.py:96
+#: ddportfolioservice/model/urlbuilder.py:100
 #, python-format
 msgid "Missing input: %s"
 msgstr ""
@@ -263,11 +263,11 @@ msgid ""
 "Developer's or package maintainer's information regarding Debian."
 msgstr ""
 
-#: ddportfolioservice/templates/base.mako:41
+#: ddportfolioservice/templates/base.mako:46
 msgid "AGPL - Free Software"
 msgstr ""
 
-#: ddportfolioservice/templates/base.mako:43
+#: ddportfolioservice/templates/base.mako:48
 #, python-format
 msgid ""
 "The service is available under the terms of the <a "
@@ -278,7 +278,7 @@ msgid ""
 "href=\"http://git.or.cz\">git</a>."
 msgstr ""
 
-#: ddportfolioservice/templates/base.mako:44
+#: ddportfolioservice/templates/base.mako:49
 msgid "Copyright © 2009, 2010 Jan Dittberner"
 msgstr ""
 
@@ -295,39 +295,43 @@ msgstr ""
 msgid "Email address:"
 msgstr ""
 
-#: ddportfolioservice/templates/showform.mako:50
+#: ddportfolioservice/templates/showform.mako:47
+msgid "Show all form fields"
+msgstr ""
+
+#: ddportfolioservice/templates/showform.mako:54
 msgid "Name:"
 msgstr ""
 
-#: ddportfolioservice/templates/showform.mako:60
+#: ddportfolioservice/templates/showform.mako:64
 msgid "GPG fingerprint:"
 msgstr ""
 
-#: ddportfolioservice/templates/showform.mako:75
+#: ddportfolioservice/templates/showform.mako:79
 msgid "Debian user name:"
 msgstr ""
 
-#: ddportfolioservice/templates/showform.mako:90
+#: ddportfolioservice/templates/showform.mako:94
 msgid "Non DD email address:"
 msgstr ""
 
-#: ddportfolioservice/templates/showform.mako:105
+#: ddportfolioservice/templates/showform.mako:109
 msgid "Alioth user name:"
 msgstr ""
 
-#: ddportfolioservice/templates/showform.mako:117
+#: ddportfolioservice/templates/showform.mako:121
 msgid "Output format:"
 msgstr ""
 
-#: ddportfolioservice/templates/showform.mako:123
+#: ddportfolioservice/templates/showform.mako:127
 msgid "HTML"
 msgstr ""
 
-#: ddportfolioservice/templates/showform.mako:125
+#: ddportfolioservice/templates/showform.mako:129
 msgid "JSON"
 msgstr ""
 
-#: ddportfolioservice/templates/showform.mako:127
+#: ddportfolioservice/templates/showform.mako:131
 msgid "Build DD Portfolio URLs"
 msgstr ""
 
diff --git a/ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.mo b/ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.mo
index 232bdcbf163cfdd0f99d9a7b27cbf88a79112fce..91def36e5e6ff9038c50acabe3b4ae941442c4b7 100644
GIT binary patch
delta 1389
zcmYMzO-NKx7{>8adTUHa$M2fduBj72NNN$O6(y8KQs|<fL?#_;?53rdWzs-JAr@IC
zxJhZDixOH)Ac2x8M37<_5fQkkXxFATQiT1VywGsx{?54{=Y7w6&Ydd0Q4(25iS0N1
zj_}Xo|6rwh|9=UVF@<!!ScB!5hP}87htY?ln2ZycjdK`_-;u-o;FO7r7(gE{6DneM
z(8%XPDf+PvH)1E|;X|yzml%)M>g7a}(M!J&l|VTvfhtVII`@9F+wZ~+T<<}}d4d-4
z&8vS6V`eak8}q0EKcg!06Ezc`$Cyo+j_U71C9n_I;8C}K0+mP@Rm>}>=dYqFaUE5`
zZcHb>8Kj|%pCN~t=A;2;kl1Dc^};tiw!)a-7>_kXjp2G7WuZ8x-n9u8=mIKm2c}{d
zR$?z+!;cuz3{EB(vmTppJKn?$97iSa4$JTpYT!&>lG(Tu^W1(ds)F^%*rpBRP(frj
zuEjo7#YVl<pUIdpE-<#4bRV3>0cQ9CwfW97YAp_7I{rb;IF)tM%>1Yd6=DunpzfbS
zB^t&8Y{3Bbqn2jeNB#3@yx@X1#aGP5CHKKx)<K)E5;ddSxETjf2~VLCm_sG-1yzAX
zBzNOUSzg)<)ZQsTeH~S(%ASqTP=;;DJLWQSm>y0FG>BTm*SG~|-Tp6BfF;!4@sfo~
zoP|mxfSO?$>iylQI2EYR@E~f5BS9J(;1X(0ZXt)c&q*^JL45^L9A-)0Vg_Dh9kluG
zFp5fj&vgJb&JZf_W7OVyiq-fAA7KtzFyV-qq*26$c|3rz>=0#m7*(PMJcJHv24k)h
zxQG6<+mBhd{Mp8#mdcN+NWgU~s`RC(1dpRfk?Luvln&~JPBeXYlk8}=^*ko6=1fb6
z9dsPKv8DB#-53rz4Q<i)o_5PqRAd*Ilx{1DRwtHQ{=JS9viI{$yAy0}<f%}r9c=Cl
Lg-=I&Qpc>n!q19~

delta 1324
zcmYM!Pe@cz6vy#n`fAktljfBDnetCsVltW0WTORXg%dNNkrWsdQITnZMVQcJ1QC=(
zAx73BDiEQdMqEjfn|2XJAyO@}g)5;z60+#~%L@%}-sj#o@7;6mx%bW0&104EFF7f_
z#wW^m72g{R)cgOLOEIgU`x~3E+%sE>mvJHXVm98#CHNFq<0$foeMS!Z%4r!+VF~JC
zLdC6=Mlt;|T!Aqx#8X&=H*ps}$8?-QC7QIzECU0m1j<nf)L<sY-0z27|1_@QdKW5A
zKYGNs;eQRY5zOL;G1P$XP=O{<Gcli8DR`*<MpOcon1(xDKY~i+AgY+HsQcSdmFPfK
zuoLr$Z#^`W@nht$1SbtJg2c8r*qmhc5!11PXvti!rW_Q*YMu3{0Q*n@8!;D~aWA&w
z6&yk(zI8G6UrD2$#uhw+e(Xa9eump|7&Y(@=PYic|Ht)1jHb%fB4b+=Q}K}V7%r#Z
zj;ho(WG;3)gZeXu^}8Df@Gdiaf!cHtMs2~1n1|!28Be2THiIf<D(e-%0P6P|RKj(*
z4jZrp&!U#34~y|$HucwL80A6%PPiNAP@ArZb<m7X;0EkKCHw%Dz#uAtmq;%59?9J%
zQA_$AwP!46{;gP#s_br5g3&k)?y>#IVaGWsP$y~)A7METxc&!JfC*H9DO9O{q7q3W
zE6vc4dOjZ&D1dtXicw1(Mm-;IqM<c8iX7I)Ni*!mCoDw|`mu`oYtuz|S|yG-51^iJ
zK?OXC+EZ=Vh}ZEUenL(35?O4*TewH>{}>Hrmc|ZIX$r9c%TSr0cXr_p`rWSo3Rxw4
zjas5{R3*MSr%``Iv#139`SY8u09C;<Ox09EH13?q3MRtdU~=M@@0{lgR;>*Nt1Cl^
N3z=ar@iuqJ`wJmycB}vZ

diff --git a/ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.po b/ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.po
index a6b5083..c0943ba 100644
--- a/ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.po
+++ b/ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: ddportfolioservice 0.1\n"
 "Report-Msgid-Bugs-To: jan@dittberner.info\n"
 "POT-Creation-Date: 2009-01-20 23:13+0100\n"
-"PO-Revision-Date: 2010-06-04 00:27+0200\n"
+"PO-Revision-Date: 2010-06-11 23:43+0200\n"
 "Last-Translator: Jan Dittberner <jan@dittberner.info>\n"
 "Language-Team: de <de@li.org>\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
@@ -214,10 +214,11 @@ msgstr "Besitz von debian.net-Domains"
 msgid ""
 "<a href=\"http://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a> database"
 " information"
-msgstr "Informationen in der <a href=\"http://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a>-Datenbank"
+msgstr ""
+"Informationen in der <a "
+"href=\"http://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a>-Datenbank"
 
 #: ddportfolioservice/controllers/ddportfolio.py:107
-#| msgid "Enter your personal information"
 msgid "Group membership information"
 msgstr "Information über Gruppenmitgliedschaften"
 
@@ -253,8 +254,8 @@ msgstr "Nicht-DD E-Mailadresse:"
 msgid "Alioth user name"
 msgstr "Alioth-Benutzername"
 
-#: ddportfolioservice/model/urlbuilder.py:95
-#: ddportfolioservice/model/urlbuilder.py:99
+#: ddportfolioservice/model/urlbuilder.py:96
+#: ddportfolioservice/model/urlbuilder.py:100
 #, python-format
 msgid "Missing input: %s"
 msgstr "Fehlende Eingabe: %s"
@@ -281,11 +282,11 @@ msgstr ""
 "Informationen im Bezug auf Debian für Debian-Entwickler und Paketbetreuer"
 " erzeugt werden."
 
-#: ddportfolioservice/templates/base.mako:41
+#: ddportfolioservice/templates/base.mako:46
 msgid "AGPL - Free Software"
 msgstr "AGPL - Freie Software"
 
-#: ddportfolioservice/templates/base.mako:43
+#: ddportfolioservice/templates/base.mako:48
 #, python-format
 msgid ""
 "The service is available under the terms of the <a "
@@ -303,7 +304,7 @@ msgstr ""
 "<a href=\"http://git.or.cz\">git</a> <a href=\"%s\">den Quelltext "
 "herunterladen</a>."
 
-#: ddportfolioservice/templates/base.mako:44
+#: ddportfolioservice/templates/base.mako:49
 msgid "Copyright © 2009, 2010 Jan Dittberner"
 msgstr "Copyright © 2009, 2010 Jan Dittberner"
 
@@ -320,39 +321,43 @@ msgstr "Debian-Entwicklerportfolio"
 msgid "Email address:"
 msgstr "E-Mailadresse:"
 
-#: ddportfolioservice/templates/showform.mako:50
+#: ddportfolioservice/templates/showform.mako:47
+msgid "Show all form fields"
+msgstr "Alle Formularfelder anzeigen"
+
+#: ddportfolioservice/templates/showform.mako:54
 msgid "Name:"
 msgstr "Name:"
 
-#: ddportfolioservice/templates/showform.mako:60
+#: ddportfolioservice/templates/showform.mako:64
 msgid "GPG fingerprint:"
 msgstr "GPG-Fingerabdruck:"
 
-#: ddportfolioservice/templates/showform.mako:75
+#: ddportfolioservice/templates/showform.mako:79
 msgid "Debian user name:"
 msgstr "Debian-Benutzername:"
 
-#: ddportfolioservice/templates/showform.mako:90
+#: ddportfolioservice/templates/showform.mako:94
 msgid "Non DD email address:"
 msgstr "Nicht-DD-E-Mailadresse"
 
-#: ddportfolioservice/templates/showform.mako:105
+#: ddportfolioservice/templates/showform.mako:109
 msgid "Alioth user name:"
 msgstr "Alioth-Benutzername:"
 
-#: ddportfolioservice/templates/showform.mako:117
+#: ddportfolioservice/templates/showform.mako:121
 msgid "Output format:"
 msgstr "Ausgabeformat:"
 
-#: ddportfolioservice/templates/showform.mako:123
+#: ddportfolioservice/templates/showform.mako:127
 msgid "HTML"
 msgstr "HTML"
 
-#: ddportfolioservice/templates/showform.mako:125
+#: ddportfolioservice/templates/showform.mako:129
 msgid "JSON"
 msgstr "JSON"
 
-#: ddportfolioservice/templates/showform.mako:127
+#: ddportfolioservice/templates/showform.mako:131
 msgid "Build DD Portfolio URLs"
 msgstr "Debian-Entwicklerportfolio-URLs bauen"
 

From 4450a7ccfd1a2d9b564cd3b92c35afcbb6b06549 Mon Sep 17 00:00:00 2001
From: Jan Dittberner <jan@dittberner.info>
Date: Sat, 12 Jun 2010 00:02:17 +0200
Subject: [PATCH 6/9] add input fields for wikihomepage and forumsid

---
 ddportfolioservice/templates/showform.mako    | 30 +++++++++++++++++++
 .../templates/showformscript.mako             | 29 ++++++++++--------
 2 files changed, 46 insertions(+), 13 deletions(-)

diff --git a/ddportfolioservice/templates/showform.mako b/ddportfolioservice/templates/showform.mako
index 3d12ec8..74a3258 100644
--- a/ddportfolioservice/templates/showform.mako
+++ b/ddportfolioservice/templates/showform.mako
@@ -117,6 +117,36 @@ ${h.form(h.url_for(action='urllist'), method='get')}
              h.escape(request.params.get('username', None)),
              id='aliothusername')}<br />
   </div>
+  <div id="wikihomepagefield" \
+       % if 'wikihomepage' in c.messages['errors']:
+       class="witherrors"
+       % endif
+       >
+    <label for="wikihomepage">${_('Wiki user name:')}
+      % if 'wikihomepage' in c.messages['errors']:
+      <br />
+      <span class="errormsg">${c.messages['errors']['wikihomepage'] | h}</span>
+      % endif
+    </label><br />
+    ${h.text('wikihomepage',
+             h.escape(request.params.get('wikihomepage', None)),
+             id='wikihomepage')}<br />
+  </div>
+  <div id="forumsidfield" \
+       % if 'forumsid' in c.messages['errors']:
+       class="witherrors"
+       % endif
+       >
+    <label for="forumsid">${_('Forum user id:')}
+      % if 'forumsid' in c.messages['errors']:
+      <br />
+      <span class="errormsg">${c.messages['errors']['forumsid'] | h}</span>
+      % endif
+    </label><br />
+    ${h.text('forumsid',
+             h.escape(request.params.get('forumsid', None)),
+             id='forumsid')}<br />
+  </div>
   <div id="modefield">
     <label for="mode_html">${_('Output format:')}
       % if 'mode' in c.messages['errors']:
diff --git a/ddportfolioservice/templates/showformscript.mako b/ddportfolioservice/templates/showformscript.mako
index 8c21447..80128e9 100644
--- a/ddportfolioservice/templates/showformscript.mako
+++ b/ddportfolioservice/templates/showformscript.mako
@@ -21,15 +21,16 @@ License along with this program.  If not, see
 </%doc>
 
 var defaulthiddendivs = new Array(
-    '#gpgfpfield');
+    '#namefield', '#gpgfpfield', '#usernamefield', '#nonddemailfield',
+    '#aliothusernamefield', '#wikihomepagefield', '#forumsidfield');
 var defaultreadonlydivs = new Array(
     '#gpgfpfield');
 var maskedfielddivs = new Array(
     '#namefield', '#gpgfpfield', '#usernamefield', '#nonddemailfield',
-    '#aliothusernamefield');
+    '#aliothusernamefield', '#wikihomepagefield', '#forumsidfield');
 var allfielddivs = new Array(
     '#namefield', '#gpgfpfield', '#usernamefield', '#nonddemailfield',
-    '#aliothusernamefield');
+    '#aliothusernamefield', '#wikihomepagefield', '#forumsidfield');
 
 function updateFields(data, textStatus) {
     if (data.type == 2) { // DD
@@ -39,12 +40,15 @@ function updateFields(data, textStatus) {
             'readonly', 'readonly');
         $('#nonddemail').attr('value', data.email).focus();
         $('#aliothusername').attr('value', data.username);
+        $('#wikihomepage').attr('value', data.wikihomepage);
 
         $('#namefield').show();
         $('#gpgfpfield').show();
         $('#usernamefield').show();
         $('#nonddemailfield').show();
         $('#aliothusernamefield').show();
+        $('#wikihomepagefield').show();
+        $('#forumsidfield').show();
 
         $('#nonddemail').focus().select();
     } else if (data.type == 1) { // DM
@@ -52,12 +56,15 @@ function updateFields(data, textStatus) {
         $('#gpgfp').attr('value', data.gpgfp);
         $('#username').attr('value', '');
         $('#nonddemail').attr('value', data.email).focus();
+        $('#wikihomepage').attr('value', data.wikihomepage);
 
         $('#namefield').show();
         $('#gpgfpfield').show();
         $('#usernamefield').hide();
         $('#nonddemailfield').hide();
         $('#aliothusernamefield').show();
+        $('#wikihomepagefield').show();
+        $('#forumsidfield').show();
 
         $('#aliothusername').focus().select();
     } else {
@@ -71,6 +78,8 @@ function updateFields(data, textStatus) {
         $('#nonddemailfield').hide();
         $('#namefield').show();
         $('#aliothusernamefield').show();
+        $('#wikihomepagefield').show();
+        $('#forumsidfield').show();
 
         $('#name').focus().select();
     }
@@ -103,19 +112,13 @@ function onBlurEmail() {
 }
 
 $(document).ready(function() {
-    var fields = new Array(
-        '#namefield', '#usernamefield',
-        '#nonddemailfield', '#aliothusernamefield');
-    for (var index in fields) {
-        if (!$(fields[index]).hasClass('witherrors')) {
-            $(fields[index]).hide();
+    for (var index in defaulthiddendivs) {
+        if (!$(defaulthiddendivs[index]).hasClass('witherrors')) {
+            $(defaulthiddendivs[index]).hide();
         }
     }
-    for (var index in defaulthiddendivs) {
-        $(defaulthiddendivs[index]).hide();
-    }
     for (var index in defaultreadonlydivs) {
-        $(defaultreadonlydivs[index]).hide();
+        $(defaultreadonlydivs[index]).attr('readonly', 'readonly');
     }
 
     $('#showall').attr('checked', false).change(onChangeShowAll);

From 4782b64f06f20e491160650957c506e25bf2bf77 Mon Sep 17 00:00:00 2001
From: Jan Dittberner <jan@dittberner.info>
Date: Sat, 12 Jun 2010 00:13:04 +0200
Subject: [PATCH 7/9] populate wikihomepage in dddatabuilder.py

---
 ddportfolioservice/model/dddatabuilder.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/ddportfolioservice/model/dddatabuilder.py b/ddportfolioservice/model/dddatabuilder.py
index 4128a5f..8d26d5a 100644
--- a/ddportfolioservice/model/dddatabuilder.py
+++ b/ddportfolioservice/model/dddatabuilder.py
@@ -22,12 +22,15 @@
 #
 """This file contains code to build a representation of a person based
 on keyring data associated to a given email address."""
+import logging
 from ddportfolioservice.model import keyfinder
 
 TYPE_NO = 0
 TYPE_DM = 1
 TYPE_DD = 2
 
+log = logging.getLogger(__name__)
+
 
 def build_data(email_address):
     """Build a DD data structure from a given email address."""
@@ -43,4 +46,9 @@ def build_data(email_address):
         fields['type'] = TYPE_DM
     else:
         fields['type'] = TYPE_NO
+    if fields['name']:
+        log.debug('generate wikihomepage from name')
+        fields['wikihomepage'] = "".join(
+            [part.capitalize() for part in fields['name'].split()])
+
     return fields

From 65847e4d6c8f7ead4e2113488c5b39e8ec25672c Mon Sep 17 00:00:00 2001
From: Jan Dittberner <jan@dittberner.info>
Date: Sat, 12 Jun 2010 00:16:27 +0200
Subject: [PATCH 8/9] updated translations

---
 .../i18n/ddportfolioservice.pot               |  18 +++++++++++++-----
 .../i18n/de/LC_MESSAGES/ddportfolioservice.mo | Bin 6532 -> 6636 bytes
 .../i18n/de/LC_MESSAGES/ddportfolioservice.po |  18 +++++++++++++-----
 3 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/ddportfolioservice/i18n/ddportfolioservice.pot b/ddportfolioservice/i18n/ddportfolioservice.pot
index 1f186b8..30a07f1 100644
--- a/ddportfolioservice/i18n/ddportfolioservice.pot
+++ b/ddportfolioservice/i18n/ddportfolioservice.pot
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ddportfolioservice 0.1\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2010-06-11 23:41+0200\n"
+"POT-Creation-Date: 2010-06-12 00:15+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -319,19 +319,27 @@ msgstr ""
 msgid "Alioth user name:"
 msgstr ""
 
-#: ddportfolioservice/templates/showform.mako:121
+#: ddportfolioservice/templates/showform.mako:125
+msgid "Wiki user name:"
+msgstr ""
+
+#: ddportfolioservice/templates/showform.mako:140
+msgid "Forum user id:"
+msgstr ""
+
+#: ddportfolioservice/templates/showform.mako:151
 msgid "Output format:"
 msgstr ""
 
-#: ddportfolioservice/templates/showform.mako:127
+#: ddportfolioservice/templates/showform.mako:157
 msgid "HTML"
 msgstr ""
 
-#: ddportfolioservice/templates/showform.mako:129
+#: ddportfolioservice/templates/showform.mako:159
 msgid "JSON"
 msgstr ""
 
-#: ddportfolioservice/templates/showform.mako:131
+#: ddportfolioservice/templates/showform.mako:161
 msgid "Build DD Portfolio URLs"
 msgstr ""
 
diff --git a/ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.mo b/ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.mo
index 91def36e5e6ff9038c50acabe3b4ae941442c4b7..eccceb129db46ad5d7f00019e2b534e93455aa24 100644
GIT binary patch
delta 1453
zcmYMzTS${(9LMp;IaBkzJY|_S(@rWgF=<IcMMf7zc96oL#9c^EaVAAxyfC65LLw=w
zBvL9$$-+elQFJ2&YEektl$3#8WCV7&5wh=Zd!w=K^E~hAe|VnvO!;iNHRW<%HhlK-
zTh8y6L$m*%;uvE}nU>%_tjBbGh>LI(Q*j*A@B`-JcXVPB7cn$0%))FeLJtzkGIb1A
zao{lKpoMO{h6VT(x8WyDz{1!_qGg!Gd^akAdQ<{_Oh(H--(}BxF^}Ves5oO7Lwqw6
z9vCx=x^WIuFe)zc;51Zc+^CAGaW!tY=gp`@+Hf&i_WV35p&nFI2T=FlM|ETv(}{0J
z7-ZlCDuK_)*Ua&!2h1ZmnWXqg>oc$}%9wSSfI*^0bH0oA&?Ixo_9`mSO;q4JsKN$u
z2|ht<CxcfEf|#8cspL8?V}1`Sa1=9f9+ilTayMfRD!@V8dfddk!JhY`0`?;z%rKI(
zd1m_}iT-DE;0*`Vy056pe<QKXf_-5kZRw%XOf2R21D<*Wr%;`%Vgso1T2y6+P@B|`
zD==uE??WYg7YlJHmHrnonB;)gXdbm0|DZNW0sUWzTTs^>MQz4&sEWpLExtn~9Oa56
zkc>*ejp{%pQj4iUE%5==9%{50=ykb(YV80j!(miqBgnJOOXO=l@~415P-~h?xy9&4
z&G(=J?MDS_K()LLl~5<D(2J<+t!@Si*n@gMZ=lxtG3o&msHJ(2e9agBROvkGt%&2P
zw^^D(%)~LW)@GdMAzG3d+i$4n{6qy_Kx(jzlc?HkSy+qZ*oS9Pm9Jrgl%W@Euo*dJ
z9-%rmj=OLYRY=~_h=o|qe7!wCj;yL_LoHnp<IP51oA7`Rpq8Q^mFaWTW*kGcbQ0Cd
zY3y!I@r0^kt~io+v<5o-`5o=PKz>uBH}pDoFgm5K>3CD*P|GpD&l~DY_~nS*kniz$
w%PK-AlO4{C@LlZ<zLt&?r+tBz4!_?Q@P<ygDxEIfT(b4wnehEXnQt9`0Uu(Y-2eap

delta 1349
zcmYMzPe@cz6vy%7IFn;KI*#eoq?V}@L5Mc}A+>^BWRVoPC`cK~Hk$MYp+6=KR1{)?
zWyWk$TG+y*7B6y<k|jitW*89>xTt7Vn`$9N*!PzY8s5Cmz3<OG=bn4t*Vv_4Vm9RM
zGk$yc7x2I7QSbjR(`QyrH-HUTgG;an7vUfVaTs%O3=44@z4#3|>^rA0&S4aTyiBNs
zZK6@ig({3-99Llnmf&ry#iy8ozO;ozb1*=^9F;%~DuH^;!nk|?nA`8f6<qH|#kq$*
z;@k6o4YNti=Ee+az>lbk{6Nhl=r>!9d8qytR07*^G46Hy2T_T%po)18_568MB`%^W
z*oAq-w|*MR_#txG1SbtJiNv;9)C*s5e~Q^}%)kbsrgA+_StyP*ySAbNokRsbjk(x~
zb=ZR!@I59pgT_p=<=BcF@G|D(C@O(BSdAZ01BZD@7UE_sar;fE3N|BSTRWzsg2*mh
zioK|c4F{+{ld%ylFt&}m4^Cl{8NNepz7vevgaep|e^4{dWt}v$2&zKmScJ8x`-f49
zwqO|^$0+upmS!|a{Yz;);es~BXDr5f_rYS;L7T4*HKVJz29v0SpP>?%MkVkGRe?Dq
zck_o9mNp-?cgj#-M?I>tM-w!ZVLS4Uokb4o=A=OVs5N|nYjMi$|3U?rN9~;eS*XMX
zs6?Wu8CIj---?P;i~0<AqLw&uh=v9@gIbd-$YD1)X@+-EUx9;zEXixk$5X6>Hs3Wy
zQK_%HCQ;)IpaKt}_SOU3hcEFC7Lf%LPS`k&N-oUc4)n4^l;LhviH_hdY(vdp#B~g}
z(VuYpsmm5V+jP`YMNk!qx>le{UxiBW0QyyfW*RDG8|sA)?7g2|;WYYgd7KpgP^$Ad
d<EJOBa^<>M)%uw8D9ht@UWGP#opAWA=PxqQe6#=n

diff --git a/ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.po b/ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.po
index c0943ba..c50df7a 100644
--- a/ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.po
+++ b/ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: ddportfolioservice 0.1\n"
 "Report-Msgid-Bugs-To: jan@dittberner.info\n"
 "POT-Creation-Date: 2009-01-20 23:13+0100\n"
-"PO-Revision-Date: 2010-06-11 23:43+0200\n"
+"PO-Revision-Date: 2010-06-12 00:15+0200\n"
 "Last-Translator: Jan Dittberner <jan@dittberner.info>\n"
 "Language-Team: de <de@li.org>\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
@@ -345,19 +345,27 @@ msgstr "Nicht-DD-E-Mailadresse"
 msgid "Alioth user name:"
 msgstr "Alioth-Benutzername:"
 
-#: ddportfolioservice/templates/showform.mako:121
+#: ddportfolioservice/templates/showform.mako:125
+msgid "Wiki user name:"
+msgstr "Wiki-Benutzername:"
+
+#: ddportfolioservice/templates/showform.mako:140
+msgid "Forum user id:"
+msgstr "Forumsbenutzernummer:"
+
+#: ddportfolioservice/templates/showform.mako:151
 msgid "Output format:"
 msgstr "Ausgabeformat:"
 
-#: ddportfolioservice/templates/showform.mako:127
+#: ddportfolioservice/templates/showform.mako:157
 msgid "HTML"
 msgstr "HTML"
 
-#: ddportfolioservice/templates/showform.mako:129
+#: ddportfolioservice/templates/showform.mako:159
 msgid "JSON"
 msgstr "JSON"
 
-#: ddportfolioservice/templates/showform.mako:131
+#: ddportfolioservice/templates/showform.mako:161
 msgid "Build DD Portfolio URLs"
 msgstr "Debian-Entwicklerportfolio-URLs bauen"
 

From 4f9e024bd389f2d99c442101ae17cc4d4219100c Mon Sep 17 00:00:00 2001
From: Jan Dittberner <jan@dittberner.info>
Date: Sat, 12 Jun 2010 00:18:52 +0200
Subject: [PATCH 9/9] remove default readonly field support

---
 ddportfolioservice/templates/showformscript.mako | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/ddportfolioservice/templates/showformscript.mako b/ddportfolioservice/templates/showformscript.mako
index 80128e9..ce04cb9 100644
--- a/ddportfolioservice/templates/showformscript.mako
+++ b/ddportfolioservice/templates/showformscript.mako
@@ -23,8 +23,6 @@ License along with this program.  If not, see
 var defaulthiddendivs = new Array(
     '#namefield', '#gpgfpfield', '#usernamefield', '#nonddemailfield',
     '#aliothusernamefield', '#wikihomepagefield', '#forumsidfield');
-var defaultreadonlydivs = new Array(
-    '#gpgfpfield');
 var maskedfielddivs = new Array(
     '#namefield', '#gpgfpfield', '#usernamefield', '#nonddemailfield',
     '#aliothusernamefield', '#wikihomepagefield', '#forumsidfield');
@@ -117,9 +115,6 @@ $(document).ready(function() {
             $(defaulthiddendivs[index]).hide();
         }
     }
-    for (var index in defaultreadonlydivs) {
-        $(defaultreadonlydivs[index]).attr('readonly', 'readonly');
-    }
 
     $('#showall').attr('checked', false).change(onChangeShowAll);
     $('#showallfield').show();