-
+
- Connection failed.
+ Connection failed.
Close
+
+
+
+ Certificate Accepted.
+ Close
+
+
+
diff --git a/Myrtille.Web/Default.aspx.cs b/Myrtille.Web/Default.aspx.cs
index 33c04bc..3460831 100644
--- 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
index 3702028..226ae8e 100644
--- a/Myrtille.Web/Default.aspx.designer.cs
+++ b/Myrtille.Web/Default.aspx.designer.cs
@@ -409,22 +409,22 @@ public partial class Default {
protected global::System.Web.UI.HtmlControls.HtmlInputButton disconnect;
///
- /// certificateDiv control.
+ /// loadingDiv control.
///
///
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
///
- protected global::System.Web.UI.HtmlControls.HtmlGenericControl certificateDiv;
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl loadingDiv;
///
- /// loadingDiv control.
+ /// certificateDiv control.
///
///
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
///
- protected global::System.Web.UI.HtmlControls.HtmlGenericControl loadingDiv;
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl certificateDiv;
///
/// remoteOperationsDivWrap control.
diff --git a/Myrtille.Web/css/securden.css b/Myrtille.Web/css/securden.css
index 5a5fa21..b0f59e7 100644
--- 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
index f8922f6..efef9c0 100644
--- 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;
}