revert unnecessary variable name changes

diff --git a/boot.php b/boot.php
index af3cc2494f6716c519cf14fe31866b95a53d5ab6..8a921473c7bb6bd4335fe7d4f23be46fecb566ad 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -1358,7 +1358,7 @@ if(! function_exists('profile_sidebar')) {
                        '$pdesc'        => $pdesc,
                        '$marital'  => $marital,
                        '$homepage' => $homepage,
-                       '$diaspora_info' => $diaspora,
+                       '$diaspora' => $diaspora,
                        '$contact_block' => $contact_block,
                ));
 

diff --git a/include/conversation.php b/include/conversation.php
index a5a6a992ff06d60e43700d57da20f0529d090bca..1f416f352c00bfbdbe275fa74e37b703deee8673 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -703,6 +703,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
        $o = replace_macros($page_template, array(
                '$baseurl' => $a->get_baseurl($ssl_state),
                '$live_update' => $live_update_div,
+               '$remove' => t('remove'),
                '$mode' => $mode,
                '$user' => $a->user,
                '$threads' => $threads,

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

diff --git a/mod/notifications.php b/mod/notifications.php
index 128317eb473b5b5bf0d2c94a684bef4a23b4ea62..9c14737f7ffb3e6c36718ab0370661f7d03b6dc6 100644 (file)
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -218,7 +218,7 @@ function notifications_content(&$a) {
 
                $o .= replace_macros($notif_tpl, array(
                        '$notif_header' => t('Notifications'),
-                       '$tabs_data' => $tabs,
+                       '$tabs' => $tabs,
                        '$notif_content' => $notif_content,
                ));
                
@@ -304,7 +304,7 @@ function notifications_content(&$a) {
                
                $o .= replace_macros($notif_tpl, array(
                        '$notif_header' => t('Network Notifications'),
-                       '$tabs_data' => $tabs,
+                       '$tabs' => $tabs,
                        '$notif_content' => $notif_content,
                ));
                
@@ -334,7 +334,7 @@ function notifications_content(&$a) {
                
                $o .= replace_macros($notif_tpl, array(
                        '$notif_header' => t('System Notifications'),
-                       '$tabs_data' => $tabs,
+                       '$tabs' => $tabs,
                        '$notif_content' => $notif_content,
                ));
 
@@ -429,7 +429,7 @@ function notifications_content(&$a) {
                
                $o .= replace_macros($notif_tpl, array(
                        '$notif_header' => t('Personal Notifications'),
-                       '$tabs_data' => $tabs,
+                       '$tabs' => $tabs,
                        '$notif_content' => $notif_content,
                ));
                
@@ -510,7 +510,7 @@ function notifications_content(&$a) {
                
                $o .= replace_macros($notif_tpl, array(
                        '$notif_header' => t('Home Notifications'),
-                       '$tabs_data' => $tabs,
+                       '$tabs' => $tabs,
                        '$notif_content' => $notif_content,
                ));
        }

diff --git a/mod/notify.php b/mod/notify.php
index 6ff437a38c94b692f5d903a8c1455faf32666ab3..b4d60a747c0bb5fcf871f9775c8fb8b909e5932c 100644 (file)
--- a/mod/notify.php
+++ b/mod/notify.php
@@ -63,7 +63,7 @@ function notify_content(&$a) {
                
                $o .= replace_macros($notif_tpl, array(
                        '$notif_header' => t('System Notifications'),
-                       '$tabs_data' => '', // $tabs,
+                       '$tabs' => '', // $tabs,
                        '$notif_content' => $notif_content,
                ));
 

diff --git a/object/Item.php b/object/Item.php
index 4da5b8a59ff630bf30f8bc81473a3d0d294ac1f9..eef8a50581d773b39ea89e6a59fcb25c54997e15 100644 (file)
--- a/object/Item.php
+++ b/object/Item.php
@@ -285,7 +285,6 @@ class Item extends BaseObject {
                        'comment' => $this->get_comment_box($indent),
                        'previewing' => ($conv->is_preview() ? ' preview ' : ''),
                        'wait' => t('Please wait'),
-                       'remove' => t('remove'),
                        'thread_level' => $thread_level
                );
 

diff --git a/view/mail_display.tpl b/view/mail_display.tpl
index bc3cd5b7999ea4036fd69d33c7bddf52304da7d5..396aa46c0a945454e09eb1965b49b1240c0a93c7 100644 (file)
--- a/view/mail_display.tpl
+++ b/view/mail_display.tpl
@@ -4,7 +4,7 @@
 {{ endfor }}
 
 {{ if $canreply }}
-{{ inc prv_message.tpl with $reply=$reply_info }}{{ endinc }}
+{{ inc prv_message.tpl }}{{ endinc }}
 {{ else }}
 $unknown_text
 {{endif }}

diff --git a/view/notifications.tpl b/view/notifications.tpl
index d6ce0cdd967dbdc09e03c20ded2a1def189ec84d..1a13b68b90d5467fb1b8fedd8aea507abdc6c3ed 100644 (file)
--- a/view/notifications.tpl
+++ b/view/notifications.tpl
@@ -1,7 +1,7 @@
 
 <h1>$notif_header</h1>
 
-{{ inc common_tabs.tpl with $tabs=$tabs_data }}{{ endinc }}
+{{ inc common_tabs.tpl }}{{ endinc }}
 
 <div class="notif-network-wrapper">
        $notif_content

diff --git a/view/profile_vcard.tpl b/view/profile_vcard.tpl
index cf3d73a544fe1d82693bfb1fab01622a71364fd0..d1e6847951628e784f0a3983b66c5a2ca7c46d99 100644 (file)
--- a/view/profile_vcard.tpl
+++ b/view/profile_vcard.tpl
@@ -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 }}
 
-       {{ inc diaspora_vcard.tpl with $diaspora=$diaspora_info }}{{ endinc }}
+       {{ inc diaspora_vcard.tpl }}{{ endinc }}
        
        <div id="profile-extra-links">
                <ul>

diff --git a/view/prv_message.tpl b/view/prv_message.tpl
index f3df1d28bf6993bcac8509589295dd02a3dc5c23..ecfef95d6b5a4192557a55984c8ced29da97f6ad 100644 (file)
--- a/view/prv_message.tpl
+++ b/view/prv_message.tpl
@@ -1,31 +1,31 @@
 
-<h3>$reply.header</h3>
+<h3>$header</h3>
 
 <div id="prvmail-wrapper" >
 <form id="prvmail-form" action="message" method="post" >
 
-$reply.parent
+$parent
 
-<div id="prvmail-to-label">$reply.to</div>
-$reply.select
+<div id="prvmail-to-label">$to</div>
+$select
 
-<div id="prvmail-subject-label">$reply.subject</div>
-<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="$reply.subjtxt" $reply.readonly tabindex="11" />
+<div id="prvmail-subject-label">$subject</div>
+<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>
-<textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">$reply.text</textarea>
+<div id="prvmail-message-label">$yourmessage</div>
+<textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">$text</textarea>
 
 
 <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" class="icon border camera" title="$reply.upload" ></div>
+               <div id="prvmail-upload" class="icon border camera" title="$upload" ></div>
        </div> 
        <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 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 id="prvmail-end"></div>

diff --git a/view/smarty3/mail_display.tpl b/view/smarty3/mail_display.tpl
index 2ee08610ff1169a2c9b405aeee47dc232fa94944..49f5ed9611763504cec077afba023c29ed8cc4ee 100644 (file)
--- a/view/smarty3/mail_display.tpl
+++ b/view/smarty3/mail_display.tpl
@@ -4,7 +4,7 @@
 {{/foreach}}
 
 {{if $canreply}}
-{{include file="prv_message.tpl" reply=$reply_info}}
+{{include file="prv_message.tpl"}}
 {{else}}
 {{$unknown_text}}
 {{/if}}

diff --git a/view/smarty3/notifications.tpl b/view/smarty3/notifications.tpl
index af195cef31963e00dcb31ccde7f7377e3d0755c8..0289c41d4084ae543bf41a43789594e68c26a479 100644 (file)
--- a/view/smarty3/notifications.tpl
+++ b/view/smarty3/notifications.tpl
@@ -1,7 +1,7 @@
 
 <h1>{{$notif_header}}</h1>
 
-{{include file="common_tabs.tpl" tabs=$tabs_data}}
+{{include file="common_tabs.tpl"}}
 
 <div class="notif-network-wrapper">
        {{$notif_content}}

diff --git a/view/smarty3/profile_vcard.tpl b/view/smarty3/profile_vcard.tpl
index 200662fda5f06f199952bd0a909300fa5e2c9bb4..86f25fe057b7b966ff10ccd9411cba28a84fdf89 100644 (file)
--- a/view/smarty3/profile_vcard.tpl
+++ b/view/smarty3/profile_vcard.tpl
@@ -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}}
 
-       {{include file="diaspora_vcard.tpl" diaspora=$diaspora_info}}
+       {{include file="diaspora_vcard.tpl"}}
        
        <div id="profile-extra-links">
                <ul>

diff --git a/view/smarty3/prv_message.tpl b/view/smarty3/prv_message.tpl
index 06f253bec57498e0674980d657aab9d8df9efac1..66007f803f34491a4231382e82216a5c8adeab32 100644 (file)
--- a/view/smarty3/prv_message.tpl
+++ b/view/smarty3/prv_message.tpl
@@ -1,31 +1,31 @@
 
-<h3>{{$reply.header}}</h3>
+<h3>{{$header}}</h3>
 
 <div id="prvmail-wrapper" >
 <form id="prvmail-form" action="message" method="post" >
 
-{{$reply.parent}}
+{{$parent}}
 
-<div id="prvmail-to-label">{{$reply.to}}</div>
-{{$reply.select}}
+<div id="prvmail-to-label">{{$to}}</div>
+{{$select}}
 
-<div id="prvmail-subject-label">{{$reply.subject}}</div>
-<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="{{$reply.subjtxt}}" {{$reply.readonly}} tabindex="11" />
+<div id="prvmail-subject-label">{{$subject}}</div>
+<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>
-<textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">{{$reply.text}}</textarea>
+<div id="prvmail-message-label">{{$yourmessage}}</div>
+<textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">{{$text}}</textarea>
 
 
 <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" class="icon border camera" title="{{$reply.upload}}" ></div>
+               <div id="prvmail-upload" class="icon border camera" title="{{$upload}}" ></div>
        </div> 
        <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 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 id="prvmail-end"></div>

diff --git a/view/smarty3/wall_thread.tpl b/view/smarty3/wall_thread.tpl
index 86da6f516a2ee4950d9da1db2265ae3d89922300..c1fed91babe2b423e9330e9ba62c0f02e4b9cfc1 100644 (file)
--- a/view/smarty3/wall_thread.tpl
+++ b/view/smarty3/wall_thread.tpl
@@ -50,12 +50,12 @@
                                                {{/foreach}}
                                        </div>
                        {{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>
                        {{/if}}
 
                        {{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>
                        {{/if}}
                        </div>

diff --git a/view/theme/diabook/mail_display.tpl b/view/theme/diabook/mail_display.tpl
index 3dd0b64e77bac9b9452588a27b3290274946f921..5d16bd32bbf18620cb8d88cfcdaa27ba95268437 100644 (file)
--- a/view/theme/diabook/mail_display.tpl
+++ b/view/theme/diabook/mail_display.tpl
@@ -9,4 +9,4 @@
        </div>
 {{ endfor }}
 
-{{ inc prv_message.tpl with $reply=$reply_info }}{{ endinc }}
+{{ inc prv_message.tpl }}{{ endinc }}

diff --git a/view/theme/diabook/profile_vcard.tpl b/view/theme/diabook/profile_vcard.tpl
index ccde72af964483b1360378e91fdefb71522e733c..b982a20693ba33f3005d5de8a494dab37960dd0c 100644 (file)
--- a/view/theme/diabook/profile_vcard.tpl
+++ b/view/theme/diabook/profile_vcard.tpl
@@ -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 }}
 
-       {{ inc diaspora_vcard.tpl with $diaspora=$diaspora_info }}{{ endinc }}
+       {{ inc diaspora_vcard.tpl }}{{ endinc }}
        
        <div id="profile-extra-links">
                <ul>

diff --git a/view/theme/diabook/prv_message.tpl b/view/theme/diabook/prv_message.tpl
index 8ccab1a1ea22cb59eabd414311401ba00d9ac343..7a7413e9d893de4fa8803518f8e7c32ec9167ba0 100644 (file)
--- a/view/theme/diabook/prv_message.tpl
+++ b/view/theme/diabook/prv_message.tpl
@@ -1,38 +1,38 @@
 
-<h3>$reply.header</h3>
+<h3>$header</h3>
 
 <div id="prvmail-wrapper" >
 <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;
-vertical-align: middle;" name="messageto" value="$reply.prefill" maxlength="255" size="64" tabindex="10" />
-<input type="hidden" id="recip-complete" name="messageto" value="$reply.preid">
+vertical-align: middle;" name="messageto" value="$prefill" maxlength="255" size="64" tabindex="10" />
+<input type="hidden" id="recip-complete" name="messageto" value="$preid">
 {{ else }}
-$reply.select
+$select
 {{ endif }}
 
-<div id="prvmail-subject-label">$reply.subject</div>
-<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="$reply.subjtxt" $reply.readonly tabindex="11" />
+<div id="prvmail-subject-label">$subject</div>
+<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>
-<textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">$reply.text</textarea>
+<div id="prvmail-message-label">$yourmessage</div>
+<textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">$text</textarea>
 
 
 <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" class="icon border camera" title="$reply.upload" ></div>
+               <div id="prvmail-upload" class="icon border camera" title="$upload" ></div>
        </div> 
        <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 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 id="prvmail-end"></div>

diff --git a/view/theme/diabook/smarty3/mail_display.tpl b/view/theme/diabook/smarty3/mail_display.tpl
index 060fa1ae6eeba7ff6accfed78287ba0f487a62aa..7a96cbf361d45692656d25c05face85374692358 100644 (file)
--- a/view/theme/diabook/smarty3/mail_display.tpl
+++ b/view/theme/diabook/smarty3/mail_display.tpl
@@ -9,4 +9,4 @@
        </div>
 {{/foreach}}
 
-{{include file="prv_message.tpl" reply=$reply_info}}
+{{include file="prv_message.tpl"}}

diff --git a/view/theme/diabook/smarty3/profile_vcard.tpl b/view/theme/diabook/smarty3/profile_vcard.tpl
index 5331fc20154cb18e1d731d01c099be21a0f832b9..e42636734ae0d14425c62eea829f3981c41b90db 100644 (file)
--- a/view/theme/diabook/smarty3/profile_vcard.tpl
+++ b/view/theme/diabook/smarty3/profile_vcard.tpl
@@ -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}}
 
-       {{include file="diaspora_vcard.tpl" diaspora=$diaspora_info}}
+       {{include file="diaspora_vcard.tpl"}}
        
        <div id="profile-extra-links">
                <ul>

diff --git a/view/theme/diabook/smarty3/prv_message.tpl b/view/theme/diabook/smarty3/prv_message.tpl
index 8ac9a4abfe97dd2f149b4be6c8f1e2c5955fb838..594411eb669522fa527c99ddd5c0dadcdee0a9f6 100644 (file)
--- a/view/theme/diabook/smarty3/prv_message.tpl
+++ b/view/theme/diabook/smarty3/prv_message.tpl
@@ -1,38 +1,38 @@
 
-<h3>{{$reply.header}}</h3>
+<h3>{{$header}}</h3>
 
 <div id="prvmail-wrapper" >
 <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;
-vertical-align: middle;" name="messageto" value="{{$reply.prefill}}" maxlength="255" size="64" tabindex="10" />
-<input type="hidden" id="recip-complete" name="messageto" value="{{$reply.preid}}">
+vertical-align: middle;" name="messageto" value="{{$prefill}}" maxlength="255" size="64" tabindex="10" />
+<input type="hidden" id="recip-complete" name="messageto" value="{{$preid}}">
 {{else}}
-{{$reply.select}}
+{{$select}}
 {{/if}}
 
-<div id="prvmail-subject-label">{{$reply.subject}}</div>
-<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="{{$reply.subjtxt}}" {{$reply.readonly}} tabindex="11" />
+<div id="prvmail-subject-label">{{$subject}}</div>
+<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>
-<textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">{{$reply.text}}</textarea>
+<div id="prvmail-message-label">{{$yourmessage}}</div>
+<textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">{{$text}}</textarea>
 
 
 <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" class="icon border camera" title="{{$reply.upload}}" ></div>
+               <div id="prvmail-upload" class="icon border camera" title="{{$upload}}" ></div>
        </div> 
        <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 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 id="prvmail-end"></div>

diff --git a/view/theme/dispy/profile_vcard.tpl b/view/theme/dispy/profile_vcard.tpl
index 70b68447a3c7497520ce091b81c68edee53f8148..cf0054a675ee85a5aded3174318e66f4dcb867cc 100644 (file)
--- a/view/theme/dispy/profile_vcard.tpl
+++ b/view/theme/dispy/profile_vcard.tpl
@@ -67,7 +67,7 @@
     target="external-link">$profile.homepage</a></span>
     </div>{{ endif }}
 
-       {{ inc diaspora_vcard.tpl with $diaspora=$diaspora_info }}{{ endinc }}
+       {{ inc diaspora_vcard.tpl }}{{ endinc }}
        
        <div id="profile-extra-links">
                <ul>

diff --git a/view/theme/dispy/smarty3/profile_vcard.tpl b/view/theme/dispy/smarty3/profile_vcard.tpl
index b32af214af6f3af641a7f1fc794b2a01fd987375..3a2cf73eeafb424dc51c9c7be6e279bde2d09cc5 100644 (file)
--- a/view/theme/dispy/smarty3/profile_vcard.tpl
+++ b/view/theme/dispy/smarty3/profile_vcard.tpl
@@ -67,7 +67,7 @@
     target="external-link">{{$profile.homepage}}</a></span>
     </div>{{/if}}
 
-       {{include file="diaspora_vcard.tpl" diaspora=$diaspora_info}}
+       {{include file="diaspora_vcard.tpl"}}
        
        <div id="profile-extra-links">
                <ul>

diff --git a/view/theme/dispy/smarty3/wall_thread.tpl b/view/theme/dispy/smarty3/wall_thread.tpl
index 9f418b61123a15abe7d45c2bdf9c63c7caedfb2d..b0de88e34a15a7ccc70d3e864eceb871d22998c9 100644 (file)
--- a/view/theme/dispy/smarty3/wall_thread.tpl
+++ b/view/theme/dispy/smarty3/wall_thread.tpl
@@ -98,12 +98,12 @@ class="icon recycle wall-item-share-buttons"  title="{{$item.vote.share.0}}" onc
                                        {{/foreach}}
                                </div>                  
                        {{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>
                        {{/if}}
 
                        {{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>
                        {{/if}}
 

diff --git a/view/theme/dispy/wall_thread.tpl b/view/theme/dispy/wall_thread.tpl
index 128b287e7aef1e5408692ca3d0ff34a9cfa1608e..ae70b8c82b790d8fd68b058cf7d47ca29f3a8613 100644 (file)
--- a/view/theme/dispy/wall_thread.tpl
+++ b/view/theme/dispy/wall_thread.tpl
@@ -98,12 +98,12 @@ class="icon recycle wall-item-share-buttons"  title="$item.vote.share.0" onclick
                                        {{ endfor }}
                                </div>                  
                        {{ 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>
                        {{ endif }}
 
                        {{ 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>
                        {{ endif }}
 

diff --git a/view/theme/duepuntozero/profile_vcard.tpl b/view/theme/duepuntozero/profile_vcard.tpl
index fa0c0a5afeadb5317654dd478579d2eebd52780f..bcb5baeeb5935607d8033e8b8dcb9ae1baeaaea8 100644 (file)
--- a/view/theme/duepuntozero/profile_vcard.tpl
+++ b/view/theme/duepuntozero/profile_vcard.tpl
@@ -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 }}
 
-       {{ inc diaspora_vcard.tpl with $diaspora=$diaspora_info }}{{ endinc }}
+       {{ inc diaspora_vcard.tpl }}{{ endinc }}
 
        <div id="profile-vcard-break"></div>    
        <div id="profile-extra-links">

diff --git a/view/theme/duepuntozero/prv_message.tpl b/view/theme/duepuntozero/prv_message.tpl
index 5ef411c4aaf4c13482fef730786319d667e0ddf5..3f0bd937f4b0a80795d7b052588fd88975dd39ff 100644 (file)
--- a/view/theme/duepuntozero/prv_message.tpl
+++ b/view/theme/duepuntozero/prv_message.tpl
@@ -1,37 +1,37 @@
 
-<h3>$reply.header</h3>
+<h3>$header</h3>
 
 <div id="prvmail-wrapper" >
 <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 }}
-<input type="text" id="recip" name="messagerecip" value="$reply.prefill" maxlength="255" size="64" tabindex="10" />
-<input type="hidden" id="recip-complete" name="messageto" value="$reply.preid">
+{{ if $showinputs }}
+<input type="text" id="recip" name="messagerecip" value="$prefill" maxlength="255" size="64" tabindex="10" />
+<input type="hidden" id="recip-complete" name="messageto" value="$preid">
 {{ else }}
-$reply.select
+$select
 {{ endif }}
 
-<div id="prvmail-subject-label">$reply.subject</div>
-<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="$reply.subjtxt" $reply.readonly tabindex="11" />
+<div id="prvmail-subject-label">$subject</div>
+<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>
-<textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">$reply.text</textarea>
+<div id="prvmail-message-label">$yourmessage</div>
+<textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">$text</textarea>
 
 
 <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" class="icon border camera" title="$reply.upload" ></div>
+               <div id="prvmail-upload" class="icon border camera" title="$upload" ></div>
        </div> 
        <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 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 id="prvmail-end"></div>

diff --git a/view/theme/duepuntozero/smarty3/profile_vcard.tpl b/view/theme/duepuntozero/smarty3/profile_vcard.tpl
index ba5b6fd59e6f73119a4fd6d6991d96c9bc64a304..b7300329c5d6972993e21f4ed848933f258b3282 100644 (file)
--- a/view/theme/duepuntozero/smarty3/profile_vcard.tpl
+++ b/view/theme/duepuntozero/smarty3/profile_vcard.tpl
@@ -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}}
 
-       {{include file="diaspora_vcard.tpl" diaspora=$diaspora_info}}
+       {{include file="diaspora_vcard.tpl"}}
 
        <div id="profile-vcard-break"></div>    
        <div id="profile-extra-links">

diff --git a/view/theme/duepuntozero/smarty3/prv_message.tpl b/view/theme/duepuntozero/smarty3/prv_message.tpl
index 2711f55cceec90abe8d43027c167c5d12be27e8b..f8cbd01cc75072efeb3185e708ddbd834f1f9ead 100644 (file)
--- a/view/theme/duepuntozero/smarty3/prv_message.tpl
+++ b/view/theme/duepuntozero/smarty3/prv_message.tpl
@@ -1,37 +1,37 @@
 
-<h3>{{$reply.header}}</h3>
+<h3>{{$header}}</h3>
 
 <div id="prvmail-wrapper" >
 <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}}
-<input type="text" id="recip" name="messagerecip" value="{{$reply.prefill}}" maxlength="255" size="64" tabindex="10" />
-<input type="hidden" id="recip-complete" name="messageto" value="{{$reply.preid}}">
+{{if $showinputs}}
+<input type="text" id="recip" name="messagerecip" value="{{$prefill}}" maxlength="255" size="64" tabindex="10" />
+<input type="hidden" id="recip-complete" name="messageto" value="{{$preid}}">
 {{else}}
-{{$reply.select}}
+{{$select}}
 {{/if}}
 
-<div id="prvmail-subject-label">{{$reply.subject}}</div>
-<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="{{$reply.subjtxt}}" {{$reply.readonly}} tabindex="11" />
+<div id="prvmail-subject-label">{{$subject}}</div>
+<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>
-<textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">{{$reply.text}}</textarea>
+<div id="prvmail-message-label">{{$yourmessage}}</div>
+<textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">{{$text}}</textarea>
 
 
 <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" class="icon border camera" title="{{$reply.upload}}" ></div>
+               <div id="prvmail-upload" class="icon border camera" title="{{$upload}}" ></div>
        </div> 
        <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 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 id="prvmail-end"></div>

diff --git a/view/theme/facepark/profile_vcard.tpl b/view/theme/facepark/profile_vcard.tpl
index ee73460fc2970fc6b227386871f2fecf666fcd6d..154f22363ce6118ce3c80c104a449d4024b503d1 100644 (file)
--- a/view/theme/facepark/profile_vcard.tpl
+++ b/view/theme/facepark/profile_vcard.tpl
@@ -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 }}
 
-       {{ inc diaspora_vcard.tpl with $diaspora=$diaspora_info }}{{ endinc }}
+       {{ inc diaspora_vcard.tpl }}{{ endinc }}
        
        <div id="profile-extra-links">
                <ul>

diff --git a/view/theme/facepark/smarty3/profile_vcard.tpl b/view/theme/facepark/smarty3/profile_vcard.tpl
index 2697217625cc8f9662eb9f10e00f250c7f7aca70..b7ba41918e024cfefe4012199a45c31da9c1d36d 100644 (file)
--- a/view/theme/facepark/smarty3/profile_vcard.tpl
+++ b/view/theme/facepark/smarty3/profile_vcard.tpl
@@ -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}}
 
