[00:00] robertr bye all [00:43] Tiki|bot New Forum Posts: Inline editing - http://tiki.org/tiki-view_forum_thread.php?forumId=26&comments_parentId=48771 [01:20] Tiki-KGB 03arildb r47246 10trunk/lib/jquery_tiki/autoToc.js [01:20] Tiki-KGB [REVERT/r47217][FIX] Add the Tiki license header to autoToc.js [01:20] Tiki-KGB (I assume that is fine) [02:55] Tiki|bot Recent Bug: - Switching perspectives should have URL of the home page of that perspective, instead of tiki-index.php - http://dev.tiki.org/item4691 [07:05] Tiki|bot Recent Bug: - t.o 11.x: left column overlapping central column and flip left column is unclickable with Webkit - http://dev.tiki.org/item4692 [07:05] Tiki|bot Recent Bug: - http://i18n.tiki.org/Status shows fatal error - http://dev.tiki.org/item4693 [07:36] Tiki-KGB 03xavidp r47247 10trunk/lang/ca/language.php * a few strings translated [08:38] Telesight joined #tikiwiki [09:45] changi|lowcon marclaporte: releae or not release ? [09:46] * changi back to normal connection :) [10:03] Robepower joined #tikiwiki [10:03] Robepower Hi [10:04] Robepower Can someone help me to apply a profile for my Tiki Wiki page ? [10:04] Robepower I have tried and it works for a little bit but nothing happens [10:44] Tiki-KGB 03changi67 r47248 10trunk/ 10(28 files in 16 dirs) * no changes - see qa.tiki.org [11:12] eliasp joined #tikiwiki [11:32] chibaguy joined #tikiwiki [11:32] fabricius joined #tikiwiki [13:25] Tiki|bot New Forum Posts: Spider Chart? - http://tiki.org/tiki-view_forum_thread.php?forumId=4&comments_parentId=48776 [13:40] Tiki-KGB 03changi67 r47249 10trunk/lib/wiki-plugins/wikiplugin_youtube.php * [FIX] Shorter check need a valid regexp too [13:59] arildb joined #tikiwiki [14:28] Tiki-KGB 03changi67 r47250 10branches/11.x/lib/wiki-plugins/wikiplugin_youtube.php * [ENH] Let's try to di this more rock solid [14:32] Tiki-KGB 03changi67 r47251 10trunk/lib/wiki-plugins/wikiplugin_youtube.php 10trunk * [MRG] Automatic merge, branches/11.x 47225 to 47250 [14:40] Tiki-KGB 03changi67 r47252 10trunk/lib/test/wiki-plugins/YoutubeTest.php * [ADD] More tests for youtube [14:58] Tiki-KGB 03jonnybradley r47253 10trunk/templates/modules/mod-quickadmin.tpl [14:58] Tiki-KGB [FIX] quickadmin: Recent prefs menu triangle had disappeared again - seems if class="sf-arrows" is on the UL tag in the page, superfish removes that class so the CSS doesn't apply anymore (sure that was the other way round last time?) [15:02] nkoth|nelson joined #tikiwiki [15:06] chibaguy joined #tikiwiki [15:21] chibaguy joined #tikiwiki [15:28] nkoth|nelson joined #tikiwiki [15:32] Tiki-KGB 03jonnybradley r47254 10branches/11.x/lib/jquery_tiki/tiki-connect.js [15:32] Tiki-KGB [FIX] connect: Various fixes, mainly $spinner var not found, but added a hasOwnProperty check and some jquery selector optimisations. [15:36] Tiki-KGB 03jonnybradley r47255 10branches/11.x/lib/jquery_tiki/tiki-maps.js [15:36] Tiki-KGB [FIX] maps: Don't create a marker if you don't know where to put it (e.g. when a location defaults to 0,0,1 somehow) [15:41] Tiki|bot joined #tikiwiki [15:44] Tiki-KGB 03jonnybradley r47256 10trunk/lib/jquery_tiki/tiki-connect.js 10trunk/lib/jquery_tiki/tiki-maps.js 10trunk * [MRG] Automatic merge, branches/11.x 47250 to 47255 [15:49] jonnyb joined #tikiwiki [15:50] jonnyb polom [15:53] arildb hi jonnyb [15:54] jonnyb hi arildb [16:00] Tiki-KGB 03jonnybradley r47257 10branches/11.x/lib/core/Tiki/Connect/Abstract.php * [FIX] connect: Add a few new prefs to the private and protected lists [16:02] Tiki-KGB 03jonnybradley r47258 10trunk/lib/core/Tiki/Connect/Abstract.php 10trunk * [MRG] Automatic merge, branches/11.x 47255 to 47257 [17:04] arildb For Location fields in trackers, users can "Search for location". When displaying this location the world map is displayed. I would like it to zoom to the street address I have specified [17:05] arildb For this I have prepared the function, and now I need to add the option. [17:05] arildb Where should I put it? [17:06] arildb The option is isZoomToFoundLocation. If set, the map will zoom. Otherwise the current behaviour is kept [17:06] arildb Does that sound correct? Should zooming be the default [17:08] arildb Should the new option use the "Google Maps" admin panel? [17:18] Tiki-KGB 03arildb r47259 10trunk/ 10lib/jquery_tiki/tiki-maps.js 10tiki-setup.php [17:18] Tiki-KGB [ENH] Option for zooming to "Search for location" result. [17:18] Tiki-KGB The option itself is still missing. Trying to figure out where to put it. [17:18] Tiki-KGB Switch hard-coded in tiki-setup.php. Set to keep current behaviour (world-view) [17:18] Tiki-KGB 03arildb r47260 10trunk/lib/jquery_tiki/tiki-maps.js * dos2unix [17:20] DKR joined #tikiwiki [17:22] DKR Trying to get Geshi running on TikiWiki v11. Cannot find a solution. Currently geshi is installed with 'apt-get install php-geshi'. How can it be activated in TikiWiki, and what is the correct color? [17:28] Tiki-KGB 03arildb r47261 10trunk/tiki-setup.php * [FIX] javascript error [17:30] arildb DKR, is this Geshi, the graph drawing program? [17:31] DKR GeSHi (Generic Syntax Highlighter) [17:31] arildb ah, right [17:32] arildb sorry, I don't know much about that [17:32] DKR I'm just looking for a way to show C++ sourcecode highlighted in the wiki. [17:46] DarkCalf joined #tikiwiki [17:58] DKR left #tikiwiki [18:00] Tiki-KGB 03arildb r47262 10trunk/ 10lib/prefs/geo.php 10templates/admin/include_maps.tpl 10tiki-setup.php [18:00] Tiki-KGB [FIX] Add option geo_zoom_to_found_location. When set "search for location" will center the map and zoom to the result. [18:00] Tiki-KGB The default is set to 'n', which keeps the current "world-view" zoom. [18:06] jonnyb arildb: seems inline editing is broken - there's a js syntax error in there now... looks like r47244 [18:07] Telesight joined #tikiwiki [18:13] jonnyb hmm, better fix it then... [18:17] arildb jonnyb: checking... [18:18] jonnyb is ok, i'm on it [18:18] arildb ok [18:18] jonnyb you can't set a default for a param in the function definition in js - that's php [18:28] Tiki-KGB 03jonnybradley r47263 10trunk/lib/ckeditor_tiki/tiki-ckeditor.js [18:28] Tiki-KGB [FIX] wysiwyg inline: Fix syntax error (js can't have defaults defined in function params like php) and refactor duplicated code [18:29] arildb thanks jonnyb ... I get a bit confused between all the languages sometimes .... [18:30] jonnyb easily done - maybe it works in some browsers (but not ones i use)? [18:32] Tiki-KGB 03jonnybradley r47264 10trunk/ 10styles/layout/design.css 10lib/jquery_tiki/tiki-jquery.js [18:32] Tiki-KGB [ENH] modal: General improvements for $.fn.modal (actually a busy spinner, doesn't need to be modal). [18:32] Tiki-KGB Better z-index handling and positioning using more CSS and (a little) less JS [18:38] Tiki-KGB 03jonnybradley r47265 10trunk/lib/core/Tiki/Connect/Abstract.php * [FIX] connect: A few more missing prefs from the private list [19:02] nkoth|nelson joined #tikiwiki [19:28] Tiki-KGB 03arildb r47266 10trunk/ 10lib/userslib.php 10tiki-index.php 10lib/ckeditor_tiki/wysiwyglib.php 10templates/tiki-wiki_topline.tpl [19:28] Tiki-KGB [NEW] Permission for inline editing only tiki_p_edit_inline. [19:28] Tiki-KGB The existing tiki_p_edit has implicitly tiki_p_edit_inline permissions. [19:40] Tiki-KGB 03arildb r47267 10trunk/lib/ckeditor_tiki/tiki-ckeditor.js * [FIX] svn ID [19:40] arildb In trunk my TortoiseSVN tells me that composer.lock is out of date. ..I think I have the latest composer updates installed. Should it be checked in? [19:43] jonnyb hmm, don't think anything's change in composer recently... did you run composer.phar update instead of composer.phar install maybe? [19:43] jonnyb just roll it back i guess [19:44] jonnyb arildb: i'm finding that inline editing of a normal wiki page now removes all the line ends - sure it was ok a little while ago [19:44] arildb looks ok on my side...will make a new test [19:44] jonnyb http://sourceforge.net/p/tikiwiki/code/47237 looks a bit wrong to me (wiki pages can have html in them, it's a property of the page and is checked in there somewhere) [19:46] arildb I haven't tested that case. The fix is needed for inline editing. [19:47] arildb Do you have a good wiki format test page? [19:47] jonnyb also http://sourceforge.net/p/tikiwiki/code/47201 looks to me like that autotoc code should be in tiki-index.php, not setup (which is run for every page in tiki, admin etc included) [19:47] arildb yes, that's probably better. Let me check it [19:47] jonnyb thanks [19:50] jonnyb $is_html is setup (properly i thought) in /lib/setup/editmode.php, r47237 seems to cancel out a lot of that logic, what was the problem it was fixing? [19:52] arildb jonnyb: No $is_html not always set correctly. See the case description: http://dev.tiki.org/inline%20editing#HTML_syntax_in_wiki_pages [19:53] arildb However, there may be better ways to solve the problem. [19:53] arildb Try to uncomment the fix and do the steps (if you have time) [19:54] jonnyb inline editing doesn't use tiki-editpage.php at all though, so i don't see how it helps that scenario [19:55] arildb yes, the error occurs in the conversion when using edit page (as far as I could see) [19:55] arildb pages in wiki format have is_html = 1 [19:56] jonnyb ok, well that bit should be sorted out in the $_REQUEST['mode_normal'] bit [19:56] jonnyb you code was in the global scope of the page (happening every load) [20:05] arildb Let me move the page display options from setup to index first. I will check the is_html case afterwards [20:14] Tiki-KGB 03arildb r47268 10trunk/ 10tiki-index.php 10tiki-setup.php [20:14] Tiki-KGB [FIX] Move new page display option processing from tiki-setup to tiki-index to avoid load every time. Only for wiki pages. Thanks jonnyb [20:14] jonnyb thank arildb :) [20:20] Tiki-KGB 03jonnybradley r47269 10trunk/templates/pagehistory.tpl * [FIX] history: Don't show diff if nothing to show [20:20] jonnyb arildb: seems on a simple wiki page the inline edit convert to wiki works sort of ok, just my test page has lots of plugins etc so the effect is magnified [20:21] jonnyb inline should really be using the tikiwiki plugin (and tikiplugin) - but not trivial... [20:22] arildb I am using wysiwyg-html, so I don't experience the conversion problems...only when testing [20:23] * jonnyb wonders "how hard can it be..." [20:24] arildb What's the benefit of using the plugings tikiwiki and tikiplugin? [20:42] arildb jonnyb: I looked some more http://sourceforge.net/p/tikiwiki/code/47237 [20:43] arildb The problem seems to occur when switching from wysiwyg-html to wiki text format. In tiki_pages wysiwyg=n, but is_html=1...after the conversion. [20:49] jonnyb yes, sounds wrong (that bit used to work) [20:49] jonnyb will test [20:50] jonnyb i've just given up on inline plugin editing - think it's possible but too tired now [20:53] jonnyb is_html gets set to 0 in the database, so far so good... [20:54] jonnyb seems to work fine here (with r47237 commented out) [20:55] arildb did you do the steps described on the "inline editing" page? [20:55] jonnyb yes, but retrying with feature_wiki_allowhtml disabled [20:56] arildb what occurs when switching iis... [20:57] jonnyb ah, you're right - disabling feature_wiki_allowhtml means is_html=1 in the data [20:57] arildb when the editor swicthes from wysiwyg-html to wiki format, all is good (in memory). is_html is converted to false. However nothing is saved. [20:58] arildb So, when tyhe user p�resses save, the is_html value from the stored data is used, which is is_html=1. [20:58] arildb Thus the converted page gets is_html is 1 [20:58] arildb The fix should be corrected, as it will "destroy" "allowhtml" settings [20:59] arildb maybe you have an idea for a better fix? [20:59] jonnyb but that would also mess up wiki pages intentionally with html in [20:59] jonnyb (it happens! :) ) [21:17] jonnyb arildb: found it! :) [21:17] arildb great! [21:17] jonnyb r47237 probably can go now [21:17] arildb please do [21:17] jonnyb it wasn't using the allowhtml set in the post request [21:18] arildb ok [21:18] Tiki-KGB 03jonnybradley r47270 10trunk/tiki-editpage.php [21:18] Tiki-KGB [FIX] html: Use allowhtml sent in request if set - prevents former html wysiwyg pages ending up as html ones (thanks arildb) [21:18] jonnyb thought i'd leave that one to you, if this works ;) [21:18] arildb ok [21:19] jonnyb that processPageDisplayOptions fn looks like it might be better in a library - the wiki one maybe? [21:20] jonnyb just a thought - i'm knackered, so off - back in a week or so [21:21] arildb ok jonnyb. see you then [21:21] arildb Yes, I can move processPageDisplayOption [21:42] Tiki-KGB 03arildb r47271 10trunk/tiki-editpage.php [21:42] Tiki-KGB [ROLLBACK][r47237[FIX] HTML syntax in wiki pages could occur with inline editing. [21:42] Tiki-KGB Fixed in a better way by r47270. thanks jonnyb [21:56] Tiki-KGB 03arildb r47272 10trunk/ 10lib/wiki/wikilib.php 10tiki-index.php * [REF] Move processPageDisplayOptions() from tiki-index to wikilib