rave-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ja...@apache.org
Subject svn commit: r1208423 - /incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/mobile_home.jsp
Date Wed, 30 Nov 2011 13:40:59 GMT
Author: jasha
Date: Wed Nov 30 13:40:58 2011
New Revision: 1208423

URL: http://svn.apache.org/viewvc?rev=1208423&view=rev
Log:
RAVE-357 use displayname in mobile view

Modified:
    incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/mobile_home.jsp

Modified: incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/mobile_home.jsp
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/mobile_home.jsp?rev=1208423&r1=1208422&r2=1208423&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/mobile_home.jsp
(original)
+++ incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/mobile_home.jsp
Wed Nov 30 13:40:58 2011
@@ -42,9 +42,14 @@
                 </li>
             </ul>
         </nav>
-      <h1>
-          <fmt:message key="page.home.welcome"><fmt:param><c:out value="${page.owner.username}"/></fmt:param></fmt:message>
-      </h1>
+        <h1>
+            <fmt:message key="page.home.welcome"><fmt:param>
+                <c:choose>
+                    <c:when test="${not empty page.owner.displayName}"><c:out value="${page.owner.displayName}"/></c:when>
+                    <c:otherwise><c:out value="${page.owner.username}"/></c:otherwise>
+                </c:choose>
+            </fmt:param></fmt:message>
+        </h1>
     </header>
     <input id="currentPageId" type="hidden" value="${page.entityId}" />
     <c:set var="hasOnlyOnePage">



Mime
View raw message