From b55e2776ccc72be172cdf9a6d29e35716a592708 Mon Sep 17 00:00:00 2001 From: Andrew Manning Date: Thu, 19 May 2016 07:03:42 -0400 Subject: [PATCH 1/3] Improved plugin repo management UI in admin/plugins --- view/tpl/admin_plugins.tpl | 55 ++++++++++++++++++++++++++------------ 1 file changed, 38 insertions(+), 17 deletions(-) diff --git a/view/tpl/admin_plugins.tpl b/view/tpl/admin_plugins.tpl index f21a3057e..29187e974 100755 --- a/view/tpl/admin_plugins.tpl +++ b/view/tpl/admin_plugins.tpl @@ -1,33 +1,54 @@
- +

{{$title}} - {{$page}}

-
+
+
-
-

Installed Plugin Repositories

- {{foreach $addonrepos as $repo}} - -
- {{$repo.name}} - - - -
- -
- {{/foreach}} -
{{foreach $plugins as $p}}
From d5ca889cf5d479135560b1f915fb5d3986b28c65 Mon Sep 17 00:00:00 2001 From: Andrew Manning Date: Thu, 19 May 2016 07:09:13 -0400 Subject: [PATCH 2/3] Replace text strings for translation support --- Zotlabs/Module/Admin.php | 4 +++- view/tpl/admin_plugins.tpl | 12 +++--------- 2 files changed, 6 insertions(+), 10 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/view/tpl/admin_plugins.tpl b/view/tpl/admin_plugins.tpl index 29187e974..993a4dea2 100755 --- a/view/tpl/admin_plugins.tpl +++ b/view/tpl/admin_plugins.tpl @@ -1,7 +1,7 @@
- +

{{$title}} - {{$page}}

@@ -10,7 +10,7 @@
-

Installed Plugin Repositories

+

{{$installedtitle}}

@@ -26,12 +26,6 @@ -
{{/foreach}} @@ -39,7 +33,7 @@
-

Install a New Plugin Repository

+

{{$addnewrepotitle}}

{{$form}} From 6b69184554d2e24f539d9841a9cb2d851f9aa5a7 Mon Sep 17 00:00:00 2001 From: Treer Date: Thu, 19 May 2016 22:37:21 +1000 Subject: [PATCH 3/3] fix permission string --- include/PermissionDescription.php | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) 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 '';