Text changes + clipboard style modified.

cedrozor · May 4, 2020 · 506842e · 506842e
1 parent 7333459
commit 506842e
Show file tree

Hide file tree

Showing 5 changed files with 63 additions and 21 deletions.
diff --git a/Myrtille.Web/Default.aspx b/Myrtille.Web/Default.aspx
@@ -329,29 +329,29 @@
                   <label>●</label>
                   <label>●</label>
                 </div>
-                <div class="loading-text">Loading</div>
+                <div class="loading-text">Launching Connection</div>
             </div>
         </div>
 
         <div class="container webrdp-container-body" style="display:none;" id="errorMessageDialogEle">
             <div id="status" class="dialog-message-div">
             <span id="webrdp-error-icon" class="webrdp-error-icon"></span>
-            <span id="webrdp-error-text" class="webrdp-dialog-message-text">Connection failed.</span>
+            <span id="webrdp-error-text" class="webrdp-dialog-message-text">Unable to establish a connection. Possible reasons: Invalid credentials or remote machine is not reachable.</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-dialog-message-text">Certificate validated. You can launch web-based RDP connections.</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>
+            <div id="remoteOperationsHeader" title="Click to drag"><p>. . .</p><p>. . .</p></div>
             <div class="remote-oper-label-text" onclick="sendCtrlAltDel();">Ctrl+Alt+Delete</div>
             <div class="remote-oper-label-text" onclick="openPopup('pasteClipboardPopup', 'PasteClipboard.aspx');">Clipboard</div>
             <div class="remote-oper-label-text" onclick="disconnectSession();">Disconnect</div>

diff --git a/Myrtille.Web/css/securden.css b/Myrtille.Web/css/securden.css
@@ -1,4 +1,4 @@
-.web-rdp-session-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"
 }
 
@@ -227,7 +227,6 @@ span.webrdp-dialog-message-text {
     position: absolute;
     z-index: 1000;
     text-align: center;
-    border: 1px solid #d3d3d3;
     width: 125px;
     top: 10px;
     opacity: .6;
@@ -240,15 +239,13 @@ span.webrdp-dialog-message-text {
     }
 
 #remoteOperationsHeader {
-    padding: 0 0 1px 0;
     cursor: move;
     z-index: 10;
     background-color: #2196F3;
     color: #fff;
     float: left;
-    height: 19px;
+    height: 21px;
     box-sizing: border-box;
-    margin-top: -1px;
     width: 100%;
     border-bottom: 1px solid #eee;
 }
@@ -279,3 +276,44 @@ span.webrdp-dialog-message-text {
         color: #ffffff;
         background-color: #2096f3;
     }
+
+.remote-clip-span {
+    font-weight: normal !important;
+    height: 50px;
+    display: block;
+    line-height: 50px;
+    box-sizing: border-box;
+    font-size: 14px;
+    text-align: center;
+}
+
+.remote-clip-input {
+    resize: none;
+    width: 520px !important;
+    margin-left: 12px;
+}
+
+.remote-clip-button {
+    float: left;
+    margin: 8px 5px 5px;
+    font-size: 14px;
+    font-weight: bold;
+    border-radius: 2px;
+    cursor: pointer;
+    padding: 5px 15px;
+}
+
+    .remote-clip-button.remote-clip-copy {
+        background-color: #2196F3;
+        margin-left: 210px;
+    }
+
+    .remote-clip-button.remote-clip-close {
+        background-color: #d5d5d5;
+        color: #666;
+    }
+
+#pasteClipboardPopup {
+    width: 550px !important;
+    height: 260px !important;
+}
diff --git a/Myrtille.Web/js/securden.js b/Myrtille.Web/js/securden.js
@@ -79,7 +79,7 @@ function onSessionDisconnection() {
 }
 
 function disconnectSession() {
-    if (confirm("Do you want to disconnect the session? Note: The session won't be logged off.")) {
+    if (confirm("Do you want to disconnect? The remote session will be simply disconnected and not logged out.")) {
         doDisconnect();
     }
 }
@@ -89,7 +89,7 @@ function closeTab() {
     window.close();
     hideLoadingDiv();
     hideRemoteOperationsDiv();
-    showErrorMessage("Unexpected Error.", true);
+    setTimeout(function () { showErrorMessage("Unexpected Error.", true); }, 1000);
 }
 
 function dragElement(elmnt) {
@@ -126,8 +126,8 @@ function dragElement(elmnt) {
         pos4 = e.clientY;
         // set the element's new position:
         var topPixel = (elmnt.offsetTop - pos2)
-        if (topPixel > (clientHeight - 143)) {
-            topPixel = clientHeight - 143;
+        if (topPixel > (clientHeight - 145)) {
+            topPixel = clientHeight - 145;
         } else if (topPixel < 0) {
             topPixel = 0;
         }

diff --git a/Myrtille.Web/popups/CopyClipboard.aspx b/Myrtille.Web/popups/CopyClipboard.aspx
@@ -73,7 +73,7 @@
                             // working on Edge and every other browsers
                             if (!parent.getMyrtille().getDisplay().isIEBrowser())
                             {
-                                alert('clipboard successfully synchronized');
+                                alert('Text copied from the clipboard of the remote computer.');
                             }
                             else
                             {

diff --git a/Myrtille.Web/popups/PasteClipboard.aspx b/Myrtille.Web/popups/PasteClipboard.aspx
@@ -26,6 +26,8 @@
     <head>
         <title>Myrtille</title>
         <link rel="stylesheet" type="text/css" href="../css/Default.css"/>
+        <link rel="stylesheet" type="text/css" href="../css/securden.css"/>
+
         <script language="javascript" type="text/javascript" src="../js/tools/convert.js"></script>
 	</head>
 
@@ -34,13 +36,15 @@
         <form method="get" runat="server">
 
             <div>
-                <span id="pasteClipboardPopupDesc">
-                    Type or paste some text then click send
-                </span><hr/>
-                <textarea id="pasteClipboardPopupText" rows="10" cols="50"></textarea><br/>
+                <span id="pasteClipboardPopupDesc" class="remote-clip-span">
+                    Type or paste the content to be copied to the clipboard of the remote computer.
+                </span>
+                <textarea id="pasteClipboardPopupText" rows="10" cols="50" class="remote-clip-input"></textarea><br/>
                 <!--<input type="button" id="pasteClipboardButton" value="Paste" onclick="pasteClipboard();"/>-->
-                <input type="button" id="sendClipboardButton" value="Send" onclick="sendClipboard();"/>
-                <input type="button" id="closePopupButton" value="Close" onclick="parent.closePopup();"/>
+                <!--<input type="button" id="sendClipboardButton" value="Copy" onclick="sendClipboard();"/>-->
+                <!--<input type="button" id="closePopupButton" value="Close" onclick="parent.closePopup();"/>-->
+                <div id="sendClipboardButton" onclick="sendClipboard();" class="remote-clip-button remote-clip-copy">Copy</div>
+                <div id="closePopupButton" onclick="parent.closePopup();" class="remote-clip-button remote-clip-close">Close</div>
             </div>
 
         </form>
@@ -102,7 +106,7 @@
                             // working on Edge and every other browsers
                             if (!parent.getMyrtille().getDisplay().isIEBrowser())
                             {
-                                alert('clipboard successfully synchronized');
+                                alert('Text copied to the clipboard of the remote computer.');
                             }
                             else
                             {