-       {{include file="diaspora_vcard.tpl" diaspora=$diaspora_info}}
+       {{include file="diaspora_vcard.tpl"}}
        
        <div id="profile-extra-links">
                <ul>

diff --git a/view/theme/frost-mobile/profile_vcard.tpl b/view/theme/frost-mobile/profile_vcard.tpl
index fa0c0a5afeadb5317654dd478579d2eebd52780f..bcb5baeeb5935607d8033e8b8dcb9ae1baeaaea8 100644 (file)
--- a/view/theme/frost-mobile/profile_vcard.tpl
+++ b/view/theme/frost-mobile/profile_vcard.tpl
@@ -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 }}
 
-       {{ inc diaspora_vcard.tpl with $diaspora=$diaspora_info }}{{ endinc }}
+       {{ inc diaspora_vcard.tpl }}{{ endinc }}
 
        <div id="profile-vcard-break"></div>    
        <div id="profile-extra-links">

diff --git a/view/theme/frost-mobile/prv_message.tpl b/view/theme/frost-mobile/prv_message.tpl
index 840ca3221b8cb1348a4f5b136a9d8a4088a5b363..27b2f395077a80adb335e352d926780802d9dc7f 100644 (file)
--- a/view/theme/frost-mobile/prv_message.tpl
+++ b/view/theme/frost-mobile/prv_message.tpl
@@ -1,37 +1,37 @@
 
