SAK-46112 forums > settings pages > various issues with labels, headi…

…ng levels, indentation, etc. (sakaiproject#9683)
viv623 · Aug 27, 2021 · 099fc69 · 099fc69
1 parent 1a61597
commit 099fc69
Show file tree

Hide file tree

Showing 9 changed files with 184 additions and 440 deletions.
diff --git a/library/src/morpheus-master/sass/modules/tool/forums/_forums.scss b/library/src/morpheus-master/sass/modules/tool/forums/_forums.scss
@@ -169,6 +169,9 @@
 			&[for*=forum_assignments]{
 				margin-top: 0;
 			}
+			&.strong {
+				font-weight: 700;
+			}
 		}
 		input[type="text"], textarea{
 			width: 100%;
@@ -215,6 +218,7 @@
 		.permissionRow{
 			label{
 				margin: 0 0 0 0;
+				cursor: pointer;
 			}
 		}
 		.messageInstruction{

diff --git a/...sageforums-app/src/java/org/sakaiproject/tool/messageforums/jsf/HideDivisionRenderer.java b/...sageforums-app/src/java/org/sakaiproject/tool/messageforums/jsf/HideDivisionRenderer.java
@@ -114,7 +114,7 @@ public void encodeBegin(FacesContext context, UIComponent component)
     writer.write("  <img id=\"" + id + "__img_hide_division_" + "\" alt=\"" +
         title + "\"");
     writer.write("    src=\""   + foldImage + "\" style=\"" + CURSOR + "\" />");
-    writer.write("<h4>"  + title + "</h4>");
+    writer.write("<h2>"  + title + "</h2>");
     writer.write("</td><td class=\"discTria\">&nbsp;</td>");
     writer.write("<td  class=\"itemAction\" style=\"text-align: right;\">");
     List childrenList = component.getChildren();

diff --git a/msgcntr/messageforums-app/src/webapp/css/msgcntr.css b/msgcntr/messageforums-app/src/webapp/css/msgcntr.css
@@ -421,7 +421,7 @@ table.discTria{
 	background: var(--sakai-background-color-3);
 	border:1px solid var(--sakai-border-color);
 }
-table.discTria h4{
+table.discTria h2{
 	display: inline;
 	margin: 0;
 	padding: 3px;

diff --git a/msgcntr/messageforums-app/src/webapp/jsp/dfReviseForumSettingsAttach.jsp b/msgcntr/messageforums-app/src/webapp/jsp/dfReviseForumSettingsAttach.jsp
@@ -139,7 +139,7 @@
 			<h:panelGrid columns="1" styleClass="jsfFormTable" columnClasses="shorttext">
 				<h:panelGroup>
 					<%-- //designNote: does this text input need a maxlength attribute ? --%>
-					<h:outputLabel id="outputLabel" for="forum_title" styleClass="block" style="padding-bottom:.3em;display:block;clear:both;float:none">
+					<h:outputLabel id="outputLabel" for="forum_title" styleClass="block strong" style="padding-bottom:.3em;display:block;clear:both;float:none;">
 					<h:outputText id="req_star"  value="#{msgs.cdfm_info_required_sign}" styleClass="reqStar"/>	
 						<h:outputText  value="#{msgs.cdfm_forum_title}" />
 					</h:outputLabel>
@@ -154,7 +154,7 @@
 				<h:panelGroup >
 					<h:outputText value="" />
 					<%-- //designNote: this label should alert that textarea has a 255 max chars limit --%>
-					<h:outputLabel id="outputLabel1" for="forum_shortDescription"  value="#{msgs.cdfm_shortDescription}"/>	
+					<h:outputLabel id="outputLabel1" for="forum_shortDescription"  value="#{msgs.cdfm_shortDescription}" styleClass="strong"/>
 							<h:outputText value="#{msgs.cdfm_shortDescriptionCharsRem}"  styleClass="charRemFormat" style="display:none"/>
 							<%--
 						
@@ -243,25 +243,26 @@
 					<h:selectBooleanCheckbox
 						title="ForumLocked" value="#{ForumTool.selectedForum.forumLocked}"
 						id="forum_locked">
-					</h:selectBooleanCheckbox> <h:outputLabel id="forum_locked_label" value="#{msgs.cdfm_lock_forum}" />
+					</h:selectBooleanCheckbox>
+					<h:outputLabel for="forum_locked" value="#{msgs.cdfm_lock_forum}" />
 				</p>
 				<p class="checkbox">
 					<h:selectBooleanCheckbox
 						title="Moderated" value="#{ForumTool.selectedForum.forumModerated}"
 						id="moderated">
-					</h:selectBooleanCheckbox> <h:outputLabel id="moderated_label" value="#{msgs.cdfm_moderate_forum}" />
+					</h:selectBooleanCheckbox>
+					<h:outputLabel for="moderated" value="#{msgs.cdfm_moderate_forum}" />
 				</p>
 				<p class="checkbox">
 					<h:selectBooleanCheckbox
 						title="postFirst" value="#{ForumTool.selectedForum.forumPostFirst}"
 						id="postFirst">
-					</h:selectBooleanCheckbox> <h:outputLabel id="postFirst_label" value="#{msgs.cdfm_postFirst}" />
+					</h:selectBooleanCheckbox>
+					<h:outputLabel for="postFirst" value="#{msgs.cdfm_postFirst}" />
 				</p>
 
 			<h2><h:outputText  value="#{msgs.cdfm_forum_availability}" /></h2>
-
 			<h:panelGroup layout="block" styleClass="indnt1">
-			<%-- <h:panelGrid columns="1" columnClasses="longtext,checkbox" cellpadding="0" cellspacing="0"> --%>
               <h:panelGroup styleClass="checkbox">
                  <h:selectOneRadio layout="pageDirection" onclick="this.blur()" onchange="setDatesEnabled(this);" disabled="#{not ForumTool.editMode}" id="availabilityRestricted"  value="#{ForumTool.selectedForum.availabilityRestricted}">
                   <f:selectItem itemValue="false" itemLabel="#{msgs.cdfm_forum_avail_show}"/>
@@ -352,7 +353,7 @@
 		></sakai-rubric-association>
 
 			<h:panelGroup rendered="#{ForumTool.selectedForum.forum.id==null && !empty ForumTool.siteGroups}">
-					<f:verbatim><h4></f:verbatim><h:outputText  value="#{msgs.cdfm_autocreate_forums_header}" /><f:verbatim></h4></f:verbatim>
+					<f:verbatim><h2></f:verbatim><h:outputText  value="#{msgs.cdfm_autocreate_forums_header}" /><f:verbatim></h2></f:verbatim>
 				</h:panelGroup>
 				<h:panelGroup layout="block" styleClass="indnt1">
 					<h:panelGrid columns="1" columnClasses="longtext,checkbox" cellpadding="0" cellspacing="0" >