diff options
| -rw-r--r-- | .htaccess | 2 | ||||
| -rw-r--r-- | edit_book.php | 2 | ||||
| -rw-r--r-- | includes/classes/BitPage.php | 13 | ||||
| -rw-r--r-- | modules/mod_recent_page_changes.tpl | 2 | ||||
| -rw-r--r-- | templates/admin_external_wikis.tpl | 4 | ||||
| -rw-r--r-- | templates/center_wiki_page.tpl | 2 | ||||
| -rw-r--r-- | templates/copyrights.tpl | 6 | ||||
| -rw-r--r-- | templates/edit_page.tpl | 10 | ||||
| -rw-r--r-- | templates/list_books.tpl | 6 | ||||
| -rw-r--r-- | templates/list_pages.tpl | 12 | ||||
| -rw-r--r-- | templates/menu_wiki.tpl | 18 | ||||
| -rw-r--r-- | templates/page_icons.tpl | 30 | ||||
| -rw-r--r-- | templates/page_permissions.tpl | 2 | ||||
| -rw-r--r-- | templates/print.tpl | 2 |
14 files changed, 60 insertions, 51 deletions
@@ -7,5 +7,5 @@ RewriteRule ^(.*)$ - [L] RewriteRule ^view/(.*)$ index.php?page=$1 [L,QSA] - RewriteRule ^(.*)$ index.php?page=$1 [L,QSA] + RewriteRule ^(.*)$ index.php?page=$1 [L,QSA,B] </IfModule> diff --git a/edit_book.php b/edit_book.php index dd20c72..af7e1be 100644 --- a/edit_book.php +++ b/edit_book.php @@ -33,7 +33,7 @@ global $gStructure; **/ // get a book instance global $gContent; -if( @BitBase::verifyId( $_REQUEST["structure_id"] ) || @BitBase::verifyId( $_REQUEST["content_id"] ) ) { +if( BitBase::verifyIdParameter( $_REQUEST, 'structure_id' ) || BitBase::verifyIdParameter( $_REQUEST, 'content_id' ) ) { include_once( LIBERTY_PKG_INCLUDE_PATH.'lookup_content_inc.php' ); if( empty( $gContent ) ){ $gBitSystem->fatalError( 'Error: Invalid structure id, the book you requested could not be found.' ); diff --git a/includes/classes/BitPage.php b/includes/classes/BitPage.php index 92c0776..b262895 100644 --- a/includes/classes/BitPage.php +++ b/includes/classes/BitPage.php @@ -166,12 +166,13 @@ class BitPage extends LibertyMime implements BitCacheable { $this->getServicesSql( 'content_load_sql_function', $selectSql, $joinSql, $whereSql, $bindVars ); $query = " - SELECT wp.*, lc.*, lcds.`data` AS `summary`, + SELECT wp.*, lc.*, lcds.`data` AS `summary`, lcdm.`data` as `metatags`, uue.`login` AS modifier_user, uue.`real_name` AS modifier_real_name, uuc.`login` AS creator_user, uuc.`real_name` AS creator_real_name $selectSql FROM `".BIT_DB_PREFIX."wiki_pages` wp INNER JOIN `".BIT_DB_PREFIX."liberty_content` lc ON (lc.`content_id` = wp.`content_id`) $joinSql LEFT OUTER JOIN `".BIT_DB_PREFIX."liberty_content_data` lcds ON (lc.`content_id` = lcds.`content_id` AND lcds.`data_type`='summary') + LEFT OUTER JOIN `".BIT_DB_PREFIX."liberty_content_data` lcdm ON (lc.`content_id` = lcdm.`content_id` AND lcdm.`data_type`='metatags') LEFT JOIN `".BIT_DB_PREFIX."users_users` uue ON (uue.`user_id` = lc.`modifier_user_id`) LEFT JOIN `".BIT_DB_PREFIX."users_users` uuc ON (uuc.`user_id` = lc.`user_id`) WHERE wp.`$lookupColumn`=? $whereSql"; @@ -305,7 +306,7 @@ class BitPage extends LibertyMime implements BitCacheable { $pParamHash['content_type_guid'] = $this->mContentTypeGuid; } - if( @$this->verifyId( $pParamHash['content_id'] ) ) { + if( @$this->verifyIdParameter( $pParamHash, 'content_id' ) ) { $pParamHash['page_store']['content_id'] = $pParamHash['content_id']; } @@ -516,7 +517,7 @@ class BitPage extends LibertyMime implements BitCacheable { $ret = $this->getField('title'); if( $this->isValid() ) { $ret = static::getTitleFromHash( $this->mInfo ); - $requestPage = strtoupper( self::getParameter( $_REQUEST, 'page' ) ); + $requestPage = strtoupper( self::getParameter( $_REQUEST, 'page' ) ?? '' ); if( $requestPage && $requestPage != strtoupper( $this->mInfo['title'] ) ) { $aliases = $this->getAliases( TRUE ); if( in_array( $requestPage, $aliases ) ) { @@ -682,7 +683,7 @@ class BitPage extends LibertyMime implements BitCacheable { } // limit by user id - if( @BitBase::verifyId( $pListHash['user_id'] )) { + if( @BitBase::verifyIdParameter( $pListHash, 'user_id' )) { $whereSql .= " AND lc.`user_id` = ? "; $bindVars = array_merge( $bindVars, array( $pListHash['user_id'] )); } @@ -859,7 +860,7 @@ class BitPage extends LibertyMime implements BitCacheable { // ...page... functions function countSubPages( $pData ) { - return(( preg_match_all( '/'.( defined( 'PAGE_SEP' ) ? preg_quote( PAGE_SEP ) : '\.\.\.page\.\.\.').'/', $pData, $matches ) + 1 )); + return(( preg_match_all( '/'.( defined( 'PAGE_SEP' ) ? preg_quote( PAGE_SEP ) : '\.\.\.page\.\.\.').'/', $pData ?? '', $matches ) + 1 )); } /** @@ -994,7 +995,7 @@ class BitPage extends LibertyMime implements BitCacheable { * @access public * @return boolean TRUE on success, FALSE on failure - $this->mErrors will contain reason for failure */ - function linkStructureGraph( $pLinkStructure = array(), $pParams = array(), &$pGraphViz ) { + function linkStructureGraph( $pLinkStructure = array(), $pParams = array(), $pGraphViz = null ) { if( !empty( $pLinkStructure ) && !empty( $pGraphViz )) { $pParams['graph']['URL'] = WIKI_PKG_URL.'index.php'; $pGraphViz->addAttributes( $pParams['graph'] ); diff --git a/modules/mod_recent_page_changes.tpl b/modules/mod_recent_page_changes.tpl index 27fa56c..9a4b45c 100644 --- a/modules/mod_recent_page_changes.tpl +++ b/modules/mod_recent_page_changes.tpl @@ -5,7 +5,7 @@ {section name=ix loop=$modLastModif} <li> <a href="{$modLastModif[ix].display_url}" title="{$modLastModif[ix].title|escape} - {displayname user=$modLastModif[ix].modifier_user real_name=$modLastModif[ix].modifier_real_name nolink=1}, {$modLastModif[ix].last_modified|bit_short_date}"> - {if $maxlen gt 0} + {if !empty($maxlen)} {$modLastModif[ix].title|escape|truncate:$maxlen:"...":true} {else} {$modLastModif[ix].title|escape} diff --git a/templates/admin_external_wikis.tpl b/templates/admin_external_wikis.tpl index 1d011b3..e81b152 100644 --- a/templates/admin_external_wikis.tpl +++ b/templates/admin_external_wikis.tpl @@ -30,8 +30,8 @@ <td>{$channels[user].name}</td> <td>{$channels[user].extwiki}</td> <td> - <a href="{$smarty.const.WIKI_PKG_URL}admin/admin_external_wikis.php?offset={$offset}&sort_mode={$sort_mode}&remove={$channels[user].extwiki_id}" onclick="return confirm('{tr}Are you sure you want to delete this external wiki?{/tr}')" title="Click here to delete this external wiki">{booticon iname="icon-trash" ipackage="icons" iexplain="remove"}</a> - <a href="{$smarty.const.WIKI_PKG_URL}admin/admin_external_wikis.php?offset={$offset}&sort_mode={$sort_mode}&extwiki_id={$channels[user].extwiki_id}">{booticon iname="icon-edit" ipackage="icons" iexplain="edit"}</a> + <a href="{$smarty.const.WIKI_PKG_URL}admin/admin_external_wikis.php?offset={$offset}&sort_mode={$sort_mode}&remove={$channels[user].extwiki_id}" onclick="return confirm('{tr}Are you sure you want to delete this external wiki?{/tr}')" title="Click here to delete this external wiki">{booticon iname="fa-trash" iexplain="remove"}</a> + <a href="{$smarty.const.WIKI_PKG_URL}admin/admin_external_wikis.php?offset={$offset}&sort_mode={$sort_mode}&extwiki_id={$channels[user].extwiki_id}">{booticon iname="fa-pen-to-square" iexplain="edit"}</a> </td> </tr> {sectionelse} diff --git a/templates/center_wiki_page.tpl b/templates/center_wiki_page.tpl index 3a3259e..f1167ab 100644 --- a/templates/center_wiki_page.tpl +++ b/templates/center_wiki_page.tpl @@ -3,7 +3,7 @@ <div class="display wiki"> <nav class="floaticon"> <!-- Actions --> {if $wikiPage->hasUpdatePermission()} - <a href="{$smarty.const.WIKI_PKG_URL}edit.php?page_id={$wikiPage->mInfo.page_id}">{booticon iname="icon-edit" ipackage="icons" iexplain="edit"}</a> + <a href="{$smarty.const.WIKI_PKG_URL}edit.php?page_id={$wikiPage->mInfo.page_id}">{booticon iname="fa-pen-to-square" iexplain="edit"}</a> {/if} {if $gBitSystem->isPackageActive( 'pdf' ) && $wikiPage->hasUserPermission( 'p_pdf_generation' )} <a title="{tr}create PDF{/tr}" href="{$smarty.const.PDF_PKG_URL}?page_id={$wikiPage->mInfo.page_id}">{biticon ipackage="pdf" iname="pdf" iexplain="PDF"}</a> diff --git a/templates/copyrights.tpl b/templates/copyrights.tpl index e6ff5f2..2609162 100644 --- a/templates/copyrights.tpl +++ b/templates/copyrights.tpl @@ -35,10 +35,10 @@ <input type="hidden" name="page_id" value="{$pageInfo.page_id}" /> <input type="hidden" name="copyright_id" value="{$copyrights[i].copyright_id|escape}" /> <input type="submit" class="btn btn-default" name="editcopyright" value="{tr}edit{/tr}" /> - <a href="{$smarty.const.WIKI_PKG_URL}copyrights.php?page_id={$pageInfo.page_id}&action=up&copyright_id={$copyrights[i].copyright_id}">{booticon iname="icon-cloud-upload" ipackage="icons" iexplain="move up"}</a> - <a href="{$smarty.const.WIKI_PKG_URL}copyrights.php?page_id={$pageInfo.page_id}&action=down&copyright_id={$copyrights[i].copyright_id}">{booticon iname="icon-cloud-download" ipackage="icons" iexplain="move down"}</a> + <a href="{$smarty.const.WIKI_PKG_URL}copyrights.php?page_id={$pageInfo.page_id}&action=up&copyright_id={$copyrights[i].copyright_id}">{booticon iname="fa-circle-arrow-up" iexplain="move up"}</a> + <a href="{$smarty.const.WIKI_PKG_URL}copyrights.php?page_id={$pageInfo.page_id}&action=down&copyright_id={$copyrights[i].copyright_id}">{booticon iname="fa-circle-arrow-down" iexplain="move down"}</a> <a title="{tr}Delete this copyright{/tr}" href="{$smarty.const.WIKI_PKG_URL}copyrights.php?page_id={$pageInfo.page_id}&action=delete&copyright_id={$copyrights[i].copyright_id}" - onclick="return confirm('{tr}Are you sure you want to delete this copyright?{/tr}')">{booticon iname="icon-trash" ipackage="icons" iexplain="delete"}</a> + onclick="return confirm('{tr}Are you sure you want to delete this copyright?{/tr}')">{booticon iname="fa-trash" iexplain="delete"}</a> </div> {/form} {/section} diff --git a/templates/edit_page.tpl b/templates/edit_page.tpl index 4546b82..a3cfc11 100644 --- a/templates/edit_page.tpl +++ b/templates/edit_page.tpl @@ -17,7 +17,7 @@ {* Check to see if there is an editing conflict *} {if $errors.edit_conflict} - <script type="text/javascript">/* <![CDATA[ */ + <script>/* <![CDATA[ */ alert( "{$errors.edit_conflict|strip_tags}" ); /* ]]> */</script> {formfeedback warning=$errors.edit_conflict} @@ -86,6 +86,14 @@ </div> {/if} + <div class="form-group"> + {formlabel label="Meta Tags" for="metatags"} + {forminput} + <textarea class="form-control" name="metatags" id="metatags" rows="5">{$pageInfo.metatags|escape:html}</textarea> + {formhelp note="Meta data to be inserted on page display. Useful for Opengraph tags."} + {/forminput} + </div> + {if $pageInfo.edit_section == 1} <input type="hidden" name="section" value="{$pageInfo.section}" /> {/if} diff --git a/templates/list_books.tpl b/templates/list_books.tpl index 00fe866..2874d80 100644 --- a/templates/list_books.tpl +++ b/templates/list_books.tpl @@ -24,15 +24,15 @@ </td> <td class="actionicon"> {if ($channels[ix].creator_user_id == $gBitUser->mUserId) || $gBitUser->hasPermission( 'p_wiki_admin_book' )} - <a href="{$smarty.const.WIKI_PKG_URL}edit_book.php?structure_id={$channels[ix].structure_id}">{booticon iname="icon-cogs" ipackage="icons" iexplain="edit book"}</a> + <a href="{$smarty.const.WIKI_PKG_URL}edit_book.php?structure_id={$channels[ix].structure_id}">{booticon iname="fa-gears" iexplain="edit book"}</a> {/if} {if $gBitUser->isAdmin()} {if $gBitSystem->isPackageActive( 'nexus' )} - <a href="{$smarty.const.NEXUS_PKG_URL}menus.php?structure_id={$channels[ix].structure_id}&action=convert_structure">{booticon iname="icon-sitemap" ipackage="icons" iexplain="create menu from structure"}</a> + <a href="{$smarty.const.NEXUS_PKG_URL}menus.php?structure_id={$channels[ix].structure_id}&action=convert_structure">{booticon iname="fa-sitemap" iexplain="create menu from structure"}</a> {/if} {/if} {if ($channels[ix].creator_user_id == $gBitUser->mUserId) || $gBitUser->hasPermission( 'p_wiki_admin_book' )} - <a href="{$smarty.const.WIKI_PKG_URL}edit_book.php?action=remove&structure_id={$channels[ix].structure_id}&tk={$gBitUser->mTicket}">{booticon iname="icon-trash" ipackage="icons" iexplain="remove"}</a> + <a href="{$smarty.const.WIKI_PKG_URL}edit_book.php?action=remove&structure_id={$channels[ix].structure_id}&tk={$gBitUser->mTicket}">{booticon iname="fa-trash" iexplain="remove"}</a> {/if} </td> </tr> diff --git a/templates/list_pages.tpl b/templates/list_pages.tpl index dca741d..a599188 100644 --- a/templates/list_pages.tpl +++ b/templates/list_pages.tpl @@ -6,7 +6,7 @@ <div class="floaticon"> {form class="form-inline" } <input type="hidden" name="sort_mode" value="{$sort_mode}" /> - {booticon iname="icon-search" ipackage="icons" iexplain="Search"} + {booticon iname="fa-magnifying-glass" iexplain="Search"} <label>{tr}Title{/tr}: <input class="input-small" type="text" name="find_title" value="{$find_title|default:$smarty.request.find_title|escape}" /></label> <label>{tr}Author{/tr}: <input class="input-small" type="text" name="find_author" value="{$find_author|default:$smarty.request.find_author|escape}" /></label> <label>{tr}Last Editor{/tr}: <input class="input-small" type="text" name="find_last_editor" value="{$find_last_editor|default:$smarty.request.find_last_editor|escape}" /></label> <input type="submit" class="btn btn-xs" name="search" value="{tr}Find{/tr}" /> {/form} </div> @@ -21,7 +21,7 @@ {form id="checkform"} <ul class="list-inline navbar"> - <li>{booticon iname="icon-circle-arrow-right" ipackage="icons" iexplain="sort by"}</li> + <li>{booticon iname="fa-circle-arrow-right" iexplain="sort by"}</li> {if $gBitSystem->isFeatureActive( 'wiki_list_name' )} <li>{smartlink ititle="Page Name" isort="title" icontrol=$listInfo}</li> {/if} @@ -168,9 +168,9 @@ {if $gBitSystem->isFeatureActive( 'wiki_list_status' )} <td style="text-align:center;"> {if $listpages[changes].flag eq 'locked'} - {booticon iname="icon-lock" ipackage="icons" iexplain="locked"} + {booticon iname="fa-lock" iexplain="locked"} {else} - {booticon ipackage="icons" iname="icon-asterisk" iexplain="unlocked"} + {booticon iname="fa-asterisk" iexplain="unlocked"} {/if} </td> {/if} @@ -199,7 +199,7 @@ {/if} {if $gBitUser->hasPermission( 'p_wiki_update_page' )} <td class="actionicon"> - <a href="{$smarty.const.WIKI_PKG_URL}edit.php?page_id={$listpages[changes].page_id}">{booticon iname="icon-edit" ipackage="icons" iexplain="edit"}</a> + <a href="{$smarty.const.WIKI_PKG_URL}edit.php?page_id={$listpages[changes].page_id}">{booticon iname="fa-pen-to-square" iexplain="edit"}</a> {if $checkboxes_on eq 'y'} <input type="checkbox" name="checked[]" value="{$listpages[changes].page_id}" /> {/if} </td> {/if} @@ -213,7 +213,7 @@ {if $checkboxes_on eq 'y'} <div style="text-align:right;"> - <script type="text/javascript">/* <![CDATA[ check / uncheck all */ + <script>/* <![CDATA[ check / uncheck all */ document.write("<label for=\"switcher\">{tr}Select All{/tr} <input name=\"switcher\" id=\"switcher\" type=\"checkbox\" onclick=\"BitBase.switchCheckboxes(this.form.id,'checked[]','switcher')\" /></label>"); /* ]]> */</script> <br /> diff --git a/templates/menu_wiki.tpl b/templates/menu_wiki.tpl index 3d13629..42e8f5c 100644 --- a/templates/menu_wiki.tpl +++ b/templates/menu_wiki.tpl @@ -2,31 +2,31 @@ {if $packageMenuTitle}<a class="dropdown-toggle" data-toggle="dropdown" href="#"> {tr}{$packageMenuTitle}{/tr} <b class="caret"></b></a>{/if} <ul class="{$packageMenuClass}"> {if $gBitUser->hasPermission( 'p_wiki_view_page' )} - <li><a class="item" href="{$smarty.const.WIKI_PKG_URL}index.php">{booticon iname="icon-home" iexplain="`$smarty.const.WIKI_PKG_DIR` Home" ilocation=menu}</a></li> + <li><a class="item" href="{$smarty.const.WIKI_PKG_URL}index.php">{booticon iname="fa-house" iexplain="`$smarty.const.WIKI_PKG_DIR` Home" ilocation=menu}</a></li> {/if} {if $gBitUser->hasPermission( 'p_wiki_list_pages' )} - <li><a class="item" href="{$smarty.const.WIKI_PKG_URL}list_pages.php">{booticon iname="icon-list" iexplain="List Pages" ilocation=menu}</a></li> + <li><a class="item" href="{$smarty.const.WIKI_PKG_URL}list_pages.php">{booticon iname="fa-list-ul" iexplain="List Pages" ilocation=menu}</a></li> {/if} {if $gBitUser->hasPermission( 'p_wiki_create_page' )} - <li><a class="item" href="{$smarty.const.WIKI_PKG_URL}edit.php">{booticon iname="icon-file" iexplain="Create Page" ilocation=menu}</a></li> + <li><a class="item" href="{$smarty.const.WIKI_PKG_URL}edit.php">{booticon iname="fa-file" iexplain="Create Page" ilocation=menu}</a></li> {/if} {if $gBitUser->hasPermission( 'p_wiki_view_page' ) and $gBitSystem->isFeatureActive( 'wiki_books' )} - <li><a class="item" href="{$smarty.const.WIKI_PKG_URL}books.php">{booticon iname="icon-book" iexplain="`$smarty.const.WIKI_PKG_DIR` Books" ilocation=menu}</a></li> + <li><a class="item" href="{$smarty.const.WIKI_PKG_URL}books.php">{booticon iname="fa-book" iexplain="`$smarty.const.WIKI_PKG_DIR` Books" ilocation=menu}</a></li> {/if} {if $gBitSystem->isFeatureActive( 'wiki_books' ) && $gBitUser->hasPermission( 'p_wiki_create_book' )} - <li><a class="item" href="{$smarty.const.WIKI_PKG_URL}edit_book.php">{booticon iname="icon-copy" iexplain="Create Book" ilocation=menu}</a></li> + <li><a class="item" href="{$smarty.const.WIKI_PKG_URL}edit_book.php">{booticon iname="fa-files" iexplain="Create Book" ilocation=menu}</a></li> {/if} {if $gBitSystem->isFeatureActive( 'wiki_list_orphans' ) and $gBitUser->hasPermission( 'p_wiki_view_page' )} - <li><a class="item" href="{$smarty.const.WIKI_PKG_URL}orphan_pages.php">{booticon iname="icon-search" iexplain="Orphan Pages" ilocation=menu}</a></li> + <li><a class="item" href="{$smarty.const.WIKI_PKG_URL}orphan_pages.php">{booticon iname="fa-magnifying-glass" iexplain="Orphan Pages" ilocation=menu}</a></li> {/if} {if $gBitSystem->isFeatureActive( 'wiki_multiprint' ) and $gBitUser->hasPermission( 'p_wiki_view_page' )} - <li><a class="item" href="{$smarty.const.WIKI_PKG_URL}print_pages.php">{booticon iname="icon-print" iexplain="Print" ilocation=menu}</a></li> + <li><a class="item" href="{$smarty.const.WIKI_PKG_URL}print_pages.php">{booticon iname="fa-print" iexplain="Print" ilocation=menu}</a></li> {/if} {if $gBitUser->hasPermission( 'p_wiki_list_pages' )} - <li><a class="item" href="{$smarty.const.WIKI_PKG_URL}rankings.php">{booticon iname="icon-list" iexplain="`$smarty.const.WIKI_PKG_DIR` Rankings" ilocation=menu}</a></li> + <li><a class="item" href="{$smarty.const.WIKI_PKG_URL}rankings.php">{booticon iname="fa-list-ul" iexplain="`$smarty.const.WIKI_PKG_DIR` Rankings" ilocation=menu}</a></li> {/if} {if $gBitSystem->isPackageActive( 'rss' )} - <li><a title="{tr}Wiki Update RSS Feed{/tr}" href="{$smarty.const.RSS_PKG_URL}index.php?pkg=wiki">{booticon iname="icon-rss" ipackage=rss iexplain="Changes Feed" ilocation=menu}</a></li> + <li><a title="{tr}Wiki Update RSS Feed{/tr}" href="{$smarty.const.RSS_PKG_URL}index.php?pkg=wiki">{booticon iname="fa-rss" ipackage=rss iexplain="Changes Feed" ilocation=menu}</a></li> {/if} </ul> {/strip} diff --git a/templates/page_icons.tpl b/templates/page_icons.tpl index 67a3ae1..61f468e 100644 --- a/templates/page_icons.tpl +++ b/templates/page_icons.tpl @@ -4,23 +4,23 @@ {include file="bitpackage:liberty/services_inc.tpl" serviceLocation='icon' serviceHash=$gContent->mInfo} {if $gBitSystem->isFeatureActive( 'wiki_like_pages' )} - <a href="{$smarty.const.WIKI_PKG_URL}like_pages.php?page_id={$gContent->mInfo.page_id}">{booticon iname="icon-copy" ipackage="icons" iexplain="Similar Pages"}</a> + <a href="{$smarty.const.WIKI_PKG_URL}like_pages.php?page_id={$gContent->mInfo.page_id}">{booticon iname="fa-files" iexplain="Similar Pages"}</a> {/if} {if $gContent->isLocked()} {if $gContent->hasAdminPermission() or ($gContent->isOwner() and $gContent->hasUserPermission( 'p_wiki_lock_page' ) and $gBitSystem->isFeatureActive( 'wiki_usrlock' ))} - <a href="{$smarty.const.WIKI_PKG_URL}index.php?page_id={$gContent->mInfo.page_id}&action=unlock">{booticon iname="icon-lock" ipackage="icons" iexplain="Unlock this page"}</a> + <a href="{$smarty.const.WIKI_PKG_URL}index.php?page_id={$gContent->mInfo.page_id}&action=unlock">{booticon iname="fa-lock" iexplain="Unlock this page"}</a> {else} - {booticon iname="icon-lock" ipackage="icons" iexplain="Locked"} + {booticon iname="fa-lock" iexplain="Locked"} {/if} {else} {assign var=format_guid value=$gContent->mInfo.format_guid} {if $gLibertySystem->mPlugins.$format_guid.is_active eq 'y' or $gContent->hasAdminPermission()} {if $gContent->hasUpdatePermission()} {if $gContent->hasAdminPermission() or ($gContent->isOwner() and $gContent->hasUserPermission( 'p_wiki_lock_page' ) and $gBitSystem->isFeatureActive( 'wiki_usrlock' ))} - <a href="{$smarty.const.WIKI_PKG_URL}index.php?page_id={$gContent->mInfo.page_id}&action=lock">{booticon iname="icon-unlock" ipackage="icons" iexplain="Lock this page"}</a> + <a href="{$smarty.const.WIKI_PKG_URL}index.php?page_id={$gContent->mInfo.page_id}&action=lock">{booticon iname="fa-unlock" iexplain="Lock this page"}</a> {/if} - <a href="{$smarty.const.WIKI_PKG_URL}edit.php?page_id={$gContent->mInfo.page_id}">{booticon iname="icon-edit" ipackage="icons" iexplain="Edit"}</a> + <a href="{$smarty.const.WIKI_PKG_URL}edit.php?page_id={$gContent->mInfo.page_id}">{booticon iname="fa-pen-to-square" iexplain="Edit"}</a> {/if} {/if} @@ -29,45 +29,45 @@ {/if} {if $gBitSystem->isFeatureActive( 'wiki_history' ) and $gContent->hasUserPermission('p_wiki_view_history')} - <a href="{$smarty.const.WIKI_PKG_URL}page_history.php?page_id={$gContent->mInfo.page_id}" rel="nofollow">{booticon iname="icon-time" ipackage="icons" iexplain=History}</a> + <a href="{$smarty.const.WIKI_PKG_URL}page_history.php?page_id={$gContent->mInfo.page_id}" rel="nofollow">{booticon iname="fa-clock" iexplain=History}</a> {/if} {/if} {if ($structureInfo.structure_id) && ($gStructure->mInfo.creator_user_id == $gBitUser->mUserId || $gContent->hasUserPermission( 'p_wiki_admin_book' ))} - <a href="{$smarty.const.WIKI_PKG_URL}edit_book.php?structure_id={$structureInfo.structure_id}">{booticon iname="icon-cogs" ipackage="icons" iexplain="Edit book"}</a> + <a href="{$smarty.const.WIKI_PKG_URL}edit_book.php?structure_id={$structureInfo.structure_id}">{booticon iname="fa-gears" iexplain="Edit book"}</a> {elseif is_a($gContent,'BitBook') && $gContent->hasUpdatePermission()} - <a href="{$smarty.const.WIKI_PKG_URL}edit_book.php?content_id={$gContent->mContentId}">{booticon iname="icon-cogs" ipackage="icons" iexplain="Edit book"}</a> + <a href="{$smarty.const.WIKI_PKG_URL}edit_book.php?content_id={$gContent->mContentId}">{booticon iname="fa-gears" iexplain="Edit book"}</a> {/if} {if $gBitUser->isRegistered() and $gBitUser->mUserId && $gBitSystem->isFeatureActive( 'users_watches' ) } {if $user_watching_page eq 'y'} - <a title="{tr}stop monitoring this page{/tr}" href="{$smarty.const.WIKI_PKG_URL}index.php?page_id={$gContent->mInfo.page_id}&watch_event=wiki_page_changed&watch_object={$gContent->mInfo.page_id}&watch_action=remove">{booticon ipackage="icons" iname="icon-eye-close" iexplain="Stop monitoring"}</a> + <a title="{tr}stop monitoring this page{/tr}" href="{$smarty.const.WIKI_PKG_URL}index.php?page_id={$gContent->mInfo.page_id}&watch_event=wiki_page_changed&watch_object={$gContent->mInfo.page_id}&watch_action=remove">{booticon iname="fa-eye-slash" iexplain="Stop monitoring"}</a> {else} - <a title="{tr}monitor this page{/tr}" href="{$smarty.const.WIKI_PKG_URL}index.php?page_id={$gContent->mInfo.page_id}&watch_event=wiki_page_changed&watch_object={$gContent->mInfo.page_id}&watch_action=add">{booticon iname="icon-eye" ipackage="icons" iexplain="Monitor"}</a> + <a title="{tr}monitor this page{/tr}" href="{$smarty.const.WIKI_PKG_URL}index.php?page_id={$gContent->mInfo.page_id}&watch_event=wiki_page_changed&watch_object={$gContent->mInfo.page_id}&watch_action=add">{booticon iname="fa-eye" iexplain="Monitor"}</a> {/if} {/if} {if $gBitSystem->isFeatureActive( 'users_watches' ) and $gContent->hasUserPermission('p_users_admin')} - <a href="{$smarty.const.WIKI_PKG_URL}page_watches.php?page_id={$gContent->mInfo.page_id}">{booticon ipackage="icons" iname="icon-user" iexplain="Watches"}</a> + <a href="{$smarty.const.WIKI_PKG_URL}page_watches.php?page_id={$gContent->mInfo.page_id}">{booticon iname="fa-user" iexplain="Watches"}</a> {/if} {* seem to be broken {if $gBitUser->hasPermission( 'p_wiki_admin' )} - <li><a href="{$smarty.const.WIKI_PKG_URL}export_wiki_pages.php?page_id={$gContent->mInfo.page_id}">{booticon iname="icon-arrow-up" ipackage="icons" iexplain="Export"}</a></li> + <li><a href="{$smarty.const.WIKI_PKG_URL}export_wiki_pages.php?page_id={$gContent->mInfo.page_id}">{booticon iname="fa-arrow-up" iexplain="Export"}</a></li> {/if} *} {if $gBitSystem->isFeatureActive( 'wiki_uses_slides' )} {if $show_slideshow eq 'y'} - <a href="{$smarty.const.WIKI_PKG_URL}slideshow.php?page_id={$gContent->mInfo.page_id}">{booticon ipackage="icons" iname="icon-facetime-video" iexplain="Slideshow"}</a> + <a href="{$smarty.const.WIKI_PKG_URL}slideshow.php?page_id={$gContent->mInfo.page_id}">{booticon iname="fa-video" iexplain="Slideshow"}</a> {elseif $structure eq 'y'} - <a href="{$smarty.const.WIKI_PKG_URL}slideshow2.php?structure_id={$page_info.structure_id}">{booticon ipackage="icons" iname="icon-facetime-video" iexplain="Slideshow"}</a> + <a href="{$smarty.const.WIKI_PKG_URL}slideshow2.php?structure_id={$page_info.structure_id}">{booticon iname="fa-video" iexplain="Slideshow"}</a> {/if} {/if} {if $gContent->mInfo.title ne 'SandBox' && !$gContent->isLocked()} {if $gContent->isOwner() || $gContent->hasUserPermission( 'p_wiki_remove_page' )} - <a title="{tr}Remove this page{/tr}" href="{$smarty.const.WIKI_PKG_URL}remove_page.php?page_id={$gContent->mInfo.page_id}&version=last">{booticon iname="icon-trash" ipackage="icons" iexplain="Delete"}</a> + <a title="{tr}Remove this page{/tr}" href="{$smarty.const.WIKI_PKG_URL}remove_page.php?page_id={$gContent->mInfo.page_id}&version=last">{booticon iname="fa-trash" iexplain="Delete"}</a> {/if} {/if} diff --git a/templates/page_permissions.tpl b/templates/page_permissions.tpl index 58d6550..337e8d0 100644 --- a/templates/page_permissions.tpl +++ b/templates/page_permissions.tpl @@ -28,7 +28,7 @@ <h2>{tr}Existing requests for email notification{/tr}</h2> <ul> {section name=ix loop=$emails} - <li>{$emails[ix]} <a href="{$smarty.const.WIKI_PKG_URL}page_permissions.php?page_id={$gContent->mInfo.page_id}&removeemail={$emails[ix]}&tab=email">{booticon iname="icon-trash" ipackage="icons" iexplain="delete"}</a></li> + <li>{$emails[ix]} <a href="{$smarty.const.WIKI_PKG_URL}page_permissions.php?page_id={$gContent->mInfo.page_id}&removeemail={$emails[ix]}&tab=email">{booticon iname="fa-trash" iexplain="delete"}</a></li> {/section} </ul> {/if} diff --git a/templates/print.tpl b/templates/print.tpl index 437ca37..235f09e 100644 --- a/templates/print.tpl +++ b/templates/print.tpl @@ -5,7 +5,7 @@ <div class="display wiki"> <div class="floaticon"> <!-- Actions --> {if $gContent->hasUpdatePermission()} - <a href="{$smarty.const.WIKI_PKG_URL}edit.php?page_id={$gContent->mInfo.page_id}">{booticon iname="icon-edit" ipackage="icons" iexplain="edit"}</a> + <a href="{$smarty.const.WIKI_PKG_URL}edit.php?page_id={$gContent->mInfo.page_id}">{booticon iname="fa-pen-to-square" iexplain="edit"}</a> {/if} {if $gBitSystem->isPackageActive( 'pdf' ) && $gContent->hasUserPermission( 'p_pdf_generation' )} <a title="{tr}create PDF{/tr}" href="{$smarty.const.PDF_PKG_URL}?page_id={$gContent->mInfo.page_id}">{biticon ipackage="pdf" iname="pdf" iexplain="PDF"}</a> |