From: Jonny B. <svn...@no...> - 2013-02-25 11:13:33
|
No, that does sound like a bug as it didn't use to to that - it was necessary to be able to have line breaks within paragraphs, but something's changed in the parser somewhere... seems to happen every few months (sigh). Also, the plan (discussed at the webinar) is currently to get rid of the need for a profile, and just make the wysiwyg feature depend on wiki-para etc (so i think the add_br thing needs fixing) Thanks for getting it started though, Luci :) jonny On 24 Feb 2013, at 05:55, Marc Laporte wrote: > hehe, one person's feature is another one's bugs... > > On Feb 23, 2013 9:51 PM, <lu...@us...> wrote: > Revision: 44956 > http://sourceforge.net/p/tikiwiki/code/44956 > Author: luciash > Date: 2013-02-24 02:51:29 +0000 (Sun, 24 Feb 2013) > Log Message: > ----------- > [FIX] CKEditor4 dev notice: remove obsolete Tiki 6 notice, modified the check for feature_wiki_paragraph_formatting_add_br - must be actually off to prevent unwanted paragraph creation on each edit ! some TODOs remain > > Modified Paths: > -------------- > trunk/lib/smarty_tiki/block.textarea.php > > Modified: trunk/lib/smarty_tiki/block.textarea.php > =================================================================== > --- trunk/lib/smarty_tiki/block.textarea.php 2013-02-24 01:54:43 UTC (rev 44955) > +++ trunk/lib/smarty_tiki/block.textarea.php 2013-02-24 02:51:29 UTC (rev 44956) > @@ -161,24 +161,26 @@ > } else { > // new ckeditor implementation 2010 > if ($prefs['feature_ajax'] !== 'y' || $prefs['ajax_autosave'] !== 'y' || > - $prefs['feature_wiki_paragraph_formatting'] !== 'y' || $prefs['feature_wiki_paragraph_formatting_add_br'] !== 'y' || > + $prefs['feature_wiki_paragraph_formatting'] !== 'y' || $prefs['feature_wiki_paragraph_formatting_add_br'] === 'y' || > $prefs['wysiwyg_wiki_parsed'] !== 'y') { > > // show dev notice > $smarty->loadPlugin('smarty_block_remarksbox'); > - $msg = tra('<strong>Thank you for trying the new ckeditor implementation for Tiki 6</strong><br /><br />'); > + $msg = ''; > > global $tiki_p_admin; > if ($tiki_p_admin) { > - $profile_link = 'tiki-admin.php?profile=WYSIWYG_6x&repository=http%3A%2F%2Fprofiles.tiki.org%2Fprofiles&page=profiles&list=List'; > + // TODO: Create the up-to-date profile for it (WYSIWYG_CKEditor4) > + $profile_link = 'tiki-admin.php?profile=WYSIWYG_CKEditor4&repository=http%3A%2F%2Fprofiles.tiki.org%2Fprofiles&page=profiles&list=List'; > + // TODO: Put check of what prefs are actually set up wrongly and list them in the msg > $msg .= tra("Some of your preferences should be set differently for this to work at it's best. Please click this to apply the recommended profile:") . > - ' <a href="'.$profile_link.'">WYSIWYG_6x</a>'; > + ' <a href="'.$profile_link.'">WYSIWYG CKEditor4 Profile</a>'; > } else { > $msg .= tra('Some of the settings at this site should be set differently for this to work best. Please ask the administrator to try this.'); > } > > $remrepeat = false; > - $html .= smarty_block_remarksbox(array( 'type'=>'info', 'icon'=>'bricks', 'title'=>tra('Ckeditor Development Notice')), $msg, $smarty, $remrepeat)."\n"; > + $html .= smarty_block_remarksbox(array( 'type'=>'info', 'icon'=>'bricks', 'title'=>tra('CKEditor Development Notice')), $msg, $smarty, $remrepeat)."\n"; > } > > // set up ckeditor > > This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. > > > ------------------------------------------------------------------------------ > Everyone hates slow websites. So do we. > Make your web apps faster with AppDynamics > Download AppDynamics Lite for free today: > http://p.sf.net/sfu/appdyn_d2d_feb > _______________________________________________ > Tikiwiki-cvs mailing list > Tik...@li... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > ------------------------------------------------------------------------------ > Everyone hates slow websites. So do we. > Make your web apps faster with AppDynamics > Download AppDynamics Lite for free today: > http://p.sf.net/sfu/appdyn_d2d_feb_______________________________________________ > Tikiwiki-cvs mailing list > Tik...@li... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs |