Skip to content

Commit cde501e

Browse files
adrianfishadrianfish
authored
SAK-48076 preferences: Fix tool expansion and collapse (sakaiproject#11012)
https://sakaiproject.atlassian.net/browse/SAK-48076 Also, move the styles into library and scope them.
1 parent a6ea10f commit cde501e

File tree

11 files changed

+355
-433
lines changed

11 files changed

+355
-433
lines changed

‎user/user-tool-prefs/tool/src/webapp/css/prefs.css ‎library/src/skins/default/src/sass/modules/tool/preferences/_preferences.scss

+334-335
Large diffs are not rendered by default.

‎library/src/skins/default/src/sass/tool.scss

+1
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ $jumbotron-heading-font-size: $h4-font-size;
136136
@import "modules/tool/polls/polls";
137137
@import "modules/tool/lessonbuilder/lessonbuilder";
138138
@import "modules/tool/myconnections/myconnections";
139+
@import "modules/tool/preferences/preferences";
139140
@import "modules/tool/samigo/samigo";
140141
@import "modules/tool/synoptic/synoptic";
141142
@import "modules/tool/resources/resources";

‎user/user-tool-prefs/tool/src/java/org/sakaiproject/user/jsf/HideDivisionRenderer.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,10 @@ public void encodeBegin(FacesContext context, UIComponent component)
8787

8888
writer.write("<fieldset>");
8989
writer.write("<legend>");
90-
writer.write("<a role='button' data-bs-toggle='collapse' aria-expanded='true' href='#" + id + "' data-target=\"[id='" + id + "']\">" + title + "</a>");
90+
writer.write("<button type='button' class='btn btn-transparent' data-bs-toggle='collapse' aria-expanded='false' data-bs-target=\"[id='" + id + "']\">" + title + "</button>");
9191
writer.write("</legend>");
9292

93-
writer.write("<div class='collapse in' " +
94-
" id=\"" + id + "\">");
93+
writer.write("<div class='collapse' id='" + id + "'>");
9594
}
9695

9796

‎user/user-tool-prefs/tool/src/java/org/sakaiproject/user/tool/UserPrefsTool.java

+1-72
Original file line numberDiff line numberDiff line change
@@ -1664,6 +1664,7 @@ else if ("admin".equals(type))
16641664
return term;
16651665
}
16661666

1667+
@Getter @Setter
16671668
public class DecoratedNotificationPreference {
16681669

16691670
private String key = "";
@@ -1692,78 +1693,6 @@ public DecoratedNotificationPreference(UserNotificationPreferencesRegistration u
16921693
}
16931694
}
16941695

