webpages blocks fixes

4 files changed, 95 insertions, 24 deletions

diff --git a/view/css/mod_blocks.css b/view/css/mod_blocks.css
index 117e99068..c930f5dc8 100644
--- a/view/css/mod_blocks.css
+++ b/view/css/mod_blocks.css
@@ -1,3 +1,32 @@
 #block-editor {
 	display: none;
 }
+
+#block-list-table {
+	width: 100%;
+}
+
+#block-list-table th:nth-child(1){
+	padding: 7px 3px 7px 10px;
+	white-space: nowrap;
+}
+
+#block-list-table td:nth-child(1){
+	padding: 7px 3px 7px 10px;
+}
+
+#block-list-table th:nth-child(5),
+#block-list-table td:nth-child(5){
+	padding: 7px 3px;
+	white-space: nowrap;
+}
+
+#block-list-table th:nth-child(6),
+#block-list-table td:nth-child(6){
+	padding: 7px 10px 7px 7px;
+	white-space: nowrap;
+}
+
+.webpage-list-tool {
+	padding: 7px 10px;
+}
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index eebd1566e..28d443c74 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1937,6 +1937,7 @@ nav .dropdown-menu {
 }
 
 [id^="webpage-list-item-"]:hover td,
+[id^="block-list-item-"]:hover td,
 [id^="menu-list-item-"]:hover td,
 [id^="mitem-list-item-"]:hover td {
 	background-color: $item_colour;
diff --git a/view/tpl/blocklist.tpl b/view/tpl/blocklist.tpl
index a8cb29b35..f599aade7 100644
--- a/view/tpl/blocklist.tpl
+++ b/view/tpl/blocklist.tpl
@@ -13,20 +13,51 @@
 </div>
 {{/if}}
 {{if $pages}}
-
-	   <div id="pagelist-content-wrapper" class="generic-content-wrapper">
+<div id="pagelist-content-wrapper" class="section-content-wrapper-np">
+	<table id="block-list-table">
+		<tr>
+			<th width="97%">{{$name}}</th>
+			<th width="1%"></th>
+			<th width="1%"></th>
+			<th width="1%"></th>
+			<th width="1%" class="hidden-xs">{{$created}}</th>
+			<th width="1%" class="hidden-xs">{{$edited}}</th>
+		</tr>
 		{{foreach $pages as $key => $items}} 
-				{{foreach $items as $item}}
-					<div class="page-list-item">
-					{{if $edit}}<a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="icon-pencil design-icons design-edit-icon btn btn-default"></i></a> {{/if}}
-					{{if $view}}<a href="block/{{$channel}}/{{$item.title}}" title="{{$view}}"><i class="icon-external-link design-icons design-view-icon btn btn-default"></i></a> {{/if}}
-					{{*if $preview}}<a href="block/{{$channel}}/{{$item.title}}?iframe=true&width=80%&height=80%" title="{{$preview}}" class="webpage-preview" ><i class="icon-eye-open design-icons design-preview-icon btn-btn-default"></i></a> {{/if*}}
-					{{$item.title}}
-					</div>
-				{{/foreach}}
+		{{foreach $items as $item}}
+		<tr id="block-list-item-{{$item.url}}">
+			<td>
+				{{if $view}}
+				<a href="block/{{$channel}}/{{$item.title}}" title="{{$view}}">{{$item.title}}</a>
+				{{else}}
+				{{$item.title}}
+				{{/if}}
+			</td>
+			<td class="webpage-list-tool">
+				{{if $edit}}
+				<a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="icon-pencil"></i></a>
+				{{/if}}
+			</td>
+			<td class="webpage-list-tool">
+				{{if $item.bb_element}}
+				<a href="rpost?attachment={{$item.bb_element}}" title="{{$share}}"><i class="icon-share"></i></a>
+				{{/if}}
+			</td>
+			<td class="webpage-list-tool">
+				{{if $edit}}
+				<a href="#" title="{{$delete}}" onclick="dropItem('item/drop/{{$item.url}}', '#block-list-item-{{$item.url}}'); return false;"><i class="icon-trash drop-icons"></i></a>
+				{{/if}}
+			</td>
+			<td class="hidden-xs">
+				{{$item.created}}
+			</td>
+			<td class="hidden-xs">
+				{{$item.edited}}
+			</td>
+		</tr>
 		{{/foreach}}
-	   </div>
-	
-	   <div class="clear"></div>
-
+		{{/foreach}}
+	</table>
+</div>
+<div class="clear"></div>
 {{/if}}
diff --git a/view/tpl/webpagelist.tpl b/view/tpl/webpagelist.tpl
index 549344903..77fb09492 100644
--- a/view/tpl/webpagelist.tpl
+++ b/view/tpl/webpagelist.tpl
@@ -29,31 +29,41 @@
 		{{foreach $items as $item}}
 		<tr id="webpage-list-item-{{$item.url}}">
 			<td>
-			{{if $view}}
+				{{if $view}}
 				<a href="page/{{$channel}}/{{$item.pagetitle}}" title="{{$view}}">{{$item.pagetitle}}</a>
-			{{else}}
+				{{else}}
 				{{$item.pagetitle}}
-			{{/if}}
+				{{/if}}
 			</td>
 			<td>
-			{{$item.title}}
+				{{$item.title}}
 			</td>
 			<td class="webpage-list-tool dropdown">
-			{{if $item.lockstate=='lock'}}<i class="icon-lock dropdown-toggle lockview" data-toggle="dropdown" onclick="lockview('item',{{$item.url}});" ></i><ul id="panel-{{$item.url}}" class="lockview-panel dropdown-menu"></ul>{{/if}}
+				{{if $item.lockstate=='lock'}}
+				<i class="icon-lock dropdown-toggle lockview" data-toggle="dropdown" onclick="lockview('item',{{$item.url}});" ></i>
+				<ul id="panel-{{$item.url}}" class="lockview-panel dropdown-menu"></ul>
+				{{/if}}
+			</td>
 			<td class="webpage-list-tool">
-			{{if $edit}}<a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="icon-pencil"></i></a>{{/if}}
+				{{if $edit}}
+				<a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="icon-pencil"></i></a>
+				{{/if}}
 			</td>
 			<td class="webpage-list-tool">
-			{{if $item.bb_element}}<a href="rpost?attachment={{$item.bb_element}}" title="{{$share}}"><i class="icon-share"></i></a>{{/if}}
+				{{if $item.bb_element}}
+				<a href="rpost?attachment={{$item.bb_element}}" title="{{$share}}"><i class="icon-share"></i></a>
+				{{/if}}
 			</td>
 			<td class="webpage-list-tool">
-			{{if $edit}}<a href="#" title="{{$delete}}" onclick="dropItem('item/drop/{{$item.url}}', '#webpage-list-item-{{$item.url}}'); return false;"><i class="icon-trash drop-icons"></i></a>{{/if}}
+				{{if $edit}}
+				<a href="#" title="{{$delete}}" onclick="dropItem('item/drop/{{$item.url}}', '#webpage-list-item-{{$item.url}}'); return false;"><i class="icon-trash drop-icons"></i></a>
+				{{/if}}
 			</td>
 			<td class="hidden-xs">
-			{{$item.created}}
+				{{$item.created}}
 			</td>
 			<td class="hidden-xs">
-			{{$item.edited}}
+				{{$item.edited}}
 			</td>
 		</tr>
 		{{/foreach}}