[gatewiki-commits] SF.net SVN: gatewiki:[1736] trunk/cow
|
View:
New views
1 Messages
—
Rating Filter:
Alert me
|
 |
[gatewiki-commits] SF.net SVN: gatewiki:[1736] trunk/cow
by ian_roberts
::
Rate this Message:
Revision: 1736
http://gatewiki.svn.sourceforge.net/gatewiki/?rev=1736&view=rev Author: ian_roberts Date: 2009-10-22 12:39:21 +0000 (Thu, 22 Oct 2009) Log Message: ----------- Put topLoginEtc, topPageSpecific and topBreadcrumbs inside topBar, and made them non-floated but right aligned instead. If the browser window is too narrow to contain all the top links and search box in one line they now wrap across multiple lines but stay to the right of the logo, rather than the whole lot wrapping to below the logo. Also changed DOCTYPE to the proper HTML 4 strict doctype, which fixes rendering in opera and IE8 (don't know about IE 7 or earlier, I don't have them to test). Modified Paths: -------------- trunk/cow/grails-app/views/layouts/cowpage.gsp trunk/cow/web-app/css/page.css Modified: trunk/cow/grails-app/views/layouts/cowpage.gsp =================================================================== --- trunk/cow/grails-app/views/layouts/cowpage.gsp 2009-10-21 14:56:20 UTC (rev 1735) +++ trunk/cow/grails-app/views/layouts/cowpage.gsp 2009-10-22 12:39:21 UTC (rev 1736) @@ -1,4 +1,5 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" + "http://www.w3.org/TR/html4/strict.dtd"> <html lang="en"> <head> <title><g:layoutTitle default="CoW: Controllable Wiki" /></title> @@ -45,61 +46,61 @@ <span id="topLogo"> <a href="${createLinkTo(dir:'/')}"><g:cowLogo/></a> </span> - </div> - <!-- first row header links --> - <div id="topLoginEtc"> - <!-- page links --> - <span id="topPageSpecific">${pageLinks}</span> + <!-- first row header links --> + <div id="topLoginEtc"> + <!-- page links --> + <span id="topPageSpecific">${pageLinks}</span> - <!-- Only show search box when we are viewing a page, not when we are in - the admin area --> - <g:if test="${(webRequest?.controllerName == 'page') || (webRequest?.controllerName == 'search')}"> - <g:if test="${gate.cow.CowUtils.getConfig().gate.cow.solr.run}"> - <g:form name="searchForm" controller="search" method="post" - class="inlineForm"> - <label class="pageLink" for="searchBox">Search:</label> - <g:if test="${parameters?.searchBox}"> - <input type="text" name="searchBox" id="searchBox" tabindex="1" - value="${parameters.searchBox}"/> - </g:if> - <g:else> - <input type="text" name="searchBox" id="searchBox" tabindex="1"/> - </g:else> - <input type="hidden" name="id" value="${id}" id="id"/> - </g:form> - + <!-- Only show search box when we are viewing a page, not when we are in + the admin area --> + <g:if test="${(webRequest?.controllerName == 'page') || (webRequest?.controllerName == 'search')}"> + <g:if test="${gate.cow.CowUtils.getConfig().gate.cow.solr.run}"> + <g:form name="searchForm" controller="search" method="post" + class="inlineForm"> + <label class="pageLink" for="searchBox">Search:</label> + <g:if test="${parameters?.searchBox}"> + <input type="text" name="searchBox" id="searchBox" tabindex="1" + value="${parameters.searchBox}"/> + </g:if> + <g:else> + <input type="text" name="searchBox" id="searchBox" tabindex="1"/> + </g:else> + <input type="hidden" name="id" value="${id}" id="id"/> + </g:form> + + </g:if> </g:if> - </g:if> - <jsec:isLoggedIn> - <g:link controller="user"><cow:principal property='firstname'/> <cow:principal property='lastname'/></g:link> - - <g:link controller="auth" action="signOut">Log out</g:link> - </jsec:isLoggedIn> - <cow:isServer> - <jsec:isNotLoggedIn> - <cow:isNotLoggingIn> - <g:link controller="auth">Log in</g:link> - </cow:isNotLoggingIn> - </jsec:isNotLoggedIn> - </cow:isServer> - <cow:isAdministrator> + <jsec:isLoggedIn> + <g:link controller="user"><cow:principal property='firstname'/> <cow:principal property='lastname'/></g:link> + + <g:link controller="auth" action="signOut">Log out</g:link> + </jsec:isLoggedIn> <cow:isServer> - <g:link controller="admin">Admin</g:link> + <jsec:isNotLoggedIn> + <cow:isNotLoggingIn> + <g:link controller="auth">Log in</g:link> + </cow:isNotLoggingIn> + </jsec:isNotLoggedIn> </cow:isServer> - </cow:isAdministrator> - <cow:isWorkstation> - (w/s mode) <g:link controller="admin">Admin</g:link> - </cow:isWorkstation> - <g:pageLink action="show" id="1" linkPath="doc/gatewiki.html">Help</g:pageLink> - </div> + <cow:isAdministrator> + <cow:isServer> + <g:link controller="admin">Admin</g:link> + </cow:isServer> + </cow:isAdministrator> + <cow:isWorkstation> + (w/s mode) <g:link controller="admin">Admin</g:link> + </cow:isWorkstation> + <g:pageLink action="show" id="1" linkPath="doc/gatewiki.html">Help</g:pageLink> + </div> - <!-- second row header links --> - <div id="topBreadcrumbs"> - <g:if test="${pageTree}"> - ${pageTree} - </g:if> - </div> + <!-- second row header links --> + <div id="topBreadcrumbs"> + <g:if test="${pageTree}"> + ${pageTree} + </g:if> + </div> + </div><!-- topBar --> <!-- header menus --> <div id="header"> Modified: trunk/cow/web-app/css/page.css =================================================================== --- trunk/cow/web-app/css/page.css 2009-10-21 14:56:20 UTC (rev 1735) +++ trunk/cow/web-app/css/page.css 2009-10-22 12:39:21 UTC (rev 1736) @@ -23,7 +23,8 @@ margin-right: 6px; } #topLoginEtc { - float: right; + /*float: right;*/ + text-align: right; margin-bottom: 6px; } #topBreadcrumbs { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference _______________________________________________ gatewiki-commits mailing list gatewiki-commits@... https://lists.sourceforge.net/lists/listinfo/gatewiki-commits |
| Free embeddable forum powered by Nabble | Forum Help |
