SAK-41012 Site Info > Manage Tools: Cleaned up the layout of the page…

… and standardized the tool descriptions (sakaiproject#6309) * SAK-41012 Site Info > Manage Tools: Cleaned up the layout of the page and standardized the tool descriptions * Update _sitemanage.scss * Update _sitemanage_variables.scss
bizzkriss · Nov 29, 2018 · d0b8293 · d0b8293
1 parent e4f639b
commit d0b8293
Show file tree

Hide file tree

Showing 34 changed files with 215 additions and 181 deletions.
diff --git a/announcement/announcement-tool/tool/src/webapp/WEB-INF/tools/sakai.announcements.xml b/announcement/announcement-tool/tool/src/webapp/WEB-INF/tools/sakai.announcements.xml
@@ -6,6 +6,7 @@
 			id="sakai.announcements"
 			title="Announcements"
 			description="For posting current, time-critical information.">
+			<!-- Note: Tool titles and descriptions are now internationalized and managed in the tools.properties file in the config project and will override the above values -->
 
 		<configuration name="channel" value="" />
 		<configuration name="pagesize" value="10" />

diff --git a/assignment/tool/src/webapp/WEB-INF/tools/sakai.assignment.grades.xml b/assignment/tool/src/webapp/WEB-INF/tools/sakai.assignment.grades.xml
@@ -6,6 +6,7 @@
 			id="sakai.assignment.grades"
 			title="Assignments"
 			description="For posting, submitting and grading assignment(s) online.">
+			<!-- Note: Tool titles and descriptions are now internationalized and managed in the tools.properties file in the config project and will override the above values -->
 
 		<category name="course" />
 		<category name="project" />

diff --git a/basiclti/basiclti-portlet/src/webapp/WEB-INF/sakai/IMSBLTIPortlet.xml b/basiclti/basiclti-portlet/src/webapp/WEB-INF/sakai/IMSBLTIPortlet.xml
@@ -4,6 +4,7 @@
                         id="sakai.basiclti"
                         title="External Tool"
                         description="Launch external tools using IMS Learning Tools Interoperability.">
+                        <!-- Note: Tool titles and descriptions are now internationalized and managed in the tools.properties file in the config project and will override the above values -->
 
                 <configuration name="sakai:portlet-pre-render" value="true" />
 

diff --git a/calendar/calendar-tool/tool/src/webapp/WEB-INF/tools/sakai.schedule.xml b/calendar/calendar-tool/tool/src/webapp/WEB-INF/tools/sakai.schedule.xml
@@ -6,6 +6,7 @@
 			id="sakai.schedule"
 			title="Calendar"
 			description="For posting and viewing deadlines, events, etc.">
+			<!-- Note: Tool titles and descriptions are now internationalized and managed in the tools.properties file in the config project and will override the above values -->
 
 		<configuration name="calendar" value="" />
 

diff --git a/chat/chat-tool/tool/src/webapp/WEB-INF/tools/sakai.chat.xml b/chat/chat-tool/tool/src/webapp/WEB-INF/tools/sakai.chat.xml
@@ -6,6 +6,7 @@
 			id="sakai.chat"
 			title="Chat Room"
 			description="For real-time conversations in written form.">
+			<!-- Note: Tool titles and descriptions are now internationalized and managed in the tools.properties file in the config project and will override the above values -->
 
 		<configuration name="display-date" value="false" />
 		<configuration name="display-time" value="true" />

diff --git a/commons/tool/src/webapp/WEB-INF/tools/commons.xml b/commons/tool/src/webapp/WEB-INF/tools/commons.xml
@@ -19,6 +19,7 @@
     <tool id="sakai.commons"
         title="Commons"
         description="A social networking style tool allowing posts with url to thumbnail expansion, and unthreaded replies.">
+        <!-- Note: Tool titles and descriptions are now internationalized and managed in the tools.properties file in the config project and will override the above values -->
 
         <category name="course" />
         <category name="project" />

diff --git a/...ocalization/bundles/src/bundle/org/sakaiproject/localization/bundle/tool/tools.properties b/...ocalization/bundles/src/bundle/org/sakaiproject/localization/bundle/tool/tools.properties
diff --git a/...lization/bundles/src/bundle/org/sakaiproject/localization/bundle/tool/tools_sv.properties b/...lization/bundles/src/bundle/org/sakaiproject/localization/bundle/tool/tools_sv.properties
@@ -175,10 +175,6 @@ sakai.blogwow.title=Blogg
 sakai.sitestats.description=F\u00f6r att titta p\u00e5 statistik \u00f6ver anv\u00e4ndningen av sajten.
 sakai.Sitestats.title=Sajtstatistik
 # OSP TOOLS
-#sakai.mailtool.title                                = Mailtool
-#sakai.mailtool.description                          = Send mail to groups in your course.(Attachment-enabled) 
-#sakai.poll.title                                    = Polls
-#sakai.poll.description                              = For anonymous polls or voting
 #osp.style.title                                     = Styles
 #osp.style.description                               = OSP Style Helper Tool
 #osp.evaluation.title                                = Evaluations

diff --git a/content/content-tool/tool/src/webapp/WEB-INF/tools/sakai.dropbox.xml b/content/content-tool/tool/src/webapp/WEB-INF/tools/sakai.dropbox.xml
@@ -6,6 +6,7 @@
 			id="sakai.dropbox"
 			title="Drop Box"
 			description="For private file sharing between instructor and student.">
+			<!-- Note: Tool titles and descriptions are now internationalized and managed in the tools.properties file in the config project and will override the above values -->
 
 		<configuration name="resources_mode" value="dropbox" type="final" />
 

diff --git a/content/content-tool/tool/src/webapp/WEB-INF/tools/sakai.resources.xml b/content/content-tool/tool/src/webapp/WEB-INF/tools/sakai.resources.xml
@@ -6,6 +6,7 @@
 			id="sakai.resources"
 			title="Resources"
 			description="For posting documents, URLs to other websites, etc.">
+			<!-- Note: Tool titles and descriptions are now internationalized and managed in the tools.properties file in the config project and will override the above values -->
 
 		<configuration name="home" value="" />
 		<configuration name="optional_properties" value="true" />

diff --git a/feedback/src/webapp/WEB-INF/tools/sakai.feedback.xml b/feedback/src/webapp/WEB-INF/tools/sakai.feedback.xml
@@ -3,6 +3,7 @@
     <tool id="sakai.feedback" 
     	title="Contact Us"
     	description="A site content and functionality reporting tool">
+    	<!-- Note: Tool titles and descriptions are now internationalized and managed in the tools.properties file in the config project and will override the above values -->
 
     	<category name="course" />
         <category name="project" />

diff --git a/lessonbuilder/tool/src/webapp/WEB-INF/tools/sakai.lessonbuildertool.xml b/lessonbuilder/tool/src/webapp/WEB-INF/tools/sakai.lessonbuildertool.xml
@@ -3,6 +3,8 @@
 	<tool id="sakai.lessonbuildertool"
 		title="Lessons"
 		description="[Lessons] For creating content modules and sequences; can be organized by week or unit" >
+		<!-- Note: Tool titles and descriptions are now internationalized and managed in the tools.properties file in the config project and will override the above values -->
+
 		<category name="course" />
 		<category name="project" />
 		<!-- <category name="myworkspace" /> -->

diff --git a/library/src/morpheus-master/sass/base/_icons.scss b/library/src/morpheus-master/sass/base/_icons.scss
@@ -40,6 +40,7 @@
     sakai-gradebook-tool : ( extend : fa-book ),
     sakai-gradebookng : ( extend : fa-book ),
     sakai-help : ( extend : fa-question-circle ),
+    sakai-home : ( extend : fa-list-ul ),
     sakai-iframe : ( extend : fa-globe ),
     sakai-iframe-site : ( extend : fa-list-ul ),
     sakai-synoptic-announcement: ( extend : fa-list-ul),

diff --git a/library/src/morpheus-master/sass/modules/tool/sitemanage/_sitemanage.scss b/library/src/morpheus-master/sass/modules/tool/sitemanage/_sitemanage.scss
@@ -1,3 +1,6 @@
+
+@import "_sitemanage_variables";
+
 // Membership namespace
 .#{$namespace}sakai-membership {
   //SAK-29873
@@ -233,20 +236,18 @@
     }
   }
   #toolHolderW {
