aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2017-05-19 10:48:23 +0200
committerMario Vavti <mario@mariovavti.com>2017-05-19 10:48:23 +0200
commit335de94343a3eb4dcce172514eed0701e79f4d44 (patch)
treef8e2db4ebd6fe04a057749177d26d981fe7b7630
parentb62463107ce89f397aa0bd738f10cb0522bb126e (diff)
parent3fad69e5cad9aab1cb31969253919198e551b048 (diff)
downloadvolse-hubzilla-335de94343a3eb4dcce172514eed0701e79f4d44.tar.gz
volse-hubzilla-335de94343a3eb4dcce172514eed0701e79f4d44.tar.bz2
volse-hubzilla-335de94343a3eb4dcce172514eed0701e79f4d44.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
-rw-r--r--Zotlabs/Module/Notifications.php2
-rwxr-xr-xview/tpl/notifications.tpl20
-rwxr-xr-xview/tpl/notify.tpl4
3 files changed, 13 insertions, 13 deletions
diff --git a/Zotlabs/Module/Notifications.php b/Zotlabs/Module/Notifications.php
index e0313dd8b..652648701 100644
--- a/Zotlabs/Module/Notifications.php
+++ b/Zotlabs/Module/Notifications.php
@@ -40,7 +40,7 @@ class Notifications extends \Zotlabs\Web\Controller {
$o .= replace_macros(get_markup_template('notifications.tpl'),array(
'$notif_header' => t('System Notifications'),
- '$notif_link_mark_seen' => t('Mark all system notifications seen'),
+ '$notif_link_mark_seen' => t('Mark all seen'),
'$notif_content' => $notif_content,
'$notifications_available' => $notifications_available,
));
diff --git a/view/tpl/notifications.tpl b/view/tpl/notifications.tpl
index 0b24da7c3..53ff8de52 100755
--- a/view/tpl/notifications.tpl
+++ b/view/tpl/notifications.tpl
@@ -1,11 +1,11 @@
-<div class="generic-content-wrapper-styled">
-
-<h1>{{$notif_header}}</h1>
-
-{{if $notifications_available}}
-<a href="#" onclick="markRead('notify'); setTimeout(function() { window.location.href=window.location.href; },1500); return false;">{{$notif_link_mark_seen}}</a>
-{{/if}}
-<div class="notif-network-wrapper">
- {{$notif_content}}
-</div>
+<div class="generic-content-wrapper">
+ <div class="section-title-wrapper clearfix">
+ {{if $notifications_available}}
+ <a href="#" class="btn btn-outline-secondary btn-sm float-right" onclick="markRead('notify'); setTimeout(function() { window.location.href=window.location.href; },1500); return false;">{{$notif_link_mark_seen}}</a>
+ {{/if}}
+ <h2>{{$notif_header}}</h2>
+ </div>
+ <div class="section-content-wrapper">
+ {{$notif_content}}
+ </div>
</div>
diff --git a/view/tpl/notify.tpl b/view/tpl/notify.tpl
index d3c79be82..ae6e160b1 100755
--- a/view/tpl/notify.tpl
+++ b/view/tpl/notify.tpl
@@ -1,3 +1,3 @@
-<div class="notif-item">
- <a href="{{$item_link}}"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a>
+<div class="mb-2 notif-item">
+ <a href="{{$item_link}}"><img src="{{$item_image}}" class="menu-img-1">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a>
</div>