Revision: 1737
http://gatewiki.svn.sourceforge.net/gatewiki/?rev=1737&view=revAuthor: ian_roberts
Date: 2009-10-22 13:44:31 +0000 (Thu, 22 Oct 2009)
Log Message:
-----------
Same change in gau layout - move top* divs inside topBar to fix float wrapping
issue, and change DOCTYPE to HTML4 strict to fix Opera and IE8 rendering.
Modified Paths:
--------------
trunk/site-plugins/gau/grails-app/views/layouts/cowguest.gsp
Modified: trunk/site-plugins/gau/grails-app/views/layouts/cowguest.gsp
===================================================================
--- trunk/site-plugins/gau/grails-app/views/layouts/cowguest.gsp 2009-10-22 12:39:21 UTC (rev 1736)
+++ trunk/site-plugins/gau/grails-app/views/layouts/cowguest.gsp 2009-10-22 13:44:31 UTC (rev 1737)
@@ -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="GATE: a General Architecure for Text Engineering" /></title>
@@ -44,59 +45,59 @@
<span id="topLogo">
<a href="/"><img src="/plugins/gau-0.1/images/logo-colour.png" alt="GATE" border="0" height="76"></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>
- <!-- If admin area, id will be null; do not show search box in admin area -->
- <g:if test="${id}">
- <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>
-
+ <!-- If admin area, id will be null; do not show search box in admin area -->
+ <g:if test="${id}">
+ <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>
+ <!-- second row header links -->
+ <div id="topBreadcrumbs">
+ <g:if test="${pageTree}">
+ ${pageTree}
+ </g:if>
+ </div>
</div>
<!-- header menus -->
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
