diff options
| -rw-r--r-- | Zotlabs/Module/Manifest.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Suggest.php | 6 | ||||
| -rw-r--r-- | Zotlabs/Module/Webpages.php | 6 | ||||
| -rw-r--r-- | Zotlabs/Module/Wiki.php | 6 | ||||
| -rw-r--r-- | app/bookmarks.png | bin | 5716 -> 0 bytes | |||
| -rw-r--r-- | app/bugreport.png | bin | 4478 -> 0 bytes | |||
| -rw-r--r-- | app/chat.png | bin | 2544 -> 0 bytes | |||
| -rw-r--r-- | app/connections.png | bin | 9387 -> 0 bytes | |||
| -rw-r--r-- | app/directory.png | bin | 4895 -> 0 bytes | |||
| -rw-r--r-- | app/firefoxshare.png | bin | 3170 -> 0 bytes | |||
| -rw-r--r-- | app/help.png | bin | 6697 -> 0 bytes | |||
| -rw-r--r-- | app/home.png | bin | 6347 -> 0 bytes | |||
| -rw-r--r-- | app/invite.png | bin | 6227 -> 0 bytes | |||
| -rw-r--r-- | app/lang.png | bin | 6559 -> 0 bytes | |||
| -rw-r--r-- | app/login.png | bin | 5847 -> 0 bytes | |||
| -rw-r--r-- | app/mood.png | bin | 6384 -> 0 bytes | |||
| -rw-r--r-- | app/photos.png | bin | 4080 -> 0 bytes | |||
| -rw-r--r-- | app/poke.png | bin | 2610 -> 0 bytes | |||
| -rw-r--r-- | app/post.png | bin | 4394 -> 0 bytes | |||
| -rw-r--r-- | app/pphoto.png | bin | 5498 -> 0 bytes | |||
| -rw-r--r-- | app/probe.png | bin | 7584 -> 0 bytes | |||
| -rw-r--r-- | app/randprof.png | bin | 5268 -> 0 bytes | |||
| -rw-r--r-- | app/search.png | bin | 8354 -> 0 bytes | |||
| -rw-r--r-- | app/storage.png | bin | 3194 -> 0 bytes | |||
| -rw-r--r-- | app/suggest.apd | 3 | ||||
| -rw-r--r-- | app/suggest.png | bin | 7225 -> 0 bytes | |||
| -rw-r--r-- | app/webpages.apd | 3 | ||||
| -rw-r--r-- | app/webpages.png | bin | 9092 -> 0 bytes | |||
| -rw-r--r-- | app/wiki.apd | 3 | ||||
| -rw-r--r-- | app/wiki.png | bin | 10668 -> 0 bytes | |||
| -rw-r--r-- | include/channel.php | 6 | ||||
| -rw-r--r-- | include/nav.php | 2 |
32 files changed, 16 insertions, 21 deletions
diff --git a/Zotlabs/Module/Manifest.php b/Zotlabs/Module/Manifest.php index 30a091172..6fe468a14 100644 --- a/Zotlabs/Module/Manifest.php +++ b/Zotlabs/Module/Manifest.php @@ -27,8 +27,6 @@ class Manifest extends Controller { 'start_url' => z_root(), 'display' => 'standalone', 'orientation' => 'any', - 'theme_color' => '#343a40', - 'background_color' => '#ccccc', 'share_target' => [ 'action' => '/rpost', 'method' => 'POST', diff --git a/Zotlabs/Module/Suggest.php b/Zotlabs/Module/Suggest.php index 0ed6ea8d7..22822bb87 100644 --- a/Zotlabs/Module/Suggest.php +++ b/Zotlabs/Module/Suggest.php @@ -36,10 +36,8 @@ class Suggest extends \Zotlabs\Web\Controller { if(! Apps::system_app_installed(local_channel(), 'Suggest Channels')) { //Do not display any associated widgets at this point App::$pdl = ''; - - $o = '<b>' . t('Suggest Channels App') . ' (' . t('Not Installed') . '):</b><br>'; - $o .= t('Suggestions for channels in the $Projectname network you might be interested in'); - return $o; + $papp = Apps::get_papp('Suggest Channels'); + return Apps::app_render($papp, 'module'); } $o = ''; diff --git a/Zotlabs/Module/Webpages.php b/Zotlabs/Module/Webpages.php index 72deba305..bc47484be 100644 --- a/Zotlabs/Module/Webpages.php +++ b/Zotlabs/Module/Webpages.php @@ -44,10 +44,8 @@ class Webpages extends Controller { if(! Apps::system_app_installed(App::$profile_uid, 'Webpages')) { //Do not display any associated widgets at this point App::$pdl = ''; - - $o = '<b>' . t('Webpages App') . ' (' . t('Not Installed') . '):</b><br>'; - $o .= t('Provide managed web pages on your channel'); - return $o; + $papp = Apps::get_papp('Webpages'); + return Apps::app_render($papp, 'module'); } nav_set_selected('Webpages'); diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php index da6e9dda6..a06119506 100644 --- a/Zotlabs/Module/Wiki.php +++ b/Zotlabs/Module/Wiki.php @@ -48,10 +48,8 @@ class Wiki extends Controller { if(! Apps::system_app_installed(App::$profile_uid, 'Wiki')) { //Do not display any associated widgets at this point App::$pdl = ''; - - $o = '<b>' . t('Wiki App') . ' (' . t('Not Installed') . '):</b><br>'; - $o .= t('Provide a wiki for your channel'); - return $o; + $papp = Apps::get_papp('Wiki'); + return Apps::app_render($papp, 'module'); } diff --git a/app/bookmarks.png b/app/bookmarks.png Binary files differdeleted file mode 100644 index fffad3329..000000000 --- a/app/bookmarks.png +++ /dev/null diff --git a/app/bugreport.png b/app/bugreport.png Binary files differdeleted file mode 100644 index 4b59da185..000000000 --- a/app/bugreport.png +++ /dev/null diff --git a/app/chat.png b/app/chat.png Binary files differdeleted file mode 100644 index 9d3fdebd7..000000000 --- a/app/chat.png +++ /dev/null diff --git a/app/connections.png b/app/connections.png Binary files differdeleted file mode 100644 index 6f6100761..000000000 --- a/app/connections.png +++ /dev/null diff --git a/app/directory.png b/app/directory.png Binary files differdeleted file mode 100644 index 659f69051..000000000 --- a/app/directory.png +++ /dev/null diff --git a/app/firefoxshare.png b/app/firefoxshare.png Binary files differdeleted file mode 100644 index 755952284..000000000 --- a/app/firefoxshare.png +++ /dev/null diff --git a/app/help.png b/app/help.png Binary files differdeleted file mode 100644 index 6b9b1ccb6..000000000 --- a/app/help.png +++ /dev/null diff --git a/app/home.png b/app/home.png Binary files differdeleted file mode 100644 index 4b45f2a7a..000000000 --- a/app/home.png +++ /dev/null diff --git a/app/invite.png b/app/invite.png Binary files differdeleted file mode 100644 index dbc2cbbfa..000000000 --- a/app/invite.png +++ /dev/null diff --git a/app/lang.png b/app/lang.png Binary files differdeleted file mode 100644 index 89a61c26a..000000000 --- a/app/lang.png +++ /dev/null diff --git a/app/login.png b/app/login.png Binary files differdeleted file mode 100644 index 4e5625ee7..000000000 --- a/app/login.png +++ /dev/null diff --git a/app/mood.png b/app/mood.png Binary files differdeleted file mode 100644 index 2a5c1aca6..000000000 --- a/app/mood.png +++ /dev/null diff --git a/app/photos.png b/app/photos.png Binary files differdeleted file mode 100644 index 59b038288..000000000 --- a/app/photos.png +++ /dev/null diff --git a/app/poke.png b/app/poke.png Binary files differdeleted file mode 100644 index 9655d54ff..000000000 --- a/app/poke.png +++ /dev/null diff --git a/app/post.png b/app/post.png Binary files differdeleted file mode 100644 index 4a4355581..000000000 --- a/app/post.png +++ /dev/null diff --git a/app/pphoto.png b/app/pphoto.png Binary files differdeleted file mode 100644 index 041ff1e0c..000000000 --- a/app/pphoto.png +++ /dev/null diff --git a/app/probe.png b/app/probe.png Binary files differdeleted file mode 100644 index 21bd85cd9..000000000 --- a/app/probe.png +++ /dev/null diff --git a/app/randprof.png b/app/randprof.png Binary files differdeleted file mode 100644 index 7bb438dcd..000000000 --- a/app/randprof.png +++ /dev/null diff --git a/app/search.png b/app/search.png Binary files differdeleted file mode 100644 index 505d93c3f..000000000 --- a/app/search.png +++ /dev/null diff --git a/app/storage.png b/app/storage.png Binary files differdeleted file mode 100644 index ad8b89f6a..000000000 --- a/app/storage.png +++ /dev/null diff --git a/app/suggest.apd b/app/suggest.apd index 0fdd8a399..56bced0dc 100644 --- a/app/suggest.apd +++ b/app/suggest.apd @@ -1,6 +1,7 @@ -version: 2 +version: 3 url: $baseurl/suggest requires: local_channel name: Suggest Channels photo: icon:lightbulb-o categories: Networking +desc: Suggestions for channels in the network you might be interested in. diff --git a/app/suggest.png b/app/suggest.png Binary files differdeleted file mode 100644 index ca9180528..000000000 --- a/app/suggest.png +++ /dev/null diff --git a/app/webpages.apd b/app/webpages.apd index 1c215512f..e72b8586b 100644 --- a/app/webpages.apd +++ b/app/webpages.apd @@ -1,6 +1,7 @@ -version: 2 +version: 3 url: $baseurl/webpages/$nick requires: local_channel name: Webpages photo: icon:newspaper-o categories: nav_featured_app, Productivity +desc: Create and manage web pages for your channel. diff --git a/app/webpages.png b/app/webpages.png Binary files differdeleted file mode 100644 index 72a091831..000000000 --- a/app/webpages.png +++ /dev/null diff --git a/app/wiki.apd b/app/wiki.apd index e2fbe77e1..d59bdd8a4 100644 --- a/app/wiki.apd +++ b/app/wiki.apd @@ -1,6 +1,7 @@ -version: 2 +version: 3 url: $baseurl/wiki/$nick requires: local_channel name: Wiki photo: icon:pencil-square-o categories: nav_featured_app, Productivity +desc: A simple yet powerful wiki for your channel. diff --git a/app/wiki.png b/app/wiki.png Binary files differdeleted file mode 100644 index 31d981679..000000000 --- a/app/wiki.png +++ /dev/null diff --git a/include/channel.php b/include/channel.php index 3ee2742b8..ed46904e7 100644 --- a/include/channel.php +++ b/include/channel.php @@ -1041,11 +1041,11 @@ function identity_basic_export($channel_id, $sections = null, $zap_compat = fals // @fixme - Not totally certain how to handle $zot_compat for the event timezone which exists // in Hubzilla but is stored with the item and not the event. In Zap, stored information is - // always UTC and localised on access as per standard conventions for working with global time data. + // always UTC and localised on access as per standard conventions for working with global time data. // Older Zot (pre-Zot6) records aren't translated correctly w/r/t AS2 so only include events for the last year or so if - // migrating to Zap. - + // migrating to Zap. + $sqle = (($zap_compat) ? " and created > '2020-01-01 00:00:00' " : ''); $r = q("select * from event where uid = %d $sqle", diff --git a/include/nav.php b/include/nav.php index 0e75cd59f..7cc64ab1b 100644 --- a/include/nav.php +++ b/include/nav.php @@ -337,7 +337,7 @@ function nav($template = 'default') { '$featured_apps' => t('Featured Apps'), '$url' => (($url) ? $url : z_root() . '/' . App::$cmd), '$settings_url' => $settings_url, - '$name' => ((!$is_owner) ? App::$profile['channel_name'] : ''), + '$name' => ((!$is_owner) ? App::$profile['fullname'] : ''), '$thumb' => ((!$is_owner) ? App::$profile['thumb'] : ''), '$form_security_token' => get_form_security_token('pconfig') ]); |
