Revision: 1992
Author: [email protected]
Date: Wed Aug 4 05:41:29 2010
Log: Added content licences and jurisdiction for CC licences only (fixes
Issue 313)
http://code.google.com/p/simal/source/detail?r=1992
Modified:
/trunk/uk.ac.osswatch.simal.web/src/main/widgets/doapcreator/index.html
/trunk/uk.ac.osswatch.simal.web/src/main/widgets/doapcreator/scripts/doapform.js
=======================================
--- /trunk/uk.ac.osswatch.simal.web/src/main/widgets/doapcreator/index.html
Wed Aug 4 03:13:16 2010
+++ /trunk/uk.ac.osswatch.simal.web/src/main/widgets/doapcreator/index.html
Wed Aug 4 05:41:29 2010
@@ -267,14 +267,23 @@
</div>
<div class="answer">
<select id="cont_licence">
- <option value="">No different licence for
documentation</option>
- <option value="CC-SA-UK">Creative Commons
Attribution-Share
- Alike UK 2.0: England and Wales</option>
- <option value="CC-UK">Creative Commons Attribution UK
2.0:
- England and Wales</option>
+ <option value="">No separate licence for
documentation</option>
+ <option value="CC-BY">Creative Commons
Attribution</option>
+ <option value="CC-BY-SA">Creative Commons Attribution
Share Alike</option>
+ <option value="CC-BY-ND">Creative Commons Attribution No
Derivatives</option>
+ <option value="CC-BY-NC">Creative Commons Attribution
Non-Commercial</option>
+ <option value="CC-BY-NC-SA">Creative Commons Attribution
Non-Commercial Share Alike</option>
+ <option value="CC-BY-NC-ND">Creative Commons Attribution
Non-Commercial No Derivatives</option>
+ <option value="GFDL">GNU Free Documentation
License</option>
+ </select><br />
+ Jurisdiction (CC only):<select id="cont_licence_juris">
+ <option value="">International</option>
+ <option value="UK">England and Wales</option>
+ <option value="Scotland">Scotland</option>
</select><br />
If you use a separate licence it must be displayed on all
documents and websites
- produced by the project.
+ produced by the project. See the <a target="_blank"
href="http://creativecommons.org/about/licenses/">
+ Creative Commons (CC) website</a> for more information.
</div>
</div>
<div class="q_container">
=======================================
---
/trunk/uk.ac.osswatch.simal.web/src/main/widgets/doapcreator/scripts/doapform.js
Wed Aug 4 04:05:13 2010
+++
/trunk/uk.ac.osswatch.simal.web/src/main/widgets/doapcreator/scripts/doapform.js
Wed Aug 4 05:41:29 2010
@@ -444,6 +444,7 @@
var resp_reports_phone =
document.getElementById("resp_reports_phone").value;
var resp_reports_skype =
document.getElementById("resp_reports_skype").value;
var cont_licence = document.getElementById("cont_licence").value;
+ var cont_licence_juris =
document.getElementById("cont_licence_juris").value;
var lead_institution = document.getElementById("lead_institution").value;
var department = document.getElementById("department").value;
var dept_postcode = document.getElementById("dept_postcode").value;
@@ -505,6 +506,9 @@
}
if (cont_licence != "") {
+ if (cont_licence.indexOf("CC") == 0 && cont_licence_juris != "") {
+ cont_licence += "-" + cont_licence_juris;
+ }
jiscdoap += " <license
rdf:resource=\"http://usefulinc.com/doap/licenses/"
+ cont_licence + "\"/>\n";
}
--
You received this message because you are subscribed to the Google Groups "Simal
Commits" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/simal-commits?hl=en.