Changeset 12931 for branches/crossvalidation-2434/HeuristicLab.Services.WebApp/3.3/WebApp/shared

Timestamp:

09/02/15 13:16:18 (9 years ago)

Author:

gkronber

Message:

#2434 merged r12878:12927 from trunk to branch (hive changes)

Location:

branches/crossvalidation-2434

Files:

• . (modified) (1 prop)
• HeuristicLab.Services.WebApp/3.3 (modified) (1 prop)
• HeuristicLab.Services.WebApp/3.3/WebApp/shared/filter/filters.js (modified) (1 diff)
• HeuristicLab.Services.WebApp/3.3/WebApp/shared/layout/layout.cshtml (modified) (3 diffs)

branches/crossvalidation-2434/HeuristicLab.Services.WebApp/3.3

@@ -1 +1 @@
 Bin
+HeuristicLab.Services.WebApp-3.3.csproj.user

@@ -1 +1 @@
 Bin
+HeuristicLab.Services.WebApp-3.3.csproj.user

branches/crossvalidation-2434/HeuristicLab.Services.WebApp/3.3/WebApp/shared/filter/filters.js

@@ -1 @@
-(function () {
+(function() {
     var module = appMainPlugin.getAngularModule();
     module.filter('kbToGB', function () {

branches/crossvalidation-2434/HeuristicLab.Services.WebApp/3.3/WebApp/shared/layout/layout.cshtml

@@ -24 +24 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta http-equiv="pragma" content="no-cache" />
     <title>HeuristicLab Hive</title>
     <link href="~/WebApp/HeuristicLab.ico" rel="shortcut icon" type="image/x-icon" />
     @Styles.Render("~/Bundles/Vendors/css")
     @Styles.Render("~/Bundles/WebApp/css")
-    <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Open+Sans:300,400,600,700">
+    <link rel="stylesheet" type="text/css" href="//fonts.googleapis.com/css?family=Open+Sans:300,400,600,700">
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
@@ -63 +64 @@
                 <div class="navbar-content">
                     <ul class="nav navbar-nav navbar-right">
-                        @if (Request.IsAuthenticated)
-                        {
+                        @if (Request.IsAuthenticated) {
                             <li>
                                 <span class="navbar-text">Hello @User.Identity.Name!</span>
                             </li>
                             <li>
-                                <a ng-href="" data-ng-click="logout()">Logout</a>
+                                <a ng-href="#" data-ng-click="logout()">Logout</a>
                             </li>
-                        }
-                        else
-                        {
+                        } else {
                             <li>
                                 <a ng-href="#/login" data-ng-click="hideMenu()">Login</a>
@@ -97 +95 @@
 </div>
 <script type="text/javascript">
-$('.navbar-collapse').on('click', 'li a', function () {
-    $('.navbar-collapse').collapse('hide');
-});
+    $('.navbar-collapse').on('click', 'li a', function () {
+        $('.navbar-collapse').collapse('hide');
+    });
 </script>
 </body>

@@ -1 +1 @@
 Bin
+HeuristicLab.Services.WebApp-3.3.csproj.user