small fixes; update smarty3 templates

diff --git a/include/text.php b/include/text.php
index 58f69449f4cb3ecf0b2aa3728c8db82a75fd739d..628da1c1b2795ebd75b3eaff4c0b289271f8138e 100644 (file)
--- a/include/text.php
+++ b/include/text.php
@@ -477,7 +477,6 @@ function get_markup_template($s, $root = '') {
 //             $tt = microtime() - $ts;
 //             $a->page['debug'] .= "$tt <br>\n";
 //             return $file_contents;
-//             logger($template_file);
                return file_get_contents($template_file);
        }       
 }}

diff --git a/mod/install.php b/mod/install.php
index d4e04c1a9d4fd8f005a43cd01dbfd2022a789723..91b5e3d2d47a7851b63f8ce1145a96c246bd725f 100755 (executable)
--- a/mod/install.php
+++ b/mod/install.php
@@ -177,8 +177,6 @@ function install_content(&$a) {
 
                        check_htconfig($checks);
 
-                       check_smarty3($checks);
-
                        check_keys($checks);
                        
                        if(x($_POST,'phpath'))
@@ -430,22 +428,6 @@ function check_htconfig(&$checks) {
 
 }
 
-function check_smarty3(&$checks) {
-       $status = true;
-       $help = "";
-       if(     !is_writable('view/smarty3') ) {
-       
-               $status=false;
-               $help = t('Friendica uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering.') .EOL;
-               $help .= t('In order to store these compiled templates, the web server needs to have write access to the directory view/smarty3/ under the Friendica top level folder.').EOL;
-               $help .= t('Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder.').EOL;
-               $help .= t('Note: as a security measure, you should give the web server write access to view/smarty3/ only--not the template files (.tpl) that it contains.').EOL; 
-       }
-    
-       check_add($checks, t('view/smarty3 is writable'), $status, true, $help);
-
-}
-
 function check_htaccess(&$checks) {
        $a = get_app();
        $status = true;

diff --git a/view/smarty3/admin_logs.tpl b/view/smarty3/admin_logs.tpl
index 4f79515ad2c6c1d54c38c9e6933531964f79010f..e5412429f4e7349a1a68373995164c094e32f210 100644 (file)
--- a/view/smarty3/admin_logs.tpl
+++ b/view/smarty3/admin_logs.tpl
@@ -4,9 +4,9 @@
        <form action="{{$baseurl}}/admin/logs" method="post">
     <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
 
-       {{include file="file:{{$field_checkbox}}" field=$debugging}}
-       {{include file="file:{{$field_input}}" field=$logfile}}
-       {{include file="file:{{$field_select}}" field=$loglevel}}
+       {{include file="field_checkbox.tpl" field=$debugging}}
+       {{include file="field_input.tpl" field=$logfile}}
+       {{include file="field_select.tpl" field=$loglevel}}
        
        <div class="submit"><input type="submit" name="page_logs" value="{{$submit}}" /></div>
        

diff --git a/view/smarty3/admin_remoteupdate.tpl b/view/smarty3/admin_remoteupdate.tpl
index 2e52e99a699532cbf600cac6080c05fdc15a1b32..6260741ed773ad8f96d97c66cd6964bb38813e92 100644 (file)
--- a/view/smarty3/admin_remoteupdate.tpl
+++ b/view/smarty3/admin_remoteupdate.tpl
@@ -84,10 +84,10 @@
                <h3>Your friendica installation is not writable by web server.</h3>
                {{if $canftp}}
                        <p>You can try to update via FTP</p>
-                       {{include file="file:{{$field_input}}" field=$ftphost}}
-                       {{include file="file:{{$field_input}}" field=$ftppath}}
-                       {{include file="file:{{$field_input}}" field=$ftpuser}}
-                       {{include file="file:{{$field_password}}" field=$ftppwd}}
+                       {{include file="field_input.tpl" field=$ftphost}}
+                       {{include file="field_input.tpl" field=$ftppath}}
+                       {{include file="field_input.tpl" field=$ftpuser}}
+                       {{include file="field_password.tpl" field=$ftppwd}}
                        <div class="submit"><input type="submit" name="remoteupdate" value="{{$submit}}" /></div>
                {{/if}}
        {{/if}}

diff --git a/view/smarty3/admin_site.tpl b/view/smarty3/admin_site.tpl
index 290ee0bb1a5e17bcdda09e1675cdfe8d5eb9092f..79e68a40c81fed01a84cd8b211d89c0961ccbacb 100644 (file)
--- a/view/smarty3/admin_site.tpl
+++ b/view/smarty3/admin_site.tpl
@@ -41,65 +41,65 @@
        <form action="{{$baseurl}}/admin/site" method="post">
     <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
 
-       {{include file="file:{{$field_input}}" field=$sitename}}
-       {{include file="file:{{$field_textarea}}" field=$banner}}
-       {{include file="file:{{$field_select}}" field=$language}}
-       {{include file="file:{{$field_select}}" field=$theme}}
-       {{include file="file:{{$field_select}}" field=$theme_mobile}}
-       {{include file="file:{{$field_select}}" field=$ssl_policy}}
-       {{include file="file:{{$field_checkbox}}" field=$new_share}}
+       {{include file="field_input.tpl" field=$sitename}}
+       {{include file="field_textarea.tpl" field=$banner}}
+       {{include file="field_select.tpl" field=$language}}
+       {{include file="field_select.tpl" field=$theme}}
+       {{include file="field_select.tpl" field=$theme_mobile}}
+       {{include file="field_select.tpl" field=$ssl_policy}}
+       {{include file="field_checkbox.tpl" field=$new_share}}
 
        
        <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
        
        <h3>{{$registration}}</h3>
-       {{include file="file:{{$field_input}}" field=$register_text}}
-       {{include file="file:{{$field_select}}" field=$register_policy}}
-       {{include file="file:{{$field_input}}" field=$daily_registrations}}
-       {{include file="file:{{$field_checkbox}}" field=$no_multi_reg}}
-       {{include file="file:{{$field_checkbox}}" field=$no_openid}}
-       {{include file="file:{{$field_checkbox}}" field=$no_regfullname}}
+       {{include file="field_input.tpl" field=$register_text}}
+       {{include file="field_select.tpl" field=$register_policy}}
+       {{include file="field_input.tpl" field=$daily_registrations}}
+       {{include file="field_checkbox.tpl" field=$no_multi_reg}}
+       {{include file="field_checkbox.tpl" field=$no_openid}}
+       {{include file="field_checkbox.tpl" field=$no_regfullname}}
        
        <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
 
        <h3>{{$upload}}</h3>
-       {{include file="file:{{$field_input}}" field=$maximagesize}}
-       {{include file="file:{{$field_input}}" field=$maximagelength}}
-       {{include file="file:{{$field_input}}" field=$jpegimagequality}}
+       {{include file="field_input.tpl" field=$maximagesize}}
+       {{include file="field_input.tpl" field=$maximagelength}}
+       {{include file="field_input.tpl" field=$jpegimagequality}}
        
        <h3>{{$corporate}}</h3>
-       {{include file="file:{{$field_input}}" field=$allowed_sites}}
-       {{include file="file:{{$field_input}}" field=$allowed_email}}
-       {{include file="file:{{$field_checkbox}}" field=$block_public}}
-       {{include file="file:{{$field_checkbox}}" field=$force_publish}}
-       {{include file="file:{{$field_checkbox}}" field=$no_community_page}}
-       {{include file="file:{{$field_checkbox}}" field=$ostatus_disabled}}
-       {{include file="file:{{$field_checkbox}}" field=$diaspora_enabled}}
-       {{include file="file:{{$field_checkbox}}" field=$dfrn_only}}
-       {{include file="file:{{$field_input}}" field=$global_directory}}
-       {{include file="file:{{$field_checkbox}}" field=$thread_allow}}
-       {{include file="file:{{$field_checkbox}}" field=$newuser_private}}
+       {{include file="field_input.tpl" field=$allowed_sites}}
+       {{include file="field_input.tpl" field=$allowed_email}}
+       {{include file="field_checkbox.tpl" field=$block_public}}
+       {{include file="field_checkbox.tpl" field=$force_publish}}
+       {{include file="field_checkbox.tpl" field=$no_community_page}}
+       {{include file="field_checkbox.tpl" field=$ostatus_disabled}}
+       {{include file="field_checkbox.tpl" field=$diaspora_enabled}}
+       {{include file="field_checkbox.tpl" field=$dfrn_only}}
+       {{include file="field_input.tpl" field=$global_directory}}
+       {{include file="field_checkbox.tpl" field=$thread_allow}}
+       {{include file="field_checkbox.tpl" field=$newuser_private}}
        
        <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
        
        <h3>{{$advanced}}</h3>
-       {{include file="file:{{$field_checkbox}}" field=$no_utf}}
-       {{include file="file:{{$field_checkbox}}" field=$verifyssl}}
-       {{include file="file:{{$field_input}}" field=$proxy}}
-       {{include file="file:{{$field_input}}" field=$proxyuser}}
-       {{include file="file:{{$field_input}}" field=$timeout}}
-       {{include file="file:{{$field_input}}" field=$delivery_interval}}
-       {{include file="file:{{$field_input}}" field=$poll_interval}}
-       {{include file="file:{{$field_input}}" field=$maxloadavg}}
-       {{include file="file:{{$field_input}}" field=$abandon_days}}
-       {{include file="file:{{$field_input}}" field=$lockpath}}
-       {{include file="file:{{$field_input}}" field=$temppath}}
-       {{include file="file:{{$field_input}}" field=$basepath}}
+       {{include file="field_checkbox.tpl" field=$no_utf}}
+       {{include file="field_checkbox.tpl" field=$verifyssl}}
+       {{include file="field_input.tpl" field=$proxy}}
+       {{include file="field_input.tpl" field=$proxyuser}}
+       {{include file="field_input.tpl" field=$timeout}}
+       {{include file="field_input.tpl" field=$delivery_interval}}
+       {{include file="field_input.tpl" field=$poll_interval}}
+       {{include file="field_input.tpl" field=$maxloadavg}}
+       {{include file="field_input.tpl" field=$abandon_days}}
+       {{include file="field_input.tpl" field=$lockpath}}
+       {{include file="field_input.tpl" field=$temppath}}
+       {{include file="field_input.tpl" field=$basepath}}
 
        <h3>{{$performance}}</h3>
-       {{include file="file:{{$field_checkbox}}" field=$use_fulltext_engine}}
-       {{include file="file:{{$field_input}}" field=$itemcache}}
-       {{include file="file:{{$field_input}}" field=$itemcache_duration}}
+       {{include file="field_checkbox.tpl" field=$use_fulltext_engine}}
+       {{include file="field_input.tpl" field=$itemcache}}
+       {{include file="field_input.tpl" field=$itemcache_duration}}
 
        
        <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>

diff --git a/view/smarty3/api_friends_xml.tpl b/view/smarty3/api_friends_xml.tpl
index fe92eea6d39727fad01ebee2523e0bcac94c30cb..d3a21814200cc11f4216bf923f02e5d39d1f619f 100644 (file)
--- a/view/smarty3/api_friends_xml.tpl
+++ b/view/smarty3/api_friends_xml.tpl
@@ -2,6 +2,6 @@
 
 <users type="array">
        {{foreach $users as $u}}
-       {{include file="file:{{$api_user_xml}}" user=$u}}
+       {{include file="api_user_xml.tpl" user=$u}}
        {{/foreach}}
 </users>

diff --git a/view/smarty3/api_timeline_xml.tpl b/view/smarty3/api_timeline_xml.tpl
index 48e9328662a0d481422e7179f947ec2cfec16abb..f14d73e9c0571f6ed8980083950a23f9f8a67dbb 100644 (file)
--- a/view/smarty3/api_timeline_xml.tpl
+++ b/view/smarty3/api_timeline_xml.tpl
@@ -10,7 +10,7 @@
   <in_reply_to_screen_name>{{$status.in_reply_to_screen_name}}</in_reply_to_screen_name>
   <geo>{{$status.geo}}</geo>
   <favorited>{{$status.favorited}}</favorited>
-{{include file="file:{{$api_user_xml}}" user=$status.user}}  <statusnet:html>{{$status.statusnet_html}}</statusnet:html>
+{{include file="api_user_xml.tpl" user=$status.user}}  <statusnet:html>{{$status.statusnet_html}}</statusnet:html>
   <statusnet:conversation_id>{{$status.statusnet_conversation_id}}</statusnet:conversation_id>
   <url>{{$status.url}}</url>
   <coordinates>{{$status.coordinates}}</coordinates>

diff --git a/view/smarty3/contact_edit.tpl b/view/smarty3/contact_edit.tpl
index d12fdd44fb794033d5ddb5fa6eb9d36377e6ba87..4f65f76a3e999e639a04d42018a4484d6d078c5f 100644 (file)
--- a/view/smarty3/contact_edit.tpl
+++ b/view/smarty3/contact_edit.tpl
@@ -65,7 +65,7 @@
        {{/if}}
        <div id="contact-edit-end" ></div>
 
-       {{include file="file:{{$field_checkbox}}" field=$hidden}}
+       {{include file="field_checkbox.tpl" field=$hidden}}
 
 <div id="contact-edit-info-wrapper">
 <h4>{{$lbl_info1}}</h4>

diff --git a/view/smarty3/contacts-template.tpl b/view/smarty3/contacts-template.tpl
index 3c998f792a73b79def8654c6564913d2c8b43dc7..de074fc3c4d7fee6e92e86cae4c3bd62275df647 100644 (file)
--- a/view/smarty3/contacts-template.tpl
+++ b/view/smarty3/contacts-template.tpl
@@ -15,7 +15,7 @@
 
 
 {{foreach $contacts as $c}}
-       {{include file="file:{{$contact_template}}" contact=$c}}
+       {{include file="contact_template.tpl" contact=$c}}
 {{/foreach}}
 <div id="contact-edit-end"></div>
 

diff --git a/view/smarty3/field.tpl b/view/smarty3/field.tpl
index c364bd91e2ccee82c94a92635f6c84529452b257..b7111ce5ca165295fc640425ec33397b670194b8 100644 (file)
--- a/view/smarty3/field.tpl
+++ b/view/smarty3/field.tpl
@@ -1,4 +1,4 @@
 
  {{if $field.0==select}}
- {{include file="file:{{$field_select}}"}}
+ {{include file="field_select.tpl"}}
  {{/if}}

diff --git a/view/smarty3/filebrowser.tpl b/view/smarty3/filebrowser.tpl
index c5171ae84645b31503503d98bbfa0a2225b54144..787f7c0cd07653f0d4ce25dc2a98efa5c4226dbd 100644 (file)
--- a/view/smarty3/filebrowser.tpl
+++ b/view/smarty3/filebrowser.tpl
@@ -77,7 +77,7 @@
                </div>
        </div>
        <div class="mceActionPanel">
-               <input type="button" id="cancel" name="cancel" value="{{*cancel}" onclick="tinyMCEPopup.close();" />
+               <input type="button" id="cancel" name="cancel" value="{{$cancel}}" onclick="tinyMCEPopup.close();" />
        </div>  
        </body>
        

diff --git a/view/smarty3/filer_dialog.tpl b/view/smarty3/filer_dialog.tpl
index 5444d7f4d80bfcee27c320fd7bfdb773e458dbe5..ae59ab7138695c6f3e03ef1ceda42f20c86990e5 100644 (file)
--- a/view/smarty3/filer_dialog.tpl
+++ b/view/smarty3/filer_dialog.tpl
@@ -1,4 +1,4 @@
-{{include file="file:{{$field_combobox}}"}}
+{{include file="field_combobox.tpl"}}
 <div class="settings-submit-wrapper" >
        <input id="filer_save" type="button" class="settings-submit" value="{{$submit}}" />
 </div>

diff --git a/view/smarty3/group_edit.tpl b/view/smarty3/group_edit.tpl
index e381ff47b11dda40a1b17596f50aa106576f24c6..424d1c12524acd3168958c42a117f4f4a499636a 100644 (file)
--- a/view/smarty3/group_edit.tpl
+++ b/view/smarty3/group_edit.tpl
@@ -5,7 +5,7 @@
        <form action="group/{{$gid}}" id="group-edit-form" method="post" >
                <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
                
-               {{include file="file:{{$field_input}}" field=$gname}}
+               {{include file="field_input.tpl" field=$gname}}
                {{if $drop}}{{$drop}}{{/if}}
                <div id="group-edit-submit-wrapper" >
                        <input type="submit" name="submit" value="{{$submit}}" >
@@ -17,7 +17,7 @@
 
 {{if $groupedit_info}}
        <div id="group-update-wrapper">
-               {{include file="file:{{$groupeditortpl}}" groupeditor=$groupedit_info}}
+               {{include file="groupeditor.tpl" groupeditor=$groupedit_info}}
        </div>
 {{/if}}
 {{if $desc}}<div id="group-edit-desc">{{$desc}}</div>{{/if}}

diff --git a/view/smarty3/install_db.tpl b/view/smarty3/install_db.tpl
index 3d9a107fe25aee7c9978f5992a27f07e3f255993..ef8510ae3b19c7aeb7c8f16f511bd95579190022 100644 (file)
--- a/view/smarty3/install_db.tpl
+++ b/view/smarty3/install_db.tpl
@@ -18,10 +18,10 @@
 <input type="hidden" name="phpath" value="{{$phpath}}" />
 <input type="hidden" name="pass" value="3" />
 
-{{include file="file:{{$field_input}}" field=$dbhost}}
-{{include file="file:{{$field_input}}" field=$dbuser}}
-{{include file="file:{{$field_password}}" field=$dbpass}}
-{{include file="file:{{$field_input}}" field=$dbdata}}
+{{include file="field_input.tpl" field=$dbhost}}
+{{include file="field_input.tpl" field=$dbuser}}
+{{include file="field_password.tpl" field=$dbpass}}
+{{include file="field_input.tpl" field=$dbdata}}
 
 
 <input id="install-submit" type="submit" name="submit" value="{{$submit}}" /> 

diff --git a/view/smarty3/install_settings.tpl b/view/smarty3/install_settings.tpl
index 83efa3d7182bd626467f073e82a899a084e96892..dcb2f22420dd16ff8855610026cf5ccd70be9fae 100644 (file)
--- a/view/smarty3/install_settings.tpl
+++ b/view/smarty3/install_settings.tpl
@@ -16,7 +16,7 @@
 <input type="hidden" name="dbdata" value="{{$dbdata}}" />
 <input type="hidden" name="pass" value="4" />
 
-{{include file="file:{{$field_input}}" field=$adminmail}}
+{{include file="field_input.tpl" field=$adminmail}}
 {{$timezone}}
 
 <input id="install-submit" type="submit" name="submit" value="{{$submit}}" /> 

diff --git a/view/smarty3/intros.tpl b/view/smarty3/intros.tpl
index abf198158e2ae669dbd3df1122fa37e65e9023e8..6132bfc75b099b708d40b8d876602f3d7c921c78 100644 (file)
--- a/view/smarty3/intros.tpl
+++ b/view/smarty3/intros.tpl
@@ -14,8 +14,8 @@
 <div class="intro-form-end"></div>
 
 <form class="intro-approve-form" action="dfrn_confirm" method="post">
-{{include file="file:{{$field_checkbox}}" field=$hidden}}
-{{include file="file:{{$field_checkbox}}" field=$activity}}
+{{include file="field_checkbox.tpl" field=$hidden}}
+{{include file="field_checkbox.tpl" field=$activity}}
 <input type="hidden" name="dfrn_id" value="{{$dfrn_id}}" >
 <input type="hidden" name="intro_id" value="{{$intro_id}}" >
 <input type="hidden" name="contact_id" value="{{$contact_id}}" >

diff --git a/view/smarty3/login.tpl b/view/smarty3/login.tpl
index 6695495c076d5a883da0974e149a8f57e565baa6..331caeb24694ed0354db6b9b8b29123b9de2d270 100644 (file)
--- a/view/smarty3/login.tpl
+++ b/view/smarty3/login.tpl
@@ -3,17 +3,17 @@
        <input type="hidden" name="auth-params" value="login" />
 
        <div id="login_standard">
-       {{include file="file:{{$field_input}}" field=$lname}}
-       {{include file="file:{{$field_password}}" field=$lpassword}}
+       {{include file="field_input.tpl" field=$lname}}
+       {{include file="field_password.tpl" field=$lpassword}}
        </div>
        
        {{if $openid}}
                        <div id="login_openid">
-                       {{include file="file:{{$field_openid}}" field=$lopenid}}
+                       {{include file="field_openid.tpl" field=$lopenid}}
                        </div>
        {{/if}}
 
-       {{include file="file:{{$field_checkbox}}" field=$lremember}}
+       {{include file="field_checkbox.tpl" field=$lremember}}
 
        <div id="login-extra-links">
                {{if $register}}<a href="register" title="{{$register.title}}" id="register-link">{{$register.desc}}</a>{{/if}}

diff --git a/view/smarty3/mail_display.tpl b/view/smarty3/mail_display.tpl
index 0e6bd13d334df8735e34336280e4583d7aac523d..2ee08610ff1169a2c9b405aeee47dc232fa94944 100644 (file)
--- a/view/smarty3/mail_display.tpl
+++ b/view/smarty3/mail_display.tpl
@@ -1,10 +1,10 @@
 
 {{foreach $mails as $mail_item}}
-       {{include file="file:{{$mail_conv}}" mail=$mail_item}}
+       {{include file="mail_conv.tpl" mail=$mail_item}}
 {{/foreach}}
 
 {{if $canreply}}
-{{include file="file:{{$prv_message}}" reply=$reply_info}}
+{{include file="prv_message.tpl" reply=$reply_info}}
 {{else}}
 {{$unknown_text}}
 {{/if}}

diff --git a/view/smarty3/nogroup-template.tpl b/view/smarty3/nogroup-template.tpl
index 6daeba0cfe467de19e1ae07a046fb6eb65cf67c3..16600b9ceabbe091a5b155dcc8dc74efc616c8eb 100644 (file)
--- a/view/smarty3/nogroup-template.tpl
+++ b/view/smarty3/nogroup-template.tpl
@@ -1,7 +1,7 @@
 <h1>{{$header}}</h1>
 
 {{foreach $contacts as $c}}
-       {{include file="file:{{$contact_template}}" contact=$c}}
+       {{include file="contact_template.tpl" contact=$c}}
 {{/foreach}}
 <div id="contact-edit-end"></div>
 

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

diff --git a/view/smarty3/notifications_network_item.tpl b/view/smarty3/notifications_network_item.tpl
index 14f37162d4cca998e39f2307ae43551aeadaf698..856955424b853e8bca22c91cca483773a74debce 100644 (file)
--- a/view/smarty3/notifications_network_item.tpl
+++ b/view/smarty3/notifications_network_item.tpl
@@ -1,3 +1,3 @@
 <div class="notif-item">
-       <a href="{{{$item_link}}}" target="friendica-notifications"><img src="{{{$item_image}}}" class="notif-image">{{{$item_text}}} <span class="notif-when">{{{$item_when}}}</span></a>
-</div>
\ No newline at end of file
+       <a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a>
+</div>

diff --git a/view/smarty3/pagetypes.tpl b/view/smarty3/pagetypes.tpl
index 6c4c1cf93902cefdd81c8a87bb40b00201ae443c..d5fcd9968f3bab040bc1ce2ee7c105e0d93d4bbe 100644 (file)
--- a/view/smarty3/pagetypes.tpl
+++ b/view/smarty3/pagetypes.tpl
@@ -1,5 +1,5 @@
-       {{include file="file:{{$field_radio}}" field=$page_normal}}
-       {{include file="file:{{$field_radio}}" field=$page_community}}
-       {{include file="file:{{$field_radio}}" field=$page_prvgroup}}
-       {{include file="file:{{$field_radio}}" field=$page_soapbox}}
-       {{include file="file:{{$field_radio}}" field=$page_freelove}}
+       {{include file="field_radio.tpl" field=$page_normal}}
+       {{include file="field_radio.tpl" field=$page_community}}
+       {{include file="field_radio.tpl" field=$page_prvgroup}}
+       {{include file="field_radio.tpl" field=$page_soapbox}}
+       {{include file="field_radio.tpl" field=$page_freelove}}

diff --git a/view/smarty3/photos_recent.tpl b/view/smarty3/photos_recent.tpl
index b5faa2c4e6fe56d130b0e4afcb7fd48feff7b228..329562515963b0a2784454be4b17f2bbc37f14fd 100644 (file)
--- a/view/smarty3/photos_recent.tpl
+++ b/view/smarty3/photos_recent.tpl
@@ -5,7 +5,7 @@
 
 <div class="photos">
 {{foreach $photos as $ph}}
-       {{include file="file:{{$photo_top}}" photo=$ph}}
+       {{include file="photo_top.tpl" photo=$ph}}
 {{/foreach}}
 </div>
 <div class="photos-end"></div>

diff --git a/view/smarty3/poco_xml.tpl b/view/smarty3/poco_xml.tpl
index 67137c25365dc7073e535e1fa4d53db28c76f9be..cd54b5446cbbf80823f512e27fd20a534ff2cc0d 100644 (file)
--- a/view/smarty3/poco_xml.tpl
+++ b/view/smarty3/poco_xml.tpl
@@ -10,7 +10,7 @@
 
 {{if $response.totalResults}}
 {{foreach $response.entry as $ent}}
-{{include file="file:{{$poco_entry_xml}}" entry=$ent}}
+{{include file="poco_entry_xml.tpl" entry=$ent}}
 {{/foreach}}
 {{else}}
 <entry></entry>

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

diff --git a/view/smarty3/settings.tpl b/view/smarty3/settings.tpl
index d4e8fb6ac63489b26a9f29e357fd84733238f132..9fdd5437b0525371548368f5a6eae0ebf7d05a9f 100644 (file)
--- a/view/smarty3/settings.tpl
+++ b/view/smarty3/settings.tpl
@@ -7,11 +7,11 @@
 
 <h3 class="settings-heading">{{$h_pass}}</h3>
 
-{{include file="file:{{$field_password}}" field=$password1}}
-{{include file="file:{{$field_password}}" field=$password2}}
+{{include file="field_password.tpl" field=$password1}}
+{{include file="field_password.tpl" field=$password2}}
 
 {{if $oid_enable}}
-{{include file="file:{{$field_input}}" field=$openid}}
+{{include file="field_input.tpl" field=$openid}}
 {{/if}}
 
 <div class="settings-submit-wrapper" >
@@ -21,11 +21,11 @@
 
 <h3 class="settings-heading">{{$h_basic}}</h3>
 
-{{include file="file:{{$field_input}}" field=$username}}
-{{include file="file:{{$field_input}}" field=$email}}
-{{include file="file:{{$field_custom}}" field=$timezone}}
-{{include file="file:{{$field_input}}" field=$defloc}}
-{{include file="file:{{$field_checkbox}}" field=$allowloc}}
+{{include file="field_input.tpl" field=$username}}
+{{include file="field_input.tpl" field=$email}}
+{{include file="field_custom.tpl" field=$timezone}}
+{{include file="field_input.tpl" field=$defloc}}
+{{include file="field_checkbox.tpl" field=$allowloc}}
 
 
 <div class="settings-submit-wrapper" >
@@ -38,7 +38,7 @@
 
 <input type="hidden" name="visibility" value="{{$visibility}}" />
 
-{{include file="file:{{$field_input}}" field=$maxreq}}
+{{include file="field_input.tpl" field=$maxreq}}
 
 {{$profile_in_dir}}
 
@@ -57,9 +57,9 @@
 {{$unkmail}}
 
 
-{{include file="file:{{$field_input}}" field=$cntunkmail}}
+{{include file="field_input.tpl" field=$cntunkmail}}
 
-{{include file="file:{{$field_input}}" field=$expire.days}}
+{{include file="field_input.tpl" field=$expire.days}}
 
 
 <div class="field input">
@@ -67,10 +67,10 @@
        <div style="display: none;">
                <div id="advanced-expire-popup" style="width:auto;height:auto;overflow:auto;">
                        <h3>{{$expire.advanced}}</h3>
-                       {{include file="file:{{$field_yesno}}" field=$expire.items}}
-                       {{include file="file:{{$field_yesno}}" field=$expire.notes}}
-                       {{include file="file:{{$field_yesno}}" field=$expire.starred}}
-                       {{include file="file:{{$field_yesno}}" field=$expire.network_only}}
+                       {{include file="field_yesno.tpl" field=$expire.items}}
+                       {{include file="field_yesno.tpl" field=$expire.notes}}
+                       {{include file="field_yesno.tpl" field=$expire.starred}}
+                       {{include file="field_yesno.tpl" field=$expire.network_only}}
                </div>
        </div>
 
@@ -108,22 +108,22 @@
 
 <div id="settings-activity-desc">{{$activity_options}}</div>
 
-{{include file="file:{{$field_checkbox}}" field=$post_newfriend}}
-{{include file="file:{{$field_checkbox}}" field=$post_joingroup}}
-{{include file="file:{{$field_checkbox}}" field=$post_profilechange}}
+{{include file="field_checkbox.tpl" field=$post_newfriend}}
+{{include file="field_checkbox.tpl" field=$post_joingroup}}
+{{include file="field_checkbox.tpl" field=$post_profilechange}}
 
 
 <div id="settings-notify-desc">{{$lbl_not}}</div>
 
 <div class="group">
-{{include file="file:{{$field_intcheckbox}}" field=$notify1}}
-{{include file="file:{{$field_intcheckbox}}" field=$notify2}}
-{{include file="file:{{$field_intcheckbox}}" field=$notify3}}
-{{include file="file:{{$field_intcheckbox}}" field=$notify4}}
-{{include file="file:{{$field_intcheckbox}}" field=$notify5}}
-{{include file="file:{{$field_intcheckbox}}" field=$notify6}}
-{{include file="file:{{$field_intcheckbox}}" field=$notify7}}
-{{include file="file:{{$field_intcheckbox}}" field=$notify8}}
+{{include file="field_intcheckbox.tpl" field=$notify1}}
+{{include file="field_intcheckbox.tpl" field=$notify2}}
+{{include file="field_intcheckbox.tpl" field=$notify3}}
+{{include file="field_intcheckbox.tpl" field=$notify4}}
+{{include file="field_intcheckbox.tpl" field=$notify5}}
+{{include file="field_intcheckbox.tpl" field=$notify6}}
+{{include file="field_intcheckbox.tpl" field=$notify7}}
+{{include file="field_intcheckbox.tpl" field=$notify8}}
 </div>
 
 </div>

diff --git a/view/smarty3/settings_connectors.tpl b/view/smarty3/settings_connectors.tpl
index 3b025a63d9ef71f6909e25dcb5dc1045aabd0972..4d33393b13f2bfb7c10b9707da84972cfe4e2d59 100644 (file)
--- a/view/smarty3/settings_connectors.tpl
+++ b/view/smarty3/settings_connectors.tpl
@@ -14,16 +14,16 @@
        <div class="settings-block">
        <h3 class="settings-heading">{{$h_imap}}</h3>
        <p>{{$imap_desc}}</p>
-       {{include file="file:{{$field_custom}}" field=$imap_lastcheck}}
-       {{include file="file:{{$field_input}}" field=$mail_server}}
-       {{include file="file:{{$field_input}}" field=$mail_port}}
-       {{include file="file:{{$field_select}}" field=$mail_ssl}}
-       {{include file="file:{{$field_input}}" field=$mail_user}}
-       {{include file="file:{{$field_password}}" field=$mail_pass}}
-       {{include file="file:{{$field_input}}" field=$mail_replyto}}
-       {{include file="file:{{$field_checkbox}}" field=$mail_pubmail}}
-       {{include file="file:{{$field_select}}" field=$mail_action}}
-       {{include file="file:{{$field_input}}" field=$mail_movetofolder}}
+       {{include file="field_custom.tpl" field=$imap_lastcheck}}
+       {{include file="field_input.tpl" field=$mail_server}}
+       {{include file="field_input.tpl" field=$mail_port}}
+       {{include file="field_select.tpl" field=$mail_ssl}}
+       {{include file="field_input.tpl" field=$mail_user}}
+       {{include file="field_password.tpl" field=$mail_pass}}
+       {{include file="field_input.tpl" field=$mail_replyto}}
+       {{include file="field_checkbox.tpl" field=$mail_pubmail}}
+       {{include file="field_select.tpl" field=$mail_action}}
+       {{include file="field_input.tpl" field=$mail_movetofolder}}
 
        <div class="settings-submit-wrapper" >
                <input type="submit" id="imap-submit" name="imap-submit" class="settings-submit" value="{{$submit}}" />

diff --git a/view/smarty3/settings_display.tpl b/view/smarty3/settings_display.tpl
index 030523939d78fb24d053cae3ff26785f5c750787..f8b4c51306a2317ba5c8de3bddbe0e499ab2580a 100644 (file)
--- a/view/smarty3/settings_display.tpl
+++ b/view/smarty3/settings_display.tpl
@@ -3,11 +3,11 @@
 <form action="settings/display" id="settings-form" method="post" autocomplete="off" >
 <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
 
-{{include file="file:{{$field_themeselect}}" field=$theme}}
-{{include file="file:{{$field_themeselect}}" field=$mobile_theme}}
-{{include file="file:{{$field_input}}" field=$ajaxint}}
-{{include file="file:{{$field_input}}" field=$itemspage_network}}
-{{include file="file:{{$field_checkbox}}" field=$nosmile}}
+{{include file="field_themeselect.tpl" field=$theme}}
+{{include file="field_themeselect.tpl" field=$mobile_theme}}
+{{include file="field_input.tpl" field=$ajaxint}}
+{{include file="field_input.tpl" field=$itemspage_network}}
+{{include file="field_checkbox.tpl" field=$nosmile}}
 
 
 <div class="settings-submit-wrapper" >

diff --git a/view/smarty3/settings_features.tpl b/view/smarty3/settings_features.tpl
index 9db99b5ec83989ca049fc2fd9bf12446c5264c18..5c0333df26e0cf15bee8cbf63738782db43a7103 100644 (file)
--- a/view/smarty3/settings_features.tpl
+++ b/view/smarty3/settings_features.tpl
@@ -8,7 +8,7 @@
 <h3 class="settings-heading">{{$f.0}}</h3>
 
 {{foreach $f.1 as $fcat}}
-       {{include file="file:{{$field_yesno}}" field=$fcat}}
+       {{include file="field_yesno.tpl" field=$fcat}}
 {{/foreach}}
 {{/foreach}}
 

diff --git a/view/smarty3/settings_oauth_edit.tpl b/view/smarty3/settings_oauth_edit.tpl
index c991f97ba72db0ad35da2ecc206cd7609dc8a42d..bf805363c558b4ddeb04a707dc81509f63587ae3 100644 (file)
--- a/view/smarty3/settings_oauth_edit.tpl
+++ b/view/smarty3/settings_oauth_edit.tpl
@@ -3,11 +3,11 @@
 <form method="POST">
 <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
 
-{{include file="file:{{$field_input}}" field=$name}}
-{{include file="file:{{$field_input}}" field=$key}}
-{{include file="file:{{$field_input}}" field=$secret}}
-{{include file="file:{{$field_input}}" field=$redirect}}
-{{include file="file:{{$field_input}}" field=$icon}}
+{{include file="field_input.tpl" field=$name}}
+{{include file="field_input.tpl" field=$key}}
+{{include file="field_input.tpl" field=$secret}}
+{{include file="field_input.tpl" field=$redirect}}
+{{include file="field_input.tpl" field=$icon}}
 
 <div class="settings-submit-wrapper" >
 <input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />

diff --git a/view/smarty3/suggestions.tpl b/view/smarty3/suggestions.tpl
index b4f6afc99479d63bc3e182127bcf1827e50a4c06..02460b6ad95d087a711ea824c8d041c7f9a356a3 100644 (file)
--- a/view/smarty3/suggestions.tpl
+++ b/view/smarty3/suggestions.tpl
@@ -14,7 +14,7 @@
 <div class="intro-form-end"></div>
 
 <form class="intro-approve-form" action="{{$request}}" method="get">
-{{include file="file:{{$field_checkbox}}" field=$hidden}}
+{{include file="field_checkbox.tpl" field=$hidden}}
 <input class="intro-submit-approve" type="submit" name="submit" value="{{$approve}}" />
 </form>
 </div>

diff --git a/view/smarty3/uimport.tpl b/view/smarty3/uimport.tpl
index f9ec290ab97a48a55e3d47a508524875fdfc82b1..cb0290ed47ea61d9cbb68e0d87cc8ff6d0faa887 100644 (file)
--- a/view/smarty3/uimport.tpl
+++ b/view/smarty3/uimport.tpl
@@ -3,7 +3,7 @@
     <p>{{$import.intro}}</p>\r
     <p>{{$import.instruct}}</p>\r
     <p><b>{{$import.warn}}</b></p>\r
-     {{include file="file:{{$field_custom}}" field=$import.field}}\r
+     {{include file="field_custom.tpl" field=$import.field}}\r
      \r
      \r
        <div id="register-submit-wrapper">\r

diff --git a/view/smarty3/viewcontact_template.tpl b/view/smarty3/viewcontact_template.tpl
index 4a3b0efaf6b62d7d4f53eb5cb1281978d8fe174f..19a4eec805433d44a0ee97687361f51ca4ad256f 100644 (file)
--- a/view/smarty3/viewcontact_template.tpl
+++ b/view/smarty3/viewcontact_template.tpl
@@ -1,7 +1,7 @@
 <h3>{{$title}}</h3>
 
 {{foreach $contacts as $c}}
-       {{include file="file:{{$contact_template}}" contact=$c}}
+       {{include file="contact_template.tpl" contact=$c}}
 {{/foreach}}
 
 <div id="view-contact-end"></div>

diff --git a/view/theme/cleanzero/smarty3/theme_settings.tpl b/view/theme/cleanzero/smarty3/theme_settings.tpl
index 5df8e28bea2e7b81ff5f010199c80a566a69c087..dabda90fd9d266afeda72d8d7bd9ce880d1981c4 100644 (file)
--- a/view/theme/cleanzero/smarty3/theme_settings.tpl
+++ b/view/theme/cleanzero/smarty3/theme_settings.tpl
@@ -1,7 +1,7 @@
-{{include file="file:{{$field_select}}" field=$color}}
-{{include file="file:{{$field_select}}" field=$font_size}}
-{{include file="file:{{$field_select}}" field=$resize}}
-{{include file="file:{{$field_select}}" field=$theme_width}}
+{{include file="field_select.tpl" field=$color}}
+{{include file="field_select.tpl" field=$font_size}}
+{{include file="field_select.tpl" field=$resize}}
+{{include file="field_select.tpl" field=$theme_width}}
 
 
 <div class="settings-submit-wrapper">

diff --git a/view/theme/diabook/smarty3/communityhome.tpl b/view/theme/diabook/smarty3/communityhome.tpl
index 864dc55c40152551881ac2e50f4cdf52b5f1cfe0..7895fd731d23b34955841f3dfa178b6002bdbe49 100644 (file)
--- a/view/theme/diabook/smarty3/communityhome.tpl
+++ b/view/theme/diabook/smarty3/communityhome.tpl
@@ -1,7 +1,7 @@
 
 <div id="twittersettings" style="display:none">
 <form id="twittersettingsform" action="network" method="post" >
-{{include file="file:{{$field_input}}" field=$TSearchTerm}}
+{{include file="field_input.tpl" field=$TSearchTerm}}
 <div class="settings-submit-wrapper">
 <input id="twittersub" type="submit" value="{{$sub}}" class="settings-submit" name="diabook-settings-sub"></input>
 </div>
@@ -13,9 +13,9 @@
 <div id="layermanager" style="width: 350px;position: relative;float: right;right:20px;height: 300px;"></div>
 <div id="map2" style="height:350px;width:350px;"></div>
 <div id="mouseposition" style="width: 350px;"></div>
-{{include file="file:{{$field_input}}" field=$ELZoom}}
-{{include file="file:{{$field_input}}" field=$ELPosX}}
-{{include file="file:{{$field_input}}" field=$ELPosY}}
+{{include file="field_input.tpl" field=$ELZoom}}
+{{include file="field_input.tpl" field=$ELPosX}}
+{{include file="field_input.tpl" field=$ELPosY}}
 <div class="settings-submit-wrapper">
 <input id="mapsub" type="submit" value="{{$sub}}" class="settings-submit" name="diabook-settings-map-sub"></input>
 </div>
@@ -35,16 +35,16 @@ just contact me, if you are intesrested in joining</p>
 <div id="boxsettings" style="display:none">
 <form id="boxsettingsform" action="network" method="post" >
 <fieldset><legend>{{$boxsettings.title.1}}</legend>
-{{include file="file:{{$field_select}}" field=$close_pages}}
-{{include file="file:{{$field_select}}" field=$close_profiles}}
-{{include file="file:{{$field_select}}" field=$close_helpers}}
-{{include file="file:{{$field_select}}" field=$close_services}}
-{{include file="file:{{$field_select}}" field=$close_friends}}
-{{include file="file:{{$field_select}}" field=$close_lastusers}}
-{{include file="file:{{$field_select}}" field=$close_lastphotos}}
-{{include file="file:{{$field_select}}" field=$close_lastlikes}}
-{{include file="file:{{$field_select}}" field=$close_twitter}}
-{{include file="file:{{$field_select}}" field=$close_mapquery}}
+{{include file="field_select.tpl" field=$close_pages}}
+{{include file="field_select.tpl" field=$close_profiles}}
+{{include file="field_select.tpl" field=$close_helpers}}
+{{include file="field_select.tpl" field=$close_services}}
+{{include file="field_select.tpl" field=$close_friends}}
+{{include file="field_select.tpl" field=$close_lastusers}}
+{{include file="field_select.tpl" field=$close_lastphotos}}
+{{include file="field_select.tpl" field=$close_lastlikes}}
+{{include file="field_select.tpl" field=$close_twitter}}
+{{include file="field_select.tpl" field=$close_mapquery}}
 <div class="settings-submit-wrapper">
 <input id="boxsub" type="submit" value="{{$sub}}" class="settings-submit" name="diabook-settings-box-sub"></input>
 </div>

diff --git a/view/theme/diabook/smarty3/login.tpl b/view/theme/diabook/smarty3/login.tpl
index 330e379ad9de888e2b331696e3ee3160e0f40e74..a6e8e9dec6a7cc79cbdce942c35fe6da08e34042 100644 (file)
--- a/view/theme/diabook/smarty3/login.tpl
+++ b/view/theme/diabook/smarty3/login.tpl
@@ -3,13 +3,13 @@
        <input type="hidden" name="auth-params" value="login" />
 
        <div id="login_standard">
-       {{include file="file:{{$field_input}}" field=$lname}}
-       {{include file="file:{{$field_password}}" field=$lpassword}}
+       {{include file="field_input.tpl" field=$lname}}
+       {{include file="field_password.tpl" field=$lpassword}}
        </div>
        
        {{if $openid}}
                        <div id="login_openid">
-                       {{include file="file:{{$field_openid}}" field=$lopenid}}
+                       {{include file="field_openid.tpl" field=$lopenid}}
                        </div>
        {{/if}}
        

diff --git a/view/theme/diabook/smarty3/mail_display.tpl b/view/theme/diabook/smarty3/mail_display.tpl
index 3400227923db80a5d5a0b256ee96be7c0922966a..060fa1ae6eeba7ff6accfed78287ba0f487a62aa 100644 (file)
--- a/view/theme/diabook/smarty3/mail_display.tpl
+++ b/view/theme/diabook/smarty3/mail_display.tpl
@@ -5,8 +5,8 @@
 
 {{foreach $mails as $mail_item}}
        <div id="tread-wrapper-{{$mail_item.id}}" class="tread-wrapper">
-               {{include file="file:{{$mail_conv}}" mail=$mail_item}}
+               {{include file="mail_conv.tpl" mail=$mail_item}}
        </div>
 {{/foreach}}
 
-{{include file="file:{{$prv_message}}" reply=$reply_info}}
+{{include file="prv_message.tpl" reply=$reply_info}}

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

diff --git a/view/theme/diabook/smarty3/theme_settings.tpl b/view/theme/diabook/smarty3/theme_settings.tpl
index a9bc0422c301dc1bf0980d2534ebd127078aa4a1..fe4340a29f2ae33c52b3b2abcbe2cc4d3cd97066 100644 (file)
--- a/view/theme/diabook/smarty3/theme_settings.tpl
+++ b/view/theme/diabook/smarty3/theme_settings.tpl
@@ -1,33 +1,33 @@
-{{include file="file:{{$field_select}}" field=$color}}
+{{include file="field_select.tpl" field=$color}}
 
-{{include file="file:{{$field_select}}" field=$font_size}}
+{{include file="field_select.tpl" field=$font_size}}
 
-{{include file="file:{{$field_select}}" field=$line_height}}
+{{include file="field_select.tpl" field=$line_height}}
 
-{{include file="file:{{$field_select}}" field=$resolution}}
+{{include file="field_select.tpl" field=$resolution}}
 
 <div class="settings-submit-wrapper">
        <input type="submit" value="{{$submit}}" class="settings-submit" name="diabook-settings-submit" />
 </div>
 <br>
 <h3>Show/hide boxes at right-hand column</h3>
-{{include file="file:{{$field_select}}" field=$close_pages}}
-{{include file="file:{{$field_select}}" field=$close_profiles}}
-{{include file="file:{{$field_select}}" field=$close_helpers}}
-{{include file="file:{{$field_select}}" field=$close_services}}
-{{include file="file:{{$field_select}}" field=$close_friends}}
-{{include file="file:{{$field_select}}" field=$close_lastusers}}
-{{include file="file:{{$field_select}}" field=$close_lastphotos}}
-{{include file="file:{{$field_select}}" field=$close_lastlikes}}
-{{include file="file:{{$field_select}}" field=$close_twitter}}
-{{include file="file:{{$field_input}}" field=$TSearchTerm}}
-{{include file="file:{{$field_select}}" field=$close_mapquery}}
-
-{{include file="file:{{$field_input}}" field=$ELPosX}}
-
-{{include file="file:{{$field_input}}" field=$ELPosY}}
-
-{{include file="file:{{$field_input}}" field=$ELZoom}}
+{{include file="field_select.tpl" field=$close_pages}}
+{{include file="field_select.tpl" field=$close_profiles}}
+{{include file="field_select.tpl" field=$close_helpers}}
+{{include file="field_select.tpl" field=$close_services}}
+{{include file="field_select.tpl" field=$close_friends}}
+{{include file="field_select.tpl" field=$close_lastusers}}
+{{include file="field_select.tpl" field=$close_lastphotos}}
+{{include file="field_select.tpl" field=$close_lastlikes}}
+{{include file="field_select.tpl" field=$close_twitter}}
+{{include file="field_input.tpl" field=$TSearchTerm}}
+{{include file="field_select.tpl" field=$close_mapquery}}
+
+{{include file="field_input.tpl" field=$ELPosX}}
+
+{{include file="field_input.tpl" field=$ELPosY}}
+
+{{include file="field_input.tpl" field=$ELZoom}}
 
 <div class="settings-submit-wrapper">
        <input type="submit" value="{{$submit}}" class="settings-submit" name="diabook-settings-submit" />

diff --git a/view/theme/dispy/smarty3/profile_vcard.tpl b/view/theme/dispy/smarty3/profile_vcard.tpl
index 1334183ab31002c2f5b7a141c27a57eda118ada0..b32af214af6f3af641a7f1fc794b2a01fd987375 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="file:{{$diaspora_vcard}}" diaspora=$diaspora_info}}
+       {{include file="diaspora_vcard.tpl" diaspora=$diaspora_info}}
        
        <div id="profile-extra-links">
                <ul>

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

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

