diff options
| author | Friendika <info@friendika.com> | 2011-09-28 23:53:05 -0700 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2011-09-28 23:53:05 -0700 |
| commit | 0ee9ae23d75d9f15fd37fb2ea118649dfe92aee0 (patch) | |
| tree | 1785aa2947ac6d472fc03ca5954f85102222df2f /mod | |
| parent | ffa3b67365741d77b9a21b8505e4661668e6b561 (diff) | |
| parent | 0881c04cea53b68fba070ebb4490055064bc537d (diff) | |
| download | volse-hubzilla-0ee9ae23d75d9f15fd37fb2ea118649dfe92aee0.tar.gz volse-hubzilla-0ee9ae23d75d9f15fd37fb2ea118649dfe92aee0.tar.bz2 volse-hubzilla-0ee9ae23d75d9f15fd37fb2ea118649dfe92aee0.zip | |
Merge pull request #8 from duthied/master
Classes added to core and testbubble theme
It looks to me as if view/wall_item.tpl is an earlier version that somehow didn't get merged. I don't think testbubble is using it, so I'm going to merge and then revert that one file, as I don't see any changes you made to it specifically for this body of work.
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/network.php | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/mod/network.php b/mod/network.php index 9488cd973..371a35402 100644 --- a/mod/network.php +++ b/mod/network.php @@ -78,23 +78,25 @@ function network_init(&$a) { // network links moved to content to match other pages // all - $a->page['content'] .= '<a class="tabs ' . $all_active . '" href="' . $a->get_baseurl() . '/' + // added 'button' class for easier styling - not the best place for it, should be moved into the tpl like profile_tabs.tpl + // once there is a network_tabs.tpl or something + $a->page['content'] .= '<a class="button tabs ' . $all_active . '" href="' . $a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '?cid=' . $_GET['cid'] : '') . '">' . t('All') . '</a>'; // new - $a->page['content'] .= '<a class="tabs ' . $new_active . '" href="' . $a->get_baseurl() . '/' + $a->page['content'] .= '<a class="button tabs ' . $new_active . '" href="' . $a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . '/new' . ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : '') . '">' . t('New') . '</a>'; // starred - $a->page['content'] .= '<a class="tabs ' . $starred_active . '" href="' . $a->get_baseurl() . '/' + $a->page['content'] .= '<a class="button tabs ' . $starred_active . '" href="' . $a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : '') . '&star=1" >' . t('Starred') . '</a>'; // bookmarks - $a->page['content'] .= '<a class="tabs ' . $bookmarked_active . '" href="' . $a->get_baseurl() . '/' + $a->page['content'] .= '<a class="button tabs ' . $bookmarked_active . '" href="' . $a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : '') . '&bmark=1" >' . t('Bookmarks') . '</a>'; |