From 76dbe9d8959217a489b17d27858a4f69b9fb0763 Mon Sep 17 00:00:00 2001 From: Adrian Fish Date: Tue, 8 Oct 2024 10:58:47 +0100 Subject: [PATCH] Cleaned up css --- .../sass/modules/tool/profile2/_profile2.scss | 1715 ++++------------- .../components/OnlinePresenceIndicator.html | 43 - .../bundle/src/bundle/roster_fa_IR.properties | 6 - .../sakaiproject/roster/api/SakaiProxy.java | 1 - roster2/tool/src/webapp/css/print.css | 4 +- .../src/SakaiNotifications.js | 21 +- 6 files changed, 361 insertions(+), 1429 deletions(-) delete mode 100644 profile2/tool/src/java/org/sakaiproject/profile2/tool/components/OnlinePresenceIndicator.html diff --git a/library/src/skins/default/src/sass/modules/tool/profile2/_profile2.scss b/library/src/skins/default/src/sass/modules/tool/profile2/_profile2.scss index 853c7dcd78b7..da8f2b3cb349 100644 --- a/library/src/skins/default/src/sass/modules/tool/profile2/_profile2.scss +++ b/library/src/skins/default/src/sass/modules/tool/profile2/_profile2.scss @@ -1,1368 +1,369 @@ .#{$namespace}sakai-profile2 { - #leftPanel{ - min-width: fit-content; - margin-bottom: 20px; - } - - .profile-twitter-account td.label { - text-align: left; - width: 250px; - } - - @media only screen and (max-width : 800px ) { - .profile-twitter-account td{ - display: block !important; - } - .profile-twitter-account td.label { - width: 100%; - } - } - - #photoContainer { - margin-bottom: 12px; - } - - #photoContainer img { - border-radius: 4px; - } - - #photoContainer > div:focus, #photoContainer > div:hover { - button { - display: block; - } - } - - .sakai-wicket-iconwithtooltip { - float: right; - } - - .profileContent .radio label, .profileContent .checkbox label { - font-size: 1.2em; - } - - .editable > .edit-button { - @include sakai_secondary_button(); - margin: 3px 0 0 0; - float: right; - clear: none; - display: block; - clip: unset; - } - - .edit-image-button { - @include sakai_secondary_button(); - margin: 3px 3px 0 0; - } - - #photoContainer > div:focus { - button { - display: block; - } + #leftPanel{ + min-width: fit-content; + margin-bottom: 20px; + } + + #photoContainer { + margin-bottom: 12px; + img { + border-radius: 4px; } - .new-items-count { - padding-left: 4px !important; - font-weight: bold; - } - - #profileHeadingName { - font-size: 140%; - font-weight: bold; - } - - /* generic styles */ - .tiny { - font-size: 80%; - } - - button.tiny { - padding: 1px 4px; - margin-bottom: 4px; - } - - .status-divider { - span:first-child { - padding-right: 4px; - border-right: 1px solid #000; - } - } - - .right { - float: right; - } - - .instruction { - color: var(--instruction-color); - } - - .clear { - clear: both; - } - - h2 { - margin-top: 0; - } - - .icon { - background-position: center left; - background-repeat: no-repeat; - padding-left: 18px; - display: inline; - } - - /* icons */ - .locked:before, - .unlocked:before, - .profile:before, - .picture:before, - .pictures:before, - .picture-add:before, - .connections:before, - .connection-add:before, - .connection-delete:before, - .connection-confirm:before, - .connection-ignore:before, - .connection-request:before, - .connection-confirmed:before, - .search:before, - .privacy:before, - .preferences:before, - .messages:before, - .message:before, - .twitter:before, - .email-link:before, - .website-link:before, - .google:before, - .facebook:before, - .linkedin:before, - .myspace:before { - @extend .fa; - margin-right: $standard-space-2x; - } - @mixin mimic_button() { - padding: 7px 16px; - justify-content: center; - font-weight: 600; - display: flex; - width: auto; - font-size: 13px; - } - - .locked { - @extend .fa-lock; - } - - .unlocked { - @extend .fa-unlock; - } - - .profile { - @extend .fa-address-card; - @include mimic_button(); - } - - .picture { - @extend .fa-picture-o; - } - - .pictures { - @extend .fa-picture-o; - } - - .picture-add { - @extend .fa-plus-square; - } - - .connections { - @extend .fa-eye; - } - - .connection-add { - @extend .fa-user-plus; - } - - .connection-delete { - @extend .fa-user-times; - } - - .connection-confirm { - @extend .fa-check-circle; - } - - .connection-ignore { - @extend .fa-minus-circle; - } - - .connection-request { - @extend .fa-hourglass-half; - @include mimic_button(); - } - - .connection-confirmed { - @extend .fa-users; - @include mimic_button(); - } - - .search { - @extend .fa-search; - } - - .privacy { - @extend .fa-lock; - } - - .preferences { - @extend .fa-cog; - } - - .messages { - @extend .fa-comments; - } - - .message { - @extend .fa-comment; - } - - .twitter { - @extend .fa-twitter; - } - - .email-link { - @extend .fa-envelope-o; - } - - .website-link { - @extend .fa-external-link; - } - - .google { - @extend .fa-google; - } - - .facebook { - @extend .fa-facebook; - } - - .linkedin { - @extend .fa-linkedin; - } - - .myspace { - @extend .fa-user-circle; - } - - .recordIcon { - @extend .fa; - @extend .fa-microphone; - width: 11px; - height: 15px; - display: inline-block; - background-size: 100%; - margin-left: 7px; - } - - .infoIcon { - @extend .fa, .fa-info-circle; - } - - /* sideLink styles */ - #sideLink { - list-style-type: none; - padding: 0; - margin: $standard-space-2x 0; - - li { - margin-bottom: $standard-space-2x; - - a { - @include sakai_secondary_button(); - display: flex; - width: auto; - justify-content: center; - } - } - } - - /** workaround for disabled link and extra markup */ - #sideLink li span>span { - margin: 0; - padding: 0; - } - - .side-widget-heading { - margin-top: 4px; - border-right: 1px solid var(--sakai-border-color); - padding: 2px 5px; - display: block; - font-weight: bold; - background-color: var(--sakai-background-color-2); - word-wrap: break-word; - border-radius: 4px; - } - - .side-widget-content { - display: block; - margin-bottom: 4px; - } - - .side-widget-labels { - display: block; - position: relative; - height: 1.0em; - padding-top: 2px; - margin-bottom: 2px; - } - - .side-widget-item-count, .side-widget-more-link { - font-size: 70%; - position: absolute; - } - - .side-widget-item-count { - left: 0; - padding-left: 2px; - width: 40%; - } - - .side-widget-more-link { - right: 0; - text-align: right; /* depends on element width */ - padding-right: 2px; - width: 60%; - } - - /* kudos styles */ - .kudos-wrapper { - display: block; - text-align: center; - margin-top: 4px; - } - - .kudos-rating { - font-size: 120%; - font-weight: bold; - } - - /* mainSection styles */ - .mainSection { - padding-bottom: 10px; - display: block; - } - - .mainSectionHeading { - display: block; - font-weight: bold; - border-bottom: 1px solid var(--sakai-primary-color-1); - margin-bottom: 0; - margin-top: $standard-space-2x; - padding-bottom: 0; - width: 100%; - } - - .mainSectionContentDescription { - padding-top: 5px; - } - - .mainSectionContent { - padding-top: 5px; - } - - /* profile and preferences information sections */ - .profileContent, .preferencesContent { - padding-top: 2px; - padding-bottom: 2px; - font-size: 90%; - border: none; - } - - .preferencesContent { - margin-top: 6px; - margin-bottom: 12px; - } - - .profileContent td { - padding: 0.5em 1em 0.5em 0em !important; - } - - .profileContent td:last-child { - padding: 0.5em 0 0.5em 0 !important; - } - - .profileContent .label, - .preferencesContent .label { - color: var(--sakai-text-color-1); - vertical-align: middle; - font-weight: normal; - padding-top: 4px; - padding-bottom: 4px; - } - - .preferencesContent .label { - width: 170px; - } - - .label a { - padding-top: 2px; - padding-bottom: 2px; - } - - .profileContent .content, - .preferencesContent .content { - padding-left: 2px; - /*padding-right: 40px;*/ - vertical-align: middle; - word-wrap: break-word; - /* WebKit rule. See http://blog.kenneth.io/blog/2012/03/04/word-wrapping-hypernation-using-css/ */ - word-break: break-word; - /* Split long words with hyphens */ - hyphens: auto; - -moz-hyphens: auto; - -webkit-hyphens: auto; - /* Only split after 8 characters. Webkit only. */ - -webkit-hyphenate-limit-before: 8; - } - - .contentExample { - color: var(--sakai-text-color-2); - } - - .preferencesContent .item { - padding-left: 4px; - padding-right: 4px; - text-align: center; - font-size: 80%; - } - - .profileContent .toolTip, - .preferencesContent .toolTip { - padding-left: 8px; - vertical-align: top; - - } - - .disabled { - color: var(--sakai-text-color-disabled) !important; - } - - .status-msg { - word-wrap: break-word; - } - - .statusField { - color: var(--sakai-text-color-2); - border: 1px solid var(--sakai-border-color); - width: 300px; - } - - .formInputField { - width: 210px; - } - - .formInputArea { - width: 300px; - } - - .form-input-small { - width: 80px; - } - - .profileImageUrlInputField { - width: 180px; - } - - .formInputField.invalid, - .formInputArea.invalid { - border: 2px solid var(--sakai-color-red); - color: var(--sakai-color-red); - } - - .feedbackLabel { - display: block; - font-weight: bold; - } - - /* wicket FeedbackPanel but remove the list styles and just make it bold */ - .wicket-feedbackpanel-nolist ul { - list-style-type: none; - margin-left: 0; - padding-left: 0; - font-weight: bold; - } - - .formSectionHeading { - color: var(--sakai-text-color-1); - padding-left: 0; - } - - .formSectionText { - font-weight: normal; - font-size: 0.9em; - padding-left: 2px; - margin-top: 4px; - font-style: italic; - } - - /* Style for wicket's feedback message panel */ - .alertMessage ul { - list-style-type: none !important; - margin-left: -40px; - margin-bottom: 0px; - margin-top: 0px; - } - - /* friends feed styles */ - #friends-feed-wrapper { - display: block; - text-align: center; - } - - #friends-feed-wrapper table { - border: none; - margin: 0 auto; - table-layout: fixed; - } - - #friends-feed-wrapper table td { - padding-left: 2px; - padding-right: 2px; - margin-left: 1px; - margin-right: 1px; - vertical-align: top; - } - - .friends-feed-item { - vertical-align: top; - width: 55px; - max-width: 55px; - margin: 1px; - text-align: center; - word-wrap: break-word; - white-space: normal; - } - - .friends-feed-item-photo { - max-width: 55px; - width: 55px; - /* centre the image inside this cell */ - display: block; - margin: auto; - /* end centreing */ - cursor: pointer; - } - - .friends-feed-item-caption { - max-width: 55px; - margin-top: 0; - font-size: 70%; - color: var(--sakai-text-color-1); - cursor: pointer; - } - - .friends-feed-item-caption:hover { - color: var(--link-hover-color); - } - - /* people list styles */ - .connections-wrap, .search-results-wrap { - margin-bottom: 12px; - max-width: 520px; - width: 100%; - } - - .connection, .search-result { - display: block; - position: relative; - left: 0; - top: 0; - height: 170px; - border: 1px solid var(--sakai-border-color); - padding: $standard-space-2x; - margin: $standard-space-2x 0; - overflow: hidden; /* to crop bigger pictures that might overhang */ - } - - .connection-img, .search-result-img { - position: absolute; - top: 5px; - left: 5px; - max-width: 100px; - border: 1px solid var(--sakai-border-color); - padding: 2px; - } - - .connection-info-wrap, .search-result-info-wrap { - position: absolute; - top: 5px; - left: 115px; - width: 200px; - } - - .connection-info-name, .search-result-info-name, .wall-item-name { - display: inline; - font-weight: bold; - word-wrap:break-word; - /* WebKit rule. See http://blog.kenneth.io/blog/2012/03/04/word-wrapping-hypernation-using-css/ */ - word-break: break-word; - /* Split long words with hyphens */ - hyphens: auto; - -moz-hyphens: auto; - -webkit-hyphens: auto; - /* Only split after 8 characters. Webkit only. */ - -webkit-hyphenate-limit-before:8; - } - - .connection-status-msg, .search-result-status-msg { - display: block; - font-size: 90%; - } - - .connection-status-date, .search-result-status-date { - display: block; - font-size: 70%; - color: var(--sakai-text-color-2); - } - - .search-connections { - margin-bottom: 10px; - } - - /* action styles */ - - .connection-actions-wrap, .search-result-actions-wrap { - position: absolute; - top: 5px; - right: 0px; - max-width: 250px; - width: 50%; - font-size: 90%; - padding: 0; - } - - @media (max-width: 800px) { - .connection-actions-wrap, .search-result-actions-wrap { - top: 35px; - width: calc(100% - 114px); - } - } - - .connection-actions, - .search-result-actions { - list-style-type: none; - padding: 0; - margin: 0; - - li { - margin-bottom: $standard-space-2x; - - a { - @include sakai_secondary_button(); - display: flex; - width: auto; - justify-content: center; - - &:before { - @extend .fa; - margin-right: $standard-space-2x; - line-height: 18px; - } - } - } - } - - /** workaround for disabled link and extra markup */ - .connection-actions li span>span, .search-result-actions li span>span { - margin: 0; - padding: 0; - } - - .connection-summary-wrap, .search-result-summary-wrap { - position: absolute; - top: 115px; - left: auto; - max-width: 510px; - width: 100%; - height: 50px; - font-size: 90%; - padding: 0; - } - - .connections-wrap .connection-summary-wrap, - .search-result .search-result-summary-wrap { - width:340px; - } - - .search-result-summary { - word-wrap: break-word; - } - - .connection-action-icon { - float: right; - margin-left: 2px; - } - - .iconAdd, .iconRemove { - width: 18px; - height: 18px; - background-repeat: no-repeat; - background-position: 4px center; - margin: 0; - padding: 0; - vertical-align: middle; - } - - .iconAdd { - background-image: url("/library/image/silk/user_add.png"); - } - - .iconRemove { - background-image: url("/library/image/silk/user_delete.png"); - } - - .connectionStatus { - color: var(--sakai-text-color-2); - font-size: 90%; - } - - /* fix this so the image is in the style, NOT in wicket */ - .rssLink { - margin: 0; - padding: 0; - display: inline; - } - - .rssLink img { - vertical-align: middle; - } - - /* heading for pages and items */ - .header { - border-bottom: 1px solid var(--sakai-border-color); - line-height: 1.55; - } - - .results-header, .search-results-header { - margin-top: 12px; - font-weight: normal; - } - - /* style the indicator for form submits that use an IndicatingAjaxButton as the button */ - span.wicket-ajax-indicator img { - padding-left: 2px; - display: inline; - white-space: nowrap; - vertical-align: middle; - } - - /* warning message style for when editing another person's profile */ - .edit-other-warning { - @extend .sak-banner-warn-inline; - margin: $standard-space-2x 0; - } - - /* warning message style for when editing another person's profile */ - .save-failed-error { - @extend .sak-banner-error-inline; - margin: $standard-space-2x 0; - } - - /* autocomplete styling */ - div.wicket-aa { - font-size: 12px; - background-color: white; - border-width: 1px; - border-style: solid; - border-color: var(--sakai-border-color); - margin: 1px 0 0 0; - text-align: left; - } - - div.wicket-aa ul { - list-style: none; - margin-top: 0 !important; - margin-bottom: 0 !important; - } - - div.wicket-aa li { - list-style: none; - margin-left: -17px; /*strip the default margin */ - padding-left: 5px; - padding-top: 2px; - padding-bottom: 2px; - } - - div.wicket-aa ul li.selected { - @extend .sakai-colorize--sakai-color-gold--lighter-6; - } - - /* message threads styles */ - .message-thread-list-wrap { - border-top: 1px solid var(--sakai-border-color); - width: 700px; - } - - .message-thread-item { - display: block; - position: relative; - left: 0; - top: 0; - border-bottom: 1px solid var(--sakai-border-color); - border-collapse: collapse; - /*height: 50px;*/ - min-height: 50px; /*use min-height rather than fixed height as names might be long and spill over */ - padding-top: 5px; - padding-left: 5px; - padding-right: 5px; - padding-bottom: 5px; - overflow: hidden; /* to crop bigger pictures that might overhang */ - } - - .message-thread-item:hover { - @extend .sakai-colorize--sakai-color-gold--lighter-6; - } - - .message-thread-photo-wrap { - display: table-cell; - vertical-align: top; - } - - .message-thread-photo{ - float: left; - max-width: 50px; - width: 50px; - } - - .message-thread-from-wrap, .message-thread-details-wrap { - display: table-cell; - overflow:hidden; - vertical-align: top; - font-size: 100%; - padding-left: 10px; - } - - .message-thread-from-wrap { - width: 150px; - } - - .message-thread-from-name { - display: block; - font-size: 90%; - } - - .message-thread-date { - display: block; - font-size: 70%; - color: var(--sakai-text-color-2); - } - - .message-thread-subject { - display: block; - font-size: 90%; - } - - .message-thread-body { - display: block; - font-size: 90%; - color: var(--sakai-text-color-2); - } - - /* message view styles */ - .message-details-wrap { - margin-top: 10px; - width: 700px; - padding-bottom: 10px; - border-bottom: 1px solid var(--sakai-border-color); - margin-bottom: 1px; - } - - .message-subject { - font-size: 140%; - font-weight: bold; - color: var(--sakai-text-color-2); - } - - .message-list-wrap { - border-top: 1px solid var(--sakai-border-color); - width: 700px; - } - - .message-item { - display: block; - position: relative; - left: 0; - top: 0; - border-bottom: 1px solid var(--sakai-border-color); - border-collapse: collapse; - padding-top: 5px; - padding-left: 5px; - padding-right: 5px; - padding-bottom: 5px; - overflow: hidden; /* to crop bigger pictures that might overhang */ - } - - .message-photo-wrap { - display: table-cell; - vertical-align: top; - } - - .message-photo{ - float:left; - max-width: 55px; - width: 55px; - } - - .message-info-wrap { - display: table-cell; - overflow:hidden; - vertical-align: top; - font-size: 100%; - padding-left: 10px; - } - - .message-from-wrap { - display: block; - } - - .message-from-name { - display: inline; - } - - .message-date { - display: inline; - font-size: 70%; - color: var(--sakai-text-color-2); - } - - .message-body { - display: block; - width: 100%; - padding-top:5px; - font-size: 90%; - color: var(--sakai-text-color-2); - } - - .replyLabel { - width: 50px; - float: left; - color: var(--sakai-text-color-2); - vertical-align: top; - font-weight: normal; - } - - .unread-message { - background-color: var(--sakai-active-color-1); - } - - .unread-message:hover { - background-color: var(--sakai-active-color-2); - } - - /* gallery-related */ - .add-form-item { - vertical-align: top; - } - - .add-form-warning { - text-align: right; - padding-right: 10px; - } - - .gallery-warning-text { - font-size: 12px; - font-weight: bold; - } - - .gallery-form { - position: relative; - } - - .gallery-image-panel { - cursor: pointer; - } - - .gallery-image-form { - position: relative; - } - - .gallery-image-form img { - max-width: 575px; - } - - /* spacing between gallery images in grid */ - .gallery-form td { - border: 5px; - border-spacing: 5px; - padding: 5px; - } - - /* gallery feed styles */ - #gallery-feed { - display: block; - text-align: center; - } - - #gallery-feed table { - border: none; - margin: 0 auto; - table-layout: fixed; - } - - #gallery-feed table td { - padding-left: 2px; - padding-right: 2px; - margin-left: 1px; - margin-right: 1px; - vertical-align: top; - } - - .gallery-feed-item { - vertical-align: top; - width: 55px; - max-width: 55px; - margin: 1px; - text-align: center; - word-wrap: break-word; - white-space: normal; - } - - .gallery-feed-item img { - max-width: 55px; - width: 55px; - display: block; - margin: auto; - } - - /* wall-related */ - .wall-wrap { - width: 500px; - font-size: 90%; - } - - .wall-item { - clear: left; - border-top: 1px solid var(--sakai-border-color); - padding: 5px; - } - - .wall-item-img { - float: left; - max-width: 35px; - width: 35px; - margin-bottom: 5px; - cursor: pointer; - } - - .wall-item-text-wrap { - width: 435px; - margin-left: 50px; - overflow: hidden; - } - - .wall-item-comment-text-wrap { - width: 380px; - margin-left: 50px; - overflow: hidden; - } - - .wall-item-comment { - margin-top: 5px; - padding-left: 5px; - padding-top: 5px; - padding-bottom: 5px; - @extend .sakai-colorize--sakai-color-gold--lighter-6; - } - - .wall-item-post-comment { - width: 435px; - height: 100px; - padding-left: 5px; - padding-top: 5px; - @extend .sakai-colorize--sakai-color-gold--lighter-6; - } - - .wall-comment-input-area { - width: 415px; - margin-bottom: 5px; - font-size: 90%; - } - - .wallButtons input[type="submit"] { - @include sakai_primary_button(); - } - - .wall-item-date { - color: var(--sakai-text-color-2); - } - - .wall-item-actions-wrap { - float: right; - } - - .wall-item-action-icon { - float:right; - margin-left: 2px; - } - - .wall-post-form { - padding-top: 5px; - padding-bottom: 5px; - } - - .wall-post-container { - /* height: 150px; let this be set automatically by the contents*/ - padding-bottom: 5px; - } - - .wall-post-input-area { - width: 492px; /* TinyMCE control adds 8px */ - } - - .wall-post-button { - margin-top: 5px; - } - - /* confirmed friends button form */ - .confirmed-friends-button-form { - margin-bottom: 5px; - } - - /* create worksite panel */ - .create-worksite-panel { - width: 500px; - padding: 5px; - margin-left: auto; - margin-right: auto; - } - - /* close button */ - .closebutton { - float: right; - clear: none; - text-align: right; - } - - .closebutton:hover { - @extend .sakai-colorize--sakai-color-red--lighter-6; - } - - /* accessibility */ - .accessibility-label { - position: absolute; - left: -999em; - width: 1em; - overflow: hidden; - } - - .text-counter { - color: var(--sakai-text-color-2); - font-size: 1.5em; - font-weight: bolder; - float:right; - } - - .pager { - margin-top: 10px; - } - - /* center the datepicker icon */ - img.ui-datepicker-trigger { - vertical-align: middle; - } - - button.ui-datepicker-trigger { - margin: 0 0; - } - - .no-pictures { - margin-bottom: 10px; - } - - .create-worksite { - .create-worksite-panel { - .content { - .label { - color: var(--sakai-text-color-2); - } - } - } - } - - .label{ - font-size: 110%; - padding: 0 0 0 0; - line-height: 2.3em; - &:not(.notBold) { - font-weight: 700; - } - } - - .recordButton { - border-radius: 17px; - padding: 7px 30px; - @extend .sakai-colorize--sakai-color-red; - border-color: var(--sakai-color-red); - box-shadow: var(--elevation-2dp); - margin-bottom: 10px; - @include display-flex; - @include flex-direction(row); - @include align-items(center); - &:hover { - @extend .sakai-colorize--sakai-color-red--darker-1; - border-color: var(--sakai-color-red--darker-1); - box-shadow: var(--elevation-4dp); - } - &:active, &:focus { - @extend .sakai-colorize--sakai-color-red--darker-2; - border-color: var(--sakai-color-red--darker-2); - box-shadow: var(--elevation-0dp); - } - } - - #prev-audio-player audio, .audioPlayer audio { - max-width: 100%; - } - - .content { - font-size: 14px; - } - - .navIntraTool { - margin: -2px -14px 0 0; - @media #{$phone}{ - margin-top: 10px; - } - } - - .Mrphs-pageColumns--single { - margin: 1em 0 1em 0; - clear: both; - } - - .portletBody { - padding: 2.5em 0 40px 0; - } - - /* tabs */ - .tab-row ul { - @extend .nav; - @extend .nav-tabs; - @extend .sakai_tabs; - } - - .panel-profile-message{ - padding: $standard-spacing; - background: var(--sakai-background-color-2); - position: relative; - } - - .profileSayItActionBar { - @include display-flex; - @include justify-content(space-between); - @include align-items(center); - margin-top: $standard-space; - - .act { - margin: 0; - } - } - - .gallery-form{ - - img{ - cursor: pointer; - } - - .sakai-wicket-iconwithtooltip{ - position: absolute; - margin-top: 0em; - } - - .addPictureLabel{ - margin-right: 1.6em; - } - - .wicket-mfu-container{ - margin: 1em 0 0 0; - } - - input[type="submit"]{ - float: right; - margin: -1.6em 0 0 0; - } - - .input-file-container{ - - input[type="file"]{ - @extend .form-control; - height: auto !important; - position: relative !important; - left: 0 !important; - } - } - - .label.no-pictures{ - color: var(--sakai-text-color-1); - font-weight: 400; - } - } - - .table-preferences{ - max-width: 800px; - } - - #privacy-settings{ - - max-width: 1200px; - - .row{ - margin-bottom: 1em; - } - } - - #searchinput{ - margin: 0.5em 0 0 0; - } + div:focus, div:hover { + button { + display: block; + } + } + } + + .profileContent .radio label, .profileContent .checkbox label { + font-size: 1.2em; + } + + .editable > .edit-button { + @include sakai_secondary_button(); + margin: 3px 0 0 0; + float: right; + clear: none; + display: block; + clip: unset; + } + + .edit-image-button { + @include sakai_secondary_button(); + margin: 3px 3px 0 0; + } + + #profileHeadingName { + font-size: 140%; + font-weight: bold; + } + + /* generic styles */ + + h2 { + margin-top: 0; + } + + /* icons */ + .locked:before, + .unlocked:before, + .profile:before, + .picture:before, + .preferences:before, + .email-link:before, + .facebook:before, + .linkedin:before { + @extend .fa; + margin-right: $standard-space-2x; + } + @mixin mimic_button() { + padding: 7px 16px; + justify-content: center; + font-weight: 600; + display: flex; + width: auto; + font-size: 13px; + } + + .locked { + @extend .fa-lock; + } + + .unlocked { + @extend .fa-unlock; + } + + .profile { + @extend .fa-address-card; + @include mimic_button(); + } + + .picture { + @extend .fa-picture-o; + } + + .preferences { + @extend .fa-cog; + } + + .facebook { + @extend .fa-facebook; + } + + .linkedin { + @extend .fa-linkedin; + } + + .recordIcon { + @extend .fa; + @extend .fa-microphone; + width: 11px; + height: 15px; + display: inline-block; + background-size: 100%; + margin-left: 7px; + } + + .infoIcon { + @extend .fa, .fa-info-circle; + } + + /* mainSection styles */ + .mainSection { + padding-bottom: 10px; + display: block; + } + + .mainSectionHeading { + display: block; + font-weight: bold; + border-bottom: 1px solid var(--sakai-primary-color-1); + margin-bottom: 0; + margin-top: $standard-space-2x; + padding-bottom: 0; + width: 100%; + } + + .mainSectionContentDescription { + padding-top: 5px; + } + + .mainSectionContent { + padding-top: 5px; + } + + /* sideLink styles */ + #sideLink { + list-style-type: none; + padding: 0; + margin: $standard-space-2x 0; + + li { + margin-bottom: $standard-space-2x; + + a { + @include sakai_secondary_button(); + display: flex; + width: auto; + justify-content: center; + } + } + } + + /** workaround for disabled link and extra markup */ + #sideLink li span>span { + margin: 0; + padding: 0; + } + + /* profile and preferences information sections */ + .profileContent, .preferencesContent { + padding-top: 2px; + padding-bottom: 2px; + font-size: 90%; + border: none; + } + + .preferencesContent { + margin-top: 6px; + margin-bottom: 12px; + } + + .profileContent td { + padding: 0.5em 1em 0.5em 0em !important; + } + + .profileContent td:last-child { + padding: 0.5em 0 0.5em 0 !important; + } + + .profileContent .label, + .preferencesContent .label { + color: var(--sakai-text-color-1); + vertical-align: middle; + font-weight: normal; + padding-top: 4px; + padding-bottom: 4px; + } + + .preferencesContent .label { + width: 170px; + } + + .label a { + padding-top: 2px; + padding-bottom: 2px; + } + + .profileContent .content, + .preferencesContent .content { + padding-left: 2px; + /*padding-right: 40px;*/ + vertical-align: middle; + word-wrap: break-word; + /* WebKit rule. See http://blog.kenneth.io/blog/2012/03/04/word-wrapping-hypernation-using-css/ */ + word-break: break-word; + /* Split long words with hyphens */ + hyphens: auto; + -moz-hyphens: auto; + -webkit-hyphens: auto; + /* Only split after 8 characters. Webkit only. */ + -webkit-hyphenate-limit-before: 8; + } + + .contentExample { + color: var(--sakai-text-color-2); + } + + .preferencesContent .item { + padding-left: 4px; + padding-right: 4px; + text-align: center; + font-size: 80%; + } + + .profileContent .toolTip, + .preferencesContent .toolTip { + padding-left: 8px; + vertical-align: top; + + } + + .formInputField { + width: 210px; + } + + .formInputArea { + width: 300px; + } + + .formInputField.invalid, + .formInputArea.invalid { + border: 2px solid var(--sakai-color-red); + color: var(--sakai-color-red); + } + + .feedbackLabel { + display: block; + font-weight: bold; + } + + /* wicket FeedbackPanel but remove the list styles and just make it bold */ + + .formSectionHeading { + color: var(--sakai-text-color-1); + padding-left: 0; + } + + .formSectionText { + font-weight: normal; + font-size: 0.9em; + padding-left: 2px; + margin-top: 4px; + font-style: italic; + } + + /* Style for wicket's feedback message panel */ + .alertMessage ul { + list-style-type: none !important; + margin-left: -40px; + margin-bottom: 0px; + margin-top: 0px; + } + + /* heading for pages and items */ + .header { + border-bottom: 1px solid var(--sakai-border-color); + line-height: 1.55; + } + + /* style the indicator for form submits that use an IndicatingAjaxButton as the button */ + span.wicket-ajax-indicator img { + padding-left: 2px; + display: inline; + white-space: nowrap; + vertical-align: middle; + } + + /* warning message style for when editing another person's profile */ + .edit-other-warning { + @extend .sak-banner-warn-inline; + margin: $standard-space-2x 0; + } + + /* warning message style for when editing another person's profile */ + .save-failed-error { + @extend .sak-banner-error-inline; + margin: $standard-space-2x 0; + } + + /* accessibility */ + .accessibility-label { + position: absolute; + left: -999em; + width: 1em; + overflow: hidden; + } + + .label{ + font-size: 110%; + padding: 0 0 0 0; + line-height: 2.3em; + &:not(.notBold) { + font-weight: 700; + } + } + + .recordButton { + border-radius: 17px; + padding: 7px 30px; + @extend .sakai-colorize--sakai-color-red; + border-color: var(--sakai-color-red); + box-shadow: var(--elevation-2dp); + margin-bottom: 10px; + @include display-flex; + @include flex-direction(row); + @include align-items(center); + &:hover { + @extend .sakai-colorize--sakai-color-red--darker-1; + border-color: var(--sakai-color-red--darker-1); + box-shadow: var(--elevation-4dp); + } + &:active, &:focus { + @extend .sakai-colorize--sakai-color-red--darker-2; + border-color: var(--sakai-color-red--darker-2); + box-shadow: var(--elevation-0dp); + } + } - .profileContent { - max-width: 65em; - } + #prev-audio-player audio, .audioPlayer audio { + max-width: 100%; + } -} + .content { + font-size: 14px; + } -/* modal window styles (also modalWindowButtons above) */ -.profileModalWindowWrapper { - display: block; - position: relative; - left: 5px; - top: 5px; - width: 450px; /* must be smaller than the actual modal window */ - height: 120px; -} + .navIntraTool { + margin: -2px -14px 0 0; + @media #{$phone}{ + margin-top: 10px; + } + } -.profileModalWindowImage { - position: absolute; - top: 0; - left: 0; - max-width: 100px; - width: 100px; - border: 1px solid var(--sakai-border-color); - padding: 2px; -} + .Mrphs-pageColumns--single { + margin: 1em 0 1em 0; + clear: both; + } -.profileModalWindowMain { - position: relative; - top: 0; - left: 120px; - width: 300px; -} + .portletBody { + padding: 2.5em 0 40px 0; + } -.profileModalWindowText { - margin-top: 5px; + .profileContent { + max-width: 65em; + } } - -.sakai-wicket-onlinepresence { - width: 0px; - width: 1.7rem; - height: 1.7rem; - padding: 0 !important; -} \ No newline at end of file diff --git a/profile2/tool/src/java/org/sakaiproject/profile2/tool/components/OnlinePresenceIndicator.html b/profile2/tool/src/java/org/sakaiproject/profile2/tool/components/OnlinePresenceIndicator.html deleted file mode 100644 index e2cee146670b..000000000000 --- a/profile2/tool/src/java/org/sakaiproject/profile2/tool/components/OnlinePresenceIndicator.html +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/roster2/bundle/src/bundle/roster_fa_IR.properties b/roster2/bundle/src/bundle/roster_fa_IR.properties index cd7c9d9746bd..267c522e162f 100644 --- a/roster2/bundle/src/bundle/roster_fa_IR.properties +++ b/roster2/bundle/src/bundle/roster_fa_IR.properties @@ -40,11 +40,6 @@ roster_show_official_pictures=\u062a\u0635\u0627\u0648\u06cc\u0631 \u0631\u0633\ roster_show_profile_pictures=\u0639\u06a9\u0633 \u0647\u0627\u06cc \u067e\u0631\u0648\u0641\u0627\u06cc\u0644 # Profile show_profile=\u0645\u0634\u0627\u0647\u062f\u0647 \u067e\u0631\u0648\u0641\u0627\u06cc\u0644 \u0627\u06cc\u0646 \u0634\u0631\u06a9\u062a \u06a9\u0646\u0646\u062f\u0647 -profile_connection_accept=\u062a\u0627\u06cc\u06cc\u062f \u062f\u0648\u0633\u062a\u06cc -profile_connection_add=\u0627\u0641\u0632\u0648\u062f\u0646 \u062f\u0648\u0633\u062a -profile_connection_remove=\u062d\u0630\u0641 \u062f\u0648\u0633\u062a -profile_connection_requested=\u062f\u0631\u062e\u0648\u0627\u0633\u062a \u062f\u0648\u0633\u062a\u06cc -profile_connection_self=\u0627\u06cc\u0646 \u0634\u0645\u0627 \u0647\u0633\u062a\u06cc\u062f\! profile_email=\u067e\u0633\u062a \u0627\u0644\u06a9\u062a\u0631\u0648\u0646\u06cc\u06a9 profile_picture_alt=\u0639\u06a9\u0633 \u0627\u0632 # Facets @@ -56,7 +51,6 @@ facet_role=\u0633\u0637\u062d \u06a9\u0627\u0631\u0628\u0631\u06cc facet_status=\u0648\u0636\u0639\u06cc\u062a facet_credits=\u0627\u0639\u062a\u0628\u0627\u0631\u0627\u062a facet_groups=\u06af\u0631\u0648\u0647 \u0647\u0627 -facet_connected_status=\u0645\u062a\u0635\u0644 # Page title messages title_msg_permissions=\u062a\u0639\u0631\u06cc\u0641 \u0645\u062c\u0648\u0632\u0647\u0627 \u0628\u0631\u0627\u06cc \u0646\u0642\u0634\u200c\u0647\u0627 \u062f\u0631 \u0633\u0627\u06cc\u062a \u0641\u0639\u0644\u06cc. no_participants=\u0646\u062a\u06cc\u062c\u0647 \u0627\u06cc \u06cc\u0627\u0641\u062a \u0646\u0634\u062f diff --git a/roster2/tool/src/java/org/sakaiproject/roster/api/SakaiProxy.java b/roster2/tool/src/java/org/sakaiproject/roster/api/SakaiProxy.java index b1d057f0839d..50b0a56ffaae 100644 --- a/roster2/tool/src/java/org/sakaiproject/roster/api/SakaiProxy.java +++ b/roster2/tool/src/java/org/sakaiproject/roster/api/SakaiProxy.java @@ -60,7 +60,6 @@ public interface SakaiProxy { public final static Boolean DEFAULT_FIRST_NAME_LAST_NAME = false; public final static Boolean DEFAULT_HIDE_SINGLE_GROUP_FILTER = false; public final static Boolean DEFAULT_VIEW_EMAIL = true; - public final static Boolean DEFAULT_VIEW_CONNECTIONS = true; public final static Boolean DEFAULT_VIEW_USER_DISPLAY_ID = true; public final static Boolean DEFAULT_VIEW_USER_PROPERTIES = true; public final static Boolean DEFAULT_VIEW_CANDIDATE_DETAILS = true; diff --git a/roster2/tool/src/webapp/css/print.css b/roster2/tool/src/webapp/css/print.css index dc4ddb0525f6..663af878cf11 100644 --- a/roster2/tool/src/webapp/css/print.css +++ b/roster2/tool/src/webapp/css/print.css @@ -1,5 +1,5 @@ #skipNav, .Mrphs-mainHeader,.portal-header, .offcanvas, .offcanvas-body, #toolMenuWrap, #profile-image-upload, .sakai-pageNav, .portal-nav-sidebar, .portal-mobilebar, #footer, #selectSiteModal, .Mrphs-siteHierarchy, -#roster_navbar, .sakai-table-toolBar, .roster-filter-totals, .roster-connections-cell, #roster-loading-image, +#roster_navbar, .sakai-table-toolBar, .roster-filter-totals, #roster-loading-image, #profileImageUpload, .Mrphs-container--toolTitleNav, .portal-footer { display: none !important; } @@ -218,4 +218,4 @@ page-break-inside: avoid; overflow: visible; } -} \ No newline at end of file +} diff --git a/webcomponents/tool/src/main/frontend/packages/sakai-notifications/src/SakaiNotifications.js b/webcomponents/tool/src/main/frontend/packages/sakai-notifications/src/SakaiNotifications.js index d0242259b230..796f0f71a0cc 100644 --- a/webcomponents/tool/src/main/frontend/packages/sakai-notifications/src/SakaiNotifications.js +++ b/webcomponents/tool/src/main/frontend/packages/sakai-notifications/src/SakaiNotifications.js @@ -134,9 +134,7 @@ export class SakaiNotifications extends SakaiElement { // Grab the first section of the event. This is the tool event prefix. const toolEventPrefix = noti.event.substring(0, noti.event.indexOf(".")); - if (toolEventPrefix === "profile") { - this._decorateProfileNotification(noti); - } else if (toolEventPrefix === "asn") { + if (toolEventPrefix === "asn") { this._decorateAssignmentNotification(noti); } else if (toolEventPrefix === "annc") { this._decorateAnnouncementNotification(noti); @@ -153,23 +151,6 @@ export class SakaiNotifications extends SakaiElement { } } - _decorateProfileNotification(noti) { - - switch (noti.event) { - - case "profile.friend.request": - noti.title = this._i18n.connection_request_received.replace("{0}", noti.fromDisplayName); - break; - case "profile.friend.confirm": - noti.title = this._i18n.connection_request_accepted.replace("{0}", noti.fromDisplayName); - break; - case "profile.message.sent": - noti.title = this._i18n.message_received.replace("{0}", noti.fromDisplayName); - break; - default: - } - } - _decorateAssignmentNotification(noti) { if (noti.event === "asn.new.assignment" || noti.event === "asn.revise.access") {