From c5ec471e03780c106cb72ff487a4f79daed36c35 Mon Sep 17 00:00:00 2001 From: lsces Date: Tue, 3 Jun 2014 22:57:39 +0100 Subject: Sync with BS3 master --- .hgignore | 2 + edit.php | 1 + templates/admin_external_wikis.tpl | 2 +- templates/admin_wiki.tpl | 42 ++--- templates/books.tpl | 2 +- templates/copyrights.tpl | 16 +- templates/create_book.tpl | 6 +- templates/create_webhelp.tpl | 2 +- templates/edit_page.tpl | 37 ++-- templates/import_phpwiki.tpl | 2 +- templates/list_pages.tpl | 375 ++++++++++++++++++------------------- templates/page_action_bar.tpl | 2 +- templates/page_history.tpl | 2 +- templates/page_icons.tpl | 15 +- templates/page_permissions.tpl | 4 +- templates/print_pages.tpl | 14 +- templates/remove_page.tpl | 8 +- templates/rename_page.tpl | 2 +- templates/rollback.tpl | 2 +- 19 files changed, 268 insertions(+), 268 deletions(-) create mode 100644 .hgignore diff --git a/.hgignore b/.hgignore new file mode 100644 index 0000000..cf2195b --- /dev/null +++ b/.hgignore @@ -0,0 +1,2 @@ +syntax: glob +apply.php diff --git a/edit.php b/edit.php index 532bd88..9e59156 100644 --- a/edit.php +++ b/edit.php @@ -47,6 +47,7 @@ if( $gContent->isLocked() ) { $gBitSystem->fatalError( 'Cannot edit page because it is locked' ); } + $gContent->invokeServices( 'content_edit_function' ); if( !empty( $gContent->mInfo ) ) { diff --git a/templates/admin_external_wikis.tpl b/templates/admin_external_wikis.tpl index e65204f..1d011b3 100644 --- a/templates/admin_external_wikis.tpl +++ b/templates/admin_external_wikis.tpl @@ -13,7 +13,7 @@ - +
{tr}name{/tr}:
{tr}URL (use $page to be replaced by the page name in the URL example: http://www.example.com/{$smarty.const.WIKI_PKG_URL}index.php?page=$page){/tr}:
diff --git a/templates/admin_wiki.tpl b/templates/admin_wiki.tpl index 91ef1f3..a4c7f79 100644 --- a/templates/admin_wiki.tpl +++ b/templates/admin_wiki.tpl @@ -6,7 +6,7 @@ {foreach from=$formWikiFeatures key=item item=output} -
+
{formlabel label=$output.label for=$item} {forminput} {html_checkboxes name="$item" values="y" checked=$gBitSystem->getConfig($item) labels=false id=$item} @@ -15,7 +15,7 @@
{/foreach} -
+
{formlabel label="Edit Page Sections" for="wiki_section_edit"} {forminput} @@ -39,7 +39,7 @@
- +
{/form} {/jstab} @@ -49,7 +49,7 @@ {foreach from=$formWikiBooks key=item item=output} -
+
{formlabel label=$output.label for=$item} {forminput} {html_checkboxes name="$item" values="y" checked=$gBitSystem->getConfig($item) labels=false id=$item} @@ -58,7 +58,7 @@
{/foreach}
- +
{/form} {/jstab} @@ -68,7 +68,7 @@ {foreach from=$formWikiInOut key=item item=output} -
+
{formlabel label=$output.label for=$item} {forminput} {html_checkboxes name="$item" values="y" checked=$gBitSystem->getConfig($item) labels=false id=$item} @@ -77,7 +77,7 @@
{/foreach}
- +
{/form} {/jstab} @@ -87,7 +87,7 @@ {foreach from=$formWikiLists key=item item=output} -
+
{formlabel label=$output.label for=$item} {forminput} {html_checkboxes name="$item" values="y" checked=$gBitSystem->getConfig($item) labels=false id=$item} @@ -97,7 +97,7 @@ {/foreach}
- +
{/form} {/jstab} @@ -106,7 +106,7 @@ {form} {legend legend="Wiki Home Page"} -
+
{formlabel label="Disable Wiki Home Page" for="wiki_disable_auto_home"} {forminput} {html_checkboxes name="wiki_disable_auto_home" values="y" checked=$gBitSystem->getConfig('wiki_disable_auto_home') labels=false id="wiki_disabled_auto_home"} @@ -114,7 +114,7 @@ {/forminput}
-
+
{formlabel label="Wiki Home Page" for="wiki_home_page"} {forminput} @@ -123,12 +123,12 @@
- +
{/legend} {legend legend="Wiki Link Format"} -
+
{formlabel label="Wiki Link Format" for="wiki_page_regex"} {forminput} +
{/legend} {legend legend="Copyright Management"} -
+
{formlabel label="Enable Feature" for="wiki_copyrights"} {forminput} {html_checkboxes name="wiki_copyrights" values="y" checked=$gBitSystem->getConfig('wiki_copyrights') labels=false id="wiki_copyrights"} {/forminput}
-
+
{formlabel label="License Page" for="wiki_license_page"} {forminput} {/forminput}
-
+
{formlabel label="Submit Notice" for="wiki_submit_notice"} {forminput} @@ -173,7 +173,7 @@
- +
{/legend} @@ -181,7 +181,7 @@ {formfeedback warning="This feature has been disabled for now since it's not functional."} {foreach from=$formWikiWatch key=item item=output} -
+
{formlabel label=$output.label for=$item} {forminput} {html_checkboxes name="$item" values="y" checked=$gBitSystem->getConfig($item) labels=false id=$item} @@ -191,7 +191,7 @@ {/foreach}
- +
{/legend} {/form} diff --git a/templates/books.tpl b/templates/books.tpl index ff30b11..b29ddb3 100755 --- a/templates/books.tpl +++ b/templates/books.tpl @@ -1,6 +1,6 @@ {strip} {if count($showstructs) ne 0} -
+
{formlabel label="Structures"} {forminput} {tr}show books{/tr} diff --git a/templates/copyrights.tpl b/templates/copyrights.tpl index cb8bdff..da868f5 100644 --- a/templates/copyrights.tpl +++ b/templates/copyrights.tpl @@ -7,7 +7,7 @@ {legend legend="Copyright settings"} {section name=i loop=$copyrights} {form} -
+
{formlabel label="Title" for="copyleft-title"} {forminput} @@ -15,7 +15,7 @@ {/forminput}
-
+
{formlabel label="Authors" for="copyleft-authors"} {forminput} @@ -23,7 +23,7 @@ {/forminput}
-
+
{formlabel label="Year" for="copyleft-year"} {forminput} @@ -34,7 +34,7 @@
- + {booticon iname="icon-cloud-upload" ipackage="icons" iexplain="move up"} {booticon iname="icon-cloud-download" ipackage="icons" iexplain="move down"} -
+
{formlabel label="Title" for="copyleft-tit"} {forminput} @@ -54,7 +54,7 @@ {/forminput}
-
+
{formlabel label="Authors" for="copyleft-aut"} {forminput} @@ -62,7 +62,7 @@ {/forminput}
-
+
{formlabel label="Year" for="copyleft-yyyy"} {forminput} @@ -71,7 +71,7 @@
- +
{/form}
diff --git a/templates/create_book.tpl b/templates/create_book.tpl index 54de8b5..b360693 100644 --- a/templates/create_book.tpl +++ b/templates/create_book.tpl @@ -8,7 +8,7 @@
{form legend="Create new Wiki Book"} -
+
{formfeedback error=$errors.title} {formlabel label="Book Title" for="name"} {forminput} @@ -17,7 +17,7 @@ {/forminput}
-
+
{formlabel label="Table of Contents
(optional)" for="chapters"} {forminput} @@ -26,7 +26,7 @@
- +
{/form}
diff --git a/templates/create_webhelp.tpl b/templates/create_webhelp.tpl index c5c801f..9b5ad5a 100755 --- a/templates/create_webhelp.tpl +++ b/templates/create_webhelp.tpl @@ -24,7 +24,7 @@ Here you can generate static HTML files from Wiki Book. - + diff --git a/templates/edit_page.tpl b/templates/edit_page.tpl index 32b269e..7380608 100644 --- a/templates/edit_page.tpl +++ b/templates/edit_page.tpl @@ -57,14 +57,14 @@
{tr}The SandBox is a page where you can practice your editing skills, use the preview feature to preview the appeareance of the page, no versions are stored for this page.{/tr}
{/if} - {form class="ink-form column-group gutters" enctype="multipart/form-data" id="editpageform"} + {form class="form-horizontal" enctype="multipart/form-data" id="editpageform"} {jstabs} {jstab title="Body"} {legend legend="`$editLabel` Body"} -
+
{formfeedback warning=$errors.title} {formlabel label="$conDescr Title"} {forminput} @@ -77,7 +77,7 @@
{if $gBitSystem->isFeatureActive( 'wiki_description' )} -
+
{formlabel label="Summary" for="summary"} {forminput} @@ -93,7 +93,7 @@ {textarea edit=$pageInfo.data} {if $footnote} -
+
{formlabel label="Footnotes" for="footnote"} {forminput} @@ -103,7 +103,7 @@ {/if} {if $page ne 'SandBox'} -
+
{formlabel label="Comment" for="edit_comment"} {forminput} @@ -113,8 +113,7 @@ {/if} {if $gBitUser->hasPermission( 'p_wiki_save_minor' )} -
- {formlabel label="" for="isminor"} +
{forminput}
+
{legend legend="Copyright Settings" for="copyrightTitle"} -
+
{formlabel label="Title" for="copyrightTitle"} {forminput} {/forminput}
-
+
{formlabel label="Authors" for="copyrightAuthors"} {forminput} {/forminput}
-
+
{formlabel label="Year" for="copyrightYear"} {forminput} {/forminput}
-
+
{formlabel label="License"} {forminput} {tr}{$wiki_license_page}{/tr} @@ -178,7 +177,7 @@
{if $wiki_submit_notice neq ""} -
+
{formlabel label="Important"} {forminput} {$wiki_submit_notice} @@ -194,7 +193,7 @@ {if $gBitSystem->isFeatureActive( 'wiki_url_import' )} {jstab title="Import HMTL"} {legend legend="Import HMTL"} -
+
{formlabel label="Import HTML from URL" for="suck_url"} {forminput} @@ -202,7 +201,7 @@ {/forminput}
-
+
{forminput}
+
+ {form class="form-inline" } + + {booticon iname="icon-search" ipackage="icons" iexplain="Search"} + + {/form} +

{tr}{$gBitSystem->getBrowserTitle()}{/tr}

-
-
- {form class="form-inline push-right" } - - {booticon iname="icon-search" ipackage="icons" iexplain="Search"} - - {/form} -
+ {pagination} {formfeedback error=$errors} -
+
{form id="checkform"} -
-
- {pagination}
{/strip} diff --git a/templates/page_action_bar.tpl b/templates/page_action_bar.tpl index f716969..dfb7fd9 100644 --- a/templates/page_action_bar.tpl +++ b/templates/page_action_bar.tpl @@ -47,7 +47,7 @@ {/if} {/strip}{/capture} {if $smarty.capture.navbarlist ne ''} -
    +
      {$smarty.capture.navbarlist}
    {/if} diff --git a/templates/page_history.tpl b/templates/page_history.tpl index 44b47ec..1eee68a 100644 --- a/templates/page_history.tpl +++ b/templates/page_history.tpl @@ -109,7 +109,7 @@ {if $gBitUser->hasPermission( 'p_wiki_remove_page' )}
    - +
    {/if} {/form} diff --git a/templates/page_icons.tpl b/templates/page_icons.tpl index 24c5704..cd49496 100644 --- a/templates/page_icons.tpl +++ b/templates/page_icons.tpl @@ -34,9 +34,9 @@ {/if} {if ($structureInfo.structure_id) && ($gStructure->mInfo.creator_user_id == $gBitUser->mUserId || $gContent->hasUserPermission( 'p_wiki_admin_book' ))} - {booticon iname="icon-book" ipackage="icons" iexplain="Edit book"} + {booticon iname="icon-cogs" ipackage="icons" iexplain="Edit book"} {elseif is_a($gContent,'BitBook') && $gContent->hasUpdatePermission()} - {booticon iname="icon-book-edit" ipackage="icons" iexplain="Edit book"} + {booticon iname="icon-cogs" ipackage="icons" iexplain="Edit book"} {/if} {if $gBitUser->isRegistered() and $gBitUser->mUserId && $gBitSystem->isFeatureActive( 'users_watches' ) } @@ -72,14 +72,17 @@ {/if} {if $gBitSystem->isFeatureActive( 'wiki_backlinks' ) and $backlinks} -
    - -
    {/if} {if count($showstructs) gt 0} diff --git a/templates/page_permissions.tpl b/templates/page_permissions.tpl index 69854a6..c31234d 100644 --- a/templates/page_permissions.tpl +++ b/templates/page_permissions.tpl @@ -11,7 +11,7 @@ -
    +
    {formlabel label="Email"} {forminput} @@ -20,7 +20,7 @@
    - +
    {/form} diff --git a/templates/print_pages.tpl b/templates/print_pages.tpl index bb1adf7..245ca4f 100644 --- a/templates/print_pages.tpl +++ b/templates/print_pages.tpl @@ -9,7 +9,7 @@ -
    +
    {formlabel label="Wiki Pages" for="pages"} {forminput} -   +   {formhelp note="To find specific pages more easily, you can apply a filter here."} {/forminput}
    - -   + +  
    {/form} {form legend="Selected Wiki Pages" ipackage="wiki" ifile="print_multi_pages.php"} -
    +
      {section name=ix loop=$printpages}
    • {$printpages[ix]}
      • @@ -48,7 +48,7 @@
    - +
    {/form}
    diff --git a/templates/remove_page.tpl b/templates/remove_page.tpl index a973f2b..762a5d1 100644 --- a/templates/remove_page.tpl +++ b/templates/remove_page.tpl @@ -12,21 +12,21 @@ {formfeedback warning="These actions are permanent and cannot be undone"} -
    +
    {formlabel label="Page to remove"} {forminput} {$page} {/forminput}
    -
    +
    {formlabel label="Version"} {forminput} {$version} {/forminput}
    -
    +
    {formlabel label="Remove all versions" for="all"} {forminput} @@ -34,7 +34,7 @@
    - +
    {/form}
    diff --git a/templates/rename_page.tpl b/templates/rename_page.tpl index 7aa7525..2a42102 100644 --- a/templates/rename_page.tpl +++ b/templates/rename_page.tpl @@ -11,7 +11,7 @@ {tr}New name{/tr}: - + diff --git a/templates/rollback.tpl b/templates/rollback.tpl index ca51e66..6bd8f6e 100644 --- a/templates/rollback.tpl +++ b/templates/rollback.tpl @@ -4,6 +4,6 @@
    - +
    -- cgit v1.3