Merge branch 'master' into tres

Conflicts:
	include/notifier.php

view/css/mod_blocks.css

@@ -15,14 +15,18 @@
 	padding: 7px 3px 7px 10px;
 }
 
-#block-list-table th:nth-child(5),
-#block-list-table td:nth-child(5){
-	padding: 7px 3px;
+#block-list-table th:nth-child(2){
 	white-space: nowrap;
 }
 
 #block-list-table th:nth-child(6),
 #block-list-table td:nth-child(6){
+	padding: 7px 3px;
+	white-space: nowrap;
+}
+
+#block-list-table th:nth-child(7),
+#block-list-table td:nth-child(7){
 	padding: 7px 10px 7px 7px;
 	white-space: nowrap;
 }

view/css/mod_layouts.css

@@ -1,3 +1,36 @@
 #layout-editor {
 	display: none;
 }
+
+#layout-list-table {
+	width: 100%;
+}
+
+#layout-list-table th:nth-child(1){
+	padding: 7px 3px 7px 10px;
+	white-space: nowrap;
+}
+
+#layout-list-table td:nth-child(1){
+	padding: 7px 3px 7px 10px;
+}
+
+#layout-list-table th:nth-child(2){
+	white-space: nowrap;
+}
+
+#layout-list-table th:nth-child(6),
+#layout-list-table td:nth-child(6){
+	padding: 7px 3px;
+	white-space: nowrap;
+}
+
+#layout-list-table th:nth-child(7),
+#layout-list-table td:nth-child(7){
+	padding: 7px 10px 7px 7px;
+	white-space: nowrap;
+}
+
+.webpage-list-tool {
+	padding: 7px 10px;
+}

view/css/mod_webpages.css

@@ -15,6 +15,10 @@
 	padding: 7px 3px 7px 10px;
 }
 
+#webpage-list-table th:nth-child(2){
+	white-space: nowrap;
+}
+
 #webpage-list-table th:nth-child(7),
 #webpage-list-table td:nth-child(7){
 	padding: 7px 3px;