-    background: none repeat scroll 0 0 #eeeeee;
-    @include border-radius( 5px );
-    padding: 0.5em;
-    margin-bottom: 12px;
+    margin-bottom: $standard-spacing;
+    padding: 0;
+    border: $manageTools-panel-border;
+    @include border-radius( $manageTools-border-radius-size );
   }
   #toolSelectionList {
     margin: 0;
     line-height: 200%;
-    border: 1px solid #dddddd;
-    @include border-radius( 5px );
+    border: $manageTools-panel-border;
+    @include border-radius( $manageTools-border-radius-size );
     padding: 0;
-    h4 {
-      margin: 0 0 1em 0;
-    }
+
     li {
       display: table-row;
       text-align: center;
@@ -263,14 +264,16 @@
         vertical-align: middle;
         text-align: center;
         i {
-          font-size: 0.9em;
+          position: absolute;
+          left: $standard-spacing;
+          margin-top: 5px;
+          font-size: 1em;
+          text-align: center;
         }
       }
       .selectedToolTitle {
-        padding: 6px 0 6px 30px;
+        padding: $standard-spacing $standard-spacing $standard-spacing 35px;
         text-align: left;
-        background-position: 8px 8px;
-        background-repeat: no-repeat;
       }
     }
     ul {
@@ -284,7 +287,7 @@
       li {
         line-height: 1.4;
         position: static;
-        border-top: 1px solid #ddd;
+        border-top: $manageTools-panel-border;
         &.highlightTool {
           background-color: #ffc;
         }
@@ -295,11 +298,13 @@
     }
     #toolSelectionListHeader {
       display: table-header-group;
+      border-top: 0 none;
       background-image: none;
     }
     h3 {
       display: table-cell;
-      padding: 0 8px;
+      margin: 0;
+      padding: $standard-spacing;
       &#toolSelectionListToolHeader {
         text-align: left;
       }
