Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix broken css menu #15

Open
wants to merge 2 commits into
base: unified
Choose a base branch
from
Open

Fix broken css menu #15

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17230eb
Change main.jspx to create the correct anchor tag
May 29, 2018
0638ac7
Add hack to fix page until duplication error can be found
May 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions onebusaway-enterprise-webapp/src/main/webapp/WEB-INF/decorators/main.jspx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
</s:url>
<script type="text/javascript" src="${url}">
<!-- //prevent jspx minimization -->

</script>

<decorator:head />
Expand All @@ -104,11 +104,10 @@
<div id="mainbox">
<div id="topbar">
<div id="branding">
<a href="${link}">
<s:url var="url" value="/css/img/agency_logo.png"></s:url>
<img src="${url}" alt="Agency logo" />
</a>

<s:set var="link" value="getText('main.agency.link')" />
<a href="${link}" id="agency-logo"/>
<!-- this is a hack until we find out why the last anchor in this div is duplicated !-->
<a style="display: none"/>
</div>

<div id="search">
Expand All @@ -132,21 +131,21 @@
<div id="bottombar">
<div class="bottombox" id="google_translate_element_bottom">
<span>Google Translate</span>
<s:set var="link" value="getText('main.agency.link')" />
<s:url var="url" value="/css/img/google_logo.png"></s:url>
<s:url var="url" value="/css/img/google_logo.png" />
<img id="icon" src="${url}" />
</div>
<div class="bottombox">
<s:set var="link" value="getText('main.privacypolicy.link')" />
<a href="${link}"> <span id="privacy-policy" alt="Privacy">Privacy</span>
<a href="${link}">
<span id="privacy-policy" alt="Privacy">Privacy</span>
</a>
</div>
</div>

<!-- End Content -->
</div>

<div class="container clear"></div>
<div class="container clear" />

</div>
<!-- close mainbox -->
Expand Down