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 2018/10/06 03:17:32 UTC
[openmeetings] branch 4.0.x updated: [OPENMEETINGS-1928] reflow
skin is updated, ApacheCon banner is permanently added
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch 4.0.x
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/4.0.x by this push:
new d4879de [OPENMEETINGS-1928] reflow skin is updated, ApacheCon banner is permanently added
d4879de is described below
commit d4879de53b2dcbbe450acd0276a8e2c25c1763db
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Sat Oct 6 10:15:37 2018 +0700
[OPENMEETINGS-1928] reflow skin is updated, ApacheCon banner is permanently added
---
openmeetings-server/src/site/resources/css/site.css | 8 ++++++++
openmeetings-server/src/site/resources/js/site.js | 8 ++++++++
pom.xml | 6 +++---
src/site/site.xml | 6 +++---
4 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/openmeetings-server/src/site/resources/css/site.css b/openmeetings-server/src/site/resources/css/site.css
index 9e9d330..a76f09b 100644
--- a/openmeetings-server/src/site/resources/css/site.css
+++ b/openmeetings-server/src/site/resources/css/site.css
@@ -63,3 +63,11 @@ iframe {
.carousel.slide .carousel-inner .item img {
height: 654px !important;
}
+.apachecon-banner img {
+ height: 62px !important;
+}
+.apachecon-banner div {
+ font-size: small;
+ font-weight: bold;
+ text-align: center;
+}
diff --git a/openmeetings-server/src/site/resources/js/site.js b/openmeetings-server/src/site/resources/js/site.js
index 88fcece..9509f1f 100644
--- a/openmeetings-server/src/site/resources/js/site.js
+++ b/openmeetings-server/src/site/resources/js/site.js
@@ -23,4 +23,12 @@ $(document).ready(function() {
for (var i = 0; i < topics.length; ++i) {
$('ul.nav li a[title="' + topics[i] + '"').append(' <span class="label label-success">New</span>')
}
+ // "ACNA" banner on the right
+ $('#bannerRight').parent().parent().append(
+ $('<div class="pull-right">')
+ .append($('<a href="https://www.apachecon.com" class="apachecon-banner">')
+ .append($('<img src="https://apachecon.com/acna18/banners/acna-sleek-standard.png">'))
+ .append($('<div>').text('Register to ApacheCon!'))
+ )
+ );
})
diff --git a/pom.xml b/pom.xml
index b0ae41b..3dbbec8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,7 +48,7 @@
<checksum-maven-plugin.version>1.6</checksum-maven-plugin.version>
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
<license-maven-plugin.version>1.16</license-maven-plugin.version>
- <reflow-skin.version>1.3.10</reflow-skin.version>
+ <reflow-maven-skin.version>1.4.0</reflow-maven-skin.version>
<maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
<maven-project-info-reports-plugin.version>3.0.0</maven-project-info-reports-plugin.version>
<maven-jar-plugin.version>3.1.0</maven-jar-plugin.version>
@@ -107,7 +107,7 @@
<api-all.version>2.0.0.AM2</api-all.version>
<caldav4j.version>0.9.1</caldav4j.version>
<tika-parsers.version>1.19</tika-parsers.version>
- <commons-text.version>1.4</commons-text.version>
+ <commons-text.version>1.5</commons-text.version>
<license.excludedScopes>test</license.excludedScopes>
<bcprov-jdk15on.version>1.60</bcprov-jdk15on.version>
<!-- URL of the ASF SonarQube server -->
@@ -913,7 +913,7 @@
<dependency>
<groupId>io.github.devacfr.maven.skins</groupId>
<artifactId>reflow-velocity-tools</artifactId>
- <version>${reflow-skin.version}</version>
+ <version>${reflow-maven-skin.version}</version>
</dependency>
</dependencies>
</plugin>
diff --git a/src/site/site.xml b/src/site/site.xml
index d958798..5504e33 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -12,8 +12,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/DECORATION/1.7.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.7.0 http://maven.apache.org/xsd/decoration-1.7.0.xsd"
+<project xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd"
name="Apache OpenMeetings Project">
<bannerLeft>
<name>Apache OpenMeetings</name>
@@ -29,7 +29,7 @@
<skin>
<groupId>io.github.devacfr.maven.skins</groupId>
<artifactId>reflow-maven-skin</artifactId>
- <version>${reflow-skin.version}</version>
+ <version>${reflow-maven-skin.version}</version>
</skin>
<version position="none"/>