You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by br...@apache.org on 2018/03/31 14:10:57 UTC
[jspwiki] branch master updated: JSPWIKI-1068 TitleBox rendering on
Haddock
This is an automated email from the ASF dual-hosted git repository.
brushed pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
The following commit(s) were added to refs/heads/master by this push:
new 43b6f2c JSPWIKI-1068 TitleBox rendering on Haddock
43b6f2c is described below
commit 43b6f2c9b87c4636efbf48a706a5bf4903f69e71
Author: brushed <di...@gmail.com>
AuthorDate: Sat Mar 31 16:10:42 2018 +0200
JSPWIKI-1068 TitleBox rendering on Haddock
Put TitleBox inside the DIV.header so it becomes part of the
fixed/reveal header block on top of the page.
---
ChangeLog | 4 ++++
.../src/main/java/org/apache/wiki/Release.java | 2 +-
.../main/styles/haddock/default/Template.View.less | 5 ++++-
.../src/main/webapp/templates/haddock/Header.jsp | 26 ++++++++++++----------
4 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 4d7d969..eaaa39c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2018-03-31 Dirk Frederickx (brushed AT apache DOT org)
+
+ * 2.10.4-git-05 JSPWIKI-1068 TitleBox rendering on Haddock
+
2018-03-29 Juan Pablo Santos (juanpablo AT apache DOT org)
* 2.10.4-git-04
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/Release.java b/jspwiki-war/src/main/java/org/apache/wiki/Release.java
index 005f2d2..3738857 100644
--- a/jspwiki-war/src/main/java/org/apache/wiki/Release.java
+++ b/jspwiki-war/src/main/java/org/apache/wiki/Release.java
@@ -72,7 +72,7 @@ public final class Release {
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "4";
+ public static final String BUILD = "5";
/**
* This is the generic version string you should use when printing out the version. It is of
diff --git a/jspwiki-war/src/main/styles/haddock/default/Template.View.less b/jspwiki-war/src/main/styles/haddock/default/Template.View.less
index 4213d3c..44c11b9 100644
--- a/jspwiki-war/src/main/styles/haddock/default/Template.View.less
+++ b/jspwiki-war/src/main/styles/haddock/default/Template.View.less
@@ -110,7 +110,10 @@ DOM structure:
}
-.titlebox.alert { margin:0; }
+.titlebox {
+ color:@black;
+ .bg-warning;
+}
.header, .footer {
.clearfix;
diff --git a/jspwiki-war/src/main/webapp/templates/haddock/Header.jsp b/jspwiki-war/src/main/webapp/templates/haddock/Header.jsp
index 2abc58e..db4bc57 100644
--- a/jspwiki-war/src/main/webapp/templates/haddock/Header.jsp
+++ b/jspwiki-war/src/main/webapp/templates/haddock/Header.jsp
@@ -24,19 +24,17 @@
<%@ page import="org.apache.wiki.*" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
-<%
- WikiContext c = WikiContext.findContext(pageContext);
-%>
-<c:set var="frontpage" value="<%= c.getEngine().getFrontPage() %>" />
-
-<c:set var="titlebox"><wiki:InsertPage page="TitleBox" /></c:set>
-<c:if test="${!empty titlebox}"><div class="titlebox alert">${titlebox}</div></c:if>
+<c:set var="frontpage"><wiki:Variable var="jspwiki.frontPage" /></c:set>
<div class="header">
+ <c:set var="titlebox"><wiki:InsertPage page="TitleBox" /></c:set>
+ <c:if test="${!empty titlebox}"><div class="titlebox">${titlebox}</div></c:if>
+
<div class="topline">
<div class="cage pull-left">
+
<a class="logo pull-left"
href="<wiki:Link page='${frontpage}' format='url' />"
title="<fmt:message key='actions.home.title' ><fmt:param>${frontpage}</fmt:param></fmt:message> ">apache<b>jspωiki</b></a>
@@ -54,13 +52,17 @@
<div class="pagename" title="<wiki:PageName />">
<wiki:CheckRequestContext context='viewGroup|createGroup|editGroup'><span class="icon-group"></span></wiki:CheckRequestContext>
<wiki:PageType type="attachment"><span class="icon-paper-clip"></span></wiki:PageType>
- <wiki:Link>
+
<c:choose>
- <c:when test="${not empty fn:substringBefore(param.page,'_blogentry_')}">${fn:replace(fn:replace(param.page,'_blogentry_',' ['),'_','#')}]</c:when>
- <c:when test="${not empty fn:substringBefore(param.page,'_comments_')}">${fn:replace(fn:replace(param.page,'_comments_',' ['),'_','#')}]</c:when>
- <c:otherwise><a href="#top"><wiki:PageName /></a></c:otherwise>
+ <c:when test="${not empty fn:substringBefore(param.page,'_blogentry_')}">
+ <wiki:Link>${fn:replace(fn:replace(param.page,'_blogentry_',' ['),'_','#')}]</wiki:Link>
+ </c:when>
+ <c:when test="${not empty fn:substringBefore(param.page,'_comments_')}">
+ <wiki:Link>${fn:replace(fn:replace(param.page,'_comments_',' ['),'_','#')}]</wiki:Link>
+ </c:when>
+ <c:otherwise><a href="#top"><wiki:PageName /></a></c:otherwise>
</c:choose>
- </wiki:Link>
+
</div>
</div>
--
To stop receiving notification emails like this one, please contact
brushed@apache.org.