From b7f6cceaea464df81fac872d2d7b863bd02746de Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Fri, 24 Apr 2015 22:37:22 +0200
Subject: provide block titles in blocklist

---
 view/css/mod_blocks.css |  8 ++++----
 view/tpl/blocklist.tpl  | 10 +++++++---
 2 files changed, 11 insertions(+), 7 deletions(-)

(limited to 'view')

diff --git a/view/css/mod_blocks.css b/view/css/mod_blocks.css
index c930f5dc8..e17d19750 100644
--- a/view/css/mod_blocks.css
+++ b/view/css/mod_blocks.css
@@ -15,14 +15,14 @@
 	padding: 7px 3px 7px 10px;
 }
 
-#block-list-table th:nth-child(5),
-#block-list-table td:nth-child(5){
+#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(6),
-#block-list-table td:nth-child(6){
+#block-list-table th:nth-child(7),
+#block-list-table td:nth-child(7){
 	padding: 7px 10px 7px 7px;
 	white-space: nowrap;
 }
diff --git a/view/tpl/blocklist.tpl b/view/tpl/blocklist.tpl
index f599aade7..f653ef59d 100644
--- a/view/tpl/blocklist.tpl
+++ b/view/tpl/blocklist.tpl
@@ -16,7 +16,8 @@
 <div id="pagelist-content-wrapper" class="section-content-wrapper-np">
 	<table id="block-list-table">
 		<tr>
-			<th width="97%">{{$name}}</th>
+			<th width="1%">{{$name}}</th>
+			<th width="94%">{{$blocktitle}}</th>
 			<th width="1%"></th>
 			<th width="1%"></th>
 			<th width="1%"></th>
@@ -28,11 +29,14 @@
 		<tr id="block-list-item-{{$item.url}}">
 			<td>
 				{{if $view}}
-				<a href="block/{{$channel}}/{{$item.title}}" title="{{$view}}">{{$item.title}}</a>
+				<a href="block/{{$channel}}/{{$item.title}}" title="{{$view}}">{{$item.name}}</a>
 				{{else}}
-				{{$item.title}}
+				{{$item.name}}
 				{{/if}}
 			</td>
+			<td>
+				{{$item.title}}
+			</td>
 			<td class="webpage-list-tool">
 				{{if $edit}}
 				<a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="icon-pencil"></i></a>
-- 
cgit v1.2.3