SAK-45196 Made adjustments to Overview synoptic tools to render prope…

…rly in dark mode (sakaiproject#9156)
msoupcoff · Apr 6, 2021 · 6013e28 · 6013e28
1 parent 970a3dd
commit 6013e28
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 18 deletions.
diff --git a/jsf/jsf-widgets/src/java/org/sakaiproject/jsf/renderer/ViewRenderer.java b/jsf/jsf-widgets/src/java/org/sakaiproject/jsf/renderer/ViewRenderer.java
@@ -129,7 +129,7 @@ public void encodeBegin(FacesContext context, UIComponent component) throws IOEx
 
 			writer.write("</head>\n");
 
-			writer.write("<body");
+			writer.write("<body class=\"Mrphs-container\"");
 
 			if (bodyonload != null && bodyonload.length() > 0)
 			{

diff --git a/jsf2/jsf2-widgets/src/java/org/sakaiproject/jsf2/renderer/ViewRenderer.java b/jsf2/jsf2-widgets/src/java/org/sakaiproject/jsf2/renderer/ViewRenderer.java
@@ -120,7 +120,7 @@ public void encodeBegin(FacesContext context, UIComponent component) throws IOEx
 
 			writer.write("</head>\n");
 
-			writer.write("<body");
+			writer.write("<body class=\"Mrphs-container\"");
 
 			if (bodyonload != null && bodyonload.length() > 0)
 			{

diff --git a/library/src/morpheus-master/sass/modules/tool/calendar/_calendarSynoptic.scss b/library/src/morpheus-master/sass/modules/tool/calendar/_calendarSynoptic.scss
@@ -144,7 +144,6 @@
 				width: 100%;		// to maximize click area
 				height: 100%;
 				color: $calendar-event-text-color;
-				text-shadow: 0 0 2px var(--sakai-background-color-1);			// to be able to see text on dark user-picked background colours
 				text-decoration: none;
 
 				&:hover, &:focus

diff --git a/library/src/morpheus-master/sass/modules/tool/calendar/_calendar_variables.scss b/library/src/morpheus-master/sass/modules/tool/calendar/_calendar_variables.scss
@@ -34,4 +34,4 @@ $calendar-event-indicator-color: var(--sakai-background-color-4);
 // today with event(s)
 $calendar-today-event-border-color: 	$calendar-event-border-color;
 $calendar-today-event-background-color: $calendar-day-today-background-color;
-$calendar-today-event-text-color: 		$calendar-event-text-color;
+$calendar-today-event-text-color: 		$calendar-day-today-text-color;
diff --git a/library/src/webapp/content/myworkspace_info.html b/library/src/webapp/content/myworkspace_info.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 	<head>
 		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
@@ -34,13 +34,13 @@
 		</script>
 	</head>
 
-	<body>
+	<body style="background-color:transparent">
 		<div class="portletBody">
-		<h3> Welcome to your personal workspace.</h3>
-			<p>In Sakai each user has an individual worksite called "Home".
+		<h3 style="color:var(--sakai-color-gray--darker-2)"> Welcome to your personal workspace.</h3>
+			<p style="color:var(--sakai-color-gray--darker-2)">In Sakai each user has an individual worksite called "Home".
 			Home is a place where you can keep personal documents, create new sites, maintain a
 			schedule, store resources, and much more.</p>
-			<p class="instruction">The default information displayed here for a new user can be modified by the Sakai
+			<p style="color:var(--sakai-color-gray--darker-2)">The default information displayed here for a new user can be modified by the Sakai
 				Administrator by editing the file sakai.properties configuration value "myworkspace.info.url" to point to the HTML file desired.</p>
 		</div>
 	</body>

diff --git a/...geforums-api/src/bundle/org/sakaiproject/api/app/messagecenter/bundle/Messages.properties b/...geforums-api/src/bundle/org/sakaiproject/api/app/messagecenter/bundle/Messages.properties
@@ -698,8 +698,8 @@ syn_directions=To hide the Message & Forums notifications for a site, select the
 syn_site_not_vis=Site Notifications Not Visible
 syn_site_vis=Site Notifications Visible
 syn_hide=Don't Show
-syn_hide_info=Remove sites from this synoptic list.
-syn_hide_info_hidden_msg=Sites that are hidden from Preferences will not show up in this list.
+syn_hide_info=Choose sites to hide from displaying on this synoptic list.
+syn_hide_info_hidden_msg=Sites that are hidden in Preferences will not show up in this list.
 syn_hide_tooltip=Hide this site from this forums/messages view
 
 syn_move_rone=>

diff --git a/msgcntr/messageforums-app/src/webapp/jsp/synoptic/synMainLite.jsp b/msgcntr/messageforums-app/src/webapp/jsp/synoptic/synMainLite.jsp
@@ -236,7 +236,7 @@ function mySetMainFrameHeightViewCell(id)
 		  	<f:verbatim>
 	 			<div class="hideInfo" style="display: none;"> 			
 	 		</f:verbatim> 
-				<h:outputText styleClass="information" value="#{msgs.syn_hide_info}"/><h:outputText styleClass="highlight" value="#{msgs.syn_hide_info_hidden_msg}"/>
+				<h:outputText styleClass="instruction" value="#{msgs.syn_hide_info}"/><h:outputText styleClass="sak-banner-info" value="#{msgs.syn_hide_info_hidden_msg}"/>
 		  	<f:verbatim>
 		  		</div>
 		  	</f:verbatim>
@@ -344,12 +344,10 @@ function mySetMainFrameHeightViewCell(id)
 		 		</t:dataTable>
 		 	</t:div>
 
-	 		<f:verbatim>
-	 			<div class="optionsTable" style="display: none;"> 			
-	 			<br>
-	 			<br>
-	 		</f:verbatim>
-	 		<h:commandButton id="update" value="#{msgs.syn_update}" action="#{mfSynopticBeanLite.proccessActionSaveChanges}"/>	 		
+			<f:verbatim>
+				<div class="act optionsTable" style="display: none;">
+			</f:verbatim>
+			<h:commandButton id="update" value="#{msgs.syn_update}" action="#{mfSynopticBeanLite.proccessActionSaveChanges}" styleClass="active" />
 	 		<f:verbatim>
 	 			<input type="button" id="cancel" value='</f:verbatim><h:outputText value="#{msgs.syn_cancel}"/><f:verbatim>' onclick="$('.optionsTable').fadeOut(resize);$('.optionLink').parent().parent().toggle();SynMainLite.resetCheckboxes();$('.hideInfo').fadeOut();if(SynMainLite.getCount() == 1){$('.noActivity').fadeIn();$('.workspaceTable').fadeOut();};">
 	 		</f:verbatim>