@@ -312,36 +317,45 @@
     ul {
       list-style: none;
       margin: 0;
-      padding: 0;
-      padding: 5px 20px;
-      display: none;
-      li div {
-        &.toolListDesc {
-          padding: 5px;
-          padding: 0 30px 5px;
+      padding: 0 $standard-spacing;
+      display: none;	
+      > li {
+        padding: $standard-spacing 0;
+        border-top: $manageTools-panel-border;  
+        &:first-of-type {
+          border-top: 0 none; 
         }
-        &.toolListControl {
-          padding: 5px;
-          label {
-            color: #555;
+        &.indnt3 {
+          padding-top: 0;
+          border-top: 0 none;		// no border on indented instance tools
+        }
+	    div {
+          &.toolListDesc {
+            padding: 0 0 0 20px;	// to align with tool name
+          }
+          &.toolListControl label {
+              margin: 0;
           }
         }
       }
     }
-    h4 {
-      margin-top: 5px;
+    h3 {
+        margin: 0;
+        padding: 0;
+
       a {
-        border: 1px solid #d6d7d9;
-        background: linear-gradient(to bottom, #e3e4e5 0,#d9d9d9 100%);
+        border-top: $manageTools-panel-border;
+        border-bottom: $manageTools-panel-border;
+        background: $manageTools-heading-background;
         text-decoration: none;
         text-transform: capitalize;
-        padding: 5px;
+        padding: $standard-spacing;
         display: block;
         margin: 0;
-        @include border-radius( 5px );
-        &:hover {
-          border: 1px solid #cccdd1;
-          background: linear-gradient(to bottom, #d9dadd 0,#cccccc 100%);
+
+        &:hover, &:hover .checkedCount, &:focus, &:focus .checkedCount {
+          background: $manageTools-heading-hover-background;
+          outline-offset: -#{$focus-outline-width};	// keep outline contained within the element
         }
         &:before {
           content: "\25B8\0020\0020";
@@ -350,7 +364,7 @@
           &:before {
             content: "";
           }
-          &:hover {
+          &:hover, &:focus {
             border: 1px solid #d6d7d9;
             background: linear-gradient(to bottom, #e3e4e5 0,#d9d9d9 100%);
             color: #555;
@@ -383,17 +397,19 @@
       &.miscellaneous a {
       }
     }
+    .groupedTools {
+      &:first-of-type a { 
+        border-top: 0 none;		// remove extra top border from first item
+      }
+      a:not(.open) {
+        border-bottom: 0 none;	// remove the extra bottom border when the group isn't expanded
+      }
+    }
     .checkedCount {
       color: #555;
-      margin: 0;
       display: block;
       float: right;
-      padding: 0 3px;
-      text-align: center;
       min-width: 10px;
-      background: #eee;
-      font-size: 90%;
-      @include border-radius( 3px );
     }
     li:first-child ul {
       display: block;
@@ -427,19 +443,17 @@
     text-decoration: none !important;
   }
   #alertBox {
-    @include border-radius( 3px );
-    position: absolute;
-    padding: 5px 10px;
     background: #c00;
     color: #fff;
     white-space: nowrap;
     z-index: 100;
+
+    span {
+        padding: $standard-spacing 0;
+    }
     a {
       color: #fff;
-      margin: 0 5px;
-      &:first-child {
-        margin-left: 20px;
-      }
+      margin: 0 $standard-space;
     }
   }
   .multitool {
@@ -466,8 +480,7 @@
   }
   #toolSelectionListHeader {
     position: relative;
-    background-image: none;
-    background-color: #eeeeee;
+    background: $manageTools-heading-background;
   }
   #joinLimitByAccountType {
     margin-bottom: 1em;
@@ -510,11 +523,15 @@
     }
   }
   #toolHolderWW {
+    @include display-flex;
     .mathJaxToggleArea, .lessonsSubNavToggleArea, .portalNeochatToggleArea {
-      border: 1px solid #dddddd;
-      @include border-radius( 5px );
-      padding: 10px;
-      margin: 20px 0 0;
+      @include display-flex;
+      @include flex-direction(row-reverse);
+      @include justify-content(flex-end);		// align to the left
+      border: $manageTools-panel-border;
+      @include border-radius( $manageTools-border-radius-size );
+      padding: $standard-spacing;
+      margin: $standard-spacing 0 0 0;
     }
   }
   h4.toggleAnchor {
@@ -540,7 +557,7 @@
     }
   }
   .indnt3 .row {
-    margin: 10px 0 0;
+    margin: $standard-spacing 0 0;
     &:first-child {
       margin-top: 0;
     }
@@ -583,6 +600,7 @@
     margin: 0;
   }
   label.onoffswitch-label {
+    margin: 0 0 0 $standard-space; 		// space between label and checkbox
     font-weight: normal;
   }
   legend {

diff --git a/library/src/morpheus-master/sass/modules/tool/sitemanage/_sitemanage_variables.scss b/library/src/morpheus-master/sass/modules/tool/sitemanage/_sitemanage_variables.scss
@@ -0,0 +1,8 @@
+// Site Manage and Site Info-specific styles
+
+$manageTools-heading-background: #eee;
+$manageTools-heading-hover-background: #ddd;
+
+$manageTools-panel-border: 1px solid #ddd;
+
+$manageTools-border-radius-size: 5px;
diff --git a/mailarchive/mailarchive-tool/tool/src/webapp/WEB-INF/tools/sakai.mailbox.xml b/mailarchive/mailarchive-tool/tool/src/webapp/WEB-INF/tools/sakai.mailbox.xml
@@ -6,6 +6,7 @@
 			id="sakai.mailbox"
 			title="Email Archive"
 			description="For viewing email sent to the site.">
+			<!-- Note: Tool titles and descriptions are now internationalized and managed in the tools.properties file in the config project and will override the above values -->
 
 		<configuration name="channel" value="" />
 		<configuration name="pagesize" value="20" />

diff --git a/msgcntr/messageforums-app/src/webapp/WEB-INF/tools/sakai.forums.xml b/msgcntr/messageforums-app/src/webapp/WEB-INF/tools/sakai.forums.xml
@@ -6,6 +6,8 @@
 		id="sakai.forums"
 		title="Forums"
 		description="Display forums and topics of a particular site">
+		<!-- Note: Tool titles and descriptions are now internationalized and managed in the tools.properties file in the config project and will override the above values -->
+
 		<category name="course" />
 		<category name="project" />	
 

diff --git a/podcasts/podcasts-app/src/webapp/WEB-INF/tools/sakai.podcasts.xml b/podcasts/podcasts-app/src/webapp/WEB-INF/tools/sakai.podcasts.xml
@@ -5,6 +5,7 @@
 			id="sakai.podcasts"
 			title="Podcasts"
 			description="For managing individual podcast and podcast feed information.">
+			<!-- Note: Tool titles and descriptions are now internationalized and managed in the tools.properties file in the config project and will override the above values -->
 
 		<category name="course" />
 		<category name="project" />

diff --git a/polls/tool/src/webapp/WEB-INF/tools/sakai.poll.xml b/polls/tool/src/webapp/WEB-INF/tools/sakai.poll.xml
@@ -4,6 +4,8 @@
 	<tool id="sakai.poll"
 		title="Polls"
 		description="For anonymous polls or voting">
+		<!-- Note: Tool titles and descriptions are now internationalized and managed in the tools.properties file in the config project and will override the above values -->
+
 		<category name="course" />
 		<category name="project" />
 	</tool>