view bookmarks

diff --git a/mod/network.php b/mod/network.php
index 1434f5d31264fc6d3f10ab8c3dbd08b7f4c586e2..624fb8793f1e8c95facd37c58269ff29a8756834 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -14,6 +14,9 @@ function network_init(&$a) {
                $a->page['aside'] = '';
 
        $search = ((x($_GET,'search')) ? escape_tags($_GET['search']) : '');
+
+       // We need a better way of managing a growing argument list
+
        $srchurl = '/network' 
                . ((x($_GET,'cid')) ? '?cid=' . $_GET['cid'] : '') 
                . ((x($_GET,'star')) ? '?star=' . $_GET['star'] : '')
@@ -44,8 +47,9 @@ function network_init(&$a) {
 
 
        $a->page['aside'] .= '<div id="network-view-link">';
-       if(($a->argc > 1 && $a->argv[1] === 'new') || ($a->argc > 2 && $a->argv[2] === 'new') || x($_GET,'search'))
+       if(($a->argc > 1 && $a->argv[1] === 'new') || ($a->argc > 2 && $a->argv[2] === 'new') || x($_GET,'search')) {
                $a->page['aside'] .= '<a href="' . $a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '?cid=' . $_GET['cid'] : '') . '">' . t('View Conversations') . '</a></div>';
+       }
        else { 
                $a->page['aside'] .= '<a href="' . $a->get_baseurl() . '/' . $a->cmd . '/new' . ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : '') . '">' . t('View New Items') . '</a></div>';
 
@@ -65,6 +69,14 @@ function network_init(&$a) {
                                . '<span class="network-star icon starred"></span>' 
                                . '<div class="clear"></div></div>';
 
+               if(! $_GET['bmark'])
+                       $a->page['aside'] .= '<div id="network-bmark-link">'
+                               . '<a class="network-bmark" href="' . $a->get_baseurl() . '/' . $a->cmd 
+                               . ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : '') . '&bmark=1" >' 
+                               . t('View Bookmarks') . '</a>'
+                               . '<div class="clear"></div></div>';
+
+
        }
 
        $a->page['aside'] .= '</div>';

diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 8a681a0e09d5fb83c36f34f9dd02379198064d12..acd7d5bb54655c357a93e5c095a27c80152ce7aa 100644 (file)
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -803,6 +803,9 @@ input#dfrn-url {
        float: left;
        margin-right: 5px;
 }
+#network-bmark-link {
+       margin-top: 10px;
+}
 
 .wall-item-content-wrapper {
        margin-top: 10px;

diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css
index d552d59c614456ac5a5ceb12dccd07f828d655cf..8636f1085eff1c02a0b5d8d2656f632137493c17 100644 (file)
--- a/view/theme/loozah/style.css
+++ b/view/theme/loozah/style.css
@@ -1019,6 +1019,10 @@ input#dfrn-url {
        float: left;
        margin-right: 5px;
 }
+#network-bmark-link {
+       margin-top: 10px;
+}
+
 
 
 .wall-item-info.wallwall {