friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

view bookmarks

This commit is contained in:
Friendika 2011-09-06 00:55:24 -07:00
parent 6eb6b8f969
commit eeecb412aa
3 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mod/network.php
View File

@ -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>';

3
view/theme/duepuntozero/style.css
View File

@ -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;

4
view/theme/loozah/style.css
View File

@ -1019,6 +1019,10 @@ input#dfrn-url {
float: left;
margin-right: 5px;
}
#network-bmark-link {
margin-top: 10px;
}
.wall-item-info.wallwall {