Tiki|bot: joined #tikiwiki Gwayne: joined #tikiwiki fabricius: joined #tikiwiki Tiki|bot: New Forum Posts: Module Visability Control - http://tiki.org/tiki-view_forum_thread.php?forumId=2&comments_parentId=50909 marclaporte: joined #tikiwiki Tiki|bot: joined #tikiwiki chibaguy: joined #tikiwiki Tiki|bot: joined #tikiwiki Tiki-KGB: 03chibaguy r49404 10trunk/styles/layout/design.css * [REF] Chosen selector widths conflict with Bootstrap grid. Tiki|bot: joined #tikiwiki Tiki-KGB: 03chibaguy r49405 10trunk/templates/ 10(12 files in 6 dirs) * [REF] Class "clear" replaced with "clearfix", for Bootstrap conformity.
03chibaguy r49406 10trunk/styles/layout/design.css * [REF] Class "clear" replaced with "clearfix", for Bootstrap conformity.
03chibaguy r49407 10trunk/templates/debug/function.debugger.tpl * [REF] Shift to bootstrap.css class for same effect.
03chibaguy r49408 10trunk/styles/layout/design.css * [REF] Shift to bootstrap.css class for same effect.
03chibaguy r49409 10trunk/templates/debug/function.debugger.tpl * [REF] Shift to bootstrap.css class for same effect.
03chibaguy r49410 10trunk/styles/layout/design.css * [REF] Shift to bootstrap.css class for same effect.
03chibaguy r49411 10trunk/styles/layout/design.css * [REF] Shift to bootstrap.css class for same effect.
03chibaguy r49412 10trunk/styles/layout/design.css
[REF] Some micromanagement rules removed. Hopefully the instances will be covered by bootstrappification. If not, these items can be addressed again.
03chibaguy r49413 10trunk/ 10templates/wiki_edit.tpl 10styles/layout/design.css 10templates/tiki-admin_notifications.tpl 10lib/toolbars/toolbarslib.php * [REF] Shift to bootstrap.css classes for same effect. Telesight: joined #tikiwiki
left #tikiwiki xavi: joined #tikiwiki Telesight: joined #tikiwiki redflo: joined #tikiwiki rodrigoprimo: joined #tikiwiki
joined #tikiwiki Tiki|bot: New Forum Posts: Module Visability Control - https://suite.tiki.org/tiki-view_forum_thread.php?forumId=2&comments_parentId=50909
New Forum Posts: Blank Page after adding Add This code - https://suite.tiki.org/tiki-view_forum_thread.php?forumId=4&comments_parentId=50902
New Forum Posts: Add New Syntax Tip to Gallery Upload - https://suite.tiki.org/tiki-view_forum_thread.php?forumId=4&comments_parentId=50896
New Forum Posts: Module Visability Control - http://tiki.org/tiki-view_forum_thread.php?forumId=2&comments_parentId=50909
New Forum Posts: Blank Page after adding Add This code - http://tiki.org/tiki-view_forum_thread.php?forumId=4&comments_parentId=50902
New Forum Posts: Add New Syntax Tip to Gallery Upload - http://tiki.org/tiki-view_forum_thread.php?forumId=4&comments_parentId=50896 fabricius: joined #tikiwiki jonnyb: joined #tikiwiki arildb: joined #tikiwiki jonnyb: polom xavi here too :) xavi: he he , hi jonnyb here too :-) jonnyb: guess this s5 in mobile mode conversation might be relevant to others...
it looks like this link: http://seeds4c.org/show:140125+El+programari+lliure+és+bo+per+a+tu?mobile_mode=y works ok in firefox but not in safari - odd...
in safari it looks like there's no html head element somehow xavi: mmm, jonnyb, it doesn't display the mobile mode in firefox for me in Android jonnyb: actually, if i go and switch to mobile also in firefox i get the same xavi: nor in chrome for android either jonnyb: i'm trying on normal browsers at the moment xavi: ok jonnyb: looks like tiki's not rendering the page properly in mobile mode xavi: in normal browsers on a pc (gnu/linux here at the moment): it works fine for me (Chrome and FF on Ubuntu) jonnyb: if you go into mobile mode first?
hmmm xavi: double checking, just in case, on the pc... luciash: hiiiiiiiya ! all jonnyb: polom luciash xavi: yes, confirmed. they both (ff and chrome) display the slideshow as expected on a pc -: jonnyb debugs xavi: hi luciash luciash: yo xavi jonnyb: xavi: that's very odd - for me i definitely get a page without any css or javascript in it xavi: mm, jonnyb, chrome 31 here. Maybe version specific issue? luciash: jonnyb: hi, it sounds like server side problem to me
jonnyb: memore exhausted or script timeout jonnyb: me 2 luciash: memory jonnyb: wonder if it's more smarty weirdness luciash: i have seen it recently on one of mine when i was messing with trackers
when i corrected my tracker fields item lists or links, it gone away... but generally i think it eat too many resources and my server got exhausted and responed by half-rendered pages after long loading jonnyb: aha, found it - __someone__ has overridden tiki_full.tpl in mobile and it's very out of date... ;) xavi: aha... (__someone__: is it going to be me???? :-) ) jonnyb: no... maybe not xavi: I didn't mean to do that, if it was me jonnyb: $Id: tiki_full.tpl 44972 2013-02-25 16:13:14Z luciash
:) xavi: oups jonnyb: no {* mobile *} comments :( luciash: huh ? Tiki|bot: joined #tikiwiki luciash: last february I did something on that file indeed
but what does it say ? jonnyb: looks like not you luciash - r44972 was innocent i think
html5 stuff luciash: i mean what you mean by "no {* mobile *} comments" ? jonnyb: in the mobile forked tpls i've been trying to add comments where stuff was changed to work in mobile, so updating them is easier
but looks like i didn't in this case
i think it was a left over from the (bad) old xajax days in tiki 6 xavi: ok
so that there are chances that jquery.s5 would work on mobile "as is", once this is fixed? lphuberdeau: joined #tikiwiki marclaporte: joined #tikiwiki jonnyb: maybe
just trying it locally on my phone (but for some reason it's showing my local 12.x in Spanish on my phone - wtf?)
hmm, sort of works... will commit xavi: hehe, your phone keeps trying to learn Spanish for you. Nice OS, then :-) jonnyb: ha ha Tiki-KGB: 03jonnybradley r49414 10branches/12.x/templates/styles/mobile/tiki_full.tpl
[FIX] mobile: Resync tiki_full.tpl to get slideshows working (sort of) in mobile mode (hadn't been updated since 2011! Thanks Xavi) jonnyb: i actually ended up on my local 11.x site, which is currently being Spanish xavi: ah, ok :-)
I'll update my server and retest :-) -: xavi loves svn
jonnyb loves svn 99% of the time xavi: :-)
jonnyb, gorgeous, it works for me in FF on Android! :-) jonnyb: 8) xavi: and (almost the) same for Chrome on Android. The only difference for me is that the background image of the theme is not loaded jonnyb: nice, not too bad then? xavi: mmm, oh, sorry, it seems to be loaded maybe, much in amich lighter grey
yes, not bad at all, In fact, almost perfect, I would say. Thanks! :-)
ok, to make it perfect in mobile, I might contribute, if I get some minor guidance... ;-)
the bottom bar, seems not mobile ready: too smal font for the text in that bottom bar
maybe some css is missing...
and once the buttons of the bottom bar are shown, they are way too small for mobile... and I might know already how to fix that... arildb_: joined #tikiwiki xavi: ok, fixing my previous findings: font size seems to be ok in jquery.s5 in mobile mode. Footer font size depends on the width of the screen, and that's why it looks too small when in a smartphone in portrait mode. In landscape, everything is much mroe readable, of course
but buttons size, yes, they need to be made mobile-ready... There i go right now then... -: xavi tries to fix this before his late lunch xavi: mmmm, jonnyb, I've updated locally the templates/tiki-show_page_raw.tpl to add the data-role="controlgroup" data-type="horizontal" in the div container of the icons & buttons, and data-role="button" inside the a tags (all conditional to {if $prefs.mobile_mode eq "y"}), but now way....
I see that the buttons and links (and container divs) are also present in ./vendor/jquery/jquery-s5/jquery.s5.js ...
... but I'm reluctant to change them there, since it's a file in "vendors", and in addition, I'm not sure of the translation to javascript of: {if $prefs.mobile_mode eq "y"}data-role="button" {/if} jonnyb: hmm, yes - jquery-s5 is a separate project run by Robert - think it's on github now?
so no tiki specific stuff should go in there
ok, off for lunch too, bbl Tiki|bot: joined #tikiwiki xavi: ok, thanks. bbl (lunch here also) MagicFab_: joined #tikiwiki
joined #tikiwiki Tiki-KGB: 03xavidp r49415 03branches/12.x/templates/styles/mobile/tiki-show_page_raw.tpl
[ENH]Tweaks to tiki-show_page_raw.tpl to make it adapted to mobile mode (work in progress, keeping changes between conditional if clauses so that this file could replace the original one in ./templates). Step 1 out of 2. Clone of original tpl to ease keeping track of changes.
03xavidp r49416 10branches/12.x/templates/styles/mobile/tiki-show_page_raw.tpl
[ENH]Tweaks to tiki-show_page_raw.tpl to make it adapted to mobile mode (work in progress, keeping changes between conditional if clauses so that this file could replace the original one in ./templates). Step 2 out of 2. Changes included. xavi: and I asked Robert on how to proceed to fix the size of those buttons in mobile mode
bbl arildb__: joined #tikiwiki jonnyb: joined #tikiwiki rodrigoprimo: joined #tikiwiki marclaporte: joined #tikiwiki jonnyb: hi marclaporte
backsoon... Tiki|bot: joined #tikiwiki
joined #tikiwiki MagicFab_: joined #tikiwiki jonnyb: joined #tikiwiki Tiki|bot: New Forum Posts: Tiki Webinars 2014 - http://tiki.org/tiki-view_forum_thread.php?forumId=26&comments_parentId=50913 xavi: polom-again jonnyb: re-hi xavi xavi: I'm willing to search for a pattern in $_SERVER['HTTP_REFERER'], in wikilib.php, but for some reason, var_dump($_SERVER['HTTP_REFERER']); returns null, unless I also do a var_dump($_SERVER);
hi jonnyb
how should I proceed, to be able to do some preg_match against $_SERVER['HTTP_REFERER'] inside wikilib.php?
Jyhem maybe ? marclaporte: joined #tikiwiki jonnyb: sry, here again xavi xavi: ok jonnyb: i don't really follow - you mean like a file search (in phpstorm for instance?) Tiki-KGB: 03lphuberdeau r49417 10trunk/lib/parser/parserlib.php * [FIX] Notice xavi: jonnyb: nope. just in the php code at run time.
I mean, do you know why var_dump($_SERVER['HTTP_REFERER']) returns null, but var_dump($_SERVER) returns all the $_SERVER values? Tiki-KGB: 03lphuberdeau r49418 10trunk/ 10(8 files in 7 dirs) jonnyb: of course... i can't see why that should happen - $_SERVER is just a "normal" array (sort of) Tiki-KGB: [NEW] Adding terms and conditions feature to manage terms page and make sure users approved the latest approved terms before accessing the site xavi: jonnyb: I mean, do you know why var_dump($_SERVER['HTTP_REFERER']) returns null, but var_dump($_SERVER) returns all the $_SERVER values? jonnyb: maybe HTTP_REFERER is just null? it would be empty if you go straight to a page (like by pasting in the url) xavi: and when var_dump($_SERVER['HTTP_REFERER']) is included next to var_dump($_SERVER), then var_dump($_SERVER['HTTP_REFERER']) displays the referes?
I'm playing with sefurf pages
I was to tweak wikilib.php to allow showing the presentation by including the alias of the page after the show. I.e.: "show:PageAlias"
let me explain: http://seeds4c.org/FCTiA is a page alias of the real page. Once written, the real page is shown. jonnyb: hmm, good luck - aliases are weird ;) xavi: however, when I type http://seeds4c.org/show:FCTiA , then the real page is shown through tiki-index.php, not through the tiki-slideshow.php
I managed to get the desired behavior with a preg_match to $_SERVER['HTTP_REFERER'] (to search for "show:" or "tiki-slideshow"), but for some reason, $_SERVER['HTTP_REFERER'] only gets the real value when I do a var_dump of the whole $_SERVER Tiki|bot: joined #tikiwiki yo_bj: joined #tikiwiki jonnyb: i don't understand why you're looking at the referrer? that's the page before the one you're on now
i think... yo_bj: hi all
anyone up for a toolbar question? jonnyb: hi yo_bj
go for it :) yo_bj: admin stuff: v 9.7, running on ubuntu 12.04 LTS
Trying to add the TOC formatting tool button to the wysiwyg toolbar, but even though I've saved it in Admin Toolbars, the button's not showing up in the editor for any user, including admin. I've cleared the cache and tested in multiple browsers. Any idea what's going on?
jonnyb: thx :) jonnyb: didn't know there was a TOC formatting tool button... yo_bj: https://doc.tiki.org/PluginMaketoc Tiki-KGB: 03lphuberdeau r49419 10branches/12.x/lib/jquery_tiki/tiki-jquery.js
[FIX] Trigger chosen event on update so the list gets updated, remove * for all -- which does not exist in any way, replace autocomplete filter with normal title search, which is less confusing with the search label jonnyb: are you using wysiwyg in wiki mode? or html (TOC is a wiki feature so won't work in html) yo_bj: looking at the config, so it might be a bit before I hunt that config line down jonnyb: on admin/wysiwyg
or you can just look at the source of a wysiwyg page MagicFab_: joined #tikiwiki yo_bj: cheers
page source is html
admin/wysiwyg has "content is parsed like wiki page" checked, along with the two sub options below it jonnyb: but "Use Wiki syntax in WYSIWYG" is off i'm guessing
{maketoc} will only work on wiki pages i'm afraid yo_bj: nope, that option is on
well, shoot. it was worth a try. thx for the help :) jonnyb: maybe the page was made before that was turned on yo_bj: will try to create a new page to see what happens jonnyb: try making a new page - the source should be in wiki syntax
then maybe maketoc will work (but not sure about it appearing on the toolbar) Tiki-KGB: 03lphuberdeau r49420 10trunk/lib/jquery_tiki/tiki-jquery.js 03trunk/templates/styles/mobile/tiki-show_page_raw.tpl 10trunk/templates/styles/mobile/tiki_full.tpl 10trunk * [MRG] Automatic merge, branches/12.x 49396 to 49419 yo_bj: gah - editor toolbar is now missing a lot more options
with the new page jonnyb: that's cos you're only seeing the non-html ones
hi arildb arildb: hi jonnyb yo_bj: sadly, i need the html options, so i guess maketoc will be out of reach xavi: ko, beyond myskills this $_SERVER['HTTP_REFERER'] thing jonnyb: yo_bj: you'll need to turn "Use Wiki syntax in WYSIWYG" off then
in tiki 12 there's an "autotoc" function arildb added, i think that works on html pages yo_bj: yep, that's what i did, created a new page and the html options are back
saw that jonnyb: :) yo_bj: it looks nice, but i'm stuck on 9 for a bit xavi: jonnyb, I looking at that because when I visit http://example.com/show:AliasName tiki returns http://example.com/RealPage instead of http://example.com/show:RealPage yo_bj: at least until i get time to upgrade
;) xavi: s/I looking/I was looking yo_bj: jonnyb: cheers for the help. at least i know why it wasn't working :) jonnyb: xavi: ah, i see - makes sense yo_bj: left #tikiwiki Tiki|bot: joined #tikiwiki xavi: I could fix that by adding $script_name = 'tiki-slideshow.php'; in wikilib.php, around line 1152 (function sefurl), but I need to know when the initial url contained "show:" or "tiki-slideshow.php"
and I don't know how to get that initial url once I'm there... $_SERVER['HTTP_REFERER'] was one way, but it gets null when you don't do var_dump($_SERVER). So I'm out of ideas... jonnyb: it's probably hidden away in route.php
sorry xavi, need to focus on this stuff (map weirdness) xavi: ok, np, thanks for feedback. Good luck with your map laberynth Tiki-KGB: 03lphuberdeau r49421 10trunk/lib/core/Services/User/ConditionsController.php * [MOD] Obtain the ideal terms and conditions translation for the user
03lphuberdeau r49422 10trunk/lib/core/Services/User/ConditionsController.php * [MOD] Do not check for terms multiple times within the same session
03xavidp r49423 10branches/12.x/lib/modules/modlib.php
[ENH]Improved documentation with the sections keywords shown explicitly to facilitate users' life. Thanks drsassafras for pointing that need in the forums. lphuberdeau: joined #tikiwiki surfhai: joined #tikiwiki Tiki-KGB: 03jonnybradley r49424 10branches/12.x/lib/jquery_tiki/tiki-maps.js
[FIX] maps: Create features from files in the usual "Editable" vector layer so previous ability to define the "depth" order form the {searchlayer} sub-plugin sort_mode param. Also use the properties.color setting from the file if it exists. Tiki|bot: joined #tikiwiki
joined #tikiwiki dmn_c: joined #tikiwiki Tiki-KGB: 03xavidp r49425 10branches/12.x/ 03img/icons/large/admin_panel48x48.png 10tiki-wizard_admin.php 10templates/tiki-wizard_admin.tpl 10templates/wizard/admin_wizard.tpl
[ENH]Admin wizard synchronized with the improved version in trunk, as agreed weeks ago in the devel list.
[bp/r49023]NULL (I only backported the addition of img/icons/large/admin_panel48x48.png out of that commit r49023)
[bp/r49047][FIX] Hide the admin wizard toc on the front page. Avoid indicating that it is the required process steps
[bp/r49048][FIX] Make the wizard toc items for the profiles part link to the correct page.
[bp/r49052][ENH]Minor changes to make the config wizard dialog clearer and more consisten.
[bp/r49071][MOD]Fix consistency with icon size. Add '12' to the congratulations message about the Tiki instance so that it can be applicable for upgrades also. Add more spacing between the two first lines.
[bp/r49072][FIX] Do not hard-code the version number
[bp/r49073][FIX] wording. The recommendation is to start with "this approach". Not any of the others
03lphuberdeau r49426 10branches/12.x/lib/core/Math/Formula/ 10Function/Avg.php 10Function/SplitList.php * [FIX] Handle empty lists in calculations kbishop: joined #tikiwiki Tiki|bot: New Forum Posts: images in dev.t.o/img/wiki_up/ gone? ("No route found") - http://tiki.org/tiki-view_forum_thread.php?forumId=26&comments_parentId=50918 kbishop: Hello I'm working with trunk as a developer and having issues loading bootstrap.js lphuberdeau: should get loaded by default in trunk kbishop: what if it doesn't? fabricius: joined #tikiwiki xavi: jonnyb or lphuberdeau: I'm to merge 12.x to trunk, and I get a tree conflict of an icon, which I cloned by hand from trunk to 12.x. But after svnbranchupdate.php, svn complains that the file remains in conflict
I tried the tips a our documentation at: http://dev.tiki.org/Commit+to+a+proposals+branch lphuberdeau: svn revert on the directory xavi: but neither "svn revolved this_file" nor "svn resolve --accept working this_file" work
opk, I'll try with revent (thanks)
revert Tiki-KGB: 03lphuberdeau r49427 10branches/12.x/lib/core/Search/ContentSource/CommentSource.php * [FIX] Notice kbishop: Working with trunk and having issues loading bootstrap.js. Any help would be appreciated Tiki|bot: joined #tikiwiki lphuberdeau: kbishop: I just verified, bootstrap.js is loaded in trunk and works just fine kbishop: Is there a way to set it up or something? lphuberdeau: bootstrap is bundled and enabled by default in trunk
you have nothing to do kbishop: ok what could it be than? lphuberdeau: are you getting any errors? kbishop: 404 not found
for bootstrap.js xavi: bbl kbishop: and bootstrap.min.css lphuberdeau: make sure to run composer kbishop: joined #tikiwiki
joined #tikiwiki xavi: back
lphuberdeau: the conflict is with img/icons/large/admin_panel48x48.png. But all the other files are merged ok.
how can I fix or revert just this file? lphuberdeau: if they are the same, it should be simpler just to revert xavi: I did cd img/icons/large/. And then: "svn revert ./"
and went back to tiki root, and run "svn ci -F svn-commit.tmp". however, it still compain that that file remains in conflict lphuberdeau: if it's a single file, do it on the file xavi: ok, I'll try. And do I need to re-launch the "php doc/devtools/svnbranchupdate.php branches/12.x"?
or just "svn ci -F svn-commit.tmp"? lphuberdeau: just the commit part xavi: ok lphuberdeau: the update script won't run anyway with files left to commit xavi: ok :-)
commit going through! thanks lphuberdeau Tiki-KGB: 03xavidp r49428 10(5 files in 4 dirs) * [MRG] Automatic merge, branches/12.x 49419 to 49426 xavi: I'll document that in http://dev.tiki.org/Semi-automatic+merging+period#Merging_from_stable_to_trunk marclaporte: joined #tikiwiki jonnyb: xavi: you should be able to resolve the conflict (svn resolve) but i can't remember the syntax exactly - doesn't you have a GUI for this kind of thing? xavi: phone jonnyb: np :)
i think the command would be:
svn resolve --accept working img/icons/large/admin_panel48x48.png xavi: back
mmm
how can I know?
I did run your command, and nothing was returned as output. And that svn tree seems up to date with HEAD, nothing to commit, nothing to update
^ jonnyb jonnyb: yes, it would only work if there was a conflict, so tricky to test i geuss xavi: ok, just in case, I'll add the command to the doc/dev page jonnyb: you get these tree conflicts if any file appears or disappears on both sides of the merge
i would have thought your Meld tool would have a "resolve" option, no? xavi: yes, but I might have made a mistake (no perms to save, or something when I did merge the changes, it seems)
I'll investigate next time I find something similar kbishop: lphuberdeau : it worked great. thanx alot xavi: fyi, doc page update at: http://dev.tiki.org/Semi-automatic+merging+period#Q:_How_to_resolve_a_tree_conflict_ jonnyb: thanks xavi :) xavi: yw
and I added a link from a new page I created for me (I never remember the long url): http://dev.tiki.org/merge marclaporte: joined #tikiwiki Tiki-KGB: 03lphuberdeau r49429 10trunk/ 10templates/tiki-page_bar.tpl 10lib/init/smarty.php * [FIX] Do not show 'More' if empty marclaporte: joined #tikiwiki Tiki-KGB: 03xavidp r49430 10branches/12.x/img/icons/large/admin_panel48x48.png
[ENH]Reduce area of screenshot, so that details of smaller area aer enlarged, and added black margin
03xavidp r49431 10trunk/img/icons/large/admin_panel48x48.png 10trunk/lib/core/Search/ContentSource/CommentSource.php 10trunk * [MRG] Automatic merge, branches/12.x 49426 to 49430 xavi: ok, enough for today
c u
left #tikiwiki jonnyb: me2... over Tiki-KGB: 03lphuberdeau r49432 10trunk/templates/ 10comment/list.tpl 10layouts/internal/ajax.tpl
[ENH] Include the title block in ajax request response, avoids having to include it in the content, which causes double-headers in modals. marclaporte: joined #tikiwiki fabricius: polom
just updated the webinars for 2014 - thx to Pascal for mentioning
lphuberdeau: are you still there? lphuberdeau: yes fabricius: lphuberdeau: issue: trunk menus
lphuberdeau: before the TikiFestBootstrap we had a discussion about the menus and superfish
you made some changes
Tiki menus in the left column and the topbar then acted "bootstrap alike"
but not everywhere lphuberdeau: don't recall fabricius: wouldn't it be the time - if not already made - to make the menus acting bootstrap alike everywhere
at that time you mentioned, that you wanted superfish to be removed, but I answered, that we needed superfish for wikistructure menus
and you made the Tikimenus with bootstrap having one more level than the original bootstrap menu
still not recall?
you made some preperations code wise from where we could build upon Tiki|bot: joined #tikiwiki arildb_: joined #tikiwiki Tiki-KGB: 03lphuberdeau r49433 10trunk/ 10templates/tiki-list_trackers.tpl 10templates/tracker/replace.tpl 10lib/core/Services/Tracker/Controller.php
[ENH] Converting the add tracker/edit tracker interface to bootstrap modal, partially converting form Tiki|bot: joined #tikiwiki Tiki-KGB: 03lphuberdeau r49434 10trunk/ 10(8 files in 6 dirs) * [ENH] Use the modal-footer component to display form buttons