From d54f5a3831ec003468e33185318a060711cb9c09 Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Fri, 15 Jul 2016 01:43:09 -0700
Subject: more cleanup of atoken UI

---
 Zotlabs/Module/Settings.php       | 5 ++++-
 view/theme/redbasic/css/style.css | 5 ++++-
 view/tpl/settings_tokens.tpl      | 1 +
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Zotlabs/Module/Settings.php b/Zotlabs/Module/Settings.php
index 44088fea5..20aa59f78 100644
--- a/Zotlabs/Module/Settings.php
+++ b/Zotlabs/Module/Settings.php
@@ -134,7 +134,7 @@ class Settings extends \Zotlabs\Web\Controller {
 					$expires = NULL_DATE;
 			}
 			if($token_errs) {
-				notice( t('Name and Token are required.') . EOL);
+				notice( t('Name and Password are required.') . EOL);
 				return;
 			}
 			if($atoken_id) {
@@ -774,10 +774,13 @@ class Settings extends \Zotlabs\Web\Controller {
 				intval(local_channel())
 			);			
 
+			$desc = t('Use this form to create temporary access identifiers to share things with non-members. These identities may be used in Access Control Lists and visitors may login using these credentials to access the private content.');
+
 			$tpl = get_markup_template("settings_tokens.tpl");
 			$o .= replace_macros($tpl, array(
 				'$form_security_token' => get_form_security_token("settings_tokens"),
 				'$title'	=> t('Guest Access Tokens'),
+				'$desc'     => $desc,
 				'$tokens' => $t,
 				'$atoken' => $atoken,
 				'$name' => array('name', t('Login Name'), (($atoken) ? $atoken['atoken_name'] : ''),''),
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 5f1637c50..e39c9eb11 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -2045,5 +2045,8 @@ dl.bb-dl > dd > li {
 	list-style-type: none;
 }
 .atoken-list li {
-	margin-bottom: 8px;
+	margin-bottom: 10px;
+}
+.atoken-text {
+	margin: 5px 10px 5px 10px;
 }
\ No newline at end of file
diff --git a/view/tpl/settings_tokens.tpl b/view/tpl/settings_tokens.tpl
index 73c6e9a64..a81d65dfc 100644
--- a/view/tpl/settings_tokens.tpl
+++ b/view/tpl/settings_tokens.tpl
@@ -3,6 +3,7 @@
 		<h2>{{$title}}</h2>
 		<div class="clear"></div>
 	</div>
+	<div class="atoken-text descriptive-text">{{$desc}}</div>
 	<form action="settings/tokens" id="settings-account-form" method="post" autocomplete="off" >
 		<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
 		{{if $atoken}}<input type="hidden" name="atoken_id" value="{{$atoken.atoken_id}}" />{{/if}}
-- 
cgit v1.2.3