]> git.mxchange.org Git - friendica.git/commitdiff
Merge https://github.com/friendica/friendica into pull
authorfriendica <info@friendica.com>
Wed, 26 Dec 2012 21:09:20 +0000 (13:09 -0800)
committerfriendica <info@friendica.com>
Wed, 26 Dec 2012 21:09:20 +0000 (13:09 -0800)
189 files changed:
boot.php
include/auth.php
include/conversation.php
include/friendica_smarty.php
include/text.php
mod/admin.php
mod/contacts.php
mod/fbrowser.php
mod/filer.php
mod/group.php
mod/install.php
mod/message.php
mod/nogroup.php
mod/notifications.php
mod/notify.php
mod/photos.php
mod/poco.php
mod/profile.php
mod/settings.php
mod/uimport.php
mod/viewcontacts.php
object/Item.php
view/admin_logs.tpl
view/admin_remoteupdate.tpl
view/admin_site.tpl
view/api_friends_xml.tpl
view/api_timeline_xml.tpl
view/contact_edit.tpl
view/contacts-template.tpl
view/de/messages.po
view/de/strings.php
view/field.tpl
view/filebrowser.tpl
view/filer_dialog.tpl
view/group_edit.tpl
view/install_db.tpl
view/install_settings.tpl
view/intros.tpl
view/login.tpl
view/mail_display.tpl
view/nogroup-template.tpl
view/notifications.tpl
view/notifications_network_item.tpl
view/pagetypes.tpl
view/photos_recent.tpl
view/poco_xml.tpl
view/profile_vcard.tpl
view/prv_message.tpl
view/settings.tpl
view/settings_connectors.tpl
view/settings_display.tpl
view/settings_features.tpl
view/settings_oauth_edit.tpl
view/smarty3/admin_logs.tpl
view/smarty3/admin_remoteupdate.tpl
view/smarty3/admin_site.tpl
view/smarty3/api_friends_xml.tpl
view/smarty3/api_timeline_xml.tpl
view/smarty3/contact_edit.tpl
view/smarty3/contacts-template.tpl
view/smarty3/field.tpl
view/smarty3/filebrowser.tpl
view/smarty3/filer_dialog.tpl
view/smarty3/group_edit.tpl
view/smarty3/install_db.tpl
view/smarty3/install_settings.tpl
view/smarty3/intros.tpl
view/smarty3/login.tpl
view/smarty3/mail_display.tpl
view/smarty3/nogroup-template.tpl
view/smarty3/notifications.tpl
view/smarty3/notifications_network_item.tpl
view/smarty3/pagetypes.tpl
view/smarty3/photos_recent.tpl
view/smarty3/poco_xml.tpl
view/smarty3/profile_vcard.tpl
view/smarty3/prv_message.tpl
view/smarty3/settings.tpl
view/smarty3/settings_connectors.tpl
view/smarty3/settings_display.tpl
view/smarty3/settings_features.tpl
view/smarty3/settings_oauth_edit.tpl
view/smarty3/suggestions.tpl
view/smarty3/uimport.tpl
view/smarty3/viewcontact_template.tpl
view/smarty3/wall_thread.tpl
view/suggestions.tpl
view/theme/cleanzero/config.php
view/theme/cleanzero/smarty3/theme_settings.tpl
view/theme/cleanzero/theme.php
view/theme/cleanzero/theme_settings.tpl
view/theme/comix-plain/theme.php
view/theme/comix/theme.php
view/theme/darkbubble/theme.php
view/theme/darkzero/theme.php
view/theme/diabook/communityhome.tpl
view/theme/diabook/config.php
view/theme/diabook/login.tpl
view/theme/diabook/mail_display.tpl
view/theme/diabook/profile_vcard.tpl
view/theme/diabook/prv_message.tpl
view/theme/diabook/smarty3/communityhome.tpl
view/theme/diabook/smarty3/login.tpl
view/theme/diabook/smarty3/mail_display.tpl
view/theme/diabook/smarty3/profile_vcard.tpl
view/theme/diabook/smarty3/prv_message.tpl
view/theme/diabook/smarty3/theme_settings.tpl
view/theme/diabook/theme.php
view/theme/diabook/theme_settings.tpl
view/theme/dispy/config.php
view/theme/dispy/dark/theme.php
view/theme/dispy/light/theme.php
view/theme/dispy/profile_vcard.tpl
view/theme/dispy/smarty3/profile_vcard.tpl
view/theme/dispy/smarty3/wall_thread.tpl
view/theme/dispy/theme.php
view/theme/dispy/wall_thread.tpl
view/theme/duepuntozero/profile_vcard.tpl
view/theme/duepuntozero/prv_message.tpl
view/theme/duepuntozero/smarty3/profile_vcard.tpl
view/theme/duepuntozero/smarty3/prv_message.tpl
view/theme/duepuntozero/theme.php
view/theme/facepark/profile_vcard.tpl
view/theme/facepark/smarty3/profile_vcard.tpl
view/theme/facepark/theme.php
view/theme/frost-mobile/admin_site.tpl
view/theme/frost-mobile/contacts-template.tpl
view/theme/frost-mobile/login.tpl
view/theme/frost-mobile/profile_vcard.tpl
view/theme/frost-mobile/prv_message.tpl
view/theme/frost-mobile/settings.tpl
view/theme/frost-mobile/smarty3/admin_site.tpl
view/theme/frost-mobile/smarty3/contacts-template.tpl
view/theme/frost-mobile/smarty3/login.tpl
view/theme/frost-mobile/smarty3/profile_vcard.tpl
view/theme/frost-mobile/smarty3/prv_message.tpl
view/theme/frost-mobile/smarty3/settings.tpl
view/theme/frost-mobile/smarty3/wall_thread.tpl
view/theme/frost-mobile/theme.php
view/theme/frost-mobile/wall_thread.tpl
view/theme/frost/admin_site.tpl
view/theme/frost/contacts-template.tpl
view/theme/frost/filebrowser.tpl
view/theme/frost/login.tpl
view/theme/frost/profile_vcard.tpl
view/theme/frost/prv_message.tpl
view/theme/frost/smarty3/admin_site.tpl
view/theme/frost/smarty3/contacts-template.tpl
view/theme/frost/smarty3/filebrowser.tpl
view/theme/frost/smarty3/login.tpl
view/theme/frost/smarty3/profile_vcard.tpl
view/theme/frost/smarty3/prv_message.tpl
view/theme/frost/smarty3/wall_thread.tpl
view/theme/frost/theme.php
view/theme/frost/wall_thread.tpl
view/theme/greenzero/theme.php
view/theme/purplezero/theme.php
view/theme/quattro/config.php
view/theme/quattro/mail_display.tpl
view/theme/quattro/profile_vcard.tpl
view/theme/quattro/prv_message.tpl
view/theme/quattro/smarty3/mail_display.tpl
view/theme/quattro/smarty3/profile_vcard.tpl
view/theme/quattro/smarty3/prv_message.tpl
view/theme/quattro/smarty3/theme_settings.tpl
view/theme/quattro/smarty3/wall_thread.tpl
view/theme/quattro/theme.php
view/theme/quattro/theme_settings.tpl
view/theme/quattro/wall_thread.tpl
view/theme/slackr/theme.php
view/theme/smoothly/login.tpl
view/theme/smoothly/smarty3/login.tpl
view/theme/smoothly/smarty3/wall_thread.tpl
view/theme/smoothly/theme.php
view/theme/smoothly/wall_thread.tpl
view/theme/testbubble/profile_vcard.tpl
view/theme/testbubble/smarty3/profile_vcard.tpl
view/theme/testbubble/theme.php
view/theme/vier/css/font2.css [new file with mode: 0644]
view/theme/vier/smarty3/comment_item.tpl
view/theme/vier/smarty3/nav.tpl
view/theme/vier/smarty3/search_item.tpl
view/theme/vier/smarty3/wall_thread.tpl
view/theme/vier/style.css
view/theme/vier/theme.php
view/theme/vier/wall_thread.tpl
view/uimport.tpl
view/viewcontact_template.tpl
view/wall_thread.tpl

index f4dce840f860fa7eeb523efd2a653e94ff8fba20..77be9ac26125145b9e47046b14e21d7cd967ffb3 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -969,16 +969,7 @@ if(! function_exists('login')) {
                        $a->module = 'login';
                }
 
