keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

revert unnecessary variable name changes

Browse source
This commit is contained in:
Zach Prezkuta 2012-12-26 10:42:01 -07:00
parent 189c8ccf6f
commit 263fe0f6bc
58 changed files with 261 additions and 265 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
boot.php
View file

@ -1358,7 +1358,7 @@ if(! function_exists('profile_sidebar')) {
'$pdesc' => $pdesc, '$pdesc' => $pdesc,
'$marital' => $marital, '$marital' => $marital,
'$homepage' => $homepage, '$homepage' => $homepage,
'$diaspora_info' => $diaspora, '$diaspora' => $diaspora,
'$contact_block' => $contact_block, '$contact_block' => $contact_block,
)); ));

1
include/conversation.php
View file

@ -703,6 +703,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
$o = replace_macros($page_template, array( $o = replace_macros($page_template, array(
'$baseurl' => $a->get_baseurl($ssl_state), '$baseurl' => $a->get_baseurl($ssl_state),
'$live_update' => $live_update_div, '$live_update' => $live_update_div,
'$remove' => t('remove'),
'$mode' => $mode, '$mode' => $mode,
'$user' => $a->user, '$user' => $a->user,
'$threads' => $threads, '$threads' => $threads,

66
mod/message.php
View file

@ -282,25 +282,23 @@ function message_content(&$a) {
$tpl = get_markup_template('prv_message.tpl'); $tpl = get_markup_template('prv_message.tpl');
$o .= replace_macros($tpl,array( $o .= replace_macros($tpl,array(
'$reply' => array( '$header' => t('Send Private Message'),
'header' => t('Send Private Message'), '$to' => t('To:'),
'to' => t('To:'), '$showinputs' => 'true',
'showinputs' => 'true', '$prefill' => $prefill,
'prefill' => $prefill, '$autocomp' => $autocomp,
'autocomp' => $autocomp, '$preid' => $preid,
'preid' => $preid, '$subject' => t('Subject:'),
'subject' => t('Subject:'), '$subjtxt' => ((x($_REQUEST,'subject')) ? strip_tags($_REQUEST['subject']) : ''),
'subjtxt' => ((x($_REQUEST,'subject')) ? strip_tags($_REQUEST['subject']) : ''), '$text' => ((x($_REQUEST,'body')) ? escape_tags(htmlspecialchars($_REQUEST['body'])) : ''),
'text' => ((x($_REQUEST,'body')) ? escape_tags(htmlspecialchars($_REQUEST['body'])) : ''), '$readonly' => '',
'readonly' => '', '$yourmessage' => t('Your message:'),
'yourmessage' => t('Your message:'), '$select' => $select,
'select' => $select, '$parent' => '',
'parent' => '', '$upload' => t('Upload photo'),
'upload' => t('Upload photo'), '$insert' => t('Insert web link'),
'insert' => t('Insert web link'), '$wait' => t('Please wait'),
'wait' => t('Please wait'), '$submit' => t('Submit')
'submit' => t('Submit')
)
)); ));
return $o; return $o;
@ -514,22 +512,20 @@ function message_content(&$a) {
'$mails' => $mails, '$mails' => $mails,
// reply // reply
'$reply_info' => array( '$header' => t('Send Reply'),
'header' => t('Send Reply'), '$to' => t('To:'),
'to' => t('To:'), '$showinputs' => '',
'showinputs' => '', '$subject' => t('Subject:'),
'subject' => t('Subject:'), '$subjtxt' => template_escape($message['title']),
'subjtxt' => $subjtxt_e, '$readonly' => ' readonly="readonly" style="background: #BBBBBB;" ',
'readonly' => ' readonly="readonly" style="background: #BBBBBB;" ', '$yourmessage' => t('Your message:'),
'yourmessage' => t('Your message:'), '$text' => '',
'text' => '', '$select' => $select,
'select' => $select, '$parent' => $parent,
'parent' => $parent, '$upload' => t('Upload photo'),
'upload' => t('Upload photo'), '$insert' => t('Insert web link'),
'insert' => t('Insert web link'), '$submit' => t('Submit'),
'submit' => t('Submit'), '$wait' => t('Please wait')
'wait' => t('Please wait'),
),
)); ));

10
mod/notifications.php
View file

@ -218,7 +218,7 @@ function notifications_content(&$a) {
$o .= replace_macros($notif_tpl, array( $o .= replace_macros($notif_tpl, array(
'$notif_header' => t('Notifications'), '$notif_header' => t('Notifications'),
'$tabs_data' => $tabs, '$tabs' => $tabs,
'$notif_content' => $notif_content, '$notif_content' => $notif_content,
)); ));
@ -304,7 +304,7 @@ function notifications_content(&$a) {
$o .= replace_macros($notif_tpl, array( $o .= replace_macros($notif_tpl, array(
'$notif_header' => t('Network Notifications'), '$notif_header' => t('Network Notifications'),
'$tabs_data' => $tabs, '$tabs' => $tabs,
'$notif_content' => $notif_content, '$notif_content' => $notif_content,
)); ));
@ -334,7 +334,7 @@ function notifications_content(&$a) {
$o .= replace_macros($notif_tpl, array( $o .= replace_macros($notif_tpl, array(
'$notif_header' => t('System Notifications'), '$notif_header' => t('System Notifications'),
'$tabs_data' => $tabs, '$tabs' => $tabs,
'$notif_content' => $notif_content, '$notif_content' => $notif_content,
)); ));
@ -429,7 +429,7 @@ function notifications_content(&$a) {
$o .= replace_macros($notif_tpl, array( $o .= replace_macros($notif_tpl, array(
'$notif_header' => t('Personal Notifications'), '$notif_header' => t('Personal Notifications'),
'$tabs_data' => $tabs, '$tabs' => $tabs,
'$notif_content' => $notif_content, '$notif_content' => $notif_content,
)); ));
@ -510,7 +510,7 @@ function notifications_content(&$a) {
$o .= replace_macros($notif_tpl, array( $o .= replace_macros($notif_tpl, array(
'$notif_header' => t('Home Notifications'), '$notif_header' => t('Home Notifications'),
'$tabs_data' => $tabs, '$tabs' => $tabs,
'$notif_content' => $notif_content, '$notif_content' => $notif_content,
)); ));
} }

2
mod/notify.php
View file

@ -63,7 +63,7 @@ function notify_content(&$a) {
$o .= replace_macros($notif_tpl, array( $o .= replace_macros($notif_tpl, array(
'$notif_header' => t('System Notifications'), '$notif_header' => t('System Notifications'),
'$tabs_data' => '', // $tabs, '$tabs' => '', // $tabs,
'$notif_content' => $notif_content, '$notif_content' => $notif_content,
)); ));

1
object/Item.php
View file

@ -285,7 +285,6 @@ class Item extends BaseObject {
'comment' => $this->get_comment_box($indent), 'comment' => $this->get_comment_box($indent),
'previewing' => ($conv->is_preview() ? ' preview ' : ''), 'previewing' => ($conv->is_preview() ? ' preview ' : ''),
'wait' => t('Please wait'), 'wait' => t('Please wait'),
'remove' => t('remove'),
'thread_level' => $thread_level 'thread_level' => $thread_level
); );

2
view/mail_display.tpl
View file

@ -4,7 +4,7 @@
{{ endfor }} {{ endfor }}
{{ if $canreply }} {{ if $canreply }}
{{ inc prv_message.tpl with $reply=$reply_info }}{{ endinc }} {{ inc prv_message.tpl }}{{ endinc }}
{{ else }} {{ else }}
$unknown_text $unknown_text
{{endif }} {{endif }}

2
view/notifications.tpl
View file

@ -1,7 +1,7 @@
<h1>$notif_header</h1> <h1>$notif_header</h1>
{{ inc common_tabs.tpl with $tabs=$tabs_data }}{{ endinc }} {{ inc common_tabs.tpl }}{{ endinc }}
<div class="notif-network-wrapper"> <div class="notif-network-wrapper">
$notif_content $notif_content

2
view/profile_vcard.tpl
View file

@ -31,7 +31,7 @@
{{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }} {{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
{{ inc diaspora_vcard.tpl with $diaspora=$diaspora_info }}{{ endinc }} {{ inc diaspora_vcard.tpl }}{{ endinc }}
<div id="profile-extra-links"> <div id="profile-extra-links">
<ul> <ul>

24
view/prv_message.tpl
View file

@ -1,31 +1,31 @@
<h3>$reply.header</h3> <h3>$header</h3>
<div id="prvmail-wrapper" > <div id="prvmail-wrapper" >
<form id="prvmail-form" action="message" method="post" > <form id="prvmail-form" action="message" method="post" >
$reply.parent $parent
<div id="prvmail-to-label">$reply.to</div> <div id="prvmail-to-label">$to</div>
$reply.select $select
<div id="prvmail-subject-label">$reply.subject</div> <div id="prvmail-subject-label">$subject</div>
<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="$reply.subjtxt" $reply.readonly tabindex="11" /> <input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="$subjtxt" $readonly tabindex="11" />
<div id="prvmail-message-label">$reply.yourmessage</div> <div id="prvmail-message-label">$yourmessage</div>
<textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">$reply.text</textarea> <textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">$text</textarea>
<div id="prvmail-submit-wrapper" > <div id="prvmail-submit-wrapper" >
<input type="submit" id="prvmail-submit" name="submit" value="$reply.submit" tabindex="13" /> <input type="submit" id="prvmail-submit" name="submit" value="$submit" tabindex="13" />
<div id="prvmail-upload-wrapper" > <div id="prvmail-upload-wrapper" >
<div id="prvmail-upload" class="icon border camera" title="$reply.upload" ></div> <div id="prvmail-upload" class="icon border camera" title="$upload" ></div>
</div> </div>
<div id="prvmail-link-wrapper" > <div id="prvmail-link-wrapper" >
<div id="prvmail-link" class="icon border link" title="$reply.insert" onclick="jotGetLink();" ></div> <div id="prvmail-link" class="icon border link" title="$insert" onclick="jotGetLink();" ></div>
</div> </div>
<div id="prvmail-rotator-wrapper" > <div id="prvmail-rotator-wrapper" >
<img id="prvmail-rotator" src="images/rotator.gif" alt="$reply.wait" title="$reply.wait" style="display: none;" /> <img id="prvmail-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
</div> </div>
</div> </div>
<div id="prvmail-end"></div> <div id="prvmail-end"></div>

2
view/smarty3/mail_display.tpl
View file

@ -4,7 +4,7 @@
{{/foreach}} {{/foreach}}
{{if $canreply}} {{if $canreply}}
{{include file="prv_message.tpl" reply=$reply_info}} {{include file="prv_message.tpl"}}
{{else}} {{else}}
{{$unknown_text}} {{$unknown_text}}
{{/if}} {{/if}}

2
view/smarty3/notifications.tpl
View file

@ -1,7 +1,7 @@
<h1>{{$notif_header}}</h1> <h1>{{$notif_header}}</h1>
{{include file="common_tabs.tpl" tabs=$tabs_data}} {{include file="common_tabs.tpl"}}
<div class="notif-network-wrapper"> <div class="notif-network-wrapper">
{{$notif_content}} {{$notif_content}}

2
view/smarty3/profile_vcard.tpl
View file

@ -31,7 +31,7 @@
{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}} {{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}
{{include file="diaspora_vcard.tpl" diaspora=$diaspora_info}} {{include file="diaspora_vcard.tpl"}}
<div id="profile-extra-links"> <div id="profile-extra-links">
<ul> <ul>

24
view/smarty3/prv_message.tpl
View file

@ -1,31 +1,31 @@
<h3>{{$reply.header}}</h3> <h3>{{$header}}</h3>
<div id="prvmail-wrapper" > <div id="prvmail-wrapper" >
<form id="prvmail-form" action="message" method="post" > <form id="prvmail-form" action="message" method="post" >
{{$reply.parent}} {{$parent}}
<div id="prvmail-to-label">{{$reply.to}}</div> <div id="prvmail-to-label">{{$to}}</div>
{{$reply.select}} {{$select}}
<div id="prvmail-subject-label">{{$reply.subject}}</div> <div id="prvmail-subject-label">{{$subject}}</div>
<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="{{$reply.subjtxt}}" {{$reply.readonly}} tabindex="11" /> <input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="{{$subjtxt}}" {{$readonly}} tabindex="11" />
<div id="prvmail-message-label">{{$reply.yourmessage}}</div> <div id="prvmail-message-label">{{$yourmessage}}</div>
<textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">{{$reply.text}}</textarea> <textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">{{$text}}</textarea>
<div id="prvmail-submit-wrapper" > <div id="prvmail-submit-wrapper" >
<input type="submit" id="prvmail-submit" name="submit" value="{{$reply.submit}}" tabindex="13" /> <input type="submit" id="prvmail-submit" name="submit" value="{{$submit}}" tabindex="13" />
<div id="prvmail-upload-wrapper" > <div id="prvmail-upload-wrapper" >
<div id="prvmail-upload" class="icon border camera" title="{{$reply.upload}}" ></div> <div id="prvmail-upload" class="icon border camera" title="{{$upload}}" ></div>
</div> </div>
<div id="prvmail-link-wrapper" > <div id="prvmail-link-wrapper" >
<div id="prvmail-link" class="icon border link" title="{{$reply.insert}}" onclick="jotGetLink();" ></div> <div id="prvmail-link" class="icon border link" title="{{$insert}}" onclick="jotGetLink();" ></div>
</div> </div>
<div id="prvmail-rotator-wrapper" > <div id="prvmail-rotator-wrapper" >
<img id="prvmail-rotator" src="images/rotator.gif" alt="{{$reply.wait}}" title="{{$reply.wait}}" style="display: none;" /> <img id="prvmail-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
</div> </div>
</div> </div>
<div id="prvmail-end"></div> <div id="prvmail-end"></div>

4
view/smarty3/wall_thread.tpl
View file

@ -50,12 +50,12 @@
{{/foreach}} {{/foreach}}
</div> </div>
{{if $item.has_cats}} {{if $item.has_cats}}
<div class="categorytags"><span>{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}}{{if $cat.removeurl}} <a href="{{$cat.removeurl}}" title="{{$item.remove}}">[{{$item.remove}}]</a>{{/if}} {{if $cat.last}}{{else}}, {{/if}}{{/foreach}} <div class="categorytags"><span>{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}}{{if $cat.removeurl}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a>{{/if}} {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
</div> </div>
{{/if}} {{/if}}
{{if $item.has_folders}} {{if $item.has_folders}}
<div class="filesavetags"><span>{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}}{{if $cat.removeurl}} <a href="{{$cat.removeurl}}" title="{{$item.remove}}">[{{$item.remove}}]</a>{{/if}}{{if $cat.last}}{{else}}, {{/if}}{{/foreach}} <div class="filesavetags"><span>{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}}{{if $cat.removeurl}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a>{{/if}}{{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
</div> </div>
{{/if}} {{/if}}
</div> </div>

2
view/theme/diabook/mail_display.tpl
View file

@ -9,4 +9,4 @@
</div> </div>
{{ endfor }} {{ endfor }}
{{ inc prv_message.tpl with $reply=$reply_info }}{{ endinc }} {{ inc prv_message.tpl }}{{ endinc }}

2
view/theme/diabook/profile_vcard.tpl
View file

@ -48,7 +48,7 @@
{{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }} {{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
{{ inc diaspora_vcard.tpl with $diaspora=$diaspora_info }}{{ endinc }} {{ inc diaspora_vcard.tpl }}{{ endinc }}
<div id="profile-extra-links"> <div id="profile-extra-links">
<ul> <ul>

30
view/theme/diabook/prv_message.tpl
View file

@ -1,38 +1,38 @@
<h3>$reply.header</h3> <h3>$header</h3>
<div id="prvmail-wrapper" > <div id="prvmail-wrapper" >
<form id="prvmail-form" action="message" method="post" > <form id="prvmail-form" action="message" method="post" >
$reply.parent $parent
<div id="prvmail-to-label">$reply.to</div> <div id="prvmail-to-label">$to</div>
{{ if $reply.showinputs }} {{ if $showinputs }}
<input type="text" id="recip" style="background: none repeat scroll 0 0 white;border: 1px solid #CCC;border-radius: 5px 5px 5px 5px;height: 20px;margin: 0 0 5px; <input type="text" id="recip" style="background: none repeat scroll 0 0 white;border: 1px solid #CCC;border-radius: 5px 5px 5px 5px;height: 20px;margin: 0 0 5px;
vertical-align: middle;" name="messageto" value="$reply.prefill" maxlength="255" size="64" tabindex="10" /> vertical-align: middle;" name="messageto" value="$prefill" maxlength="255" size="64" tabindex="10" />
<input type="hidden" id="recip-complete" name="messageto" value="$reply.preid"> <input type="hidden" id="recip-complete" name="messageto" value="$preid">
{{ else }} {{ else }}
$reply.select $select
{{ endif }} {{ endif }}
<div id="prvmail-subject-label">$reply.subject</div> <div id="prvmail-subject-label">$subject</div>
<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="$reply.subjtxt" $reply.readonly tabindex="11" /> <input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="$subjtxt" $readonly tabindex="11" />
<div id="prvmail-message-label">$reply.yourmessage</div> <div id="prvmail-message-label">$yourmessage</div>
<textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">$reply.text</textarea> <textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">$text</textarea>
<div id="prvmail-submit-wrapper" > <div id="prvmail-submit-wrapper" >
<input type="submit" id="prvmail-submit" name="submit" value="$reply.submit" tabindex="13" /> <input type="submit" id="prvmail-submit" name="submit" value="$submit" tabindex="13" />
<div id="prvmail-upload-wrapper" > <div id="prvmail-upload-wrapper" >
<div id="prvmail-upload" class="icon border camera" title="$reply.upload" ></div> <div id="prvmail-upload" class="icon border camera" title="$upload" ></div>
</div> </div>
<div id="prvmail-link-wrapper" > <div id="prvmail-link-wrapper" >
<div id="prvmail-link" class="icon border link" title="$reply.insert" onclick="jotGetLink();" ></div> <div id="prvmail-link" class="icon border link" title="$insert" onclick="jotGetLink();" ></div>
</div> </div>
<div id="prvmail-rotator-wrapper" > <div id="prvmail-rotator-wrapper" >
<img id="prvmail-rotator" src="images/rotator.gif" alt="$reply.wait" title="$reply.wait" style="display: none;" /> <img id="prvmail-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
</div> </div>
</div> </div>
<div id="prvmail-end"></div> <div id="prvmail-end"></div>

2
view/theme/diabook/smarty3/mail_display.tpl
View file

@ -9,4 +9,4 @@
</div> </div>
{{/foreach}} {{/foreach}}
{{include file="prv_message.tpl" reply=$reply_info}} {{include file="prv_message.tpl"}}

2
view/theme/diabook/smarty3/profile_vcard.tpl
View file

@ -48,7 +48,7 @@
{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}} {{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}
{{include file="diaspora_vcard.tpl" diaspora=$diaspora_info}} {{include file="diaspora_vcard.tpl"}}
<div id="profile-extra-links"> <div id="profile-extra-links">
<ul> <ul>

30
view/theme/diabook/smarty3/prv_message.tpl
View file

@ -1,38 +1,38 @@
<h3>{{$reply.header}}</h3> <h3>{{$header}}</h3>
<div id="prvmail-wrapper" > <div id="prvmail-wrapper" >
<form id="prvmail-form" action="message" method="post" > <form id="prvmail-form" action="message" method="post" >
{{$reply.parent}} {{$parent}}
<div id="prvmail-to-label">{{$reply.to}}</div> <div id="prvmail-to-label">{{$to}}</div>
{{if $reply.showinputs}} {{if $showinputs}}
<input type="text" id="recip" style="background: none repeat scroll 0 0 white;border: 1px solid #CCC;border-radius: 5px 5px 5px 5px;height: 20px;margin: 0 0 5px; <input type="text" id="recip" style="background: none repeat scroll 0 0 white;border: 1px solid #CCC;border-radius: 5px 5px 5px 5px;height: 20px;margin: 0 0 5px;
vertical-align: middle;" name="messageto" value="{{$reply.prefill}}" maxlength="255" size="64" tabindex="10" /> vertical-align: middle;" name="messageto" value="{{$prefill}}" maxlength="255" size="64" tabindex="10" />
<input type="hidden" id="recip-complete" name="messageto" value="{{$reply.preid}}"> <input type="hidden" id="recip-complete" name="messageto" value="{{$preid}}">
{{else}} {{else}}
{{$reply.select}} {{$select}}
{{/if}} {{/if}}
<div id="prvmail-subject-label">{{$reply.subject}}</div> <div id="prvmail-subject-label">{{$subject}}</div>
<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="{{$reply.subjtxt}}" {{$reply.readonly}} tabindex="11" /> <input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="{{$subjtxt}}" {{$readonly}} tabindex="11" />
<div id="prvmail-message-label">{{$reply.yourmessage}}</div> <div id="prvmail-message-label">{{$yourmessage}}</div>
<textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">{{$reply.text}}</textarea> <textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">{{$text}}</textarea>
<div id="prvmail-submit-wrapper" > <div id="prvmail-submit-wrapper" >
<input type="submit" id="prvmail-submit" name="submit" value="{{$reply.submit}}" tabindex="13" /> <input type="submit" id="prvmail-submit" name="submit" value="{{$submit}}" tabindex="13" />
<div id="prvmail-upload-wrapper" > <div id="prvmail-upload-wrapper" >
<div id="prvmail-upload" class="icon border camera" title="{{$reply.upload}}" ></div> <div id="prvmail-upload" class="icon border camera" title="{{$upload}}" ></div>
</div> </div>
<div id="prvmail-link-wrapper" > <div id="prvmail-link-wrapper" >
<div id="prvmail-link" class="icon border link" title="{{$reply.insert}}" onclick="jotGetLink();" ></div> <div id="prvmail-link" class="icon border link" title="{{$insert}}" onclick="jotGetLink();" ></div>
</div> </div>
<div id="prvmail-rotator-wrapper" > <div id="prvmail-rotator-wrapper" >
<img id="prvmail-rotator" src="images/rotator.gif" alt="{{$reply.wait}}" title="{{$reply.wait}}" style="display: none;" /> <img id="prvmail-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
</div> </div>
</div> </div>
<div id="prvmail-end"></div> <div id="prvmail-end"></div>

2
view/theme/dispy/profile_vcard.tpl
View file

@ -67,7 +67,7 @@
target="external-link">$profile.homepage</a></span> target="external-link">$profile.homepage</a></span>
</div>{{ endif }} </div>{{ endif }}
{{ inc diaspora_vcard.tpl with $diaspora=$diaspora_info }}{{ endinc }} {{ inc diaspora_vcard.tpl }}{{ endinc }}
<div id="profile-extra-links"> <div id="profile-extra-links">
<ul> <ul>

2
view/theme/dispy/smarty3/profile_vcard.tpl
View file

@ -67,7 +67,7 @@
target="external-link">{{$profile.homepage}}</a></span> target="external-link">{{$profile.homepage}}</a></span>
</div>{{/if}} </div>{{/if}}
{{include file="diaspora_vcard.tpl" diaspora=$diaspora_info}} {{include file="diaspora_vcard.tpl"}}
<div id="profile-extra-links"> <div id="profile-extra-links">
<ul> <ul>

4
view/theme/dispy/smarty3/wall_thread.tpl
View file

@ -98,12 +98,12 @@ class="icon recycle wall-item-share-buttons" title="{{$item.vote.share.0}}" onc
{{/foreach}} {{/foreach}}
</div> </div>
{{if $item.has_cats}} {{if $item.has_cats}}
<div class="categorytags"><span>{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$item.remove}}">[{{$item.remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}} <div class="categorytags"><span>{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
</div> </div>
{{/if}} {{/if}}
{{if $item.has_folders}} {{if $item.has_folders}}
<div class="filesavetags"><span>{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$item.remove}}">[{{$item.remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}} <div class="filesavetags"><span>{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
</div> </div>
{{/if}} {{/if}}

4
view/theme/dispy/wall_thread.tpl
View file

@ -98,12 +98,12 @@ class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick
{{ endfor }} {{ endfor }}
</div> </div>
{{ if $item.has_cats }} {{ if $item.has_cats }}
<div class="categorytags"><span>$item.txt_cats {{ for $item.categories as $cat }}$cat.name <a href="$cat.removeurl" title="$item.remove">[$item.remove]</a> {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} <div class="categorytags"><span>$item.txt_cats {{ for $item.categories as $cat }}$cat.name <a href="$cat.removeurl" title="$remove">[$remove]</a> {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
</div> </div>
{{ endif }} {{ endif }}
{{ if $item.has_folders }} {{ if $item.has_folders }}
<div class="filesavetags"><span>$item.txt_folders {{ for $item.folders as $cat }}$cat.name <a href="$cat.removeurl" title="$item.remove">[$item.remove]</a> {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} <div class="filesavetags"><span>$item.txt_folders {{ for $item.folders as $cat }}$cat.name <a href="$cat.removeurl" title="$remove">[$remove]</a> {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
</div> </div>
{{ endif }} {{ endif }}

2
view/theme/duepuntozero/profile_vcard.tpl
View file

@ -31,7 +31,7 @@
{{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }} {{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
{{ inc diaspora_vcard.tpl with $diaspora=$diaspora_info }}{{ endinc }} {{ inc diaspora_vcard.tpl }}{{ endinc }}
<div id="profile-vcard-break"></div> <div id="profile-vcard-break"></div>
<div id="profile-extra-links"> <div id="profile-extra-links">

30
view/theme/duepuntozero/prv_message.tpl
View file

@ -1,37 +1,37 @@
<h3>$reply.header</h3> <h3>$header</h3>
<div id="prvmail-wrapper" > <div id="prvmail-wrapper" >
<form id="prvmail-form" action="message" method="post" > <form id="prvmail-form" action="message" method="post" >
$reply.parent $parent
<div id="prvmail-to-label">$reply.to</div> <div id="prvmail-to-label">$to</div>
{{ if $reply.showinputs }} {{ if $showinputs }}
<input type="text" id="recip" name="messagerecip" value="$reply.prefill" maxlength="255" size="64" tabindex="10" /> <input type="text" id="recip" name="messagerecip" value="$prefill" maxlength="255" size="64" tabindex="10" />
<input type="hidden" id="recip-complete" name="messageto" value="$reply.preid"> <input type="hidden" id="recip-complete" name="messageto" value="$preid">
{{ else }} {{ else }}
$reply.select $select
{{ endif }} {{ endif }}
<div id="prvmail-subject-label">$reply.subject</div> <div id="prvmail-subject-label">$subject</div>
<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="$reply.subjtxt" $reply.readonly tabindex="11" /> <input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="$subjtxt" $readonly tabindex="11" />
<div id="prvmail-message-label">$reply.yourmessage</div> <div id="prvmail-message-label">$yourmessage</div>
<textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">$reply.text</textarea> <textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">$text</textarea>
<div id="prvmail-submit-wrapper" > <div id="prvmail-submit-wrapper" >
<input type="submit" id="prvmail-submit" name="submit" value="$reply.submit" tabindex="13" /> <input type="submit" id="prvmail-submit" name="submit" value="$submit" tabindex="13" />
<div id="prvmail-upload-wrapper" > <div id="prvmail-upload-wrapper" >
<div id="prvmail-upload" class="icon border camera" title="$reply.upload" ></div> <div id="prvmail-upload" class="icon border camera" title="$upload" ></div>
</div> </div>
<div id="prvmail-link-wrapper" > <div id="prvmail-link-wrapper" >
<div id="prvmail-link" class="icon border link" title="$reply.insert" onclick="jotGetLink();" ></div> <div id="prvmail-link" class="icon border link" title="$insert" onclick="jotGetLink();" ></div>
</div> </div>
<div id="prvmail-rotator-wrapper" > <div id="prvmail-rotator-wrapper" >
<img id="prvmail-rotator" src="images/rotator.gif" alt="$reply.wait" title="$reply.wait" style="display: none;" /> <img id="prvmail-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
</div> </div>
</div> </div>
<div id="prvmail-end"></div> <div id="prvmail-end"></div>

2
view/theme/duepuntozero/smarty3/profile_vcard.tpl
View file

@ -31,7 +31,7 @@
{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}} {{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}
{{include file="diaspora_vcard.tpl" diaspora=$diaspora_info}} {{include file="diaspora_vcard.tpl"}}
<div id="profile-vcard-break"></div> <div id="profile-vcard-break"></div>
<div id="profile-extra-links"> <div id="profile-extra-links">

30
view/theme/duepuntozero/smarty3/prv_message.tpl
View file

@ -1,37 +1,37 @@
<h3>{{$reply.header}}</h3> <h3>{{$header}}</h3>
<div id="prvmail-wrapper" > <div id="prvmail-wrapper" >
<form id="prvmail-form" action="message" method="post" > <form id="prvmail-form" action="message" method="post" >
{{$reply.parent}} {{$parent}}
<div id="prvmail-to-label">{{$reply.to}}</div> <div id="prvmail-to-label">{{$to}}</div>
{{if $reply.showinputs}} {{if $showinputs}}
<input type="text" id="recip" name="messagerecip" value="{{$reply.prefill}}" maxlength="255" size="64" tabindex="10" /> <input type="text" id="recip" name="messagerecip" value="{{$prefill}}" maxlength="255" size="64" tabindex="10" />
<input type="hidden" id="recip-complete" name="messageto" value="{{$reply.preid}}"> <input type="hidden" id="recip-complete" name="messageto" value="{{$preid}}">
{{else}} {{else}}
{{$reply.select}} {{$select}}
{{/if}} {{/if}}
<div id="prvmail-subject-label">{{$reply.subject}}</div> <div id="prvmail-subject-label">{{$subject}}</div>
<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="{{$reply.subjtxt}}" {{$reply.readonly}} tabindex="11" /> <input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="{{$subjtxt}}" {{$readonly}} tabindex="11" />
<div id="prvmail-message-label">{{$reply.yourmessage}}</div> <div id="prvmail-message-label">{{$yourmessage}}</div>
<textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">{{$reply.text}}</textarea> <textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">{{$text}}</textarea>
<div id="prvmail-submit-wrapper" > <div id="prvmail-submit-wrapper" >
<input type="submit" id="prvmail-submit" name="submit" value="{{$reply.submit}}" tabindex="13" /> <input type="submit" id="prvmail-submit" name="submit" value="{{$submit}}" tabindex="13" />
<div id="prvmail-upload-wrapper" > <div id="prvmail-upload-wrapper" >
<div id="prvmail-upload" class="icon border camera" title="{{$reply.upload}}" ></div> <div id="prvmail-upload" class="icon border camera" title="{{$upload}}" ></div>
</div> </div>
<div id="prvmail-link-wrapper" > <div id="prvmail-link-wrapper" >
<div id="prvmail-link" class="icon border link" title="{{$reply.insert}}" onclick="jotGetLink();" ></div> <div id="prvmail-link" class="icon border link" title="{{$insert}}" onclick="jotGetLink();" ></div>
</div> </div>
<div id="prvmail-rotator-wrapper" > <div id="prvmail-rotator-wrapper" >
<img id="prvmail-rotator" src="images/rotator.gif" alt="{{$reply.wait}}" title="{{$reply.wait}}" style="display: none;" /> <img id="prvmail-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
</div> </div>
</div> </div>
<div id="prvmail-end"></div> <div id="prvmail-end"></div>

2
view/theme/facepark/profile_vcard.tpl
View file

@ -31,7 +31,7 @@
{{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }} {{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
{{ inc diaspora_vcard.tpl with $diaspora=$diaspora_info }}{{ endinc }} {{ inc diaspora_vcard.tpl }}{{ endinc }}
<div id="profile-extra-links"> <div id="profile-extra-links">
<ul> <ul>

2
view/theme/facepark/smarty3/profile_vcard.tpl
View file

@ -31,7 +31,7 @@
{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}} {{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}
{{include file="diaspora_vcard.tpl" diaspora=$diaspora_info}} {{include file="diaspora_vcard.tpl"}}
<div id="profile-extra-links"> <div id="profile-extra-links">
<ul> <ul>

2
view/theme/frost-mobile/profile_vcard.tpl
View file

@ -31,7 +31,7 @@
{{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }} {{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
{{ inc diaspora_vcard.tpl with $diaspora=$diaspora_info }}{{ endinc }} {{ inc diaspora_vcard.tpl }}{{ endinc }}
<div id="profile-vcard-break"></div> <div id="profile-vcard-break"></div>
<div id="profile-extra-links"> <div id="profile-extra-links">

30
view/theme/frost-mobile/prv_message.tpl
View file

@ -1,37 +1,37 @@
<h3>$reply.header</h3> <h3>$header</h3>
<div id="prvmail-wrapper" > <div id="prvmail-wrapper" >
<form id="prvmail-form" action="message" method="post" > <form id="prvmail-form" action="message" method="post" >
$reply.parent $parent
<div id="prvmail-to-label">$reply.to</div> <div id="prvmail-to-label">$to</div>
{{ if $reply.showinputs }} {{ if $showinputs }}
<input type="text" id="recip" name="messageto" value="$reply.prefill" maxlength="255" size="64" tabindex="10" /> <input type="text" id="recip" name="messageto" value="$prefill" maxlength="255" size="64" tabindex="10" />
<input type="hidden" id="recip-complete" name="messageto" value="$reply.preid"> <input type="hidden" id="recip-complete" name="messageto" value="$preid">
{{ else }} {{ else }}
$reply.select $select
{{ endif }} {{ endif }}
<div id="prvmail-subject-label">$reply.subject</div> <div id="prvmail-subject-label">$subject</div>
<input type="text" size="28" maxlength="255" id="prvmail-subject" name="subject" value="$reply.subjtxt" $reply.readonly tabindex="11" /> <input type="text" size="28" maxlength="255" id="prvmail-subject" name="subject" value="$subjtxt" $readonly tabindex="11" />
<div id="prvmail-message-label">$reply.yourmessage</div> <div id="prvmail-message-label">$yourmessage</div>
<textarea rows="8" cols="32" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">$reply.text</textarea> <textarea rows="8" cols="32" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">$text</textarea>
<div id="prvmail-submit-wrapper" > <div id="prvmail-submit-wrapper" >
<input type="submit" id="prvmail-submit" name="submit" value="$reply.submit" tabindex="13" /> <input type="submit" id="prvmail-submit" name="submit" value="$submit" tabindex="13" />
<div id="prvmail-upload-wrapper" > <div id="prvmail-upload-wrapper" >
<div id="prvmail-upload" class="icon border camera" title="$reply.upload" ></div> <div id="prvmail-upload" class="icon border camera" title="$upload" ></div>
</div> </div>
<div id="prvmail-link-wrapper" > <div id="prvmail-link-wrapper" >
<div id="prvmail-link" class="icon border link" title="$reply.insert" onclick="jotGetLink();" ></div> <div id="prvmail-link" class="icon border link" title="$insert" onclick="jotGetLink();" ></div>
</div> </div>
<div id="prvmail-rotator-wrapper" > <div id="prvmail-rotator-wrapper" >
<img id="prvmail-rotator" src="images/rotator.gif" alt="$reply.wait" title="$reply.wait" style="display: none;" /> <img id="prvmail-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
</div> </div>
</div> </div>
<div id="prvmail-end"></div> <div id="prvmail-end"></div>

2
view/theme/frost-mobile/smarty3/profile_vcard.tpl
View file

@ -31,7 +31,7 @@
{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}} {{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}
{{include file="diaspora_vcard.tpl" diaspora=$diaspora_info}} {{include file="diaspora_vcard.tpl"}}
<div id="profile-vcard-break"></div> <div id="profile-vcard-break"></div>
<div id="profile-extra-links"> <div id="profile-extra-links">

30
view/theme/frost-mobile/smarty3/prv_message.tpl
View file

@ -1,37 +1,37 @@
<h3>{{$reply.header}}</h3> <h3>{{$header}}</h3>
<div id="prvmail-wrapper" > <div id="prvmail-wrapper" >
<form id="prvmail-form" action="message" method="post" > <form id="prvmail-form" action="message" method="post" >
{{$reply.parent}} {{$parent}}
<div id="prvmail-to-label">{{$reply.to}}</div> <div id="prvmail-to-label">{{$to}}</div>
{{if $reply.showinputs}} {{if $showinputs}}
<input type="text" id="recip" name="messageto" value="{{$reply.prefill}}" maxlength="255" size="64" tabindex="10" /> <input type="text" id="recip" name="messageto" value="{{$prefill}}" maxlength="255" size="64" tabindex="10" />
<input type="hidden" id="recip-complete" name="messageto" value="{{$reply.preid}}"> <input type="hidden" id="recip-complete" name="messageto" value="{{$preid}}">
{{else}} {{else}}
{{$reply.select}} {{$select}}
{{/if}} {{/if}}
<div id="prvmail-subject-label">{{$reply.subject}}</div> <div id="prvmail-subject-label">{{$subject}}</div>
<input type="text" size="28" maxlength="255" id="prvmail-subject" name="subject" value="{{$reply.subjtxt}}" {{$reply.readonly}} tabindex="11" /> <input type="text" size="28" maxlength="255" id="prvmail-subject" name="subject" value="{{$subjtxt}}" {{$readonly}} tabindex="11" />
<div id="prvmail-message-label">{{$reply.yourmessage}}</div> <div id="prvmail-message-label">{{$yourmessage}}</div>
<textarea rows="8" cols="32" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">{{$reply.text}}</textarea> <textarea rows="8" cols="32" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">{{$text}}</textarea>
<div id="prvmail-submit-wrapper" > <div id="prvmail-submit-wrapper" >
<input type="submit" id="prvmail-submit" name="submit" value="{{$reply.submit}}" tabindex="13" /> <input type="submit" id="prvmail-submit" name="submit" value="{{$submit}}" tabindex="13" />
<div id="prvmail-upload-wrapper" > <div id="prvmail-upload-wrapper" >
<div id="prvmail-upload" class="icon border camera" title="{{$reply.upload}}" ></div> <div id="prvmail-upload" class="icon border camera" title="{{$upload}}" ></div>
</div> </div>
<div id="prvmail-link-wrapper" > <div id="prvmail-link-wrapper" >
<div id="prvmail-link" class="icon border link" title="{{$reply.insert}}" onclick="jotGetLink();" ></div> <div id="prvmail-link" class="icon border link" title="{{$insert}}" onclick="jotGetLink();" ></div>
</div> </div>
<div id="prvmail-rotator-wrapper" > <div id="prvmail-rotator-wrapper" >
<img id="prvmail-rotator" src="images/rotator.gif" alt="{{$reply.wait}}" title="{{$reply.wait}}" style="display: none;" /> <img id="prvmail-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
</div> </div>
</div> </div>
<div id="prvmail-end"></div> <div id="prvmail-end"></div>

4
view/theme/frost-mobile/smarty3/wall_thread.tpl
View file

@ -53,12 +53,12 @@
{{/foreach}} {{/foreach}}
<!--</div>--> <!--</div>-->
{{if $item.has_cats}} {{if $item.has_cats}}
<div class="categorytags">{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$item.remove}}">[{{$item.remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}} <div class="categorytags">{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
</div> </div>
{{/if}} {{/if}}
{{if $item.has_folders}} {{if $item.has_folders}}
<div class="filesavetags">{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$item.remove}}">[{{$item.remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}} <div class="filesavetags">{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
</div> </div>
{{/if}} {{/if}}
</div> </div>

4
view/theme/frost-mobile/wall_thread.tpl
View file

@ -53,12 +53,12 @@
{{ endfor }} {{ endfor }}
<!--</div>--> <!--</div>-->
{{ if $item.has_cats }} {{ if $item.has_cats }}
<div class="categorytags">$item.txt_cats {{ for $item.categories as $cat }}$cat.name <a href="$cat.removeurl" title="$item.remove">[$item.remove]</a> {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} <div class="categorytags">$item.txt_cats {{ for $item.categories as $cat }}$cat.name <a href="$cat.removeurl" title="$remove">[$remove]</a> {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
</div> </div>
{{ endif }} {{ endif }}
{{ if $item.has_folders }} {{ if $item.has_folders }}
<div class="filesavetags">$item.txt_folders {{ for $item.folders as $cat }}$cat.name <a href="$cat.removeurl" title="$item.remove">[$item.remove]</a> {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} <div class="filesavetags">$item.txt_folders {{ for $item.folders as $cat }}$cat.name <a href="$cat.removeurl" title="$remove">[$remove]</a> {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
</div> </div>
{{ endif }} {{ endif }}
</div> </div>

2
view/theme/frost/profile_vcard.tpl
View file

@ -31,7 +31,7 @@
{{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }} {{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
{{ inc diaspora_vcard.tpl with $diaspora=$diaspora_info }}{{ endinc }} {{ inc diaspora_vcard.tpl }}{{ endinc }}
<div id="profile-vcard-break"></div> <div id="profile-vcard-break"></div>
<div id="profile-extra-links"> <div id="profile-extra-links">

30
view/theme/frost/prv_message.tpl
View file

@ -1,37 +1,37 @@
<h3>$reply.header</h3> <h3>$header</h3>
<div id="prvmail-wrapper" > <div id="prvmail-wrapper" >
<form id="prvmail-form" action="message" method="post" > <form id="prvmail-form" action="message" method="post" >
$reply.parent $parent
<div id="prvmail-to-label">$reply.to</div> <div id="prvmail-to-label">$to</div>
{{ if $reply.showinputs }} {{ if $showinputs }}
<input type="text" id="recip" name="messageto" value="$reply.prefill" maxlength="255" size="64" tabindex="10" /> <input type="text" id="recip" name="messageto" value="$prefill" maxlength="255" size="64" tabindex="10" />
<input type="hidden" id="recip-complete" name="messageto" value="$reply.preid"> <input type="hidden" id="recip-complete" name="messageto" value="$preid">
{{ else }} {{ else }}
$reply.select $select
{{ endif }} {{ endif }}
<div id="prvmail-subject-label">$reply.subject</div> <div id="prvmail-subject-label">$subject</div>
<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="$reply.subjtxt" $reply.readonly tabindex="11" /> <input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="$subjtxt" $readonly tabindex="11" />
<div id="prvmail-message-label">$reply.yourmessage</div> <div id="prvmail-message-label">$yourmessage</div>
<textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">$reply.text</textarea> <textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">$text</textarea>
<div id="prvmail-submit-wrapper" > <div id="prvmail-submit-wrapper" >
<input type="submit" id="prvmail-submit" name="submit" value="$reply.submit" tabindex="13" /> <input type="submit" id="prvmail-submit" name="submit" value="$submit" tabindex="13" />
<div id="prvmail-upload-wrapper" > <div id="prvmail-upload-wrapper" >
<div id="prvmail-upload" class="icon border camera" title="$reply.upload" ></div> <div id="prvmail-upload" class="icon border camera" title="$upload" ></div>
</div> </div>
<div id="prvmail-link-wrapper" > <div id="prvmail-link-wrapper" >
<div id="prvmail-link" class="icon border link" title="$reply.insert" onclick="jotGetLink();" ></div> <div id="prvmail-link" class="icon border link" title="$insert" onclick="jotGetLink();" ></div>
</div> </div>
<div id="prvmail-rotator-wrapper" > <div id="prvmail-rotator-wrapper" >
<img id="prvmail-rotator" src="images/rotator.gif" alt="$reply.wait" title="$reply.wait" style="display: none;" /> <img id="prvmail-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
</div> </div>
</div> </div>
<div id="prvmail-end"></div> <div id="prvmail-end"></div>

2
view/theme/frost/smarty3/profile_vcard.tpl
View file

@ -31,7 +31,7 @@
{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}} {{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}
{{include file="diaspora_vcard.tpl" diaspora=$diaspora_info}} {{include file="diaspora_vcard.tpl"}}
<div id="profile-vcard-break"></div> <div id="profile-vcard-break"></div>
<div id="profile-extra-links"> <div id="profile-extra-links">

30
view/theme/frost/smarty3/prv_message.tpl
View file

@ -1,37 +1,37 @@
<h3>{{$reply.header}}</h3> <h3>{{$header}}</h3>
<div id="prvmail-wrapper" > <div id="prvmail-wrapper" >
<form id="prvmail-form" action="message" method="post" > <form id="prvmail-form" action="message" method="post" >
{{$reply.parent}} {{$parent}}
<div id="prvmail-to-label">{{$reply.to}}</div> <div id="prvmail-to-label">{{$to}}</div>
{{if $reply.showinputs}} {{if $showinputs}}
<input type="text" id="recip" name="messageto" value="{{$reply.prefill}}" maxlength="255" size="64" tabindex="10" /> <input type="text" id="recip" name="messageto" value="{{$prefill}}" maxlength="255" size="64" tabindex="10" />
<input type="hidden" id="recip-complete" name="messageto" value="{{$reply.preid}}"> <input type="hidden" id="recip-complete" name="messageto" value="{{$preid}}">
{{else}} {{else}}
{{$reply.select}} {{$select}}
{{/if}} {{/if}}
<div id="prvmail-subject-label">{{$reply.subject}}</div> <div id="prvmail-subject-label">{{$subject}}</div>
<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="{{$reply.subjtxt}}" {{$reply.readonly}} tabindex="11" /> <input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="{{$subjtxt}}" {{$readonly}} tabindex="11" />
<div id="prvmail-message-label">{{$reply.yourmessage}}</div> <div id="prvmail-message-label">{{$yourmessage}}</div>
<textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">{{$reply.text}}</textarea> <textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">{{$text}}</textarea>
<div id="prvmail-submit-wrapper" > <div id="prvmail-submit-wrapper" >
<input type="submit" id="prvmail-submit" name="submit" value="{{$reply.submit}}" tabindex="13" /> <input type="submit" id="prvmail-submit" name="submit" value="{{$submit}}" tabindex="13" />
<div id="prvmail-upload-wrapper" > <div id="prvmail-upload-wrapper" >
<div id="prvmail-upload" class="icon border camera" title="{{$reply.upload}}" ></div> <div id="prvmail-upload" class="icon border camera" title="{{$upload}}" ></div>
</div> </div>
<div id="prvmail-link-wrapper" > <div id="prvmail-link-wrapper" >
<div id="prvmail-link" class="icon border link" title="{{$reply.insert}}" onclick="jotGetLink();" ></div> <div id="prvmail-link" class="icon border link" title="{{$insert}}" onclick="jotGetLink();" ></div>
</div> </div>
<div id="prvmail-rotator-wrapper" > <div id="prvmail-rotator-wrapper" >
<img id="prvmail-rotator" src="images/rotator.gif" alt="{{$reply.wait}}" title="{{$reply.wait}}" style="display: none;" /> <img id="prvmail-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
</div> </div>
</div> </div>
<div id="prvmail-end"></div> <div id="prvmail-end"></div>

4
view/theme/frost/smarty3/wall_thread.tpl
View file

@ -52,12 +52,12 @@
{{/foreach}} {{/foreach}}
<!--</div>--> <!--</div>-->
{{if $item.has_cats}} {{if $item.has_cats}}
<div class="categorytags">{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$item.remove}}">[{{$item.remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}} <div class="categorytags">{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
</div> </div>
{{/if}} {{/if}}
{{if $item.has_folders}} {{if $item.has_folders}}
<div class="filesavetags">{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$item.remove}}">[{{$item.remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}} <div class="filesavetags">{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
</div> </div>
{{/if}} {{/if}}
</div> </div>

4
view/theme/frost/wall_thread.tpl
View file

@ -52,12 +52,12 @@
{{ endfor }} {{ endfor }}
<!--</div>--> <!--</div>-->
{{ if $item.has_cats }} {{ if $item.has_cats }}
<div class="categorytags">$item.txt_cats {{ for $item.categories as $cat }}$cat.name <a href="$cat.removeurl" title="$item.remove">[$item.remove]</a> {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} <div class="categorytags">$item.txt_cats {{ for $item.categories as $cat }}$cat.name <a href="$cat.removeurl" title="$remove">[$remove]</a> {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
</div> </div>
{{ endif }} {{ endif }}
{{ if $item.has_folders }} {{ if $item.has_folders }}
<div class="filesavetags">$item.txt_folders {{ for $item.folders as $cat }}$cat.name <a href="$cat.removeurl" title="$item.remove">[$item.remove]</a> {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} <div class="filesavetags">$item.txt_folders {{ for $item.folders as $cat }}$cat.name <a href="$cat.removeurl" title="$remove">[$remove]</a> {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
</div> </div>
{{ endif }} {{ endif }}
</div> </div>

2
view/theme/quattro/mail_display.tpl
View file

@ -9,4 +9,4 @@
</div> </div>
{{ endfor }} {{ endfor }}
{{ inc prv_message.tpl with $reply=$reply_info }}{{ endinc }} {{ inc prv_message.tpl }}{{ endinc }}

2
view/theme/quattro/profile_vcard.tpl
View file

@ -49,7 +49,7 @@
class="homepage-label">$homepage</dt><dd class="homepage-url"><a class="homepage-label">$homepage</dt><dd class="homepage-url"><a
href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }} href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
{{ inc diaspora_vcard.tpl with $diaspora=$diaspora_info }}{{ endinc }} {{ inc diaspora_vcard.tpl }}{{ endinc }}
<div id="profile-extra-links"> <div id="profile-extra-links">
<ul> <ul>

24
view/theme/quattro/prv_message.tpl
View file

@ -1,31 +1,31 @@
<h3>$reply.header</h3> <h3>$header</h3>
<div id="prvmail-wrapper" > <div id="prvmail-wrapper" >
<form id="prvmail-form" action="message" method="post" > <form id="prvmail-form" action="message" method="post" >
$reply.parent $parent
<div id="prvmail-to-label">$reply.to</div> <div id="prvmail-to-label">$to</div>
$reply.select $select
<div id="prvmail-subject-label">$reply.subject</div> <div id="prvmail-subject-label">$subject</div>
<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="$reply.subjtxt" $reply.readonly tabindex="11" /> <input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="$subjtxt" $readonly tabindex="11" />
<div id="prvmail-message-label">$reply.yourmessage</div> <div id="prvmail-message-label">$yourmessage</div>
<textarea rows="20" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">$reply.text</textarea> <textarea rows="20" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">$text</textarea>
<div id="prvmail-submit-wrapper" > <div id="prvmail-submit-wrapper" >
<input type="submit" id="prvmail-submit" name="submit" value="$reply.submit" tabindex="13" /> <input type="submit" id="prvmail-submit" name="submit" value="$submit" tabindex="13" />
<div id="prvmail-upload-wrapper" > <div id="prvmail-upload-wrapper" >
<div id="prvmail-upload" class="icon border camera" title="$reply.upload" ></div> <div id="prvmail-upload" class="icon border camera" title="$upload" ></div>
</div> </div>
<div id="prvmail-link-wrapper" > <div id="prvmail-link-wrapper" >
<div id="prvmail-link" class="icon border link" title="$reply.insert" onclick="jotGetLink();" ></div> <div id="prvmail-link" class="icon border link" title="$insert" onclick="jotGetLink();" ></div>
</div> </div>
<div id="prvmail-rotator-wrapper" > <div id="prvmail-rotator-wrapper" >
<img id="prvmail-rotator" src="images/rotator.gif" alt="$reply.wait" title="$reply.wait" style="display: none;" /> <img id="prvmail-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
</div> </div>
</div> </div>
<div id="prvmail-end"></div> <div id="prvmail-end"></div>

2
view/theme/quattro/smarty3/mail_display.tpl
View file

@ -9,4 +9,4 @@
</div> </div>
{{/foreach}} {{/foreach}}
{{include file="prv_message.tpl" reply=$reply_info}} {{include file="prv_message.tpl"}}

2
view/theme/quattro/smarty3/profile_vcard.tpl
View file

@ -49,7 +49,7 @@
class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a
href="{{$profile.homepage}}" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}} href="{{$profile.homepage}}" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}
{{include file="diaspora_vcard.tpl" diaspora=$diaspora_info}} {{include file="diaspora_vcard.tpl"}}
<div id="profile-extra-links"> <div id="profile-extra-links">
<ul> <ul>

24
view/theme/quattro/smarty3/prv_message.tpl
View file

@ -1,31 +1,31 @@
<h3>{{$reply.header}}</h3> <h3>{{$header}}</h3>
<div id="prvmail-wrapper" > <div id="prvmail-wrapper" >
<form id="prvmail-form" action="message" method="post" > <form id="prvmail-form" action="message" method="post" >
{{$reply.parent}} {{$parent}}
<div id="prvmail-to-label">{{$reply.to}}</div> <div id="prvmail-to-label">{{$to}}</div>
{{$reply.select}} {{$select}}
<div id="prvmail-subject-label">{{$reply.subject}}</div> <div id="prvmail-subject-label">{{$subject}}</div>
<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="{{$reply.subjtxt}}" {{$reply.readonly}} tabindex="11" /> <input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="{{$subjtxt}}" {{$readonly}} tabindex="11" />
<div id="prvmail-message-label">{{$reply.yourmessage}}</div> <div id="prvmail-message-label">{{$yourmessage}}</div>
<textarea rows="20" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">{{$reply.text}}</textarea> <textarea rows="20" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">{{$text}}</textarea>
<div id="prvmail-submit-wrapper" > <div id="prvmail-submit-wrapper" >
<input type="submit" id="prvmail-submit" name="submit" value="{{$reply.submit}}" tabindex="13" /> <input type="submit" id="prvmail-submit" name="submit" value="{{$submit}}" tabindex="13" />
<div id="prvmail-upload-wrapper" > <div id="prvmail-upload-wrapper" >
<div id="prvmail-upload" class="icon border camera" title="{{$reply.upload}}" ></div> <div id="prvmail-upload" class="icon border camera" title="{{$upload}}" ></div>
</div> </div>
<div id="prvmail-link-wrapper" > <div id="prvmail-link-wrapper" >
<div id="prvmail-link" class="icon border link" title="{{$reply.insert}}" onclick="jotGetLink();" ></div> <div id="prvmail-link" class="icon border link" title="{{$insert}}" onclick="jotGetLink();" ></div>
</div> </div>
<div id="prvmail-rotator-wrapper" > <div id="prvmail-rotator-wrapper" >
<img id="prvmail-rotator" src="images/rotator.gif" alt="{{$reply.wait}}" title="{{$reply.wait}}" style="display: none;" /> <img id="prvmail-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
</div> </div>
</div> </div>
<div id="prvmail-end"></div> <div id="prvmail-end"></div>

4
view/theme/quattro/smarty3/wall_thread.tpl
View file

@ -67,10 +67,10 @@
<span class='mention'>{{$tag}}</span> <span class='mention'>{{$tag}}</span>
{{/foreach}} {{/foreach}}
{{foreach $item.folders as $cat}} {{foreach $item.folders as $cat}}
<span class='folder'>{{$cat.name}}</a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$item.remove}}">x</a>) {{/if}} </span> <span class='folder'>{{$cat.name}}</a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
{{/foreach}} {{/foreach}}
{{foreach $item.categories as $cat}} {{foreach $item.categories as $cat}}
<span class='category'>{{$cat.name}}</a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$item.remove}}">x</a>) {{/if}} </span> <span class='category'>{{$cat.name}}</a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
{{/foreach}} {{/foreach}}
</div> </div>
</div> </div>

4
view/theme/quattro/wall_thread.tpl
View file

@ -67,10 +67,10 @@
<span class='mention'>$tag</span> <span class='mention'>$tag</span>
{{ endfor }} {{ endfor }}
{{ for $item.folders as $cat }} {{ for $item.folders as $cat }}
<span class='folder'>$cat.name</a>{{if $cat.removeurl}} (<a href="$cat.removeurl" title="$item.remove">x</a>) {{endif}} </span> <span class='folder'>$cat.name</a>{{if $cat.removeurl}} (<a href="$cat.removeurl" title="$remove">x</a>) {{endif}} </span>
{{ endfor }} {{ endfor }}
{{ for $item.categories as $cat }} {{ for $item.categories as $cat }}
<span class='category'>$cat.name</a>{{if $cat.removeurl}} (<a href="$cat.removeurl" title="$item.remove">x</a>) {{endif}} </span> <span class='category'>$cat.name</a>{{if $cat.removeurl}} (<a href="$cat.removeurl" title="$remove">x</a>) {{endif}} </span>
{{ endfor }} {{ endfor }}
</div> </div>
</div> </div>

4
view/theme/smoothly/smarty3/wall_thread.tpl
View file

@ -66,14 +66,14 @@
{{if $item.has_cats}} {{if $item.has_cats}}
<div class="categorytags"><span>{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}} <div class="categorytags"><span>{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}}
<a href="{{$cat.removeurl}}" title="{{$item.remove}}">[{{$item.remove}}]</a> <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a>
{{if $cat.last}}{{else}}, {{/if}}{{/foreach}} {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
</div> </div>
{{/if}} {{/if}}
{{if $item.has_folders}} {{if $item.has_folders}}
<div class="filesavetags"><span>{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}} <div class="filesavetags"><span>{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}}
<a href="{{$cat.removeurl}}" title="{{$item.remove}}">[{{$item.remove}}]</a> <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a>
{{if $cat.last}}{{else}}, {{/if}}{{/foreach}} {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
</div> </div>
{{/if}} {{/if}}

4
view/theme/smoothly/wall_thread.tpl
View file

@ -66,14 +66,14 @@
{{ if $item.has_cats }} {{ if $item.has_cats }}
<div class="categorytags"><span>$item.txt_cats {{ for $item.categories as $cat }}$cat.name <div class="categorytags"><span>$item.txt_cats {{ for $item.categories as $cat }}$cat.name
<a href="$cat.removeurl" title="$item.remove">[$item.remove]</a> <a href="$cat.removeurl" title="$remove">[$remove]</a>
{{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
</div> </div>
{{ endif }} {{ endif }}
{{ if $item.has_folders }} {{ if $item.has_folders }}
<div class="filesavetags"><span>$item.txt_folders {{ for $item.folders as $cat }}$cat.name <div class="filesavetags"><span>$item.txt_folders {{ for $item.folders as $cat }}$cat.name
<a href="$cat.removeurl" title="$item.remove">[$item.remove]</a> <a href="$cat.removeurl" title="$remove">[$remove]</a>
{{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
</div> </div>
{{ endif }} {{ endif }}

2
view/theme/testbubble/profile_vcard.tpl
View file

@ -29,7 +29,7 @@
{{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }} {{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
{{ inc diaspora_vcard.tpl with $diaspora=$diaspora_info }}{{ endinc }} {{ inc diaspora_vcard.tpl }}{{ endinc }}
<div id="profile-extra-links"> <div id="profile-extra-links">
<ul> <ul>

2
view/theme/testbubble/smarty3/profile_vcard.tpl
View file

@ -29,7 +29,7 @@
{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}} {{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}
{{include file="diaspora_vcard.tpl" diaspora=$diaspora_info}} {{include file="diaspora_vcard.tpl"}}
<div id="profile-extra-links"> <div id="profile-extra-links">
<ul> <ul>

4
view/theme/vier/smarty3/wall_thread.tpl
View file

@ -75,10 +75,10 @@
<span class='mention'>{{$tag}}</span> <span class='mention'>{{$tag}}</span>
{{/foreach}} {{/foreach}}
{{foreach $item.folders as $cat}} {{foreach $item.folders as $cat}}
<span class='folder'>{{$cat.name}}</a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$item.remove}}">x</a>) {{/if}} </span> <span class='folder'>{{$cat.name}}</a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
{{/foreach}} {{/foreach}}
{{foreach $item.categories as $cat}} {{foreach $item.categories as $cat}}
<span class='category'>{{$cat.name}}</a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$item.remove}}">x</a>) {{/if}} </span> <span class='category'>{{$cat.name}}</a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
{{/foreach}} {{/foreach}}
</div> </div>
</div> </div>

4
view/theme/vier/wall_thread.tpl
View file

@ -75,10 +75,10 @@
<span class='mention'>$tag</span> <span class='mention'>$tag</span>
{{ endfor }} {{ endfor }}
{{ for $item.folders as $cat }} {{ for $item.folders as $cat }}
<span class='folder'>$cat.name</a>{{if $cat.removeurl}} (<a href="$cat.removeurl" title="$item.remove">x</a>) {{endif}} </span> <span class='folder'>$cat.name</a>{{if $cat.removeurl}} (<a href="$cat.removeurl" title="$remove">x</a>) {{endif}} </span>
{{ endfor }} {{ endfor }}
{{ for $item.categories as $cat }} {{ for $item.categories as $cat }}
<span class='category'>$cat.name</a>{{if $cat.removeurl}} (<a href="$cat.removeurl" title="$item.remove">x</a>) {{endif}} </span> <span class='category'>$cat.name</a>{{if $cat.removeurl}} (<a href="$cat.removeurl" title="$remove">x</a>) {{endif}} </span>
{{ endfor }} {{ endfor }}
</div> </div>
</div> </div>

4
view/wall_thread.tpl
View file

@ -50,12 +50,12 @@
{{ endfor }} {{ endfor }}
</div> </div>
{{ if $item.has_cats }} {{ if $item.has_cats }}
<div class="categorytags"><span>$item.txt_cats {{ for $item.categories as $cat }}$cat.name{{ if $cat.removeurl }} <a href="$cat.removeurl" title="$item.remove">[$item.remove]</a>{{ endif }} {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} <div class="categorytags"><span>$item.txt_cats {{ for $item.categories as $cat }}$cat.name{{ if $cat.removeurl }} <a href="$cat.removeurl" title="$remove">[$remove]</a>{{ endif }} {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
</div> </div>
{{ endif }} {{ endif }}
{{ if $item.has_folders }} {{ if $item.has_folders }}
<div class="filesavetags"><span>$item.txt_folders {{ for $item.folders as $cat }}$cat.name{{ if $cat.removeurl}} <a href="$cat.removeurl" title="$item.remove">[$item.remove]</a>{{ endif }}{{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} <div class="filesavetags"><span>$item.txt_folders {{ for $item.folders as $cat }}$cat.name{{ if $cat.removeurl}} <a href="$cat.removeurl" title="$remove">[$remove]</a>{{ endif }}{{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
</div> </div>
{{ endif }} {{ endif }}
</div> </div>