diff options
| author | zotlabs <mike@macgirvin.com> | 2018-03-30 16:47:47 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-03-30 16:47:47 -0700 |
| commit | 1c3e6697615b70d2528856b6c8e69962a14763dc (patch) | |
| tree | 0dc325235040a3a9614cc2f68a8bb1447c904839 | |
| parent | af125fbe4f72b1f170ef6722d1bf9ca4beb3c7c5 (diff) | |
| download | volse-hubzilla-1c3e6697615b70d2528856b6c8e69962a14763dc.tar.gz volse-hubzilla-1c3e6697615b70d2528856b6c8e69962a14763dc.tar.bz2 volse-hubzilla-1c3e6697615b70d2528856b6c8e69962a14763dc.zip | |
Hubzilla issue #1022 - improve the usability
| -rw-r--r-- | Zotlabs/Module/Wiki.php | 4 | ||||
| -rw-r--r-- | view/tpl/wiki.tpl | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php index a2cc87f13..696191f70 100644 --- a/Zotlabs/Module/Wiki.php +++ b/Zotlabs/Module/Wiki.php @@ -284,7 +284,7 @@ class Wiki extends \Zotlabs\Web\Controller { $wikiheaderPage = urldecode($pageUrlName); $renamePage = (($wikiheaderPage === 'Home') ? '' : t('Rename page')); - $sharePage = t('Share page'); + $sharePage = t('Share'); $p = []; @@ -357,7 +357,7 @@ class Wiki extends \Zotlabs\Web\Controller { '$wikiheaderPage' => $wikiheaderPage, '$renamePage' => $renamePage, '$sharePage' => $sharePage, - '$shareLink' => urlencode('#^[zrl=' . z_root() . '/wiki/' . argv(1) . '/' . $wikiUrlName . '/' . $pageUrlName . ']' . $wikiheaderName . ' - ' . $wikiheaderPage . '[/zrl]'), + '$shareLink' => urlencode('#^[zrl=' . z_root() . '/wiki/' . argv(1) . '/' . $wikiUrlName . '/' . $pageUrlName . ']' . '[ ' . $owner['channel_name'] . ' ] - ' . $wikiheaderName . ' - ' . $wikiheaderPage . '[/zrl]'), '$showPageControls' => $showPageControls, '$editOrSourceLabel' => (($showPageControls) ? t('Edit') : t('Source')), '$tools_label' => 'Page Tools', diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl index 1a83179a3..6ca4b0c77 100644 --- a/view/tpl/wiki.tpl +++ b/view/tpl/wiki.tpl @@ -11,13 +11,11 @@ {{if $renamePage}} <a class="dropdown-item rename-page" href="#"><i class="fa fa-fw fa-edit"></i> {{$renamePage}}</a> {{/if}} - {{if $sharePage}} - <a class="dropdown-item share-page" href="rpost?f=&body={{$shareLink}}"><i class="fa fa-fw fa-share"></i> {{$sharePage}}</a> - {{/if}} <a id="embed-image" class="dropdown-item" href="#"><i class="fa fa-fw fa-picture-o"></i> Embed Image</a> </div> </div> {{/if}} + <button type="button" class="btn btn-outline-secondary btn-sm" title="{{$sharePage}}" onclick="window.location.href='rpost?f=&body={{$shareLink}}';"><i class="fa fa-fw fa-share"></i></button> <button id="fullscreen-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen(); adjustFullscreenEditorHeight();"><i class="fa fa-expand"></i></button> <button id="inline-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen(false); adjustInlineEditorHeight()"><i class="fa fa-compress"></i></button> </div> |