-<h3>$reply.header</h3>
+<h3>$header</h3>
 
 <div id="prvmail-wrapper" >
 <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 }}
-<input type="text" id="recip" name="messageto" value="$reply.prefill" maxlength="255" size="64" tabindex="10" />
-<input type="hidden" id="recip-complete" name="messageto" value="$reply.preid">
+{{ if $showinputs }}
+<input type="text" id="recip" name="messageto" value="$prefill" maxlength="255" size="64" tabindex="10" />
+<input type="hidden" id="recip-complete" name="messageto" value="$preid">
 {{ else }}
-$reply.select
+$select
 {{ endif }}
 
-<div id="prvmail-subject-label">$reply.subject</div>
-<input type="text" size="28" maxlength="255" id="prvmail-subject" name="subject" value="$reply.subjtxt" $reply.readonly tabindex="11" />
+<div id="prvmail-subject-label">$subject</div>
+<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>
-<textarea rows="8" cols="32" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">$reply.text</textarea>
+<div id="prvmail-message-label">$yourmessage</div>
+<textarea rows="8" cols="32" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">$text</textarea>
 
 
 <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" class="icon border camera" title="$reply.upload" ></div>
+               <div id="prvmail-upload" class="icon border camera" title="$upload" ></div>
        </div> 
        <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 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 id="prvmail-end"></div>

