Re: [Server-devel] Looking at edublog moodle code --
Hi Martin, You're right, trying to change to tinyMCE in Moodle itself by porting relevant portions of Mauno's modifications is a large job. However, there were some versions I came across that simply stick tinyMCE into the theme files. I was planning on hacking the XO theme to make it use tinyMCE and the new Sugar theme for tinyMCE. After all, this is temporary anyway. If you think this is acceptable, I will go ahead with it. Thanks, Tarun Martin Langhoff wrote: On Thu, Sep 18, 2008 at 11:53 AM, Martin Langhoff [EMAIL PROTECTED] wrote: Anyway, I believe I should be cleaning up the messes I create, so I'll try to write two patches based on the current moodle-r2 code in catalyst (1- enable tinyMCE, 2-integrate the Sugar theme). With some luck I should be done by Monday. That sounds like a large-ish job. If you do it, I'll take them, but no pressure. They aren't hugely important (yet). BTW, one large patch with each thing might not be the best idea. For example, for tinyMCE, I'd do the following commits A1 - import the pristine tinyMCE src A2 - changes on top of tinyMCE needed to work with moodle A3 - core changes to moodle (say, moodlelib.php) A4 - any ancillary changes -- add options in the /admin area, etc When a new version of tinyMCE comes out, then the workflow is B1 - import new pristine tinyMCE B2 - reapply A2 along the 'stable' moodle versions, you can just use git-merge. But when a major new version of moodle comes out, you'll need to rebase things C1 - Reapply B1 C2 - Reapply B2 C3 - Reapply A3 C4 - Reapply A4 Of course all those 'reapply' actions might need manual conflict resolution :-) but if you don't have them as separate commits everything gets a whole lot harder. (Tricks of the trade - I've been doing this maintain a custom version of $project stuff for ~8 years now.) cheers, martin ___ Server-devel mailing list Server-devel@lists.laptop.org http://lists.laptop.org/listinfo/server-devel
Re: [Server-devel] Looking at edublog moodle code --
On Mon, Sep 22, 2008 at 2:25 PM, Tarun Pondicherry You're right, trying to change to tinyMCE in Moodle itself by porting relevant portions of Mauno's modifications is a large job. However, there were some versions I came across that simply stick tinyMCE into the theme files. I was planning on hacking the XO theme to make it use tinyMCE and the new Sugar theme for tinyMCE. After all, this is temporary anyway. If you think this is acceptable, I will go ahead with it. Probably won't use tinyMCE for this release (in 2 weeks time). If we can get a good patch, perhaps backported from cvshead, it might be worthwhile. but there's so many other things to do... By the way, I tried to find the actual server where you are running edublog - wanted to see the theme and tinymce in action - is that still down? cheers, martin -- [EMAIL PROTECTED] [EMAIL PROTECTED] -- School Server Architect - ask interesting questions - don't get distracted with shiny stuff - working code first - http://wiki.laptop.org/go/User:Martinlanghoff ___ Server-devel mailing list Server-devel@lists.laptop.org http://lists.laptop.org/listinfo/server-devel
Re: [Server-devel] Looking at edublog moodle code --
On Thu, Sep 18, 2008 at 7:13 AM, Tarun Pondicherry [EMAIL PROTECTED] wrote: Really sorry for the newb mistakes. This is my first time on a project where the repository is actually significant. I'll be sure to pay close attention to my commits in the future. Hey - no problem. The Moodle I used as a base is from: http://korpelainen.net/weekly19.zip linked from the forum discussion at: http://moodle.org/mod/forum/discuss.php?d=96160 That's a tricky one, so you started from Mauno's snapshot, which has all sorts of very odd things in it. Ok... The reason is that the Moodle in the catalyst repo had a 1/2 done tinyMCE integration and it was *really* frustrating to figure out what functions did what you'd think they did or were just to be implemented type things. However, after working with it for the summer, I think I can probably patch tinyMCE into the catalyst version. Ok. From the 'catalyst' repo, I am basing my work on a branch based on MOODLE_19_STABLE - On top of that, I simply copied in the OU Blog module and a theme, but those are self contained in their respective directories. That's good to know... All that needs to be done to get tinyMCE working is to enable tinyMCE and copy in the Sugar theme folder and change one line to let in moodlelib.php to tell it to send an editor to the XO (not a textarea). This will give a demoable version with patchy localization support, patchy file upload and will need to fall back to HTMLArea in IE. Right. I think that for this release cycle (closing mid-next-week) I'll leave tinyMCE alone. This is quite a bit of work... Anyway, I believe I should be cleaning up the messes I create, so I'll try to write two patches based on the current moodle-r2 code in catalyst (1- enable tinyMCE, 2-integrate the Sugar theme). With some luck I should be done by Monday. That sounds like a large-ish job. If you do it, I'll take them, but no pressure. They aren't hugely important (yet). With regards to future maintainability of EduBlog, I think I'd like to split it up into a Sugar tinyMCE editor branch that has changes to pertaining how that would work and a OU Blog Branch that contains the actual changes for ou blog. Is this the sort of thing branches are meant for? That's one way - you can have topic branches and merge them into an integration branch. In practice, I think that ends up overcomplicating things. Your edublog branch will have a few topics (editor, theme, upload tricks, oublog patches) and you need to put that at the beginning of the commit msg anyway. So my recommendation is a single branch with well written commit msgs... One case where you will want separate topic branches is when you have 2 integration branches for some reason - like several clients, each with its own theme, but each using various features each in its topic branch. The catalyst repo shows some examples of this :-) but it's such a pain to use that they have a 'mdl19-local' branch where all the popular topics are -- they only do topic branches for specific things. cheers, martin -- [EMAIL PROTECTED] [EMAIL PROTECTED] -- School Server Architect - ask interesting questions - don't get distracted with shiny stuff - working code first - http://wiki.laptop.org/go/User:Martinlanghoff ___ Server-devel mailing list Server-devel@lists.laptop.org http://lists.laptop.org/listinfo/server-devel
Re: [Server-devel] Looking at edublog moodle code --
On Thu, Sep 18, 2008 at 11:53 AM, Martin Langhoff [EMAIL PROTECTED] wrote: Anyway, I believe I should be cleaning up the messes I create, so I'll try to write two patches based on the current moodle-r2 code in catalyst (1- enable tinyMCE, 2-integrate the Sugar theme). With some luck I should be done by Monday. That sounds like a large-ish job. If you do it, I'll take them, but no pressure. They aren't hugely important (yet). BTW, one large patch with each thing might not be the best idea. For example, for tinyMCE, I'd do the following commits A1 - import the pristine tinyMCE src A2 - changes on top of tinyMCE needed to work with moodle A3 - core changes to moodle (say, moodlelib.php) A4 - any ancillary changes -- add options in the /admin area, etc When a new version of tinyMCE comes out, then the workflow is B1 - import new pristine tinyMCE B2 - reapply A2 along the 'stable' moodle versions, you can just use git-merge. But when a major new version of moodle comes out, you'll need to rebase things C1 - Reapply B1 C2 - Reapply B2 C3 - Reapply A3 C4 - Reapply A4 Of course all those 'reapply' actions might need manual conflict resolution :-) but if you don't have them as separate commits everything gets a whole lot harder. (Tricks of the trade - I've been doing this maintain a custom version of $project stuff for ~8 years now.) cheers, martin -- [EMAIL PROTECTED] [EMAIL PROTECTED] -- School Server Architect - ask interesting questions - don't get distracted with shiny stuff - working code first - http://wiki.laptop.org/go/User:Martinlanghoff ___ Server-devel mailing list Server-devel@lists.laptop.org http://lists.laptop.org/listinfo/server-devel
