Hi Nyloth!
+1 to these enhancements. (And to all your work!)
However, can we have a preference (in addition to current perm check) to
"change the wiki authors style for each page". On some of my sites, I will
use. However, on others, I won't and this will just add an unneeded box for
my editors.
Thanks!
--
M ;-)
//////////////////////////////////////////////////////////////////////
/ /
/ Marc Laporte <|>
http://marclaporte.com /
/ Avantech.net <|>
http://avantech.net /
/ TikiWiki CMS/Groupware <|>
http://tikiwiki.org/UserPagemarclaporte /
/ /
//////////////////////////////////////////////////////////////////////
-----Original Message-----
From:
nyloth@... [mailto:
nyloth@...]
Sent: June 30, 2008 10:23 AM
To:
tikiwiki-cvs@...
Subject: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki: [13390] branches/1.10
Revision: 13390
http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=13390&view=revAuthor: nyloth
Date: 2008-06-30 07:22:48 -0700 (Mon, 30 Jun 2008)
Log Message:
-----------
[NEW] wiki pages:
* allow users that have tiki_p_admin_wiki perm to change the wiki authors
style for each page,
* allow admins to choose the position of the bar of actions buttons (save,
cancel, preview...) : top (above textarea), bottom, both + factorize code of
buttons for preview mode and for normal edit mode,
* add a feature 'Save Draft' in wiki admin page, to be able to hide the
'Save Draft' button when editing a wiki page,
* display a message ($date - Version $num of this page has been saved by
$user) after a page has been saved,
* css: by default, put wiki actions buttons on the right when they are
above textarea (position = top),
* in some places, use the new way of handling ':' chars at the end of
translated strings
Modified Paths:
--------------
branches/1.10/db/tiki.sql
branches/1.10/db/tiki_1.9to1.10.sql
branches/1.10/lib/setup/prefs.php
branches/1.10/lib/tikilib.php
branches/1.10/styles/tikineat.css
branches/1.10/styles/transitions/1.9to1.10.css
branches/1.10/templates/tiki-admin-include-wiki.tpl
branches/1.10/templates/tiki-editpage.tpl
branches/1.10/templates/tiki-show_page.tpl
branches/1.10/templates/wiki_edit_actions.tpl
branches/1.10/tiki-admin_include_wiki.php
branches/1.10/tiki-editpage.php
Added Paths:
-----------
branches/1.10/templates/wiki_authors_style.tpl
Modified: branches/1.10/db/tiki.sql
===================================================================
--- branches/1.10/db/tiki.sql 2008-06-30 14:05:25 UTC (rev 13389)
+++ branches/1.10/db/tiki.sql 2008-06-30 14:22:48 UTC (rev 13390)
@@ -2546,6 +2546,7 @@
is_html tinyint(1) default 0,
created int(14),
wysiwyg char(1) default NULL,
+ wiki_authors_style varchar(20) NOT NULL default '',
PRIMARY KEY (page_id),
UNIQUE KEY pageName (pageName),
KEY data (data(255)),
Modified: branches/1.10/db/tiki_1.9to1.10.sql
===================================================================
--- branches/1.10/db/tiki_1.9to1.10.sql 2008-06-30 14:05:25 UTC (rev 13389)
+++ branches/1.10/db/tiki_1.9to1.10.sql 2008-06-30 14:22:48 UTC (rev 13390)
@@ -1842,3 +1842,6 @@
#2008-06-26 pkdille
INSERT INTO tiki_menu_options
(menuId,type,name,url,position,section,perm,groupname) VALUES
(42,'o','Action
Log','tiki-admin_actionlog.php',1255,'feature_actionlog','tiki_p_view_action
log','');
INSERT INTO tiki_menu_options
(menuId,type,name,url,position,section,perm,groupname) VALUES
(42,'o','Action
Log','tiki-admin_actionlog.php',1255,'feature_actionlog','tiki_p_view_action
log_owngroups','');
+
+#2008-06-30 nyloth
+ALTER TABLE tiki_pages ADD wiki_authors_style varchar(20) NOT NULL
+default '';
Modified: branches/1.10/lib/setup/prefs.php
===================================================================
--- branches/1.10/lib/setup/prefs.php 2008-06-30 14:05:25 UTC (rev 13389)
+++ branches/1.10/lib/setup/prefs.php 2008-06-30 14:22:48 UTC (rev 13390)
@@ -98,6 +98,7 @@
$prefs['feature_wiki_userpage'] = 'y';
$prefs['feature_wiki_userpage_prefix'] = 'UserPage';
$prefs['feature_wiki_usrlock'] = 'n';
+ $prefs['feature_wiki_save_draft'] = 'y';
$prefs['feature_wikiwords'] = 'y';
$prefs['feature_wikiwords_usedash'] = 'y';
$prefs['mailin_autocheck'] = 'n';
@@ -143,6 +144,7 @@
$prefs['wiki_page_regex'] = 'strict';
$prefs['wiki_page_separator'] = '...page...';
$prefs['wiki_page_navigation_bar'] = 'bottom';
+ $prefs['wiki_actions_bar'] = 'bottom';
$prefs['wiki_pagename_strip'] = '';
$prefs['wiki_right_column'] = 'y';
$prefs['wiki_top_bar'] = 'y';
Modified: branches/1.10/lib/tikilib.php
===================================================================
--- branches/1.10/lib/tikilib.php 2008-06-30 14:05:25 UTC (rev 13389)
+++ branches/1.10/lib/tikilib.php 2008-06-30 14:22:48 UTC (rev 13390)
@@ -4637,7 +4637,7 @@
/** Create a wiki page
@param array $hash- lock_it,contributions, contributors
**/
- function create_page($name, $hits, $data, $lastModif, $comment, $user =
'admin', $ip = '0.0.0.0', $description = '', $lang='', $is_html = false,
$hash=null, $wysiwyg=NULL) {
+ function create_page($name, $hits, $data, $lastModif, $comment,
+ $user = 'admin', $ip = '0.0.0.0', $description = '', $lang='', $is_html =
false, $hash=null, $wysiwyg=NULL, $wiki_authors_style='') {
global $smarty, $prefs, $dbTiki, $quantifylib;
include_once ("lib/commentslib.php");
@@ -4670,7 +4670,7 @@
$edit_data = $purifier->purify($edit_data);
}
$mid = ''; $midvar = '';
- $bindvars = array($name, (int)$hits, $data, (int)$lastModif,
$comment, 1, $user, $ip, $description, $user, (int)strlen($data), $html,
$this->now, $wysiwyg);
+ $bindvars = array($name, (int)$hits, $data, (int)$lastModif,
$comment,
+1, $user, $ip, $description, $user, (int)strlen($data), $html, $this->now,
$wysiwyg, $wiki_authors_style);
if ($lang) {
$mid .= ',`lang`';
$midvar .= ',?';
@@ -4698,7 +4698,7 @@
$hash2[] = $hash3;
}
}
- $query = "insert into
`tiki_pages`(`pageName`,`hits`,`data`,`lastModif`,`comment`,`version`,`user`
,`ip`,`description`,`creator`,`page_size`,`is_html`,`created`, `wysiwyg`
$mid) values(?,?,?,?,?,?,?,?,?,?,?,?,?,? $midvar)";
+ $query = "insert into
+`tiki_pages`(`pageName`,`hits`,`data`,`lastModif`,`comment`,`version`,`user
`,`ip`,`description`,`creator`,`page_size`,`is_html`,`created`, `wysiwyg`,
`wiki_authors_style` $mid) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,? $midvar)";
$result = $this->query($query, $bindvars);
$page_id = $this->get_page_id_from_name( $name );
@@ -6951,7 +6951,7 @@
/** Update a wiki page
@param array $hash- lock_it,contributions, contributors
**/
- function update_page($pageName, $edit_data, $edit_comment, $edit_user,
$edit_ip, $description = '', $minor = false, $lang='', $is_html=false,
$hash=null, $saveLastModif=null, $wysiwyg='') {
+ function update_page($pageName, $edit_data, $edit_comment,
+ $edit_user, $edit_ip, $description = '', $minor = false, $lang='',
$is_html=false, $hash=null, $saveLastModif=null, $wysiwyg='',
$wiki_authors_style) {
global $smarty, $prefs, $dbTiki, $histlib, $quantifylib;
include_once ("lib/wiki/histlib.php");
include_once ("lib/commentslib.php");
@@ -7010,7 +7010,7 @@
$saveLastModif = $this->now;
}
- $bindvars = array($description,$edit_data,$edit_comment,(int)
$saveLastModif,$version,$edit_user,$edit_ip,(int)strlen($data),$html,$wysiwy
g);
+ $bindvars = array($description,$edit_data,$edit_comment,(int)
+$saveLastModif,$version,$edit_user,$edit_ip,(int)strlen($data),$html,$wysiw
yg, $wiki_authors_style);
if ($lang) {
$mid .= ', `lang`=? ';
$bindvars[] = $lang;
@@ -7036,7 +7036,7 @@
}
}
$bindvars[] = $pageName;
- $query = "update `tiki_pages` set `description`=?, `data`=?,
`comment`=?, `lastModif`=?, `version`=?, `user`=?, `ip`=?, `page_size`=?,
`is_html`=?, `wysiwyg`=? $mid where `pageName`=?";
+ $query = "update `tiki_pages` set `description`=?, `data`=?,
+`comment`=?, `lastModif`=?, `version`=?, `user`=?, `ip`=?, `page_size`=?,
`is_html`=?, `wysiwyg`=?, `wiki_authors_style`=? $mid where `pageName`=?";
$result = $this->query($query,$bindvars);
// Parse edit_data updating the list of links from this page
Modified: branches/1.10/styles/tikineat.css
===================================================================
--- branches/1.10/styles/tikineat.css 2008-06-30 14:05:25 UTC (rev 13389)
+++ branches/1.10/styles/tikineat.css 2008-06-30 14:22:48 UTC (rev 13390)
@@ -2138,4 +2138,8 @@
a.flipmodtitle:hover img {
border: 1px solid #999999 !important;
}
+.top_actions {
+ text-align: right;
+ margin-top: 5px;
+}
/* end of css file */
Modified: branches/1.10/styles/transitions/1.9to1.10.css
===================================================================
--- branches/1.10/styles/transitions/1.9to1.10.css 2008-06-30 14:05:25
UTC (rev 13389)
+++ branches/1.10/styles/transitions/1.9to1.10.css 2008-06-30 14:22:48
UTC (rev 13390)
@@ -407,3 +407,7 @@
.findtitle input {
margin-left: 2px;
}
+.top_actions {
+ text-align: right;
+ margin-top: 5px;
+}
Modified: branches/1.10/templates/tiki-admin-include-wiki.tpl
===================================================================
--- branches/1.10/templates/tiki-admin-include-wiki.tpl 2008-06-30 14:05:25
UTC (rev 13389)
+++ branches/1.10/templates/tiki-admin-include-wiki.tpl 2008-06-30 14:22:48
UTC (rev 13390)
@@ -21,7 +21,7 @@
<div class="heading">{tr}Create a Tag for the Current Wiki{/tr}</div>
<form action="tiki-admin.php?page=wiki" method="post">
- {tr}Tag name{/tr}: <input maxlength="20" size="10" type="text"
name="tagname"/>
+ {tr}Tag name:{/tr} <input maxlength="20" size="10" type="text"
+ name="tagname"/>
<input type="submit" name="createtag" value="{tr}Create{/tr}"/>
</form>
@@ -29,7 +29,7 @@
<div class="heading">{tr}Restore the Wiki{/tr}</div>
<form action="tiki-admin.php?page=wiki" method="post">
- {tr}Tag name{/tr}: <select name="tagname">
+ {tr}Tag name:{/tr} <select name="tagname">
{section name=sel loop=$tags}
<option value="{$tags[sel]|escape}">{$tags[sel]}</option>
{sectionelse}
@@ -43,7 +43,7 @@
<div class="heading">{tr}Remove a Tag{/tr}</div>
<form action="tiki-admin.php?page=wiki" method="post">
- {tr}Tag name{/tr}: <select name="tagname">
+ {tr}Tag name:{/tr} <select name="tagname">
{section name=sel loop=$tags}
<option value="{$tags[sel]|escape}">{$tags[sel]}</option>
{sectionelse}
@@ -63,7 +63,7 @@
<div class="cbox-data">
<form method="post" action="tiki-admin.php?page=wiki">
<table class="admin">
- <tr><td class="form">{tr}Default number of comments per page{/tr}:
</td><td><input size="5" type="text" name="wiki_comments_per_page"
value="{$prefs.wiki_comments_per_page|escape}" /></td></tr>
+ <tr><td class="form">{tr}Default number of comments per page:{/tr}
+ </td><td><input size="5" type="text" name="wiki_comments_per_page"
value="{$prefs.wiki_comments_per_page|escape}" /></td></tr>
<tr><td class="form">{tr}Comments default ordering{/tr}
</td><td>
<select name="wiki_comments_default_ordering">
@@ -103,10 +103,10 @@
<div class="cbox-data">
<form method="post" action="tiki-admin.php?page=wiki">
<table class="admin">
- <tr><td class="form">{tr}Wiki
attachments{/tr}:</td><td><input type="checkbox"
name="feature_wiki_attachments" {if $prefs.feature_wiki_attachments eq
'y'}checked="checked"{/if}/></td></tr>
- <tr><td class="form">{tr}Use database to store
files{/tr}:</td><td><input type="radio" name="w_use_db" value="y" {if
$prefs.w_use_db eq 'y'}checked="checked"{/if} /></td></tr>
- <tr><td class="form">{tr}Use a directory to store
files{/tr}:</td><td><input type="radio" name="w_use_db" value="n" {if
$prefs.w_use_db eq 'n'}checked="checked"{/if} /></td></tr>
- <tr><td class="form">{tr}Path{/tr}:</td><td><input type="text"
name="w_use_dir" value="{$prefs.w_use_dir}" /></td></tr>
+ <tr><td class="form">{tr}Wiki
attachments:{/tr}</td><td><input type="checkbox"
name="feature_wiki_attachments" {if $prefs.feature_wiki_attachments eq
'y'}checked="checked"{/if}/></td></tr>
+ <tr><td class="form">{tr}Use database to store
files:{/tr}</td><td><input type="radio" name="w_use_db" value="y" {if
$prefs.w_use_db eq 'y'}checked="checked"{/if} /></td></tr>
+ <tr><td class="form">{tr}Use a directory to store
files:{/tr}</td><td><input type="radio" name="w_use_db" value="n" {if
$prefs.w_use_db eq 'n'}checked="checked"{/if} /></td></tr>
+ <tr><td class="form">{tr}Path:{/tr}</td><td><input type="text"
+name="w_use_dir" value="{$prefs.w_use_dir}" /></td></tr>
<tr><td class="form">{tr}List displayed by
default{/tr}</td><td><input type="checkbox"
name="w_displayed_default"{if $prefs.w_displayed_default eq 'y'}
checked="checked"{/if} /></td></tr>
<tr><td colspan="2" class="button"><input type="submit"
name="wikiattprefs" value="{tr}Change preferences{/tr}" /></td></tr> @@
-153,7 +153,7 @@
<td width="10"><input type="checkbox" onclick="flip('discussforum');"
name="feature_wiki_discuss" {if $prefs.feature_wiki_discuss eq
'y'}checked="checked"{/if} {if $prefs.feature_forums ne 'y'}
disabled="disabled"{/if} /></td>
<td class="form">{tr}Discuss pages on forums{/tr}{if
$prefs.feature_forums ne 'y'}<br />({tr}Forums are disabled.{/tr} <a
href="tiki-admin.php?page=features" title="{tr}Features{/tr}">{tr}Enable
now{/tr}</a>.){/if}
<div id="discussforum" style="display:{if
($prefs.feature_wiki_discuss eq 'y') and ($prefs.feature_forums eq
'y')}block{else}none{/if};">
- <p>{tr}Forum for discussion{/tr}:<br /> <select
name="wiki_forum_id"{if $prefs.feature_forums ne 'y'}
disabled="disabled"{/if}>
+ <p>{tr}Forum for discussion:{/tr}<br /> <select
+ name="wiki_forum_id"{if $prefs.feature_forums ne 'y'}
disabled="disabled"{/if}>
{if $all_forums} {section name=ix loop=$all_forums}
<option value="{$all_forums[ix].forumId|escape}" {if
$all_forums[ix].forumId eq
$prefs.wiki_forum_id}selected="selected"{/if}>{$all_forums[ix].name}</option
>
{/section}
@@ -206,16 +206,16 @@
<form method="post" action="tiki-admin.php?page=wiki">
<table class="admin">
<tr><td class="form">
- {tr}Use wiki page staging and approval{/tr}: </td><td>
+ {tr}Use wiki page staging and approval:{/tr} </td><td>
<input type="checkbox" name="feature_wikiapproval" {if
$prefs.feature_wikiapproval eq 'y'}checked="checked"{/if}/>
</td></tr>
- <tr><td class="form">{tr}Unique page name prefix to indicate staging
copy{/tr}:</td><td>
+ <tr><td class="form">{tr}Unique page name prefix to indicate
+ staging copy:{/tr}</td><td>
<input type="text" name="wikiapproval_prefix" value="{if
$prefs.wikiapproval_prefix}{$prefs.wikiapproval_prefix|escape}{else}*{/if}"
/></td></tr>
<tr><td class="form">
- {tr}Hide page name prefix{/tr}: </td><td>
+ {tr}Hide page name prefix:{/tr} </td><td>
<input type="checkbox" name="wikiapproval_hideprefix" {if
$prefs.wikiapproval_hideprefix eq 'y'}checked="checked"{/if}/>
</td></tr>
- <tr><td class="form">{tr}Category for staging pages{/tr}:</td><td>
+ <tr><td class="form">{tr}Category for staging pages:{/tr}</td><td>
<select name="wikiapproval_staging_category">
<option value="0" {if $prefs.feature_wikiapproval_staging_category
eq 0}selected="selected"{/if}>{tr}None{/tr}</option>
{section name=ix loop=$catree}
@@ -223,7 +223,7 @@
{/section}
</select>
</td></tr>
- <tr><td class="form">{tr}Category for approved pages{/tr}:</td><td>
+ <tr><td class="form">{tr}Category for approved pages:{/tr}</td><td>
<select name="wikiapproval_approved_category">
<option value="0" {if $prefs.feature_wikiapproval_approved_category
eq 0}selected="selected"{/if}>{tr}None{/tr}</option>
{section name=ix loop=$catree}
@@ -231,7 +231,7 @@
{/section}
</select>
</td></tr>
- <tr><td class="form">{tr}Category for pages out of
sync{/tr}:</td><td>
+ <tr><td class="form">{tr}Category for pages out of
sync:{/tr}</td><td>
<select name="wikiapproval_outofsync_category">
<option value="0" {if $prefs.feature_wikiapproval_outofsync_category
eq 0}selected="selected"{/if}>{tr}None{/tr}</option>
{section name=ix loop=$catree}
@@ -240,27 +240,27 @@
</select>
</td></tr>
<tr><td class="form">
- {tr}Force bounce of editing of approved pages to staging{/tr}:
</td><td>
+ {tr}Force bounce of editing of approved pages to staging:{/tr}
+ </td><td>
<input type="checkbox" name="wikiapproval_block_editapproved" {if
$prefs.wikiapproval_block_editapproved eq 'y'}checked="checked"{/if}/>
</td></tr>
<tr><td class="form">
- {tr}Categorize approved pages with categories of staging copy on
approval{/tr}: </td><td>
+ {tr}Categorize approved pages with categories of staging copy on
+ approval:{/tr} </td><td>
<input type="checkbox" name="wikiapproval_sync_categories" {if
$prefs.wikiapproval_sync_categories eq 'y'}checked="checked"{/if}/>
</td></tr>
<tr><td class="form">
- {tr}Replace freetags with that of staging pages on approval{/tr}:
</td><td>
+ {tr}Replace freetags with that of staging pages on approval:{/tr}
+ </td><td>
<input type="checkbox" name="wikiapproval_update_freetags" {if
$prefs.wikiapproval_update_freetags eq 'y'}checked="checked"{/if}/>
</td></tr>
<tr><td class="form">
- {tr}Add new freetags of approved copy (into tags field) when editing
staging pages{/tr}: </td><td>
+ {tr}Add new freetags of approved copy (into tags field) when
+ editing staging pages:{/tr} </td><td>
<input type="checkbox" name="wikiapproval_combine_freetags" {if
$prefs.wikiapproval_combine_freetags eq 'y'}checked="checked"{/if}/>
</td></tr>
<tr><td class="form">
- {tr}Delete staging pages at approval{/tr}: </td><td>
+ {tr}Delete staging pages at approval:{/tr} </td><td>
<input type="checkbox" name="wikiapproval_delete_staging" {if
$prefs.wikiapproval_delete_staging eq 'y'}checked="checked"{/if}/>
</td></tr>
<tr><td class="form">
- {tr}If not in the group, edit is always redirected to the staging page
edit{/tr}: </td><td>
+ {tr}If not in the group, edit is always redirected to the staging
+ page edit:{/tr} </td><td>
<select name="wikiapproval_master_group">
<option value=""{if $prefs.wikiapproval_master_group eq ''}
selected="selected"{/if}></option>
{foreach from=$all_groups item=g}
@@ -295,7 +295,7 @@
</td>
</tr>
<tr>
- <td class="form">{tr}Name length{/tr}:</td>
+ <td class="form">{tr}Name length:{/tr}</td>
<td class="form">
<input type="text" name="wiki_list_name_len"
value="{$prefs.wiki_list_name_len}" size="3" />
</td>
@@ -337,7 +337,7 @@
</td>
</tr>
<tr>
- <td class="form">{tr}Comment length{/tr}:</td>
+ <td class="form">{tr}Comment length:{/tr}</td>
<td class="form">
<input type="text" name="wiki_list_comment_len"
value="{$prefs.wiki_list_comment_len}" size="3" />
</td>
@@ -349,7 +349,7 @@
</td>
</tr>
<tr>
- <td class="form">{tr}Description length{/tr}:</td>
+ <td class="form">{tr}Description length:{/tr}</td>
<td class="form">
<input type="text" name="wiki_list_description_len"
value="{$prefs.wiki_list_description_len}" size="3" />
</td>
@@ -403,7 +403,7 @@
</td>
</tr>
<tr>
- <td class="form">{tr}Default sort
order{/tr}:</td><td class="form"><select name="wiki_list_sortorder">
+ <td class="form">{tr}Default sort
order:{/tr}</td><td
+class="form"><select name="wiki_list_sortorder">
{foreach from=$options_sortorder key=key
item=item}
<option value="{$item}" {if
$prefs.wiki_list_sortorder eq $item}
selected="selected"{/if}>{$key}</option>
{/foreach}
@@ -434,68 +434,68 @@
<td colspan="2" class="heading">General</td>
</tr>
<tr>
- <td class="form">{tr}Enable wiki 3D browser{/tr}:</td>
+ <td class="form">{tr}Enable wiki 3D browser:{/tr}</td>
<td><input type="checkbox" name="wiki_feature_3d" {if
$prefs.wiki_feature_3d eq 'y'}checked="checked"{/if}/></td>
</tr>
<tr>
- <td class="form">{tr}Load page on navigation{/tr}: </td>
+ <td class="form">{tr}Load page on navigation:{/tr} </td>
<td><input type="checkbox" name="wiki_3d_autoload" value="true" {if
$prefs.wiki_3d_missing_page_color eq 'true'}checked{/if} /></td>
</tr>
<tr>
- <td class="form">{tr}Browser width{/tr}: </td>
+ <td class="form">{tr}Browser width:{/tr} </td>
<td><input type="text" name="wiki_3d_width"
value="{$prefs.wiki_3d_width|escape}" size="3" /></td>
</tr>
<tr>
- <td class="form">{tr}Browser height{/tr}: </td>
+ <td class="form">{tr}Browser height:{/tr} </td>
<td><input type="text" name="wiki_3d_height"
value="{$prefs.wiki_3d_height|escape}" size="3" /></td>
</tr>
<tr>
<td colspan="2" class="heading">Graph appearance</td>
</tr>
<tr>
- <td class="form">{tr}Navigation depth{/tr}: </td>
+ <td class="form">{tr}Navigation depth:{/tr} </td>
<td><input type="text" name="wiki_3d_navigation_depth"
value="{$prefs.wiki_3d_navigation_depth|escape}" size="2" /></td>
</tr>
<tr>
- <td class="form">{tr}Node size{/tr}: </td>
+ <td class="form">{tr}Node size:{/tr} </td>
<td><input type="text" name="wiki_3d_node_size"
value="{$prefs.wiki_3d_node_size|default:"30"}" size="2" /></td>
</tr>
<tr>
- <td class="form">{tr}Text size{/tr}: </td>
+ <td class="form">{tr}Text size:{/tr} </td>
<td><input type="text" name="wiki_3d_text_size"
value="{$prefs.wiki_3d_text_size|default:"40"}" size="3" /></td>
</tr>
<tr>
- <td class="form">{tr}Spring (connection) size{/tr}: </td>
+ <td class="form">{tr}Spring (connection) size:{/tr} </td>
<td><input type="text" name="wiki_3d_spring_size"
value="{$prefs.wiki_3d_spring_size|default:"100"}" size="3" /></td>
</tr>
<tr>
- <td class="form">{tr}Existing page node color{/tr}: </td>
+ <td class="form">{tr}Existing page node color:{/tr} </td>
<td><input type="text" name="wiki_3d_existing_page_color"
value="{$prefs.wiki_3d_existing_page_color|escape}" size="7" /></td>
</tr>
<tr>
- <td class="form">{tr}Missing page node color{/tr}: </td>
+ <td class="form">{tr}Missing page node color:{/tr} </td>
<td><input type="text" name="wiki_3d_missing_page_color"
value="{$prefs.wiki_3d_missing_page_color|escape}" size="7" /></td>
</tr>
<tr>
<td colspan="2" class="heading">Camera settings</td>
</tr>
<tr>
- <td class="form">{tr}Camera distance adjusted relative to nearest
node{/tr}: </td>
+ <td class="form">{tr}Camera distance adjusted relative to
+ nearest node:{/tr} </td>
<td><input type="checkbox" name="wiki_3d_adjust_camera" value="true"
{if $prefs.wiki_3d_adjust_camera eq 'true'}checked{/if} /></td>
</tr><tr>
- <td class="form">{tr}Load page on navigation{/tr}: </td>
+ <td class="form">{tr}Load page on navigation:{/tr} </td>
<td><input type="checkbox" name="wiki_3d_autoload" {if
$prefs.wiki_3d_autoload eq 'true'}checked="checked"{/if} /></td>
</tr>
<tr>
- <td class="form">{tr}Camera distance{/tr}: </td>
+ <td class="form">{tr}Camera distance:{/tr} </td>
<td><input type="text" name="wiki_3d_camera_distance"
value="{$prefs.wiki_3d_camera_distance|default:"200"}" size="3" /></td>
</tr>
<tr>
- <td class="form">{tr}Field of view{/tr}: </td>
+ <td class="form">{tr}Field of view:{/tr} </td>
<td><input type="text" name="wiki_3d_fov"
value="{$prefs.wiki_3d_fov|default:"250"}" size="3" /></td>
</tr>
<tr>
- <td class="form">{tr}Feed animation interval (milisecs){/tr}: </td>
+ <td class="form">{tr}Feed animation interval (milisecs):{/tr}
+ </td>
<td><input type="text" name="wiki_3d_feed_animation_interval"
value="{$prefs.wiki_3d_feed_animation_interval|escape}" size="4" /></td>
</tr>
{* new fields *}
@@ -503,23 +503,23 @@
<td colspan="2" class="heading">Physics engine</td>
</tr>
<tr>
- <td class="form">{tr}Friction constant{/tr}: </td>
+ <td class="form">{tr}Friction constant:{/tr} </td>
<td><input type="text" name="wiki_3d_friction_constant"
value="{$prefs.wiki_3d_friction_constant|default:"0.4f"}" size="7" /></td>
</tr>
<tr>
- <td class="form">{tr}Elastic constant{/tr}: </td>
+ <td class="form">{tr}Elastic constant:{/tr} </td>
<td><input type="text" name="wiki_3d_elastic_constant"
value="{$prefs.wiki_3d_elastic_constant|default:"0.5f"}" size="7" /></td>
</tr>
<tr>
- <td class="form">{tr}Eletrostatic constant{/tr}: </td>
+ <td class="form">{tr}Eletrostatic constant:{/tr} </td>
<td><input type="text" name="wiki_3d_eletrostatic_constant"
value="{$prefs.wiki_3d_eletrostatic_constant|default:"1000f"}" size="7"
/></td>
</tr>
<tr>
- <td class="form">{tr}Node mass{/tr}: </td>
+ <td class="form">{tr}Node mass:{/tr} </td>
<td><input type="text" name="wiki_3d_node_mass"
value="{$prefs.wiki_3d_node_mass|default:"5"}" size="7" /></td>
</tr>
<tr>
- <td class="form">{tr}Node charge{/tr}: </td>
+ <td class="form">{tr}Node charge:{/tr} </td>
<td><input type="text" name="wiki_3d_node_charge"
value="{$prefs.wiki_3d_node_charge|default:"1"}" size="7" /></td>
</tr>
@@ -542,26 +542,27 @@
<div class="cbox-data">
<form action="tiki-admin.php?page=wiki" method="post">
<table class="admin">
- <tr><td class="form">{tr}Sandbox{/tr}:</td><td><input type="checkbox"
name="feature_sandbox" {if $prefs.feature_sandbox eq
'y'}checked="checked"{/if}/></td></tr>
- <tr><td class="form">{tr}Anonymous editors must input anti-bot
code{/tr}:</td><td><input type="checkbox" name="feature_antibot" {if
$prefs.feature_antibot eq 'y'}checked="checked"{/if}/></td></tr>
- <tr><td class="form">{tr}Last changes{/tr}:</td><td><input
type="checkbox" name="feature_lastChanges" {if $prefs.feature_lastChanges eq
'y'}checked="checked"{/if}/></td></tr>
- <tr><td class="form">{tr}Dump{/tr}:</td><td><input type="checkbox"
name="feature_dump" {if $prefs.feature_dump eq
'y'}checked="checked"{/if}/></td></tr>
- <tr><td class="form">{tr}Export{/tr}:</td><td><input type="checkbox"
name="feature_wiki_export" {if $prefs.feature_wiki_export eq
'y'}checked="checked"{/if}/></td></tr>
- <tr><td class="form">{tr}Rating{/tr}:</td><td><input type="checkbox"
name="feature_wiki_ratings" {if $prefs.feature_wiki_ratings eq
'y'}checked="checked"{/if}/></td></tr>
- <tr><td class="form">{tr}History{/tr}:</td><td><input type="checkbox"
name="feature_history" {if $prefs.feature_history eq
'y'}checked="checked"{/if}/></td></tr>
- <tr><td class="form">{tr}View source{/tr}:</td><td><input
type="checkbox" name="feature_source" {if $prefs.feature_source eq
'y'}checked="checked"{/if}/></td></tr>
- <tr><td class="form">{tr}List pages{/tr}:</td><td><input
type="checkbox" name="feature_listPages" {if $prefs.feature_listPages eq
'y'}checked="checked"{/if}/></td></tr>
- <tr><td class="form">{tr}Backlinks{/tr}:</td><td><input type="checkbox"
name="feature_backlinks" {if $prefs.feature_backlinks eq
'y'}checked="checked"{/if}/></td></tr>
- <tr><td class="form">{tr}Similar{/tr}:</td><td><input type="checkbox"
name="feature_likePages" {if $prefs.feature_likePages eq
'y'}checked="checked"{/if}/></td></tr>
- <tr><td class="form">{tr}Rankings{/tr}:</td><td><input type="checkbox"
name="feature_wiki_rankings" {if $prefs.feature_wiki_rankings eq
'y'}checked="checked"{/if}/></td></tr>
- <tr><td class="form">{tr}Undo{/tr}:</td><td><input type="checkbox"
name="feature_wiki_undo" {if $prefs.feature_wiki_undo eq
'y'}checked="checked"{/if}/></td></tr>
- <tr><td class="form">{tr}MultiPrint{/tr}:</td><td><input
type="checkbox" name="feature_wiki_multiprint" {if
$prefs.feature_wiki_multiprint eq 'y'}checked="checked"{/if}/></td></tr>
-{* <tr><td class="form">{tr}PDF generation{/tr}:</td><td><input
type="checkbox" name="feature_wiki_pdf" {if $prefs.feature_wiki_pdf eq
'y'}checked="checked"{/if}/></td></tr> *}
- <tr><td class="form">{tr}Comments{/tr}:</td><td><input type="checkbox"
name="feature_wiki_comments" {if $prefs.feature_wiki_comments eq
'y'}checked="checked"{/if}/></td></tr>
- <tr><td class="form">{tr}Spellchecking{/tr}:</td><td>{if
$prefs.lib_spellcheck eq 'y'}<input type="checkbox" name="wiki_spellcheck"
{if $prefs.wiki_spellcheck eq 'y'}checked="checked"{/if}/>{else}{tr}Not
Installed{/tr}{/if}</td></tr>
- <tr><td class="form">{tr}Use templates{/tr}:</td><td><input
type="checkbox" name="feature_wiki_templates" {if
$prefs.feature_wiki_templates eq 'y'}checked="checked"{/if}/></td></tr>
- <tr><td class="form">{tr}Warn on edit conflict{/tr}:</td><td><input
type="checkbox" name="feature_warn_on_edit" {if $prefs.feature_warn_on_edit
eq 'y'}checked="checked"{/if}/></td></tr>
- <tr><td class="form">{tr}Edit idle timeout{/tr}:</td><td class="form">
+ <tr><td class="form">{tr}Sandbox:{/tr}</td><td><input type="checkbox"
name="feature_sandbox" {if $prefs.feature_sandbox eq
'y'}checked="checked"{/if}/></td></tr>
+ <tr><td class="form">{tr}Anonymous editors must input anti-bot
code:{/tr}</td><td><input type="checkbox" name="feature_antibot" {if
$prefs.feature_antibot eq 'y'}checked="checked"{/if}/></td></tr>
+ <tr><td class="form">{tr}Last changes:{/tr}</td><td><input
type="checkbox" name="feature_lastChanges" {if $prefs.feature_lastChanges eq
'y'}checked="checked"{/if}/></td></tr>
+ <tr><td class="form">{tr}Dump:{/tr}</td><td><input type="checkbox"
name="feature_dump" {if $prefs.feature_dump eq
'y'}checked="checked"{/if}/></td></tr>
+ <tr><td class="form">{tr}Export:{/tr}</td><td><input type="checkbox"
name="feature_wiki_export" {if $prefs.feature_wiki_export eq
'y'}checked="checked"{/if}/></td></tr>
+ <tr><td class="form">{tr}Rating:{/tr}</td><td><input type="checkbox"
name="feature_wiki_ratings" {if $prefs.feature_wiki_ratings eq
'y'}checked="checked"{/if}/></td></tr>
+ <tr><td class="form">{tr}History:{/tr}</td><td><input type="checkbox"
name="feature_history" {if $prefs.feature_history eq
'y'}checked="checked"{/if}/></td></tr>
+ <tr><td class="form">{tr}View source:{/tr}</td><td><input
type="checkbox" name="feature_source" {if $prefs.feature_source eq
'y'}checked="checked"{/if}/></td></tr>
+ <tr><td class="form">{tr}List pages:{/tr}</td><td><input
type="checkbox" name="feature_listPages" {if $prefs.feature_listPages eq
'y'}checked="checked"{/if}/></td></tr>
+ <tr><td class="form">{tr}Backlinks:{/tr}</td><td><input type="checkbox"
name="feature_backlinks" {if $prefs.feature_backlinks eq
'y'}checked="checked"{/if}/></td></tr>
+ <tr><td class="form">{tr}Similar:{/tr}</td><td><input type="checkbox"
name="feature_likePages" {if $prefs.feature_likePages eq
'y'}checked="checked"{/if}/></td></tr>
+ <tr><td class="form">{tr}Rankings:{/tr}</td><td><input type="checkbox"
name="feature_wiki_rankings" {if $prefs.feature_wiki_rankings eq
'y'}checked="checked"{/if}/></td></tr>
+ <tr><td class="form">{tr}Undo:{/tr}</td><td><input type="checkbox"
name="feature_wiki_undo" {if $prefs.feature_wiki_undo eq
'y'}checked="checked"{/if}/></td></tr>
+ <tr><td class="form">{tr}Save Draft:{/tr}</td><td><input
type="checkbox" name="feature_wiki_save_draft" {if
$prefs.feature_wiki_save_draft eq 'y'}checked="checked"{/if}/></td></tr>
+ <tr><td class="form">{tr}MultiPrint:{/tr}</td><td><input
type="checkbox" name="feature_wiki_multiprint" {if
$prefs.feature_wiki_multiprint eq 'y'}checked="checked"{/if}/></td></tr>
+{* <tr><td class="form">{tr}PDF generation:{/tr}</td><td><input
type="checkbox" name="feature_wiki_pdf" {if $prefs.feature_wiki_pdf eq
'y'}checked="checked"{/if}/></td></tr> *}
+ <tr><td class="form">{tr}Comments:{/tr}</td><td><input type="checkbox"
name="feature_wiki_comments" {if $prefs.feature_wiki_comments eq
'y'}checked="checked"{/if}/></td></tr>
+ <tr><td class="form">{tr}Spellchecking:{/tr}</td><td>{if
$prefs.lib_spellcheck eq 'y'}<input type="checkbox" name="wiki_spellcheck"
{if $prefs.wiki_spellcheck eq 'y'}checked="checked"{/if}/>{else}{tr}Not
Installed{/tr}{/if}</td></tr>
+ <tr><td class="form">{tr}Use templates:{/tr}</td><td><input
type="checkbox" name="feature_wiki_templates" {if
$prefs.feature_wiki_templates eq 'y'}checked="checked"{/if}/></td></tr>
+ <tr><td class="form">{tr}Warn on edit conflict:{/tr}</td><td><input
type="checkbox" name="feature_warn_on_edit" {if $prefs.feature_warn_on_edit
eq 'y'}checked="checked"{/if}/></td></tr>
+ <tr><td class="form">{tr}Edit idle timeout:{/tr}</td><td
+class="form">
<select name="warn_on_edit_time">
<option value="1" {if $prefs.warn_on_edit_time eq
1}selected="selected"{/if}>1</option>
<option value="2" {if $prefs.warn_on_edit_time eq
2}selected="selected"{/if}>2</option>
@@ -571,11 +572,11 @@
<option value="30" {if $prefs.warn_on_edit_time eq
30}selected="selected"{/if}>30</option>
</select> {tr}mins{/tr}
</td></tr>
- <tr><td class="form">{tr}Pictures{/tr}:</td><td><input type="checkbox"
name="feature_wiki_pictures" {if $prefs.feature_wiki_pictures eq
'y'}checked="checked"{/if}/></td></tr>
- <tr><td class="form">{tr}Use page description{/tr}:</td><td><input
type="checkbox" name="feature_wiki_description" {if
$prefs.feature_wiki_description eq 'y'}checked="checked"{/if}/></td></tr>
- <tr><td class="form">{tr}Show page title{/tr}:</td><td><input
type="checkbox" name="feature_page_title" {if $prefs.feature_page_title eq
'y'}checked="checked"{/if}/></td></tr>
- <tr><td class="form">{tr}Show page ID{/tr}:</td><td><input
type="checkbox" name="feature_wiki_pageid" {if $prefs.feature_wiki_pageid eq
'y'}checked="checked"{/if}/></td></tr>
- <tr><td class="form">{tr}Cache wiki pages (global){/tr}:</td><td>
+ <tr><td class="form">{tr}Pictures:{/tr}</td><td><input type="checkbox"
name="feature_wiki_pictures" {if $prefs.feature_wiki_pictures eq
'y'}checked="checked"{/if}/></td></tr>
+ <tr><td class="form">{tr}Use page description:{/tr}</td><td><input
type="checkbox" name="feature_wiki_description" {if
$prefs.feature_wiki_description eq 'y'}checked="checked"{/if}/></td></tr>
+ <tr><td class="form">{tr}Show page title:{/tr}</td><td><input
type="checkbox" name="feature_page_title" {if $prefs.feature_page_title eq
'y'}checked="checked"{/if}/></td></tr>
+ <tr><td class="form">{tr}Show page ID:{/tr}</td><td><input
type="checkbox" name="feature_wiki_pageid" {if $prefs.feature_wiki_pageid eq
'y'}checked="checked"{/if}/></td></tr>
+ <tr><td class="form">{tr}Cache wiki pages (global):{/tr}</td><td>
<select name="wiki_cache">
<option value="0" {if $prefs.wiki_cache eq 0}selected="selected"{/if}>0
({tr}no cache{/tr})</option>
<option value="60" {if $prefs.wiki_cache eq
60}selected="selected"{/if}>1 {tr}minute{/tr}</option> @@ -587,47 +588,40 @@
<option value="7200" {if $prefs.wiki_cache eq
7200}selected="selected"{/if}>2 {tr}hours{/tr}</option>
</select>
</td></tr>
- <tr><td class="form">{tr}Individual cache{/tr}:</td><td><input
type="checkbox" name="feature_wiki_icache" {if $prefs.feature_wiki_icache eq
'y'}checked="checked"{/if}/></td></tr>
+ <tr><td class="form">{tr}Individual cache:{/tr}</td><td><input
type="checkbox" name="feature_wiki_icache" {if $prefs.feature_wiki_icache eq
'y'}checked="checked"{/if}/></td></tr>
- <tr><td class="form">{tr}Footnotes{/tr}:</td><td><input type="checkbox"
name="feature_wiki_footnotes" {if $prefs.feature_wiki_footnotes eq
'y'}checked="checked"{/if}/></td></tr>
- <tr><td class="form">{tr}Users can lock pages (if
perm){/tr}:</td><td><input type="checkbox" name="feature_wiki_usrlock" {if
$prefs.feature_wiki_usrlock eq 'y'}checked="checked"{/if}/></td></tr>
- <tr><td class="form">{tr}Use WikiWords{/tr}:</td><td><input
type="checkbox" name="feature_wikiwords" {if $prefs.feature_wikiwords eq
'y'}checked="checked"{/if}/></td></tr>
- <tr><td class="form">{tr}Accept dashes and underscores in
WikiWords{/tr}:</td><td><input type="checkbox"
name="feature_wikiwords_usedash" {if $prefs.feature_wikiwords_usedash eq
'y'}checked="checked"{/if}/></td></tr>
- <tr><td class="form">{tr}Link plural WikiWords to their singular
forms{/tr}:</td><td><input type="checkbox" name="feature_wiki_plurals" {if
$prefs.feature_wiki_plurals eq 'y'}checked="checked"{/if}/></td></tr>
- <tr><td class="form">{tr}Use Wiki paragraph
formatting{/tr}:</td><td><input type="checkbox"
name="feature_wiki_paragraph_formatting" {if
$prefs.feature_wiki_paragraph_formatting eq
'y'}checked="checked"{/if}/></td></tr>
- <tr><td class="form">{tr}But still create line breaks within
paragraphs{/tr}:</td><td><input type="checkbox"
name="feature_wiki_paragraph_formatting_add_br" {if
$prefs.feature_wiki_paragraph_formatting_add_br eq
'y'}checked="checked"{/if}/></td></tr>
- <tr><td class="form">{tr}Automonospaced text{/tr}:</td><td><input
type="checkbox" name="feature_wiki_monosp" {if $prefs.feature_wiki_monosp eq
'y'}checked="checked"{/if}/></td></tr>
- <tr><td class="form">{tr}Tables syntax{/tr}:</td><td>
+ <tr><td class="form">{tr}Footnotes:{/tr}</td><td><input type="checkbox"
name="feature_wiki_footnotes" {if $prefs.feature_wiki_footnotes eq
'y'}checked="checked"{/if}/></td></tr>
+ <tr><td class="form">{tr}Users can lock pages (if
perm):{/tr}</td><td><input type="checkbox" name="feature_wiki_usrlock" {if
$prefs.feature_wiki_usrlock eq 'y'}checked="checked"{/if}/></td></tr>
+ <tr><td class="form">{tr}Use WikiWords:{/tr}</td><td><input
type="checkbox" name="feature_wikiwords" {if $prefs.feature_wikiwords eq
'y'}checked="checked"{/if}/></td></tr>
+ <tr><td class="form">{tr}Accept dashes and underscores in
WikiWords:{/tr}</td><td><input type="checkbox"
name="feature_wikiwords_usedash" {if $prefs.feature_wikiwords_usedash eq
'y'}checked="checked"{/if}/></td></tr>
+ <tr><td class="form">{tr}Link plural WikiWords to their singular
forms:{/tr}</td><td><input type="checkbox" name="feature_wiki_plurals" {if
$prefs.feature_wiki_plurals eq 'y'}checked="checked"{/if}/></td></tr>
+ <tr><td class="form">{tr}Use Wiki paragraph
formatting:{/tr}</td><td><input type="checkbox"
name="feature_wiki_paragraph_formatting" {if
$prefs.feature_wiki_paragraph_formatting eq
'y'}checked="checked"{/if}/></td></tr>
+ <tr><td class="form">{tr}But still create line breaks within
paragraphs:{/tr}</td><td><input type="checkbox"
name="feature_wiki_paragraph_formatting_add_br" {if
$prefs.feature_wiki_paragraph_formatting_add_br eq
'y'}checked="checked"{/if}/></td></tr>
+ <tr><td class="form">{tr}Automonospaced text:{/tr}</td><td><input
type="checkbox" name="feature_wiki_monosp" {if $prefs.feature_wiki_monosp eq
'y'}checked="checked"{/if}/></td></tr>
+ <tr><td class="form">{tr}Tables syntax:{/tr}</td><td>
<select name="feature_wiki_tables">
<option value="old" {if $prefs.feature_wiki_tables eq
'old'}selected="selected"{/if}>{tr}|| for rows{/tr}</option>
<option value="new" {if $prefs.feature_wiki_tables eq
'new'}selected="selected"{/if}>{tr}\n for rows{/tr}</option>
</select>
</td></tr>
- <tr><td class="form">{tr}Uses Slideshow{/tr}:</td><td><input
type="checkbox" name="wiki_uses_slides" {if $prefs.wiki_uses_slides eq
'y'}checked="checked"{/if}/></td></tr>
- <tr><td class="form">{tr}Open page as structure{/tr}:</td><td><input
type="checkbox" name="feature_wiki_open_as_structure" {if
$prefs.feature_wiki_open_as_structure eq
'y'}checked="checked"{/if}/></td></tr>
- <tr><td class="form">{tr}Make structure from page{/tr}:</td><td><input
type="checkbox" name="feature_wiki_make_structure" {if
$prefs.feature_wiki_make_structure eq 'y'}checked="checked"{/if}/></td></tr>
- <tr><td class="form">{tr}Categorize structure pages
together{/tr}:</td><td><input type="checkbox"
name="feature_wiki_categorize_structure" {if
$prefs.feature_wiki_categorize_structure eq
'y'}checked="checked"{/if}/></td></tr>
- <tr><td class="form">{tr}Create webhelp from
structure{/tr}:</td><td><input type="checkbox" name="feature_create_webhelp"
{if $prefs.feature_create_webhelp eq 'y'}checked="checked"{/if}/></td></tr>
- <tr><td class="form">{tr}Use external link icons{/tr}:</td><td><input
type="checkbox" name="feature_wiki_ext_icon" {if
$prefs.feature_wiki_ext_icon eq 'y'}checked="checked"{/if}/></td></tr>
- <tr><td class="form">{tr}User's Page{/tr}:</td><td><input
type="checkbox" name="feature_wiki_userpage" {if
$prefs.feature_wiki_userpage eq 'y'}checked="checked"{/if}/></td></tr>
- <tr><td class="form">{tr}UserPage prefix{/tr}:</td><td><input
type="text" name="feature_wiki_userpage_prefix"
value="{$prefs.feature_wiki_userpage_prefix|default:'UserPage'}" size="12"
/></td></tr>
- <tr><td class="form">{tr}Page creators are admin of their
pages{/tr}:</td><td><input type="checkbox" name="wiki_creator_admin" {if
$prefs.wiki_creator_admin eq 'y'}checked="checked"{/if}/></td></tr>
- <tr><td class="form">{tr}Import HTML{/tr}:</td><td><input
type="checkbox" name="feature_wiki_import_html" {if
$prefs.feature_wiki_import_html eq 'y'}checked="checked"{/if}/></td></tr>
- <tr><td class="form">{tr}Import Page{/tr}:</td><td><input
type="checkbox" name="feature_wiki_import_page" {if
$prefs.feature_wiki_import_page eq 'y'}checked="checked"{/if}/></td></tr>
-
- <tr><td class="form">{tr}List authors{/tr}:</td><td>
- <select name="wiki_authors_style">
- <option value="classic" {if $prefs.wiki_authors_style eq
'classic'}selected="selected"{/if}>{tr}as Creator & Last
Editor{/tr}</option>
- <option value="business" {if $prefs.wiki_authors_style eq
'business'}selected="selected"{/if}>{tr}Business style{/tr}</option>
- <option value="collaborative" {if $prefs.wiki_authors_style eq
'collaborative'}selected="selected"{/if}>{tr}Collaborative
style{/tr}</option>
- <option value="lastmodif" {if $prefs.wiki_authors_style eq
'lastmodif'}selected="selected"{/if}>{tr}Page last modified on{/tr}</option>
- <option value="none" {if $prefs.wiki_authors_style eq
'none'}selected="selected"{/if}>{tr}no (disabled){/tr}</option>
- </select>
- </td></tr>
- <tr><td class="form">{tr}Protect email against
spam{/tr}:</td><td><input type="checkbox" name="feature_wiki_protect_email"
{if $prefs.feature_wiki_protect_email eq
'y'}checked="checked"{/if}/></td></tr>
- <tr><td class="form">{tr}When viewing a page, if it doesn't exist and
has one like page, automatic redirection to this like
page{/tr}:</td><td><input type="checkbox"
name="feature_wiki_1like_redirection" {if
$prefs.feature_wiki_1like_redirection eq
'y'}checked="checked"{/if}/></td></tr>
- <tr><td class="form">{tr}Show/hide heading icon displayed before the
heading{/tr}:</td><td><input type="checkbox"
name="feature_wiki_show_hide_before" {if
$prefs.feature_wiki_show_hide_before eq
'y'}checked="checked"{/if}/></td></tr>
- <tr><td class="form">{tr}Force and limit categorization to within
subtree of{/tr}:</td>
+ <tr><td class="form">{tr}Uses Slideshow:{/tr}</td><td><input
type="checkbox" name="wiki_uses_slides" {if $prefs.wiki_uses_slides eq
'y'}checked="checked"{/if}/></td></tr>
+ <tr><td class="form">{tr}Open page as structure:{/tr}</td><td><input
type="checkbox" name="feature_wiki_open_as_structure" {if
$prefs.feature_wiki_open_as_structure eq
'y'}checked="checked"{/if}/></td></tr>
+ <tr><td class="form">{tr}Make structure from page:{/tr}</td><td><input
type="checkbox" name="feature_wiki_make_structure" {if
$prefs.feature_wiki_make_structure eq 'y'}checked="checked"{/if}/></td></tr>
+ <tr><td class="form">{tr}Categorize structure pages
together:{/tr}</td><td><input type="checkbox"
name="feature_wiki_categorize_structure" {if
$prefs.feature_wiki_categorize_structure eq
'y'}checked="checked"{/if}/></td></tr>
+ <tr><td class="form">{tr}Create webhelp from
structure:{/tr}</td><td><input type="checkbox" name="feature_create_webhelp"
{if $prefs.feature_create_webhelp eq 'y'}checked="checked"{/if}/></td></tr>
+ <tr><td class="form">{tr}Use external link icons:{/tr}</td><td><input
type="checkbox" name="feature_wiki_ext_icon" {if
$prefs.feature_wiki_ext_icon eq 'y'}checked="checked"{/if}/></td></tr>
+ <tr><td class="form">{tr}User's Page:{/tr}</td><td><input
type="checkbox" name="feature_wiki_userpage" {if
$prefs.feature_wiki_userpage eq 'y'}checked="checked"{/if}/></td></tr>
+ <tr><td class="form">{tr}UserPage prefix:{/tr}</td><td><input
type="text" name="feature_wiki_userpage_prefix"
value="{$prefs.feature_wiki_userpage_prefix|default:'UserPage'}" size="12"
/></td></tr>
+ <tr><td class="form">{tr}Page creators are admin of their
pages:{/tr}</td><td><input type="checkbox" name="wiki_creator_admin" {if
$prefs.wiki_creator_admin eq 'y'}checked="checked"{/if}/></td></tr>
+ <tr><td class="form">{tr}Import HTML:{/tr}</td><td><input
type="checkbox" name="feature_wiki_import_html" {if
$prefs.feature_wiki_import_html eq 'y'}checked="checked"{/if}/></td></tr>
+ <tr><td class="form">{tr}Import Page:{/tr}</td><td><input
+ type="checkbox" name="feature_wiki_import_page" {if
+ $prefs.feature_wiki_import_page eq
+ 'y'}checked="checked"{/if}/></td></tr>
+
+ {include file='wiki_authors_style.tpl'
+ wiki_authors_style=$prefs.wiki_authors_style}
+
+ <tr><td class="form">{tr}Protect email against
spam:{/tr}</td><td><input type="checkbox" name="feature_wiki_protect_email"
{if $prefs.feature_wiki_protect_email eq
'y'}checked="checked"{/if}/></td></tr>
+ <tr><td class="form">{tr}When viewing a page, if it doesn't exist and
has one like page, automatic redirection to this like
page:{/tr}</td><td><input type="checkbox"
name="feature_wiki_1like_redirection" {if
$prefs.feature_wiki_1like_redirection eq
'y'}checked="checked"{/if}/></td></tr>
+ <tr><td class="form">{tr}Show/hide heading icon displayed before the
heading:{/tr}</td><td><input type="checkbox"
name="feature_wiki_show_hide_before" {if
$prefs.feature_wiki_show_hide_before eq
'y'}checked="checked"{/if}/></td></tr>
+ <tr><td class="form">{tr}Force and limit categorization to within
+ subtree of:{/tr}</td>
<td class="form"><select name="feature_wiki_mandatory_category">
<option value="-1" {if $prefs.feature_wiki_mandatory_category eq -1
or $prefs.feature_wiki_mandatory_category eq
''}selected="selected"{/if}>{tr}None{/tr}</option>
<option value="0" {if $prefs.feature_wiki_mandatory_category eq
0}selected="selected"{/if}>{tr}All{/tr}</option>
@@ -636,18 +630,25 @@
{/section}
</select>
</td></tr>
- <tr><td class="form">{tr}Print Page{/tr}:</td><td><input
type="checkbox" name="feature_wiki_print" {if $prefs.feature_wiki_print eq
'y'}checked="checked"{/if}/></td></tr>
- <tr><td class="form">{tr}Allow HTML{/tr}:</td><td><input
type="checkbox" name="feature_wiki_allowhtml" {if
$prefs.feature_wiki_allowhtml eq 'y'}checked="checked"{/if}/></td></tr>
- <tr><td class="form">{tr}Show page version{/tr}:</td><td><input
type="checkbox" name="wiki_show_version" {if $prefs.wiki_show_version eq
'y'}checked="checked"{/if}/></td></tr>
- <tr><td class="form">{tr}Page navigation bar position (displayed when
page break '...page...' are used){/tr}:</td><td>
+ <tr><td class="form">{tr}Print Page:{/tr}</td><td><input
type="checkbox" name="feature_wiki_print" {if $prefs.feature_wiki_print eq
'y'}checked="checked"{/if}/></td></tr>
+ <tr><td class="form">{tr}Allow HTML:{/tr}</td><td><input
type="checkbox" name="feature_wiki_allowhtml" {if
$prefs.feature_wiki_allowhtml eq 'y'}checked="checked"{/if}/></td></tr>
+ <tr><td class="form">{tr}Show page version:{/tr}</td><td><input
type="checkbox" name="wiki_show_version" {if $prefs.wiki_show_version eq
'y'}checked="checked"{/if}/></td></tr>
+ <tr><td class="form">{tr}Page navigation bar position (displayed
+ when page break '...page...' are used):{/tr}</td><td>
<select name="wiki_page_navigation_bar">
<option value="top" {if $prefs.wiki_page_navigation_bar eq
'top'}selected="selected"{/if}>{tr}Top bar{/tr}</option>
<option value="bottom" {if $prefs.wiki_page_navigation_bar eq
'bottom'}selected="selected"{/if}>{tr}Bottom bar{/tr}</option>
<option value="both" {if $prefs.wiki_page_navigation_bar eq
'both'}selected="selected"{/if}>{tr}Both{/tr}</option>
</select>
</td></tr>
- <tr><td class="form">{tr}Regex search and replace{/tr}:</td><td><input
type="checkbox" name="feature_wiki_replace" {if $prefs.feature_wiki_replace
eq 'y'}checked="checked"{/if}/></td></tr>
- <tr><td class="form">{tr}Edit section{/tr}:</td><td><input
type="checkbox" name="wiki_edit_section" {if $prefs.wiki_edit_section eq
'y'}checked="checked"{/if}/></td></tr>
+ <tr><td class="form">{tr}Wiki actions bar position (e.g. Save, Preview,
Cancel, ...):{/tr}</td><td>
+ <select name="wiki_actions_bar">
+ <option value="top" {if $prefs.wiki_actions_bar eq
'top'}selected="selected"{/if}>{tr}Top bar{/tr}</option>
+ <option value="bottom" {if $prefs.wiki_actions_bar eq
'bottom'}selected="selected"{/if}>{tr}Bottom bar{/tr}</option>
+ <option value="both" {if $prefs.wiki_actions_bar eq
'both'}selected="selected"{/if}>{tr}Both{/tr}</option>
+ </select>
+ </td></tr>
+ <tr><td class="form">{tr}Regex search and replace:{/tr}</td><td><input
type="checkbox" name="feature_wiki_replace" {if $prefs.feature_wiki_replace
eq 'y'}checked="checked"{/if}/></td></tr>
+ <tr><td class="form">{tr}Edit section:{/tr}</td><td><input
+type="checkbox" name="wiki_edit_section" {if $prefs.wiki_edit_section eq
'y'}checked="checked"{/if}/></td></tr>
<tr><td class="form">{tr}Log bytes changes (+/-) in Action Logs
(slows each page modifications){/tr}</td><td><input type="checkbox"
name="feature_actionlog_bytes" {if $prefs.feature_actionlog_bytes eq
'y'}checked="checked"{/if}/></td></tr>
<tr><td colspan="2" class="button"><input type="submit"
name="wikifeatures" value="{tr}Set features{/tr}" /></td></tr>
</table>
@@ -662,12 +663,12 @@
<div class="cbox-data">
<form action="tiki-admin.php?page=wiki" method="post">
<table class="admin">
- <tr><td class="form">{tr}Maximum number of versions for history{/tr}:
</td><td><input size="5" type="text" name="maxVersions"
value="{$prefs.maxVersions|escape}" /> (0={tr}unlimited{/tr})</td></tr>
- <tr><td class="form">{tr}Never delete versions younger than days{/tr}:
</td><td><input size="5" type="text" name="keep_versions"
value="{$prefs.keep_versions|escape}" /></td></tr>
- <tr><td class="form">{tr}IP address displayed in
history{/tr}:</td><td>
+ <tr><td class="form">{tr}Maximum number of versions for history:{/tr}
</td><td><input size="5" type="text" name="maxVersions"
value="{$prefs.maxVersions|escape}" /> (0={tr}unlimited{/tr})</td></tr>
+ <tr><td class="form">{tr}Never delete versions younger than days:{/tr}
</td><td><input size="5" type="text" name="keep_versions"
value="{$prefs.keep_versions|escape}" /></td></tr>
+ <tr><td class="form">{tr}IP address displayed in
+ history:{/tr}</td><td>
<input type="checkbox" name="feature_wiki_history_ip" {if
$prefs.feature_wiki_history_ip eq 'y'}checked="checked"{/if}/>
</td></tr>
- <tr><td class="form">{tr}Diff style{/tr}: </td><td><select
name="default_wiki_diff_style">
+ <tr><td class="form">{tr}Diff style:{/tr} </td><td><select
+ name="default_wiki_diff_style">
<option value="old" {if $prefs.default_wiki_diff_style eq
'old'}selected="selected"{/if}>{tr}Only with last version{/tr}</option>
<option value="minsidediff" {if $prefs.default_wiki_diff_style ne
'old'}selected="selected"{/if}>{tr}Any 2 versions{/tr}</option>
</select></td></tr>
@@ -686,10 +687,10 @@
<div class="cbox-data">
<form action="tiki-admin.php?page=wiki" method="post">
<table class="admin">
- <tr><td class="form">{tr}Create watch for author on page
creation{/tr}:</td><td><input type="checkbox" name="wiki_watch_author" {if
$prefs.wiki_watch_author eq 'y'}checked="checked"{/if}/></td></tr>
- <tr><td class="form">{tr}Enable watch events when I am the
editor{/tr}:</td><td><input type="checkbox" name="wiki_watch_editor" {if
$prefs.wiki_watch_editor eq 'y'}checked="checked"{/if}/></td></tr>
- <tr><td class="form">{tr}Enable watches on
comments{/tr}:</td><td><input type="checkbox" name="wiki_watch_comments" {if
$prefs.wiki_watch_comments eq 'y'}checked="checked"{/if}/></td></tr>
- <tr><td class="form">{tr}Watch minor{/tr}:</td><td><input
type="checkbox" name="wiki_watch_minor" {if $prefs.wiki_watch_minor eq
'y'}checked="checked"{/if}/></td></tr>
+ <tr><td class="form">{tr}Create watch for author on page
creation:{/tr}</td><td><input type="checkbox" name="wiki_watch_author" {if
$prefs.wiki_watch_author eq 'y'}checked="checked"{/if}/></td></tr>
+ <tr><td class="form">{tr}Enable watch events when I am the
editor:{/tr}</td><td><input type="checkbox" name="wiki_watch_editor" {if
$prefs.wiki_watch_editor eq 'y'}checked="checked"{/if}/></td></tr>
+ <tr><td class="form">{tr}Enable watches on
comments:{/tr}</td><td><input type="checkbox" name="wiki_watch_comments" {if
$prefs.wiki_watch_comments eq 'y'}checked="checked"{/if}/></td></tr>
+ <tr><td class="form">{tr}Watch minor:{/tr}</td><td><input
+type="checkbox" name="wiki_watch_minor" {if $prefs.wiki_watch_minor eq
'y'}checked="checked"{/if}/></td></tr>
<tr><td colspan="2" class="button"><input type="submit"
name="wikisetwatch" value="{tr}Change preferences{/tr}" /></td></tr>
</table>
</form>
Modified: branches/1.10/templates/tiki-editpage.tpl
===================================================================
--- branches/1.10/templates/tiki-editpage.tpl 2008-06-30 14:05:25 UTC (rev
13389)
+++ branches/1.10/templates/tiki-editpage.tpl 2008-06-30 14:22:48 UTC (rev
13390)
@@ -118,7 +118,7 @@
<br />
{/if}
{if $preview}
-{include file="tiki-preview.tpl"}
+ {include file="tiki-preview.tpl"}
{/if}
{if $diff_style}
<div style="overflow:auto;height:200px;">
@@ -128,20 +128,6 @@
<form enctype="multipart/form-data" method="post"
action="tiki-editpage.php" id='editpageform' name='editpageform'> <input
type="hidden" name="page" value="{$page|escape}" /> <input type="hidden"
name="clock" value="{$edittimeout}" /> -{if $preview && $staging_preview neq
'y'} -<input type="submit" onmouseover="return overlib('{tr}Preview your
changes.{/tr}');" onmouseout="nd();" class="wikiaction" name="preview"
value="{tr}Preview{/tr}" onclick="needToConfirm = false;" /> -{if
$translation_mode eq 'y'} -<input type="submit" onmouseover="return
overlib('{tr}Save the page as a partial translation.{/tr}');"
onmouseout="nd();" class="wikiaction" name="partial_save" value="{tr}Partial
Translation{/tr}" onclick="needToConfirm=false"/> -<input type="submit"
onmouseover="return overlib('{tr}Save the page as a completed
translation.{/tr}');" onmouseout="nd();" class="wikiaction" name="save"
value="{tr}Complete Translation{/tr}" onclick="needToConfirm=false"/>
-{else} -{if $page|lower neq 'sandbox'} -{if $tiki_p_minor eq 'y'}
- <input type="submit" onmouseover="return overlib('{tr}Save the page, but
do not send notifications and do not count it as new content to be
translated.{/tr}');" onmouseout="nd();" class="wikiaction" name="minor"
value="{tr}Minor Edit{/tr}" onclick="needToConfirm=false;" /> -{/if} -<input
type="submit" onmouseover="return overlib('{tr}Save the page.{/tr}');"
onmouseout="nd();" class="wikiaction" name="save" value="{tr}Save{/tr}"
onclick="needToConfirm = false;" /> <input type="submit"
onmouseover="return overlib('{tr}Cancel the edit, you will lose your
changes.{/tr}');" onmouseout="nd();" class="wikiaction" name="cancel_edit"
value="{tr}Cancel Edit{/tr}" /> -{/if} -{/if} -{/if} {if $page_ref_id}
<input type="hidden" name="page_ref_id" value="{$page_ref_id}" /> {/if}
@@ -160,9 +146,21 @@ {if $add_child}
<input type="hidden" name="add_child" value="true" />
{/if}
-{if $page|lower neq 'sandbox'}
- <p><strong>{tr}Note{/tr}</strong>: {tr}This edit session will expire in
{$edittimeout} minutes{/tr}. {tr}<strong>Preview</strong> or
<strong>Save</strong> your work to restart the edit session timer.{/tr}</p>
+
+<div class="rbox tip">
+ <div class="rbox-data">
+ {if $page|lower neq 'sandbox'}
+ <strong>{tr}Note{/tr}</strong>: {tr}This edit session will expire
+in {$edittimeout} minutes{/tr}. {tr}<strong>Preview</strong> or
<strong>Save</strong> your work to restart the edit session timer.{/tr}
+ {/if}
+ </div>
+</div>
+
+{if ( $preview && $staging_preview neq 'y' ) or $prefs.wiki_actions_bar
+eq 'top' or $prefs.wiki_actions_bar eq 'both'} <div
+class='top_actions'>
+ {include file='wiki_edit_actions.tpl'}
+</div>
{/if}
+
{if $prefs.feature_wysiwyg eq 'y' and $prefs.wysiwyg_optional eq 'y'}
{if $wysiwyg ne 'y'}
<span class="button2">{self_link _class='linkbut' wysiwyg='y'
onclick="needToConfirm = false;"}{tr}Use wysiwyg
editor{/tr}{/self_link}</span> @@ -170,6 +168,7 @@
<span class="button2">{self_link _class='linkbut' wysiwyg='n'
onclick="needToConfirm = false;"}{tr}Use normal
editor{/tr}{/self_link}</span>
{/if}
{/if}
+
<table class="normal">
{if $categIds}
{section name=o loop=$categIds}
@@ -428,11 +427,16 @@
<tr class="formcolor"><td>{tr}Lock this page{/tr}</td><td><input
type="checkbox" name="lock_it" {if $lock_it eq
'y'}checked="checked"{/if}/></td></tr>
{/if}
{if $prefs.feature_contribution eq 'y'}
-{include file="contribution.tpl"}
+ {include file="contribution.tpl"}
{/if}
+{if $tiki_p_admin_wiki eq 'y'}
+ {include file='wiki_authors_style.tpl' tr_class='formcolor'
+wiki_authors_style_site='y'} {/if} {if $prefs.wiki_actions_bar neq
+'top'}
<tr class="formcolor"><td colspan="2" style="text-align:center;"> -{include
file='wiki_edit_actions.tpl'}
+ {include file='wiki_edit_actions.tpl'}
</td></tr>
+{/if}
</table>
{if $prefs.feature_wiki_allowhtml eq 'y' and $tiki_p_use_HTML eq 'y' and
$wysiwyg eq 'y' and $allowhtml eq 'y'}
<input type="hidden" name="allowhtml" checked="checked"/>
Modified: branches/1.10/templates/tiki-show_page.tpl
===================================================================
--- branches/1.10/templates/tiki-show_page.tpl 2008-06-30 14:05:25 UTC (rev
13389)
+++ branches/1.10/templates/tiki-show_page.tpl 2008-06-30 14:22:48 UTC (rev
13390)
@@ -124,6 +124,13 @@
</div>
</div>
+{if isset($saved_msg) && $saved_msg neq ''}
+<div class="rbox" name="tip">
+ <div class="rbox-title" name="note">{tr}Note{/tr}</div>
+ <div class="rbox-data" name="note">{$saved_msg}</div>
+</div>
+{/if}
+
<div class="navbar" style="clear: both; text-align: right">
{if $user and $prefs.feature_user_watches eq 'y'}
{if $category_watched eq 'y'}
@@ -259,7 +266,7 @@
{if $has_footnote eq 'y'}<div class="wikitext"
id="wikifootnote">{$footnote}</div>{/if}
<p class="editdate"> {* begining editdate *}
-{if isset($prefs.wiki_authors_style) && $prefs.wiki_authors_style eq
'business'}
+{if isset($wiki_authors_style) && $wiki_authors_style eq 'business'}
{tr}Last edited by{/tr} {$lastUser|userlink}
{section name=author loop=$contributors}
{if $smarty.section.author.first}, {tr}based on work by{/tr} @@ -271,7
+278,7 @@
{$contributors[author]|userlink}
{/section}.<br />
{tr}Page last modified on{/tr} {$lastModif|tiki_long_datetime}. {if
$prefs.wiki_show_version eq 'y'}({tr}Version{/tr} {$lastVersion}){/if}
-{elseif isset($prefs.wiki_authors_style) && $prefs.wiki_authors_style eq
'collaborative'}
+{elseif isset($wiki_authors_style) && $wiki_authors_style eq
+'collaborative'}
<br />
{tr}Contributors to this page{/tr}: {$lastUser|userlink}
{section name=author loop=$contributors}
@@ -281,8 +288,8 @@
{$contributors[author]|userlink}
{/section}.<br />
{tr}Page last modified on{/tr} {$lastModif|tiki_long_datetime}
{tr}by{/tr} {$lastUser|userlink}. {if $prefs.wiki_show_version eq
'y'}({tr}Version{/tr} {$lastVersion}){/if} -{elseif
isset($prefs.wiki_authors_style) && $prefs.wiki_authors_style eq 'none'}
-{elseif isset($prefs.wiki_authors_style) && $prefs.wiki_authors_style eq
'lastmodif'}
+{elseif isset($wiki_authors_style) && $wiki_authors_style eq 'none'}
+{elseif isset($wiki_authors_style) && $wiki_authors_style eq
+'lastmodif'}
{tr}Page last modified on{/tr} {$lastModif|tiki_long_datetime}
{else} <br />
Added: branches/1.10/templates/wiki_authors_style.tpl
===================================================================
--- branches/1.10/templates/wiki_authors_style.tpl
(rev 0)
+++ branches/1.10/templates/wiki_authors_style.tpl 2008-06-30 14:22:48
UTC (rev 13390)
@@ -0,0 +1,15 @@
+<tr{if isset($tr_class)} class="{$tr_class}"{/if}>
+ <td class="form">{tr}List authors:{/tr}</td>
+ <td>
+ <select name="wiki_authors_style">
+ {if isset($wiki_authors_style_site) && $wiki_authors_style_site eq
'y'}
+ <option value="" style="font-style:italic;border-bottom:1px dashed
#666;"{if $wiki_authors_style eq ''} selected="selected"{/if}>{tr}Site
default{/tr}</option>
+ {/if}
+ <option value="classic"{if $wiki_authors_style eq 'classic'}
selected="selected"{/if}>{tr}as Creator & Last Editor{/tr}</option>
+ <option value="business"{if $wiki_authors_style eq 'business'}
selected="selected"{/if}>{tr}Business style{/tr}</option>
+ <option value="collaborative"{if $wiki_authors_style eq
'collaborative'} selected="selected"{/if}>{tr}Collaborative
style{/tr}</option>
+ <option value="lastmodif"{if $wiki_authors_style eq 'lastmodif'}
selected="selected"{/if}>{tr}Page last modified on{/tr}</option>
+ <option value="none"{if $wiki_authors_style eq 'none'}
selected="selected"{/if}>{tr}no (disabled){/tr}</option>
+ </select>
+ </td>
+</tr>
Modified: branches/1.10/templates/wiki_edit_actions.tpl
===================================================================
--- branches/1.10/templates/wiki_edit_actions.tpl 2008-06-30 14:05:25
UTC (rev 13389)
+++ branches/1.10/templates/wiki_edit_actions.tpl 2008-06-30 14:22:48
UTC (rev 13390)
@@ -9,7 +9,7 @@
{/if}
<input type="submit" class="wikiaction" onmouseover="return
overlib('{tr}Save the page.{/tr}');" onmouseout="nd();" name="save"
value="{tr}Save{/tr}" onclick="needToConfirm=false;" />
- {if $prefs.feature_ajax eq 'y'}
+ {if $prefs.feature_ajax eq 'y' &&
$prefs.feature_wiki_save_draft eq
+'y'}
<input type="submit" class="wikiaction" onmouseover="return
overlib('{tr}Save the page as a draft.{/tr}');" onmouseout="nd();"
value="{tr}Save Draft{/tr}" onclick="save_draft()" />
{/if}
{/if}
Modified: branches/1.10/tiki-admin_include_wiki.php
===================================================================
--- branches/1.10/tiki-admin_include_wiki.php 2008-06-30 14:05:25 UTC (rev
13389)
+++ branches/1.10/tiki-admin_include_wiki.php 2008-06-30 14:22:48 UTC (rev
13390)
@@ -142,6 +142,7 @@
'feature_wiki_monosp',
'feature_wiki_usrlock',
'feature_wiki_undo',
+ 'feature_wiki_save_draft',
'feature_wiki_icache',
'feature_wiki_import_html',
'wiki_creator_admin',
@@ -184,7 +185,8 @@
'feature_wiki_userpage_prefix',
'wiki_authors_style',
'feature_wiki_mandatory_category',
- 'wiki_page_navigation_bar'
+ 'wiki_page_navigation_bar',
+ 'wiki_actions_bar'
);
foreach ($pref_values as $value) {
simple_set_value($value);
Modified: branches/1.10/tiki-editpage.php
===================================================================
--- branches/1.10/tiki-editpage.php 2008-06-30 14:05:25 UTC (rev 13389)
+++ branches/1.10/tiki-editpage.php 2008-06-30 14:22:48 UTC (rev 13390)
@@ -724,6 +724,16 @@
$smarty->assign_by_ref('description',$_REQUEST["description"]);
$description = $_REQUEST["description"];
}
+
+if ( isset($_REQUEST['wiki_authors_style']) && $tiki_p_admin_wiki == 'y' )
{
+ $wiki_authors_style = $_REQUEST['wiki_authors_style'];
+} elseif ( isset($info['wiki_authors_style']) ) {
+ $wiki_authors_style = $info['wiki_authors_style'];
+} else {
+ $wiki_authors_style = '';
+}
+$smarty->assign('wiki_authors_style', $wiki_authors_style);
+
if($is_html) {
$smarty->assign('allowhtml','y');
} else {
@@ -838,6 +848,7 @@
// to avoid error messages. This can happen if some features are
// disabled
if(!isset($_REQUEST["description"])) $_REQUEST["description"]='';
+ if(!isset($_REQUEST["wiki_authors_style"]))
+ $_REQUEST["wiki_authors_style"]='';
if(!isset($_REQUEST["comment"])) $_REQUEST["comment"]='';
if(!isset($_REQUEST["lang"])) $_REQUEST["lang"]='';
if(!isset($_REQUEST['wysiwyg'])) $_REQUEST['wysiwyg'] = ''; @@ -894,7
+905,9 @@
$cachedlinks = array_diff($links, $notcachedlinks);
$tikilib->cache_links($cachedlinks);
*/
- $tikilib->create_page($_REQUEST["page"], 0, $edit, $tikilib->now,
$_REQUEST["comment"],$user,$_SERVER["REMOTE_ADDR"],$description, $pageLang,
$is_html, $hash, $_REQUEST['wysiwyg']);
+ $tikilib->create_page($_REQUEST["page"], 0, $edit, $tikilib->now,
$_REQUEST["comment"],$user,$_SERVER["REMOTE_ADDR"],$description, $pageLang,
$is_html, $hash, $_REQUEST['wysiwyg'], $wiki_authors_style);
+ $info_new = $tikilib->get_page_info($page);
+
if ($prefs['wiki_watch_author'] == 'y') {
$tikilib->add_user_watch($user,"wiki_page_changed",$_REQUEST["page"],'wiki
page',$page,"tiki-index.php?page=$page");
}
@@ -967,7 +980,8 @@
$edit .= "\r\n";
$edit = substr($info['data'], 0,
$real_start).$edit.substr($info['data'], $real_start + $real_len);
}
-
$tikilib->update_page($_REQUEST["page"],$edit,$_REQUEST["comment"],$user,$_S
ERVER["REMOTE_ADDR"],$description,$minor,$pageLang, $is_html, $hash, null,
$_REQUEST['wysiwyg']);
+
$tikilib->update_page($_REQUEST["page"],$edit,$_REQUEST["comment"],$user,$_S
ERVER["REMOTE_ADDR"],$description,$minor,$pageLang, $is_html, $hash, null,
$_REQUEST['wysiwyg'], $wiki_authors_style);
+ $info_new = $tikilib->get_page_info($page);
// Handle translation bits
if ($prefs['feature_multilingual'] == 'y' && !$minor) {
@@ -1021,7 +1035,7 @@
if ($tikilib->user_has_perm_on_object($user, $_REQUEST["page"],'wiki
page', 'tiki_p_admin_wiki', 'tiki_p_admin_categories'))
$userlib->copy_object_permissions($page_info["pageName"],
$_REQUEST["page"],'wiki page');
}
-
+
if ($page_ref_id) {
$url = "tiki-index.php?page_ref_id=$page_ref_id";
} else {
@@ -1030,6 +1044,8 @@
if ($prefs['feature_best_language'] == 'y') {
$url .= '&bl=n';
}
+ $url .= '&saved_msg=y';
+
header("location: $url");
die;
} //save
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php_______________________________________________
Tikiwiki-cvs mailing list
Tikiwiki-cvs@...
https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/_______________________________________________
Tikiwiki-devel mailing list
Tikiwiki-devel@...
https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel
