Revision: 1975
Author: [email protected]
Date: Fri Jul 23 01:56:57 2010
Log: Add default option and a few extra licenses. (Issue 313)
http://code.google.com/p/simal/source/detail?r=1975
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
Fri Jul 9 10:24:28 2010
+++ /trunk/uk.ac.osswatch.simal.web/src/main/widgets/doapcreator/index.html
Fri Jul 23 01:56:57 2010
@@ -133,6 +133,7 @@
<div class="question">OSS license you will you be using for the
code generated from project:<span
class="mandatory">*</span></div>
<div class="answer"><select id="licence">
+ <option value="">Please choose</option>
<option value="asl20">Apache License 2.0</option>
<option value="agpl">Affero GNU Public License</option>
<option value="epl">Eclipse Public License</option>
@@ -142,6 +143,7 @@
<option value="mpl">Mozilla Public License 1.1</option>
<option value="mit">MIT License</option>
<option value="bsd">BSD License</option>
+ <option value="eupl">European Union Public License</option>
</select><br />
Please consult <a target="_blank"
href="http://www.oss-watch.ac.uk";>OSS
Watch</a> for guidance on which license to use</div>
@@ -218,12 +220,15 @@
<div class="q_container">
<div class="question">Licence used for documentation:<span
class="mandatory">*</span>
</div>
- <div class="answer"><select id="cont_licence">
- <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></select><br />
- This licence and logo must be displayed on all documents
and websites
+ <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>
+ </select><br />
+ If you use a separate licence it must be displayed on all
documents and websites
produced by the project.
</div>
</div>
=======================================
---
/trunk/uk.ac.osswatch.simal.web/src/main/widgets/doapcreator/scripts/doapform.js
Thu Jul 22 11:06:17 2010
+++
/trunk/uk.ac.osswatch.simal.web/src/main/widgets/doapcreator/scripts/doapform.js
Fri Jul 23 01:56:57 2010
@@ -135,7 +135,7 @@
function allMandatoryFieldsOK() {
var allMandatoryFieldIds =
[ "shortname", "name", "shortdesc", "description",
- "homepage", "person_email_1", "person_name_1", "licence" ];
+ "homepage", "person_email_1", "person_name_1" ];
var allMandatoryJiscFieldIds =
[ "name", "shortname", "shortdesc", "description",
"blog", "homepage", "blogfeed", "projectemail",
"person_email_1",
"person_name_1", "person_pic_1", "lead_institution",
"department",
@@ -443,7 +443,7 @@
}
function commitDoapFile(doap) {
- var loc = 'http://localhost:8888/simal-rest/addProject';
+ var loc = 'http://localhost:8080/simal-rest/addProject';
loc = Widget.proxify(loc);
var xml_request = new XMLHttpRequest();
--
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.