diff --git a/view/theme/frost-mobile/smarty3/profile_vcard.tpl b/view/theme/frost-mobile/smarty3/profile_vcard.tpl
index ba5b6fd59e6f73119a4fd6d6991d96c9bc64a304..b7300329c5d6972993e21f4ed848933f258b3282 100644 (file)
--- a/view/theme/frost-mobile/smarty3/profile_vcard.tpl
+++ b/view/theme/frost-mobile/smarty3/profile_vcard.tpl
@@ -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}}
 
-       {{include file="diaspora_vcard.tpl" diaspora=$diaspora_info}}
+       {{include file="diaspora_vcard.tpl"}}
 
        <div id="profile-vcard-break"></div>    
        <div id="profile-extra-links">

diff --git a/view/theme/frost-mobile/smarty3/prv_message.tpl b/view/theme/frost-mobile/smarty3/prv_message.tpl
index 2926569c55abe2e6f93f41d994f73800a8531e3c..71667af2da191bd581ff5ef2f9c0eb4fb2f91038 100644 (file)
--- a/view/theme/frost-mobile/smarty3/prv_message.tpl
+++ b/view/theme/frost-mobile/smarty3/prv_message.tpl
@@ -1,37 +1,37 @@
 
-<h3>{{$reply.header}}</h3>
+<h3>{{$header}}</h3>
 
 <div id="prvmail-wrapper" >
 <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}}
