From de3eb5a1b7ee1299efeae1178532e7140407a666 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Tue, 31 May 2016 22:07:29 +0200 Subject: [PATCH 1/5] Frio: Removed github link, changed notification description --- view/theme/frio/templates/nav.tpl | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/view/theme/frio/templates/nav.tpl b/view/theme/frio/templates/nav.tpl index 17da20b6f2..1f03bdd27b 100644 --- a/view/theme/frio/templates/nav.tpl +++ b/view/theme/frio/templates/nav.tpl @@ -84,7 +84,7 @@
{{$nav.notifications.1}}
- Mark as read{{*** @todo Translation ***}} + {{$clear_notifs}}{{*** @todo Translation ***}}
@@ -140,8 +140,6 @@
  • {{$usermenu.1}}
    • {{/foreach}} -
  • frio on GitHub
    • - {{if $nav.notifications}}
  • {{$nav.notifications.1}}
    • {{/if}} From 9a442da852b1c457f112a8792b9660c44584759d Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Tue, 31 May 2016 22:09:35 +0200 Subject: [PATCH 2/5] Removed todo --- view/theme/frio/templates/nav.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/theme/frio/templates/nav.tpl b/view/theme/frio/templates/nav.tpl index 1f03bdd27b..645a50eb6b 100644 --- a/view/theme/frio/templates/nav.tpl +++ b/view/theme/frio/templates/nav.tpl @@ -84,7 +84,7 @@
    {{$nav.notifications.1}}
    - {{$clear_notifs}}{{*** @todo Translation ***}} + {{$clear_notifs}}
    From 9dd6fec0e0d55147d6c8f5f41485a1a4f180e884 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Tue, 31 May 2016 22:27:36 +0200 Subject: [PATCH 3/5] The user name moved to the central. --- view/theme/frio/css/style.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css index 4c65552ec7..7d45bddbec 100644 --- a/view/theme/frio/css/style.css +++ b/view/theme/frio/css/style.css @@ -527,7 +527,8 @@ nav.navbar a { } /* The Top Nav Bar user menu */ #topbar-first .account .user-title { - text-align: right + text-align: right; + margin-top: 7px; } #topbar-first .account .user-title span { color: $nav_icon_color; From ef566ecbc30b33c58c37af9959406ae76b59c610 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Wed, 1 Jun 2016 07:03:03 +0200 Subject: [PATCH 4/5] Changed option description --- view/theme/frio/templates/nav.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/theme/frio/templates/nav.tpl b/view/theme/frio/templates/nav.tpl index 645a50eb6b..b5f401a99c 100644 --- a/view/theme/frio/templates/nav.tpl +++ b/view/theme/frio/templates/nav.tpl @@ -84,7 +84,7 @@
    {{$nav.notifications.1}}
    - {{$clear_notifs}} + {{$nav.notifications.mark.1}}
    From e2c0f04eeb0ca890465607d6d3305f08d2bfe862 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Wed, 1 Jun 2016 07:05:44 +0200 Subject: [PATCH 5/5] Added short description to "mark as seen" --- include/nav.php | 2 +- view/templates/nav.tpl | 2 +- view/theme/cleanzero/templates/nav.tpl | 2 +- view/theme/decaf-mobile/templates/nav.tpl | 2 +- view/theme/diabook/templates/nav.tpl | 2 +- view/theme/dispy/templates/nav.tpl | 2 +- view/theme/duepuntozero/templates/nav.tpl | 2 +- view/theme/facepark/templates/nav.tpl | 2 +- view/theme/frost-mobile/templates/nav.tpl | 2 +- view/theme/frost/templates/nav.tpl | 2 +- view/theme/quattro/templates/nav.tpl | 2 +- view/theme/smoothly/templates/nav.tpl | 2 +- view/theme/testbubble/templates/nav.tpl | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/include/nav.php b/include/nav.php index 8f82bc4d02..e6460c046b 100644 --- a/include/nav.php +++ b/include/nav.php @@ -170,7 +170,7 @@ function nav_info(&$a) { if(in_array($_SESSION['page_flags'], array(PAGE_NORMAL, PAGE_SOAPBOX, PAGE_FREELOVE))) { $nav['notifications'] = array('notifications', t('Notifications'), "", t('Notifications')); $nav['notifications']['all']=array('notifications/system', t('See all notifications'), "", ""); - $nav['notifications']['mark'] = array('', t('Mark all system notifications seen'), '',''); + $nav['notifications']['mark'] = array('', t('Mark as seen'), '',t('Mark all system notifications seen')); } } diff --git a/view/templates/nav.tpl b/view/templates/nav.tpl index 69c55000b6..b6513e0fe8 100644 --- a/view/templates/nav.tpl +++ b/view/templates/nav.tpl @@ -50,7 +50,7 @@ {{/if}} diff --git a/view/theme/cleanzero/templates/nav.tpl b/view/theme/cleanzero/templates/nav.tpl index 6f00f5c060..1760c68f26 100644 --- a/view/theme/cleanzero/templates/nav.tpl +++ b/view/theme/cleanzero/templates/nav.tpl @@ -35,7 +35,7 @@ {{/if}} diff --git a/view/theme/decaf-mobile/templates/nav.tpl b/view/theme/decaf-mobile/templates/nav.tpl index 3ec6e0831e..5e64880689 100644 --- a/view/theme/decaf-mobile/templates/nav.tpl +++ b/view/theme/decaf-mobile/templates/nav.tpl @@ -67,7 +67,7 @@ {{**}} diff --git a/view/theme/diabook/templates/nav.tpl b/view/theme/diabook/templates/nav.tpl index 3f16a6e40c..8a8664d0a4 100644 --- a/view/theme/diabook/templates/nav.tpl +++ b/view/theme/diabook/templates/nav.tpl @@ -48,7 +48,7 @@ {{$nav.notifications.1}} diff --git a/view/theme/dispy/templates/nav.tpl b/view/theme/dispy/templates/nav.tpl index d4c00297ba..44690562bf 100644 --- a/view/theme/dispy/templates/nav.tpl +++ b/view/theme/dispy/templates/nav.tpl @@ -25,7 +25,7 @@ rel="#nav-notifications-menu" title="{{$nav.notifications.1}}">{{$nav.notifications.1}} {{/if}} diff --git a/view/theme/duepuntozero/templates/nav.tpl b/view/theme/duepuntozero/templates/nav.tpl index 55e69b3155..a47dca3902 100644 --- a/view/theme/duepuntozero/templates/nav.tpl +++ b/view/theme/duepuntozero/templates/nav.tpl @@ -49,7 +49,7 @@ {{/if}} diff --git a/view/theme/facepark/templates/nav.tpl b/view/theme/facepark/templates/nav.tpl index 3a54066ad1..5af2eecec4 100644 --- a/view/theme/facepark/templates/nav.tpl +++ b/view/theme/facepark/templates/nav.tpl @@ -50,7 +50,7 @@ {{/if}} diff --git a/view/theme/frost-mobile/templates/nav.tpl b/view/theme/frost-mobile/templates/nav.tpl index e1c2295ad7..48cbfa0ee8 100644 --- a/view/theme/frost-mobile/templates/nav.tpl +++ b/view/theme/frost-mobile/templates/nav.tpl @@ -63,7 +63,7 @@ diff --git a/view/theme/frost/templates/nav.tpl b/view/theme/frost/templates/nav.tpl index e6e4522c39..cc9110a27f 100644 --- a/view/theme/frost/templates/nav.tpl +++ b/view/theme/frost/templates/nav.tpl @@ -63,7 +63,7 @@ diff --git a/view/theme/quattro/templates/nav.tpl b/view/theme/quattro/templates/nav.tpl index deb0cdfa46..eb0cbbac65 100644 --- a/view/theme/quattro/templates/nav.tpl +++ b/view/theme/quattro/templates/nav.tpl @@ -64,7 +64,7 @@ diff --git a/view/theme/smoothly/templates/nav.tpl b/view/theme/smoothly/templates/nav.tpl index f0fd11adc2..347f3403af 100644 --- a/view/theme/smoothly/templates/nav.tpl +++ b/view/theme/smoothly/templates/nav.tpl @@ -11,7 +11,7 @@ {{if $nav.notifications}}{{/if}} diff --git a/view/theme/testbubble/templates/nav.tpl b/view/theme/testbubble/templates/nav.tpl index 7de76682f6..9531cef55e 100644 --- a/view/theme/testbubble/templates/nav.tpl +++ b/view/theme/testbubble/templates/nav.tpl @@ -13,7 +13,7 @@ {{if $nav.notifications}}{{/if}}