From: Gary Cunningham-L. <ga...@cu...> - 2008-04-30 01:48:38
|
Hi, I'm not sure I understand this change. Many (most?) of the country names used by Tiki are short versions. What is the rationale for changing just these four? -- Gary Jy...@us... wrote: > Revision: 12709 > http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=12709&view=rev > Author: Jyhem > Date: 2008-04-28 10:16:06 -0700 (Mon, 28 Apr 2008) > > Log Message: > ----------- > [FIX] Some country flags did not have the actual name of the country. This might break some references to the former country names. The impact in tracker fields of type 'country' is handled. > Added Paths: > ----------- > branches/1.10/img/flags/Republic_of_Macedonia.gif > branches/1.10/img/flags/Republic_of_Montenegro.gif > branches/1.10/img/flags/Republic_of_Serbia.gif > branches/1.10/img/flags/Russian_Federation.gif > > Removed Paths: > ------------- > branches/1.10/img/flags/Macedonia.gif > branches/1.10/img/flags/Montenegro.gif > branches/1.10/img/flags/Russia.gif > branches/1.10/img/flags/Serbia.gif > |
From: WEBER P. <Pat...@co...> - 2008-06-19 13:23:34
|
Hi Louis-Philippe, Your error 'You cannot download this file right now. Your score is low or file limit was reached.' seems a very bad idea to me. First of all, I think you forgot to add a test, since not everyone wants to block downloads for people with low score. More importantly, even with a test like this, tiki-download_file.php is used to display images (e.g. in wiki pages, file galleries, ...). I don't think the score should have any impact on those images. Even a user with a bad score should be able to display them. I may have misunderstood your commit, but if not, it is broken. Thanx to have a look at this, Nyloth. -----Original Message----- From: tik...@li... [mailto:tik...@li...] On Behalf Of lph...@us... Sent: Thursday 19 June 2008 15:13 To: tik...@li... Subject: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki: [13298] branches/1.10 Revision: 13298 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=13298&view=rev Author: lphuberdeau Date: 2008-06-19 06:13:10 -0700 (Thu, 19 Jun 2008) Log Message: ----------- [MOD] Enforce limitation to keep credits above 0 if negative credits are used Modified Paths: -------------- branches/1.10/lib/tikilib.php branches/1.10/tiki-download_file.php Modified: branches/1.10/lib/tikilib.php =================================================================== --- branches/1.10/lib/tikilib.php 2008-06-19 05:54:32 UTC (rev 13297) +++ branches/1.10/lib/tikilib.php 2008-06-19 13:13:10 UTC (rev 13298) @@ -934,11 +934,11 @@ if (!is_object($scorelib)) { include_once("lib/score/scorelib.php"); } - if ($user == 'admin' || !$user) { return; } + if ($user == 'admin' || !$user) { return true; } $event = $scorelib->get_event($event_type); if (!$event || !$event['score']) { - return; + return true; } $score = $event['score']; @@ -957,7 +957,7 @@ $bindvars[] = time(); } if ($this->getOne($query, $bindvars)) { - return; + return true; } $query = "delete from `tiki_users_score` where `user`=? and `event_id`=?"; @@ -967,11 +967,17 @@ $this->query($query, array($user, $event_id, time() + ($expire*60))); } + // Perform check to make sure score does not go below 0 with negative scores + $result = $this->query( "select userId from users_users where score + ? >= 0 and login = ?", + array( $score, $user ) ); + if( ! $row = $result->fetchRow( $result ) ) + return false; + $query = "update `users_users` set `score` = `score` + ? where `login`=?"; $event['id'] = $id; // just for debug $this->query($query, array($score, $user)); - return; + return true; } // List users by best scoring @@ -2276,10 +2282,13 @@ } if ($prefs['feature_score'] == 'y') { - $this->score_event($user, 'fgallery_download', $id); + if( ! $this->score_event($user, 'fgallery_download', $id) ) + return false; + $query = "select `user` from `tiki_files` where `fileId`=?"; $owner = $this->getOne($query, array((int)$id)); - $this->score_event($owner, 'fgallery_is_downloaded', "$user:$id"); + if( ! $this->score_event($owner, 'fgallery_is_downloaded', "$user:$id") ) + return false; } return true; Modified: branches/1.10/tiki-download_file.php =================================================================== --- branches/1.10/tiki-download_file.php 2008-06-19 05:54:32 UTC (rev 13297) +++ branches/1.10/tiki-download_file.php 2008-06-19 13:13:10 UTC (rev 13298) @@ -92,7 +92,13 @@ if ( ! isset($_GET['thumbnail']) && ! isset($_GET['icon']) ) { require_once('lib/stats/statslib.php'); - $tikilib->add_file_hit($_REQUEST['fileId']); + if( ! $tikilib->add_file_hit($_REQUEST['fileId']) ) + { + $smarty->assign('msg', tra('You cannot download this file right now. Your score is low or file limit was reached.')); + $smarty->display('error.tpl'); + die; + } + $statslib->stats_hit($info['filename'], 'file', $_REQUEST['fileId']); if ( $prefs['feature_actionlog'] == 'y' ) { 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 Tik...@li... https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs |
From: Marc L. <mar...@gm...> - 2008-06-25 19:03:33
|
Hi! +1 to this change. In my experience, people often don't even put a page name, and end up being offered to edit the HomePage. How about putting a warning message (ex.: pop up javascript) that people should enter a page name to edit? This would be even better: New module: search page name, search text, edit page http://dev.tikiwiki.org/tiki-view_tracker_item.php?itemId=480 Thanks! M ;-) > -----Original Message----- > From: Jy...@us... > [mailto:Jy...@us...] > Sent: June 25, 2008 11:42 AM > To: tik...@li... > Subject: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki: [13348] > branches/1.10 > > > Revision: 13348 > > http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=13348&view=rev > Author: Jyhem > Date: 2008-06-25 08:41:49 -0700 (Wed, 25 Jun 2008) > > Log Message: > ----------- > [ENH] People usually don't figure out that new pages can be > created by clicking 'Edit' > > Modified Paths: > -------------- > branches/1.10/lang/fr/language.php > branches/1.10/modules/mod-quick_edit.php > > Modified: branches/1.10/lang/fr/language.php > =================================================================== > --- branches/1.10/lang/fr/language.php 2008-06-25 > 15:24:45 UTC (rev 13347) > +++ branches/1.10/lang/fr/language.php 2008-06-25 > 15:41:49 UTC (rev 13348) > @@ -7194,5 +7194,6 @@ > "Tiki RSS feed for the wiki pages" => "Canal de syndication > RSS Tiki pour les pages Wiki", "Last modifications to the > Wiki." => "Dernières pages Wiki modifiées.", "The page is > empty" => "La page est vide", > +"Create/Edit" => "Créer/Modifier", > "###end###"=>"###end###"); > ?> > > Modified: branches/1.10/modules/mod-quick_edit.php > =================================================================== > --- branches/1.10/modules/mod-quick_edit.php 2008-06-25 > 15:24:45 UTC (rev 13347) > +++ branches/1.10/modules/mod-quick_edit.php 2008-06-25 > 15:41:49 UTC (rev 13348) > @@ -18,7 +18,7 @@ > if (isset($module_params["submit"])) { > $submit = $module_params["submit"]; > } else { > - $submit = tra('Edit','',true); > + $submit = tra('Create/Edit','',true); > } > if (isset($module_params["size"])) { > $size = $module_params["size"]; > > > 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 > Tik...@li... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > |
From: Rodrigo S. P. <rod...@gm...> - 2008-06-29 05:13:28
|
I've set the "Generate a password" field optional and the default is disable. But I think we could remove this option. It is useless. Anyone against? Rodrigo. On Sat, Jun 28, 2008 at 8:55 PM, Marc Laporte <ma...@ma...> wrote: > Thank you. This has been annoying me for years. > > M ;-) > > > > -----Original Message----- > > From: sam...@us... > > [mailto:sam...@us...] > > Sent: June 28, 2008 3:54 PM > > To: tik...@li... > > Subject: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki: [13384] > > branches/1.10 > > > > > > Revision: 13384 > > > > http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=13384&view=rev > > Author: sampaioprimo > > Date: 2008-06-28 12:53:31 -0700 (Sat, 28 Jun 2008) > > > > Log Message: > > ----------- > > [MOD] make generate a password in registration form optional > > and set default to 'n' > > > > Modified Paths: > > -------------- > > branches/1.10/lib/setup/prefs.php > > branches/1.10/templates/tiki-admin-include-login.tpl > > branches/1.10/templates/tiki-register.tpl > > branches/1.10/tiki-admin_include_login.php > > > > Modified: branches/1.10/lib/setup/prefs.php > > =================================================================== > > --- branches/1.10/lib/setup/prefs.php 2008-06-28 18:35:37 UTC > > (rev 13383) > > +++ branches/1.10/lib/setup/prefs.php 2008-06-28 19:53:31 UTC > > (rev 13384) > > @@ -640,6 +640,7 @@ > > $prefs['email_due'] = -1; > > $prefs['unsuccessful_logins'] = -1; > > $prefs['rnd_num_reg'] = 'n'; > > + $prefs['generate_password'] = 'n'; > > $prefs['auth_method'] = 'tiki'; > > $prefs['auth_pear'] = 'tiki'; > > $prefs['auth_create_user_tiki'] = 'n'; > > > > Modified: branches/1.10/templates/tiki-admin-include-login.tpl > > =================================================================== > > --- branches/1.10/templates/tiki-admin-include-login.tpl > > 2008-06-28 18:35:37 UTC (rev 13383) > > +++ branches/1.10/templates/tiki-admin-include-login.tpl > > 2008-06-28 19:53:31 UTC (rev 13384) > > @@ -118,6 +118,7 @@ > > <tr><td class="form">{tr}Password invalid after > > days{/tr}:</td><td><input type="text" name="pass_due" > > value="{$prefs.pass_due|escape}" /><i>{tr}-1 for > > never{/tr}</i></td></tr> <tr><td > > class="form">{tr}Re-validate user by email after > > days{/tr}:</td><td><input type="text" name="email_due" > > value="{$prefs.email_due|escape}" /><i>{tr}-1 for > > never{/tr}</i></td></tr> <tr><td > > class="form">{tr}Re-validate user by email after unsuccessful > > logins{/tr}:</td><td><input type="text" > > name="unsuccessful_logins" > > value="{$prefs.unsuccessful_logins|escape}" /><i>{tr}-1 for > > never{/tr}</i></td></tr> > > +<tr><td class="form">{tr}Generate a password > > +option{/tr}:</td><td><input type="checkbox" > > name="generate_password" {if $prefs.generate_password eq > > 'y'}checked="checked"{/if}/></td></tr> > > <tr><td class="form">{tr}HTTPS login{/tr}:</td><td > > class="form"> <select name="https_login"> <option > > value="disabled"{if $prefs.https_login eq 'disabled'} > > selected="selected"{/if}>{tr}Disabled{/tr}</option> > > > > Modified: branches/1.10/templates/tiki-register.tpl > > =================================================================== > > --- branches/1.10/templates/tiki-register.tpl 2008-06-28 > > 18:35:37 UTC (rev 13383) > > +++ branches/1.10/templates/tiki-register.tpl 2008-06-28 > > 19:53:31 UTC (rev 13384) > > @@ -98,9 +98,11 @@ > > </div> > > <br /> > > > > - <table class="normal"> > > - <tr><td class="formcolor"><a class="link" > > href="javascript:genPass('genepass','pass1','pass2');">{tr}Gen > > erate a password{/tr}</a></td> > > - <td class="formcolor"><input id='genepass' type="text" /></td> > > - </tr> > > - </table> > > + {if $prefs.generate_password eq 'y'} > > + <table class="normal"> > > + <tr><td class="formcolor"><a class="link" > > href="javascript:genPass('genepass','pass1','pass2');">{tr}Gen > > erate a password{/tr}</a></td> > > + <td class="formcolor"><input id='genepass' > > type="text" /></td> > > + </tr> > > + </table> > > + {/if} > > {/if} > > > > Modified: branches/1.10/tiki-admin_include_login.php > > =================================================================== > > --- branches/1.10/tiki-admin_include_login.php > > 2008-06-28 18:35:37 UTC (rev 13383) > > +++ branches/1.10/tiki-admin_include_login.php > > 2008-06-28 19:53:31 UTC (rev 13384) > > @@ -43,7 +43,7 @@ > > simple_set_toggle('feature_challenge'); > > simple_set_toggle('feature_clear_passwords'); > > simple_set_toggle('forgotPass'); > > - simple_set_value('feature_crypt_passwords'); > > + simple_set_toggle('generate_password'); > > simple_set_value('https_login'); > > simple_set_toggle('feature_show_stay_in_ssl_mode'); > > simple_set_toggle('feature_switch_ssl_mode'); > > > > > > 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 > > Tik...@li... > > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > > > > > ------------------------------------------------------------------------- > 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 > Tik...@li... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > |
From: Jean-Marc L. <jea...@gm...> - 2008-06-29 08:54:27
|
Removing the option seems a bit exteme. We are not sure nobody uses it. Imagine someone creating 20 accounts in a row with one-tme passwords. Wouldn't they like to have the passwords generated for them ? Jyhem On Sun, Jun 29, 2008 at 7:13 AM, Rodrigo Sampaio Primo <rod...@gm...> wrote: > I've set the "Generate a password" field optional and the default is > disable. But I think we could remove this option. It is useless. Anyone > against? > > Rodrigo. > > On Sat, Jun 28, 2008 at 8:55 PM, Marc Laporte <ma...@ma...> wrote: >> >> Thank you. This has been annoying me for years. >> >> M ;-) >> >> >> > -----Original Message----- >> > From: sam...@us... >> > [mailto:sam...@us...] >> > Sent: June 28, 2008 3:54 PM >> > To: tik...@li... >> > Subject: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki: [13384] >> > branches/1.10 >> > >> > >> > Revision: 13384 >> > >> > http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=13384&view=rev >> > Author: sampaioprimo >> > Date: 2008-06-28 12:53:31 -0700 (Sat, 28 Jun 2008) >> > >> > Log Message: >> > ----------- >> > [MOD] make generate a password in registration form optional >> > and set default to 'n' >> > >> > Modified Paths: >> > -------------- >> > branches/1.10/lib/setup/prefs.php >> > branches/1.10/templates/tiki-admin-include-login.tpl >> > branches/1.10/templates/tiki-register.tpl >> > branches/1.10/tiki-admin_include_login.php >> > >> > Modified: branches/1.10/lib/setup/prefs.php >> > =================================================================== >> > --- branches/1.10/lib/setup/prefs.php 2008-06-28 18:35:37 UTC >> > (rev 13383) >> > +++ branches/1.10/lib/setup/prefs.php 2008-06-28 19:53:31 UTC >> > (rev 13384) >> > @@ -640,6 +640,7 @@ >> > $prefs['email_due'] = -1; >> > $prefs['unsuccessful_logins'] = -1; >> > $prefs['rnd_num_reg'] = 'n'; >> > + $prefs['generate_password'] = 'n'; >> > $prefs['auth_method'] = 'tiki'; >> > $prefs['auth_pear'] = 'tiki'; >> > $prefs['auth_create_user_tiki'] = 'n'; >> > >> > Modified: branches/1.10/templates/tiki-admin-include-login.tpl >> > =================================================================== >> > --- branches/1.10/templates/tiki-admin-include-login.tpl >> > 2008-06-28 18:35:37 UTC (rev 13383) >> > +++ branches/1.10/templates/tiki-admin-include-login.tpl >> > 2008-06-28 19:53:31 UTC (rev 13384) >> > @@ -118,6 +118,7 @@ >> > <tr><td class="form">{tr}Password invalid after >> > days{/tr}:</td><td><input type="text" name="pass_due" >> > value="{$prefs.pass_due|escape}" /><i>{tr}-1 for >> > never{/tr}</i></td></tr> <tr><td >> > class="form">{tr}Re-validate user by email after >> > days{/tr}:</td><td><input type="text" name="email_due" >> > value="{$prefs.email_due|escape}" /><i>{tr}-1 for >> > never{/tr}</i></td></tr> <tr><td >> > class="form">{tr}Re-validate user by email after unsuccessful >> > logins{/tr}:</td><td><input type="text" >> > name="unsuccessful_logins" >> > value="{$prefs.unsuccessful_logins|escape}" /><i>{tr}-1 for >> > never{/tr}</i></td></tr> >> > +<tr><td class="form">{tr}Generate a password >> > +option{/tr}:</td><td><input type="checkbox" >> > name="generate_password" {if $prefs.generate_password eq >> > 'y'}checked="checked"{/if}/></td></tr> >> > <tr><td class="form">{tr}HTTPS login{/tr}:</td><td >> > class="form"> <select name="https_login"> <option >> > value="disabled"{if $prefs.https_login eq 'disabled'} >> > selected="selected"{/if}>{tr}Disabled{/tr}</option> >> > >> > Modified: branches/1.10/templates/tiki-register.tpl >> > =================================================================== >> > --- branches/1.10/templates/tiki-register.tpl 2008-06-28 >> > 18:35:37 UTC (rev 13383) >> > +++ branches/1.10/templates/tiki-register.tpl 2008-06-28 >> > 19:53:31 UTC (rev 13384) >> > @@ -98,9 +98,11 @@ >> > </div> >> > <br /> >> > >> > - <table class="normal"> >> > - <tr><td class="formcolor"><a class="link" >> > href="javascript:genPass('genepass','pass1','pass2');">{tr}Gen >> > erate a password{/tr}</a></td> >> > - <td class="formcolor"><input id='genepass' type="text" /></td> >> > - </tr> >> > - </table> >> > + {if $prefs.generate_password eq 'y'} >> > + <table class="normal"> >> > + <tr><td class="formcolor"><a class="link" >> > href="javascript:genPass('genepass','pass1','pass2');">{tr}Gen >> > erate a password{/tr}</a></td> >> > + <td class="formcolor"><input id='genepass' >> > type="text" /></td> >> > + </tr> >> > + </table> >> > + {/if} >> > {/if} >> > >> > Modified: branches/1.10/tiki-admin_include_login.php >> > =================================================================== >> > --- branches/1.10/tiki-admin_include_login.php >> > 2008-06-28 18:35:37 UTC (rev 13383) >> > +++ branches/1.10/tiki-admin_include_login.php >> > 2008-06-28 19:53:31 UTC (rev 13384) >> > @@ -43,7 +43,7 @@ >> > simple_set_toggle('feature_challenge'); >> > simple_set_toggle('feature_clear_passwords'); >> > simple_set_toggle('forgotPass'); >> > - simple_set_value('feature_crypt_passwords'); >> > + simple_set_toggle('generate_password'); >> > simple_set_value('https_login'); >> > simple_set_toggle('feature_show_stay_in_ssl_mode'); >> > simple_set_toggle('feature_switch_ssl_mode'); >> > >> > >> > 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 >> > Tik...@li... >> > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs >> > >> >> >> ------------------------------------------------------------------------- >> 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 >> Tik...@li... >> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > > > ------------------------------------------------------------------------- > 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-devel mailing list > Tik...@li... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel > > |
From: Marc L. <ma...@ma...> - 2008-06-29 15:24:16
|
Optional with default to off is fine. It should have been like this since day one. Password generator probably doesn't respect the criteria that you can set somewhere else. Ex.: min length M ;-) > -----Original Message----- > From: Jean-Marc Libs [mailto:jea...@gm...] > Sent: June 29, 2008 10:55 AM > To: Tikiwiki developers > Subject: Re: [Tikiwiki-devel] [Tikiwiki-cvs/svn] SF.net SVN: > tikiwiki:[13384] branches/1.10 > > > Removing the option seems a bit exteme. We are not sure > nobody uses it. > > Imagine someone creating 20 accounts in a row with one-tme > passwords. Wouldn't they like to have the passwords generated > for them ? > > Jyhem > > On Sun, Jun 29, 2008 at 7:13 AM, Rodrigo Sampaio Primo > <rod...@gm...> wrote: > > I've set the "Generate a password" field optional and the > default is > > disable. But I think we could remove this option. It is useless. > > Anyone against? > > > > Rodrigo. > > > > On Sat, Jun 28, 2008 at 8:55 PM, Marc Laporte > <ma...@ma...> > > wrote: > >> > >> Thank you. This has been annoying me for years. > >> > >> M ;-) > >> > >> > >> > -----Original Message----- > >> > From: sam...@us... > >> > [mailto:sam...@us...] > >> > Sent: June 28, 2008 3:54 PM > >> > To: tik...@li... > >> > Subject: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki: [13384] > >> > branches/1.10 > >> > > >> > > >> > Revision: 13384 > >> > > >> > http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=13384&view=rev > >> > Author: sampaioprimo > >> > Date: 2008-06-28 12:53:31 -0700 (Sat, 28 Jun 2008) > >> > > >> > Log Message: > >> > ----------- > >> > [MOD] make generate a password in registration form optional and > >> > set default to 'n' > >> > > >> > Modified Paths: > >> > -------------- > >> > branches/1.10/lib/setup/prefs.php > >> > branches/1.10/templates/tiki-admin-include-login.tpl > >> > branches/1.10/templates/tiki-register.tpl > >> > branches/1.10/tiki-admin_include_login.php > >> > > >> > Modified: branches/1.10/lib/setup/prefs.php > >> > > =================================================================== > >> > --- branches/1.10/lib/setup/prefs.php 2008-06-28 > 18:35:37 UTC (rev > >> > 13383) > >> > +++ branches/1.10/lib/setup/prefs.php 2008-06-28 19:53:31 UTC > >> > (rev 13384) > >> > @@ -640,6 +640,7 @@ > >> > $prefs['email_due'] = -1; > >> > $prefs['unsuccessful_logins'] = -1; > >> > $prefs['rnd_num_reg'] = 'n'; > >> > + $prefs['generate_password'] = 'n'; > >> > $prefs['auth_method'] = 'tiki'; > >> > $prefs['auth_pear'] = 'tiki'; > >> > $prefs['auth_create_user_tiki'] = 'n'; > >> > > >> > Modified: branches/1.10/templates/tiki-admin-include-login.tpl > >> > > =================================================================== > >> > --- branches/1.10/templates/tiki-admin-include-login.tpl > >> > 2008-06-28 18:35:37 UTC (rev 13383) > >> > +++ branches/1.10/templates/tiki-admin-include-login.tpl > >> > 2008-06-28 19:53:31 UTC (rev 13384) > >> > @@ -118,6 +118,7 @@ > >> > <tr><td class="form">{tr}Password invalid after > >> > days{/tr}:</td><td><input type="text" name="pass_due" > >> > value="{$prefs.pass_due|escape}" /><i>{tr}-1 for > >> > never{/tr}</i></td></tr> <tr><td > class="form">{tr}Re-validate user > >> > by email after days{/tr}:</td><td><input type="text" > >> > name="email_due" value="{$prefs.email_due|escape}" > /><i>{tr}-1 for > >> > never{/tr}</i></td></tr> <tr><td > >> > class="form">{tr}Re-validate user by email after unsuccessful > >> > logins{/tr}:</td><td><input type="text" > >> > name="unsuccessful_logins" > >> > value="{$prefs.unsuccessful_logins|escape}" /><i>{tr}-1 for > >> > never{/tr}</i></td></tr> > >> > +<tr><td class="form">{tr}Generate a password > >> > +option{/tr}:</td><td><input type="checkbox" > >> > name="generate_password" {if $prefs.generate_password eq > >> > 'y'}checked="checked"{/if}/></td></tr> > >> > <tr><td class="form">{tr}HTTPS login{/tr}:</td><td > class="form"> > >> > <select name="https_login"> <option value="disabled"{if > >> > $prefs.https_login eq 'disabled'} > >> > selected="selected"{/if}>{tr}Disabled{/tr}</option> > >> > > >> > Modified: branches/1.10/templates/tiki-register.tpl > >> > > =================================================================== > >> > --- branches/1.10/templates/tiki-register.tpl 2008-06-28 > 18:35:37 > >> > UTC (rev 13383) > >> > +++ branches/1.10/templates/tiki-register.tpl 2008-06-28 > >> > 19:53:31 UTC (rev 13384) > >> > @@ -98,9 +98,11 @@ > >> > </div> > >> > <br /> > >> > > >> > - <table class="normal"> > >> > - <tr><td class="formcolor"><a class="link" > >> > href="javascript:genPass('genepass','pass1','pass2');">{tr}Gen > >> > erate a password{/tr}</a></td> > >> > - <td class="formcolor"><input id='genepass' > type="text" /></td> > >> > - </tr> > >> > - </table> > >> > + {if $prefs.generate_password eq 'y'} > >> > + <table class="normal"> > >> > + <tr><td class="formcolor"><a class="link" > >> > href="javascript:genPass('genepass','pass1','pass2');">{tr}Gen > >> > erate a password{/tr}</a></td> > >> > + <td class="formcolor"><input id='genepass' > >> > type="text" /></td> > >> > + </tr> > >> > + </table> > >> > + {/if} > >> > {/if} > >> > > >> > Modified: branches/1.10/tiki-admin_include_login.php > >> > > =================================================================== > >> > --- branches/1.10/tiki-admin_include_login.php > >> > 2008-06-28 18:35:37 UTC (rev 13383) > >> > +++ branches/1.10/tiki-admin_include_login.php > >> > 2008-06-28 19:53:31 UTC (rev 13384) > >> > @@ -43,7 +43,7 @@ > >> > simple_set_toggle('feature_challenge'); > >> > simple_set_toggle('feature_clear_passwords'); > >> > simple_set_toggle('forgotPass'); > >> > - simple_set_value('feature_crypt_passwords'); > >> > + simple_set_toggle('generate_password'); > >> > simple_set_value('https_login'); > >> > simple_set_toggle('feature_show_stay_in_ssl_mode'); > >> > simple_set_toggle('feature_switch_ssl_mode'); > >> > > >> > > >> > 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 Tik...@li... > >> > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > >> > > >> > >> > >> > --------------------------------------------------------------------- > >> ---- > >> 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 > >> Tik...@li... > >> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > > > > > > > ---------------------------------------------------------------------- > > --- > > 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-devel mailing list > > Tik...@li... > > https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel > > > > > > -------------------------------------------------------------- > ----------- > 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-devel mailing list Tik...@li... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel > |
From: Sylvie G. <sgr...@gm...> - 2008-06-30 11:29:01
|
And what about trying to format the plugin template names? I know that it is not homogeneous for the plugins (and we can not rename them because of the possible overwritting) But why not using this name templates/wiki-plugins/wikiplugin_listpages.tpl as it is done for the majority of templates.... On Mon, 2008-06-30 at 03:08 -0700, pk...@us... wrote: > Revision: 13387 > http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=13387&view=rev > Author: pkdille > Date: 2008-06-30 03:08:19 -0700 (Mon, 30 Jun 2008) > > Log Message: > ----------- > [ADD] listpages plugin > > Added Paths: > ----------- > branches/1.10/lib/wiki-plugins/wikiplugin_listpages.php > branches/1.10/templates/wikiplugin_listpagenames.tpl > > Added: branches/1.10/lib/wiki-plugins/wikiplugin_listpages.php > =================================================================== > --- branches/1.10/lib/wiki-plugins/wikiplugin_listpages.php (rev 0) > +++ branches/1.10/lib/wiki-plugins/wikiplugin_listpages.php 2008-06-30 10:08:19 UTC (rev 13387) > @@ -0,0 +1,72 @@ > +<?php > +// $Header: /cvsroot/tikiwiki/_mods/wiki-plugins/listpages/wiki-plugins/wikiplugin_listpages.php,v 1.3 2007-04-19 16:22:47 sylvieg Exp $ > +function wikiplugin_listpages_help() { > + $help = tra("List wiki pages."); > + $help .= "<br />"; > + $help .= "~np~{LISTPAGES(initial=txt, showNameOnly=y|n, categId=id, structHead=y|n, showPageAlias=y|n, offset=num, max=num, find=txt, exact_match=y|n, only_orphan_pages=y|n, for_list_pages=y|n)}{LISTPAGES}~/np~"; > + > + return $help; > +} > +function wikiplugin_listpages($data, $params) { > + global $prefs, $tiki_p_view, $tikilib, $smarty; > + > + if ( isset($prefs) ) { > + // Handle 1.10.x prefs > + $feature_listPages = $prefs['feature_listPages']; > + $feature_wiki = $prefs['feature_wiki']; > + } else { > + // Handle 1.9.x prefs > + global $feature_listPages, $feature_wiki; > + } > + > + if ( $feature_wiki != 'y' || $feature_listPages != 'y' || $tiki_p_view != 'y') { > + // the feature is disabled or the user can't read wiki pages > + return ''; > + } > + extract($params,EXTR_SKIP); > + $filter == array(); > + if (!isset($initial)) { > + if (isset($_REQUEST['initial'])) { > + $initial = $_REQUEST['initial']; > + } else { > + $initial = ''; > + } > + } > + if (!empty($categId)) { > + $filter['categId'] = $categId; > + } > + if (!empty($structHead) && $structHead == 'y') { > + $filter['structHead'] = $structHead; > + } > + if (!isset($offset)) { > + $offset = 0; > + } > + if (!isset($max)) { > + $max = -1; > + } > + if (!isset($sort)) { > + $sort = 'pageName_desc'; > + } > + if (!isset($find)) { > + $find = ''; > + } > + $exact_match = ( isset($exact_match) && $exact_match == 'y' ); > + $only_name = ( isset($showNameOnly) && $showNameOnly == 'y' ); > + $only_orphan_pages = ( isset($only_orphan_pages) && $only_orphan_pages == 'y' ); > + $for_list_pages = ( isset($for_list_pages) && $for_list_pages == 'y' ); > + $only_cant = false; > + > + $listpages = $tikilib->list_pages($offset, $max, $sort, $find, $initial, $exact_match, $only_name, $for_list_pages, $only_orphan_pages, $filter, $only_cant); > + > + $smarty->assign_by_ref('listpages', $listpages['data']); > + if (!empty($showPageAlias) && $showPageAlias == 'y') > + $smarty->assign_by_ref('showPageAlias', $showPageAlias); > + if (isset($showNameOnly) && $showNameOnly == 'y') { > + $ret = $smarty->fetch('wiki-plugins/wikiplugin_listpagenames.tpl'); > + } else { > + $ret = $smarty->fetch('tiki-listpages_content.tpl'); > + } > + > + return '~np~'.$ret.'~/np~'; > +} > +?> > > Added: branches/1.10/templates/wikiplugin_listpagenames.tpl > =================================================================== > --- branches/1.10/templates/wikiplugin_listpagenames.tpl (rev 0) > +++ branches/1.10/templates/wikiplugin_listpagenames.tpl 2008-06-30 10:08:19 UTC (rev 13387) > @@ -0,0 +1,16 @@ > +{* $Header: /cvsroot/tikiwiki/_mods/wiki-plugins/listpages/templates/wikiplugin_listpagenames.tpl,v 1.3 2007-04-19 16:33:25 sylvieg Exp $ *} > +{strip} > +<ul> > +{section name=ix loop=$listpages} > +<li> > + <a href="tiki-index.php?page={$listpages[ix].pageName|escape:"url"}" class="link" title="{tr}view{/tr}"> > + {if !empty($showPageAlias) and $showPageAlias eq 'y' and !empty($listpages[ix].page_alias)} > + {$listpages[ix].page_alias} > + {else} > + {$listpages[ix].pageName} > + {/if} > + </a> > +</li> > +{/section} > +</ul> > +{/strip} > \ No newline at end of file > > > 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 > Tik...@li... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs |
From: Jean-Marc L. <jea...@gm...> - 2008-07-06 19:25:41
|
What is the purpose of this ? If the purpose is that the website should give back an HTTP 401 code when people try to access a page, I don't think it's a good idea, because it would presumably prompt the browser to display a basic http authentication pop-up. As tikiwiki has it's own authentication mechanism, I fail to understand the point. Luckyly, my tests show that we still get an HTTP "200" code, even if the page displays "Permission denied you cannot view this section" --- starts tests--- libs@tirnanog:~/tmp$ wget http://localhost/~libs/test02/tiki-forums.php --19:55:52-- http://localhost/~libs/test02/tiki-forums.php => `tiki-forums.php' Résolution de localhost... 127.0.0.1 Connexion vers localhost|127.0.0.1|:80... connecté. requête HTTP transmise, en attente de la réponse... 200 OK Longueur: non spécifié [text/html] [ <=> ] 8 307 --.--K/s 19:55:52 (865.72 KB/s) - « tiki-forums.php » sauvegardé [8307] libs@tirnanog:~/tmp$ grep -i permission tiki-forums.php Permission denied you cannot view this section ---/end tests--- So, what are we trying to achieve ? Jyhem On Fri, Jul 4, 2008 at 8:33 PM, <sy...@us...> wrote: > Revision: 13437 > http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=13437&view=rev > Author: sylvieg > Date: 2008-07-04 11:33:34 -0700 (Fri, 04 Jul 2008) > > Log Message: > ----------- > set smarty errortype to 401 if permission denied > [...] > > Modified: branches/1.10/tiki-forums.php > =================================================================== > --- branches/1.10/tiki-forums.php 2008-07-04 13:44:06 UTC (rev 13436) > +++ branches/1.10/tiki-forums.php 2008-07-04 18:33:34 UTC (rev 13437) > @@ -22,6 +22,7 @@ > } > > if ($tiki_p_forum_read != 'y') { > + $smarty->assign('errortype', 401); > $smarty->assign('msg', tra("Permission denied you cannot view this section")); > > $smarty->display("error.tpl"); > |
From: Jean-Marc L. <jea...@gm...> - 2008-07-06 19:43:58
|
OK, I understood what was the point. It was explained in further commits (while I was doing tests and writing my question). Jyhem On Sun, Jul 6, 2008 at 9:25 PM, Jean-Marc Libs <jea...@gm...> wrote: > What is the purpose of this ? > > If the purpose is that the website should give back an HTTP 401 code > when people try to access a page, I don't think it's a good idea, > because it would presumably prompt the browser to display a basic http > authentication pop-up. As tikiwiki has it's own authentication > mechanism, I fail to understand the point. > > Luckyly, my tests show that we still get an HTTP "200" code, even if > the page displays "Permission denied you cannot view this section" > > --- starts tests--- > libs@tirnanog:~/tmp$ wget http://localhost/~libs/test02/tiki-forums.php > --19:55:52-- http://localhost/~libs/test02/tiki-forums.php > => `tiki-forums.php' > Résolution de localhost... 127.0.0.1 > Connexion vers localhost|127.0.0.1|:80... connecté. > requête HTTP transmise, en attente de la réponse... 200 OK > Longueur: non spécifié [text/html] > > [ <=> > > ] 8 307 --.--K/s > > 19:55:52 (865.72 KB/s) - « tiki-forums.php » sauvegardé [8307] > > libs@tirnanog:~/tmp$ grep -i permission tiki-forums.php > Permission > denied you cannot view this section > ---/end tests--- > > So, what are we trying to achieve ? > > Jyhem > > On Fri, Jul 4, 2008 at 8:33 PM, <sy...@us...> wrote: >> Revision: 13437 >> http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=13437&view=rev >> Author: sylvieg >> Date: 2008-07-04 11:33:34 -0700 (Fri, 04 Jul 2008) >> >> Log Message: >> ----------- >> set smarty errortype to 401 if permission denied >> > [...] >> >> Modified: branches/1.10/tiki-forums.php >> =================================================================== >> --- branches/1.10/tiki-forums.php 2008-07-04 13:44:06 UTC (rev 13436) >> +++ branches/1.10/tiki-forums.php 2008-07-04 18:33:34 UTC (rev 13437) >> @@ -22,6 +22,7 @@ >> } >> >> if ($tiki_p_forum_read != 'y') { >> + $smarty->assign('errortype', 401); >> $smarty->assign('msg', tra("Permission denied you cannot view this section")); >> >> $smarty->display("error.tpl"); >> > |
From: Marc L. <ma...@ma...> - 2008-07-20 21:16:09
|
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: ny...@us... [mailto:ny...@us...] Sent: June 30, 2008 10:23 AM To: tik...@li... Subject: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki: [13390] branches/1.10 Revision: 13390 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=13390&view=rev Author: 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_a... [truncated message content] |
From: Alexander M. <ma...@am...> - 2008-07-20 22:47:42
|
On Sonntag 20 Juli 2008, Marc Laporte wrote: > Hi Nyloth! > > +1 to these enhancements. (And to all your work!) +1 > 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. +1 Basically in Tiki everything is a feature and a perm. greets amette > > Thanks! -- http://amette.eu ma...@am... |
From: Rodrigo S. P. <rod...@gm...> - 2008-07-29 14:27:15
|
Hi Nyloth, I also think that the "Wiki authors style for each page" should be optional and off by default. If there is no time to do this, we should move this new feature to trunk. What do you think? And about the new way for handling ':' char I would appreciate if you could explain it. For me the problem is that now there are two almost identical strings to translate. Like "History" and "History:" or "Similar" and "Similar:". There is a good reason for having the ':' char inside the string? From the translator point of view this change represent more work :-) Thanks, Rodrigo. On Sun, Jul 20, 2008 at 7:47 PM, Alexander Mette <ma...@am...> wrote: > On Sonntag 20 Juli 2008, Marc Laporte wrote: > > Hi Nyloth! > > > > +1 to these enhancements. (And to all your work!) > +1 > > > 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. > +1 > Basically in Tiki everything is a feature and a perm. > > greets > amette > > > > > Thanks! > > > > -- > http://amette.eu > ma...@am... > > ------------------------------------------------------------------------- > 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-cvs mailing list > Tik...@li... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > |
From: Nyloth <ny...@ti...> - 2008-07-29 15:00:29
|
Hi Rodrigo, On Tuesday 29 July 2008 16:27:22 Rodrigo Sampaio Primo wrote: > Hi Nyloth, I also think that the "Wiki authors style for each page" should > be optional and off by default. If there is no time to do this, we should > move this new feature to trunk. What do you think? I agree (for the optional part). There is less work to make it optionnal compared to remove completely the feature. I'll try to do something quickly. > And about the new way for handling ':' char I would appreciate if you could > explain it. For me the problem is that now there are two almost identical > strings to translate. Like "History" and "History:" or "Similar" and > "Similar:". There is a good reason for having the ':' char inside the > string? From the translator point of view this change represent more work I think you misunderstood my change. In fact, it is intended to _reduce_ the number of strings to translate. You only have to translate "History", not "History:" anymore, even if both are used in the templates... I tried to explain this in my commit message, but it might not have been clear enough : ------------------------------------------------------------------------ r13361 | nyloth | 2008-06-26 16:57:38 +0200 (jeu, 26 jun 2008) | 5 lines [NEW] translation system : Now, if no translation has been found for strings which ends with a punctuation char like : ! or ; then try to translate punctuation separately (e.g. if the content is 'Login:' or 'Login :', then it will try to translate 'Login' and ':' separately). This should avoid duplicated strings like 'Login' and 'Login:' that were needed before (because there is no space before ':' in english, but there is one in others like french). I hope this will stop the endless nightmare to decide weither to put the ':' inside or outside the string to translate (now, we should put it inside the string between smarty {tra}{/tra} or when using php tra() function, but not in the language.php file). ------------------------------------------------------------------------ There was also some comments added by Jyhem in get_strings.php (and they should be automatically added to each language.php that are regenerated from get_strings) : ### Note for translators about translation of text ending with colons (':') ### ### Short version: it is not a problem that string "Login:" has no translation. Only "Login" needs to be translated. ### ### Technical justification: ### If a string ending with colon needs translating (like "{tr}Login:{/tr}") ### then TikiWiki tries to translate 'Login' and ':' separately. ### This allows to have only one translation for "{tr}Login{/tr}" and "{tr}Login:{/tr}" ### and it still allows to translate ":" as " :" for languages that ### need it (like french) ------------------------------------------------------------------------- I even commented the code of the tra() function : // If no translation has been found and if the string ends with a punctuation, // try to translate punctuation separately (e.g. if the content is 'Login:' or 'Login :', // then it will try to translate 'Login' and ':' separately). // This should avoid duplicated strings like 'Login' and 'Login:' that were needed before // (because there is no space before ':' in english, but there is one in others like french) If you need more explanations, feel free to ask, Nyloth. |
From: Rodrigo S. P. <rod...@gm...> - 2008-07-31 14:39:34
|
Hi Nyloth, ok for making "Wiki authors style" optional and thanks for the information about the new way for handling translation :-) Just one more think to consider. What do you think if we organize in the language.php so that strings like 'Login' and 'Login:' are put together? Not sure if this is hard to implement in get_strings.php or if it will make thinks harder in some way. I'm just thinking in a way to alert translators that they don't need to translate some strings in language.php. Other ideas? Cheers, Rodrigo. On Tue, Jul 29, 2008 at 12:00 PM, Nyloth <ny...@ti...> wrote: > Hi Rodrigo, > > On Tuesday 29 July 2008 16:27:22 Rodrigo Sampaio Primo wrote: > > Hi Nyloth, I also think that the "Wiki authors style for each page" > should > > be optional and off by default. If there is no time to do this, we should > > move this new feature to trunk. What do you think? > > I agree (for the optional part). There is less work to make it optionnal > compared to remove completely the feature. I'll try to do something > quickly. > > > And about the new way for handling ':' char I would appreciate if you > could > > explain it. For me the problem is that now there are two almost identical > > strings to translate. Like "History" and "History:" or "Similar" and > > "Similar:". There is a good reason for having the ':' char inside the > > string? From the translator point of view this change represent more work > > I think you misunderstood my change. In fact, it is intended to _reduce_ > the > number of strings to translate. You only have to translate "History", > not "History:" anymore, even if both are used in the templates... > > I tried to explain this in my commit message, but it might not have been > clear > enough : > > ------------------------------------------------------------------------ > r13361 | nyloth | 2008-06-26 16:57:38 +0200 (jeu, 26 jun 2008) | 5 lines > > [NEW] translation system : Now, if no translation has been found for > strings > which ends with a punctuation char like : ! or ; then try to translate > punctuation separately (e.g. if the content is 'Login:' or 'Login :', then > it > will try to translate 'Login' and ':' separately). This should avoid > duplicated strings like 'Login' and 'Login:' that were needed before > (because > there is no space before ':' in english, but there is one in others like > french). > > I hope this will stop the endless nightmare to decide weither to put the > ':' > inside or outside the string to translate (now, we should put it inside the > string between smarty {tra}{/tra} or when using php tra() function, but not > in the language.php file). > ------------------------------------------------------------------------ > > There was also some comments added by Jyhem in get_strings.php (and they > should be automatically added to each language.php that are regenerated > from > get_strings) : > > ### Note for translators about translation of text ending with colons (':') > ### > ### Short version: it is not a problem that string "Login:" has no > translation. Only "Login" needs to be translated. > ### > ### Technical justification: > ### If a string ending with colon needs translating (like > "{tr}Login:{/tr}") > ### then TikiWiki tries to translate 'Login' and ':' separately. > ### This allows to have only one translation for "{tr}Login{/tr}" > and "{tr}Login:{/tr}" > ### and it still allows to translate ":" as " :" for languages that > ### need it (like french) > > ------------------------------------------------------------------------- > > I even commented the code of the tra() function : > > // If no translation has been found and if the string ends with a > punctuation, > // try to translate punctuation separately (e.g. if the content is > 'Login:' > or 'Login :', > // then it will try to translate 'Login' and ':' separately). > // This should avoid duplicated strings like 'Login' and 'Login:' that were > needed before > // (because there is no space before ':' in english, but there is one in > others like french) > > > If you need more explanations, feel free to ask, > > Nyloth. > |
From: Nyloth <ny...@ti...> - 2008-08-01 22:57:57
|
Hi Rodrigo, On Thursday 31 July 2008 16:39:42 Rodrigo Sampaio Primo wrote: > Hi Nyloth, ok for making "Wiki authors style" optional and thanks for the > information about the new way for handling translation :-) Ok, I've just fixed this issue in SVN. > Just one more think to consider. What do you think if we organize in the > language.php so that strings like 'Login' and 'Login:' are put together? > Not sure if this is hard to implement in get_strings.php or if it will make > thinks harder in some way. I'm just thinking in a way to alert translators > that they don't need to translate some strings in language.php. Other > ideas? I would prefer not to have 'Login:' in language.php at all, so somebody should rename 'something:' into 'something' from every language.php, and be careful to keep existing translated strings when there is already one (either 'something:' or 'something'). I also would like that get_strings.php handle translations of features names when enabling or disabling them in admin panels. Currently it's not done, because there is a tra("%s enabled") in tiki-admin.php (%s is replaced by the feature variable name, like "feature_wiki"). We could for example add strings like "feature_wiki enabled" into lang/en/language.php , and ask get_strings to get strings from there too. Cheers, Nyloth |
From: Jean-Marc L. <jea...@gm...> - 2008-04-30 14:01:21
|
I am not aware that Tiki has a short version/full version concept. The name of the file is what is used everywhere, in drop-down boxes, etc. If TW is used in Council of Europe (not an imaginary example) and the name of a country is not listed as the actual name of the country, complaints abound. I used as reference: http://www.coe.int/t/dg1/legalcooperation/cepej/profiles/default_EN.asp? but afterwards (while answering you), I noticed that the real reference should be: http://www.coe.int/T/E/Com/About_Coe/Member_states/default.asp (the list in the first URL will actually be corrected soon to match the list in the second) (I just rolled back on Serbia and Macedonia) The only country where I did not follow the above list is Macedonia because it's much more complicated: http://en.wikipedia.org/wiki/Macedonia_naming_dispute I chose Republic of Macedonia for TW over "the former Yugoslav Republic of Macedonia" because the concerned people prefer it. Obviously, for the site I'm working on, we will still show "the former Yugoslav Republic of Macedonia" thanks to lang/en/custom.php I realise that for most countries, everybody prefers if you don't use their full name like French Republic or United Kingdom of Great Britain and Northern Ireland or Kindgom of the Netherlands or so on... For other countries, it is a touchy subject. On a related note, if someone has time on their hands, a "clean" way of handling countries would be to use the ISO codes for country flag files, and a database table with short and full names, and ordering. That would allow anyone to control the display of country names (and the display order) on a site by site basis without image files renaming. I hope this clears things up. Jean-Marc Libs On 4/30/08, Gary Cunningham-Lee <ga...@cu...> wrote: > Hi, > > I'm not sure I understand this change. Many (most?) of the country names > used by Tiki are short versions. What is the rationale for changing just > these four? > > -- Gary > > > Jy...@us... wrote: > > Revision: 12709 > > http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=12709&view=rev > > Author: Jyhem > > Date: 2008-04-28 10:16:06 -0700 (Mon, 28 Apr 2008) > > > > Log Message: > > ----------- > > [FIX] Some country flags did not have the actual name of the country. This might break some references to the former country names. The impact in tracker fields of type 'country' is handled. > > > Added Paths: > > ----------- > > branches/1.10/img/flags/Republic_of_Macedonia.gif > > branches/1.10/img/flags/Republic_of_Montenegro.gif > > branches/1.10/img/flags/Republic_of_Serbia.gif > > branches/1.10/img/flags/Russian_Federation.gif > > > > Removed Paths: > > ------------- > > branches/1.10/img/flags/Macedonia.gif > > branches/1.10/img/flags/Montenegro.gif > > branches/1.10/img/flags/Russia.gif > > branches/1.10/img/flags/Serbia.gif > > > > > > ------------------------------------------------------------------------- > This SF.net email is sponsored by the 2008 JavaOne(SM) Conference > Don't miss this year's exciting event. There's still time to save $100. > Use priority code J8TL2D2. > http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone > _______________________________________________ > > Tikiwiki-devel mailing list > Tik...@li... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel > |
From: Gary Cunningham-L. <ga...@cu...> - 2008-05-01 04:43:27
|
Thanks for the clarification. By "short versions" I meant the short form of country names as used in general conversation. This would seem to be the practical form to use in applications like Tiki so I was surprised to see, as exceptions, the change to longer versions for a few countries. But it's understandable that there are other considerations in such cases. :-) -- Gary Jean-Marc Libs wrote: > I am not aware that Tiki has a short version/full version concept. > The name of the file is what is used everywhere, in drop-down boxes, etc. > > If TW is used in Council of Europe (not an imaginary example) and the > name of a country is not listed as the actual name of the country, > complaints abound. > > I used as reference: > http://www.coe.int/t/dg1/legalcooperation/cepej/profiles/default_EN.asp? > > but afterwards (while answering you), I noticed that the real > reference should be: > http://www.coe.int/T/E/Com/About_Coe/Member_states/default.asp > (the list in the first URL will actually be corrected soon to match > the list in the second) > > (I just rolled back on Serbia and Macedonia) > > The only country where I did not follow the above list is Macedonia > because it's much more complicated: > http://en.wikipedia.org/wiki/Macedonia_naming_dispute > > I chose Republic of Macedonia for TW over "the former Yugoslav > Republic of Macedonia" because the concerned people prefer it. > Obviously, for the site I'm working on, we will still show "the former > Yugoslav Republic of Macedonia" thanks to lang/en/custom.php > > I realise that for most countries, everybody prefers if you don't use > their full name like French Republic or United Kingdom of Great > Britain and Northern Ireland or Kindgom of the Netherlands or so on... > For other countries, it is a touchy subject. > > On a related note, if someone has time on their hands, a "clean" way > of handling countries would be to use the ISO codes for country flag > files, and a database table with short and full names, and ordering. > That would allow anyone to control the display of country names (and > the display order) on a site by site basis without image files > renaming. > > I hope this clears things up. > Jean-Marc Libs > > > On 4/30/08, Gary Cunningham-Lee <ga...@cu...> wrote: >> Hi, >> >> I'm not sure I understand this change. Many (most?) of the country names >> used by Tiki are short versions. What is the rationale for changing just >> these four? >> >> -- Gary >> >> >> Jy...@us... wrote: >> > Revision: 12709 >> > http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=12709&view=rev >> > Author: Jyhem >> > Date: 2008-04-28 10:16:06 -0700 (Mon, 28 Apr 2008) >> > >> > Log Message: >> > ----------- >> > [FIX] Some country flags did not have the actual name of the country. This might break some references to the former country names. The impact in tracker fields of type 'country' is handled. >> >>> Added Paths: >> > ----------- >> > branches/1.10/img/flags/Republic_of_Macedonia.gif >> > branches/1.10/img/flags/Republic_of_Montenegro.gif >> > branches/1.10/img/flags/Republic_of_Serbia.gif >> > branches/1.10/img/flags/Russian_Federation.gif >> > >> > Removed Paths: >> > ------------- >> > branches/1.10/img/flags/Macedonia.gif >> > branches/1.10/img/flags/Montenegro.gif >> > branches/1.10/img/flags/Russia.gif >> > branches/1.10/img/flags/Serbia.gif >> > |