aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorAndrew Manning <tamanning@zoho.com>2016-05-05 05:35:00 -0400
committerAndrew Manning <tamanning@zoho.com>2016-05-05 05:35:00 -0400
commit6ce939491bf932c20c9777a8518da5875e02a6b1 (patch)
treee49b75c9017015677e6d550d75e4ce62ffaddc75 /view
parent8cb06e7af8c3a14a6513d2aee2beba091f3ecfb5 (diff)
parent8ffdc4859baa9f2ae9567a4c443dfbb227919167 (diff)
downloadvolse-hubzilla-6ce939491bf932c20c9777a8518da5875e02a6b1.tar.gz
volse-hubzilla-6ce939491bf932c20c9777a8518da5875e02a6b1.tar.bz2
volse-hubzilla-6ce939491bf932c20c9777a8518da5875e02a6b1.zip
Merge remote-tracking branch 'upstream/dev' into plugin-repo
Diffstat (limited to 'view')
-rw-r--r--view/pdl/mod_apps.pdl1
-rw-r--r--view/tpl/app_create.tpl1
-rwxr-xr-xview/tpl/myapps.tpl2
3 files changed, 3 insertions, 1 deletions
diff --git a/view/pdl/mod_apps.pdl b/view/pdl/mod_apps.pdl
index db93958a3..32fef28e9 100644
--- a/view/pdl/mod_apps.pdl
+++ b/view/pdl/mod_apps.pdl
@@ -1,3 +1,4 @@
[region=aside]
[widget=appselect][/widget]
+[widget=appcategories][/widget]
[/region]
diff --git a/view/tpl/app_create.tpl b/view/tpl/app_create.tpl
index 0590e7031..06fbcaaa7 100644
--- a/view/tpl/app_create.tpl
+++ b/view/tpl/app_create.tpl
@@ -17,6 +17,7 @@
{{include file="field_input.tpl" field=$name}}
+{{include file="field_input.tpl" field=$categories}}
{{include file="field_input.tpl" field=$url}}
{{include file="field_textarea.tpl" field=$desc}}
{{include file="field_input.tpl" field=$photo}}
diff --git a/view/tpl/myapps.tpl b/view/tpl/myapps.tpl
index 32d544a86..c654993b7 100755
--- a/view/tpl/myapps.tpl
+++ b/view/tpl/myapps.tpl
@@ -1,5 +1,5 @@
<div class="generic-content-wrapper-styled">
-<h3>{{$title}}</h3>
+<h3>{{$title}}{{$cat}}</h3>
{{foreach $apps as $ap}}
{{$ap}}