From bcf4cb519ae6c7d590db6a8023b7f24332ea9160 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 8 Oct 2017 22:21:19 +0200 Subject: new notification fixes --- view/js/main.js | 4 ++-- view/pdl/mod_display.pdl | 3 +++ view/pdl/mod_pubstream.pdl | 3 +++ view/php/default.php | 2 +- view/tpl/nav.tpl | 22 +++++++++++----------- view/tpl/notifications_widget.tpl | 26 ++++++++++++++++---------- 6 files changed, 36 insertions(+), 24 deletions(-) create mode 100644 view/pdl/mod_display.pdl create mode 100644 view/pdl/mod_pubstream.pdl (limited to 'view') diff --git a/view/js/main.js b/view/js/main.js index b2210ee4c..186cefbd0 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -481,8 +481,8 @@ function NavUpdate() { if(data.home == 0) { data.home = ''; $('.home-update, .home-button').hide(); } else { $('.home-update, .home-button').show(); } $('.home-update').html(data.home); - if(data.intros == 0) { data.intros = ''; $('.intro-update, .intro-button').hide(); } else { $('.intro-update, .intro-button').show(); } - $('.intro-update').html(data.intros); + if(data.intros == 0) { data.intros = ''; $('.intros-update, .intros-button').hide(); } else { $('.intros-update, .intros-button').show(); } + $('.intros-update').html(data.intros); if(data.mail == 0) { data.mail = ''; $('.mail-update, .mail-button').hide(); } else { $('.mail-update, .mail-button').show(); } $('.mail-update').html(data.mail); diff --git a/view/pdl/mod_display.pdl b/view/pdl/mod_display.pdl new file mode 100644 index 000000000..e657fa88b --- /dev/null +++ b/view/pdl/mod_display.pdl @@ -0,0 +1,3 @@ +[region=right_aside] +[widget=notifications][/widget] +[/region] diff --git a/view/pdl/mod_pubstream.pdl b/view/pdl/mod_pubstream.pdl new file mode 100644 index 000000000..e657fa88b --- /dev/null +++ b/view/pdl/mod_pubstream.pdl @@ -0,0 +1,3 @@ +[region=right_aside] +[widget=notifications][/widget] +[/region] diff --git a/view/php/default.php b/view/php/default.php index bd4d7dc22..444e24197 100644 --- a/view/php/default.php +++ b/view/php/default.php @@ -8,7 +8,7 @@ >
- +
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index 92ab88574..a19fa15a1 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -1,5 +1,5 @@ {{if $nav.login && !$userinfo}} -
+
{{$nav.loginmenu.1.1}} @@ -111,11 +111,11 @@ {{/if}} {{if $nav.messages}} {{/if}} {{if $nav.intros}} - {{/if}} {{if $nav.login && !$userinfo}} -
  • +
  • {{$nav.loginmenu.1.1}}
    • {{/if}} {{if $nav.register}} -
  • +
  • {{$nav.register.1}}
    • {{/if}} {{if $nav.alogout}} -
  • +
  • {{$nav.alogout.1}}
    • {{/if}} @@ -216,9 +216,9 @@
    {{$sel.active}}
    {{/if}} - + -
    -