Merge remote-tracking branch 'upstream/develop' into 1606-dbm

diff --git a/include/nav.php b/include/nav.php
index 8f82bc4d0220d20993228df77ae83c0047b7363b..e6460c046b7a857d83f5c3eb1edf5a43b4d2b37b 100644 (file)
--- 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/include/ostatus.php b/include/ostatus.php
index 918dec5f32156e35160d6da0a690b840fb419951..7ac26846d246ab575259e89e5c6fa9a8fde632e7 100644 (file)
--- a/include/ostatus.php
+++ b/include/ostatus.php
@@ -493,6 +493,7 @@ class ostatus {
                                                $orig_body = $xpath->query('atom:content/text()', $activityobjects)->item(0)->nodeValue;
 
                                        $orig_created = $xpath->query('atom:published/text()', $activityobjects)->item(0)->nodeValue;
+                                       $orig_edited = $xpath->query('atom:updated/text()', $activityobjects)->item(0)->nodeValue;
 
                                        $orig_contact = $contact;
                                        $orig_author = self::fetchauthor($xpath, $activityobjects, $importer, $orig_contact, false);
@@ -502,6 +503,7 @@ class ostatus {
                                        $item["author-avatar"] = $orig_author["author-avatar"];
                                        $item["body"] = add_page_info_to_body(html2bbcode($orig_body));
                                        $item["created"] = $orig_created;
+                                       $item["edited"] = $orig_edited;
 
                                        $item["uri"] = $orig_uri;
                                        $item["plink"] = $orig_link;

diff --git a/view/templates/nav.tpl b/view/templates/nav.tpl
index 69c55000b627dcc01c6f05205e612d524b1f7129..b6513e0fe8b6dad01d0b91af21e6055c523f54b0 100644 (file)
--- a/view/templates/nav.tpl
+++ b/view/templates/nav.tpl
@@ -50,7 +50,7 @@
                                <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 id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">{{$nav.notifications.mark.3}}</a></li>
                                        <li class="empty">{{$emptynotifications}}</li>
                                </ul>
                {{/if}}         

diff --git a/view/theme/cleanzero/templates/nav.tpl b/view/theme/cleanzero/templates/nav.tpl
index 6f00f5c0604bc04318c67e9533b4f391347a74ca..1760c68f266aa950d4a8bf18895af61968ff4d12 100644 (file)
--- a/view/theme/cleanzero/templates/nav.tpl
+++ b/view/theme/cleanzero/templates/nav.tpl
@@ -35,7 +35,7 @@
                                <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 id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">{{$nav.notifications.mark.3}}</a></li>
                                        <li class="empty">{{$emptynotifications}}</li>
                                </ul>
                {{/if}} 

diff --git a/view/theme/decaf-mobile/templates/nav.tpl b/view/theme/decaf-mobile/templates/nav.tpl
index 3ec6e0831e577b8c6bfa0c769e1f84d49fd9e28f..5e64880689aa09e309bade04e3f8db73ea9d1f51 100644 (file)
--- a/view/theme/decaf-mobile/templates/nav.tpl
+++ b/view/theme/decaf-mobile/templates/nav.tpl
@@ -67,7 +67,7 @@
        {{*<!--<span id="notify-update" class="nav-ajax-left"></span>
        <ul id="nav-notifications-menu" class="notifications-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 id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">{{$nav.notifications.mark.3}}</a></li>
                <li class="empty">{{$emptynotifications}}</li>
        </ul>-->*}}
        </div>

diff --git a/view/theme/diabook/templates/nav.tpl b/view/theme/diabook/templates/nav.tpl
index 3f16a6e40c00527dbe1d3cafab8837e03185db60..8a8664d0a4537a9757a4069cbd8f802d72d3e3f1 100644 (file)
--- a/view/theme/diabook/templates/nav.tpl
+++ b/view/theme/diabook/templates/nav.tpl
@@ -48,7 +48,7 @@
                        <span class="icon notify">{{$nav.notifications.1}}</span>
                                <span id="notify-update" class="nav-notify"></span></a>
                                <ul id="nav-notifications-menu" class="menu-popup">
-                                       <li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">{{$nav.notifications.mark.1}}</a></li>
+                                       <li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">{{$nav.notifications.mark.3}}</a></li>
                                        <li id="nav-notifications-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li>
                                        <li class="empty">{{$emptynotifications}}</li>
                                </ul>

diff --git a/view/theme/dispy/templates/nav.tpl b/view/theme/dispy/templates/nav.tpl
index d4c00297ba364eb2efd421343ae0a3371741fc9c..44690562bfb66120e7c18522bb8f311d92217b93 100644 (file)
--- 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}}</a></li>
         <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 id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">{{$nav.notifications.mark.3}}</a></li>
             <li class="empty">{{$emptynotifications}}</li>
         </ul>
     {{/if}}

