Merge pull request sakaiproject#1891 from SedueRey/SAK-30468

SAK-30468 - Issues with portlet buttons and custom page name
axxter99 · Mar 8, 2016 · 8416a86 · 8416a86
2 parents d08c333 + a203f27
commit 8416a86
Show file tree

Hide file tree

Showing 9 changed files with 58 additions and 8 deletions.
diff --git a/portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/includePageNav.vm b/portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/includePageNav.vm
@@ -13,7 +13,7 @@
     <h1 class="skip" tabindex="-1" id="totoolmenu">${rloader.sit_toolshead}</h1>
     <!--Added this check in to make sure that we just don't have an empty img element in the page. -->
 	#if(${sitePages.pageNavIconUrl} != "")
-        <img src="${sitePages.pageNavIconUrl}" alt="">
+        <img src="${sitePages.pageNavIconUrl}" alt="" class="img_site_toolmenu">
 	#end
 
     <nav id="toolMenu" role="navigation" aria-label="${rloader.sit_toolshead}" class="Mrphs-toolsNav__menu">
@@ -62,7 +62,7 @@
 		                #if (${page.ispopup})
 
 		                    <li>
-		                        <a class="Mrphs-toolsNav__menuitem--link #if(${page.hidden})is-invisible#end" href="javascript:;" title="${page.pageTitle}" onclick="window.open( '${page.pagePopupUrl}${page.pageId}','${page.jsPageTitle}','resizable=yes,toolbar=no,scrollbars=yes, width=1024,height=768' )">
+		                        <a class="Mrphs-toolsNav__menuitem--link #if(${page.hidden})is-invisible#end" href="javascript:;" title="${page.pageTitle} - ${page.pageTitle}" onclick="window.open( '${page.pagePopupUrl}${page.pageId}','${page.jsPageTitle}','resizable=yes,toolbar=no,scrollbars=yes, width=1024,height=768' )">
 		                            <span class="Mrphs-toolsNav__menuitem--icon ${page.menuClass} $!{page.menuClassOverride}"></span>
 		                            <span class="Mrphs-toolsNav__menuitem--title">${page.pageTitle}</span>
 		                        </a>
@@ -71,7 +71,7 @@
 		                #else
 
 		                    <li>
-		                        <a class="Mrphs-toolsNav__menuitem--link #if(${page.hidden})is-invisible#end" href="${page.pageRefUrl}" title="${page.description}">
+		                        <a class="Mrphs-toolsNav__menuitem--link #if(${page.hidden})is-invisible#end" href="${page.pageRefUrl}" title="${page.pageTitle} - ${page.description}">
 		                            <span class="Mrphs-toolsNav__menuitem--icon ${page.menuClass} $!{page.menuClassOverride}"></span>
 		                            <span class="Mrphs-toolsNav__menuitem--title">${page.pageTitle}</span>
 		                        </a>

diff --git a/reference/library/src/morpheus-master/sass/modules/_toolmenu.scss b/reference/library/src/morpheus-master/sass/modules/_toolmenu.scss
@@ -23,6 +23,9 @@ body.#{$namespace}toolMenu-collapsed{
 		width: #{ $tool-menu-width / 2 };
 	}
 	#toolMenu{
+		.img_site_toolmenu{
+			display: none;
+		}
 		ul{
 			li{
 				a{
@@ -53,16 +56,21 @@ body.#{$namespace}toolMenu-collapsed{
 	}
 }
 
-#toolMenuWrap img{
-  max-width: 100%;
+#toolMenuWrap .img_site_toolmenu{
+  width: 100%;
+  max-width: $tool-menu-width;
   height: auto;
+  margin: 0 auto; 
 }
 
 #toolMenuWrap{
 	background: $toolMenuBGColor;
 	display: block;
 	min-width: $tool-menu-width;
+	width: $tool-menu-width;
+	@include flex-basis( 7.5em );
 	margin: 0 0 0 0;
+	text-align: center;
 	@include transition( left 0.25s linear 0s );
 
 	@media #{$phone}{
@@ -162,6 +170,14 @@ body.#{$namespace}toolMenu-collapsed{
 					overflow: hidden;
 					padding: 0.85em 0.25em 0.1em;
 				}
