Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
09/21/15 16:28:38 (9 years ago)
Author:
ascheibe
Message:

#2388 merged r12878, r12879, r12883, r12885, r12913, r12914, r12925, r12932, r12961 into stable

Location:
stable
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Services.WebApp/3.3

    • Property svn:ignore
      •  

        old new  
        11Bin
         2HeuristicLab.Services.WebApp-3.3.csproj.user
  • stable/HeuristicLab.Services.WebApp/3.3/WebApp/shared/filter/filters.js

    r12546 r12962  
    1 (function () {
     1(function() {
    22    var module = appMainPlugin.getAngularModule();
    33    module.filter('kbToGB', function () {
  • stable/HeuristicLab.Services.WebApp/3.3/WebApp/shared/layout/layout.cshtml

    r12563 r12962  
    2424    <meta charset="utf-8" />
    2525    <meta name="viewport" content="width=device-width, initial-scale=1">
     26    <meta http-equiv="pragma" content="no-cache" />
    2627    <title>HeuristicLab Hive</title>
    2728    <link href="~/WebApp/HeuristicLab.ico" rel="shortcut icon" type="image/x-icon" />
    2829    @Styles.Render("~/Bundles/Vendors/css")
    2930    @Styles.Render("~/Bundles/WebApp/css")
    30     <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Open+Sans:300,400,600,700">
     31    <link rel="stylesheet" type="text/css" href="//fonts.googleapis.com/css?family=Open+Sans:300,400,600,700">
    3132    <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
    3233    <!--[if lt IE 9]>
     
    6364                <div class="navbar-content">
    6465                    <ul class="nav navbar-nav navbar-right">
    65                         @if (Request.IsAuthenticated)
    66                         {
     66                        @if (Request.IsAuthenticated) {
    6767                            <li>
    6868                                <span class="navbar-text">Hello @User.Identity.Name!</span>
    6969                            </li>
    7070                            <li>
    71                                 <a ng-href="" data-ng-click="logout()">Logout</a>
     71                                <a ng-href="#" data-ng-click="logout()">Logout</a>
    7272                            </li>
    73                         }
    74                         else
    75                         {
     73                        } else {
    7674                            <li>
    7775                                <a ng-href="#/login" data-ng-click="hideMenu()">Login</a>
     
    9795</div>
    9896<script type="text/javascript">
    99 $('.navbar-collapse').on('click', 'li a', function () {
    100     $('.navbar-collapse').collapse('hide');
    101 });
     97    $('.navbar-collapse').on('click', 'li a', function () {
     98        $('.navbar-collapse').collapse('hide');
     99    });
    102100</script>
    103101</body>
Note: See TracChangeset for help on using the changeset viewer.