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

whitespace and minor fixes

Browse Source
This commit is contained in:
Mario Vavti 2016-11-23 13:38:27 +01:00
parent 4bb6b5a547
commit 6cf8ca5e43
2 changed files with 57 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Module/Wiki.php
View File

@ -258,7 +258,7 @@ class Wiki extends \Zotlabs\Web\Controller {
'$wikiName' => array('wikiName', t('Enter the name of your new wiki:'), '', ''), '$wikiName' => array('wikiName', t('Enter the name of your new wiki:'), '', ''),
'$pageName' => array('pageName', t('Enter the name of the new page:'), '', ''), '$pageName' => array('pageName', t('Enter the name of the new page:'), '', ''),
'$pageRename' => array('pageRename', t('Enter the new name:'), '', ''), '$pageRename' => array('pageRename', t('Enter the new name:'), '', ''),
'$commitMsg' => array('commitMsg', '', '', '', '', 'placeholder="(optional) Enter a custom message when saving the page..."'), '$commitMsg' => array('commitMsg', '', '', '', '', 'placeholder="Short description of your changes (optional)"'),
'$pageHistory' => $pageHistory['history'], '$pageHistory' => $pageHistory['history'],
'$wikiModal' => $wikiModal, '$wikiModal' => $wikiModal,
'$wikiModalID' => $wikiModalID, '$wikiModalID' => $wikiModalID,

52
view/tpl/wiki.tpl
View File

@ -1,19 +1,12 @@
{{if $hideEditor}}
<div>
<p class="lead text-center">{{$chooseWikiMessage}}</p>
</div>
{{/if}}
<div class="generic-content-wrapper" {{if $hideEditor}}style="display: none;"{{/if}}> <div class="generic-content-wrapper" {{if $hideEditor}}style="display: none;"{{/if}}>
<div class="section-title-wrapper"> <div class="section-title-wrapper">
<div class="pull-right"> <div class="pull-right">
{{if $showPageControls}} {{if $showPageControls}}
<div class="btn-group"> <div class="btn-group">
<button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown"> <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-caret-down"></i>&nbsp;{{$tools_label}} <i class="fa fa-caret-down"></i>&nbsp;{{$tools_label}}
</button> </button>
<ul class="dropdown-menu"> <ul class="dropdown-menu dropdown-menu-right">
<li class="nav-item"> <li class="nav-item">
<a id="rename-page" class="nav-link" href="#"><i class="fa fa-edit"></i>&nbsp;Rename Page</a> <a id="rename-page" class="nav-link" href="#"><i class="fa fa-edit"></i>&nbsp;Rename Page</a>
</li> </li>
@ -23,59 +16,46 @@
<li class="nav-item"> <li class="nav-item">
<a id="embed-image" class="nav-link" href="#"><i class="fa fa-picture-o"></i>&nbsp;Embed Image</a> <a id="embed-image" class="nav-link" href="#"><i class="fa fa-picture-o"></i>&nbsp;Embed Image</a>
</li> </li>
</ul> </ul>
</div> </div>
{{/if}} {{/if}}
<button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button> <button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button>
<button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button> <button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button>
</div> </div>
<h2><span id="wiki-header-name"><i class="fa fa-book"></i>&nbsp<b>{{$wikiheaderName}}</b></span>&nbsp:&nbsp <h2>
<span id="wiki-header-name">{{$wikiheaderName}}</span>:
<span id="wiki-header-page">{{$wikiheaderPage}}</span> <span id="wiki-header-page">{{$wikiheaderPage}}</span>
</h2> </h2>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<div id="rename-page-form-wrapper" class="section-content-tools-wrapper" style="display:none;"> <div id="rename-page-form-wrapper" class="section-content-tools-wrapper" style="display:none;">
<form id="rename-page-form" action="wiki/rename/page" method="post" > <form id="rename-page-form" action="wiki/rename/page" method="post" >
<div class="clear"></div>
{{include file="field_input.tpl" field=$pageRename}} {{include file="field_input.tpl" field=$pageRename}}
<div class="btn-group pull-right"> <div class="btn-group pull-right">
<button id="rename-page-submit" class="btn btn-warning" type="submit" name="submit" >Rename Page</button> <button id="rename-page-submit" class="btn btn-warning" type="submit" name="submit" >Rename Page</button>
</div> </div>
</form> <div class="clear"></div> </form>
<hr> <div class="clear"></div>
</div> </div>
<div id="wiki-content-container" class="section-content-wrapper" {{if $hideEditor}}style="display: none;"{{/if}}> <div id="wiki-content-container" class="section-content-wrapper" {{if $hideEditor}}style="display: none;"{{/if}}>
<ul class="nav nav-tabs" id="wiki-nav-tabs"> <ul class="nav nav-tabs" id="wiki-nav-tabs">
<li id="edit-pane-tab"><a data-toggle="tab" href="#edit-pane">{{$editOrSourceLabel}}</a></li> <li id="edit-pane-tab"><a data-toggle="tab" href="#edit-pane">{{$editOrSourceLabel}}</a></li>
<li class="active"><a data-toggle="tab" href="#preview-pane" id="wiki-get-preview">View</a></li> <li class="active"><a data-toggle="tab" href="#preview-pane" id="wiki-get-preview">View</a></li>
<li {{if $hidePageHistory}}style="display: none;"{{/if}}><a data-toggle="tab" href="#page-history-pane" id="wiki-get-history">History</a></li> <li {{if $hidePageHistory}}style="display: none;"{{/if}}><a data-toggle="tab" href="#page-history-pane" id="wiki-get-history">History</a></li>
</ul> </ul>
<div class="tab-content" id="wiki-page-tabs"> <div class="tab-content" id="wiki-page-tabs">
<div id="edit-pane" class="tab-pane fade"> <div id="edit-pane" class="tab-pane fade">
<div id="ace-editor"></div> <div id="ace-editor"></div>
{{if $showCommitMsg}} {{if $showCommitMsg}}
{{if $showPageControls}} {{if $showPageControls}}
<div> <div>
<div id="id_{{$commitMsg.0}}_wrapper" class='form-group field input'> <div id="id_{{$commitMsg.0}}_wrapper" class="form-group field input">
<label for='id_{{$commitMsg.0}}' id='label_{{$commitMsg.0}}'>{{$commitMsg.1}}{{if $commitMsg.4}}<span class="required"> {{$commitMsg.4}}</span>{{/if}}</label> <div class="input-group">
<span> <input class="widget-input" name="{{$commitMsg.0}}" id="id_{{$commitMsg.0}}" type="text" value="{{$commitMsg.2}}"{{if $commitMsg.5}} {{$commitMsg.5}}{{/if}}>
<input class="" style="width: 80%;" name='{{$commitMsg.0}}' id='id_{{$commitMsg.0}}' type="text" value="{{$commitMsg.2}}"{{if $commitMsg.5}} {{$commitMsg.5}}{{/if}}> <div class="input-group-btn">
<a id="save-page" href="#" class="btn btn-primary btn-md disabled">Save</a> <button id="save-page" type="button" class="btn btn-primary btn-sm disabled">Save</button>
</span> </div>
<span id='help_{{$commitMsg.0}}' class='help-block'>{{$commitMsg.3}}</span> </div>
<div class="clear"></div>
</div> </div>
</div> </div>
{{/if}} {{/if}}
@ -87,20 +67,14 @@
</div> </div>
</div> </div>
<div id="page-history-pane" class="tab-pane fade" {{if $hidePageHistory}}style="display: none;"{{/if}}> <div id="page-history-pane" class="tab-pane fade" {{if $hidePageHistory}}style="display: none;"{{/if}}>
<div id="page-history-list"> <div id="page-history-list"></div>
</div> </div>
</div> </div>
</div>
</div>
</div> </div>
</div> </div>
{{$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">