+				.#{$namespace}toolsNav__menuitem--title{
+					display: block;
+					max-width: 100%;
+					width: 100%;
+					text-overflow: ellipsis;
+					white-space: pre-wrap;
+					overflow: hidden;
+				}
 			}
 			&.is-current{
 				background: $background-color;

diff --git a/reference/library/src/morpheus-master/sass/modules/navigation/_base.scss b/reference/library/src/morpheus-master/sass/modules/navigation/_base.scss
@@ -110,7 +110,7 @@ body.is-logged-out{
 .userNav__subnav{
 	font-family: $header-font-family;
 	position: absolute;
-	right: 0.5em;
+	right: 0em;
 	width: #{ $tool-menu-width * 2.5 };
 	z-index: 99;
 	box-shadow: 0 0 4px rgba( $text-color ,0.35);
@@ -531,14 +531,16 @@ body.is-logged-out{
 				}
 			}
 			.#{$namespace}sitesNav__drop, .#{$namespace}sitesNav__dropdown{
+				outline: 0;
 				@extend .fa-angle-down;
 				@extend .fa;
 				@extend .fa-lg;
 				@extend .sitesNav__drop;
 				&.is-clicked{
 					@include transform( rotate(180deg) );
+					left: -5px;
 					position: relative;
-					top: 3px;
+					top: -2px;
 				}
 			}
 			ul{

diff --git a/reference/library/src/morpheus-master/sass/modules/navigation/_breadCrumbs.scss b/reference/library/src/morpheus-master/sass/modules/navigation/_breadCrumbs.scss
@@ -15,6 +15,10 @@
 	    margin: 0 0.5em 0 0.5em;
 	    padding: 0em 0em 0.2em 0em;
 	    text-decoration: none;
+	    &:hover{
+	    	border-bottom: 1px solid #B0B0B0;
+		    text-decoration: none;
+	    }
     }
 	@media #{$phone}{
 		background-color: $primary-color;

diff --git a/reference/library/src/morpheus-master/sass/modules/tool/_base.scss b/reference/library/src/morpheus-master/sass/modules/tool/_base.scss
@@ -7,8 +7,10 @@
 			font-weight: 400;
 			letter-spacing: 1.2px;
 			margin: 0px;
+			position: relative;
 			text-transform: uppercase;
 			width: calc(100% - 90px);
+			z-index: 21;
 			a{
 				color: rgba(21,21,21,0.5);
 				font-weight: 400;

diff --git a/reference/library/src/morpheus-master/sass/modules/tool/_menu.scss b/reference/library/src/morpheus-master/sass/modules/tool/_menu.scss
@@ -2,9 +2,16 @@
 	margin: -14px -14px 0 -14px;
 	background: $tool-background-color;
 	border-bottom: 1px solid $toolBorderColor;
-	padding: 0 0 0 1em;
+	padding: 0 170px 0 1em;
+	//max-width: calc(100% - 170px);
 	@media #{$phone}{
 		padding: 0.3em 0.7em;
+		//max-width: 100%;
+	}
+	&:after{
+		content: " ";
+		display: block;
+		width: 100%;
 	}
 	li{
 		display: inline-block;

diff --git a/reference/library/src/morpheus-master/sass/modules/tool/chat/_chat.scss b/reference/library/src/morpheus-master/sass/modules/tool/chat/_chat.scss
@@ -17,6 +17,7 @@
 		    position: fixed;
 		    bottom: 0px;
 		    right: 20px;
+		    z-index: 2;
 		}
 		&__portalChat{
 		    width: 205px;

diff --git a/reference/library/src/morpheus-master/sass/modules/tool/synoptic/_synoptic.scss b/reference/library/src/morpheus-master/sass/modules/tool/synoptic/_synoptic.scss
@@ -0,0 +1,17 @@
+.#{$namespace}sakai-synoptic-announcement, .#{$namespace}sakai-summary-calendar, .#{$namespace}sakai-synoptic-messagecenter, .#{$namespace}sakai-synoptic-chat{
+	iframe{
+		position: relative;
+		top: -2.9em;
+		z-index: 0;
+	}
+}
+.#{$namespace}sakai-iframe-site{
+	.siteDescription{
+		margin: 2em 0 0 0;
+	}
+}
+
+body > .portletBody > #calendarForm{
+	overflow: hidden;
+	padding: 5px 0 0 4px;
+}
diff --git a/reference/library/src/morpheus-master/sass/tool.scss b/reference/library/src/morpheus-master/sass/tool.scss
@@ -26,6 +26,7 @@
 @import "modules/tool/lessonbuilder/lessonbuilder";
 @import "modules/tool/samigo/samigo";
 @import "modules/tool/resources/resources";
+@import "modules/tool/synoptic/synoptic";
 
 @import "base/rtl";