diff --git a/boot.php b/boot.php index fbac881abb..b306662eba 100644 --- a/boot.php +++ b/boot.php @@ -383,8 +383,13 @@ if(! class_exists('App')) { 'force_max_items' => 0, 'thread_allow' => true, 'stylesheet' => '', - 'template_engine' => 'internal', + 'template_engine' => 'smarty3', ); + + // array of registered template engines ('name'=>'class name') + public $template_engines = array(); + // array of instanced template engines ('name'=>'instance') + public $template_engine_instance = array(); private $ldelim = array( 'internal' => '', @@ -539,6 +544,17 @@ if(! class_exists('App')) { $mobile_detect = new Mobile_Detect(); $this->is_mobile = $mobile_detect->isMobile(); $this->is_tablet = $mobile_detect->isTablet(); + + /** + * register template engines + */ + $dc = get_declared_classes(); + foreach ($dc as $k) { + if (in_array("ITemplateEngine", class_implements($k))){ + $this->register_template_engine($k); + } + } + } function get_basepath() { @@ -712,13 +728,64 @@ if(! class_exists('App')) { return $this->cached_profile_image[$avatar_image]; } + + /** + * register template engine class + * if $name is "", is used class static property $class::$name + * @param string $class + * @param string $name + */ + function register_template_engine($class, $name = '') { + if ($name===""){ + $v = get_class_vars( $class ); + if(x($v,"name")) $name = $v['name']; + } + if ($name===""){ + echo "template engine $class cannot be registered without a name.\n"; + killme(); + } + $this->template_engines[$name] = $class; + } + + /** + * return template engine instance. If $name is not defined, + * return engine defined by theme, or default + * + * @param strin $name Template engine name + * @return object Template Engine instance + */ + function template_engine($name = ''){ + if ($name!=="") { + $template_engine = $name; + } else { + $template_engine = 'smarty3'; + if (x($this->theme, 'template_engine')) { + $template_engine = $this->theme['template_engine']; + } + } + + if (isset($this->template_engines[$template_engine])){ + if(isset($this->template_engine_instance[$template_engine])){ + return $this->template_engine_instance[$template_engine]; + } else { + $class = $this->template_engines[$template_engine]; + $obj = new $class; + $this->template_engine_instance[$template_engine] = $obj; + return $obj; + } + } + + echo "template engine $template_engine is not registered!\n"; killme(); + } + function get_template_engine() { return $this->theme['template_engine']; } - function set_template_engine($engine = 'internal') { - - $this->theme['template_engine'] = 'internal'; + function set_template_engine($engine = 'smarty3') { + $this->theme['template_engine'] = $engine; + /* + $this->theme['template_engine'] = 'smarty3'; switch($engine) { case 'smarty3': @@ -728,13 +795,14 @@ if(! class_exists('App')) { default: break; } + */ } - function get_template_ldelim($engine = 'internal') { + function get_template_ldelim($engine = 'smarty3') { return $this->ldelim[$engine]; } - function get_template_rdelim($engine = 'internal') { + function get_template_rdelim($engine = 'smarty3') { return $this->rdelim[$engine]; } diff --git a/include/friendica_smarty.php b/include/friendica_smarty.php index b3f0d18a01..1326b0aca6 100644 --- a/include/friendica_smarty.php +++ b/include/friendica_smarty.php @@ -1,9 +1,11 @@ "view/theme/$theme/smarty3/"); + $template_dirs = array('theme' => "view/theme/$theme/".SMARTY3_TEMPLATE_FOLDER."/"); 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/'); + $template_dirs = $template_dirs + array('extends' => "view/theme/".$a->theme_info["extends"]."/".SMARTY3_TEMPLATE_FOLDER."/"); + $template_dirs = $template_dirs + array('base' => "view/".SMARTY3_TEMPLATE_FOLDER."/"); $this->setTemplateDir($template_dirs); $this->setCompileDir('view/smarty3/compiled/'); @@ -37,7 +39,33 @@ class FriendicaSmarty extends Smarty { } return $this->fetch('file:' . $this->filename); } + + } - - +class FriendicaSmartyEngine implements ITemplateEngine { + static $name ="smarty3"; + // ITemplateEngine interface + public function replace_macros($s, $r) { + $template = ''; + if(gettype($s) === 'string') { + $template = $s; + $s = new FriendicaSmarty(); + } + foreach($r as $key=>$value) { + if($key[0] === '$') { + $key = substr($key, 1); + } + $s->assign($key, $value); + } + return $s->parsed($template); + } + + public function get_template_file($file, $root=''){ + $a = get_app(); + $template_file = get_template_file($a, SMARTY3_TEMPLATE_FOLDER.'/'.$file, $root); + $template = new FriendicaSmarty(); + $template->filename = $template_file; + return $template; + } +} diff --git a/include/template_processor.php b/include/template_processor.php index ebc03b8d84..49d37488f9 100644 --- a/include/template_processor.php +++ b/include/template_processor.php @@ -1,9 +1,11 @@ r = $r; // remove comments block @@ -276,12 +279,18 @@ class Template { $count++; $s = $this->var_replace($s); } - return $s; + return template_unescape($s); } - + + public function get_template_file($file, $root='') { + $a = get_app(); + $template_file = get_template_file($a, $file, $root); + $content = file_get_contents($template_file); + return $content; + } + } -$t = new Template; function template_escape($s) { diff --git a/include/text.php b/include/text.php index 3d244c61ff..72a2e1c372 100644 --- a/include/text.php +++ b/include/text.php @@ -15,39 +15,20 @@ if(! function_exists('replace_macros')) { /** * This is our template processor * - * @global Template $t * @param string|FriendicaSmarty $s the string requiring macro substitution, * or an instance of FriendicaSmarty * @param array $r key value pairs (search => replace) * @return string substituted string */ function replace_macros($s,$r) { - global $t; $stamp1 = microtime(true); $a = get_app(); - if($a->theme['template_engine'] === 'smarty3') { - $template = ''; - if(gettype($s) === 'string') { - $template = $s; - $s = new FriendicaSmarty(); - } - foreach($r as $key=>$value) { - if($key[0] === '$') { - $key = substr($key, 1); - } - $s->assign($key, $value); - } - $output = $s->parsed($template); - } - else { - $r = $t->replace($s,$r); + $t = $a->template_engine(); + $output = $t->replace_macros($s,$r); - $output = template_unescape($r); - } - $a = get_app(); $a->save_timestamp($stamp1, "rendering"); return $output; @@ -582,26 +563,13 @@ function get_markup_template($s, $root = '') { $stamp1 = microtime(true); $a = get_app(); - - if($a->theme['template_engine'] === 'smarty3') { - $template_file = get_template_file($a, 'smarty3/' . $s, $root); - - $template = new FriendicaSmarty(); - $template->filename = $template_file; - $a->save_timestamp($stamp1, "rendering"); - - return $template; - } - else { - $template_file = get_template_file($a, $s, $root); - $a->save_timestamp($stamp1, "rendering"); - - $stamp1 = microtime(true); - $content = file_get_contents($template_file); - $a->save_timestamp($stamp1, "file"); - return $content; - - } + $t = $a->template_engine(); + + $template = $t->get_template_file($s, $root); + + $a->save_timestamp($stamp1, "file"); + + return $template; }} if(! function_exists("get_template_file")) { @@ -623,6 +591,8 @@ function get_template_file($a, $filename, $root = '') { $template_file = "{$root}view/theme/$theme/$filename"; elseif (x($a->theme_info,"extends") && file_exists("{$root}view/theme/{$a->theme_info["extends"]}/$filename")) $template_file = "{$root}view/theme/{$a->theme_info["extends"]}/$filename"; + elseif (file_exists("{$root}/$filename")) + $template_file = "{$root}/$filename"; else $template_file = "{$root}view/$filename"; diff --git a/object/TemplateEngine.php b/object/TemplateEngine.php new file mode 100644 index 0000000000..cbd74aaec9 --- /dev/null +++ b/object/TemplateEngine.php @@ -0,0 +1,11 @@ +$message diff --git a/view/acl_selector.tpl b/view/acl_selector.tpl deleted file mode 100644 index 837225a5b1..0000000000 --- a/view/acl_selector.tpl +++ /dev/null @@ -1,26 +0,0 @@ -
- - $showall -
-
-
-
- -
- - - - diff --git a/view/admin_aside.tpl b/view/admin_aside.tpl deleted file mode 100644 index 2f43562bd1..0000000000 --- a/view/admin_aside.tpl +++ /dev/null @@ -1,42 +0,0 @@ - -

$admtxt

- - -{{ if $admin.update }} - -{{ endif }} - - -{{ if $admin.plugins_admin }}

$plugadmtxt

{{ endif }} - - - -

$logtxt

- - diff --git a/view/admin_logs.tpl b/view/admin_logs.tpl deleted file mode 100644 index b777cf4201..0000000000 --- a/view/admin_logs.tpl +++ /dev/null @@ -1,19 +0,0 @@ -
-

$title - $page

- -
- - - {{ inc field_checkbox.tpl with $field=$debugging }}{{ endinc }} - {{ inc field_input.tpl with $field=$logfile }}{{ endinc }} - {{ inc field_select.tpl with $field=$loglevel }}{{ endinc }} - -
- -
- -

$logname

-
$data
- - -
diff --git a/view/admin_plugins.tpl b/view/admin_plugins.tpl deleted file mode 100644 index 74b56bb4e9..0000000000 --- a/view/admin_plugins.tpl +++ /dev/null @@ -1,15 +0,0 @@ -
-

$title - $page

- - -
diff --git a/view/admin_plugins_details.tpl b/view/admin_plugins_details.tpl deleted file mode 100644 index 931c7b83cf..0000000000 --- a/view/admin_plugins_details.tpl +++ /dev/null @@ -1,36 +0,0 @@ -
-

$title - $page

- -

$info.name - $info.version : $action

-

$info.description

- -

$str_author - {{ for $info.author as $a }} - {{ if $a.link }}$a.name{{ else }}$a.name{{ endif }}, - {{ endfor }} -

- -

$str_maintainer - {{ for $info.maintainer as $a }} - {{ if $a.link }}$a.name{{ else }}$a.name{{ endif }}, - {{ endfor }} -

- - {{ if $screenshot }} - $screenshot.1 - {{ endif }} - - {{ if $admin_form }} -

$settings

-
- $admin_form -
- {{ endif }} - - {{ if $readme }} -

Readme

-
- $readme -
- {{ endif }} -
diff --git a/view/admin_remoteupdate.tpl b/view/admin_remoteupdate.tpl deleted file mode 100644 index 874c6e6267..0000000000 --- a/view/admin_remoteupdate.tpl +++ /dev/null @@ -1,98 +0,0 @@ - - - -
-
Your version:
$localversion
-{{ if $needupdate }} -
New version:
$remoteversion
- -
- - - {{ if $canwrite }} -
- {{ else }} -

Your friendica installation is not writable by web server.

- {{ if $canftp }} -

You can try to update via FTP

- {{ 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 }} -
- {{ endif }} - {{ endif }} -
-{{ else }} -

No updates

-{{ endif }} -
diff --git a/view/admin_site.tpl b/view/admin_site.tpl deleted file mode 100644 index 0f0fdd4268..0000000000 --- a/view/admin_site.tpl +++ /dev/null @@ -1,116 +0,0 @@ - -
-

$title - $page

- -
- - - {{ 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 }} - {{ inc field_checkbox.tpl with $field=$hide_help }}{{ endinc }} - {{ inc field_select.tpl with $field=$singleuser }}{{ endinc }} - - -
- -

$registration

- {{ 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 }} - -
- -

$upload

- {{ inc field_input.tpl with $field=$maximagesize }}{{ endinc }} - {{ inc field_input.tpl with $field=$maximagelength }}{{ endinc }} - {{ inc field_input.tpl with $field=$jpegimagequality }}{{ endinc }} - -

$corporate

- {{ 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_select.tpl with $field=$ostatus_poll_interval }}{{ 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 }} - {{ inc field_checkbox.tpl with $field=$enotify_no_content }}{{ endinc }} - {{ inc field_checkbox.tpl with $field=$private_addons }}{{ endinc }} - {{ inc field_checkbox.tpl with $field=$disable_embedded }}{{ endinc }} -
- -

$advanced

- {{ 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 }} - -

$performance

- {{ 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 }} - - -
- -
-
diff --git a/view/admin_summary.tpl b/view/admin_summary.tpl deleted file mode 100644 index 4efe1960c5..0000000000 --- a/view/admin_summary.tpl +++ /dev/null @@ -1,40 +0,0 @@ -
-

$title - $page

- -
-
$queues.label
-
$queues.deliverq - $queues.queue
-
-
-
$pending.0
-
$pending.1 -
- -
-
$users.0
-
$users.1
-
- {{ for $accounts as $p }} -
-
$p.0
-
{{ if $p.1 }}$p.1{{ else }}0{{ endif }}
-
- {{ endfor }} - - -
-
$plugins.0
- - {{ for $plugins.1 as $p }} -
$p
- {{ endfor }} - -
- -
-
$version.0
-
$version.1 - $build -
- - -
diff --git a/view/admin_users.tpl b/view/admin_users.tpl deleted file mode 100644 index d9a96d7df7..0000000000 --- a/view/admin_users.tpl +++ /dev/null @@ -1,98 +0,0 @@ - -
-

$title - $page

- -
- - -

$h_pending

- {{ if $pending }} - - - - {{ for $th_pending as $th }}{{ endfor }} - - - - - - {{ for $pending as $u }} - - - - - - - - {{ endfor }} - -
$th
$u.created$u.name - - -
- -
- {{ else }} -

$no_pending

- {{ endif }} - - - - -

$h_users

- {{ if $users }} - - - - - {{ for $th_users as $th }}{{ endfor }} - - - - - - {{ for $users as $u }} - - - - - - - - - - {{ endif }} - - - {{ endfor }} - -
$th
$u.nickname$u.name$u.register_date$u.lastitem_date - {{ if $u.is_admin }} -   - {{ else }} - - {{ if $u.is_admin }} -   - {{ else }} - - - {{ endif }} -
- -
- {{ else }} - NO USERS?!? - {{ endif }} -
-
diff --git a/view/album_edit.tpl b/view/album_edit.tpl deleted file mode 100644 index 56a7b73fcd..0000000000 --- a/view/album_edit.tpl +++ /dev/null @@ -1,15 +0,0 @@ -
-
- - - - - -
- - - - -
-
-
diff --git a/view/api_config_xml.tpl b/view/api_config_xml.tpl deleted file mode 100644 index 3281e59dd3..0000000000 --- a/view/api_config_xml.tpl +++ /dev/null @@ -1,66 +0,0 @@ - - - $config.site.name - $config.site.server - default - - $config.site.logo - - true - en - $config.site.email - - - UTC - $config.site.closed - - false - $config.site.private - $config.site.textlimit - $config.site.ssl - $config.site.sslserver - 30 - - - - cc - - http://creativecommons.org/licenses/by/3.0/ - Creative Commons Attribution 3.0 - http://i.creativecommons.org/l/by/3.0/80x15.png - - - - - - - - - - - - - - - - - false - 20 - 600 - - - - false - INVALID SERVER - 5222 - update - - - StatusNet - - - - false - 0 - - diff --git a/view/api_friends_xml.tpl b/view/api_friends_xml.tpl deleted file mode 100644 index 9bdf53222d..0000000000 --- a/view/api_friends_xml.tpl +++ /dev/null @@ -1,7 +0,0 @@ - - - - {{for $users as $u }} - {{inc api_user_xml.tpl with $user=$u }}{{endinc}} - {{endfor}} - diff --git a/view/api_ratelimit_xml.tpl b/view/api_ratelimit_xml.tpl deleted file mode 100644 index 36ec1993df..0000000000 --- a/view/api_ratelimit_xml.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - $hash.remaining_hits - $hash.hourly_limit - $hash.reset_time - $hash.resettime_in_seconds - diff --git a/view/api_status_xml.tpl b/view/api_status_xml.tpl deleted file mode 100644 index f6cd9c2c02..0000000000 --- a/view/api_status_xml.tpl +++ /dev/null @@ -1,46 +0,0 @@ -{{ if $status }} - $status.created_at - $status.id - $status.text - $status.source - $status.truncated - $status.in_reply_to_status_id - $status.in_reply_to_user_id - $status.favorited - $status.in_reply_to_screen_name - $status.geo - $status.coordinates - $status.place - $status.contributors - - $status.user.id - $status.user.name - $status.user.screen_name - $status.user.location - $status.user.description - $status.user.profile_image_url - $status.user.url - $status.user.protected - $status.user.followers - $status.user.profile_background_color - $status.user.profile_text_color - $status.user.profile_link_color - $status.user.profile_sidebar_fill_color - $status.user.profile_sidebar_border_color - $status.user.friends_count - $status.user.created_at - $status.user.favourites_count - $status.user.utc_offset - $status.user.time_zone - $status.user.profile_background_image_url - $status.user.profile_background_tile - $status.user.profile_use_background_image - - $status.user.geo_enabled - $status.user.verified - - $status.user.statuses_count - $status.user.lang - $status.user.contributors_enabled - -{{ endif }} diff --git a/view/api_test_xml.tpl b/view/api_test_xml.tpl deleted file mode 100644 index 7509a2dc1b..0000000000 --- a/view/api_test_xml.tpl +++ /dev/null @@ -1 +0,0 @@ -$ok diff --git a/view/api_timeline_atom.tpl b/view/api_timeline_atom.tpl deleted file mode 100644 index 3db91573ef..0000000000 --- a/view/api_timeline_atom.tpl +++ /dev/null @@ -1,90 +0,0 @@ - - StatusNet - $rss.self - Friendica - Friendica API feed - $rss.logo - $rss.atom_updated - - - - - - http://activitystrea.ms/schema/1.0/person - $user.url - $user.name - - - - - - - $user.screen_name - $user.name - - homepage - $user.url - true - - - - - - - http://activitystrea.ms/schema/1.0/person - $user.contact_url - $user.name - - - - - - $user.screen_name - $user.name - - homepage - $user.url - true - - - - - - {{ for $statuses as $status }} - - $status.objecttype - $status.message_id - $status.text - $status.statusnet_html - - $status.verb - $status.published - $status.updated - - - - - - - - http://activitystrea.ms/schema/1.0/person - $status.user.url - $status.user.name - - - - - $status.user.screen_name - $status.user.name - - - homepage - $status.user.url - true - - - - - - {{ endfor }} - diff --git a/view/api_timeline_rss.tpl b/view/api_timeline_rss.tpl deleted file mode 100644 index 99279ec372..0000000000 --- a/view/api_timeline_rss.tpl +++ /dev/null @@ -1,26 +0,0 @@ - - - Friendica - $rss.alternate - - Friendica timeline - $rss.language - 40 - - $user.link - $user.name's items - $user.profile_image_url - - -{{ for $statuses as $status }} - - $status.user.name: $status.text - $status.text - $status.created_at - $status.url - $status.url - $status.source - -{{ endfor }} - - diff --git a/view/api_timeline_xml.tpl b/view/api_timeline_xml.tpl deleted file mode 100644 index 4a32b411b5..0000000000 --- a/view/api_timeline_xml.tpl +++ /dev/null @@ -1,20 +0,0 @@ - -{{ for $statuses as $status }} - $status.text - $status.truncated - $status.created_at - $status.in_reply_to_status_id - $status.source - $status.id - $status.in_reply_to_user_id - $status.in_reply_to_screen_name - $status.geo - $status.favorited -{{ inc api_user_xml.tpl with $user=$status.user }}{{ endinc }} $status.statusnet_html - $status.statusnet_conversation_id - $status.url - $status.coordinates - $status.place - $status.contributors - -{{ endfor }} diff --git a/view/api_user_xml.tpl b/view/api_user_xml.tpl deleted file mode 100644 index d286652c03..0000000000 --- a/view/api_user_xml.tpl +++ /dev/null @@ -1,46 +0,0 @@ - - $user.id - $user.name - $user.screen_name - $user.location - $user.description - $user.profile_image_url - $user.url - $user.protected - $user.followers_count - $user.friends_count - $user.created_at - $user.favourites_count - $user.utc_offset - $user.time_zone - $user.statuses_count - $user.following - $user.profile_background_color - $user.profile_text_color - $user.profile_link_color - $user.profile_sidebar_fill_color - $user.profile_sidebar_border_color - $user.profile_background_image_url - $user.profile_background_tile - $user.profile_use_background_image - $user.notifications - $user.geo_enabled - $user.verified - $user.lang - $user.contributors_enabled - {{ if $user.status }} - $user.status.created_at - $user.status.id - $user.status.text - $user.status.source - $user.status.truncated - $user.status.in_reply_to_status_id - $user.status.in_reply_to_user_id - $user.status.favorited - $user.status.in_reply_to_screen_name - $user.status.geo - $user.status.coordinates - $user.status.place - $user.status.contributors - {{ endif }} - diff --git a/view/apps.tpl b/view/apps.tpl deleted file mode 100644 index 4c7f8c94cc..0000000000 --- a/view/apps.tpl +++ /dev/null @@ -1,7 +0,0 @@ -

$title

- - diff --git a/view/atom_feed.tpl b/view/atom_feed.tpl deleted file mode 100644 index 2feb547ee2..0000000000 --- a/view/atom_feed.tpl +++ /dev/null @@ -1,29 +0,0 @@ - - - - $feed_id - $feed_title - Friendica - - $hub - $salmon - $community - - $feed_updated - - - $name - $profile_page - - - $birthday - diff --git a/view/atom_feed_dfrn.tpl b/view/atom_feed_dfrn.tpl deleted file mode 100644 index 0bae62b526..0000000000 --- a/view/atom_feed_dfrn.tpl +++ /dev/null @@ -1,29 +0,0 @@ - - - - $feed_id - $feed_title - Friendica - - $hub - $salmon - $community - - $feed_updated - - - $name - $profile_page - - - $birthday - diff --git a/view/atom_mail.tpl b/view/atom_mail.tpl deleted file mode 100644 index bf7c3efc86..0000000000 --- a/view/atom_mail.tpl +++ /dev/null @@ -1,17 +0,0 @@ - - - - - $name - $profile_page - $thumb - - - $item_id - $parent_id - $created - $subject - $content - - - diff --git a/view/atom_relocate.tpl b/view/atom_relocate.tpl deleted file mode 100644 index f7db934d7a..0000000000 --- a/view/atom_relocate.tpl +++ /dev/null @@ -1,17 +0,0 @@ - - - - $url - $name - $photo - $thumb - $micro - $request - $confirm - $notify - $poll - $sitepubkey - - - - diff --git a/view/atom_suggest.tpl b/view/atom_suggest.tpl deleted file mode 100644 index 66c61f9b6e..0000000000 --- a/view/atom_suggest.tpl +++ /dev/null @@ -1,11 +0,0 @@ - - - - $url - $name - $photo - $request - $note - - - diff --git a/view/auto_request.tpl b/view/auto_request.tpl deleted file mode 100644 index 961de9bb39..0000000000 --- a/view/auto_request.tpl +++ /dev/null @@ -1,37 +0,0 @@ - -

$header

- -

-$page_desc
-

-

-

-$invite_desc -

-

-$desc -

- -
- -
- - -
-
- - -
- -
- -
- - -
-
diff --git a/view/birthdays_reminder.tpl b/view/birthdays_reminder.tpl deleted file mode 100644 index 971680a8cc..0000000000 --- a/view/birthdays_reminder.tpl +++ /dev/null @@ -1,10 +0,0 @@ -{{ if $count }} - - -{{ endif }} - diff --git a/view/categories_widget.tpl b/view/categories_widget.tpl deleted file mode 100644 index 5dbd871a89..0000000000 --- a/view/categories_widget.tpl +++ /dev/null @@ -1,12 +0,0 @@ -
-

$title

-
$desc
- - - -
diff --git a/view/comment_item.tpl b/view/comment_item.tpl deleted file mode 100644 index 1764f99d89..0000000000 --- a/view/comment_item.tpl +++ /dev/null @@ -1,39 +0,0 @@ - {{ if $threaded }} -
- {{ else }} -
- {{ endif }} -
- - - - {##} - - - - -
- $mytitle -
-
- - {{ if $qcomment }} - - {{ endif }} - -
- - -
-
- -
diff --git a/view/common_friends.tpl b/view/common_friends.tpl deleted file mode 100644 index 1f610d8c4f..0000000000 --- a/view/common_friends.tpl +++ /dev/null @@ -1,12 +0,0 @@ -
-
- - $name - -
-
-
- $name -
-
-
\ No newline at end of file diff --git a/view/common_tabs.tpl b/view/common_tabs.tpl deleted file mode 100644 index f8ceff46a3..0000000000 --- a/view/common_tabs.tpl +++ /dev/null @@ -1,5 +0,0 @@ -
    - {{ for $tabs as $tab }} -
  • $tab.label
  • - {{ endfor }} -
diff --git a/view/confirm.tpl b/view/confirm.tpl deleted file mode 100644 index 5e7e641c45..0000000000 --- a/view/confirm.tpl +++ /dev/null @@ -1,14 +0,0 @@ -
-
- - $message - {{ for $extra_inputs as $input }} - - {{ endfor }} - - - - -
-
- diff --git a/view/contact_block.tpl b/view/contact_block.tpl deleted file mode 100644 index a796487122..0000000000 --- a/view/contact_block.tpl +++ /dev/null @@ -1,12 +0,0 @@ -
-

$contacts

-{{ if $micropro }} - $viewcontacts -
- {{ for $micropro as $m }} - $m - {{ endfor }} -
-{{ endif }} -
-
diff --git a/view/contact_edit.tpl b/view/contact_edit.tpl deleted file mode 100644 index bec78bd7d9..0000000000 --- a/view/contact_edit.tpl +++ /dev/null @@ -1,88 +0,0 @@ - -

$header

- -
- - $tab_str - - - - - - -
- -
-
- - -
- - - {{ if $poll_enabled }} -
-
$lastupdtext $last_update
- $updpub $poll_interval $udnow -
- {{ endif }} -
- - {{inc field_checkbox.tpl with $field=$hidden }}{{endinc}} - -
-

$lbl_info1

- - -
-
- - -
-

$lbl_vis1

-

$lbl_vis2

-
-$profile_select -
- - - -
-
diff --git a/view/contact_end.tpl b/view/contact_end.tpl deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/view/contact_head.tpl b/view/contact_head.tpl deleted file mode 100644 index 0a7f0ef0f9..0000000000 --- a/view/contact_head.tpl +++ /dev/null @@ -1,30 +0,0 @@ - - - diff --git a/view/contact_template.tpl b/view/contact_template.tpl deleted file mode 100644 index f7ed107509..0000000000 --- a/view/contact_template.tpl +++ /dev/null @@ -1,31 +0,0 @@ - -
-
-
- - $contact.name - - {{ if $contact.photo_menu }} - menu -
-
    - {{ for $contact.photo_menu as $c }} - {{ if $c.2 }} -
  • $c.0
  • - {{ else }} -
  • $c.0
  • - {{ endif }} - {{ endfor }} -
-
- {{ endif }} -
- -
-
-
$contact.name
- -
-
diff --git a/view/contacts-end.tpl b/view/contacts-end.tpl deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/view/contacts-head.tpl b/view/contacts-head.tpl deleted file mode 100644 index 011f55b981..0000000000 --- a/view/contacts-head.tpl +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/view/contacts-template.tpl b/view/contacts-template.tpl deleted file mode 100644 index ecb342bf44..0000000000 --- a/view/contacts-template.tpl +++ /dev/null @@ -1,26 +0,0 @@ -

$header{{ if $total }} ($total){{ endif }}

- -{{ if $finding }}

$finding

{{ endif }} - -
-
-$desc - - -
-
-
- -$tabs - - -{{ for $contacts as $contact }} - {{ inc contact_template.tpl }}{{ endinc }} -{{ endfor }} -
- -$paginate - - - - diff --git a/view/contacts-widget-sidebar.tpl b/view/contacts-widget-sidebar.tpl deleted file mode 100644 index c9450ce648..0000000000 --- a/view/contacts-widget-sidebar.tpl +++ /dev/null @@ -1,6 +0,0 @@ -$vcard_widget -$follow_widget -$groups_widget -$findpeople_widget -$networks_widget - diff --git a/view/content.tpl b/view/content.tpl deleted file mode 100644 index 466045d396..0000000000 --- a/view/content.tpl +++ /dev/null @@ -1,2 +0,0 @@ -
-
diff --git a/view/conversation.tpl b/view/conversation.tpl deleted file mode 100644 index 0e14646219..0000000000 --- a/view/conversation.tpl +++ /dev/null @@ -1,29 +0,0 @@ -$live_update - -{{ for $threads as $thread }} -
- {{ for $thread.items as $item }} - {{if $item.comment_firstcollapsed}} -
- $thread.num_comments $thread.hide_text -
- {{endif}} - - {{ inc $item.template }}{{ endinc }} - - - {{ endfor }} -
-{{ endfor }} - -
- -{{ if $dropping }} - -
-{{ endif }} diff --git a/view/crepair.tpl b/view/crepair.tpl deleted file mode 100644 index a3e532b615..0000000000 --- a/view/crepair.tpl +++ /dev/null @@ -1,46 +0,0 @@ - -
- -

$contact_name

- - - -
- - - -
- - - -
- - - -
- - - -
- - - -
- - - -
- - - -
- - - -
- - - -
- - diff --git a/view/cropbody.tpl b/view/cropbody.tpl deleted file mode 100644 index 4c0ca3d634..0000000000 --- a/view/cropbody.tpl +++ /dev/null @@ -1,58 +0,0 @@ -

$title

-

-$desc -

-
-$title -
-
-
-
- - - -
- - - - - - - - - - - -
- -
- -
diff --git a/view/cropend.tpl b/view/cropend.tpl deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/view/crophead.tpl b/view/crophead.tpl deleted file mode 100644 index 48f3754265..0000000000 --- a/view/crophead.tpl +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/view/delegate.tpl b/view/delegate.tpl deleted file mode 100644 index 9a7d2e18d2..0000000000 --- a/view/delegate.tpl +++ /dev/null @@ -1,57 +0,0 @@ -

$header

- -
$desc
- -{{ if $managers }} -

$head_managers

- -{{ for $managers as $x }} - -
- - - -
- -{{ endfor }} -
-
-{{ endif }} - - -

$head_delegates

- -{{ if $delegates }} -{{ for $delegates as $x }} - -
- - - -
- -{{ endfor }} -
-{{ else }} -$none -{{ endif }} -
- - -

$head_potentials

-{{ if $potentials }} -{{ for $potentials as $x }} - -
- - - -
- -{{ endfor }} -
-{{ else }} -$none -{{ endif }} -
- diff --git a/view/dfrn_req_confirm.tpl b/view/dfrn_req_confirm.tpl deleted file mode 100644 index 6c916323ce..0000000000 --- a/view/dfrn_req_confirm.tpl +++ /dev/null @@ -1,21 +0,0 @@ - -

-$welcome -
-$please - -

-
- - - -$aes_allow - - - - - -
- -
-
\ No newline at end of file diff --git a/view/dfrn_request.tpl b/view/dfrn_request.tpl deleted file mode 100644 index bd3bcbc42b..0000000000 --- a/view/dfrn_request.tpl +++ /dev/null @@ -1,65 +0,0 @@ - -

$header

- -

-$page_desc
-

-$invite_desc -

-

-$desc -

- -
- -
- - -
-
- -

-$pls_answer -

- -
- - -

-$does_know -

- -
- - - -
-
-
- - - -
-
- - -

-$add_note -

-
- -
- - -
- -
- - -
-
diff --git a/view/diasp_dec_hdr.tpl b/view/diasp_dec_hdr.tpl deleted file mode 100644 index e87c618888..0000000000 --- a/view/diasp_dec_hdr.tpl +++ /dev/null @@ -1,8 +0,0 @@ - - $inner_iv - $inner_key - - $author_name - $author_uri - - diff --git a/view/diaspora_comment.tpl b/view/diaspora_comment.tpl deleted file mode 100644 index 6ef4ab664d..0000000000 --- a/view/diaspora_comment.tpl +++ /dev/null @@ -1,11 +0,0 @@ - - - - $guid - $parent_guid - $authorsig - $body - $handle - - - \ No newline at end of file diff --git a/view/diaspora_comment_relay.tpl b/view/diaspora_comment_relay.tpl deleted file mode 100644 index e82de1171e..0000000000 --- a/view/diaspora_comment_relay.tpl +++ /dev/null @@ -1,12 +0,0 @@ - - - - $guid - $parent_guid - $parentsig - $authorsig - $body - $handle - - - \ No newline at end of file diff --git a/view/diaspora_conversation.tpl b/view/diaspora_conversation.tpl deleted file mode 100644 index 12807ba599..0000000000 --- a/view/diaspora_conversation.tpl +++ /dev/null @@ -1,29 +0,0 @@ - - - - $conv.guid - $conv.subject - $conv.created_at - - {{ for $conv.messages as $msg }} - - - $msg.guid - $msg.parent_guid - {{ if $msg.parent_author_signature }} - $msg.parent_author_signature - {{ endif }} - $msg.author_signature - $msg.text - $msg.created_at - $msg.diaspora_handle - $msg.conversation_guid - - - {{ endfor }} - - $conv.diaspora_handle - $conv.participant_handles - - - diff --git a/view/diaspora_like.tpl b/view/diaspora_like.tpl deleted file mode 100644 index a777aeebed..0000000000 --- a/view/diaspora_like.tpl +++ /dev/null @@ -1,12 +0,0 @@ - - - - $target_type - $guid - $parent_guid - $authorsig - $positive - $handle - - - diff --git a/view/diaspora_like_relay.tpl b/view/diaspora_like_relay.tpl deleted file mode 100755 index 8b67f4de33..0000000000 --- a/view/diaspora_like_relay.tpl +++ /dev/null @@ -1,13 +0,0 @@ - - - - $guid - $target_type - $parent_guid - $parentsig - $authorsig - $positive - $handle - - - diff --git a/view/diaspora_message.tpl b/view/diaspora_message.tpl deleted file mode 100644 index 667b8d53fa..0000000000 --- a/view/diaspora_message.tpl +++ /dev/null @@ -1,13 +0,0 @@ - - - - $msg.guid - $msg.parent_guid - $msg.author_signature - $msg.text - $msg.created_at - $msg.diaspora_handle - $msg.conversation_guid - - - diff --git a/view/diaspora_photo.tpl b/view/diaspora_photo.tpl deleted file mode 100644 index 75ca7f15c7..0000000000 --- a/view/diaspora_photo.tpl +++ /dev/null @@ -1,13 +0,0 @@ - - - - $path - $filename - $msg_guid - $guid - $handle - $public - $created_at - - - \ No newline at end of file diff --git a/view/diaspora_post.tpl b/view/diaspora_post.tpl deleted file mode 100644 index 1ba3ebb1fc..0000000000 --- a/view/diaspora_post.tpl +++ /dev/null @@ -1,11 +0,0 @@ - - - - $body - $guid - $handle - $public - $created - - - \ No newline at end of file diff --git a/view/diaspora_profile.tpl b/view/diaspora_profile.tpl deleted file mode 100644 index e5c3d3cad2..0000000000 --- a/view/diaspora_profile.tpl +++ /dev/null @@ -1,16 +0,0 @@ - - - $handle - $first - $last - $large - $small - $medium - $dob - $gender - $about - $location - $searchable - $tags - - diff --git a/view/diaspora_relay_retraction.tpl b/view/diaspora_relay_retraction.tpl deleted file mode 100644 index e76c7c6c5e..0000000000 --- a/view/diaspora_relay_retraction.tpl +++ /dev/null @@ -1,10 +0,0 @@ - - - - $type - $guid - $signature - $handle - - - diff --git a/view/diaspora_relayable_retraction.tpl b/view/diaspora_relayable_retraction.tpl deleted file mode 100755 index 73cff8343a..0000000000 --- a/view/diaspora_relayable_retraction.tpl +++ /dev/null @@ -1,11 +0,0 @@ - - - - $target_type - $guid - $parentsig - $authorsig - $handle - - - diff --git a/view/diaspora_retract.tpl b/view/diaspora_retract.tpl deleted file mode 100644 index 6d5b6e22be..0000000000 --- a/view/diaspora_retract.tpl +++ /dev/null @@ -1,9 +0,0 @@ - - - - $guid - $type - $handle - - - \ No newline at end of file diff --git a/view/diaspora_share.tpl b/view/diaspora_share.tpl deleted file mode 100644 index c16341b1e1..0000000000 --- a/view/diaspora_share.tpl +++ /dev/null @@ -1,8 +0,0 @@ - - - - $sender - $recipient - - - \ No newline at end of file diff --git a/view/diaspora_signed_retract.tpl b/view/diaspora_signed_retract.tpl deleted file mode 100644 index 22120e2870..0000000000 --- a/view/diaspora_signed_retract.tpl +++ /dev/null @@ -1,10 +0,0 @@ - - - - $guid - $type - $handle - $signature - - - diff --git a/view/diaspora_vcard.tpl b/view/diaspora_vcard.tpl deleted file mode 100644 index de3981a94b..0000000000 --- a/view/diaspora_vcard.tpl +++ /dev/null @@ -1,57 +0,0 @@ -
-
-
Nickname
-
- $diaspora.nickname -
-
-
-
Full name
-
- $diaspora.fullname -
-
- -
-
First name
-
- $diaspora.firstname -
-
-
-
Family name
-
- $diaspora.lastname -
-
-
-
URL
-
- $diaspora.podloc/ -
-
-
-
Photo
-
- -
-
-
-
Photo
-
- -
-
-
-
Photo
-
- -
-
-
-
Searchable
-
- $diaspora.searchable -
-
-
diff --git a/view/directory_header.tpl b/view/directory_header.tpl deleted file mode 100644 index 1f03540f2c..0000000000 --- a/view/directory_header.tpl +++ /dev/null @@ -1,16 +0,0 @@ -

$sitedir

- -$globaldir -$admin - -$finding - -
-
-$desc - - -
-
-
- diff --git a/view/directory_item.tpl b/view/directory_item.tpl deleted file mode 100644 index d496cb2add..0000000000 --- a/view/directory_item.tpl +++ /dev/null @@ -1,11 +0,0 @@ - -
-
-
- $alt_text -
-
- -
$name
-
$details
-
diff --git a/view/display-head.tpl b/view/display-head.tpl deleted file mode 100644 index 3d4e7e96ad..0000000000 --- a/view/display-head.tpl +++ /dev/null @@ -1,8 +0,0 @@ - - diff --git a/view/email_notify_html.tpl b/view/email_notify_html.tpl deleted file mode 100644 index 4a8e5a9114..0000000000 --- a/view/email_notify_html.tpl +++ /dev/null @@ -1,30 +0,0 @@ - - - - $banner - - - - - - - - - - - - {{ if $content_allowed }} - - - - - {{ endif }} - - - - - -
$product
$preamble
$source_name
$title
$htmlversion
$hsitelink
$hitemlink
$thanks
$site_admin
- - - diff --git a/view/email_notify_text.tpl b/view/email_notify_text.tpl deleted file mode 100644 index af7931e4b0..0000000000 --- a/view/email_notify_text.tpl +++ /dev/null @@ -1,16 +0,0 @@ - -$preamble - -{{ if $content_allowed }} -$title - -$textversion - -{{ endif }} -$tsitelink -$titemlink - -$thanks -$site_admin - - diff --git a/view/end.tpl b/view/end.tpl deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/view/event.tpl b/view/event.tpl deleted file mode 100644 index 1f71289b3a..0000000000 --- a/view/event.tpl +++ /dev/null @@ -1,10 +0,0 @@ -{{ for $events as $event }} -
- - {{ if $event.item.author_name }}$event.item.author_name{{ endif }} - $event.html - {{ if $event.item.plink }}{{ endif }} - {{ if $event.edit }}{{ endif }} -
-
-{{ endfor }} diff --git a/view/event_end.tpl b/view/event_end.tpl deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/view/event_form.tpl b/view/event_form.tpl deleted file mode 100644 index 536c52b0fa..0000000000 --- a/view/event_form.tpl +++ /dev/null @@ -1,49 +0,0 @@ -

$title

- -

-$desc -

- -
- - - - - -
$s_text
-$s_dsel $s_tsel - -
$f_text
-$f_dsel $f_tsel - -
- -
$n_text
- -
- -
$a_text
- -
- -
$t_text
- - - -
$d_text
- - - -
$l_text
- - -
$sh_text
-
- -$acl - -
- -
- - diff --git a/view/event_head.tpl b/view/event_head.tpl deleted file mode 100644 index 559de24e31..0000000000 --- a/view/event_head.tpl +++ /dev/null @@ -1,139 +0,0 @@ - - - - - - - - - diff --git a/view/events-js.tpl b/view/events-js.tpl deleted file mode 100644 index b0e182c56d..0000000000 --- a/view/events-js.tpl +++ /dev/null @@ -1,6 +0,0 @@ -$tabs -

$title

- - - -
diff --git a/view/events.tpl b/view/events.tpl deleted file mode 100644 index be7dc2fb2d..0000000000 --- a/view/events.tpl +++ /dev/null @@ -1,24 +0,0 @@ -$tabs -

$title

- - - -
- - $calendar - -
-
- - -{{ for $events as $event }} -
- {{ if $event.is_first }}
$event.d
{{ endif }} - {{ if $event.item.author_name }}$event.item.author_name{{ endif }} - $event.html - {{ if $event.item.plink }}{{ endif }} - {{ if $event.edit }}{{ endif }} -
-
- -{{ endfor }} diff --git a/view/events_reminder.tpl b/view/events_reminder.tpl deleted file mode 100644 index 9746898c77..0000000000 --- a/view/events_reminder.tpl +++ /dev/null @@ -1,10 +0,0 @@ -{{ if $count }} - - -{{ endif }} - diff --git a/view/failed_updates.tpl b/view/failed_updates.tpl deleted file mode 100644 index c6e4cb08e1..0000000000 --- a/view/failed_updates.tpl +++ /dev/null @@ -1,17 +0,0 @@ -

$banner

- -
$desc
- -{{ if $failed }} -{{ for $failed as $f }} - -

$f

- - -
-{{ endfor }} -{{ endif }} - diff --git a/view/fake_feed.tpl b/view/fake_feed.tpl deleted file mode 100644 index c37071cf4a..0000000000 --- a/view/fake_feed.tpl +++ /dev/null @@ -1,13 +0,0 @@ - - - - fake feed - fake title - - 1970-01-01T00:00:00Z - - - Fake Name - http://example.com - - diff --git a/view/field.tpl b/view/field.tpl deleted file mode 100644 index 35f5afd39c..0000000000 --- a/view/field.tpl +++ /dev/null @@ -1,4 +0,0 @@ - - {{ if $field.0==select }} - {{ inc field_select.tpl }}{{ endinc }} - {{ endif }} diff --git a/view/field_checkbox.tpl b/view/field_checkbox.tpl deleted file mode 100644 index 5e170370ab..0000000000 --- a/view/field_checkbox.tpl +++ /dev/null @@ -1,6 +0,0 @@ - -
- - - $field.3 -
diff --git a/view/field_combobox.tpl b/view/field_combobox.tpl deleted file mode 100644 index a4dc8e5714..0000000000 --- a/view/field_combobox.tpl +++ /dev/null @@ -1,18 +0,0 @@ - -
- - {# html5 don't work on Chrome, Safari and IE9 - - - {{ for $field.4 as $opt=>$val }} #} - - - - - $field.3 -
- diff --git a/view/field_custom.tpl b/view/field_custom.tpl deleted file mode 100644 index be15d3f607..0000000000 --- a/view/field_custom.tpl +++ /dev/null @@ -1,6 +0,0 @@ - -
- - $field.2 - $field.3 -
diff --git a/view/field_input.tpl b/view/field_input.tpl deleted file mode 100644 index 748d93f3ee..0000000000 --- a/view/field_input.tpl +++ /dev/null @@ -1,6 +0,0 @@ - -
- - - $field.3 -
diff --git a/view/field_intcheckbox.tpl b/view/field_intcheckbox.tpl deleted file mode 100644 index 47a513a55e..0000000000 --- a/view/field_intcheckbox.tpl +++ /dev/null @@ -1,6 +0,0 @@ - -
- - - $field.4 -
diff --git a/view/field_openid.tpl b/view/field_openid.tpl deleted file mode 100644 index acd93ff62d..0000000000 --- a/view/field_openid.tpl +++ /dev/null @@ -1,6 +0,0 @@ - -
- - - $field.3 -
diff --git a/view/field_password.tpl b/view/field_password.tpl deleted file mode 100644 index e604b7f5da..0000000000 --- a/view/field_password.tpl +++ /dev/null @@ -1,6 +0,0 @@ - -
- - - $field.3 -
diff --git a/view/field_radio.tpl b/view/field_radio.tpl deleted file mode 100644 index a915e8eb3c..0000000000 --- a/view/field_radio.tpl +++ /dev/null @@ -1,6 +0,0 @@ - -
- - - $field.3 -
diff --git a/view/field_richtext.tpl b/view/field_richtext.tpl deleted file mode 100644 index c124ee000e..0000000000 --- a/view/field_richtext.tpl +++ /dev/null @@ -1,6 +0,0 @@ - -
- - - $field.3 -
diff --git a/view/field_select.tpl b/view/field_select.tpl deleted file mode 100644 index d79eb48e0d..0000000000 --- a/view/field_select.tpl +++ /dev/null @@ -1,8 +0,0 @@ - -
- - - $field.3 -
diff --git a/view/field_select_raw.tpl b/view/field_select_raw.tpl deleted file mode 100644 index 765b285d99..0000000000 --- a/view/field_select_raw.tpl +++ /dev/null @@ -1,8 +0,0 @@ - -
- - - $field.3 -
diff --git a/view/field_textarea.tpl b/view/field_textarea.tpl deleted file mode 100644 index 2425cdd3b7..0000000000 --- a/view/field_textarea.tpl +++ /dev/null @@ -1,6 +0,0 @@ - -
- - - $field.3 -
diff --git a/view/field_themeselect.tpl b/view/field_themeselect.tpl deleted file mode 100644 index 654c18d450..0000000000 --- a/view/field_themeselect.tpl +++ /dev/null @@ -1,9 +0,0 @@ - -
- - - $field.3 -
-
diff --git a/view/field_yesno.tpl b/view/field_yesno.tpl deleted file mode 100644 index 5d4a775c29..0000000000 --- a/view/field_yesno.tpl +++ /dev/null @@ -1,13 +0,0 @@ - diff --git a/view/fileas_widget.tpl b/view/fileas_widget.tpl deleted file mode 100644 index 54fba7435f..0000000000 --- a/view/fileas_widget.tpl +++ /dev/null @@ -1,12 +0,0 @@ -
-

$title

-
$desc
- - - -
diff --git a/view/filebrowser.tpl b/view/filebrowser.tpl deleted file mode 100644 index 7db31d716f..0000000000 --- a/view/filebrowser.tpl +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - -
-
    -
  • FileBrowser
  • -
-
-
- -
-
- {{ for $path as $p }}$p.1{{ endfor }} -
-
-
    - {{ for $folders as $f }}
  • $f.1
  • {{ endfor }} -
-
-
-
    - {{ for $files as $f }} -
  • $f.1
  • - {{ endfor }} -
-
-
-
-
- -
- - - diff --git a/view/filer_dialog.tpl b/view/filer_dialog.tpl deleted file mode 100644 index ae837d6b74..0000000000 --- a/view/filer_dialog.tpl +++ /dev/null @@ -1,4 +0,0 @@ -{{ inc field_combobox.tpl }}{{ endinc }} -
- -
diff --git a/view/follow.tpl b/view/follow.tpl deleted file mode 100644 index d6f3261307..0000000000 --- a/view/follow.tpl +++ /dev/null @@ -1,8 +0,0 @@ -
-

$connect

-
$desc
-
- -
-
- diff --git a/view/follow_slap.tpl b/view/follow_slap.tpl deleted file mode 100644 index 0d0889f7db..0000000000 --- a/view/follow_slap.tpl +++ /dev/null @@ -1,25 +0,0 @@ - - - $name - $profile_page - - - - - $item_id - $title - $published - $content - - - http://activitystrea.ms/schema/1.0/person - $profile_page - - - - $nick - $name - - $verb - $ostat_follow - diff --git a/view/generic_links_widget.tpl b/view/generic_links_widget.tpl deleted file mode 100644 index f3404f783f..0000000000 --- a/view/generic_links_widget.tpl +++ /dev/null @@ -1,11 +0,0 @@ -
- {{if $title}}

$title

{{endif}} - {{if $desc}}
$desc
{{endif}} - -
    - {{ for $items as $item }} -
  • $item.label
  • - {{ endfor }} -
- -
diff --git a/view/group_drop.tpl b/view/group_drop.tpl deleted file mode 100644 index 2cbebbb8e5..0000000000 --- a/view/group_drop.tpl +++ /dev/null @@ -1,9 +0,0 @@ -
- -
-
diff --git a/view/group_edit.tpl b/view/group_edit.tpl deleted file mode 100644 index 2fa2b1a552..0000000000 --- a/view/group_edit.tpl +++ /dev/null @@ -1,23 +0,0 @@ -

$title

- - -
-
- - - {{ inc field_input.tpl with $field=$gname }}{{ endinc }} - {{ if $drop }}$drop{{ endif }} -
- -
-
-
-
- - -{{ if $groupeditor }} -
- {{ inc groupeditor.tpl }}{{ endinc }} -
-{{ endif }} -{{ if $desc }}
$desc
{{ endif }} diff --git a/view/group_selection.tpl b/view/group_selection.tpl deleted file mode 100644 index 3809cb9946..0000000000 --- a/view/group_selection.tpl +++ /dev/null @@ -1,8 +0,0 @@ -
- - -
diff --git a/view/group_side.tpl b/view/group_side.tpl deleted file mode 100644 index ebb194d9c0..0000000000 --- a/view/group_side.tpl +++ /dev/null @@ -1,33 +0,0 @@ -
-

$title

- - - - {{ if $ungrouped }} - - {{ endif }} -
- - diff --git a/view/groupeditor.tpl b/view/groupeditor.tpl deleted file mode 100644 index 755985eb35..0000000000 --- a/view/groupeditor.tpl +++ /dev/null @@ -1,16 +0,0 @@ -
-

$groupeditor.label_members

-
-{{ for $groupeditor.members as $c}} $c {{ endfor }} -
-
-
-
- -
-

$groupeditor.label_contacts

-
-{{ for $groupeditor.contacts as $m}} $m {{ endfor }} -
-
-
diff --git a/view/head.tpl b/view/head.tpl deleted file mode 100644 index 7b1ed7de93..0000000000 --- a/view/head.tpl +++ /dev/null @@ -1,112 +0,0 @@ - - - -{##} - - - - - - - - - - - - - - - - - -{##} - - - - - - - - - diff --git a/view/hide_comments.tpl b/view/hide_comments.tpl deleted file mode 100644 index 55ee9dd7b1..0000000000 --- a/view/hide_comments.tpl +++ /dev/null @@ -1,4 +0,0 @@ -
-$num_comments $hide_text -
-
diff --git a/view/install.tpl b/view/install.tpl deleted file mode 100644 index b3a5f46fff..0000000000 --- a/view/install.tpl +++ /dev/null @@ -1,10 +0,0 @@ - -

$title

-

$pass

- - -{{ if $status }} -

$status

-{{ endif }} - -$text diff --git a/view/install_checks.tpl b/view/install_checks.tpl deleted file mode 100644 index a3aa2b2660..0000000000 --- a/view/install_checks.tpl +++ /dev/null @@ -1,24 +0,0 @@ -

$title

-

$pass

-
- -{{ for $checks as $check }} - - {{if $check.help }} - - {{endif}} -{{ endfor }} -
$check.title {{if $check.required}}(required){{endif}}
$check.help
- -{{ if $phpath }} - -{{ endif }} - -{{ if $passed }} - - -{{ else }} - - -{{ endif }} -
diff --git a/view/install_db.tpl b/view/install_db.tpl deleted file mode 100644 index 1302b5a708..0000000000 --- a/view/install_db.tpl +++ /dev/null @@ -1,30 +0,0 @@ - -

$title

-

$pass

- - -

-$info_01
-$info_02
-$info_03 -

- -{{ if $status }} -

$status

-{{ endif }} - -
- - - - -{{ 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}} - - - - -
- diff --git a/view/install_settings.tpl b/view/install_settings.tpl deleted file mode 100644 index 05b87f904e..0000000000 --- a/view/install_settings.tpl +++ /dev/null @@ -1,25 +0,0 @@ - -

$title

-

$pass

- - -{{ if $status }} -

$status

-{{ endif }} - -
- - - - - - - - -{{ inc field_input.tpl with $field=$adminmail }}{{endinc}} -$timezone - - - -
- diff --git a/view/intros.tpl b/view/intros.tpl deleted file mode 100644 index e7fd53ca4f..0000000000 --- a/view/intros.tpl +++ /dev/null @@ -1,28 +0,0 @@ - -
- -

$str_notifytype $notify_type

-
$fullname
-$fullname -
$knowyou
-
$note
-
-
- - -
-
- -
-{{inc field_checkbox.tpl with $field=$hidden }}{{endinc}} -{{inc field_checkbox.tpl with $field=$activity }}{{endinc}} - - - - -$dfrn_text - - -
-
-
diff --git a/view/invite.tpl b/view/invite.tpl deleted file mode 100644 index e00d27d4ae..0000000000 --- a/view/invite.tpl +++ /dev/null @@ -1,30 +0,0 @@ -
- - - -
- -

$invite

- -
-$addr_text -
- -
- -
- -
-$msg_text -
- -
- -
- -
- -
- -
-
diff --git a/view/jot-end.tpl b/view/jot-end.tpl deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/view/jot-header.tpl b/view/jot-header.tpl deleted file mode 100644 index a442c4c648..0000000000 --- a/view/jot-header.tpl +++ /dev/null @@ -1,322 +0,0 @@ - - - - - diff --git a/view/jot.tpl b/view/jot.tpl deleted file mode 100644 index 61d7273070..0000000000 --- a/view/jot.tpl +++ /dev/null @@ -1,88 +0,0 @@ - -
-
-
 
-
-
-
- -
- - - - - - - - -
- {{ if $placeholdercategory }} -
- {{ endif }} -
- - -
- -
- - -
-
-
-
-
-
- - -
- -
-
- -
-
- -
- - -
- $bang -
- - $preview - -
- - -
- $jotplugins -
- -
- -
- - - -
-
- $acl -
-
$emailcc
-
- $jotnets -
-
- - -
- -
-
-
- {{ if $content }}{{ endif }} diff --git a/view/jot_geotag.tpl b/view/jot_geotag.tpl deleted file mode 100644 index b0f71e73bf..0000000000 --- a/view/jot_geotag.tpl +++ /dev/null @@ -1,8 +0,0 @@ - - if(navigator.geolocation) { - navigator.geolocation.getCurrentPosition(function(position) { - $('#jot-coord').val(position.coords.latitude + ' ' + position.coords.longitude); - $('#profile-nolocation-wrapper').show(); - }); - } - diff --git a/view/lang_selector.tpl b/view/lang_selector.tpl deleted file mode 100644 index b3a527b40f..0000000000 --- a/view/lang_selector.tpl +++ /dev/null @@ -1,10 +0,0 @@ -
lang
- diff --git a/view/like_noshare.tpl b/view/like_noshare.tpl deleted file mode 100644 index 777b2e3594..0000000000 --- a/view/like_noshare.tpl +++ /dev/null @@ -1,7 +0,0 @@ - diff --git a/view/login.tpl b/view/login.tpl deleted file mode 100644 index 297b36c9ac..0000000000 --- a/view/login.tpl +++ /dev/null @@ -1,35 +0,0 @@ - -
- - -
- {{ inc field_input.tpl with $field=$lname }}{{ endinc }} - {{ inc field_password.tpl with $field=$lpassword }}{{ endinc }} -
- - {{ if $openid }} -
- {{ inc field_openid.tpl with $field=$lopenid }}{{ endinc }} -
- {{ endif }} - - {{ inc field_checkbox.tpl with $field=$lremember }}{{ endinc }} - - - -
- -
- - {{ for $hiddens as $k=>$v }} - - {{ endfor }} - - -
- - - diff --git a/view/login_head.tpl b/view/login_head.tpl deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/view/logout.tpl b/view/logout.tpl deleted file mode 100644 index efc971df84..0000000000 --- a/view/logout.tpl +++ /dev/null @@ -1,6 +0,0 @@ -
-
- - -
-
diff --git a/view/lostpass.tpl b/view/lostpass.tpl deleted file mode 100644 index cd3644157a..0000000000 --- a/view/lostpass.tpl +++ /dev/null @@ -1,18 +0,0 @@ -

$title

- -

-$desc -

- -
-
- - -
-
-
- -
-
-
- diff --git a/view/magicsig.tpl b/view/magicsig.tpl deleted file mode 100644 index 75f9bc475b..0000000000 --- a/view/magicsig.tpl +++ /dev/null @@ -1,9 +0,0 @@ - - - -$data - -$encoding -$algorithm -$signature - diff --git a/view/mail_conv.tpl b/view/mail_conv.tpl deleted file mode 100644 index 75a4506f6a..0000000000 --- a/view/mail_conv.tpl +++ /dev/null @@ -1,14 +0,0 @@ -
-
- $mail.from_name -
-
-
$mail.from_name
-
$mail.date
-
$mail.subject
-
$mail.body
-
-
-
-
-
diff --git a/view/mail_display.tpl b/view/mail_display.tpl deleted file mode 100644 index b328d32a27..0000000000 --- a/view/mail_display.tpl +++ /dev/null @@ -1,10 +0,0 @@ - -{{ for $mails as $mail }} - {{ inc mail_conv.tpl }}{{endinc}} -{{ endfor }} - -{{ if $canreply }} -{{ inc prv_message.tpl }}{{ endinc }} -{{ else }} -$unknown_text -{{endif }} diff --git a/view/mail_head.tpl b/view/mail_head.tpl deleted file mode 100644 index afb65f5373..0000000000 --- a/view/mail_head.tpl +++ /dev/null @@ -1,3 +0,0 @@ -

$messages

- -$tab_content diff --git a/view/mail_list.tpl b/view/mail_list.tpl deleted file mode 100644 index 22e35dec81..0000000000 --- a/view/mail_list.tpl +++ /dev/null @@ -1,16 +0,0 @@ -
-
- $from_name -
-
-
$from_name
-
$date
- -
- -
-
-
-
- -
diff --git a/view/maintenance.tpl b/view/maintenance.tpl deleted file mode 100644 index bbe15d46a8..0000000000 --- a/view/maintenance.tpl +++ /dev/null @@ -1 +0,0 @@ -
$sysdown
diff --git a/view/manage.tpl b/view/manage.tpl deleted file mode 100644 index 24497b42c6..0000000000 --- a/view/manage.tpl +++ /dev/null @@ -1,17 +0,0 @@ -

$title

-
$desc
-
$choose
-
-
- -
- - {##} -
- diff --git a/view/match.tpl b/view/match.tpl deleted file mode 100644 index b052845ae7..0000000000 --- a/view/match.tpl +++ /dev/null @@ -1,16 +0,0 @@ -
-
- - $name - -
-
-
- $name -
-
- {{ if $connlnk }} - - {{ endif }} - -
diff --git a/view/message-end.tpl b/view/message-end.tpl deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/view/message-head.tpl b/view/message-head.tpl deleted file mode 100644 index 91c322fda4..0000000000 --- a/view/message-head.tpl +++ /dev/null @@ -1,17 +0,0 @@ - - - - diff --git a/view/message_side.tpl b/view/message_side.tpl deleted file mode 100644 index fce771bd5d..0000000000 --- a/view/message_side.tpl +++ /dev/null @@ -1,10 +0,0 @@ -
- - -
    - {{ for $tabs as $t }} -
  • $t.label
  • - {{ endfor }} -
- -
diff --git a/view/moderated_comment.tpl b/view/moderated_comment.tpl deleted file mode 100644 index 911c35f33e..0000000000 --- a/view/moderated_comment.tpl +++ /dev/null @@ -1,34 +0,0 @@ -
-
- - - - - - - -
- $mytitle -
-
- - - -
- - -
-
- -
diff --git a/view/mood_content.tpl b/view/mood_content.tpl deleted file mode 100644 index 9349c56aef..0000000000 --- a/view/mood_content.tpl +++ /dev/null @@ -1,20 +0,0 @@ -

$title

- -
$desc
- -
-
-
- - - - -
-
- -
- diff --git a/view/msg-end.tpl b/view/msg-end.tpl deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/view/msg-header.tpl b/view/msg-header.tpl deleted file mode 100644 index 8517ef3832..0000000000 --- a/view/msg-header.tpl +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - diff --git a/view/nav.tpl b/view/nav.tpl deleted file mode 100644 index 04c4931fc6..0000000000 --- a/view/nav.tpl +++ /dev/null @@ -1,68 +0,0 @@ - - - diff --git a/view/navigation.tpl b/view/navigation.tpl deleted file mode 100644 index 3e03efa30a..0000000000 --- a/view/navigation.tpl +++ /dev/null @@ -1,103 +0,0 @@ -{# - # LOGIN/REGISTER - #} -
-{# Use nested if's since the Friendica template engine doesn't support AND or OR in if statements #} -{{ if $nav.login }} - -{{ endif }} -{{ endif }} - -{# - # NETWORK/HOME - #} -{{ if $nav.network }} - -{{ endif }} -{{ endif }} -{{ endif }} - -{# - # PRIVATE MESSAGES - #} -{{ if $nav.messages }} - -{{ endif }} - - -{# - # CONTACTS - #} - - -{# - # NOTIFICATIONS - #} -{{ if $nav.notifications }} - -{{ endif }} - -{# - # MISCELLANEOUS - #} - - -{{ if $nav.logout }}$nav.logout.1
{{ endif }} -
diff --git a/view/netfriend.tpl b/view/netfriend.tpl deleted file mode 100644 index c2a92ce9ed..0000000000 --- a/view/netfriend.tpl +++ /dev/null @@ -1,14 +0,0 @@ -
$approve_as
- -
- - -
-
-
-
- - -
-
-
diff --git a/view/nets.tpl b/view/nets.tpl deleted file mode 100644 index 920c2332b6..0000000000 --- a/view/nets.tpl +++ /dev/null @@ -1,10 +0,0 @@ -
-

$title

-
$desc
- $all -
    - {{ for $nets as $net }} -
  • $net.name
  • - {{ endfor }} -
-
diff --git a/view/nogroup-template.tpl b/view/nogroup-template.tpl deleted file mode 100644 index dd00ed097a..0000000000 --- a/view/nogroup-template.tpl +++ /dev/null @@ -1,12 +0,0 @@ -

$header

- -{{ for $contacts as $contact }} - {{ inc contact_template.tpl }}{{ endinc }} -{{ endfor }} -
- -$paginate - - - - diff --git a/view/notifications.tpl b/view/notifications.tpl deleted file mode 100644 index 1a13b68b90..0000000000 --- a/view/notifications.tpl +++ /dev/null @@ -1,8 +0,0 @@ - -

$notif_header

- -{{ inc common_tabs.tpl }}{{ endinc }} - -
- $notif_content -
diff --git a/view/notifications_comments_item.tpl b/view/notifications_comments_item.tpl deleted file mode 100644 index 73cc9f9480..0000000000 --- a/view/notifications_comments_item.tpl +++ /dev/null @@ -1,3 +0,0 @@ - \ No newline at end of file diff --git a/view/notifications_dislikes_item.tpl b/view/notifications_dislikes_item.tpl deleted file mode 100644 index 73cc9f9480..0000000000 --- a/view/notifications_dislikes_item.tpl +++ /dev/null @@ -1,3 +0,0 @@ - \ No newline at end of file diff --git a/view/notifications_friends_item.tpl b/view/notifications_friends_item.tpl deleted file mode 100644 index 73cc9f9480..0000000000 --- a/view/notifications_friends_item.tpl +++ /dev/null @@ -1,3 +0,0 @@ - \ No newline at end of file diff --git a/view/notifications_likes_item.tpl b/view/notifications_likes_item.tpl deleted file mode 100644 index 389144d9b1..0000000000 --- a/view/notifications_likes_item.tpl +++ /dev/null @@ -1,3 +0,0 @@ - \ No newline at end of file diff --git a/view/notifications_network_item.tpl b/view/notifications_network_item.tpl deleted file mode 100644 index 261ab36432..0000000000 --- a/view/notifications_network_item.tpl +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/view/notifications_posts_item.tpl b/view/notifications_posts_item.tpl deleted file mode 100644 index 73cc9f9480..0000000000 --- a/view/notifications_posts_item.tpl +++ /dev/null @@ -1,3 +0,0 @@ - \ No newline at end of file diff --git a/view/notify.tpl b/view/notify.tpl deleted file mode 100644 index 73cc9f9480..0000000000 --- a/view/notify.tpl +++ /dev/null @@ -1,3 +0,0 @@ - \ No newline at end of file diff --git a/view/oauth_authorize.tpl b/view/oauth_authorize.tpl deleted file mode 100644 index 31f02ac505..0000000000 --- a/view/oauth_authorize.tpl +++ /dev/null @@ -1,10 +0,0 @@ -

$title

- -
- -

$app.name

-
-

$authorize

-
-
-
diff --git a/view/oauth_authorize_done.tpl b/view/oauth_authorize_done.tpl deleted file mode 100644 index 51eaea2484..0000000000 --- a/view/oauth_authorize_done.tpl +++ /dev/null @@ -1,4 +0,0 @@ -

$title

- -

$info

-$code diff --git a/view/oembed_video.tpl b/view/oembed_video.tpl deleted file mode 100755 index d3a9a93113..0000000000 --- a/view/oembed_video.tpl +++ /dev/null @@ -1,4 +0,0 @@ - - -
-
diff --git a/view/oexchange_xrd.tpl b/view/oexchange_xrd.tpl deleted file mode 100644 index 6735a3e04d..0000000000 --- a/view/oexchange_xrd.tpl +++ /dev/null @@ -1,33 +0,0 @@ - - - - $base - - Friendica - Friendica Social Network - Friendica - Send to Friendica - - - - - - - - diff --git a/view/opensearch.tpl b/view/opensearch.tpl deleted file mode 100644 index 4b5c01bc90..0000000000 --- a/view/opensearch.tpl +++ /dev/null @@ -1,13 +0,0 @@ - - - Friendica@$nodename - Search in Friendica@$nodename - http://bugs.friendica.com/ - $baseurl/images/friendica-16.png - $baseurl/images/friendica-64.png - - - \ No newline at end of file diff --git a/view/pagetypes.tpl b/view/pagetypes.tpl deleted file mode 100644 index c9022a1c14..0000000000 --- a/view/pagetypes.tpl +++ /dev/null @@ -1,5 +0,0 @@ - {{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}} diff --git a/view/peoplefind.tpl b/view/peoplefind.tpl deleted file mode 100644 index 3c2692d25e..0000000000 --- a/view/peoplefind.tpl +++ /dev/null @@ -1,14 +0,0 @@ -
-

$findpeople

-
$desc
-
- -
- - - - {{ if $inv }} - - {{ endif }} -
- diff --git a/view/photo_album.tpl b/view/photo_album.tpl deleted file mode 100644 index cc3dcfb9cc..0000000000 --- a/view/photo_album.tpl +++ /dev/null @@ -1,7 +0,0 @@ - -
diff --git a/view/photo_drop.tpl b/view/photo_drop.tpl deleted file mode 100644 index b4ea62b451..0000000000 --- a/view/photo_drop.tpl +++ /dev/null @@ -1,4 +0,0 @@ -
- -
-
diff --git a/view/photo_edit.tpl b/view/photo_edit.tpl deleted file mode 100644 index 53b69caae5..0000000000 --- a/view/photo_edit.tpl +++ /dev/null @@ -1,50 +0,0 @@ - -
- - - - - - -
- - - - -
- - - - -
-
-
- $rotatecw
- $rotateccw -
-
- -
-
- -
- - $permissions - -
- -
-
- $aclselect -
-
-
-
- - - - -
-
- - diff --git a/view/photo_edit_head.tpl b/view/photo_edit_head.tpl deleted file mode 100644 index c7a36c4ca6..0000000000 --- a/view/photo_edit_head.tpl +++ /dev/null @@ -1,11 +0,0 @@ - - diff --git a/view/photo_item.tpl b/view/photo_item.tpl deleted file mode 100644 index 22884e848e..0000000000 --- a/view/photo_item.tpl +++ /dev/null @@ -1,22 +0,0 @@ -
-
- - $name -
- -
- $name -
$ago
-
-
-
$title
-
$body
-
- $drop -
-
- $comment - -
-
- diff --git a/view/photo_top.tpl b/view/photo_top.tpl deleted file mode 100644 index 155cab51d5..0000000000 --- a/view/photo_top.tpl +++ /dev/null @@ -1,8 +0,0 @@ - - - diff --git a/view/photo_view.tpl b/view/photo_view.tpl deleted file mode 100644 index 732caf6900..0000000000 --- a/view/photo_view.tpl +++ /dev/null @@ -1,37 +0,0 @@ -
-

$album.1

- - - -{{ if $prevlink }}{{ endif }} -
-{{ if $nextlink }}{{ endif }} -
-
$desc
-{{ if $tags }} -
$tags.0
-
$tags.1
-{{ endif }} -{{ if $tags.2 }}{{ endif }} - -{{ if $edit }}$edit{{ endif }} - -{{ if $likebuttons }} -
- $likebuttons - $like - $dislike -
-{{ endif }} - -$comments - -$paginate - diff --git a/view/photos_default_uploader_box.tpl b/view/photos_default_uploader_box.tpl deleted file mode 100644 index 2f1f69a50d..0000000000 --- a/view/photos_default_uploader_box.tpl +++ /dev/null @@ -1 +0,0 @@ - diff --git a/view/photos_default_uploader_submit.tpl b/view/photos_default_uploader_submit.tpl deleted file mode 100644 index cacb416569..0000000000 --- a/view/photos_default_uploader_submit.tpl +++ /dev/null @@ -1,3 +0,0 @@ -
- -
diff --git a/view/photos_head.tpl b/view/photos_head.tpl deleted file mode 100644 index 2f5de0f159..0000000000 --- a/view/photos_head.tpl +++ /dev/null @@ -1,26 +0,0 @@ - - - diff --git a/view/photos_recent.tpl b/view/photos_recent.tpl deleted file mode 100644 index 1df78cb7be..0000000000 --- a/view/photos_recent.tpl +++ /dev/null @@ -1,11 +0,0 @@ -

$title

-{{ if $can_post }} -$upload.0 -{{ endif }} - -
-{{ for $photos as $photo }} - {{ inc photo_top.tpl }}{{ endinc }} -{{ endfor }} -
-
diff --git a/view/photos_upload.tpl b/view/photos_upload.tpl deleted file mode 100644 index 7de8d8ab74..0000000000 --- a/view/photos_upload.tpl +++ /dev/null @@ -1,49 +0,0 @@ -

$pagename

- -
$usage
- -
-
-
- -
- -
-
-
-
$existalbumtext
- -
-
- -
- - -
- - - -
- -
-
- $aclselect -
-
- -
- - $alt_uploader - - $default_upload_box - $default_upload_submit - -
-
- diff --git a/view/poco_entry_xml.tpl b/view/poco_entry_xml.tpl deleted file mode 100644 index 4d84cee416..0000000000 --- a/view/poco_entry_xml.tpl +++ /dev/null @@ -1,7 +0,0 @@ - -{{ if $entry.id }}$entry.id{{ endif }} -{{ if $entry.displayName }}$entry.displayName{{ endif }} -{{ if $entry.preferredUsername }}$entry.preferredUsername{{ endif }} -{{ if $entry.urls }}{{ for $entry.urls as $url }}$url.value$url.type{{ endfor }}{{ endif }} -{{ if $entry.photos }}{{ for $entry.photos as $photo }}$photo.value$photo.type{{ endfor }}{{ endif }} - diff --git a/view/poco_xml.tpl b/view/poco_xml.tpl deleted file mode 100644 index 9549b695d1..0000000000 --- a/view/poco_xml.tpl +++ /dev/null @@ -1,18 +0,0 @@ - - -{{ if $response.sorted }}$response.sorted{{ endif }} -{{ if $response.filtered }}$response.filtered{{ endif }} -{{ if $response.updatedSince }}$response.updatedSince{{ endif }} -$response.startIndex -$response.itemsPerPage -$response.totalResults - - -{{ if $response.totalResults }} -{{ for $response.entry as $entry }} -{{ inc poco_entry_xml.tpl }}{{ endinc }} -{{ endfor }} -{{ else }} - -{{ endif }} - diff --git a/view/poke_content.tpl b/view/poke_content.tpl deleted file mode 100644 index b9e089f5b3..0000000000 --- a/view/poke_content.tpl +++ /dev/null @@ -1,32 +0,0 @@ -

$title

- -
$desc
- -
-
-
- -
$clabel
-
- - - -
-
-
$choice
-
-
- -
-
-
$prv_desc
- -
-
- -
- diff --git a/view/posted_date_widget.tpl b/view/posted_date_widget.tpl deleted file mode 100644 index 3e2ee5a3ed..0000000000 --- a/view/posted_date_widget.tpl +++ /dev/null @@ -1,9 +0,0 @@ -
-

$title

- - -
diff --git a/view/profed_end.tpl b/view/profed_end.tpl deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/view/profed_head.tpl b/view/profed_head.tpl deleted file mode 100644 index 753e2fa5f3..0000000000 --- a/view/profed_head.tpl +++ /dev/null @@ -1,38 +0,0 @@ - - - - - diff --git a/view/profile-hide-friends.tpl b/view/profile-hide-friends.tpl deleted file mode 100644 index 9ecacfbe0f..0000000000 --- a/view/profile-hide-friends.tpl +++ /dev/null @@ -1,16 +0,0 @@ -

-$desc -

- -
- - - -
-
-
- - - -
-
diff --git a/view/profile-hide-wall.tpl b/view/profile-hide-wall.tpl deleted file mode 100644 index 10185e243d..0000000000 --- a/view/profile-hide-wall.tpl +++ /dev/null @@ -1,16 +0,0 @@ -

-$desc -

- -
- - - -
-
-
- - - -
-
diff --git a/view/profile-in-directory.tpl b/view/profile-in-directory.tpl deleted file mode 100644 index 56b28d37e3..0000000000 --- a/view/profile-in-directory.tpl +++ /dev/null @@ -1,16 +0,0 @@ -

-$desc -

- -
- - - -
-
-
- - - -
-
diff --git a/view/profile-in-netdir.tpl b/view/profile-in-netdir.tpl deleted file mode 100644 index 882ad2d17c..0000000000 --- a/view/profile-in-netdir.tpl +++ /dev/null @@ -1,16 +0,0 @@ -

-$desc -

- -
- - - -
-
-
- - - -
-
diff --git a/view/profile_advanced.tpl b/view/profile_advanced.tpl deleted file mode 100644 index b02b7f27de..0000000000 --- a/view/profile_advanced.tpl +++ /dev/null @@ -1,170 +0,0 @@ -

$title

- -
-
$profile.fullname.0
-
$profile.fullname.1
-
- -{{ if $profile.gender }} -
-
$profile.gender.0
-
$profile.gender.1
-
-{{ endif }} - -{{ if $profile.birthday }} -
-
$profile.birthday.0
-
$profile.birthday.1
-
-{{ endif }} - -{{ if $profile.age }} -
-
$profile.age.0
-
$profile.age.1
-
-{{ endif }} - -{{ if $profile.marital }} -
-
$profile.marital.0
-
$profile.marital.1{{ if $profile.marital.with }} ($profile.marital.with){{ endif }}{{ if $profile.howlong }} $profile.howlong{{ endif }}
-
-{{ endif }} - -{{ if $profile.sexual }} -
-
$profile.sexual.0
-
$profile.sexual.1
-
-{{ endif }} - -{{ if $profile.pub_keywords }} -
-
$profile.pub_keywords.0
-
$profile.pub_keywords.1
-
-{{ endif }} - -{{ if $profile.homepage }} -
-
$profile.homepage.0
-
$profile.homepage.1
-
-{{ endif }} - -{{ if $profile.hometown }} -
-
$profile.hometown.0
-
$profile.hometown.1
-
-{{ endif }} - -{{ if $profile.politic }} -
-
$profile.politic.0
-
$profile.politic.1
-
-{{ endif }} - -{{ if $profile.religion }} -
-
$profile.religion.0
-
$profile.religion.1
-
-{{ endif }} - -{{ if $profile.about }} -
-
$profile.about.0
-
$profile.about.1
-
-{{ endif }} - -{{ if $profile.interest }} -
-
$profile.interest.0
-
$profile.interest.1
-
-{{ endif }} - -{{ if $profile.likes }} -
-
$profile.likes.0
-
$profile.likes.1
-
-{{ endif }} - -{{ if $profile.dislikes }} -
-
$profile.dislikes.0
-
$profile.dislikes.1
-
-{{ endif }} - -{{ if $profile.contact }} -
-
$profile.contact.0
-
$profile.contact.1
-
-{{ endif }} - - -{{ if $profile.music }} -
-
$profile.music.0
-
$profile.music.1
-
-{{ endif }} - - -{{ if $profile.book }} -
-
$profile.book.0
-
$profile.book.1
-
-{{ endif }} - - -{{ if $profile.tv }} -
-
$profile.tv.0
-
$profile.tv.1
-
-{{ endif }} - - -{{ if $profile.film }} -
-
$profile.film.0
-
$profile.film.1
-
-{{ endif }} - - -{{ if $profile.romance }} -
-
$profile.romance.0
-
$profile.romance.1
-
-{{ endif }} - - -{{ if $profile.work }} -
-
$profile.work.0
-
$profile.work.1
-
-{{ endif }} - -{{ if $profile.education }} -
-
$profile.education.0
-
$profile.education.1
-
-{{ endif }} - - - - diff --git a/view/profile_edit.tpl b/view/profile_edit.tpl deleted file mode 100644 index 4df6ecc694..0000000000 --- a/view/profile_edit.tpl +++ /dev/null @@ -1,323 +0,0 @@ -$default - -

$banner

- - - - - - -
-
- - -
- -
*
-
-
- -
- - -
-
- -
- - -
-
- - -
- -$gender -
-
- -
- -
-$dob $age -
-
-
- -$hide_friends - -
- -
-
- - -
- - -
-
- -
- - -
-
- - -
- - -
-
- -
- - -
-
- -
- - -
-
- -
- - -
-
- -
- -
-
- -
- -$marital -
- - - - - -
- -
- -$sexual -
-
- - - -
- - -
-
- -
- - -
-
- -
- - -
-
- -
- - -
$lbl_pubdsc
-
- -
- - -
$lbl_prvdsc
-
- - -
- -
-
- -
-

-$lbl_about -

- - - -
-
- - -
-

-$lbl_hobbies -

- - - -
-
- - -
-

-$lbl_likes -

- - - -
-
- - -
-

-$lbl_dislikes -

- - - -
-
- - -
-

-$lbl_social -

- - - -
-
- - -
- -
-
- - -
-

-$lbl_music -

- - - -
-
- -
-

-$lbl_book -

- - - -
-
- - - -
-

-$lbl_tv -

- - - -
-
- - - -
-

-$lbl_film -

- - - -
-
- - -
- -
-
- - -
-

-$lbl_love -

- - - -
-
- - - -
-

-$lbl_work -

- - - -
-
- - - -
-

-$lbl_school -

- - - -
-
- - - -
- -
-
- - -
-
- diff --git a/view/profile_edlink.tpl b/view/profile_edlink.tpl deleted file mode 100644 index ea787b9f53..0000000000 --- a/view/profile_edlink.tpl +++ /dev/null @@ -1,2 +0,0 @@ -
-
\ No newline at end of file diff --git a/view/profile_entry.tpl b/view/profile_entry.tpl deleted file mode 100644 index 7ff6d685b8..0000000000 --- a/view/profile_entry.tpl +++ /dev/null @@ -1,11 +0,0 @@ - -
-
-$alt -
-
- -
$visible
-
-
- diff --git a/view/profile_listing_header.tpl b/view/profile_listing_header.tpl deleted file mode 100644 index 61a2737929..0000000000 --- a/view/profile_listing_header.tpl +++ /dev/null @@ -1,8 +0,0 @@ -

$header

-

-$chg_photo -

- - diff --git a/view/profile_photo.tpl b/view/profile_photo.tpl deleted file mode 100644 index 04ee8f9167..0000000000 --- a/view/profile_photo.tpl +++ /dev/null @@ -1,26 +0,0 @@ -

$title

- -
- - -
- - -
- - - - -
- -
- -
- - \ No newline at end of file diff --git a/view/profile_publish.tpl b/view/profile_publish.tpl deleted file mode 100644 index 8fd0bc913b..0000000000 --- a/view/profile_publish.tpl +++ /dev/null @@ -1,16 +0,0 @@ -

-$pubdesc -

- -
- - - -
-
-
- - - -
-
diff --git a/view/profile_vcard.tpl b/view/profile_vcard.tpl deleted file mode 100644 index 6e137f28fa..0000000000 --- a/view/profile_vcard.tpl +++ /dev/null @@ -1,50 +0,0 @@ -
- -
$profile.name
- - - - {{ if $pdesc }}
$profile.pdesc
{{ endif }} -
$profile.name
- - - - {{ if $location }} -
$location
-
- {{ if $profile.address }}
$profile.address
{{ endif }} - - $profile.locality{{ if $profile.locality }}, {{ endif }} - $profile.region - $profile.postal_code - - {{ if $profile.country_name }}$profile.country_name{{ endif }} -
-
- {{ endif }} - - {{ if $gender }}
$gender
$profile.gender
{{ endif }} - - {{ if $profile.pubkey }}{{ endif }} - - {{ if $marital }}
$marital
$profile.marital
{{ endif }} - - {{ if $homepage }}
$homepage
$profile.homepage
{{ endif }} - - {{ inc diaspora_vcard.tpl }}{{ endinc }} - - -
- -$contact_block - - diff --git a/view/prv_message.tpl b/view/prv_message.tpl deleted file mode 100644 index ecfef95d6b..0000000000 --- a/view/prv_message.tpl +++ /dev/null @@ -1,33 +0,0 @@ - -

$header

- -
-
- -$parent - -
$to
-$select - -
$subject
- - -
$yourmessage
- - - -
- -
-
-
- -
- -
-
-
-
-
diff --git a/view/pwdreset.tpl b/view/pwdreset.tpl deleted file mode 100644 index 497b93396d..0000000000 --- a/view/pwdreset.tpl +++ /dev/null @@ -1,17 +0,0 @@ -

$lbl1

- -

-$lbl2 -

-

-$lbl3 -

-

-$newpass -

-

-$lbl4 $lbl5 -

-

-$lbl6 -

diff --git a/view/register.tpl b/view/register.tpl deleted file mode 100644 index 2275356a21..0000000000 --- a/view/register.tpl +++ /dev/null @@ -1,65 +0,0 @@ -

$regtitle

- -
- - - - $registertext - -

$realpeople

- -

$fillwith

-

$fillext

- -{{ if $oidlabel }} -
- -
-
-{{ endif }} - -{{ if $invitations }} - -

$invite_desc

-
- - -
-
- -{{ endif }} - - -
- - -
-
- - -
- - -
-
- -

$nickdesc

- -
- -
@$sitename
-
-
- - $publish - -
- -
-
- -
- -$license - - diff --git a/view/remote_friends_common.tpl b/view/remote_friends_common.tpl deleted file mode 100644 index 9e0562878e..0000000000 --- a/view/remote_friends_common.tpl +++ /dev/null @@ -1,21 +0,0 @@ -
-
$desc      {{ if $linkmore }}$more{{ endif }}
- {{ if $items }} - {{ for $items as $item }} -
-
- - $item.name - -
-
- -
-
- {{ endfor }} - {{ endif }} -
-
- diff --git a/view/removeme.tpl b/view/removeme.tpl deleted file mode 100644 index a3ca8d4cfa..0000000000 --- a/view/removeme.tpl +++ /dev/null @@ -1,20 +0,0 @@ -

$title

- -
- -
$desc
- -
- - -
- - -
-
- - - -
-
- diff --git a/view/saved_searches_aside.tpl b/view/saved_searches_aside.tpl deleted file mode 100644 index e6a0d6278d..0000000000 --- a/view/saved_searches_aside.tpl +++ /dev/null @@ -1,14 +0,0 @@ -
- - $searchbox - -
    - {{ for $saved as $search }} -
  • - - $search.term -
  • - {{ endfor }} -
-
-
diff --git a/view/search_item.tpl b/view/search_item.tpl deleted file mode 100644 index 384f6087ac..0000000000 --- a/view/search_item.tpl +++ /dev/null @@ -1,64 +0,0 @@ - -
-
-
-
- - $item.name - menu -
-
    - $item.item_photo_menu -
-
-
-
-
- {{ if $item.lock }}
$item.lock
- {{ else }}
{{ endif }} -
$item.location
-
-
-
- $item.name -
$item.ago
- -
-
-
$item.title
-
-
$item.body
- {{ if $item.has_cats }} -
$item.txt_cats {{ for $item.categories as $cat }}$cat.name{{ if $cat.removeurl }} [$remove]{{ endif }} {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} -
- {{ endif }} - - {{ if $item.has_folders }} -
$item.txt_folders {{ for $item.folders as $cat }}$cat.name{{ if $cat.removeurl }} [$remove]{{ endif }}{{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} -
- {{ endif }} -
-
-
- {{ if $item.drop.dropping }}{{ endif }} -
- {{ if $item.drop.pagedrop }}{{ endif }} -
-
-
-
- - -
- {{ if $item.conv }} - $item.conv.title - {{ endif }} -
- -
- -
- - diff --git a/view/settings-end.tpl b/view/settings-end.tpl deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/view/settings-head.tpl b/view/settings-head.tpl deleted file mode 100644 index 2555bedc86..0000000000 --- a/view/settings-head.tpl +++ /dev/null @@ -1,25 +0,0 @@ - - - diff --git a/view/settings.tpl b/view/settings.tpl deleted file mode 100644 index 569ebcf101..0000000000 --- a/view/settings.tpl +++ /dev/null @@ -1,147 +0,0 @@ -

$ptitle

- -$nickname_block - -
- - -

$h_pass

- -{{inc field_password.tpl with $field=$password1 }}{{endinc}} -{{inc field_password.tpl with $field=$password2 }}{{endinc}} -{{inc field_password.tpl with $field=$password3 }}{{endinc}} - -{{ if $oid_enable }} -{{inc field_input.tpl with $field=$openid }}{{endinc}} -{{ endif }} - -
- -
- - -

$h_basic

- -{{inc field_input.tpl with $field=$username }}{{endinc}} -{{inc field_input.tpl with $field=$email }}{{endinc}} -{{inc field_password.tpl with $field=$password4 }}{{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}} - - -
- -
- - -

$h_prv

- - - - -{{inc field_input.tpl with $field=$maxreq }}{{endinc}} - -$profile_in_dir - -$profile_in_net_dir - -$hide_friends - -$hide_wall - -$blockwall - -$blocktags - -$suggestme - -$unkmail - - -{{inc field_input.tpl with $field=$cntunkmail }}{{endinc}} - -{{inc field_input.tpl with $field=$expire.days }}{{endinc}} - - -
- $expire.label -
-
-

$expire.advanced

- {{ 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}} -
-
- -
- - -
- $permissions $permdesc -
- - -
-
-
- -$group_select - - -
- -
- - - -

$h_not

-
- -
$activity_options
- -{{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}} - - -
$lbl_not
- -
-{{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}} -
- -
- -
- -
- - -

$h_advn

-
$h_descadvn
- -$pagetype - -
- -
- - diff --git a/view/settings_addons.tpl b/view/settings_addons.tpl deleted file mode 100644 index 84171dc8db..0000000000 --- a/view/settings_addons.tpl +++ /dev/null @@ -1,10 +0,0 @@ -

$title

- - - - - -$settings_addons - -
- diff --git a/view/settings_connectors.tpl b/view/settings_connectors.tpl deleted file mode 100644 index bd3d60f0f4..0000000000 --- a/view/settings_connectors.tpl +++ /dev/null @@ -1,35 +0,0 @@ -

$title

- -
$diasp_enabled
-
$ostat_enabled
- -
- - -$settings_connectors - -{{ if $mail_disabled }} - -{{ else }} -
-

$h_imap

-

$imap_desc

- {{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}} - -
- -
-
-{{ endif }} - -
- diff --git a/view/settings_display.tpl b/view/settings_display.tpl deleted file mode 100644 index 24fc110270..0000000000 --- a/view/settings_display.tpl +++ /dev/null @@ -1,22 +0,0 @@ -

$ptitle

- -
- - -{{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}} - - -
- -
- -{{ if $theme_config }} -

Theme settings

-$theme_config -{{ endif }} - -
diff --git a/view/settings_display_end.tpl b/view/settings_display_end.tpl deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/view/settings_features.tpl b/view/settings_features.tpl deleted file mode 100644 index 1b106d4111..0000000000 --- a/view/settings_features.tpl +++ /dev/null @@ -1,20 +0,0 @@ -

$title

- - -
- - -{{ for $features as $f }} -

$f.0

- -{{ for $f.1 as $fcat }} - {{ inc field_yesno.tpl with $field=$fcat }}{{endinc}} -{{ endfor }} -{{ endfor }} - -
- -
- -
- diff --git a/view/settings_nick_set.tpl b/view/settings_nick_set.tpl deleted file mode 100644 index eb4721d50d..0000000000 --- a/view/settings_nick_set.tpl +++ /dev/null @@ -1,5 +0,0 @@ - -
-
$desc '$nickname@$basepath'$subdir
-
-
diff --git a/view/settings_nick_subdir.tpl b/view/settings_nick_subdir.tpl deleted file mode 100644 index 303c24df71..0000000000 --- a/view/settings_nick_subdir.tpl +++ /dev/null @@ -1,6 +0,0 @@ -

-It appears that your website is located in a subdirectory of the
-$hostname website, so this setting may not work reliably.
-

-

If you have any issues, you may have better results using the profile
address '$baseurl/profile/$nickname'. -

\ No newline at end of file diff --git a/view/settings_oauth.tpl b/view/settings_oauth.tpl deleted file mode 100644 index 890c4ee6c8..0000000000 --- a/view/settings_oauth.tpl +++ /dev/null @@ -1,31 +0,0 @@ -

$title

- - -
- - - - - {{ for $apps as $app }} -
- - {{ if $app.name }}

$app.name

{{ else }}

$noname

{{ endif }} - {{ if $app.my }} - {{ if $app.oauth_token }} -
- {{ endif }} - {{ endif }} - {{ if $app.my }} -   -   - {{ endif }} -
- {{ endfor }} - -
diff --git a/view/settings_oauth_edit.tpl b/view/settings_oauth_edit.tpl deleted file mode 100644 index e6f2abdc24..0000000000 --- a/view/settings_oauth_edit.tpl +++ /dev/null @@ -1,17 +0,0 @@ -

$title

- -
- - -{{ 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 }} - -
- - -
- -
diff --git a/view/suggest_friends.tpl b/view/suggest_friends.tpl deleted file mode 100644 index e97b5e8cce..0000000000 --- a/view/suggest_friends.tpl +++ /dev/null @@ -1,16 +0,0 @@ -
- -
- - $name - -
-
-
- $name -
-
- {{ if $connlnk }} - - {{ endif }} -
\ No newline at end of file diff --git a/view/suggestions.tpl b/view/suggestions.tpl deleted file mode 100644 index 656336496c..0000000000 --- a/view/suggestions.tpl +++ /dev/null @@ -1,21 +0,0 @@ - -
- -

$str_notifytype $notify_type

-
$madeby
-
$fullname
-$fullname -
$note
-
-
- - -
-
- -
-{{inc field_checkbox.tpl with $field=$hidden }}{{endinc}} - -
-
-
diff --git a/view/tag_slap.tpl b/view/tag_slap.tpl deleted file mode 100644 index 6449df4967..0000000000 --- a/view/tag_slap.tpl +++ /dev/null @@ -1,30 +0,0 @@ - - - $name - $profile_page - - - - - $item_id - $title - $published - $content - - - http://activitystrea.ms/schema/1.0/person - $profile_page - - - - $nick - $name - - $verb - - - - - - - diff --git a/view/smarty3/404.tpl b/view/templates/404.tpl similarity index 100% rename from view/smarty3/404.tpl rename to view/templates/404.tpl diff --git a/view/smarty3/acl_selector.tpl b/view/templates/acl_selector.tpl similarity index 100% rename from view/smarty3/acl_selector.tpl rename to view/templates/acl_selector.tpl diff --git a/view/smarty3/admin_aside.tpl b/view/templates/admin_aside.tpl similarity index 100% rename from view/smarty3/admin_aside.tpl rename to view/templates/admin_aside.tpl diff --git a/view/smarty3/admin_logs.tpl b/view/templates/admin_logs.tpl similarity index 100% rename from view/smarty3/admin_logs.tpl rename to view/templates/admin_logs.tpl diff --git a/view/smarty3/admin_plugins.tpl b/view/templates/admin_plugins.tpl similarity index 100% rename from view/smarty3/admin_plugins.tpl rename to view/templates/admin_plugins.tpl diff --git a/view/smarty3/admin_plugins_details.tpl b/view/templates/admin_plugins_details.tpl similarity index 100% rename from view/smarty3/admin_plugins_details.tpl rename to view/templates/admin_plugins_details.tpl diff --git a/view/smarty3/admin_remoteupdate.tpl b/view/templates/admin_remoteupdate.tpl similarity index 100% rename from view/smarty3/admin_remoteupdate.tpl rename to view/templates/admin_remoteupdate.tpl diff --git a/view/smarty3/admin_site.tpl b/view/templates/admin_site.tpl similarity index 100% rename from view/smarty3/admin_site.tpl rename to view/templates/admin_site.tpl diff --git a/view/smarty3/admin_summary.tpl b/view/templates/admin_summary.tpl similarity index 100% rename from view/smarty3/admin_summary.tpl rename to view/templates/admin_summary.tpl diff --git a/view/smarty3/admin_users.tpl b/view/templates/admin_users.tpl similarity index 100% rename from view/smarty3/admin_users.tpl rename to view/templates/admin_users.tpl diff --git a/view/smarty3/album_edit.tpl b/view/templates/album_edit.tpl similarity index 100% rename from view/smarty3/album_edit.tpl rename to view/templates/album_edit.tpl diff --git a/view/smarty3/api_config_xml.tpl b/view/templates/api_config_xml.tpl similarity index 100% rename from view/smarty3/api_config_xml.tpl rename to view/templates/api_config_xml.tpl diff --git a/view/smarty3/api_friends_xml.tpl b/view/templates/api_friends_xml.tpl similarity index 100% rename from view/smarty3/api_friends_xml.tpl rename to view/templates/api_friends_xml.tpl diff --git a/view/smarty3/api_ratelimit_xml.tpl b/view/templates/api_ratelimit_xml.tpl similarity index 100% rename from view/smarty3/api_ratelimit_xml.tpl rename to view/templates/api_ratelimit_xml.tpl diff --git a/view/smarty3/api_status_xml.tpl b/view/templates/api_status_xml.tpl similarity index 100% rename from view/smarty3/api_status_xml.tpl rename to view/templates/api_status_xml.tpl diff --git a/view/smarty3/api_test_xml.tpl b/view/templates/api_test_xml.tpl similarity index 100% rename from view/smarty3/api_test_xml.tpl rename to view/templates/api_test_xml.tpl diff --git a/view/smarty3/api_timeline_atom.tpl b/view/templates/api_timeline_atom.tpl similarity index 100% rename from view/smarty3/api_timeline_atom.tpl rename to view/templates/api_timeline_atom.tpl diff --git a/view/smarty3/api_timeline_rss.tpl b/view/templates/api_timeline_rss.tpl similarity index 100% rename from view/smarty3/api_timeline_rss.tpl rename to view/templates/api_timeline_rss.tpl diff --git a/view/smarty3/api_timeline_xml.tpl b/view/templates/api_timeline_xml.tpl similarity index 100% rename from view/smarty3/api_timeline_xml.tpl rename to view/templates/api_timeline_xml.tpl diff --git a/view/smarty3/api_user_xml.tpl b/view/templates/api_user_xml.tpl similarity index 100% rename from view/smarty3/api_user_xml.tpl rename to view/templates/api_user_xml.tpl diff --git a/view/smarty3/apps.tpl b/view/templates/apps.tpl similarity index 100% rename from view/smarty3/apps.tpl rename to view/templates/apps.tpl diff --git a/view/smarty3/atom_feed.tpl b/view/templates/atom_feed.tpl similarity index 100% rename from view/smarty3/atom_feed.tpl rename to view/templates/atom_feed.tpl diff --git a/view/smarty3/atom_feed_dfrn.tpl b/view/templates/atom_feed_dfrn.tpl similarity index 100% rename from view/smarty3/atom_feed_dfrn.tpl rename to view/templates/atom_feed_dfrn.tpl diff --git a/view/smarty3/atom_mail.tpl b/view/templates/atom_mail.tpl similarity index 100% rename from view/smarty3/atom_mail.tpl rename to view/templates/atom_mail.tpl diff --git a/view/smarty3/atom_relocate.tpl b/view/templates/atom_relocate.tpl similarity index 100% rename from view/smarty3/atom_relocate.tpl rename to view/templates/atom_relocate.tpl diff --git a/view/smarty3/atom_suggest.tpl b/view/templates/atom_suggest.tpl similarity index 100% rename from view/smarty3/atom_suggest.tpl rename to view/templates/atom_suggest.tpl diff --git a/view/smarty3/auto_request.tpl b/view/templates/auto_request.tpl similarity index 100% rename from view/smarty3/auto_request.tpl rename to view/templates/auto_request.tpl diff --git a/view/smarty3/birthdays_reminder.tpl b/view/templates/birthdays_reminder.tpl similarity index 100% rename from view/smarty3/birthdays_reminder.tpl rename to view/templates/birthdays_reminder.tpl diff --git a/view/smarty3/categories_widget.tpl b/view/templates/categories_widget.tpl similarity index 100% rename from view/smarty3/categories_widget.tpl rename to view/templates/categories_widget.tpl diff --git a/view/smarty3/comment_item.tpl b/view/templates/comment_item.tpl similarity index 100% rename from view/smarty3/comment_item.tpl rename to view/templates/comment_item.tpl diff --git a/view/smarty3/common_friends.tpl b/view/templates/common_friends.tpl similarity index 100% rename from view/smarty3/common_friends.tpl rename to view/templates/common_friends.tpl diff --git a/view/smarty3/common_tabs.tpl b/view/templates/common_tabs.tpl similarity index 100% rename from view/smarty3/common_tabs.tpl rename to view/templates/common_tabs.tpl diff --git a/view/smarty3/confirm.tpl b/view/templates/confirm.tpl similarity index 100% rename from view/smarty3/confirm.tpl rename to view/templates/confirm.tpl diff --git a/view/smarty3/contact_block.tpl b/view/templates/contact_block.tpl similarity index 100% rename from view/smarty3/contact_block.tpl rename to view/templates/contact_block.tpl diff --git a/view/smarty3/contact_edit.tpl b/view/templates/contact_edit.tpl similarity index 100% rename from view/smarty3/contact_edit.tpl rename to view/templates/contact_edit.tpl diff --git a/view/smarty3/contact_end.tpl b/view/templates/contact_end.tpl similarity index 100% rename from view/smarty3/contact_end.tpl rename to view/templates/contact_end.tpl diff --git a/view/smarty3/contact_head.tpl b/view/templates/contact_head.tpl similarity index 100% rename from view/smarty3/contact_head.tpl rename to view/templates/contact_head.tpl diff --git a/view/smarty3/contact_template.tpl b/view/templates/contact_template.tpl similarity index 100% rename from view/smarty3/contact_template.tpl rename to view/templates/contact_template.tpl diff --git a/view/smarty3/contacts-end.tpl b/view/templates/contacts-end.tpl similarity index 100% rename from view/smarty3/contacts-end.tpl rename to view/templates/contacts-end.tpl diff --git a/view/smarty3/contacts-head.tpl b/view/templates/contacts-head.tpl similarity index 100% rename from view/smarty3/contacts-head.tpl rename to view/templates/contacts-head.tpl diff --git a/view/smarty3/contacts-template.tpl b/view/templates/contacts-template.tpl similarity index 100% rename from view/smarty3/contacts-template.tpl rename to view/templates/contacts-template.tpl diff --git a/view/smarty3/contacts-widget-sidebar.tpl b/view/templates/contacts-widget-sidebar.tpl similarity index 100% rename from view/smarty3/contacts-widget-sidebar.tpl rename to view/templates/contacts-widget-sidebar.tpl diff --git a/view/smarty3/content.tpl b/view/templates/content.tpl similarity index 100% rename from view/smarty3/content.tpl rename to view/templates/content.tpl diff --git a/view/smarty3/conversation.tpl b/view/templates/conversation.tpl similarity index 100% rename from view/smarty3/conversation.tpl rename to view/templates/conversation.tpl diff --git a/view/smarty3/crepair.tpl b/view/templates/crepair.tpl similarity index 100% rename from view/smarty3/crepair.tpl rename to view/templates/crepair.tpl diff --git a/view/smarty3/cropbody.tpl b/view/templates/cropbody.tpl similarity index 100% rename from view/smarty3/cropbody.tpl rename to view/templates/cropbody.tpl diff --git a/view/smarty3/cropend.tpl b/view/templates/cropend.tpl similarity index 100% rename from view/smarty3/cropend.tpl rename to view/templates/cropend.tpl diff --git a/view/smarty3/crophead.tpl b/view/templates/crophead.tpl similarity index 100% rename from view/smarty3/crophead.tpl rename to view/templates/crophead.tpl diff --git a/view/smarty3/delegate.tpl b/view/templates/delegate.tpl similarity index 100% rename from view/smarty3/delegate.tpl rename to view/templates/delegate.tpl diff --git a/view/smarty3/dfrn_req_confirm.tpl b/view/templates/dfrn_req_confirm.tpl similarity index 100% rename from view/smarty3/dfrn_req_confirm.tpl rename to view/templates/dfrn_req_confirm.tpl diff --git a/view/smarty3/dfrn_request.tpl b/view/templates/dfrn_request.tpl similarity index 100% rename from view/smarty3/dfrn_request.tpl rename to view/templates/dfrn_request.tpl diff --git a/view/smarty3/diasp_dec_hdr.tpl b/view/templates/diasp_dec_hdr.tpl similarity index 100% rename from view/smarty3/diasp_dec_hdr.tpl rename to view/templates/diasp_dec_hdr.tpl diff --git a/view/smarty3/diaspora_comment.tpl b/view/templates/diaspora_comment.tpl similarity index 100% rename from view/smarty3/diaspora_comment.tpl rename to view/templates/diaspora_comment.tpl diff --git a/view/smarty3/diaspora_comment_relay.tpl b/view/templates/diaspora_comment_relay.tpl similarity index 100% rename from view/smarty3/diaspora_comment_relay.tpl rename to view/templates/diaspora_comment_relay.tpl diff --git a/view/smarty3/diaspora_conversation.tpl b/view/templates/diaspora_conversation.tpl similarity index 100% rename from view/smarty3/diaspora_conversation.tpl rename to view/templates/diaspora_conversation.tpl diff --git a/view/smarty3/diaspora_like.tpl b/view/templates/diaspora_like.tpl similarity index 100% rename from view/smarty3/diaspora_like.tpl rename to view/templates/diaspora_like.tpl diff --git a/view/smarty3/diaspora_like_relay.tpl b/view/templates/diaspora_like_relay.tpl similarity index 100% rename from view/smarty3/diaspora_like_relay.tpl rename to view/templates/diaspora_like_relay.tpl diff --git a/view/smarty3/diaspora_message.tpl b/view/templates/diaspora_message.tpl similarity index 100% rename from view/smarty3/diaspora_message.tpl rename to view/templates/diaspora_message.tpl diff --git a/view/smarty3/diaspora_photo.tpl b/view/templates/diaspora_photo.tpl similarity index 100% rename from view/smarty3/diaspora_photo.tpl rename to view/templates/diaspora_photo.tpl diff --git a/view/smarty3/diaspora_post.tpl b/view/templates/diaspora_post.tpl similarity index 100% rename from view/smarty3/diaspora_post.tpl rename to view/templates/diaspora_post.tpl diff --git a/view/smarty3/diaspora_profile.tpl b/view/templates/diaspora_profile.tpl similarity index 100% rename from view/smarty3/diaspora_profile.tpl rename to view/templates/diaspora_profile.tpl diff --git a/view/smarty3/diaspora_relay_retraction.tpl b/view/templates/diaspora_relay_retraction.tpl similarity index 100% rename from view/smarty3/diaspora_relay_retraction.tpl rename to view/templates/diaspora_relay_retraction.tpl diff --git a/view/smarty3/diaspora_relayable_retraction.tpl b/view/templates/diaspora_relayable_retraction.tpl similarity index 100% rename from view/smarty3/diaspora_relayable_retraction.tpl rename to view/templates/diaspora_relayable_retraction.tpl diff --git a/view/smarty3/diaspora_retract.tpl b/view/templates/diaspora_retract.tpl similarity index 100% rename from view/smarty3/diaspora_retract.tpl rename to view/templates/diaspora_retract.tpl diff --git a/view/smarty3/diaspora_share.tpl b/view/templates/diaspora_share.tpl similarity index 100% rename from view/smarty3/diaspora_share.tpl rename to view/templates/diaspora_share.tpl diff --git a/view/smarty3/diaspora_signed_retract.tpl b/view/templates/diaspora_signed_retract.tpl similarity index 100% rename from view/smarty3/diaspora_signed_retract.tpl rename to view/templates/diaspora_signed_retract.tpl diff --git a/view/smarty3/diaspora_vcard.tpl b/view/templates/diaspora_vcard.tpl similarity index 100% rename from view/smarty3/diaspora_vcard.tpl rename to view/templates/diaspora_vcard.tpl diff --git a/view/smarty3/directory_header.tpl b/view/templates/directory_header.tpl similarity index 100% rename from view/smarty3/directory_header.tpl rename to view/templates/directory_header.tpl diff --git a/view/smarty3/directory_item.tpl b/view/templates/directory_item.tpl similarity index 100% rename from view/smarty3/directory_item.tpl rename to view/templates/directory_item.tpl diff --git a/view/smarty3/display-head.tpl b/view/templates/display-head.tpl similarity index 100% rename from view/smarty3/display-head.tpl rename to view/templates/display-head.tpl diff --git a/view/smarty3/email_notify_html.tpl b/view/templates/email_notify_html.tpl similarity index 100% rename from view/smarty3/email_notify_html.tpl rename to view/templates/email_notify_html.tpl diff --git a/view/smarty3/email_notify_text.tpl b/view/templates/email_notify_text.tpl similarity index 100% rename from view/smarty3/email_notify_text.tpl rename to view/templates/email_notify_text.tpl diff --git a/view/smarty3/end.tpl b/view/templates/end.tpl similarity index 100% rename from view/smarty3/end.tpl rename to view/templates/end.tpl diff --git a/view/smarty3/event.tpl b/view/templates/event.tpl similarity index 100% rename from view/smarty3/event.tpl rename to view/templates/event.tpl diff --git a/view/smarty3/event_end.tpl b/view/templates/event_end.tpl similarity index 100% rename from view/smarty3/event_end.tpl rename to view/templates/event_end.tpl diff --git a/view/smarty3/event_form.tpl b/view/templates/event_form.tpl similarity index 100% rename from view/smarty3/event_form.tpl rename to view/templates/event_form.tpl diff --git a/view/smarty3/event_head.tpl b/view/templates/event_head.tpl similarity index 100% rename from view/smarty3/event_head.tpl rename to view/templates/event_head.tpl diff --git a/view/smarty3/events-js.tpl b/view/templates/events-js.tpl similarity index 100% rename from view/smarty3/events-js.tpl rename to view/templates/events-js.tpl diff --git a/view/smarty3/events.tpl b/view/templates/events.tpl similarity index 100% rename from view/smarty3/events.tpl rename to view/templates/events.tpl diff --git a/view/smarty3/events_reminder.tpl b/view/templates/events_reminder.tpl similarity index 100% rename from view/smarty3/events_reminder.tpl rename to view/templates/events_reminder.tpl diff --git a/view/smarty3/failed_updates.tpl b/view/templates/failed_updates.tpl similarity index 100% rename from view/smarty3/failed_updates.tpl rename to view/templates/failed_updates.tpl diff --git a/view/smarty3/fake_feed.tpl b/view/templates/fake_feed.tpl similarity index 100% rename from view/smarty3/fake_feed.tpl rename to view/templates/fake_feed.tpl diff --git a/view/smarty3/field.tpl b/view/templates/field.tpl similarity index 100% rename from view/smarty3/field.tpl rename to view/templates/field.tpl diff --git a/view/smarty3/field_checkbox.tpl b/view/templates/field_checkbox.tpl similarity index 100% rename from view/smarty3/field_checkbox.tpl rename to view/templates/field_checkbox.tpl diff --git a/view/smarty3/field_combobox.tpl b/view/templates/field_combobox.tpl similarity index 100% rename from view/smarty3/field_combobox.tpl rename to view/templates/field_combobox.tpl diff --git a/view/smarty3/field_custom.tpl b/view/templates/field_custom.tpl similarity index 100% rename from view/smarty3/field_custom.tpl rename to view/templates/field_custom.tpl diff --git a/view/smarty3/field_input.tpl b/view/templates/field_input.tpl similarity index 100% rename from view/smarty3/field_input.tpl rename to view/templates/field_input.tpl diff --git a/view/smarty3/field_intcheckbox.tpl b/view/templates/field_intcheckbox.tpl similarity index 100% rename from view/smarty3/field_intcheckbox.tpl rename to view/templates/field_intcheckbox.tpl diff --git a/view/smarty3/field_openid.tpl b/view/templates/field_openid.tpl similarity index 100% rename from view/smarty3/field_openid.tpl rename to view/templates/field_openid.tpl diff --git a/view/smarty3/field_password.tpl b/view/templates/field_password.tpl similarity index 100% rename from view/smarty3/field_password.tpl rename to view/templates/field_password.tpl diff --git a/view/smarty3/field_radio.tpl b/view/templates/field_radio.tpl similarity index 100% rename from view/smarty3/field_radio.tpl rename to view/templates/field_radio.tpl diff --git a/view/smarty3/field_richtext.tpl b/view/templates/field_richtext.tpl similarity index 100% rename from view/smarty3/field_richtext.tpl rename to view/templates/field_richtext.tpl diff --git a/view/smarty3/field_select.tpl b/view/templates/field_select.tpl similarity index 100% rename from view/smarty3/field_select.tpl rename to view/templates/field_select.tpl diff --git a/view/smarty3/field_select_raw.tpl b/view/templates/field_select_raw.tpl similarity index 100% rename from view/smarty3/field_select_raw.tpl rename to view/templates/field_select_raw.tpl diff --git a/view/smarty3/field_textarea.tpl b/view/templates/field_textarea.tpl similarity index 100% rename from view/smarty3/field_textarea.tpl rename to view/templates/field_textarea.tpl diff --git a/view/smarty3/field_themeselect.tpl b/view/templates/field_themeselect.tpl similarity index 100% rename from view/smarty3/field_themeselect.tpl rename to view/templates/field_themeselect.tpl diff --git a/view/smarty3/field_yesno.tpl b/view/templates/field_yesno.tpl similarity index 100% rename from view/smarty3/field_yesno.tpl rename to view/templates/field_yesno.tpl diff --git a/view/smarty3/fileas_widget.tpl b/view/templates/fileas_widget.tpl similarity index 100% rename from view/smarty3/fileas_widget.tpl rename to view/templates/fileas_widget.tpl diff --git a/view/smarty3/filebrowser.tpl b/view/templates/filebrowser.tpl similarity index 100% rename from view/smarty3/filebrowser.tpl rename to view/templates/filebrowser.tpl diff --git a/view/smarty3/filer_dialog.tpl b/view/templates/filer_dialog.tpl similarity index 100% rename from view/smarty3/filer_dialog.tpl rename to view/templates/filer_dialog.tpl diff --git a/view/smarty3/follow.tpl b/view/templates/follow.tpl similarity index 100% rename from view/smarty3/follow.tpl rename to view/templates/follow.tpl diff --git a/view/smarty3/follow_slap.tpl b/view/templates/follow_slap.tpl similarity index 100% rename from view/smarty3/follow_slap.tpl rename to view/templates/follow_slap.tpl diff --git a/view/smarty3/generic_links_widget.tpl b/view/templates/generic_links_widget.tpl similarity index 100% rename from view/smarty3/generic_links_widget.tpl rename to view/templates/generic_links_widget.tpl diff --git a/view/smarty3/group_drop.tpl b/view/templates/group_drop.tpl similarity index 100% rename from view/smarty3/group_drop.tpl rename to view/templates/group_drop.tpl diff --git a/view/smarty3/group_edit.tpl b/view/templates/group_edit.tpl similarity index 100% rename from view/smarty3/group_edit.tpl rename to view/templates/group_edit.tpl diff --git a/view/smarty3/group_selection.tpl b/view/templates/group_selection.tpl similarity index 100% rename from view/smarty3/group_selection.tpl rename to view/templates/group_selection.tpl diff --git a/view/smarty3/group_side.tpl b/view/templates/group_side.tpl similarity index 100% rename from view/smarty3/group_side.tpl rename to view/templates/group_side.tpl diff --git a/view/smarty3/groupeditor.tpl b/view/templates/groupeditor.tpl similarity index 100% rename from view/smarty3/groupeditor.tpl rename to view/templates/groupeditor.tpl diff --git a/view/smarty3/head.tpl b/view/templates/head.tpl similarity index 100% rename from view/smarty3/head.tpl rename to view/templates/head.tpl diff --git a/view/smarty3/hide_comments.tpl b/view/templates/hide_comments.tpl similarity index 100% rename from view/smarty3/hide_comments.tpl rename to view/templates/hide_comments.tpl diff --git a/view/smarty3/install.tpl b/view/templates/install.tpl similarity index 100% rename from view/smarty3/install.tpl rename to view/templates/install.tpl diff --git a/view/smarty3/install_checks.tpl b/view/templates/install_checks.tpl similarity index 100% rename from view/smarty3/install_checks.tpl rename to view/templates/install_checks.tpl diff --git a/view/smarty3/install_db.tpl b/view/templates/install_db.tpl similarity index 100% rename from view/smarty3/install_db.tpl rename to view/templates/install_db.tpl diff --git a/view/smarty3/install_settings.tpl b/view/templates/install_settings.tpl similarity index 100% rename from view/smarty3/install_settings.tpl rename to view/templates/install_settings.tpl diff --git a/view/smarty3/intros.tpl b/view/templates/intros.tpl similarity index 100% rename from view/smarty3/intros.tpl rename to view/templates/intros.tpl diff --git a/view/smarty3/invite.tpl b/view/templates/invite.tpl similarity index 100% rename from view/smarty3/invite.tpl rename to view/templates/invite.tpl diff --git a/view/smarty3/jot-end.tpl b/view/templates/jot-end.tpl similarity index 100% rename from view/smarty3/jot-end.tpl rename to view/templates/jot-end.tpl diff --git a/view/smarty3/jot-header.tpl b/view/templates/jot-header.tpl similarity index 100% rename from view/smarty3/jot-header.tpl rename to view/templates/jot-header.tpl diff --git a/view/smarty3/jot.tpl b/view/templates/jot.tpl similarity index 100% rename from view/smarty3/jot.tpl rename to view/templates/jot.tpl diff --git a/view/smarty3/jot_geotag.tpl b/view/templates/jot_geotag.tpl similarity index 100% rename from view/smarty3/jot_geotag.tpl rename to view/templates/jot_geotag.tpl diff --git a/view/smarty3/lang_selector.tpl b/view/templates/lang_selector.tpl similarity index 100% rename from view/smarty3/lang_selector.tpl rename to view/templates/lang_selector.tpl diff --git a/view/smarty3/like_noshare.tpl b/view/templates/like_noshare.tpl similarity index 100% rename from view/smarty3/like_noshare.tpl rename to view/templates/like_noshare.tpl diff --git a/view/smarty3/login.tpl b/view/templates/login.tpl similarity index 100% rename from view/smarty3/login.tpl rename to view/templates/login.tpl diff --git a/view/smarty3/login_head.tpl b/view/templates/login_head.tpl similarity index 100% rename from view/smarty3/login_head.tpl rename to view/templates/login_head.tpl diff --git a/view/smarty3/logout.tpl b/view/templates/logout.tpl similarity index 100% rename from view/smarty3/logout.tpl rename to view/templates/logout.tpl diff --git a/view/smarty3/lostpass.tpl b/view/templates/lostpass.tpl similarity index 100% rename from view/smarty3/lostpass.tpl rename to view/templates/lostpass.tpl diff --git a/view/smarty3/magicsig.tpl b/view/templates/magicsig.tpl similarity index 100% rename from view/smarty3/magicsig.tpl rename to view/templates/magicsig.tpl diff --git a/view/smarty3/mail_conv.tpl b/view/templates/mail_conv.tpl similarity index 100% rename from view/smarty3/mail_conv.tpl rename to view/templates/mail_conv.tpl diff --git a/view/smarty3/mail_display.tpl b/view/templates/mail_display.tpl similarity index 100% rename from view/smarty3/mail_display.tpl rename to view/templates/mail_display.tpl diff --git a/view/smarty3/mail_head.tpl b/view/templates/mail_head.tpl similarity index 100% rename from view/smarty3/mail_head.tpl rename to view/templates/mail_head.tpl diff --git a/view/smarty3/mail_list.tpl b/view/templates/mail_list.tpl similarity index 100% rename from view/smarty3/mail_list.tpl rename to view/templates/mail_list.tpl diff --git a/view/smarty3/maintenance.tpl b/view/templates/maintenance.tpl similarity index 100% rename from view/smarty3/maintenance.tpl rename to view/templates/maintenance.tpl diff --git a/view/smarty3/manage.tpl b/view/templates/manage.tpl similarity index 100% rename from view/smarty3/manage.tpl rename to view/templates/manage.tpl diff --git a/view/smarty3/match.tpl b/view/templates/match.tpl similarity index 100% rename from view/smarty3/match.tpl rename to view/templates/match.tpl diff --git a/view/smarty3/message-end.tpl b/view/templates/message-end.tpl similarity index 100% rename from view/smarty3/message-end.tpl rename to view/templates/message-end.tpl diff --git a/view/smarty3/message-head.tpl b/view/templates/message-head.tpl similarity index 100% rename from view/smarty3/message-head.tpl rename to view/templates/message-head.tpl diff --git a/view/smarty3/message_side.tpl b/view/templates/message_side.tpl similarity index 100% rename from view/smarty3/message_side.tpl rename to view/templates/message_side.tpl diff --git a/view/smarty3/moderated_comment.tpl b/view/templates/moderated_comment.tpl similarity index 100% rename from view/smarty3/moderated_comment.tpl rename to view/templates/moderated_comment.tpl diff --git a/view/smarty3/mood_content.tpl b/view/templates/mood_content.tpl similarity index 100% rename from view/smarty3/mood_content.tpl rename to view/templates/mood_content.tpl diff --git a/view/smarty3/msg-end.tpl b/view/templates/msg-end.tpl similarity index 100% rename from view/smarty3/msg-end.tpl rename to view/templates/msg-end.tpl diff --git a/view/smarty3/msg-header.tpl b/view/templates/msg-header.tpl similarity index 100% rename from view/smarty3/msg-header.tpl rename to view/templates/msg-header.tpl diff --git a/view/smarty3/nav.tpl b/view/templates/nav.tpl similarity index 100% rename from view/smarty3/nav.tpl rename to view/templates/nav.tpl diff --git a/view/smarty3/navigation.tpl b/view/templates/navigation.tpl similarity index 100% rename from view/smarty3/navigation.tpl rename to view/templates/navigation.tpl diff --git a/view/smarty3/netfriend.tpl b/view/templates/netfriend.tpl similarity index 100% rename from view/smarty3/netfriend.tpl rename to view/templates/netfriend.tpl diff --git a/view/smarty3/nets.tpl b/view/templates/nets.tpl similarity index 100% rename from view/smarty3/nets.tpl rename to view/templates/nets.tpl diff --git a/view/smarty3/nogroup-template.tpl b/view/templates/nogroup-template.tpl similarity index 100% rename from view/smarty3/nogroup-template.tpl rename to view/templates/nogroup-template.tpl diff --git a/view/smarty3/notifications.tpl b/view/templates/notifications.tpl similarity index 100% rename from view/smarty3/notifications.tpl rename to view/templates/notifications.tpl diff --git a/view/smarty3/notifications_comments_item.tpl b/view/templates/notifications_comments_item.tpl similarity index 100% rename from view/smarty3/notifications_comments_item.tpl rename to view/templates/notifications_comments_item.tpl diff --git a/view/smarty3/notifications_dislikes_item.tpl b/view/templates/notifications_dislikes_item.tpl similarity index 100% rename from view/smarty3/notifications_dislikes_item.tpl rename to view/templates/notifications_dislikes_item.tpl diff --git a/view/smarty3/notifications_friends_item.tpl b/view/templates/notifications_friends_item.tpl similarity index 100% rename from view/smarty3/notifications_friends_item.tpl rename to view/templates/notifications_friends_item.tpl diff --git a/view/smarty3/notifications_likes_item.tpl b/view/templates/notifications_likes_item.tpl similarity index 100% rename from view/smarty3/notifications_likes_item.tpl rename to view/templates/notifications_likes_item.tpl diff --git a/view/smarty3/notifications_network_item.tpl b/view/templates/notifications_network_item.tpl similarity index 100% rename from view/smarty3/notifications_network_item.tpl rename to view/templates/notifications_network_item.tpl diff --git a/view/smarty3/notifications_posts_item.tpl b/view/templates/notifications_posts_item.tpl similarity index 100% rename from view/smarty3/notifications_posts_item.tpl rename to view/templates/notifications_posts_item.tpl diff --git a/view/smarty3/notify.tpl b/view/templates/notify.tpl similarity index 100% rename from view/smarty3/notify.tpl rename to view/templates/notify.tpl diff --git a/view/smarty3/oauth_authorize.tpl b/view/templates/oauth_authorize.tpl similarity index 100% rename from view/smarty3/oauth_authorize.tpl rename to view/templates/oauth_authorize.tpl diff --git a/view/smarty3/oauth_authorize_done.tpl b/view/templates/oauth_authorize_done.tpl similarity index 100% rename from view/smarty3/oauth_authorize_done.tpl rename to view/templates/oauth_authorize_done.tpl diff --git a/view/smarty3/oembed_video.tpl b/view/templates/oembed_video.tpl similarity index 100% rename from view/smarty3/oembed_video.tpl rename to view/templates/oembed_video.tpl diff --git a/view/smarty3/oexchange_xrd.tpl b/view/templates/oexchange_xrd.tpl similarity index 100% rename from view/smarty3/oexchange_xrd.tpl rename to view/templates/oexchange_xrd.tpl diff --git a/view/smarty3/opensearch.tpl b/view/templates/opensearch.tpl similarity index 100% rename from view/smarty3/opensearch.tpl rename to view/templates/opensearch.tpl diff --git a/view/smarty3/pagetypes.tpl b/view/templates/pagetypes.tpl similarity index 100% rename from view/smarty3/pagetypes.tpl rename to view/templates/pagetypes.tpl diff --git a/view/smarty3/peoplefind.tpl b/view/templates/peoplefind.tpl similarity index 100% rename from view/smarty3/peoplefind.tpl rename to view/templates/peoplefind.tpl diff --git a/view/smarty3/photo_album.tpl b/view/templates/photo_album.tpl similarity index 100% rename from view/smarty3/photo_album.tpl rename to view/templates/photo_album.tpl diff --git a/view/smarty3/photo_drop.tpl b/view/templates/photo_drop.tpl similarity index 100% rename from view/smarty3/photo_drop.tpl rename to view/templates/photo_drop.tpl diff --git a/view/smarty3/photo_edit.tpl b/view/templates/photo_edit.tpl similarity index 100% rename from view/smarty3/photo_edit.tpl rename to view/templates/photo_edit.tpl diff --git a/view/smarty3/photo_edit_head.tpl b/view/templates/photo_edit_head.tpl similarity index 100% rename from view/smarty3/photo_edit_head.tpl rename to view/templates/photo_edit_head.tpl diff --git a/view/smarty3/photo_item.tpl b/view/templates/photo_item.tpl similarity index 100% rename from view/smarty3/photo_item.tpl rename to view/templates/photo_item.tpl diff --git a/view/smarty3/photo_top.tpl b/view/templates/photo_top.tpl similarity index 100% rename from view/smarty3/photo_top.tpl rename to view/templates/photo_top.tpl diff --git a/view/smarty3/photo_view.tpl b/view/templates/photo_view.tpl similarity index 100% rename from view/smarty3/photo_view.tpl rename to view/templates/photo_view.tpl diff --git a/view/smarty3/photos_default_uploader_box.tpl b/view/templates/photos_default_uploader_box.tpl similarity index 100% rename from view/smarty3/photos_default_uploader_box.tpl rename to view/templates/photos_default_uploader_box.tpl diff --git a/view/smarty3/photos_default_uploader_submit.tpl b/view/templates/photos_default_uploader_submit.tpl similarity index 100% rename from view/smarty3/photos_default_uploader_submit.tpl rename to view/templates/photos_default_uploader_submit.tpl diff --git a/view/smarty3/photos_head.tpl b/view/templates/photos_head.tpl similarity index 100% rename from view/smarty3/photos_head.tpl rename to view/templates/photos_head.tpl diff --git a/view/smarty3/photos_recent.tpl b/view/templates/photos_recent.tpl similarity index 100% rename from view/smarty3/photos_recent.tpl rename to view/templates/photos_recent.tpl diff --git a/view/smarty3/photos_upload.tpl b/view/templates/photos_upload.tpl similarity index 100% rename from view/smarty3/photos_upload.tpl rename to view/templates/photos_upload.tpl diff --git a/view/smarty3/poco_entry_xml.tpl b/view/templates/poco_entry_xml.tpl similarity index 100% rename from view/smarty3/poco_entry_xml.tpl rename to view/templates/poco_entry_xml.tpl diff --git a/view/smarty3/poco_xml.tpl b/view/templates/poco_xml.tpl similarity index 100% rename from view/smarty3/poco_xml.tpl rename to view/templates/poco_xml.tpl diff --git a/view/smarty3/poke_content.tpl b/view/templates/poke_content.tpl similarity index 100% rename from view/smarty3/poke_content.tpl rename to view/templates/poke_content.tpl diff --git a/view/smarty3/posted_date_widget.tpl b/view/templates/posted_date_widget.tpl similarity index 100% rename from view/smarty3/posted_date_widget.tpl rename to view/templates/posted_date_widget.tpl diff --git a/view/smarty3/profed_end.tpl b/view/templates/profed_end.tpl similarity index 100% rename from view/smarty3/profed_end.tpl rename to view/templates/profed_end.tpl diff --git a/view/smarty3/profed_head.tpl b/view/templates/profed_head.tpl similarity index 100% rename from view/smarty3/profed_head.tpl rename to view/templates/profed_head.tpl diff --git a/view/smarty3/profile-hide-friends.tpl b/view/templates/profile-hide-friends.tpl similarity index 100% rename from view/smarty3/profile-hide-friends.tpl rename to view/templates/profile-hide-friends.tpl diff --git a/view/smarty3/profile-hide-wall.tpl b/view/templates/profile-hide-wall.tpl similarity index 100% rename from view/smarty3/profile-hide-wall.tpl rename to view/templates/profile-hide-wall.tpl diff --git a/view/smarty3/profile-in-directory.tpl b/view/templates/profile-in-directory.tpl similarity index 100% rename from view/smarty3/profile-in-directory.tpl rename to view/templates/profile-in-directory.tpl diff --git a/view/smarty3/profile-in-netdir.tpl b/view/templates/profile-in-netdir.tpl similarity index 100% rename from view/smarty3/profile-in-netdir.tpl rename to view/templates/profile-in-netdir.tpl diff --git a/view/smarty3/profile_advanced.tpl b/view/templates/profile_advanced.tpl similarity index 100% rename from view/smarty3/profile_advanced.tpl rename to view/templates/profile_advanced.tpl diff --git a/view/smarty3/profile_edit.tpl b/view/templates/profile_edit.tpl similarity index 100% rename from view/smarty3/profile_edit.tpl rename to view/templates/profile_edit.tpl diff --git a/view/smarty3/profile_edlink.tpl b/view/templates/profile_edlink.tpl similarity index 100% rename from view/smarty3/profile_edlink.tpl rename to view/templates/profile_edlink.tpl diff --git a/view/smarty3/profile_entry.tpl b/view/templates/profile_entry.tpl similarity index 100% rename from view/smarty3/profile_entry.tpl rename to view/templates/profile_entry.tpl diff --git a/view/smarty3/profile_listing_header.tpl b/view/templates/profile_listing_header.tpl similarity index 100% rename from view/smarty3/profile_listing_header.tpl rename to view/templates/profile_listing_header.tpl diff --git a/view/smarty3/profile_photo.tpl b/view/templates/profile_photo.tpl similarity index 100% rename from view/smarty3/profile_photo.tpl rename to view/templates/profile_photo.tpl diff --git a/view/smarty3/profile_publish.tpl b/view/templates/profile_publish.tpl similarity index 100% rename from view/smarty3/profile_publish.tpl rename to view/templates/profile_publish.tpl diff --git a/view/smarty3/profile_vcard.tpl b/view/templates/profile_vcard.tpl similarity index 100% rename from view/smarty3/profile_vcard.tpl rename to view/templates/profile_vcard.tpl diff --git a/view/smarty3/prv_message.tpl b/view/templates/prv_message.tpl similarity index 100% rename from view/smarty3/prv_message.tpl rename to view/templates/prv_message.tpl diff --git a/view/smarty3/pwdreset.tpl b/view/templates/pwdreset.tpl similarity index 100% rename from view/smarty3/pwdreset.tpl rename to view/templates/pwdreset.tpl diff --git a/view/smarty3/register.tpl b/view/templates/register.tpl similarity index 100% rename from view/smarty3/register.tpl rename to view/templates/register.tpl diff --git a/view/smarty3/remote_friends_common.tpl b/view/templates/remote_friends_common.tpl similarity index 100% rename from view/smarty3/remote_friends_common.tpl rename to view/templates/remote_friends_common.tpl diff --git a/view/smarty3/removeme.tpl b/view/templates/removeme.tpl similarity index 100% rename from view/smarty3/removeme.tpl rename to view/templates/removeme.tpl diff --git a/view/smarty3/saved_searches_aside.tpl b/view/templates/saved_searches_aside.tpl similarity index 100% rename from view/smarty3/saved_searches_aside.tpl rename to view/templates/saved_searches_aside.tpl diff --git a/view/smarty3/search_item.tpl b/view/templates/search_item.tpl similarity index 100% rename from view/smarty3/search_item.tpl rename to view/templates/search_item.tpl diff --git a/view/smarty3/settings-end.tpl b/view/templates/settings-end.tpl similarity index 100% rename from view/smarty3/settings-end.tpl rename to view/templates/settings-end.tpl diff --git a/view/smarty3/settings-head.tpl b/view/templates/settings-head.tpl similarity index 100% rename from view/smarty3/settings-head.tpl rename to view/templates/settings-head.tpl diff --git a/view/smarty3/settings.tpl b/view/templates/settings.tpl similarity index 100% rename from view/smarty3/settings.tpl rename to view/templates/settings.tpl diff --git a/view/smarty3/settings_addons.tpl b/view/templates/settings_addons.tpl similarity index 100% rename from view/smarty3/settings_addons.tpl rename to view/templates/settings_addons.tpl diff --git a/view/smarty3/settings_connectors.tpl b/view/templates/settings_connectors.tpl similarity index 100% rename from view/smarty3/settings_connectors.tpl rename to view/templates/settings_connectors.tpl diff --git a/view/smarty3/settings_display.tpl b/view/templates/settings_display.tpl similarity index 100% rename from view/smarty3/settings_display.tpl rename to view/templates/settings_display.tpl diff --git a/view/smarty3/settings_display_end.tpl b/view/templates/settings_display_end.tpl similarity index 100% rename from view/smarty3/settings_display_end.tpl rename to view/templates/settings_display_end.tpl diff --git a/view/smarty3/settings_features.tpl b/view/templates/settings_features.tpl similarity index 100% rename from view/smarty3/settings_features.tpl rename to view/templates/settings_features.tpl diff --git a/view/smarty3/settings_nick_set.tpl b/view/templates/settings_nick_set.tpl similarity index 100% rename from view/smarty3/settings_nick_set.tpl rename to view/templates/settings_nick_set.tpl diff --git a/view/smarty3/settings_nick_subdir.tpl b/view/templates/settings_nick_subdir.tpl similarity index 100% rename from view/smarty3/settings_nick_subdir.tpl rename to view/templates/settings_nick_subdir.tpl diff --git a/view/smarty3/settings_oauth.tpl b/view/templates/settings_oauth.tpl similarity index 100% rename from view/smarty3/settings_oauth.tpl rename to view/templates/settings_oauth.tpl diff --git a/view/smarty3/settings_oauth_edit.tpl b/view/templates/settings_oauth_edit.tpl similarity index 100% rename from view/smarty3/settings_oauth_edit.tpl rename to view/templates/settings_oauth_edit.tpl diff --git a/view/smarty3/suggest_friends.tpl b/view/templates/suggest_friends.tpl similarity index 100% rename from view/smarty3/suggest_friends.tpl rename to view/templates/suggest_friends.tpl diff --git a/view/smarty3/suggestions.tpl b/view/templates/suggestions.tpl similarity index 100% rename from view/smarty3/suggestions.tpl rename to view/templates/suggestions.tpl diff --git a/view/smarty3/tag_slap.tpl b/view/templates/tag_slap.tpl similarity index 100% rename from view/smarty3/tag_slap.tpl rename to view/templates/tag_slap.tpl diff --git a/view/smarty3/threaded_conversation.tpl b/view/templates/threaded_conversation.tpl similarity index 100% rename from view/smarty3/threaded_conversation.tpl rename to view/templates/threaded_conversation.tpl diff --git a/view/smarty3/toggle_mobile_footer.tpl b/view/templates/toggle_mobile_footer.tpl similarity index 100% rename from view/smarty3/toggle_mobile_footer.tpl rename to view/templates/toggle_mobile_footer.tpl diff --git a/view/smarty3/uexport.tpl b/view/templates/uexport.tpl similarity index 100% rename from view/smarty3/uexport.tpl rename to view/templates/uexport.tpl diff --git a/view/smarty3/uimport.tpl b/view/templates/uimport.tpl similarity index 100% rename from view/smarty3/uimport.tpl rename to view/templates/uimport.tpl diff --git a/view/smarty3/vcard-widget.tpl b/view/templates/vcard-widget.tpl similarity index 100% rename from view/smarty3/vcard-widget.tpl rename to view/templates/vcard-widget.tpl diff --git a/view/smarty3/viewcontact_template.tpl b/view/templates/viewcontact_template.tpl similarity index 100% rename from view/smarty3/viewcontact_template.tpl rename to view/templates/viewcontact_template.tpl diff --git a/view/smarty3/voting_fakelink.tpl b/view/templates/voting_fakelink.tpl similarity index 100% rename from view/smarty3/voting_fakelink.tpl rename to view/templates/voting_fakelink.tpl diff --git a/view/smarty3/wall_thread.tpl b/view/templates/wall_thread.tpl similarity index 100% rename from view/smarty3/wall_thread.tpl rename to view/templates/wall_thread.tpl diff --git a/view/smarty3/wallmessage.tpl b/view/templates/wallmessage.tpl similarity index 100% rename from view/smarty3/wallmessage.tpl rename to view/templates/wallmessage.tpl diff --git a/view/smarty3/wallmsg-end.tpl b/view/templates/wallmsg-end.tpl similarity index 100% rename from view/smarty3/wallmsg-end.tpl rename to view/templates/wallmsg-end.tpl diff --git a/view/smarty3/wallmsg-header.tpl b/view/templates/wallmsg-header.tpl similarity index 100% rename from view/smarty3/wallmsg-header.tpl rename to view/templates/wallmsg-header.tpl diff --git a/view/smarty3/xrd_diaspora.tpl b/view/templates/xrd_diaspora.tpl similarity index 100% rename from view/smarty3/xrd_diaspora.tpl rename to view/templates/xrd_diaspora.tpl diff --git a/view/smarty3/xrd_host.tpl b/view/templates/xrd_host.tpl similarity index 100% rename from view/smarty3/xrd_host.tpl rename to view/templates/xrd_host.tpl diff --git a/view/smarty3/xrd_person.tpl b/view/templates/xrd_person.tpl similarity index 100% rename from view/smarty3/xrd_person.tpl rename to view/templates/xrd_person.tpl diff --git a/view/theme/cleanzero/nav.tpl b/view/theme/cleanzero/nav.tpl deleted file mode 100644 index 17a2f72590..0000000000 --- a/view/theme/cleanzero/nav.tpl +++ /dev/null @@ -1,85 +0,0 @@ - - - - diff --git a/view/theme/cleanzero/smarty3/nav.tpl b/view/theme/cleanzero/templates/nav.tpl similarity index 100% rename from view/theme/cleanzero/smarty3/nav.tpl rename to view/theme/cleanzero/templates/nav.tpl diff --git a/view/theme/cleanzero/smarty3/theme_settings.tpl b/view/theme/cleanzero/templates/theme_settings.tpl similarity index 100% rename from view/theme/cleanzero/smarty3/theme_settings.tpl rename to view/theme/cleanzero/templates/theme_settings.tpl diff --git a/view/theme/cleanzero/theme_settings.tpl b/view/theme/cleanzero/theme_settings.tpl deleted file mode 100644 index bfe18af27d..0000000000 --- a/view/theme/cleanzero/theme_settings.tpl +++ /dev/null @@ -1,10 +0,0 @@ -{{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}} - - -
- -
- diff --git a/view/theme/comix-plain/comment_item.tpl b/view/theme/comix-plain/comment_item.tpl deleted file mode 100644 index 045a350f6d..0000000000 --- a/view/theme/comix-plain/comment_item.tpl +++ /dev/null @@ -1,33 +0,0 @@ -
-
- - - - {##} - - - - -
- $mytitle -
-
- - {{ if $qcomment }} - {{ for $qcomment as $qc }} - $qc -   - {{ endfor }} - {{ endif }} - -
- - -
-
- -
diff --git a/view/theme/comix-plain/search_item.tpl b/view/theme/comix-plain/search_item.tpl deleted file mode 100644 index cf1c388cd2..0000000000 --- a/view/theme/comix-plain/search_item.tpl +++ /dev/null @@ -1,54 +0,0 @@ -
-
-
-
- - $item.name - menu -
-
    - $item.item_photo_menu -
-
-
-
-
- {{ if $item.lock }}
$item.lock
- {{ else }}
{{ endif }} -
$item.location
-
-
-
- $item.name -
$item.ago
- -
-
-
$item.title
-
-
$item.body
-
-
-
- {{ if $item.drop.dropping }}{{ endif }} -
- {{ if $item.drop.pagedrop }}{{ endif }} -
-
-
-
- - -
- {{ if $item.conv }} - $item.conv.title - {{ endif }} -
- -
- -
- - diff --git a/view/theme/comix-plain/smarty3/comment_item.tpl b/view/theme/comix-plain/templates/comment_item.tpl similarity index 100% rename from view/theme/comix-plain/smarty3/comment_item.tpl rename to view/theme/comix-plain/templates/comment_item.tpl diff --git a/view/theme/comix-plain/smarty3/search_item.tpl b/view/theme/comix-plain/templates/search_item.tpl similarity index 100% rename from view/theme/comix-plain/smarty3/search_item.tpl rename to view/theme/comix-plain/templates/search_item.tpl diff --git a/view/theme/comix/comment_item.tpl b/view/theme/comix/comment_item.tpl deleted file mode 100644 index 045a350f6d..0000000000 --- a/view/theme/comix/comment_item.tpl +++ /dev/null @@ -1,33 +0,0 @@ -
-
- - - - {##} - - - - -
- $mytitle -
-
- - {{ if $qcomment }} - {{ for $qcomment as $qc }} - $qc -   - {{ endfor }} - {{ endif }} - -
- - -
-
- -
diff --git a/view/theme/comix/search_item.tpl b/view/theme/comix/search_item.tpl deleted file mode 100644 index 34c176ceef..0000000000 --- a/view/theme/comix/search_item.tpl +++ /dev/null @@ -1,54 +0,0 @@ -
-
-
-
- - $item.name - menu -
-
    - $item.item_photo_menu -
-
-
-
-
- {{ if $item.lock }}
$item.lock
- {{ else }}
{{ endif }} -
$item.location
-
-
-
- $item.name -
$item.ago
- -
-
-
$item.title
-
-
$item.body
-
-
-
- {{ if $item.drop.dropping }}{{ endif }} -
- {{ if $item.drop.pagedrop }}{{ endif }} -
-
-
-
- - -
- {{ if $item.conv }} - $item.conv.title - {{ endif }} -
- -
- -
- - diff --git a/view/theme/comix/smarty3/comment_item.tpl b/view/theme/comix/templates/comment_item.tpl similarity index 100% rename from view/theme/comix/smarty3/comment_item.tpl rename to view/theme/comix/templates/comment_item.tpl diff --git a/view/theme/comix/smarty3/search_item.tpl b/view/theme/comix/templates/search_item.tpl similarity index 100% rename from view/theme/comix/smarty3/search_item.tpl rename to view/theme/comix/templates/search_item.tpl diff --git a/view/theme/decaf-mobile/acl_html_selector.tpl b/view/theme/decaf-mobile/acl_html_selector.tpl deleted file mode 100644 index e84b0eefca..0000000000 --- a/view/theme/decaf-mobile/acl_html_selector.tpl +++ /dev/null @@ -1,29 +0,0 @@ - -
- -
-
-
- $group_perms
- -
-
- $contact_perms
- -
-
-
- -
- diff --git a/view/theme/decaf-mobile/acl_selector.tpl b/view/theme/decaf-mobile/acl_selector.tpl deleted file mode 100644 index 8e9916c950..0000000000 --- a/view/theme/decaf-mobile/acl_selector.tpl +++ /dev/null @@ -1,23 +0,0 @@ -
- - $showall -
-
-
-
- -
- - - -{##} diff --git a/view/theme/decaf-mobile/admin_aside.tpl b/view/theme/decaf-mobile/admin_aside.tpl deleted file mode 100644 index da3ed23a88..0000000000 --- a/view/theme/decaf-mobile/admin_aside.tpl +++ /dev/null @@ -1,31 +0,0 @@ - -

$admtxt

- - -{{ if $admin.update }} - -{{ endif }} - - -{{ if $admin.plugins_admin }}

$plugadmtxt

{{ endif }} - - - -

$logtxt

- - diff --git a/view/theme/decaf-mobile/admin_site.tpl b/view/theme/decaf-mobile/admin_site.tpl deleted file mode 100644 index 61f52b18dc..0000000000 --- a/view/theme/decaf-mobile/admin_site.tpl +++ /dev/null @@ -1,67 +0,0 @@ - -
-

$title - $page

- -
- - - {{ 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 }} - {{ inc field_checkbox.tpl with $field=$hide_help }}{{ endinc }} - {{ inc field_select.tpl with $field=$singleuser }}{{ endinc }} - -
- -

$registration

- {{ inc field_input.tpl with $field=$register_text }}{{ endinc }} - {{ inc field_select.tpl with $field=$register_policy }}{{ 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 }} - -
- -

$upload

- {{ inc field_input.tpl with $field=$maximagesize }}{{ endinc }} - {{ inc field_input.tpl with $field=$maximagelength }}{{ endinc }} - {{ inc field_input.tpl with $field=$jpegimagequality }}{{ endinc }} - -

$corporate

- {{ 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_select.tpl with $field=$ostatus_poll_interval }}{{ 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 }} - {{ inc field_checkbox.tpl with $field=$enotify_no_content }}{{ endinc }} - {{ inc field_checkbox.tpl with $field=$private_addons }}{{ endinc }} - {{ inc field_checkbox.tpl with $field=$disable_embedded }}{{ endinc }} -
- -

$advanced

- {{ 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 }} - -
- -
-
diff --git a/view/theme/decaf-mobile/admin_users.tpl b/view/theme/decaf-mobile/admin_users.tpl deleted file mode 100644 index c3abbeb9c0..0000000000 --- a/view/theme/decaf-mobile/admin_users.tpl +++ /dev/null @@ -1,98 +0,0 @@ - -
-

$title - $page

- -
- - -

$h_pending

- {{ if $pending }} - - - - {{ for $th_pending as $th }}{{ endfor }} - - - - - - {{ for $pending as $u }} - - - - - - - - {{ endfor }} - -
$th
$u.created$u.name - - -
- {##} -
- {{ else }} -

$no_pending

- {{ endif }} - - - - -

$h_users

- {{ if $users }} - - - - - {{ for $th_users as $th }}{{ endfor }} - - - - - - {{ for $users as $u }} - - - - - - - - - - {{ endif }} - - - {{ endfor }} - -
$th
$u.nickname$u.name$u.register_date$u.lastitem_date - {{ if $u.is_admin }} -   - {{ else }} - - {{ if $u.is_admin }} -   - {{ else }} - - - {{ endif }} -
- {##} -
- {{ else }} - NO USERS?!? - {{ endif }} -
-
diff --git a/view/theme/decaf-mobile/album_edit.tpl b/view/theme/decaf-mobile/album_edit.tpl deleted file mode 100644 index 3fe2d9fe92..0000000000 --- a/view/theme/decaf-mobile/album_edit.tpl +++ /dev/null @@ -1,15 +0,0 @@ -
-
- - - - - -
- - - - -
-
-
diff --git a/view/theme/decaf-mobile/categories_widget.tpl b/view/theme/decaf-mobile/categories_widget.tpl deleted file mode 100644 index ebc62404b8..0000000000 --- a/view/theme/decaf-mobile/categories_widget.tpl +++ /dev/null @@ -1,12 +0,0 @@ -{##} diff --git a/view/theme/decaf-mobile/comment_item.tpl b/view/theme/decaf-mobile/comment_item.tpl deleted file mode 100755 index ee0e8c7916..0000000000 --- a/view/theme/decaf-mobile/comment_item.tpl +++ /dev/null @@ -1,79 +0,0 @@ -{##} - -
- -
-{##} - - - - - - - - - - {##} - $mytitle - {##} - {##} - {##} -{##} - {##} - {##} -{##} - - {##} - -
-
- - {##} -
- - {##} -
- -
diff --git a/view/theme/decaf-mobile/common_tabs.tpl b/view/theme/decaf-mobile/common_tabs.tpl deleted file mode 100644 index 940e5aeb2f..0000000000 --- a/view/theme/decaf-mobile/common_tabs.tpl +++ /dev/null @@ -1,6 +0,0 @@ -
    - {{ for $tabs as $tab }} -
  • $tab.label
  • - {{ endfor }} -
    -
diff --git a/view/theme/decaf-mobile/contact_block.tpl b/view/theme/decaf-mobile/contact_block.tpl deleted file mode 100644 index a8e34fce16..0000000000 --- a/view/theme/decaf-mobile/contact_block.tpl +++ /dev/null @@ -1,12 +0,0 @@ -{##} diff --git a/view/theme/decaf-mobile/contact_edit.tpl b/view/theme/decaf-mobile/contact_edit.tpl deleted file mode 100644 index e113018b31..0000000000 --- a/view/theme/decaf-mobile/contact_edit.tpl +++ /dev/null @@ -1,93 +0,0 @@ - -

$header

- -
- - $tab_str - - - - - -
-
$name
-
$name
-
- - -
- -
-
- - -
- - - {{ if $poll_enabled }} -
-
$lastupdtext $last_update
- $updpub $poll_interval $udnow -
- {{ endif }} -
- - {{inc field_checkbox.tpl with $field=$hidden }}{{endinc}} - -
-

$lbl_info1

- - -
-
- - -
-

$lbl_vis1

-

$lbl_vis2

-
-$profile_select -
- - - -
-
diff --git a/view/theme/decaf-mobile/contact_head.tpl b/view/theme/decaf-mobile/contact_head.tpl deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/view/theme/decaf-mobile/contact_template.tpl b/view/theme/decaf-mobile/contact_template.tpl deleted file mode 100644 index 4ef0405b7b..0000000000 --- a/view/theme/decaf-mobile/contact_template.tpl +++ /dev/null @@ -1,38 +0,0 @@ - -
-
-
- -{##} - {##} - - $contact.name - - {##} - -{##} -
- -
-
-
$contact.name

-{{ if $contact.alt_text }}
$contact.alt_text
{{ endif }} -
$contact.network
- -
-
diff --git a/view/theme/decaf-mobile/contacts-end.tpl b/view/theme/decaf-mobile/contacts-end.tpl deleted file mode 100644 index fea596360b..0000000000 --- a/view/theme/decaf-mobile/contacts-end.tpl +++ /dev/null @@ -1,4 +0,0 @@ -{##} diff --git a/view/theme/decaf-mobile/contacts-head.tpl b/view/theme/decaf-mobile/contacts-head.tpl deleted file mode 100644 index 6c7355f4c7..0000000000 --- a/view/theme/decaf-mobile/contacts-head.tpl +++ /dev/null @@ -1,5 +0,0 @@ -{##} diff --git a/view/theme/decaf-mobile/contacts-template.tpl b/view/theme/decaf-mobile/contacts-template.tpl deleted file mode 100644 index 76254c1ca8..0000000000 --- a/view/theme/decaf-mobile/contacts-template.tpl +++ /dev/null @@ -1,28 +0,0 @@ -

$header{{ if $total }} ($total){{ endif }}

- -{{ if $finding }}

$finding

{{ endif }} - -
-
-$desc - - -
-
-
- -$tabs - - -
-{{ for $contacts as $contact }} - {{ inc contact_template.tpl }}{{ endinc }} -{{ endfor }} -
-
- -$paginate - - - - diff --git a/view/theme/decaf-mobile/contacts-widget-sidebar.tpl b/view/theme/decaf-mobile/contacts-widget-sidebar.tpl deleted file mode 100644 index 1c63f9eab2..0000000000 --- a/view/theme/decaf-mobile/contacts-widget-sidebar.tpl +++ /dev/null @@ -1,2 +0,0 @@ -$follow_widget - diff --git a/view/theme/decaf-mobile/conversation.tpl b/view/theme/decaf-mobile/conversation.tpl deleted file mode 100644 index d39976f39f..0000000000 --- a/view/theme/decaf-mobile/conversation.tpl +++ /dev/null @@ -1,29 +0,0 @@ -$live_update - -{{ for $threads as $thread }} -
- {{ for $thread.items as $item }} - {{if $item.comment_firstcollapsed}} -
- $thread.num_comments $thread.hide_text -
- {{endif}} - - {{ inc $item.template }}{{ endinc }} - - - {{ endfor }} -
-{{ endfor }} - -
- -{##} diff --git a/view/theme/decaf-mobile/cropbody.tpl b/view/theme/decaf-mobile/cropbody.tpl deleted file mode 100644 index 3283084cad..0000000000 --- a/view/theme/decaf-mobile/cropbody.tpl +++ /dev/null @@ -1,27 +0,0 @@ -

$title

-

-$desc -

-
-$title -
-
-
-
- -
- - - - - - - - - - -
- -
- -
diff --git a/view/theme/decaf-mobile/cropend.tpl b/view/theme/decaf-mobile/cropend.tpl deleted file mode 100644 index a27de0e2f8..0000000000 --- a/view/theme/decaf-mobile/cropend.tpl +++ /dev/null @@ -1,4 +0,0 @@ -{##} diff --git a/view/theme/decaf-mobile/crophead.tpl b/view/theme/decaf-mobile/crophead.tpl deleted file mode 100644 index 56e941e3ab..0000000000 --- a/view/theme/decaf-mobile/crophead.tpl +++ /dev/null @@ -1 +0,0 @@ - diff --git a/view/theme/decaf-mobile/display-head.tpl b/view/theme/decaf-mobile/display-head.tpl deleted file mode 100644 index 1c990657f0..0000000000 --- a/view/theme/decaf-mobile/display-head.tpl +++ /dev/null @@ -1,4 +0,0 @@ -{##} diff --git a/view/theme/decaf-mobile/end.tpl b/view/theme/decaf-mobile/end.tpl deleted file mode 100644 index 2e78838e01..0000000000 --- a/view/theme/decaf-mobile/end.tpl +++ /dev/null @@ -1,25 +0,0 @@ - -{##} -{##} -{##} -{##} -{##} - - - - diff --git a/view/theme/decaf-mobile/event_end.tpl b/view/theme/decaf-mobile/event_end.tpl deleted file mode 100644 index 3e4be6ec61..0000000000 --- a/view/theme/decaf-mobile/event_end.tpl +++ /dev/null @@ -1,4 +0,0 @@ -{##} diff --git a/view/theme/decaf-mobile/event_head.tpl b/view/theme/decaf-mobile/event_head.tpl deleted file mode 100644 index 63a1135af6..0000000000 --- a/view/theme/decaf-mobile/event_head.tpl +++ /dev/null @@ -1,6 +0,0 @@ - -{##} diff --git a/view/theme/decaf-mobile/field_checkbox.tpl b/view/theme/decaf-mobile/field_checkbox.tpl deleted file mode 100644 index 9fbf84eac9..0000000000 --- a/view/theme/decaf-mobile/field_checkbox.tpl +++ /dev/null @@ -1,6 +0,0 @@ - -
- -
- $field.3 -
diff --git a/view/theme/decaf-mobile/field_input.tpl b/view/theme/decaf-mobile/field_input.tpl deleted file mode 100644 index 58e17406c0..0000000000 --- a/view/theme/decaf-mobile/field_input.tpl +++ /dev/null @@ -1,6 +0,0 @@ - -
-
- - $field.3 -
diff --git a/view/theme/decaf-mobile/field_openid.tpl b/view/theme/decaf-mobile/field_openid.tpl deleted file mode 100644 index 8d330a30a0..0000000000 --- a/view/theme/decaf-mobile/field_openid.tpl +++ /dev/null @@ -1,6 +0,0 @@ - -
-
- - $field.3 -
diff --git a/view/theme/decaf-mobile/field_password.tpl b/view/theme/decaf-mobile/field_password.tpl deleted file mode 100644 index 7a0d3fe9f4..0000000000 --- a/view/theme/decaf-mobile/field_password.tpl +++ /dev/null @@ -1,6 +0,0 @@ - -
-
- - $field.3 -
diff --git a/view/theme/decaf-mobile/field_themeselect.tpl b/view/theme/decaf-mobile/field_themeselect.tpl deleted file mode 100644 index 5ac310f804..0000000000 --- a/view/theme/decaf-mobile/field_themeselect.tpl +++ /dev/null @@ -1,9 +0,0 @@ - -
- - - $field.3 -
-
diff --git a/view/theme/decaf-mobile/field_yesno.tpl b/view/theme/decaf-mobile/field_yesno.tpl deleted file mode 100644 index c399579b29..0000000000 --- a/view/theme/decaf-mobile/field_yesno.tpl +++ /dev/null @@ -1,14 +0,0 @@ -{##} -{{ inc field_checkbox.tpl }}{{ endinc }} diff --git a/view/theme/decaf-mobile/generic_links_widget.tpl b/view/theme/decaf-mobile/generic_links_widget.tpl deleted file mode 100644 index a976d4573c..0000000000 --- a/view/theme/decaf-mobile/generic_links_widget.tpl +++ /dev/null @@ -1,12 +0,0 @@ -
-{##} - {{if $desc}}
$desc
{{endif}} - - - -
diff --git a/view/theme/decaf-mobile/group_drop.tpl b/view/theme/decaf-mobile/group_drop.tpl deleted file mode 100644 index 959b77bb21..0000000000 --- a/view/theme/decaf-mobile/group_drop.tpl +++ /dev/null @@ -1,9 +0,0 @@ -
- -
-
diff --git a/view/theme/decaf-mobile/group_side.tpl b/view/theme/decaf-mobile/group_side.tpl deleted file mode 100644 index 0b4564077a..0000000000 --- a/view/theme/decaf-mobile/group_side.tpl +++ /dev/null @@ -1,33 +0,0 @@ -
-

$title

- - - - {{ if $ungrouped }} - - {{ endif }} -
- - diff --git a/view/theme/decaf-mobile/head.tpl b/view/theme/decaf-mobile/head.tpl deleted file mode 100644 index a8b2133189..0000000000 --- a/view/theme/decaf-mobile/head.tpl +++ /dev/null @@ -1,30 +0,0 @@ - -{##} - -{##} - - - -{##} - - - - - - - diff --git a/view/theme/decaf-mobile/jot-end.tpl b/view/theme/decaf-mobile/jot-end.tpl deleted file mode 100644 index 59585d01d5..0000000000 --- a/view/theme/decaf-mobile/jot-end.tpl +++ /dev/null @@ -1,5 +0,0 @@ - - -{##} diff --git a/view/theme/decaf-mobile/jot-header.tpl b/view/theme/decaf-mobile/jot-header.tpl deleted file mode 100644 index c239aeecd8..0000000000 --- a/view/theme/decaf-mobile/jot-header.tpl +++ /dev/null @@ -1,17 +0,0 @@ - - - diff --git a/view/theme/decaf-mobile/jot.tpl b/view/theme/decaf-mobile/jot.tpl deleted file mode 100644 index 697a7c8094..0000000000 --- a/view/theme/decaf-mobile/jot.tpl +++ /dev/null @@ -1,99 +0,0 @@ - -
-
-
 
-
-
-
- -
- - - - - - - - - -
- {{ if $placeholdercategory }} -
- {{ endif }} -
- {##} - -
- -
- - -
- -
- -
- -
-
- -
- - {##} - {##} - - {##} - -
- - -
- $jotplugins -
- - - - {##} -
- {##} - {{ if $acl_data }} - {{ inc acl_html_selector.tpl }}{{ endinc }} - {{ endif }} - $jotnets -
- {##} - - -
- -
-
-
- {##} - diff --git a/view/theme/decaf-mobile/jot_geotag.tpl b/view/theme/decaf-mobile/jot_geotag.tpl deleted file mode 100644 index 3f8bee91a7..0000000000 --- a/view/theme/decaf-mobile/jot_geotag.tpl +++ /dev/null @@ -1,11 +0,0 @@ - - if(navigator.geolocation) { - navigator.geolocation.getCurrentPosition(function(position) { - var lat = position.coords.latitude.toFixed(4); - var lon = position.coords.longitude.toFixed(4); - - $j('#jot-coord').val(lat + ', ' + lon); - $j('#profile-nolocation-wrapper').show(); - }); - } - diff --git a/view/theme/decaf-mobile/lang_selector.tpl b/view/theme/decaf-mobile/lang_selector.tpl deleted file mode 100644 index e777a0a861..0000000000 --- a/view/theme/decaf-mobile/lang_selector.tpl +++ /dev/null @@ -1,10 +0,0 @@ -
- diff --git a/view/theme/decaf-mobile/like_noshare.tpl b/view/theme/decaf-mobile/like_noshare.tpl deleted file mode 100644 index 5e74850a7a..0000000000 --- a/view/theme/decaf-mobile/like_noshare.tpl +++ /dev/null @@ -1,7 +0,0 @@ - diff --git a/view/theme/decaf-mobile/login.tpl b/view/theme/decaf-mobile/login.tpl deleted file mode 100644 index 926ab769d2..0000000000 --- a/view/theme/decaf-mobile/login.tpl +++ /dev/null @@ -1,45 +0,0 @@ - - - -{##} diff --git a/view/theme/decaf-mobile/login_head.tpl b/view/theme/decaf-mobile/login_head.tpl deleted file mode 100644 index 14734821ce..0000000000 --- a/view/theme/decaf-mobile/login_head.tpl +++ /dev/null @@ -1,2 +0,0 @@ -{##} - diff --git a/view/theme/decaf-mobile/lostpass.tpl b/view/theme/decaf-mobile/lostpass.tpl deleted file mode 100644 index 583e3dbaff..0000000000 --- a/view/theme/decaf-mobile/lostpass.tpl +++ /dev/null @@ -1,21 +0,0 @@ -
-

$title

-


- -
-
-
- -
-
-

-$desc -

-
- -
- -
-
-
-
diff --git a/view/theme/decaf-mobile/mail_conv.tpl b/view/theme/decaf-mobile/mail_conv.tpl deleted file mode 100644 index 7aac8370b2..0000000000 --- a/view/theme/decaf-mobile/mail_conv.tpl +++ /dev/null @@ -1,18 +0,0 @@ -
-
- $mail.from_name -
-
-
$mail.from_name
-
$mail.date
-
$mail.subject
-
-
$mail.body
-
-
- - -
-
- -
diff --git a/view/theme/decaf-mobile/mail_list.tpl b/view/theme/decaf-mobile/mail_list.tpl deleted file mode 100644 index 74274a246a..0000000000 --- a/view/theme/decaf-mobile/mail_list.tpl +++ /dev/null @@ -1,16 +0,0 @@ -
-
- $from_name -
-
-
$from_name
-
$date
- -
- -
-
-
-
- -
diff --git a/view/theme/decaf-mobile/manage.tpl b/view/theme/decaf-mobile/manage.tpl deleted file mode 100644 index fec30db9b0..0000000000 --- a/view/theme/decaf-mobile/manage.tpl +++ /dev/null @@ -1,18 +0,0 @@ -

$title

-
$desc
-
$choose
-
-
- -
- - {# name="submit" interferes with this.form.submit() #} - -
- diff --git a/view/theme/decaf-mobile/message-end.tpl b/view/theme/decaf-mobile/message-end.tpl deleted file mode 100644 index fea596360b..0000000000 --- a/view/theme/decaf-mobile/message-end.tpl +++ /dev/null @@ -1,4 +0,0 @@ -{##} diff --git a/view/theme/decaf-mobile/message-head.tpl b/view/theme/decaf-mobile/message-head.tpl deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/view/theme/decaf-mobile/msg-end.tpl b/view/theme/decaf-mobile/msg-end.tpl deleted file mode 100644 index 6074133798..0000000000 --- a/view/theme/decaf-mobile/msg-end.tpl +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/view/theme/decaf-mobile/msg-header.tpl b/view/theme/decaf-mobile/msg-header.tpl deleted file mode 100644 index 9ccf5d6fa2..0000000000 --- a/view/theme/decaf-mobile/msg-header.tpl +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/view/theme/decaf-mobile/nav.tpl b/view/theme/decaf-mobile/nav.tpl deleted file mode 100644 index 45b7beeefc..0000000000 --- a/view/theme/decaf-mobile/nav.tpl +++ /dev/null @@ -1,155 +0,0 @@ - - -{##} diff --git a/view/theme/decaf-mobile/photo_drop.tpl b/view/theme/decaf-mobile/photo_drop.tpl deleted file mode 100644 index 296b829091..0000000000 --- a/view/theme/decaf-mobile/photo_drop.tpl +++ /dev/null @@ -1,4 +0,0 @@ -
- -
-
diff --git a/view/theme/decaf-mobile/photo_edit.tpl b/view/theme/decaf-mobile/photo_edit.tpl deleted file mode 100644 index 5bfa37c366..0000000000 --- a/view/theme/decaf-mobile/photo_edit.tpl +++ /dev/null @@ -1,60 +0,0 @@ - -
- - - - -
- - -
- -
- -
- - -
- -
- -
- - -
- -
- -
- -
-
- -
- - -
-
- -
- {##} -
- {##} - {{ inc acl_html_selector.tpl }}{{ endinc }} -
- {##} -
-
- - - - -
-
- - diff --git a/view/theme/decaf-mobile/photo_edit_head.tpl b/view/theme/decaf-mobile/photo_edit_head.tpl deleted file mode 100644 index c819e24ce3..0000000000 --- a/view/theme/decaf-mobile/photo_edit_head.tpl +++ /dev/null @@ -1,7 +0,0 @@ -{##} diff --git a/view/theme/decaf-mobile/photo_view.tpl b/view/theme/decaf-mobile/photo_view.tpl deleted file mode 100644 index 329e0a4e05..0000000000 --- a/view/theme/decaf-mobile/photo_view.tpl +++ /dev/null @@ -1,42 +0,0 @@ -
-

$album.1

- - - -
- {{ if $prevlink }}{{ endif }} - {{ if $nextlink }}{{ endif }} -
-
-
-
$desc
-{{ if $tags }} -
$tags.0
-
$tags.1
-{{ endif }} -{{ if $tags.2 }}{{ endif }} - -{{ if $edit }} -$edit -{{ else }} - -{{ if $likebuttons }} -
- $likebuttons - $like - $dislike -
-{{ endif }} - -$comments - -$paginate -{{ endif }} - diff --git a/view/theme/decaf-mobile/photos_head.tpl b/view/theme/decaf-mobile/photos_head.tpl deleted file mode 100644 index 5c13a0ae6c..0000000000 --- a/view/theme/decaf-mobile/photos_head.tpl +++ /dev/null @@ -1,5 +0,0 @@ -{##} diff --git a/view/theme/decaf-mobile/photos_upload.tpl b/view/theme/decaf-mobile/photos_upload.tpl deleted file mode 100644 index 31ad468015..0000000000 --- a/view/theme/decaf-mobile/photos_upload.tpl +++ /dev/null @@ -1,51 +0,0 @@ -

$pagename

- -
$usage
- -
-
-
- -
- -
-
-
-
$existalbumtext
- -
-
- - $default_upload_box - -
- - -
- - - {##} -
- {##} - {{ inc acl_html_selector.tpl }}{{ endinc }} -
- {##} - -
- - $alt_uploader - - $default_upload_submit - -
-
- diff --git a/view/theme/decaf-mobile/profed_end.tpl b/view/theme/decaf-mobile/profed_end.tpl deleted file mode 100644 index ff56fda467..0000000000 --- a/view/theme/decaf-mobile/profed_end.tpl +++ /dev/null @@ -1,8 +0,0 @@ -{##} diff --git a/view/theme/decaf-mobile/profed_head.tpl b/view/theme/decaf-mobile/profed_head.tpl deleted file mode 100644 index 02fd46aa49..0000000000 --- a/view/theme/decaf-mobile/profed_head.tpl +++ /dev/null @@ -1,5 +0,0 @@ -{##} diff --git a/view/theme/decaf-mobile/profile_edit.tpl b/view/theme/decaf-mobile/profile_edit.tpl deleted file mode 100644 index bed1de35ae..0000000000 --- a/view/theme/decaf-mobile/profile_edit.tpl +++ /dev/null @@ -1,324 +0,0 @@ -$default - -

$banner

- - - - - - -
-
- - -
- -
*
-
-
- -
- - -
-
- -
- - -
-
- - -
- -$gender -
-
- -
- -
-$dob $age -
-
-
- -$hide_friends - -
- -
-
- - -
- - -
-
- -
- - -
-
- - -
- - -
-
- -
- - -{##} -
-
- -
- - -{##} -
-
- -
- - -
-
- -
- -
-
- -
- -$marital -
- - - - - -
- -
- -$sexual -
-
- - - -
- - -
-
- -
- - -
-
- -
- - -
-
- -
- - -
$lbl_pubdsc
-
- -
- - -
$lbl_prvdsc
-
- - -
- -
-
- -
-

-$lbl_about -

- - - -
-
- - -
-

-$lbl_hobbies -

- - - -
-
- - -
-

-$lbl_likes -

- - - -
-
- - -
-

-$lbl_dislikes -

- - - -
-
- - -
-

-$lbl_social -

- - - -
-
- - -
- -
-
- - -
-

-$lbl_music -

- - - -
-
- -
-

-$lbl_book -

- - - -
-
- - - -
-

-$lbl_tv -

- - - -
-
- - - -
-

-$lbl_film -

- - - -
-
- - -
- -
-
- - -
-

-$lbl_love -

- - - -
-
- - - -
-

-$lbl_work -

- - - -
-
- - - -
-

-$lbl_school -

- - - -
-
- - - -
- -
-
- - -
-
- diff --git a/view/theme/decaf-mobile/profile_photo.tpl b/view/theme/decaf-mobile/profile_photo.tpl deleted file mode 100644 index 42fc139f8f..0000000000 --- a/view/theme/decaf-mobile/profile_photo.tpl +++ /dev/null @@ -1,19 +0,0 @@ -

$title

- -
- - -
- - -
- -
- -
- -
- - diff --git a/view/theme/decaf-mobile/profile_vcard.tpl b/view/theme/decaf-mobile/profile_vcard.tpl deleted file mode 100644 index e91e6125ff..0000000000 --- a/view/theme/decaf-mobile/profile_vcard.tpl +++ /dev/null @@ -1,51 +0,0 @@ -
- -
$profile.name
- - - - {{ if $pdesc }}
$profile.pdesc
{{ endif }} -
$profile.name
- - - - {{ if $location }} -
$location
-
- {{ if $profile.address }}
$profile.address
{{ endif }} - - $profile.locality{{ if $profile.locality }}, {{ endif }} - $profile.region - $profile.postal_code - - {{ if $profile.country_name }}$profile.country_name{{ endif }} -
-
- {{ endif }} - - {{ if $gender }}
$gender
$profile.gender
{{ endif }} - - {{ if $profile.pubkey }}{{ endif }} - - {{ if $marital }}
$marital
$profile.marital
{{ endif }} - - {{ if $homepage }}
$homepage
$profile.homepage
{{ endif }} - - {{ inc diaspora_vcard.tpl }}{{ endinc }} - -
- -
- -$contact_block - - diff --git a/view/theme/decaf-mobile/prv_message.tpl b/view/theme/decaf-mobile/prv_message.tpl deleted file mode 100644 index 5d9925297d..0000000000 --- a/view/theme/decaf-mobile/prv_message.tpl +++ /dev/null @@ -1,43 +0,0 @@ - -

$header

- -
-
- -$parent - -
$to
- -{{ if $showinputs }} - - -{{ else }} -$select -{{ endif }} - -
$subject
- - -
$yourmessage
- - - -
- - - {##} -
- -
-
-
-
-
- - diff --git a/view/theme/decaf-mobile/register.tpl b/view/theme/decaf-mobile/register.tpl deleted file mode 100644 index b1f39048e9..0000000000 --- a/view/theme/decaf-mobile/register.tpl +++ /dev/null @@ -1,80 +0,0 @@ -
-

$regtitle

-
- -
- - - - $registertext - -

$realpeople

- -
-{{ if $oidlabel }} -
- -
-
-{{ endif }} - -
-

$fillwith $fillext

-
- -

- -{{ if $invitations }} - -

$invite_desc

-
- - -
-
- -{{ endif }} - - -
-
- -
-
- - -
-
- -
-
- -
-
- -
-
- -
-

$nickdesc

-
- - $publish - - -
-


- -$license - -
diff --git a/view/theme/decaf-mobile/search_item.tpl b/view/theme/decaf-mobile/search_item.tpl deleted file mode 100644 index 3e14b644b0..0000000000 --- a/view/theme/decaf-mobile/search_item.tpl +++ /dev/null @@ -1,64 +0,0 @@ - -{##} -
-
- {##} - - $item.name - {##} -
-
- {{ if $item.lock }}{##}$item.lock{##} - {{ else }}
{{ endif }} -
$item.location
-
-
- {##} - $item.name -
$item.ago
- - {##} -
-
$item.title
- {##} -
$item.body
- {{ if $item.has_cats }} -
$item.txt_cats {{ for $item.categories as $cat }}$cat.name{{ if $cat.removeurl }} [$remove]{{ endif }} {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} -
- {{ endif }} - - {{ if $item.has_folders }} -
$item.txt_folders {{ for $item.folders as $cat }}$cat.name{{ if $cat.removeurl }} [$remove]{{ endif }}{{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} -
- {{ endif }} -
-
- {##} - {{ if $item.drop.dropping }}{{ endif }} - {##} - {##} - {##} -
-
- {##} - - -
- {{ if $item.conv }} - $item.conv.title - {{ endif }} -
- -{##} - -{##} - - diff --git a/view/theme/decaf-mobile/settings-head.tpl b/view/theme/decaf-mobile/settings-head.tpl deleted file mode 100644 index 5c13a0ae6c..0000000000 --- a/view/theme/decaf-mobile/settings-head.tpl +++ /dev/null @@ -1,5 +0,0 @@ -{##} diff --git a/view/theme/decaf-mobile/settings.tpl b/view/theme/decaf-mobile/settings.tpl deleted file mode 100644 index 036cc16916..0000000000 --- a/view/theme/decaf-mobile/settings.tpl +++ /dev/null @@ -1,151 +0,0 @@ -

$ptitle

- -$nickname_block - -
- - -

$h_pass

- -{{inc field_password.tpl with $field=$password1 }}{{endinc}} -{{inc field_password.tpl with $field=$password2 }}{{endinc}} -{{inc field_password.tpl with $field=$password3 }}{{endinc}} - -{{ if $oid_enable }} -{{inc field_input.tpl with $field=$openid }}{{endinc}} -{{ endif }} - -
- -
- - -

$h_basic

- -{{inc field_input.tpl with $field=$username }}{{endinc}} -{{inc field_input.tpl with $field=$email }}{{endinc}} -{{inc field_password.tpl with $field=$password4 }}{{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}} - - -
- -
- - -

$h_prv

- - - - -{{inc field_input.tpl with $field=$maxreq }}{{endinc}} - -$profile_in_dir - -$profile_in_net_dir - -$hide_friends - -$hide_wall - -$blockwall - -$blocktags - -$suggestme - -$unkmail - - -{{inc field_input.tpl with $field=$cntunkmail }}{{endinc}} - -{{inc field_input.tpl with $field=$expire.days }}{{endinc}} - - -
- $expire.label -
-
-

$expire.advanced

- {{ 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}} -
-
- -
- - -
-
-
-{##} -
- {##} - {{ inc acl_html_selector.tpl }}{{ endinc }} -
-{##} -
-
-
-
- -$group_select - - -
- -
- - - -

$h_not

-
- -
$activity_options
- -{{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}} - - -
$lbl_not
- -
-{{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}} -
- -
- -
- -
- - -

$h_advn

-
$h_descadvn
- -$pagetype - -
- -
- - diff --git a/view/theme/decaf-mobile/settings_display_end.tpl b/view/theme/decaf-mobile/settings_display_end.tpl deleted file mode 100644 index 739c43b35a..0000000000 --- a/view/theme/decaf-mobile/settings_display_end.tpl +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/view/theme/decaf-mobile/suggest_friends.tpl b/view/theme/decaf-mobile/suggest_friends.tpl deleted file mode 100644 index d5051e33b5..0000000000 --- a/view/theme/decaf-mobile/suggest_friends.tpl +++ /dev/null @@ -1,16 +0,0 @@ -
-
- - $name - -
-
-
- $name -
-
- {{ if $connlnk }} - - {{ endif }} - -
diff --git a/view/theme/decaf-mobile/smarty3/acl_html_selector.tpl b/view/theme/decaf-mobile/templates/acl_html_selector.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/acl_html_selector.tpl rename to view/theme/decaf-mobile/templates/acl_html_selector.tpl diff --git a/view/theme/decaf-mobile/smarty3/acl_selector.tpl b/view/theme/decaf-mobile/templates/acl_selector.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/acl_selector.tpl rename to view/theme/decaf-mobile/templates/acl_selector.tpl diff --git a/view/theme/decaf-mobile/smarty3/admin_aside.tpl b/view/theme/decaf-mobile/templates/admin_aside.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/admin_aside.tpl rename to view/theme/decaf-mobile/templates/admin_aside.tpl diff --git a/view/theme/decaf-mobile/smarty3/admin_site.tpl b/view/theme/decaf-mobile/templates/admin_site.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/admin_site.tpl rename to view/theme/decaf-mobile/templates/admin_site.tpl diff --git a/view/theme/decaf-mobile/smarty3/admin_users.tpl b/view/theme/decaf-mobile/templates/admin_users.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/admin_users.tpl rename to view/theme/decaf-mobile/templates/admin_users.tpl diff --git a/view/theme/decaf-mobile/smarty3/album_edit.tpl b/view/theme/decaf-mobile/templates/album_edit.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/album_edit.tpl rename to view/theme/decaf-mobile/templates/album_edit.tpl diff --git a/view/theme/decaf-mobile/smarty3/categories_widget.tpl b/view/theme/decaf-mobile/templates/categories_widget.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/categories_widget.tpl rename to view/theme/decaf-mobile/templates/categories_widget.tpl diff --git a/view/theme/decaf-mobile/smarty3/comment_item.tpl b/view/theme/decaf-mobile/templates/comment_item.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/comment_item.tpl rename to view/theme/decaf-mobile/templates/comment_item.tpl diff --git a/view/theme/decaf-mobile/smarty3/common_tabs.tpl b/view/theme/decaf-mobile/templates/common_tabs.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/common_tabs.tpl rename to view/theme/decaf-mobile/templates/common_tabs.tpl diff --git a/view/theme/decaf-mobile/smarty3/contact_block.tpl b/view/theme/decaf-mobile/templates/contact_block.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/contact_block.tpl rename to view/theme/decaf-mobile/templates/contact_block.tpl diff --git a/view/theme/decaf-mobile/smarty3/contact_edit.tpl b/view/theme/decaf-mobile/templates/contact_edit.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/contact_edit.tpl rename to view/theme/decaf-mobile/templates/contact_edit.tpl diff --git a/view/theme/decaf-mobile/smarty3/contact_head.tpl b/view/theme/decaf-mobile/templates/contact_head.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/contact_head.tpl rename to view/theme/decaf-mobile/templates/contact_head.tpl diff --git a/view/theme/decaf-mobile/smarty3/contact_template.tpl b/view/theme/decaf-mobile/templates/contact_template.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/contact_template.tpl rename to view/theme/decaf-mobile/templates/contact_template.tpl diff --git a/view/theme/decaf-mobile/smarty3/contacts-end.tpl b/view/theme/decaf-mobile/templates/contacts-end.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/contacts-end.tpl rename to view/theme/decaf-mobile/templates/contacts-end.tpl diff --git a/view/theme/decaf-mobile/smarty3/contacts-head.tpl b/view/theme/decaf-mobile/templates/contacts-head.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/contacts-head.tpl rename to view/theme/decaf-mobile/templates/contacts-head.tpl diff --git a/view/theme/decaf-mobile/smarty3/contacts-template.tpl b/view/theme/decaf-mobile/templates/contacts-template.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/contacts-template.tpl rename to view/theme/decaf-mobile/templates/contacts-template.tpl diff --git a/view/theme/decaf-mobile/smarty3/contacts-widget-sidebar.tpl b/view/theme/decaf-mobile/templates/contacts-widget-sidebar.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/contacts-widget-sidebar.tpl rename to view/theme/decaf-mobile/templates/contacts-widget-sidebar.tpl diff --git a/view/theme/decaf-mobile/smarty3/conversation.tpl b/view/theme/decaf-mobile/templates/conversation.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/conversation.tpl rename to view/theme/decaf-mobile/templates/conversation.tpl diff --git a/view/theme/decaf-mobile/smarty3/cropbody.tpl b/view/theme/decaf-mobile/templates/cropbody.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/cropbody.tpl rename to view/theme/decaf-mobile/templates/cropbody.tpl diff --git a/view/theme/decaf-mobile/smarty3/cropend.tpl b/view/theme/decaf-mobile/templates/cropend.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/cropend.tpl rename to view/theme/decaf-mobile/templates/cropend.tpl diff --git a/view/theme/decaf-mobile/smarty3/crophead.tpl b/view/theme/decaf-mobile/templates/crophead.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/crophead.tpl rename to view/theme/decaf-mobile/templates/crophead.tpl diff --git a/view/theme/decaf-mobile/smarty3/display-head.tpl b/view/theme/decaf-mobile/templates/display-head.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/display-head.tpl rename to view/theme/decaf-mobile/templates/display-head.tpl diff --git a/view/theme/decaf-mobile/smarty3/end.tpl b/view/theme/decaf-mobile/templates/end.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/end.tpl rename to view/theme/decaf-mobile/templates/end.tpl diff --git a/view/theme/decaf-mobile/smarty3/event_end.tpl b/view/theme/decaf-mobile/templates/event_end.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/event_end.tpl rename to view/theme/decaf-mobile/templates/event_end.tpl diff --git a/view/theme/decaf-mobile/smarty3/event_head.tpl b/view/theme/decaf-mobile/templates/event_head.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/event_head.tpl rename to view/theme/decaf-mobile/templates/event_head.tpl diff --git a/view/theme/decaf-mobile/smarty3/field_checkbox.tpl b/view/theme/decaf-mobile/templates/field_checkbox.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/field_checkbox.tpl rename to view/theme/decaf-mobile/templates/field_checkbox.tpl diff --git a/view/theme/decaf-mobile/smarty3/field_input.tpl b/view/theme/decaf-mobile/templates/field_input.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/field_input.tpl rename to view/theme/decaf-mobile/templates/field_input.tpl diff --git a/view/theme/decaf-mobile/smarty3/field_openid.tpl b/view/theme/decaf-mobile/templates/field_openid.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/field_openid.tpl rename to view/theme/decaf-mobile/templates/field_openid.tpl diff --git a/view/theme/decaf-mobile/smarty3/field_password.tpl b/view/theme/decaf-mobile/templates/field_password.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/field_password.tpl rename to view/theme/decaf-mobile/templates/field_password.tpl diff --git a/view/theme/decaf-mobile/smarty3/field_themeselect.tpl b/view/theme/decaf-mobile/templates/field_themeselect.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/field_themeselect.tpl rename to view/theme/decaf-mobile/templates/field_themeselect.tpl diff --git a/view/theme/decaf-mobile/smarty3/field_yesno.tpl b/view/theme/decaf-mobile/templates/field_yesno.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/field_yesno.tpl rename to view/theme/decaf-mobile/templates/field_yesno.tpl diff --git a/view/theme/decaf-mobile/smarty3/generic_links_widget.tpl b/view/theme/decaf-mobile/templates/generic_links_widget.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/generic_links_widget.tpl rename to view/theme/decaf-mobile/templates/generic_links_widget.tpl diff --git a/view/theme/decaf-mobile/smarty3/group_drop.tpl b/view/theme/decaf-mobile/templates/group_drop.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/group_drop.tpl rename to view/theme/decaf-mobile/templates/group_drop.tpl diff --git a/view/theme/decaf-mobile/smarty3/group_side.tpl b/view/theme/decaf-mobile/templates/group_side.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/group_side.tpl rename to view/theme/decaf-mobile/templates/group_side.tpl diff --git a/view/theme/decaf-mobile/smarty3/head.tpl b/view/theme/decaf-mobile/templates/head.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/head.tpl rename to view/theme/decaf-mobile/templates/head.tpl diff --git a/view/theme/decaf-mobile/smarty3/jot-end.tpl b/view/theme/decaf-mobile/templates/jot-end.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/jot-end.tpl rename to view/theme/decaf-mobile/templates/jot-end.tpl diff --git a/view/theme/decaf-mobile/smarty3/jot-header.tpl b/view/theme/decaf-mobile/templates/jot-header.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/jot-header.tpl rename to view/theme/decaf-mobile/templates/jot-header.tpl diff --git a/view/theme/decaf-mobile/smarty3/jot.tpl b/view/theme/decaf-mobile/templates/jot.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/jot.tpl rename to view/theme/decaf-mobile/templates/jot.tpl diff --git a/view/theme/decaf-mobile/smarty3/jot_geotag.tpl b/view/theme/decaf-mobile/templates/jot_geotag.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/jot_geotag.tpl rename to view/theme/decaf-mobile/templates/jot_geotag.tpl diff --git a/view/theme/decaf-mobile/smarty3/lang_selector.tpl b/view/theme/decaf-mobile/templates/lang_selector.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/lang_selector.tpl rename to view/theme/decaf-mobile/templates/lang_selector.tpl diff --git a/view/theme/decaf-mobile/smarty3/like_noshare.tpl b/view/theme/decaf-mobile/templates/like_noshare.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/like_noshare.tpl rename to view/theme/decaf-mobile/templates/like_noshare.tpl diff --git a/view/theme/decaf-mobile/smarty3/login.tpl b/view/theme/decaf-mobile/templates/login.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/login.tpl rename to view/theme/decaf-mobile/templates/login.tpl diff --git a/view/theme/decaf-mobile/smarty3/login_head.tpl b/view/theme/decaf-mobile/templates/login_head.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/login_head.tpl rename to view/theme/decaf-mobile/templates/login_head.tpl diff --git a/view/theme/decaf-mobile/smarty3/lostpass.tpl b/view/theme/decaf-mobile/templates/lostpass.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/lostpass.tpl rename to view/theme/decaf-mobile/templates/lostpass.tpl diff --git a/view/theme/decaf-mobile/smarty3/mail_conv.tpl b/view/theme/decaf-mobile/templates/mail_conv.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/mail_conv.tpl rename to view/theme/decaf-mobile/templates/mail_conv.tpl diff --git a/view/theme/decaf-mobile/smarty3/mail_list.tpl b/view/theme/decaf-mobile/templates/mail_list.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/mail_list.tpl rename to view/theme/decaf-mobile/templates/mail_list.tpl diff --git a/view/theme/decaf-mobile/smarty3/manage.tpl b/view/theme/decaf-mobile/templates/manage.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/manage.tpl rename to view/theme/decaf-mobile/templates/manage.tpl diff --git a/view/theme/decaf-mobile/smarty3/message-end.tpl b/view/theme/decaf-mobile/templates/message-end.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/message-end.tpl rename to view/theme/decaf-mobile/templates/message-end.tpl diff --git a/view/theme/decaf-mobile/smarty3/message-head.tpl b/view/theme/decaf-mobile/templates/message-head.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/message-head.tpl rename to view/theme/decaf-mobile/templates/message-head.tpl diff --git a/view/theme/decaf-mobile/smarty3/moderated_comment.tpl b/view/theme/decaf-mobile/templates/moderated_comment.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/moderated_comment.tpl rename to view/theme/decaf-mobile/templates/moderated_comment.tpl diff --git a/view/theme/decaf-mobile/smarty3/msg-end.tpl b/view/theme/decaf-mobile/templates/msg-end.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/msg-end.tpl rename to view/theme/decaf-mobile/templates/msg-end.tpl diff --git a/view/theme/decaf-mobile/smarty3/msg-header.tpl b/view/theme/decaf-mobile/templates/msg-header.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/msg-header.tpl rename to view/theme/decaf-mobile/templates/msg-header.tpl diff --git a/view/theme/decaf-mobile/smarty3/nav.tpl b/view/theme/decaf-mobile/templates/nav.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/nav.tpl rename to view/theme/decaf-mobile/templates/nav.tpl diff --git a/view/theme/decaf-mobile/smarty3/photo_drop.tpl b/view/theme/decaf-mobile/templates/photo_drop.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/photo_drop.tpl rename to view/theme/decaf-mobile/templates/photo_drop.tpl diff --git a/view/theme/decaf-mobile/smarty3/photo_edit.tpl b/view/theme/decaf-mobile/templates/photo_edit.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/photo_edit.tpl rename to view/theme/decaf-mobile/templates/photo_edit.tpl diff --git a/view/theme/decaf-mobile/smarty3/photo_edit_head.tpl b/view/theme/decaf-mobile/templates/photo_edit_head.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/photo_edit_head.tpl rename to view/theme/decaf-mobile/templates/photo_edit_head.tpl diff --git a/view/theme/decaf-mobile/smarty3/photo_view.tpl b/view/theme/decaf-mobile/templates/photo_view.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/photo_view.tpl rename to view/theme/decaf-mobile/templates/photo_view.tpl diff --git a/view/theme/decaf-mobile/smarty3/photos_head.tpl b/view/theme/decaf-mobile/templates/photos_head.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/photos_head.tpl rename to view/theme/decaf-mobile/templates/photos_head.tpl diff --git a/view/theme/decaf-mobile/smarty3/photos_upload.tpl b/view/theme/decaf-mobile/templates/photos_upload.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/photos_upload.tpl rename to view/theme/decaf-mobile/templates/photos_upload.tpl diff --git a/view/theme/decaf-mobile/smarty3/profed_end.tpl b/view/theme/decaf-mobile/templates/profed_end.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/profed_end.tpl rename to view/theme/decaf-mobile/templates/profed_end.tpl diff --git a/view/theme/decaf-mobile/smarty3/profed_head.tpl b/view/theme/decaf-mobile/templates/profed_head.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/profed_head.tpl rename to view/theme/decaf-mobile/templates/profed_head.tpl diff --git a/view/theme/decaf-mobile/smarty3/profile_edit.tpl b/view/theme/decaf-mobile/templates/profile_edit.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/profile_edit.tpl rename to view/theme/decaf-mobile/templates/profile_edit.tpl diff --git a/view/theme/decaf-mobile/smarty3/profile_photo.tpl b/view/theme/decaf-mobile/templates/profile_photo.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/profile_photo.tpl rename to view/theme/decaf-mobile/templates/profile_photo.tpl diff --git a/view/theme/decaf-mobile/smarty3/profile_vcard.tpl b/view/theme/decaf-mobile/templates/profile_vcard.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/profile_vcard.tpl rename to view/theme/decaf-mobile/templates/profile_vcard.tpl diff --git a/view/theme/decaf-mobile/smarty3/prv_message.tpl b/view/theme/decaf-mobile/templates/prv_message.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/prv_message.tpl rename to view/theme/decaf-mobile/templates/prv_message.tpl diff --git a/view/theme/decaf-mobile/smarty3/register.tpl b/view/theme/decaf-mobile/templates/register.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/register.tpl rename to view/theme/decaf-mobile/templates/register.tpl diff --git a/view/theme/decaf-mobile/smarty3/search_item.tpl b/view/theme/decaf-mobile/templates/search_item.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/search_item.tpl rename to view/theme/decaf-mobile/templates/search_item.tpl diff --git a/view/theme/decaf-mobile/smarty3/settings-head.tpl b/view/theme/decaf-mobile/templates/settings-head.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/settings-head.tpl rename to view/theme/decaf-mobile/templates/settings-head.tpl diff --git a/view/theme/decaf-mobile/smarty3/settings.tpl b/view/theme/decaf-mobile/templates/settings.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/settings.tpl rename to view/theme/decaf-mobile/templates/settings.tpl diff --git a/view/theme/decaf-mobile/smarty3/settings_display_end.tpl b/view/theme/decaf-mobile/templates/settings_display_end.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/settings_display_end.tpl rename to view/theme/decaf-mobile/templates/settings_display_end.tpl diff --git a/view/theme/decaf-mobile/smarty3/suggest_friends.tpl b/view/theme/decaf-mobile/templates/suggest_friends.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/suggest_friends.tpl rename to view/theme/decaf-mobile/templates/suggest_friends.tpl diff --git a/view/theme/decaf-mobile/smarty3/threaded_conversation.tpl b/view/theme/decaf-mobile/templates/threaded_conversation.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/threaded_conversation.tpl rename to view/theme/decaf-mobile/templates/threaded_conversation.tpl diff --git a/view/theme/decaf-mobile/smarty3/voting_fakelink.tpl b/view/theme/decaf-mobile/templates/voting_fakelink.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/voting_fakelink.tpl rename to view/theme/decaf-mobile/templates/voting_fakelink.tpl diff --git a/view/theme/decaf-mobile/smarty3/wall_thread.tpl b/view/theme/decaf-mobile/templates/wall_thread.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/wall_thread.tpl rename to view/theme/decaf-mobile/templates/wall_thread.tpl diff --git a/view/theme/decaf-mobile/smarty3/wall_thread_toponly.tpl b/view/theme/decaf-mobile/templates/wall_thread_toponly.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/wall_thread_toponly.tpl rename to view/theme/decaf-mobile/templates/wall_thread_toponly.tpl diff --git a/view/theme/decaf-mobile/smarty3/wallmessage.tpl b/view/theme/decaf-mobile/templates/wallmessage.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/wallmessage.tpl rename to view/theme/decaf-mobile/templates/wallmessage.tpl diff --git a/view/theme/decaf-mobile/smarty3/wallmsg-end.tpl b/view/theme/decaf-mobile/templates/wallmsg-end.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/wallmsg-end.tpl rename to view/theme/decaf-mobile/templates/wallmsg-end.tpl diff --git a/view/theme/decaf-mobile/smarty3/wallmsg-header.tpl b/view/theme/decaf-mobile/templates/wallmsg-header.tpl similarity index 100% rename from view/theme/decaf-mobile/smarty3/wallmsg-header.tpl rename to view/theme/decaf-mobile/templates/wallmsg-header.tpl diff --git a/view/theme/decaf-mobile/threaded_conversation.tpl b/view/theme/decaf-mobile/threaded_conversation.tpl deleted file mode 100644 index 5310b323a9..0000000000 --- a/view/theme/decaf-mobile/threaded_conversation.tpl +++ /dev/null @@ -1,12 +0,0 @@ -$live_update - -{{ for $threads as $thread }} -{{ if $mode == display }} -{{ inc $thread.template with $item=$thread }}{{ endinc }} -{{ else }} -{{ inc wall_thread_toponly.tpl with $item=$thread }}{{ endinc }} -{{ endif }} -{{ endfor }} - -
- diff --git a/view/theme/decaf-mobile/voting_fakelink.tpl b/view/theme/decaf-mobile/voting_fakelink.tpl deleted file mode 100644 index b66302cc27..0000000000 --- a/view/theme/decaf-mobile/voting_fakelink.tpl +++ /dev/null @@ -1 +0,0 @@ -$phrase diff --git a/view/theme/decaf-mobile/wall_thread.tpl b/view/theme/decaf-mobile/wall_thread.tpl deleted file mode 100644 index a5bcbda7ea..0000000000 --- a/view/theme/decaf-mobile/wall_thread.tpl +++ /dev/null @@ -1,119 +0,0 @@ -
- -{##} -
-
- {{ if $item.owner_url }} -
- - $item.owner_name - -
-
$item.wall
- {{ endif }} - {##} - {##} - - $item.name - - {##} - - {##} - {##} -
- {{ if $item.lock }}{##}$item.lock{##} - {{ else }}
{{ endif }} -
$item.location
-
-
- {##} - $item.name{{ if $item.owner_url }} $item.to $item.owner_name $item.vwall{{ endif }}
-
$item.ago
- {##} -
-
$item.title
- {##} -
$item.body - {##} - {{ for $item.tags as $tag }} - $tag - {{ endfor }} - {##} - {{ if $item.has_cats }} -
$item.txt_cats {{ for $item.categories as $cat }}$cat.name [$remove] {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} -
- {{ endif }} - - {{ if $item.has_folders }} -
$item.txt_folders {{ for $item.folders as $cat }}$cat.name [$remove] {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} -
- {{ endif }} -
-
-
- {{ if $item.vote }} - - {{ endif }} - {{ if $item.plink }} - {##}{##} - {{ endif }} - {{ if $item.edpost }} - - {{ endif }} - - {{ if $item.star }} - - {{ endif }} - {##} - {##} - - {##} - {{ if $item.drop.dropping }}{{ endif }} - {##} - {##} - {##} -
-
- {##} - -
$item.dislike
- - {{ if $item.threaded }} - {{ if $item.comment }} - {##} - $item.comment - {##} - {{ endif }} - {{ endif }} - -{##} -{##} -{{ for $item.children as $child }} - {{ inc $child.template with $item=$child }}{{ endinc }} -{{ endfor }} - -{{ if $item.flatten }} -{##} - $item.comment -{##} -{{ endif }} -
- diff --git a/view/theme/decaf-mobile/wall_thread_toponly.tpl b/view/theme/decaf-mobile/wall_thread_toponly.tpl deleted file mode 100644 index 817432da53..0000000000 --- a/view/theme/decaf-mobile/wall_thread_toponly.tpl +++ /dev/null @@ -1,101 +0,0 @@ - -
- -
-
- {{ if $item.owner_url }} -
- - $item.owner_name - -
-
$item.wall
- {{ endif }} - - $item.name - - -
- {{ if $item.lock }}$item.lock - {{ else }}
{{ endif }} -
$item.location
-
-
- $item.name{{ if $item.owner_url }} $item.to $item.owner_name $item.vwall{{ endif }}
-
$item.ago
-
-
$item.title
-
$item.body - {{ for $item.tags as $tag }} - $tag - {{ endfor }} - {{ if $item.has_cats }} -
$item.txt_cats {{ for $item.categories as $cat }}$cat.name [$remove] {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} -
- {{ endif }} - - {{ if $item.has_folders }} -
$item.txt_folders {{ for $item.folders as $cat }}$cat.name [$remove] {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} -
- {{ endif }} -
-
-
- {{ if $item.vote }} - - {{ endif }} - {{ if $item.plink }} - - {{ endif }} - {{ if $item.edpost }} - - {{ endif }} - - {{ if $item.star }} - - {{ endif }} - {##} - - {{ if $item.drop.dropping }}{{ endif }} - {##} -
-
- -
$item.dislike
- - - -
- - diff --git a/view/theme/decaf-mobile/wallmessage.tpl b/view/theme/decaf-mobile/wallmessage.tpl deleted file mode 100644 index e7fa0ec048..0000000000 --- a/view/theme/decaf-mobile/wallmessage.tpl +++ /dev/null @@ -1,32 +0,0 @@ - -

$header

- -

$subheader

- -
- - -$parent - -
$to
-$recipname - -
$subject
- - -
$yourmessage
- - - -
- - {##} -
- -
-
-
- -
diff --git a/view/theme/decaf-mobile/wallmsg-end.tpl b/view/theme/decaf-mobile/wallmsg-end.tpl deleted file mode 100644 index 6074133798..0000000000 --- a/view/theme/decaf-mobile/wallmsg-end.tpl +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/view/theme/decaf-mobile/wallmsg-header.tpl b/view/theme/decaf-mobile/wallmsg-header.tpl deleted file mode 100644 index dc6cb82199..0000000000 --- a/view/theme/decaf-mobile/wallmsg-header.tpl +++ /dev/null @@ -1,7 +0,0 @@ - - - diff --git a/view/theme/diabook/admin_users.tpl b/view/theme/diabook/admin_users.tpl deleted file mode 100644 index b455a8c2ee..0000000000 --- a/view/theme/diabook/admin_users.tpl +++ /dev/null @@ -1,88 +0,0 @@ - -
-

$title - $page

- -
- -

$h_pending

- {{ if $pending }} - - - - {{ for $th_pending as $th }}{{ endfor }} - - - - - - {{ for $pending as $u }} - - - - - - - - {{ endfor }} - -
$th
$u.created$u.name - - -
- -
- {{ else }} -

$no_pending

- {{ endif }} - - - - -

$h_users

- {{ if $users }} - - - - - {{ for $th_users as $th }}{{ endfor }} - - - - - - {{ for $users as $u }} - - - - - - - - - - - - {{ endfor }} - -
$th
$u.nickname$u.name$u.register_date$u.lastitem_date - - -
- -
- {{ else }} - NO USERS?!? - {{ endif }} -
-
diff --git a/view/theme/diabook/bottom.tpl b/view/theme/diabook/bottom.tpl deleted file mode 100644 index 08952aad65..0000000000 --- a/view/theme/diabook/bottom.tpl +++ /dev/null @@ -1,155 +0,0 @@ - - - diff --git a/view/theme/diabook/ch_directory_item.tpl b/view/theme/diabook/ch_directory_item.tpl deleted file mode 100644 index f32f5a4f78..0000000000 --- a/view/theme/diabook/ch_directory_item.tpl +++ /dev/null @@ -1,10 +0,0 @@ - -
-
-
- - $alt_text - -
-
-
diff --git a/view/theme/diabook/comment_item.tpl b/view/theme/diabook/comment_item.tpl deleted file mode 100644 index 6f263b3d3a..0000000000 --- a/view/theme/diabook/comment_item.tpl +++ /dev/null @@ -1,43 +0,0 @@ -
-
- - - - {##} - - - -
- $mytitle -
-
- - - {{ if $qcomment }} - - {{ endif }} - -
- - -
-
- -
diff --git a/view/theme/diabook/communityhome.tpl b/view/theme/diabook/communityhome.tpl deleted file mode 100644 index dda674f75b..0000000000 --- a/view/theme/diabook/communityhome.tpl +++ /dev/null @@ -1,172 +0,0 @@ - - - - - - - -
-
- -
- -
-{{ if $page }} -
$page
-{{ endif }} -
- -
-{{ if $comunity_profiles_title }} -

$comunity_profiles_title

-
-{{ for $comunity_profiles_items as $i }} - $i -{{ endfor }} -
-{{ endif }} -
- -
-{{ if $helpers }} -

$helpers.title.1

-How-To Guides
-NewHere
-Friendica Support
-Let's talk
-Local Friendica -{{ endif }} -
- -
-{{ if $con_services }} -

$con_services.title.1

-
-Facebook -StatusNet -LiveJournal -Posterous -Tumblr -Twitter -WordPress -E-Mail -
-{{ endif }} -
- -
-{{ if $nv }} -

$nv.title.1

-$nv.directory.1
-$nv.global_directory.1
-$nv.match.1
-$nv.suggest.1
-$nv.invite.1 -$nv.search -{{ endif }} -
- -
-{{ if $lastusers_title }} -

$lastusers_title

-
-{{ for $lastusers_items as $i }} - $i -{{ endfor }} -
-{{ endif }} -
- -{{ if $activeusers_title }} -

$activeusers_title

-
-{{ for $activeusers_items as $i }} - $i -{{ endfor }} -
-{{ endif }} - -
-{{ if $photos_title }} -

$photos_title

-
-{{ for $photos_items as $i }} - $i -{{ endfor }} -
-{{ endif }} -
- -
-{{ if $like_title }} -

$like_title

-
    -{{ for $like_items as $i }} -
  • $i
  • -{{ endfor }} -
-{{ endif }} -
- -
-

$twitter.title.1

-
-
-
- -
-{{ if $mapquery }} -

$mapquery.title.1

-
-
-
Data CC-By-SA by OpenStreetMap
-{{ endif }} -
-
diff --git a/view/theme/diabook/contact_template.tpl b/view/theme/diabook/contact_template.tpl deleted file mode 100644 index f7ed107509..0000000000 --- a/view/theme/diabook/contact_template.tpl +++ /dev/null @@ -1,31 +0,0 @@ - -
-
-
- - $contact.name - - {{ if $contact.photo_menu }} - menu -
-
    - {{ for $contact.photo_menu as $c }} - {{ if $c.2 }} -
  • $c.0
  • - {{ else }} -
  • $c.0
  • - {{ endif }} - {{ endfor }} -
-
- {{ endif }} -
- -
-
-
$contact.name
- -
-
diff --git a/view/theme/diabook/directory_item.tpl b/view/theme/diabook/directory_item.tpl deleted file mode 100644 index 163c0c80e7..0000000000 --- a/view/theme/diabook/directory_item.tpl +++ /dev/null @@ -1,42 +0,0 @@ - -
-
-
- - $alt_text - -
-
-
-
$name
-
$page_type
- {{ if $pdesc }}
$profile.pdesc
{{ endif }} -
-
- {{ if $location }} -
$location
-
- {{ if $profile.address }}
$profile.address
{{ endif }} - - $profile.locality{{ if $profile.locality }}, {{ endif }} - $profile.region - $profile.postal_code - - {{ if $profile.country_name }}$profile.country_name{{ endif }} -
-
- {{ endif }} - - {{ if $gender }}
$gender
$profile.gender
{{ endif }} -
-
- {{ if $marital }}
$marital
$profile.marital
{{ endif }} - - {{ if $homepage }}
$homepage
$profile.homepage
{{ endif }} -
-
-
- {{ if $about }}
$about
$profile.about
{{ endif }} -
-
-
diff --git a/view/theme/diabook/footer.tpl b/view/theme/diabook/footer.tpl deleted file mode 100644 index 25058a7ff7..0000000000 --- a/view/theme/diabook/footer.tpl +++ /dev/null @@ -1,3 +0,0 @@ - \ No newline at end of file diff --git a/view/theme/diabook/generic_links_widget.tpl b/view/theme/diabook/generic_links_widget.tpl deleted file mode 100644 index 001c1395e6..0000000000 --- a/view/theme/diabook/generic_links_widget.tpl +++ /dev/null @@ -1,11 +0,0 @@ -
- {{if $title}}

$title

{{endif}} - {{if $desc}}
$desc
{{endif}} - -
    - {{ for $items as $item }} -
  • $item.label
  • - {{ endfor }} -
- -
diff --git a/view/theme/diabook/group_side.tpl b/view/theme/diabook/group_side.tpl deleted file mode 100644 index ce4b25fbf7..0000000000 --- a/view/theme/diabook/group_side.tpl +++ /dev/null @@ -1,34 +0,0 @@ -
-
-

$title

-
- - - {{ if $ungrouped }} - - {{ endif }} -
- diff --git a/view/theme/diabook/jot.tpl b/view/theme/diabook/jot.tpl deleted file mode 100644 index 2c7e521103..0000000000 --- a/view/theme/diabook/jot.tpl +++ /dev/null @@ -1,87 +0,0 @@ - -
-
-
 
-
-
- -
- - - - - - - - - {{ if $placeholdercategory }} -
- {{ endif }} -
- - - - -
- -
-
-
-
-
-
- - -
- -
-
- -
-
- -
-
- -
- - - - $preview - -
- $bang -
- - -
- $jotplugins -
- -
- -
- -
-
- - - -
-
- $acl -
-
$emailcc
-
- $jotnets -
-
- - - - -
-
- {{ if $content }}{{ endif }} diff --git a/view/theme/diabook/login.tpl b/view/theme/diabook/login.tpl deleted file mode 100644 index efa7c2d6dd..0000000000 --- a/view/theme/diabook/login.tpl +++ /dev/null @@ -1,33 +0,0 @@ - -
- - -
- {{ inc field_input.tpl with $field=$lname }}{{ endinc }} - {{ inc field_password.tpl with $field=$lpassword }}{{ endinc }} -
- - {{ if $openid }} -
- {{ inc field_openid.tpl with $field=$lopenid }}{{ endinc }} -
- {{ endif }} - -
- -
- - - - {{ for $hiddens as $k=>$v }} - - {{ endfor }} - - -
- - - diff --git a/view/theme/diabook/mail_conv.tpl b/view/theme/diabook/mail_conv.tpl deleted file mode 100644 index 989f178781..0000000000 --- a/view/theme/diabook/mail_conv.tpl +++ /dev/null @@ -1,60 +0,0 @@ -
-
-
- -
-
- $mail.body -
-
-
- -
-
-
-
-
-
-
-
- $mail.from_name $mail.date -
- -
-
- - - -
-
-
-
-
- - -{# - - -
-
- $mail.from_name -
-
-
$mail.from_name
-
$mail.date
-
$mail.subject
-
$mail.body
-
-
-
-
-
- -#} diff --git a/view/theme/diabook/mail_display.tpl b/view/theme/diabook/mail_display.tpl deleted file mode 100644 index 2b680ae428..0000000000 --- a/view/theme/diabook/mail_display.tpl +++ /dev/null @@ -1,12 +0,0 @@ -
- $thread_subject - -
- -{{ for $mails as $mail }} -
- {{ inc mail_conv.tpl }}{{endinc}} -
-{{ endfor }} - -{{ inc prv_message.tpl }}{{ endinc }} diff --git a/view/theme/diabook/mail_list.tpl b/view/theme/diabook/mail_list.tpl deleted file mode 100644 index 6bc6c84f60..0000000000 --- a/view/theme/diabook/mail_list.tpl +++ /dev/null @@ -1,8 +0,0 @@ -
- $subject - $from_name - $date - $count - - -
diff --git a/view/theme/diabook/message_side.tpl b/view/theme/diabook/message_side.tpl deleted file mode 100644 index 9f15870964..0000000000 --- a/view/theme/diabook/message_side.tpl +++ /dev/null @@ -1,10 +0,0 @@ -
- - -
    - {{ for $tabs as $t }} -
  • $t.label
  • - {{ endfor }} -
- -
diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl deleted file mode 100644 index c91a9f56d2..0000000000 --- a/view/theme/diabook/nav.tpl +++ /dev/null @@ -1,188 +0,0 @@ -
-
$sitelocation
- -
- - - - -
$langselector
-
- - - - - - - - -{# - -{{ if $nav.logout }}$nav.logout.1 {{ endif }} -{{ if $nav.login }} {{ endif }} - - - -{{ if $nav.register }}$nav.register.1{{ endif }} - -$nav.help.1 - -{{ if $nav.apps }}$nav.apps.1{{ endif }} - -$nav.search.1 -$nav.directory.1 - -{{ if $nav.admin }}$nav.admin.1{{ endif }} - -{{ if $nav.notifications }} -$nav.notifications.1 - -{{ endif }} -{{ if $nav.messages }} -$nav.messages.1 - -{{ endif }} - -{{ if $nav.manage }}$nav.manage.1{{ endif }} - -{{ if $nav.settings }}$nav.settings.1{{ endif }} -{{ if $nav.profiles }}$nav.profiles.1{{ endif }} - - - - - -#} diff --git a/view/theme/diabook/nets.tpl b/view/theme/diabook/nets.tpl deleted file mode 100644 index faccca398e..0000000000 --- a/view/theme/diabook/nets.tpl +++ /dev/null @@ -1,17 +0,0 @@ -
-

$title

-
$desc
- - -
diff --git a/view/theme/diabook/oembed_video.tpl b/view/theme/diabook/oembed_video.tpl deleted file mode 100644 index 99c65cb290..0000000000 --- a/view/theme/diabook/oembed_video.tpl +++ /dev/null @@ -1,4 +0,0 @@ - - -
-
diff --git a/view/theme/diabook/photo_item.tpl b/view/theme/diabook/photo_item.tpl deleted file mode 100644 index 5d65a89b79..0000000000 --- a/view/theme/diabook/photo_item.tpl +++ /dev/null @@ -1,65 +0,0 @@ -{{ if $indent }}{{ else }} -
- -
-{{ endif }} - -
-
-
-
- - $name - - menu - - -
-
-
- $name - - - {{ if $plink }}$ago{{ else }} $ago {{ endif }} - {{ if $lock }} - $lock {{ endif }} - -
-
- {{ if $title }}

$title

{{ endif }} - $body -
-
-
- -
- {{ for $tags as $tag }} - $tag - {{ endfor }} -
-
- -
-
-
-
- -
- - {{ if $drop.dropping }} - - $drop.delete - {{ endif }} - {{ if $edpost }} - - {{ endif }} -
- -
-
-
- -
-
- diff --git a/view/theme/diabook/photo_view.tpl b/view/theme/diabook/photo_view.tpl deleted file mode 100644 index 272b670488..0000000000 --- a/view/theme/diabook/photo_view.tpl +++ /dev/null @@ -1,33 +0,0 @@ -
-

$album.1

- - - -{{ if $prevlink }}{{ endif }} -
-{{ if $nextlink }}{{ endif }} -
-
$desc
-{{ if $tags }} -
$tags.0
-
$tags.1
-{{ endif }} -{{ if $tags.2 }}{{ endif }} - -{{ if $edit }}$edit{{ endif }} - -
-
-
-$comments -
- -$paginate - diff --git a/view/theme/diabook/profile_side.tpl b/view/theme/diabook/profile_side.tpl deleted file mode 100644 index 01e80f2388..0000000000 --- a/view/theme/diabook/profile_side.tpl +++ /dev/null @@ -1,21 +0,0 @@ - - - diff --git a/view/theme/diabook/profile_vcard.tpl b/view/theme/diabook/profile_vcard.tpl deleted file mode 100644 index 8251458257..0000000000 --- a/view/theme/diabook/profile_vcard.tpl +++ /dev/null @@ -1,64 +0,0 @@ -
- -
-
$profile.name
- {{ if $profile.edit }} -
- $profile.edit.1 - -
- {{ endif }} -
- - - -
$profile.name
- {{ if $pdesc }}
$profile.pdesc
{{ endif }} - - - {{ if $location }} -
$location

-
- {{ if $profile.address }}
$profile.address
{{ endif }} - - $profile.locality{{ if $profile.locality }}, {{ endif }} - $profile.region - $profile.postal_code - - {{ if $profile.country_name }}$profile.country_name{{ endif }} -
-
- {{ endif }} - - {{ if $gender }}
$gender
$profile.gender
{{ endif }} - - {{ if $profile.pubkey }}{{ endif }} - - {{ if $marital }}
$marital
$profile.marital
{{ endif }} - - {{ if $homepage }}
$homepage
$profile.homepage
{{ endif }} - - {{ inc diaspora_vcard.tpl }}{{ endinc }} - - -
- -$contact_block - - diff --git a/view/theme/diabook/prv_message.tpl b/view/theme/diabook/prv_message.tpl deleted file mode 100644 index 7a7413e9d8..0000000000 --- a/view/theme/diabook/prv_message.tpl +++ /dev/null @@ -1,40 +0,0 @@ - -

$header

- -
-
- -$parent - -
$to
- -{{ if $showinputs }} - - -{{ else }} -$select -{{ endif }} - -
$subject
- - -
$yourmessage
- - - -
- -
-
-
- -
- -
-
-
-
-
diff --git a/view/theme/diabook/right_aside.tpl b/view/theme/diabook/right_aside.tpl deleted file mode 100644 index 18d5f6fd52..0000000000 --- a/view/theme/diabook/right_aside.tpl +++ /dev/null @@ -1,20 +0,0 @@ - - - \ No newline at end of file diff --git a/view/theme/diabook/search_item.tpl b/view/theme/diabook/search_item.tpl deleted file mode 100644 index d0c83c37a3..0000000000 --- a/view/theme/diabook/search_item.tpl +++ /dev/null @@ -1,111 +0,0 @@ -{{ if $item.indent }}{{ else }} -
- -
-{{ endif }} -
-
-
-
- - $item.name - - menu - - -
-
-
- $item.name - - - {{ if $item.plink }}$item.ago{{ else }} $item.ago {{ endif }} - {{ if $item.lock }} - $item.lock {{ endif }} - -
-
- {{ if $item.title }}

$item.title

{{ endif }} - $item.body - {{ if $item.has_cats }} -
$item.txt_cats {{ for $item.categories as $cat }}$cat.name [$remove] {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} -
- {{ endif }} - - {{ if $item.has_folders }} -
$item.txt_folders {{ for $item.folders as $cat }}$cat.name [$remove] {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} -
- {{ endif }} -
-
-
- -
- {{ for $item.tags as $tag }} - $tag - {{ endfor }} -
-
-
-
- -
-
- -
- - - {{ if $item.vote }} - - - {{ endif }} - - {{ if $item.vote.share }} - - {{ endif }} - - - {{ if $item.star }} - - $item.star.do - - {{ endif }} - - {{ if $item.filer }} - - {{ endif }} - - {{ if $item.plink }}$item.plink.title{{ endif }} - - - -
- -
- - {{ if $item.drop.pagedrop }} - - {{ endif }} - {{ if $item.drop.dropping }} - $item.drop.delete - {{ endif }} - {{ if $item.edpost }} - - {{ endif }} -
-
$item.location 
-
-
-
- - -
$item.dislike
-
-
- -
- $item.comment -
diff --git a/view/theme/diabook/smarty3/admin_users.tpl b/view/theme/diabook/templates/admin_users.tpl similarity index 100% rename from view/theme/diabook/smarty3/admin_users.tpl rename to view/theme/diabook/templates/admin_users.tpl diff --git a/view/theme/diabook/smarty3/bottom.tpl b/view/theme/diabook/templates/bottom.tpl similarity index 100% rename from view/theme/diabook/smarty3/bottom.tpl rename to view/theme/diabook/templates/bottom.tpl diff --git a/view/theme/diabook/smarty3/ch_directory_item.tpl b/view/theme/diabook/templates/ch_directory_item.tpl similarity index 100% rename from view/theme/diabook/smarty3/ch_directory_item.tpl rename to view/theme/diabook/templates/ch_directory_item.tpl diff --git a/view/theme/diabook/smarty3/comment_item.tpl b/view/theme/diabook/templates/comment_item.tpl similarity index 100% rename from view/theme/diabook/smarty3/comment_item.tpl rename to view/theme/diabook/templates/comment_item.tpl diff --git a/view/theme/diabook/smarty3/communityhome.tpl b/view/theme/diabook/templates/communityhome.tpl similarity index 100% rename from view/theme/diabook/smarty3/communityhome.tpl rename to view/theme/diabook/templates/communityhome.tpl diff --git a/view/theme/diabook/smarty3/contact_template.tpl b/view/theme/diabook/templates/contact_template.tpl similarity index 100% rename from view/theme/diabook/smarty3/contact_template.tpl rename to view/theme/diabook/templates/contact_template.tpl diff --git a/view/theme/diabook/smarty3/directory_item.tpl b/view/theme/diabook/templates/directory_item.tpl similarity index 100% rename from view/theme/diabook/smarty3/directory_item.tpl rename to view/theme/diabook/templates/directory_item.tpl diff --git a/view/theme/diabook/smarty3/footer.tpl b/view/theme/diabook/templates/footer.tpl similarity index 100% rename from view/theme/diabook/smarty3/footer.tpl rename to view/theme/diabook/templates/footer.tpl diff --git a/view/theme/diabook/smarty3/generic_links_widget.tpl b/view/theme/diabook/templates/generic_links_widget.tpl similarity index 100% rename from view/theme/diabook/smarty3/generic_links_widget.tpl rename to view/theme/diabook/templates/generic_links_widget.tpl diff --git a/view/theme/diabook/smarty3/group_side.tpl b/view/theme/diabook/templates/group_side.tpl similarity index 100% rename from view/theme/diabook/smarty3/group_side.tpl rename to view/theme/diabook/templates/group_side.tpl diff --git a/view/theme/diabook/smarty3/jot.tpl b/view/theme/diabook/templates/jot.tpl similarity index 100% rename from view/theme/diabook/smarty3/jot.tpl rename to view/theme/diabook/templates/jot.tpl diff --git a/view/theme/diabook/smarty3/login.tpl b/view/theme/diabook/templates/login.tpl similarity index 100% rename from view/theme/diabook/smarty3/login.tpl rename to view/theme/diabook/templates/login.tpl diff --git a/view/theme/diabook/smarty3/mail_conv.tpl b/view/theme/diabook/templates/mail_conv.tpl similarity index 100% rename from view/theme/diabook/smarty3/mail_conv.tpl rename to view/theme/diabook/templates/mail_conv.tpl diff --git a/view/theme/diabook/smarty3/mail_display.tpl b/view/theme/diabook/templates/mail_display.tpl similarity index 100% rename from view/theme/diabook/smarty3/mail_display.tpl rename to view/theme/diabook/templates/mail_display.tpl diff --git a/view/theme/diabook/smarty3/mail_list.tpl b/view/theme/diabook/templates/mail_list.tpl similarity index 100% rename from view/theme/diabook/smarty3/mail_list.tpl rename to view/theme/diabook/templates/mail_list.tpl diff --git a/view/theme/diabook/smarty3/message_side.tpl b/view/theme/diabook/templates/message_side.tpl similarity index 100% rename from view/theme/diabook/smarty3/message_side.tpl rename to view/theme/diabook/templates/message_side.tpl diff --git a/view/theme/diabook/smarty3/nav.tpl b/view/theme/diabook/templates/nav.tpl similarity index 100% rename from view/theme/diabook/smarty3/nav.tpl rename to view/theme/diabook/templates/nav.tpl diff --git a/view/theme/diabook/smarty3/nets.tpl b/view/theme/diabook/templates/nets.tpl similarity index 100% rename from view/theme/diabook/smarty3/nets.tpl rename to view/theme/diabook/templates/nets.tpl diff --git a/view/theme/diabook/smarty3/oembed_video.tpl b/view/theme/diabook/templates/oembed_video.tpl similarity index 100% rename from view/theme/diabook/smarty3/oembed_video.tpl rename to view/theme/diabook/templates/oembed_video.tpl diff --git a/view/theme/diabook/smarty3/photo_item.tpl b/view/theme/diabook/templates/photo_item.tpl similarity index 100% rename from view/theme/diabook/smarty3/photo_item.tpl rename to view/theme/diabook/templates/photo_item.tpl diff --git a/view/theme/diabook/smarty3/photo_view.tpl b/view/theme/diabook/templates/photo_view.tpl similarity index 100% rename from view/theme/diabook/smarty3/photo_view.tpl rename to view/theme/diabook/templates/photo_view.tpl diff --git a/view/theme/diabook/smarty3/profile_side.tpl b/view/theme/diabook/templates/profile_side.tpl similarity index 100% rename from view/theme/diabook/smarty3/profile_side.tpl rename to view/theme/diabook/templates/profile_side.tpl diff --git a/view/theme/diabook/smarty3/profile_vcard.tpl b/view/theme/diabook/templates/profile_vcard.tpl similarity index 100% rename from view/theme/diabook/smarty3/profile_vcard.tpl rename to view/theme/diabook/templates/profile_vcard.tpl diff --git a/view/theme/diabook/smarty3/prv_message.tpl b/view/theme/diabook/templates/prv_message.tpl similarity index 100% rename from view/theme/diabook/smarty3/prv_message.tpl rename to view/theme/diabook/templates/prv_message.tpl diff --git a/view/theme/diabook/smarty3/right_aside.tpl b/view/theme/diabook/templates/right_aside.tpl similarity index 100% rename from view/theme/diabook/smarty3/right_aside.tpl rename to view/theme/diabook/templates/right_aside.tpl diff --git a/view/theme/diabook/smarty3/search_item.tpl b/view/theme/diabook/templates/search_item.tpl similarity index 100% rename from view/theme/diabook/smarty3/search_item.tpl rename to view/theme/diabook/templates/search_item.tpl diff --git a/view/theme/diabook/smarty3/theme_settings.tpl b/view/theme/diabook/templates/theme_settings.tpl similarity index 100% rename from view/theme/diabook/smarty3/theme_settings.tpl rename to view/theme/diabook/templates/theme_settings.tpl diff --git a/view/theme/diabook/smarty3/wall_thread.tpl b/view/theme/diabook/templates/wall_thread.tpl similarity index 100% rename from view/theme/diabook/smarty3/wall_thread.tpl rename to view/theme/diabook/templates/wall_thread.tpl diff --git a/view/theme/diabook/theme_settings.tpl b/view/theme/diabook/theme_settings.tpl deleted file mode 100644 index ad024dfe99..0000000000 --- a/view/theme/diabook/theme_settings.tpl +++ /dev/null @@ -1,41 +0,0 @@ -{{inc field_select.tpl with $field=$color}}{{endinc}} - -{{inc field_select.tpl with $field=$font_size}}{{endinc}} - -{{inc field_select.tpl with $field=$line_height}}{{endinc}} - -{{inc field_select.tpl with $field=$resolution}}{{endinc}} - -
- -
-
-

Show/hide boxes at right-hand column

-{{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}} - -
- -
- -
- - - diff --git a/view/theme/diabook/wall_thread.tpl b/view/theme/diabook/wall_thread.tpl deleted file mode 100644 index c4c0ac35fe..0000000000 --- a/view/theme/diabook/wall_thread.tpl +++ /dev/null @@ -1,141 +0,0 @@ -{{if $item.comment_firstcollapsed}} -
- $item.num_comments $item.hide_text -
- {{endif}} diff --git a/view/theme/dispy/bottom.tpl b/view/theme/dispy/bottom.tpl deleted file mode 100644 index 82f0201703..0000000000 --- a/view/theme/dispy/bottom.tpl +++ /dev/null @@ -1,71 +0,0 @@ - - diff --git a/view/theme/dispy/comment_item.tpl b/view/theme/dispy/comment_item.tpl deleted file mode 100644 index e940800323..0000000000 --- a/view/theme/dispy/comment_item.tpl +++ /dev/null @@ -1,70 +0,0 @@ -
-
- - - - {##} - - - - -
- $mytitle -
-
-
    -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
-
- - {{ if $qcomment }} -
- -
- {{ endif }} - -
- -
-
-
diff --git a/view/theme/dispy/communityhome.tpl b/view/theme/dispy/communityhome.tpl deleted file mode 100644 index aaa27465b0..0000000000 --- a/view/theme/dispy/communityhome.tpl +++ /dev/null @@ -1,35 +0,0 @@ -{{ if $page }} -
$page
-{{ endif }} - -

Help or '@NewHere'?

- - -

Connectable Services

-
    -
  • Facebook
  • -
  • StatusNet
  • -
  • LiveJournal
  • -
  • Posterous
  • -
  • Tumblr
  • -
  • Twitter
  • -
  • WordPress
  • -
  • E-Mail
  • -
- diff --git a/view/theme/dispy/contact_template.tpl b/view/theme/dispy/contact_template.tpl deleted file mode 100644 index e656ea5527..0000000000 --- a/view/theme/dispy/contact_template.tpl +++ /dev/null @@ -1,36 +0,0 @@ - -
-
-
- - $contact.name - - {{ if $contact.photo_menu }} - menu -
-
    - {{ for $contact.photo_menu as $c }} - {{ if $c.2 }} -
  • $c.0
  • - {{ else }} -
  • $c.0
  • - {{ endif }} - {{ endfor }} -
-
- {{ endif }} -
- -
-
-
$contact.name
-{{ if $contact.alt_text }}
$contact.alt_text
{{ endif }} -
- Profile URL
-
$contact.network
- -
-
- diff --git a/view/theme/dispy/conversation.tpl b/view/theme/dispy/conversation.tpl deleted file mode 100644 index 8eae2d6d1c..0000000000 --- a/view/theme/dispy/conversation.tpl +++ /dev/null @@ -1,29 +0,0 @@ -$live_update - -{{ for $threads as $thread }} -
- {{ for $thread.items as $item }} - {{if $item.comment_firstcollapsed}} -
- $thread.num_comments $thread.hide_text -
- {{endif}} - - {{ inc $item.template }}{{ endinc }} - - - {{ endfor }} -
-{{ endfor }} - -
- -{{ if $dropping }} - -
-{{ endif }} diff --git a/view/theme/dispy/group_side.tpl b/view/theme/dispy/group_side.tpl deleted file mode 100644 index be8e23de09..0000000000 --- a/view/theme/dispy/group_side.tpl +++ /dev/null @@ -1,29 +0,0 @@ -
-

$title

- - - -
- - diff --git a/view/theme/dispy/header.tpl b/view/theme/dispy/header.tpl deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl deleted file mode 100644 index f4712f0bef..0000000000 --- a/view/theme/dispy/jot-header.tpl +++ /dev/null @@ -1,345 +0,0 @@ - - - diff --git a/view/theme/dispy/jot.tpl b/view/theme/dispy/jot.tpl deleted file mode 100644 index 193872f182..0000000000 --- a/view/theme/dispy/jot.tpl +++ /dev/null @@ -1,79 +0,0 @@ -
-
-
 
- - - - - - - - - -
-
- {{ if $placeholdercategory }} -
- {{ endif }} - - -
- -
- - - -
-
- $acl -
-
$emailcc
-
- $jotnets -
-
-
- -
-
-
- {{ if $content }}{{ endif }} diff --git a/view/theme/dispy/lang_selector.tpl b/view/theme/dispy/lang_selector.tpl deleted file mode 100644 index e777a0a861..0000000000 --- a/view/theme/dispy/lang_selector.tpl +++ /dev/null @@ -1,10 +0,0 @@ -
- diff --git a/view/theme/dispy/mail_head.tpl b/view/theme/dispy/mail_head.tpl deleted file mode 100644 index d49d7c1af9..0000000000 --- a/view/theme/dispy/mail_head.tpl +++ /dev/null @@ -1,5 +0,0 @@ -

$messages

- -
-$tab_content -
diff --git a/view/theme/dispy/nav.tpl b/view/theme/dispy/nav.tpl deleted file mode 100644 index d0307b60d0..0000000000 --- a/view/theme/dispy/nav.tpl +++ /dev/null @@ -1,145 +0,0 @@ - - -
-$langselector -
- - - - - - - diff --git a/view/theme/dispy/photo_edit.tpl b/view/theme/dispy/photo_edit.tpl deleted file mode 100644 index ead8bc9207..0000000000 --- a/view/theme/dispy/photo_edit.tpl +++ /dev/null @@ -1,53 +0,0 @@ - -
- - - - - - -
- - - - -
- - - - -
-
-
$rotate
- -
-
- -
- $permissions -
- -
-
- $aclselect -
-
-
-
- - - - -
-
- - diff --git a/view/theme/dispy/photo_view.tpl b/view/theme/dispy/photo_view.tpl deleted file mode 100644 index a559583085..0000000000 --- a/view/theme/dispy/photo_view.tpl +++ /dev/null @@ -1,36 +0,0 @@ -
-

$album.1

- - - -{{ if $prevlink }}{{ endif }} -
-{{ if $nextlink }}{{ endif }} -
-
$desc
-{{ if $tags }} -
$tags.0
-
$tags.1
-{{ endif }} -{{ if $tags.2 }}{{ endif }} - -{{ if $edit }}$edit{{ endif }} - -{{ if $likebuttons }} -
- $likebuttons $like $dislike -
-{{ endif }} -
-$comments -
- -$paginate - diff --git a/view/theme/dispy/profile_vcard.tpl b/view/theme/dispy/profile_vcard.tpl deleted file mode 100644 index b7c99edd9d..0000000000 --- a/view/theme/dispy/profile_vcard.tpl +++ /dev/null @@ -1,82 +0,0 @@ -
- - {{ if $profile.edit }} -
- - $profile.edit.1 - -
- {{ endif }} - -
$profile.name
- - {{ if $pdesc }} -
$profile.pdesc
- {{ endif }} -
- $profile.name -
- - {{ if $location }} -
- $location -
- {{ if $profile.address }} -
$profile.address
{{ endif }} - - $profile.locality{{ if $profile.locality }}, {{ endif }} - $profile.region - $profile.postal_code - - {{ if $profile.country_name }}$profile.country_name{{ endif }} -
-
- {{ endif }} - - {{ if $gender }} -
- $gender - $profile.gender -
- {{ endif }} - - {{ if $profile.pubkey }} - - {{ endif }} - - {{ if $marital }} -
- - $marital - $profile.marital -
- {{ endif }} - - {{ if $homepage }} -
- $homepage - $profile.homepage -
{{ endif }} - - {{ inc diaspora_vcard.tpl }}{{ endinc }} - - -
- -$contact_block - diff --git a/view/theme/dispy/saved_searches_aside.tpl b/view/theme/dispy/saved_searches_aside.tpl deleted file mode 100644 index fb822fe5db..0000000000 --- a/view/theme/dispy/saved_searches_aside.tpl +++ /dev/null @@ -1,14 +0,0 @@ -
- - $searchbox - -
    - {{ for $saved as $search }} -
  • - - $search.term -
  • - {{ endfor }} -
-
-
diff --git a/view/theme/dispy/search_item.tpl b/view/theme/dispy/search_item.tpl deleted file mode 100644 index 5fc8febe9f..0000000000 --- a/view/theme/dispy/search_item.tpl +++ /dev/null @@ -1,64 +0,0 @@ -
-
-
-
- - $item.name - menu -
-
    - $item.item_photo_menu -
-
-
-
-
- {{ if $item.lock }}
$item.lock
- {{ else }}
{{ endif }} -
$item.location
-
-
-
- $item.name -
$item.ago
- -
-
-
$item.title
-
-
$item.body
- {{ if $item.has_cats }} -
$item.txt_cats {{ for $item.categories as $cat }}$cat.name [$remove] {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} -
- {{ endif }} - - {{ if $item.has_folders }} -
$item.txt_folders {{ for $item.folders as $cat }}$cat.name [$remove] {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} -
- {{ endif }} - -
-
-
- {{ if $item.drop.dropping }}{{ endif }} -
- {{ if $item.drop.pagedrop }}{{ endif }} -
-
-
-
- - -
- {{ if $item.conv }} - $item.conv.title - {{ endif }} -
- -
- -
- - diff --git a/view/theme/dispy/smarty3/bottom.tpl b/view/theme/dispy/templates/bottom.tpl similarity index 100% rename from view/theme/dispy/smarty3/bottom.tpl rename to view/theme/dispy/templates/bottom.tpl diff --git a/view/theme/dispy/smarty3/comment_item.tpl b/view/theme/dispy/templates/comment_item.tpl similarity index 100% rename from view/theme/dispy/smarty3/comment_item.tpl rename to view/theme/dispy/templates/comment_item.tpl diff --git a/view/theme/dispy/smarty3/communityhome.tpl b/view/theme/dispy/templates/communityhome.tpl similarity index 100% rename from view/theme/dispy/smarty3/communityhome.tpl rename to view/theme/dispy/templates/communityhome.tpl diff --git a/view/theme/dispy/smarty3/contact_template.tpl b/view/theme/dispy/templates/contact_template.tpl similarity index 100% rename from view/theme/dispy/smarty3/contact_template.tpl rename to view/theme/dispy/templates/contact_template.tpl diff --git a/view/theme/dispy/smarty3/conversation.tpl b/view/theme/dispy/templates/conversation.tpl similarity index 100% rename from view/theme/dispy/smarty3/conversation.tpl rename to view/theme/dispy/templates/conversation.tpl diff --git a/view/theme/dispy/smarty3/group_side.tpl b/view/theme/dispy/templates/group_side.tpl similarity index 100% rename from view/theme/dispy/smarty3/group_side.tpl rename to view/theme/dispy/templates/group_side.tpl diff --git a/view/theme/dispy/smarty3/header.tpl b/view/theme/dispy/templates/header.tpl similarity index 100% rename from view/theme/dispy/smarty3/header.tpl rename to view/theme/dispy/templates/header.tpl diff --git a/view/theme/dispy/smarty3/jot-header.tpl b/view/theme/dispy/templates/jot-header.tpl similarity index 100% rename from view/theme/dispy/smarty3/jot-header.tpl rename to view/theme/dispy/templates/jot-header.tpl diff --git a/view/theme/dispy/smarty3/jot.tpl b/view/theme/dispy/templates/jot.tpl similarity index 100% rename from view/theme/dispy/smarty3/jot.tpl rename to view/theme/dispy/templates/jot.tpl diff --git a/view/theme/dispy/smarty3/lang_selector.tpl b/view/theme/dispy/templates/lang_selector.tpl similarity index 100% rename from view/theme/dispy/smarty3/lang_selector.tpl rename to view/theme/dispy/templates/lang_selector.tpl diff --git a/view/theme/dispy/smarty3/mail_head.tpl b/view/theme/dispy/templates/mail_head.tpl similarity index 100% rename from view/theme/dispy/smarty3/mail_head.tpl rename to view/theme/dispy/templates/mail_head.tpl diff --git a/view/theme/dispy/smarty3/nav.tpl b/view/theme/dispy/templates/nav.tpl similarity index 100% rename from view/theme/dispy/smarty3/nav.tpl rename to view/theme/dispy/templates/nav.tpl diff --git a/view/theme/dispy/smarty3/photo_edit.tpl b/view/theme/dispy/templates/photo_edit.tpl similarity index 100% rename from view/theme/dispy/smarty3/photo_edit.tpl rename to view/theme/dispy/templates/photo_edit.tpl diff --git a/view/theme/dispy/smarty3/photo_view.tpl b/view/theme/dispy/templates/photo_view.tpl similarity index 100% rename from view/theme/dispy/smarty3/photo_view.tpl rename to view/theme/dispy/templates/photo_view.tpl diff --git a/view/theme/dispy/smarty3/profile_vcard.tpl b/view/theme/dispy/templates/profile_vcard.tpl similarity index 100% rename from view/theme/dispy/smarty3/profile_vcard.tpl rename to view/theme/dispy/templates/profile_vcard.tpl diff --git a/view/theme/dispy/smarty3/saved_searches_aside.tpl b/view/theme/dispy/templates/saved_searches_aside.tpl similarity index 100% rename from view/theme/dispy/smarty3/saved_searches_aside.tpl rename to view/theme/dispy/templates/saved_searches_aside.tpl diff --git a/view/theme/dispy/smarty3/search_item.tpl b/view/theme/dispy/templates/search_item.tpl similarity index 100% rename from view/theme/dispy/smarty3/search_item.tpl rename to view/theme/dispy/templates/search_item.tpl diff --git a/view/theme/dispy/smarty3/theme_settings.tpl b/view/theme/dispy/templates/theme_settings.tpl similarity index 100% rename from view/theme/dispy/smarty3/theme_settings.tpl rename to view/theme/dispy/templates/theme_settings.tpl diff --git a/view/theme/dispy/smarty3/threaded_conversation.tpl b/view/theme/dispy/templates/threaded_conversation.tpl similarity index 100% rename from view/theme/dispy/smarty3/threaded_conversation.tpl rename to view/theme/dispy/templates/threaded_conversation.tpl diff --git a/view/theme/dispy/smarty3/wall_thread.tpl b/view/theme/dispy/templates/wall_thread.tpl similarity index 100% rename from view/theme/dispy/smarty3/wall_thread.tpl rename to view/theme/dispy/templates/wall_thread.tpl diff --git a/view/theme/dispy/theme_settings.tpl b/view/theme/dispy/theme_settings.tpl deleted file mode 100644 index 9d250cb3aa..0000000000 --- a/view/theme/dispy/theme_settings.tpl +++ /dev/null @@ -1,10 +0,0 @@ -{{inc field_select.tpl with $field=$colour}}{{endinc}} - -{{inc field_select.tpl with $field=$font_size}}{{endinc}} - -{{inc field_select.tpl with $field=$line_height}}{{endinc}} - -
- -
- diff --git a/view/theme/dispy/threaded_conversation.tpl b/view/theme/dispy/threaded_conversation.tpl deleted file mode 100644 index 3deb7b9477..0000000000 --- a/view/theme/dispy/threaded_conversation.tpl +++ /dev/null @@ -1,15 +0,0 @@ -$live_update - -{{ for $threads as $thread }} -{{ inc $thread.template with $item=$thread }}{{ endinc }} -{{ endfor }} - -
- -{{ if $dropping }} - -
-{{ endif }} diff --git a/view/theme/dispy/wall_thread.tpl b/view/theme/dispy/wall_thread.tpl deleted file mode 100644 index ae70b8c82b..0000000000 --- a/view/theme/dispy/wall_thread.tpl +++ /dev/null @@ -1,139 +0,0 @@ -{{if $item.comment_firstcollapsed}} -
- $item.num_comments $item.hide_text -
- {{endif}} diff --git a/view/theme/duepuntozero/comment_item.tpl b/view/theme/duepuntozero/comment_item.tpl deleted file mode 100755 index 24164a0367..0000000000 --- a/view/theme/duepuntozero/comment_item.tpl +++ /dev/null @@ -1,66 +0,0 @@ - {{ if $threaded }} -
- {{ else }} -
- {{ endif }} -
- - - - {##} - - - - -
- $mytitle -
-
-
    -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
-
- - {{ if $qcomment }} - - {{ endif }} - -
- - -
-
- -
diff --git a/view/theme/duepuntozero/lang_selector.tpl b/view/theme/duepuntozero/lang_selector.tpl deleted file mode 100644 index e777a0a861..0000000000 --- a/view/theme/duepuntozero/lang_selector.tpl +++ /dev/null @@ -1,10 +0,0 @@ -
- diff --git a/view/theme/duepuntozero/moderated_comment.tpl b/view/theme/duepuntozero/moderated_comment.tpl deleted file mode 100755 index b0451c8c60..0000000000 --- a/view/theme/duepuntozero/moderated_comment.tpl +++ /dev/null @@ -1,61 +0,0 @@ -
-
- - - - - - - -
- $mytitle -
-
- -
    -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
-
- - -
- - -
-
- -
diff --git a/view/theme/duepuntozero/nav.tpl b/view/theme/duepuntozero/nav.tpl deleted file mode 100644 index edffcebf49..0000000000 --- a/view/theme/duepuntozero/nav.tpl +++ /dev/null @@ -1,70 +0,0 @@ - - - diff --git a/view/theme/duepuntozero/profile_vcard.tpl b/view/theme/duepuntozero/profile_vcard.tpl deleted file mode 100644 index e91e6125ff..0000000000 --- a/view/theme/duepuntozero/profile_vcard.tpl +++ /dev/null @@ -1,51 +0,0 @@ -
- -
$profile.name
- - - - {{ if $pdesc }}
$profile.pdesc
{{ endif }} -
$profile.name
- - - - {{ if $location }} -
$location
-
- {{ if $profile.address }}
$profile.address
{{ endif }} - - $profile.locality{{ if $profile.locality }}, {{ endif }} - $profile.region - $profile.postal_code - - {{ if $profile.country_name }}$profile.country_name{{ endif }} -
-
- {{ endif }} - - {{ if $gender }}
$gender
$profile.gender
{{ endif }} - - {{ if $profile.pubkey }}{{ endif }} - - {{ if $marital }}
$marital
$profile.marital
{{ endif }} - - {{ if $homepage }}
$homepage
$profile.homepage
{{ endif }} - - {{ inc diaspora_vcard.tpl }}{{ endinc }} - -
- -
- -$contact_block - - diff --git a/view/theme/duepuntozero/prv_message.tpl b/view/theme/duepuntozero/prv_message.tpl deleted file mode 100644 index 3f0bd937f4..0000000000 --- a/view/theme/duepuntozero/prv_message.tpl +++ /dev/null @@ -1,39 +0,0 @@ - -

$header

- -
-
- -$parent - -
$to
- -{{ if $showinputs }} - - -{{ else }} -$select -{{ endif }} - -
$subject
- - -
$yourmessage
- - - -
- -
-
-
- -
- -
-
-
-
-
diff --git a/view/theme/duepuntozero/smarty3/comment_item.tpl b/view/theme/duepuntozero/templates/comment_item.tpl similarity index 100% rename from view/theme/duepuntozero/smarty3/comment_item.tpl rename to view/theme/duepuntozero/templates/comment_item.tpl diff --git a/view/theme/duepuntozero/smarty3/lang_selector.tpl b/view/theme/duepuntozero/templates/lang_selector.tpl similarity index 100% rename from view/theme/duepuntozero/smarty3/lang_selector.tpl rename to view/theme/duepuntozero/templates/lang_selector.tpl diff --git a/view/theme/duepuntozero/smarty3/moderated_comment.tpl b/view/theme/duepuntozero/templates/moderated_comment.tpl similarity index 100% rename from view/theme/duepuntozero/smarty3/moderated_comment.tpl rename to view/theme/duepuntozero/templates/moderated_comment.tpl diff --git a/view/theme/duepuntozero/smarty3/nav.tpl b/view/theme/duepuntozero/templates/nav.tpl similarity index 100% rename from view/theme/duepuntozero/smarty3/nav.tpl rename to view/theme/duepuntozero/templates/nav.tpl diff --git a/view/theme/duepuntozero/smarty3/profile_vcard.tpl b/view/theme/duepuntozero/templates/profile_vcard.tpl similarity index 100% rename from view/theme/duepuntozero/smarty3/profile_vcard.tpl rename to view/theme/duepuntozero/templates/profile_vcard.tpl diff --git a/view/theme/duepuntozero/smarty3/prv_message.tpl b/view/theme/duepuntozero/templates/prv_message.tpl similarity index 100% rename from view/theme/duepuntozero/smarty3/prv_message.tpl rename to view/theme/duepuntozero/templates/prv_message.tpl diff --git a/view/theme/facepark/comment_item.tpl b/view/theme/facepark/comment_item.tpl deleted file mode 100644 index bb1d4fa79e..0000000000 --- a/view/theme/facepark/comment_item.tpl +++ /dev/null @@ -1,33 +0,0 @@ -
-
- - - - {##} - - - - -
- $mytitle -
-
- - {{ if $qcomment }} - {{ for $qcomment as $qc }} - $qc -   - {{ endfor }} - {{ endif }} - -
- - -
-
- -
diff --git a/view/theme/facepark/group_side.tpl b/view/theme/facepark/group_side.tpl deleted file mode 100644 index 0353b1d2cc..0000000000 --- a/view/theme/facepark/group_side.tpl +++ /dev/null @@ -1,28 +0,0 @@ -
-

$title

- - - -
- - diff --git a/view/theme/facepark/jot.tpl b/view/theme/facepark/jot.tpl deleted file mode 100644 index 6b24045ef3..0000000000 --- a/view/theme/facepark/jot.tpl +++ /dev/null @@ -1,85 +0,0 @@ - -
-
-
 
-
-
-
- -
- - - - - - - - -
-
- - -
- -
- - -
-
-
-
-
-
- - -
- -
-
- -
-
- -
- - -
- $bang -
- - $preview - -
- - -
- $jotplugins -
- -
- -
- - - -
-
- $acl -
-
$emailcc
-
- $jotnets -
-
- - -
- -
-
-
- {{ if $content }}{{ endif }} diff --git a/view/theme/facepark/nav.tpl b/view/theme/facepark/nav.tpl deleted file mode 100644 index 04c4931fc6..0000000000 --- a/view/theme/facepark/nav.tpl +++ /dev/null @@ -1,68 +0,0 @@ - - - diff --git a/view/theme/facepark/profile_vcard.tpl b/view/theme/facepark/profile_vcard.tpl deleted file mode 100644 index 07d2df5df3..0000000000 --- a/view/theme/facepark/profile_vcard.tpl +++ /dev/null @@ -1,47 +0,0 @@ -
- -
$profile.name
- - - - {{ if $pdesc }}
$profile.pdesc
{{ endif }} -
$profile.name
- - - - {{ if $location }} -
$location
-
- {{ if $profile.address }}
$profile.address
{{ endif }} - - $profile.locality{{ if $profile.locality }}, {{ endif }} - $profile.region - $profile.postal_code - - {{ if $profile.country_name }}$profile.country_name{{ endif }} -
-
- {{ endif }} - - {{ if $gender }}
$gender
$profile.gender
{{ endif }} - - {{ if $profile.pubkey }}{{ endif }} - - {{ if $marital }}
$marital
$profile.marital
{{ endif }} - - {{ if $homepage }}
$homepage
$profile.homepage
{{ endif }} - - {{ inc diaspora_vcard.tpl }}{{ endinc }} - - -
- -$contact_block - - diff --git a/view/theme/facepark/search_item.tpl b/view/theme/facepark/search_item.tpl deleted file mode 100644 index 737f1649e1..0000000000 --- a/view/theme/facepark/search_item.tpl +++ /dev/null @@ -1,54 +0,0 @@ -
-
-
-
- - $item.name - menu -
-
    - $item.item_photo_menu -
-
-
-
-
- {{ if $item.lock }}
$item.lock
- {{ else }}
{{ endif }} -
$item.location
-
-
-
- $item.name -
$item.ago
- -
-
-
$item.title
-
-
$item.body
-
-
-
- {{ if $item.drop.dropping }}{{ endif }} -
- {{ if $item.drop.pagedrop }}{{ endif }} -
-
-
-
- - -
- {{ if $item.conv }} - $item.conv.title - {{ endif }} -
- -
- -
- - diff --git a/view/theme/facepark/smarty3/comment_item.tpl b/view/theme/facepark/templates/comment_item.tpl similarity index 100% rename from view/theme/facepark/smarty3/comment_item.tpl rename to view/theme/facepark/templates/comment_item.tpl diff --git a/view/theme/facepark/smarty3/group_side.tpl b/view/theme/facepark/templates/group_side.tpl similarity index 100% rename from view/theme/facepark/smarty3/group_side.tpl rename to view/theme/facepark/templates/group_side.tpl diff --git a/view/theme/facepark/smarty3/jot.tpl b/view/theme/facepark/templates/jot.tpl similarity index 100% rename from view/theme/facepark/smarty3/jot.tpl rename to view/theme/facepark/templates/jot.tpl diff --git a/view/theme/facepark/smarty3/nav.tpl b/view/theme/facepark/templates/nav.tpl similarity index 100% rename from view/theme/facepark/smarty3/nav.tpl rename to view/theme/facepark/templates/nav.tpl diff --git a/view/theme/facepark/smarty3/profile_vcard.tpl b/view/theme/facepark/templates/profile_vcard.tpl similarity index 100% rename from view/theme/facepark/smarty3/profile_vcard.tpl rename to view/theme/facepark/templates/profile_vcard.tpl diff --git a/view/theme/facepark/smarty3/search_item.tpl b/view/theme/facepark/templates/search_item.tpl similarity index 100% rename from view/theme/facepark/smarty3/search_item.tpl rename to view/theme/facepark/templates/search_item.tpl diff --git a/view/theme/frost-mobile/acl_selector.tpl b/view/theme/frost-mobile/acl_selector.tpl deleted file mode 100644 index df34a1a2ae..0000000000 --- a/view/theme/frost-mobile/acl_selector.tpl +++ /dev/null @@ -1,23 +0,0 @@ -
- - $showall -
-
-
-
- -
- - - - diff --git a/view/theme/frost-mobile/admin_aside.tpl b/view/theme/frost-mobile/admin_aside.tpl deleted file mode 100644 index da3ed23a88..0000000000 --- a/view/theme/frost-mobile/admin_aside.tpl +++ /dev/null @@ -1,31 +0,0 @@ - -

$admtxt

- - -{{ if $admin.update }} - -{{ endif }} - - -{{ if $admin.plugins_admin }}

$plugadmtxt

{{ endif }} - - - -

$logtxt

- - diff --git a/view/theme/frost-mobile/admin_site.tpl b/view/theme/frost-mobile/admin_site.tpl deleted file mode 100644 index 61f52b18dc..0000000000 --- a/view/theme/frost-mobile/admin_site.tpl +++ /dev/null @@ -1,67 +0,0 @@ - -
-

$title - $page

- -
- - - {{ 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 }} - {{ inc field_checkbox.tpl with $field=$hide_help }}{{ endinc }} - {{ inc field_select.tpl with $field=$singleuser }}{{ endinc }} - -
- -

$registration

- {{ inc field_input.tpl with $field=$register_text }}{{ endinc }} - {{ inc field_select.tpl with $field=$register_policy }}{{ 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 }} - -
- -

$upload

- {{ inc field_input.tpl with $field=$maximagesize }}{{ endinc }} - {{ inc field_input.tpl with $field=$maximagelength }}{{ endinc }} - {{ inc field_input.tpl with $field=$jpegimagequality }}{{ endinc }} - -

$corporate

- {{ 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_select.tpl with $field=$ostatus_poll_interval }}{{ 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 }} - {{ inc field_checkbox.tpl with $field=$enotify_no_content }}{{ endinc }} - {{ inc field_checkbox.tpl with $field=$private_addons }}{{ endinc }} - {{ inc field_checkbox.tpl with $field=$disable_embedded }}{{ endinc }} -
- -

$advanced

- {{ 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 }} - -
- -
-
diff --git a/view/theme/frost-mobile/admin_users.tpl b/view/theme/frost-mobile/admin_users.tpl deleted file mode 100644 index a3f6d2416f..0000000000 --- a/view/theme/frost-mobile/admin_users.tpl +++ /dev/null @@ -1,98 +0,0 @@ - -
-

$title - $page

- -
- - -

$h_pending

- {{ if $pending }} - - - - {{ for $th_pending as $th }}{{ endfor }} - - - - - - {{ for $pending as $u }} - - - - - - - - {{ endfor }} - -
$th
$u.created$u.name - - -
- -
- {{ else }} -

$no_pending

- {{ endif }} - - - - -

$h_users

- {{ if $users }} - - - - - {{ for $th_users as $th }}{{ endfor }} - - - - - - {{ for $users as $u }} - - - - - - - - - - {{ endif }} - - - {{ endfor }} - -
$th
$u.nickname$u.name$u.register_date$u.lastitem_date - {{ if $u.is_admin }} -   - {{ else }} - - {{ if $u.is_admin }} -   - {{ else }} - - - {{ endif }} -
- -
- {{ else }} - NO USERS?!? - {{ endif }} -
-
diff --git a/view/theme/frost-mobile/categories_widget.tpl b/view/theme/frost-mobile/categories_widget.tpl deleted file mode 100644 index ebc62404b8..0000000000 --- a/view/theme/frost-mobile/categories_widget.tpl +++ /dev/null @@ -1,12 +0,0 @@ -{##} diff --git a/view/theme/frost-mobile/comment_item.tpl b/view/theme/frost-mobile/comment_item.tpl deleted file mode 100755 index 5410cd4cfb..0000000000 --- a/view/theme/frost-mobile/comment_item.tpl +++ /dev/null @@ -1,78 +0,0 @@ -{##} - -
-
-{##} - - - - - {##} - - - - - {##} - $mytitle - {##} - {##} -
    -
  • -
  • -
  • -
  • -
  • -{##} -
- {##} -{##} - - {{ if $qcomment }} - - {{ endif }} - -
- - - {##} -
- -
diff --git a/view/theme/frost-mobile/common_tabs.tpl b/view/theme/frost-mobile/common_tabs.tpl deleted file mode 100644 index 940e5aeb2f..0000000000 --- a/view/theme/frost-mobile/common_tabs.tpl +++ /dev/null @@ -1,6 +0,0 @@ -
    - {{ for $tabs as $tab }} -
  • $tab.label
  • - {{ endfor }} -
    -
diff --git a/view/theme/frost-mobile/contact_block.tpl b/view/theme/frost-mobile/contact_block.tpl deleted file mode 100644 index a8e34fce16..0000000000 --- a/view/theme/frost-mobile/contact_block.tpl +++ /dev/null @@ -1,12 +0,0 @@ -{##} diff --git a/view/theme/frost-mobile/contact_edit.tpl b/view/theme/frost-mobile/contact_edit.tpl deleted file mode 100644 index e5f12950c7..0000000000 --- a/view/theme/frost-mobile/contact_edit.tpl +++ /dev/null @@ -1,93 +0,0 @@ - -

$header

- -
- - $tab_str - - - - - -
-
$name
-
$name
-
- - -
- -
-
- - -
- - - {{ if $poll_enabled }} -
-
$lastupdtext $last_update
- $updpub $poll_interval $udnow -
- {{ endif }} -
- - {{inc field_checkbox.tpl with $field=$hidden }}{{endinc}} - -
-

$lbl_info1

- - -
-
- - -
-

$lbl_vis1

-

$lbl_vis2

-
-$profile_select -
- - - -
-
diff --git a/view/theme/frost-mobile/contact_head.tpl b/view/theme/frost-mobile/contact_head.tpl deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/view/theme/frost-mobile/contact_template.tpl b/view/theme/frost-mobile/contact_template.tpl deleted file mode 100644 index 7c19b3272e..0000000000 --- a/view/theme/frost-mobile/contact_template.tpl +++ /dev/null @@ -1,36 +0,0 @@ - -
-
-
- -{##} - - $contact.name - - - {{ if $contact.photo_menu }} -{##} -
-
    - {{ for $contact.photo_menu as $c }} - {{ if $c.2 }} -
  • $c.0
  • - {{ else }} -
  • $c.0
  • - {{ endif }} - {{ endfor }} -
-
- {{ endif }} -
- -
-
-
$contact.name

-{{ if $contact.alt_text }}
$contact.alt_text
{{ endif }} -
$contact.network
- -
-
diff --git a/view/theme/frost-mobile/contacts-end.tpl b/view/theme/frost-mobile/contacts-end.tpl deleted file mode 100644 index 820b1c6a0f..0000000000 --- a/view/theme/frost-mobile/contacts-end.tpl +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/view/theme/frost-mobile/contacts-head.tpl b/view/theme/frost-mobile/contacts-head.tpl deleted file mode 100644 index 5ae97f9f0c..0000000000 --- a/view/theme/frost-mobile/contacts-head.tpl +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/view/theme/frost-mobile/contacts-template.tpl b/view/theme/frost-mobile/contacts-template.tpl deleted file mode 100644 index 76254c1ca8..0000000000 --- a/view/theme/frost-mobile/contacts-template.tpl +++ /dev/null @@ -1,28 +0,0 @@ -

$header{{ if $total }} ($total){{ endif }}

- -{{ if $finding }}

$finding

{{ endif }} - -
-
-$desc - - -
-
-
- -$tabs - - -
-{{ for $contacts as $contact }} - {{ inc contact_template.tpl }}{{ endinc }} -{{ endfor }} -
-
- -$paginate - - - - diff --git a/view/theme/frost-mobile/contacts-widget-sidebar.tpl b/view/theme/frost-mobile/contacts-widget-sidebar.tpl deleted file mode 100644 index 1c63f9eab2..0000000000 --- a/view/theme/frost-mobile/contacts-widget-sidebar.tpl +++ /dev/null @@ -1,2 +0,0 @@ -$follow_widget - diff --git a/view/theme/frost-mobile/conversation.tpl b/view/theme/frost-mobile/conversation.tpl deleted file mode 100644 index d39976f39f..0000000000 --- a/view/theme/frost-mobile/conversation.tpl +++ /dev/null @@ -1,29 +0,0 @@ -$live_update - -{{ for $threads as $thread }} -
- {{ for $thread.items as $item }} - {{if $item.comment_firstcollapsed}} -
- $thread.num_comments $thread.hide_text -
- {{endif}} - - {{ inc $item.template }}{{ endinc }} - - - {{ endfor }} -
-{{ endfor }} - -
- -{##} diff --git a/view/theme/frost-mobile/cropbody.tpl b/view/theme/frost-mobile/cropbody.tpl deleted file mode 100644 index 3283084cad..0000000000 --- a/view/theme/frost-mobile/cropbody.tpl +++ /dev/null @@ -1,27 +0,0 @@ -

$title

-

-$desc -

-
-$title -
-
-
-
- -
- - - - - - - - - - -
- -
- -
diff --git a/view/theme/frost-mobile/cropend.tpl b/view/theme/frost-mobile/cropend.tpl deleted file mode 100644 index a56c71d92e..0000000000 --- a/view/theme/frost-mobile/cropend.tpl +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/view/theme/frost-mobile/crophead.tpl b/view/theme/frost-mobile/crophead.tpl deleted file mode 100644 index 56e941e3ab..0000000000 --- a/view/theme/frost-mobile/crophead.tpl +++ /dev/null @@ -1 +0,0 @@ - diff --git a/view/theme/frost-mobile/display-head.tpl b/view/theme/frost-mobile/display-head.tpl deleted file mode 100644 index 1fc82ae779..0000000000 --- a/view/theme/frost-mobile/display-head.tpl +++ /dev/null @@ -1,4 +0,0 @@ - - diff --git a/view/theme/frost-mobile/end.tpl b/view/theme/frost-mobile/end.tpl deleted file mode 100644 index 8bc088421a..0000000000 --- a/view/theme/frost-mobile/end.tpl +++ /dev/null @@ -1,22 +0,0 @@ - -{##} - - - - -{##} -{##} - - - - - - - - diff --git a/view/theme/frost-mobile/event.tpl b/view/theme/frost-mobile/event.tpl deleted file mode 100644 index 67de85d5c8..0000000000 --- a/view/theme/frost-mobile/event.tpl +++ /dev/null @@ -1,10 +0,0 @@ -{{ for $events as $event }} -
- - {{ if $event.item.author_name }}$event.item.author_name{{ endif }} - $event.html - {{ if $event.item.plink }}{{ endif }} - {{ if $event.edit }}{{ endif }} -
-
-{{ endfor }} diff --git a/view/theme/frost-mobile/event_end.tpl b/view/theme/frost-mobile/event_end.tpl deleted file mode 100644 index fd9e41f944..0000000000 --- a/view/theme/frost-mobile/event_end.tpl +++ /dev/null @@ -1,4 +0,0 @@ - - - diff --git a/view/theme/frost-mobile/event_head.tpl b/view/theme/frost-mobile/event_head.tpl deleted file mode 100644 index c3f16d5428..0000000000 --- a/view/theme/frost-mobile/event_head.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - - - diff --git a/view/theme/frost-mobile/field_checkbox.tpl b/view/theme/frost-mobile/field_checkbox.tpl deleted file mode 100644 index 9fbf84eac9..0000000000 --- a/view/theme/frost-mobile/field_checkbox.tpl +++ /dev/null @@ -1,6 +0,0 @@ - -
- -
- $field.3 -
diff --git a/view/theme/frost-mobile/field_input.tpl b/view/theme/frost-mobile/field_input.tpl deleted file mode 100644 index 58e17406c0..0000000000 --- a/view/theme/frost-mobile/field_input.tpl +++ /dev/null @@ -1,6 +0,0 @@ - -
-
- - $field.3 -
diff --git a/view/theme/frost-mobile/field_openid.tpl b/view/theme/frost-mobile/field_openid.tpl deleted file mode 100644 index 8d330a30a0..0000000000 --- a/view/theme/frost-mobile/field_openid.tpl +++ /dev/null @@ -1,6 +0,0 @@ - -
-
- - $field.3 -
diff --git a/view/theme/frost-mobile/field_password.tpl b/view/theme/frost-mobile/field_password.tpl deleted file mode 100644 index 7a0d3fe9f4..0000000000 --- a/view/theme/frost-mobile/field_password.tpl +++ /dev/null @@ -1,6 +0,0 @@ - -
-
- - $field.3 -
diff --git a/view/theme/frost-mobile/field_themeselect.tpl b/view/theme/frost-mobile/field_themeselect.tpl deleted file mode 100644 index d8ddc2fc74..0000000000 --- a/view/theme/frost-mobile/field_themeselect.tpl +++ /dev/null @@ -1,9 +0,0 @@ - -
- - - $field.3 -
-
diff --git a/view/theme/frost-mobile/generic_links_widget.tpl b/view/theme/frost-mobile/generic_links_widget.tpl deleted file mode 100644 index a976d4573c..0000000000 --- a/view/theme/frost-mobile/generic_links_widget.tpl +++ /dev/null @@ -1,12 +0,0 @@ -
-{##} - {{if $desc}}
$desc
{{endif}} - - - -
diff --git a/view/theme/frost-mobile/group_drop.tpl b/view/theme/frost-mobile/group_drop.tpl deleted file mode 100644 index 959b77bb21..0000000000 --- a/view/theme/frost-mobile/group_drop.tpl +++ /dev/null @@ -1,9 +0,0 @@ -
- -
-
diff --git a/view/theme/frost-mobile/head.tpl b/view/theme/frost-mobile/head.tpl deleted file mode 100644 index a79b2916dd..0000000000 --- a/view/theme/frost-mobile/head.tpl +++ /dev/null @@ -1,31 +0,0 @@ - -{##} - -{##} - - - -{##} - - - - - - - - - diff --git a/view/theme/frost-mobile/jot-end.tpl b/view/theme/frost-mobile/jot-end.tpl deleted file mode 100644 index 41f50160f1..0000000000 --- a/view/theme/frost-mobile/jot-end.tpl +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/view/theme/frost-mobile/jot-header.tpl b/view/theme/frost-mobile/jot-header.tpl deleted file mode 100644 index 5d8cfa4548..0000000000 --- a/view/theme/frost-mobile/jot-header.tpl +++ /dev/null @@ -1,18 +0,0 @@ - - - - diff --git a/view/theme/frost-mobile/jot.tpl b/view/theme/frost-mobile/jot.tpl deleted file mode 100644 index b345152792..0000000000 --- a/view/theme/frost-mobile/jot.tpl +++ /dev/null @@ -1,91 +0,0 @@ - -
-
-
 
-
-
-
- -
- - - - - - - - - -
- {{ if $placeholdercategory }} -
- {{ endif }} -
- {##} - -
- -
- - -
- -
- -
-
-
-
-
-
- - {##} - -
- -
-
- -
-
- -
- - -
- $bang -
- - $preview - -
- - -
- $jotplugins -
- - - -
-
- $acl -
-
$emailcc
- $jotnets -
-
-
- - -
- -
-
-
- {{ if $content }}{{ endif }} diff --git a/view/theme/frost-mobile/jot_geotag.tpl b/view/theme/frost-mobile/jot_geotag.tpl deleted file mode 100644 index 3f8bee91a7..0000000000 --- a/view/theme/frost-mobile/jot_geotag.tpl +++ /dev/null @@ -1,11 +0,0 @@ - - if(navigator.geolocation) { - navigator.geolocation.getCurrentPosition(function(position) { - var lat = position.coords.latitude.toFixed(4); - var lon = position.coords.longitude.toFixed(4); - - $j('#jot-coord').val(lat + ', ' + lon); - $j('#profile-nolocation-wrapper').show(); - }); - } - diff --git a/view/theme/frost-mobile/lang_selector.tpl b/view/theme/frost-mobile/lang_selector.tpl deleted file mode 100644 index e777a0a861..0000000000 --- a/view/theme/frost-mobile/lang_selector.tpl +++ /dev/null @@ -1,10 +0,0 @@ -
- diff --git a/view/theme/frost-mobile/like_noshare.tpl b/view/theme/frost-mobile/like_noshare.tpl deleted file mode 100644 index 5bf94f7df7..0000000000 --- a/view/theme/frost-mobile/like_noshare.tpl +++ /dev/null @@ -1,7 +0,0 @@ - diff --git a/view/theme/frost-mobile/login.tpl b/view/theme/frost-mobile/login.tpl deleted file mode 100644 index 05ae364c00..0000000000 --- a/view/theme/frost-mobile/login.tpl +++ /dev/null @@ -1,45 +0,0 @@ - - - - diff --git a/view/theme/frost-mobile/login_head.tpl b/view/theme/frost-mobile/login_head.tpl deleted file mode 100644 index 14734821ce..0000000000 --- a/view/theme/frost-mobile/login_head.tpl +++ /dev/null @@ -1,2 +0,0 @@ -{##} - diff --git a/view/theme/frost-mobile/lostpass.tpl b/view/theme/frost-mobile/lostpass.tpl deleted file mode 100644 index 583e3dbaff..0000000000 --- a/view/theme/frost-mobile/lostpass.tpl +++ /dev/null @@ -1,21 +0,0 @@ -
-

$title

-


- -
-
-
- -
-
-

-$desc -

-
- -
- -
-
-
-
diff --git a/view/theme/frost-mobile/mail_conv.tpl b/view/theme/frost-mobile/mail_conv.tpl deleted file mode 100644 index ed32dac5a9..0000000000 --- a/view/theme/frost-mobile/mail_conv.tpl +++ /dev/null @@ -1,18 +0,0 @@ -
-
- $mail.from_name -
-
-
$mail.from_name
-
$mail.date
-
$mail.subject
-
-
$mail.body
-
-
- - -
-
- -
diff --git a/view/theme/frost-mobile/mail_list.tpl b/view/theme/frost-mobile/mail_list.tpl deleted file mode 100644 index 5be7f38623..0000000000 --- a/view/theme/frost-mobile/mail_list.tpl +++ /dev/null @@ -1,16 +0,0 @@ -
-
- $from_name -
-
-
$from_name
-
$date
- -
- -
-
-
-
- -
diff --git a/view/theme/frost-mobile/message-end.tpl b/view/theme/frost-mobile/message-end.tpl deleted file mode 100644 index 820b1c6a0f..0000000000 --- a/view/theme/frost-mobile/message-end.tpl +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/view/theme/frost-mobile/message-head.tpl b/view/theme/frost-mobile/message-head.tpl deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/view/theme/frost-mobile/moderated_comment.tpl b/view/theme/frost-mobile/moderated_comment.tpl deleted file mode 100755 index b0451c8c60..0000000000 --- a/view/theme/frost-mobile/moderated_comment.tpl +++ /dev/null @@ -1,61 +0,0 @@ -
-
- - - - - - - -
- $mytitle -
-
- -
    -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
-
- - -
- - -
-
- -
diff --git a/view/theme/frost-mobile/msg-end.tpl b/view/theme/frost-mobile/msg-end.tpl deleted file mode 100644 index 6074133798..0000000000 --- a/view/theme/frost-mobile/msg-end.tpl +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/view/theme/frost-mobile/msg-header.tpl b/view/theme/frost-mobile/msg-header.tpl deleted file mode 100644 index fb6e0684b7..0000000000 --- a/view/theme/frost-mobile/msg-header.tpl +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/view/theme/frost-mobile/nav.tpl b/view/theme/frost-mobile/nav.tpl deleted file mode 100644 index c03ea05d90..0000000000 --- a/view/theme/frost-mobile/nav.tpl +++ /dev/null @@ -1,146 +0,0 @@ - - - diff --git a/view/theme/frost-mobile/photo_drop.tpl b/view/theme/frost-mobile/photo_drop.tpl deleted file mode 100644 index d004fce977..0000000000 --- a/view/theme/frost-mobile/photo_drop.tpl +++ /dev/null @@ -1,4 +0,0 @@ -
- -
-
diff --git a/view/theme/frost-mobile/photo_edit.tpl b/view/theme/frost-mobile/photo_edit.tpl deleted file mode 100644 index 4265f8c98c..0000000000 --- a/view/theme/frost-mobile/photo_edit.tpl +++ /dev/null @@ -1,58 +0,0 @@ - -
- - - -
- - -
- -
- -
- - -
- -
- -
- - -
- -
- -
- -
-
- -
- - -
-
- -
- -
$permissions
-
-
- -
-
- $aclselect -
-
-
-
- - - - -
-
- - diff --git a/view/theme/frost-mobile/photo_edit_head.tpl b/view/theme/frost-mobile/photo_edit_head.tpl deleted file mode 100644 index 4536dd5dfd..0000000000 --- a/view/theme/frost-mobile/photo_edit_head.tpl +++ /dev/null @@ -1,7 +0,0 @@ - - diff --git a/view/theme/frost-mobile/photo_view.tpl b/view/theme/frost-mobile/photo_view.tpl deleted file mode 100644 index 92e115487a..0000000000 --- a/view/theme/frost-mobile/photo_view.tpl +++ /dev/null @@ -1,42 +0,0 @@ -
-

$album.1

- - - -
- {{ if $prevlink }}{{ endif }} - {{ if $nextlink }}{{ endif }} -
-
-
-
$desc
-{{ if $tags }} -
$tags.0
-
$tags.1
-{{ endif }} -{{ if $tags.2 }}{{ endif }} - -{{ if $edit }} -$edit -{{ else }} - -{{ if $likebuttons }} -
- $likebuttons - $like - $dislike -
-{{ endif }} - -$comments - -$paginate -{{ endif }} - diff --git a/view/theme/frost-mobile/photos_head.tpl b/view/theme/frost-mobile/photos_head.tpl deleted file mode 100644 index 8cd22d5b6d..0000000000 --- a/view/theme/frost-mobile/photos_head.tpl +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/view/theme/frost-mobile/photos_upload.tpl b/view/theme/frost-mobile/photos_upload.tpl deleted file mode 100644 index 43dbcaad7b..0000000000 --- a/view/theme/frost-mobile/photos_upload.tpl +++ /dev/null @@ -1,50 +0,0 @@ -

$pagename

- -
$usage
- -
-
-
- -
- -
-
-
-
$existalbumtext
- -
-
- - $default_upload_box - -
- - -
- - - -
- -
-
- $aclselect -
-
- -
- - $alt_uploader - - $default_upload_submit - -
-
- diff --git a/view/theme/frost-mobile/profed_end.tpl b/view/theme/frost-mobile/profed_end.tpl deleted file mode 100644 index bf9b2a57a1..0000000000 --- a/view/theme/frost-mobile/profed_end.tpl +++ /dev/null @@ -1,8 +0,0 @@ - - - - - diff --git a/view/theme/frost-mobile/profed_head.tpl b/view/theme/frost-mobile/profed_head.tpl deleted file mode 100644 index 83d22d1745..0000000000 --- a/view/theme/frost-mobile/profed_head.tpl +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/view/theme/frost-mobile/profile_edit.tpl b/view/theme/frost-mobile/profile_edit.tpl deleted file mode 100644 index 64dc2a2f27..0000000000 --- a/view/theme/frost-mobile/profile_edit.tpl +++ /dev/null @@ -1,322 +0,0 @@ -$default - -

$banner

- - - - - - -
-
- - -
- -
*
-
-
- -
- - -
-
- -
- - -
-
- - -
- -$gender -
-
- -
- -
-$dob $age -
-
-
- -$hide_friends - -
- -
-
- - -
- - -
-
- -
- - -
-
- - -
- - -
-
- -
- - -
-
- -
- - -
-
- -
- - -
-
- -
- -
-
- -
- -$marital -
- - - - - -
- -
- -$sexual -
-
- - - -
- - -
-
- -
- - -
-
- -
- - -
-
- -
- - -
$lbl_pubdsc
-
- -
- - -
$lbl_prvdsc
-
- - -
- -
-
- -
-

-$lbl_about -

- - - -
-
- - -
-

-$lbl_hobbies -

- - - -
-
- - -
-

-$lbl_likes -

- - - -
-
- - -
-

-$lbl_dislikes -

- - - -
-
- - -
-

-$lbl_social -

- - - -
-
- - -
- -
-
- - -
-

-$lbl_music -

- - - -
-
- -
-

-$lbl_book -

- - - -
-
- - - -
-

-$lbl_tv -

- - - -
-
- - - -
-

-$lbl_film -

- - - -
-
- - -
- -
-
- - -
-

-$lbl_love -

- - - -
-
- - - -
-

-$lbl_work -

- - - -
-
- - - -
-

-$lbl_school -

- - - -
-
- - - -
- -
-
- - -
-
- diff --git a/view/theme/frost-mobile/profile_photo.tpl b/view/theme/frost-mobile/profile_photo.tpl deleted file mode 100644 index 42fc139f8f..0000000000 --- a/view/theme/frost-mobile/profile_photo.tpl +++ /dev/null @@ -1,19 +0,0 @@ -

$title

- -
- - -
- - -
- -
- -
- -
- - diff --git a/view/theme/frost-mobile/profile_vcard.tpl b/view/theme/frost-mobile/profile_vcard.tpl deleted file mode 100644 index e91e6125ff..0000000000 --- a/view/theme/frost-mobile/profile_vcard.tpl +++ /dev/null @@ -1,51 +0,0 @@ -
- -
$profile.name
- - - - {{ if $pdesc }}
$profile.pdesc
{{ endif }} -
$profile.name
- - - - {{ if $location }} -
$location
-
- {{ if $profile.address }}
$profile.address
{{ endif }} - - $profile.locality{{ if $profile.locality }}, {{ endif }} - $profile.region - $profile.postal_code - - {{ if $profile.country_name }}$profile.country_name{{ endif }} -
-
- {{ endif }} - - {{ if $gender }}
$gender
$profile.gender
{{ endif }} - - {{ if $profile.pubkey }}{{ endif }} - - {{ if $marital }}
$marital
$profile.marital
{{ endif }} - - {{ if $homepage }}
$homepage
$profile.homepage
{{ endif }} - - {{ inc diaspora_vcard.tpl }}{{ endinc }} - -
- -
- -$contact_block - - diff --git a/view/theme/frost-mobile/prv_message.tpl b/view/theme/frost-mobile/prv_message.tpl deleted file mode 100644 index 27b2f39507..0000000000 --- a/view/theme/frost-mobile/prv_message.tpl +++ /dev/null @@ -1,39 +0,0 @@ - -

$header

- -
-
- -$parent - -
$to
- -{{ if $showinputs }} - - -{{ else }} -$select -{{ endif }} - -
$subject
- - -
$yourmessage
- - - -
- -
-
-
- -
- -
-
-
-
-
diff --git a/view/theme/frost-mobile/register.tpl b/view/theme/frost-mobile/register.tpl deleted file mode 100644 index 041be5e96e..0000000000 --- a/view/theme/frost-mobile/register.tpl +++ /dev/null @@ -1,80 +0,0 @@ -
-

$regtitle

-
- -
- - - - $registertext - -

$realpeople

- -
-{{ if $oidlabel }} -
- -
-
-{{ endif }} - -
-

$fillwith $fillext

-
- -

- -{{ if $invitations }} - -

$invite_desc

-
- - -
-
- -{{ endif }} - - -
-
- -
-
- - -
-
- -
-
- -
-
- -
-
- -
-

$nickdesc

-
- - $publish - - -
-


- -$license - -
diff --git a/view/theme/frost-mobile/search_item.tpl b/view/theme/frost-mobile/search_item.tpl deleted file mode 100644 index cec365dc80..0000000000 --- a/view/theme/frost-mobile/search_item.tpl +++ /dev/null @@ -1,64 +0,0 @@ - -{##} -
-
- {##} - - $item.name - {##} - {##} -
- {{ if $item.lock }}{##}$item.lock{##} - {{ else }}
{{ endif }} -
$item.location
-
-
- {##} - $item.name -
$item.ago
- - {##} -
-
$item.title
- {##} -
$item.body
- {{ if $item.has_cats }} -
$item.txt_cats {{ for $item.categories as $cat }}$cat.name{{ if $cat.removeurl }} [$remove]{{ endif }} {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} -
- {{ endif }} - - {{ if $item.has_folders }} -
$item.txt_folders {{ for $item.folders as $cat }}$cat.name{{ if $cat.removeurl }} [$remove]{{ endif }}{{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} -
- {{ endif }} -
-
- {##} - {{ if $item.drop.dropping }}{{ endif }} - {##} - {{ if $item.drop.pagedrop }}{{ endif }} - {##} -
-
- {##} - - -
- {{ if $item.conv }} - $item.conv.title - {{ endif }} -
- -{##} diff --git a/view/theme/frost-mobile/settings-head.tpl b/view/theme/frost-mobile/settings-head.tpl deleted file mode 100644 index 8cd22d5b6d..0000000000 --- a/view/theme/frost-mobile/settings-head.tpl +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/view/theme/frost-mobile/settings.tpl b/view/theme/frost-mobile/settings.tpl deleted file mode 100644 index 8e5aff019b..0000000000 --- a/view/theme/frost-mobile/settings.tpl +++ /dev/null @@ -1,147 +0,0 @@ -

$ptitle

- -$nickname_block - -
- - -

$h_pass

- -{{inc field_password.tpl with $field=$password1 }}{{endinc}} -{{inc field_password.tpl with $field=$password2 }}{{endinc}} -{{inc field_password.tpl with $field=$password3 }}{{endinc}} - -{{ if $oid_enable }} -{{inc field_input.tpl with $field=$openid }}{{endinc}} -{{ endif }} - -
- -
- - -

$h_basic

- -{{inc field_input.tpl with $field=$username }}{{endinc}} -{{inc field_input.tpl with $field=$email }}{{endinc}} -{{inc field_password.tpl with $field=$password4 }}{{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}} - - -
- -
- - -

$h_prv

- - - - -{{inc field_input.tpl with $field=$maxreq }}{{endinc}} - -$profile_in_dir - -$profile_in_net_dir - -$hide_friends - -$hide_wall - -$blockwall - -$blocktags - -$suggestme - -$unkmail - - -{{inc field_input.tpl with $field=$cntunkmail }}{{endinc}} - -{{inc field_input.tpl with $field=$expire.days }}{{endinc}} - - -
- $expire.label -
-
-

$expire.advanced

- {{ 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}} -
-
- -
- - -
- $permissions $permdesc -
- -{##} - -
-
- $aclselect -
-
- -{##} -
-
-
- -$group_select - - -
- -
- - - -

$h_not

-
- -
$activity_options
- -{{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}} - - -
$lbl_not
- -
-{{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}} -
- -
- -
- -
- - -

$h_advn

-
$h_descadvn
- -$pagetype - -
- -
- - diff --git a/view/theme/frost-mobile/settings_display_end.tpl b/view/theme/frost-mobile/settings_display_end.tpl deleted file mode 100644 index 739c43b35a..0000000000 --- a/view/theme/frost-mobile/settings_display_end.tpl +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/view/theme/frost-mobile/suggest_friends.tpl b/view/theme/frost-mobile/suggest_friends.tpl deleted file mode 100644 index e0d1c29441..0000000000 --- a/view/theme/frost-mobile/suggest_friends.tpl +++ /dev/null @@ -1,16 +0,0 @@ -
-
- - $name - -
-
-
- $name -
-
- {{ if $connlnk }} - - {{ endif }} - -
diff --git a/view/theme/frost-mobile/smarty3/acl_selector.tpl b/view/theme/frost-mobile/templates/acl_selector.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/acl_selector.tpl rename to view/theme/frost-mobile/templates/acl_selector.tpl diff --git a/view/theme/frost-mobile/smarty3/admin_aside.tpl b/view/theme/frost-mobile/templates/admin_aside.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/admin_aside.tpl rename to view/theme/frost-mobile/templates/admin_aside.tpl diff --git a/view/theme/frost-mobile/smarty3/admin_site.tpl b/view/theme/frost-mobile/templates/admin_site.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/admin_site.tpl rename to view/theme/frost-mobile/templates/admin_site.tpl diff --git a/view/theme/frost-mobile/smarty3/admin_users.tpl b/view/theme/frost-mobile/templates/admin_users.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/admin_users.tpl rename to view/theme/frost-mobile/templates/admin_users.tpl diff --git a/view/theme/frost-mobile/smarty3/categories_widget.tpl b/view/theme/frost-mobile/templates/categories_widget.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/categories_widget.tpl rename to view/theme/frost-mobile/templates/categories_widget.tpl diff --git a/view/theme/frost-mobile/smarty3/comment_item.tpl b/view/theme/frost-mobile/templates/comment_item.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/comment_item.tpl rename to view/theme/frost-mobile/templates/comment_item.tpl diff --git a/view/theme/frost-mobile/smarty3/common_tabs.tpl b/view/theme/frost-mobile/templates/common_tabs.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/common_tabs.tpl rename to view/theme/frost-mobile/templates/common_tabs.tpl diff --git a/view/theme/frost-mobile/smarty3/contact_block.tpl b/view/theme/frost-mobile/templates/contact_block.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/contact_block.tpl rename to view/theme/frost-mobile/templates/contact_block.tpl diff --git a/view/theme/frost-mobile/smarty3/contact_edit.tpl b/view/theme/frost-mobile/templates/contact_edit.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/contact_edit.tpl rename to view/theme/frost-mobile/templates/contact_edit.tpl diff --git a/view/theme/frost-mobile/smarty3/contact_head.tpl b/view/theme/frost-mobile/templates/contact_head.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/contact_head.tpl rename to view/theme/frost-mobile/templates/contact_head.tpl diff --git a/view/theme/frost-mobile/smarty3/contact_template.tpl b/view/theme/frost-mobile/templates/contact_template.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/contact_template.tpl rename to view/theme/frost-mobile/templates/contact_template.tpl diff --git a/view/theme/frost-mobile/smarty3/contacts-end.tpl b/view/theme/frost-mobile/templates/contacts-end.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/contacts-end.tpl rename to view/theme/frost-mobile/templates/contacts-end.tpl diff --git a/view/theme/frost-mobile/smarty3/contacts-head.tpl b/view/theme/frost-mobile/templates/contacts-head.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/contacts-head.tpl rename to view/theme/frost-mobile/templates/contacts-head.tpl diff --git a/view/theme/frost-mobile/smarty3/contacts-template.tpl b/view/theme/frost-mobile/templates/contacts-template.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/contacts-template.tpl rename to view/theme/frost-mobile/templates/contacts-template.tpl diff --git a/view/theme/frost-mobile/smarty3/contacts-widget-sidebar.tpl b/view/theme/frost-mobile/templates/contacts-widget-sidebar.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/contacts-widget-sidebar.tpl rename to view/theme/frost-mobile/templates/contacts-widget-sidebar.tpl diff --git a/view/theme/frost-mobile/smarty3/conversation.tpl b/view/theme/frost-mobile/templates/conversation.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/conversation.tpl rename to view/theme/frost-mobile/templates/conversation.tpl diff --git a/view/theme/frost-mobile/smarty3/cropbody.tpl b/view/theme/frost-mobile/templates/cropbody.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/cropbody.tpl rename to view/theme/frost-mobile/templates/cropbody.tpl diff --git a/view/theme/frost-mobile/smarty3/cropend.tpl b/view/theme/frost-mobile/templates/cropend.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/cropend.tpl rename to view/theme/frost-mobile/templates/cropend.tpl diff --git a/view/theme/frost-mobile/smarty3/crophead.tpl b/view/theme/frost-mobile/templates/crophead.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/crophead.tpl rename to view/theme/frost-mobile/templates/crophead.tpl diff --git a/view/theme/frost-mobile/smarty3/display-head.tpl b/view/theme/frost-mobile/templates/display-head.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/display-head.tpl rename to view/theme/frost-mobile/templates/display-head.tpl diff --git a/view/theme/frost-mobile/smarty3/end.tpl b/view/theme/frost-mobile/templates/end.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/end.tpl rename to view/theme/frost-mobile/templates/end.tpl diff --git a/view/theme/frost-mobile/smarty3/event.tpl b/view/theme/frost-mobile/templates/event.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/event.tpl rename to view/theme/frost-mobile/templates/event.tpl diff --git a/view/theme/frost-mobile/smarty3/event_end.tpl b/view/theme/frost-mobile/templates/event_end.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/event_end.tpl rename to view/theme/frost-mobile/templates/event_end.tpl diff --git a/view/theme/frost-mobile/smarty3/event_head.tpl b/view/theme/frost-mobile/templates/event_head.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/event_head.tpl rename to view/theme/frost-mobile/templates/event_head.tpl diff --git a/view/theme/frost-mobile/smarty3/field_checkbox.tpl b/view/theme/frost-mobile/templates/field_checkbox.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/field_checkbox.tpl rename to view/theme/frost-mobile/templates/field_checkbox.tpl diff --git a/view/theme/frost-mobile/smarty3/field_input.tpl b/view/theme/frost-mobile/templates/field_input.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/field_input.tpl rename to view/theme/frost-mobile/templates/field_input.tpl diff --git a/view/theme/frost-mobile/smarty3/field_openid.tpl b/view/theme/frost-mobile/templates/field_openid.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/field_openid.tpl rename to view/theme/frost-mobile/templates/field_openid.tpl diff --git a/view/theme/frost-mobile/smarty3/field_password.tpl b/view/theme/frost-mobile/templates/field_password.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/field_password.tpl rename to view/theme/frost-mobile/templates/field_password.tpl diff --git a/view/theme/frost-mobile/smarty3/field_themeselect.tpl b/view/theme/frost-mobile/templates/field_themeselect.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/field_themeselect.tpl rename to view/theme/frost-mobile/templates/field_themeselect.tpl diff --git a/view/theme/frost-mobile/smarty3/generic_links_widget.tpl b/view/theme/frost-mobile/templates/generic_links_widget.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/generic_links_widget.tpl rename to view/theme/frost-mobile/templates/generic_links_widget.tpl diff --git a/view/theme/frost-mobile/smarty3/group_drop.tpl b/view/theme/frost-mobile/templates/group_drop.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/group_drop.tpl rename to view/theme/frost-mobile/templates/group_drop.tpl diff --git a/view/theme/frost-mobile/smarty3/head.tpl b/view/theme/frost-mobile/templates/head.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/head.tpl rename to view/theme/frost-mobile/templates/head.tpl diff --git a/view/theme/frost-mobile/smarty3/jot-end.tpl b/view/theme/frost-mobile/templates/jot-end.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/jot-end.tpl rename to view/theme/frost-mobile/templates/jot-end.tpl diff --git a/view/theme/frost-mobile/smarty3/jot-header.tpl b/view/theme/frost-mobile/templates/jot-header.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/jot-header.tpl rename to view/theme/frost-mobile/templates/jot-header.tpl diff --git a/view/theme/frost-mobile/smarty3/jot.tpl b/view/theme/frost-mobile/templates/jot.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/jot.tpl rename to view/theme/frost-mobile/templates/jot.tpl diff --git a/view/theme/frost-mobile/smarty3/jot_geotag.tpl b/view/theme/frost-mobile/templates/jot_geotag.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/jot_geotag.tpl rename to view/theme/frost-mobile/templates/jot_geotag.tpl diff --git a/view/theme/frost-mobile/smarty3/lang_selector.tpl b/view/theme/frost-mobile/templates/lang_selector.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/lang_selector.tpl rename to view/theme/frost-mobile/templates/lang_selector.tpl diff --git a/view/theme/frost-mobile/smarty3/like_noshare.tpl b/view/theme/frost-mobile/templates/like_noshare.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/like_noshare.tpl rename to view/theme/frost-mobile/templates/like_noshare.tpl diff --git a/view/theme/frost-mobile/smarty3/login.tpl b/view/theme/frost-mobile/templates/login.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/login.tpl rename to view/theme/frost-mobile/templates/login.tpl diff --git a/view/theme/frost-mobile/smarty3/login_head.tpl b/view/theme/frost-mobile/templates/login_head.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/login_head.tpl rename to view/theme/frost-mobile/templates/login_head.tpl diff --git a/view/theme/frost-mobile/smarty3/lostpass.tpl b/view/theme/frost-mobile/templates/lostpass.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/lostpass.tpl rename to view/theme/frost-mobile/templates/lostpass.tpl diff --git a/view/theme/frost-mobile/smarty3/mail_conv.tpl b/view/theme/frost-mobile/templates/mail_conv.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/mail_conv.tpl rename to view/theme/frost-mobile/templates/mail_conv.tpl diff --git a/view/theme/frost-mobile/smarty3/mail_list.tpl b/view/theme/frost-mobile/templates/mail_list.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/mail_list.tpl rename to view/theme/frost-mobile/templates/mail_list.tpl diff --git a/view/theme/frost-mobile/smarty3/message-end.tpl b/view/theme/frost-mobile/templates/message-end.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/message-end.tpl rename to view/theme/frost-mobile/templates/message-end.tpl diff --git a/view/theme/frost-mobile/smarty3/message-head.tpl b/view/theme/frost-mobile/templates/message-head.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/message-head.tpl rename to view/theme/frost-mobile/templates/message-head.tpl diff --git a/view/theme/frost-mobile/smarty3/moderated_comment.tpl b/view/theme/frost-mobile/templates/moderated_comment.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/moderated_comment.tpl rename to view/theme/frost-mobile/templates/moderated_comment.tpl diff --git a/view/theme/frost-mobile/smarty3/msg-end.tpl b/view/theme/frost-mobile/templates/msg-end.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/msg-end.tpl rename to view/theme/frost-mobile/templates/msg-end.tpl diff --git a/view/theme/frost-mobile/smarty3/msg-header.tpl b/view/theme/frost-mobile/templates/msg-header.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/msg-header.tpl rename to view/theme/frost-mobile/templates/msg-header.tpl diff --git a/view/theme/frost-mobile/smarty3/nav.tpl b/view/theme/frost-mobile/templates/nav.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/nav.tpl rename to view/theme/frost-mobile/templates/nav.tpl diff --git a/view/theme/frost-mobile/smarty3/photo_drop.tpl b/view/theme/frost-mobile/templates/photo_drop.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/photo_drop.tpl rename to view/theme/frost-mobile/templates/photo_drop.tpl diff --git a/view/theme/frost-mobile/smarty3/photo_edit.tpl b/view/theme/frost-mobile/templates/photo_edit.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/photo_edit.tpl rename to view/theme/frost-mobile/templates/photo_edit.tpl diff --git a/view/theme/frost-mobile/smarty3/photo_edit_head.tpl b/view/theme/frost-mobile/templates/photo_edit_head.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/photo_edit_head.tpl rename to view/theme/frost-mobile/templates/photo_edit_head.tpl diff --git a/view/theme/frost-mobile/smarty3/photo_view.tpl b/view/theme/frost-mobile/templates/photo_view.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/photo_view.tpl rename to view/theme/frost-mobile/templates/photo_view.tpl diff --git a/view/theme/frost-mobile/smarty3/photos_head.tpl b/view/theme/frost-mobile/templates/photos_head.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/photos_head.tpl rename to view/theme/frost-mobile/templates/photos_head.tpl diff --git a/view/theme/frost-mobile/smarty3/photos_upload.tpl b/view/theme/frost-mobile/templates/photos_upload.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/photos_upload.tpl rename to view/theme/frost-mobile/templates/photos_upload.tpl diff --git a/view/theme/frost-mobile/smarty3/profed_end.tpl b/view/theme/frost-mobile/templates/profed_end.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/profed_end.tpl rename to view/theme/frost-mobile/templates/profed_end.tpl diff --git a/view/theme/frost-mobile/smarty3/profed_head.tpl b/view/theme/frost-mobile/templates/profed_head.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/profed_head.tpl rename to view/theme/frost-mobile/templates/profed_head.tpl diff --git a/view/theme/frost-mobile/smarty3/profile_edit.tpl b/view/theme/frost-mobile/templates/profile_edit.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/profile_edit.tpl rename to view/theme/frost-mobile/templates/profile_edit.tpl diff --git a/view/theme/frost-mobile/smarty3/profile_photo.tpl b/view/theme/frost-mobile/templates/profile_photo.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/profile_photo.tpl rename to view/theme/frost-mobile/templates/profile_photo.tpl diff --git a/view/theme/frost-mobile/smarty3/profile_vcard.tpl b/view/theme/frost-mobile/templates/profile_vcard.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/profile_vcard.tpl rename to view/theme/frost-mobile/templates/profile_vcard.tpl diff --git a/view/theme/frost-mobile/smarty3/prv_message.tpl b/view/theme/frost-mobile/templates/prv_message.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/prv_message.tpl rename to view/theme/frost-mobile/templates/prv_message.tpl diff --git a/view/theme/frost-mobile/smarty3/register.tpl b/view/theme/frost-mobile/templates/register.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/register.tpl rename to view/theme/frost-mobile/templates/register.tpl diff --git a/view/theme/frost-mobile/smarty3/search_item.tpl b/view/theme/frost-mobile/templates/search_item.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/search_item.tpl rename to view/theme/frost-mobile/templates/search_item.tpl diff --git a/view/theme/frost-mobile/smarty3/settings-head.tpl b/view/theme/frost-mobile/templates/settings-head.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/settings-head.tpl rename to view/theme/frost-mobile/templates/settings-head.tpl diff --git a/view/theme/frost-mobile/smarty3/settings.tpl b/view/theme/frost-mobile/templates/settings.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/settings.tpl rename to view/theme/frost-mobile/templates/settings.tpl diff --git a/view/theme/frost-mobile/smarty3/settings_display_end.tpl b/view/theme/frost-mobile/templates/settings_display_end.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/settings_display_end.tpl rename to view/theme/frost-mobile/templates/settings_display_end.tpl diff --git a/view/theme/frost-mobile/smarty3/suggest_friends.tpl b/view/theme/frost-mobile/templates/suggest_friends.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/suggest_friends.tpl rename to view/theme/frost-mobile/templates/suggest_friends.tpl diff --git a/view/theme/frost-mobile/smarty3/threaded_conversation.tpl b/view/theme/frost-mobile/templates/threaded_conversation.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/threaded_conversation.tpl rename to view/theme/frost-mobile/templates/threaded_conversation.tpl diff --git a/view/theme/frost-mobile/smarty3/voting_fakelink.tpl b/view/theme/frost-mobile/templates/voting_fakelink.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/voting_fakelink.tpl rename to view/theme/frost-mobile/templates/voting_fakelink.tpl diff --git a/view/theme/frost-mobile/smarty3/wall_thread.tpl b/view/theme/frost-mobile/templates/wall_thread.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/wall_thread.tpl rename to view/theme/frost-mobile/templates/wall_thread.tpl diff --git a/view/theme/frost-mobile/smarty3/wallmsg-end.tpl b/view/theme/frost-mobile/templates/wallmsg-end.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/wallmsg-end.tpl rename to view/theme/frost-mobile/templates/wallmsg-end.tpl diff --git a/view/theme/frost-mobile/smarty3/wallmsg-header.tpl b/view/theme/frost-mobile/templates/wallmsg-header.tpl similarity index 100% rename from view/theme/frost-mobile/smarty3/wallmsg-header.tpl rename to view/theme/frost-mobile/templates/wallmsg-header.tpl diff --git a/view/theme/frost-mobile/threaded_conversation.tpl b/view/theme/frost-mobile/threaded_conversation.tpl deleted file mode 100644 index 9d7f5c325c..0000000000 --- a/view/theme/frost-mobile/threaded_conversation.tpl +++ /dev/null @@ -1,15 +0,0 @@ -$live_update - -{{ for $threads as $thread }} -{{ inc $thread.template with $item=$thread }}{{ endinc }} -{{ endfor }} - -
- -{##} diff --git a/view/theme/frost-mobile/voting_fakelink.tpl b/view/theme/frost-mobile/voting_fakelink.tpl deleted file mode 100644 index b66302cc27..0000000000 --- a/view/theme/frost-mobile/voting_fakelink.tpl +++ /dev/null @@ -1 +0,0 @@ -$phrase diff --git a/view/theme/frost-mobile/wall_thread.tpl b/view/theme/frost-mobile/wall_thread.tpl deleted file mode 100644 index 6d34602a79..0000000000 --- a/view/theme/frost-mobile/wall_thread.tpl +++ /dev/null @@ -1,126 +0,0 @@ -{{if $item.comment_firstcollapsed}} -
- $item.num_comments $item.hide_text -
- {{endif}} - diff --git a/view/theme/frost-mobile/wallmsg-end.tpl b/view/theme/frost-mobile/wallmsg-end.tpl deleted file mode 100644 index 6074133798..0000000000 --- a/view/theme/frost-mobile/wallmsg-end.tpl +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/view/theme/frost-mobile/wallmsg-header.tpl b/view/theme/frost-mobile/wallmsg-header.tpl deleted file mode 100644 index 8ed5ea130d..0000000000 --- a/view/theme/frost-mobile/wallmsg-header.tpl +++ /dev/null @@ -1,7 +0,0 @@ - - - diff --git a/view/theme/frost/acl_selector.tpl b/view/theme/frost/acl_selector.tpl deleted file mode 100644 index df34a1a2ae..0000000000 --- a/view/theme/frost/acl_selector.tpl +++ /dev/null @@ -1,23 +0,0 @@ -
- - $showall -
-
-
-
- -
- - - - diff --git a/view/theme/frost/admin_aside.tpl b/view/theme/frost/admin_aside.tpl deleted file mode 100644 index da3ed23a88..0000000000 --- a/view/theme/frost/admin_aside.tpl +++ /dev/null @@ -1,31 +0,0 @@ - -

$admtxt

- - -{{ if $admin.update }} - -{{ endif }} - - -{{ if $admin.plugins_admin }}

$plugadmtxt

{{ endif }} - - - -

$logtxt

- - diff --git a/view/theme/frost/admin_site.tpl b/view/theme/frost/admin_site.tpl deleted file mode 100644 index 07a76a827d..0000000000 --- a/view/theme/frost/admin_site.tpl +++ /dev/null @@ -1,76 +0,0 @@ - -
-

$title - $page

- - - - - {{ 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 }} - {{ inc field_checkbox.tpl with $field=$hide_help }}{{ endinc }} - {{ inc field_select.tpl with $field=$singleuser }}{{ endinc }} - -
- -

$registration

- {{ 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 }} - -
- -

$upload

- {{ inc field_input.tpl with $field=$maximagesize }}{{ endinc }} - {{ inc field_input.tpl with $field=$maximagelength }}{{ endinc }} - {{ inc field_input.tpl with $field=$jpegimagequality }}{{ endinc }} - -

$corporate

- {{ 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_select.tpl with $field=$ostatus_poll_interval }}{{ 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 }} - {{ inc field_checkbox.tpl with $field=$enotify_no_content }}{{ endinc }} - {{ inc field_checkbox.tpl with $field=$private_addons }}{{ endinc }} - {{ inc field_checkbox.tpl with $field=$disable_embedded }}{{ endinc }} -
- -

$advanced

- {{ 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 }} - -

$performance

- {{ 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 }} - - -
- - -
diff --git a/view/theme/frost/admin_users.tpl b/view/theme/frost/admin_users.tpl deleted file mode 100644 index a3f6d2416f..0000000000 --- a/view/theme/frost/admin_users.tpl +++ /dev/null @@ -1,98 +0,0 @@ - -
-

$title - $page

- -
- - -

$h_pending

- {{ if $pending }} - - - - {{ for $th_pending as $th }}{{ endfor }} - - - - - - {{ for $pending as $u }} - - - - - - - - {{ endfor }} - -
$th
$u.created$u.name - - -
- -
- {{ else }} -

$no_pending

- {{ endif }} - - - - -

$h_users

- {{ if $users }} - - - - - {{ for $th_users as $th }}{{ endfor }} - - - - - - {{ for $users as $u }} - - - - - - - - - - {{ endif }} - - - {{ endfor }} - -
$th
$u.nickname$u.name$u.register_date$u.lastitem_date - {{ if $u.is_admin }} -   - {{ else }} - - {{ if $u.is_admin }} -   - {{ else }} - - - {{ endif }} -
- -
- {{ else }} - NO USERS?!? - {{ endif }} -
-
diff --git a/view/theme/frost/comment_item.tpl b/view/theme/frost/comment_item.tpl deleted file mode 100755 index 5e0919c30f..0000000000 --- a/view/theme/frost/comment_item.tpl +++ /dev/null @@ -1,77 +0,0 @@ -{##} - -
-
-{##} - - - - {##} - - - - -{##} - $mytitle -{##} - {##} -
    -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
-{##} -{##} - - {{ if $qcomment }} - - {{ endif }} - -
- - - {##} -
- -
diff --git a/view/theme/frost/contact_edit.tpl b/view/theme/frost/contact_edit.tpl deleted file mode 100644 index f5710063a2..0000000000 --- a/view/theme/frost/contact_edit.tpl +++ /dev/null @@ -1,88 +0,0 @@ - -

$header

- -
- - $tab_str - - - - - - -
- -
-
- - -
- - - {{ if $poll_enabled }} -
-
$lastupdtext $last_update
- $updpub $poll_interval $udnow -
- {{ endif }} -
- - {{inc field_checkbox.tpl with $field=$hidden }}{{endinc}} - -
-

$lbl_info1

- - -
-
- - -
-

$lbl_vis1

-

$lbl_vis2

-
-$profile_select -
- - - -
-
diff --git a/view/theme/frost/contact_end.tpl b/view/theme/frost/contact_end.tpl deleted file mode 100644 index 95c78ba7da..0000000000 --- a/view/theme/frost/contact_end.tpl +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/view/theme/frost/contact_head.tpl b/view/theme/frost/contact_head.tpl deleted file mode 100644 index 7b89a20e71..0000000000 --- a/view/theme/frost/contact_head.tpl +++ /dev/null @@ -1,4 +0,0 @@ - - diff --git a/view/theme/frost/contact_template.tpl b/view/theme/frost/contact_template.tpl deleted file mode 100644 index dd3dbf7945..0000000000 --- a/view/theme/frost/contact_template.tpl +++ /dev/null @@ -1,33 +0,0 @@ - -
-
-
- - $contact.name - - {{ if $contact.photo_menu }} - menu -
-
    - {{ for $contact.photo_menu as $c }} - {{ if $c.2 }} -
  • $c.0
  • - {{ else }} -
  • $c.0
  • - {{ endif }} - {{ endfor }} -
-
- {{ endif }} -
- -
-
-
$contact.name

-{{ if $contact.alt_text }}
$contact.alt_text
{{ endif }} -
$contact.network
- -
-
diff --git a/view/theme/frost/contacts-end.tpl b/view/theme/frost/contacts-end.tpl deleted file mode 100644 index 820b1c6a0f..0000000000 --- a/view/theme/frost/contacts-end.tpl +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/view/theme/frost/contacts-head.tpl b/view/theme/frost/contacts-head.tpl deleted file mode 100644 index 5ae97f9f0c..0000000000 --- a/view/theme/frost/contacts-head.tpl +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/view/theme/frost/contacts-template.tpl b/view/theme/frost/contacts-template.tpl deleted file mode 100644 index de89b5371e..0000000000 --- a/view/theme/frost/contacts-template.tpl +++ /dev/null @@ -1,28 +0,0 @@ -

$header{{ if $total }} ($total){{ endif }}

- -{{ if $finding }}

$finding

{{ endif }} - -$tabs - -
-
-$desc - - -
-
-
- - -
-{{ for $contacts as $contact }} - {{ inc contact_template.tpl }}{{ endinc }} -{{ endfor }} -
-
- -$paginate - - - - diff --git a/view/theme/frost/cropbody.tpl b/view/theme/frost/cropbody.tpl deleted file mode 100644 index 3283084cad..0000000000 --- a/view/theme/frost/cropbody.tpl +++ /dev/null @@ -1,27 +0,0 @@ -

$title

-

-$desc -

-
-$title -
-
-
-
- -
- - - - - - - - - - -
- -
- -
diff --git a/view/theme/frost/cropend.tpl b/view/theme/frost/cropend.tpl deleted file mode 100644 index a56c71d92e..0000000000 --- a/view/theme/frost/cropend.tpl +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/view/theme/frost/crophead.tpl b/view/theme/frost/crophead.tpl deleted file mode 100644 index 56e941e3ab..0000000000 --- a/view/theme/frost/crophead.tpl +++ /dev/null @@ -1 +0,0 @@ - diff --git a/view/theme/frost/display-head.tpl b/view/theme/frost/display-head.tpl deleted file mode 100644 index 1fc82ae779..0000000000 --- a/view/theme/frost/display-head.tpl +++ /dev/null @@ -1,4 +0,0 @@ - - diff --git a/view/theme/frost/end.tpl b/view/theme/frost/end.tpl deleted file mode 100644 index c88426bbf4..0000000000 --- a/view/theme/frost/end.tpl +++ /dev/null @@ -1,25 +0,0 @@ - -{##} -{##} - - - - - - - -{##} - - - - - - - - - - diff --git a/view/theme/frost/event.tpl b/view/theme/frost/event.tpl deleted file mode 100644 index 67de85d5c8..0000000000 --- a/view/theme/frost/event.tpl +++ /dev/null @@ -1,10 +0,0 @@ -{{ for $events as $event }} -
- - {{ if $event.item.author_name }}$event.item.author_name{{ endif }} - $event.html - {{ if $event.item.plink }}{{ endif }} - {{ if $event.edit }}{{ endif }} -
-
-{{ endfor }} diff --git a/view/theme/frost/event_end.tpl b/view/theme/frost/event_end.tpl deleted file mode 100644 index 8e8dcd33ab..0000000000 --- a/view/theme/frost/event_end.tpl +++ /dev/null @@ -1,5 +0,0 @@ - - - - diff --git a/view/theme/frost/event_form.tpl b/view/theme/frost/event_form.tpl deleted file mode 100644 index 36a22a8b2d..0000000000 --- a/view/theme/frost/event_form.tpl +++ /dev/null @@ -1,50 +0,0 @@ -

$title

- -

-$desc -

- -
- - - - - -
$s_text
-$s_dsel $s_tsel - -
$f_text
-$f_dsel $f_tsel - -
- -
$n_text
- -
- -
$a_text
- -
- -
$t_text
- - - -
$d_text
- - - -
$l_text
- -
- -
$sh_text
-
- -$acl - -
- -
- - diff --git a/view/theme/frost/event_head.tpl b/view/theme/frost/event_head.tpl deleted file mode 100644 index 44c6090fc1..0000000000 --- a/view/theme/frost/event_head.tpl +++ /dev/null @@ -1,7 +0,0 @@ - - - - diff --git a/view/theme/frost/field_combobox.tpl b/view/theme/frost/field_combobox.tpl deleted file mode 100644 index c454352d01..0000000000 --- a/view/theme/frost/field_combobox.tpl +++ /dev/null @@ -1,18 +0,0 @@ - -
- - {# html5 don't work on Chrome, Safari and IE9 - - - {{ for $field.4 as $opt=>$val }} #} - - - - - $field.3 -
- diff --git a/view/theme/frost/field_input.tpl b/view/theme/frost/field_input.tpl deleted file mode 100644 index 3c2149517f..0000000000 --- a/view/theme/frost/field_input.tpl +++ /dev/null @@ -1,6 +0,0 @@ - -
- - - $field.3 -
diff --git a/view/theme/frost/field_openid.tpl b/view/theme/frost/field_openid.tpl deleted file mode 100644 index a9f6cacad5..0000000000 --- a/view/theme/frost/field_openid.tpl +++ /dev/null @@ -1,6 +0,0 @@ - -
- - - $field.3 -
diff --git a/view/theme/frost/field_password.tpl b/view/theme/frost/field_password.tpl deleted file mode 100644 index a329b11029..0000000000 --- a/view/theme/frost/field_password.tpl +++ /dev/null @@ -1,6 +0,0 @@ - -
- - - $field.3 -
diff --git a/view/theme/frost/field_themeselect.tpl b/view/theme/frost/field_themeselect.tpl deleted file mode 100644 index d8ddc2fc74..0000000000 --- a/view/theme/frost/field_themeselect.tpl +++ /dev/null @@ -1,9 +0,0 @@ - -
- - - $field.3 -
-
diff --git a/view/theme/frost/filebrowser.tpl b/view/theme/frost/filebrowser.tpl deleted file mode 100644 index 9fe3c04ffe..0000000000 --- a/view/theme/frost/filebrowser.tpl +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - -
-
    -
  • FileBrowser
  • -
-
-
- -
-
- {{ for $path as $p }}$p.1{{ endfor }} -
-
-
    - {{ for $folders as $f }}
  • $f.1
  • {{ endfor }} -
-
-
-
    - {{ for $files as $f }} -
  • $f.1
  • - {{ endfor }} -
-
-
-
-
- -
- - - diff --git a/view/theme/frost/group_drop.tpl b/view/theme/frost/group_drop.tpl deleted file mode 100644 index 959b77bb21..0000000000 --- a/view/theme/frost/group_drop.tpl +++ /dev/null @@ -1,9 +0,0 @@ -
- -
-
diff --git a/view/theme/frost/head.tpl b/view/theme/frost/head.tpl deleted file mode 100644 index 3c25da46d0..0000000000 --- a/view/theme/frost/head.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - - - -{##} - - - - - - - - diff --git a/view/theme/frost/jot-end.tpl b/view/theme/frost/jot-end.tpl deleted file mode 100644 index 0ed2a3af6b..0000000000 --- a/view/theme/frost/jot-end.tpl +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/view/theme/frost/jot-header.tpl b/view/theme/frost/jot-header.tpl deleted file mode 100644 index 5291907072..0000000000 --- a/view/theme/frost/jot-header.tpl +++ /dev/null @@ -1,17 +0,0 @@ - - - diff --git a/view/theme/frost/jot.tpl b/view/theme/frost/jot.tpl deleted file mode 100644 index 96abeecba7..0000000000 --- a/view/theme/frost/jot.tpl +++ /dev/null @@ -1,91 +0,0 @@ - -
-
-
 
-
-
-
- -
- - - - - - - - -
- {{ if $placeholdercategory }} -
- {{ endif }} -
- - -
- -
- - -
- -
- -
-
-
-
-
-
- - {##} - -
- -
-
- -
-
- -
- - -
- $bang -
- - $preview - -
- - -
- $jotplugins -
- -{##} - - - -
-
- $acl -
-
$emailcc
-
- $jotnets -
-
- - -
- -
-
-
- {{ if $content }}{{ endif }} diff --git a/view/theme/frost/jot_geotag.tpl b/view/theme/frost/jot_geotag.tpl deleted file mode 100644 index 3f8bee91a7..0000000000 --- a/view/theme/frost/jot_geotag.tpl +++ /dev/null @@ -1,11 +0,0 @@ - - if(navigator.geolocation) { - navigator.geolocation.getCurrentPosition(function(position) { - var lat = position.coords.latitude.toFixed(4); - var lon = position.coords.longitude.toFixed(4); - - $j('#jot-coord').val(lat + ', ' + lon); - $j('#profile-nolocation-wrapper').show(); - }); - } - diff --git a/view/theme/frost/lang_selector.tpl b/view/theme/frost/lang_selector.tpl deleted file mode 100644 index e777a0a861..0000000000 --- a/view/theme/frost/lang_selector.tpl +++ /dev/null @@ -1,10 +0,0 @@ -
- diff --git a/view/theme/frost/like_noshare.tpl b/view/theme/frost/like_noshare.tpl deleted file mode 100644 index 5bf94f7df7..0000000000 --- a/view/theme/frost/like_noshare.tpl +++ /dev/null @@ -1,7 +0,0 @@ - diff --git a/view/theme/frost/login.tpl b/view/theme/frost/login.tpl deleted file mode 100644 index af315ac5e5..0000000000 --- a/view/theme/frost/login.tpl +++ /dev/null @@ -1,45 +0,0 @@ - - - - diff --git a/view/theme/frost/login_head.tpl b/view/theme/frost/login_head.tpl deleted file mode 100644 index 25339c327d..0000000000 --- a/view/theme/frost/login_head.tpl +++ /dev/null @@ -1,2 +0,0 @@ -{##} - diff --git a/view/theme/frost/lostpass.tpl b/view/theme/frost/lostpass.tpl deleted file mode 100644 index f2a802494e..0000000000 --- a/view/theme/frost/lostpass.tpl +++ /dev/null @@ -1,21 +0,0 @@ -
-

$title

-


- -
-
- - -
-
-

-$desc -

-
- -
- -
-
-
-
diff --git a/view/theme/frost/mail_conv.tpl b/view/theme/frost/mail_conv.tpl deleted file mode 100644 index 97e814e1fb..0000000000 --- a/view/theme/frost/mail_conv.tpl +++ /dev/null @@ -1,14 +0,0 @@ -
-
- $mail.from_name -
-
-
$mail.from_name
-
$mail.date
-
$mail.subject
-
$mail.body
-
-
-
-
-
diff --git a/view/theme/frost/mail_list.tpl b/view/theme/frost/mail_list.tpl deleted file mode 100644 index 5be7f38623..0000000000 --- a/view/theme/frost/mail_list.tpl +++ /dev/null @@ -1,16 +0,0 @@ -
-
- $from_name -
-
-
$from_name
-
$date
- -
- -
-
-
-
- -
diff --git a/view/theme/frost/message-end.tpl b/view/theme/frost/message-end.tpl deleted file mode 100644 index 820b1c6a0f..0000000000 --- a/view/theme/frost/message-end.tpl +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/view/theme/frost/message-head.tpl b/view/theme/frost/message-head.tpl deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/view/theme/frost/moderated_comment.tpl b/view/theme/frost/moderated_comment.tpl deleted file mode 100755 index b0451c8c60..0000000000 --- a/view/theme/frost/moderated_comment.tpl +++ /dev/null @@ -1,61 +0,0 @@ -
-
- - - - - - - -
- $mytitle -
-
- -
    -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
-
- - -
- - -
-
- -
diff --git a/view/theme/frost/msg-end.tpl b/view/theme/frost/msg-end.tpl deleted file mode 100644 index 84448efd53..0000000000 --- a/view/theme/frost/msg-end.tpl +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/view/theme/frost/msg-header.tpl b/view/theme/frost/msg-header.tpl deleted file mode 100644 index c1eabcec74..0000000000 --- a/view/theme/frost/msg-header.tpl +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/view/theme/frost/nav.tpl b/view/theme/frost/nav.tpl deleted file mode 100644 index 3c9a4102fb..0000000000 --- a/view/theme/frost/nav.tpl +++ /dev/null @@ -1,150 +0,0 @@ - - - diff --git a/view/theme/frost/photo_drop.tpl b/view/theme/frost/photo_drop.tpl deleted file mode 100644 index f55e62344a..0000000000 --- a/view/theme/frost/photo_drop.tpl +++ /dev/null @@ -1,4 +0,0 @@ -
- -
-
diff --git a/view/theme/frost/photo_edit.tpl b/view/theme/frost/photo_edit.tpl deleted file mode 100644 index 5ed3c1d036..0000000000 --- a/view/theme/frost/photo_edit.tpl +++ /dev/null @@ -1,58 +0,0 @@ - -
- - - - - - -
- - - - -
- - - - -
-
-
- $rotatecw -
-
- -
- $rotateccw -
- -
-
- -
- -
$permissions
-
-
- -
-
- $aclselect -
-
-
-
- - - - -
-
- -{##} diff --git a/view/theme/frost/photo_edit_head.tpl b/view/theme/frost/photo_edit_head.tpl deleted file mode 100644 index 4536dd5dfd..0000000000 --- a/view/theme/frost/photo_edit_head.tpl +++ /dev/null @@ -1,7 +0,0 @@ - - diff --git a/view/theme/frost/photo_view.tpl b/view/theme/frost/photo_view.tpl deleted file mode 100644 index 92e115487a..0000000000 --- a/view/theme/frost/photo_view.tpl +++ /dev/null @@ -1,42 +0,0 @@ -
-

$album.1

- - - -
- {{ if $prevlink }}{{ endif }} - {{ if $nextlink }}{{ endif }} -
-
-
-
$desc
-{{ if $tags }} -
$tags.0
-
$tags.1
-{{ endif }} -{{ if $tags.2 }}{{ endif }} - -{{ if $edit }} -$edit -{{ else }} - -{{ if $likebuttons }} -
- $likebuttons - $like - $dislike -
-{{ endif }} - -$comments - -$paginate -{{ endif }} - diff --git a/view/theme/frost/photos_head.tpl b/view/theme/frost/photos_head.tpl deleted file mode 100644 index 8cd22d5b6d..0000000000 --- a/view/theme/frost/photos_head.tpl +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/view/theme/frost/photos_upload.tpl b/view/theme/frost/photos_upload.tpl deleted file mode 100644 index 1a41fcbdb0..0000000000 --- a/view/theme/frost/photos_upload.tpl +++ /dev/null @@ -1,52 +0,0 @@ -

$pagename

- -
$usage
- -
-
-
- -
- -
-
-
-
$existalbumtext
- -
-
- -
- $default_upload_box -
- -
- -
-
- - -
- -
-
- $aclselect -
-
- -
- - $alt_uploader - - $default_upload_submit - -
-
-
- diff --git a/view/theme/frost/posted_date_widget.tpl b/view/theme/frost/posted_date_widget.tpl deleted file mode 100644 index ce70b74255..0000000000 --- a/view/theme/frost/posted_date_widget.tpl +++ /dev/null @@ -1,9 +0,0 @@ -
-

$title

- - -
diff --git a/view/theme/frost/profed_end.tpl b/view/theme/frost/profed_end.tpl deleted file mode 100644 index 73a08c1328..0000000000 --- a/view/theme/frost/profed_end.tpl +++ /dev/null @@ -1,8 +0,0 @@ - - - - diff --git a/view/theme/frost/profed_head.tpl b/view/theme/frost/profed_head.tpl deleted file mode 100644 index 55fd5f4a76..0000000000 --- a/view/theme/frost/profed_head.tpl +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/view/theme/frost/profile_edit.tpl b/view/theme/frost/profile_edit.tpl deleted file mode 100644 index 11b2a5b3a8..0000000000 --- a/view/theme/frost/profile_edit.tpl +++ /dev/null @@ -1,322 +0,0 @@ -$default - -

$banner

- - - - - - -
-
- - -
- -
*
-
-
- -
- - -
-
- -
- - -
-
- - -
- -$gender -
-
- -
- -
-$dob $age -
-
-
- -$hide_friends - -
- -
-
- - -
- - -
-
- -
- - -
-
- - -
- - -
-
- -
- - -
-
- -
- - -
-
- -
- - -
-
- -
- -
-
- -
- -$marital -
- - - - - -
- -
- -$sexual -
-
- - - -
- - -
-
- -
- - -
-
- -
- - -
-
- -
- - -
$lbl_pubdsc
-
- -
- - -
$lbl_prvdsc
-
- - -
- -
-
- -
-

-$lbl_about -

- - - -
-
- - -
-

-$lbl_hobbies -

- - - -
-
- - -
-

-$lbl_likes -

- - - -
-
- - -
-

-$lbl_dislikes -

- - - -
-
- - -
-

-$lbl_social -

- - - -
-
- - -
- -
-
- - -
-

-$lbl_music -

- - - -
-
- -
-

-$lbl_book -

- - - -
-
- - - -
-

-$lbl_tv -

- - - -
-
- - - -
-

-$lbl_film -

- - - -
-
- - -
- -
-
- - -
-

-$lbl_love -

- - - -
-
- - - -
-

-$lbl_work -

- - - -
-
- - - -
-

-$lbl_school -

- - - -
-
- - - -
- -
-
- - -
-
- diff --git a/view/theme/frost/profile_vcard.tpl b/view/theme/frost/profile_vcard.tpl deleted file mode 100644 index e91e6125ff..0000000000 --- a/view/theme/frost/profile_vcard.tpl +++ /dev/null @@ -1,51 +0,0 @@ -
- -
$profile.name
- - - - {{ if $pdesc }}
$profile.pdesc
{{ endif }} -
$profile.name
- - - - {{ if $location }} -
$location
-
- {{ if $profile.address }}
$profile.address
{{ endif }} - - $profile.locality{{ if $profile.locality }}, {{ endif }} - $profile.region - $profile.postal_code - - {{ if $profile.country_name }}$profile.country_name{{ endif }} -
-
- {{ endif }} - - {{ if $gender }}
$gender
$profile.gender
{{ endif }} - - {{ if $profile.pubkey }}{{ endif }} - - {{ if $marital }}
$marital
$profile.marital
{{ endif }} - - {{ if $homepage }}
$homepage
$profile.homepage
{{ endif }} - - {{ inc diaspora_vcard.tpl }}{{ endinc }} - -
- -
- -$contact_block - - diff --git a/view/theme/frost/prv_message.tpl b/view/theme/frost/prv_message.tpl deleted file mode 100644 index 25d7e1116c..0000000000 --- a/view/theme/frost/prv_message.tpl +++ /dev/null @@ -1,39 +0,0 @@ - -

$header

- -
-
- -$parent - -
$to
- -{{ if $showinputs }} - - -{{ else }} -$select -{{ endif }} - -
$subject
- - -
$yourmessage
- - - -
- -
-
-
- -
- -
-
-
-
-
diff --git a/view/theme/frost/register.tpl b/view/theme/frost/register.tpl deleted file mode 100644 index 15ce5040e2..0000000000 --- a/view/theme/frost/register.tpl +++ /dev/null @@ -1,80 +0,0 @@ -
-

$regtitle

-

- -
- - - - $registertext - -

$realpeople

- -
-{{ if $oidlabel }} -
- -
-
-{{ endif }} - -
-

$fillwith $fillext

-
- -

- -{{ if $invitations }} - -

$invite_desc

-
- - -
-
- -{{ endif }} - - -
- - -
-
- - -
- - -
-
-

- -
- - -
-
- -
-

$nickdesc

-
- - $publish - -
- -

- -
- -
-
-
- -$license - -
diff --git a/view/theme/frost/search_item.tpl b/view/theme/frost/search_item.tpl deleted file mode 100644 index b78f05d661..0000000000 --- a/view/theme/frost/search_item.tpl +++ /dev/null @@ -1,64 +0,0 @@ - -{##} -
-
-
- - $item.name - menu - {##} -
    - $item.item_photo_menu -
- {##} -
- {##} -
- {{ if $item.lock }}{##}$item.lock{##} - {{ else }}
{{ endif }} -
$item.location
-
-
- {##} - $item.name -
$item.ago
- - {##} -
-
$item.title
- {##} -
$item.body
- {{ if $item.has_cats }} -
$item.txt_cats {{ for $item.categories as $cat }}$cat.name{{ if $cat.removeurl }} [$remove]{{ endif }} {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} -
- {{ endif }} - - {{ if $item.has_folders }} -
$item.txt_folders {{ for $item.folders as $cat }}$cat.name{{ if $cat.removeurl }} [$remove]{{ endif }}{{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} -
- {{ endif }} -
-
- {##} - {{ if $item.drop.dropping }}{{ endif }} - {##} - {{ if $item.drop.pagedrop }}{{ endif }} - {##} -
-
- {##} - - -
- {{ if $item.conv }} - $item.conv.title - {{ endif }} -
- -{##} diff --git a/view/theme/frost/settings-head.tpl b/view/theme/frost/settings-head.tpl deleted file mode 100644 index 8cd22d5b6d..0000000000 --- a/view/theme/frost/settings-head.tpl +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/view/theme/frost/settings_display_end.tpl b/view/theme/frost/settings_display_end.tpl deleted file mode 100644 index 739c43b35a..0000000000 --- a/view/theme/frost/settings_display_end.tpl +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/view/theme/frost/suggest_friends.tpl b/view/theme/frost/suggest_friends.tpl deleted file mode 100644 index e0d1c29441..0000000000 --- a/view/theme/frost/suggest_friends.tpl +++ /dev/null @@ -1,16 +0,0 @@ -
-
- - $name - -
-
-
- $name -
-
- {{ if $connlnk }} - - {{ endif }} - -
diff --git a/view/theme/frost/smarty3/acl_selector.tpl b/view/theme/frost/templates/acl_selector.tpl similarity index 100% rename from view/theme/frost/smarty3/acl_selector.tpl rename to view/theme/frost/templates/acl_selector.tpl diff --git a/view/theme/frost/smarty3/admin_aside.tpl b/view/theme/frost/templates/admin_aside.tpl similarity index 100% rename from view/theme/frost/smarty3/admin_aside.tpl rename to view/theme/frost/templates/admin_aside.tpl diff --git a/view/theme/frost/smarty3/admin_site.tpl b/view/theme/frost/templates/admin_site.tpl similarity index 100% rename from view/theme/frost/smarty3/admin_site.tpl rename to view/theme/frost/templates/admin_site.tpl diff --git a/view/theme/frost/smarty3/admin_users.tpl b/view/theme/frost/templates/admin_users.tpl similarity index 100% rename from view/theme/frost/smarty3/admin_users.tpl rename to view/theme/frost/templates/admin_users.tpl diff --git a/view/theme/frost/smarty3/comment_item.tpl b/view/theme/frost/templates/comment_item.tpl similarity index 100% rename from view/theme/frost/smarty3/comment_item.tpl rename to view/theme/frost/templates/comment_item.tpl diff --git a/view/theme/frost/smarty3/contact_edit.tpl b/view/theme/frost/templates/contact_edit.tpl similarity index 100% rename from view/theme/frost/smarty3/contact_edit.tpl rename to view/theme/frost/templates/contact_edit.tpl diff --git a/view/theme/frost/smarty3/contact_end.tpl b/view/theme/frost/templates/contact_end.tpl similarity index 100% rename from view/theme/frost/smarty3/contact_end.tpl rename to view/theme/frost/templates/contact_end.tpl diff --git a/view/theme/frost/smarty3/contact_head.tpl b/view/theme/frost/templates/contact_head.tpl similarity index 100% rename from view/theme/frost/smarty3/contact_head.tpl rename to view/theme/frost/templates/contact_head.tpl diff --git a/view/theme/frost/smarty3/contact_template.tpl b/view/theme/frost/templates/contact_template.tpl similarity index 100% rename from view/theme/frost/smarty3/contact_template.tpl rename to view/theme/frost/templates/contact_template.tpl diff --git a/view/theme/frost/smarty3/contacts-end.tpl b/view/theme/frost/templates/contacts-end.tpl similarity index 100% rename from view/theme/frost/smarty3/contacts-end.tpl rename to view/theme/frost/templates/contacts-end.tpl diff --git a/view/theme/frost/smarty3/contacts-head.tpl b/view/theme/frost/templates/contacts-head.tpl similarity index 100% rename from view/theme/frost/smarty3/contacts-head.tpl rename to view/theme/frost/templates/contacts-head.tpl diff --git a/view/theme/frost/smarty3/contacts-template.tpl b/view/theme/frost/templates/contacts-template.tpl similarity index 100% rename from view/theme/frost/smarty3/contacts-template.tpl rename to view/theme/frost/templates/contacts-template.tpl diff --git a/view/theme/frost/smarty3/cropbody.tpl b/view/theme/frost/templates/cropbody.tpl similarity index 100% rename from view/theme/frost/smarty3/cropbody.tpl rename to view/theme/frost/templates/cropbody.tpl diff --git a/view/theme/frost/smarty3/cropend.tpl b/view/theme/frost/templates/cropend.tpl similarity index 100% rename from view/theme/frost/smarty3/cropend.tpl rename to view/theme/frost/templates/cropend.tpl diff --git a/view/theme/frost/smarty3/crophead.tpl b/view/theme/frost/templates/crophead.tpl similarity index 100% rename from view/theme/frost/smarty3/crophead.tpl rename to view/theme/frost/templates/crophead.tpl diff --git a/view/theme/frost/smarty3/display-head.tpl b/view/theme/frost/templates/display-head.tpl similarity index 100% rename from view/theme/frost/smarty3/display-head.tpl rename to view/theme/frost/templates/display-head.tpl diff --git a/view/theme/frost/smarty3/end.tpl b/view/theme/frost/templates/end.tpl similarity index 100% rename from view/theme/frost/smarty3/end.tpl rename to view/theme/frost/templates/end.tpl diff --git a/view/theme/frost/smarty3/event.tpl b/view/theme/frost/templates/event.tpl similarity index 100% rename from view/theme/frost/smarty3/event.tpl rename to view/theme/frost/templates/event.tpl diff --git a/view/theme/frost/smarty3/event_end.tpl b/view/theme/frost/templates/event_end.tpl similarity index 100% rename from view/theme/frost/smarty3/event_end.tpl rename to view/theme/frost/templates/event_end.tpl diff --git a/view/theme/frost/smarty3/event_form.tpl b/view/theme/frost/templates/event_form.tpl similarity index 100% rename from view/theme/frost/smarty3/event_form.tpl rename to view/theme/frost/templates/event_form.tpl diff --git a/view/theme/frost/smarty3/event_head.tpl b/view/theme/frost/templates/event_head.tpl similarity index 100% rename from view/theme/frost/smarty3/event_head.tpl rename to view/theme/frost/templates/event_head.tpl diff --git a/view/theme/frost/smarty3/field_combobox.tpl b/view/theme/frost/templates/field_combobox.tpl similarity index 100% rename from view/theme/frost/smarty3/field_combobox.tpl rename to view/theme/frost/templates/field_combobox.tpl diff --git a/view/theme/frost/smarty3/field_input.tpl b/view/theme/frost/templates/field_input.tpl similarity index 100% rename from view/theme/frost/smarty3/field_input.tpl rename to view/theme/frost/templates/field_input.tpl diff --git a/view/theme/frost/smarty3/field_openid.tpl b/view/theme/frost/templates/field_openid.tpl similarity index 100% rename from view/theme/frost/smarty3/field_openid.tpl rename to view/theme/frost/templates/field_openid.tpl diff --git a/view/theme/frost/smarty3/field_password.tpl b/view/theme/frost/templates/field_password.tpl similarity index 100% rename from view/theme/frost/smarty3/field_password.tpl rename to view/theme/frost/templates/field_password.tpl diff --git a/view/theme/frost/smarty3/field_themeselect.tpl b/view/theme/frost/templates/field_themeselect.tpl similarity index 100% rename from view/theme/frost/smarty3/field_themeselect.tpl rename to view/theme/frost/templates/field_themeselect.tpl diff --git a/view/theme/frost/smarty3/filebrowser.tpl b/view/theme/frost/templates/filebrowser.tpl similarity index 100% rename from view/theme/frost/smarty3/filebrowser.tpl rename to view/theme/frost/templates/filebrowser.tpl diff --git a/view/theme/frost/smarty3/group_drop.tpl b/view/theme/frost/templates/group_drop.tpl similarity index 100% rename from view/theme/frost/smarty3/group_drop.tpl rename to view/theme/frost/templates/group_drop.tpl diff --git a/view/theme/frost/smarty3/head.tpl b/view/theme/frost/templates/head.tpl similarity index 100% rename from view/theme/frost/smarty3/head.tpl rename to view/theme/frost/templates/head.tpl diff --git a/view/theme/frost/smarty3/jot-end.tpl b/view/theme/frost/templates/jot-end.tpl similarity index 100% rename from view/theme/frost/smarty3/jot-end.tpl rename to view/theme/frost/templates/jot-end.tpl diff --git a/view/theme/frost/smarty3/jot-header.tpl b/view/theme/frost/templates/jot-header.tpl similarity index 100% rename from view/theme/frost/smarty3/jot-header.tpl rename to view/theme/frost/templates/jot-header.tpl diff --git a/view/theme/frost/smarty3/jot.tpl b/view/theme/frost/templates/jot.tpl similarity index 100% rename from view/theme/frost/smarty3/jot.tpl rename to view/theme/frost/templates/jot.tpl diff --git a/view/theme/frost/smarty3/jot_geotag.tpl b/view/theme/frost/templates/jot_geotag.tpl similarity index 100% rename from view/theme/frost/smarty3/jot_geotag.tpl rename to view/theme/frost/templates/jot_geotag.tpl diff --git a/view/theme/frost/smarty3/lang_selector.tpl b/view/theme/frost/templates/lang_selector.tpl similarity index 100% rename from view/theme/frost/smarty3/lang_selector.tpl rename to view/theme/frost/templates/lang_selector.tpl diff --git a/view/theme/frost/smarty3/like_noshare.tpl b/view/theme/frost/templates/like_noshare.tpl similarity index 100% rename from view/theme/frost/smarty3/like_noshare.tpl rename to view/theme/frost/templates/like_noshare.tpl diff --git a/view/theme/frost/smarty3/login.tpl b/view/theme/frost/templates/login.tpl similarity index 100% rename from view/theme/frost/smarty3/login.tpl rename to view/theme/frost/templates/login.tpl diff --git a/view/theme/frost/smarty3/login_head.tpl b/view/theme/frost/templates/login_head.tpl similarity index 100% rename from view/theme/frost/smarty3/login_head.tpl rename to view/theme/frost/templates/login_head.tpl diff --git a/view/theme/frost/smarty3/lostpass.tpl b/view/theme/frost/templates/lostpass.tpl similarity index 100% rename from view/theme/frost/smarty3/lostpass.tpl rename to view/theme/frost/templates/lostpass.tpl diff --git a/view/theme/frost/smarty3/mail_conv.tpl b/view/theme/frost/templates/mail_conv.tpl similarity index 100% rename from view/theme/frost/smarty3/mail_conv.tpl rename to view/theme/frost/templates/mail_conv.tpl diff --git a/view/theme/frost/smarty3/mail_list.tpl b/view/theme/frost/templates/mail_list.tpl similarity index 100% rename from view/theme/frost/smarty3/mail_list.tpl rename to view/theme/frost/templates/mail_list.tpl diff --git a/view/theme/frost/smarty3/message-end.tpl b/view/theme/frost/templates/message-end.tpl similarity index 100% rename from view/theme/frost/smarty3/message-end.tpl rename to view/theme/frost/templates/message-end.tpl diff --git a/view/theme/frost/smarty3/message-head.tpl b/view/theme/frost/templates/message-head.tpl similarity index 100% rename from view/theme/frost/smarty3/message-head.tpl rename to view/theme/frost/templates/message-head.tpl diff --git a/view/theme/frost/smarty3/moderated_comment.tpl b/view/theme/frost/templates/moderated_comment.tpl similarity index 100% rename from view/theme/frost/smarty3/moderated_comment.tpl rename to view/theme/frost/templates/moderated_comment.tpl diff --git a/view/theme/frost/smarty3/msg-end.tpl b/view/theme/frost/templates/msg-end.tpl similarity index 100% rename from view/theme/frost/smarty3/msg-end.tpl rename to view/theme/frost/templates/msg-end.tpl diff --git a/view/theme/frost/smarty3/msg-header.tpl b/view/theme/frost/templates/msg-header.tpl similarity index 100% rename from view/theme/frost/smarty3/msg-header.tpl rename to view/theme/frost/templates/msg-header.tpl diff --git a/view/theme/frost/smarty3/nav.tpl b/view/theme/frost/templates/nav.tpl similarity index 100% rename from view/theme/frost/smarty3/nav.tpl rename to view/theme/frost/templates/nav.tpl diff --git a/view/theme/frost/smarty3/photo_drop.tpl b/view/theme/frost/templates/photo_drop.tpl similarity index 100% rename from view/theme/frost/smarty3/photo_drop.tpl rename to view/theme/frost/templates/photo_drop.tpl diff --git a/view/theme/frost/smarty3/photo_edit.tpl b/view/theme/frost/templates/photo_edit.tpl similarity index 100% rename from view/theme/frost/smarty3/photo_edit.tpl rename to view/theme/frost/templates/photo_edit.tpl diff --git a/view/theme/frost/smarty3/photo_edit_head.tpl b/view/theme/frost/templates/photo_edit_head.tpl similarity index 100% rename from view/theme/frost/smarty3/photo_edit_head.tpl rename to view/theme/frost/templates/photo_edit_head.tpl diff --git a/view/theme/frost/smarty3/photo_view.tpl b/view/theme/frost/templates/photo_view.tpl similarity index 100% rename from view/theme/frost/smarty3/photo_view.tpl rename to view/theme/frost/templates/photo_view.tpl diff --git a/view/theme/frost/smarty3/photos_head.tpl b/view/theme/frost/templates/photos_head.tpl similarity index 100% rename from view/theme/frost/smarty3/photos_head.tpl rename to view/theme/frost/templates/photos_head.tpl diff --git a/view/theme/frost/smarty3/photos_upload.tpl b/view/theme/frost/templates/photos_upload.tpl similarity index 100% rename from view/theme/frost/smarty3/photos_upload.tpl rename to view/theme/frost/templates/photos_upload.tpl diff --git a/view/theme/frost/smarty3/posted_date_widget.tpl b/view/theme/frost/templates/posted_date_widget.tpl similarity index 100% rename from view/theme/frost/smarty3/posted_date_widget.tpl rename to view/theme/frost/templates/posted_date_widget.tpl diff --git a/view/theme/frost/smarty3/profed_end.tpl b/view/theme/frost/templates/profed_end.tpl similarity index 100% rename from view/theme/frost/smarty3/profed_end.tpl rename to view/theme/frost/templates/profed_end.tpl diff --git a/view/theme/frost/smarty3/profed_head.tpl b/view/theme/frost/templates/profed_head.tpl similarity index 100% rename from view/theme/frost/smarty3/profed_head.tpl rename to view/theme/frost/templates/profed_head.tpl diff --git a/view/theme/frost/smarty3/profile_edit.tpl b/view/theme/frost/templates/profile_edit.tpl similarity index 100% rename from view/theme/frost/smarty3/profile_edit.tpl rename to view/theme/frost/templates/profile_edit.tpl diff --git a/view/theme/frost/smarty3/profile_vcard.tpl b/view/theme/frost/templates/profile_vcard.tpl similarity index 100% rename from view/theme/frost/smarty3/profile_vcard.tpl rename to view/theme/frost/templates/profile_vcard.tpl diff --git a/view/theme/frost/smarty3/prv_message.tpl b/view/theme/frost/templates/prv_message.tpl similarity index 100% rename from view/theme/frost/smarty3/prv_message.tpl rename to view/theme/frost/templates/prv_message.tpl diff --git a/view/theme/frost/smarty3/register.tpl b/view/theme/frost/templates/register.tpl similarity index 100% rename from view/theme/frost/smarty3/register.tpl rename to view/theme/frost/templates/register.tpl diff --git a/view/theme/frost/smarty3/search_item.tpl b/view/theme/frost/templates/search_item.tpl similarity index 100% rename from view/theme/frost/smarty3/search_item.tpl rename to view/theme/frost/templates/search_item.tpl diff --git a/view/theme/frost/smarty3/settings-head.tpl b/view/theme/frost/templates/settings-head.tpl similarity index 100% rename from view/theme/frost/smarty3/settings-head.tpl rename to view/theme/frost/templates/settings-head.tpl diff --git a/view/theme/frost/smarty3/settings_display_end.tpl b/view/theme/frost/templates/settings_display_end.tpl similarity index 100% rename from view/theme/frost/smarty3/settings_display_end.tpl rename to view/theme/frost/templates/settings_display_end.tpl diff --git a/view/theme/frost/smarty3/suggest_friends.tpl b/view/theme/frost/templates/suggest_friends.tpl similarity index 100% rename from view/theme/frost/smarty3/suggest_friends.tpl rename to view/theme/frost/templates/suggest_friends.tpl diff --git a/view/theme/frost/smarty3/threaded_conversation.tpl b/view/theme/frost/templates/threaded_conversation.tpl similarity index 100% rename from view/theme/frost/smarty3/threaded_conversation.tpl rename to view/theme/frost/templates/threaded_conversation.tpl diff --git a/view/theme/frost/smarty3/voting_fakelink.tpl b/view/theme/frost/templates/voting_fakelink.tpl similarity index 100% rename from view/theme/frost/smarty3/voting_fakelink.tpl rename to view/theme/frost/templates/voting_fakelink.tpl diff --git a/view/theme/frost/smarty3/wall_thread.tpl b/view/theme/frost/templates/wall_thread.tpl similarity index 100% rename from view/theme/frost/smarty3/wall_thread.tpl rename to view/theme/frost/templates/wall_thread.tpl diff --git a/view/theme/frost/smarty3/wallmsg-end.tpl b/view/theme/frost/templates/wallmsg-end.tpl similarity index 100% rename from view/theme/frost/smarty3/wallmsg-end.tpl rename to view/theme/frost/templates/wallmsg-end.tpl diff --git a/view/theme/frost/smarty3/wallmsg-header.tpl b/view/theme/frost/templates/wallmsg-header.tpl similarity index 100% rename from view/theme/frost/smarty3/wallmsg-header.tpl rename to view/theme/frost/templates/wallmsg-header.tpl diff --git a/view/theme/frost/threaded_conversation.tpl b/view/theme/frost/threaded_conversation.tpl deleted file mode 100644 index a987541831..0000000000 --- a/view/theme/frost/threaded_conversation.tpl +++ /dev/null @@ -1,28 +0,0 @@ -{{ if $dropping }} - - -{{ else }} -{{ if $mode==display }} -
-{{ endif }} -{{ endif }} - -$live_update - -{{ for $threads as $thread }} -{{ inc $thread.template with $item=$thread }}{{ endinc }} -{{ endfor }} - -
- -{{ if $dropping }} - - -
-{{ endif }} diff --git a/view/theme/frost/voting_fakelink.tpl b/view/theme/frost/voting_fakelink.tpl deleted file mode 100644 index b66302cc27..0000000000 --- a/view/theme/frost/voting_fakelink.tpl +++ /dev/null @@ -1 +0,0 @@ -$phrase diff --git a/view/theme/frost/wall_thread.tpl b/view/theme/frost/wall_thread.tpl deleted file mode 100644 index 9c63bef227..0000000000 --- a/view/theme/frost/wall_thread.tpl +++ /dev/null @@ -1,125 +0,0 @@ -{{if $item.comment_firstcollapsed}} -
- $item.num_comments $item.hide_text -
- {{endif}} - diff --git a/view/theme/frost/wallmsg-end.tpl b/view/theme/frost/wallmsg-end.tpl deleted file mode 100644 index 6baa6e7dc1..0000000000 --- a/view/theme/frost/wallmsg-end.tpl +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/view/theme/frost/wallmsg-header.tpl b/view/theme/frost/wallmsg-header.tpl deleted file mode 100644 index 7523539483..0000000000 --- a/view/theme/frost/wallmsg-header.tpl +++ /dev/null @@ -1,7 +0,0 @@ - - - diff --git a/view/theme/quattro/birthdays_reminder.tpl b/view/theme/quattro/birthdays_reminder.tpl deleted file mode 100644 index 8b13789179..0000000000 --- a/view/theme/quattro/birthdays_reminder.tpl +++ /dev/null @@ -1 +0,0 @@ - diff --git a/view/theme/quattro/comment_item.tpl b/view/theme/quattro/comment_item.tpl deleted file mode 100644 index 293f93f948..0000000000 --- a/view/theme/quattro/comment_item.tpl +++ /dev/null @@ -1,63 +0,0 @@ -
-
- - - - {##} - - - - -
- $mytitle -
-
    -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
- - {{ if $qcomment }} - - {{ endif }} - - - -
- -
diff --git a/view/theme/quattro/contact_template.tpl b/view/theme/quattro/contact_template.tpl deleted file mode 100644 index 485ee6cac0..0000000000 --- a/view/theme/quattro/contact_template.tpl +++ /dev/null @@ -1,32 +0,0 @@ - -
-
-
- - $contact.name - - {{ if $contact.photo_menu }} - menu - - {{ endif }} -
- -
-
$contact.name
- {{ if $contact.alt_text }}
$contact.alt_text
{{ endif }} -
$contact.itemurl
-
$contact.network
- - -
- diff --git a/view/theme/quattro/conversation.tpl b/view/theme/quattro/conversation.tpl deleted file mode 100644 index 36afc392eb..0000000000 --- a/view/theme/quattro/conversation.tpl +++ /dev/null @@ -1,49 +0,0 @@ -$live_update - -{{ for $threads as $thread }} -
- {{ for $thread.items as $item }} - {{if $mode == display}} - {{ else }} - {{if $item.comment_firstcollapsed}} -
- $thread.num_comments $thread.hide_text -
- {{endif}} - {{ endif }} - - {{ if $item.type == tag }} - {{ inc wall_item_tag.tpl }}{{ endinc }} - {{ else }} - {{ inc $item.template }}{{ endinc }} - {{ endif }} - - {{ endfor }} -
-{{ endfor }} - -
- -{{ if $dropping }} - - $dropping - -{{ endif }} - - - -{{ if $mode == display }} - -{{ endif }} - diff --git a/view/theme/quattro/events_reminder.tpl b/view/theme/quattro/events_reminder.tpl deleted file mode 100644 index 28b6a6675f..0000000000 --- a/view/theme/quattro/events_reminder.tpl +++ /dev/null @@ -1,39 +0,0 @@ - - - -
-
diff --git a/view/theme/quattro/fileas_widget.tpl b/view/theme/quattro/fileas_widget.tpl deleted file mode 100644 index 1e5a760449..0000000000 --- a/view/theme/quattro/fileas_widget.tpl +++ /dev/null @@ -1,12 +0,0 @@ -
-

$title

-
$desc
- - - -
diff --git a/view/theme/quattro/generic_links_widget.tpl b/view/theme/quattro/generic_links_widget.tpl deleted file mode 100644 index 29580bbc71..0000000000 --- a/view/theme/quattro/generic_links_widget.tpl +++ /dev/null @@ -1,11 +0,0 @@ -
- {{if $title}}

$title

{{endif}} - {{if $desc}}
$desc
{{endif}} - -
    - {{ for $items as $item }} -
  • $item.label
  • - {{ endfor }} -
- -
diff --git a/view/theme/quattro/group_side.tpl b/view/theme/quattro/group_side.tpl deleted file mode 100644 index 596a8d13fd..0000000000 --- a/view/theme/quattro/group_side.tpl +++ /dev/null @@ -1,29 +0,0 @@ -
-
-

$title

- $add -
- - -
- diff --git a/view/theme/quattro/jot.tpl b/view/theme/quattro/jot.tpl deleted file mode 100644 index 55de92d08f..0000000000 --- a/view/theme/quattro/jot.tpl +++ /dev/null @@ -1,56 +0,0 @@ -
-
-
 
- - {{ if $placeholdercategory }} - - {{ endif }} -
- - - - - - - - - - - - - - - -
- - - -
-
- $acl -
-
$emailcc
-
- $jotnets -
-
- -
- -{{ if $content }}{{ endif }} diff --git a/view/theme/quattro/mail_conv.tpl b/view/theme/quattro/mail_conv.tpl deleted file mode 100644 index 0d673236b7..0000000000 --- a/view/theme/quattro/mail_conv.tpl +++ /dev/null @@ -1,63 +0,0 @@ -
-
-
- -
-
- $mail.body -
-
-
- -
-
-
-
-
-
-
-
- $mail.from_name - $mail.ago -
- -
-
- - - -
-
-
-
-
- - -{# - - -
-
- $mail.from_name -
-
-
$mail.from_name
-
$mail.date
-
$mail.subject
-
$mail.body
-
-
-
-
-
- -#} diff --git a/view/theme/quattro/mail_display.tpl b/view/theme/quattro/mail_display.tpl deleted file mode 100644 index 2b680ae428..0000000000 --- a/view/theme/quattro/mail_display.tpl +++ /dev/null @@ -1,12 +0,0 @@ -
- $thread_subject - -
- -{{ for $mails as $mail }} -
- {{ inc mail_conv.tpl }}{{endinc}} -
-{{ endfor }} - -{{ inc prv_message.tpl }}{{ endinc }} diff --git a/view/theme/quattro/mail_list.tpl b/view/theme/quattro/mail_list.tpl deleted file mode 100644 index 4f0fe673a0..0000000000 --- a/view/theme/quattro/mail_list.tpl +++ /dev/null @@ -1,8 +0,0 @@ -
- $subject - $from_name - $ago - $count - - -
diff --git a/view/theme/quattro/message_side.tpl b/view/theme/quattro/message_side.tpl deleted file mode 100644 index 9f15870964..0000000000 --- a/view/theme/quattro/message_side.tpl +++ /dev/null @@ -1,10 +0,0 @@ -
- - -
    - {{ for $tabs as $t }} -
  • $t.label
  • - {{ endfor }} -
- -
diff --git a/view/theme/quattro/nav.tpl b/view/theme/quattro/nav.tpl deleted file mode 100644 index ca84e7db54..0000000000 --- a/view/theme/quattro/nav.tpl +++ /dev/null @@ -1,95 +0,0 @@ -
- {# $langselector #} - -
$sitelocation
- -
- - - -
$langselector
diff --git a/view/theme/quattro/nets.tpl b/view/theme/quattro/nets.tpl deleted file mode 100644 index f596df8209..0000000000 --- a/view/theme/quattro/nets.tpl +++ /dev/null @@ -1,12 +0,0 @@ -
-

$title

-
$desc
- - - -
diff --git a/view/theme/quattro/photo_view.tpl b/view/theme/quattro/photo_view.tpl deleted file mode 100644 index 3b7a662716..0000000000 --- a/view/theme/quattro/photo_view.tpl +++ /dev/null @@ -1,37 +0,0 @@ -
-

$album.1

- - - -
-{{ if $prevlink }}{{ endif }} -{{ if $nextlink }}{{ endif }} -
$desc
-{{ if $tags }} -
$tags.0
-
$tags.1
-{{ endif }} -{{ if $tags.2 }}{{ endif }} - -{{ if $edit }}$edit{{ endif }} - -{{ if $likebuttons }} -
- $likebuttons - $like - $dislike -
-{{ endif }} -
- $comments -
- -$paginate - diff --git a/view/theme/quattro/profile_vcard.tpl b/view/theme/quattro/profile_vcard.tpl deleted file mode 100644 index 13037c8a21..0000000000 --- a/view/theme/quattro/profile_vcard.tpl +++ /dev/null @@ -1,68 +0,0 @@ -
- -
-
$profile.name
- {{ if $profile.edit }} -
- $profile.edit.1 - -
- {{ endif }} -
- - - {{ if $pdesc }}
$profile.pdesc
{{ endif }} -
$profile.name
- - - - {{ if $location }} -
$location
-
- {{ if $profile.address }}
$profile.address
{{ endif }} - - $profile.locality{{ if $profile.locality }}, {{ endif }} - $profile.region - $profile.postal_code - - {{ if $profile.country_name }}$profile.country_name{{ endif }} -
-
- {{ endif }} - - {{ if $gender }}
$gender
$profile.gender
{{ endif }} - - {{ if $profile.pubkey }}{{ endif }} - - {{ if $marital }}
$marital
$profile.marital
{{ endif }} - - {{ if $homepage }}
$homepage
$profile.homepage
{{ endif }} - - {{ inc diaspora_vcard.tpl }}{{ endinc }} - - -
- -$contact_block - - diff --git a/view/theme/quattro/prv_message.tpl b/view/theme/quattro/prv_message.tpl deleted file mode 100644 index 9db4fc0176..0000000000 --- a/view/theme/quattro/prv_message.tpl +++ /dev/null @@ -1,38 +0,0 @@ - -

$header

- -
-
- -$parent - -
$to
-{{ if $showinputs }} - - -{{ else }} -$select -{{ endif }} - -
$subject
- - -
$yourmessage
- - - -
- -
-
-
- -
- -
-
-
-
-
diff --git a/view/theme/quattro/saved_searches_aside.tpl b/view/theme/quattro/saved_searches_aside.tpl deleted file mode 100644 index 9c10a26dec..0000000000 --- a/view/theme/quattro/saved_searches_aside.tpl +++ /dev/null @@ -1,15 +0,0 @@ -
-

$title

- -
    - {{ for $saved as $search }} -
  • - $search.term - -
  • - {{ endfor }} -
- - $searchbox - -
diff --git a/view/theme/quattro/search_item.tpl b/view/theme/quattro/search_item.tpl deleted file mode 100644 index 55868e5483..0000000000 --- a/view/theme/quattro/search_item.tpl +++ /dev/null @@ -1,93 +0,0 @@ - -
- $item.star.starred - {{ if $item.lock }}$item.lock{{ endif }} - -
- -
-
-
-
- - $item.name - - menu - - -
-
$item.location
-
-
- {{ if $item.title }}

$item.title

{{ endif }} - $item.body -
-
-
- -
- {{ for $item.tags as $tag }} - $tag - {{ endfor }} -
-
-
-
- {{ if $item.plink }}$item.plink.title{{ endif }} -
-
-
- $item.name $item.ago -
- -
- {{ if $item.star }} - $item.star.do - $item.star.undo - $item.star.tagger - {{ endif }} - - {{ if $item.vote }} - $item.vote.like.1 - $item.vote.dislike.1 - {{ endif }} - - {{ if $item.vote.share }} - $item.vote.share.1 - {{ endif }} -
- -
- - {{ if $item.drop.pagedrop }} - - {{ endif }} - {{ if $item.drop.dropping }} - $item.drop.delete - {{ endif }} - {{ if $item.edpost }} - - {{ endif }} -
- -
-
-
- - -
$item.dislike
- {{ if $item.conv }} -
- $item.conv.title - {{ endif }} -
-
- - -
- diff --git a/view/theme/quattro/smarty3/birthdays_reminder.tpl b/view/theme/quattro/templates/birthdays_reminder.tpl similarity index 100% rename from view/theme/quattro/smarty3/birthdays_reminder.tpl rename to view/theme/quattro/templates/birthdays_reminder.tpl diff --git a/view/theme/quattro/smarty3/comment_item.tpl b/view/theme/quattro/templates/comment_item.tpl similarity index 100% rename from view/theme/quattro/smarty3/comment_item.tpl rename to view/theme/quattro/templates/comment_item.tpl diff --git a/view/theme/quattro/smarty3/contact_template.tpl b/view/theme/quattro/templates/contact_template.tpl similarity index 100% rename from view/theme/quattro/smarty3/contact_template.tpl rename to view/theme/quattro/templates/contact_template.tpl diff --git a/view/theme/quattro/smarty3/conversation.tpl b/view/theme/quattro/templates/conversation.tpl similarity index 100% rename from view/theme/quattro/smarty3/conversation.tpl rename to view/theme/quattro/templates/conversation.tpl diff --git a/view/theme/quattro/smarty3/events_reminder.tpl b/view/theme/quattro/templates/events_reminder.tpl similarity index 100% rename from view/theme/quattro/smarty3/events_reminder.tpl rename to view/theme/quattro/templates/events_reminder.tpl diff --git a/view/theme/quattro/smarty3/fileas_widget.tpl b/view/theme/quattro/templates/fileas_widget.tpl similarity index 100% rename from view/theme/quattro/smarty3/fileas_widget.tpl rename to view/theme/quattro/templates/fileas_widget.tpl diff --git a/view/theme/quattro/smarty3/generic_links_widget.tpl b/view/theme/quattro/templates/generic_links_widget.tpl similarity index 100% rename from view/theme/quattro/smarty3/generic_links_widget.tpl rename to view/theme/quattro/templates/generic_links_widget.tpl diff --git a/view/theme/quattro/smarty3/group_side.tpl b/view/theme/quattro/templates/group_side.tpl similarity index 100% rename from view/theme/quattro/smarty3/group_side.tpl rename to view/theme/quattro/templates/group_side.tpl diff --git a/view/theme/quattro/smarty3/jot.tpl b/view/theme/quattro/templates/jot.tpl similarity index 100% rename from view/theme/quattro/smarty3/jot.tpl rename to view/theme/quattro/templates/jot.tpl diff --git a/view/theme/quattro/smarty3/mail_conv.tpl b/view/theme/quattro/templates/mail_conv.tpl similarity index 100% rename from view/theme/quattro/smarty3/mail_conv.tpl rename to view/theme/quattro/templates/mail_conv.tpl diff --git a/view/theme/quattro/smarty3/mail_display.tpl b/view/theme/quattro/templates/mail_display.tpl similarity index 100% rename from view/theme/quattro/smarty3/mail_display.tpl rename to view/theme/quattro/templates/mail_display.tpl diff --git a/view/theme/quattro/smarty3/mail_list.tpl b/view/theme/quattro/templates/mail_list.tpl similarity index 100% rename from view/theme/quattro/smarty3/mail_list.tpl rename to view/theme/quattro/templates/mail_list.tpl diff --git a/view/theme/quattro/smarty3/message_side.tpl b/view/theme/quattro/templates/message_side.tpl similarity index 100% rename from view/theme/quattro/smarty3/message_side.tpl rename to view/theme/quattro/templates/message_side.tpl diff --git a/view/theme/quattro/smarty3/nav.tpl b/view/theme/quattro/templates/nav.tpl similarity index 100% rename from view/theme/quattro/smarty3/nav.tpl rename to view/theme/quattro/templates/nav.tpl diff --git a/view/theme/quattro/smarty3/nets.tpl b/view/theme/quattro/templates/nets.tpl similarity index 100% rename from view/theme/quattro/smarty3/nets.tpl rename to view/theme/quattro/templates/nets.tpl diff --git a/view/theme/quattro/smarty3/photo_view.tpl b/view/theme/quattro/templates/photo_view.tpl similarity index 100% rename from view/theme/quattro/smarty3/photo_view.tpl rename to view/theme/quattro/templates/photo_view.tpl diff --git a/view/theme/quattro/smarty3/profile_vcard.tpl b/view/theme/quattro/templates/profile_vcard.tpl similarity index 100% rename from view/theme/quattro/smarty3/profile_vcard.tpl rename to view/theme/quattro/templates/profile_vcard.tpl diff --git a/view/theme/quattro/smarty3/prv_message.tpl b/view/theme/quattro/templates/prv_message.tpl similarity index 100% rename from view/theme/quattro/smarty3/prv_message.tpl rename to view/theme/quattro/templates/prv_message.tpl diff --git a/view/theme/quattro/smarty3/saved_searches_aside.tpl b/view/theme/quattro/templates/saved_searches_aside.tpl similarity index 100% rename from view/theme/quattro/smarty3/saved_searches_aside.tpl rename to view/theme/quattro/templates/saved_searches_aside.tpl diff --git a/view/theme/quattro/smarty3/search_item.tpl b/view/theme/quattro/templates/search_item.tpl similarity index 100% rename from view/theme/quattro/smarty3/search_item.tpl rename to view/theme/quattro/templates/search_item.tpl diff --git a/view/theme/quattro/smarty3/theme_settings.tpl b/view/theme/quattro/templates/theme_settings.tpl similarity index 100% rename from view/theme/quattro/smarty3/theme_settings.tpl rename to view/theme/quattro/templates/theme_settings.tpl diff --git a/view/theme/quattro/smarty3/threaded_conversation.tpl b/view/theme/quattro/templates/threaded_conversation.tpl similarity index 100% rename from view/theme/quattro/smarty3/threaded_conversation.tpl rename to view/theme/quattro/templates/threaded_conversation.tpl diff --git a/view/theme/quattro/smarty3/wall_item_tag.tpl b/view/theme/quattro/templates/wall_item_tag.tpl similarity index 100% rename from view/theme/quattro/smarty3/wall_item_tag.tpl rename to view/theme/quattro/templates/wall_item_tag.tpl diff --git a/view/theme/quattro/smarty3/wall_thread.tpl b/view/theme/quattro/templates/wall_thread.tpl similarity index 100% rename from view/theme/quattro/smarty3/wall_thread.tpl rename to view/theme/quattro/templates/wall_thread.tpl diff --git a/view/theme/quattro/theme_settings.tpl b/view/theme/quattro/theme_settings.tpl deleted file mode 100644 index b957532cf5..0000000000 --- a/view/theme/quattro/theme_settings.tpl +++ /dev/null @@ -1,32 +0,0 @@ - - -{{inc field_select.tpl with $field=$color}}{{endinc}} - -{{inc field_select.tpl with $field=$align}}{{endinc}} - - -
- - - -
- - -
- - - -
- - - - - -
- -
- - diff --git a/view/theme/quattro/threaded_conversation.tpl b/view/theme/quattro/threaded_conversation.tpl deleted file mode 100644 index 82e071134e..0000000000 --- a/view/theme/quattro/threaded_conversation.tpl +++ /dev/null @@ -1,40 +0,0 @@ -$live_update - -{{ for $threads as $thread }} - -
- - - {{ if $thread.type == tag }} - {{ inc wall_item_tag.tpl with $item=$thread }}{{ endinc }} - {{ else }} - {{ inc $thread.template with $item=$thread }}{{ endinc }} - {{ endif }} - -
-{{ endfor }} - -
- -{{ if $dropping }} - - $dropping - - -{{ endif }} - - - -{{ if $mode == display }} - -{{ endif }} - diff --git a/view/theme/quattro/wall_item_tag.tpl b/view/theme/quattro/wall_item_tag.tpl deleted file mode 100644 index 63373ab163..0000000000 --- a/view/theme/quattro/wall_item_tag.tpl +++ /dev/null @@ -1,67 +0,0 @@ -{{if $mode == display}} -{{ else }} -{{if $item.comment_firstcollapsed}} -
- $item.num_comments - $item.hide_text - {{ if $item.thread_level==3 }} - - expand / - collapse thread{{ endif }} -
- {{endif}} -{{ endif }} - -{# top thread comment box #} -{{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}} -
$item.comment
-{{ endif }}{{ endif }}{{ endif }} - -{{ if $item.flatten }} -
$item.comment
-{{ endif }} diff --git a/view/theme/quattro/wall_thread.tpl b/view/theme/quattro/wall_thread.tpl deleted file mode 100644 index eee27776be..0000000000 --- a/view/theme/quattro/wall_thread.tpl +++ /dev/null @@ -1,172 +0,0 @@ -{{if $mode == display}} -{{ else }} -{{if $item.comment_firstcollapsed}} -
- $item.num_comments - $item.hide_text - {{ if $item.thread_level==3 }} - - expand / - collapse thread{{ endif }} -
- {{endif}} -{{ endif }} - -{# top thread comment box #} -{{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}} -
$item.comment
-{{ endif }}{{ endif }}{{ endif }} - - -{{ if $item.flatten }} -
$item.comment
-{{ endif }} diff --git a/view/theme/slackr/birthdays_reminder.tpl b/view/theme/slackr/birthdays_reminder.tpl deleted file mode 100644 index 1dc65295a9..0000000000 --- a/view/theme/slackr/birthdays_reminder.tpl +++ /dev/null @@ -1,8 +0,0 @@ -{{ if $classtoday }} - -{{ endif }} - diff --git a/view/theme/slackr/events_reminder.tpl b/view/theme/slackr/events_reminder.tpl deleted file mode 100644 index 93c493432a..0000000000 --- a/view/theme/slackr/events_reminder.tpl +++ /dev/null @@ -1,39 +0,0 @@ - - - -
-
diff --git a/view/theme/slackr/smarty3/birthdays_reminder.tpl b/view/theme/slackr/templates/birthdays_reminder.tpl similarity index 100% rename from view/theme/slackr/smarty3/birthdays_reminder.tpl rename to view/theme/slackr/templates/birthdays_reminder.tpl diff --git a/view/theme/slackr/smarty3/events_reminder.tpl b/view/theme/slackr/templates/events_reminder.tpl similarity index 100% rename from view/theme/slackr/smarty3/events_reminder.tpl rename to view/theme/slackr/templates/events_reminder.tpl diff --git a/view/theme/smoothly/bottom.tpl b/view/theme/smoothly/bottom.tpl deleted file mode 100644 index 347d87094b..0000000000 --- a/view/theme/smoothly/bottom.tpl +++ /dev/null @@ -1,52 +0,0 @@ - - diff --git a/view/theme/smoothly/follow.tpl b/view/theme/smoothly/follow.tpl deleted file mode 100644 index 09258b9c30..0000000000 --- a/view/theme/smoothly/follow.tpl +++ /dev/null @@ -1,8 +0,0 @@ -
-

$connect

-
$desc
-
- -
-
- diff --git a/view/theme/smoothly/jot-header.tpl b/view/theme/smoothly/jot-header.tpl deleted file mode 100644 index 79d8799a5f..0000000000 --- a/view/theme/smoothly/jot-header.tpl +++ /dev/null @@ -1,374 +0,0 @@ - - - - - - diff --git a/view/theme/smoothly/jot.tpl b/view/theme/smoothly/jot.tpl deleted file mode 100644 index 12792fa0b4..0000000000 --- a/view/theme/smoothly/jot.tpl +++ /dev/null @@ -1,84 +0,0 @@ - -
-
-
 
- -
-
- -
- - - - - - - - -
- -
- {{ if $placeholdercategory }} -
- -
- {{ endif }} -
-
- -
- - - - - - - - - - - - - - -
- - - -
-
- $acl -
-
$emailcc
-
- $jotnets -
-
- -
-
-
- {{ if $content }}{{ endif }} diff --git a/view/theme/smoothly/lang_selector.tpl b/view/theme/smoothly/lang_selector.tpl deleted file mode 100644 index e777a0a861..0000000000 --- a/view/theme/smoothly/lang_selector.tpl +++ /dev/null @@ -1,10 +0,0 @@ -
- diff --git a/view/theme/smoothly/nav.tpl b/view/theme/smoothly/nav.tpl deleted file mode 100644 index b923718da0..0000000000 --- a/view/theme/smoothly/nav.tpl +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - -
$langselector
- - diff --git a/view/theme/smoothly/search_item.tpl b/view/theme/smoothly/search_item.tpl deleted file mode 100644 index 9c90fd0402..0000000000 --- a/view/theme/smoothly/search_item.tpl +++ /dev/null @@ -1,53 +0,0 @@ -
-
-
-
- - $item.name - menu -
-
    - $item.item_photo_menu -
-
-
-
-
{{ if $item.location }}$item.location {{ endif }}
-
-
- {{ if $item.lock }}
$item.lock
- {{ else }}
{{ endif }} -
-
-
- {{ if $item.drop.dropping }}{{ endif }} -
- {{ if $item.drop.pagedrop }}{{ endif }} -
-
-
-
$item.title
-
-
$item.body
-
-
- $item.name -
$item.ago
- -
- -
-
- - -
- {{ if $item.conv }} - $item.conv.title - {{ endif }} -
-
-
- -
diff --git a/view/theme/smoothly/smarty3/bottom.tpl b/view/theme/smoothly/templates/bottom.tpl similarity index 100% rename from view/theme/smoothly/smarty3/bottom.tpl rename to view/theme/smoothly/templates/bottom.tpl diff --git a/view/theme/smoothly/smarty3/follow.tpl b/view/theme/smoothly/templates/follow.tpl similarity index 100% rename from view/theme/smoothly/smarty3/follow.tpl rename to view/theme/smoothly/templates/follow.tpl diff --git a/view/theme/smoothly/smarty3/jot-header.tpl b/view/theme/smoothly/templates/jot-header.tpl similarity index 100% rename from view/theme/smoothly/smarty3/jot-header.tpl rename to view/theme/smoothly/templates/jot-header.tpl diff --git a/view/theme/smoothly/smarty3/jot.tpl b/view/theme/smoothly/templates/jot.tpl similarity index 100% rename from view/theme/smoothly/smarty3/jot.tpl rename to view/theme/smoothly/templates/jot.tpl diff --git a/view/theme/smoothly/smarty3/lang_selector.tpl b/view/theme/smoothly/templates/lang_selector.tpl similarity index 100% rename from view/theme/smoothly/smarty3/lang_selector.tpl rename to view/theme/smoothly/templates/lang_selector.tpl diff --git a/view/theme/smoothly/smarty3/nav.tpl b/view/theme/smoothly/templates/nav.tpl similarity index 100% rename from view/theme/smoothly/smarty3/nav.tpl rename to view/theme/smoothly/templates/nav.tpl diff --git a/view/theme/smoothly/smarty3/search_item.tpl b/view/theme/smoothly/templates/search_item.tpl similarity index 100% rename from view/theme/smoothly/smarty3/search_item.tpl rename to view/theme/smoothly/templates/search_item.tpl diff --git a/view/theme/smoothly/smarty3/wall_thread.tpl b/view/theme/smoothly/templates/wall_thread.tpl similarity index 100% rename from view/theme/smoothly/smarty3/wall_thread.tpl rename to view/theme/smoothly/templates/wall_thread.tpl diff --git a/view/theme/smoothly/wall_thread.tpl b/view/theme/smoothly/wall_thread.tpl deleted file mode 100644 index 6d1e947754..0000000000 --- a/view/theme/smoothly/wall_thread.tpl +++ /dev/null @@ -1,160 +0,0 @@ -{{if $item.comment_firstcollapsed}} -
- $item.num_comments - $item.hide_text -
- {{endif}} diff --git a/view/theme/testbubble/comment_item.tpl b/view/theme/testbubble/comment_item.tpl deleted file mode 100644 index f7fe22dd77..0000000000 --- a/view/theme/testbubble/comment_item.tpl +++ /dev/null @@ -1,33 +0,0 @@ -
-
- - - - {##} - - - - -
- $mytitle -
-
- - {{ if $qcomment }} - {{ for $qcomment as $qc }} - $qc -   - {{ endfor }} - {{ endif }} - -
- - -
-
- -
- diff --git a/view/theme/testbubble/group_drop.tpl b/view/theme/testbubble/group_drop.tpl deleted file mode 100644 index f088fc06ff..0000000000 --- a/view/theme/testbubble/group_drop.tpl +++ /dev/null @@ -1,8 +0,0 @@ - -
diff --git a/view/theme/testbubble/group_edit.tpl b/view/theme/testbubble/group_edit.tpl deleted file mode 100644 index a8b3f92a07..0000000000 --- a/view/theme/testbubble/group_edit.tpl +++ /dev/null @@ -1,16 +0,0 @@ -

$title

- - -
-
-
- - - - $drop -
-
-
$desc
-
-
-
diff --git a/view/theme/testbubble/group_side.tpl b/view/theme/testbubble/group_side.tpl deleted file mode 100644 index a1fc70a22e..0000000000 --- a/view/theme/testbubble/group_side.tpl +++ /dev/null @@ -1,28 +0,0 @@ -
-

$title

- - - -
- - diff --git a/view/theme/testbubble/jot-header.tpl b/view/theme/testbubble/jot-header.tpl deleted file mode 100644 index 9c0037f7f2..0000000000 --- a/view/theme/testbubble/jot-header.tpl +++ /dev/null @@ -1,366 +0,0 @@ - - - - - - diff --git a/view/theme/testbubble/jot.tpl b/view/theme/testbubble/jot.tpl deleted file mode 100644 index 12f60b29c0..0000000000 --- a/view/theme/testbubble/jot.tpl +++ /dev/null @@ -1,75 +0,0 @@ - -
-
-
 
- -
- -
-
- -
- - - - - - - - -
-
- - -
- - - - - - - - - - - - - -
- - - -
-
- $acl -
-
$emailcc
-
- $jotnets -
-
- -
-
-
- {{ if $content }}{{ endif }} diff --git a/view/theme/testbubble/match.tpl b/view/theme/testbubble/match.tpl deleted file mode 100644 index 244b243ece..0000000000 --- a/view/theme/testbubble/match.tpl +++ /dev/null @@ -1,13 +0,0 @@ -
-
- - $name - -
- $name$inttxt
$tags
-
- {{ if $connlnk }} - - {{ endif }} -
-
\ No newline at end of file diff --git a/view/theme/testbubble/nav.tpl b/view/theme/testbubble/nav.tpl deleted file mode 100644 index f4c504d365..0000000000 --- a/view/theme/testbubble/nav.tpl +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - diff --git a/view/theme/testbubble/photo_album.tpl b/view/theme/testbubble/photo_album.tpl deleted file mode 100644 index a0e3f46c49..0000000000 --- a/view/theme/testbubble/photo_album.tpl +++ /dev/null @@ -1,8 +0,0 @@ - -

$desc

-
-
-
diff --git a/view/theme/testbubble/photo_top.tpl b/view/theme/testbubble/photo_top.tpl deleted file mode 100644 index 48a546a16e..0000000000 --- a/view/theme/testbubble/photo_top.tpl +++ /dev/null @@ -1,8 +0,0 @@ - - -
diff --git a/view/theme/testbubble/photo_view.tpl b/view/theme/testbubble/photo_view.tpl deleted file mode 100644 index 4c754f5978..0000000000 --- a/view/theme/testbubble/photo_view.tpl +++ /dev/null @@ -1,40 +0,0 @@ -
-

$album.1

- - - -
- {{ if $prevlink }}{{ endif }} - - {{ if $nextlink }}{{ endif }} -
- -
-
$desc
-{{ if $tags }} -
$tags.0
-
$tags.1
-{{ endif }} -{{ if $tags.2 }}{{ endif }} - -{{ if $edit }}$edit{{ endif }} - -{{ if $likebuttons }} -
- $likebuttons - $like - $dislike -
-{{ endif }} - -$comments - -$paginate - diff --git a/view/theme/testbubble/profile_entry.tpl b/view/theme/testbubble/profile_entry.tpl deleted file mode 100644 index 5bea298ac5..0000000000 --- a/view/theme/testbubble/profile_entry.tpl +++ /dev/null @@ -1,11 +0,0 @@ - -
-
-$alt -
-
- -
$visible
-
-
- diff --git a/view/theme/testbubble/profile_vcard.tpl b/view/theme/testbubble/profile_vcard.tpl deleted file mode 100644 index 1686706995..0000000000 --- a/view/theme/testbubble/profile_vcard.tpl +++ /dev/null @@ -1,45 +0,0 @@ -
-
$profile.name
- - - {{ if $pdesc }}
$profile.pdesc
{{ endif }} -
$profile.name
- - - - {{ if $location }} -
$location
-
- {{ if $profile.address }}
$profile.address
{{ endif }} - - $profile.locality{{ if $profile.locality }}, {{ endif }} - $profile.region - $profile.postal_code - - {{ if $profile.country_name }}$profile.country_name{{ endif }} -
-
- {{ endif }} - - {{ if $gender }}
$gender
$profile.gender
{{ endif }} - - {{ if $profile.pubkey }}{{ endif }} - - {{ if $marital }}
$marital
$profile.marital
{{ endif }} - - {{ if $homepage }}
$homepage
$profile.homepage
{{ endif }} - - {{ inc diaspora_vcard.tpl }}{{ endinc }} - - -
- -$contact_block - - diff --git a/view/theme/testbubble/saved_searches_aside.tpl b/view/theme/testbubble/saved_searches_aside.tpl deleted file mode 100644 index e2aae1e77c..0000000000 --- a/view/theme/testbubble/saved_searches_aside.tpl +++ /dev/null @@ -1,14 +0,0 @@ -
- - $searchbox - -
    - {{ for $saved as $search }} -
  • - - $search.term -
  • - {{ endfor }} -
-
-
diff --git a/view/theme/testbubble/search_item.tpl b/view/theme/testbubble/search_item.tpl deleted file mode 100644 index 9c90fd0402..0000000000 --- a/view/theme/testbubble/search_item.tpl +++ /dev/null @@ -1,53 +0,0 @@ -
-
-
-
- - $item.name - menu -
-
    - $item.item_photo_menu -
-
-
-
-
{{ if $item.location }}$item.location {{ endif }}
-
-
- {{ if $item.lock }}
$item.lock
- {{ else }}
{{ endif }} -
-
-
- {{ if $item.drop.dropping }}{{ endif }} -
- {{ if $item.drop.pagedrop }}{{ endif }} -
-
-
-
$item.title
-
-
$item.body
-
-
- $item.name -
$item.ago
- -
- -
-
- - -
- {{ if $item.conv }} - $item.conv.title - {{ endif }} -
-
-
- -
diff --git a/view/theme/testbubble/smarty3/comment_item.tpl b/view/theme/testbubble/templates/comment_item.tpl similarity index 100% rename from view/theme/testbubble/smarty3/comment_item.tpl rename to view/theme/testbubble/templates/comment_item.tpl diff --git a/view/theme/testbubble/smarty3/group_drop.tpl b/view/theme/testbubble/templates/group_drop.tpl similarity index 100% rename from view/theme/testbubble/smarty3/group_drop.tpl rename to view/theme/testbubble/templates/group_drop.tpl diff --git a/view/theme/testbubble/smarty3/group_edit.tpl b/view/theme/testbubble/templates/group_edit.tpl similarity index 100% rename from view/theme/testbubble/smarty3/group_edit.tpl rename to view/theme/testbubble/templates/group_edit.tpl diff --git a/view/theme/testbubble/smarty3/group_side.tpl b/view/theme/testbubble/templates/group_side.tpl similarity index 100% rename from view/theme/testbubble/smarty3/group_side.tpl rename to view/theme/testbubble/templates/group_side.tpl diff --git a/view/theme/testbubble/smarty3/jot-header.tpl b/view/theme/testbubble/templates/jot-header.tpl similarity index 100% rename from view/theme/testbubble/smarty3/jot-header.tpl rename to view/theme/testbubble/templates/jot-header.tpl diff --git a/view/theme/testbubble/smarty3/jot.tpl b/view/theme/testbubble/templates/jot.tpl similarity index 100% rename from view/theme/testbubble/smarty3/jot.tpl rename to view/theme/testbubble/templates/jot.tpl diff --git a/view/theme/testbubble/smarty3/match.tpl b/view/theme/testbubble/templates/match.tpl similarity index 100% rename from view/theme/testbubble/smarty3/match.tpl rename to view/theme/testbubble/templates/match.tpl diff --git a/view/theme/testbubble/smarty3/nav.tpl b/view/theme/testbubble/templates/nav.tpl similarity index 100% rename from view/theme/testbubble/smarty3/nav.tpl rename to view/theme/testbubble/templates/nav.tpl diff --git a/view/theme/testbubble/smarty3/photo_album.tpl b/view/theme/testbubble/templates/photo_album.tpl similarity index 100% rename from view/theme/testbubble/smarty3/photo_album.tpl rename to view/theme/testbubble/templates/photo_album.tpl diff --git a/view/theme/testbubble/smarty3/photo_top.tpl b/view/theme/testbubble/templates/photo_top.tpl similarity index 100% rename from view/theme/testbubble/smarty3/photo_top.tpl rename to view/theme/testbubble/templates/photo_top.tpl diff --git a/view/theme/testbubble/smarty3/photo_view.tpl b/view/theme/testbubble/templates/photo_view.tpl similarity index 100% rename from view/theme/testbubble/smarty3/photo_view.tpl rename to view/theme/testbubble/templates/photo_view.tpl diff --git a/view/theme/testbubble/smarty3/profile_entry.tpl b/view/theme/testbubble/templates/profile_entry.tpl similarity index 100% rename from view/theme/testbubble/smarty3/profile_entry.tpl rename to view/theme/testbubble/templates/profile_entry.tpl diff --git a/view/theme/testbubble/smarty3/profile_vcard.tpl b/view/theme/testbubble/templates/profile_vcard.tpl similarity index 100% rename from view/theme/testbubble/smarty3/profile_vcard.tpl rename to view/theme/testbubble/templates/profile_vcard.tpl diff --git a/view/theme/testbubble/smarty3/saved_searches_aside.tpl b/view/theme/testbubble/templates/saved_searches_aside.tpl similarity index 100% rename from view/theme/testbubble/smarty3/saved_searches_aside.tpl rename to view/theme/testbubble/templates/saved_searches_aside.tpl diff --git a/view/theme/testbubble/smarty3/search_item.tpl b/view/theme/testbubble/templates/search_item.tpl similarity index 100% rename from view/theme/testbubble/smarty3/search_item.tpl rename to view/theme/testbubble/templates/search_item.tpl diff --git a/view/theme/testbubble/smarty3/wall_thread.tpl b/view/theme/testbubble/templates/wall_thread.tpl similarity index 100% rename from view/theme/testbubble/smarty3/wall_thread.tpl rename to view/theme/testbubble/templates/wall_thread.tpl diff --git a/view/theme/testbubble/wall_thread.tpl b/view/theme/testbubble/wall_thread.tpl deleted file mode 100644 index c2ccf9d721..0000000000 --- a/view/theme/testbubble/wall_thread.tpl +++ /dev/null @@ -1,107 +0,0 @@ -{{if $item.comment_firstcollapsed}} -
- $item.num_comments $item.hide_text -
- {{endif}} diff --git a/view/theme/vier/comment_item.tpl b/view/theme/vier/comment_item.tpl deleted file mode 100644 index 4e39c0772a..0000000000 --- a/view/theme/vier/comment_item.tpl +++ /dev/null @@ -1,51 +0,0 @@ - {{ if $threaded }} -
- {{ else }} -
- {{ endif }} -
- - - - {##} - - - - -
- $mytitle -
-
- - {{ if $qcomment }} - - {{ endif }} - -
- - -
-
- -
diff --git a/view/theme/vier/mail_list.tpl b/view/theme/vier/mail_list.tpl deleted file mode 100644 index 1d78db2fc5..0000000000 --- a/view/theme/vier/mail_list.tpl +++ /dev/null @@ -1,8 +0,0 @@ -
- $subject - $from_name - $date - $count - - -
diff --git a/view/theme/vier/nav.tpl b/view/theme/vier/nav.tpl deleted file mode 100644 index dfb35a62c0..0000000000 --- a/view/theme/vier/nav.tpl +++ /dev/null @@ -1,145 +0,0 @@ -
- {# $langselector #} - -
$sitelocation
- -
- - - -{# - -{{ if $nav.logout }}$nav.logout.1 {{ endif }} -{{ if $nav.login }} {{ endif }} - - - -{{ if $nav.register }}$nav.register.1{{ endif }} - -$nav.help.1 - -{{ if $nav.apps }}$nav.apps.1{{ endif }} - -$nav.search.1 -$nav.directory.1 - -{{ if $nav.admin }}$nav.admin.1{{ endif }} - -{{ if $nav.notifications }} -$nav.notifications.1 - -{{ endif }} -{{ if $nav.messages }} -$nav.messages.1 - -{{ endif }} - -{{ if $nav.manage }}$nav.manage.1{{ endif }} -{{ if $nav.settings }}$nav.settings.1{{ endif }} -{{ if $nav.profiles }}$nav.profiles.1{{ endif }} - - - - - -#} diff --git a/view/theme/vier/profile_edlink.tpl b/view/theme/vier/profile_edlink.tpl deleted file mode 100644 index 5bdbb834a5..0000000000 --- a/view/theme/vier/profile_edlink.tpl +++ /dev/null @@ -1 +0,0 @@ -
diff --git a/view/theme/vier/profile_vcard.tpl b/view/theme/vier/profile_vcard.tpl deleted file mode 100644 index aa716f100b..0000000000 --- a/view/theme/vier/profile_vcard.tpl +++ /dev/null @@ -1,65 +0,0 @@ -
- -
-
$profile.name
- {{ if $profile.edit }} -
- $profile.edit.1 - -
- {{ else }} -
- {{ endif }} -
- - -
$profile.name
- {{ if $pdesc }}
$profile.pdesc
{{ endif }} - - - {{ if $location }} -
$location

-
- {{ if $profile.address }}
$profile.address
{{ endif }} - - $profile.locality{{ if $profile.locality }}, {{ endif }} - $profile.region - $profile.postal-code - - {{ if $profile.country-name }}$profile.country-name{{ endif }} -
-
- {{ endif }} - - {{ if $gender }}
$gender
$profile.gender
{{ endif }} - - {{ if $profile.pubkey }}{{ endif }} - - {{ if $marital }}
$marital
$profile.marital
{{ endif }} - - {{ if $homepage }}
$homepage
$profile.homepage
{{ endif }} - - {{ inc diaspora_vcard.tpl }}{{ endinc }} - - -
- -$contact_block - - diff --git a/view/theme/vier/search_item.tpl b/view/theme/vier/search_item.tpl deleted file mode 100644 index 334e33fca7..0000000000 --- a/view/theme/vier/search_item.tpl +++ /dev/null @@ -1,92 +0,0 @@ - -
- $item.star.starred - {{ if $item.lock }}$item.lock{{ endif }} - -
- -
-
-
-
- - $item.name - - menu - - -
-
-
- $item.name - - {{ if $item.plink }}$item.ago{{ else }} $item.ago {{ endif }} - {{ if $item.lock }}$item.lock {{ endif }} - -
-
- {{ if $item.title }}

$item.title

{{ endif }} - $item.body -
-
-
- -
- {{ for $item.tags as $tag }} - $tag - {{ endfor }} - -
-
-
-
- - {{ if $item.conv }}{{ endif }} -
-
- -
$item.location 
- -
- {{ if $item.star }} - $item.star.do - $item.star.undo - $item.star.tagger - {{ endif }} - - {{ if $item.vote }} - $item.vote.like.1 - $item.vote.dislike.1 - {{ endif }} - - {{ if $item.vote.share }} - $item.vote.share.1 - {{ endif }} -
- -
- - {{ if $item.drop.pagedrop }} - - {{ endif }} - {{ if $item.drop.dropping }} - $item.drop.delete - {{ endif }} - {{ if $item.edpost }} - - {{ endif }} -
- -
-
-
- - -
$item.dislike
-
-
diff --git a/view/theme/vier/smarty3/comment_item.tpl b/view/theme/vier/templates/comment_item.tpl similarity index 100% rename from view/theme/vier/smarty3/comment_item.tpl rename to view/theme/vier/templates/comment_item.tpl diff --git a/view/theme/vier/smarty3/mail_list.tpl b/view/theme/vier/templates/mail_list.tpl similarity index 100% rename from view/theme/vier/smarty3/mail_list.tpl rename to view/theme/vier/templates/mail_list.tpl diff --git a/view/theme/vier/smarty3/nav.tpl b/view/theme/vier/templates/nav.tpl similarity index 100% rename from view/theme/vier/smarty3/nav.tpl rename to view/theme/vier/templates/nav.tpl diff --git a/view/theme/vier/smarty3/profile_edlink.tpl b/view/theme/vier/templates/profile_edlink.tpl similarity index 100% rename from view/theme/vier/smarty3/profile_edlink.tpl rename to view/theme/vier/templates/profile_edlink.tpl diff --git a/view/theme/vier/smarty3/profile_vcard.tpl b/view/theme/vier/templates/profile_vcard.tpl similarity index 100% rename from view/theme/vier/smarty3/profile_vcard.tpl rename to view/theme/vier/templates/profile_vcard.tpl diff --git a/view/theme/vier/smarty3/search_item.tpl b/view/theme/vier/templates/search_item.tpl similarity index 100% rename from view/theme/vier/smarty3/search_item.tpl rename to view/theme/vier/templates/search_item.tpl diff --git a/view/theme/vier/smarty3/threaded_conversation.tpl b/view/theme/vier/templates/threaded_conversation.tpl similarity index 100% rename from view/theme/vier/smarty3/threaded_conversation.tpl rename to view/theme/vier/templates/threaded_conversation.tpl diff --git a/view/theme/vier/smarty3/wall_thread.tpl b/view/theme/vier/templates/wall_thread.tpl similarity index 100% rename from view/theme/vier/smarty3/wall_thread.tpl rename to view/theme/vier/templates/wall_thread.tpl diff --git a/view/theme/vier/threaded_conversation.tpl b/view/theme/vier/threaded_conversation.tpl deleted file mode 100644 index 82e071134e..0000000000 --- a/view/theme/vier/threaded_conversation.tpl +++ /dev/null @@ -1,40 +0,0 @@ -$live_update - -{{ for $threads as $thread }} - -
- - - {{ if $thread.type == tag }} - {{ inc wall_item_tag.tpl with $item=$thread }}{{ endinc }} - {{ else }} - {{ inc $thread.template with $item=$thread }}{{ endinc }} - {{ endif }} - -
-{{ endfor }} - -
- -{{ if $dropping }} - - $dropping - - -{{ endif }} - - - -{{ if $mode == display }} - -{{ endif }} - diff --git a/view/theme/vier/wall_thread.tpl b/view/theme/vier/wall_thread.tpl deleted file mode 100644 index 756015bc0f..0000000000 --- a/view/theme/vier/wall_thread.tpl +++ /dev/null @@ -1,172 +0,0 @@ -{{if $mode == display}} -{{ else }} -{{if $item.comment_firstcollapsed}} -
- $item.num_comments - $item.hide_text - {{ if $item.thread_level==3 }} - - expand / - collapse thread{{ endif }} -
- {{endif}} -{{ endif }} - -{{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}} -
$item.comment
-{{ endif }}{{ endif }}{{ endif }} - - -{{ if $item.flatten }} -
$item.comment
-{{ endif }} diff --git a/view/threaded_conversation.tpl b/view/threaded_conversation.tpl deleted file mode 100644 index c95ab52967..0000000000 --- a/view/threaded_conversation.tpl +++ /dev/null @@ -1,16 +0,0 @@ -$live_update - -{{ for $threads as $thread }} -{{ inc $thread.template with $item=$thread }}{{ endinc }} -{{ endfor }} - -
- -{{ if $dropping }} - - -
-{{ endif }} diff --git a/view/toggle_mobile_footer.tpl b/view/toggle_mobile_footer.tpl deleted file mode 100644 index 58695f4dff..0000000000 --- a/view/toggle_mobile_footer.tpl +++ /dev/null @@ -1,2 +0,0 @@ -$toggle_text - diff --git a/view/uexport.tpl b/view/uexport.tpl deleted file mode 100644 index 30d11d58e0..0000000000 --- a/view/uexport.tpl +++ /dev/null @@ -1,9 +0,0 @@ -

$title

- - -{{ for $options as $o }} -
-
$o.1
-
$o.2
-
-{{ endfor }} \ No newline at end of file diff --git a/view/uimport.tpl b/view/uimport.tpl deleted file mode 100644 index 8950c8b541..0000000000 --- a/view/uimport.tpl +++ /dev/null @@ -1,13 +0,0 @@ -
-

$import.title

-

$import.intro

-

$import.instruct

-

$import.warn

- {{inc field_custom.tpl with $field=$import.field }}{{ endinc }} - - -
- -
-
-
diff --git a/view/vcard-widget.tpl b/view/vcard-widget.tpl deleted file mode 100644 index d00099adba..0000000000 --- a/view/vcard-widget.tpl +++ /dev/null @@ -1,5 +0,0 @@ -
-
$name
-
$name
-
- diff --git a/view/viewcontact_template.tpl b/view/viewcontact_template.tpl deleted file mode 100644 index d6f01643ea..0000000000 --- a/view/viewcontact_template.tpl +++ /dev/null @@ -1,9 +0,0 @@ -

$title

- -{{ for $contacts as $contact }} - {{ inc contact_template.tpl }}{{ endinc }} -{{ endfor }} - -
- -$paginate diff --git a/view/voting_fakelink.tpl b/view/voting_fakelink.tpl deleted file mode 100644 index a1ff04a703..0000000000 --- a/view/voting_fakelink.tpl +++ /dev/null @@ -1 +0,0 @@ -$phrase diff --git a/view/wall_thread.tpl b/view/wall_thread.tpl deleted file mode 100644 index 716956c655..0000000000 --- a/view/wall_thread.tpl +++ /dev/null @@ -1,120 +0,0 @@ -{{if $item.comment_firstcollapsed}} -
- $item.num_comments $item.hide_text -
- {{endif}} diff --git a/view/wallmessage.tpl b/view/wallmessage.tpl deleted file mode 100644 index 66b2bc3a05..0000000000 --- a/view/wallmessage.tpl +++ /dev/null @@ -1,32 +0,0 @@ - -

$header

- -

$subheader

- -
-
- -$parent - -
$to
-$recipname - -
$subject
- - -
$yourmessage
- - - -
- - -
- -
-
-
-
-
diff --git a/view/wallmsg-end.tpl b/view/wallmsg-end.tpl deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/view/wallmsg-header.tpl b/view/wallmsg-header.tpl deleted file mode 100644 index 200dfcbd06..0000000000 --- a/view/wallmsg-header.tpl +++ /dev/null @@ -1,82 +0,0 @@ - - - - - diff --git a/view/xrd_diaspora.tpl b/view/xrd_diaspora.tpl deleted file mode 100644 index 25cda533cb..0000000000 --- a/view/xrd_diaspora.tpl +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/view/xrd_host.tpl b/view/xrd_host.tpl deleted file mode 100644 index 94e3c2146e..0000000000 --- a/view/xrd_host.tpl +++ /dev/null @@ -1,18 +0,0 @@ - - - - $zhost - - - - - - - $bigkey - - - diff --git a/view/xrd_person.tpl b/view/xrd_person.tpl deleted file mode 100644 index d79203465b..0000000000 --- a/view/xrd_person.tpl +++ /dev/null @@ -1,38 +0,0 @@ - - - - $accturi - $accturi - $profile_url - - - - - - - - $dspr - - - - - - $bigkey - -