SAK-33685 - Syllabus icons are not able to be clicked (sakaiproject#5115

)
cab938 · Dec 12, 2017 · 221a903 · 221a903
1 parent f4ef0f7
commit 221a903
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/syllabus/syllabus-app/src/webapp/js/syllabus.js b/syllabus/syllabus-app/src/webapp/js/syllabus.js
@@ -65,7 +65,7 @@ function setupAccordion(iframId, isInstructor, msgs, openDataId){
 	if(isInstructor){
 		$( "#accordion span" ).sortable({
 			axis: "y",
-			handle: "h3 span.actionIcon",
+			handle: "h3 span.handleIcon",
 			start: function(event, ui){
 			dragStartIndex = ui.item.index();
 		},

diff --git a/syllabus/syllabus-app/src/webapp/syllabus/main.jsp b/syllabus/syllabus-app/src/webapp/syllabus/main.jsp
@@ -72,6 +72,17 @@
 			};
 		setupAccordion('<%= org.sakaiproject.util.Web.escapeJavascript(thisId)%>',<h:outputText value="#{SyllabusTool.editAble == 'true' ? true : false}"/>, msgs, 
 							'<h:outputText value="#{SyllabusTool.openDataId}"/>');
+					if(<h:outputText value="#{SyllabusTool.editAble == 'true'}"/>){
+						//draft/publish toggle:
+						setupToggleImages("publish", "publish", "publishOn", "publishOff", msgs);
+						//Calendar Toggle
+						setupToggleImages("linkCalendar", "linkCal", "linkCalOn", "linkCalOff", msgs);
+						//Public/Private to the world toggle
+						setupToggleImages("view", "linkWorld", "linkWorldOn", "linkWorldOff", msgs);
+						}else{
+						//remove CSS classes (otherwise you get those hover over "pencil edit" images
+						$(".editItem").removeClass("editItem");
+						}
 	});
 	
 	function showConfirmDeleteHelper(deleteButton, event){
@@ -200,7 +211,7 @@
 						<f:verbatim>"><h3></f:verbatim>
 						<f:subview id="actionIcons" rendered="#{SyllabusTool.editAble == 'true'}">
 						    <f:verbatim>
-							<span class="fa fa-arrows actionIcon" alt="</f:verbatim><h:outputText value="#{msgs.dragToReorder}"/><f:verbatim>" title="</f:verbatim><h:outputText value="#{msgs.dragToReorder}"/><f:verbatim>"></span>
+							<span class="fa fa-arrows handleIcon" alt="</f:verbatim><h:outputText value="#{msgs.dragToReorder}"/><f:verbatim>" title="</f:verbatim><h:outputText value="#{msgs.dragToReorder}"/><f:verbatim>"></span>
 							<span class="edit-actions">
 							  <span class="fa fa-eye actionIcon publish publishOn" alt="</f:verbatim><h:outputText value="#{msgs.clickToUnpublish}"/><f:verbatim>" title="</f:verbatim><h:outputText value="#{msgs.clickToUnpublish}"/><f:verbatim>" style="</f:verbatim><h:outputText value="#{eachEntry.status == eachEntry.draftStatus ? 'display:none' : ''}"/><f:verbatim>"></span>
 							  <span class="fa fa-eye-slash actionIcon publish publishOff" alt="</f:verbatim><h:outputText value="#{msgs.clickToPublish}"/><f:verbatim>" title="</f:verbatim><h:outputText value="#{msgs.clickToPublish}"/><f:verbatim>" style="</f:verbatim><h:outputText value="#{eachEntry.status == eachEntry.draftStatus ? '' : 'display:none'}"/><f:verbatim>"></span>