SAM-2384 indicate the state of zero selected groups more clearly to t…

…he user git-svn-id: https://source.sakaiproject.org/svn/sam/trunk@314131 66ffb92e-73f9-0310-93c1-f5514f145a0a
stetsche · Oct 8, 2014 · 5991cd7 · 5991cd7
1 parent c4120d7
commit 5991cd7
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/samigo/samigo-app/sakai-samigo/webapp/jsf/index/mainIndex.jsp b/samigo/samigo-app/sakai-samigo/webapp/jsf/index/mainIndex.jsp
@@ -1,4 +1,6 @@
-<%@ page contentType="text/html;charset=UTF-8" pageEncoding="utf-8" %>
+<%@ page contentType="text/html;charset=UTF-8" pageEncoding="utf-8" 
+	import="org.sakaiproject.tool.assessment.ui.listener.author.AuthorActionListener,
+		org.sakaiproject.tool.assessment.ui.listener.select.SelectActionListener"%>
 <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
 <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
 <%@ taglib uri="http://www.sakaiproject.org/samigo" prefix="samigo" %>
@@ -10,10 +12,18 @@
 
    <f:view>      
 		<h:panelGroup rendered="#{authorization.adminPrivilege}">
+			<%
+				AuthorActionListener authorListener = new AuthorActionListener();
+				authorListener.processAction(null);
+			%>
 			<%@ include file="../author/authorIndex_noHeader.jsp"%>
 		</h:panelGroup>
 
 		<h:panelGroup rendered="#{!authorization.adminPrivilege}">
+			<%
+				SelectActionListener listener = new SelectActionListener();
+				listener.processAction(null);
+			%>
 			<%@ include file="../select/selectIndex_noHeader.jsp"%>
 		</h:panelGroup>
   </f:view>
diff --git a/samigo/samigo-app/src/webapp/css/tool_sam.css b/samigo/samigo-app/src/webapp/css/tool_sam.css
@@ -918,3 +918,7 @@ div.expand {
 div.collapse {
     background: url('/library/image/sakai/expand.gif') no-repeat left !important;
 }
+
+td.releaseTo div.alertMessage {
+    width: auto;
+}
diff --git a/samigo/samigo-app/src/webapp/jsf/author/authorIndex_noHeader.jsp b/samigo/samigo-app/src/webapp/jsf/author/authorIndex_noHeader.jsp
@@ -417,8 +417,8 @@ $(document).ready(function() {
       <h:outputText value="#{authorFrontDoorMessages.anonymous_users}" rendered="#{publishedAssessment.releaseTo eq 'Anonymous Users'}" />
       <h:outputText value="#{authorFrontDoorMessages.entire_site}" rendered="#{publishedAssessment.releaseTo ne 'Anonymous Users' && publishedAssessment.releaseTo ne 'Selected Groups'}" />
 
-        <t:div>
-            <t:div id="groupsHeader" onclick="#{publishedAssessment.groupCount gt 0 ? 'toggleGroups( this );' : ''}" styleClass="#{publishedAssessment.groupCount gt 0 ? 'collapse' : ''}">
+        <t:div rendered="#{publishedAssessment.releaseTo eq 'Selected Groups'}">
+            <t:div id="groupsHeader" onclick="#{publishedAssessment.groupCount gt 0 ? 'toggleGroups( this );' : ''}" styleClass="#{publishedAssessment.groupCount ge 1 ? 'collapse' : 'alertMessage'}">
                 <h:outputText value="#{publishedAssessment.groupCount} " rendered ="#{publishedAssessment.releaseTo eq 'Selected Groups'}" />
                 <h:outputText value="#{authorFrontDoorMessages.selected_groups} " rendered="#{publishedAssessment.releaseTo eq 'Selected Groups' and (publishedAssessment.groupCount gt 1 or publishedAssessment.groupCount eq 0)}"/>
                 <h:outputText value="#{authorFrontDoorMessages.selected_group} " rendered="#{publishedAssessment.releaseTo eq 'Selected Groups' and publishedAssessment.groupCount eq 1}"/>