You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2020/02/07 10:50:55 UTC
[openmeetings] branch csp updated: [OPENMEETINGS-2165] RSS widget
is converted
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch csp
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/csp by this push:
new 9845738 [OPENMEETINGS-2165] RSS widget is converted
9845738 is described below
commit 984573865761830455360444097be44cb0335f42
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Fri Feb 7 17:50:41 2020 +0700
[OPENMEETINGS-2165] RSS widget is converted
---
.../org/apache/openmeetings/web/common/MainPanel.html | 2 +-
.../openmeetings/web/common/tree/FileTreePanel.html | 2 +-
.../java/org/apache/openmeetings/web/pages/MainPage.html | 2 +-
.../openmeetings/web/room/sidebar/RoomSidebar.html | 2 +-
.../openmeetings/web/user/dashboard/RssWidgetView.html | 10 ++++++++++
.../org/apache/openmeetings/web/user/dashboard/rss.js | 16 +++++++++-------
.../web/user/profile/MessagesContactsPanel.html | 2 +-
openmeetings-web/src/main/webapp/css/raw-general.css | 13 ++-----------
8 files changed, 26 insertions(+), 23 deletions(-)
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.html
index 4e27465..5526e9c 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.html
@@ -33,7 +33,7 @@
<div wicket:id="menu"></div>
</div>
<div wicket:id="dev" id="devMenu"/>
- <div wicket:id="contents"><div wicket:id="child" class="child-panel"></div></div>
+ <div wicket:id="contents"><div wicket:id="child" class="child-panel h-100"></div></div>
<div wicket:id="chatPanel" class="closed"></div>
<div wicket:id="aboutDialog"></div>
<div wicket:id="userInfoDialog"></div>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html
index fa0fe84..8702054 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html
@@ -21,7 +21,7 @@
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
- <form wicket:id="form" class="full-height">
+ <form wicket:id="form" class="h-100">
<div class="file tree item drop area">
<div class="icons clear trash-toolbar" wicket:id="trash-toolbar" wicket:message="title:705">
<span wicket:id="upload" wicket:message="title:702"></span>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.html
index c0779af..d8737f4 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.html
@@ -21,6 +21,6 @@
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org">
<wicket:extend>
- <div wicket:id="main-container" class="main-container"><div wicket:id="main" class="main"/></div>
+ <div wicket:id="main-container" class="main-container"><div wicket:id="main" class="main h-100"/></div>
</wicket:extend>
</html>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
index c2c2a469..1ac1510 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
@@ -46,7 +46,7 @@
</div>
</div>
<div id="room-sidebar-tab-files" wicket:enclosure="tree">
- <div class="file-list full-height" wicket:id="tree"></div>
+ <div class="file-list h-100" wicket:id="tree"></div>
</div>
</div>
<div wicket:id="activities"></div>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetView.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetView.html
index 7cf26b7..e1cfaca 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetView.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetView.html
@@ -22,5 +22,15 @@
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
<div id="feedcontainer"></div>
+ <div class="d-none">
+ <div class="card" id="rss-item-template">
+ <div class="card-header p-0">
+ <button class="btn btn-outline-info btn-block" type="button" data-toggle="collapse"></button>
+ </div>
+ <div class="collapse">
+ <div class="card-body"></div>
+ </div>
+ </div>
+ </div>
</wicket:panel>
</html>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/rss.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/rss.js
index cc40eac..bcba775 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/rss.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/rss.js
@@ -8,12 +8,14 @@ function displayRss(entries) {
$('#feedcontainer').append('<div id="feeds"></div>');
const feeds = $('#feeds');
for (let i = 0; i < entries.length; ++i) {
- addItem(feeds, entries[i]);
+ const headId = `om-rss-heading${i}`
+ , bodyId = `om-rss-content${i}`
+ , markup = OmUtil.tmpl('#rss-item-template');
+ markup.find('.card-header').attr('id', headId);
+ markup.find('button').attr('data-target', `#${bodyId}`).attr('aria-controls', bodyId)
+ .append(entries[i].title);
+ markup.find('.collapse').attr('id', bodyId).attr('aria-labelledby', headId);
+ markup.find('.card-body').text(entries[i].content);
+ feeds.append(markup);
}
- feeds.accordion({
- collapsible: true
- , active: false
- , header: 'h3'
- , heightStyle: "content"
- });
}
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html
index 2eb4bb7..32ae988 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html
@@ -38,7 +38,7 @@
</div>
</div>
</td>
- <td class="main">
+ <td class="main h-100">
<div><strong><wicket:message key="1206"/> (<span wicket:id="unread"></span>)</strong></div>
<div class="adminNav" wicket:id="navigator"></div>
<table id="messagesTable" class="list-table small full-width">
diff --git a/openmeetings-web/src/main/webapp/css/raw-general.css b/openmeetings-web/src/main/webapp/css/raw-general.css
index c66e873..f2d11b5 100644
--- a/openmeetings-web/src/main/webapp/css/raw-general.css
+++ b/openmeetings-web/src/main/webapp/css/raw-general.css
@@ -11,10 +11,7 @@ html, body {
.main-container {
height: calc(100% - var(--header-height));
}
-.main
-, #contents .child-panel
-, .full-height
-{
+.main {
height: 100%;
}
.signin .oauth-section {
@@ -215,10 +212,7 @@ html, body {
#feedcontainer {
overflow: auto;
}
-#feeds.ui-accordion .ui-accordion-header {
- margin-bottom: 2px;
-}
-#feeds.ui-accordion .ui-accordion-content {
+#feeds .card .card-body {
white-space: pre;
}
.align-left {
@@ -538,9 +532,6 @@ select.messages.selector {
.user.info.panel fieldset table, .user.info.panel fieldset table textarea {
width: 100%;
}
-#topControls {
- height: var(--menu-height);
-}
#topControls #wicketDebugBar {
right: initial;
top: initial;