Style Issues Fixed.

cedrozor · May 4, 2020 · 1b74656 · 1b74656
1 parent aeabd57
commit 1b74656
Show file tree

Hide file tree

Showing 5 changed files with 79 additions and 28 deletions.
diff --git a/Myrtille.Web/Default.aspx b/Myrtille.Web/Default.aspx
@@ -67,7 +67,7 @@
 
 	</head>
 
-    <body onload="startMyrtille(
+    <body class="web-rdp-session-body" onload="startMyrtille(
         <%=(RemoteSession != null ? "'" + RemoteSession.State.ToString().ToUpper() + "'" : "null")%>,
         getToggleCookie((parent != null && window.name != '' ? window.name + '_' : '') + 'stat'),
         getToggleCookie((parent != null && window.name != '' ? window.name + '_' : '') + 'debug'),
@@ -319,10 +319,6 @@
             <input type="hidden" id="dummy_data" value=""/>
         </form>
 
-        <div runat="server" id="certificateDiv" visible="False">
-            Certificate accepted.
-        </div>
-
         <div runat="server" id="loadingDiv" visible="False">
             <div class="sec-loading-wrap">
                 <div class="sec-loading-circle">
@@ -333,18 +329,26 @@
                   <label>●</label>
                   <label>●</label>
                 </div>
-                <div class="loading-text">Loading...</div>
+                <div class="loading-text">Loading</div>
             </div>
         </div>
 
         <div class="container webrdp-container-body" style="display:none;" id="errorMessageDialogEle">
-            <div id="status" class="error-message-div">
+            <div id="status" class="dialog-message-div">
             <span id="webrdp-error-icon" class="webrdp-error-icon"></span>
-            <span id="webrdp-error-text" class="webrdp-error-text">Connection failed.</span>
+            <span id="webrdp-error-text" class="webrdp-dialog-message-text">Connection failed.</span>
             <span id="webrdp-back-home-btn" class="webrdp-back-btn" onclick="window.close();">Close</span>
             </div>
         </div>
 
+        <div runat="server" visible="False" class="container webrdp-container-body" id="certificateDiv">
+            <div class="success-message-div dialog-message-div">
+            <span class="webrdp-success-icon"></span>
+            <span class="webrdp-dialog-message-text">Certificate Accepted.</span>
+            <span class="webrdp-back-btn" onclick="disableUserClose=false; window.history.back(); window.history.back(); window.close();">Close</span>
+            </div>
+        </div>
+
         <div runat="server" id="remoteOperationsDivWrap" visible="False">
           <div runat="server" id="remoteOperationsDiv">
             <div id="remoteOperationsHeader" title="Click to move"><p>. . .</p><p>. . .</p></div>

diff --git a/Myrtille.Web/Default.aspx.cs b/Myrtille.Web/Default.aspx.cs
@@ -632,8 +632,11 @@ private bool ConnectRemoteServer()
                 }
                 else
                 {
-                    //userProfileId = (long)connectionDetails["user_profile_id"];
-                    //userSessionId = (long)connectionDetails["user_session_id"];
+                    if (connectionDetails["user_profile_id"] != null && connectionDetails["user_session_id"] != null)
+                    {
+                        userProfileId = (long)connectionDetails["user_profile_id"];
+                        userSessionId = (long)connectionDetails["user_session_id"];
+                    }
                     connectionDetails = (JObject)connectionDetails["details"];
                     loginServer = (string)connectionDetails["address"];
                     loginDomain = "";

diff --git a/Myrtille.Web/Default.aspx.designer.cs b/Myrtille.Web/Default.aspx.designer.cs
diff --git a/Myrtille.Web/css/securden.css b/Myrtille.Web/css/securden.css
@@ -1,4 +1,8 @@
-.container.webrdp-container-body {
+.web-rdp-session-body {
+    font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol"
+}
+
+.container.webrdp-container-body {
     position: relative;
     text-align: center;
 }
@@ -33,11 +37,41 @@ span.webrdp-error-icon {
         transform: rotate(45deg);
     }
 
+span.webrdp-success-icon {
+    font-size: 11px;
+    list-style-type: none;
+    padding: 0;
+    position: absolute;
+    left: 50px;
+    top: 30px;
+    height: 27px;
+    width: 27px;
+    opacity: 1;
+    border-radius: 50px;
+    background-color: #4bad20;
+}
+
+    span.webrdp-success-icon:before {
+        content: " ";
+        width: .3em;
+        height: .9em;
+        border: solid #fff;
+        border-width: 0 .3em .3em 0;
+        position: absolute;
+        left: 0.92em;
+        top: 32%;
+        margin-top: -.2em;
+        -webkit-transform: rotate(45deg);
+        -moz-transform: rotate(45deg);
+        -o-transform: rotate(45deg);
+        transform: rotate(45deg);
+    }
+
 .webrdp-back-btn:hover {
     background-color: #e92a2a;
 }
 
-.error-message-div {
+.dialog-message-div {
     z-index: 100;
     color: #fff;
     text-align: center;
@@ -54,7 +88,7 @@ span.webrdp-error-icon {
     box-shadow: 0px 0px 30px rgba(169, 169, 169, .5);
 }
 
-span.webrdp-error-text {
+span.webrdp-dialog-message-text {
     display: block;
     color: #222222;
     font-weight: 500;
@@ -70,6 +104,10 @@ span.webrdp-error-text {
     font-size: 15px;
 }
 
+.success-message-div .webrdp-back-btn {
+    background-color: #4bad20;
+}
+
 .label-text {
     float: left;
     line-height: 40px;
@@ -102,11 +140,15 @@ span.webrdp-error-text {
   margin-top: 10px;
 }
 
-.sec-loading-circle label {
-  font-size: 20px;
-  opacity: 0;
-  display:inline-block;
-}
+    .sec-loading-circle label {
+        font-size: 20px;
+        opacity: 0;
+        display: inline-block;
+        width: auto;
+        float: none;
+        margin: 0;
+    }
+
 .loading-text {
     width: 100%;
     text-align: center;
@@ -198,13 +240,13 @@ span.webrdp-error-text {
     }
 
 #remoteOperationsHeader {
-    padding: 2px 0;
+    padding: 0 0 1px 0;
     cursor: move;
     z-index: 10;
     background-color: #2196F3;
     color: #fff;
     float: left;
-    height: 24px;
+    height: 19px;
     box-sizing: border-box;
     margin-top: -1px;
     width: 100%;
@@ -215,7 +257,7 @@ span.webrdp-error-text {
         position: relative;
         float: left;
         width: 100%;
-        line-height: 7px;
+        line-height: 5px;
         padding: 0;
         margin: 0;
         letter-spacing: 3px;
@@ -227,8 +269,10 @@ span.webrdp-error-text {
     background-color: #f1f1f1;
     text-align: center;
     width: 100%;
-    font-size: 14px;
+    font-size: 13px;
     cursor: pointer;
+    color: #333333;
+    border-bottom: 1px solid #ddd;
 }
 
     .remote-oper-label-text:hover {

diff --git a/Myrtille.Web/js/securden.js b/Myrtille.Web/js/securden.js
@@ -107,8 +107,8 @@ function dragElement(elmnt) {
         pos4 = e.clientY;
         // set the element's new position:
         var topPixel = (elmnt.offsetTop - pos2)
-        if (topPixel > (clientHeight - 145)) {
-            topPixel = clientHeight - 145;
+        if (topPixel > (clientHeight - 143)) {
+            topPixel = clientHeight - 143;
         } else if (topPixel < 0) {
             topPixel = 0;
         }