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

Merge https://github.com/redmatrix/redmatrix into pending_merge

Browse Source
This commit is contained in:
friendica 2015-04-23 21:29:27 -07:00
commit ca305f5421
6 changed files with 123 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
mod/blocks.php
View File

@ -70,7 +70,6 @@ function blocks_content(&$a) {
return; return;
} }
// Block design features from visitors // Block design features from visitors
if((! $uid) || ($uid != $owner)) { if((! $uid) || ($uid != $owner)) {
@ -105,11 +104,10 @@ function blocks_content(&$a) {
if($_REQUEST['pagetitle']) if($_REQUEST['pagetitle'])
$x['pagetitle'] = $_REQUEST['pagetitle']; $x['pagetitle'] = $_REQUEST['pagetitle'];
$editor = status_editor($a,$x); $editor = status_editor($a,$x);
$r = q("select * from item_id where uid = %d and service = 'BUILDBLOCK' order by sid asc", $r = q("select * from item_id left join item on item_id.iid = item.id
where item_id.uid = %d and service = 'BUILDBLOCK' order by item.created desc",
intval($owner) intval($owner)
); );
@ -118,7 +116,22 @@ function blocks_content(&$a) {
if($r) { if($r) {
$pages = array(); $pages = array();
foreach($r as $rr) { foreach($r as $rr) {
$pages[$rr['iid']][] = array('url' => $rr['iid'],'title' => $rr['sid']); $element_arr = array(
'type' => 'block',
'body' => $rr['body'],
'created' => $rr['created'],
'edited' => $rr['edited'],
'mimetype' => $rr['mimetype'],
'pagetitle' => $rr['sid'],
'mid' => $rr['mid']
);
$pages[$rr['iid']][] = array(
'url' => $rr['iid'],
'title' => $rr['sid'],
'created' => $rr['created'],
'edited' => $rr['edited'],
'bb_element' => '[element]' . base64url_encode(json_encode($element_arr)) . '[/element]'
);
} }
} }
@ -128,8 +141,13 @@ function blocks_content(&$a) {
$o .= replace_macros(get_markup_template('blocklist.tpl'), array( $o .= replace_macros(get_markup_template('blocklist.tpl'), array(
'$baseurl' => $url, '$baseurl' => $url,
'$title' => t('Blocks'), '$title' => t('Blocks'),
'$name' => t('Block Name'),
'$created' => t('Created'),
'$edited' => t('Edited'),
'$create' => t('Create'), '$create' => t('Create'),
'$edit' => t('Edit'), '$edit' => t('Edit'),
'$share' => t('Share'),
'$delete' => t('Delete'),
'$editor' => $editor, '$editor' => $editor,
'$pages' => $pages, '$pages' => $pages,
'$channel' => $which, '$channel' => $which,

31
mod/editblock.php
View File

@ -70,7 +70,6 @@ function editblock_content(&$a) {
$o = ''; $o = '';
// Figure out which post we're editing // Figure out which post we're editing
$post_id = ((argc() > 2) ? intval(argv(2)) : 0); $post_id = ((argc() > 2) ? intval(argv(2)) : 0);
@ -96,7 +95,6 @@ function editblock_content(&$a) {
return; return;
} }
$plaintext = true; $plaintext = true;
$mimeselect = ''; $mimeselect = '';
@ -110,22 +108,21 @@ function editblock_content(&$a) {
else else
$mimeselect = mimetype_select($itm[0]['uid'],$mimetype); $mimeselect = mimetype_select($itm[0]['uid'],$mimetype);
$o .= replace_macros(get_markup_template('edpost_head.tpl'), array( $o .= replace_macros(get_markup_template('edpost_head.tpl'), array(
'$title' => t('Edit Block') '$title' => t('Edit Block'),
'$delete' => ((($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash)) ? t('Delete') : false),
'$id' => $itm[0]['id']
)); ));
$a->page['htmlhead'] .= replace_macros(get_markup_template('jot-header.tpl'), array( $a->page['htmlhead'] .= replace_macros(get_markup_template('jot-header.tpl'), array(
'$baseurl' => $a->get_baseurl(), '$baseurl' => $a->get_baseurl(),
'$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'), '$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
'$ispublic' => '&nbsp;', // t('Visible to <strong>everybody</strong>'), '$ispublic' => '&nbsp;', // t('Visible to <strong>everybody</strong>'),
'$geotag' => '', '$geotag' => '',
'$nickname' => $channel['channel_address'], '$nickname' => $channel['channel_address'],
'$confirmdelete' => t('Delete block?') '$confirmdelete' => t('Delete block?')
)); ));
$tpl = get_markup_template("jot.tpl"); $tpl = get_markup_template("jot.tpl");
$jotplugins = ''; $jotplugins = '';
@ -184,26 +181,6 @@ function editblock_content(&$a) {
'$expires' => t('Set expiration date'), '$expires' => t('Set expiration date'),
)); ));
if(($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash))
$o .= '<br /><br /><a class="block-delete-link" href="item/drop/' . $itm[0]['id'] . '" >' . t('Delete Block') . '</a><br />';
$x = array(
'type' => 'block',
'title' => $itm[0]['title'],
'body' => $itm[0]['body'],
'term' => $itm[0]['term'],
'created' => $itm[0]['created'],
'edited' => $itm[0]['edited'],
'mimetype' => $itm[0]['mimetype'],
'pagetitle' => $page_title,
'mid' => $itm[0]['mid']
);
$o .= EOL . EOL . t('Share') . EOL . '<textarea onclick="this.select();" class="shareable_element_text" >[element]' . base64url_encode(json_encode($x)) . '[/element]</textarea>' . EOL . EOL;
return $o; return $o;
} }

29
view/css/mod_blocks.css
View File

@ -1,3 +1,32 @@
#block-editor { #block-editor {
display: none; 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;
}

1
view/theme/redbasic/css/style.css
View File

@ -1937,6 +1937,7 @@ nav .dropdown-menu {
} }
[id^="webpage-list-item-"]:hover td, [id^="webpage-list-item-"]:hover td,
[id^="block-list-item-"]:hover td,
[id^="menu-list-item-"]:hover td, [id^="menu-list-item-"]:hover td,
[id^="mitem-list-item-"]:hover td { [id^="mitem-list-item-"]:hover td {
background-color: $item_colour; background-color: $item_colour;

59
view/tpl/blocklist.tpl
View File

@ -13,20 +13,51 @@
</div> </div>
{{/if}} {{/if}}
{{if $pages}} {{if $pages}}
<div id="pagelist-content-wrapper" class="section-content-wrapper-np">
<div id="pagelist-content-wrapper" class="generic-content-wrapper"> <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 $pages as $key => $items}}
{{foreach $items as $item}} {{foreach $items as $item}}
<div class="page-list-item"> <tr id="block-list-item-{{$item.url}}">
{{if $edit}}<a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="icon-pencil design-icons design-edit-icon btn btn-default"></i></a> {{/if}} <td>
{{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 $view}}
{{*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*}} <a href="block/{{$channel}}/{{$item.title}}" title="{{$view}}">{{$item.title}}</a>
{{$item.title}} {{else}}
</div> {{$item.title}}
{{/foreach}} {{/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}} {{/foreach}}
</div> {{/foreach}}
</table>
<div class="clear"></div> </div>
<div class="clear"></div>
{{/if}} {{/if}}

32
view/tpl/webpagelist.tpl
View File

@ -29,31 +29,41 @@
{{foreach $items as $item}} {{foreach $items as $item}}
<tr id="webpage-list-item-{{$item.url}}"> <tr id="webpage-list-item-{{$item.url}}">
<td> <td>
{{if $view}} {{if $view}}
<a href="page/{{$channel}}/{{$item.pagetitle}}" title="{{$view}}">{{$item.pagetitle}}</a> <a href="page/{{$channel}}/{{$item.pagetitle}}" title="{{$view}}">{{$item.pagetitle}}</a>
{{else}} {{else}}
{{$item.pagetitle}} {{$item.pagetitle}}
{{/if}} {{/if}}
</td> </td>
<td> <td>
{{$item.title}} {{$item.title}}
</td> </td>
<td class="webpage-list-tool dropdown"> <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'}}
<td class="webpage-list-tool"> <i class="icon-lock dropdown-toggle lockview" data-toggle="dropdown" onclick="lockview('item',{{$item.url}});" ></i>
{{if $edit}}<a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="icon-pencil"></i></a>{{/if}} <ul id="panel-{{$item.url}}" class="lockview-panel dropdown-menu"></ul>
{{/if}}
</td> </td>
<td class="webpage-list-tool"> <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 $edit}}
<a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="icon-pencil"></i></a>
{{/if}}
</td> </td>
<td class="webpage-list-tool"> <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 $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}}
</td> </td>
<td class="hidden-xs"> <td class="hidden-xs">
{{$item.created}} {{$item.created}}
</td> </td>
<td class="hidden-xs"> <td class="hidden-xs">
{{$item.edited}} {{$item.edited}}
</td> </td>
</tr> </tr>
{{/foreach}} {{/foreach}}