aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-08-24 18:34:12 -0700
committerzotlabs <mike@macgirvin.com>2017-08-24 18:34:12 -0700
commit5c92337821834853dc03eecbc8af9e59b16b70a1 (patch)
treeb462d85d5e466f94de8319af79adda03078ff13d
parent341386a95ba68227f60964ab50f9b20989ac6802 (diff)
downloadvolse-hubzilla-5c92337821834853dc03eecbc8af9e59b16b70a1.tar.gz
volse-hubzilla-5c92337821834853dc03eecbc8af9e59b16b70a1.tar.bz2
volse-hubzilla-5c92337821834853dc03eecbc8af9e59b16b70a1.zip
cards - change placeholdertext, separate from button text
-rw-r--r--Zotlabs/Module/Cards.php2
-rw-r--r--include/conversation.php6
-rwxr-xr-xview/tpl/jot.tpl2
3 files changed, 8 insertions, 2 deletions
diff --git a/Zotlabs/Module/Cards.php b/Zotlabs/Module/Cards.php
index 9114e3b89..22c5d673c 100644
--- a/Zotlabs/Module/Cards.php
+++ b/Zotlabs/Module/Cards.php
@@ -92,6 +92,8 @@ class Cards extends \Zotlabs\Web\Controller {
$x = [
'webpage' => ITEM_TYPE_CARD,
'is_owner' => true,
+ 'content_label' => t('Add Card'),
+ 'button' => t('Create'),
'nickname' => $channel['channel_address'],
'lockstate' => (($channel['channel_allow_cid'] || $channel['channel_allow_gid']
|| $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),
diff --git a/include/conversation.php b/include/conversation.php
index 5cb85c3f9..9a48a83d2 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1340,10 +1340,14 @@ function status_editor($a, $x, $popup = false) {
call_hooks('jot_networks', $jotnets);
}
+ $sharebutton = (x($x,'button') ? $x['button'] : t('Share'));
+ $placeholdtext = (x($x,'content_label') ? $x['content_label'] : $sharebutton);
+
$o .= replace_macros($tpl, array(
'$return_path' => ((x($x, 'return_path')) ? $x['return_path'] : App::$query_string),
'$action' => z_root() . '/item',
- '$share' => (x($x,'button') ? $x['button'] : t('Share')),
+ '$share' => $sharebutton,
+ '$placeholdtext' => $placeholdtext,
'$webpage' => $webpage,
'$placeholdpagetitle' => ((x($x,'ptlabel')) ? $x['ptlabel'] : t('Page link name')),
'$pagetitle' => (x($x,'pagetitle') ? $x['pagetitle'] : ''),
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index 39ba9e59b..ce17f2f24 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -41,7 +41,7 @@
</div>
{{/if}}
<div id="jot-text-wrap">
- <textarea class="profile-jot-text" id="profile-jot-text" name="body" tabindex="2" placeholder="{{$share}}" >{{$content}}</textarea>
+ <textarea class="profile-jot-text" id="profile-jot-text" name="body" tabindex="2" placeholder="{{$placeholdtext}}" >{{$content}}</textarea>
</div>
{{if $attachment}}
<div id="jot-attachment-wrap">