Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
This commit is contained in:
commit
6ee691e019
@ -262,6 +262,7 @@ class Apps {
|
|||||||
* list: normal mode for viewing an app on the app page
|
* list: normal mode for viewing an app on the app page
|
||||||
* no buttons are shown
|
* no buttons are shown
|
||||||
* edit: viewing the app page in editing mode provides a delete button
|
* edit: viewing the app page in editing mode provides a delete button
|
||||||
|
* nav: render apps for app-bin
|
||||||
*/
|
*/
|
||||||
|
|
||||||
$installed = false;
|
$installed = false;
|
||||||
@ -357,6 +358,7 @@ class Apps {
|
|||||||
'$delete' => ((local_channel() && $installed && $mode == 'edit') ? t('Delete') : ''),
|
'$delete' => ((local_channel() && $installed && $mode == 'edit') ? t('Delete') : ''),
|
||||||
'$undelete' => ((local_channel() && $installed && $mode == 'edit') ? t('Undelete') : ''),
|
'$undelete' => ((local_channel() && $installed && $mode == 'edit') ? t('Undelete') : ''),
|
||||||
'$deleted' => $papp['deleted'],
|
'$deleted' => $papp['deleted'],
|
||||||
|
'$feature' => (($papp['embed']) ? false : true),
|
||||||
'$featured' => ((strpos($papp['categories'], 'nav_featured_app') === false) ? false : true),
|
'$featured' => ((strpos($papp['categories'], 'nav_featured_app') === false) ? false : true),
|
||||||
'$navapps' => (($mode == 'nav') ? true : false)
|
'$navapps' => (($mode == 'nav') ? true : false)
|
||||||
));
|
));
|
||||||
@ -768,6 +770,8 @@ class Apps {
|
|||||||
if(! $embed)
|
if(! $embed)
|
||||||
return $ret;
|
return $ret;
|
||||||
|
|
||||||
|
$ret['embed'] = true;
|
||||||
|
|
||||||
if(array_key_exists('categories',$ret))
|
if(array_key_exists('categories',$ret))
|
||||||
unset($ret['categories']);
|
unset($ret['categories']);
|
||||||
|
|
||||||
|
@ -2104,6 +2104,9 @@ dl.bb-dl > dd > li {
|
|||||||
font-size: 80px;
|
font-size: 80px;
|
||||||
color: $toolicon_colour;
|
color: $toolicon_colour;
|
||||||
text-shadow: 3px 3px 3px lightgrey;
|
text-shadow: 3px 3px 3px lightgrey;
|
||||||
|
}
|
||||||
|
|
||||||
|
.app-detail {
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2112,4 +2115,4 @@ dl.bb-dl > dd > li {
|
|||||||
margin-top: 20px;
|
margin-top: 20px;
|
||||||
margin-left: auto;
|
margin-left: auto;
|
||||||
margin-right: auto;
|
margin-right: auto;
|
||||||
}
|
}
|
||||||
|
@ -11,19 +11,18 @@
|
|||||||
<a href="{{$app.page}}" class="btn btn-default" title="{{$purchase}}" ><i class="fa fa-external"></i></a>
|
<a href="{{$app.page}}" class="btn btn-default" title="{{$purchase}}" ><i class="fa fa-external"></i></a>
|
||||||
</div>
|
</div>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
{{if $install || $update || $delete || $feature}}
|
||||||
<div class="app-tools">
|
<div class="app-tools">
|
||||||
<form action="{{$hosturl}}appman" method="post">
|
<form action="{{$hosturl}}appman" method="post">
|
||||||
<input type="hidden" name="papp" value="{{$app.papp}}" />
|
<input type="hidden" name="papp" value="{{$app.papp}}" />
|
||||||
{{if $install || $update || $delete }}
|
|
||||||
{{if $install}}<button type="submit" name="install" value="{{$install}}" class="btn btn-default btn-xs" title="{{$install}}" ><i class="fa fa-arrow-circle-o-down" ></i></button>{{/if}}
|
{{if $install}}<button type="submit" name="install" value="{{$install}}" class="btn btn-default btn-xs" title="{{$install}}" ><i class="fa fa-arrow-circle-o-down" ></i></button>{{/if}}
|
||||||
{{if $edit}}<input type="hidden" name="appid" value="{{$app.guid}}" /><button type="submit" name="edit" value="{{$edit}}" class="btn btn-default btn-xs" title="{{$edit}}" ><i class="fa fa-pencil" ></i></button>{{/if}}
|
{{if $edit}}<input type="hidden" name="appid" value="{{$app.guid}}" /><button type="submit" name="edit" value="{{$edit}}" class="btn btn-default btn-xs" title="{{$edit}}" ><i class="fa fa-pencil" ></i></button>{{/if}}
|
||||||
{{if $delete}}<button type="submit" name="delete" value="{{if $deleted}}{{$undelete}}{{else}}{{$delete}}{{/if}}" class="btn btn-default btn-xs" title="{{if $deleted}}{{$undelete}}{{else}}{{$delete}}{{/if}}" ><i class="fa fa-trash-o drop-icons"></i></button>{{/if}}
|
{{if $delete}}<button type="submit" name="delete" value="{{if $deleted}}{{$undelete}}{{else}}{{$delete}}{{/if}}" class="btn btn-default btn-xs" title="{{if $deleted}}{{$undelete}}{{else}}{{$delete}}{{/if}}" ><i class="fa fa-trash-o drop-icons"></i></button>{{/if}}
|
||||||
{{/if}}
|
{{if $feature}}<button type="submit" name="feature" value="feature" class="btn btn-default btn-xs" ><i class="fa fa-star"{{if $featured}} style="color: gold"{{/if}}></i></button>{{/if}}
|
||||||
<button type="submit" name="feature" value="feature" class="btn btn-default btn-xs" ><i class="fa fa-star"{{if $featured}} style="color: gold"{{/if}}></i></button>
|
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
{{/if}}
|
||||||
</div>
|
</div>
|
||||||
{{else}}
|
{{else}}
|
||||||
<li><a href="{{$app.url}}">{{if $icon}}<i class="generic-icons-nav fa fa-fw fa-{{$icon}}"></i>{{else}}<img src="{{$app.photo}}" width="16" height="16" style="margin-right:9px;"/>{{/if}}{{$app.name}}</a></li>
|
<li><a href="{{$app.url}}">{{if $icon}}<i class="generic-icons-nav fa fa-fw fa-{{$icon}}"></i>{{else}}<img src="{{$app.photo}}" width="16" height="16" style="margin-right:9px;"/>{{/if}}{{$app.name}}</a></li>
|
||||||
|
Reference in New Issue
Block a user