diff --git a/view/theme/frost-mobile/smarty3/admin_site.tpl b/view/theme/frost-mobile/smarty3/admin_site.tpl
index a62f03934b2f45b9a5b286f0025ef4029c9e6e16..421f7e56c7e8c05ca26175c48d9d8e7d6ce423bf 100644 (file)
--- a/view/theme/frost-mobile/smarty3/admin_site.tpl
+++ b/view/theme/frost-mobile/smarty3/admin_site.tpl
@@ -5,55 +5,55 @@
        <form action="{{$baseurl}}/admin/site" method="post">
     <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
 
-       {{include file="file:{{$field_input}}" field=$sitename}}
-       {{include file="file:{{$field_textarea}}" field=$banner}}
-       {{include file="file:{{$field_select}}" field=$language}}
-       {{include file="file:{{$field_select}}" field=$theme}}
-       {{include file="file:{{$field_select}}" field=$theme_mobile}}
-       {{include file="file:{{$field_select}}" field=$ssl_policy}}
+       {{include file="field_input.tpl" field=$sitename}}
+       {{include file="field_textarea.tpl" field=$banner}}
+       {{include file="field_select.tpl" field=$language}}
+       {{include file="field_select.tpl" field=$theme}}
+       {{include file="field_select.tpl" field=$theme_mobile}}
+       {{include file="field_select.tpl" field=$ssl_policy}}
        
        <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
        
        <h3>{{$registration}}</h3>
