343544 - Follow Tb's lead for handling about:license

Status: RESOLVED WONTFIX

(Calendar :: Sunbird Only, defect)

Description

[Matthew (lilmatt) Willis]

Spin off from bug 343247.

Rework our credits.xhtml to more closely resemble Ff and Tb, and follow Tb's lead in providing a way for users to view about:license

Comment 1

[Matthew (lilmatt) Willis]

We won't block 0.5 on this.

Comment 2

[Phil Ringnalda (:philor)]

Attachment: Fork v.1

More or less following Tb's lead: the license file is a copy-paste, with the MoFo binary line from bug 353917 (which means we need a website bug to add Sunbird's EULA to mozilla.org/legal/eula/), credits.xhtml adds the same clunky external protocol dialog that wants to use the application "file", but the Makefile and installer bits are a little different because I wanted to kick LICENSE out of the nest: its contents are random badness. For a while it was saying to look at toolkit/content/license.html for licenses, which doesn't exactly help an end-user with a binary, and now it's back to what SeaMonkey's installer wants, MPL/NPL.

Tested Linux/Mac/Windows, and tested installing Windows over an existing copy, to remove LICENSE.

Comment 3

[Phil Ringnalda (:philor)]

(In reply to comment #2)
> (which means we need a website bug to add
> Sunbird's EULA to mozilla.org/legal/eula/)

Filed bug 373734.

Comment 4

[Gervase Markham [:gerv]]

Phil: as you know, we are trying hard to avoid further forks of license.html; Thunderbird only did it because they were in a freeze and up against a release deadline. If that's not true for Sunbird, then can we please fix this properly? :-)

Gerv

Comment 5

[Phil Ringnalda (:philor)]

Tb didn't do it because it was in a freeze, it did it because it was about to ship something off the 1.8.1 branch, and didn't have any other choice, because it didn't get permission to make toolkit workable.

Sb, on the other hand, is about to ship something off the 1.8.1 branch, and doesn't have any other choice, because it isn't going to get permission to make toolkit workable.

Comment 6

[Gervase Markham [:gerv]]

<sigh> Well, OK then, as long as it all gets sorted out eventually.

Gerv

Comment 7

[Matthew (lilmatt) Willis]

Attachment: Fixed up license.html

Comment 8

[Matthew (lilmatt) Willis]

Comment on attachment 258385 [details] [diff] [review]
Fork v.1

>Index: calendar/sunbird/app/Makefile.in
>===================================================================
>-libs::
>-	$(INSTALL) $(topsrcdir)/LICENSE $(DIST)/bin
>+libs:: $(srcdir)/license.html
>+	$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)
> 
> libs:: $(srcdir)/profile/prefs.js
> 	$(INSTALL) $^ $(DIST)/bin/defaults/profile
> 
> install:: $(srcdir)/profile/prefs.js
> 	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile
Why are we switching to using $(SYSINSTALL) in the libs target?  I thought we use that in install targets only?  I'd expect we'd update the license libs line to handle the new filename, and add an install target for that file as well.  What am I missing?


>Index: calendar/sunbird/app/license.html
>===================================================================
The HTML has a veritable slew of formatting issues.  Rather than pollute bugzilla with them all, I've fixed the blasted thing and attached it to this bug.


>Index: calendar/sunbird/base/content/credits.xhtml
>===================================================================
>+      function openLicense()
>+      {
>+        var fileLocator = 
Trailing space on this line ^^^

>+            Components.classes["@mozilla.org/file/directory_service;1"].
>+            getService(Components.interfaces.nsIProperties);
Prevailing style in calendar code is to put the dot on the "getService" line, and then align the Cc and get service dots.  Please update to that.

>+        var appDir = fileLocator.get("XCurProcD", Components.interfaces.nsIFile);
>+        appDir.append("license.html");
>+        var protocolSvc =
>+            Components.classes["@mozilla.org/uriloader/external-protocol-service;1"].
>+            getService(Components.interfaces.nsIExternalProtocolService);
align the dots like above

>+        var ioService = Components.classes["@mozilla.org/network/io-service;1"].
>+                        getService(Components.interfaces.nsIIOService);
align the dots like above

>@@ -251,32 +267,22 @@
>             <li>MozDev</li>
>           </ul>
>         </div>
> 
>         <p id="gecko" class="center">&credit.powered; Gecko&trade;</p>
> 
>         <p class="footnote">
>           &brandFullName;&trade; &license.part0; Copyright &copy;1998-2007 &license.part1;
>-          <a href="" link="about:credits" onclick="visitLink(event);">&license.contrib;</a>,
>+          <a href="" link="http://www.mozilla.org/credits/" onclick="visitLink(event); event.preventDefault();">&license.contrib;</a>,
>           &license.part2;
>-          <a href="" link="chrome://global/content/MPL-1.1.html" onclick="visitLink(event);">Mozilla Public License</a>
>-          &license.and;
Since we're removing &license.and, we should also remove it from the .dtd.  This needs to be done after string freeze.

>-          <a href="" link="chrome://global/content/NPL-1.1.html" onclick="visitLink(event);">Netscape Public License</a>
>+          <a href="" onclick="openLicense(); event.preventDefault();">license</a>
Does this want to be localizable?

r- since there's a fair bit to fix/answer.

Comment 9

[Matthew (lilmatt) Willis]

Attachment: Revised fixed-up license.html

Fixed html error in previous version.  Now passes validation.

Comment 10

[Phil Ringnalda (:philor)]

Attachment: Fork v.2

Thanks for being willing to treat the HTML as something other than a 100Kb binary blob :)

Dots aligned, space removed.

I used SYSINSTALL - as cribbed from http://bonsai.mozilla.org/cvsblame.cgi?file=mozilla/browser/locales/Makefile.in&rev=1.49&mark=115-116#115 - because that gets sane perms on Linix. Right now, double-clicking Sunbird's LICENSE file asks if I want to run that executable text file in a terminal.

You're absolutely right that now that license isn't the URL about:license, it should be localized; I look forward to working outside string freezes and branches, someday.

Comment 11

[Phil Ringnalda (:philor)]

<philor> bsmedberg: is using $(SYSINSTALL) $(IFLAGS1) on license.html to get sane perms, so double-clicking it doesn't ask if you want to open that executable in a terminal, okay or evil?
<bsmedberg> philor: sounds like it
<philor> bsmedberg: sounds like okay, or sounds like evil?

...

Comment 12

[Gary Kwong [:gkw] [:nth10sd] (NOT official MoCo now)]

IMO, licensing issues should be sorted out by 1.0

Comment 13

[Smokey Ardisson (offline for a while; not following bugs - do not email)]

What are you guys doing for about:license/license.html right now?  I did some poking last night and couldn't find anything in mxr or in the 0.8 binary (other than a copy of the MPL-1.1).

On the trunk, you can now (post-bug 368091) port the Tb work I did in bug 427316 and bug 428144 to generate an appropriate stand-alone html license file you can ship/use.  There's not a good solution for the branch, unfortunately (although you could do an uglier/more fragile sed-version of the EULA block replacement there, I suppose), and I know you guys are still developing off of the branch.

Actually, maybe the stuff from my first Tb bug + a new sed pair would work on branch, where the added sed bits look something like (minus the required escaping, which'll be a pain):

sed -e "|<a href="http://www.mozilla.com/">Mozilla Corporation</a>|<a href="http://www.mozilla.org/">Mozilla Foundation</a>|" 
    -e "|<a href="http://www.mozilla.org/foundation/EULA/">|<a href="http://www.mozilla.org/legal/eula/">|"

Comment 15

[Martin Schröder [:mschroeder]]

Sunbird code was removed from tree, bug is no longer required.