<html>
<head>
<meta content="text/html; charset=ISO-8859-1"
http-equiv="Content-Type">
</head>
<body bgcolor="#FFFFFF" text="#000000">
We are, aren't we? We do have a 1.8 branch.<br>
And we should make a branch for the december 7 release. And fixes
should go in there as well as trunk.<br>
<br>
It is a bit unfortunate that your branch is called 1.9, that should
have been pats_1.9. But, we can work around that, perhaps even
renaming your branch.<br>
<br>
Tom<br>
<br>
<div class="moz-cite-prefix">Op 22-11-2012 0:06, Pat Lockley
schreef:<br>
</div>
<blockquote
cite="mid:CAO2PinNqHWtGKo4ije9AViDTyZjVbh2iq95yuOEBq7MwaakSyw@mail.gmail.com"
type="cite">Also, should we move to a more formal trunk way of
working where the branches are old releases?
<div class="gmail_extra"><br>
<br>
<div class="gmail_quote">On Wed, Nov 21, 2012 at 10:42 PM, Pat
Lockley <span dir="ltr"><<a moz-do-not-send="true"
href="mailto:patrick.lockley@googlemail.com"
target="_blank">patrick.lockley@googlemail.com</a>></span>
wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0
.8ex;border-left:1px #ccc solid;padding-left:1ex">I don't
get the process here though and there is a lot of core I
can't test - no ldap, no multiuser and sharing and so on.
Could the sandbox switch to 1.9?<br>
<br>
Alternatively, I could commit into 1.8 as I suspect I've
changed maybe 10 files (if that)<br>
<div class="HOEnZb">
<div class="h5"><br>
On 21 Nov 2012, at 22:32, Julian Tenney <<a
moz-do-not-send="true"
href="mailto:Julian.Tenney@nottingham.ac.uk">Julian.Tenney@nottingham.ac.uk</a>>
wrote:<br>
<br>
> well, I think it will be for you to attempt to
merge, and when you have code in files that have changed
since you branched, it's going to be down to you to make
sure your new code doesn't break anything that has
changed since you branched. I don't think too much has -
you can also get a log of each file so you can step
through changes that have been mde to that file. I'm
guessing that to ull this off, you'll have changed some
core stuff, but I don't know how much. From our point
ofview the only thing that has changed is the html5
stuff, and that is mostly client side. My own changes
are client side, but might have fixed the odd PHP thing.<br>
><br>
> Ron, Tom and David are the most likely to be able
to comment on any PHP changes since 1.8 they have made.<br>
><br>
> Probably worth trying at first into a dummy folder
or something 'safe', just to see how things pan out?<br>
> ________________________________________<br>
> From: <a moz-do-not-send="true"
href="mailto:xerte-dev-bounces@lists.nottingham.ac.uk">xerte-dev-bounces@lists.nottingham.ac.uk</a>
[<a moz-do-not-send="true"
href="mailto:xerte-dev-bounces@lists.nottingham.ac.uk">xerte-dev-bounces@lists.nottingham.ac.uk</a>]
On Behalf Of Pat Lockley [<a moz-do-not-send="true"
href="mailto:patrick.lockley@googlemail.com">patrick.lockley@googlemail.com</a>]<br>
> Sent: 21 November 2012 17:47<br>
> To: For Xerte technical developers<br>
> Subject: [Xerte-dev] Re: Players and alternative
formats<br>
><br>
> i've never merged before........<br>
><br>
><br>
> On Wed, Nov 21, 2012 at 4:42 PM, Julian Tenney <<a
moz-do-not-send="true"
href="mailto:Julian.Tenney@nottingham.ac.uk">Julian.Tenney@nottingham.ac.uk</a><mailto:<a
moz-do-not-send="true"
href="mailto:Julian.Tenney@nottingham.ac.uk">Julian.Tenney@nottingham.ac.uk</a>>>
wrote:<br>
> I don’t think so. LTI just lets you open a door
into the application.<br>
><br>
> I’d rather deal with this now, than later when it’s
more complicated.<br>
><br>
> Why not try merging, and see if it looks gribbly?<br>
><br>
> From: <a moz-do-not-send="true"
href="mailto:xerte-dev-bounces@lists.nottingham.ac.uk">xerte-dev-bounces@lists.nottingham.ac.uk</a><mailto:<a
moz-do-not-send="true"
href="mailto:xerte-dev-bounces@lists.nottingham.ac.uk">xerte-dev-bounces@lists.nottingham.ac.uk</a>>
[mailto:<a moz-do-not-send="true"
href="mailto:xerte-dev-bounces@lists.nottingham.ac.uk">xerte-dev-bounces@lists.nottingham.ac.uk</a><mailto:<a
moz-do-not-send="true"
href="mailto:xerte-dev-bounces@lists.nottingham.ac.uk">xerte-dev-bounces@lists.nottingham.ac.uk</a>>]
On Behalf Of Pat Lockley<br>
> Sent: 21 November 2012 16:36<br>
><br>
> To: For Xerte technical developers<br>
> Subject: [Xerte-dev] Re: Players and alternative
formats<br>
><br>
> Could do, and just leave out the new modules?<br>
><br>
> The changes I discussed don't exist in 1.9 just yet
- would later in week.<br>
><br>
> I need to list what's changed for the purposes of
testing, but am a bit worried that since the 1.9 branch
was made a lot of new stuff has joined 1.8 (LTI for
example) and I might undo some stuff? I can't see it
clashing, but....<br>
><br>
> On Wed, Nov 21, 2012 at 3:58 PM, Julian Tenney <<a
moz-do-not-send="true"
href="mailto:Julian.Tenney@nottingham.ac.uk">Julian.Tenney@nottingham.ac.uk</a><mailto:<a
moz-do-not-send="true"
href="mailto:Julian.Tenney@nottingham.ac.uk">Julian.Tenney@nottingham.ac.uk</a>>>
wrote:<br>
> Why don’t you merge in your mod stuff, it won’t
make a lot of odds to most people, but will allow some
cool stuff later… most people won’t see any difference,
right?<br>
><br>
><br>
> From: <a moz-do-not-send="true"
href="mailto:xerte-dev-bounces@lists.nottingham.ac.uk">xerte-dev-bounces@lists.nottingham.ac.uk</a><mailto:<a
moz-do-not-send="true"
href="mailto:xerte-dev-bounces@lists.nottingham.ac.uk">xerte-dev-bounces@lists.nottingham.ac.uk</a>>
[mailto:<a moz-do-not-send="true"
href="mailto:xerte-dev-bounces@lists.nottingham.ac.uk">xerte-dev-bounces@lists.nottingham.ac.uk</a><mailto:<a
moz-do-not-send="true"
href="mailto:xerte-dev-bounces@lists.nottingham.ac.uk">xerte-dev-bounces@lists.nottingham.ac.uk</a>>]
On Behalf Of Pat Lockley<br>
> Sent: 21 November 2012 15:53<br>
><br>
> To: For Xerte technical developers<br>
> Subject: [Xerte-dev] Re: Players and alternative
formats<br>
><br>
> i could, but is the php in 1.8 svn?<br>
><br>
> It isn't a lot of php (an if statement or two)<br>
><br>
> On Wed, Nov 21, 2012 at 3:16 PM, Julian Tenney <<a
moz-do-not-send="true"
href="mailto:Julian.Tenney@nottingham.ac.uk">Julian.Tenney@nottingham.ac.uk</a><mailto:<a
moz-do-not-send="true"
href="mailto:Julian.Tenney@nottingham.ac.uk">Julian.Tenney@nottingham.ac.uk</a>>>
wrote:<br>
> Could you do the php side? In the wizard we can add
a parameter to the LO playback=”flash” which can be
updated to playback=”html” for people who want to
experiment with the beta.<br>
><br>
> Then in the wizard we can do<br>
><br>
> If (set as flash or undefined) //do it flash style<br>
><br>
> Else<br>
><br>
> //do it html5 style<br>
><br>
> Appreciate the flash side is probably easier than
the PHP side…<br>
><br>
> From: <a moz-do-not-send="true"
href="mailto:xerte-dev-bounces@lists.nottingham.ac.uk">xerte-dev-bounces@lists.nottingham.ac.uk</a><mailto:<a
moz-do-not-send="true"
href="mailto:xerte-dev-bounces@lists.nottingham.ac.uk">xerte-dev-bounces@lists.nottingham.ac.uk</a>>
[mailto:<a moz-do-not-send="true"
href="mailto:xerte-dev-bounces@lists.nottingham.ac.uk">xerte-dev-bounces@lists.nottingham.ac.uk</a><mailto:<a
moz-do-not-send="true"
href="mailto:xerte-dev-bounces@lists.nottingham.ac.uk">xerte-dev-bounces@lists.nottingham.ac.uk</a>>]
On Behalf Of Pat Lockley<br>
> Sent: 21 November 2012 14:45<br>
><br>
> To: For Xerte technical developers<br>
> Subject: [Xerte-dev] Re: Players and alternative
formats<br>
><br>
> -- Flash side --<br>
><br>
> put a radio button in the editor<br>
> add an extra parameter to the url generation code
(event handler for the play button)<br>
><br>
> -- php side --<br>
><br>
> Edit preview and play .php to check for this new
$_GET and then branch<br>
><br>
> -- .htaccess side --<br>
><br>
> Mod the reg exp<br>
><br>
> On Wed, Nov 21, 2012 at 1:37 PM, Julian Tenney <<a
moz-do-not-send="true"
href="mailto:Julian.Tenney@nottingham.ac.uk">Julian.Tenney@nottingham.ac.uk</a><mailto:<a
moz-do-not-send="true"
href="mailto:Julian.Tenney@nottingham.ac.uk">Julian.Tenney@nottingham.ac.uk</a>>>
wrote:<br>
> Time is of the essence for the 1.9 drop because we
want to get that done by 30th November, so I like what
you’re saying, but wonder if it can be done in time…?<br>
><br>
> From: <a moz-do-not-send="true"
href="mailto:xerte-dev-bounces@lists.nottingham.ac.uk">xerte-dev-bounces@lists.nottingham.ac.uk</a><mailto:<a
moz-do-not-send="true"
href="mailto:xerte-dev-bounces@lists.nottingham.ac.uk">xerte-dev-bounces@lists.nottingham.ac.uk</a>>
[mailto:<a moz-do-not-send="true"
href="mailto:xerte-dev-bounces@lists.nottingham.ac.uk">xerte-dev-bounces@lists.nottingham.ac.uk</a><mailto:<a
moz-do-not-send="true"
href="mailto:xerte-dev-bounces@lists.nottingham.ac.uk">xerte-dev-bounces@lists.nottingham.ac.uk</a>>]
On Behalf Of Pat Lockley<br>
> Sent: 21 November 2012 13:29<br>
><br>
> To: For Xerte technical developers<br>
> Subject: [Xerte-dev] Re: Players and alternative
formats<br>
><br>
> Well it depends on what we call "now"<br>
><br>
><br>
> It's a bit roadmappy, but for 1.9 you'd not have
html_play.php and play.php, but one play.php which would
then switch on the variable set (within the module
folder).<br>
><br>
> You'd have an option somewhere of setting "HTML5"
somehow (perhaps a radio box on the editor?) which would
then send a request to set this session to be "HTML5"
and all previews from then on would be HTML5 mode.<br>
><br>
> Then you add an extension to the current play rule
in htaccess to support a "third" variable, so
play_560_html would play the template in HTML5 mode. In
the future, play_560_scorm would do the scorm export. As
long as play_560_[a-z]+ was handled in the php play code
for that module you could do whatever you wanted to do.<br>
><br>
> In theory you could also have preview_560_html as
well<br>
><br>
> It seems neater to me, but this is me speaking from
my cave.<br>
><br>
> Oooh a flint.<br>
><br>
> On Wed, Nov 21, 2012 at 12:57 PM, Julian Tenney
<<a moz-do-not-send="true"
href="mailto:Julian.Tenney@nottingham.ac.uk">Julian.Tenney@nottingham.ac.uk</a><mailto:<a
moz-do-not-send="true"
href="mailto:Julian.Tenney@nottingham.ac.uk">Julian.Tenney@nottingham.ac.uk</a>>>
wrote:<br>
> I like to generalise solutions too. What would the
implications be for what we have now?<br>
><br>
> From: <a moz-do-not-send="true"
href="mailto:xerte-dev-bounces@lists.nottingham.ac.uk">xerte-dev-bounces@lists.nottingham.ac.uk</a><mailto:<a
moz-do-not-send="true"
href="mailto:xerte-dev-bounces@lists.nottingham.ac.uk">xerte-dev-bounces@lists.nottingham.ac.uk</a>>
[mailto:<a moz-do-not-send="true"
href="mailto:xerte-dev-bounces@lists.nottingham.ac.uk">xerte-dev-bounces@lists.nottingham.ac.uk</a><mailto:<a
moz-do-not-send="true"
href="mailto:xerte-dev-bounces@lists.nottingham.ac.uk">xerte-dev-bounces@lists.nottingham.ac.uk</a>>]
On Behalf Of Pat Lockley<br>
> Sent: 21 November 2012 12:43<br>
> To: For Xerte technical developers<br>
> Subject: [Xerte-dev] Players and alternative
formats<br>
><br>
> Hello all,<br>
><br>
> This is a message from deep inside modularisation
caves so it might not apply to all.<br>
><br>
> I have a semi working google maps making template,
and when it "plays" at present it draws a map using the
google maps API.<br>
><br>
> However, the play could also generate a KML file
for people to download, or if the map couldn't load it
could provide the data in a different way.<br>
><br>
> So then I thought this is effectively the HTML5
option (and you might argue the xml download, export,
scorm are also "plays").<br>
><br>
> So I was thinking that rather than using ctrl +
click, or extra buttons, you could facilitate an extra
request variable consistently across modules.<br>
><br>
> Ergo you post a "HTML5" option at the URL and you
get HTML5 back, you post a "XML" and get xml, or "JSON"
and get json.<br>
><br>
> This way the URL Library doesn't need to change all
the time, or the .htaccess, but you also get different
plays for each module (and they are all distinct).<br>
><br>
> Thoughts?<br>
><br>
> Pat<br>
><br>
><br>
> _______________________________________________<br>
> Xerte-dev mailing list<br>
> <a moz-do-not-send="true"
href="mailto:Xerte-dev@lists.nottingham.ac.uk">Xerte-dev@lists.nottingham.ac.uk</a><mailto:<a
moz-do-not-send="true"
href="mailto:Xerte-dev@lists.nottingham.ac.uk">Xerte-dev@lists.nottingham.ac.uk</a>><br>
> <a moz-do-not-send="true"
href="http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev"
target="_blank">http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev</a><br>
><br>
><br>
><br>
> _______________________________________________<br>
> Xerte-dev mailing list<br>
> <a moz-do-not-send="true"
href="mailto:Xerte-dev@lists.nottingham.ac.uk">Xerte-dev@lists.nottingham.ac.uk</a><mailto:<a
moz-do-not-send="true"
href="mailto:Xerte-dev@lists.nottingham.ac.uk">Xerte-dev@lists.nottingham.ac.uk</a>><br>
> <a moz-do-not-send="true"
href="http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev"
target="_blank">http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev</a><br>
><br>
><br>
><br>
> _______________________________________________<br>
> Xerte-dev mailing list<br>
> <a moz-do-not-send="true"
href="mailto:Xerte-dev@lists.nottingham.ac.uk">Xerte-dev@lists.nottingham.ac.uk</a><mailto:<a
moz-do-not-send="true"
href="mailto:Xerte-dev@lists.nottingham.ac.uk">Xerte-dev@lists.nottingham.ac.uk</a>><br>
> <a moz-do-not-send="true"
href="http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev"
target="_blank">http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev</a><br>
><br>
><br>
><br>
><br>
> _______________________________________________<br>
> Xerte-dev mailing list<br>
> <a moz-do-not-send="true"
href="mailto:Xerte-dev@lists.nottingham.ac.uk">Xerte-dev@lists.nottingham.ac.uk</a><mailto:<a
moz-do-not-send="true"
href="mailto:Xerte-dev@lists.nottingham.ac.uk">Xerte-dev@lists.nottingham.ac.uk</a>><br>
> <a moz-do-not-send="true"
href="http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev"
target="_blank">http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev</a><br>
><br>
><br>
><br>
><br>
><br>
> _______________________________________________<br>
> Xerte-dev mailing list<br>
> <a moz-do-not-send="true"
href="mailto:Xerte-dev@lists.nottingham.ac.uk">Xerte-dev@lists.nottingham.ac.uk</a><mailto:<a
moz-do-not-send="true"
href="mailto:Xerte-dev@lists.nottingham.ac.uk">Xerte-dev@lists.nottingham.ac.uk</a>><br>
> <a moz-do-not-send="true"
href="http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev"
target="_blank">http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev</a><br>
><br>
><br>
><br>
> _______________________________________________<br>
> Xerte-dev mailing list<br>
> <a moz-do-not-send="true"
href="mailto:Xerte-dev@lists.nottingham.ac.uk">Xerte-dev@lists.nottingham.ac.uk</a><br>
> <a moz-do-not-send="true"
href="http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev"
target="_blank">http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev</a><br>
> This message and any attachment are intended solely
for the addressee and may contain confidential
information. If you have received this message in error,
please send it back to me, and immediately delete it.
Please do not use, copy or disclose the information
contained in this message or in any attachment. Any
views or opinions expressed by the author of this email
do not necessarily reflect the views of the University
of Nottingham.<br>
><br>
> This message has been checked for viruses but the
contents of an attachment<br>
> may still contain software viruses which could
damage your computer system:<br>
> you are advised to perform your own checks. Email
communications with the<br>
> University of Nottingham may be monitored as
permitted by UK legislation.<br>
</div>
</div>
</blockquote>
</div>
<br>
</div>
<br>
<fieldset class="mimeAttachmentHeader"></fieldset>
<br>
<pre wrap="">_______________________________________________
Xerte-dev mailing list
<a class="moz-txt-link-abbreviated" href="mailto:Xerte-dev@lists.nottingham.ac.uk">Xerte-dev@lists.nottingham.ac.uk</a>
<a class="moz-txt-link-freetext" href="http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev">http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev</a>
</pre>
</blockquote>
<br>
<pre class="moz-signature" cols="72">--
--
Tom Reijnders
TOR Informatica
Chopinlaan 27
5242HM Rosmalen
Tel: 073 5226191
Fax: 073 5226196
</pre>
</body>
</html>