sites => communities

Code/Lib/Apps.php

@@ -358,6 +358,7 @@ class Apps
             'Chatrooms' => t('Chatrooms'),
             'Clients' => t('Clients'),
             'Comment Control' => t('Comment Control'),
+            'Communities' => t('Communities'),
             'Connections' => t('Connections'),
             'Content Filter' => t('Content Filter'),
             'Content Import' => t('Content Import'),

Code/Module/Communities.php

@@ -9,7 +9,7 @@ use Code\Web\Controller;
 use Code\Render\Theme;
 
 
-class Sites extends Controller
+class Communities extends Controller
 {
 
     public function get()
@@ -125,7 +125,7 @@ class Sites extends Controller
                     'photo' => $logo,
                     'about' => bbcode($about),
                     'hash' => substr(hash('sha256', $rr['site_url']), 0, 16),
-                    'network_label' => t('Project'),
+                    'network_label' => t('Type'),
                     'network' => $rr['site_project'],
                     'version_label' => t('Version'),
                     'version' => $rr['site_version'],
@@ -175,7 +175,7 @@ class Sites extends Controller
             }
         }
         $projects = array_keys($ret);
-        rsort($projects);
+        sort($projects);
 
         $newret = [];
         foreach ($projects as $p) {

Code/Widget/Findpeople.php

@@ -37,7 +37,7 @@ class Findpeople
             '$suggest' => t('Channel Suggestions'),
             '$similar' => '', // FIXME and uncomment when mod/match working // t('Similar Interests'),
             '$random' => '', // t('Random Profile'),
-            '$sites' => t('Affiliated sites'),
+            '$sites' => t('Communities'),
             '$inv' => '', // t('Invite Friends'),
             '$advanced_search' => $advanced_search,
             '$advanced_hint' => "\r\n" . t('Advanced example: name=fred and country=iceland'),

Code/Widget/Site_projects.php

@@ -32,9 +32,9 @@ class Site_projects
             }
 
             $o = replace_macros(Theme::get_template('site_projects.tpl'), [
-                '$title' => t('Projects'),
+                '$title' => t('Community Types'),
                 '$desc' => '',
-                '$all' => t('All projects'),
+                '$all' => t('All community types'),
                 'base' => z_root() . '/sites',
                 '$sel_all' => (($_REQUEST['project']) ? false : true),
                 '$terms' => $results
@@ -46,9 +46,6 @@ class Site_projects
 
     public static function site_sort($a, $b)
     {
-        if ($a['site_type'] === $b['site_type']) {
+        return strcasecmp($a['site_project'], $b['site_project']);
-            return strcasecmp($b['site_project'], $a['site_project']);
-        }
-        return (($a['site_type'] < $b['site_type']) ? -1 : 1);
     }
 }

app/communities.apd

@@ -1,5 +1,5 @@
 version: 1
-url: $baseurl/sites
+url: $baseurl/communities
 name: Sites
 photo: icon:cloud
 categories: Networking

include/text.php

@@ -1515,9 +1515,8 @@ function theme_attachments(&$item)
         $attaches = [];
         foreach ($arr as $r) {
             $label = EMPTY_STR;
-            if (isset($r['type']) && $r['type']) {
+            $icon = getIconFromType(isset($r['type']) ? $r['type'] : 'application/octet-stream');
-                $icon = getIconFromType($r['type']);
+
-            }
             if (isset($r['title']) && $r['title']) {
                 $label = urldecode(htmlspecialchars($r['title'], ENT_COMPAT, 'UTF-8'));
             }

view/pdl/mod_communities.pdl

@@ -4,4 +4,4 @@
 [region=right_aside]
 [widget=notifications][/widget]
 [widget=newmember][/widget]
-[/region]
+[/region]

view/tpl/peoplefind.tpl

@@ -11,7 +11,7 @@
 	<ul class="nav nav-pills flex-column">
 		{{if $similar}}<li class="nav-item"><a class="nav-link" href="match" >{{$similar}}</a></li>{{/if}}
 		{{if $loggedin}}<li class="nav-item"><a class="nav-link" href="directory?f=&suggest=1" >{{$suggest}}</a></li>{{/if}}
-		{{if $sites}}<li class="nav-item"><a class="nav-link" href="sites" >{{$sites}}</a></li>{{/if}}
+		{{if $sites}}<li class="nav-item"><a class="nav-link" href="communities" >{{$sites}}</a></li>{{/if}}
 		<li class="nav-item"><a class="nav-link" href="randprof" >{{$random}}</a></li>
 		{{if $loggedin}}{{if $inv}}<li class="nav-item"><a class="nav-link" href="invite" >{{$inv}}</a></li>{{/if}}{{/if}}
 	</ul>

view/tpl/site_projects.tpl

@@ -5,7 +5,7 @@
 	<ul class="nav nav-pills flex-column">
 		<li class="nav-item"><a href="{{$base}}" class="nav-link{{if $sel_all}} active{{/if}}">{{$all}}</a></li>
 		{{foreach $terms as $term}}
-		<li class="nav-item"><a  href="{{$base}}?project={{$term.name|urlencode}}" class="nav-link{{if $term.selected}} active{{/if}}">{{if $term.type == 0}}<strong>{{$term.cname}}</strong>{{else}}{{$term.cname}}{{/if}}</a></li>
+		<li class="nav-item"><a  href="{{$base}}?project={{$term.name|urlencode}}" class="nav-link{{if $term.selected}} active{{/if}}">{{$term.cname}}</a></li>
 		{{/foreach}}
 	</ul>
 </div>