diff options
| author | Thomas Willingham <founder@kakste.com> | 2013-10-01 22:58:44 +0100 |
|---|---|---|
| committer | Thomas Willingham <founder@kakste.com> | 2013-10-01 22:58:44 +0100 |
| commit | 70fd797994e4b861d20d99cec2a7d801e478d894 (patch) | |
| tree | 5b00b61522f2c7136912396df54bd3251e3f17c8 /include/text.php | |
| parent | 2c9c206808fec2212141f8630ce534ed29a47037 (diff) | |
| parent | 27e97571d44f9e69a66eead9da2de4209996457d (diff) | |
| download | volse-hubzilla-70fd797994e4b861d20d99cec2a7d801e478d894.tar.gz volse-hubzilla-70fd797994e4b861d20d99cec2a7d801e478d894.tar.bz2 volse-hubzilla-70fd797994e4b861d20d99cec2a7d801e478d894.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/text.php')
| -rwxr-xr-x | include/text.php | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/include/text.php b/include/text.php index 40df8bd89..69c258488 100755 --- a/include/text.php +++ b/include/text.php @@ -1312,7 +1312,7 @@ function get_plink($item) { $a = get_app(); if (x($item,'plink') && ($item['item_private'] != 1)) { return array( - 'href' => $item['plink'], + 'href' => zid($item['plink']), 'title' => t('link to source'), ); } @@ -1835,16 +1835,17 @@ function json_decode_plus($s) { function design_tools() { -// FIXME - this should be a template - - $o = '<div class="widget design-tools">'; - $o .= '<h3>' . t('Design') . '</h3>'; - $o .= '<a href="blocks">' . t('Blocks') . '</a>' . EOL; - $o .= '<a href="menu">' . t('Menus') . '</a>' . EOL; - $o .= '<a href="layout">' . t('Layouts') . '</a>' . EOL; - $o .= '<a href="webpages">' . t('Pages') . '</a>' . EOL; - $o .= '</div>'; - return $o; +$channel = get_app()->get_channel(); +$who = $channel['channel_address']; + +return replace_macros(get_markup_template('design_tools.tpl'), array( + '$title' => t('Design'), + '$who' => $who, + '$blocks' => t('Blocks'), + '$menus' => t('Menus'), + '$layout' => t('Layouts'), + '$pages' => t('Pages') + )); } |