-       {{include file="file:{{$field_input}}" field=$register_text}}
-       {{include file="file:{{$field_select}}" field=$register_policy}}
+       {{include file="field_input.tpl" field=$register_text}}
+       {{include file="field_select.tpl" field=$register_policy}}
        
-       {{include file="file:{{$field_checkbox}}" field=$no_multi_reg}}
-       {{include file="file:{{$field_checkbox}}" field=$no_openid}}
-       {{include file="file:{{$field_checkbox}}" field=$no_regfullname}}
+       {{include file="field_checkbox.tpl" field=$no_multi_reg}}
+       {{include file="field_checkbox.tpl" field=$no_openid}}
+       {{include file="field_checkbox.tpl" field=$no_regfullname}}
        
        <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
 
        <h3>{{$upload}}</h3>
-       {{include file="file:{{$field_input}}" field=$maximagesize}}
-       {{include file="file:{{$field_input}}" field=$maximagelength}}
-       {{include file="file:{{$field_input}}" field=$jpegimagequality}}
+       {{include file="field_input.tpl" field=$maximagesize}}
+       {{include file="field_input.tpl" field=$maximagelength}}
+       {{include file="field_input.tpl" field=$jpegimagequality}}
        
        <h3>{{$corporate}}</h3>
-       {{include file="file:{{$field_input}}" field=$allowed_sites}}
-       {{include file="file:{{$field_input}}" field=$allowed_email}}
-       {{include file="file:{{$field_checkbox}}" field=$block_public}}
-       {{include file="file:{{$field_checkbox}}" field=$force_publish}}
-       {{include file="file:{{$field_checkbox}}" field=$no_community_page}}
-       {{include file="file:{{$field_checkbox}}" field=$ostatus_disabled}}
-       {{include file="file:{{$field_checkbox}}" field=$diaspora_enabled}}
-       {{include file="file:{{$field_checkbox}}" field=$dfrn_only}}
-       {{include file="file:{{$field_input}}" field=$global_directory}}
-       {{include file="file:{{$field_checkbox}}" field=$thread_allow}}
-       {{include file="file:{{$field_checkbox}}" field=$newuser_private}}
+       {{include file="field_input.tpl" field=$allowed_sites}}
+       {{include file="field_input.tpl" field=$allowed_email}}
+       {{include file="field_checkbox.tpl" field=$block_public}}
+       {{include file="field_checkbox.tpl" field=$force_publish}}
+       {{include file="field_checkbox.tpl" field=$no_community_page}}
+       {{include file="field_checkbox.tpl" field=$ostatus_disabled}}
+       {{include file="field_checkbox.tpl" field=$diaspora_enabled}}
+       {{include file="field_checkbox.tpl" field=$dfrn_only}}
+       {{include file="field_input.tpl" field=$global_directory}}
+       {{include file="field_checkbox.tpl" field=$thread_allow}}
+       {{include file="field_checkbox.tpl" field=$newuser_private}}
        
        <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
        
        <h3>{{$advanced}}</h3>
