Merge branch 'master' into pylons0.10

* master:
  use unquoted email address for MIA lookup
  mark all patterns that require optional information as optional
  update keyringanalyzer.py copyright information
  use email address for MIA pattern to catch non-DDs
  add support for automatic DM data lookup
  silence keyringanalyzer
  fix path handling in keyringanalyzer
  add flattr button
  add flattr button
This commit is contained in:
Jan Dittberner 2010-06-11 22:17:59 +02:00
commit d5c1fd1a34
6 changed files with 52 additions and 16 deletions

View file

@ -20,7 +20,7 @@ License along with this program. If not, see
<http://www.gnu.org/licenses/>.
</%doc>\
function updateFields(data, textStatus) {
if (data.isdd == 1) {
if (data.type == 2) { // DD
$('#name').attr('value', data.name).attr('readonly', 'readonly');
$('#gpgfp').attr('value', data.gpgfp);
$('#username').attr('value', data.username).attr(
@ -35,6 +35,19 @@ function updateFields(data, textStatus) {
$('#aliothusernamefield').show();
$('#nonddemail').focus().select();
} else if (data.type == 1) { // DM
$('#name').attr('value', data.name).attr('readonly', 'readonly');
$('#gpgfp').attr('value', data.gpgfp);
$('#username').attr('value', '');
$('#nonddemail').attr('value', data.email).focus();
$('#namefield').show();
$('#gpgfpfield').show();
$('#usernamefield').hide();
$('#nonddemailfield').hide();
$('#aliothusernamefield').show();
$('#aliothusername').focus().select();
} else {
$('#nonddemail').attr('value', data.email);
$('#name').removeAttr('readonly');