Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-20 04:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' of /home/macgirvin/roadhouse into dev

Browse source
This commit is contained in:
nobody 2021-11-10 20:02:36 -08:00
commit 19489f588d
4 changed files with 17 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Zotlabs/Lib/Apps.php
View file

@ -558,6 +558,9 @@ class Apps {
if (local_channel()) {
if (self::app_installed(local_channel(),$papp) && (! (isset($papp['deleted']) && intval($papp['deleted'])))) {
$installed = true;
if ($mode === 'install') {
return '';
}
}
$hosturl = z_root() . '/';
@ -573,7 +576,7 @@ class Apps {
}
}
$install_action = (($installed) ? t('Update') : t('Install'));
$install_action = (($installed) ? t('Installed') : t('Install'));
$icon = ((strpos($papp['photo'],'icon:') === 0) ? substr($papp['photo'],5) : '');
if ($mode === 'navbar') {

9
Zotlabs/Module/Apps.php
View file

@ -1,10 +1,11 @@
<?php
namespace Zotlabs\Module;
use App;
use Zotlabs\Lib as Zlib;
use Zotlabs\Web\Controller;
use \Zotlabs\Lib as Zlib;
class Apps extends \Zotlabs\Web\Controller {
class Apps extends Controller {
function get() {
@ -17,7 +18,7 @@ class Apps extends \Zotlabs\Web\Controller {
$available = ((argc() == 2 && argv(1) === 'available') ? true : false);
$_SESSION['return_url'] = \App::$query_string;
$_SESSION['return_url'] = App::$query_string;
$apps = [];

15
include/items.php
View file

@ -2570,21 +2570,6 @@ function send_status_notifications($post_id,$item) {
));
}
function get_item_contact($item,$contacts) {
if(! count($contacts) || (! is_array($item)))
return false;
foreach($contacts as $contact) {
if($contact['id'] == $item['contact-id']) {
return $contact;
break; // NOTREACHED
}
}
return false;
}
/**
* @brief Called when we deliver things that might be tagged in ways that require delivery processing.
*

9
view/tpl/app.tpl
View file

@ -15,7 +15,14 @@
<div class="text-center app-tools">
<form action="{{$hosturl}}appman" method="post">
<input type="hidden" name="papp" value="{{$app.papp}}" />
{{if $action_label}}<button type="submit" name="install" value="{{$action_label}}" class="btn btn-outline-{{if $installed}}secondary{{else}}success{{/if}} btn-sm" title="{{$action_label}}" ><i class="fa fa-fw {{if $installed}}fa-refresh{{else}}fa-arrow-circle-o-down{{/if}}" ></i> {{$action_label}}</button>{{/if}}
{{if $action_label}}
{{if $installed}}
<button disabled type="submit" name="install" value="{{$action_label}}" class="btn btn-sm" title="{{$action_label}}" >{{$action_label}}</button>
{{else}}
<button type="submit" name="install" value="{{$action_label}}" class="btn btn-outline-success btn-sm" title="{{$action_label}}" ><i class="fa fa-fw fa-arrow-circle-o-down" ></i> {{$action_label}}</button>
{{/if}}
{{/if}}
{{if $edit}}<input type="hidden" name="appid" value="{{$app.guid}}" /><button type="submit" name="edit" value="{{$edit}}" class="btn btn-outline-secondary btn-sm" title="{{$edit}}" ><i class="fa fa-fw fa-pencil" ></i></button>{{/if}}
{{if $delete}}<button type="submit" name="delete" value="{{if $deleted}}{{$undelete}}{{else}}{{$delete}}{{/if}}" class="btn btn-outline-secondary btn-sm" title="{{if $deleted}}{{$undelete}}{{else}}{{$delete}}{{/if}}" ><i class="fa fa-fw fa-trash-o drop-icons"></i></button>{{/if}}
{{if $feature}}<button type="submit" name="feature" value="nav_featured_app" class="btn btn-outline-secondary btn-sm" title="{{if $featured}}{{$remove}}{{else}}{{$add}}{{/if}}"><i class="fa fa-fw fa-star{{if $featured}} text-warning{{/if}}"></i></button>{{/if}}