1695-
public void setKey(String key) {
1696-
this.key = key;
1697-
}
1698-
1699-
public String getKey() {
1700-
return key;
1701-
}
1702-
1703-
public void setUserNotificationPreferencesRegistration(UserNotificationPreferencesRegistration userNotificationPreferencesRegistration) {
1704-
this.userNotificationPreferencesRegistration = userNotificationPreferencesRegistration;
1705-
}
1706-
1707-
public UserNotificationPreferencesRegistration getUserNotificationPreferencesRegistration() {
1708-
return userNotificationPreferencesRegistration;
1709-
}
1710-
1711-
public void setSelectedOption(String selectedOption) {
1712-
this.selectedOption = selectedOption;
1713-
}
1714-
1715-
public String getSelectedOption() {
1716-
return selectedOption;
1717-
}
1718-
1719-
public void setOptionSelectItems(List<SelectItem> optionSelectItems) {
1720-
this.optionSelectItems = optionSelectItems;
1721-
}
1722-
1723-
public List<SelectItem> getOptionSelectItems() {
1724-
return optionSelectItems;
1725-
}
1726-
1727-
public void setSiteOverrides(List<SiteOverrideBean> siteOverrides) {
1728-
this.siteOverrides = siteOverrides;
1729-
}
1730-
1731-
public List<SiteOverrideBean> getSiteOverrides() {
1732-
return siteOverrides;
1733-
}
1734-
1735-
public List<DecoratedSiteTypeBean> getSiteList() {
1736-
return siteList;
1737-
}
1738-
1739-
public void setSiteList(List<DecoratedSiteTypeBean> siteList) {
1740-
this.siteList = siteList;
1741-
}
1742-
1743-
public Integer getSortOrder() {
1744-
return sortOrder;
1745-
}
1746-
1747-
public void setSortOrder(Integer sortOrder) {
1748-
this.sortOrder = sortOrder;
1749-
}
1750-
1751-
public boolean isHidden() {
1752-
return hidden;
1753-
}
1754-
1755-
public void setHidden(boolean hidden) {
1756-
this.hidden = hidden;
1757-
}
1758-
1759-
public Boolean getExpandOverride() {
1760-
return expandOverride;
1761-
}
1762-
1763-
public void setExpandOverride(Boolean expandOverride) {
1764-
this.expandOverride = expandOverride;
1765-
}
1766-
17671696
public boolean getExpand() {
17681697
Boolean override = getExpandOverride();
17691698
if (override != null)

‎user/user-tool-prefs/tool/src/webapp/prefs/editor.jsp

+3-4
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,14 @@
1010

1111
<f:view>
1212
<sakai:view_container title="#{msgs.prefs_title}">
13-
<link rel="stylesheet" href="/sakai-user-tool-prefs/css/prefs.css" type="text/css" />
1413
<sakai:view_content>
1514
<h:form id="ckeditor_form">
1615

1716
<h:outputText value="#{Portal.latestJQuery}" escape="false"/>
1817

19-
<script type="text/javascript" src="/sakai-user-tool-prefs/js/prefs.js">// </script>
20-
<script type="text/javascript" src="/library/js/spinner.js"></script>
21-
<script type="text/javascript">
18+
<script src="/sakai-user-tool-prefs/js/prefs.js">// </script>
19+
<script src="/library/js/spinner.js"></script>
20+
<script>
2221
$PBJQ(document).ready(function(){
2322
fixImplicitLabeling();
2423
})

‎user/user-tool-prefs/tool/src/webapp/prefs/locale.jsp

+2-3
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,11 @@
1010

1111
<f:view>
1212
<sakai:view_container title="#{msgs.prefs_title}">
13-
<link rel="stylesheet" href="/sakai-user-tool-prefs/css/prefs.css" type="text/css" />
1413
<sakai:view_content>
1514
<h:form id="locale_form">
1615
<h:outputText value="#{Portal.latestJQuery}" escape="false"/>
17-
<script type="text/javascript" src="/sakai-user-tool-prefs/js/prefs.js">// </script>
18-
<script type="text/javascript" src="/library/js/spinner.js"></script>
16+
<script src="/sakai-user-tool-prefs/js/prefs.js">// </script>
17+
<script src="/library/js/spinner.js"></script>
1918

2019
<%-- Set current value for template --%>
2120
<c:set var="cTemplate" value = "locale" scope="session"/>

‎user/user-tool-prefs/tool/src/webapp/prefs/noti.jsp

+4-5
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,11 @@
1212

1313
<f:view>
1414
<sakai:view_container title="#{msgs.prefs_title}">
15-
<link rel="stylesheet" href="/sakai-user-tool-prefs/css/prefs.css" type="text/css" />
1615
<sakai:view_content>
1716

1817
<h:outputText value="#{Portal.latestJQuery}" escape="false"/>
1918
<f:verbatim>
20-
<script type="text/javascript">
19+
<script>
2120
function removeOverride(cur) {
2221
//set to true
2322
cur.nextSibling.value=true;
@@ -31,9 +30,9 @@
3130

3231
<h:form id="options_form">
3332

34-
<script type="text/javascript" src="/sakai-user-tool-prefs/js/prefs.js">// </script>
35-
<script type="text/javascript" src="/library/js/spinner.js"></script>
36-
<script type="text/javascript">
33+
<script src="/sakai-user-tool-prefs/js/prefs.js">// </script>
34+
<script src="/library/js/spinner.js"></script>
35+
<script>
3736
$PBJQ(document).ready(function(){
3837
fixImplicitLabeling();
3938
})

‎user/user-tool-prefs/tool/src/webapp/prefs/noti_addSiteOverride.jsp

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<sakai:view_content>
1212
<h:outputText value="#{Portal.latestJQuery}" escape="false"/>
1313
<f:verbatim>
14-
<script type="text/javascript" src="/sakai-user-tool-prefs/js/prefs.js"> </script>
14+
<script src="/sakai-user-tool-prefs/js/prefs.js"> </script>
1515
</f:verbatim>
1616

1717
<h:form id="site_list_form">

‎user/user-tool-prefs/tool/src/webapp/prefs/privacy.jsp

+2-3
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,11 @@
1010

1111
<f:view>
1212
<sakai:view_container title="#{msgs.privacy_title}">
13-
<link rel="stylesheet" href="/sakai-user-tool-prefs/css/prefs.css" type="text/css" />
1413
<sakai:view_content>
1514
<h:form>
1615
<!--SAK-18566 -->
1716
<h:outputText value="#{Portal.latestJQuery}" escape="false"/>
18-
<script type="text/javascript" src="/sakai-user-tool-prefs/js/prefs.js">// </script>
17+
<script src="/sakai-user-tool-prefs/js/prefs.js">// </script>
1918

2019
<!-- *********** Tool rendering top of page if on MyWorkspace home page *********** -->
2120
<h:panelGroup rendered="#{privacyBean.myWorkspace}" >
@@ -118,7 +117,7 @@
118117
<f:verbatim></tr></table></f:verbatim>
119118
--%>
120119
<h:outputText escape="false" rendered="#{privacyBean.displayPopup}"
121-
value="<script type=\"text/javascript\">parent.privacy_show_popup();</script>" />
120+
value="<script>parent.privacy_show_popup();</script>" />
122121

123122
</h:panelGroup>
124123
<h:panelGroup rendered="#{privacyBean.myWorkspace && not privacyBean.sitesEmpty}" >

‎user/user-tool-prefs/tool/src/webapp/prefs/theme.jsp

+3-4
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,14 @@
1010

1111
<f:view>
1212
<sakai:view_container title="#{msgs.prefs_title}">
13-
<link rel="stylesheet" href="/sakai-user-tool-prefs/css/prefs.css" type="text/css" />
1413
<sakai:view_content>
1514
<h:form id="theme_form" rendered="#{UserPrefsTool.prefShowThemePreferences==true}">
1615

1716
<h:outputText value="#{Portal.latestJQuery}" escape="false"/>
1817

19-
<script type="text/javascript" src="/sakai-user-tool-prefs/js/prefs.js">// </script>
20-
<script type="text/javascript" src="/library/js/spinner.js"></script>
21-
<script type="text/javascript">
18+
<script src="/sakai-user-tool-prefs/js/prefs.js">// </script>
19+
<script src="/library/js/spinner.js"></script>
20+
<script>
2221
$PBJQ(document).ready(function(){
2322
fixImplicitLabeling();
2423
})

‎user/user-tool-prefs/tool/src/webapp/prefs/timezone.jsp

+2-3
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,11 @@
1010

1111
<f:view>
1212
<sakai:view_container title="#{msgs.prefs_title}">
13-
<link rel="stylesheet" href="/sakai-user-tool-prefs/css/prefs.css" type="text/css" />
1413
<sakai:view_content>
1514
<h:form id="timezone_form">
1615
<h:outputText value="#{Portal.latestJQuery}" escape="false"/>
17-
<script type="text/javascript" src="/sakai-user-tool-prefs/js/prefs.js">// </script>
18-
<script type="text/javascript" src="/library/js/spinner.js"></script>
16+
<script src="/sakai-user-tool-prefs/js/prefs.js">// </script>
17+
<script src="/library/js/spinner.js"></script>
1918

2019
<%-- Set current value for template --%>
2120
<c:set var="cTemplate" value = "timezone" scope = "session" />

0 commit comments

Comments
 (0)