Skip to content

Commit aafd1e6

Browse files
SAK-43993 Library,Simple RSS Portlet - fix news feed formatting (sakaiproject#8613)
* SAK-43993 Library,Simple RSS Portlet - fix news feed formatting Co-authored-by: Michael Greene <[email protected]> Co-authored-by: Shawn Foster <[email protected]>
1 parent c3462c4 commit aafd1e6

File tree

6 files changed

+66
-88
lines changed

6 files changed

+66
-88
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
.#{$namespace}sakai-simple-rss {
2+
.#{$namespace}toolBody--sakai-simple-rss {
3+
padding: 0 $standard-spacing $standard-spacing;
4+
}
5+
.simple-rss-portlet form p {
6+
margin-top: $standard-spacing;
7+
margin-bottom: 0;
8+
}
9+
.news-items ul {
10+
padding:0;
11+
display:flex;
12+
flex-direction: column;
13+
}
14+
.news-items li {
15+
list-style-type: none;
16+
display:flex;
17+
flex-direction: row;
18+
margin-bottom: $standard-spacing;
19+
}
20+
/** overrides for CSyndFeed **/
21+
/** Sakai version **/
22+
.news-item-img {
23+
flex: 1 0 0 ;
24+
margin-right: $standard-spacing;
25+
}
26+
.news-item-content {
27+
flex: 4 0px;
28+
}
29+
.news-items h4 {
30+
margin-top:0;
31+
line-height: 1.25;
32+
}
33+
.news-item-attachment {
34+
font-size: 0.9em;
35+
flex: auto;
36+
background-color: var(--sakai-background-color-2);
37+
border: 1px solid var(--sakai-border-color);
38+
39+
}
40+
}

library/src/morpheus-master/sass/modules/tool/synoptic/_synoptic.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ body > .portletBody > #calendarForm{
2424
.navIntraTool {
2525
margin: 0;
2626
}
27-
}
27+
}

library/src/morpheus-master/sass/tool.scss

+1
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
@import "modules/tool/rubrics/rubrics";
5757
@import "modules/tool/authz/authz";
5858
@import "modules/tool/delegatedaccess/delegatedaccess";
59+
@import "modules/tool/simplerss/simplerss";
5960

6061
@import "base/rtl";
6162

simple-rss-portlet/src/main/webapp/css/simple-rss-portlet.css

-64
This file was deleted.

simple-rss-portlet/src/main/webapp/pages/edit.jsp

-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
<fmt:setLocale value="${language}" />
3434
<fmt:setBundle basename="au.edu.anu.portal.portlets.rss.utils.messages" />
3535

36-
<link type="text/css" rel="stylesheet" href="<%=request.getContextPath()%>/css/simple-rss-portlet.css" />
3736

3837
<div class="simple-rss-portlet">
3938

simple-rss-portlet/src/main/webapp/pages/view.jsp

+24-22
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
<%@ taglib prefix="portlet" uri="http://java.sun.com/portlet" %>
2222

2323
<portlet:defineObjects />
24-
<link type="text/css" rel="stylesheet" href="<%=request.getContextPath()%>/css/simple-rss-portlet.css" />
2524

2625
<div class="news-feed">
2726

@@ -31,39 +30,42 @@
3130
<img src="${SyndFeed.image.url}" alt="${SyndFeed.image.description}" class="news-feed-img"/>
3231
</a>
3332
</c:if>
34-
<p>${SyndFeed.description}</p>
33+
<h1>${SyndFeed.description}</h1>
3534
</div>
3635

3736
<div class="news-items">
3837
<ul>
3938
<c:forEach items="${SyndFeed.entries}" var="SyndEntry" end="${maxItems}">
4039
<li>
4140
<c:if test="${not empty Media[SyndEntry.uri] && Media[SyndEntry.uri].image}">
42-
<img src="${Media[SyndEntry.uri].url}" class="news-item-img"/>
43-
</c:if>
44-
<h3>
45-
<c:choose>
46-
<c:when test="${not empty SyndEntry.link}">
47-
<a target="_blank" href="${SyndEntry.link}" class="news-item-title">${SyndEntry.title}</a>
48-
</c:when>
49-
<c:otherwise>
50-
${SyndEntry.title}
51-
</c:otherwise>
52-
</c:choose>
53-
</h3>
54-
<span class="news-item-excerpt">${SyndEntry.description.value}</span>
55-
56-
<c:if test="${not empty Media[SyndEntry.uri] && !Media[SyndEntry.uri].image}">
57-
<div class="news-item-attachment">
58-
<a href="${Media[SyndEntry.uri].url}">${Media[SyndEntry.uri].displayName}</a>
59-
(${Media[SyndEntry.uri].type}, ${Media[SyndEntry.uri].displayLength})
41+
<div class="news-item-img">
42+
<img src="${Media[SyndEntry.uri].url}" />
6043
</div>
6144
</c:if>
62-
45+
<div class="news-item-content">
46+
<h2>
47+
<c:choose>
48+
<c:when test="${not empty SyndEntry.link}">
49+
<a target="_blank" href="${SyndEntry.link}" class="news-item-title">${SyndEntry.title}</a>
50+
</c:when>
51+
<c:otherwise>
52+
${SyndEntry.title}
53+
</c:otherwise>
54+
</c:choose>
55+
</h2>
56+
<span class="news-item-excerpt">${SyndEntry.description.value}</span>
57+
58+
<c:if test="${not empty Media[SyndEntry.uri] && !Media[SyndEntry.uri].image}">
59+
<div class="news-item-attachment">
60+
<a href="${Media[SyndEntry.uri].url}">${Media[SyndEntry.uri].displayName}</a>
61+
(${Media[SyndEntry.uri].type}, ${Media[SyndEntry.uri].displayLength})
62+
</div>
63+
</c:if>
64+
</div>
6365
</li>
6466
</c:forEach>
6567

6668
</ul>
6769
</div>
6870
</div>
69-
71+

0 commit comments

Comments
 (0)