diff --git a/view/theme/duepuntozero/templates/nav.tpl b/view/theme/duepuntozero/templates/nav.tpl
index 55e69b3155368fd0dc85f63e80111073bf2df1da..a47dca39023d2e29aa26686bd7067236b25d290c 100644 (file)
--- a/view/theme/duepuntozero/templates/nav.tpl
+++ b/view/theme/duepuntozero/templates/nav.tpl
@@ -49,7 +49,7 @@
                                <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 id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">{{$nav.notifications.mark.3}}</a></li>
                                        <li class="empty">{{$emptynotifications}}</li>
                                </ul>
                {{/if}}         

diff --git a/view/theme/facepark/templates/nav.tpl b/view/theme/facepark/templates/nav.tpl
index 3a54066ad15531c3027ffb8bd28907e7fc4243c5..5af2eecec4deb496dd6d92479cfeb4ea42b7ec6c 100644 (file)
--- a/view/theme/facepark/templates/nav.tpl
+++ b/view/theme/facepark/templates/nav.tpl
@@ -50,7 +50,7 @@
                                <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 id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">{{$nav.notifications.mark.3}}</a></li>
                                        <li class="empty">{{$emptynotifications}}</li>
                                </ul>
                {{/if}}         

diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index 4c65552ec7e7e894522421d746e7a424bd3da8ec..7d45bddbec010a180be99d183d022d9c06a87c98 100644 (file)
--- 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;

diff --git a/view/theme/frio/templates/nav.tpl b/view/theme/frio/templates/nav.tpl
index 17da20b6f2cd266925f5bef241df8e51856295cc..b5f401a99c193352d9c7eebfe3a8d4cb0376f720 100644 (file)
--- a/view/theme/frio/templates/nav.tpl
+++ b/view/theme/frio/templates/nav.tpl
@@ -84,7 +84,7 @@
                                                                        <div class="arrow"></div>
                                                                        {{$nav.notifications.1}}
                                                                        <div class="dropdown-header-link">
-                                                                               <a href="#" onclick="notifyMarkAll(); return false;" data-toggle="tooltip" title="{{$nav.notifications.mark.1}}" class="">Mark as read{{*** @todo Translation ***}}</a>
+                                                                               <a href="#" onclick="notifyMarkAll(); return false;" data-toggle="tooltip" title="{{$nav.notifications.mark.3}}" class="">{{$nav.notifications.mark.1}}</a>
                                                                        </div>
 
                                                                </li>
@@ -140,8 +140,6 @@
                                                        <li role="menuitem"><a class="{{$usermenu.2}}" href="{{$usermenu.0}}" title="{{$usermenu.3}}">{{$usermenu.1}}</a></li>
                                                        {{/foreach}}
                                                        <li role="separator" class="divider"></li>
-                                                       <li role="menuitem"><a href="https://github.com/rabuzarus/frio" target="new" title="frio on GitHub"><i class="fa fa-github"></i> frio on GitHub</a></li>
-                                                       <li role="separator" class="divider"></li>
                                                        {{if $nav.notifications}}
                                                        <li role="menuitem"><a href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}"><i class="fa fa-exclamation-circle fa-fw"></i> {{$nav.notifications.1}}</a></li>
                                                        {{/if}}

diff --git a/view/theme/frost-mobile/templates/nav.tpl b/view/theme/frost-mobile/templates/nav.tpl
index e1c2295ad76a567cc83ee26a63d4a2a668c650d1..48cbfa0ee8df422243e3423e64bdf6e8d9be6e6d 100644 (file)
--- a/view/theme/frost-mobile/templates/nav.tpl
+++ b/view/theme/frost-mobile/templates/nav.tpl
@@ -63,7 +63,7 @@
        <span id="notify-update" class="nav-ajax-left"></span>
        <ul id="nav-notifications-menu" class="notifications-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 id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">{{$nav.notifications.mark.3}}</a></li>
                <li class="empty">{{$emptynotifications}}</li>
        </ul>
        </div>