-<input type="text" id="recip" name="messageto" value="{{$reply.prefill}}" maxlength="255" size="64" tabindex="10" />
-<input type="hidden" id="recip-complete" name="messageto" value="{{$reply.preid}}">
+{{if $showinputs}}
+<input type="text" id="recip" name="messageto" value="{{$prefill}}" maxlength="255" size="64" tabindex="10" />
+<input type="hidden" id="recip-complete" name="messageto" value="{{$preid}}">
 {{else}}
-{{$reply.select}}
+{{$select}}
 {{/if}}
 
-<div id="prvmail-subject-label">{{$reply.subject}}</div>
-<input type="text" size="28" maxlength="255" id="prvmail-subject" name="subject" value="{{$reply.subjtxt}}" {{$reply.readonly}} tabindex="11" />
+<div id="prvmail-subject-label">{{$subject}}</div>
+<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>
-<textarea rows="8" cols="32" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">{{$reply.text}}</textarea>
+<div id="prvmail-message-label">{{$yourmessage}}</div>
+<textarea rows="8" cols="32" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">{{$text}}</textarea>
 
 
 <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" class="icon border camera" title="{{$reply.upload}}" ></div>
+               <div id="prvmail-upload" class="icon border camera" title="{{$upload}}" ></div>
        </div> 
        <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 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 id="prvmail-end"></div>