-       {{include file="file:{{$field_checkbox}}" field=$no_utf}}
-       {{include file="file:{{$field_checkbox}}" field=$verifyssl}}
-       {{include file="file:{{$field_input}}" field=$proxy}}
-       {{include file="file:{{$field_input}}" field=$proxyuser}}
-       {{include file="file:{{$field_input}}" field=$timeout}}
-       {{include file="file:{{$field_input}}" field=$delivery_interval}}
-       {{include file="file:{{$field_input}}" field=$poll_interval}}
-       {{include file="file:{{$field_input}}" field=$maxloadavg}}
-       {{include file="file:{{$field_input}}" field=$abandon_days}}
+       {{include file="field_checkbox.tpl" field=$no_utf}}
+       {{include file="field_checkbox.tpl" field=$verifyssl}}
+       {{include file="field_input.tpl" field=$proxy}}
+       {{include file="field_input.tpl" field=$proxyuser}}
+       {{include file="field_input.tpl" field=$timeout}}
+       {{include file="field_input.tpl" field=$delivery_interval}}
+       {{include file="field_input.tpl" field=$poll_interval}}
+       {{include file="field_input.tpl" field=$maxloadavg}}
+       {{include file="field_input.tpl" field=$abandon_days}}
        
        <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
        

diff --git a/view/theme/frost-mobile/smarty3/contacts-template.tpl b/view/theme/frost-mobile/smarty3/contacts-template.tpl
index a6cc66a2ba12dfd0c106d4559c258fbdaaa09053..3a2547596885599c07fad440d1247862d5646452 100644 (file)
--- a/view/theme/frost-mobile/smarty3/contacts-template.tpl
+++ b/view/theme/frost-mobile/smarty3/contacts-template.tpl
@@ -16,7 +16,7 @@
 
 <div id="contacts-display-wrapper">
 {{foreach $contacts as $c}}
