diff options
| author | friendica <info@friendica.com> | 2012-07-17 22:11:24 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-07-17 22:11:24 -0700 |
| commit | 59ec6718799b8b5d2aee2a394bd3f45792e23754 (patch) | |
| tree | f4e01db6f73754418438b020c2327e18c256653c /view | |
| parent | a10e9d335ab68989a0e6e40af8ae03e5dabd27a7 (diff) | |
| download | volse-hubzilla-59ec6718799b8b5d2aee2a394bd3f45792e23754.tar.gz volse-hubzilla-59ec6718799b8b5d2aee2a394bd3f45792e23754.tar.bz2 volse-hubzilla-59ec6718799b8b5d2aee2a394bd3f45792e23754.zip | |
json notification popup mostly working in zero
Diffstat (limited to 'view')
| -rw-r--r-- | view/theme/duepuntozero/nav.tpl | 20 | ||||
| -rw-r--r-- | view/theme/duepuntozero/theme.php | 2 | ||||
| -rw-r--r-- | view/theme/slackr/theme.php | 1 |
3 files changed, 10 insertions, 13 deletions
diff --git a/view/theme/duepuntozero/nav.tpl b/view/theme/duepuntozero/nav.tpl index 257822df4..20b4e923a 100644 --- a/view/theme/duepuntozero/nav.tpl +++ b/view/theme/duepuntozero/nav.tpl @@ -43,15 +43,15 @@ - {{ if $nav.notifications }} - <a id="nav-notifications-linkmenu" class="nav-commlink" href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">$nav.notifications.1</a> - <span id="notify-update" class="nav-ajax-left"></span> - <ul id="nav-notifications-menu" class="menu-popup"> - <li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li> - <li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li> - <li class="empty">$emptynotifications</li> - </ul> - {{ endif }} + {{ if $nav.notifications }} + <a id="nav-notifications-linkmenu" class="nav-commlink" onclick="notify_popup(); return false;" title="$nav.notifications.1">$nav.notifications.1</a> + <span id="notify-update" class="nav-ajax-left"></span> + <ul id="nav-notifications-menu" class="menu-popup"> + <li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li> + <li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li> + <li class="empty">$emptynotifications</li> + </ul> + {{ endif }} {{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }} {{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }} @@ -65,6 +65,6 @@ <span id="banner">$banner</span> </nav> -<ul id="nav-notifications-template" style="display:none;" rel="template"> +<ul id="nav-notifications-template" rel="template" style="display:none;"> <li class="{4}"><a href="{0}"><img src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li> </ul> diff --git a/view/theme/duepuntozero/theme.php b/view/theme/duepuntozero/theme.php index 2498852f9..e42c2b7b4 100644 --- a/view/theme/duepuntozero/theme.php +++ b/view/theme/duepuntozero/theme.php @@ -42,8 +42,6 @@ function cmtBbClose(comment, id) { } $(document).ready(function() { -$('html').click(function() { $("#nav-notifications-menu" ).hide(); }); - $('.group-edit-icon').hover( function() { $(this).addClass('icon'); $(this).removeClass('iconspacer');}, diff --git a/view/theme/slackr/theme.php b/view/theme/slackr/theme.php index 988700860..7e03886df 100644 --- a/view/theme/slackr/theme.php +++ b/view/theme/slackr/theme.php @@ -54,7 +54,6 @@ $(document).ready(function() { $("#profile-jot-text").focus(hidecal); $("#profile-jot-text").click(hidecal); -$('html').click(function() { $("#nav-notifications-menu" ).hide(); }); $('.group-edit-icon').hover( function() { |