diff --git a/view/theme/frost-mobile/smarty3/wall_thread.tpl b/view/theme/frost-mobile/smarty3/wall_thread.tpl
index b7706f3bd8563cca620d5bba1f6e3b6b3b3d471b..e1a0aa868e4bccd68a88e1d2039ce65f212054ef 100644 (file)
--- a/view/theme/frost-mobile/smarty3/wall_thread.tpl
+++ b/view/theme/frost-mobile/smarty3/wall_thread.tpl
@@ -53,12 +53,12 @@
                                                {{/foreach}}
                                        <!--</div>-->
                        {{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>
                        {{/if}}
 
                        {{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>
                        {{/if}}
                        </div>

diff --git a/view/theme/frost-mobile/wall_thread.tpl b/view/theme/frost-mobile/wall_thread.tpl
index a6a8f9615df53f4f3a67c595c4e3a22a7f2b65d6..901ed76c168059622c1ffe648b3d56d98a159d0e 100644 (file)
--- a/view/theme/frost-mobile/wall_thread.tpl
+++ b/view/theme/frost-mobile/wall_thread.tpl
@@ -53,12 +53,12 @@
                                                {{ endfor }}
                                        <!--</div>-->
                        {{ 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>
                        {{ endif }}
 
                        {{ 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>
                        {{ endif }}
                        </div>

diff --git a/view/theme/frost/profile_vcard.tpl b/view/theme/frost/profile_vcard.tpl
index fa0c0a5afeadb5317654dd478579d2eebd52780f..bcb5baeeb5935607d8033e8b8dcb9ae1baeaaea8 100644 (file)
--- a/view/theme/frost/profile_vcard.tpl
+++ b/view/theme/frost/profile_vcard.tpl
@@ -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 }}
 
-       {{ inc diaspora_vcard.tpl with $diaspora=$diaspora_info }}{{ endinc }}
+       {{ inc diaspora_vcard.tpl }}{{ endinc }}
 
        <div id="profile-vcard-break"></div>    
        <div id="profile-extra-links">

diff --git a/view/theme/frost/prv_message.tpl b/view/theme/frost/prv_message.tpl
index 171947f8575197fc80fe108938f027759519a487..25d7e1116c17b8810eed3febba81f47e1e07801b 100644 (file)
--- a/view/theme/frost/prv_message.tpl
+++ b/view/theme/frost/prv_message.tpl
@@ -1,37 +1,37 @@
 
-<h3>$reply.header</h3>
+<h3>$header</h3>
 
 <div id="prvmail-wrapper" >
 <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 }}
-<input type="text" id="recip" name="messageto" value="$reply.prefill" maxlength="255" size="64" tabindex="10" />
-<input type="hidden" id="recip-complete" name="messageto" value="$reply.preid">
+{{ if $showinputs }}
+<input type="text" id="recip" name="messageto" value="$prefill" maxlength="255" size="64" tabindex="10" />
+<input type="hidden" id="recip-complete" name="messageto" value="$preid">
 {{ else }}
-$reply.select
+$select
 {{ endif }}
 
-<div id="prvmail-subject-label">$reply.subject</div>
-<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="$reply.subjtxt" $reply.readonly tabindex="11" />
+<div id="prvmail-subject-label">$subject</div>
+<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>
-<textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">$reply.text</textarea>
+<div id="prvmail-message-label">$yourmessage</div>
+<textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">$text</textarea>
 
 
 <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" class="icon border camera" title="$reply.upload" ></div>
+               <div id="prvmail-upload" class="icon border camera" title="$upload" ></div>
        </div> 
        <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 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 id="prvmail-end"></div>

diff --git a/view/theme/frost/smarty3/profile_vcard.tpl b/view/theme/frost/smarty3/profile_vcard.tpl
index ba5b6fd59e6f73119a4fd6d6991d96c9bc64a304..b7300329c5d6972993e21f4ed848933f258b3282 100644 (file)
--- a/view/theme/frost/smarty3/profile_vcard.tpl
+++ b/view/theme/frost/smarty3/profile_vcard.tpl
@@ -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}}
 
-       {{include file="diaspora_vcard.tpl" diaspora=$diaspora_info}}
+       {{include file="diaspora_vcard.tpl"}}
 
        <div id="profile-vcard-break"></div>    
        <div id="profile-extra-links">

diff --git a/view/theme/frost/smarty3/prv_message.tpl b/view/theme/frost/smarty3/prv_message.tpl
index e7fd32cba4cb1f029cdbf1ea151a5b8c2eca789a..7ff0d1b468a759fe632ef77721c220cf0c22baa0 100644 (file)
--- a/view/theme/frost/smarty3/prv_message.tpl
+++ b/view/theme/frost/smarty3/prv_message.tpl
@@ -1,37 +1,37 @@
 
-<h3>{{$reply.header}}</h3>
+<h3>{{$header}}</h3>
 
 <div id="prvmail-wrapper" >
 <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}}
-<input type="text" id="recip" name="messageto" value="{{$reply.prefill}}" maxlength="255" size="64" tabindex="10" />
-<input type="hidden" id="recip-complete" name="messageto" value="{{$reply.preid}}">
+{{if $showinputs}}
+<input type="text" id="recip" name="messageto" value="{{$prefill}}" maxlength="255" size="64" tabindex="10" />
+<input type="hidden" id="recip-complete" name="messageto" value="{{$preid}}">
 {{else}}
-{{$reply.select}}
+{{$select}}
 {{/if}}
 