-       {{include file="file:{{$contact_template}}" contact=$c}}
+       {{include file="contact_template.tpl" contact=$c}}
 {{/foreach}}
 </div>
 <div id="contact-edit-end"></div>

diff --git a/view/theme/frost-mobile/smarty3/login.tpl b/view/theme/frost-mobile/smarty3/login.tpl
index cd57c79fa2b3d8483a0a404e1ed0fbd2c7766758..2f466dddd08829cdfb0f41f0c0ede3dfc42a78c9 100644 (file)
--- a/view/theme/frost-mobile/smarty3/login.tpl
+++ b/view/theme/frost-mobile/smarty3/login.tpl
@@ -4,13 +4,13 @@
        <input type="hidden" name="auth-params" value="login" />
 
        <div id="login_standard">
-       {{include file="file:{{$field_input}}" field=$lname}}
-       {{include file="file:{{$field_password}}" field=$lpassword}}
+       {{include file="field_input.tpl" field=$lname}}
+       {{include file="field_password.tpl" field=$lpassword}}
        </div>
        
        {{if $openid}}
                        <div id="login_openid">
-                       {{include file="file:{{$field_openid}}" field=$lopenid}}
+                       {{include file="field_openid.tpl" field=$lopenid}}
                        </div>
        {{/if}}
 
