Browse Source

Update _Layout.cshtml files in Identity.API, WebMVC and WebStatus projects to use correct jquery script

pull/735/head
rafsanulhasan 6 years ago
parent
commit
71b3121ce7
3 changed files with 50 additions and 34 deletions
  1. +46
    -30
      src/Services/Identity/Identity.API/Views/Shared/_Layout.cshtml
  2. +2
    -2
      src/Web/WebMVC/Views/Shared/_Layout.cshtml
  3. +2
    -2
      src/Web/WebStatus/Views/Shared/_Layout.cshtml

+ 46
- 30
src/Services/Identity/Identity.API/Views/Shared/_Layout.cshtml View File

@ -18,38 +18,54 @@
</environment> </environment>
</head> </head>
<body> <body>
<div class="navbar navbar-inverse navbar-fixed-top es-header">
<div class="container">
<div class="row">
<div class="navbar-header col-sm-6 col-xs-8">
<a asp-controller="home" asp-action="ReturnToOriginalApplication" asp-route-returnUrl="@ViewData["ReturnUrl"]">
<div class="navbar-brand"></div>
</a>
</div>
</div>
</div>
</div>
<div class="navbar navbar-inverse navbar-fixed-top es-header">
<div class="container">
<div class="row">
<div class="navbar-header col-sm-6 col-xs-8">
<a asp-controller="home" asp-action="ReturnToOriginalApplication" asp-route-returnUrl="@ViewData["ReturnUrl"]">
<div class="navbar-brand"></div>
</a>
</div>
</div>
</div>
</div>
<div>
@RenderBody()
<br /><br />
<footer>
<div class="container">
<div class="row">
<div class="col-sm-6">
<br><div class="brand"></div>
</div>
<div class="col-sm-6">
<img class="text hidden-xs" src="~/images/main_footer_text.PNG" width="335" height="26" alt="footer text image" />
</div>
</div>
</div>
</footer>
</div>
<div>
@RenderBody()
<br /><br />
<footer>
<div class="container">
<div class="row">
<div class="col-sm-6">
<br><div class="brand"></div>
</div>
<div class="col-sm-6">
<img class="text hidden-xs" src="~/images/main_footer_text.PNG" width="335" height="26" alt="footer text image" />
</div>
</div>
</div>
</footer>
</div>
<script src="~/lib/jquery/jquery.js"></script>
<script src="~/lib/bootstrap/dist/js/bootstrap.js"></script>
@RenderSection("scripts", required: false)
<environment names="Development">
<script src="~/lib/jquery/jquery.js"></script>
<script src="~/lib/bootstrap/dist/js/bootstrap.js"></script>
</environment>
<environment names="Staging,Production">
<script src="https://ajax.aspnetcdn.com/ajax/jquery/jquery-2.2.0.min.js"
asp-fallback-src="~/lib/jquery/jquery.min.js"
asp-fallback-test="window.jQuery"
crossorigin="anonymous"
integrity="sha384-K+ctZQ+LL8q6tP7I94W+qzQsfRV2a+AfHIi9k8z8l9ggpc8X+Ytst4yBo/hH+8Fk">
</script>
<script src="https://ajax.aspnetcdn.com/ajax/bootstrap/3.3.7/bootstrap.min.js"
asp-fallback-src="~/lib/bootstrap/dist/js/bootstrap.min.js"
asp-fallback-test="window.jQuery && window.jQuery.fn && window.jQuery.fn.modal"
crossorigin="anonymous"
integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa">
</script>
</environment>
@RenderSection("scripts", required: false)
</body> </body>
</html> </html>

+ 2
- 2
src/Web/WebMVC/Views/Shared/_Layout.cshtml View File

@ -69,13 +69,13 @@
</footer> </footer>
<environment names="Development"> <environment names="Development">
<script src="~/lib/jquery/dist/jquery.js"></script>
<script src="~/lib/jquery/jquery.js"></script>
<script src="~/lib/bootstrap/dist/js/bootstrap.js"></script> <script src="~/lib/bootstrap/dist/js/bootstrap.js"></script>
<script src="~/js/site.js" asp-append-version="true"></script> <script src="~/js/site.js" asp-append-version="true"></script>
</environment> </environment>
<environment names="Staging,Production"> <environment names="Staging,Production">
<script src="https://ajax.aspnetcdn.com/ajax/jquery/jquery-2.2.0.min.js" <script src="https://ajax.aspnetcdn.com/ajax/jquery/jquery-2.2.0.min.js"
asp-fallback-src="~/lib/jquery/dist/jquery.min.js"
asp-fallback-src="~/lib/jquery/jquery.min.js"
asp-fallback-test="window.jQuery"> asp-fallback-test="window.jQuery">
</script> </script>
<script src="https://ajax.aspnetcdn.com/ajax/bootstrap/3.3.7/bootstrap.min.js" <script src="https://ajax.aspnetcdn.com/ajax/bootstrap/3.3.7/bootstrap.min.js"


+ 2
- 2
src/Web/WebStatus/Views/Shared/_Layout.cshtml View File

@ -51,12 +51,12 @@
<environment names="Development"> <environment names="Development">
<script src="~/lib/jquery/dist/jquery.js"></script>
<script src="~/lib/jquery/jquery.js"></script>
<script src="~/lib/bootstrap/dist/js/bootstrap.js"></script> <script src="~/lib/bootstrap/dist/js/bootstrap.js"></script>
</environment> </environment>
<environment names="Staging,Production"> <environment names="Staging,Production">
<script src="https://ajax.aspnetcdn.com/ajax/jquery/jquery-2.2.0.min.js" <script src="https://ajax.aspnetcdn.com/ajax/jquery/jquery-2.2.0.min.js"
asp-fallback-src="~/lib/jquery/dist/jquery.min.js"
asp-fallback-src="~/lib/jquery/jquery.min.js"
asp-fallback-test="window.jQuery" asp-fallback-test="window.jQuery"
crossorigin="anonymous" crossorigin="anonymous"
integrity="sha384-K+ctZQ+LL8q6tP7I94W+qzQsfRV2a+AfHIi9k8z8l9ggpc8X+Ytst4yBo/hH+8Fk"> integrity="sha384-K+ctZQ+LL8q6tP7I94W+qzQsfRV2a+AfHIi9k8z8l9ggpc8X+Ytst4yBo/hH+8Fk">


Loading…
Cancel
Save