diff --git a/src/main/webapp/WEB-INF/tags/page/xnat.tag b/src/main/webapp/WEB-INF/tags/page/xnat.tag
index 1563b31f337f0cde35edd01cba59b554e3c1a1ce..56bb7a7fcc02197803449ddee01cf1353eb09443 100644
--- a/src/main/webapp/WEB-INF/tags/page/xnat.tag
+++ b/src/main/webapp/WEB-INF/tags/page/xnat.tag
@@ -59,7 +59,7 @@
<!-- required libraries -->
<script src="${SITE_ROOT}/scripts/lib/loadjs/loadjs.js"></script>
<script src="${SITE_ROOT}/scripts/lib/jquery/jquery.js"></script>
- <script src="${SITE_ROOT}/scripts/lib/jquery/jquery-migrate-1.2.1.min.js"></script>
+ <script src="${SITE_ROOT}/scripts/lib/jquery/jquery-migrate.js"></script>
<script type="text/javascript">
// use 'jq' to avoid _possible_ conflicts with Velocity
var jq = jQuery;
@@ -144,7 +144,7 @@
</script>
<script type="text/javascript">
// initialize "Chosen" menus on DOM load
- // all <select class="chosen-menu"> elements
+ // all <select class="xnat-menu"> elements
// will be converted
// putting this here to be at the top of
// the jQuery DOM-ready queue
@@ -272,6 +272,30 @@ ${bodyTop}
});
</script>
</li>
+ <!-- Sequence: 11 -->
+ <li><a id="browse" title="Browse" href="#Browse">Browse</a>
+ <ul class="" style="display:none; min-width: 120px;">
+ <!-- Browse/Default -->
+ <li><a href="#BrowseProjects">Projects</a>
+ <ul id="browse-projects">
+ <!-- Sequence: 10 -->
+ <li class="create-project hidden"><a href="${SITE_ROOT}/app/template/XDATScreen_add_xnat_projectData.vm">Project</a></li>
+ </ul>
+ </li>
+ <li class="hidden"><a href="#FavoriteProjects">Favorite Projects</a>
+ <ul id="favorite-projects">
+ <!-- Sequence: 10 -->
+ </ul>
+ </li>
+ <li class="hidden"><a href="#BrowseData">Data</a>
+ <ul id="browse-data">
+ <!-- Sequence: 10 -->
+ </ul>
+ </li>
+
+ <script src="${SITE_ROOT}/scripts/xnat/ui/topnav-browse.js"></script>
+ </ul>
+ </li>
<!-- Sequence: 20 -->
<li class="more"><a href="#new">New</a>
<ul class="" style="display: none;">
@@ -332,13 +356,13 @@ ${bodyTop}
<!-- Sequence: 10 -->
<!-- allowGuest: true -->
<li>
- <a href="https://wiki.xnat.org/display/XNAT16/XNAT+Desktop" target="_blank">XNAT Desktop (XND)</a>
+ <a href="https://wiki.xnat.org/display/XTOOLS/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>
+ <a href="http://nrg.wustl.edu/software/dicom-browser/" target="_blank">DICOM Browser</a>
</li>
<li>
- <a href="https://wiki.xnat.org/display/XNAT16/XNAT+Client+Tools" target="_blank">Command Prompt Tools</a>
+ <a href="https://wiki.xnat.org/display/XTOOLS" target="_blank">Command Prompt Tools</a>
</li>
</ul>
</li>
@@ -515,8 +539,8 @@ ${bodyTop}
//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 + -37 })
+ var offsetL = sub$.closest('li').width();
+ sub$.css({ 'left': offsetL });
});
if (body$.hasClass('applet')) {
coverApplet(li$.find('> ul'));
@@ -625,7 +649,7 @@ ${bodyTop}
// update the radio buttons/checkboxes
searchMethodInputs$.prop('checked', false);
searchMethodInputs$.filter('.' + method).prop('checked', true);
- chosenUpdate();
+ menuUpdate();
});
};
@@ -684,16 +708,48 @@ ${bodyTop}
<div id="mylogger"></div>
</div>
<!-- /page_wrapper -->
-
-<div id="xnat_power">
- <a target="_blank" href="http://www.xnat.org/" style="" title="XNAT Version 1.7"><img
- src="${SITE_ROOT}/images/xnat_power_small.png"></a>
- <small>version 1.7</small>
-</div>
+<div class="clear"></div>
+<div id="xnat_power"></div>
<script type="text/javascript">
- loadjs(scriptUrl('xnat/event.js'), function(){
+ (function(){
+
+ <c:import url="/xapi/siteConfig/buildInfo" var="buildInfo" scope="session"/>
+
+ var buildInfo = XNAT.data.siteConfig.buildInfo = ${buildInfo};
+
+ var buildInfoSample = {
+ "Application-Name": "XNAT",
+ "Manifest-Version": "1.0",
+ buildDate: "Sun Jun 05 12:41:24 CDT 2016",
+ buildNumber: "Manual",
+ commit: "v275-gd2220fd",
+ version: "1.7.0-SNAPSHOT"
+ };
+
+ XNAT.version = buildInfo.version;
+
+ // add version to title attribute of XNAT logos
+ var version = buildInfo.version + " build: " + buildInfo.buildNumber;
+
+ var isNonRelease = /.*(SNAPSHOT|BETA|RC).*/i.test(buildInfo.version);
+
+ if (isNonRelease) {
+ version += " (" + buildInfo.commit + ")";
+ }
+
+ $('#xnat_power')
+ .spawn('a.xnat-version', {
+ href: 'http://www.xnat.org',
+ target: '_blank',
+ title: 'XNAT version ' + version
+ }, [['img|src=${SITE_ROOT}/images/xnat_power_small.png']])
+ .spawn('small', 'version ' + version + (isNonRelease ? '<br>' + buildInfo.buildDate : ''));
+
+ $('#header_logo').attr('title','XNAT version ' + version);
+
+ XNAT.app.version = version ;
var clicker = XNAT.event.click('#header_logo, #xnat_power > a');
@@ -717,15 +773,10 @@ ${bodyTop}
XNAT.ui.popup(XNAT.url.rootUrl('/xapi/swagger-ui.html'));
});
- })
+ })();
</script>
-<%--<script src="${SITE_ROOT}/scripts/footer.js"></script>--%>
-
-<%--<div id="xmodal-loading" style="position:fixed;left:-9999px;top:-9999px;">--%>
- <%--<img src="${SITE_ROOT}/scripts/xmodal/loading_bar.gif" alt="loading">--%>
-<%--</div>--%>
${bodyBottom}
-</body>
\ No newline at end of file
+</body>