-<div id="prvmail-subject-label">{{$reply.subject}}</div>
-<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="{{$reply.subjtxt}}" {{$reply.readonly}} tabindex="11" />
+<div id="prvmail-subject-label">{{$subject}}</div>
+<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>
-<textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">{{$reply.text}}</textarea>
+<div id="prvmail-message-label">{{$yourmessage}}</div>
+<textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">{{$text}}</textarea>
 
 
 <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" class="icon border camera" title="{{$reply.upload}}" ></div>
+               <div id="prvmail-upload" class="icon border camera" title="{{$upload}}" ></div>
        </div> 
        <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 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 id="prvmail-end"></div>

diff --git a/view/theme/frost/smarty3/wall_thread.tpl b/view/theme/frost/smarty3/wall_thread.tpl
index cbfa7ffd05cbe6d7e597dea14d60763946470c75..5d0e51c657ca4af36926563eaa5bf84d14451250 100644 (file)
--- a/view/theme/frost/smarty3/wall_thread.tpl
+++ b/view/theme/frost/smarty3/wall_thread.tpl
@@ -52,12 +52,12 @@
                                                {{/foreach}}
                                        <!--</div>-->
                        {{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>
                        {{/if}}
 
                        {{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>
                        {{/if}}
                        </div>

diff --git a/view/theme/frost/wall_thread.tpl b/view/theme/frost/wall_thread.tpl
index 43d9db60818a0a994f968a21cffb02a163121ea0..b6086040dc4ebac984987f5a2661254c02c04f7e 100644 (file)
--- a/view/theme/frost/wall_thread.tpl
+++ b/view/theme/frost/wall_thread.tpl
@@ -52,12 +52,12 @@
                                                {{ endfor }}
                                        <!--</div>-->
                        {{ 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>
                        {{ endif }}
 
                        {{ 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>
                        {{ endif }}
                        </div>

diff --git a/view/theme/quattro/mail_display.tpl b/view/theme/quattro/mail_display.tpl
index 3dd0b64e77bac9b9452588a27b3290274946f921..5d16bd32bbf18620cb8d88cfcdaa27ba95268437 100644 (file)
--- a/view/theme/quattro/mail_display.tpl
+++ b/view/theme/quattro/mail_display.tpl
@@ -9,4 +9,4 @@
        </div>
 {{ endfor }}
 
-{{ inc prv_message.tpl with $reply=$reply_info }}{{ endinc }}
+{{ inc prv_message.tpl }}{{ endinc }}

diff --git a/view/theme/quattro/profile_vcard.tpl b/view/theme/quattro/profile_vcard.tpl
index 3ea6adfcc193f15f95c2ee98bd25bd2ee7ef0d93..e7264cfecf6ea179ec8ace84156184936038083d 100644 (file)
--- a/view/theme/quattro/profile_vcard.tpl
+++ b/view/theme/quattro/profile_vcard.tpl
@@ -49,7 +49,7 @@
         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">
                <ul>

diff --git a/view/theme/quattro/prv_message.tpl b/view/theme/quattro/prv_message.tpl
index e070c68d3c824af3e8fecdc1af3c95bf136ce1e9..5aa03688aa23d3c0ce657477651e8a041100c034 100644 (file)
--- a/view/theme/quattro/prv_message.tpl
+++ b/view/theme/quattro/prv_message.tpl
@@ -1,31 +1,31 @@
 
-<h3>$reply.header</h3>
+<h3>$header</h3>
 
 <div id="prvmail-wrapper" >
 <form id="prvmail-form" action="message" method="post" >
 
-$reply.parent
+$parent
 
-<div id="prvmail-to-label">$reply.to</div>
-$reply.select
+<div id="prvmail-to-label">$to</div>
+$select
 
-<div id="prvmail-subject-label">$reply.subject</div>
-<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="$reply.subjtxt" $reply.readonly tabindex="11" />
+<div id="prvmail-subject-label">$subject</div>
+<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>
-<textarea rows="20" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">$reply.text</textarea>
+<div id="prvmail-message-label">$yourmessage</div>
+<textarea rows="20" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">$text</textarea>
 
 
 <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" class="icon border camera" title="$reply.upload" ></div>
+               <div id="prvmail-upload" class="icon border camera" title="$upload" ></div>
        </div> 
        <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 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 id="prvmail-end"></div>

diff --git a/view/theme/quattro/smarty3/mail_display.tpl b/view/theme/quattro/smarty3/mail_display.tpl
index 060fa1ae6eeba7ff6accfed78287ba0f487a62aa..7a96cbf361d45692656d25c05face85374692358 100644 (file)
--- a/view/theme/quattro/smarty3/mail_display.tpl
+++ b/view/theme/quattro/smarty3/mail_display.tpl
@@ -9,4 +9,4 @@
        </div>
 {{/foreach}}
 
-{{include file="prv_message.tpl" reply=$reply_info}}
+{{include file="prv_message.tpl"}}

diff --git a/view/theme/quattro/smarty3/profile_vcard.tpl b/view/theme/quattro/smarty3/profile_vcard.tpl
index 05412492d356c52a8c52a4e9726733c848987960..902fb040de3f6f745b280e0e68ddbe2af84dbfb7 100644 (file)
--- a/view/theme/quattro/smarty3/profile_vcard.tpl
+++ b/view/theme/quattro/smarty3/profile_vcard.tpl
@@ -49,7 +49,7 @@
         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">
                <ul>

diff --git a/view/theme/quattro/smarty3/prv_message.tpl b/view/theme/quattro/smarty3/prv_message.tpl
index 651478c50dd9f2f02f64c201a15efcf7b58201f8..07fcfdadc20a05c023efcd59e7cf781c8c6892f4 100644 (file)
--- a/view/theme/quattro/smarty3/prv_message.tpl
+++ b/view/theme/quattro/smarty3/prv_message.tpl
@@ -1,31 +1,31 @@
 
-<h3>{{$reply.header}}</h3>
+<h3>{{$header}}</h3>
 
 <div id="prvmail-wrapper" >
 <form id="prvmail-form" action="message" method="post" >
 
-{{$reply.parent}}
+{{$parent}}
 
-<div id="prvmail-to-label">{{$reply.to}}</div>
-{{$reply.select}}
+<div id="prvmail-to-label">{{$to}}</div>
+{{$select}}
 
-<div id="prvmail-subject-label">{{$reply.subject}}</div>
-<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="{{$reply.subjtxt}}" {{$reply.readonly}} tabindex="11" />
+<div id="prvmail-subject-label">{{$subject}}</div>
+<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>
-<textarea rows="20" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">{{$reply.text}}</textarea>
+<div id="prvmail-message-label">{{$yourmessage}}</div>
+<textarea rows="20" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">{{$text}}</textarea>
 
 
 <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" class="icon border camera" title="{{$reply.upload}}" ></div>
+               <div id="prvmail-upload" class="icon border camera" title="{{$upload}}" ></div>
        </div> 
        <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 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 id="prvmail-end"></div>

diff --git a/view/theme/quattro/smarty3/wall_thread.tpl b/view/theme/quattro/smarty3/wall_thread.tpl
index de118952a4ffc3fc574fb3268dd7d83eb91b0ce8..68e6d5d1027f91876b4b0f05f66499c810292539 100644 (file)
--- a/view/theme/quattro/smarty3/wall_thread.tpl
+++ b/view/theme/quattro/smarty3/wall_thread.tpl
@@ -67,10 +67,10 @@
                                <span class='mention'>{{$tag}}</span>
                        {{/foreach}}
                {{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 $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}}
                </div>
        </div>  

diff --git a/view/theme/quattro/wall_thread.tpl b/view/theme/quattro/wall_thread.tpl
index d9fa083c546ad4854528fddb75a4765c291f8d03..eee27776be6ebdbb414c030f097089423aed8764 100644 (file)
--- a/view/theme/quattro/wall_thread.tpl
+++ b/view/theme/quattro/wall_thread.tpl
@@ -67,10 +67,10 @@
                                <span class='mention'>$tag</span>
                        {{ endfor }}
                {{ 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 }}
                 {{ 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 }}
                </div>
        </div>  

diff --git a/view/theme/smoothly/smarty3/wall_thread.tpl b/view/theme/smoothly/smarty3/wall_thread.tpl
index 019a83646616b3e47c13f573e532048af0d69b6a..b0538b9791b027d1539b42924656fa397db418db 100644 (file)
--- a/view/theme/smoothly/smarty3/wall_thread.tpl
+++ b/view/theme/smoothly/smarty3/wall_thread.tpl
@@ -66,14 +66,14 @@
 
                                {{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> 
+                               <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> 
                                {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
                                </div>
                                {{/if}}
 
                                {{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> 
+                               <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> 
                                {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
                                </div>
                                {{/if}}

diff --git a/view/theme/smoothly/wall_thread.tpl b/view/theme/smoothly/wall_thread.tpl
index e192ca61ca01848a5f498354e98dcbadef6b49f5..7987a36492c88121d973f19b39d8d81a87680d47 100644 (file)
--- a/view/theme/smoothly/wall_thread.tpl
+++ b/view/theme/smoothly/wall_thread.tpl
@@ -66,14 +66,14 @@
 
                                {{ 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> 
+                               <a href="$cat.removeurl" title="$remove">[$remove]</a> 
                                {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
                                </div>
                                {{ endif }}
 
                                {{ 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> 
+                               <a href="$cat.removeurl" title="$remove">[$remove]</a> 
                                {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
                                </div>
                                {{ endif }}

diff --git a/view/theme/testbubble/profile_vcard.tpl b/view/theme/testbubble/profile_vcard.tpl
index 44d0d60e2b86684574759c6eb9d9fd03f086762d..0ee6919bc950fcea7e9c48605afb34e1c355008e 100644 (file)
--- a/view/theme/testbubble/profile_vcard.tpl
+++ b/view/theme/testbubble/profile_vcard.tpl
@@ -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 }}
 
-       {{ inc diaspora_vcard.tpl with $diaspora=$diaspora_info }}{{ endinc }}
+       {{ inc diaspora_vcard.tpl }}{{ endinc }}
        
        <div id="profile-extra-links">
                <ul>

diff --git a/view/theme/testbubble/smarty3/profile_vcard.tpl b/view/theme/testbubble/smarty3/profile_vcard.tpl
index 9ee1a61bde4a9f636b132cc5b0e5aeb8a9307ed8..e1b05f81b389bc449a63afa32c791fd6f0af8357 100644 (file)
--- a/view/theme/testbubble/smarty3/profile_vcard.tpl
+++ b/view/theme/testbubble/smarty3/profile_vcard.tpl
@@ -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}}
 
-       {{include file="diaspora_vcard.tpl" diaspora=$diaspora_info}}
+       {{include file="diaspora_vcard.tpl"}}
        
        <div id="profile-extra-links">
                <ul>

diff --git a/view/theme/vier/smarty3/wall_thread.tpl b/view/theme/vier/smarty3/wall_thread.tpl
index d0a96a8c3c095f520ab21dd6c22770efcbc8b6fb..07a7a50f85c35977c205a9f01b2f9a331a84e824 100644 (file)
--- a/view/theme/vier/smarty3/wall_thread.tpl
+++ b/view/theme/vier/smarty3/wall_thread.tpl
@@ -75,10 +75,10 @@
                                <span class='mention'>{{$tag}}</span>
                        {{/foreach}}
                {{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 $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}}
                </div>
        </div>  

diff --git a/view/theme/vier/wall_thread.tpl b/view/theme/vier/wall_thread.tpl
index 1a45df57b6fa21e2c73a3c1e5ed47b04e874d356..d535704605467e5e4af6be76d4301e1787642f84 100644 (file)
--- a/view/theme/vier/wall_thread.tpl
+++ b/view/theme/vier/wall_thread.tpl
@@ -75,10 +75,10 @@
                                <span class='mention'>$tag</span>
                        {{ endfor }}
                {{ 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 }}
                 {{ 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 }}
                </div>
        </div>  

diff --git a/view/wall_thread.tpl b/view/wall_thread.tpl
index 799c986634e5e6ef6707544c4b6e044918a708b1..716956c65569901e66485cb0d6acfa3645dd5a73 100644 (file)
--- a/view/wall_thread.tpl
+++ b/view/wall_thread.tpl
@@ -50,12 +50,12 @@
                                                {{ endfor }}
                                        </div>
                        {{ 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>
                        {{ endif }}
 
                        {{ 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>
                        {{ endif }}
                        </div>