@@ -21,7 +21,7 @@
        </div>-->
 
        <br />
-       {{include file="file:{{$field_checkbox}}" field=$lremember}}
+       {{include file="field_checkbox.tpl" field=$lremember}}
 
        <div id="login-submit-wrapper" >
                <input type="submit" name="submit" id="login-submit-button" value="{{$login}}" />

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

diff --git a/view/theme/frost-mobile/smarty3/settings.tpl b/view/theme/frost-mobile/smarty3/settings.tpl
index 71c40d938747a268c13f85243d18ecafb3bf35ac..1f6eaa5a9ac8443a1d66629726f3e293230c4a72 100644 (file)
--- a/view/theme/frost-mobile/smarty3/settings.tpl
+++ b/view/theme/frost-mobile/smarty3/settings.tpl
@@ -7,11 +7,11 @@
 
 <h3 class="settings-heading">{{$h_pass}}</h3>
 
-{{include file="file:{{$field_password}}" field=$password1}}
-{{include file="file:{{$field_password}}" field=$password2}}
+{{include file="field_password.tpl" field=$password1}}
+{{include file="field_password.tpl" field=$password2}}
 
 {{if $oid_enable}}
-{{include file="file:{{$field_input}}" field=$openid}}
+{{include file="field_input.tpl" field=$openid}}
 {{/if}}
 
 <div class="settings-submit-wrapper" >
