Index: content/content-bundles/resources/content.properties =================================================================== --- content/content-bundles/resources/content.properties (revision 122254) +++ content/content-bundles/resources/content.properties (working copy) @@ -339,6 +339,9 @@ list.unselect = Uncheck All list.ame = Actions menu end +# SAK-23367 +list.copycontent = Copy Content from My Other Sites + locked = is locked by another usage. mismatch = has type mismatch. Index: content/content-bundles/resources/types.properties =================================================================== --- content/content-bundles/resources/types.properties (revision 122254) +++ content/content-bundles/resources/types.properties (working copy) @@ -513,3 +513,6 @@ dropdown.duration_widget_qualifiers.11.label=Minute dropdown.duration_widget_qualifiers.12=second dropdown.duration_widget_qualifiers.12.label=Second + +# SAK-23367 +notes.expandfolder=Expand folder(s) of interest and select item(s) to copy to your current site above. \ No newline at end of file Index: content/content-tool/tool/src/java/org/sakaiproject/content/tool/ResourcesAction.java =================================================================== --- content/content-tool/tool/src/java/org/sakaiproject/content/tool/ResourcesAction.java (revision 122254) +++ content/content-tool/tool/src/java/org/sakaiproject/content/tool/ResourcesAction.java (working copy) @@ -4392,7 +4392,7 @@ String allowed_to_see_other_sites = (String) state.getAttribute(STATE_SHOW_ALL_SITES); String show_other_sites = (String) state.getAttribute(STATE_SHOW_OTHER_SITES); context.put("show_other_sites", show_other_sites); - if(Boolean.TRUE.toString().equals(allowed_to_see_other_sites)) + if(Boolean.TRUE.toString().equals(allowed_to_see_other_sites) && canReviseAny()) { context.put("allowed_to_see_other_sites", Boolean.TRUE.toString()); show_all_sites = Boolean.TRUE.toString().equals(show_other_sites); @@ -6736,7 +6736,17 @@ { doHideconfirm(data); } - + else if(ResourceToolAction.COPY_OTHER.equals(actionId)) + { + List selectedSet = new ArrayList(); + String[] selectedItems = params.getStrings("selectedMembers-other"); + if(selectedItems != null) + { + selectedSet.addAll(Arrays.asList(selectedItems)); + } + state.setAttribute(STATE_ITEMS_TO_BE_COPIED, selectedSet); + state.removeAttribute(STATE_ITEMS_TO_BE_MOVED); + } } /** Index: content/content-tool/tool/src/webapp/vm/content/sakai_resources_list.vm =================================================================== --- content/content-tool/tool/src/webapp/vm/content/sakai_resources_list.vm (revision 122254) +++ content/content-tool/tool/src/webapp/vm/content/sakai_resources_list.vm (working copy) @@ -119,7 +119,7 @@ #end #if ($alertMessage) -
$validator.escapeHtml($alertMessage)
+
$alertMessage
#end
@@ -525,19 +525,34 @@

- ## - $clang.getString('list.hide') - $validator.escapeHtml("$clang.getString('list.hide')") + title= "$clang.getString('list.copycontent')"> + $clang.getString('list.copycontent') + $validator.escapeHtml("$clang.getString('list.copycontent')")

+ + + $tlang.getString('notes.expandfolder') + + ################################################################ Begin Paging widgets #if($!allMsgNumber && $allMsgNumberInt && $allMsgNumberInt > 5) - +
+
+ + + +
+
+ + +
$tlang.getString("viewing") $topMsgPos - $btmMsgPos $tlang.getString("of") $allMsgNumber $tlang.getString("items")
#if ("$pagesize" != "0") @@ -576,6 +591,21 @@
+ #else + + +
+
+ + + +
+
+ + + #end ################################################################ Eng Paging widgets #foreach($item in $other_sites) @@ -607,9 +637,9 @@ #if($item.depth > 0 && $item.hasMultipleItemActions()) - #foreach($key in $item.multipleItemActions.keySet())$counter.increment("$key") $counter.increment("selectall")#if($selectedItems.contains($item.id))$counter.increment("${key}selected")#end#end #end @@ -688,66 +718,13 @@ #if ($item.description !="" && $item.description) $tlang.getString(#end - - #if($item.pasteActions && !$item.pasteActions.isEmpty()) - #set ($itemsOnLine = 0) - #foreach($action in $item.pasteActions) - #if($itemsOnLine > 0)|#end - $labeler.getLabel($action) - #set ($itemsOnLine = $itemsOnLine + 1) - #end - #end - - - #if($item.addActions && !$item.addActions.isEmpty()) - - #end - - - - #if($item.otherActions && !$item.otherActions.isEmpty()) - - #end - - + + #set ($actionCount=($actionCount - 1)) + #set ($actionCount2=($actionCount2 - 1)) + + #if($item.depth > 0) - - #if($item.isPubviewInherited() || $item.isPubview()) - $tlang.getString("access.public") - #elseif($item.isInDropbox()) - $tlang.getString("access.dropbox") - #elseif($item.effectiveAccess == $INHERITED_ACCESS || $item.effectiveAccess == $SITE_ACCESS) - $tlang.getString("access.site") - #elseif($item.effectiveAccess == $GROUP_ACCESS) - $tlang.getString("access.group") - #end - + $validator.escapeHtml($item.createdBy) @@ -769,9 +746,9 @@

- $clang.getString('list.show') - $validator.escapeHtml("$clang.getString('list.show')") + title= "$clang.getString('list.copycontent')"> + $clang.getString('list.copycontent') + $validator.escapeHtml("$clang.getString('list.copycontent')")

@@ -790,6 +767,8 @@ + ## copy for other sites +