Merge branch 'dev' into module_blog

resources/assets/admin/css/vendor.css

@@ -9520,11 +9520,11 @@ pre code {
 	border-bottom-width: 2px;
 }
 
-.table-striped tbody tr:nth-of-type(odd) {
+.table-striped tbody tr:nth-of-type(odd), .rows-striped .row:nth-of-type(odd) {
 	background-color: #F9F9F9;
 }
 
-.table-hover tbody tr:hover {
+.table-hover tbody tr:hover, .rows-striped .row:hover {
 	background-color: #F5F5F5;
 }
 
@@ -14168,7 +14168,7 @@ img {
 }
 
 .users-list img {
-	border-radius: 500px;
+	border-radius: 50%;
 	padding: 3px;
 }
 
@@ -14191,7 +14191,6 @@ img {
 
 .timeline > li {
 	position: relative;
-
 }
 
 .timeline > li:before,
@@ -14204,7 +14203,6 @@ img {
 	clear: both;
 }
 
-
 .timeline > li > .timeline-panel {
 	width: 46%;
 	float: left;
@@ -14250,7 +14248,7 @@ img {
 	top: 26px;
 	left: 50%;
 	margin-left: -14px;
-	background-color: #ddd;
+	background-color: #DDD;
 	z-index: 100;
 	border-radius: 50%;
 }
@@ -14349,6 +14347,7 @@ img {
 .ace-editor-container {
 	position: relative;
 }
+
 .ace-editor {
 	position: absolute !important;
 	width: 100%;
@@ -14367,4 +14366,20 @@ img {
 
 .header-block img {
 	margin-right: 10px;
+}
+
+.truncate {
+	width: 90%;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+
+.bold {
+	font-weight: bold;
+}
+
+.p-tb-15 {
+	padding-top: 15px;
+	padding-bottom: 15px;
 }

resources/assets/admin/js/app.js

@@ -1346,7 +1346,6 @@ $ (function () {
 
 });
 
-
 $ (function () {
 
 	$ ("body").addClass ("loaded");
@@ -1364,7 +1363,6 @@ $ (function () {
 	}
 });
 
-
 /**
  * Makes slug from input string
  *
@@ -1401,24 +1399,45 @@ function slugify(text, trimSpaces) {
 
 // bind some custom methods
 $ (document).ready (function () {
-	$ ('.confirm').click (function () {
-		var confirmMessage = $ (this).data ('confirm-message');
+	var previousTitle, previousMessage;
 
-		// set some default message
-		if (typeof confirmMessage == 'undefined') {
-			confirmMessage = 'Really?';
-		}
+	$ ('.confirm').click (function (e) {
 
-		return confirm (confirmMessage);
+		var titleElement = $ ('#confirmation-title');
+		var messageElement = $ ('#confirmation-message');
+
+		previousTitle = titleElement.text ();
+		previousMessage = messageElement.text ();
+
+		var confirmTitle = $ (this).data ('title');
+		var confirmMessage = $ (this).data ('message');
+		var href = $ (this).attr ('href');
+
+		$ ('#confirm-button').attr ('href', href);
+
+		if (confirmTitle)
+			titleElement.text (confirmTitle);
+
+		if (confirmMessage)
+			messageElement.text (confirmMessage);
+
+		$ ('#confirm-modal').modal ('show');
+
+		e.preventDefault ();
 	});
 
-	$('#lockUrl').change(function () {
+	$ ('#confirm-modal').on ('hidden.bs.modal', function () {
+		$ ('#confirmation-title').text (previousTitle);
+		$ ('#confirmation-message').text (previousMessage);
+	});
+
+	$ ('#lockUrl').change (function () {
 		$ ('.slug-source').keyup ();
 	});
 
 	$ ('.slug-target').keyup (function () {
 		$ (this).val (slugify ($ (this).val (), false));
-		$('#lockUrl').prop('checked', true);
+		$ ('#lockUrl').prop ('checked', true);
 	});
 
 	$ ('.slug-source').keyup (function () {
@@ -1430,22 +1449,19 @@ $ (document).ready (function () {
 			target.val (slugify (source.val (), true));
 	});
 
-	$(function () {
-		$('[data-toggle="tooltip"]').tooltip()
-	})
+	$ (function () {
+		$ ('[data-toggle="tooltip"]').tooltip ()
+	});
 
 	// find if any error occured and mark tab with that error
-	$('.has-error').each(function () {
-		var error = $(this);
-		var tabCard = error.closest('.tab-pane');
+	$ ('.has-error').each (function () {
+		var error = $ (this);
+		var tabCard = error.closest ('.tab-pane');
 
-		$("#"+tabCard.prop('id')+"-tab").addClass('tab-with-error');
+		$ ("#" + tabCard.prop ('id') + "-tab").addClass ('tab-with-error');
 	});
 });
 
-
-
-
 /***********************************************
  *        NProgress Settings
  ***********************************************/