v3.2.6

inc/configshow.js

@@ -5,6 +5,24 @@ $( function() {
 		heightStyle: "content",
 		icons: { "header": "ui-icon-plus", "activeHeader": "ui-icon-minus" }
 	});
+	$('#raw').click(function() {	
+		$(".configShow").accordion("destroy");
+		$('#raw').css('display', 'none');
+		$('.numRow').css('display', 'none');
+		$('#according').css('display', 'inline-block');
+		$('.accordion-expand-all').css('display', 'none');
+	});
+	$('#according').click(function() {	
+		$( ".configShow" ).accordion({
+			collapsible: true,
+			heightStyle: "content",
+			icons: { "header": "ui-icon-plus", "activeHeader": "ui-icon-minus" }
+		});
+		$('#raw').css('display', 'inline-block');
+		$('.numRow').css('display', 'inline-block');
+		$('#according').css('display', 'none');
+		$('.accordion-expand-all').css('display', 'inline-block');
+	});
 	var headers = $('.configShow .accordion-header');
 	var contentAreas = $('.configShow .ui-accordion-content ').hide()
 	.first().show().end();

inc/overview.js

@@ -80,7 +80,9 @@ $( function() {
 			$( "#show-all-users" ).text("Show all");
 		}
 	});
+	if (cur_url[0] == "overview.py" || cur_url[0] == "waf.py" || cur_url[0] == "metrics.py") {
 		$('#secIntervals').css('display', 'none');
+	}
 	$('#apply_close').click( function() {
 		$("#apply").css('display', 'none');
 		Cookies.remove('restart', { path: '' });

inc/users.js

@@ -757,6 +757,9 @@ function updateServer(id) {
 }
 function uploadSsh() {
 	$('.alert-danger').remove();
+	if ($( "#ssh-key-name option:selected" ).val() == "Choose server" || $('#ssh_cert').val() == '') {
+		$("#ajax-ssh").html('<div class="alert alert-danger" style="margin: 10px;">All fields must be completed</div>');
+	} else {
 		$.ajax( {
 			url: "options.py",
 			data: {
@@ -775,12 +778,12 @@ function uploadSsh() {
 						setTimeout(function() {
 							$( "#ajax-ssh").html( "" );
 						}, 2500 );					
-					
 					} else {
 						$("#ajax-ssh").html('<div class="alert alert-danger">Something wrong, check and try again</div>');
 					}
 			}
 		} );
+	}
 }
 function updateSSH(id) {
 	$('#error').remove();