Skip to content

Commit

Permalink
SAK-40600 Library: Designed and styled the Sakai footer (sakaiproject…
Browse files Browse the repository at this point in the history
  • Loading branch information
fostersdesign authored and bjones86 committed Sep 25, 2018
1 parent 548fbb6 commit aec6178
Show file tree
Hide file tree
Showing 23 changed files with 420 additions and 238 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -147,9 +147,9 @@
# Powered by assertions placed at the bottom of the portal.
# DEFAULTS as shown below (from component-manager/kernel.properties)
# powered.url.count=1
# powered.url.1=http://sakaiproject.org
# powered.url.1=https://www.sakaiproject.org/
# powered.img.count=1
# powered.img.1=/library/image/sakai_powered.gif
# powered.img.1=/library/image/poweredBySakai.png
# powered.alt.count=1
# powered.alt.1=Powered by Sakai

Expand All @@ -158,7 +158,7 @@
# The keyword "currentYearFromServer" will be automatically substituted by Sakai to be set to by the server's end date.
# Using this keyword in the copyright statement can allow the copyright end date to automatically be updated to the current year.
# If you do not wish to have the copyright end date to be automatically updated, do not include the keyword in bottom.copyrighttext.
# bottom.copyrighttext=Copyright 2003-currentYearFromServer The Sakai Foundation. All rights reserved. Portions of Sakai are copyrighted by other parties as described in the Acknowledgments screen.
# bottom.copyrighttext=Copyright 2003-currentYearFromServer The Sakai Foundation. All rights reserved.

## VERSION - The are set in auto.sakai.properties at build time.
# Format: ${ui.service} - \${version.service} - Sakai \${version.sakai}) - Server ${serverId}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ bottomnav.3 = <a href="http://www.sakaiproject.org/" target="_blank">The Sakai P

# Powered by assertion placed at the bottom of the portal.
powered.url.count=1
powered.url.1=http://sakaiproject.org
powered.url.1=https://www.sakaiproject.org/
powered.img.count=1
powered.img.1=/library/image/sakai_powered.gif
powered.img.1=/library/image/poweredBySakai.png
powered.alt.count=1
powered.alt.1=Powered by Sakai

Expand All @@ -50,7 +50,7 @@ webcontent.instructions.url=/library/content/webcontent_instructions.html
webdav.instructions.url=/library/content/webdav_instructions.html

# copyright
bottom.copyrighttext=Copyright 2003-currentYearFromServer The Apereo Foundation. All rights reserved. Portions of Sakai are copyrighted by other parties as described in the Acknowledgments screen.
bottom.copyrighttext=Copyright 2003-currentYearFromServer The Apereo Foundation. All rights reserved.

# Default is to create needed schema
auto.ddl=true
Expand Down
7 changes: 0 additions & 7 deletions library/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -359,13 +359,6 @@
</includes>
<output>${project.build.directory}/${project.build.finalName}/skin/${sakai.skin.target}/js/morpheus.scripts.min.js</output>
</aggregation>
<aggregation>
<inputDir>${project.build.directory}/js/plugins/</inputDir>
<includes>
<include>**/*.js</include>
</includes>
<output>${project.build.directory}/${project.build.finalName}/skin/${sakai.skin.target}/js/morpheus.plugins.min.js</output>
</aggregation>
<aggregation>
<inputDir>src/webapp/editor/elfinder/sakai/js/src</inputDir>
<includes>
Expand Down
151 changes: 0 additions & 151 deletions library/src/morpheus-master/js/plugins/jquery.details.js

This file was deleted.

5 changes: 0 additions & 5 deletions library/src/morpheus-master/js/src/sakai.morpheus.details.js

This file was deleted.

34 changes: 33 additions & 1 deletion library/src/morpheus-master/js/src/sakai.morpheus.footer.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,32 @@
/**
* For Footer toggles in Morpheus
* For the Sakai Footer
*/

/* if the Esc key is hit, the panel will close */
function footerDetailsPanelEscHandler(e){
if (e.keyCode === 27) { // esc keycode
toggleFooterDetailsPanel(e);
}
}

/* displays or hides the server details panel in the footer */
function toggleFooterDetailsPanel(e) {
e.preventDefault(); // override # in href from popping to the top of the page

$PBJQ("#Mrphs-footer--details__panel").toggleClass("Mrphs-footer--details__panel-show");

if ($PBJQ('#Mrphs-footer--details__panel').hasClass('Mrphs-footer--details__panel-show')) {
// ESC key can close the panel:
$PBJQ(document).on('keyup',footerDetailsPanelEscHandler);
// then focus on the close button
$PBJQ('#Mrphs-footer--details__close').focus();
} else {
$PBJQ(document).off('keyup',footerDetailsPanelEscHandler);
// refocus on the launching button
$PBJQ('#Mrphs-footer--details__info').focus();
}
}

/* Show server time on footer if container exists */
$PBJQ(document).ready(function(){

Expand Down Expand Up @@ -41,4 +66,11 @@ $PBJQ(document).ready(function(){
updateFooterTime();
}

$PBJQ("#Mrphs-footer--details__info").click(function (e) {
toggleFooterDetailsPanel(e);
});

$PBJQ("#Mrphs-footer--details__close").click(function (e) {
toggleFooterDetailsPanel(e);
});
});
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
/**
* For Footer toggles in Morpheus
*/

function updatePresence(){

$PBJQ.ajax({
Expand Down
2 changes: 2 additions & 0 deletions library/src/morpheus-master/sass/_defaults.scss
Original file line number Diff line number Diff line change
Expand Up @@ -369,6 +369,8 @@ $siteDelete-border: 1px solid $info-color !default;
$footer-background-color: $tool-menu-background-color !default;
$footer-border-color: $tool-border-color !default;
$footer-color: $text-color !default;
$footer-link-separator: #ccc !default;
$footer-details-border-color: $footer-link-separator !default;

// Overview page column widths. Total to add up to 96% as the columns have a margin.
$col1of2-width: 48% !default;
Expand Down
Loading

0 comments on commit aec6178

Please sign in to comment.