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

Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge

Browse Source
This commit is contained in:
zotlabs 2017-06-11 16:28:40 -07:00
commit 425e13843e
3 changed files with 109 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
install/schema_mysql.sql
View File

@ -607,6 +607,7 @@ CREATE TABLE IF NOT EXISTS `item` (
`resource_type` char(16) NOT NULL DEFAULT '', `resource_type` char(16) NOT NULL DEFAULT '',
`attach` mediumtext NOT NULL, `attach` mediumtext NOT NULL,
`sig` text NOT NULL, `sig` text NOT NULL,
`diaspora_meta` mediumtext NOT NULL,
`location` char(191) NOT NULL DEFAULT '', `location` char(191) NOT NULL DEFAULT '',
`coord` char(191) NOT NULL DEFAULT '', `coord` char(191) NOT NULL DEFAULT '',
`public_policy` char(191) NOT NULL DEFAULT '', `public_policy` char(191) NOT NULL DEFAULT '',
@ -897,14 +898,13 @@ CREATE TABLE IF NOT EXISTS `outq` (
CREATE TABLE IF NOT EXISTS `pconfig` ( CREATE TABLE IF NOT EXISTS `pconfig` (
`id` int(11) NOT NULL AUTO_INCREMENT, `id` int(11) NOT NULL AUTO_INCREMENT,
`uid` int(11) NOT NULL DEFAULT 0 , `uid` int(11) NOT NULL DEFAULT 0 ,
`cat` char(100) NOT NULL DEFAULT '', `cat` char(191) NOT NULL DEFAULT '',
`k` char(100) NOT NULL DEFAULT '', `k` char(191) NOT NULL DEFAULT '',
`v` mediumtext NOT NULL, `v` mediumtext NOT NULL,
PRIMARY KEY (`id`), PRIMARY KEY (`id`),
UNIQUE KEY `access` (`uid`,`cat`,`k`) UNIQUE KEY `access` (`uid`,`cat`,`k`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
CREATE TABLE IF NOT EXISTS `photo` ( CREATE TABLE IF NOT EXISTS `photo` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT, `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`aid` int(10) unsigned NOT NULL DEFAULT 0 , `aid` int(10) unsigned NOT NULL DEFAULT 0 ,

16
view/tpl/conv_item.tpl
View File

@ -84,9 +84,9 @@
</div> </div>
{{/if}} {{/if}}
<div class="p-2 clearfix wall-item-tools"> <div class="p-2 clearfix wall-item-tools">
<div class="wall-item-tools-right pull-right"> <div class="float-right wall-item-tools-right">
{{if $item.toplevel && $item.emojis && $item.reactions}} {{if $item.toplevel && $item.emojis && $item.reactions}}
<div class="btn-group dropdown"> <div class="btn-group">
<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-react-{{$item.id}}"> <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-react-{{$item.id}}">
<i class="fa fa-smile-o"></i> <i class="fa fa-smile-o"></i>
</button> </button>
@ -97,7 +97,7 @@
</div> </div>
</div> </div>
{{/if}} {{/if}}
<div class="btn-group dropdown"> <div class="btn-group">
{{if $item.like}} {{if $item.like}}
<button type="button" title="{{$item.like.0}}" class="btn btn-outline-secondary btn-sm" onclick="dolike({{$item.id}},'like'); return false;"> <button type="button" title="{{$item.like.0}}" class="btn btn-outline-secondary btn-sm" onclick="dolike({{$item.id}},'like'); return false;">
<i class="fa fa-thumbs-o-up{{if $item.my_responses.like}} ivoted{{/if}}" ></i> <i class="fa fa-thumbs-o-up{{if $item.my_responses.like}} ivoted{{/if}}" ></i>
@ -109,11 +109,11 @@
</button> </button>
{{/if}} {{/if}}
{{if $item.isevent}} {{if $item.isevent}}
<div class="btn-group dropdown"> <div class="btn-group">
<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-attend-menu-{{$item.id}}" title="{{$item.attend_title}}"> <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-attend-menu-{{$item.id}}" title="{{$item.attend_title}}">
<i class="fa fa-calendar-check-o"></i> <i class="fa fa-calendar-check-o"></i>
</button> </button>
<div class="dropdown-menu"> <div class="dropdown-menu dropdown-menu-right">
<a class="dropdown-item" href="#" title="{{$item.attend.0}}" onclick="itemAddToCal({{$item.id}}); dolike({{$item.id}},'attendyes'); return false;"> <a class="dropdown-item" href="#" title="{{$item.attend.0}}" onclick="itemAddToCal({{$item.id}}); dolike({{$item.id}},'attendyes'); return false;">
<i class="item-act-list fa fa-check{{if $item.my_responses.attend}} ivoted{{/if}}" ></i> {{$item.attend.0}} <i class="item-act-list fa fa-check{{if $item.my_responses.attend}} ivoted{{/if}}" ></i> {{$item.attend.0}}
</a> </a>
@ -127,11 +127,11 @@
</div> </div>
{{/if}} {{/if}}
{{if $item.canvote}} {{if $item.canvote}}
<div class="btn-group dropdown"> <div class="btn-group">
<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-consensus-menu-{{$item.id}}" title="{{$item.vote_title}}"> <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-consensus-menu-{{$item.id}}" title="{{$item.vote_title}}">
<i class="fa fa-check-square-o"></i> <i class="fa fa-check-square-o"></i>
</button> </button>
<div class="dropdown-menu" role="menu" aria-labelledby="wall-item-consensus-menu-{{$item.id}}"> <div class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="wall-item-consensus-menu-{{$item.id}}">
<a class="dropdown-item" href="#" title="{{$item.conlabels.0}}" onclick="dolike({{$item.id}},'agree'); return false;"> <a class="dropdown-item" href="#" title="{{$item.conlabels.0}}" onclick="dolike({{$item.id}},'agree'); return false;">
<i class="item-act-list fa fa-check{{if $item.my_responses.agree}} ivoted{{/if}}" ></i> {{$item.conlabels.0}} <i class="item-act-list fa fa-check{{if $item.my_responses.agree}} ivoted{{/if}}" ></i> {{$item.conlabels.0}}
</a> </a>
@ -144,6 +144,7 @@
</div> </div>
</div> </div>
{{/if}} {{/if}}
<div class="btn-group">
<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-menu-{{$item.id}}"> <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-menu-{{$item.id}}">
<i class="fa fa-cog"></i> <i class="fa fa-cog"></i>
</button> </button>
@ -192,6 +193,7 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<div id="like-rotator-{{$item.id}}" class="like-rotator"></div> <div id="like-rotator-{{$item.id}}" class="like-rotator"></div>
{{if $item.responses || $item.attachments}} {{if $item.responses || $item.attachments}}

12
view/tpl/conv_list.tpl
View File

@ -84,9 +84,9 @@
</div> </div>
{{/if}} {{/if}}
<div class="p-2 clearfix wall-item-tools"> <div class="p-2 clearfix wall-item-tools">
<div class="wall-item-tools-right pull-right"> <div class="float-right wall-item-tools-right">
{{if $item.toplevel && $item.emojis && $item.reactions}} {{if $item.toplevel && $item.emojis && $item.reactions}}
<div class="btn-group dropdown"> <div class="btn-group">
<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-react-{{$item.id}}"> <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-react-{{$item.id}}">
<i class="fa fa-smile-o"></i> <i class="fa fa-smile-o"></i>
</button> </button>
@ -97,7 +97,7 @@
</div> </div>
</div> </div>
{{/if}} {{/if}}
<div class="btn-group dropdown"> <div class="btn-group">
{{if $item.like}} {{if $item.like}}
<button type="button" title="{{$item.like.0}}" class="btn btn-outline-secondary btn-sm" onclick="dolike({{$item.id}},'like'); return false;"> <button type="button" title="{{$item.like.0}}" class="btn btn-outline-secondary btn-sm" onclick="dolike({{$item.id}},'like'); return false;">
<i class="fa fa-thumbs-o-up{{if $item.my_responses.like}} ivoted{{/if}}" ></i> <i class="fa fa-thumbs-o-up{{if $item.my_responses.like}} ivoted{{/if}}" ></i>
@ -109,7 +109,7 @@
</button> </button>
{{/if}} {{/if}}
{{if $item.isevent}} {{if $item.isevent}}
<div class="btn-group dropdown"> <div class="btn-group">
<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-attend-menu-{{$item.id}}" title="{{$item.attend_title}}"> <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-attend-menu-{{$item.id}}" title="{{$item.attend_title}}">
<i class="fa fa-calendar-check-o"></i> <i class="fa fa-calendar-check-o"></i>
</button> </button>
@ -127,7 +127,7 @@
</div> </div>
{{/if}} {{/if}}
{{if $item.canvote}} {{if $item.canvote}}
<div class="btn-group dropdown"> <div class="btn-group">
<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-consensus-menu-{{$item.id}}" title="{{$item.vote_title}}"> <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-consensus-menu-{{$item.id}}" title="{{$item.vote_title}}">
<i class="fa fa-check-square-o"></i> <i class="fa fa-check-square-o"></i>
</button> </button>
@ -144,6 +144,7 @@
</div> </div>
</div> </div>
{{/if}} {{/if}}
<div class="btn-group">
<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-menu-{{$item.id}}"> <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-menu-{{$item.id}}">
<i class="fa fa-cog"></i> <i class="fa fa-cog"></i>
</button> </button>
@ -192,6 +193,7 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<div id="like-rotator-{{$item.id}}" class="like-rotator"></div> <div id="like-rotator-{{$item.id}}" class="like-rotator"></div>
<div class="wall-item-tools-left{{if $item.unseen_comments || $item.like_count || $item.dislike_count || $item.attachments}} btn-group{{/if}}"> <div class="wall-item-tools-left{{if $item.unseen_comments || $item.like_count || $item.dislike_count || $item.attachments}} btn-group{{/if}}">
{{if $item.attachments}} {{if $item.attachments}}