diff options
89 files changed, 345 insertions, 91 deletions
diff --git a/Zotlabs/Widget/Chatroom_list.php b/Zotlabs/Widget/Chatroom_list.php index 42b92ddb2..d80e40bf9 100644 --- a/Zotlabs/Widget/Chatroom_list.php +++ b/Zotlabs/Widget/Chatroom_list.php @@ -1,7 +1,7 @@ <?php /** - * * Name: Chantroom list + * * Name: Chatroom list * * Description: A menu with links to your chatrooms * * Requires: chat, channel, articles, cards, wiki */ diff --git a/Zotlabs/Widget/Common_friends.php b/Zotlabs/Widget/Common_friends.php index dfeeb41b0..6024f82f5 100644 --- a/Zotlabs/Widget/Common_friends.php +++ b/Zotlabs/Widget/Common_friends.php @@ -2,7 +2,7 @@ /** * * Name: Common friends - * * Description: Display common friends to viitors + * * Description: Display common friends to visitors * * Requires: channel, articles, cards, wiki */ diff --git a/Zotlabs/Widget/Fullprofile.php b/Zotlabs/Widget/Fullprofile.php index e8ed13811..edff88e31 100644 --- a/Zotlabs/Widget/Fullprofile.php +++ b/Zotlabs/Widget/Fullprofile.php @@ -1,5 +1,11 @@ <?php +/** + * * Name: Full profile + * * Description: Profile card with extended profile info + * * Requires: channel, articles, cards, wiki, cloud, photos + */ + namespace Zotlabs\Widget; class Fullprofile { diff --git a/Zotlabs/Widget/Helpindex.php b/Zotlabs/Widget/Helpindex.php index 6c8748194..fbcd8c8b2 100644 --- a/Zotlabs/Widget/Helpindex.php +++ b/Zotlabs/Widget/Helpindex.php @@ -1,11 +1,18 @@ <?php +/** + * * Name: Help index + * * Description: Help pages index + */ + namespace Zotlabs\Widget; class Helpindex { function widget($arr) { + require_once('include/help.php'); + $o .= '<div class="widget">'; $level_0 = get_help_content('sitetoc'); diff --git a/Zotlabs/Widget/Item.php b/Zotlabs/Widget/Item.php index 273d5649c..9fd703dfe 100644 --- a/Zotlabs/Widget/Item.php +++ b/Zotlabs/Widget/Item.php @@ -1,5 +1,11 @@ <?php +/** + * * Name: Item + * * Description: Display a webpage by title or mid, + * * Requires: channel, articles, cards, wiki + */ + namespace Zotlabs\Widget; require_once('include/security.php'); @@ -35,7 +41,7 @@ class Item { ); } else { - $r = q("select * from item where mid = '%s' and uid = %d and item_type = " + $r = q("select * from item where mid = '%s' and uid = %d and item_type = " . intval(ITEM_TYPE_WEBPAGE) . " $sql_extra limit 1", dbesc($arr['mid']), intval($channel_id) diff --git a/Zotlabs/Widget/Menu_preview.php b/Zotlabs/Widget/Menu_preview.php index 51218f6cf..ddeb4d12c 100644 --- a/Zotlabs/Widget/Menu_preview.php +++ b/Zotlabs/Widget/Menu_preview.php @@ -1,5 +1,11 @@ <?php +/** + * * Name: Menu preview + * * Description: Shows a preview of the current menu + * * Requires: mitem + */ + namespace Zotlabs\Widget; require_once('include/menu.php'); diff --git a/Zotlabs/Widget/Newmember.php b/Zotlabs/Widget/Newmember.php index 224f7a8a2..70a858fb0 100644 --- a/Zotlabs/Widget/Newmember.php +++ b/Zotlabs/Widget/Newmember.php @@ -1,5 +1,10 @@ <?php +/** + * * Name: New member + * * Description: Display useful links for new members to help them get started + */ + namespace Zotlabs\Widget; class Newmember { @@ -29,7 +34,7 @@ class Newmember { $options = [ t('Profile Creation'), - [ + [ 'profile_photo' => t('Upload profile photo'), 'cover_photo' => t('Upload cover photo'), 'profiles' => t('Edit your profile'), @@ -84,4 +89,4 @@ class Newmember { } - + diff --git a/Zotlabs/Widget/Permcats.php b/Zotlabs/Widget/Permcats.php index a908f6220..9226b3c71 100644 --- a/Zotlabs/Widget/Permcats.php +++ b/Zotlabs/Widget/Permcats.php @@ -1,5 +1,12 @@ <?php +/** + * * Name: Contact roles + * * Description: Display a menu with all defined contact roles and contacts which are assigned to the selected role + * * Author: Mario Vavti + * * Requires: permcats + */ + namespace Zotlabs\Widget; use Zotlabs\Lib\Permcat; diff --git a/Zotlabs/Widget/Photo.php b/Zotlabs/Widget/Photo.php index 10031f028..5ad6c604c 100644 --- a/Zotlabs/Widget/Photo.php +++ b/Zotlabs/Widget/Photo.php @@ -1,5 +1,11 @@ <?php +/** + * * Name: Photo + * * Description: Displays a single photo + */ + + namespace Zotlabs\Widget; diff --git a/Zotlabs/Widget/Photo_albums.php b/Zotlabs/Widget/Photo_albums.php index 6df8ddf3c..2ce916048 100644 --- a/Zotlabs/Widget/Photo_albums.php +++ b/Zotlabs/Widget/Photo_albums.php @@ -1,5 +1,11 @@ <?php +/** + * * Name: Photo albums + * * Description: Displays a menu with links to existing photo albums + * * Requires: photos + */ + namespace Zotlabs\Widget; require_once('include/photos.php'); diff --git a/Zotlabs/Widget/Photo_rand.php b/Zotlabs/Widget/Photo_rand.php index af80a3b9f..cfe026b19 100644 --- a/Zotlabs/Widget/Photo_rand.php +++ b/Zotlabs/Widget/Photo_rand.php @@ -1,5 +1,10 @@ <?php +/** + * * Name: Random photo + * * Description: Display a random photo + */ + namespace Zotlabs\Widget; require_once('include/photos.php'); @@ -40,15 +45,15 @@ class Photo_rand { if(strpos($url, 'http') !== 0) return ''; - + if(array_key_exists('style', $arr) && isset($arr['style'])) $style = $arr['style']; - + // ensure they can't sneak in an eval(js) function if(strpos($style,'(') !== false) return ''; - + $url = zid($url); $o = '<div class="widget">'; diff --git a/Zotlabs/Widget/Pinned.php b/Zotlabs/Widget/Pinned.php index 66d06bbd3..83036e98c 100644 --- a/Zotlabs/Widget/Pinned.php +++ b/Zotlabs/Widget/Pinned.php @@ -1,11 +1,14 @@ <?php namespace Zotlabs\Widget; -/* - * Show pinned content - * +/** + * * Name: Pinned items + * * Description: Display pinned items + * * Author: Max Kostikov + * * Requires: disabled_for_pdledit_gui */ + class Pinned { private $allowed_types = 0; diff --git a/Zotlabs/Widget/Portfolio.php b/Zotlabs/Widget/Portfolio.php index 0cd043246..a06f56e30 100644 --- a/Zotlabs/Widget/Portfolio.php +++ b/Zotlabs/Widget/Portfolio.php @@ -1,5 +1,11 @@ <?php +/** + * * Name: Portfolio + * * Description: Display a photo album in a portfolio style + * * Requires: channel, articles, cards, wiki + */ + namespace Zotlabs\Widget; require_once('include/attach.php'); @@ -8,11 +14,9 @@ class Portfolio { function widget($args) { - $owner_uid = \App::$profile_uid; $sql_extra = permissions_sql($owner_uid); - if(! perm_is_allowed($owner_uid,get_observer_hash(),'view_storage')) return ''; @@ -112,7 +116,7 @@ class Portfolio { '$upload_form' => $upload_form, '$usage' => $usage_message )); - + return $o; } } diff --git a/Zotlabs/Widget/Privacygroups.php b/Zotlabs/Widget/Privacygroups.php index a6b16c552..62f343ea6 100644 --- a/Zotlabs/Widget/Privacygroups.php +++ b/Zotlabs/Widget/Privacygroups.php @@ -1,5 +1,12 @@ <?php +/** + * * Name: Privacy Groups + * * Description: Display a menu with links to existing privacy groups + * * Requires: group + */ + + namespace Zotlabs\Widget; use Zotlabs\Lib\AccessList; diff --git a/Zotlabs/Widget/Profile.php b/Zotlabs/Widget/Profile.php index 0e5444a56..a0bb1a66a 100644 --- a/Zotlabs/Widget/Profile.php +++ b/Zotlabs/Widget/Profile.php @@ -1,5 +1,12 @@ <?php +/** + * * Name: Profile + * * Description: Your profile card + * * Requires: channel, articles, cards, wiki, cloud, photos + */ + + namespace Zotlabs\Widget; use App; diff --git a/Zotlabs/Widget/Pubsites.php b/Zotlabs/Widget/Pubsites.php deleted file mode 100644 index 958ba68c2..000000000 --- a/Zotlabs/Widget/Pubsites.php +++ /dev/null @@ -1,16 +0,0 @@ -<?php - -namespace Zotlabs\Widget; - -class Pubsites { - - // used by site ratings pages to provide a return link - - function widget($arr) { - if(\App::$poi) - return; - return '<div class="widget"><ul class="nav nav-pills"><li><a href="pubsites">' . t('Public Hubs') . '</a></li></ul></div>'; - } -} - - diff --git a/Zotlabs/Widget/Pubtagcloud.php b/Zotlabs/Widget/Pubtagcloud.php index 826e3e6ae..db7ea02e7 100644 --- a/Zotlabs/Widget/Pubtagcloud.php +++ b/Zotlabs/Widget/Pubtagcloud.php @@ -1,5 +1,10 @@ <?php +/** + * * Name: Public stream tags + * * Description: Display public stream tags in a cloud + */ + namespace Zotlabs\Widget; class Pubtagcloud { diff --git a/Zotlabs/Widget/Random_block.php b/Zotlabs/Widget/Random_block.php index 465a51f97..9052bea03 100644 --- a/Zotlabs/Widget/Random_block.php +++ b/Zotlabs/Widget/Random_block.php @@ -1,5 +1,10 @@ <?php +/** + * * Name: Random block + * * Description: Display a random block item + */ + namespace Zotlabs\Widget; class Random_block { diff --git a/Zotlabs/Widget/Rating.php b/Zotlabs/Widget/Rating.php index 5e09f457b..20c27ff1c 100644 --- a/Zotlabs/Widget/Rating.php +++ b/Zotlabs/Widget/Rating.php @@ -1,5 +1,11 @@ <?php +/** + * * Name: Rating + * * Description: Deprecated rating tool + * * Requires: disabled_for_pdledit_gui + */ + namespace Zotlabs\Widget; class Rating { diff --git a/Zotlabs/Widget/Savedsearch.php b/Zotlabs/Widget/Savedsearch.php index 378c27139..660fd6d81 100644 --- a/Zotlabs/Widget/Savedsearch.php +++ b/Zotlabs/Widget/Savedsearch.php @@ -1,5 +1,11 @@ <?php +/** + * * Name: Saved searches + * * Description: A search form which also displays saved searches if the feature is enabled + * * Requires: network + */ + namespace Zotlabs\Widget; class Savedsearch { diff --git a/Zotlabs/Widget/Settings_menu.php b/Zotlabs/Widget/Settings_menu.php index 4d0f1d2dd..ef269d84b 100644 --- a/Zotlabs/Widget/Settings_menu.php +++ b/Zotlabs/Widget/Settings_menu.php @@ -1,5 +1,10 @@ <?php +/** + * * Name: Settings menu + * * Description: Display the channel settings menu + */ + namespace Zotlabs\Widget; class Settings_menu { diff --git a/Zotlabs/Widget/Shortprofile.php b/Zotlabs/Widget/Shortprofile.php deleted file mode 100644 index 9c2a46e75..000000000 --- a/Zotlabs/Widget/Shortprofile.php +++ /dev/null @@ -1,18 +0,0 @@ -<?php - -namespace Zotlabs\Widget; - -class Shortprofile { - - function widget($arr) { - - if(! \App::$profile['profile_uid']) - return; - - $block = observer_prohibited(); - - return profile_sidebar(\App::$profile, $block, true, true); - } - -} - diff --git a/Zotlabs/Widget/Sitesearch.php b/Zotlabs/Widget/Sitesearch.php index b3a25d76a..a5f1a5935 100644 --- a/Zotlabs/Widget/Sitesearch.php +++ b/Zotlabs/Widget/Sitesearch.php @@ -1,5 +1,11 @@ <?php +/** + * * Name: Search + * * Description: A search form + * * Requires: search, network, channel + */ + namespace Zotlabs\Widget; diff --git a/Zotlabs/Widget/Suggestions.php b/Zotlabs/Widget/Suggestions.php index b4f384e9d..e7d23bda4 100644 --- a/Zotlabs/Widget/Suggestions.php +++ b/Zotlabs/Widget/Suggestions.php @@ -1,5 +1,10 @@ <?php +/** + * * Name: Suggestions + * * Description: Display suggestions for new contacts + */ + namespace Zotlabs\Widget; use Zotlabs\Lib\Apps; @@ -12,7 +17,7 @@ class Suggestions { function widget($arr) { - if((! local_channel()) || (! Apps::system_app_installed(local_channel(), 'Suggest Channels'))) + if(! local_channel()) return EMPTY_STR; $r = suggestion_query(local_channel(),get_observer_hash(),0,20); @@ -23,14 +28,14 @@ class Suggestions { $arr = array(); - // Get two random entries from the top 20 returned. + // Get four random entries from the top 20 returned. // We'll grab the first one and the one immediately following. // This will throw some entropy intot he situation so you won't // be looking at the same two mug shots every time the widget runs - $index = ((count($r) > 2) ? mt_rand(0,count($r) - 2) : 0); + $index = ((count($r) > 4) ? mt_rand(0,count($r) - 4) : 0); - for($x = $index; $x <= ($index+1); $x ++) { + for($x = $index; $x <= ($index+3); $x ++) { $rr = $r[$x]; if(! $rr['xchan_url']) break; diff --git a/Zotlabs/Widget/Tagcloud.php b/Zotlabs/Widget/Tagcloud.php index f79bd59ad..00456f24f 100644 --- a/Zotlabs/Widget/Tagcloud.php +++ b/Zotlabs/Widget/Tagcloud.php @@ -2,6 +2,11 @@ namespace Zotlabs\Widget; +/** + * * Name: Tag cloud + * * Description: Display hashtags of your network items in a cloud + * * Requires: network, hq + */ class Tagcloud { diff --git a/Zotlabs/Widget/Tagcloud_wall.php b/Zotlabs/Widget/Tagcloud_wall.php index 7cff6ce09..20def4ab1 100644 --- a/Zotlabs/Widget/Tagcloud_wall.php +++ b/Zotlabs/Widget/Tagcloud_wall.php @@ -1,5 +1,11 @@ <?php +/** + * * Name: Tag cloud wall + * * Description: Display hashtags of your channel wall items in a cloud if the feature is enabled + * * Requires: channel + */ + namespace Zotlabs\Widget; class Tagcloud_wall { diff --git a/Zotlabs/Widget/Tasklist.php b/Zotlabs/Widget/Tasklist.php index 56342bd17..5ecfd5a27 100644 --- a/Zotlabs/Widget/Tasklist.php +++ b/Zotlabs/Widget/Tasklist.php @@ -1,8 +1,11 @@ <?php -namespace Zotlabs\Widget; +/** + * * Name: Task list + * * Description: Simple task list mangager + */ -require_once('include/event.php'); +namespace Zotlabs\Widget; class Tasklist { @@ -20,7 +23,7 @@ class Tasklist { } </script>'; - $o .= '<div class="widget">' . '<h3>' . t('Tasks') . '</h3><div class="tasklist-tasks">'; + $o .= '<div class="widget">' . '<h3>' . t('Tasks') . '</h3><div class="tasklist-tasks mb-1">'; $o .= '</div><form id="tasklist-new-form" action="" ><input class="form-control" id="tasklist-new-summary" type="text" name="summary" value="" /></form>'; $o .= '</div>'; return $o; diff --git a/Zotlabs/Widget/Tokens.php b/Zotlabs/Widget/Tokens.php index 8c31003fc..69452d628 100644 --- a/Zotlabs/Widget/Tokens.php +++ b/Zotlabs/Widget/Tokens.php @@ -1,5 +1,11 @@ <?php +/** + * * Name: Tokens + * * Description: Display a menu with links to existing guest access tokens + * * Requires: tokens + */ + namespace Zotlabs\Widget; class Tokens { diff --git a/Zotlabs/Widget/Vcard.php b/Zotlabs/Widget/Vcard.php index cab05dfdd..25bb8592c 100644 --- a/Zotlabs/Widget/Vcard.php +++ b/Zotlabs/Widget/Vcard.php @@ -1,5 +1,10 @@ <?php +/** + * * Name: Vcard + * * Description: Your default profile card + */ + namespace Zotlabs\Widget; class Vcard { diff --git a/Zotlabs/Widget/Website_portation_tools.php b/Zotlabs/Widget/Website_portation_tools.php index 1cf3bb78a..61fe48169 100644 --- a/Zotlabs/Widget/Website_portation_tools.php +++ b/Zotlabs/Widget/Website_portation_tools.php @@ -1,7 +1,12 @@ <?php -namespace Zotlabs\Widget; +/** + * * Name: Website import/export + * * Description: Tools to import and export websites + * * Requires: website + */ +namespace Zotlabs\Widget; class Website_portation_tools { diff --git a/Zotlabs/Widget/Wiki_list.php b/Zotlabs/Widget/Wiki_list.php index 64c988ee7..217ab8706 100644 --- a/Zotlabs/Widget/Wiki_list.php +++ b/Zotlabs/Widget/Wiki_list.php @@ -1,5 +1,10 @@ <?php +/** + * * Name: Wiki list + * * Description: A list of existing wikis + */ + namespace Zotlabs\Widget; class Wiki_list { diff --git a/Zotlabs/Widget/Wiki_page_history.php b/Zotlabs/Widget/Wiki_page_history.php index dbb322dc3..3c9f5ed1a 100644 --- a/Zotlabs/Widget/Wiki_page_history.php +++ b/Zotlabs/Widget/Wiki_page_history.php @@ -1,5 +1,11 @@ <?php +/** + * * Name: Wiki page history + * * Description: History of an existing wiki page + * * Requires: wiki + */ + namespace Zotlabs\Widget; class Wiki_page_history { @@ -10,7 +16,7 @@ class Wiki_page_history { $resource_id = ((array_key_exists('resource_id', $arr)) ? $arr['resource_id'] : ''); $pageHistory = \Zotlabs\Lib\NativeWikiPage::page_history([ - 'channel_id' => \App::$profile_uid, + 'channel_id' => \App::$profile_uid, 'observer_hash' => get_observer_hash(), 'resource_id' => $resource_id, 'pageUrlName' => $pageUrlName diff --git a/Zotlabs/Widget/Wiki_pages.php b/Zotlabs/Widget/Wiki_pages.php index dee0a2229..ece712334 100644 --- a/Zotlabs/Widget/Wiki_pages.php +++ b/Zotlabs/Widget/Wiki_pages.php @@ -1,5 +1,11 @@ <?php +/** + * * Name: Wiki pages + * * Description: A list of existing pages of a wiki + * * Requires: wiki + */ + namespace Zotlabs\Widget; use Zotlabs\Lib\NativeWiki; @@ -34,7 +40,7 @@ class Wiki_pages { '$addnew' => t('Add new page'), '$typelock' => $typelock, '$lockedtype' => $w['mimeType'], - '$mimetype' => mimetype_select(0,$w['mimeType'], + '$mimetype' => mimetype_select(0,$w['mimeType'], [ 'text/markdown' => t('Markdown'), 'text/bbcode' => t('BBcode'), 'text/plain' => t('Text') ]), '$pageName' => array('missingPageName', 'Create Page' , $pageName), '$refresh' => $arr['refresh'], @@ -91,7 +97,7 @@ class Wiki_pages { '$addnew' => t('Add new page'), '$typelock' => $typelock, '$lockedtype' => $w['mimeType'], - '$mimetype' => mimetype_select(0,$w['mimeType'], + '$mimetype' => mimetype_select(0,$w['mimeType'], [ 'text/markdown' => t('Markdown'), 'text/bbcode' => t('BBcode'), 'text/plain' => t('Text') ]), '$pageName' => array('pageName', t('Page name')), '$refresh' => $arr['refresh'], diff --git a/Zotlabs/Widget/Zcard.php b/Zotlabs/Widget/Zcard.php index 12e53eaab..35362c50e 100644 --- a/Zotlabs/Widget/Zcard.php +++ b/Zotlabs/Widget/Zcard.php @@ -1,5 +1,10 @@ <?php +/** + * * Name: Zcard + * * Description: Your default profile card including your cover photo + */ + namespace Zotlabs\Widget; class Zcard { diff --git a/view/css/widgets.css b/view/css/widgets.css index 0a091272c..ebe0f47b0 100644 --- a/view/css/widgets.css +++ b/view/css/widgets.css @@ -136,17 +136,6 @@ li:hover .group-edit-icon { } -/* tasklist */ - -.tasklist-tasks { - max-height: 300px; - overflow-y: auto; -} - -#tasklist-new-summary { - width: 250px; -} - /* cover photo */ #cover-photo { diff --git a/view/pdl/mod_admin.pdl b/view/pdl/mod_admin.pdl index 1cf49750d..3c9633a69 100644 --- a/view/pdl/mod_admin.pdl +++ b/view/pdl/mod_admin.pdl @@ -1,6 +1,9 @@ [region=aside] [widget=admin][/widget] [/region] +[region=content] +$content +[/region] [region=right_aside] [widget=notifications][/widget] [widget=newmember][/widget] diff --git a/view/pdl/mod_appman.pdl b/view/pdl/mod_appman.pdl index ad8843890..71306785e 100644 --- a/view/pdl/mod_appman.pdl +++ b/view/pdl/mod_appman.pdl @@ -1,6 +1,9 @@ [region=aside] [widget=appstore][/widget] [/region] +[region=content] +$content +[/region] [region=right_aside] [widget=notifications][/widget] [widget=newmember][/widget] diff --git a/view/pdl/mod_apps.pdl b/view/pdl/mod_apps.pdl index 32e2ce560..be9e15366 100644 --- a/view/pdl/mod_apps.pdl +++ b/view/pdl/mod_apps.pdl @@ -2,6 +2,9 @@ [widget=appstore][/widget] [widget=appcategories][/widget] [/region] +[region=content] +$content +[/region] [region=right_aside] [widget=notifications][/widget] [widget=newmember][/widget] diff --git a/view/pdl/mod_articles.pdl b/view/pdl/mod_articles.pdl index 490917358..051e89278 100644 --- a/view/pdl/mod_articles.pdl +++ b/view/pdl/mod_articles.pdl @@ -5,6 +5,9 @@ [widget=tasklist][/widget] [widget=notes][/widget] [/region] +[region=content] +$content +[/region] [region=right_aside] [widget=notifications][/widget] [widget=newmember][/widget] diff --git a/view/pdl/mod_blocks.pdl b/view/pdl/mod_blocks.pdl index 4a90a4f36..c0ccacdc7 100644 --- a/view/pdl/mod_blocks.pdl +++ b/view/pdl/mod_blocks.pdl @@ -1,6 +1,9 @@ [region=aside] [widget=design_tools][/widget] [/region] +[region=content] +$content +[/region] [region=right_aside] [widget=notifications][/widget] [widget=newmember][/widget] diff --git a/view/pdl/mod_cal.pdl b/view/pdl/mod_cal.pdl index d7e5d29f3..47af1ed38 100644 --- a/view/pdl/mod_cal.pdl +++ b/view/pdl/mod_cal.pdl @@ -1,6 +1,9 @@ [region=aside] [widget=profile][/widget] [/region] +[region=content] +$content +[/region] [region=right_aside] [widget=notifications][/widget] [widget=newmember][/widget] diff --git a/view/pdl/mod_cards.pdl b/view/pdl/mod_cards.pdl index fd08121fc..2252659a3 100644 --- a/view/pdl/mod_cards.pdl +++ b/view/pdl/mod_cards.pdl @@ -4,6 +4,9 @@ [widget=tasklist][/widget] [widget=notes][/widget] [/region] +[region=content] +$content +[/region] [region=right_aside] [widget=notifications][/widget] [widget=newmember][/widget] diff --git a/view/pdl/mod_cdav.pdl b/view/pdl/mod_cdav.pdl index c0f9a511f..be5b491ae 100644 --- a/view/pdl/mod_cdav.pdl +++ b/view/pdl/mod_cdav.pdl @@ -1,6 +1,9 @@ [region=aside] [widget=cdav][/widget] [/region] +[region=content] +$content +[/region] [region=right_aside] [widget=notifications][/widget] [widget=newmember][/widget] diff --git a/view/pdl/mod_channel.pdl b/view/pdl/mod_channel.pdl index 5857fca95..80333afdc 100644 --- a/view/pdl/mod_channel.pdl +++ b/view/pdl/mod_channel.pdl @@ -8,6 +8,9 @@ [widget=categories][/widget] [widget=tagcloud_wall][var=limit]24[/var][/widget] [/region] +[region=content] +$content +[/region] [region=right_aside] [widget=notifications][/widget] [widget=newmember][/widget] diff --git a/view/pdl/mod_chanview.pdl b/view/pdl/mod_chanview.pdl index a5461df50..0527ac00c 100644 --- a/view/pdl/mod_chanview.pdl +++ b/view/pdl/mod_chanview.pdl @@ -1,6 +1,9 @@ [region=aside] [widget=vcard][/widget] [/region] +[region=content] +$content +[/region] [region=right_aside] [widget=notifications][/widget] [widget=newmember][/widget] diff --git a/view/pdl/mod_chat.pdl b/view/pdl/mod_chat.pdl index 8a79b4b12..b761e3361 100644 --- a/view/pdl/mod_chat.pdl +++ b/view/pdl/mod_chat.pdl @@ -5,6 +5,9 @@ [widget=suggestedchats][/widget] [widget=chatroom_members][/widget] [/region] +[region=content] +$content +[/region] [region=right_aside] [widget=notifications][/widget] [widget=newmember][/widget] diff --git a/view/pdl/mod_cloud.pdl b/view/pdl/mod_cloud.pdl index 7f40e7ea0..699aff1f8 100644 --- a/view/pdl/mod_cloud.pdl +++ b/view/pdl/mod_cloud.pdl @@ -2,6 +2,9 @@ [widget=profile][/widget] [widget=categories][var=files]1[/var][/widget] [/region] +[region=content] +$content +[/region] [region=right_aside] [widget=notifications][/widget] [widget=newmember][/widget] diff --git a/view/pdl/mod_common.pdl b/view/pdl/mod_common.pdl index 7e15fc869..df722e5bf 100644 --- a/view/pdl/mod_common.pdl +++ b/view/pdl/mod_common.pdl @@ -1,6 +1,9 @@ [region=aside] [widget=fullprofile][/widget] [/region] +[region=content] +$content +[/region] [region=right_aside] [widget=notifications][/widget] [widget=newmember][/widget] diff --git a/view/pdl/mod_connect.pdl b/view/pdl/mod_connect.pdl index d7e5d29f3..47af1ed38 100644 --- a/view/pdl/mod_connect.pdl +++ b/view/pdl/mod_connect.pdl @@ -1,6 +1,9 @@ [region=aside] [widget=profile][/widget] [/region] +[region=content] +$content +[/region] [region=right_aside] [widget=notifications][/widget] [widget=newmember][/widget] diff --git a/view/pdl/mod_connections.pdl b/view/pdl/mod_connections.pdl index 3c3dfd313..992ed9ca4 100644 --- a/view/pdl/mod_connections.pdl +++ b/view/pdl/mod_connections.pdl @@ -1,6 +1,9 @@ [region=aside] [widget=findpeople][/widget] [/region] +[region=content] +$content +[/region] [region=right_aside] [widget=notifications][/widget] [widget=newmember][/widget] diff --git a/view/pdl/mod_connedit.pdl b/view/pdl/mod_connedit.pdl index a5461df50..0527ac00c 100644 --- a/view/pdl/mod_connedit.pdl +++ b/view/pdl/mod_connedit.pdl @@ -1,6 +1,9 @@ [region=aside] [widget=vcard][/widget] [/region] +[region=content] +$content +[/region] [region=right_aside] [widget=notifications][/widget] [widget=newmember][/widget] diff --git a/view/pdl/mod_defperms.pdl b/view/pdl/mod_defperms.pdl index 37c85c765..759dbf039 100644 --- a/view/pdl/mod_defperms.pdl +++ b/view/pdl/mod_defperms.pdl @@ -1,6 +1,9 @@ [region=aside] [widget=settings_menu][/widget] [/region] +[region=content] +$content +[/region] [region=right_aside] [widget=notifications][/widget] [widget=newmember][/widget] diff --git a/view/pdl/mod_display.pdl b/view/pdl/mod_display.pdl index a5461df50..0527ac00c 100644 --- a/view/pdl/mod_display.pdl +++ b/view/pdl/mod_display.pdl @@ -1,6 +1,9 @@ [region=aside] [widget=vcard][/widget] [/region] +[region=content] +$content +[/region] [region=right_aside] [widget=notifications][/widget] [widget=newmember][/widget] diff --git a/view/pdl/mod_editblock.pdl b/view/pdl/mod_editblock.pdl index 4a90a4f36..c0ccacdc7 100644 --- a/view/pdl/mod_editblock.pdl +++ b/view/pdl/mod_editblock.pdl @@ -1,6 +1,9 @@ [region=aside] [widget=design_tools][/widget] [/region] +[region=content] +$content +[/region] [region=right_aside] [widget=notifications][/widget] [widget=newmember][/widget] diff --git a/view/pdl/mod_editlayout.pdl b/view/pdl/mod_editlayout.pdl index 4a90a4f36..c0ccacdc7 100644 --- a/view/pdl/mod_editlayout.pdl +++ b/view/pdl/mod_editlayout.pdl @@ -1,6 +1,9 @@ [region=aside] [widget=design_tools][/widget] [/region] +[region=content] +$content +[/region] [region=right_aside] [widget=notifications][/widget] [widget=newmember][/widget] diff --git a/view/pdl/mod_editwebpage.pdl b/view/pdl/mod_editwebpage.pdl index 4a90a4f36..c0ccacdc7 100644 --- a/view/pdl/mod_editwebpage.pdl +++ b/view/pdl/mod_editwebpage.pdl @@ -1,6 +1,9 @@ [region=aside] [widget=design_tools][/widget] [/region] +[region=content] +$content +[/region] [region=right_aside] [widget=notifications][/widget] [widget=newmember][/widget] diff --git a/view/pdl/mod_go.pdl b/view/pdl/mod_go.pdl index 7e15fc869..df722e5bf 100644 --- a/view/pdl/mod_go.pdl +++ b/view/pdl/mod_go.pdl @@ -1,6 +1,9 @@ [region=aside] [widget=fullprofile][/widget] [/region] +[region=content] +$content +[/region] [region=right_aside] [widget=notifications][/widget] [widget=newmember][/widget] diff --git a/view/pdl/mod_group.pdl b/view/pdl/mod_group.pdl index 749ede18c..523f24178 100644 --- a/view/pdl/mod_group.pdl +++ b/view/pdl/mod_group.pdl @@ -1,6 +1,9 @@ [region=aside] [widget=privacygroups][/widget] [/region] +[region=content] +$content +[/region] [region=right_aside] [widget=notifications][/widget] [widget=newmember][/widget] diff --git a/view/pdl/mod_help.pdl b/view/pdl/mod_help.pdl index 4bb380cc9..6f8a41226 100644 --- a/view/pdl/mod_help.pdl +++ b/view/pdl/mod_help.pdl @@ -1,6 +1,9 @@ [region=aside] [widget=helpindex][/widget] [/region] +[region=content] +$content +[/region] [region=right_aside] [widget=notifications][/widget] [widget=newmember][/widget] diff --git a/view/pdl/mod_id.pdl b/view/pdl/mod_id.pdl index 7e15fc869..df722e5bf 100644 --- a/view/pdl/mod_id.pdl +++ b/view/pdl/mod_id.pdl @@ -1,6 +1,9 @@ [region=aside] [widget=fullprofile][/widget] [/region] +[region=content] +$content +[/region] [region=right_aside] [widget=notifications][/widget] [widget=newmember][/widget] diff --git a/view/pdl/mod_import_items.pdl b/view/pdl/mod_import_items.pdl index e657fa88b..9f0bb4d9a 100644 --- a/view/pdl/mod_import_items.pdl +++ b/view/pdl/mod_import_items.pdl @@ -1,3 +1,8 @@ +[region=aside] +[/region] +[region=content] +$content +[/region] [region=right_aside] [widget=notifications][/widget] [/region] diff --git a/view/pdl/mod_layouts.pdl b/view/pdl/mod_layouts.pdl index 4a90a4f36..c0ccacdc7 100644 --- a/view/pdl/mod_layouts.pdl +++ b/view/pdl/mod_layouts.pdl @@ -1,6 +1,9 @@ [region=aside] [widget=design_tools][/widget] [/region] +[region=content] +$content +[/region] [region=right_aside] [widget=notifications][/widget] [widget=newmember][/widget] diff --git a/view/pdl/mod_locs.pdl b/view/pdl/mod_locs.pdl index 37c85c765..759dbf039 100644 --- a/view/pdl/mod_locs.pdl +++ b/view/pdl/mod_locs.pdl @@ -1,6 +1,9 @@ [region=aside] [widget=settings_menu][/widget] [/region] +[region=content] +$content +[/region] [region=right_aside] [widget=notifications][/widget] [widget=newmember][/widget] diff --git a/view/pdl/mod_menu.pdl b/view/pdl/mod_menu.pdl index 4a90a4f36..c0ccacdc7 100644 --- a/view/pdl/mod_menu.pdl +++ b/view/pdl/mod_menu.pdl @@ -1,6 +1,9 @@ [region=aside] [widget=design_tools][/widget] [/region] +[region=content] +$content +[/region] [region=right_aside] [widget=notifications][/widget] [widget=newmember][/widget] diff --git a/view/pdl/mod_mitem.pdl b/view/pdl/mod_mitem.pdl index 0cca7fd85..f0b03c854 100644 --- a/view/pdl/mod_mitem.pdl +++ b/view/pdl/mod_mitem.pdl @@ -2,6 +2,9 @@ [widget=design_tools][/widget] [widget=menu_preview][/widget] [/region] +[region=content] +$content +[/region] [region=right_aside] [widget=notifications][/widget] [widget=newmember][/widget] diff --git a/view/pdl/mod_moderate.pdl b/view/pdl/mod_moderate.pdl index 95f069031..11cdb4672 100644 --- a/view/pdl/mod_moderate.pdl +++ b/view/pdl/mod_moderate.pdl @@ -1,3 +1,8 @@ +[region=aside] +[/region] +[region=content] +$content +[/region] [region=right_aside] [widget=notifications][/widget] [widget=newmember][/widget] diff --git a/view/pdl/mod_pdledit_gui.pdl b/view/pdl/mod_pdledit_gui.pdl deleted file mode 100644 index 7590b7fa0..000000000 --- a/view/pdl/mod_pdledit_gui.pdl +++ /dev/null @@ -1 +0,0 @@ -[template]none[/template] diff --git a/view/pdl/mod_permcats.pdl b/view/pdl/mod_permcats.pdl index bc6c89920..996b073da 100644 --- a/view/pdl/mod_permcats.pdl +++ b/view/pdl/mod_permcats.pdl @@ -1,6 +1,9 @@ [region=aside] [widget=permcats][/widget] [/region] +[region=content] +$content +[/region] [region=right_aside] [widget=notifications][/widget] [widget=newmember][/widget] diff --git a/view/pdl/mod_photos.pdl b/view/pdl/mod_photos.pdl index bdcc087f3..4b544faa9 100644 --- a/view/pdl/mod_photos.pdl +++ b/view/pdl/mod_photos.pdl @@ -2,6 +2,9 @@ [widget=profile][/widget] [widget=photo_albums][/widget] [/region] +[region=content] +$content +[/region] [region=right_aside] [widget=notifications][/widget] [widget=newmember][/widget] diff --git a/view/pdl/mod_profile.pdl b/view/pdl/mod_profile.pdl index 7e15fc869..df722e5bf 100644 --- a/view/pdl/mod_profile.pdl +++ b/view/pdl/mod_profile.pdl @@ -1,6 +1,9 @@ [region=aside] [widget=fullprofile][/widget] [/region] +[region=content] +$content +[/region] [region=right_aside] [widget=notifications][/widget] [widget=newmember][/widget] diff --git a/view/pdl/mod_profile_photo.pdl b/view/pdl/mod_profile_photo.pdl index 7e15fc869..df722e5bf 100644 --- a/view/pdl/mod_profile_photo.pdl +++ b/view/pdl/mod_profile_photo.pdl @@ -1,6 +1,9 @@ [region=aside] [widget=fullprofile][/widget] [/region] +[region=content] +$content +[/region] [region=right_aside] [widget=notifications][/widget] [widget=newmember][/widget] diff --git a/view/pdl/mod_profiles.pdl b/view/pdl/mod_profiles.pdl index 7e15fc869..df722e5bf 100644 --- a/view/pdl/mod_profiles.pdl +++ b/view/pdl/mod_profiles.pdl @@ -1,6 +1,9 @@ [region=aside] [widget=fullprofile][/widget] [/region] +[region=content] +$content +[/region] [region=right_aside] [widget=notifications][/widget] [widget=newmember][/widget] diff --git a/view/pdl/mod_profperm.pdl b/view/pdl/mod_profperm.pdl index d7e5d29f3..47af1ed38 100644 --- a/view/pdl/mod_profperm.pdl +++ b/view/pdl/mod_profperm.pdl @@ -1,6 +1,9 @@ [region=aside] [widget=profile][/widget] [/region] +[region=content] +$content +[/region] [region=right_aside] [widget=notifications][/widget] [widget=newmember][/widget] diff --git a/view/pdl/mod_pubstream.pdl b/view/pdl/mod_pubstream.pdl index 539900155..914218e19 100644 --- a/view/pdl/mod_pubstream.pdl +++ b/view/pdl/mod_pubstream.pdl @@ -1,6 +1,9 @@ [region=aside] [widget=pubtagcloud][var=trending]8[/var][var=limit]20[/var][/widget] [/region] +[region=content] +$content +[/region] [region=right_aside] [widget=notifications][/widget] [widget=newmember][/widget] diff --git a/view/pdl/mod_rate.pdl b/view/pdl/mod_rate.pdl deleted file mode 100644 index a5461df50..000000000 --- a/view/pdl/mod_rate.pdl +++ /dev/null @@ -1,7 +0,0 @@ -[region=aside] -[widget=vcard][/widget] -[/region] -[region=right_aside] -[widget=notifications][/widget] -[widget=newmember][/widget] -[/region] diff --git a/view/pdl/mod_ratings.pdl b/view/pdl/mod_ratings.pdl deleted file mode 100644 index f6e87cb7c..000000000 --- a/view/pdl/mod_ratings.pdl +++ /dev/null @@ -1,11 +0,0 @@ -[region=aside] -[widget=pubsites][/widget] -[widget=vcard][/widget] -[widget=rating][/widget] -[widget=suggestions][/widget] -[widget=findpeople][/widget] -[/region] -[region=right_aside] -[widget=notifications][/widget] -[widget=newmember][/widget] -[/region] diff --git a/view/pdl/mod_search.pdl b/view/pdl/mod_search.pdl index ed1f77c5a..11cdb4672 100644 --- a/view/pdl/mod_search.pdl +++ b/view/pdl/mod_search.pdl @@ -1,5 +1,8 @@ [region=aside] [/region] +[region=content] +$content +[/region] [region=right_aside] [widget=notifications][/widget] [widget=newmember][/widget] diff --git a/view/pdl/mod_settings.pdl b/view/pdl/mod_settings.pdl index 37c85c765..759dbf039 100644 --- a/view/pdl/mod_settings.pdl +++ b/view/pdl/mod_settings.pdl @@ -1,6 +1,9 @@ [region=aside] [widget=settings_menu][/widget] [/region] +[region=content] +$content +[/region] [region=right_aside] [widget=notifications][/widget] [widget=newmember][/widget] diff --git a/view/pdl/mod_sharedwithme.pdl b/view/pdl/mod_sharedwithme.pdl index 95f069031..11cdb4672 100644 --- a/view/pdl/mod_sharedwithme.pdl +++ b/view/pdl/mod_sharedwithme.pdl @@ -1,3 +1,8 @@ +[region=aside] +[/region] +[region=content] +$content +[/region] [region=right_aside] [widget=notifications][/widget] [widget=newmember][/widget] diff --git a/view/pdl/mod_sources.pdl b/view/pdl/mod_sources.pdl index 37c85c765..759dbf039 100644 --- a/view/pdl/mod_sources.pdl +++ b/view/pdl/mod_sources.pdl @@ -1,6 +1,9 @@ [region=aside] [widget=settings_menu][/widget] [/region] +[region=content] +$content +[/region] [region=right_aside] [widget=notifications][/widget] [widget=newmember][/widget] diff --git a/view/pdl/mod_suggest.pdl b/view/pdl/mod_suggest.pdl index b74391cba..7878bca4e 100644 --- a/view/pdl/mod_suggest.pdl +++ b/view/pdl/mod_suggest.pdl @@ -2,6 +2,9 @@ [widget=follow][/widget] [widget=findpeople][/widget] [/region] +[region=content] +$content +[/region] [region=right_aside] [widget=notifications][/widget] [widget=newmember][/widget] diff --git a/view/pdl/mod_thing.pdl b/view/pdl/mod_thing.pdl index 7e15fc869..df722e5bf 100644 --- a/view/pdl/mod_thing.pdl +++ b/view/pdl/mod_thing.pdl @@ -1,6 +1,9 @@ [region=aside] [widget=fullprofile][/widget] [/region] +[region=content] +$content +[/region] [region=right_aside] [widget=notifications][/widget] [widget=newmember][/widget] diff --git a/view/pdl/mod_tokens.pdl b/view/pdl/mod_tokens.pdl index 97bdc3ab4..6a81829fe 100644 --- a/view/pdl/mod_tokens.pdl +++ b/view/pdl/mod_tokens.pdl @@ -1,6 +1,9 @@ [region=aside] [widget=tokens][/widget] [/region] +[region=content] +$content +[/region] [region=right_aside] [widget=notifications][/widget] [widget=newmember][/widget] diff --git a/view/pdl/mod_uexport.pdl b/view/pdl/mod_uexport.pdl index ed1f77c5a..11cdb4672 100644 --- a/view/pdl/mod_uexport.pdl +++ b/view/pdl/mod_uexport.pdl @@ -1,5 +1,8 @@ [region=aside] [/region] +[region=content] +$content +[/region] [region=right_aside] [widget=notifications][/widget] [widget=newmember][/widget] diff --git a/view/pdl/mod_viewconnections.pdl b/view/pdl/mod_viewconnections.pdl index d7e5d29f3..47af1ed38 100644 --- a/view/pdl/mod_viewconnections.pdl +++ b/view/pdl/mod_viewconnections.pdl @@ -1,6 +1,9 @@ [region=aside] [widget=profile][/widget] [/region] +[region=content] +$content +[/region] [region=right_aside] [widget=notifications][/widget] [widget=newmember][/widget] diff --git a/view/pdl/mod_webpages.pdl b/view/pdl/mod_webpages.pdl index d13bf8862..87945fb5f 100644 --- a/view/pdl/mod_webpages.pdl +++ b/view/pdl/mod_webpages.pdl @@ -2,6 +2,9 @@ [widget=design_tools][/widget] [widget=website_portation_tools][/widget] [/region] +[region=content] +$content +[/region] [region=right_aside] [widget=notifications][/widget] [widget=newmember][/widget] diff --git a/view/pdl/mod_wiki.pdl b/view/pdl/mod_wiki.pdl index db8faa0d9..e650e364e 100644 --- a/view/pdl/mod_wiki.pdl +++ b/view/pdl/mod_wiki.pdl @@ -2,6 +2,9 @@ [widget=profile][/widget] [widget=wiki_pages][/widget] [/region] +[region=content] +$content +[/region] [region=right_aside] [widget=notifications][/widget] [widget=newmember][/widget] diff --git a/view/tpl/photo_album_portfolio.tpl b/view/tpl/photo_album_portfolio.tpl index 1635e0ae1..e939ac3e1 100644 --- a/view/tpl/photo_album_portfolio.tpl +++ b/view/tpl/photo_album_portfolio.tpl @@ -1,7 +1,7 @@ {{if isset($mode) && $mode == 'orbit'}} <div class="row"> <div class="orbit small-12 medium-9 large-9 columns" id="photo-album-contents-{{$album_id}}" role="region" aria-label="portfolioOrbit-{{$album_id}}" data-orbit data-options="animInFromLeft:fade-in; animInFromRight:fade-in; animOutToLeft:fade-out; animOutToRight:fade-out;"> - + <ul class="orbit-container"> <button class="orbit-previous"><span class="show-for-sr">Previous Slide</span>◀︎</button> <button class="orbit-next"><span class="show-for-sr">Next Slide</span>▶︎</button> diff --git a/view/tpl/suggest_widget.tpl b/view/tpl/suggest_widget.tpl index 7b9afa668..d4a5a56f9 100644 --- a/view/tpl/suggest_widget.tpl +++ b/view/tpl/suggest_widget.tpl @@ -6,5 +6,5 @@ {{/foreach}} {{/if}} <div class="clear"></div> -<div class="suggest-widget-more"><a href="suggest">{{$more}}</a></div> +<div class="suggest-widget-more"><a href="directory?f=&suggest=1">{{$more}}</a></div> </div> |