aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2015-04-24 22:37:22 +0200
committerMario Vavti <mario@mariovavti.com>2015-04-24 22:37:22 +0200
commitb7f6cceaea464df81fac872d2d7b863bd02746de (patch)
treea321a4c6082329e947361fcd597bb5ea498dd704
parent2583cab469561cc910001196fbbbbafc5c1920ef (diff)
downloadvolse-hubzilla-b7f6cceaea464df81fac872d2d7b863bd02746de.tar.gz
volse-hubzilla-b7f6cceaea464df81fac872d2d7b863bd02746de.tar.bz2
volse-hubzilla-b7f6cceaea464df81fac872d2d7b863bd02746de.zip
provide block titles in blocklist
-rw-r--r--include/conversation.php1
-rw-r--r--mod/blocks.php4
-rw-r--r--view/css/mod_blocks.css8
-rw-r--r--view/tpl/blocklist.tpl10
4 files changed, 15 insertions, 8 deletions
diff --git a/include/conversation.php b/include/conversation.php
index 19c5bda14..42ce140a6 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1200,6 +1200,7 @@ function status_editor($a, $x, $popup = false) {
'$shortnoloc' => t('clear location'),
'$title' => ((x($x, 'title')) ? htmlspecialchars($x['title'], ENT_COMPAT,'UTF-8') : ''),
'$placeholdertitle' => t('Title (optional)'),
+ '$hidetitle' => ((x($x, 'hidetitle')) ? $x['hidetitle'] : false),
'$catsenabled' => ((feature_enabled($x['profile_uid'], 'categories') && (! $webpage)) ? 'categories' : ''),
'$category' => "",
'$placeholdercategory' => t('Categories (optional, comma-separated list)'),
diff --git a/mod/blocks.php b/mod/blocks.php
index 5df6aa1bc..23a66f8d9 100644
--- a/mod/blocks.php
+++ b/mod/blocks.php
@@ -128,7 +128,8 @@ function blocks_content(&$a) {
);
$pages[$rr['iid']][] = array(
'url' => $rr['iid'],
- 'title' => $rr['sid'],
+ 'name' => $rr['sid'],
+ 'title' => $rr['title'],
'created' => $rr['created'],
'edited' => $rr['edited'],
'bb_element' => '[element]' . base64url_encode(json_encode($element_arr)) . '[/element]'
@@ -143,6 +144,7 @@ function blocks_content(&$a) {
'$baseurl' => $url,
'$title' => t('Blocks'),
'$name' => t('Block Name'),
+ '$blocktitle' => t('Block Title'),
'$created' => t('Created'),
'$edited' => t('Edited'),
'$create' => t('Create'),
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>