commit 051d6ad4170fdda2df9db949d2e4fdc901c96407
author humbedooh <humbedooh@apache.org> Thu Oct 15 13:52:40 2015 +0200
committer humbedooh <humbedooh@apache.org> Thu Oct 15 13:52:40 2015 +0200
tree 0df4915b697465c2d3a4a17b69fd693acecdc6b6
parent 91ac4feccef7a0feb5b563e4169c4661a3685a69

Also use prefs.fullname if available on front page, axe an alert

dunno how that alert got there =)

site/js/dev/ponymail_phonebook.js

diff --git a/site/js/dev/ponymail_phonebook.js b/site/js/dev/ponymail_phonebook.js
index 2962b62..4bebea3 100644
--- a/site/js/dev/ponymail_phonebook.js
+++ b/site/js/dev/ponymail_phonebook.js
@@ -69,6 +69,9 @@
         return
     }
     document.getElementById('login_disclaimer').style.display = "block"
+    if (prefs.fullname && json.login) {
+        json.login.credentials.fullname = prefs.fullname
+    }
     if (json.login && json.login.credentials && json.login.credentials.fullname) {
         document.getElementById('welcome').innerHTML = "Welcome, " + json.login.credentials.fullname.split(/ /)[0] + "!"
         document.getElementById('login_disclaimer').innerHTML = "Not " + json.login.credentials.fullname.split(/ /)[0] + "? <a href='javascript:void(0);' onclick='logout();'>Log out</a> then!"

site/js/ponymail.js

diff --git a/site/js/ponymail.js b/site/js/ponymail.js
index 969a9b5..dcaee20 100644
--- a/site/js/ponymail.js
+++ b/site/js/ponymail.js
@@ -2191,6 +2191,9 @@
         return
     }
     document.getElementById('login_disclaimer').style.display = "block"
+    if (prefs.fullname && json.login) {
+        json.login.credentials.fullname = prefs.fullname
+    }
     if (json.login && json.login.credentials && json.login.credentials.fullname) {
         document.getElementById('welcome').innerHTML = "Welcome, " + json.login.credentials.fullname.split(/ /)[0] + "!"
         document.getElementById('login_disclaimer').innerHTML = "Not " + json.login.credentials.fullname.split(/ /)[0] + "? <a href='javascript:void(0);' onclick='logout();'>Log out</a> then!"
@@ -2443,7 +2446,6 @@
     }
     if (typeof json.login != undefined && json.login) {
         login = json.login
-        alert("moo")
         if (login.credentials) {
             setupUser(login)
         }