-
-               $includes = array(
-                       '$field_input' => 'field_input.tpl',
-                       '$field_password' => 'field_password.tpl',
-                       '$field_openid' => 'field_openid.tpl',
-                       '$field_checkbox' => 'field_checkbox.tpl',
-               );
-               $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-               $o .= replace_macros($tpl,$includes + array(
+               $o .= replace_macros($tpl, array(
 
                        '$dest_url'     => $dest_url,
                        '$logout'       => t('Logout'),
@@ -997,6 +988,13 @@ if(! function_exists('login')) {
        
                        '$lostpass'     => t('Forgot your password?'),
                        '$lostlink'     => t('Password Reset'),
+
+                       '$tostitle'     => t('Website Terms of Service'),
+                       '$toslink'      => t('terms of service'),
+
+                       '$privacytitle' => t('Website Privacy Policy'),
+                       '$privacylink'  => t('privacy policy'),
+
                ));
 
                call_hooks('login_hook',$o);
@@ -1348,15 +1346,10 @@ if(! function_exists('profile_sidebar')) {
                $tpl = get_markup_template('profile_vcard.tpl');
 
 
-               $includes = array(
-                       '$diaspora_vcard' => 'diaspora_vcard.tpl'
-               );
-               $includes = set_template_includes($a->theme['template_engine'], $includes);
-
                if($a->theme['template_engine'] === 'internal')
                        $location = template_escape($location);
 
-               $o .= replace_macros($tpl, $includes + array(
+               $o .= replace_macros($tpl, array(
                        '$profile' => $profile,
                        '$connect'  => $connect,
                        '$wallmessage' => $wallmessage,
@@ -1365,7 +1358,7 @@ if(! function_exists('profile_sidebar')) {
                        '$pdesc'        => $pdesc,
                        '$marital'  => $marital,
                        '$homepage' => $homepage,
-                       '$diaspora_info' => $diaspora,
+                       '$diaspora' => $diaspora,
                        '$contact_block' => $contact_block,
                ));
 
@@ -1946,3 +1939,18 @@ function clear_cache($basepath = "", $path = "") {
                closedir($dh);
        }
 }
+
+function set_template_engine(&$a, $engine = 'internal') {
+
+       $a->theme['template_engine'] = 'internal';
+
+       if(is_writable('view/smarty3/')) {
+               switch($engine) {
+                       case 'smarty3':
+                               $a->theme['template_engine'] = 'smarty3';
+                               break;
+                       default:
+                               break;
+               }
+       }
+}
index b534d4a4d3a7f170a51a1b3735315c9345294d8d..4c695cc1e3be345320a41debea00297b49cae016 100644 (file)
@@ -5,6 +5,8 @@ require_once('include/security.php');
 require_once('include/datetime.php');
 
 function nuke_session() {
+       new_cookie(0); // make sure cookie is deleted on browser close, as a security measure
+
        unset($_SESSION['authenticated']);
        unset($_SESSION['uid']);
        unset($_SESSION['visitor_id']);
@@ -187,18 +189,10 @@ else {
                // (i.e. expire when the browser is closed), even when there's a time expiration
                // on the cookie
                if($_POST['remember']) {
-                       $old_sid = session_id();
-                       session_set_cookie_params('31449600'); // one year
-                       session_regenerate_id(false);
-
-                       q("UPDATE session SET sid = '%s' WHERE sid = '%s'", dbesc(session_id()), dbesc($old_sid));
+                       new_cookie(31449600); // one year
                }
                else {
-                       $old_sid = session_id();
-                       session_set_cookie_params('0');
-                       session_regenerate_id(false);
-
-                       q("UPDATE session SET sid = '%s' WHERE sid = '%s'", dbesc(session_id()), dbesc($old_sid));
+                       new_cookie(0); // 0 means delete on browser exit
                }
 
                // if we haven't failed up this point, log them in.
@@ -208,4 +202,10 @@ else {
        }
 }
 
+function new_cookie($time) {
+       $old_sid = session_id();
+       session_set_cookie_params("$time");
+       session_regenerate_id(false);
 
+       q("UPDATE session SET sid = '%s' WHERE sid = '%s'", dbesc(session_id()), dbesc($old_sid));
+}
index 9cc6a83427f841fc4becc9a04dd57eba39bcefd7..1f416f352c00bfbdbe275fa74e37b703deee8673 100644 (file)
@@ -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,
@@ -920,7 +921,7 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
 
        $o = '';
 
-       $geotag = (($x['allow_location']) ? get_markup_template('jot_geotag.tpl') : '');
+       $geotag = (($x['allow_location']) ? replace_macros(get_markup_template('jot_geotag.tpl'), array()) : '');
 
 /*     $plaintext = false;
        if( local_user() && (intval(get_pconfig(local_user(),'system','plaintext')) || !feature_enabled(local_user(),'richtext')) )
index 2a294e9e240c19bdce6ea49841d962f9e436f404..9ad14ad8a4738e610e6c346ebb14a56ec1720b8b 100644 (file)
@@ -5,20 +5,24 @@ require_once("library/Smarty/libs/Smarty.class.php");
 class FriendicaSmarty extends Smarty {
 
        public $filename;
-       public $root;
 
        function __construct() {
                parent::__construct();
 
                $a = get_app();
+               $theme = current_theme();
 
-               //$this->root = $_SERVER['DOCUMENT_ROOT'] . '/';
-               $this->root = '';
+               // setTemplateDir can be set to an array, which Smarty will parse in order.
+               // The order is thus very important here
+               $template_dirs = array('theme' => "view/theme/$theme/smarty3/");
+               if( x($a->theme_info,"extends") )
+                       $template_dirs = $template_dirs + array('extends' => "view/theme/".$a->theme_info["extends"]."/smarty3/");
+               $template_dirs = $template_dirs + array('base' => 'view/smarty3/');
+               $this->setTemplateDir($template_dirs);
 
-               $this->setTemplateDir($this->root . 'view/smarty3/');
-               $this->setCompileDir($this->root . 'view/smarty3/compiled/');
-               $this->setConfigDir($this->root . 'view/smarty3/config/');
-               $this->setCacheDir($this->root . 'view/smarty3/cache/');
+               $this->setCompileDir('view/smarty3/compiled/');
+               $this->setConfigDir('view/smarty3/config/');
+               $this->setCacheDir('view/smarty3/cache/');
 
                $this->left_delimiter = $a->smarty3_ldelim;
                $this->right_delimiter = $a->smarty3_rdelim;
@@ -28,7 +32,7 @@ class FriendicaSmarty extends Smarty {
                if($template) {
                        return $this->fetch('string:' . $template);
                }
-               return $this->fetch('file:' . $this->root . $this->filename);
+               return $this->fetch('file:' . $this->filename);
        }
 }
 
index 0591390a84f5a628736ddb137d1f584a6ff2eeb6..628da1c1b2795ebd75b3eaff4c0b289271f8138e 100644 (file)
@@ -499,21 +499,6 @@ function get_template_file($a, $filename, $root = '') {
        return $template_file;
 }}
 
-if(! function_exists("set_template_includes")) {
-function set_template_includes($engine, $includes) {
-       if($engine === 'smarty3') {
-               $a = get_app();
-               foreach($includes as $name=>$path) {
-//                     $sm_includes[$name] = $_SERVER['DOCUMENT_ROOT'] . '/' . get_template_file($a, 'smarty3/' . $path);
-                       $sm_includes[$name] = get_template_file($a, 'smarty3/' . $path);
-               }
-               return $sm_includes;
-       }
-       else {
-               return $includes;
-       }
-}}
-
 
 
 
index c951dd8b9cd7d4d1b3bb0f58fa9adc900f8e7ceb..0381fcf4cc136d53e9509abd2261fb84023678e0 100644 (file)
@@ -455,16 +455,7 @@ function admin_page_site(&$a) {
        );
 
        $t = get_markup_template("admin_site.tpl");
-
-       $includes = array(
-               '$field_checkbox'       => 'field_checkbox.tpl',
-               '$field_input'          => 'field_input.tpl',
-               '$field_select'         => 'field_select.tpl',
-               '$field_textarea'       => 'field_textarea.tpl',
-       );
-       $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-       return replace_macros($t, $includes + array(
+       return replace_macros($t, array(
                '$title' => t('Administration'),
                '$page' => t('Site'),
                '$submit' => t('Submit'),
@@ -1144,14 +1135,7 @@ readable.");
                }
        }                       
 
-       $includes = array(
-               '$field_checkbox'       => 'field_checkbox.tpl',
-               '$field_input'          => 'field_input.tpl',
-               '$field_select'         => 'field_select.tpl',
-       );
-       $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-       return replace_macros($t, $includes + array(
+       return replace_macros($t, array(
                '$title' => t('Administration'),
                '$page' => t('Logs'),
                '$submit' => t('Submit'),
@@ -1210,14 +1194,7 @@ function admin_page_remoteupdate(&$a) {
        }
        
        $tpl = get_markup_template("admin_remoteupdate.tpl");
-
-       $includes = array(
-               '$field_input'          => 'field_input.tpl',
-               '$field_password'       => 'field_password.tpl',
-       );
-       $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-       return replace_macros($tpl, $includes + array(
+       return replace_macros($tpl, array(
                '$baseurl' => $a->get_baseurl(true),
                '$submit' => t("Update now"),
                '$close' => t("Close"),
index 1a57afbf5ad0b21864cf4e7053192b8cc9b84984..6e62ec8ef5538595ba8e9dccbfdde48a883d7940 100644 (file)
@@ -346,12 +346,7 @@ function contacts_content(&$a) {
 
                $lost_contact = (($contact['archive'] && $contact['term-date'] != '0000-00-00 00:00:00' && $contact['term-date'] < datetime_convert('','','now')) ? t('Communications lost with this contact!') : '');
 
-               $includes = array(
-                       '$field_checkbox' => 'field_checkbox.tpl',
-               );
-               $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-               $o .= replace_macros($tpl,$includes + array(
+               $o .= replace_macros($tpl, array(
                        '$header' => t('Contact Editor'),
                        '$tab_str' => $tab_str,
                        '$submit' => t('Submit'),
@@ -576,13 +571,7 @@ function contacts_content(&$a) {
        }
        
        $tpl = get_markup_template("contacts-template.tpl");
-
-       $includes = array(
-               '$contact_template' => 'contact_template.tpl',
-       );
-       $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-       $o .= replace_macros($tpl,$includes + array(
+       $o .= replace_macros($tpl, array(
                '$header' => t('Contacts') . (($nets) ? ' - ' . network_to_name($nets) : ''),
                '$tabs' => $t,
                '$total' => $total,
index 92c6bd3b4becf14456c51e2ccdf9cbc78d3b7f64..075846e50631e5cf577bca02bb70d38edb707f49 100644 (file)
@@ -78,6 +78,7 @@ function fbrowser_content($a){
                                '$path' => $path,
                                '$folders' => $albums,
                                '$files' =>$files,
+                               '$cancel' => t('Cancel'),
                        ));
                                
                                
@@ -112,6 +113,7 @@ function fbrowser_content($a){
                                        '$path' => array( array($a->get_baseurl()."/fbrowser/image/", t("Files")) ),
                                        '$folders' => false,
                                        '$files' =>$files,
+                                       '$cancel' => t('Cancel'),
                                ));
                                
                        }
index 7b0fd59d587001290b22a654df015a2103a39e9e..4e79f337dcff22502ac15d4c0673872253678312 100644 (file)
@@ -24,13 +24,8 @@ function filer_content(&$a) {
                $filetags = get_pconfig(local_user(),'system','filetags');
                $filetags = file_tag_file_to_list($filetags,'file');
                 $filetags = explode(",", $filetags);
-               $tpl = get_markup_template("filer_dialog.tpl");
-
-               $includes = array(
-                       '$field_combobox' => 'field_combobox.tpl',
-               );
-               $includes = set_template_includes($a->theme['template_engine'], $includes);
 
+               $tpl = get_markup_template("filer_dialog.tpl");
                $o = replace_macros($tpl, array(
                        '$field' => array('term', t("Save to Folder:"), '', '', $filetags, t('- select -')),
                        '$submit' => t('Save'),
index f5a37819ed92e7e44ec580a8006e95358095c555..13a899ed96aeb66a8fff1831c8b7aa5996129f05 100644 (file)
@@ -83,13 +83,7 @@ function group_content(&$a) {
 
        $tpl = get_markup_template('group_edit.tpl');
 
-       $includes = array(
-                       '$field_input' => 'field_input.tpl',
-                       '$groupeditortpl' => 'groupeditor.tpl',
-       );
-       $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-       $context = $includes + array(
+       $context = array(
                        '$submit' => t('Submit'),
        );
 
index ab6d7d204f7044b9a051b77ea262ba84917b2495..d4e04c1a9d4fd8f005a43cd01dbfd2022a789723 100755 (executable)
@@ -177,6 +177,8 @@ function install_content(&$a) {
 
                        check_htconfig($checks);
 
+                       check_smarty3($checks);
+
                        check_keys($checks);
                        
                        if(x($_POST,'phpath'))
@@ -220,14 +222,7 @@ function install_content(&$a) {
                        
 
                        $tpl = get_markup_template('install_db.tpl');
-
-                       $includes = array(
-                               '$field_input'  => 'field_input.tpl',
-                               '$field_password' => 'field_password.tpl',
-                       );
-                       $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-                       $o .= replace_macros($tpl,$includes + array(
+                       $o .= replace_macros($tpl, array(
                                '$title' => $install_title,
                                '$pass' => t('Database connection'),
                                '$info_01' => t('In order to install Friendica we need to know how to connect to your database.'),
@@ -267,13 +262,7 @@ function install_content(&$a) {
                        $timezone = ((x($_POST,'timezone')) ? ($_POST['timezone']) : 'America/Los_Angeles');
                        
                        $tpl = get_markup_template('install_settings.tpl');
-
-                       $includes = array(
-                               '$field_input' => 'field_input.tpl',
-                       );
-                       $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-                       $o .= replace_macros($tpl, $includes + array(
+                       $o .= replace_macros($tpl, array(
                                '$title' => $install_title,
                                '$pass' => t('Site settings'),
 
@@ -441,6 +430,22 @@ 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;
index 7ca3fba70af9e939b744ca45b9cdec7797162a22..057797dddaebde38ec350e2e6c042d3ed6ee001f 100644 (file)
@@ -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;
@@ -497,12 +495,6 @@ function message_content(&$a) {
 
                $tpl = get_markup_template('mail_display.tpl');
 
-               $includes = array(
-                       '$mail_conv' => 'mail_conv.tpl',
-                       '$prv_message' => 'prv_message.tpl',
-               );
-               $includes = set_template_includes($a->theme['template_engine'], $includes);
-
                if($a->theme['template_engine'] === 'internal') {
                        $subjtxt_e = template_escape($message['title']);
                }
@@ -510,7 +502,7 @@ function message_content(&$a) {
                        $subjtxt_e = $message['title'];
                }
 
-               $o = replace_macros($tpl, $includes + array(
+               $o = replace_macros($tpl, array(
                        '$thread_id' => $a->argv[1],
                        '$thread_subject' => $message['title'],
                        '$thread_seen' => $seen,
@@ -520,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')
 
                ));
 
index 885ba62c6301e4358d3b027c093bf09892f62981..24d99a59b6c01a0c071828c0f6ce8ede42b93fc3 100644 (file)
@@ -55,13 +55,7 @@ function nogroup_content(&$a) {
        }
 
        $tpl = get_markup_template("nogroup-template.tpl");
-
-       $includes = array(
-               '$contact_template' => 'contact_template.tpl',
-       );
-       $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-       $o .= replace_macros($tpl,$includes + array(
+       $o .= replace_macros($tpl, array(
                '$header' => t('Contacts who are not members of a group'),
                '$contacts' => $contacts,
                '$paginate' => paginate($a),
index 03a39a268e59da896c3a74db5c3f0ba57a1f7bc2..9c14737f7ffb3e6c36718ab0370661f7d03b6dc6 100644 (file)
@@ -145,12 +145,7 @@ function notifications_content(&$a) {
 
                                        $return_addr = bin2hex($a->user['nickname'] . '@' . $a->get_hostname() . (($a->path) ? '/' . $a->path : ''));
 
-                                       $includes = array(
-                                               '$field_checkbox' => 'field_checkbox.tpl',
-                                       );
-                                       $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-                                       $notif_content .= replace_macros($sugg,$includes + array(
+                                       $notif_content .= replace_macros($sugg, array(
                                                '$str_notifytype' => t('Notification type: '),
                                                '$notify_type' => t('Friend Suggestion'),
                                                '$intro_id' => $rr['intro_id'],
@@ -196,12 +191,7 @@ function notifications_content(&$a) {
                                        ));
                                }                       
 
-                               $includes = array(
-                                       '$field_checkbox' => 'field_checkbox.tpl',
-                               );
-                               $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-                               $notif_content .= replace_macros($tpl,$includes + array(
+                               $notif_content .= replace_macros($tpl, array(
                                        '$str_notifytype' => t('Notification type: '),
                                        '$notify_type' => (($rr['network'] !== NETWORK_OSTATUS) ? t('Friend/Connect Request') : t('New Follower')),
                                        '$dfrn_text' => $dfrn_text,     
@@ -226,14 +216,9 @@ function notifications_content(&$a) {
                else
                        info( t('No introductions.') . EOL);
 
-               $includes = array(
-                       '$common_tabs' => 'common_tabs.tpl',
-               );
-               $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-               $o .= replace_macros($notif_tpl,$includes + array(
+               $o .= replace_macros($notif_tpl, array(
                        '$notif_header' => t('Notifications'),
-                       '$tabs_data' => $tabs,
+                       '$tabs' => $tabs,
                        '$notif_content' => $notif_content,
                ));
                
@@ -317,14 +302,9 @@ function notifications_content(&$a) {
                        $notif_content = t('No more network notifications.');
                }
                
-               $includes = array(
-                       '$common_tabs' => 'common_tabs.tpl',
-               );
-               $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-               $o .= replace_macros($notif_tpl,$includes + array(
+               $o .= replace_macros($notif_tpl, array(
                        '$notif_header' => t('Network Notifications'),
-                       '$tabs_data' => $tabs,
+                       '$tabs' => $tabs,
                        '$notif_content' => $notif_content,
                ));
                
@@ -352,14 +332,9 @@ function notifications_content(&$a) {
                        $notif_content .= t('No more system notifications.');
                }
                
-               $includes = array(
-                       '$common_tabs' => 'common_tabs.tpl',
-               );
-               $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-               $o .= replace_macros($notif_tpl,$includes + array(
+               $o .= replace_macros($notif_tpl, array(
                        '$notif_header' => t('System Notifications'),
-                       '$tabs_data' => $tabs,
+                       '$tabs' => $tabs,
                        '$notif_content' => $notif_content,
                ));
 
@@ -452,14 +427,9 @@ function notifications_content(&$a) {
                        $notif_content = t('No more personal notifications.');
                }
                
-               $includes = array(
-                       '$common_tabs' => 'common_tabs.tpl',
-               );
-               $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-               $o .= replace_macros($notif_tpl,$includes + array(
+               $o .= replace_macros($notif_tpl, array(
                        '$notif_header' => t('Personal Notifications'),
-                       '$tabs_data' => $tabs,
+                       '$tabs' => $tabs,
                        '$notif_content' => $notif_content,
                ));
                
@@ -538,14 +508,9 @@ function notifications_content(&$a) {
                        $notif_content = t('No more home notifications.');
                }
                
-               $includes = array(
-                       '$common_tabs' => 'common_tabs.tpl',
-               );
-               $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-               $o .= replace_macros($notif_tpl,$includes + array(
+               $o .= replace_macros($notif_tpl, array(
                        '$notif_header' => t('Home Notifications'),
-                       '$tabs_data' => $tabs,
+                       '$tabs' => $tabs,
                        '$notif_content' => $notif_content,
                ));
        }
index 3abc1185cffc06eb3b44d2970b8f6de6595c30cd..b4d60a747c0bb5fcf871f9775c8fb8b909e5932c 100644 (file)
@@ -61,14 +61,9 @@ function notify_content(&$a) {
                        $notif_content .= t('No more system notifications.');
                }
                
-               $includes = array(
-                       '$common_tabs' => 'common_tabs.tpl',
-               );
-               $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-               $o .= replace_macros($notif_tpl,$includes + array(
+               $o .= replace_macros($notif_tpl, array(
                        '$notif_header' => t('System Notifications'),
-                       '$tabs_data' => '', // $tabs,
+                       '$tabs' => '', // $tabs,
                        '$notif_content' => $notif_content,
                ));
 
index 8ac4d8590371f1ed89da07f1d63221e261d7cc58..7035c66904897ffae8c1bcd407a2692b1ae2ee1d 100644 (file)
@@ -1679,13 +1679,7 @@ function photos_content(&$a) {
        }
        
        $tpl = get_markup_template('photos_recent.tpl'); 
-
-       $includes = array(
-               '$photo_top' => 'photo_top.tpl',
-       );
-       $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-       $o .= replace_macros($tpl,$includes + array(
+       $o .= replace_macros($tpl, array(
                '$title' => t('Recent Photos'),
                '$can_post' => $can_post,
                '$upload' => array(t('Upload New Photos'), $a->get_baseurl().'/photos/'.$a->data['user']['nickname'].'/upload'),
index abe2c8e35d715d2c8427a5203aa1923b8c0df786..ae5f0cef4e360991ccdadf1b5e8ba52bffb7ebdb 100644 (file)
@@ -147,13 +147,7 @@ function poco_init(&$a) {
 
        if($format === 'xml') {
                header('Content-type: text/xml');
-
-               $includes = array(
-                       '$poco_entry_xml' => 'poco_entry_xml.tpl'
-               );
-               $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-               echo replace_macros(get_markup_template('poco_xml.tpl'),array_xmlify($includes + array('$response' => $ret)));
+               echo replace_macros(get_markup_template('poco_xml.tpl'),array_xmlify(array('$response' => $ret)));
                http_status_exit(500);
        }
        if($format === 'json') {
index 15a02242124d7a63e311a6128680edf49919e38d..9e9af19834c0b6c89429cdfeb8b73ae9bd60e964 100644 (file)
@@ -33,7 +33,7 @@ function profile_init(&$a) {
                auto_redir($a, $which);
        }
 
-       $a->theme["template_engine"] = 'internal'; // reset the template engine to the default in case the user's theme doesn't specify one
+       set_template_engine($a); // reset the template engine to the default in case the user's theme doesn't specify one
        profile_load($a,$which,$profile);
 
        $blocked = (((get_config('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false);
index 09a45f832a44e0a4cd076095d52d54daa82f0aa2..dbdd40bc369294c045ac28f88351301e1205185d 100644 (file)
@@ -554,13 +554,7 @@ function settings_content(&$a) {
                
                if(($a->argc > 2) && ($a->argv[2] === 'add')) {
                        $tpl = get_markup_template("settings_oauth_edit.tpl");
-
-                       $includes = array(
-                               '$field_input' => 'field_input.tpl',
-                       );
-                       $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-                       $o .= replace_macros($tpl, $includes + array(
+                       $o .= replace_macros($tpl, array(
                                '$form_security_token' => get_form_security_token("settings_oauth"),
                                '$title'        => t('Add application'),
                                '$submit'       => t('Submit'),
@@ -586,13 +580,7 @@ function settings_content(&$a) {
                        $app = $r[0];
                        
                        $tpl = get_markup_template("settings_oauth_edit.tpl");
-
-                       $includes = array(
-                               '$field_input' => 'field_input.tpl',
-                       );
-                       $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-                       $o .= replace_macros($tpl, $includes + array(
+                       $o .= replace_macros($tpl, array(
                                '$form_security_token' => get_form_security_token("settings_oauth"),
                                '$title'        => t('Add application'),
                                '$submit'       => t('Update'),
@@ -675,13 +663,7 @@ function settings_content(&$a) {
 
 
                $tpl = get_markup_template("settings_features.tpl");
-
-               $includes = array(
-                       '$field_yesno'  => 'field_yesno.tpl',
-               );
-               $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-               $o .= replace_macros($tpl, $includes + array(
+               $o .= replace_macros($tpl, array(
                        '$form_security_token' => get_form_security_token("settings_features"),
                        '$title'        => t('Additional Features'),
                        '$features' => $arr,
@@ -733,16 +715,7 @@ function settings_content(&$a) {
                }
        
 
-               $includes = array(
-                       '$field_checkbox' => 'field_checkbox.tpl',
-                       '$field_input' => 'field_input.tpl',
-                       '$field_select' => 'field_select.tpl',
-                       '$field_custom' => 'field_custom.tpl',
-                       '$field_password' => 'field_password.tpl',
-               );
-               $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-               $o .= replace_macros($tpl, $includes + array(
+               $o .= replace_macros($tpl, array(
                        '$form_security_token' => get_form_security_token("settings_connectors"),
                        
                        '$title'        => t('Connector Settings'),
@@ -832,15 +805,7 @@ function settings_content(&$a) {
                }
                
                $tpl = get_markup_template("settings_display.tpl");
-
-               $includes = array(
-                       '$field_themeselect' => 'field_themeselect.tpl',
-                       '$field_checkbox' => 'field_checkbox.tpl',
-                       '$field_input' => 'field_input.tpl',
-               );
-               $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-               $o = replace_macros($tpl, $includes + array(
+               $o = replace_macros($tpl, array(
                        '$ptitle'       => t('Display Settings'),
                        '$form_security_token' => get_form_security_token("settings_display"),
                        '$submit'       => t('Submit'),
@@ -926,13 +891,7 @@ function settings_content(&$a) {
 
 
        $pageset_tpl = get_markup_template('pagetypes.tpl');
-
-       $includes = array(
-               '$field_radio' => 'field_radio.tpl',
-       );
-       $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-       $pagetype = replace_macros($pageset_tpl,$includes + array(
+       $pagetype = replace_macros($pageset_tpl, array(
                '$page_normal'  => array('page-flags', t('Normal Account Page'), PAGE_NORMAL, 
                                                                        t('This account is a normal personal profile'), 
                                                                        ($a->user['page-flags'] == PAGE_NORMAL)),
@@ -1053,17 +1012,7 @@ function settings_content(&$a) {
        require_once('include/group.php');
        $group_select = mini_group_select(local_user(),$a->user['def_gid']);
 
-       $includes = array(
-               '$field_password' => 'field_password.tpl',
-               '$field_input' => 'field_input.tpl',
-               '$field_custom' => 'field_custom.tpl',
-               '$field_checkbox' => 'field_checkbox.tpl',
-               '$field_yesno' => 'field_yesno.tpl',
-               '$field_intcheckbox' => 'field_intcheckbox.tpl',
-       );
-       $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-       $o .= replace_macros($stpl,$includes + array(
+       $o .= replace_macros($stpl, array(
                '$ptitle'       => t('Account Settings'),
 
                '$submit'       => t('Submit'),
index d28198f69ab9baa7a08b90d71e77c628408f24b7..6cca08cdaff0bfb41cba5b6dbb6380e6bdd676ff 100644 (file)
@@ -60,13 +60,7 @@ function uimport_content(&$a) {
        \r
        \r
     $tpl = get_markup_template("uimport.tpl");\r
-\r
-       $includes = array(\r
-               '$field_custom' => 'field_custom.tpl',\r
-       );\r
-       $includes = set_template_includes($a->theme['template_engine'], $includes);\r
-\r
-    return replace_macros($tpl, $includes + array(\r
+    return replace_macros($tpl, array(\r
         '$regbutt' => t('Import'),\r
         '$import' => array(\r
             'title' => t("Move account"),\r
index f54a76be4c08f3abd8d64d8ed4939a935fc6cb26..8e261e71151d1e23e706ceabd89026779caa45c7 100644 (file)
@@ -72,13 +72,7 @@ function viewcontacts_content(&$a) {
 
 
        $tpl = get_markup_template("viewcontact_template.tpl");
-
-       $includes = array(
-               '$contact_template' => 'contact_template.tpl',
-       );
-       $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-       $o .= replace_macros($tpl, $includes + array(
+       $o .= replace_macros($tpl, array(
                '$title' => t('View Contacts'),
                '$contacts' => $contacts,
                '$paginate' => paginate($a),
index 4da5b8a59ff630bf30f8bc81473a3d0d294ac1f9..eef8a50581d773b39ea89e6a59fcb25c54997e15 100644 (file)
@@ -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
                );
 
index db1b00c1121b0944cb5fdbe1826663ea9f43751e..b777cf420169d10529ac0bd5d44511c704af9f67 100644 (file)
@@ -4,9 +4,9 @@
        <form action="$baseurl/admin/logs" method="post">
     <input type='hidden' name='form_security_token' value='$form_security_token'>
 
-       {{ inc $field_checkbox with $field=$debugging }}{{ endinc }}
-       {{ inc $field_input with $field=$logfile }}{{ endinc }}
-       {{ inc $field_select with $field=$loglevel }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$debugging }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$logfile }}{{ endinc }}
+       {{ inc field_select.tpl with $field=$loglevel }}{{ endinc }}
        
        <div class="submit"><input type="submit" name="page_logs" value="$submit" /></div>
        
index 844cbad272ca47725a4001867d95cf28d2fb79d7..874c6e6267bddd416fac71d8360d51ba43fe0ce4 100644 (file)
                <h3>Your friendica installation is not writable by web server.</h3>
                {{ if $canftp }}
                        <p>You can try to update via FTP</p>
-                       {{ inc $field_input with $field=$ftphost }}{{ endinc }}
-                       {{ inc $field_input with $field=$ftppath }}{{ endinc }}
-                       {{ inc $field_input with $field=$ftpuser }}{{ endinc }}
-                       {{ inc $field_password with $field=$ftppwd }}{{ endinc }}
+                       {{ inc field_input.tpl with $field=$ftphost }}{{ endinc }}
+                       {{ inc field_input.tpl with $field=$ftppath }}{{ endinc }}
+                       {{ inc field_input.tpl with $field=$ftpuser }}{{ endinc }}
+                       {{ inc field_password.tpl with $field=$ftppwd }}{{ endinc }}
                        <div class="submit"><input type="submit" name="remoteupdate" value="$submit" /></div>
                {{ endif }}
        {{ endif }}
index 4892dc31455d6ef8379d63823512910bc51af812..38d1fb8d043464f87f9b786a57fc5ec105799df1 100644 (file)
        <div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
        
        <h3>$registration</h3>
-       {{ inc $field_input with $field=$register_text }}{{ endinc }}
-       {{ inc $field_select with $field=$register_policy }}{{ endinc }}
-       {{ inc $field_input with $field=$daily_registrations }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$no_multi_reg }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$no_openid }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$no_regfullname }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$register_text }}{{ endinc }}
+       {{ inc field_select.tpl with $field=$register_policy }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$daily_registrations }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$no_multi_reg }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$no_openid }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$no_regfullname }}{{ endinc }}
        
        <div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
 
        <h3>$upload</h3>
-       {{ inc $field_input with $field=$maximagesize }}{{ endinc }}
-       {{ inc $field_input with $field=$maximagelength }}{{ endinc }}
-       {{ inc $field_input with $field=$jpegimagequality }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$maximagesize }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$maximagelength }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$jpegimagequality }}{{ endinc }}
        
        <h3>$corporate</h3>
-       {{ inc $field_input with $field=$allowed_sites }}{{ endinc }}
-       {{ inc $field_input with $field=$allowed_email }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$block_public }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$force_publish }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$no_community_page }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$ostatus_disabled }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$diaspora_enabled }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$dfrn_only }}{{ endinc }}
-       {{ inc $field_input with $field=$global_directory }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$thread_allow }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$newuser_private }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$allowed_sites }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$allowed_email }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$block_public }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$force_publish }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$no_community_page }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$ostatus_disabled }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$diaspora_enabled }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$dfrn_only }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$global_directory }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$thread_allow }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$newuser_private }}{{ endinc }}
        
        <div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
        
index 1cabd295dad2a09f3095018eae74bed23f96c772..9bdf53222d5c85287bddeed767292d817d542e2a 100644 (file)
@@ -2,6 +2,6 @@
 
 <users type="array">
        {{for $users as $u }}
-       {{inc $api_user_xml with $user=$u }}{{endinc}}
+       {{inc api_user_xml.tpl with $user=$u }}{{endinc}}
        {{endfor}}
 </users>
index df55d807ad9cb7c5ef80903f909e7d3715b2d63c..4a32b411b58ae613919e80d115e5635b15516c23 100644 (file)
@@ -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>
-{{ inc $api_user_xml with $user=$status.user }}{{ endinc }}  <statusnet:html>$status.statusnet_html</statusnet:html>
+{{ inc api_user_xml.tpl with $user=$status.user }}{{ endinc }}  <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>
index a11e252b4a31071c0cc1f985f8f98f103378efe0..c68ca7f1db67ef33ac15f27421729a65fbeb61cc 100644 (file)
@@ -65,7 +65,7 @@
        {{ endif }}
        <div id="contact-edit-end" ></div>
 
-       {{inc $field_checkbox with $field=$hidden }}{{endinc}}
+       {{inc field_checkbox.tpl with $field=$hidden }}{{endinc}}
 
 <div id="contact-edit-info-wrapper">
 <h4>$lbl_info1</h4>
index efd426bba3a2ad1412a0c60d3b7cb5a01af2fa8f..69e3202c37d5623cd2429a5a5e8ad75a12ab181e 100644 (file)
@@ -15,7 +15,7 @@ $tabs
 
 
 {{ for $contacts as $c }}
-       {{ inc $contact_template with $contact=$c }}{{ endinc }}
+       {{ inc contact_template.tpl with $contact=$c }}{{ endinc }}
 {{ endfor }}
 <div id="contact-edit-end"></div>
 
index a1ba4ac6deb36cfd3c39006302675d6c234ff766..95224e53874410566529f9d0a9be925dfad1cc0d 100644 (file)
@@ -22,8 +22,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
-"POT-Creation-Date: 2012-12-18 10:00-0800\n"
-"PO-Revision-Date: 2012-12-21 12:00+0000\n"
+"POT-Creation-Date: 2012-12-22 10:00-0800\n"
+"PO-Revision-Date: 2012-12-24 08:27+0000\n"
 "Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -55,8 +55,8 @@ msgstr "Konnte den Kontakt nicht aktualisieren."
 #: ../../mod/api.php:31 ../../mod/photos.php:133 ../../mod/photos.php:995
 #: ../../mod/editpost.php:10 ../../mod/install.php:151 ../../mod/poke.php:135
 #: ../../mod/notifications.php:66 ../../mod/contacts.php:147
-#: ../../mod/settings.php:91 ../../mod/settings.php:541
-#: ../../mod/settings.php:546 ../../mod/manage.php:90 ../../mod/network.php:6
+#: ../../mod/settings.php:91 ../../mod/settings.php:542
+#: ../../mod/settings.php:547 ../../mod/manage.php:90 ../../mod/network.php:6
 #: ../../mod/notes.php:20 ../../mod/uimport.php:23 ../../mod/wallmessage.php:9
 #: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79
 #: ../../mod/wallmessage.php:103 ../../mod/attach.php:33
@@ -108,8 +108,8 @@ msgstr "Bitte nutze den Zurück-Button deines Browsers <strong>jetzt</strong>, w
 msgid "Return to contact editor"
 msgstr "Zurück zum Kontakteditor"
 
-#: ../../mod/crepair.php:148 ../../mod/settings.php:561
-#: ../../mod/settings.php:587 ../../mod/admin.php:695 ../../mod/admin.php:705
+#: ../../mod/crepair.php:148 ../../mod/settings.php:562
+#: ../../mod/settings.php:588 ../../mod/admin.php:695 ../../mod/admin.php:705
 msgid "Name"
 msgstr "Name"
 
@@ -152,9 +152,9 @@ msgstr "Neues Foto von dieser URL"
 #: ../../mod/photos.php:1519 ../../mod/install.php:246
 #: ../../mod/install.php:284 ../../mod/localtime.php:45 ../../mod/poke.php:199
 #: ../../mod/content.php:693 ../../mod/contacts.php:352
-#: ../../mod/settings.php:559 ../../mod/settings.php:669
-#: ../../mod/settings.php:738 ../../mod/settings.php:810
-#: ../../mod/settings.php:1017 ../../mod/group.php:85 ../../mod/mood.php:137
+#: ../../mod/settings.php:560 ../../mod/settings.php:670
+#: ../../mod/settings.php:739 ../../mod/settings.php:811
+#: ../../mod/settings.php:1018 ../../mod/group.php:85 ../../mod/mood.php:137
 #: ../../mod/message.php:301 ../../mod/message.php:487 ../../mod/admin.php:445
 #: ../../mod/admin.php:692 ../../mod/admin.php:829 ../../mod/admin.php:1028
 #: ../../mod/admin.php:1115 ../../mod/profiles.php:604
@@ -304,7 +304,7 @@ msgid "link to source"
 msgstr "Link zum Originalbeitrag"
 
 #: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:91
-#: ../../include/nav.php:52 ../../boot.php:1748
+#: ../../include/nav.php:52 ../../boot.php:1761
 msgid "Events"
 msgstr "Veranstaltungen"
 
@@ -362,8 +362,8 @@ msgstr "Beschreibung"
 
 #: ../../mod/events.php:448 ../../mod/directory.php:134
 #: ../../addon/forumdirectory/forumdirectory.php:156
-#: ../../include/event.php:40 ../../include/bb2diaspora.php:412
-#: ../../boot.php:1278
+#: ../../include/event.php:40 ../../include/bb2diaspora.php:415
+#: ../../boot.php:1291
 msgid "Location:"
 msgstr "Ort:"
 
@@ -376,8 +376,8 @@ msgid "Share this event"
 msgstr "Veranstaltung teilen"
 
 #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:145
-#: ../../mod/dfrn_request.php:847 ../../mod/settings.php:560
-#: ../../mod/settings.php:586 ../../addon/js_upload/js_upload.php:45
+#: ../../mod/dfrn_request.php:847 ../../mod/settings.php:561
+#: ../../mod/settings.php:587 ../../addon/js_upload/js_upload.php:45
 #: ../../include/conversation.php:1009
 #: ../../addon.old/js_upload/js_upload.php:45
 msgid "Cancel"
@@ -425,30 +425,30 @@ msgid ""
 msgstr "Möchtest du dieser Anwendung den Zugriff auf deine Beiträge und Kontakte, sowie das Erstellen neuer Beiträge in deinem Namen gestatten?"
 
 #: ../../mod/api.php:105 ../../mod/dfrn_request.php:835
-#: ../../mod/settings.php:933 ../../mod/settings.php:939
-#: ../../mod/settings.php:947 ../../mod/settings.php:951
-#: ../../mod/settings.php:956 ../../mod/settings.php:962
-#: ../../mod/settings.php:968 ../../mod/settings.php:974
-#: ../../mod/settings.php:1004 ../../mod/settings.php:1005
-#: ../../mod/settings.php:1006 ../../mod/settings.php:1007
-#: ../../mod/settings.php:1008 ../../mod/register.php:237
+#: ../../mod/settings.php:934 ../../mod/settings.php:940
+#: ../../mod/settings.php:948 ../../mod/settings.php:952
+#: ../../mod/settings.php:957 ../../mod/settings.php:963
+#: ../../mod/settings.php:969 ../../mod/settings.php:975
+#: ../../mod/settings.php:1005 ../../mod/settings.php:1006
+#: ../../mod/settings.php:1007 ../../mod/settings.php:1008
+#: ../../mod/settings.php:1009 ../../mod/register.php:237
 #: ../../mod/profiles.php:584
 msgid "Yes"
 msgstr "Ja"
 
 #: ../../mod/api.php:106 ../../mod/dfrn_request.php:836
-#: ../../mod/settings.php:933 ../../mod/settings.php:939
-#: ../../mod/settings.php:947 ../../mod/settings.php:951
-#: ../../mod/settings.php:956 ../../mod/settings.php:962
-#: ../../mod/settings.php:968 ../../mod/settings.php:974
-#: ../../mod/settings.php:1004 ../../mod/settings.php:1005
-#: ../../mod/settings.php:1006 ../../mod/settings.php:1007
-#: ../../mod/settings.php:1008 ../../mod/register.php:238
+#: ../../mod/settings.php:934 ../../mod/settings.php:940
+#: ../../mod/settings.php:948 ../../mod/settings.php:952
+#: ../../mod/settings.php:957 ../../mod/settings.php:963
+#: ../../mod/settings.php:969 ../../mod/settings.php:975
+#: ../../mod/settings.php:1005 ../../mod/settings.php:1006
+#: ../../mod/settings.php:1007 ../../mod/settings.php:1008
+#: ../../mod/settings.php:1009 ../../mod/register.php:238
 #: ../../mod/profiles.php:585
 msgid "No"
 msgstr "Nein"
 
-#: ../../mod/photos.php:51 ../../boot.php:1741
+#: ../../mod/photos.php:51 ../../boot.php:1754
 msgid "Photo Albums"
 msgstr "Fotoalben"
 
@@ -672,7 +672,7 @@ msgid "This is you"
 msgstr "Das bist du"
 
 #: ../../mod/photos.php:1402 ../../mod/photos.php:1446
-#: ../../mod/photos.php:1518 ../../mod/content.php:692 ../../boot.php:608
+#: ../../mod/photos.php:1518 ../../mod/content.php:692 ../../boot.php:621
 #: ../../object/Item.php:267 ../../object/Item.php:576
 msgid "Comment"
 msgstr "Kommentar"
@@ -685,7 +685,7 @@ msgid "Preview"
 msgstr "Vorschau"
 
 #: ../../mod/photos.php:1488 ../../mod/content.php:439
-#: ../../mod/content.php:724 ../../mod/settings.php:622
+#: ../../mod/content.php:724 ../../mod/settings.php:623
 #: ../../mod/group.php:168 ../../mod/admin.php:699
 #: ../../include/conversation.php:569 ../../object/Item.php:119
 msgid "Delete"
@@ -758,7 +758,7 @@ msgid "Post to Email"
 msgstr "An E-Mail senden"
 
 #: ../../mod/editpost.php:106 ../../mod/content.php:711
-#: ../../mod/settings.php:621 ../../object/Item.php:109
+#: ../../mod/settings.php:622 ../../object/Item.php:109
 msgid "Edit"
 msgstr "Bearbeiten"
 
@@ -1015,7 +1015,7 @@ msgstr "Friendica"
 msgid "StatusNet/Federated Social Web"
 msgstr "StatusNet/Federated Social Web"
 
-#: ../../mod/dfrn_request.php:841 ../../mod/settings.php:681
+#: ../../mod/dfrn_request.php:841 ../../mod/settings.php:682
 #: ../../include/contact_selectors.php:80
 msgid "Diaspora"
 msgstr "Diaspora"
@@ -1035,7 +1035,7 @@ msgstr "Adresse deines Profils:"
 msgid "Submit Request"
 msgstr "Anfrage abschicken"
 
-#: ../../mod/uexport.php:9 ../../mod/settings.php:30 ../../include/nav.php:138
+#: ../../mod/uexport.php:9 ../../mod/settings.php:30 ../../include/nav.php:140
 msgid "Account settings"
 msgstr "Kontoeinstellungen"
 
@@ -1067,7 +1067,7 @@ msgstr "Konto löschen"
 #: ../../mod/newmember.php:22 ../../mod/admin.php:788 ../../mod/admin.php:993
 #: ../../addon/dav/friendica/layout.fnk.php:225
 #: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:537
-#: ../../view/theme/diabook/theme.php:658 ../../include/nav.php:138
+#: ../../view/theme/diabook/theme.php:658 ../../include/nav.php:140
 #: ../../addon.old/dav/friendica/layout.fnk.php:225
 #: ../../addon.old/mathjax/mathjax.php:36
 msgid "Settings"
@@ -1349,7 +1349,7 @@ msgid ""
 msgstr "WICHTIG: Du musst [manuell] einen Cronjob (o.ä.) für den Poller einrichten."
 
 #: ../../mod/localtime.php:12 ../../include/event.php:11
-#: ../../include/bb2diaspora.php:390
+#: ../../include/bb2diaspora.php:393
 msgid "l F d, Y \\@ g:i A"
 msgstr "l, d. F Y\\, H:i"
 
@@ -1415,7 +1415,7 @@ msgid "is interested in:"
 msgstr "ist interessiert an:"
 
 #: ../../mod/match.php:58 ../../mod/suggest.php:59
-#: ../../include/contact_widgets.php:9 ../../boot.php:1216
+#: ../../include/contact_widgets.php:9 ../../boot.php:1229
 msgid "Connect"
 msgstr "Verbinden"
 
@@ -1482,7 +1482,7 @@ msgstr[1] "Kommentar"
 
 #: ../../mod/content.php:589 ../../addon/page/page.php:77
 #: ../../addon/page/page.php:111 ../../addon/showmore/showmore.php:119
-#: ../../include/contact_widgets.php:204 ../../boot.php:609
+#: ../../include/contact_widgets.php:204 ../../boot.php:622
 #: ../../object/Item.php:292 ../../addon.old/page/page.php:77
 #: ../../addon.old/page/page.php:111 ../../addon.old/showmore/showmore.php:119
 msgid "show more"
@@ -2051,7 +2051,7 @@ msgid "Edit contact"
 msgstr "Kontakt bearbeiten"
 
 #: ../../mod/contacts.php:575 ../../view/theme/diabook/theme.php:89
-#: ../../include/nav.php:142
+#: ../../include/nav.php:144
 msgid "Contacts"
 msgstr "Kontakte"
 
@@ -2090,7 +2090,7 @@ msgstr "Anfrage zum Zurücksetzen des Passworts auf %s erhalten"
 #: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:777
 #: ../../addon/public_server/public_server.php:62
 #: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3365
-#: ../../boot.php:824 ../../addon.old/facebook/facebook.php:702
+#: ../../boot.php:837 ../../addon.old/facebook/facebook.php:702
 #: ../../addon.old/facebook/facebook.php:1200
 #: ../../addon.old/fbpost/fbpost.php:661
 #: ../../addon.old/public_server/public_server.php:62
@@ -2104,7 +2104,7 @@ msgid ""
 "Password reset failed."
 msgstr "Anfrage konnte nicht verifiziert werden. (Eventuell hast du bereits eine Ã¤hnliche Anfrage gestellt.) Zurücksetzen des Passworts gescheitert."
 
-#: ../../mod/lostpass.php:83 ../../boot.php:963
+#: ../../mod/lostpass.php:83 ../../boot.php:976
 msgid "Password Reset"
 msgstr "Passwort zurücksetzen"
 
@@ -2156,63 +2156,63 @@ msgstr "Zusätzliche Features"
 msgid "Missing some important data!"
 msgstr "Wichtige Daten fehlen!"
 
-#: ../../mod/settings.php:121 ../../mod/settings.php:585
+#: ../../mod/settings.php:121 ../../mod/settings.php:586
 msgid "Update"
 msgstr "Aktualisierungen"
 
-#: ../../mod/settings.php:226
+#: ../../mod/settings.php:227
 msgid "Failed to connect with email account using the settings provided."
 msgstr "Verbindung zum E-Mail-Konto mit den angegebenen Einstellungen nicht möglich."
 
-#: ../../mod/settings.php:231
+#: ../../mod/settings.php:232
 msgid "Email settings updated."
 msgstr "E-Mail Einstellungen bearbeitet."
 
-#: ../../mod/settings.php:246
+#: ../../mod/settings.php:247
 msgid "Features updated"
 msgstr "Features aktualisiert"
 
-#: ../../mod/settings.php:306
+#: ../../mod/settings.php:307
 msgid "Passwords do not match. Password unchanged."
 msgstr "Die Passwörter stimmen nicht Ã¼berein. Das Passwort bleibt unverändert."
 
-#: ../../mod/settings.php:311
+#: ../../mod/settings.php:312
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr "Leere Passwörter sind nicht erlaubt. Passwort bleibt unverändert."
 
-#: ../../mod/settings.php:322
+#: ../../mod/settings.php:323
 msgid "Password changed."
 msgstr "Passwort Ã¤ndern."
 
-#: ../../mod/settings.php:324
+#: ../../mod/settings.php:325
 msgid "Password update failed. Please try again."
 msgstr "Aktualisierung des Passworts gescheitert, bitte versuche es noch einmal."
 
-#: ../../mod/settings.php:389
+#: ../../mod/settings.php:390
 msgid " Please use a shorter name."
 msgstr " Bitte verwende einen kürzeren Namen."
 
-#: ../../mod/settings.php:391
+#: ../../mod/settings.php:392
 msgid " Name too short."
 msgstr " Name ist zu kurz."
 
-#: ../../mod/settings.php:397
+#: ../../mod/settings.php:398
 msgid " Not valid email."
 msgstr " Keine gültige E-Mail."
 
-#: ../../mod/settings.php:399
+#: ../../mod/settings.php:400
 msgid " Cannot change to that email."
 msgstr "Ändern der E-Mail nicht möglich. "
 
-#: ../../mod/settings.php:453
+#: ../../mod/settings.php:454
 msgid "Private forum has no privacy permissions. Using default privacy group."
 msgstr "Für das private Forum sind keine Zugriffsrechte eingestellt. Die voreingestellte Gruppe für neue Kontakte wird benutzt."
 
-#: ../../mod/settings.php:457
+#: ../../mod/settings.php:458
 msgid "Private forum has no privacy permissions and no default privacy group."
 msgstr "Für das private Forum sind keine Zugriffsrechte eingestellt, und es gibt keine voreingestellte Gruppe für neue Kontakte."
 
-#: ../../mod/settings.php:487 ../../addon/facebook/facebook.php:495
+#: ../../mod/settings.php:488 ../../addon/facebook/facebook.php:495
 #: ../../addon/fbpost/fbpost.php:151
 #: ../../addon/remote_permissions/remote_permissions.php:204
 #: ../../addon/impressum/impressum.php:78
@@ -2228,456 +2228,456 @@ msgstr "Für das private Forum sind keine Zugriffsrechte eingestellt, und es gib
 msgid "Settings updated."
 msgstr "Einstellungen aktualisiert."
 
-#: ../../mod/settings.php:558 ../../mod/settings.php:584
-#: ../../mod/settings.php:620
+#: ../../mod/settings.php:559 ../../mod/settings.php:585
+#: ../../mod/settings.php:621
 msgid "Add application"
 msgstr "Programm hinzufügen"
 
-#: ../../mod/settings.php:562 ../../mod/settings.php:588
+#: ../../mod/settings.php:563 ../../mod/settings.php:589
 #: ../../addon/statusnet/statusnet.php:694
 #: ../../addon.old/statusnet/statusnet.php:570
 msgid "Consumer Key"
 msgstr "Consumer Key"
 
-#: ../../mod/settings.php:563 ../../mod/settings.php:589
+#: ../../mod/settings.php:564 ../../mod/settings.php:590
 #: ../../addon/statusnet/statusnet.php:693
 #: ../../addon.old/statusnet/statusnet.php:569
 msgid "Consumer Secret"
 msgstr "Consumer Secret"
 
-#: ../../mod/settings.php:564 ../../mod/settings.php:590
+#: ../../mod/settings.php:565 ../../mod/settings.php:591
 msgid "Redirect"
 msgstr "Umleiten"
 
-#: ../../mod/settings.php:565 ../../mod/settings.php:591
+#: ../../mod/settings.php:566 ../../mod/settings.php:592
 msgid "Icon url"
 msgstr "Icon URL"
 
-#: ../../mod/settings.php:576
+#: ../../mod/settings.php:577
 msgid "You can't edit this application."
 msgstr "Du kannst dieses Programm nicht bearbeiten."
 
-#: ../../mod/settings.php:619
+#: ../../mod/settings.php:620
 msgid "Connected Apps"
 msgstr "Verbundene Programme"
 
-#: ../../mod/settings.php:623
+#: ../../mod/settings.php:624
 msgid "Client key starts with"
 msgstr "Anwenderschlüssel beginnt mit"
 
-#: ../../mod/settings.php:624
+#: ../../mod/settings.php:625
 msgid "No name"
 msgstr "Kein Name"
 
-#: ../../mod/settings.php:625
+#: ../../mod/settings.php:626
 msgid "Remove authorization"
 msgstr "Autorisierung entziehen"
 
-#: ../../mod/settings.php:637
+#: ../../mod/settings.php:638
 msgid "No Plugin settings configured"
 msgstr "Keine Plugin-Einstellungen konfiguriert"
 
-#: ../../mod/settings.php:645 ../../addon/widgets/widgets.php:123
+#: ../../mod/settings.php:646 ../../addon/widgets/widgets.php:123
 #: ../../addon.old/widgets/widgets.php:123
 msgid "Plugin Settings"
 msgstr "Plugin-Einstellungen"
 
-#: ../../mod/settings.php:659
+#: ../../mod/settings.php:660
 msgid "Off"
 msgstr "Aus"
 
-#: ../../mod/settings.php:659
+#: ../../mod/settings.php:660
 msgid "On"
 msgstr "An"
 
-#: ../../mod/settings.php:667
+#: ../../mod/settings.php:668
 msgid "Additional Features"
 msgstr "Zusätzliche Features"
 
-#: ../../mod/settings.php:681 ../../mod/settings.php:682
+#: ../../mod/settings.php:682 ../../mod/settings.php:683
 #, php-format
 msgid "Built-in support for %s connectivity is %s"
 msgstr "Eingebaute Unterstützung für Verbindungen zu %s ist %s"
 
-#: ../../mod/settings.php:681 ../../mod/settings.php:682
+#: ../../mod/settings.php:682 ../../mod/settings.php:683
 msgid "enabled"
 msgstr "eingeschaltet"
 
-#: ../../mod/settings.php:681 ../../mod/settings.php:682
+#: ../../mod/settings.php:682 ../../mod/settings.php:683
 msgid "disabled"
 msgstr "ausgeschaltet"
 
-#: ../../mod/settings.php:682
+#: ../../mod/settings.php:683
 msgid "StatusNet"
 msgstr "StatusNet"
 
-#: ../../mod/settings.php:714
+#: ../../mod/settings.php:715
 msgid "Email access is disabled on this site."
 msgstr "Zugriff auf E-Mails für diese Seite deaktiviert."
 
-#: ../../mod/settings.php:720
+#: ../../mod/settings.php:721
 msgid "Connector Settings"
 msgstr "Verbindungs-Einstellungen"
 
-#: ../../mod/settings.php:725
+#: ../../mod/settings.php:726
 msgid "Email/Mailbox Setup"
 msgstr "E-Mail/Postfach-Einstellungen"
 
-#: ../../mod/settings.php:726
+#: ../../mod/settings.php:727
 msgid ""
 "If you wish to communicate with email contacts using this service "
 "(optional), please specify how to connect to your mailbox."
 msgstr "Wenn du mit E-Mail-Kontakten Ã¼ber diesen Service kommunizieren möchtest (optional), gib bitte die Einstellungen für dein Postfach an."
 
-#: ../../mod/settings.php:727
+#: ../../mod/settings.php:728
 msgid "Last successful email check:"
 msgstr "Letzter erfolgreicher E-Mail Check"
 
-#: ../../mod/settings.php:729
+#: ../../mod/settings.php:730
 msgid "IMAP server name:"
 msgstr "IMAP-Server-Name:"
 
-#: ../../mod/settings.php:730
+#: ../../mod/settings.php:731
 msgid "IMAP port:"
 msgstr "IMAP-Port:"
 
-#: ../../mod/settings.php:731
+#: ../../mod/settings.php:732
 msgid "Security:"
 msgstr "Sicherheit:"
 
-#: ../../mod/settings.php:731 ../../mod/settings.php:736
+#: ../../mod/settings.php:732 ../../mod/settings.php:737
 #: ../../addon/fbpost/fbpost.php:247 ../../addon/fbpost/fbpost.php:249
 #: ../../addon/dav/common/wdcal_edit.inc.php:191
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:191
 msgid "None"
 msgstr "Keine"
 
-#: ../../mod/settings.php:732
+#: ../../mod/settings.php:733
 msgid "Email login name:"
 msgstr "E-Mail-Login-Name:"
 
-#: ../../mod/settings.php:733
+#: ../../mod/settings.php:734
 msgid "Email password:"
 msgstr "E-Mail-Passwort:"
 
-#: ../../mod/settings.php:734
+#: ../../mod/settings.php:735
 msgid "Reply-to address:"
 msgstr "Reply-to Adresse:"
 
-#: ../../mod/settings.php:735
+#: ../../mod/settings.php:736
 msgid "Send public posts to all email contacts:"
 msgstr "Sende Ã¶ffentliche Beiträge an alle E-Mail-Kontakte:"
 
-#: ../../mod/settings.php:736
+#: ../../mod/settings.php:737
 msgid "Action after import:"
 msgstr "Aktion nach Import:"
 
-#: ../../mod/settings.php:736
+#: ../../mod/settings.php:737
 msgid "Mark as seen"
 msgstr "Als gelesen markieren"
 
-#: ../../mod/settings.php:736
+#: ../../mod/settings.php:737
 msgid "Move to folder"
 msgstr "In einen Ordner verschieben"
 
-#: ../../mod/settings.php:737
+#: ../../mod/settings.php:738
 msgid "Move to folder:"
 msgstr "In diesen Ordner verschieben:"
 
-#: ../../mod/settings.php:768 ../../mod/admin.php:404
+#: ../../mod/settings.php:769 ../../mod/admin.php:404
 msgid "No special theme for mobile devices"
 msgstr "Kein spezielles Theme für mobile Geräte verwenden."
 
-#: ../../mod/settings.php:808
+#: ../../mod/settings.php:809
 msgid "Display Settings"
 msgstr "Anzeige-Einstellungen"
 
-#: ../../mod/settings.php:814 ../../mod/settings.php:825
+#: ../../mod/settings.php:815 ../../mod/settings.php:826
 msgid "Display Theme:"
 msgstr "Theme:"
 
-#: ../../mod/settings.php:815
+#: ../../mod/settings.php:816
 msgid "Mobile Theme:"
 msgstr "Mobiles Theme"
 
-#: ../../mod/settings.php:816
+#: ../../mod/settings.php:817
 msgid "Update browser every xx seconds"
 msgstr "Browser alle xx Sekunden aktualisieren"
 
-#: ../../mod/settings.php:816
+#: ../../mod/settings.php:817
 msgid "Minimum of 10 seconds, no maximum"
 msgstr "Minimal 10 Sekunden, kein Maximum"
 
-#: ../../mod/settings.php:817
+#: ../../mod/settings.php:818
 msgid "Number of items to display per page:"
 msgstr "Zahl der Beiträge, die pro Netzwerkseite angezeigt werden sollen: "
 
-#: ../../mod/settings.php:817
+#: ../../mod/settings.php:818
 msgid "Maximum of 100 items"
 msgstr "Maximal 100 Beiträge"
 
-#: ../../mod/settings.php:818
+#: ../../mod/settings.php:819
 msgid "Don't show emoticons"
 msgstr "Keine Smilies anzeigen"
 
-#: ../../mod/settings.php:894
+#: ../../mod/settings.php:895
 msgid "Normal Account Page"
 msgstr "Normales Konto"
 
-#: ../../mod/settings.php:895
+#: ../../mod/settings.php:896
 msgid "This account is a normal personal profile"
 msgstr "Dieses Konto ist ein normales persönliches Profil"
 
-#: ../../mod/settings.php:898
+#: ../../mod/settings.php:899
 msgid "Soapbox Page"
 msgstr "Marktschreier-Konto"
 
-#: ../../mod/settings.php:899
+#: ../../mod/settings.php:900
 msgid "Automatically approve all connection/friend requests as read-only fans"
 msgstr "Kontaktanfragen werden automatisch als Nurlese-Fans akzeptiert"
 
-#: ../../mod/settings.php:902
+#: ../../mod/settings.php:903
 msgid "Community Forum/Celebrity Account"
 msgstr "Forum/Promi-Konto"
 
-#: ../../mod/settings.php:903
+#: ../../mod/settings.php:904
 msgid ""
 "Automatically approve all connection/friend requests as read-write fans"
 msgstr "Kontaktanfragen werden automatisch als Lese-und-Schreib-Fans akzeptiert"
 
-#: ../../mod/settings.php:906
+#: ../../mod/settings.php:907
 msgid "Automatic Friend Page"
 msgstr "Automatische Freunde Seite"
 
-#: ../../mod/settings.php:907
+#: ../../mod/settings.php:908
 msgid "Automatically approve all connection/friend requests as friends"
 msgstr "Kontaktanfragen werden automatisch als Freund akzeptiert"
 
-#: ../../mod/settings.php:910
+#: ../../mod/settings.php:911
 msgid "Private Forum [Experimental]"
 msgstr "Privates Forum [Versuchsstadium]"
 
-#: ../../mod/settings.php:911
+#: ../../mod/settings.php:912
 msgid "Private forum - approved members only"
 msgstr "Privates Forum, nur für Mitglieder"
 
-#: ../../mod/settings.php:923
+#: ../../mod/settings.php:924
 msgid "OpenID:"
 msgstr "OpenID:"
 
-#: ../../mod/settings.php:923
+#: ../../mod/settings.php:924
 msgid "(Optional) Allow this OpenID to login to this account."
 msgstr "(Optional) Erlaube die Anmeldung für dieses Konto mit dieser OpenID."
 
-#: ../../mod/settings.php:933
+#: ../../mod/settings.php:934
 msgid "Publish your default profile in your local site directory?"
 msgstr "Darf dein Standardprofil im Verzeichnis dieses Servers veröffentlicht werden?"
 
-#: ../../mod/settings.php:939
+#: ../../mod/settings.php:940
 msgid "Publish your default profile in the global social directory?"
 msgstr "Darf dein Standardprofil im weltweiten Verzeichnis veröffentlicht werden?"
 
-#: ../../mod/settings.php:947
+#: ../../mod/settings.php:948
 msgid "Hide your contact/friend list from viewers of your default profile?"
 msgstr "Liste der Kontakte vor Betrachtern des Standardprofils verbergen?"
 
-#: ../../mod/settings.php:951
+#: ../../mod/settings.php:952
 msgid "Hide your profile details from unknown viewers?"
 msgstr "Profil-Details vor unbekannten Betrachtern verbergen?"
 
-#: ../../mod/settings.php:956
+#: ../../mod/settings.php:957
 msgid "Allow friends to post to your profile page?"
 msgstr "Dürfen deine Kontakte auf deine Pinnwand schreiben?"
 
-#: ../../mod/settings.php:962
+#: ../../mod/settings.php:963
 msgid "Allow friends to tag your posts?"
 msgstr "Dürfen deine Kontakte deine Beiträge mit Schlagwörtern versehen?"
 
-#: ../../mod/settings.php:968
+#: ../../mod/settings.php:969
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr "Dürfen wir dich neuen Mitgliedern als potentiellen Kontakt vorschlagen?"
 
-#: ../../mod/settings.php:974
+#: ../../mod/settings.php:975
 msgid "Permit unknown people to send you private mail?"
 msgstr "Dürfen dir Unbekannte private Nachrichten schicken?"
 
-#: ../../mod/settings.php:982
+#: ../../mod/settings.php:983
 msgid "Profile is <strong>not published</strong>."
 msgstr "Profil ist <strong>nicht veröffentlicht</strong>."
 
-#: ../../mod/settings.php:985 ../../mod/profile_photo.php:248
+#: ../../mod/settings.php:986 ../../mod/profile_photo.php:248
 msgid "or"
 msgstr "oder"
 
-#: ../../mod/settings.php:990
+#: ../../mod/settings.php:991
 msgid "Your Identity Address is"
 msgstr "Die Adresse deines Profils lautet:"
 
-#: ../../mod/settings.php:1001
+#: ../../mod/settings.php:1002
 msgid "Automatically expire posts after this many days:"
 msgstr "Beiträge verfallen automatisch nach dieser Anzahl von Tagen:"
 
-#: ../../mod/settings.php:1001
+#: ../../mod/settings.php:1002
 msgid "If empty, posts will not expire. Expired posts will be deleted"
 msgstr "Wenn leer verfallen Beiträge nie automatisch. Verfallene Beiträge werden gelöscht."
 
-#: ../../mod/settings.php:1002
+#: ../../mod/settings.php:1003
 msgid "Advanced expiration settings"
 msgstr "Erweiterte Verfallseinstellungen"
 
-#: ../../mod/settings.php:1003
+#: ../../mod/settings.php:1004
 msgid "Advanced Expiration"
 msgstr "Erweitertes Verfallen"
 
-#: ../../mod/settings.php:1004
+#: ../../mod/settings.php:1005
 msgid "Expire posts:"
 msgstr "Beiträge verfallen lassen:"
 
-#: ../../mod/settings.php:1005
+#: ../../mod/settings.php:1006
 msgid "Expire personal notes:"
 msgstr "Persönliche Notizen verfallen lassen:"
 
-#: ../../mod/settings.php:1006
+#: ../../mod/settings.php:1007
 msgid "Expire starred posts:"
 msgstr "Markierte Beiträge verfallen lassen:"
 
-#: ../../mod/settings.php:1007
+#: ../../mod/settings.php:1008
 msgid "Expire photos:"
 msgstr "Fotos verfallen lassen:"
 
-#: ../../mod/settings.php:1008
+#: ../../mod/settings.php:1009
 msgid "Only expire posts by others:"
 msgstr "Nur Beiträge anderer verfallen:"
 
-#: ../../mod/settings.php:1015
+#: ../../mod/settings.php:1016
 msgid "Account Settings"
 msgstr "Kontoeinstellungen"
 
-#: ../../mod/settings.php:1023
+#: ../../mod/settings.php:1024
 msgid "Password Settings"
 msgstr "Passwort-Einstellungen"
 
-#: ../../mod/settings.php:1024
+#: ../../mod/settings.php:1025
 msgid "New Password:"
 msgstr "Neues Passwort:"
 
-#: ../../mod/settings.php:1025
+#: ../../mod/settings.php:1026
 msgid "Confirm:"
 msgstr "Bestätigen:"
 
-#: ../../mod/settings.php:1025
+#: ../../mod/settings.php:1026
 msgid "Leave password fields blank unless changing"
 msgstr "Lass die Passwort-Felder leer, außer du willst das Passwort Ã¤ndern"
 
-#: ../../mod/settings.php:1029
+#: ../../mod/settings.php:1030
 msgid "Basic Settings"
 msgstr "Grundeinstellungen"
 
-#: ../../mod/settings.php:1030 ../../include/profile_advanced.php:15
+#: ../../mod/settings.php:1031 ../../include/profile_advanced.php:15
 msgid "Full Name:"
 msgstr "Kompletter Name:"
 
-#: ../../mod/settings.php:1031
+#: ../../mod/settings.php:1032
 msgid "Email Address:"
 msgstr "E-Mail-Adresse:"
 
-#: ../../mod/settings.php:1032
+#: ../../mod/settings.php:1033
 msgid "Your Timezone:"
 msgstr "Deine Zeitzone:"
 
-#: ../../mod/settings.php:1033
+#: ../../mod/settings.php:1034
 msgid "Default Post Location:"
 msgstr "Standardstandort:"
 
-#: ../../mod/settings.php:1034
+#: ../../mod/settings.php:1035
 msgid "Use Browser Location:"
 msgstr "Standort des Browsers verwenden:"
 
-#: ../../mod/settings.php:1037
+#: ../../mod/settings.php:1038
 msgid "Security and Privacy Settings"
 msgstr "Sicherheits- und Privatsphäre-Einstellungen"
 
-#: ../../mod/settings.php:1039
+#: ../../mod/settings.php:1040
 msgid "Maximum Friend Requests/Day:"
 msgstr "Maximale Anzahl von Freundschaftsanfragen/Tag:"
 
-#: ../../mod/settings.php:1039 ../../mod/settings.php:1058
+#: ../../mod/settings.php:1040 ../../mod/settings.php:1059
 msgid "(to prevent spam abuse)"
 msgstr "(um SPAM zu vermeiden)"
 
-#: ../../mod/settings.php:1040
+#: ../../mod/settings.php:1041
 msgid "Default Post Permissions"
 msgstr "Standard-Zugriffsrechte für Beiträge"
 
-#: ../../mod/settings.php:1041
+#: ../../mod/settings.php:1042
 msgid "(click to open/close)"
 msgstr "(klicke zum Ã¶ffnen/schließen)"
 
-#: ../../mod/settings.php:1058
+#: ../../mod/settings.php:1059
 msgid "Maximum private messages per day from unknown people:"
 msgstr "Maximale Anzahl privater Nachrichten von Unbekannten pro Tag:"
 
-#: ../../mod/settings.php:1061
+#: ../../mod/settings.php:1062
 msgid "Notification Settings"
 msgstr "Benachrichtigungseinstellungen"
 
-#: ../../mod/settings.php:1062
+#: ../../mod/settings.php:1063
 msgid "By default post a status message when:"
 msgstr "Standardmäßig eine Statusnachricht posten, wenn:"
 
-#: ../../mod/settings.php:1063
+#: ../../mod/settings.php:1064
 msgid "accepting a friend request"
 msgstr "– du eine Kontaktanfrage akzeptierst"
 
-#: ../../mod/settings.php:1064
+#: ../../mod/settings.php:1065
 msgid "joining a forum/community"
 msgstr "– du einem Forum/einer Gemeinschaftsseite beitrittst"
 
-#: ../../mod/settings.php:1065
+#: ../../mod/settings.php:1066
 msgid "making an <em>interesting</em> profile change"
 msgstr "– du eine <em>interessante</em> Ã„nderung an deinem Profil durchführst"
 
-#: ../../mod/settings.php:1066
+#: ../../mod/settings.php:1067
 msgid "Send a notification email when:"
 msgstr "Benachrichtigungs-E-Mail senden wenn:"
 
-#: ../../mod/settings.php:1067
+#: ../../mod/settings.php:1068
 msgid "You receive an introduction"
 msgstr "– du eine Kontaktanfrage erhältst"
 
-#: ../../mod/settings.php:1068
+#: ../../mod/settings.php:1069
 msgid "Your introductions are confirmed"
 msgstr "– eine deiner Kontaktanfragen akzeptiert wurde"
 
-#: ../../mod/settings.php:1069
+#: ../../mod/settings.php:1070
 msgid "Someone writes on your profile wall"
 msgstr "– jemand etwas auf deine Pinnwand schreibt"
 
-#: ../../mod/settings.php:1070
+#: ../../mod/settings.php:1071
 msgid "Someone writes a followup comment"
 msgstr "– jemand auch einen Kommentar verfasst"
 
-#: ../../mod/settings.php:1071
+#: ../../mod/settings.php:1072
 msgid "You receive a private message"
 msgstr "– du eine private Nachricht erhältst"
 
-#: ../../mod/settings.php:1072
+#: ../../mod/settings.php:1073
 msgid "You receive a friend suggestion"
 msgstr "– du eine Empfehlung erhältst"
 
-#: ../../mod/settings.php:1073
+#: ../../mod/settings.php:1074
 msgid "You are tagged in a post"
 msgstr "– du in einem Beitrag erwähnt wirst"
 
-#: ../../mod/settings.php:1074
+#: ../../mod/settings.php:1075
 msgid "You are poked/prodded/etc. in a post"
 msgstr "– du von jemandem angestupst oder sonstwie behandelt wirst"
 
-#: ../../mod/settings.php:1077
+#: ../../mod/settings.php:1078
 msgid "Advanced Account/Page Type Settings"
 msgstr "Erweiterte Konto-/Seitentyp-Einstellungen"
 
-#: ../../mod/settings.php:1078
+#: ../../mod/settings.php:1079
 msgid "Change the behaviour of this account for special situations"
 msgstr "Verhalten dieses Kontos in bestimmten Situationen:"
 
@@ -2780,7 +2780,7 @@ msgstr "Private Nachrichten an diese Person könnten an die Ã–ffentlichkeit gela
 msgid "Invalid contact."
 msgstr "Ungültiger Kontakt."
 
-#: ../../mod/notes.php:44 ../../boot.php:1755
+#: ../../mod/notes.php:44 ../../boot.php:1768
 msgid "Personal Notes"
 msgstr "Persönliche Notizen"
 
@@ -2943,7 +2943,7 @@ msgstr "Ãœberprüfe die restlichen Einstellungen, insbesondere die Einstellungen
 #: ../../mod/newmember.php:32 ../../mod/profperm.php:103
 #: ../../view/theme/diabook/theme.php:88 ../../include/profile_advanced.php:7
 #: ../../include/profile_advanced.php:84 ../../include/nav.php:50
-#: ../../boot.php:1731
+#: ../../boot.php:1744
 msgid "Profile"
 msgstr "Profil"
 
@@ -3248,7 +3248,7 @@ msgstr "Wähle einen Spitznamen für dein Profil. Dieser muss mit einem Buchstab
 msgid "Choose a nickname: "
 msgstr "Spitznamen wählen: "
 
-#: ../../mod/register.php:274 ../../include/nav.php:81 ../../boot.php:923
+#: ../../mod/register.php:274 ../../include/nav.php:81 ../../boot.php:936
 msgid "Register"
 msgstr "Registrieren"
 
@@ -3305,7 +3305,7 @@ msgid "Access denied."
 msgstr "Zugriff verweigert."
 
 #: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:90
-#: ../../include/nav.php:51 ../../boot.php:1738
+#: ../../include/nav.php:51 ../../boot.php:1751
 msgid "Photos"
 msgstr "Bilder"
 
@@ -3566,7 +3566,7 @@ msgstr "DB Updates"
 msgid "Logs"
 msgstr "Protokolle"
 
-#: ../../mod/admin.php:120 ../../include/nav.php:149
+#: ../../mod/admin.php:120 ../../include/nav.php:151
 msgid "Admin"
 msgstr "Administration"
 
@@ -4195,7 +4195,7 @@ msgstr "FTP Nutzername"
 msgid "FTP Password"
 msgstr "FTP Passwort"
 
-#: ../../mod/profile.php:21 ../../boot.php:1126
+#: ../../mod/profile.php:21 ../../boot.php:1139
 msgid "Requested profile is not available."
 msgstr "Das angefragte Profil ist nicht vorhanden."
 
@@ -4601,23 +4601,23 @@ msgstr "Alter: "
 msgid "Edit/Manage Profiles"
 msgstr "Verwalte/Editiere Profile"
 
-#: ../../mod/profiles.php:700 ../../boot.php:1244
+#: ../../mod/profiles.php:700 ../../boot.php:1257
 msgid "Change profile photo"
 msgstr "Profilbild Ã¤ndern"
 
-#: ../../mod/profiles.php:701 ../../boot.php:1245
+#: ../../mod/profiles.php:701 ../../boot.php:1258
 msgid "Create New Profile"
 msgstr "Neues Profil anlegen"
 
-#: ../../mod/profiles.php:712 ../../boot.php:1255
+#: ../../mod/profiles.php:712 ../../boot.php:1268
 msgid "Profile Image"
 msgstr "Profilbild"
 
-#: ../../mod/profiles.php:714 ../../boot.php:1258
+#: ../../mod/profiles.php:714 ../../boot.php:1271
 msgid "visible to everybody"
 msgstr "sichtbar für jeden"
 
-#: ../../mod/profiles.php:715 ../../boot.php:1259
+#: ../../mod/profiles.php:715 ../../boot.php:1272
 msgid "Edit visibility"
 msgstr "Sichtbarkeit bearbeiten"
 
@@ -4639,7 +4639,7 @@ msgstr "%1$s hat %2$ss %3$s mit %4$s getaggt"
 msgid "No potential page delegates located."
 msgstr "Keine potentiellen Bevollmächtigten für die Seite gefunden."
 
-#: ../../mod/delegate.php:121
+#: ../../mod/delegate.php:121 ../../include/nav.php:138
 msgid "Delegate Page Management"
 msgstr "Delegiere das Management für die Seite"
 
@@ -4749,19 +4749,19 @@ msgstr "Geschlecht:"
 
 #: ../../mod/directory.php:136
 #: ../../addon/forumdirectory/forumdirectory.php:158
-#: ../../include/profile_advanced.php:17 ../../boot.php:1280
+#: ../../include/profile_advanced.php:17 ../../boot.php:1293
 msgid "Gender:"
 msgstr "Geschlecht:"
 
 #: ../../mod/directory.php:138
 #: ../../addon/forumdirectory/forumdirectory.php:160
-#: ../../include/profile_advanced.php:37 ../../boot.php:1283
+#: ../../include/profile_advanced.php:37 ../../boot.php:1296
 msgid "Status:"
 msgstr "Status:"
 
 #: ../../mod/directory.php:140
 #: ../../addon/forumdirectory/forumdirectory.php:162
-#: ../../include/profile_advanced.php:48 ../../boot.php:1285
+#: ../../include/profile_advanced.php:48 ../../boot.php:1298
 msgid "Homepage:"
 msgstr "Homepage:"
 
@@ -5646,7 +5646,7 @@ msgstr "Foren Verzeichnis"
 #: ../../addon/communityhome/communityhome.php:34
 #: ../../addon/communityhome/twillingham/communityhome.php:28
 #: ../../addon/communityhome/twillingham/communityhome.php:34
-#: ../../include/nav.php:64 ../../boot.php:949
+#: ../../include/nav.php:64 ../../boot.php:962
 #: ../../addon.old/communityhome/communityhome.php:28
 #: ../../addon.old/communityhome/communityhome.php:34
 #: ../../addon.old/communityhome/twillingham/communityhome.php:28
@@ -6254,8 +6254,8 @@ msgid "Extended calendar with CalDAV-support"
 msgstr "Erweiterter Kalender mit CalDAV Unterstützung."
 
 #: ../../addon/dav/friendica/main.php:279
-#: ../../addon/dav/friendica/main.php:280 ../../include/delivery.php:464
-#: ../../include/enotify.php:28 ../../include/notifier.php:778
+#: ../../addon/dav/friendica/main.php:280 ../../include/delivery.php:468
+#: ../../include/enotify.php:28 ../../include/notifier.php:781
 #: ../../addon.old/dav/friendica/main.php:279
 #: ../../addon.old/dav/friendica/main.php:280
 msgid "noreply"
@@ -8266,11 +8266,11 @@ msgstr "Ist mir nicht wichtig"
 msgid "Ask me"
 msgstr "Frag mich"
 
-#: ../../include/event.php:20 ../../include/bb2diaspora.php:396
+#: ../../include/event.php:20 ../../include/bb2diaspora.php:399
 msgid "Starts:"
 msgstr "Beginnt:"
 
-#: ../../include/event.php:30 ../../include/bb2diaspora.php:404
+#: ../../include/event.php:30 ../../include/bb2diaspora.php:407
 msgid "Finishes:"
 msgstr "Endet:"
 
@@ -8612,7 +8612,7 @@ msgstr "Neue Gruppe erstellen"
 msgid "Contacts not in any group"
 msgstr "Kontakte in keiner Gruppe"
 
-#: ../../include/nav.php:46 ../../boot.php:948
+#: ../../include/nav.php:46 ../../boot.php:961
 msgid "Logout"
 msgstr "Abmelden"
 
@@ -8620,7 +8620,7 @@ msgstr "Abmelden"
 msgid "End this session"
 msgstr "Diese Sitzung beenden"
 
-#: ../../include/nav.php:49 ../../boot.php:1724
+#: ../../include/nav.php:49 ../../boot.php:1737
 msgid "Status"
 msgstr "Status"
 
@@ -8708,23 +8708,27 @@ msgstr "Verwalten"
 msgid "Manage other pages"
 msgstr "Andere Seiten verwalten"
 
-#: ../../include/nav.php:140 ../../boot.php:1238
+#: ../../include/nav.php:138
+msgid "Delegations"
+msgstr "Delegierungen"
+
+#: ../../include/nav.php:142 ../../boot.php:1251
 msgid "Profiles"
 msgstr "Profile"
 
-#: ../../include/nav.php:140
+#: ../../include/nav.php:142
 msgid "Manage/Edit Profiles"
 msgstr "Profile Verwalten/Editieren"
 
-#: ../../include/nav.php:142
+#: ../../include/nav.php:144
 msgid "Manage/edit friends and contacts"
 msgstr "Freunde und Kontakte verwalten/editieren"
 
-#: ../../include/nav.php:149
+#: ../../include/nav.php:151
 msgid "Site setup and configuration"
 msgstr "Einstellungen der Seite und Konfiguration"
 
-#: ../../include/nav.php:173
+#: ../../include/nav.php:175
 msgid "Nothing new here"
 msgstr "Keine Neuigkeiten."
 
@@ -8868,19 +8872,26 @@ msgstr "%ss Geburtstag"
 msgid "Happy Birthday %s"
 msgstr "Herzlichen Glückwunsch %s"
 
-#: ../../include/onepoll.php:421
+#: ../../include/onepoll.php:439
 msgid "From: "
 msgstr "Von: "
 
-#: ../../include/bbcode.php:202 ../../include/bbcode.php:423
+#: ../../include/bbcode.php:202 ../../include/bbcode.php:482
 msgid "Image/photo"
 msgstr "Bild/Foto"
 
-#: ../../include/bbcode.php:388 ../../include/bbcode.php:408
+#: ../../include/bbcode.php:254
+#, php-format
+msgid ""
+"<span><a href=\"%s\">%s</a> wrote the following <a "
+"href=\"%s\">post</a>:</span>"
+msgstr "<span><a href=\"%s\">%s</a> schrieb den folgenden <a href=\"%s\">Beitrag</a>:</span>"
+
+#: ../../include/bbcode.php:447 ../../include/bbcode.php:467
 msgid "$1 wrote:"
 msgstr "$1 hat geschrieben:"
 
-#: ../../include/bbcode.php:427 ../../include/bbcode.php:428
+#: ../../include/bbcode.php:487 ../../include/bbcode.php:488
 msgid "Encrypted content"
 msgstr "Verschlüsselter Inhalt"
 
@@ -9532,109 +9543,109 @@ msgstr "Diese Aktion Ã¼berschreitet die Obergrenze deines Abonnements."
 msgid "This action is not available under your subscription plan."
 msgstr "Diese Aktion ist in deinem Abonnement nicht verfügbar."
 
-#: ../../boot.php:607
+#: ../../boot.php:620
 msgid "Delete this item?"
 msgstr "Diesen Beitrag löschen?"
 
-#: ../../boot.php:610
+#: ../../boot.php:623
 msgid "show fewer"
 msgstr "weniger anzeigen"
 
-#: ../../boot.php:819
+#: ../../boot.php:832
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr "Update %s fehlgeschlagen. Bitte Fehlerprotokoll Ã¼berprüfen."
 
-#: ../../boot.php:821
+#: ../../boot.php:834
 #, php-format
 msgid "Update Error at %s"
 msgstr "Updatefehler bei %s"
 
-#: ../../boot.php:922
+#: ../../boot.php:935
 msgid "Create a New Account"
 msgstr "Neues Konto erstellen"
 
-#: ../../boot.php:951
+#: ../../boot.php:964
 msgid "Nickname or Email address: "
 msgstr "Spitzname oder E-Mail-Adresse: "
 
-#: ../../boot.php:952
+#: ../../boot.php:965
 msgid "Password: "
 msgstr "Passwort: "
 
-#: ../../boot.php:953
+#: ../../boot.php:966
 msgid "Remember me"
 msgstr "Anmeldedaten merken"
 
-#: ../../boot.php:956
+#: ../../boot.php:969
 msgid "Or login using OpenID: "
 msgstr "Oder melde dich mit deiner OpenID an: "
 
-#: ../../boot.php:962
+#: ../../boot.php:975
 msgid "Forgot your password?"
 msgstr "Passwort vergessen?"
 
-#: ../../boot.php:1087
+#: ../../boot.php:1100
 msgid "Requested account is not available."
 msgstr "Das angefragte Profil ist nicht vorhanden."
 
-#: ../../boot.php:1164
+#: ../../boot.php:1177
 msgid "Edit profile"
 msgstr "Profil bearbeiten"
 
-#: ../../boot.php:1230
+#: ../../boot.php:1243
 msgid "Message"
 msgstr "Nachricht"
 
-#: ../../boot.php:1238
+#: ../../boot.php:1251
 msgid "Manage/edit profiles"
 msgstr "Profile verwalten/editieren"
 
-#: ../../boot.php:1352 ../../boot.php:1438
+#: ../../boot.php:1365 ../../boot.php:1451
 msgid "g A l F d"
 msgstr "l, d. F G \\U\\h\\r"
 
-#: ../../boot.php:1353 ../../boot.php:1439
+#: ../../boot.php:1366 ../../boot.php:1452
 msgid "F d"
 msgstr "d. F"
 
-#: ../../boot.php:1398 ../../boot.php:1479
+#: ../../boot.php:1411 ../../boot.php:1492
 msgid "[today]"
 msgstr "[heute]"
 
-#: ../../boot.php:1410
+#: ../../boot.php:1423
 msgid "Birthday Reminders"
 msgstr "Geburtstagserinnerungen"
 
-#: ../../boot.php:1411
+#: ../../boot.php:1424
 msgid "Birthdays this week:"
 msgstr "Geburtstage diese Woche:"
 
-#: ../../boot.php:1472
+#: ../../boot.php:1485
 msgid "[No description]"
 msgstr "[keine Beschreibung]"
 
-#: ../../boot.php:1490
+#: ../../boot.php:1503
 msgid "Event Reminders"
 msgstr "Veranstaltungserinnerungen"
 
-#: ../../boot.php:1491
+#: ../../boot.php:1504
 msgid "Events this week:"
 msgstr "Veranstaltungen diese Woche"
 
-#: ../../boot.php:1727
+#: ../../boot.php:1740
 msgid "Status Messages and Posts"
 msgstr "Statusnachrichten und Beiträge"
 
-#: ../../boot.php:1734
+#: ../../boot.php:1747
 msgid "Profile Details"
 msgstr "Profildetails"
 
-#: ../../boot.php:1751
+#: ../../boot.php:1764
 msgid "Events and Calendar"
 msgstr "Ereignisse und Kalender"
 
-#: ../../boot.php:1758
+#: ../../boot.php:1771
 msgid "Only You Can See This"
 msgstr "Nur du kannst das sehen"
 
index adc1300d1578b9ea5b03b6898e2c91083d4bbdbc..ae06508fea1a07f7162e9f5ce77e008c3478ce0f 100644 (file)
@@ -1863,6 +1863,7 @@ $a->strings["Inbox"] = "Eingang";
 $a->strings["Outbox"] = "Ausgang";
 $a->strings["Manage"] = "Verwalten";
 $a->strings["Manage other pages"] = "Andere Seiten verwalten";
+$a->strings["Delegations"] = "Delegierungen";
 $a->strings["Profiles"] = "Profile";
 $a->strings["Manage/Edit Profiles"] = "Profile Verwalten/Editieren";
 $a->strings["Manage/edit friends and contacts"] = "Freunde und Kontakte verwalten/editieren";
@@ -1906,6 +1907,7 @@ $a->strings["%s's birthday"] = "%ss Geburtstag";
 $a->strings["Happy Birthday %s"] = "Herzlichen Glückwunsch %s";
 $a->strings["From: "] = "Von: ";
 $a->strings["Image/photo"] = "Bild/Foto";
+$a->strings["<span><a href=\"%s\">%s</a> wrote the following <a href=\"%s\">post</a>:</span>"] = "<span><a href=\"%s\">%s</a> schrieb den folgenden <a href=\"%s\">Beitrag</a>:</span>";
 $a->strings["$1 wrote:"] = "$1 hat geschrieben:";
 $a->strings["Encrypted content"] = "Verschlüsselter Inhalt";
 $a->strings["General Features"] = "Allgemeine Features";
index 6119ccf22ba394179854d862412cb9901e1c7268..35f5afd39cad089d2a48616bef96eda44295b401 100644 (file)
@@ -1,4 +1,4 @@
 
  {{ if $field.0==select }}
- {{ inc $field_select }}{{ endinc }}
+ {{ inc field_select.tpl }}{{ endinc }}
  {{ endif }}
index 1e97237f478998fed141e0fb6399d8ab07e99b23..7db31d716feb2a9ae93f1c00c2f4e0a977e5fc71 100644 (file)
@@ -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>
        
index f7a253ba50b20e8ff4285facf30b00bf579f75a9..ae837d6b744d493f1112ddd6843c0a82c1a182c1 100644 (file)
@@ -1,4 +1,4 @@
-{{ inc $field_combobox }}{{ endinc }}
+{{ inc field_combobox.tpl }}{{ endinc }}
 <div class="settings-submit-wrapper" >
        <input id="filer_save" type="button" class="settings-submit" value="$submit" />
 </div>
index d60a1b0f97a6c1ff616ddefdf6a9864c9643884c..35d298111891d96dcbc3e0572936dc72553b1928 100644 (file)
@@ -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'>
                
-               {{ inc $field_input with $field=$gname }}{{ endinc }}
+               {{ inc field_input.tpl with $field=$gname }}{{ endinc }}
                {{ if $drop }}$drop{{ endif }}
                <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">
-               {{ inc $groupeditortpl with $groupeditor=$groupedit_info }}{{ endinc }}
+               {{ inc groupeditor.tpl with $groupeditor=$groupedit_info }}{{ endinc }}
        </div>
 {{ endif }}
 {{ if $desc }}<div id="group-edit-desc">$desc</div>{{ endif }}
index bf17256ebf84c3130196b36d73afd22960ec8087..1302b5a708a18ba8a0386782438c4bbf9a76268b 100644 (file)
@@ -18,10 +18,10 @@ $info_03
 <input type="hidden" name="phpath" value="$phpath" />
 <input type="hidden" name="pass" value="3" />
 
-{{ inc $field_input with $field=$dbhost }}{{endinc}}
-{{ inc $field_input with $field=$dbuser }}{{endinc}}
-{{ inc $field_password with $field=$dbpass }}{{endinc}}
-{{ inc $field_input with $field=$dbdata }}{{endinc}}
+{{ inc field_input.tpl with $field=$dbhost }}{{endinc}}
+{{ inc field_input.tpl with $field=$dbuser }}{{endinc}}
+{{ inc field_password.tpl with $field=$dbpass }}{{endinc}}
+{{ inc field_input.tpl with $field=$dbdata }}{{endinc}}
 
 
 <input id="install-submit" type="submit" name="submit" value="$submit" /> 
index 453e2e5cc3fb7566d20bc7e89c7b1e0623f12196..05b87f904e72ad363160e0b9bbe8d43dba991d89 100644 (file)
@@ -16,7 +16,7 @@
 <input type="hidden" name="dbdata" value="$dbdata" />
 <input type="hidden" name="pass" value="4" />
 
-{{ inc $field_input with $field=$adminmail }}{{endinc}}
+{{ inc field_input.tpl with $field=$adminmail }}{{endinc}}
 $timezone
 
 <input id="install-submit" type="submit" name="submit" value="$submit" /> 
index 2dd684079d3dbf74be908937478b4dea102c8491..e7fd53ca4f7504e3791aabb3b1e69e95a3788852 100644 (file)
@@ -14,8 +14,8 @@
 <div class="intro-form-end"></div>
 
 <form class="intro-approve-form" action="dfrn_confirm" method="post">
-{{inc $field_checkbox with $field=$hidden }}{{endinc}}
-{{inc $field_checkbox with $field=$activity }}{{endinc}}
+{{inc field_checkbox.tpl with $field=$hidden }}{{endinc}}
+{{inc field_checkbox.tpl with $field=$activity }}{{endinc}}
 <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" >
index 21ed66a66b99adfe1b8153498a0d69483f16f40c..297b36c9ac8cde502d7892c3790f3670d285930d 100644 (file)
@@ -3,17 +3,17 @@
        <input type="hidden" name="auth-params" value="login" />
 
        <div id="login_standard">
-       {{ inc $field_input with $field=$lname }}{{ endinc }}
-       {{ inc $field_password with $field=$lpassword }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$lname }}{{ endinc }}
+       {{ inc field_password.tpl with $field=$lpassword }}{{ endinc }}
        </div>
        
        {{ if $openid }}
                        <div id="login_openid">
-                       {{ inc $field_openid with $field=$lopenid }}{{ endinc }}
+                       {{ inc field_openid.tpl with $field=$lopenid }}{{ endinc }}
                        </div>
        {{ endif }}
 
-       {{ inc $field_checkbox with $field=$lremember }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$lremember }}{{ endinc }}
 
        <div id="login-extra-links">
                {{ if $register }}<a href="register" title="$register.title" id="register-link">$register.desc</a>{{ endif }}
index 1b569428b3e7d27a885d78a91cd69ee00676c26f..396aa46c0a945454e09eb1965b49b1240c0a93c7 100644 (file)
@@ -1,10 +1,10 @@
 
 {{ for $mails as $mail_item }}
-       {{ inc $mail_conv with $mail=$mail_item }}{{endinc}}
+       {{ inc mail_conv.tpl with $mail=$mail_item }}{{endinc}}
 {{ endfor }}
 
 {{ if $canreply }}
-{{ inc $prv_message with $reply=$reply_info }}{{ endinc }}
+{{ inc prv_message.tpl }}{{ endinc }}
 {{ else }}
 $unknown_text
 {{endif }}
index be5976ebad06e7c666071714949bc794beb1bf33..f27f158f5ddc814cafdcc4c111b2cf50d7ed29fc 100644 (file)
@@ -1,7 +1,7 @@
 <h1>$header</h1>
 
 {{ for $contacts as $c }}
-       {{ inc $contact_template with $contact=$c }}{{ endinc }}
+       {{ inc contact_template.tpl with $contact=$c }}{{ endinc }}
 {{ endfor }}
 <div id="contact-edit-end"></div>
 
index d6671be57cac7050b4634e9ac1bcc636b5e95694..1a13b68b90d5467fb1b8fedd8aea507abdc6c3ed 100644 (file)
@@ -1,7 +1,7 @@
 
 <h1>$notif_header</h1>
 
-{{ inc $common_tabs with $tabs=$tabs_data }}{{ endinc }}
+{{ inc common_tabs.tpl }}{{ endinc }}
 
 <div class="notif-network-wrapper">
        $notif_content
index bd86548fcec4174b70354b3366707045671755a2..261ab36432f0dbbcbddd596e7bd7a1432071e388 100644 (file)
@@ -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>
index 2e169c2fc3d95b3154a863a41c7284ccaf01272e..c9022a1c1498b1bdc261f04a1b3d237f2b3bc998 100644 (file)
@@ -1,5 +1,5 @@
-       {{inc $field_radio with $field=$page_normal }}{{endinc}}
-       {{inc $field_radio with $field=$page_community }}{{endinc}}
-       {{inc $field_radio with $field=$page_prvgroup }}{{endinc}}
-       {{inc $field_radio with $field=$page_soapbox }}{{endinc}}
-       {{inc $field_radio with $field=$page_freelove }}{{endinc}}
+       {{inc field_radio.tpl with $field=$page_normal }}{{endinc}}
+       {{inc field_radio.tpl with $field=$page_community }}{{endinc}}
+       {{inc field_radio.tpl with $field=$page_prvgroup }}{{endinc}}
+       {{inc field_radio.tpl with $field=$page_soapbox }}{{endinc}}
+       {{inc field_radio.tpl with $field=$page_freelove }}{{endinc}}
index 1a70b6e59be94372270bc0eab1b7d321a4e54967..7ae35402454184f5785951bbf02dac1c881b749f 100644 (file)
@@ -5,7 +5,7 @@
 
 <div class="photos">
 {{ for $photos as $ph }}
-       {{ inc $photo_top with $photo=$ph }}{{ endinc }}
+       {{ inc photo_top.tpl with $photo=$ph }}{{ endinc }}
 {{ endfor }}
 </div>
 <div class="photos-end"></div>
index e115c706aa9afcd12ada52de375748942c1b0755..394f6afcf815dda20099845cc82ed1a68ff78110 100644 (file)
@@ -10,7 +10,7 @@
 
 {{ if $response.totalResults }}
 {{ for $response.entry as $ent }}
-{{ inc $poco_entry_xml with $entry=$ent }}{{ endinc }}
+{{ inc poco_entry_xml.tpl with $entry=$ent }}{{ endinc }}
 {{ endfor }}
 {{ else }}
 <entry></entry>
index cf6a9f718c8b5e27fc3c47cd0ed608c74a6edaa6..d1e6847951628e784f0a3983b66c5a2ca7c46d99 100644 (file)
@@ -31,7 +31,7 @@
 
        {{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
 
-       {{ inc $diaspora_vcard with $diaspora=$diaspora_info }}{{ endinc }}
+       {{ inc diaspora_vcard.tpl }}{{ endinc }}
        
        <div id="profile-extra-links">
                <ul>
index f3df1d28bf6993bcac8509589295dd02a3dc5c23..ecfef95d6b5a4192557a55984c8ced29da97f6ad 100644 (file)
@@ -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>
index 46e4228ded344d3506b51ceb8efb122ecc567ab3..bebd0c12a85df299645ec07f007a6d0cbb5cd86f 100644 (file)
@@ -7,11 +7,11 @@ $nickname_block
 
 <h3 class="settings-heading">$h_pass</h3>
 
-{{inc $field_password with $field=$password1 }}{{endinc}}
-{{inc $field_password with $field=$password2 }}{{endinc}}
+{{inc field_password.tpl with $field=$password1 }}{{endinc}}
+{{inc field_password.tpl with $field=$password2 }}{{endinc}}
 
 {{ if $oid_enable }}
-{{inc $field_input with $field=$openid }}{{endinc}}
+{{inc field_input.tpl with $field=$openid }}{{endinc}}
 {{ endif }}
 
 <div class="settings-submit-wrapper" >
@@ -21,11 +21,11 @@ $nickname_block
 
 <h3 class="settings-heading">$h_basic</h3>
 
-{{inc $field_input with $field=$username }}{{endinc}}
-{{inc $field_input with $field=$email }}{{endinc}}
-{{inc $field_custom with $field=$timezone }}{{endinc}}
-{{inc $field_input with $field=$defloc }}{{endinc}}
-{{inc $field_checkbox with $field=$allowloc }}{{endinc}}
+{{inc field_input.tpl with $field=$username }}{{endinc}}
+{{inc field_input.tpl with $field=$email }}{{endinc}}
+{{inc field_custom.tpl with $field=$timezone }}{{endinc}}
+{{inc field_input.tpl with $field=$defloc }}{{endinc}}
+{{inc field_checkbox.tpl with $field=$allowloc }}{{endinc}}
 
 
 <div class="settings-submit-wrapper" >
@@ -38,7 +38,7 @@ $nickname_block
 
 <input type="hidden" name="visibility" value="$visibility" />
 
-{{inc $field_input with $field=$maxreq }}{{endinc}}
+{{inc field_input.tpl with $field=$maxreq }}{{endinc}}
 
 $profile_in_dir
 
@@ -57,9 +57,9 @@ $suggestme
 $unkmail
 
 
-{{inc $field_input with $field=$cntunkmail }}{{endinc}}
+{{inc field_input.tpl with $field=$cntunkmail }}{{endinc}}
 
-{{inc $field_input with $field=$expire.days }}{{endinc}}
+{{inc field_input.tpl with $field=$expire.days }}{{endinc}}
 
 
 <div class="field input">
@@ -67,10 +67,10 @@ $unkmail
        <div style="display: none;">
                <div id="advanced-expire-popup" style="width:auto;height:auto;overflow:auto;">
                        <h3>$expire.advanced</h3>
-                       {{ inc $field_yesno with $field=$expire.items }}{{endinc}}
-                       {{ inc $field_yesno with $field=$expire.notes }}{{endinc}}
-                       {{ inc $field_yesno with $field=$expire.starred }}{{endinc}}
-                       {{ inc $field_yesno with $field=$expire.network_only }}{{endinc}}
+                       {{ inc field_yesno.tpl with $field=$expire.items }}{{endinc}}
+                       {{ inc field_yesno.tpl with $field=$expire.notes }}{{endinc}}
+                       {{ inc field_yesno.tpl with $field=$expire.starred }}{{endinc}}
+                       {{ inc field_yesno.tpl with $field=$expire.network_only }}{{endinc}}
                </div>
        </div>
 
@@ -108,22 +108,22 @@ $group_select
 
 <div id="settings-activity-desc">$activity_options</div>
 
-{{inc $field_checkbox with $field=$post_newfriend }}{{endinc}}
-{{inc $field_checkbox with $field=$post_joingroup }}{{endinc}}
-{{inc $field_checkbox with $field=$post_profilechange }}{{endinc}}
+{{inc field_checkbox.tpl with $field=$post_newfriend }}{{endinc}}
+{{inc field_checkbox.tpl with $field=$post_joingroup }}{{endinc}}
+{{inc field_checkbox.tpl with $field=$post_profilechange }}{{endinc}}
 
 
 <div id="settings-notify-desc">$lbl_not</div>
 
 <div class="group">
-{{inc $field_intcheckbox with $field=$notify1 }}{{endinc}}
-{{inc $field_intcheckbox with $field=$notify2 }}{{endinc}}
-{{inc $field_intcheckbox with $field=$notify3 }}{{endinc}}
-{{inc $field_intcheckbox with $field=$notify4 }}{{endinc}}
-{{inc $field_intcheckbox with $field=$notify5 }}{{endinc}}
-{{inc $field_intcheckbox with $field=$notify6 }}{{endinc}}
-{{inc $field_intcheckbox with $field=$notify7 }}{{endinc}}
-{{inc $field_intcheckbox with $field=$notify8 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify1 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify2 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify3 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify4 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify5 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify6 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify7 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify8 }}{{endinc}}
 </div>
 
 </div>
index 0a1c509869539d628390bd54d5a19831f425967b..bd3d60f0f4bc5273f14536fcd20f9a89015cb9eb 100644 (file)
@@ -14,16 +14,16 @@ $settings_connectors
        <div class="settings-block">
        <h3 class="settings-heading">$h_imap</h3>
        <p>$imap_desc</p>
-       {{inc $field_custom with $field=$imap_lastcheck }}{{endinc}}
-       {{inc $field_input with $field=$mail_server }}{{endinc}}
-       {{inc $field_input with $field=$mail_port }}{{endinc}}
-       {{inc $field_select with $field=$mail_ssl }}{{endinc}}
-       {{inc $field_input with $field=$mail_user }}{{endinc}}
-       {{inc $field_password with $field=$mail_pass }}{{endinc}}
-       {{inc $field_input with $field=$mail_replyto }}{{endinc}}
-       {{inc $field_checkbox with $field=$mail_pubmail }}{{endinc}}
-       {{inc $field_select with $field=$mail_action }}{{endinc}}
-       {{inc $field_input with $field=$mail_movetofolder }}{{endinc}}
+       {{inc field_custom.tpl with $field=$imap_lastcheck }}{{endinc}}
+       {{inc field_input.tpl with $field=$mail_server }}{{endinc}}
+       {{inc field_input.tpl with $field=$mail_port }}{{endinc}}
+       {{inc field_select.tpl with $field=$mail_ssl }}{{endinc}}
+       {{inc field_input.tpl with $field=$mail_user }}{{endinc}}
+       {{inc field_password.tpl with $field=$mail_pass }}{{endinc}}
+       {{inc field_input.tpl with $field=$mail_replyto }}{{endinc}}
+       {{inc field_checkbox.tpl with $field=$mail_pubmail }}{{endinc}}
+       {{inc field_select.tpl with $field=$mail_action }}{{endinc}}
+       {{inc field_input.tpl with $field=$mail_movetofolder }}{{endinc}}
 
        <div class="settings-submit-wrapper" >
                <input type="submit" id="imap-submit" name="imap-submit" class="settings-submit" value="$submit" />
index f2c1faef58843b5c703489405e45088786885c10..24fc1102706fe9bc36d2fda10edfcaf840aec6d3 100644 (file)
@@ -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'>
 
-{{inc $field_themeselect with $field=$theme }}{{endinc}}
-{{inc $field_themeselect with $field=$mobile_theme }}{{endinc}}
-{{inc $field_input with $field=$ajaxint }}{{endinc}}
-{{inc $field_input with $field=$itemspage_network }}{{endinc}}
-{{inc $field_checkbox with $field=$nosmile}}{{endinc}}
+{{inc field_themeselect.tpl with $field=$theme }}{{endinc}}
+{{inc field_themeselect.tpl with $field=$mobile_theme }}{{endinc}}
+{{inc field_input.tpl with $field=$ajaxint }}{{endinc}}
+{{inc field_input.tpl with $field=$itemspage_network }}{{endinc}}
+{{inc field_checkbox.tpl with $field=$nosmile}}{{endinc}}
 
 
 <div class="settings-submit-wrapper" >
index 4065d8fc77cb004ba67e448ce96434cd2ca6233d..1b106d4111a82ada261200e322e78658dbc0e8db 100644 (file)
@@ -8,7 +8,7 @@
 <h3 class="settings-heading">$f.0</h3>
 
 {{ for $f.1 as $fcat }}
-       {{ inc $field_yesno with $field=$fcat }}{{endinc}}
+       {{ inc field_yesno.tpl with $field=$fcat }}{{endinc}}
 {{ endfor }}
 {{ endfor }}
 
index 514e4ef252ac4861e5da3aaff6d208929ff6e394..e6f2abdc24b48c7e197fde4652c7f7661cb42002 100644 (file)
@@ -3,11 +3,11 @@
 <form method="POST">
 <input type='hidden' name='form_security_token' value='$form_security_token'>
 
-{{ inc $field_input with $field=$name }}{{ endinc }}
-{{ inc $field_input with $field=$key }}{{ endinc }}
-{{ inc $field_input with $field=$secret }}{{ endinc }}
-{{ inc $field_input with $field=$redirect }}{{ endinc }}
-{{ inc $field_input with $field=$icon }}{{ endinc }}
+{{ inc field_input.tpl with $field=$name }}{{ endinc }}
+{{ inc field_input.tpl with $field=$key }}{{ endinc }}
+{{ inc field_input.tpl with $field=$secret }}{{ endinc }}
+{{ inc field_input.tpl with $field=$redirect }}{{ endinc }}
+{{ inc field_input.tpl with $field=$icon }}{{ endinc }}
 
 <div class="settings-submit-wrapper" >
 <input type="submit" name="submit" class="settings-submit" value="$submit" />
index 4f79515ad2c6c1d54c38c9e6933531964f79010f..e5412429f4e7349a1a68373995164c094e32f210 100644 (file)
@@ -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>
        
index 2e52e99a699532cbf600cac6080c05fdc15a1b32..6260741ed773ad8f96d97c66cd6964bb38813e92 100644 (file)
                <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}}
index 60959eb414be3b5c96bcbf18f8faa278fd857799..79e68a40c81fed01a84cd8b211d89c0961ccbacb 100644 (file)
        <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>
        
index fe92eea6d39727fad01ebee2523e0bcac94c30cb..d3a21814200cc11f4216bf923f02e5d39d1f619f 100644 (file)
@@ -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>
index 48e9328662a0d481422e7179f947ec2cfec16abb..f14d73e9c0571f6ed8980083950a23f9f8a67dbb 100644 (file)
@@ -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>
index d12fdd44fb794033d5ddb5fa6eb9d36377e6ba87..4f65f76a3e999e639a04d42018a4484d6d078c5f 100644 (file)
@@ -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>
index 3c998f792a73b79def8654c6564913d2c8b43dc7..de074fc3c4d7fee6e92e86cae4c3bd62275df647 100644 (file)
@@ -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>
 
index c364bd91e2ccee82c94a92635f6c84529452b257..b7111ce5ca165295fc640425ec33397b670194b8 100644 (file)
@@ -1,4 +1,4 @@
 
  {{if $field.0==select}}
- {{include file="file:{{$field_select}}"}}
+ {{include file="field_select.tpl"}}
  {{/if}}
index c5171ae84645b31503503d98bbfa0a2225b54144..787f7c0cd07653f0d4ce25dc2a98efa5c4226dbd 100644 (file)
@@ -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>
        
index 5444d7f4d80bfcee27c320fd7bfdb773e458dbe5..ae59ab7138695c6f3e03ef1ceda42f20c86990e5 100644 (file)
@@ -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>
index e381ff47b11dda40a1b17596f50aa106576f24c6..424d1c12524acd3168958c42a117f4f4a499636a 100644 (file)
@@ -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}}
index 3d9a107fe25aee7c9978f5992a27f07e3f255993..ef8510ae3b19c7aeb7c8f16f511bd95579190022 100644 (file)
 <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}}" /> 
index 83efa3d7182bd626467f073e82a899a084e96892..dcb2f22420dd16ff8855610026cf5ccd70be9fae 100644 (file)
@@ -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}}" /> 
index abf198158e2ae669dbd3df1122fa37e65e9023e8..6132bfc75b099b708d40b8d876602f3d7c921c78 100644 (file)
@@ -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}}" >
index 6695495c076d5a883da0974e149a8f57e565baa6..331caeb24694ed0354db6b9b8b29123b9de2d270 100644 (file)
@@ -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}}
index 0e6bd13d334df8735e34336280e4583d7aac523d..49f5ed9611763504cec077afba023c29ed8cc4ee 100644 (file)
@@ -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"}}
 {{else}}
 {{$unknown_text}}
 {{/if}}
index 6daeba0cfe467de19e1ae07a046fb6eb65cf67c3..16600b9ceabbe091a5b155dcc8dc74efc616c8eb 100644 (file)
@@ -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>
 
index 82eb2f40a35b3eb302a535c4202ce2476c1f9dad..0289c41d4084ae543bf41a43789594e68c26a479 100644 (file)
@@ -1,7 +1,7 @@
 
 <h1>{{$notif_header}}</h1>
 
-{{include file="file:{{$common_tabs}}" tabs=$tabs_data}}
+{{include file="common_tabs.tpl"}}
 
 <div class="notif-network-wrapper">
        {{$notif_content}}
index 14f37162d4cca998e39f2307ae43551aeadaf698..856955424b853e8bca22c91cca483773a74debce 100644 (file)
@@ -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>
index 6c4c1cf93902cefdd81c8a87bb40b00201ae443c..d5fcd9968f3bab040bc1ce2ee7c105e0d93d4bbe 100644 (file)
@@ -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}}
index b5faa2c4e6fe56d130b0e4afcb7fd48feff7b228..329562515963b0a2784454be4b17f2bbc37f14fd 100644 (file)
@@ -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>
index 67137c25365dc7073e535e1fa4d53db28c76f9be..cd54b5446cbbf80823f512e27fd20a534ff2cc0d 100644 (file)
@@ -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>
index 3b5f507a95bf3043f9d42ed9b5b94d6990192c09..86f25fe057b7b966ff10ccd9411cba28a84fdf89 100644 (file)
@@ -31,7 +31,7 @@
 
        {{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}
 
-       {{include file="file:{{$diaspora_vcard}}" diaspora=$diaspora_info}}
+       {{include file="diaspora_vcard.tpl"}}
        
        <div id="profile-extra-links">
                <ul>
index 06f253bec57498e0674980d657aab9d8df9efac1..66007f803f34491a4231382e82216a5c8adeab32 100644 (file)
@@ -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>
index d4e8fb6ac63489b26a9f29e357fd84733238f132..9fdd5437b0525371548368f5a6eae0ebf7d05a9f 100644 (file)
@@ -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" >
 
 <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">
        <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>
 
 
 <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>
index 3b025a63d9ef71f6909e25dcb5dc1045aabd0972..4d33393b13f2bfb7c10b9707da84972cfe4e2d59 100644 (file)
        <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}}" />
index 030523939d78fb24d053cae3ff26785f5c750787..f8b4c51306a2317ba5c8de3bddbe0e499ab2580a 100644 (file)
@@ -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" >
index 9db99b5ec83989ca049fc2fd9bf12446c5264c18..5c0333df26e0cf15bee8cbf63738782db43a7103 100644 (file)
@@ -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}}
 
index c991f97ba72db0ad35da2ecc206cd7609dc8a42d..bf805363c558b4ddeb04a707dc81509f63587ae3 100644 (file)
@@ -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}}" />
index b4f6afc99479d63bc3e182127bcf1827e50a4c06..02460b6ad95d087a711ea824c8d041c7f9a356a3 100644 (file)
@@ -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>
index f9ec290ab97a48a55e3d47a508524875fdfc82b1..cb0290ed47ea61d9cbb68e0d87cc8ff6d0faa887 100644 (file)
@@ -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
index 4a3b0efaf6b62d7d4f53eb5cb1281978d8fe174f..19a4eec805433d44a0ee97687361f51ca4ad256f 100644 (file)
@@ -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>
index 86da6f516a2ee4950d9da1db2265ae3d89922300..c1fed91babe2b423e9330e9ba62c0f02e4b9cfc1 100644 (file)
                                                {{/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>
index cab2ba83aeec6c93ca57ca623f32b07dd311db2d..656336496c0b6be7248d3ad0f0ce8efd1bd36f61 100644 (file)
@@ -14,7 +14,7 @@
 <div class="intro-form-end"></div>
 
 <form class="intro-approve-form" action="$request" method="get">
-{{inc $field_checkbox with $field=$hidden }}{{endinc}}
+{{inc field_checkbox.tpl with $field=$hidden }}{{endinc}}
 <input class="intro-submit-approve" type="submit" name="submit" value="$approve" />
 </form>
 </div>
index a81b05b8fed1971add5f8ab15504309e77f1bf98..88a41be3a16e7f71a8bf910a544aa28e149bfe5e 100644 (file)
@@ -75,15 +75,8 @@ function cleanzero_form(&$a, $color,$font_size,$resize,$theme_width){
                "wide"=>"wide",
                );
 
-//     $t = file_get_contents( dirname(__file__). "/theme_settings.tpl" );
        $t = get_markup_template("theme_settings.tpl" );
-
-       $includes = array(
-               '$field_select' => 'field_select.tpl',
-       );
-       $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-       $o .= replace_macros($t, $includes + array(
+       $o .= replace_macros($t, array(
                '$submit' => t('Submit'),
                '$baseurl' => $a->get_baseurl(),
                '$title' => t("Theme settings"),
index 5df8e28bea2e7b81ff5f010199c80a566a69c087..dabda90fd9d266afeda72d8d7bd9ce880d1981c4 100644 (file)
@@ -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">
index c7c0b2d640bd47f778750e12c72ecfdf110bac51..356a1b71cbe3098cded11d80fb4a16a8ab5b737a 100644 (file)
@@ -8,7 +8,7 @@
 $a->theme_info = array(
   'extends' => 'duepuntozero',
 );
-$a->theme['template_engine'] = 'smarty3';
+set_template_engine($a, 'smarty3');
 
 function cleanzero_init(&$a) {
 $a->page['htmlhead'] .= <<< EOT
index b2dbf9fec77fc8ed22057da46efd08ff3439032f..bfe18af27d9e3445fec331440f6d3ed84a71600b 100644 (file)
@@ -1,7 +1,7 @@
-{{inc $field_select with $field=$color}}{{endinc}}
-{{inc $field_select with $field=$font_size}}{{endinc}}
-{{inc $field_select with $field=$resize}}{{endinc}}
-{{inc $field_select with $field=$theme_width}}{{endinc}}
+{{inc field_select.tpl with $field=$color}}{{endinc}}
+{{inc field_select.tpl with $field=$font_size}}{{endinc}}
+{{inc field_select.tpl with $field=$resize}}{{endinc}}
+{{inc field_select.tpl with $field=$theme_width}}{{endinc}}
 
 
 <div class="settings-submit-wrapper">
index a85d535a72ad472e7d256753a22025e8cdbf551e..4e5fd0d0e9b7745a86b480ac73ba61220d1d7250 100644 (file)
@@ -11,7 +11,7 @@
 $a->theme_info = array(
   'extends' => 'duepuntozero',
 );
-$a->theme['template_engine'] = 'smarty3';
+set_template_engine($a, 'smarty3');
 
 $a->page['htmlhead'] .= <<< EOT
 <script>
index 52aa0a927dcc45ac73ce4b13493c441b3a919f05..ce28ebf18938180190b935c98322fa8726210a95 100644 (file)
@@ -11,7 +11,7 @@
 $a->theme_info = array(
   'extends' => 'duepuntozero',
 );
-$a->theme['template_engine'] = 'smarty3';
+set_template_engine($a, 'smarty3');
 
 $a->page['htmlhead'] .= <<< EOT
 <script>
index 6a2266dd8067484a6e0b414987a4dd1f17fed0b2..ecd14da772ed017523d2bfe1df054545ae782298 100644 (file)
@@ -10,7 +10,7 @@
 $a->theme_info = array(
   'extends' => 'testbubble',
 );
-$a->theme['template_engine'] = 'smarty3';
+set_template_engine($a, 'smarty3');
 
 
 $a->page['htmlhead'] .= <<< EOT
index 9fa248ceacba6d36a928e30013c1531b8f9781ff..ceafdf59569571a7cbf4354b3b34bffaf5cdc0d1 100644 (file)
@@ -11,7 +11,7 @@
 $a->theme_info = array(
   'extends' => 'duepuntozero',
 );
-$a->theme['template_engine'] = 'smarty3';
+set_template_engine($a, 'smarty3');
 
 function darkzero_init(&$a) {
 $a->page['htmlhead'] .= <<< EOT
index e140bff3000c6b2f340a7a5cde9925126df855fe..dda674f75b77493e137c2b365aa05370a77a3c13 100644 (file)
@@ -1,7 +1,7 @@
 
 <div id="twittersettings" style="display:none">
 <form id="twittersettingsform" action="network" method="post" >
-{{inc $field_input with $field=$TSearchTerm}}{{endinc}}
+{{inc field_input.tpl with $field=$TSearchTerm}}{{endinc}}
 <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>
-{{inc $field_input with $field=$ELZoom}}{{endinc}}
-{{inc $field_input with $field=$ELPosX}}{{endinc}}
-{{inc $field_input with $field=$ELPosY}}{{endinc}}
+{{inc field_input.tpl with $field=$ELZoom}}{{endinc}}
+{{inc field_input.tpl with $field=$ELPosX}}{{endinc}}
+{{inc field_input.tpl with $field=$ELPosY}}{{endinc}}
 <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>
-{{inc $field_select with $field=$close_pages}}{{endinc}}
-{{inc $field_select with $field=$close_profiles}}{{endinc}}
-{{inc $field_select with $field=$close_helpers}}{{endinc}}
-{{inc $field_select with $field=$close_services}}{{endinc}}
-{{inc $field_select with $field=$close_friends}}{{endinc}}
-{{inc $field_select with $field=$close_lastusers}}{{endinc}}
-{{inc $field_select with $field=$close_lastphotos}}{{endinc}}
-{{inc $field_select with $field=$close_lastlikes}}{{endinc}}
-{{inc $field_select with $field=$close_twitter}}{{endinc}}
-{{inc $field_select with $field=$close_mapquery}}{{endinc}}
+{{inc field_select.tpl with $field=$close_pages}}{{endinc}}
+{{inc field_select.tpl with $field=$close_profiles}}{{endinc}}
+{{inc field_select.tpl with $field=$close_helpers}}{{endinc}}
+{{inc field_select.tpl with $field=$close_services}}{{endinc}}
+{{inc field_select.tpl with $field=$close_friends}}{{endinc}}
+{{inc field_select.tpl with $field=$close_lastusers}}{{endinc}}
+{{inc field_select.tpl with $field=$close_lastphotos}}{{endinc}}
+{{inc field_select.tpl with $field=$close_lastlikes}}{{endinc}}
+{{inc field_select.tpl with $field=$close_twitter}}{{endinc}}
+{{inc field_select.tpl with $field=$close_mapquery}}{{endinc}}
 <div class="settings-submit-wrapper">
 <input id="boxsub" type="submit" value="$sub" class="settings-submit" name="diabook-settings-box-sub"></input>
 </div>
index 5ea024ec5e7297c18a733af244d65fd4d0d1ce24..e0f579180103770e4308eccfab443841f77263f8 100644 (file)
@@ -147,16 +147,8 @@ function diabook_form(&$a, $font_size, $line_height, $resolution, $color, $TSear
 
 
 
-//     $t = file_get_contents( dirname(__file__). "/theme_settings.tpl" );
        $t = get_markup_template("theme_settings.tpl" );
-
-       $includes = array(
-               '$field_select' => 'field_select.tpl',
-               '$field_input' => 'field_input.tpl',
-       );
-       $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-       $o .= replace_macros($t, $includes + array(
+       $o .= replace_macros($t, array(
                '$submit' => t('Submit'),
                '$baseurl' => $a->get_baseurl(),
                '$title' => t("Theme settings"),
index dc9c51682a1211fef483b4b05b13ed33522bb90a..efa7c2d6dde35776ae6d4661e64a4e8c1e383fa3 100644 (file)
@@ -3,13 +3,13 @@
        <input type="hidden" name="auth-params" value="login" />
 
        <div id="login_standard">
-       {{ inc $field_input with $field=$lname }}{{ endinc }}
-       {{ inc $field_password with $field=$lpassword }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$lname }}{{ endinc }}
+       {{ inc field_password.tpl with $field=$lpassword }}{{ endinc }}
        </div>
        
        {{ if $openid }}
                        <div id="login_openid">
-                       {{ inc $field_openid with $field=$lopenid }}{{ endinc }}
+                       {{ inc field_openid.tpl with $field=$lopenid }}{{ endinc }}
                        </div>
        {{ endif }}
        
index fa69f48a0098d274eba362fd0fbee27e4950edae..5d16bd32bbf18620cb8d88cfcdaa27ba95268437 100644 (file)
@@ -5,8 +5,8 @@
 
 {{ for $mails as $mail_item }}
        <div id="tread-wrapper-$mail_item.id" class="tread-wrapper">
-               {{ inc $mail_conv with $mail=$mail_item }}{{endinc}}
+               {{ inc mail_conv.tpl with $mail=$mail_item }}{{endinc}}
        </div>
 {{ endfor }}
 
-{{ inc $prv_message with $reply=$reply_info }}{{ endinc }}
+{{ inc prv_message.tpl }}{{ endinc }}
index 7afe59f7e9072720d40c7bc5ffdc9b37f156939c..b982a20693ba33f3005d5de8a494dab37960dd0c 100644 (file)
@@ -48,7 +48,7 @@
 
        {{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
 
-       {{ inc $diaspora_vcard with $diaspora=$diaspora_info }}{{ endinc }}
+       {{ inc diaspora_vcard.tpl }}{{ endinc }}
        
        <div id="profile-extra-links">
                <ul>
index 8ccab1a1ea22cb59eabd414311401ba00d9ac343..7a7413e9d893de4fa8803518f8e7c32ec9167ba0 100644 (file)
@@ -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>
index 864dc55c40152551881ac2e50f4cdf52b5f1cfe0..7895fd731d23b34955841f3dfa178b6002bdbe49 100644 (file)
@@ -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>
index 330e379ad9de888e2b331696e3ee3160e0f40e74..a6e8e9dec6a7cc79cbdce942c35fe6da08e34042 100644 (file)
@@ -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}}
        
index 3400227923db80a5d5a0b256ee96be7c0922966a..7a96cbf361d45692656d25c05face85374692358 100644 (file)
@@ -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"}}
index a8b0eba37407c3985398bb62666fdfeafcdefd37..e42636734ae0d14425c62eea829f3981c41b90db 100644 (file)
@@ -48,7 +48,7 @@
 
        {{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}
 
-       {{include file="file:{{$diaspora_vcard}}" diaspora=$diaspora_info}}
+       {{include file="diaspora_vcard.tpl"}}
        
        <div id="profile-extra-links">
                <ul>
index 8ac9a4abfe97dd2f149b4be6c8f1e2c5955fb838..594411eb669522fa527c99ddd5c0dadcdee0a9f6 100644 (file)
@@ -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>
index a9bc0422c301dc1bf0980d2534ebd127078aa4a1..fe4340a29f2ae33c52b3b2abcbe2cc4d3cd97066 100644 (file)
@@ -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" />
index dbfe5a8e8c7884afdce478a467831a8231a3cc1d..6a1109118412105a0330980d384c27dd35606a40 100644 (file)
@@ -8,7 +8,7 @@
  */
 
 $a = get_app();
-$a->theme['template_engine'] = 'smarty3';
+set_template_engine($a, 'smarty3');
 
 function get_diabook_config($key, $default = false) {
        if (local_user()) {
@@ -656,21 +656,16 @@ if ($color=="dark") $color_path = "/diabook-dark/";
                set_pconfig(local_user(), 'diabook', 'close_lastlikes', $_POST['diabook_close_lastlikes']);
                }
        }
-   $close = t('Settings');
-   $aside['$close'] = $close;
-   //get_baseurl
-   $url = $a->get_baseurl($ssl_state);
-   $aside['$url'] = $url;
-       //print right_aside
-       $tpl = get_markup_template('communityhome.tpl');
+       $close = t('Settings');
+       $aside['$close'] = $close;
 
-       $includes = array(
-               '$field_select' => 'field_select.tpl',
-               '$field_input' => 'field_input.tpl',
-       );
-       $includes = set_template_includes($a->theme['template_engine'], $includes);
+       //get_baseurl
+       $url = $a->get_baseurl($ssl_state);
+       $aside['$url'] = $url;
 
-       $a->page['right_aside'] = replace_macros($tpl, $includes + $aside);
+       //print right_aside
+       $tpl = get_markup_template('communityhome.tpl');
+       $a->page['right_aside'] = replace_macros($tpl, $aside);
 
  }
 
index 4bf2abb9b1f1352c20436a5b4fadb10bf4dea68e..ad024dfe998f033384abf3234db9768f800eae88 100644 (file)
@@ -1,33 +1,33 @@
-{{inc $field_select with $field=$color}}{{endinc}}
+{{inc field_select.tpl with $field=$color}}{{endinc}}
 
-{{inc $field_select with $field=$font_size}}{{endinc}}
+{{inc field_select.tpl with $field=$font_size}}{{endinc}}
 
-{{inc $field_select with $field=$line_height}}{{endinc}}
+{{inc field_select.tpl with $field=$line_height}}{{endinc}}
 
-{{inc $field_select with $field=$resolution}}{{endinc}}
+{{inc field_select.tpl with $field=$resolution}}{{endinc}}
 
 <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>
-{{inc $field_select with $field=$close_pages}}{{endinc}}
-{{inc $field_select with $field=$close_profiles}}{{endinc}}
-{{inc $field_select with $field=$close_helpers}}{{endinc}}
-{{inc $field_select with $field=$close_services}}{{endinc}}
-{{inc $field_select with $field=$close_friends}}{{endinc}}
-{{inc $field_select with $field=$close_lastusers}}{{endinc}}
-{{inc $field_select with $field=$close_lastphotos}}{{endinc}}
-{{inc $field_select with $field=$close_lastlikes}}{{endinc}}
-{{inc $field_select with $field=$close_twitter}}{{endinc}}
-{{inc $field_input with $field=$TSearchTerm}}{{endinc}}
-{{inc $field_select with $field=$close_mapquery}}{{endinc}}
-
-{{inc $field_input with $field=$ELPosX}}{{endinc}}
-
-{{inc $field_input with $field=$ELPosY}}{{endinc}}
-
-{{inc $field_input with $field=$ELZoom}}{{endinc}}
+{{inc field_select.tpl with $field=$close_pages}}{{endinc}}
+{{inc field_select.tpl with $field=$close_profiles}}{{endinc}}
+{{inc field_select.tpl with $field=$close_helpers}}{{endinc}}
+{{inc field_select.tpl with $field=$close_services}}{{endinc}}
+{{inc field_select.tpl with $field=$close_friends}}{{endinc}}
+{{inc field_select.tpl with $field=$close_lastusers}}{{endinc}}
+{{inc field_select.tpl with $field=$close_lastphotos}}{{endinc}}
+{{inc field_select.tpl with $field=$close_lastlikes}}{{endinc}}
+{{inc field_select.tpl with $field=$close_twitter}}{{endinc}}
+{{inc field_input.tpl with $field=$TSearchTerm}}{{endinc}}
+{{inc field_select.tpl with $field=$close_mapquery}}{{endinc}}
+
+{{inc field_input.tpl with $field=$ELPosX}}{{endinc}}
+
+{{inc field_input.tpl with $field=$ELPosY}}{{endinc}}
+
+{{inc field_input.tpl with $field=$ELZoom}}{{endinc}}
 
 <div class="settings-submit-wrapper">
        <input type="submit" value="$submit" class="settings-submit" name="diabook-settings-submit" />
index f2fe11b3d2932331351059c86e235ad2abbd83b0..628d5eefa0169e3ee868d6e621a4f953189d99e7 100644 (file)
@@ -65,15 +65,8 @@ function dispy_form(&$a, $font_size, $line_height, $colour) {
                'dark' => 'dark',                                               
        );
 
-       //$t = file_get_contents( dirname(__file__). "/theme_settings.tpl" );
        $t = get_markup_template("theme_settings.tpl" );
-
-       $includes = array(
-               '$field_select' => 'field_select.tpl',
-       );
-       $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-       $o .= replace_macros($t, $includes + array(
+       $o .= replace_macros($t, array(
                '$submit' => t('Submit'),
                '$baseurl' => $a->get_baseurl(),
                '$title' => t("Theme settings"),
index bae9db41ee7bcbc2b450e6c27aa3bfc37c8206d6..21d27f75ee7c743bc39099c2a8a50c44cd3914ab 100644 (file)
@@ -13,7 +13,7 @@ $a->theme_info = array(
     'family' => 'dispy',
     'name' => 'dark',
 );
-$a->theme['template_engine'] = 'smarty3';
+set_template_engine($a, 'smarty3');
 
 function dispy_dark_init(&$a) {
     /** @purpose set some theme defaults
index 806f30624d4147e26331236330aab35199ebfcb8..f8753ec1aa365d312cb08facbb2afa93c89babd7 100644 (file)
@@ -13,7 +13,7 @@ $a->theme_info = array(
     'family' => 'dispy',
        'name' => 'light',
 );
-$a->theme['template_engine'] = 'smarty3';
+set_template_engine($a, 'smarty3');
 
 function dispy_light_init(&$a) {
 
index ac19ad935b8f74acf448a71c9d34788535a480e1..cf0054a675ee85a5aded3174318e66f4dcb867cc 100644 (file)
@@ -67,7 +67,7 @@
     target="external-link">$profile.homepage</a></span>
     </div>{{ endif }}
 
-       {{ inc $diaspora_vcard with $diaspora=$diaspora_info }}{{ endinc }}
+       {{ inc diaspora_vcard.tpl }}{{ endinc }}
        
        <div id="profile-extra-links">
                <ul>
index 1334183ab31002c2f5b7a141c27a57eda118ada0..3a2cf73eeafb424dc51c9c7be6e279bde2d09cc5 100644 (file)
@@ -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"}}
        
        <div id="profile-extra-links">
                <ul>
index 9f418b61123a15abe7d45c2bdf9c63c7caedfb2d..b0de88e34a15a7ccc70d3e864eceb871d22998c9 100644 (file)
@@ -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}}
 
index 71e4e62e19a14d93dfa0ffcf8cc8e861f866f829..a1de5498e6ea68e3fd3d1c244a9c6929ff878ce2 100644 (file)
@@ -22,7 +22,7 @@ $a->theme_info = array(
     'family' => 'dispy',
        'version' => '1.2.2'
 );
-$a->theme['template_engine'] = 'smarty3';
+set_template_engine($a, 'smarty3');
 
 function dispy_init(&$a) {
 
@@ -184,7 +184,7 @@ function dispy_community_info() {
        $url = $a->get_baseurl($ssl_state);
        $aside['$url'] = $url;
 
-       $tpl = file_get_contents(dirname(__file__) . '/communityhome.tpl');
+       $tpl = get_markup_template('communityhome.tpl');
        return $a->page['aside_bottom'] = replace_macros($tpl, $aside);
 }
 
@@ -195,7 +195,7 @@ if(! function_exists('_js_in_foot')) {
                $a = get_app();
                $baseurl = $a->get_baseurl($ssl_state);
                $bottom['$baseurl'] = $baseurl;
-               $tpl = file_get_contents(dirname(__file__) . '/bottom.tpl');
+               $tpl = get_markup_template('bottom.tpl');
 
                return $a->page['bottom'] = replace_macros($tpl, $bottom);
        }
index 128b287e7aef1e5408692ca3d0ff34a9cfa1608e..ae70b8c82b790d8fd68b058cf7d47ca29f3a8613 100644 (file)
@@ -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 }}
 
index c36f0d54a8054e0bcd74fe3a522b55eeca024ae3..bcb5baeeb5935607d8033e8b8dcb9ae1baeaaea8 100644 (file)
@@ -31,7 +31,7 @@
 
        {{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
 
-       {{ inc $diaspora_vcard with $diaspora=$diaspora_info }}{{ endinc }}
+       {{ inc diaspora_vcard.tpl }}{{ endinc }}
 
        <div id="profile-vcard-break"></div>    
        <div id="profile-extra-links">
index 5ef411c4aaf4c13482fef730786319d667e0ddf5..3f0bd937f4b0a80795d7b052588fd88975dd39ff 100644 (file)
@@ -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>
index 993626df59c94fa896cee53c73e427296a7f03b8..b7300329c5d6972993e21f4ed848933f258b3282 100644 (file)
@@ -31,7 +31,7 @@
 
        {{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}
 
-       {{include file="file:{{$diaspora_vcard}}" diaspora=$diaspora_info}}
+       {{include file="diaspora_vcard.tpl"}}
 
        <div id="profile-vcard-break"></div>    
        <div id="profile-extra-links">
index 2711f55cceec90abe8d43027c167c5d12be27e8b..f8cbd01cc75072efeb3185e708ddbd834f1f9ead 100644 (file)
@@ -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>
index 6c9048ad7e3257a517e383e66c33aac30393edb1..bf5a4111fd396d46937c77ab27386c580cfac28e 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 $a->theme_info = array();
-$a->theme['template_engine'] = 'smarty3';
+set_template_engine($a, 'smarty3');
 
 function duepuntozero_init(&$a) {
 $a->page['htmlhead'] .= <<< EOT
index b8e52e5f6bd0361aab8f5fc410c03c27fe370d9d..154f22363ce6118ce3c80c104a449d4024b503d1 100644 (file)
@@ -31,7 +31,7 @@
 
        {{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
 
-       {{ inc $diaspora_vcard with $diaspora=$diaspora_info }}{{ endinc }}
+       {{ inc diaspora_vcard.tpl }}{{ endinc }}
        
        <div id="profile-extra-links">
                <ul>
index 88d380b34738f76537344f6fa974188a996d4e8b..b7ba41918e024cfefe4012199a45c31da9c1d36d 100644 (file)
@@ -31,7 +31,7 @@
 
        {{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}
 
-       {{include file="file:{{$diaspora_vcard}}" diaspora=$diaspora_info}}
+       {{include file="diaspora_vcard.tpl"}}
        
        <div id="profile-extra-links">
                <ul>
index eeb484194809d8a20bde9e688cafd4adfa14bf71..ec1ab1c6712807b99e3cd097eb8b7db2b193047d 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 $a->theme_info = array();
-$a->theme['template_engine'] = 'smarty3';
+set_template_engine($a, 'smarty3');
 
 $a->page['htmlhead'] .= <<< EOT
 <script>
index 9fd18e40753564a82c18a906924c699a8f0425f2..087de4f7dbca41328d27d5e91872b0730e657309 100644 (file)
@@ -5,55 +5,55 @@
        <form action="$baseurl/admin/site" method="post">
     <input type='hidden' name='form_security_token' value='$form_security_token'>
 
-       {{ inc $field_input with $field=$sitename }}{{ endinc }}
-       {{ inc $field_textarea with $field=$banner }}{{ endinc }}
-       {{ inc $field_select with $field=$language }}{{ endinc }}
-       {{ inc $field_select with $field=$theme }}{{ endinc }}
-       {{ inc $field_select with $field=$theme_mobile }}{{ endinc }}
-       {{ inc $field_select with $field=$ssl_policy }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$sitename }}{{ endinc }}
+       {{ inc field_textarea.tpl with $field=$banner }}{{ endinc }}
+       {{ inc field_select.tpl with $field=$language }}{{ endinc }}
+       {{ inc field_select.tpl with $field=$theme }}{{ endinc }}
+       {{ inc field_select.tpl with $field=$theme_mobile }}{{ endinc }}
+       {{ inc field_select.tpl with $field=$ssl_policy }}{{ endinc }}
        
        <div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
        
        <h3>$registration</h3>
-       {{ inc $field_input with $field=$register_text }}{{ endinc }}
-       {{ inc $field_select with $field=$register_policy }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$register_text }}{{ endinc }}
+       {{ inc field_select.tpl with $field=$register_policy }}{{ endinc }}
        
-       {{ inc $field_checkbox with $field=$no_multi_reg }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$no_openid }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$no_regfullname }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$no_multi_reg }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$no_openid }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$no_regfullname }}{{ endinc }}
        
        <div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
 
        <h3>$upload</h3>
-       {{ inc $field_input with $field=$maximagesize }}{{ endinc }}
-       {{ inc $field_input with $field=$maximagelength }}{{ endinc }}
-       {{ inc $field_input with $field=$jpegimagequality }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$maximagesize }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$maximagelength }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$jpegimagequality }}{{ endinc }}
        
        <h3>$corporate</h3>
-       {{ inc $field_input with $field=$allowed_sites }}{{ endinc }}
-       {{ inc $field_input with $field=$allowed_email }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$block_public }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$force_publish }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$no_community_page }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$ostatus_disabled }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$diaspora_enabled }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$dfrn_only }}{{ endinc }}
-       {{ inc $field_input with $field=$global_directory }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$thread_allow }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$newuser_private }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$allowed_sites }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$allowed_email }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$block_public }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$force_publish }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$no_community_page }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$ostatus_disabled }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$diaspora_enabled }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$dfrn_only }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$global_directory }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$thread_allow }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$newuser_private }}{{ endinc }}
        
        <div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
        
        <h3>$advanced</h3>
-       {{ inc $field_checkbox with $field=$no_utf }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$verifyssl }}{{ endinc }}
-       {{ inc $field_input with $field=$proxy }}{{ endinc }}
-       {{ inc $field_input with $field=$proxyuser }}{{ endinc }}
-       {{ inc $field_input with $field=$timeout }}{{ endinc }}
-       {{ inc $field_input with $field=$delivery_interval }}{{ endinc }}
-       {{ inc $field_input with $field=$poll_interval }}{{ endinc }}
-       {{ inc $field_input with $field=$maxloadavg }}{{ endinc }}
-       {{ inc $field_input with $field=$abandon_days }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$no_utf }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$verifyssl }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$proxy }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$proxyuser }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$timeout }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$delivery_interval }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$poll_interval }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$maxloadavg }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$abandon_days }}{{ endinc }}
        
        <div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
        
index b148fb4a6965b245426297756ee61a2c97252ebe..c7e3ca899dfbdc37fe4b3d84e2852eb071a55077 100644 (file)
@@ -16,7 +16,7 @@ $tabs
 
 <div id="contacts-display-wrapper">
 {{ for $contacts as $c }}
-       {{ inc $contact_template with $contact=$c }}{{ endinc }}
+       {{ inc contact_template.tpl with $contact=$c }}{{ endinc }}
 {{ endfor }}
 </div>
 <div id="contact-edit-end"></div>
index 2d1fd856b207d681805a1ffc91951a60f0ff4c51..05ae364c00d497f747bb10406d3704f035a7bdf3 100644 (file)
@@ -4,13 +4,13 @@
        <input type="hidden" name="auth-params" value="login" />
 
        <div id="login_standard">
-       {{ inc $field_input with $field=$lname }}{{ endinc }}
-       {{ inc $field_password with $field=$lpassword }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$lname }}{{ endinc }}
+       {{ inc field_password.tpl with $field=$lpassword }}{{ endinc }}
        </div>
        
        {{ if $openid }}
                        <div id="login_openid">
-                       {{ inc $field_openid with $field=$lopenid }}{{ endinc }}
+                       {{ inc field_openid.tpl with $field=$lopenid }}{{ endinc }}
                        </div>
        {{ endif }}
 
@@ -21,7 +21,7 @@
        </div>-->
 
        <br />
-       {{ inc $field_checkbox with $field=$lremember }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$lremember }}{{ endinc }}
 
        <div id="login-submit-wrapper" >
                <input type="submit" name="submit" id="login-submit-button" value="$login" />
index c36f0d54a8054e0bcd74fe3a522b55eeca024ae3..bcb5baeeb5935607d8033e8b8dcb9ae1baeaaea8 100644 (file)
@@ -31,7 +31,7 @@
 
        {{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
 
-       {{ inc $diaspora_vcard with $diaspora=$diaspora_info }}{{ endinc }}
+       {{ inc diaspora_vcard.tpl }}{{ endinc }}
 
        <div id="profile-vcard-break"></div>    
        <div id="profile-extra-links">
index 840ca3221b8cb1348a4f5b136a9d8a4088a5b363..27b2f395077a80adb335e352d926780802d9dc7f 100644 (file)
@@ -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>
index f82d672cdf84c30495fa731617064ea92115f333..5a40b96bca5c114a1a5fdc4454990bd6b7ca7ab8 100644 (file)
@@ -7,11 +7,11 @@ $nickname_block
 
 <h3 class="settings-heading">$h_pass</h3>
 
-{{inc $field_password with $field=$password1 }}{{endinc}}
-{{inc $field_password with $field=$password2 }}{{endinc}}
+{{inc field_password.tpl with $field=$password1 }}{{endinc}}
+{{inc field_password.tpl with $field=$password2 }}{{endinc}}
 
 {{ if $oid_enable }}
-{{inc $field_input with $field=$openid }}{{endinc}}
+{{inc field_input.tpl with $field=$openid }}{{endinc}}
 {{ endif }}
 
 <div class="settings-submit-wrapper" >
@@ -21,11 +21,11 @@ $nickname_block
 
 <h3 class="settings-heading">$h_basic</h3>
 
-{{inc $field_input with $field=$username }}{{endinc}}
-{{inc $field_input with $field=$email }}{{endinc}}
-{{inc $field_custom with $field=$timezone }}{{endinc}}
-{{inc $field_input with $field=$defloc }}{{endinc}}
-{{inc $field_checkbox with $field=$allowloc }}{{endinc}}
+{{inc field_input.tpl with $field=$username }}{{endinc}}
+{{inc field_input.tpl with $field=$email }}{{endinc}}
+{{inc field_custom.tpl with $field=$timezone }}{{endinc}}
+{{inc field_input.tpl with $field=$defloc }}{{endinc}}
+{{inc field_checkbox.tpl with $field=$allowloc }}{{endinc}}
 
 
 <div class="settings-submit-wrapper" >
@@ -38,7 +38,7 @@ $nickname_block
 
 <input type="hidden" name="visibility" value="$visibility" />
 
-{{inc $field_input with $field=$maxreq }}{{endinc}}
+{{inc field_input.tpl with $field=$maxreq }}{{endinc}}
 
 $profile_in_dir
 
@@ -57,9 +57,9 @@ $suggestme
 $unkmail
 
 
-{{inc $field_input with $field=$cntunkmail }}{{endinc}}
+{{inc field_input.tpl with $field=$cntunkmail }}{{endinc}}
 
-{{inc $field_input with $field=$expire.days }}{{endinc}}
+{{inc field_input.tpl with $field=$expire.days }}{{endinc}}
 
 
 <div class="field input">
@@ -67,10 +67,10 @@ $unkmail
        <div style="display: none;">
                <div id="advanced-expire-popup" style="width:auto;height:auto;overflow:auto;">
                        <h3>$expire.advanced</h3>
-                       {{ inc $field_yesno with $field=$expire.items }}{{endinc}}
-                       {{ inc $field_yesno with $field=$expire.notes }}{{endinc}}
-                       {{ inc $field_yesno with $field=$expire.starred }}{{endinc}}
-                       {{ inc $field_yesno with $field=$expire.network_only }}{{endinc}}
+                       {{ inc field_yesno.tpl with $field=$expire.items }}{{endinc}}
+                       {{ inc field_yesno.tpl with $field=$expire.notes }}{{endinc}}
+                       {{ inc field_yesno.tpl with $field=$expire.starred }}{{endinc}}
+                       {{ inc field_yesno.tpl with $field=$expire.network_only }}{{endinc}}
                </div>
        </div>
 
@@ -108,21 +108,21 @@ $group_select
 
 <div id="settings-activity-desc">$activity_options</div>
 
-{{inc $field_checkbox with $field=$post_newfriend }}{{endinc}}
-{{inc $field_checkbox with $field=$post_joingroup }}{{endinc}}
-{{inc $field_checkbox with $field=$post_profilechange }}{{endinc}}
+{{inc field_checkbox.tpl with $field=$post_newfriend }}{{endinc}}
+{{inc field_checkbox.tpl with $field=$post_joingroup }}{{endinc}}
+{{inc field_checkbox.tpl with $field=$post_profilechange }}{{endinc}}
 
 
 <div id="settings-notify-desc">$lbl_not</div>
 
 <div class="group">
-{{inc $field_intcheckbox with $field=$notify1 }}{{endinc}}
-{{inc $field_intcheckbox with $field=$notify2 }}{{endinc}}
-{{inc $field_intcheckbox with $field=$notify3 }}{{endinc}}
-{{inc $field_intcheckbox with $field=$notify4 }}{{endinc}}
-{{inc $field_intcheckbox with $field=$notify5 }}{{endinc}}
-{{inc $field_intcheckbox with $field=$notify6 }}{{endinc}}
-{{inc $field_intcheckbox with $field=$notify7 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify1 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify2 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify3 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify4 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify5 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify6 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify7 }}{{endinc}}
 </div>
 
 </div>
index a62f03934b2f45b9a5b286f0025ef4029c9e6e16..421f7e56c7e8c05ca26175c48d9d8e7d6ce423bf 100644 (file)
@@ -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>
        
index a6cc66a2ba12dfd0c106d4559c258fbdaaa09053..3a2547596885599c07fad440d1247862d5646452 100644 (file)
@@ -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>
index cd57c79fa2b3d8483a0a404e1ed0fbd2c7766758..2f466dddd08829cdfb0f41f0c0ede3dfc42a78c9 100644 (file)
@@ -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}}" />
index 993626df59c94fa896cee53c73e427296a7f03b8..b7300329c5d6972993e21f4ed848933f258b3282 100644 (file)
@@ -31,7 +31,7 @@
 
        {{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}
 
-       {{include file="file:{{$diaspora_vcard}}" diaspora=$diaspora_info}}
+       {{include file="diaspora_vcard.tpl"}}
 
        <div id="profile-vcard-break"></div>    
        <div id="profile-extra-links">
index 2926569c55abe2e6f93f41d994f73800a8531e3c..71667af2da191bd581ff5ef2f9c0eb4fb2f91038 100644 (file)
@@ -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>
index 71c40d938747a268c13f85243d18ecafb3bf35ac..1f6eaa5a9ac8443a1d66629726f3e293230c4a72 100644 (file)
@@ -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" >
 
 <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">
        <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>
 
 
 <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>
index b7706f3bd8563cca620d5bba1f6e3b6b3b3d471b..e1a0aa868e4bccd68a88e1d2039ce65f212054ef 100644 (file)
                                                {{/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>
index 7a2602e602d7b4ea52e58f4de884bfccaf478acf..48dd3ef03dec958eb543679c922167add74780de 100644 (file)
@@ -15,7 +15,7 @@ $a->videowidth = 250;
 $a->videoheight = 200;
 $a->theme_thread_allow = false;
 $a->force_max_items = 10;
-$a->theme['template_engine'] = 'smarty3';
+set_template_engine($a, 'smarty3');
 
 function frost_mobile_content_loaded(&$a) {
 
index a6a8f9615df53f4f3a67c595c4e3a22a7f2b65d6..901ed76c168059622c1ffe648b3d56d98a159d0e 100644 (file)
                                                {{ 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>
index 90f1190e9d480d4db89e5ca14066d4a4fc68a8bb..1ae6aba80d8b6158213f03054dcbef1dbac8d231 100644 (file)
@@ -5,55 +5,66 @@
        <form action="$baseurl/admin/site" method="post">
     <input type='hidden' name='form_security_token' value='$form_security_token'>
 
-       {{ inc $field_input with $field=$sitename }}{{ endinc }}
-       {{ inc $field_textarea with $field=$banner }}{{ endinc }}
-       {{ inc $field_select with $field=$language }}{{ endinc }}
-       {{ inc $field_select with $field=$theme }}{{ endinc }}
-       {{ inc $field_select with $field=$theme_mobile }}{{ endinc }}
-       {{ inc $field_select with $field=$ssl_policy }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$sitename }}{{ endinc }}
+       {{ inc field_textarea.tpl with $field=$banner }}{{ endinc }}
+       {{ inc field_select.tpl with $field=$language }}{{ endinc }}
+       {{ inc field_select.tpl with $field=$theme }}{{ endinc }}
+       {{ inc field_select.tpl with $field=$theme_mobile }}{{ endinc }}
+       {{ inc field_select.tpl with $field=$ssl_policy }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$new_share }}{{ endinc }}
+
        
        <div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
        
        <h3>$registration</h3>
-       {{ inc $field_input with $field=$register_text }}{{ endinc }}
-       {{ inc $field_select with $field=$register_policy }}{{ endinc }}
-       {{ inc $field_input with $field=$daily_registrations }}{{ endinc }}     
-       {{ inc $field_checkbox with $field=$no_multi_reg }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$no_openid }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$no_regfullname }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$register_text }}{{ endinc }}
+       {{ inc field_select.tpl with $field=$register_policy }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$daily_registrations }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$no_multi_reg }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$no_openid }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$no_regfullname }}{{ endinc }}
        
        <div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
 
        <h3>$upload</h3>
-       {{ inc $field_input with $field=$maximagesize }}{{ endinc }}
-       {{ inc $field_input with $field=$maximagelength }}{{ endinc }}
-       {{ inc $field_input with $field=$jpegimagequality }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$maximagesize }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$maximagelength }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$jpegimagequality }}{{ endinc }}
        
        <h3>$corporate</h3>
-       {{ inc $field_input with $field=$allowed_sites }}{{ endinc }}
-       {{ inc $field_input with $field=$allowed_email }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$block_public }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$force_publish }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$no_community_page }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$ostatus_disabled }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$diaspora_enabled }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$dfrn_only }}{{ endinc }}
-       {{ inc $field_input with $field=$global_directory }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$thread_allow }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$newuser_private }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$allowed_sites }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$allowed_email }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$block_public }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$force_publish }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$no_community_page }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$ostatus_disabled }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$diaspora_enabled }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$dfrn_only }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$global_directory }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$thread_allow }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$newuser_private }}{{ endinc }}
        
        <div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
        
        <h3>$advanced</h3>
-       {{ inc $field_checkbox with $field=$no_utf }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$verifyssl }}{{ endinc }}
-       {{ inc $field_input with $field=$proxy }}{{ endinc }}
-       {{ inc $field_input with $field=$proxyuser }}{{ endinc }}
-       {{ inc $field_input with $field=$timeout }}{{ endinc }}
-       {{ inc $field_input with $field=$delivery_interval }}{{ endinc }}
-       {{ inc $field_input with $field=$poll_interval }}{{ endinc }}
-       {{ inc $field_input with $field=$maxloadavg }}{{ endinc }}
-       {{ inc $field_input with $field=$abandon_days }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$no_utf }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$verifyssl }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$proxy }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$proxyuser }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$timeout }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$delivery_interval }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$poll_interval }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$maxloadavg }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$abandon_days }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$lockpath }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$temppath }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$basepath }}{{ endinc }}
+
+       <h3>$performance</h3>
+       {{ inc field_checkbox.tpl with $field=$use_fulltext_engine }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$itemcache }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$itemcache_duration }}{{ endinc }}
+
        
        <div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
        
index b148fb4a6965b245426297756ee61a2c97252ebe..c7e3ca899dfbdc37fe4b3d84e2852eb071a55077 100644 (file)
@@ -16,7 +16,7 @@ $tabs
 
 <div id="contacts-display-wrapper">
 {{ for $contacts as $c }}
-       {{ inc $contact_template with $contact=$c }}{{ endinc }}
+       {{ inc contact_template.tpl with $contact=$c }}{{ endinc }}
 {{ endfor }}
 </div>
 <div id="contact-edit-end"></div>
index e9eafde1e656df0942479fab35cbc1c98a2f7e43..9fe3c04ffeeacee059d8af3869c90564c4b6ba5f 100644 (file)
@@ -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>
        
index 1ba66ba1e6a94ecc9003b4e216038cabf868ebd6..af315ac5e596d317b5007e766c270d04a15ae543 100644 (file)
@@ -4,14 +4,14 @@
        <input type="hidden" name="auth-params" value="login" />
 
        <div id="login_standard">
-       {{ inc $field_input with $field=$lname }}{{ endinc }}
-       {{ inc $field_password with $field=$lpassword }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$lname }}{{ endinc }}
+       {{ inc field_password.tpl with $field=$lpassword }}{{ endinc }}
        </div>
        
        {{ if $openid }}
                        <br /><br />
                        <div id="login_openid">
-                       {{ inc $field_openid with $field=$lopenid }}{{ endinc }}
+                       {{ inc field_openid.tpl with $field=$lopenid }}{{ endinc }}
                        </div>
        {{ endif }}
 
@@ -21,7 +21,7 @@
        </div>-->
 
        <br /><br />
-       {{ inc $field_checkbox with $field=$lremember }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$lremember }}{{ endinc }}
 
        <div id="login-submit-wrapper" >
                <input type="submit" name="submit" id="login-submit-button" value="$login" />
index c36f0d54a8054e0bcd74fe3a522b55eeca024ae3..bcb5baeeb5935607d8033e8b8dcb9ae1baeaaea8 100644 (file)
@@ -31,7 +31,7 @@
 
        {{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
 
-       {{ inc $diaspora_vcard with $diaspora=$diaspora_info }}{{ endinc }}
+       {{ inc diaspora_vcard.tpl }}{{ endinc }}
 
        <div id="profile-vcard-break"></div>    
        <div id="profile-extra-links">
index 171947f8575197fc80fe108938f027759519a487..25d7e1116c17b8810eed3febba81f47e1e07801b 100644 (file)
@@ -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>
index 249c1dade582300f1a956bde1ef97644dcd00dfc..e6490260d87d75021c223af3a083685faa4fc16d 100644 (file)
@@ -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>
        
index a6cc66a2ba12dfd0c106d4559c258fbdaaa09053..3a2547596885599c07fad440d1247862d5646452 100644 (file)
@@ -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>
index 2a246718626cd1f7bba0bd11cde3d8fd2c1e69a1..cfcd9e823f557e029f9f2fd52086f51d627adbe3 100644 (file)
@@ -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>
        
index 81dad28688b1c718932f9651233022584a18b403..284d59929d51d08098354b268676e57f8c0ac792 100644 (file)
@@ -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}}" />
index 993626df59c94fa896cee53c73e427296a7f03b8..b7300329c5d6972993e21f4ed848933f258b3282 100644 (file)
@@ -31,7 +31,7 @@
 
        {{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}
 
-       {{include file="file:{{$diaspora_vcard}}" diaspora=$diaspora_info}}
+       {{include file="diaspora_vcard.tpl"}}
 
        <div id="profile-vcard-break"></div>    
        <div id="profile-extra-links">
index e7fd32cba4cb1f029cdbf1ea151a5b8c2eca789a..7ff0d1b468a759fe632ef77721c220cf0c22baa0 100644 (file)
@@ -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>
index cbfa7ffd05cbe6d7e597dea14d60763946470c75..5d0e51c657ca4af36926563eaa5bf84d14451250 100644 (file)
                                                {{/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>
index 3faf73d2fc948087461d5c3347e3dc2059d671e0..77ada64185b193586ed55a1f5dd2f8729f78f348 100644 (file)
@@ -13,7 +13,7 @@ $a->theme_info = array();
 $a->videowidth = 400;
 $a->videoheight = 330;
 $a->theme_thread_allow = false;
-$a->theme['template_engine'] = 'smarty3';
+set_template_engine($a, 'smarty3');
 
 function frost_content_loaded(&$a) {
 
index 43d9db60818a0a994f968a21cffb02a163121ea0..b6086040dc4ebac984987f5a2661254c02c04f7e 100644 (file)
                                                {{ 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>
index 0818091f635fca6136072ab6417c9a5d345bc218..09a63c040d20d07a549c89293687e911f4f71fcf 100644 (file)
@@ -2,7 +2,7 @@
 $a->theme_info = array(
   'extends' => 'duepuntozero',
 );
-$a->theme['template_engine'] = 'smarty3';
+set_template_engine($a, 'smarty3');
 
 function greenzero_init(&$a) {
 $a->page['htmlhead'] .= <<< EOT
index a514da669ddb59fd2435abc0b8e1426ca4ae75f7..fc9d5f91c87888605618095db889c4a13fe95e32 100644 (file)
@@ -2,7 +2,7 @@
 $a->theme_info = array(
   'extends' => 'duepuntozero',
 );
-$a->theme['template_engine'] = 'smarty3';
+set_template_engine($a, 'smarty3');
 
 function purplezero_init(&$a) {
 $a->page['htmlhead'] .= <<< EOT
index 32179dd9e2b0214cb5d0c1ec8dd4fc6743a790c4..db4356ccc887698b17a559a64355546d2cbf5031 100644 (file)
@@ -60,13 +60,7 @@ function quattro_form(&$a, $align, $color, $tfs, $pfs){
     if ($pfs===false) $pfs="12";
     
        $t = get_markup_template("theme_settings.tpl" );
-
-       $includes = array(
-               '$field_select' => 'field_select.tpl',
-       );
-       $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-       $o .= replace_macros($t, $includes + array(
+       $o .= replace_macros($t, array(
                '$submit' => t('Submit'),
                '$baseurl' => $a->get_baseurl(),
                '$title' => t("Theme settings"),
index fa69f48a0098d274eba362fd0fbee27e4950edae..5d16bd32bbf18620cb8d88cfcdaa27ba95268437 100644 (file)
@@ -5,8 +5,8 @@
 
 {{ for $mails as $mail_item }}
        <div id="tread-wrapper-$mail_item.id" class="tread-wrapper">
-               {{ inc $mail_conv with $mail=$mail_item }}{{endinc}}
+               {{ inc mail_conv.tpl with $mail=$mail_item }}{{endinc}}
        </div>
 {{ endfor }}
 
-{{ inc $prv_message with $reply=$reply_info }}{{ endinc }}
+{{ inc prv_message.tpl }}{{ endinc }}
index 373b47a4f062963f911ebace67c71d2064d184ec..e7264cfecf6ea179ec8ace84156184936038083d 100644 (file)
@@ -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 with $diaspora=$diaspora_info }}{{ endinc }}
+       {{ inc diaspora_vcard.tpl }}{{ endinc }}
        
        <div id="profile-extra-links">
                <ul>
index e070c68d3c824af3e8fecdc1af3c95bf136ce1e9..5aa03688aa23d3c0ce657477651e8a041100c034 100644 (file)
@@ -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>
index 3400227923db80a5d5a0b256ee96be7c0922966a..7a96cbf361d45692656d25c05face85374692358 100644 (file)
@@ -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"}}
index f50a89d250152e38dff28751131352d206761bda..902fb040de3f6f745b280e0e68ddbe2af84dbfb7 100644 (file)
@@ -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"}}
        
        <div id="profile-extra-links">
                <ul>
index 651478c50dd9f2f02f64c201a15efcf7b58201f8..07fcfdadc20a05c023efcd59e7cf781c8c6892f4 100644 (file)
@@ -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>
index cf2a4935de26d5849d702cb24c33f33a9bbd6f5b..9fb2d4c1c954a1f922cda7f037c2abd11fefb69f 100644 (file)
@@ -29,4 +29,4 @@
 <script>
     
     $(".inputRange").rangeinput();
-</script>
\ No newline at end of file
+</script>
index de118952a4ffc3fc574fb3268dd7d83eb91b0ce8..68e6d5d1027f91876b4b0f05f66499c810292539 100644 (file)
                                <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>  
index e21deb8ab536bc6fb4437e8fc7ecaf83c2b13e78..73d35a1628a966970a05f816a47647c9632a0b8e 100644 (file)
@@ -8,7 +8,7 @@
  */
  
 $a->theme_info = array();
-$a->theme['template_engine'] = 'smarty3';
+set_template_engine($a, 'smarty3');
 
 function quattro_init(&$a) {
 $a->page['htmlhead'] .= <<< EOT
index 47105d7aa478f320d250456ea5d7e59222216f61..b957532cf5ac5a54a2d0133626a3b22d2ad37593 100644 (file)
@@ -29,4 +29,4 @@
 <script>
     
     $(".inputRange").rangeinput();
-</script>
\ No newline at end of file
+</script>
index d9fa083c546ad4854528fddb75a4765c291f8d03..eee27776be6ebdbb414c030f097089423aed8764 100644 (file)
                                <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>  
index cbd028f7d6827db5169620f6ed853c0f0a5f497f..bc09299794a8d3c883bb900080407376cb02df95 100644 (file)
@@ -2,7 +2,7 @@
 $a->theme_info = array(
   'extends' => 'duepuntozero',
 );
-$a->theme['template_engine'] = 'smarty3';
+set_template_engine($a, 'smarty3');
 
 function slackr_init(&$a) {
 $a->page['htmlhead'] .= <<< EOT
index 3cf1f25934e5ed83b07a3706b7b891b3496ee540..281890f4236f5e1d1a0e76bf2936c5ffe9eea901 100644 (file)
@@ -5,13 +5,13 @@
        <input type="hidden" name="auth-params" value="login" />
 
        <div id="login_standard">
-               {{ inc $field_input with $field=$lname }}{{ endinc }}
-               {{ inc $field_password with $field=$lpassword }}{{ endinc }}
+               {{ inc field_input.tpl with $field=$lname }}{{ endinc }}
+               {{ inc field_password.tpl with $field=$lpassword }}{{ endinc }}
        </div>
 
        {{ if $openid }}
                <div id="login_openid">
-                       {{ inc $field_openid with $field=$lopenid }}{{ endinc }}
+                       {{ inc field_openid.tpl with $field=$lopenid }}{{ endinc }}
                </div>
        {{ endif }}
 
index 518a1303f09e72061876ba8ba2b6cde8ef0a21ef..1f355385a18dbf5b48fdb5e0394e24db17ba48d3 100644 (file)
@@ -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}}
 
index 019a83646616b3e47c13f573e532048af0d69b6a..b0538b9791b027d1539b42924656fa397db418db 100644 (file)
 
                                {{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}}
index 3dff381b220487aa97cab4c04ded90c94844251d..1f1ee7327b5ac656256607f9117934c039403da1 100644 (file)
@@ -11,7 +11,7 @@
 
 $a = get_app();
 $a->theme_info = array();
-$a->theme['template_engine'] = 'smarty3';
+set_template_engine($a, 'smarty3');
 
 function smoothly_init(&$a) {
        $cssFile = null;
@@ -117,7 +117,7 @@ if(! function_exists('_js_in_foot')) {
                $ssl_state = null;
                $baseurl = $a->get_baseurl($ssl_state);
                $bottom['$baseurl'] = $baseurl;
-               $tpl = file_get_contents(dirname(__file__) . '/bottom.tpl');
+               $tpl = get_markup_template('bottom.tpl');
 
                return $a->page['bottom'] = replace_macros($tpl, $bottom);
        }
index e192ca61ca01848a5f498354e98dcbadef6b49f5..7987a36492c88121d973f19b39d8d81a87680d47 100644 (file)
 
                                {{ 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 }}
index 06f7ed86024eefe53fbe4abf9d9b1c465b89f336..0ee6919bc950fcea7e9c48605afb34e1c355008e 100644 (file)
@@ -29,7 +29,7 @@
 
        {{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
 
-       {{ inc $diaspora_vcard with $diaspora=$diaspora_info }}{{ endinc }}
+       {{ inc diaspora_vcard.tpl }}{{ endinc }}
        
        <div id="profile-extra-links">
                <ul>
index 5fc11b742da1d5c1e44d14940fb28de27f05c8aa..e1b05f81b389bc449a63afa32c791fd6f0af8357 100644 (file)
@@ -29,7 +29,7 @@
 
        {{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}
 
-       {{include file="file:{{$diaspora_vcard}}" diaspora=$diaspora_info}}
+       {{include file="diaspora_vcard.tpl"}}
        
        <div id="profile-extra-links">
                <ul>
index b71ab06f791efc0a05c3c408c4604c0ad5aacd0b..ab5d175fe5ee65102ca8cd3e5c50ef4395424e7c 100644 (file)
@@ -8,7 +8,7 @@
  * Maintainer: Mike Macgirvin <mike@macgirvin.com>
  */
 
-$a->theme['template_engine'] = 'smarty3';
+set_template_engine($a, 'smarty3');
 
 $a->page['htmlhead'] .= <<< EOT
 <script>
diff --git a/view/theme/vier/css/font2.css b/view/theme/vier/css/font2.css
new file mode 100644 (file)
index 0000000..1ba1848
--- /dev/null
@@ -0,0 +1,339 @@
+/*  Font Awesome
+    the iconic font designed for use with Twitter Bootstrap
+    -------------------------------------------------------
+    The full suite of pictographic icons, examples, and documentation
+    can be found at: http://fortawesome.github.com/Font-Awesome/
+
+    License
+    -------------------------------------------------------
+    The Font Awesome webfont, CSS, and LESS files are licensed under CC BY 3.0:
+    http://creativecommons.org/licenses/by/3.0/ A mention of
+    'Font Awesome - http://fortawesome.github.com/Font-Awesome' in human-readable
+    source code is considered acceptable attribution (most common on the web).
+    If human readable source code is not available to the end user, a mention in
+    an 'About' or 'Credits' screen is considered acceptable (most common in desktop
+    or mobile software).
+
+    Contact
+    -------------------------------------------------------
+    Email: dave@davegandy.com
+    Twitter: http://twitter.com/fortaweso_me
+    Work: http://lemonwi.se co-founder
+
+    */
+@font-face {
+  font-family: "FontAwesome";
+  src: url('../font/fontawesome-webfont.eot');
+  src: url('../font/fontawesome-webfont.eot?#iefix') format('eot'), url('../font/fontawesome-webfont.woff') format('woff'), url('../font/fontawesome-webfont.ttf') format('truetype'), url('../font/fontawesome-webfont.svg#FontAwesome') format('svg');
+  font-weight: normal;
+  font-style: normal;
+}
+
+.icon.s10 {
+  font-size: 1em;
+}
+.icon.s16 {
+  font-size: 1.2em;
+}
+.icon.s22 {
+  font-size: 1.37em;
+}
+.icon.s48 {
+  font-size: 2em;
+}
+
+/*  Font Awesome styles
+    ------------------------------------------------------- */
+.icon:before {
+  font-family: FontAwesome;
+  font-weight: normal;
+  font-style: normal;
+  display: inline-block;
+  text-decoration: inherit;
+  vertical-align: top;
+  font-size: 1.3333333333333333em;
+}
+a .icon {
+  display: inline-block;
+  text-decoration: inherit;
+}
+/* makes the font 33% larger relative to the icon container */
+.icon-large:before {
+  vertical-align: top;
+  font-size: 1.3333333333333333em;
+}
+.btn .icon {
+  /* keeps button heights with and without icons the same */
+
+  line-height: .9em;
+}
+li .icon {
+  display: inline-block;
+  width: 1.25em;
+  text-align: center;
+}
+li .icon-large.icon {
+  /* 1.5 increased font size for icon-large * 1.25 width */
+
+  width: 1.875em;
+}
+li.icon {
+  margin-left: 0;
+  list-style-type: none;
+}
+li.icon:before, li[*class="-icon "]:before {
+  text-indent: -2em;
+  text-align: center;
+}
+li.icon.icon-large:before {
+  text-indent: -1.3333333333333333em;
+}
+/*  Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen
+    readers do not read off random characters that represent icons */
+.icon-glass:before                { content: "\f000"; }
+.icon.audio:before                { content: "\f001"; }
+.icon-search:before               { content: "\f002"; }
+.icon-envelope:before             { content: "\f003"; }
+.icon-heart:before                { content: "\f004"; }
+.icon.star:before                 { content: "\f005"; }
+.icon-star-empty:before           { content: "\f006"; }
+.icon-user:before                 { content: "\f007"; }
+.icon.video:before                { content: "\f008"; }
+.icon-th-large:before             { content: "\f009"; }
+.icon-th:before                   { content: "\f00a"; }
+.icon-th-list:before              { content: "\f00b"; }
+.icon-ok:before                   { content: "\f00c"; }
+.icon-remove:before               { content: "\f00d"; }
+.icon-zoom-in:before              { content: "\f00e"; }
+
+.icon-zoom-out:before             { content: "\f010"; }
+.icon-off:before                  { content: "\f011"; }
+.icon-signal:before               { content: "\f012"; }
+.icon.gear:before                 { content: "\f013"; }
+.icon.delete:before               { content: "\f014"; }
+.icon-home:before                 { content: "\f015"; }
+.icon.attach:before               { content: "\f016"; }
+.icon-time:before                 { content: "\f017"; }
+.icon-road:before                 { content: "\f018"; }
+.icon-download-alt:before         { content: "\f019"; }
+.icon-download:before             { content: "\f01a"; }
+.icon-upload:before               { content: "\f01b"; }
+.icon-inbox:before                { content: "\f01c"; }
+.icon-play-circle:before          { content: "\f01d"; }
+.icon-repeat:before               { content: "\f01e"; }
+
+/* \f020 doesn't work in Safari. all shifted one down */
+.icon-refresh:before              { content: "\f021"; }
+.icon-list-alt:before             { content: "\f022"; }
+.icon.lock:before                 { content: "\f023"; }
+.icon-flag:before                 { content: "\f024"; }
+.icon-headphones:before           { content: "\f025"; }
+.icon-volume-off:before           { content: "\f026"; }
+.icon-volume-down:before          { content: "\f027"; }
+.icon-volume-up:before            { content: "\f028"; }
+.icon-qrcode:before               { content: "\f029"; }
+.icon-barcode:before              { content: "\f02a"; }
+.icon-tag:before                  { content: "\f02b"; }
+.icon-tags:before                 { content: "\f02c"; }
+.icon-book:before                 { content: "\f02d"; }
+.icon-bookmark:before             { content: "\f02e"; }
+.icon-print:before                { content: "\f02f"; }
+
+.icon.camera:before               { content: "\f030"; }
+.icon-font:before                 { content: "\f031"; }
+.icon-bold:before                 { content: "\f032"; }
+.icon-italic:before               { content: "\f033"; }
+.icon-text-height:before          { content: "\f034"; }
+.icon-text-width:before           { content: "\f035"; }
+.icon-align-left:before           { content: "\f036"; }
+.icon-align-center:before         { content: "\f037"; }
+.icon-align-right:before          { content: "\f038"; }
+.icon-align-justify:before        { content: "\f039"; }
+.icon-list:before                 { content: "\f03a"; }
+.icon-indent-left:before          { content: "\f03b"; }
+.icon-indent-right:before         { content: "\f03c"; }
+.icon-facetime-video:before       { content: "\f03d"; }
+.icon-picture:before              { content: "\f03e"; }
+
+.icon.pencil:before               { content: "\f040"; }
+.icon-map-marker:before           { content: "\f041"; }
+.icon-adjust:before               { content: "\f042"; }
+.icon-tint:before                 { content: "\f043"; }
+.icon.edit:before                 { content: "\f044"; }
+.icon-share:before                { content: "\f045"; }
+.icon.on:before                   { content: "\f046"; }
+.icon-move:before                 { content: "\f047"; }
+.icon-step-backward:before        { content: "\f048"; }
+.icon-fast-backward:before        { content: "\f049"; }
+.icon-backward:before             { content: "\f04a"; }
+.icon.play:before                 { content: "\f04b"; }
+.icon.pause:before                { content: "\f04c"; }
+.icon-stop:before                 { content: "\f04d"; }
+.icon-forward:before              { content: "\f04e"; }
+
+.icon-fast-forward:before         { content: "\f050"; }
+.icon-step-forward:before         { content: "\f051"; }
+.icon-eject:before                { content: "\f052"; }
+.icon-chevron-left:before         { content: "\f053"; }
+.icon-chevron-right:before        { content: "\f054"; }
+.icon-plus-sign:before            { content: "\f055"; }
+.icon-minus-sign:before           { content: "\f056"; }
+.icon-remove-sign:before          { content: "\f057"; }
+.icon-ok-sign:before              { content: "\f058"; }
+.icon-question-sign:before        { content: "\f059"; }
+.icon-info-sign:before            { content: "\f05a"; }
+.icon-screenshot:before           { content: "\f05b"; }
+.icon-remove-circle:before        { content: "\f05c"; }
+.icon-ok-circle:before            { content: "\f05d"; }
+.icon-ban-circle:before           { content: "\f05e"; }
+
+.icon-arrow-left:before           { content: "\f060"; }
+.icon-arrow-right:before          { content: "\f061"; }
+.icon-arrow-up:before             { content: "\f062"; }
+.icon-arrow-down:before           { content: "\f063"; }
+.icon-share-alt:before            { content: "\f064"; }
+.icon-resize-full:before          { content: "\f065"; }
+.icon-resize-small:before         { content: "\f066"; }
+.icon.add:before                  { content: "\f067"; }
+.icon-minus:before                { content: "\f068"; }
+.icon-asterisk:before             { content: "\f069"; }
+.icon.notify:before               { content: "\f06a"; }
+.icon-gift:before                 { content: "\f06b"; }
+.icon-leaf:before                 { content: "\f06c"; }
+.icon-fire:before                 { content: "\f06d"; }
+.icon-eye-open:before             { content: "\f06e"; }
+
+.icon-eye-close:before            { content: "\f070"; }
+.icon-warning-sign:before         { content: "\f071"; }
+.icon-plane:before                { content: "\f072"; }
+.icon-calendar:before             { content: "\f073"; }
+.icon-random:before               { content: "\f074"; }
+.icon-comment:before              { content: "\f075"; }
+.icon-magnet:before               { content: "\f076"; }
+.icon-chevron-up:before           { content: "\f077"; }
+.icon-chevron-down:before         { content: "\f078"; }
+.icon-retweet:before              { content: "\f079"; }
+.icon-shopping-cart:before        { content: "\f07a"; }
+.icon-folder-close:before         { content: "\f07b"; }
+.icon-folder-open:before          { content: "\f07c"; }
+.icon-resize-vertical:before      { content: "\f07d"; }
+.icon-resize-horizontal:before    { content: "\f07e"; }
+
+.icon-bar-chart:before            { content: "\f080"; }
+.icon-twitter-sign:before         { content: "\f081"; }
+.icon-facebook-sign:before        { content: "\f082"; }
+.icon-camera-retro:before         { content: "\f083"; }
+.icon-key:before                  { content: "\f084"; }
+.icon.gears:before                { content: "\f085"; }
+.icon-comments:before             { content: "\f086"; }
+.icon.like:before                 { content: "\f087"; }
+.icon.dislike:before              { content: "\f088"; }
+.icon-star-half:before            { content: "\f089"; }
+.icon-heart-empty:before          { content: "\f08a"; }
+.icon-signout:before              { content: "\f08b"; }
+.icon-linkedin-sign:before        { content: "\f08c"; }
+.icon-pushpin:before              { content: "\f08d"; }
+.icon-external-link:before        { content: "\f08e"; }
+
+.icon-signin:before               { content: "\f090"; }
+.icon-trophy:before               { content: "\f091"; }
+.icon-github-sign:before          { content: "\f092"; }
+.icon-upload-alt:before           { content: "\f093"; }
+.icon-lemon:before                { content: "\f094"; }
+.icon-phone:before                { content: "\f095"; }
+.icon.off:before                  { content: "\f096"; }
+.icon-bookmark-empty:before       { content: "\f097"; }
+.icon-phone-sign:before           { content: "\f098"; }
+.icon-twitter:before              { content: "\f099"; }
+.icon-facebook:before             { content: "\f09a"; }
+.icon-github:before               { content: "\f09b"; }
+.icon.unlock:before               { content: "\f09c"; }
+.icon-credit-card:before          { content: "\f09d"; }
+.icon-rss:before                  { content: "\f09e"; }
+
+.icon-hdd:before                  { content: "\f0a0"; }
+.icon-bullhorn:before             { content: "\f0a1"; }
+.icon-bell:before                 { content: "\f0a2"; }
+.icon-certificate:before          { content: "\f0a3"; }
+.icon-hand-right:before           { content: "\f0a4"; }
+.icon-hand-left:before            { content: "\f0a5"; }
+.icon-hand-up:before              { content: "\f0a6"; }
+.icon-hand-down:before            { content: "\f0a7"; }
+.icon-circle-arrow-left:before    { content: "\f0a8"; }
+.icon-circle-arrow-right:before   { content: "\f0a9"; }
+.icon-circle-arrow-up:before      { content: "\f0aa"; }
+.icon-circle-arrow-down:before    { content: "\f0ab"; }
+.icon.globe:before                { content: "\f0ac"; }
+.icon-wrench:before               { content: "\f0ad"; }
+.icon-tasks:before                { content: "\f0ae"; }
+
+.icon-filter:before               { content: "\f0b0"; }
+.icon-briefcase:before            { content: "\f0b1"; }
+.icon-fullscreen:before           { content: "\f0b2"; }
+
+.icon-group:before                { content: "\f0c0"; }
+.icon.link:before                 { content: "\f0c1"; }
+.icon-cloud:before                { content: "\f0c2"; }
+.icon-beaker:before               { content: "\f0c3"; }
+.icon-cut:before                  { content: "\f0c4"; }
+.icon-copy:before                 { content: "\f0c5"; }
+.icon-paper-clip:before           { content: "\f0c6"; }
+.icon-save:before                 { content: "\f0c7"; }
+.icon-sign-blank:before           { content: "\f0c8"; }
+.icon-reorder:before              { content: "\f0c9"; }
+.icon-list-ul:before              { content: "\f0ca"; }
+.icon-list-ol:before              { content: "\f0cb"; }
+.icon-strikethrough:before        { content: "\f0cc"; }
+.icon-underline:before            { content: "\f0cd"; }
+.icon-table:before                { content: "\f0ce"; }
+
+.icon-magic:before                { content: "\f0d0"; }
+.icon-truck:before                { content: "\f0d1"; }
+.icon-pinterest:before            { content: "\f0d2"; }
+.icon-pinterest-sign:before       { content: "\f0d3"; }
+.icon-google-plus-sign:before     { content: "\f0d4"; }
+.icon-google-plus:before          { content: "\f0d5"; }
+.icon-money:before                { content: "\f0d6"; }
+.icon.menu:before                 { content: "\f0d7"; }
+.icon-caret-up:before             { content: "\f0d8"; }
+.icon-caret-left:before           { content: "\f0d9"; }
+.icon-caret-right:before          { content: "\f0da"; }
+.icon-columns:before              { content: "\f0db"; }
+.icon-sort:before                 { content: "\f0dc"; }
+.icon-sort-down:before            { content: "\f0dd"; }
+.icon-sort-up:before              { content: "\f0de"; }
+
+.icon-envelope-alt:before         { content: "\f0e0"; }
+.icon-linkedin:before             { content: "\f0e1"; }
+.icon-undo:before                 { content: "\f0e2"; }
+.icon-legal:before                { content: "\f0e3"; }
+.icon-dashboard:before            { content: "\f0e4"; }
+.icon-comment-alt:before          { content: "\f0e5"; }
+.icon-comments-alt:before         { content: "\f0e6"; }
+.icon-bolt:before                 { content: "\f0e7"; }
+.icon-sitemap:before              { content: "\f0e8"; }
+.icon-umbrella:before             { content: "\f0e9"; }
+.icon-paste:before                { content: "\f0ea"; }
+
+.icon-user-md:before              { content: "\f200"; }
+
+.icon.type-image:before           { content: "\f03e"; }
+.icon.type-video:before           { content: "\f008"; }
+.icon.type-audio:before           { content: "\f001"; }
+.icon.type-text:before            { content: "\f036"; }
+.icon.type.unkn:before            { content: "\f059"; }
+
+.icon.drop:before                 { content: "\f014"; }
+.icon.drophilde:before            { content: "\f014"; }
+
+.small-pencil:before, .savedsearchdrop:before { 
+  font-family: FontAwesome;
+  font-weight: normal;
+  font-style: normal;
+  display: inline-block;
+  text-decoration: inherit;
+  vertical-align: top;
+}
+
+.small-pencil:before     { content: "\f040"; }
+.savedsearchdrop:before  { content: "\f014"; }
index 22115b31de31f4ced9d8d21f68991a3c5bdaf446..5e4a805daddf4aa923471230ad9c452d1f3b10fb 100644 (file)
                                <div class="comment-edit-text-end"></div>
                                <div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;" >
 
-                               <div class="comment-edit-bb-{{$id}}">
-                                       <a class="icon bb-image" style="cursor: pointer;" title="{{$edimg}}" onclick="insertFormatting('{{$comment}}','img',{{$id}});">img</a>      
-                                       <a class="icon bb-url" style="cursor: pointer;" title="{{$edurl}}" onclick="insertFormatting('{{$comment}}','url',{{$id}});">url</a>
-                                       <a class="icon bb-video" style="cursor: pointer;" title="{{$edvideo}}" onclick="insertFormatting('{{$comment}}','video',{{$id}});">video</a>                                
+                               <div class="comment-edit-bb">
+                                       <a title="{{$edimg}}" onclick="insertFormatting('{{$comment}}','img',{{$id}});"><i class="icon-picture"></i></a>      
+                                       <a title="{{$edurl}}" onclick="insertFormatting('{{$comment}}','url',{{$id}});"><i class="icon-bookmark"></i></a>
+                                       <a title="{{$edvideo}}" onclick="insertFormatting('{{$comment}}','video',{{$id}});"><i class="icon-film"></i></a>
                                                                                 
-                                       <a class="icon underline" style="cursor: pointer;" title="{{$eduline}}" onclick="insertFormatting('{{$comment}}','u',{{$id}});">u</a>
-                                       <a class="icon italic" style="cursor: pointer;" title="{{$editalic}}" onclick="insertFormatting('{{$comment}}','i',{{$id}});">i</a>
-                                       <a class="icon bold" style="cursor: pointer;"  title="{{$edbold}}" onclick="insertFormatting('{{$comment}}','b',{{$id}});">b</a>
-                                       <a class="icon quote" style="cursor: pointer;" title="{{$edquote}}" onclick="insertFormatting('{{$comment}}','quote',{{$id}});">quote</a>
+                                       <a title="{{$eduline}}" onclick="insertFormatting('{{$comment}}','u',{{$id}});"><i class="icon-underline"></i></a>
+                                       <a title="{{$editalic}}" onclick="insertFormatting('{{$comment}}','i',{{$id}});"><i class="icon-italic"></i></a>
+                                       <a title="{{$edbold}}" onclick="insertFormatting('{{$comment}}','b',{{$id}});"><i class="icon-bold"></i></a>
+                                       <a title="{{$edquote}}" onclick="insertFormatting('{{$comment}}','quote',{{$id}});"><i class="icon-comments"></i></a>
+
                                 </div>
                                        <input type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit}}" />
                                        <span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="fakelink">{{$preview}}</span>
index 2793e6fc57158aa1f7ecc845c59e6f2464f3ac5d..0379e30ee09eb758ed05aafe5b75103c99e4a6c8 100644 (file)
@@ -35,7 +35,7 @@
                         </li>           
                 {{/if}}
 
-               <li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">Site</span></a>
+               <li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear" style="color: lightgray;"></span></a>
                        <ul id="nav-site-menu" class="menu-popup">
                                {{if $nav.manage}}<li><a class="{{$nav.manage.2}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a></li>{{/if}}                         
                                {{if $nav.help}} <li><a class="{{$nav.help.2}}" target="friendica-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a></li>{{/if}}
@@ -50,7 +50,7 @@
                        </ul>           
                </li>
                {{if $nav.notifications}}
-                       <li  id="nav-notifications-linkmenu" class="nav-menu-icon"><a href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" title="{{$nav.notifications.1}}"><span class="icon s22 notify">{{$nav.notifications.1}}</span></a>
+                       <li  id="nav-notifications-linkmenu" class="nav-menu-icon"><a href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" title="{{$nav.notifications.1}}"><span class="icon s22 notify"></span></a>
                                <span id="notify-update" class="nav-notify"></span>
                                <ul id="nav-notifications-menu" class="menu-popup">
                                        <li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">{{$nav.notifications.mark.1}}</a></li>
index af559cb8503e16ab74e06c93bc7fdde6762dedf8..c1a20adea1fc3476c6f4feee484ffbb96f0fbd0d 100644 (file)
@@ -45,7 +45,8 @@
        </div>
        <div class="wall-item-bottom">
                <div class="">
-                       {{if $item.plink}}<a title="{{$item.plink.title}}" href="{{$item.plink.href}}"><i class="icon-link icon-large"></i></a>{{/if}}
+                       <!-- {{if $item.plink}}<a title="{{$item.plink.title}}" href="{{$item.plink.href}}"><i class="icon-link icon-large"></i></a>{{/if}} -->
+                       {{if $item.conv}}<a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title}}'><i class="icon-link icon-large"></i></a>{{/if}}
                </div>
                <div class="wall-item-actions">
 
index df8240c971c0ff4bb42fb50455e2078eb19b6d5b..07a7a50f85c35977c205a9f01b2f9a331a84e824 100644 (file)
@@ -54,7 +54,7 @@
                        <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}">{{$item.name}}</span></a>
                         {{if $item.owner_url}}{{$item.via}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a> <!-- {{$item.vwall}} -->{{/if}}
                        <span class="wall-item-ago">-
-                               {{if $item.plink}}<a class="link" title="{{$item.plink.title}}" href="{{$item.plink.href}}" style="color: #999">{{$item.ago}}</a>{{else}} {{$item.ago}} {{/if}}
+                               {{if $item.plink}}<a title="{{$item.plink.title}}" href="{{$item.plink.href}}" style="color: #999">{{$item.ago}}</a>{{else}} {{$item.ago}} {{/if}}
                                {{if $item.lock}} - <span class="fakelink" style="color: #999" onclick="lockview(event,{{$item.id}});">{{$item.lock}}</span> {{/if}}
                        </span>
                </div>
                                <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>  
@@ -98,7 +98,7 @@
                                {{/if}}
                        {{/if}}
                        {{if $item.vote.share}}
-                               <a href="#" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false"><i class="icon-share icon-large"></i></a>
+                               <a href="#" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false"><i class="icon-retweet icon-large"></i></a>
                        {{/if}}
                        {{if $item.star}}
                                <a href="#" id="star-{{$item.id}}" onclick="dostar({{$item.id}}); return false;"  class="{{$item.star.classdo}}"  title="{{$item.star.do}}"><i class="icon-star icon-large"></i></a>
index 640062bcf84cfa72ff55854d293e1454a470e326..ffd50ed1466d108f3c8c6f6d81248f3b310a1d10 100644 (file)
@@ -33,8 +33,8 @@
 .admin.link {
         list-style-position: inside;
         font-size: 1em;
-        padding-left: 5px;
-        margin: 5px;
+/*        padding-left: 5px;
+        margin: 5px; */
 }
 
 #adminpage dl {
   margin-bottom: 5px;
 }
 
-div.pager, .birthday-notice {
+div.pager {
+/* .birthday-notice { */
   text-align: center;
   height: 1.2em;
   padding-bottom: 12px;
-  -webkit-border-radius: 6px;
+  color: black;
+  /*-webkit-border-radius: 6px;
   -moz-border-radius: 6px;
-  border-radius: 6px;
+  border-radius: 6px;*/
   background-color: #f2f2f2;
   clear: left;
   margin-top: 5px;
   padding: 1%;
   height: 1em;
   margin-bottom: 5px;
-}
+}*/
 
 .birthday-notice {
   margin-top: 5px;
@@ -246,6 +248,10 @@ blockquote.shared_content {
   border: none;
 }
 
+#contact-edit-drop-link-end {
+  /* clear: both; */
+}
+
 #contact-edit-links ul {
   list-style: none;
   list-style-type: none;
@@ -265,10 +271,13 @@ blockquote.shared_content {
 body {
   font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
   font-size: 14px;
-  background-color: #ffffff;
+  /* background-color: #ffffff; */
+  /* background-color: #ddd; */
+  background-color: #F2F2F2;
   color: #2d2d2d;
   margin: 37px 0px 0px 0px;
   display: table;
+  /* width: 100% */
 }
 h4 {
   font-size: 1.1em;
@@ -368,9 +377,12 @@ code {
 .tool a {
 /*  color: #000; */
 }
-.tool a:hover {
-  text-decoration: underline;
+.tool a:hover, .widget a:hover, #nets-sidear a:hover, #hide-forum-list:hover, .admin.link a:hover, aside h4 a:hover {
+  /* text-decoration: underline; */
+  text-decoration: none;
+  color: black;
 }
+
 .groupsideedit, .savedsearchdrop {
   float: right;
   opacity: 0.3;
@@ -379,20 +391,61 @@ code {
   opacity: 1;
 }
 
+.sidebar-group-li:hover, #sidebar-new-group:hover, #hide-forum-list:hover, 
+#sidebar-ungrouped:hover, .side-link:hover, .nets-ul li:hover, #forum-list div:hover,
+.nets-all:hover, .saved-search-li:hover, li.tool:hover, .admin.link:hover, aside h4 a:hover, #message-new:hover {
+  /* background-color: #ddd; */
+  background-color: #e5e5e5;
+}
+
+#message-new a {
+  color: black;
+}
+
 .sidebar-group-element {
 /*  color: #000; */
 }
 
-#sidebar-new-group, #posted-date-selector, #hide-forum-list, #forum-list, #sidebar-ungrouped,
-.side-link, #peoplefind-desc, #connect-desc, #follow-sidebar form, #peoplefind-sidebar form,
-#netsearch-box form {
+.group-selected, .nets-selected, .fileas-selected {
+  font-weight: bold;
+}
+
+#sidebar-new-group, #hide-forum-list, #forum-list, #sidebar-ungrouped,
+.side-link, #peoplefind-desc, #connect-desc, .nets-all, .admin.link, #message-new {
+  padding-left: 10px;
+  padding-top: 3px;
+  padding-bottom: 3px;
+  padding-right: 5px;
+  display: block;
+}
+
+a.nets-link, .side-link a, #sidebar-new-group a, a.savedsearchterm, a.fileas-link, aside h4 a {
+  display: block;
+  color: black;
+}
+
+a.sidebar-group-element {
+  color: black;
+}
+
+#follow-sidebar form, #peoplefind-sidebar form, #netsearch-box form, #posted-date-selector {
   margin-left: 10px;
+  margin-top: 3px;
+  margin-bottom: 3px;
 }
 
 #sidebar-ungrouped, .side-link {
   padding-top: 5px;
 }
 
+#sidebar-ungrouped a {
+  color: black;
+}
+
+#forum-list a, .tool a, .admin.link a {
+  color: black;
+}
+
 #forum-list {
   margin-top: 2px;
 }
@@ -495,9 +548,10 @@ nav ul li .menu-popup {
   left: 0px;
   right: auto;
 }
+
 nav #search-box #search-text {
-  /* background-image:  url('icons/lupe.png'); */
-  background-repeat:no-repeat;
+  /*background-image:  url('icons/lupe.png');
+  background-repeat:no-repeat; */
   padding-left:0px;
   border-top-left-radius: 15px;
   border-top-right-radius: 15px;
@@ -506,6 +560,8 @@ nav #search-box #search-text {
   position: relative;
   height: 17px;
   margin: 4px 0px 4px 4px;
+  width: 150px;
+  max-width: 150px;
 }
 
 nav .nav-menu-icon {
@@ -662,7 +718,8 @@ ul.menu-popup a {
   text-decoration: none;
 }
 ul.menu-popup a:hover {
-  background-color: #bdcdd4;
+  /* background-color: #bdcdd4; */
+  background-color: #e5e5e5;
 }
 ul.menu-popup .menu-sep {
   border-top: 1px solid #9eabb0;
@@ -741,14 +798,20 @@ ul.menu-popup .empty {
         padding: 7px 7px 0px 0px;
 }
 
+right_aside {
+  width: 0px;
+  display: block;
+}
+
 /* aside */
 aside {
   display: table-cell;
   vertical-align: top;
   width: 185px;
   padding: 10px 10px 10px 20px;
-  border-right: 1px solid #D2D2D2;
-  background-color: #ECECF2;
+  /* border-right: 1px solid #D2D2D2; */
+  /* background-color: #ECECF2; */
+  background-color: #F2F2F2;
   font-size: 14px;
   /* background: #F1F1F1; */
 }
@@ -765,6 +828,12 @@ aside .vcard dl {
   height: auto;
   overflow: auto;
 }
+
+aside select {
+  background-color: white;
+  width: 165px;
+}
+
 aside .vcard dt {
   float: left;
   margin-left: 0px;
@@ -829,9 +898,6 @@ aside h4 {
 .nets-ul {
   margin-top: 0px;
 }
-.nets-all {
-  margin-left: 10px;
-}
 
 #contact-block {
   overflow: auto;
@@ -927,12 +993,12 @@ aside h4 {
   margin-bottom: 0px;
 }
 .widget ul li {
-  padding-left: 5px;
+  padding-left: 10px;
   /* min-height: 20px; */
   list-style: none;
-  padding-top: 0px;
-  padding-bottom: 0px;
-  margin: 5px;
+  padding-top: 3px;
+  padding-bottom: 3px;
+  margin: 0px;
 }
 .widget .tool.selected {
   background: url('../../../images/selected.png') no-repeat left center;
@@ -946,8 +1012,10 @@ aside h4 {
 section {
   display: table-cell;
   vertical-align: top;
-  width: 760px;
-  padding: 10px 0px 10px 10px;
+  width: 766px;
+  max-width: 766px;
+  padding: 10px 10px 10px 10px;
+  background-color: white;
 }
 /* wall item */
 .tread-wrapper {
@@ -1601,10 +1669,12 @@ ul.tabs {
   list-style-type: none;
   padding-bottom: 10px;
   font-size: 14px;
+  padding-left: 0px;
+  margin-bottom: 30px;
 }
 ul.tabs li {
   float: left;
-  margin-left: 7px;
+  /* margin-left: 7px; */
 }
 /*ul.tabs li .active {
   border-bottom: 1px solid #005c94;
@@ -1615,9 +1685,16 @@ ul.tabs a {
     float: left;
 }
 
-ul.tabs a, #jot-preview-link, .comment-edit-submit-wrapper .fakelink {
+div.pager, .birthday-notice, ul.tabs a, #jot-preview-link, .comment-edit-submit-wrapper .fakelink {
+    border: 1px solid lightgray;
+    color: black;
+    background: #F2F2F2;
+    padding: 3px 7px 2px 7px;
+    margin-top: 2px;
+    margin-bottom: 2px;
+
     /* padding: 0px 10px 1px 10px; */
-    padding: 0px 5px 1px 5px;
+    /*padding: 0px 5px 1px 5px;
     -webkit-border-radius: 4px;
     -moz-border-radius: 4px;
     border-radius: 4px;
@@ -1633,22 +1710,23 @@ ul.tabs a, #jot-preview-link, .comment-edit-submit-wrapper .fakelink {
     background: -o-linear-gradient(top, #ffffff 0%,#ececf2 100%);
     background: -ms-linear-gradient(top, #ffffff 0%,#ececf2 100%);
     filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#ececf2',GradientType=0 );
-    background: linear-gradient(top, #ffffff 0%,#ececf2 100%);
+    background: linear-gradient(top, #ffffff 0%,#ececf2 100%);*/
 }
 
-ul.tabs li .active, ul.tabs a:hover, #jot-preview-link:hover, .comment-edit-submit-wrapper .fakelink:hover {
-    color: #fff;
-    text-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
-    border: 1px solid #ececf2;
-    background: #364a84;
+#event-notice:hover, ul.tabs li .active, ul.tabs a:hover, #jot-preview-link:hover, .comment-edit-submit-wrapper .fakelink:hover {
+    color: black;
+    background-color: #e5e5e5;
+    text-decoration: none;
+    border: 1px solid darkgray;
+
+    /*text-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
     background: -moz-linear-gradient(top, #7b8dbb 0%, #364a84 100%);
     background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#7b8dbb), color-stop(100%,#364a84));
     background: -webkit-linear-gradient(top, #7b8dbb 0%,#364a84 100%);
     background: -o-linear-gradient(top, #7b8dbb 0%,#364a84 100%);
     background: -ms-linear-gradient(top, #7b8dbb 0%,#364a84 100%);
     filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#7b8dbb', endColorstr='#364a84',GradientType=0 );
-    background: linear-gradient(top, #7b8dbb 0%,#364a84 100%);
-    text-decoration: none;
+    background: linear-gradient(top, #7b8dbb 0%,#364a84 100%);*/
 }
 
 .comment-edit-bb {
index 7749a26bca54ee81636a697474c05597576f5448..7c0f3d3f8d1b6fa3f3136230564047319179b2c4 100644 (file)
@@ -8,7 +8,7 @@
  * Description: "Vier" uses the font awesome font library: http://fortawesome.github.com/Font-Awesome/
  */
 
-$a->theme['template_engine'] = 'smarty3';
+set_template_engine($a, 'smarty3');
 
 $a->theme_info = array();
 
index 1a45df57b6fa21e2c73a3c1e5ed47b04e874d356..d535704605467e5e4af6be76d4301e1787642f84 100644 (file)
                                <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>  
index fed8e898a4cc91f892ee7d66def99be704ede02b..8950c8b5413891ca9d47333d3b19c30e3bf157ed 100644 (file)
@@ -3,7 +3,7 @@
     <p>$import.intro</p>\r
     <p>$import.instruct</p>\r
     <p><b>$import.warn</b></p>\r
-     {{inc $field_custom with $field=$import.field }}{{ endinc }}\r
+     {{inc field_custom.tpl with $field=$import.field }}{{ endinc }}\r
      \r
      \r
        <div id="register-submit-wrapper">\r
index be4676f06965a0b21552fd57be5dbaa6749f8cce..714bf03fa75f7c98850d73202fde74d90012364e 100644 (file)
@@ -1,7 +1,7 @@
 <h3>$title</h3>
 
 {{ for $contacts as $c }}
-       {{ inc $contact_template with $contact=$c }}{{ endinc }}
+       {{ inc contact_template.tpl with $contact=$c }}{{ endinc }}
 {{ endfor }}
 
 <div id="view-contact-end"></div>
index 799c986634e5e6ef6707544c4b6e044918a708b1..716956c65569901e66485cb0d6acfa3645dd5a73 100644 (file)
                                                {{ 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>