Merge branch 'master' of github.com:Froxlor/Froxlor

templates/Sparkle/admin/configfiles/configfiles_commands.tpl

@@ -1,3 +1,3 @@
 <div class="pushbot">
-	<pre class="shell">{$commands}</pre>
+	<textarea class="shell" rows="{$numbrows}" readonly>{$commands}</textarea>
 </div>

templates/Sparkle/admin/configfiles/configfiles_file.tpl

@@ -1,7 +1,7 @@
 <div class="pushbot">
 	<fieldset class="file">
 		<legend>{$realname}</legend>
-        <pre class="shell">&dollar;EDITOR {$realname}</pre>
-        <pre class="filecontent">{$file_content}</pre>
+        <textarea class="shell" rows="1" readonly>&dollar;EDITOR {$realname}</textarea>
+        <textarea class="filecontent" rows="{$numbrows}" readonly>{$file_content}</textarea>
 	</fieldset>
 </div>

templates/Sparkle/assets/css/main.css

@@ -1465,14 +1465,21 @@ table thead th.tablesorter-headerDesc {
 	margin-bottom: 20px;
 }
 
-.shell {
+.shell, .filecontent {
 	font-family: Consolas,Monaco,Lucida Console,Liberation Mono,DejaVu Sans Mono,Bitstream Vera Sans Mono,Courier New, monospace;
-	color: #bbb;
-	background-color: #333;
 	border: 1px solid #d1d5d8;
 	border-radius: 3px; 
 	padding: 10px;
-	margin-bottom: 20px;
+	background-image: none;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+	width: 100%;
+}
+
+.shell {
+	color: #bbb;
+	background-color: #333;
 }
 
 fieldset.file {
@@ -1480,10 +1487,3 @@ fieldset.file {
 	border-radius: 3px;
 	padding: 5px;
 }
-
-.filecontent {
-	font-family: Consolas,Monaco,Lucida Console,Liberation Mono,DejaVu Sans Mono,Bitstream Vera Sans Mono,Courier New, monospace;
-	border: 1px solid #d1d5d8;
-	border-radius: 3px; 
-	padding: 10px;
-}

templates/Sparkle/assets/js/main.js

@@ -64,17 +64,7 @@ $(document).ready(function() {
 	});
 	// Enable autoselect in configfules
 	$(".shell, .filecontent").click(function() {
-		if (window.getSelection) {
-		selection = window.getSelection();
-			range = document.createRange();
-			range.selectNodeContents(this);
-			selection.removeAllRanges();
-			selection.addRange(range);
-		} else if (document.body.createTextRange) {
-			range = document.body.createTextRange();
-			range.moveToElementText(this);
-			range.select();
-		}
+		$(this).select();
 	});
 	// Height of divs fix
 	var snheight = $('#sidenavigation').height();