diff options
| -rw-r--r-- | Zotlabs/Module/Wiki.php | 3 | ||||
| -rw-r--r-- | Zotlabs/Widget/Wiki_pages.php | 4 | ||||
| -rw-r--r-- | view/css/mod_wiki.css | 15 | ||||
| -rw-r--r-- | view/tpl/wiki_page_list.tpl | 13 | ||||
| -rw-r--r-- | view/tpl/wikilist.tpl | 14 |
5 files changed, 29 insertions, 20 deletions
diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php index 2668229ee..fe2bfbdfb 100644 --- a/Zotlabs/Module/Wiki.php +++ b/Zotlabs/Module/Wiki.php @@ -216,7 +216,8 @@ class Wiki extends \Zotlabs\Web\Controller { '$deny_cid' => $x['deny_cid'], '$deny_gid' => $x['deny_gid'], '$typelock' => array('typelock', t('Lock content type'), '', '', array(t('No'), t('Yes'))), - '$notify' => array('postVisible', t('Create a status post for this wiki'), '', '', array(t('No'), t('Yes'))) + '$notify' => array('postVisible', t('Create a status post for this wiki'), '', '', array(t('No'), t('Yes'))), + '$edit_wiki_name' => t('Edit Wiki Name') )); return $o; diff --git a/Zotlabs/Widget/Wiki_pages.php b/Zotlabs/Widget/Wiki_pages.php index b4928ede5..ac44b8d88 100644 --- a/Zotlabs/Widget/Wiki_pages.php +++ b/Zotlabs/Widget/Wiki_pages.php @@ -56,7 +56,9 @@ class Wiki_pages { '$mimetype' => mimetype_select(0,$w['mimeType'], [ 'text/markdown' => t('Markdown'), 'text/bbcode' => t('BBcode'), 'text/plain' => t('Text') ]), '$pageName' => array('pageName', t('Page name')), - '$refresh' => $arr['refresh'] + '$refresh' => $arr['refresh'], + '$options' => t('Options'), + '$submit' => t('Submit') )); } } diff --git a/view/css/mod_wiki.css b/view/css/mod_wiki.css index a16ab47c5..4e4c71e1d 100644 --- a/view/css/mod_wiki.css +++ b/view/css/mod_wiki.css @@ -33,17 +33,18 @@ width: 100%; } +td i { + padding: 7px 5px; + cursor: pointer; +} + #wikis-index th:nth-child(1), #wikis-index td:nth-child(1){ padding: 7px 3px 7px 10px; } -#wikis-index th:nth-child(6), -#wikis-index td:nth-child(6){ - padding: 7px 10px 7px 7px; -} - -.wikis-index-tool { - padding: 7px 10px; +#wikis-index th:nth-last-child(1), +#wikis-index td:nth-last-child(1){ + padding-right: 10px; } diff --git a/view/tpl/wiki_page_list.tpl b/view/tpl/wiki_page_list.tpl index a7e6ebdaf..d75f22f64 100644 --- a/view/tpl/wiki_page_list.tpl +++ b/view/tpl/wiki_page_list.tpl @@ -17,16 +17,21 @@ <li class="nav-item"><a class="nav-link" href="#" onclick="wiki_show_new_page_form(); return false;"><i class="fa fa-plus-circle"></i> {{$addnew}}</a></li> {{/if}} {{if $canadd}} - <div id="new-page-form-wrapper" class="sub-menu" style="display:none;"> + <div id="new-page-form-wrapper" class="clearfix sub-menu" style="display:none;"> <form id="new-page-form" action="wiki/{{$channel_address}}/create/page" method="post" > <input type="hidden" name="resource_id" value="{{$resource_id}}"> + {{include file="field_input.tpl" field=$pageName}} {{if $typelock}} <input id="id_mimetype" type="hidden" name="mimetype" value="{{$lockedtype}}"> {{else}} - {{$mimetype}} + <div id="wiki_page_options" style="display: none"> + {{$mimetype}} + </div> + <div class="float-right fakelink" onClick="openClose('wiki_page_options')"> + {{$options}} + </div> {{/if}} - {{include file="field_input.tpl" field=$pageName}} - <button id="new-page-submit" class="btn btn-primary" type="submit" name="submit" >Submit</button> + <button id="new-page-submit" class="btn btn-primary" type="submit" name="submit" >{{$submit}}</button> </form> </div> {{/if}} diff --git a/view/tpl/wikilist.tpl b/view/tpl/wikilist.tpl index dfd7f553d..801cb17fd 100644 --- a/view/tpl/wikilist.tpl +++ b/view/tpl/wikilist.tpl @@ -29,11 +29,11 @@ <tr> <th width="96%">{{$name}}</th> <th width="1%">{{$type}}</th> - <th width="1%" class="wikis-index-tool"></th> + <th width="1%"></th> {{if $owner}} - <th width="1%" class="wikis-index-tool"></th> + <th width="1%"></th> {{/if}} - <th width="1%" class="wikis-index-tool"></th> + <th width="1%"></th> {{if $owner}} <th width="1%"></th> {{/if}} @@ -43,15 +43,15 @@ <td><a href="/wiki/{{$channel}}/{{$wiki.urlName}}/Home" title="{{$view}}"{{if $wiki.active}} class="active"{{/if}}>{{$wiki.title}}</a></td> <td>{{if $wiki.typelock}}{{$wiki.mimeType}}{{else}}{{$unlocked}}{{/if}}</td> {{if $owner}} - <td class="wikis-index-tool"><i class="fa fa-pencil" onclick="openCloseTR('wikis-index-edit-{{$wiki.id}}')"></i></td> + <td><i class="fa fa-pencil" onclick="openCloseTR('wikis-index-edit-{{$wiki.id}}')"></i></td> {{/if}} - <td class="wikis-index-tool dropdown"> + <td class="dropdown"> {{if $wiki.lockstate == 'lock'}} <i class="fa fa-lock lockview" data-toggle="dropdown" onclick="lockview('item',{{$wiki.id}});"></i> <ul id="panel-{{$wiki.id}}" class="lockview-panel dropdown-menu dropdown-menu-right"></ul> {{/if}} </td> - <td class="wikis-index-tool"><i class="fa fa-download" onclick="wiki_download_wiki('{{$wiki.resource_id}}'); return false;"></i></td> + <td><i class="fa fa-download" onclick="wiki_download_wiki('{{$wiki.resource_id}}'); return false;"></i></td> {{if $owner}} <td><i class="fa fa-trash-o drop-icons" onclick="wiki_delete_wiki('{{$wiki.title}}', '{{$wiki.resource_id}}'); return false;"></i></td> {{/if}} @@ -61,7 +61,7 @@ <td colspan="6"> <form id="edit-wiki-form-{{$wiki.id}}" method="post" action="wiki/{{$channel}}/update/wiki" class="acl-form" data-form_id="edit-wiki-form-{{$wiki.id}}" data-allow_cid='{{$wiki.json_allow_cid}}' data-allow_gid='{{$wiki.json_allow_gid}}' data-deny_cid='{{$wiki.json_deny_cid}}' data-deny_gid='{{$wiki.json_deny_gid}}'> <input type="hidden" name="origRawName" value="{{$wiki.title}}"> - {{include file="field_input.tpl" field=['updateRawName', 'Edit Wiki Name', $wiki.title]}} + {{include file="field_input.tpl" field=['updateRawName', $edit_wiki_name, $wiki.title]}} <div class="btn-group float-right"> <button class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" type="button"> <i class="jot-perms-icon fa fa-{{$wiki.lockstate}}"></i> |