Index: lams_central/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -r44f25ff763552baf103b1bb4ed7d1d2466a937dc -re3bdd10ab88fbb1a570a9a79de64df6dbfef2922 --- lams_central/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 44f25ff763552baf103b1bb4ed7d1d2466a937dc) +++ lams_central/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision e3bdd10ab88fbb1a570a9a79de64df6dbfef2922) @@ -891,4 +891,7 @@ authoring.tbl.desc.question=These questions are for iRA and tRA. Click "Create Question" to add more questions. Turn on "Enable confidence levels" to have the learners' confidence levels from the iRA shown on the tRA screen. authoring.tbl.desc.ae=State the questions for AE. Click "Create Question" to add more questions. + #======= End labels: Exported 786 labels for en AU ===== + +label.view=View \ No newline at end of file Index: lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java =================================================================== diff -u -rf5852bd3f19beebb0e143f3e23e604289d0963e4 -re3bdd10ab88fbb1a570a9a79de64df6dbfef2922 --- lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java (.../AuthoringService.java) (revision f5852bd3f19beebb0e143f3e23e604289d0963e4) +++ lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java (.../AuthoringService.java) (revision e3bdd10ab88fbb1a570a9a79de64df6dbfef2922) @@ -76,6 +76,7 @@ import org.lamsfoundation.lams.learningdesign.dao.ILearningLibraryDAO; import org.lamsfoundation.lams.learningdesign.dao.ILicenseDAO; import org.lamsfoundation.lams.learningdesign.dao.ITransitionDAO; +import org.lamsfoundation.lams.learningdesign.dto.LicenseDTO; import org.lamsfoundation.lams.learningdesign.dto.ValidationErrorDTO; import org.lamsfoundation.lams.learningdesign.exception.LearningDesignException; import org.lamsfoundation.lams.learningdesign.service.ILearningDesignService; @@ -1410,12 +1411,10 @@ * @see org.lamsfoundation.lams.authoring.service.IAuthoringFullService#getAvailableLicenses() */ @Override - public Vector getAvailableLicenses() { - List licenses = licenseDAO.findAll(License.class); - Vector licenseDTOList = new Vector(licenses.size()); - Iterator iter = licenses.iterator(); - while (iter.hasNext()) { - License element = (License) iter.next(); + public Vector getAvailableLicenses() { + List licenses = licenseDAO.getLicensesByOrderId(); + Vector licenseDTOList = new Vector(licenses.size()); + for ( License element : licenses ) { licenseDTOList.add(element.getLicenseDTO(Configuration.get(ConfigurationKeys.SERVER_URL))); } return licenseDTOList; Index: lams_central/src/java/org/lamsfoundation/lams/authoring/service/IAuthoringFullService.java =================================================================== diff -u -r36d9af9cb71edbbf24ae3fee278917346a8dba56 -re3bdd10ab88fbb1a570a9a79de64df6dbfef2922 --- lams_central/src/java/org/lamsfoundation/lams/authoring/service/IAuthoringFullService.java (.../IAuthoringFullService.java) (revision 36d9af9cb71edbbf24ae3fee278917346a8dba56) +++ lams_central/src/java/org/lamsfoundation/lams/authoring/service/IAuthoringFullService.java (.../IAuthoringFullService.java) (revision e3bdd10ab88fbb1a570a9a79de64df6dbfef2922) @@ -32,7 +32,7 @@ import org.lamsfoundation.lams.authoring.ObjectExtractorException; import org.lamsfoundation.lams.learningdesign.LearningDesign; import org.lamsfoundation.lams.learningdesign.LearningDesignAccess; -import org.lamsfoundation.lams.learningdesign.License; +import org.lamsfoundation.lams.learningdesign.dto.LicenseDTO; import org.lamsfoundation.lams.learningdesign.dto.ValidationErrorDTO; import org.lamsfoundation.lams.learningdesign.exception.LearningDesignException; import org.lamsfoundation.lams.tool.dto.ToolOutputDefinitionDTO; @@ -117,7 +117,7 @@ * * @return Vector of LicenseDTO objects. */ - Vector getAvailableLicenses(); + Vector getAvailableLicenses(); /** * Index: lams_central/web/authoring/authoring.jsp =================================================================== diff -u -r30a950cbc2f449d2f3ab2e7e16b2423703f4b7f8 -re3bdd10ab88fbb1a570a9a79de64df6dbfef2922 --- lams_central/web/authoring/authoring.jsp (.../authoring.jsp) (revision 30a950cbc2f449d2f3ab2e7e16b2423703f4b7f8) +++ lams_central/web/authoring/authoring.jsp (.../authoring.jsp) (revision e3bdd10ab88fbb1a570a9a79de64df6dbfef2922) @@ -470,14 +470,16 @@ onClick="javascript:MenuLib.toggleDescriptionDiv()"> - ? + ▼
- + +
+
- - +
Index: lams_central/web/images/license/by-nc-nd.svg =================================================================== diff -u --- lams_central/web/images/license/by-nc-nd.svg (revision 0) +++ lams_central/web/images/license/by-nc-nd.svg (revision e3bdd10ab88fbb1a570a9a79de64df6dbfef2922) @@ -0,0 +1,243 @@ + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: lams_central/web/images/license/by-nc-sa.eu.svg =================================================================== diff -u --- lams_central/web/images/license/by-nc-sa.eu.svg (revision 0) +++ lams_central/web/images/license/by-nc-sa.eu.svg (revision e3bdd10ab88fbb1a570a9a79de64df6dbfef2922) @@ -0,0 +1,202 @@ + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: lams_central/web/images/license/by-nc-sa.svg =================================================================== diff -u --- lams_central/web/images/license/by-nc-sa.svg (revision 0) +++ lams_central/web/images/license/by-nc-sa.svg (revision e3bdd10ab88fbb1a570a9a79de64df6dbfef2922) @@ -0,0 +1,202 @@ + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: lams_central/web/images/license/by-nc.eu.svg =================================================================== diff -u --- lams_central/web/images/license/by-nc.eu.svg (revision 0) +++ lams_central/web/images/license/by-nc.eu.svg (revision e3bdd10ab88fbb1a570a9a79de64df6dbfef2922) @@ -0,0 +1,166 @@ + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: lams_central/web/images/license/by-nd.svg =================================================================== diff -u --- lams_central/web/images/license/by-nd.svg (revision 0) +++ lams_central/web/images/license/by-nd.svg (revision e3bdd10ab88fbb1a570a9a79de64df6dbfef2922) @@ -0,0 +1,203 @@ + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: lams_central/web/images/license/by-sa.svg =================================================================== diff -u --- lams_central/web/images/license/by-sa.svg (revision 0) +++ lams_central/web/images/license/by-sa.svg (revision e3bdd10ab88fbb1a570a9a79de64df6dbfef2922) @@ -0,0 +1,199 @@ + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: lams_central/web/images/license/by.svg =================================================================== diff -u --- lams_central/web/images/license/by.svg (revision 0) +++ lams_central/web/images/license/by.svg (revision e3bdd10ab88fbb1a570a9a79de64df6dbfef2922) @@ -0,0 +1,155 @@ + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: lams_central/web/images/license/bync.jpg =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -re3bdd10ab88fbb1a570a9a79de64df6dbfef2922 Binary files differ Index: lams_central/web/images/license/byncnd.jpg =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -re3bdd10ab88fbb1a570a9a79de64df6dbfef2922 Binary files differ Index: lams_central/web/images/license/byncsa.jpg =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -re3bdd10ab88fbb1a570a9a79de64df6dbfef2922 Binary files differ Index: lams_central/web/images/license/bynd.jpg =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -re3bdd10ab88fbb1a570a9a79de64df6dbfef2922 Binary files differ Index: lams_central/web/images/license/bysa.jpg =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -re3bdd10ab88fbb1a570a9a79de64df6dbfef2922 Binary files differ Index: lams_central/web/images/license/publicdomain.svg =================================================================== diff -u --- lams_central/web/images/license/publicdomain.svg (revision 0) +++ lams_central/web/images/license/publicdomain.svg (revision e3bdd10ab88fbb1a570a9a79de64df6dbfef2922) @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20181214.sql =================================================================== diff -u --- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20181214.sql (revision 0) +++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20181214.sql (revision e3bdd10ab88fbb1a570a9a79de64df6dbfef2922) @@ -0,0 +1,55 @@ +-- Turn off autocommit, so nothing is committed if there is an error +SET AUTOCOMMIT = 0; +SET FOREIGN_KEY_CHECKS=0; +----------------------Put all sql statements below here------------------------- + +-- LDEV-4726 Update and add new creative common licenses 4.0 for sequences +-- Add an order_id column so we can sequence them how we like +ALTER TABLE lams_license +ADD COLUMN order_id TINYINT NULL DEFAULT '0'; + +UPDATE lams_license SET order_id = license_id; +UPDATE lams_license SET order_id = 8 WHERE license_id = 6; + +UPDATE lams_license +SET name = 'CC Attribution-ShareAlike 4.0', +url = 'https://creativecommons.org/licenses/by-sa/4.0/', +picture_url = '/images/license/by-sa.svg' +WHERE license_id = 5; + +UPDATE lams_license +SET name = 'CC Attribution-No Derivatives 4.0', +url = 'https://creativecommons.org/licenses/by-nd/4.0/', +picture_url = '/images/license/by-nd.svg' +WHERE license_id = 2; + +UPDATE lams_license +SET name = 'CC Attribution-Noncommercial 4.0', +url = 'https://creativecommons.org/licenses/by-nc/4.0/', +picture_url = '/images/license/by-nc.eu.svg' +WHERE license_id = 4; + +UPDATE lams_license +SET name = 'LAMS Recommended: CC Attribution-Noncommercial-ShareAlike 4.0', +url = 'https://creativecommons.org/licenses/by-nc-sa/4.0/', +picture_url = '/images/license/by-nc-sa.eu.svg' +WHERE license_id = 1; + +UPDATE lams_license +SET name = 'CC Attribution-Noncommercial-No Derivatives 4.0', +url = 'https://creativecommons.org/licenses/by-nc-nd/4.0/', +picture_url = '/images/license/by-nc-nd.svg' +WHERE license_id = 3; + +INSERT into lams_license +VALUES (7, 'CC Attribution 4.0', 'by', 'https://creativecommons.org/licenses/by/4.0/', 0, '/images/license/by.svg', 6); + +INSERT into lams_license +VALUES (8, 'Public Domain', 'CC0', 'https://creativecommons.org/publicdomain/zero/1.0/', 0, '/images/license/publicdomain.svg', 7); + +----------------------Put all sql statements above here------------------------- + +-- If there were no errors, commit and restore autocommit to on +COMMIT; +SET AUTOCOMMIT = 1; +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/License.java =================================================================== diff -u -raaa9a8f28fa1b2a222690dbb3a2d7647efb30cd5 -re3bdd10ab88fbb1a570a9a79de64df6dbfef2922 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/License.java (.../License.java) (revision aaa9a8f28fa1b2a222690dbb3a2d7647efb30cd5) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/License.java (.../License.java) (revision e3bdd10ab88fbb1a570a9a79de64df6dbfef2922) @@ -63,6 +63,9 @@ @Column(name = "picture_url") private String pictureURL; + @Column(name = "order_id") + private Integer orderId; + public License() { } @@ -129,6 +132,14 @@ this.code = code; } + public Integer getOrderId() { + return orderId; + } + + public void setOrderId(Integer orderId) { + this.orderId = orderId; + } + /** * Is this license and another license the same license? The licenseID and name fields * are checked, with the name fields having any leading or trailing spaces stripped Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/ILicenseDAO.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -re3bdd10ab88fbb1a570a9a79de64df6dbfef2922 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/ILicenseDAO.java (.../ILicenseDAO.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/ILicenseDAO.java (.../ILicenseDAO.java) (revision e3bdd10ab88fbb1a570a9a79de64df6dbfef2922) @@ -23,6 +23,8 @@ package org.lamsfoundation.lams.learningdesign.dao; +import java.util.List; + import org.lamsfoundation.lams.dao.IBaseDAO; import org.lamsfoundation.lams.learningdesign.License; @@ -33,4 +35,5 @@ public License getLicenseByID(Long licenseID); + public List getLicensesByOrderId(); } Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LicenseDAO.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -re3bdd10ab88fbb1a570a9a79de64df6dbfef2922 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LicenseDAO.java (.../LicenseDAO.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LicenseDAO.java (.../LicenseDAO.java) (revision e3bdd10ab88fbb1a570a9a79de64df6dbfef2922) @@ -23,6 +23,8 @@ package org.lamsfoundation.lams.learningdesign.dao.hibernate; +import java.util.List; + import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.learningdesign.License; import org.lamsfoundation.lams.learningdesign.dao.ILicenseDAO; @@ -34,9 +36,16 @@ @Repository public class LicenseDAO extends LAMSBaseDAO implements ILicenseDAO { + private final static String LICENSES_BY_ORDER_ID = "from " + License.class.getName() + " ORDER BY orderId"; + @Override public License getLicenseByID(Long licenseID) { return (License) super.find(License.class, licenseID); } + @Override + @SuppressWarnings("unchecked") + public List getLicensesByOrderId() { + return (List) getSession().createQuery(LICENSES_BY_ORDER_ID).list(); + } }