diff options
| author | zottel <github@zottel.net> | 2012-04-08 10:33:32 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2012-04-08 10:33:32 +0200 |
| commit | aaf5a81365b4cbcb3d1b9537b5544aeb5de66f4b (patch) | |
| tree | 1d7e5f2b575b8836fefe76660f466cb176585d5c /js | |
| parent | 64a1367525ac920721943a08adec1124657df70d (diff) | |
| parent | e3b2ac0735c908357dafb8670339fd34d3e2e6c0 (diff) | |
| download | volse-hubzilla-aaf5a81365b4cbcb3d1b9537b5544aeb5de66f4b.tar.gz volse-hubzilla-aaf5a81365b4cbcb3d1b9537b5544aeb5de66f4b.tar.bz2 volse-hubzilla-aaf5a81365b4cbcb3d1b9537b5544aeb5de66f4b.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'js')
| -rw-r--r--[-rwxr-xr-x] | js/acl.js | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | js/ajaxupload.js | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | js/country.js | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | js/fk.autocomplete.js | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | js/jquery.htmlstream.js | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | js/jquery.js | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | js/jquery.textinputs.js | 0 | ||||
| -rwxr-xr-x | js/main.js | 12 | ||||
| -rw-r--r--[-rwxr-xr-x] | js/webtoolkit.base64.js | 0 |
9 files changed, 9 insertions, 3 deletions
diff --git a/js/acl.js b/js/acl.js index e383224ca..e383224ca 100755..100644 --- a/js/acl.js +++ b/js/acl.js diff --git a/js/ajaxupload.js b/js/ajaxupload.js index 67c4a56fb..67c4a56fb 100755..100644 --- a/js/ajaxupload.js +++ b/js/ajaxupload.js diff --git a/js/country.js b/js/country.js index 1c7505580..1c7505580 100755..100644 --- a/js/country.js +++ b/js/country.js diff --git a/js/fk.autocomplete.js b/js/fk.autocomplete.js index b1db92c41..b1db92c41 100755..100644 --- a/js/fk.autocomplete.js +++ b/js/fk.autocomplete.js diff --git a/js/jquery.htmlstream.js b/js/jquery.htmlstream.js index c62c538f7..c62c538f7 100755..100644 --- a/js/jquery.htmlstream.js +++ b/js/jquery.htmlstream.js diff --git a/js/jquery.js b/js/jquery.js index 198b3ff07..198b3ff07 100755..100644 --- a/js/jquery.js +++ b/js/jquery.js diff --git a/js/jquery.textinputs.js b/js/jquery.textinputs.js index fd6d14569..fd6d14569 100755..100644 --- a/js/jquery.textinputs.js +++ b/js/jquery.textinputs.js diff --git a/js/main.js b/js/main.js index 744691b6d..7f0428b5b 100755 --- a/js/main.js +++ b/js/main.js @@ -119,9 +119,7 @@ var home = $(data).find('home').text(); if(home == 0) { home = ''; $('#home-update').removeClass('show') } else { $('#home-update').addClass('show') } $('#home-update').html(home); - - - + var intro = $(data).find('intro').text(); if(intro == 0) { intro = ''; $('#intro-update').removeClass('show') } else { $('#intro-update').addClass('show') } $('#intro-update').html(intro); @@ -129,6 +127,14 @@ var mail = $(data).find('mail').text(); if(mail == 0) { mail = ''; $('#mail-update').removeClass('show') } else { $('#mail-update').addClass('show') } $('#mail-update').html(mail); + + var intro = $(data).find('intro').text(); + if(intro == 0) { intro = ''; $('#intro-update-li').removeClass('show') } else { $('#intro-update-li').addClass('show') } + $('#intro-update-li').html(intro); + + var mail = $(data).find('mail').text(); + if(mail == 0) { mail = ''; $('#mail-update-li').removeClass('show') } else { $('#mail-update-li').addClass('show') } + $('#mail-update-li').html(mail); var eNotif = $(data).find('notif') notif = eNotif.attr('count'); diff --git a/js/webtoolkit.base64.js b/js/webtoolkit.base64.js index 5fa3c1ed7..5fa3c1ed7 100755..100644 --- a/js/webtoolkit.base64.js +++ b/js/webtoolkit.base64.js |