You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2018/02/18 16:47:31 UTC
[3/3] roller git commit: Fix a couple of merge problems that I missed.
Fix a couple of merge problems that I missed.
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/ff5ba855
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/ff5ba855
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/ff5ba855
Branch: refs/heads/bootstrap-ui
Commit: ff5ba855b14351a1af1e853d4f481a2caa0afa13
Parents: 4ef312f
Author: Dave Johnson <sn...@gmail.com>
Authored: Sun Feb 18 11:47:25 2018 -0500
Committer: Dave Johnson <sn...@gmail.com>
Committed: Sun Feb 18 11:47:25 2018 -0500
----------------------------------------------------------------------
app/src/main/webapp/WEB-INF/jsps/tiles/bannerStatus.jsp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/roller/blob/ff5ba855/app/src/main/webapp/WEB-INF/jsps/tiles/bannerStatus.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/tiles/bannerStatus.jsp b/app/src/main/webapp/WEB-INF/jsps/tiles/bannerStatus.jsp
index 4258949..d5be278 100644
--- a/app/src/main/webapp/WEB-INF/jsps/tiles/bannerStatus.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/tiles/bannerStatus.jsp
@@ -50,16 +50,16 @@ i
</a>
</li> --%>
- <s:set name="tabMenu" value="menu"/>
+ <s:set var="tabMenu" value="menu"/>
<s:if test="#tabMenu != null">
- <s:iterator id="tab" value="#tabMenu.tabs">
+ <s:iterator var="tab" value="#tabMenu.tabs">
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button"
aria-haspopup="true" aria-expanded="false">
<s:text name="%{#tab.key}"/> <span class="caret"></span>
</a>
<ul class="dropdown-menu">
- <s:iterator id="tabItem" value="#tab.items" status="stat">
+ <s:iterator var="tabItem" value="#tab.items" status="stat">
<li>
<a href="<s:url action="%{#tabItem.action}">
<s:param name="weblog" value="actionWeblog.handle"/></s:url>">