diff --git a/src/main/webapp/WEB-INF/tags/page/xnat.tag b/src/main/webapp/WEB-INF/tags/page/xnat.tag
index 2aff8706a75b7a70211f1ba68747e1ee2ad87b5e..6cdc5160ce4bc699ff2196263d2e27a7f046a8ec 100644
--- a/src/main/webapp/WEB-INF/tags/page/xnat.tag
+++ b/src/main/webapp/WEB-INF/tags/page/xnat.tag
@@ -76,8 +76,6 @@
<script src="${_siteRoot}/scripts/lib/js.cookie.js"></script>
<script src="${_siteRoot}/scripts/lib/yamljs/dist/yaml.js"></script>
-
-
<%--<script src="${_siteRoot}/scripts/yui/build/yahoo-dom-event/yahoo-dom-event.js"></script>--%>
<%--<script src="${_siteRoot}/scripts/yui/build/event/event-min.js"></script>--%>
<%--<script src="${_siteRoot}/scripts/yui/build/container/container-min.js"></script>--%>
@@ -98,9 +96,6 @@
<%--<script src="${_siteRoot}/scripts/LeftBarTreeView.js"></script>--%>
<%--<script src="${_siteRoot}/scripts/justification/justification.js"></script>--%>
-
-
-
<!-- XNAT utility functions -->
<script src="${_siteRoot}/scripts/utils.js"></script>
@@ -218,72 +213,71 @@ ${headBottom}
${bodyTop}
-<div id="page_wrapper">
-
- <div id="user_bar">
- <div class="inner">
- <img id="attention_icon" src="${_siteRoot}/images/attention.png" style="display:none;" alt="attention needed - click for more info" title="attention needed - click for more info">
+<div id="user_bar">
+ <div class="inner">
+ <img id="attention_icon" src="${_siteRoot}/images/attention.png" style="display:none;" alt="attention needed - click for more info" title="attention needed - click for more info">
<span id="user_info">Logged in as: <a href="${_siteRoot}/app/template/XDATScreen_UpdateUser.vm">${_user}</a> <b>|</b>
<span class="tip_icon" style="margin-right:3px;left:2px;top:3px;">
<span class="tip shadowed" style="top:20px;z-index:10000;white-space:normal;left:-150px;width:300px;background-color:#ffc;">
- Your XNAT session will auto-logout after a certain period of inactivity.
+ Your XNAT session will auto-logout after a certain period of inactivity.
You can reset the timer without reloading thepage by clicking "renew."
</span>
</span>
- Auto-logout in:
+ Auto-logout in:
<b id="timeLeft">-:--:--</b> -
<a id="timeLeftRenew" href="#!">renew</a>
- <b>|</b>
+ <b>|</b>
<a id="logout_user" href="${_siteRoot}/app/action/LogoutUser">Logout</a>
</span>
- <%--<script type="text/javascript">--%>
- <%--$('#timeLeftRenew').click(XNAT.app.timeout.handleOk);--%>
- <%--Cookies.set('guest', 'false', {path: '/'});--%>
- <%--</script>--%>
- <div class="clear"></div>
- </div>
- </div><!-- /user_bar -->
-
-
- <div id="main_nav">
-
- <ul class="nav">
- <!-- Sequence: 10 -->
- <!-- allowGuest: true -->
- <li>
- <a id="nav-home" title="Home" href="${_siteRoot}/"> </a>
- <script>
- $('#nav-home').css({
- width: '30px',
- backgroundImage: "url('${_siteRoot}/images/xnat-nav-logo-white-lg.png')",
- backgroundRepeat: 'no-repeat',
- backgroundSize: '32px',
- backgroundPosition: 'center'
- });
- </script>
- </li>
- <!-- Sequence: 20 -->
- <li class="more"><a href="#new">New</a>
- <ul class="" style="display: none;">
- <!-- Sequence: 10 -->
- <li><a href="${_siteRoot}/app/template/XDATScreen_add_xnat_projectData.vm">Project</a></li>
- <li><a href="${_siteRoot}/app/action/XDATActionRouter/xdataction/edit/search_element/xnat%3AsubjectData">Subject</a></li>
- <li><a href="${_siteRoot}/app/template/XDATScreen_add_experiment.vm">Experiment</a></li>
- </ul>
- </li>
- <!-- Sequence: 30 -->
- <li class="more"><a href="#upload">Upload</a>
- <ul>
- <!-- Sequence: 10 -->
- <!-- Upload/Default -->
- <li><a href="${_siteRoot}/app/template/LaunchUploadApplet.vm">Images</a></li>
- <li><a href="${_siteRoot}/app/template/XMLUpload.vm">XML</a></li>
- <li><a href="${_siteRoot}/app/template/XDATScreen_uploadCSV.vm">Spreadsheet</a></li>
- <li><a href="${_siteRoot}/app/template/XDATScreen_prearchives.vm">Go to prearchive</a></li>
- </ul>
- </li>
+ <%--<script type="text/javascript">--%>
+ <%--$('#timeLeftRenew').click(XNAT.app.timeout.handleOk);--%>
+ <%--Cookies.set('guest', 'false', {path: '/'});--%>
+ <%--</script>--%>
+ <div class="clear"></div>
+ </div>
+</div><!-- /user_bar -->
- <c:if test="${isAdmin == true}">
+<div id="main_nav">
+ <div class="inner">
+
+ <ul class="nav">
+ <!-- Sequence: 10 -->
+ <!-- allowGuest: true -->
+ <li>
+ <a id="nav-home" title="Home" href="${_siteRoot}/"> </a>
+ <script>
+ $('#nav-home').css({
+ width: '30px',
+ backgroundImage: "url('${_siteRoot}/images/xnat-nav-logo-white-lg.png')",
+ backgroundRepeat: 'no-repeat',
+ backgroundSize: '32px',
+ backgroundPosition: 'center'
+ });
+ </script>
+ </li>
+ <!-- Sequence: 20 -->
+ <li class="more"><a href="#new">New</a>
+ <ul class="" style="display: none;">
+ <!-- Sequence: 10 -->
+ <li><a href="${_siteRoot}/app/template/XDATScreen_add_xnat_projectData.vm">Project</a></li>
+ <li><a href="${_siteRoot}/app/action/XDATActionRouter/xdataction/edit/search_element/xnat:subjectData">Subject</a></li>
+ <li><a href="${_siteRoot}/app/template/XDATScreen_add_experiment.vm">Experiment</a></li>
+ </ul>
+ </li>
+ <!-- Sequence: 30 -->
+ <li class="more"><a href="#upload">Upload</a>
+ <ul>
+ <!-- Sequence: 10 -->
+ <!-- Upload/Default -->
+ <li><a href="${_siteRoot}/app/template/LaunchUploadApplet.vm">Images</a></li>
+ <li><a href="${_siteRoot}/app/template/XMLUpload.vm">XML</a></li>
+ <li><a href="${_siteRoot}/app/template/XDATScreen_uploadCSV.vm">Spreadsheet</a></li>
+ <li><a href="${_siteRoot}/app/template/XDATScreen_prearchives.vm">Go to prearchive</a></li>
+ </ul>
+ </li>
+
+
+ <c:if test="${isAdmin == true}">
<!-- Sequence: 40 -->
<li class="more"><a href="#adminbox">Administer</a>
<ul>
@@ -298,222 +292,229 @@ ${bodyTop}
<li><a href="${_siteRoot}/app/template/XDATScreen_admin_options.vm">More...</a></li>
</ul>
</li>
- </c:if>
-
-
- <!-- Title: Tools -->
- <!-- Sequence: 50 -->
- <!-- allowGuest: true -->
-
- <li class="more"><a href="#tools">Tools</a>
- <ul>
- <!-- Sequence: 10 -->
- <!-- allowGuest: true -->
- <li><a href="https://wiki.xnat.org/display/XNAT16/XNAT+Desktop" target="_blank">XNAT Desktop (XND)</a></li>
- <li><a href="http://nrg.wustl.edu/projects/DICOM/DicomBrowser.jsp" target="_blank">DICOM Browser</a></li>
- <li><a href="https://wiki.xnat.org/display/XNAT16/XNAT+Client+Tools" target="_blank">Command Prompt Tools</a></li>
- </ul>
- </li>
- <!-- Sequence: 60 -->
- <li class="more"><a href="#help">Help</a>
- <ul class="" style="display: none;">
- <!-- Sequence: 10 -->
- <!-- Home/Default -->
- <li><a href="${_siteRoot}/app/template/ReportIssue.vm">Report a Problem</a></li>
- <li><a href="http://wiki.xnat.org/display/XNAT16/Home" target="_blank">Documentation</a></li>
- </ul>
- </li>
- </ul>
-
- <!-- search script -->
- <script type="text/javascript">
- <!--
- function DefaultEnterKey(e, button){
- var keynum, keychar, numcheck;
-
- if (window.event) // IE
- {
- keynum = e.keyCode;
- if (keynum == 13) {
- submitQuickSearch();
- return true;
- }
- }
- else if (e) // Netscape/Firefox/Opera
- {
- keynum = e.which;
- if (keynum == 13) {
- submitQuickSearch();
- return false;
- }
+ </c:if>
+
+
+ <!-- Title: Tools -->
+ <!-- Sequence: 50 -->
+ <!-- allowGuest: true -->
+
+ <li class="more"><a href="#tools">Tools</a>
+ <ul>
+ <!-- Sequence: 10 -->
+ <!-- allowGuest: true -->
+ <li><a href="https://wiki.xnat.org/display/XNAT16/XNAT+Desktop" target="_blank">XNAT Desktop (XND)</a></li>
+ <li><a href="http://nrg.wustl.edu/projects/DICOM/DicomBrowser.jsp" target="_blank">DICOM Browser</a></li>
+ <li><a href="https://wiki.xnat.org/display/XNAT16/XNAT+Client+Tools" target="_blank">Command Prompt Tools</a></li>
+ </ul>
+ </li>
+ <!-- Sequence: 60 -->
+ <li class="more"><a href="#help">Help</a>
+ <ul class="" style="display: none;">
+ <!-- Sequence: 10 -->
+ <!-- Home/Default -->
+ <li><a href="${_siteRoot}/app/template/ReportIssue.vm">Report a Problem</a></li>
+ <li><a href="http://wiki.xnat.org/display/XNAT16/Home" target="_blank">Documentation</a></li>
+ </ul>
+ </li>
+ </ul>
+
+ <!-- search script -->
+ <script type="text/javascript">
+ <!--
+ function DefaultEnterKey(e, button){
+ var keynum, keychar, numcheck;
+
+ if (window.event) // IE
+ {
+ keynum = e.keyCode;
+ if (keynum == 13) {
+ submitQuickSearch();
+ return true;
}
- return true;
}
-
- function submitQuickSearch(){
- concealContent();
- if (document.getElementById('quickSearchForm').value != "")
- document.getElementById('quickSearchForm').submit();
+ else if (e) // Netscape/Firefox/Opera
+ {
+ keynum = e.which;
+ if (keynum == 13) {
+ submitQuickSearch();
+ return false;
+ }
}
+ return true;
+ }
- //-->
- </script>
- <!-- end search script -->
+ function submitQuickSearch(){
+ concealContent();
+ if (document.getElementById('quickSearchForm').value != "")
+ document.getElementById('quickSearchForm').submit();
+ }
- <style type="text/css">
- #quickSearchForm .chosen-results {
- max-height: 500px;
- }
+ //-->
+ </script>
+ <!-- end search script -->
+
+ <style type="text/css">
+ #quickSearchForm .chosen-results {
+ max-height: 500px;
+ }
+
+ #quickSearchForm .chosen-results li {
+ padding-right: 20px;
+ white-space: nowrap;
+ }
+
+ #quickSearchForm .chosen-container .chosen-drop {
+ width: auto;
+ min-width: 180px;
+ max-width: 360px;
+ }
+
+ #quickSearchForm .chosen-container .chosen-drop .divider {
+ padding: 0;
+ overflow: hidden;
+ }
+ </style>
+
+ <form id="quickSearchForm" method="post" action="${_siteRoot}/app/action/QuickSearchAction">
+ <select id="stored-searches" data-placeholder="Stored Searches" style="display: none;">
+ <option></option>
+ <optgroup>
+ <option value="${_siteRoot}/app/template/XDATScreen_search_wizard1.vm">Advanced Search…</option>
+ </optgroup>
+ <optgroup class="stored-search-list">
+ <option disabled="">(no stored searches)</option>
+ <!-- stored searches will show up here -->
+ </optgroup>
+ </select>
+ <input id="searchValue" class="clean" name="searchValue" type="text" maxlength="40" size="20" value="">
+ <button type="button" id="search_btn" class="btn2" onclick="submitQuickSearch();">Go</button>
+
+ <script>
+
+ $('#searchValue').each(function(){
+ var _this = this;
+ _this.value = _this.value || 'search';
+ $(_this).focus(function(){
+ $(_this).removeClass('clean');
+ if (!_this.value || _this.value === 'search') {
+ _this.value = '';
+ }
+ })
+ });
- #quickSearchForm .chosen-results li {
- padding-right: 20px;
- white-space: nowrap;
- }
+ $('#stored-searches').on('change', function(){
+ if (this.value) {
+ window.location.href = this.value;
+ }
+ }).chosen({
+ width: '150px',
+ disable_search_threshold: 9,
+ inherit_select_classes: true,
+ placeholder_text_single: 'Stored Searches',
+ search_contains: true
+ });
- #quickSearchForm .chosen-container .chosen-drop {
- width: auto;
- min-width: 180px;
- max-width: 360px;
- }
+ </script>
+ </form>
- #quickSearchForm .chosen-container .chosen-drop .divider {
- padding: 0;
- overflow: hidden;
- }
- </style>
-
- <form id="quickSearchForm" method="post" action="${_siteRoot}/app/action/QuickSearchAction">
- <select id="stored-searches" data-placeholder="Stored Searches" style="display: none;">
- <option></option>
- <optgroup>
- <option value="${_siteRoot}/app/template/XDATScreen_search_wizard1.vm">Advanced Search…</option>
- </optgroup>
- <optgroup class="stored-search-list">
- <option disabled="">(no stored searches)</option>
- <!-- stored searches will show up here -->
- </optgroup>
- </select>
- <input id="searchValue" class="clean" name="searchValue" type="text" maxlength="40" size="20" value="">
- <button type="button" id="search_btn" class="btn2" onclick="submitQuickSearch();">Go</button>
+ </div>
+ <!-- /.inner -->
- <script>
- $('#searchValue').each(function(){
- var _this = this;
- _this.value = _this.value || 'search';
- $(_this).focus(function(){
- $(_this).removeClass('clean');
- if (!_this.value || _this.value === 'search') {
- _this.value = '';
- }
- })
- });
-
- $('#stored-searches').on('change', function(){
- if (this.value) {
- window.location.href = this.value;
- }
- }).chosen({
- width: '150px',
- disable_search_threshold: 9,
- inherit_select_classes: true,
- placeholder_text_single: 'Stored Searches',
- search_contains: true
- });
- </script>
- </form>
+</div>
+<!-- /#main_nav -->
- </div>
- <!-- /main_nav -->
+<!-- main_nav interactions -->
+<script type="text/javascript">
- <!-- main_nav interactions -->
- <script type="text/javascript">
+ (function(){
- (function(){
+ // cache it
+ var main_nav$ = jq('#main_nav > ul');
- // cache it
- var main_nav$ = jq('#main_nav > ul');
-
- var body$ = jq('body');
+ var body$ = jq('body');
- var cover_up_count = 1;
+ var cover_up_count = 1;
- function coverApplet(el$){
- var cover_up_id = 'cover_up' + cover_up_count++;
- var jqObjPos = el$.offset(),
+ function coverApplet(el$){
+ var cover_up_id = 'cover_up' + cover_up_count++;
+ var jqObjPos = el$.offset(),
jqObjLeft = jqObjPos.left,
jqObjTop = jqObjPos.top,
jqObjMarginTop = el$.css('margin-top'),
jqObjWidth = el$.outerWidth() + 4,
jqObjHeight = el$.outerHeight() + 2;
- el$.before('<iframe id="' + cover_up_id + '" class="applet_cover_up" src="about:blank" width="' + jqObjWidth + '" height="' + jqObjHeight + '"></iframe>');
-
- jq('#' + cover_up_id).css({
- display: 'block',
- position: 'fixed',
- width: jqObjWidth,
- height: jqObjHeight,
- marginTop: jqObjMarginTop,
- left: jqObjLeft,
- top: jqObjTop,
- background: 'transparent',
- border: 'none',
- outline: 'none'
- });
- }
+ el$.before('<iframe id="' + cover_up_id + '" class="applet_cover_up" src="about:blank" width="' + jqObjWidth + '" height="' + jqObjHeight + '"></iframe>');
+
+ jq('#' + cover_up_id).css({
+ display: 'block',
+ position: 'fixed',
+ width: jqObjWidth,
+ height: jqObjHeight,
+ marginTop: jqObjMarginTop,
+ left: jqObjLeft,
+ top: jqObjTop,
+ background: 'transparent',
+ border: 'none',
+ outline: 'none'
+ });
+ }
- function unCoverApplets(el$){
- el$.prev('iframe.applet_cover_up').detach();
- }
+ function unCoverApplets(el$){
+ el$.prev('iframe.applet_cover_up').detach();
+ }
- function fadeInNav(el$){
+ function fadeInNav(el$){
// el$.stop('clearQueue','gotoEnd');
- el$.find('> ul').show().addClass('open');
- }
+ el$.find('> ul').show().addClass('open');
+ }
- function fadeOutNav(el$){
+ function fadeOutNav(el$){
// el$.stop('clearQueue','gotoEnd');
- el$.find('> ul').hide().removeClass('open');
- }
-
- // give menus with submenus a class of 'more'
- main_nav$.find('li ul, li li ul').closest('li').addClass('more');
- main_nav$.find('li li ul').addClass('subnav');
-
- // no fancy fades on hover
- main_nav$.find('li.more').on('mouseover',
- function(){
- var li$ = $(this);
- fadeInNav(li$);
- //jq('#main_nav li').removeClass('open');
- li$.find('ul.subnav').each(function(){
- var sub$ = $(this);
- var offsetL = sub$.closest('ul').outerWidth();
- sub$.css({'left': offsetL + -25})
- });
- if (body$.hasClass('applet')) {
- coverApplet(li$.find('> ul'));
- }
+ el$.find('> ul').hide().removeClass('open');
+ }
+
+ // give menus with submenus a class of 'more'
+ main_nav$.find('li ul, li li ul').closest('li').addClass('more');
+ main_nav$.find('li li ul').addClass('subnav');
+
+ // no fancy fades on hover
+ main_nav$.find('li.more').on('mouseover',
+ function(){
+ var li$ = $(this);
+ fadeInNav(li$);
+ //jq('#main_nav li').removeClass('open');
+ li$.find('ul.subnav').each(function(){
+ var sub$ = $(this);
+ var offsetL = sub$.closest('ul').outerWidth();
+ sub$.css({'left': offsetL + -25})
+ });
+ if (body$.hasClass('applet')) {
+ coverApplet(li$.find('> ul'));
}
- ).on('mouseout',
- function(){
- var li$ = $(this);
- fadeOutNav(li$);
- if (body$.hasClass('applet')) {
- unCoverApplets(li$.find('> ul'));
- }
+ }
+ ).on('mouseout',
+ function(){
+ var li$ = $(this);
+ fadeOutNav(li$);
+ if (body$.hasClass('applet')) {
+ unCoverApplets(li$.find('> ul'));
}
- );
+ }
+ );
- // clicking the "Logout" link sets the warning bar cookie to 'OPEN' so it's available if needed on next login
- jq('#logout_user').click(function(){
- Cookies.set('WARNING_BAR', 'OPEN', {path: '/'});
- Cookies.set('NOTIFICATION_MESSAGE', 'OPEN', {path: '/'});
- });
+ // clicking the "Logout" link sets the warning bar cookie to 'OPEN' so it's available if needed on next login
+ jq('#logout_user').click(function(){
+ Cookies.set('WARNING_BAR', 'OPEN', {path: '/'});
+ Cookies.set('NOTIFICATION_MESSAGE', 'OPEN', {path: '/'});
+ });
- })();
- </script>
- <!-- end main_nav interactions -->
+ })();
+</script>
+<!-- end main_nav interactions -->
+
+<div id="page_wrapper">
<div id="header" class="main_header">
<div class="pad">
diff --git a/src/main/webapp/style/app.css b/src/main/webapp/style/app.css
index e5c446c785f0b33cb947ea4562fef5e8bcecaeb5..f189a70137fcdfd6bfde61be009803cf69185c9f 100644
--- a/src/main/webapp/style/app.css
+++ b/src/main/webapp/style/app.css
@@ -909,7 +909,7 @@ body,
html body,
* body {
margin: 0;
- background: #f0f0f0;
+ background: #fff;
font-family: Arial, Helvetica, sans-serif !important;
font-size: 12px;
line-height: 15px;
@@ -1266,6 +1266,11 @@ span.sep {
background: #033769;
}
+#user_bar > .inner {
+ width: 1160px;
+ margin: 0 auto;
+}
+
#user_bar.no_menu {
/*width: 100%;*/
}
@@ -1683,44 +1688,54 @@ div.containerTitle.withColor {
border-bottom: 1px solid #033769;
}
+#main_nav > .inner {
+ width: 1160px;
+ margin: 0 auto;
+ position: relative;
+}
+
#main_nav.hidden {
overflow: hidden;
}
-#main_nav > ul li {
+#main_nav ul.nav li {
float: left;
display: block;
position: relative;
}
-#main_nav > ul,
-#main_nav > ul ul {
+#main_nav ul.nav,
+#main_nav ul.nav ul {
margin: 0;
padding: 0;
list-style: none;
/*background: #fff;*/
}
-#main_nav > ul a {
+#main_nav ul.nav a {
display: block;
text-decoration: none;
vertical-align: middle;
white-space: nowrap;
}
-#main_nav > ul a:hover {
+#main_nav ul.nav a:hover {
cursor: pointer !important;
}
-#main_nav > ul > li {
+#main_nav ul.nav > li {
border-right: 1px solid #033769;
}
+#main_nav ul.nav > li:first-of-type {
+ border-left: 1px solid #033769;
+}
+
/*#main_nav li:hover {*/
/*!*background: url('../images/nav_bkgd_hover.png') center center repeat-x;*!*/
/*}*/
-#main_nav > ul > li > a {
+#main_nav ul.nav > li > a {
padding: 0 15px;
line-height: 40px;
background-position: right center;
@@ -1728,23 +1743,23 @@ div.containerTitle.withColor {
color: #fff;
}
-#main_nav > ul > li > a:hover {
+#main_nav ul.nav > li > a:hover {
/*color: #000;*/
background-color: #044687;
}
-#main_nav > ul > li.more > a {
+#main_nav ul.nav > li.more > a {
padding-right: 30px;
background-image: url('../images/nav_more_light.png');
}
/* second-level menus */
-#main_nav > ul > li.more > ul {
+#main_nav ul.nav > li.more > ul {
top: 40px;
}
/* all subnav */
-#main_nav > ul ul {
+#main_nav ul.nav ul {
display: none;
position: absolute;
left: 0;
@@ -1755,7 +1770,7 @@ div.containerTitle.withColor {
}
/* make sure all sub-nav menus are wide enough */
-#main_nav > ul li li {
+#main_nav ul.nav li li {
width: 100%;
}
@@ -1763,7 +1778,7 @@ div.containerTitle.withColor {
/*background: !* #D8ECFF *! !* #EDF5FF *! #e5f2ff right center no-repeat;*/
/*}*/
-#main_nav > ul li li a {
+#main_nav ul.nav li li a {
padding: 0 30px 0 15px;
line-height: 25px;
font-size: 13px;
@@ -1774,23 +1789,23 @@ div.containerTitle.withColor {
color: #222;
}
-#main_nav > ul li li a:hover {
+#main_nav ul.nav li li a:hover {
background-color: #e5f2ff;
}
-#main_nav li li.more > a {
+#main_nav ul.nav li li.more > a {
background-image: url('../images/subnav_more_light.png');
}
/* third-level menus */
-#main_nav > ul li li ul {
+#main_nav ul.nav li li ul {
display: none;
top: 0;
margin-left: -2px;
border: 1px solid #c0c0c0;
}
-#main_nav > ul ul,
+#main_nav ul.nav ul,
.shadowed {
-moz-box-shadow: 0 2px 12px rgba(96, 96, 96, 0.8);
-webkit-box-shadow: 0 2px 12px rgba(96, 96, 96, 0.8);
@@ -3468,7 +3483,9 @@ hr.light {
@media screen and (max-width: 1200px) {
#page_wrapper,
- #xnat_power {
+ #xnat_power,
+ #main_nav > .inner,
+ #user_bar > .inner {
width: 960px;
}
diff --git a/src/main/webapp/xnat-templates/navigations/DefaultTop.vm b/src/main/webapp/xnat-templates/navigations/DefaultTop.vm
index 6b94dca32e5b3e1e9da5a9791c52897dd2e55dd1..23999a8d7bd7e3173bedf15443943b89f51b05b7 100644
--- a/src/main/webapp/xnat-templates/navigations/DefaultTop.vm
+++ b/src/main/webapp/xnat-templates/navigations/DefaultTop.vm
@@ -47,6 +47,8 @@
</div>
</div><!-- /user_bar -->
+<script src="$content.getURI("scripts/timeLeft.js")"></script>
+
#if ($sessionCount > 1 || $sessionIpCount > 1 )
##If you want fewer warnings, you can eliminate $sessionCount > 1 so it will not display a warning for multiple sessions on the same IP, or increase it to $sessionCount > X where X is the maximum number of sessions you can have on the same IP before you get a warning.
<script type="text/javascript">
@@ -95,13 +97,15 @@
#end
<div id="main_nav">
+ <div class="inner">
- <ul class="nav">
+ <ul class="nav" style="border-left: 1px solid #033769;">
#addGlobalCustomScreens("topBar")
</ul>
$navigation.setTemplate("XNATQuickSearch.vm")
+ </div>
</div>
<!-- /main_nav -->
@@ -223,6 +227,8 @@
</script>
<!-- end main_nav interactions -->
+<div id="page_wrapper">
+
<div id="header" class="main_header"><div class="pad">
#if($siteConfig.getProperty("siteWideAlertStatus","")=="2")
@@ -322,8 +328,6 @@
</script>
-<script src="$content.getURI("scripts/timeLeft.js")"></script>
-
<div id="tp_fm"></div>
<!-- END: xnat-templates/navigations/DefaultTop.vm -->
diff --git a/src/main/webapp/xnat-templates/navigations/bodyOpen.vm b/src/main/webapp/xnat-templates/navigations/bodyOpen.vm
index 9af76d4120697a236661a16f897b4bd440350d14..3583e1feef03f01f5f2eeb7426a288c7bdf8eca8 100644
--- a/src/main/webapp/xnat-templates/navigations/bodyOpen.vm
+++ b/src/main/webapp/xnat-templates/navigations/bodyOpen.vm
@@ -2,4 +2,3 @@
## open <head> tag in htmlOpen.vm file
</head>
<body id="page_body" class="yui-skin-sam">
-<div id="page_wrapper">