harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cards - change placeholdertext, separate from button text

Browse Source
This commit is contained in:
zotlabs 2017-08-24 18:34:12 -07:00
parent 341386a95b
commit 5c92337821
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Module/Cards.php
View File

@ -92,6 +92,8 @@ class Cards extends \Zotlabs\Web\Controller {
$x = [ $x = [
'webpage' => ITEM_TYPE_CARD, 'webpage' => ITEM_TYPE_CARD,
'is_owner' => true, 'is_owner' => true,
'content_label' => t('Add Card'),
'button' => t('Create'),
'nickname' => $channel['channel_address'], 'nickname' => $channel['channel_address'],
'lockstate' => (($channel['channel_allow_cid'] || $channel['channel_allow_gid'] 'lockstate' => (($channel['channel_allow_cid'] || $channel['channel_allow_gid']
|| $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),

6
include/conversation.php
View File

@ -1340,10 +1340,14 @@ function status_editor($a, $x, $popup = false) {
call_hooks('jot_networks', $jotnets); 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( $o .= replace_macros($tpl, array(
'$return_path' => ((x($x, 'return_path')) ? $x['return_path'] : App::$query_string), '$return_path' => ((x($x, 'return_path')) ? $x['return_path'] : App::$query_string),
'$action' => z_root() . '/item', '$action' => z_root() . '/item',
'$share' => (x($x,'button') ? $x['button'] : t('Share')), '$share' => $sharebutton,
'$placeholdtext' => $placeholdtext,
'$webpage' => $webpage, '$webpage' => $webpage,
'$placeholdpagetitle' => ((x($x,'ptlabel')) ? $x['ptlabel'] : t('Page link name')), '$placeholdpagetitle' => ((x($x,'ptlabel')) ? $x['ptlabel'] : t('Page link name')),
'$pagetitle' => (x($x,'pagetitle') ? $x['pagetitle'] : ''), '$pagetitle' => (x($x,'pagetitle') ? $x['pagetitle'] : ''),

2
view/tpl/jot.tpl
View File

@ -41,7 +41,7 @@
</div> </div>
{{/if}} {{/if}}
<div id="jot-text-wrap"> <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> </div>
{{if $attachment}} {{if $attachment}}
<div id="jot-attachment-wrap"> <div id="jot-attachment-wrap">