@@ -21,11 +21,11 @@
 
 <h3 class="settings-heading">{{$h_basic}}</h3>
 
-{{include file="file:{{$field_input}}" field=$username}}
-{{include file="file:{{$field_input}}" field=$email}}
-{{include file="file:{{$field_custom}}" field=$timezone}}
-{{include file="file:{{$field_input}}" field=$defloc}}
-{{include file="file:{{$field_checkbox}}" field=$allowloc}}
+{{include file="field_input.tpl" field=$username}}
+{{include file="field_input.tpl" field=$email}}
+{{include file="field_custom.tpl" field=$timezone}}
+{{include file="field_input.tpl" field=$defloc}}
+{{include file="field_checkbox.tpl" field=$allowloc}}
 
 
 <div class="settings-submit-wrapper" >
@@ -38,7 +38,7 @@
 
 <input type="hidden" name="visibility" value="{{$visibility}}" />
 
-{{include file="file:{{$field_input}}" field=$maxreq}}
+{{include file="field_input.tpl" field=$maxreq}}
 
 {{$profile_in_dir}}
 
@@ -57,9 +57,9 @@
 {{$unkmail}}
 
 
-{{include file="file:{{$field_input}}" field=$cntunkmail}}
+{{include file="field_input.tpl" field=$cntunkmail}}
 
-{{include file="file:{{$field_input}}" field=$expire.days}}
+{{include file="field_input.tpl" field=$expire.days}}
 
 
 <div class="field input">
@@ -67,10 +67,10 @@
        <div style="display: none;">
                <div id="advanced-expire-popup" style="width:auto;height:auto;overflow:auto;">
                        <h3>{{$expire.advanced}}</h3>
-                       {{include file="file:{{$field_yesno}}" field=$expire.items}}
-                       {{include file="file:{{$field_yesno}}" field=$expire.notes}}
-                       {{include file="file:{{$field_yesno}}" field=$expire.starred}}
-                       {{include file="file:{{$field_yesno}}" field=$expire.network_only}}
+                       {{include file="field_yesno.tpl" field=$expire.items}}
+                       {{include file="field_yesno.tpl" field=$expire.notes}}
+                       {{include file="field_yesno.tpl" field=$expire.starred}}
+                       {{include file="field_yesno.tpl" field=$expire.network_only}}
                </div>
        </div>
 
@@ -108,21 +108,21 @@
 
 <div id="settings-activity-desc">{{$activity_options}}</div>
 
-{{include file="file:{{$field_checkbox}}" field=$post_newfriend}}
-{{include file="file:{{$field_checkbox}}" field=$post_joingroup}}
-{{include file="file:{{$field_checkbox}}" field=$post_profilechange}}
+{{include file="field_checkbox.tpl" field=$post_newfriend}}
+{{include file="field_checkbox.tpl" field=$post_joingroup}}
+{{include file="field_checkbox.tpl" field=$post_profilechange}}
 
 
 <div id="settings-notify-desc">{{$lbl_not}}</div>
 
 <div class="group">
-{{include file="file:{{$field_intcheckbox}}" field=$notify1}}
-{{include file="file:{{$field_intcheckbox}}" field=$notify2}}
-{{include file="file:{{$field_intcheckbox}}" field=$notify3}}
-{{include file="file:{{$field_intcheckbox}}" field=$notify4}}
-{{include file="file:{{$field_intcheckbox}}" field=$notify5}}
-{{include file="file:{{$field_intcheckbox}}" field=$notify6}}
-{{include file="file:{{$field_intcheckbox}}" field=$notify7}}
+{{include file="field_intcheckbox.tpl" field=$notify1}}
+{{include file="field_intcheckbox.tpl" field=$notify2}}
+{{include file="field_intcheckbox.tpl" field=$notify3}}
+{{include file="field_intcheckbox.tpl" field=$notify4}}
+{{include file="field_intcheckbox.tpl" field=$notify5}}
+{{include file="field_intcheckbox.tpl" field=$notify6}}
+{{include file="field_intcheckbox.tpl" field=$notify7}}
 </div>
 
 </div>

diff --git a/view/theme/frost/smarty3/admin_site.tpl b/view/theme/frost/smarty3/admin_site.tpl
index 249c1dade582300f1a956bde1ef97644dcd00dfc..e6490260d87d75021c223af3a083685faa4fc16d 100644 (file)
--- a/view/theme/frost/smarty3/admin_site.tpl
+++ b/view/theme/frost/smarty3/admin_site.tpl
@@ -5,55 +5,66 @@
        <form action="{{$baseurl}}/admin/site" method="post">
     <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
 
-       {{include file="file:{{$field_input}}" field=$sitename}}
-       {{include file="file:{{$field_textarea}}" field=$banner}}
-       {{include file="file:{{$field_select}}" field=$language}}
-       {{include file="file:{{$field_select}}" field=$theme}}
-       {{include file="file:{{$field_select}}" field=$theme_mobile}}
-       {{include file="file:{{$field_select}}" field=$ssl_policy}}
+       {{include file="field_input.tpl" field=$sitename}}
+       {{include file="field_textarea.tpl" field=$banner}}
+       {{include file="field_select.tpl" field=$language}}
+       {{include file="field_select.tpl" field=$theme}}
+       {{include file="field_select.tpl" field=$theme_mobile}}
+       {{include file="field_select.tpl" field=$ssl_policy}}
+       {{include file="field_checkbox.tpl" field=$new_share}}
+
        
        <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
        
        <h3>{{$registration}}</h3>
-       {{include file="file:{{$field_input}}" field=$register_text}}
-       {{include file="file:{{$field_select}}" field=$register_policy}}
-       {{include file="file:{{$field_input}}" field=$daily_registrations}}     
-       {{include file="file:{{$field_checkbox}}" field=$no_multi_reg}}
-       {{include file="file:{{$field_checkbox}}" field=$no_openid}}
-       {{include file="file:{{$field_checkbox}}" field=$no_regfullname}}
+       {{include file="field_input.tpl" field=$register_text}}
+       {{include file="field_select.tpl" field=$register_policy}}
+       {{include file="field_input.tpl" field=$daily_registrations}}
+       {{include file="field_checkbox.tpl" field=$no_multi_reg}}
+       {{include file="field_checkbox.tpl" field=$no_openid}}
+       {{include file="field_checkbox.tpl" field=$no_regfullname}}
        
        <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
 
        <h3>{{$upload}}</h3>
