aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-09-06 00:55:24 -0700
committerFriendika <info@friendika.com>2011-09-06 00:55:24 -0700
commiteeecb412aa9296be1f61e99db7695e672b08861f (patch)
tree9e1203ff52da3ba17d723779f31115060ea85961
parent6eb6b8f9694b86eb976070bdb7d56feaea838647 (diff)
downloadvolse-hubzilla-eeecb412aa9296be1f61e99db7695e672b08861f.tar.gz
volse-hubzilla-eeecb412aa9296be1f61e99db7695e672b08861f.tar.bz2
volse-hubzilla-eeecb412aa9296be1f61e99db7695e672b08861f.zip
view bookmarks
-rw-r--r--mod/network.php14
-rw-r--r--view/theme/duepuntozero/style.css3
-rw-r--r--view/theme/loozah/style.css4
3 files changed, 20 insertions, 1 deletions
diff --git a/mod/network.php b/mod/network.php
index 1434f5d31..624fb8793 100644
--- 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 8a681a0e0..acd7d5bb5 100644
--- 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 d552d59c6..8636f1085 100644
--- 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 {