Author: andre Date: 2010-05-25 16:03:07 +0200 (Tue, 25 May 2010) New Revision: 42255
Modified: openimages/trunk/src/main/webapp/WEB-INF/tags/oip/menu.tagx openimages/trunk/src/main/webapp/action/you.jspx openimages/trunk/src/main/webapp/style/css/framework.css Log: OIP-133 ellipsis for usernames in header Modified: openimages/trunk/src/main/webapp/WEB-INF/tags/oip/menu.tagx =================================================================== --- openimages/trunk/src/main/webapp/WEB-INF/tags/oip/menu.tagx 2010-05-25 14:00:29 UTC (rev 42254) +++ openimages/trunk/src/main/webapp/WEB-INF/tags/oip/menu.tagx 2010-05-25 14:03:07 UTC (rev 42255) @@ -16,7 +16,7 @@ <c:if test="${! empty requestScope['org.mmbase.mmsite.language']}"> <mm:param name="locale">${requestScope['org.mmbase.mmsite.language']}</mm:param> </c:if> - <jsp:text>$(document).ready(function() { $("#you").load("${_}"); });</jsp:text> + <jsp:text>$(document).ready(function() { $("#menu li.you").load("${_}"); });</jsp:text> </mm:link> </script> <mm:relatednodescontainer type="pages" role="posrel" searchdirs="destination"> @@ -38,7 +38,10 @@ </mm:node> <ul class="meta"> - <li> + <li class="you"> + <jsp:text> </jsp:text> + </li> + <li class="form"> <mm:datatype base="oip_language" id="language_selector"> <required value="false" /> </mm:datatype> @@ -58,9 +61,6 @@ </mm:link> </mm:virtualnode> </li> - <li id="you"> - <jsp:text> </jsp:text> - </li> </ul> </div> Modified: openimages/trunk/src/main/webapp/action/you.jspx =================================================================== --- openimages/trunk/src/main/webapp/action/you.jspx 2010-05-25 14:00:29 UTC (rev 42254) +++ openimages/trunk/src/main/webapp/action/you.jspx 2010-05-25 14:03:07 UTC (rev 42255) @@ -19,6 +19,13 @@ <fmt:setBundle basename="eu.openimages.messages"/> <mm:cloud method="asis"> <mm:hasrank minvalue="site user"> + + <mm:escaper id="ellipsis" type="substring"> + <mm:param name="from" value="0" /> + <mm:param name="to" value="13" /> + <mm:param name="ellipsis" value="..." /> + </mm:escaper> + <mm:link> <mm:frameworkparam name="component">oip</mm:frameworkparam> <mm:frameworkparam name="block">user</mm:frameworkparam> @@ -27,13 +34,14 @@ <mm:frameworkparam name="userlocale">${locale}</mm:frameworkparam> </c:if> <span> - <a href="${_}"><mm:cloudinfo type="user" /></a> + <a href="${_}"><mm:cloudinfo type="user" escape="ellipsis" /></a> <jsp:text> | </jsp:text> <mm:link page="/logout.jspx" referids="locale"> <a href="${_}"><fmt:message key="login.logout" /></a> </mm:link> </span> </mm:link> + </mm:hasrank> <mm:hasrank value="anonymous"> <mm:import externid="referrer" /> Modified: openimages/trunk/src/main/webapp/style/css/framework.css =================================================================== --- openimages/trunk/src/main/webapp/style/css/framework.css 2010-05-25 14:00:29 UTC (rev 42254) +++ openimages/trunk/src/main/webapp/style/css/framework.css 2010-05-25 14:03:07 UTC (rev 42255) @@ -95,19 +95,22 @@ #menu ul.meta li { - float: right; + float: left; display: inline; text-align: right; } -#menu ul.meta li#you +#menu ul.meta li.you { white-space: nowrap; word-spacing: 2px; + width: 172px; + text-align: right; padding-right: 8px; + overflow: hidden; } - +#menu ul.meta li.form, #menu ul.meta li form, #menu ul.meta li fieldset, #menu select _______________________________________________ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs