It looks good, but the text 'msg' => 'mwe-upwiz-license-gpl-v3' for
the GPL licence is a bit strange. Maybe the message could be more
like 'GNU General Public Licence version 3 or higher (GPLv3+)'? Or
maybe 'GNU General Public License as published by the Free Software
Foundation; either version 3 of the License, or any later version'.
For the licence selection, how do we extend this properly? For
example:
// radio button selection of some licenses
'licensesOwnWork' => array(
'type' => 'or',
'filterTemplate' => 'self',
'licenses' => array(
'gpl-v3',
'gfdl',
'cc-by-3.0',
'cc-zero',
'public-domain'
),
'defaults' => array( 'gpl-v3' )
),
The GFDL and public domain templates are at
http://commons.wikimedia.org/wiki/Template:GFDL and
http://commons.wikimedia.org/wiki/Template:PD-self,
http://commons.wikimedia.org/wiki/Template:PD-user,
http://commons.wikimedia.org/wiki/Template:PD-author, etc.
Cheers,
Edward
On 23 July 2013 16:03, Troels Emtekær Linnet <[email protected]> wrote:
> Allright.
>
> I stop touching.
>
> There is a backup file in there! :-)
>
> Troels Emtekær Linnet
>
>
> 2013/7/23 Edward d'Auvergne <[email protected]>:
>> Ouch :S That was more complicated than I had expected! I'll give it a test.
>>
>> Edward
>>
>> On 23 July 2013 15:52, Troels Emtekær Linnet <[email protected]> wrote:
>>> Allright.
>>>
>>> One needs to modify:
>>> extensions\UploadWizard\UploadWizard.config.php
>>>
>>> I have added the template, under 'licenses' => array(
>>> 'gpl-v3' => array(
>>> 'msg' => 'mwe-upwiz-license-gpl-v3',
>>> 'templates' => array( 'GPLv3' )
>>> That will fetch the license from:
>>> http://commons.wikimedia.org/wiki/Template:GPLv3
>>>
>>> Then I changed
>>> // radio button selection of some licenses
>>> 'licensesOwnWork' => array(
>>> 'type' => 'or',
>>> 'filterTemplate' => 'self',
>>> 'licenses' => array(
>>> 'cc-by-sa-3.0',
>>> 'cc-by-3.0',
>>> 'cc-zero'
>>> ),
>>> 'defaults' => array( 'cc-by-sa-3.0' )
>>> ),
>>>
>>> to
>>>
>>> // radio button selection of some licenses
>>> 'licensesOwnWork' => array(
>>> 'type' => 'or',
>>> 'filterTemplate' => 'self',
>>> 'licenses' => array(
>>> 'gpl-v3',
>>> 'cc-by-3.0',
>>> 'cc-zero'
>>> ),
>>> 'defaults' => array( 'gpl-v3' )
>>> ),
>>>
>>> This takes care of: Own work and licensing.
>>>
>>>
>>>
>>>
>>> Troels Emtekær Linnet
>>>
>>>
>>> 2013/7/23 Edward d'Auvergne <[email protected]>:
>>>> Oh, one more point. This is specific to the scientific field. Maybe
>>>> we should have some text saying that if the work is from a published
>>>> paper and that the copyright has been transferred to the journal
>>>> (which is rare but sometimes happens), that that content is forbidden
>>>> from being uploaded to the wiki.
>>>>
>>>> Cheers,
>>>>
>>>> Edward
>>>>
>>>>
>>>>
>>>> On 23 July 2013 12:42, Edward d'Auvergne <[email protected]> wrote:
>>>>> I like that graphic at the start :) It's nicely explained. For the
>>>>> licence, I think we need to add the other licences. The graphics
>>>>> within relax are GPL licensed, so most of the current images need to
>>>>> be tagged with that licence. It would be good to have the GPL, LGPL,
>>>>> and GPLD licences added as well. I think the public domain option is
>>>>> also useful. Having a default of GPL licensing would make it easier
>>>>> to incorporate images on the wiki into the relax manual or GUI
>>>>> interface. The Creative Commons Attribution ShareAlike 3.0 blocks the
>>>>> images from being used in relax, so it is preferable to not have it.
>>>>> Or to make it clear that choosing this licence is not recommended as
>>>>> it prevents its use in the relax manual or the GUI.
>>>>>
>>>>> This is explained at
>>>>> http://www.gnu.org/licenses/license-list.html#OtherLicenses.
>>>>> Specifically the text for the Creative Commons Attribution-Sharealike
>>>>> 2.0 licence (http://www.gnu.org/licenses/license-list.html#ccbysa)
>>>>> which says:
>>>>>
>>>>> -----
>>>>> This is a copyleft free license that is good for artistic and
>>>>> entertainment works, and educational works. Please don't use it for
>>>>> software or documentation, since it is incompatible with the GNU GPL
>>>>> and with the GNU FDL.
>>>>>
>>>>> Please be specific about which Creative Commons license is being used
>>>>> (http://www.gnu.org/licenses/license-list.html#which-cc).
>>>>> -----
>>>>>
>>>>> This problem may be fixed in the 3.0 licence. But the Attribution
>>>>> clause I would assume to always be incompatible with the GPL. The
>>>>> Creative Common pages do not help to clarify this (see
>>>>> http://creativecommons.org/compatiblelicenses).
>>>>>
>>>>> Cheers,
>>>>>
>>>>> Edward
>>>>>
>>>>>
>>>>> On 23 July 2013 12:19, Troels Emtekær Linnet <[email protected]> wrote:
>>>>>> How does the upload guide suit now?
>>>>>>
>>>>>> Is the Creative Commons license selection okay for the wiki?
>>>>>>
>>>>>> Best
>>>>>> Troels Emtekær Linnet
>>>>>>
>>>>>>
>>>>>> 2013/7/22 Troels Emtekær Linnet <[email protected]>:
>>>>>>> Strange....
>>>>>>> It is working for me, but http://nmr-relax.kimlinnet.dk/ is not working.
>>>>>>> Lets wait to tomorrow.
>>>>>>>
>>>>>>> I installed the extension
>>>>>>> http://www.mediawiki.org/wiki/Extension:UploadWizard
>>>>>>>
>>>>>>> It is quite nice!
>>>>>>>
>>>>>>> Setting in LocalSettings.php :
>>>>>>> ## To enable image uploads, make sure the 'images' directory
>>>>>>> ## is writable, then set this to true:
>>>>>>> $wgEnableUploads = true;
>>>>>>> ## http://www.mediawiki.org/wiki/Manual:Short_URL
>>>>>>> ## http://www.mediawiki.org/wiki/Manual:Short_URL/Apache
>>>>>>> ## Made with http://shorturls.redwerks.org/ and Article Path: /$1
>>>>>>> $wgGenerateThumbnailOnParse = true;
>>>>>>> $wgUseImageMagick = true;
>>>>>>> $wgImageMagickConvertCommand = "/usr/bin/convert";
>>>>>>> $wgTmpDirectory = "$IP/images/temp";
>>>>>>>
>>>>>>> # MediaWiki Extension:UploadWizard
>>>>>>> # http://www.mediawiki.org/wiki/Extension:UploadWizard
>>>>>>> require_once( "$IP/extensions/UploadWizard/UploadWizard.php" );
>>>>>>> $wgUseInstantCommons = true;
>>>>>>> $wgUploadNavigationUrl = '/Special:UploadWizard';
>>>>>>>
>>>>>>> Troels Emtekær Linnet
>>>>>>>
>>>>>>>
>>>>>>> 2013/7/22 Edward d'Auvergne <[email protected]>:
>>>>>>>> :S The wiki is down again. Maybe there are DNS propagation problems
>>>>>>>> still sorting themselves out. I'll look tomorrow.
>>>>>>>>
>>>>>>>> Cheers,
>>>>>>>>
>>>>>>>> Edward
>>>>>>>>
>>>>>>>>
>>>>>>>> On 22 July 2013 20:08, Troels Emtekær Linnet <[email protected]> wrote:
>>>>>>>>> I think you are looking for this
>>>>>>>>>
>>>>>>>>> http://wiki.nmr-relax.com/MediaWiki:Licenses
>>>>>>>>> http://meta.wikimedia.org/wiki/Uploading_files
>>>>>>>>> http://www.mediawiki.org/w/index.php?title=MediaWiki:Licenses&action=edit
>>>>>>>>>
>>>>>>>>> I don't know how to make the user have to add a license.
>>>>>>>>>
>>>>>>>>> Troels Emtekær Linnet
>>>>>>>>>
>>>>>>>>>
>>>>>>>>> 2013/7/22 Edward d'Auvergne <[email protected]>:
>>>>>>>>>> The wiki is back again! That's a cool little feature :) For journal
>>>>>>>>>> cover images, there is nothing I have published so far where a cover
>>>>>>>>>> image was used. There was a graphical abstract for my Molecular
>>>>>>>>>> Biosystems paper at http://dx.doi.org/10.1039/b702202f that I
>>>>>>>>>> uploaded
>>>>>>>>>> to
>>>>>>>>>> http://wiki.nmr-relax.com/File:Molecular_BioSystems_graphical_abstract.png,
>>>>>>>>>> but this is a little boring. It does relate directly to the question
>>>>>>>>>> Romel Bobby just asked on the relax-users mailing list
>>>>>>>>>> (http://thread.gmane.org/gmane.science.nmr.relax.user/1494), or at
>>>>>>>>>> least my attempt at answering the question. Oh, do you know how we
>>>>>>>>>> change the image upload so that a suitable licence can be chosen by
>>>>>>>>>> the uploader? Do you know what licences we can have there?
>>>>>>>>>>
>>>>>>>>>> There are also many screenshots in the graphics/screenshots relax
>>>>>>>>>> directory which might be suitable for uploading to the wiki, as well
>>>>>>>>>> as tonnes of other graphics. These can be uploaded when desired to
>>>>>>>>>> make the Wiki pages more colourful. For example there could be
>>>>>>>>>> different page describing each analysis performed by relax, and these
>>>>>>>>>> could use the analysis graphics. As for plugins, I don't currently
>>>>>>>>>> see a use for these. They can be added later when someone asks. For
>>>>>>>>>> example I might consider uploading presentation slides at some point
>>>>>>>>>> in the future, but not right now. Also, you will see a pile of
>>>>>>>>>> conference posters located at
>>>>>>>>>> http://svn.gna.org/svn/relax/website/conferences - these are part of
>>>>>>>>>> the relax website but could be put on the wiki later for easier
>>>>>>>>>> viewing. But for the initial wiki announcement, I don't believe
>>>>>>>>>> these
>>>>>>>>>> are needed.
>>>>>>>>>>
>>>>>>>>>> Cheers,
>>>>>>>>>>
>>>>>>>>>> Edward
>>>>>>>>>>
>>>>>>>>>>
>>>>>>>>>> On 22 July 2013 17:31, Troels Emtekær Linnet <[email protected]>
>>>>>>>>>> wrote:
>>>>>>>>>>> Hi.
>>>>>>>>>>>
>>>>>>>>>>> I added an image changer to the frontpage of the wiki.
>>>>>>>>>>> I basically uploaded the images from
>>>>>>>>>>> http://www.nmr-relax.com/screenshots.html
>>>>>>>>>>>
>>>>>>>>>>> Are there any journal published covers, which it should be done for
>>>>>>>>>>> also?
>>>>>>>>>>>
>>>>>>>>>>> Is there anymore plugins, which would be wanted?
>>>>>>>>>>> youtube plugin?
>>>>>>>>>>> Teaching / coding plugin ?
>>>>>>>>>>> Slides plugin?
>>>>>>>>>>> Presentation plugin ?
>>>>>>>>>>>
>>>>>>>>>>> I wan't to add these functionality, and test them, before releasing
>>>>>>>>>>> to
>>>>>>>>>>> relax user list and
>>>>>>>>>>> http://qa.nmrwiki.org/
>>>>>>>>>>>
>>>>>>>>>>> Best
>>>>>>>>>>> Troels Emtekær Linnet
>>>>>>>>>>>
>>>>>>>>>>> _______________________________________________
>>>>>>>>>>> relax (http://www.nmr-relax.com)
>>>>>>>>>>>
>>>>>>>>>>> This is the relax-devel mailing list
>>>>>>>>>>> [email protected]
>>>>>>>>>>>
>>>>>>>>>>> To unsubscribe from this list, get a password
>>>>>>>>>>> reminder, or change your subscription options,
>>>>>>>>>>> visit the list information page at
>>>>>>>>>>> https://mail.gna.org/listinfo/relax-devel
>
> _______________________________________________
> relax (http://www.nmr-relax.com)
>
> This is the relax-devel mailing list
> [email protected]
>
> To unsubscribe from this list, get a password
> reminder, or change your subscription options,
> visit the list information page at
> https://mail.gna.org/listinfo/relax-devel
_______________________________________________
relax (http://www.nmr-relax.com)
This is the relax-devel mailing list
[email protected]
To unsubscribe from this list, get a password
reminder, or change your subscription options,
visit the list information page at
https://mail.gna.org/listinfo/relax-devel
