Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev

3 files changed, 37 insertions, 28 deletions

diff --git a/Zotlabs/Module/Admin.php b/Zotlabs/Module/Admin.php
index cb843e212..4d052cdf8 100644
--- a/Zotlabs/Module/Admin.php
+++ b/Zotlabs/Module/Admin.php
@@ -1408,7 +1408,9 @@ class Admin extends \Zotlabs\Web\Controller {
 			'$plugins' => $plugins,
 			'$disabled' => t('Disabled - version incompatibility'),
 			'$form_security_token' => get_form_security_token('admin_plugins'),
-			'$addrepo' => t('Add Plugin Repo'),
+			'$managerepos' => t('Manage Repos'),
+			'$installedtitle' => t('Installed Plugin Repositories'),
+			'$addnewrepotitle' =>	t('Install a New Plugin Repository'),
 			'$expandform' => false,
 			'$form' => $admin_plugins_add_repo_form,
 			'$newRepoModal' => $newRepoModal,
diff --git a/include/PermissionDescription.php b/include/PermissionDescription.php
index 75dd9ecf7..1f7799406 100644
--- a/include/PermissionDescription.php
+++ b/include/PermissionDescription.php
@@ -117,11 +117,7 @@ class PermissionDescription  {
 			case PERMS_NETWORK:  return t('Anybody in the $Projectname network');
 			case PERMS_SITE:     return sprintf(t('Any account on %s'), \App::get_hostname());
 			case PERMS_CONTACTS: return t('Any of my connections');
-			case PERMS_SPECIFIC: 
-				// Because we're describing the permissions of an item with an empty ACL,
-				// the owner will be the only person able to see it if the permissions are 
-				// set to "only specified connections".
-				return t('Only me (only specified contacts and me)'); 
+			case PERMS_SPECIFIC: return t('Only connections I specifically allow');
 			case PERMS_AUTHED:   return t('Anybody authenticated (could include visitors from other networks)');
 			case PERMS_PENDING:  return t('Any connections including those who haven\'t yet been approved');
 			default:             return $this->fallback_description;
@@ -143,11 +139,7 @@ class PermissionDescription  {
 			case PERMS_NETWORK:  return 'fa-share-alt-square'; // fa-share-alt-square is very similiar to the hubzilla logo, but we should create our own logo class to use
 			case PERMS_SITE:     return 'fa-sitemap'; 
 			case PERMS_CONTACTS: return 'fa-group'; 
-			case PERMS_SPECIFIC: 
-				// Because we're describing the permissions of an item with an empty ACL,
-				// the owner will be the only person able to see it if the permissions are 
-				// set to "only specified connections".
-				return 'fa-eye-slash'; 
+			case PERMS_SPECIFIC: return 'fa-list';
 			case PERMS_AUTHED:   return '';
 			case PERMS_PENDING:  return '';
 			default:             return '';
diff --git a/view/tpl/admin_plugins.tpl b/view/tpl/admin_plugins.tpl
index f21a3057e..993a4dea2 100755
--- a/view/tpl/admin_plugins.tpl
+++ b/view/tpl/admin_plugins.tpl
@@ -1,33 +1,48 @@
 <div class="generic-content-wrapper">
 	<div class="section-title-wrapper">
 		<div class="pull-right">
-			<button class="btn btn-success btn-xs" onclick="openClose('form');">{{$addrepo}}</button>
+			<button class="btn btn-success btn-xs" onclick="openClose('form');">{{$managerepos}}</button>
 		</div>
 		<h2 id="title">{{$title}} - {{$page}}</h2>
 		<div class="clear"></div>
 	</div>
 	<div id="form" class="section-content-tools-wrapper"{{if !$expandform}} style="display:none;"{{/if}}>
+         
+        <div class="clear"></div>
+        <div class="section-title-wrapper" style="margin-top: 20px;">
+          <h2>{{$installedtitle}}</h2>
+          <div class="clear"></div>
+        </div>
+      <div class="table-responsive section-content-tools-wrapper">
+      <table class="table table-responsive table-striped table-hover">
+        {{foreach $addonrepos as $repo}}
+        <tr>
+            <td style="width: 70%;">
+              <span class="pull-left">{{$repo.name}}</span>
+            </td>
+            <td style="width: 15%;">
+              <button class="btn btn-xs btn-primary pull-right" style="margin-left: 10px; margin-right: 10px;" onclick="updateAddonRepo('{{$repo.name}}'); return false;"><i class='fa fa-download'></i>&nbsp;{{$repoUpdateButton}}</button>
+            </td>
+            <td style="width: 15%;">
+              <button class="btn btn-xs btn-danger pull-right" style="margin-left: 10px; margin-right: 0px;" onclick="removeAddonRepo('{{$repo.name}}'); return false;"><i class='fa fa-trash-o'></i>&nbsp;{{$repoRemoveButton}}</button>
+            </td>
+        <div class="clear"></div>
+        </td></tr>
+        {{/foreach}}
+        </table>
+      </div>
+      <div class="clear"></div>
+         <div class="section-title-wrapper">
+          <h2>{{$addnewrepotitle}}</h2>
+          <div class="clear"></div>
+        </div>
 		{{$form}}
-	</div>
-	<div class="clear"></div>
+    </div>
+      <div class="clear"></div>
     <div id="chat-rotator-wrapper" class="center-block">
         <div id="chat-rotator"></div>
     </div>
     <div class="clear"></div>
-    <div class="section-content-info-wrapper">
-      <h3>Installed Plugin Repositories</h3>
-      {{foreach $addonrepos as $repo}}
-<!--      <div class="section-content-tools-wrapper">	-->
-		<div style="margin-left: 30%; margin-right: 30%;">
-          <span class="pull-left">{{$repo.name}}</span>
-          <!--<button class="btn btn-xs btn-primary pull-right" onclick="switchAddonRepoBranch('{{$repo.name}}'); return false;">{{$repoBranchButton}}</button>-->
-          <button class="btn btn-xs btn-danger pull-right" style="margin-left: 10px; margin-right: 0px;" onclick="removeAddonRepo('{{$repo.name}}'); return false;"><i class='fa fa-trash-o'></i>&nbsp;{{$repoRemoveButton}}</button>
-          <button class="btn btn-xs btn-primary pull-right" style="margin-left: 10px; margin-right: 10px;" onclick="updateAddonRepo('{{$repo.name}}'); return false;"><i class='fa fa-download'></i>&nbsp;{{$repoUpdateButton}}</button>
-		</div>
-<!--      </div>-->
-      <div class="clear"></div>
-      {{/foreach}}
-    </div>
 	<div class="section-content-wrapper-np">
       {{foreach $plugins as $p}}
       <div class="section-content-tools-wrapper" id="pluginslist">