jessikitty/Disco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update: Move Layout JS to Core JS Bundle

Browse Source
This commit is contained in:
Gary Sharp
2013-07-25 17:48:08 +10:00
parent 19503366c4
commit cb30257c59
7 changed files with 173 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Web/Views/Shared/_Layout.cshtml
+1 -40
View File
@@ -23,24 +23,7 @@
</div>
<div id="headerMenu">
<span>Welcome @Html.ActionLink(DiscoApplication.CurrentUser.ToString(), MVC.User.Show(DiscoApplication.CurrentUser.Id))</span>
@using (Html.BeginForm(MVC.Search.Query(), FormMethod.Get))
{
@Html.TextBox("term", null, new { accesskey = "s" })
<script type="text/javascript">
//<!--
$(function () {
$('#term').watermark('Search').keypress(function (e) {
if (e.keyCode == 13) {
$(this).closest('form').submit();
}
}).focus(function () {
$(this).select();
});
});
//-->
</script>
}
@using (Html.BeginForm(MVC.Search.Query(), FormMethod.Get)) { @Html.TextBox("term", null, new { accesskey = "s" }) }
</div>
</div>
<nav>
@@ -71,28 +54,6 @@
<li class="sep"></li>
<li>@Html.ActionLink("Configuration", MVC.Config.Config.Index(), accesskey: "0")</li>
</ul>
<script type="text/javascript">
$(function () {
var $menu = $('#menu');
$menu.find('li').each(function () {
var $menuItem = $(this);
var $subMenu = $menuItem.children('ul').first();
var subMenuHideToken = null;
if ($subMenu.length > 0) {
$menuItem.mouseover(function () {
if (subMenuHideToken)
window.clearTimeout(subMenuHideToken);
if (!$subMenu.is(':visible'))
$subMenu.show();
}).mouseout(function () {
subMenuHideToken = window.setTimeout(function () {
$subMenu.hide();
}, 250);
}).addClass('hasSubmenu');
};
});
});
</script>
</nav>
</header>
<div id="layout_PageHeading">@CommonHelpers.Breadcrumbs(ViewBag.Title ?? string.Empty)</div>