diff --git a/view/theme/frost/templates/nav.tpl b/view/theme/frost/templates/nav.tpl
index e6e4522c39aa01dcfc5a0ab98f325ff5cf166703..cc9110a27f0bce7ea174bdfe36aa9830c52de901 100644 (file)
--- a/view/theme/frost/templates/nav.tpl
+++ b/view/theme/frost/templates/nav.tpl
@@ -63,7 +63,7 @@
        <span id="notify-update" class="nav-ajax-left" rel="#nav-network-notifications-popup"></span>
        <ul id="nav-notifications-menu" class="notifications-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 id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">{{$nav.notifications.mark.3}}</a></li>
                <li class="empty">{{$emptynotifications}}</li>
        </ul>
        </div>

diff --git a/view/theme/quattro/templates/nav.tpl b/view/theme/quattro/templates/nav.tpl
index deb0cdfa4620d533640737a699afabff346ab5b0..eb0cbbac65aca7fb568684d56288303d15307fa7 100644 (file)
--- a/view/theme/quattro/templates/nav.tpl
+++ b/view/theme/quattro/templates/nav.tpl
@@ -64,7 +64,7 @@
                                <span id="notify-update" class="nav-notify"></span>
                                <ul id="nav-notifications-menu" class="menu-popup">
                                        <!-- TODO: better icons! -->
-                                       <li id="nav-notifications-mark-all" class="toolbar"><a href="#" onclick="notifyMarkAll(); return false;" title="{{$nav.notifications.mark.1}}"><span class="icon s10 edit"></span></a></a><a href="{{$nav.notifications.all.0}}" title="{{$nav.notifications.all.1}}"><span class="icon s10 plugin"></span></a></li>
+                                       <li id="nav-notifications-mark-all" class="toolbar"><a href="#" onclick="notifyMarkAll(); return false;" title="{{$nav.notifications.mark.3}}"><span class="icon s10 edit"></span></a></a><a href="{{$nav.notifications.all.0}}" title="{{$nav.notifications.all.1}}"><span class="icon s10 plugin"></span></a></li>
                                        <li class="empty">{{$emptynotifications}}</li>
                                </ul>
                        </li>           

diff --git a/view/theme/smoothly/templates/nav.tpl b/view/theme/smoothly/templates/nav.tpl
index f0fd11adc27787f0e2a7ee2dec3694a8b645f1f5..347f3403af31d8e72cc4436f7d180b65d37462fe 100644 (file)
--- a/view/theme/smoothly/templates/nav.tpl
+++ b/view/theme/smoothly/templates/nav.tpl
@@ -11,7 +11,7 @@
                {{if $nav.notifications}}<a rel="#nav-notifications-menu" id="notify-update" class="nav-ajax-update" href="{{$nav.notifications.0}}"  title="{{$nav.notifications.1}}"></a>{{/if}}
 
                <ul id="nav-notifications-menu" class="menu-popup">
-                       <li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">{{$nav.notifications.mark.1}}</a></li>
+                       <li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">{{$nav.notifications.mark.3}}</a></li>
                        <li id="nav-notifications-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li>
                        <li class="empty">{{$emptynotifications}}</li>
                </ul>

diff --git a/view/theme/testbubble/templates/nav.tpl b/view/theme/testbubble/templates/nav.tpl
index 7de76682f694376260bfcf540a7079005fff7245..9531cef55ebe31e1005defa7201699ce275d2919 100644 (file)
--- a/view/theme/testbubble/templates/nav.tpl
+++ b/view/theme/testbubble/templates/nav.tpl
@@ -13,7 +13,7 @@
                {{if $nav.notifications}}<a rel="#nav-notifications-menu" id="notify-update" class="nav-ajax-update" href="{{$nav.notifications.0}}"  title="{{$nav.notifications.1}}"></a>{{/if}}
 
                <ul id="nav-notifications-menu" class="menu-popup">
-                       <li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">{{$nav.notifications.mark.1}}</a></li>
+                       <li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">{{$nav.notifications.mark.3}}</a></li>
                        <li id="nav-notifications-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li>
                        <li class="empty">{{$emptynotifications}}</li>
                </ul>