harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more wiki cleanup

Browse Source
This commit is contained in:
Mario Vavti 2016-12-15 10:56:16 +01:00
parent b630a01131
commit 2a2a4b96c7
2 changed files with 19 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Zotlabs/Module/Wiki.php
View File

@ -242,20 +242,12 @@ class Wiki extends \Zotlabs\Web\Controller {
'$wikiheaderName' => $wikiheaderName, '$wikiheaderName' => $wikiheaderName,
'$wikiheaderPage' => $wikiheaderPage, '$wikiheaderPage' => $wikiheaderPage,
'$renamePage' => $renamePage, '$renamePage' => $renamePage,
'$chooseWikiMessage' => t('Choose an available wiki from the list on the left.'),
'$showPageControls' => $showPageControls, '$showPageControls' => $showPageControls,
'$editOrSourceLabel' => (($showPageControls) ? t('Edit') : t('Source')), '$editOrSourceLabel' => (($showPageControls) ? t('Edit') : t('Source')),
'$tools_label' => 'Page Tools', '$tools_label' => 'Page Tools',
'$channel' => $owner['channel_address'], '$channel' => $owner['channel_address'],
'$resource_id' => $resource_id, '$resource_id' => $resource_id,
'$page' => $pageUrlName, '$page' => $pageUrlName,
'$lockstate' => $x['lockstate'],
'$acl' => $x['acl'],
'$allow_cid' => $x['allow_cid'],
'$allow_gid' => $x['allow_gid'],
'$deny_cid' => $x['deny_cid'],
'$deny_gid' => $x['deny_gid'],
'$bang' => $x['bang'],
'$mimeType' => $mimeType, '$mimeType' => $mimeType,
'$content' => $content, '$content' => $content,
'$renderedContent' => $renderedContent, '$renderedContent' => $renderedContent,
@ -270,7 +262,7 @@ class Wiki extends \Zotlabs\Web\Controller {
'$embedPhotosModalOK' => t('OK'), '$embedPhotosModalOK' => t('OK'),
'$modalchooseimages' => t('Choose images to embed'), '$modalchooseimages' => t('Choose images to embed'),
'$modalchoosealbum' => t('Choose an album'), '$modalchoosealbum' => t('Choose an album'),
'$modaldiffalbum' => t('Choose a different album...'), '$modaldiffalbum' => t('Choose a different album'),
'$modalerrorlist' => t('Error getting album list'), '$modalerrorlist' => t('Error getting album list'),
'$modalerrorlink' => t('Error getting photo link'), '$modalerrorlink' => t('Error getting photo link'),
'$modalerroralbum' => t('Error getting album'), '$modalerroralbum' => t('Error getting album'),

38
view/tpl/wiki.tpl
View File

@ -84,28 +84,26 @@
{{$wikiModal}} {{$wikiModal}}
<div class="modal" id="embedPhotoModal" tabindex="-1" role="dialog" aria-labelledby="embedPhotoLabel" aria-hidden="true"> <div class="modal" id="embedPhotoModal" tabindex="-1" role="dialog" aria-labelledby="embedPhotoLabel" aria-hidden="true">
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title" id="embedPhotoModalLabel">{{$embedPhotosModalTitle}}</h4> <h4 class="modal-title" id="embedPhotoModalLabel">{{$embedPhotosModalTitle}}</h4>
</div> </div>
<div class="modal-body" id="embedPhotoModalBody" > <div class="modal-body" id="embedPhotoModalBody" >
<div id="embedPhotoModalBodyAlbumListDialog" class="hide"> <div id="embedPhotoModalBodyAlbumListDialog" class="hide">
<div id="embedPhotoModalBodyAlbumList"></div> <div id="embedPhotoModalBodyAlbumList"></div>
</div> </div>
<div id="embedPhotoModalBodyAlbumDialog" class="hide"> <div id="embedPhotoModalBodyAlbumDialog" class="hide"></div>
</div> </div>
</div> <div class="modal-footer">
<div class="modal-footer"> <button type="button" class="btn btn-default" data-dismiss="modal">{{$embedPhotosModalCancel}}</button>
<button type="button" class="btn btn-default" data-dismiss="modal">{{$embedPhotosModalCancel}}</button> <button id="embed-photo-OKButton" type="button" class="btn btn-primary">{{$embedPhotosModalOK}}</button>
<button id="embed-photo-OKButton" type="button" class="btn btn-primary">{{$embedPhotosModalOK}}</button> </div>
</div> </div><!-- /.modal-content -->
</div><!-- /.modal-content --> </div><!-- /.modal-dialog -->
</div><!-- /.modal-dialog -->
</div><!-- /.modal --> </div><!-- /.modal -->
<script> <script>
window.wiki_resource_id = '{{$resource_id}}'; window.wiki_resource_id = '{{$resource_id}}';
window.wiki_page_name = '{{$page}}'; window.wiki_page_name = '{{$page}}';