Changeset 13739 for branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views

Timestamp:

03/29/16 17:02:16 (8 years ago)

Author:

jlodewyc

Message:

#2582 Overhaul Login service, done

Location:

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views

Files:

• Job/Index.cshtml (modified) (2 diffs)
• Job/OpenFile.cshtml (modified) (3 diffs)
• Job/UploaderPartial/_UploaderPartial.cshtml (modified) (6 diffs)
• Job/Uploads.cshtml (modified) (1 diff)
• Shared/_Layout.cshtml (modified) (2 diffs)

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Job/Index.cshtml

@@ -1 +1 @@
 @using HeuristicLab.Clients.Hive.WebJobManager.ViewModels
 @model JobViewModel
-
+<div id="userId" style="display:none">@ViewBag.SessionId</div>
 <div>
     @Html.Partial("Navbar", new NavbarViewModel("Job"))
@@ -165 +165 @@
                     }
                 </div>
+                
 
         }

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Job/OpenFile.cshtml

@@ -1 @@
-@model HeuristicLab.Clients.Hive.WebJobManager.ViewModels.FileOpeningViewModel
+@using Microsoft.AspNet.Http;
+
+@model HeuristicLab.Clients.Hive.WebJobManager.ViewModels.FileOpeningViewModel
 
 
@@ -9 +11 @@
       onscroll="showScrolly()"
       style="margin-bottom:500px;margin-left:1px;margin-right:1px;">
-
+    <div id="userId" style="display:none">@ViewBag.SessionId</div>
     @Html.Partial("Navbar", new HeuristicLab.Clients.Hive.WebJobManager.ViewModels.NavbarViewModel("Job"))
 
@@ -181 +183 @@
         </ul>
     </nav>
+    
     <script src="~/js/scripts/hubber.js"></script>
     <script>

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Job/UploaderPartial/_UploaderPartial.cshtml

@@ -25 +25 @@
         <div class="row" style="margin:10px">
 
-            <div id="selectedfiles"></div>
+            <div id="selectedfiles">
+            <h3>Files</h3>
+            <p>No files selected: press the above button to choose files</p>
+            </div>
 
-            <div style="display:none; margin-bottom:10px; box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
+            <button style="margin-bottom:10px; box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
                             text-shadow:2px 2px black;"
+                 type="button"
+                    disabled
                  id="del"
                  class='btn btn-danger'
@@ -34 +39 @@
                 <span class='glyphicon glyphicon-trash' aria-hidden='true'></span>
                 Remove files
-            </div>
+            </button>
 
-            <div id="dir"
-                 style="display:none; margin-top:20px;margin-bottom:20px">
+            <div 
+                 style="margin-top:20px;margin-bottom:20px">
 
                 <label for="basic-url">Directory name</label>
@@ -45 +50 @@
                         .../uploads/@ViewBag.Name
                     </span>
-                    <input type="text"
+                    <input 
+                           type="text"
+                           disabled
                            class="form-control"
                            id="directory"
@@ -53 +60 @@
                 </div>
             </div>
-            <button style="display:none; box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
+            <button style=" box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
                             text-shadow:2px 2px black;"
-                   id="upl"
+                   disabled
+                    id="upl"
                    class="btn btn-lg btn-block btn-success"
                    type="submit"
@@ -70 +78 @@
         var div = document.getElementById("selectedfiles");
         var files = document.getElementById("files").files;
-        div.innerHTML = "";
+        div.innerHTML = "<h3>Files</h3>";
         if (files.length > 0) {
-            document.getElementById("upl").style.display = "";
-            document.getElementById("del").style.display = "";
-            document.getElementById("dir").style.display = "";
+            document.getElementById("upl").disabled = false;
+            document.getElementById("del").disabled = false;
+            document.getElementById("directory").disabled = false;
 
-            div.innerHTML += "<h3>Files</h3>";
+            
             for (var i = 0; i < files.length; i++) {
                 div.innerHTML += "<p>File " + (i + 1) + ":" + files[i].name +
@@ -84 +92 @@
         }
         else {
-            document.getElementById("upl").style.display = "none";
-            document.getElementById("del").style.display = "none";
-            document.getElementById("dir").style.display = "none";
+            div.innerHTML += "<p>No files selected</p>";
+            document.getElementById("upl").disabled = true;
+            document.getElementById("del").disabled = true;
+            document.getElementById("directory").disabled = true;
         }
 

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Job/Uploads.cshtml

@@ -45 +45 @@
             <div class="col-sm-4">
                 <div class="btn-group-vertical btn-block">
-                    <a class="btn btn-success btn-lg btn-block
+                    <a class="btn btn-info btn-lg btn-block disabled"
+                       style="box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
+                            text-shadow:2px 2px black;">
+                        <i class="fa fa-cloud"></i> Uploads
+                    </a>
+                    <a class="btn btn-success btn-block
                        @(Model.SelectedIndex == -1 ? "active" : "")
                        "

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Shared/_Layout.cshtml

@@ -12 +12 @@
     </environment>
     <link href="https://gitcdn.github.io/bootstrap-toggle/2.2.0/css/bootstrap-toggle.min.css" rel="stylesheet">
+    <link rel="shortcut icon" type="image/x-icon" href="~/favicon.ico" />
     <link rel="stylesheet" href="//rawgithub.com/Caged/d3-tip/master/examples/example-styles.css">
 </head>
@@ -28 +29 @@
         <script src="~/js/jquery.signalr-2.1.2.js"></script>
         <script src='~/signalr/js'></script>
-        <script src="~/js/morris.js"></script>
-        <script src="~/js/npm.js"></script>
-        <script src="~/js/raphael.js"></script>
         <script src="~/js/plotly.js"></script>
-        <script src="~/js/moment.js"></script>
-        <script src="~/js/moment-timezone-with-data.js"></script>
         <script src="~/js/d3.js"></script>
         <script src="~/js/d3.v3.min.js"></script>