-       {{include file="file:{{$field_input}}" field=$maximagesize}}
-       {{include file="file:{{$field_input}}" field=$maximagelength}}
-       {{include file="file:{{$field_input}}" field=$jpegimagequality}}
+       {{include file="field_input.tpl" field=$maximagesize}}
+       {{include file="field_input.tpl" field=$maximagelength}}
+       {{include file="field_input.tpl" field=$jpegimagequality}}
        
        <h3>{{$corporate}}</h3>
-       {{include file="file:{{$field_input}}" field=$allowed_sites}}
-       {{include file="file:{{$field_input}}" field=$allowed_email}}
-       {{include file="file:{{$field_checkbox}}" field=$block_public}}
-       {{include file="file:{{$field_checkbox}}" field=$force_publish}}
-       {{include file="file:{{$field_checkbox}}" field=$no_community_page}}
-       {{include file="file:{{$field_checkbox}}" field=$ostatus_disabled}}
-       {{include file="file:{{$field_checkbox}}" field=$diaspora_enabled}}
-       {{include file="file:{{$field_checkbox}}" field=$dfrn_only}}
-       {{include file="file:{{$field_input}}" field=$global_directory}}
-       {{include file="file:{{$field_checkbox}}" field=$thread_allow}}
-       {{include file="file:{{$field_checkbox}}" field=$newuser_private}}
+       {{include file="field_input.tpl" field=$allowed_sites}}
+       {{include file="field_input.tpl" field=$allowed_email}}
+       {{include file="field_checkbox.tpl" field=$block_public}}
+       {{include file="field_checkbox.tpl" field=$force_publish}}
+       {{include file="field_checkbox.tpl" field=$no_community_page}}
+       {{include file="field_checkbox.tpl" field=$ostatus_disabled}}
+       {{include file="field_checkbox.tpl" field=$diaspora_enabled}}
+       {{include file="field_checkbox.tpl" field=$dfrn_only}}
+       {{include file="field_input.tpl" field=$global_directory}}
+       {{include file="field_checkbox.tpl" field=$thread_allow}}
+       {{include file="field_checkbox.tpl" field=$newuser_private}}
        
        <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
        
        <h3>{{$advanced}}</h3>
-       {{include file="file:{{$field_checkbox}}" field=$no_utf}}
-       {{include file="file:{{$field_checkbox}}" field=$verifyssl}}
-       {{include file="file:{{$field_input}}" field=$proxy}}
-       {{include file="file:{{$field_input}}" field=$proxyuser}}
-       {{include file="file:{{$field_input}}" field=$timeout}}
-       {{include file="file:{{$field_input}}" field=$delivery_interval}}
-       {{include file="file:{{$field_input}}" field=$poll_interval}}
-       {{include file="file:{{$field_input}}" field=$maxloadavg}}
-       {{include file="file:{{$field_input}}" field=$abandon_days}}
+       {{include file="field_checkbox.tpl" field=$no_utf}}
+       {{include file="field_checkbox.tpl" field=$verifyssl}}
+       {{include file="field_input.tpl" field=$proxy}}
+       {{include file="field_input.tpl" field=$proxyuser}}
+       {{include file="field_input.tpl" field=$timeout}}
+       {{include file="field_input.tpl" field=$delivery_interval}}
+       {{include file="field_input.tpl" field=$poll_interval}}
+       {{include file="field_input.tpl" field=$maxloadavg}}
+       {{include file="field_input.tpl" field=$abandon_days}}
+       {{include file="field_input.tpl" field=$lockpath}}
+       {{include file="field_input.tpl" field=$temppath}}
+       {{include file="field_input.tpl" field=$basepath}}
+
+       <h3>{{$performance}}</h3>
+       {{include file="field_checkbox.tpl" field=$use_fulltext_engine}}
+       {{include file="field_input.tpl" field=$itemcache}}
+       {{include file="field_input.tpl" field=$itemcache_duration}}
+
        
        <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
        

diff --git a/view/theme/frost/smarty3/contacts-template.tpl b/view/theme/frost/smarty3/contacts-template.tpl
index a6cc66a2ba12dfd0c106d4559c258fbdaaa09053..3a2547596885599c07fad440d1247862d5646452 100644 (file)
--- a/view/theme/frost/smarty3/contacts-template.tpl
+++ b/view/theme/frost/smarty3/contacts-template.tpl
@@ -16,7 +16,7 @@
 
 <div id="contacts-display-wrapper">
 {{foreach $contacts as $c}}
-       {{include file="file:{{$contact_template}}" contact=$c}}
+       {{include file="contact_template.tpl" contact=$c}}
 {{/foreach}}
 </div>
 <div id="contact-edit-end"></div>

diff --git a/view/theme/frost/smarty3/filebrowser.tpl b/view/theme/frost/smarty3/filebrowser.tpl
index 2a246718626cd1f7bba0bd11cde3d8fd2c1e69a1..cfcd9e823f557e029f9f2fd52086f51d627adbe3 100644 (file)
--- a/view/theme/frost/smarty3/filebrowser.tpl
+++ b/view/theme/frost/smarty3/filebrowser.tpl
@@ -77,7 +77,7 @@
                </div>
        </div>
        <div class="mceActionPanel">
-               <input type="button" id="cancel" name="cancel" value="{{*cancel}" onclick="tinyMCEPopup.close();" />
+               <input type="button" id="cancel" name="cancel" value="{{$cancel}}" onclick="tinyMCEPopup.close();" />
        </div>  
        </body>
        

diff --git a/view/theme/frost/smarty3/login.tpl b/view/theme/frost/smarty3/login.tpl
index 81dad28688b1c718932f9651233022584a18b403..284d59929d51d08098354b268676e57f8c0ac792 100644 (file)
--- a/view/theme/frost/smarty3/login.tpl
+++ b/view/theme/frost/smarty3/login.tpl
@@ -4,14 +4,14 @@
        <input type="hidden" name="auth-params" value="login" />
 
        <div id="login_standard">
-       {{include file="file:{{$field_input}}" field=$lname}}
-       {{include file="file:{{$field_password}}" field=$lpassword}}
+       {{include file="field_input.tpl" field=$lname}}
+       {{include file="field_password.tpl" field=$lpassword}}
        </div>
        
        {{if $openid}}
                        <br /><br />
                        <div id="login_openid">
-                       {{include file="file:{{$field_openid}}" field=$lopenid}}
+                       {{include file="field_openid.tpl" field=$lopenid}}
                        </div>
        {{/if}}
 
@@ -21,7 +21,7 @@
        </div>-->
 
        <br /><br />
-       {{include file="file:{{$field_checkbox}}" field=$lremember}}
+       {{include file="field_checkbox.tpl" field=$lremember}}
 
        <div id="login-submit-wrapper" >
                <input type="submit" name="submit" id="login-submit-button" value="{{$login}}" />

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

diff --git a/view/theme/quattro/smarty3/mail_display.tpl b/view/theme/quattro/smarty3/mail_display.tpl
index 3400227923db80a5d5a0b256ee96be7c0922966a..060fa1ae6eeba7ff6accfed78287ba0f487a62aa 100644 (file)
--- a/view/theme/quattro/smarty3/mail_display.tpl
+++ b/view/theme/quattro/smarty3/mail_display.tpl
@@ -5,8 +5,8 @@
 
 {{foreach $mails as $mail_item}}
        <div id="tread-wrapper-{{$mail_item.id}}" class="tread-wrapper">
-               {{include file="file:{{$mail_conv}}" mail=$mail_item}}
+               {{include file="mail_conv.tpl" mail=$mail_item}}
        </div>
 {{/foreach}}
 
-{{include file="file:{{$prv_message}}" reply=$reply_info}}
+{{include file="prv_message.tpl" reply=$reply_info}}

diff --git a/view/theme/quattro/smarty3/profile_vcard.tpl b/view/theme/quattro/smarty3/profile_vcard.tpl
index f50a89d250152e38dff28751131352d206761bda..05412492d356c52a8c52a4e9726733c848987960 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="file:{{$diaspora_vcard}}" diaspora=$diaspora_info}}
+       {{include file="diaspora_vcard.tpl" diaspora=$diaspora_info}}
        
        <div id="profile-extra-links">
                <ul>

diff --git a/view/theme/smoothly/smarty3/login.tpl b/view/theme/smoothly/smarty3/login.tpl
index 518a1303f09e72061876ba8ba2b6cde8ef0a21ef..1f355385a18dbf5b48fdb5e0394e24db17ba48d3 100644 (file)
--- a/view/theme/smoothly/smarty3/login.tpl
+++ b/view/theme/smoothly/smarty3/login.tpl
@@ -5,13 +5,13 @@
        <input type="hidden" name="auth-params" value="login" />
 
        <div id="login_standard">
-               {{include file="file:{{$field_input}}" field=$lname}}
-               {{include file="file:{{$field_password}}" field=$lpassword}}
+               {{include file="field_input.tpl" field=$lname}}
+               {{include file="field_password.tpl" field=$lpassword}}
        </div>
 
        {{if $openid}}
                <div id="login_openid">
-                       {{include file="file:{{$field_openid}}" field=$lopenid}}
+                       {{include file="field_openid.tpl" field=$lopenid}}
                </div>
        {{/if}}
 

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