harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

provide block titles in blocklist

Browse Source
This commit is contained in:
Mario Vavti 2015-04-24 22:37:22 +02:00
parent 2583cab469
commit b7f6cceaea
4 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/conversation.php
View File

@ -1200,6 +1200,7 @@ function status_editor($a, $x, $popup = false) {
'$shortnoloc' => t('clear location'), '$shortnoloc' => t('clear location'),
'$title' => ((x($x, 'title')) ? htmlspecialchars($x['title'], ENT_COMPAT,'UTF-8') : ''), '$title' => ((x($x, 'title')) ? htmlspecialchars($x['title'], ENT_COMPAT,'UTF-8') : ''),
'$placeholdertitle' => t('Title (optional)'), '$placeholdertitle' => t('Title (optional)'),
'$hidetitle' => ((x($x, 'hidetitle')) ? $x['hidetitle'] : false),
'$catsenabled' => ((feature_enabled($x['profile_uid'], 'categories') && (! $webpage)) ? 'categories' : ''), '$catsenabled' => ((feature_enabled($x['profile_uid'], 'categories') && (! $webpage)) ? 'categories' : ''),
'$category' => "", '$category' => "",
'$placeholdercategory' => t('Categories (optional, comma-separated list)'), '$placeholdercategory' => t('Categories (optional, comma-separated list)'),

4
mod/blocks.php
View File

@ -128,7 +128,8 @@ function blocks_content(&$a) {
); );
$pages[$rr['iid']][] = array( $pages[$rr['iid']][] = array(
'url' => $rr['iid'], 'url' => $rr['iid'],
'title' => $rr['sid'], 'name' => $rr['sid'],
'title' => $rr['title'],
'created' => $rr['created'], 'created' => $rr['created'],
'edited' => $rr['edited'], 'edited' => $rr['edited'],
'bb_element' => '[element]' . base64url_encode(json_encode($element_arr)) . '[/element]' 'bb_element' => '[element]' . base64url_encode(json_encode($element_arr)) . '[/element]'
@ -143,6 +144,7 @@ function blocks_content(&$a) {
'$baseurl' => $url, '$baseurl' => $url,
'$title' => t('Blocks'), '$title' => t('Blocks'),
'$name' => t('Block Name'), '$name' => t('Block Name'),
'$blocktitle' => t('Block Title'),
'$created' => t('Created'), '$created' => t('Created'),
'$edited' => t('Edited'), '$edited' => t('Edited'),
'$create' => t('Create'), '$create' => t('Create'),

8
view/css/mod_blocks.css
View File

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

10
view/tpl/blocklist.tpl
View File

@ -16,7 +16,8 @@
<div id="pagelist-content-wrapper" class="section-content-wrapper-np"> <div id="pagelist-content-wrapper" class="section-content-wrapper-np">
<table id="block-list-table"> <table id="block-list-table">
<tr> <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> <th width="1%"></th>
<th width="1%"></th> <th width="1%"></th>
@ -28,11 +29,14 @@
<tr id="block-list-item-{{$item.url}}"> <tr id="block-list-item-{{$item.url}}">
<td> <td>
{{if $view}} {{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}} {{else}}
{{$item.title}} {{$item.name}}
{{/if}} {{/if}}
</td> </td>
<td>
{{$item.title}}
</td>
<td class="webpage-list-tool"> <td class="webpage-list-tool">
{{if $edit}} {{if $edit}}
<a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="icon-pencil"></i></a> <a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="icon-pencil"></i></a>