Merge branch 'master' into SAK-50581

assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_list_submissions.vm

@@ -288,7 +288,7 @@ function printView(url) {
 						<label for="toggleAllSelectAllowResubmit" class="skip">$tlang.getString("allowResubmission.toggleall")</label>
 					</th> 
 					<th id="attachment" class="attach">
-						<img src="#imageLink("sakai/attachments.gif")" border="0" alt="$tlang.getString("gen.att")" width="15" height="15" class="attachmentsIcon" />
+						<span class="si si-attachment" aria-label="$tlang.getString("gen.att")" />
 					</th>
 					<th id="studentname">
 						<a href="javascript:void(0)" onclick="location='#toolLinkParam("AssignmentAction" "doSort_grade_submission" "criteria=$!sort_lastName")'; return false;"   title="$tlang.getString("gen.sorbylas")">
@@ -434,7 +434,7 @@ function printView(url) {
 							</td>
 							<td headers="attachment" class="attach">
 								#if ($!userSubmission.hasVisibleAttachments)
-									<img src="#imageLink("sakai/attachments.gif")" border="0" alt="$tlang.getString("gen.att")" width="15" height="15" class="attachmentsIcon" />
+									<span class="si si-attachment" aria-label="$tlang.getString("gen.att")" />
 								#end
 							</td>
 							<td headers="studentname">
@@ -633,9 +633,7 @@ function printView(url) {
 							#end
 							<td headers="gradereleased">
 								#if ($submission.getGradeReleased())
-									<img src="#imageLink("sakai/checkon.gif")" alt="$tlang.getString("gen.open")" border="0" width="17" height="13" align="top" />
-								#else
-									<img src="#imageLink("sakai/checkoff.gif")" alt="$tlang.getString("gen.open")" border="0" width="15" height="15" align="top" />
+									<span class="si si-check fs-3" aria-label="$tlang.getString("gen.open")" />
 								#end
 							</td>
 						</tr>

assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_report_submissions.vm

@@ -225,7 +225,7 @@
 										 $tlang.getString("gen.pf")
 									#elseif ($gradeScale == 5)
 										## Grade type that only requires a check
-										<img src="#imageLink("sakai/checkon.gif")" border="0" alt="$tlang.getString("check")" />
+										<span class="si si-check fs-3" aria-label="$tlang.getString("check")" />
 									#end
 							</td>
 							<td headers="submitted">

assignment/tool/src/webapp/vm/assignment/chef_assignments_list_assignments.vm

@@ -659,7 +659,7 @@
 										$tlang.getString("gen.pf")
 									#elseif ($gradeScale == 5)
 										## Grade type that only requires a check
-										<img src="#imageLink("sakai/checkon.gif")" border="0" alt="Checkmark" />
+										<span class="si si-check fs-3" aria-label="$tlang.getString("check")" />
 									#end
 							</td>
 							#end

chat/chat-impl/impl/src/java/org/sakaiproject/chat2/model/impl/ChatEntityProducer.java

@@ -106,9 +106,7 @@ protected void init() throws Exception {
       }
    }
 
-   /**
-    * {@inheritDoc}
-    */
+   @Override
    public String[] myToolIds()
    {
       String[] toolIds = { ChatManager.CHAT_TOOL_ID };
@@ -131,9 +129,7 @@ public ChatChannel getChannel(Reference reference) throws IdUnusedException, Per
       return chatManager.getChatChannel(reference.getId());
    }
 
-   /**
-    * {@inheritDoc}
-    */
+   @Override
    public String archive(String siteId, Document doc, Stack stack, String archivePath, List attachments)
    {
       //prepare the buffer for the results log
@@ -230,9 +226,7 @@ public void archiveSynopticOptions(String siteId, Document doc, Element element)
          }
    }
 
-   /**
-    * {@inheritDoc}
-    */
+   @Override
    public Entity getEntity(Reference ref)
    {
       // we could check that the type is one of the message services, but lets just assume it is so we don't need to know them here -ggolden
@@ -270,18 +264,7 @@ else if (ChatManager.REF_TYPE_MESSAGE.equals(ref.getSubType()))
       return rv;
    }
 
-   /**
-    * {@inheritDoc}
-    */
-   public Collection getEntityAuthzGroups(Reference ref, String userId)
-   {
-      //TODO implement this
-      return null;
-   }
-
-   /**
-    * {@inheritDoc}
-    */
+   @Override
    public String getEntityDescription(Reference ref)
    {
       // we could check that the type is one of the message services, but lets just assume it is so we don't need to know them here -ggolden
@@ -310,17 +293,7 @@ public String getEntityDescription(Reference ref)
       return rv;
    }
 
-   /* (non-Javadoc)
-    * @see org.sakaiproject.entity.api.EntityProducer#getEntityResourceProperties(org.sakaiproject.entity.api.Reference)
-    */
-   public ResourceProperties getEntityResourceProperties(Reference ref) {
-      // TODO Auto-generated method stub
-      return null;
-   }
-
-   /**
-    * {@inheritDoc}
-    */
+   @Override
    public String getEntityUrl(Reference ref)
    {
       // we could check that the type is one of the message services, but lets just assume it is so we don't need to know them here -ggolden
@@ -362,9 +335,7 @@ else if (ChatManager.REF_TYPE_MESSAGE.equals(ref.getSubType()))
       return url;
    }
 
-   /**
-    * {@inheritDoc}
-    */
+   @Override
    public HttpAccess getHttpAccess()
    {
       return new HttpAccess()
@@ -484,18 +455,14 @@ public void handleAccess(HttpServletRequest req, HttpServletResponse res, Refere
       };
    }
 
-   /**
-    * {@inheritDoc}
-    */
+   @Override
    public String getLabel() {
       return chatManager.getLabel();
    }
 
 
 
-   /**
-    * {@inheritDoc}
-    */
+   @Override
    public String merge(String siteId, Element root, String archivePath, String fromSiteId, Map attachmentNames, Map userIdTrans,
          Set userListAllowImport)
    {
@@ -605,9 +572,7 @@ else if (channelElement.getTagName().equals(SYNOPTIC_TOOL))
    } // merge
 
 
-   /**
-    * {@inheritDoc}
-    */
+   @Override
    public boolean parseEntityReference(String reference, Reference ref)
    {
       if (reference.startsWith(ChatManager.REFERENCE_ROOT))
@@ -659,9 +624,7 @@ else if (ChatManager.REF_TYPE_MESSAGE.equals(subType))
       return false;
    }
 
-   /**
-    * {@inheritDoc}
-    */
+   @Override
    public boolean willArchiveMerge()
    {
       return true;

citations/citations-impl/impl/pom.xml

@@ -108,7 +108,7 @@
     <dependency>
       <groupId>com.thoughtworks.xstream</groupId>
       <artifactId>xstream</artifactId>
-      <version>1.4.18</version>
+      <version>1.4.21</version>
     </dependency>
     <dependency>
       <groupId>backport-util-concurrent</groupId>

citations/citations-impl/impl/src/java/org/sakaiproject/citation/impl/BaseCitationService.java

@@ -4306,20 +4306,6 @@ public CitationCollection addCollection()
 		return edit;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.sakaiproject.entity.api.EntityProducer#archive(java.lang.String,
-	 *      org.w3c.dom.Document, java.util.Stack, java.lang.String,
-	 *      java.util.List)
-	 */
-	public String archive(String siteId, Document doc, Stack stack, String archivePath,
-	        List attachments)
-	{
-		// TODO Auto-generated method stub
-		return null;
-	}
-
 	/*
 	 * (non-Javadoc)
 	 *
@@ -5387,20 +5373,6 @@ public List listSchemas()
 		return new Vector(names);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.sakaiproject.entity.api.EntityProducer#merge(java.lang.String,
-	 *      org.w3c.dom.Element, java.lang.String, java.lang.String,
-	 *      java.util.Map, java.util.Map, java.util.Set)
-	 */
-	public String merge(String siteId, Element root, String archivePath, String fromSiteId,
-	        Map attachmentNames, Map userIdTrans, Set userListAllowImport)
-	{
-		// TODO Auto-generated method stub
-		return null;
-	}
-
 	/**
 	 * Construct a Storage object.
 	 *

commons/impl/src/java/org/sakaiproject/commons/impl/CommonsManagerImpl.java

@@ -338,10 +338,6 @@ public Collection getEntityAuthzGroups(Reference ref, String userId) {
         return ids;
     }
 
-    public String getEntityDescription(Reference arg0) {
-        return null;
-    }
-
     public ResourceProperties getEntityResourceProperties(Reference ref) {
 
         try {

config/configuration/bundles/src/bundle/org/sakaiproject/config/bundle/default.sakai.properties

@@ -113,10 +113,6 @@
 # DEFAULT: false
 # portal.logout.confirmation=true
 
-# SAK-32224 - Ability to disable the animated tool menu by property
-# DEFAULT: true
-# portal.scrolling.toolbar.enabled=false
-
 # Ability to enable the publish site confirmation dialog
 # DEFAULT: false
 # portal.publish.site.confirm.enabled=true

delegatedaccess/tool/src/java/org/apache/wicket/extensions/markup/html/tree/table/TreeTable.java

@@ -411,13 +411,10 @@ protected void populateTreeItem(final WebMarkupContainer item, final int level)
 			public void onComponentTag(final Component component, final ComponentTag tag)
 			{
 				super.onComponentTag(component, tag);
+				tag.put("class", "row");
 				if (getTreeState().isNodeSelected(node))
 				{
-					tag.put("class", "row-selected");
-				}
-				else
-				{
-					tag.put("class", "row");
+					tag.put("class", "row row-selected");
 				}
 			}
 		});

delegatedaccess/tool/src/java/org/sakaiproject/delegatedaccess/tool/pages/UserEditPage.java

@@ -247,26 +247,26 @@ protected void onSubmit(AjaxRequestTarget target) {
 		List<IColumn> columnsList = new ArrayList<>();
 		columnsList.add(new PropertyTreeColumn<>(new ColumnLocation(Alignment.MIDDLE, 100, Unit.PROPORTIONAL),	"", "userObject.node.description"));
 		if(sakaiProxy.isSuperUser()){
-			columnsList.add(new PropertyEditableColumnCheckbox(new ColumnLocation(Alignment.RIGHT, 70, Unit.PX), new StringResourceModel("accessAdmin").getString(), "userObject.accessAdmin", DelegatedAccessConstants.TYPE_ACCESS_ADMIN));
+			columnsList.add(new PropertyEditableColumnCheckbox(new ColumnLocation(Alignment.LEFT, 70, Unit.PX), new StringResourceModel("accessAdmin").getString(), "userObject.accessAdmin", DelegatedAccessConstants.TYPE_ACCESS_ADMIN));
 			if(sakaiProxy.getShoppingUIEnabled()) {
-				columnsList.add(new PropertyEditableColumnCheckbox(new ColumnLocation(Alignment.RIGHT, 90, Unit.PX), new StringResourceModel("shoppingPeriodAdmin").getString(), "userObject.shoppingPeriodAdmin", DelegatedAccessConstants.TYPE_SHOPPING_PERIOD_ADMIN));
+				columnsList.add(new PropertyEditableColumnCheckbox(new ColumnLocation(Alignment.LEFT, 90, Unit.PX), new StringResourceModel("shoppingPeriodAdmin").getString(), "userObject.shoppingPeriodAdmin", DelegatedAccessConstants.TYPE_SHOPPING_PERIOD_ADMIN));
 			}
 		}
-		columnsList.add(new PropertyEditableColumnCheckbox(new ColumnLocation(Alignment.RIGHT, 68, Unit.PX), new StringResourceModel("siteAccess").getString(), "userObject.directAccess", DelegatedAccessConstants.TYPE_ACCESS));
+		columnsList.add(new PropertyEditableColumnCheckbox(new ColumnLocation(Alignment.LEFT, 68, Unit.PX), new StringResourceModel("siteAccess").getString(), "userObject.directAccess", DelegatedAccessConstants.TYPE_ACCESS));
 		if(!singleRoleOptions){
-			columnsList.add(new PropertyEditableColumnDropdown(new ColumnLocation(Alignment.RIGHT, roleColumnSize, Unit.PX), new StringResourceModel("userBecomes").getString(),
+			columnsList.add(new PropertyEditableColumnDropdown(new ColumnLocation(Alignment.LEFT, roleColumnSize, Unit.PX), new StringResourceModel("userBecomes").getString(),
 					"userObject.roleOption", roleMap, DelegatedAccessConstants.TYPE_ACCESS, sakaiProxy.isSuperUser() ? null : sakaiProxy.getSubAdminOrderedRealmRoles()));
 		}
 		if(sakaiProxy.isSuperUser() || sakaiProxy.getToolsListUIEnabled()) {
-			columnsList.add(new PropertyEditableColumnList(new ColumnLocation(Alignment.RIGHT, 134, Unit.PX), new StringResourceModel("restrictedToolsHeader").getString(),
+			columnsList.add(new PropertyEditableColumnList(new ColumnLocation(Alignment.LEFT, 134, Unit.PX), new StringResourceModel("restrictedToolsHeader").getString(),
 				"userObject.restrictedAuthTools", DelegatedAccessConstants.TYPE_ACCESS, DelegatedAccessConstants.TYPE_LISTFIELD_TOOLS));
 		}
 		//setup advanced options settings:
 		Map<String, Object> advSettings = new HashMap<String, Object>();
 		boolean permitBecomeUser = sakaiProxy.isSuperUser() || sakaiProxy.allowAccessAdminsSetBecomeUserPerm();
 		if(permitBecomeUser) {
 			advSettings.put(PropertyEditableColumnAdvancedUserOptions.SETTINGS_ALLOW_SET_BECOME_USER, permitBecomeUser);
-			columnsList.add(new PropertyEditableColumnAdvancedUserOptions(new ColumnLocation(Alignment.RIGHT, 92, Unit.PX), new StringResourceModel("advanced").getString(), "", advSettings));
+			columnsList.add(new PropertyEditableColumnAdvancedUserOptions(new ColumnLocation(Alignment.LEFT, 92, Unit.PX), new StringResourceModel("advanced").getString(), "", advSettings));
 		}
 		IColumn columns[] = columnsList.toArray(new IColumn[columnsList.size()]);
 

gradebookng/impl/pom.xml

@@ -81,7 +81,7 @@
         <dependency>
             <groupId>com.thoughtworks.xstream</groupId>
             <artifactId>xstream</artifactId>
-            <version>1.4.18</version>
+            <version>1.4.21</version>
         </dependency>
         <dependency>
             <groupId>org.sakaiproject.plus</groupId>

gradebookng/tool/src/java/org/sakaiproject/gradebookng/framework/GradebookNgEntityProducer.java

@@ -17,7 +17,6 @@
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
-import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -27,13 +26,10 @@
 
 import org.apache.commons.lang3.StringUtils;
 
-import org.sakaiproject.entity.api.Entity;
 import org.sakaiproject.entity.api.EntityManager;
 import org.sakaiproject.entity.api.EntityProducer;
 import org.sakaiproject.entity.api.EntityTransferrer;
-import org.sakaiproject.entity.api.HttpAccess;
 import org.sakaiproject.entity.api.Reference;
-import org.sakaiproject.entity.api.ResourceProperties;
 import org.sakaiproject.exception.IdUnusedException;
 import org.sakaiproject.grading.api.GradingConstants;
 import org.sakaiproject.grading.api.model.Gradebook;
@@ -272,41 +268,6 @@ public String merge(final String siteId, final Element root, final String archiv
 		return "GradebookNG merge not supported: nothing to do.";
 	}
 
-	@Override
-	public boolean parseEntityReference(final String reference, final Reference ref) {
-		return false;
-	}
-
-	@Override
-	public String getEntityDescription(final Reference ref) {
-		return null;
-	}
-
-	@Override
-	public ResourceProperties getEntityResourceProperties(final Reference ref) {
-		return null;
-	}
-
-	@Override
-	public Entity getEntity(final Reference ref) {
-		return null;
-	}
-
-	@Override
-	public String getEntityUrl(final Reference ref) {
-		return null;
-	}
-
-	@Override
-	public Collection<String> getEntityAuthzGroups(final Reference ref, final String userId) {
-		return null;
-	}
-
-	@Override
-	public HttpAccess getHttpAccess() {
-		return null;
-	}
-
 	@Override
 	public String[] myToolIds() {
 		return TOOL_IDS;
@@ -350,9 +311,4 @@ public Map<String, String> transferCopyEntities(String fromContext, String toCon
 		// now migrate
 		return this.transferCopyEntities(fromContext, toContext, ids, null);
 	}
-
-	@Override
-	public void updateEntityReferences(String toContext, Map<String, String> transversalMap) {
-		//not necessary
-	}
 }