From 2ace5edeefd5a21cd8e5847c58082c2a17fc8842 Mon Sep 17 00:00:00 2001 From: fabrixxm Date: Tue, 23 Apr 2013 03:49:05 -0400 Subject: [PATCH] update to new template system --- view/theme/blog/admin_aside.tpl | 49 --- view/theme/blog/admin_logs.tpl | 19 - view/theme/blog/admin_plugins.tpl | 15 - view/theme/blog/admin_plugins_details.tpl | 36 -- view/theme/blog/admin_remoteupdate.tpl | 98 ----- view/theme/blog/admin_site.tpl | 108 ------ view/theme/blog/admin_summary.tpl | 41 --- view/theme/blog/admin_users.tpl | 100 ----- view/theme/blog/comment_item.tpl | 29 -- view/theme/blog/common_tabs.tpl | 5 - view/theme/blog/config.php | 7 +- view/theme/blog/config.tpl | 9 - view/theme/blog/contact_template.tpl | 9 - view/theme/blog/contacts-head.tpl | 17 - view/theme/blog/contacts-template.tpl | 26 -- view/theme/blog/directory_end.tpl | 1 - view/theme/blog/directory_header.tpl | 16 - view/theme/blog/directory_item.tpl | 6 - view/theme/blog/end.tpl | 1 - view/theme/blog/field_input.tpl | 6 - view/theme/blog/jot-end.tpl | 0 view/theme/blog/jot-header.tpl | 344 ------------------ view/theme/blog/jot.tpl | 64 ---- view/theme/blog/jot_geotag.tpl | 8 - view/theme/blog/nav.tpl | 104 ------ view/theme/blog/profile-hide-friends.tpl | 8 - view/theme/blog/profile-hide-wall.tpl | 16 - view/theme/blog/profile_advanced.tpl | 171 --------- view/theme/blog/profile_edit.tpl | 235 ------------ view/theme/blog/profile_edlink.tpl | 0 view/theme/blog/profile_entry.tpl | 5 - view/theme/blog/profile_listing_header.tpl | 6 - view/theme/blog/profile_vcard.tpl | 65 ---- view/theme/blog/removeme.tpl | 20 - view/theme/blog/search_item.tpl | 34 -- view/theme/blog/settings.tpl | 149 -------- view/theme/blog/settings_addons.tpl | 12 - view/theme/blog/settings_connectors.tpl | 37 -- view/theme/blog/settings_display.tpl | 24 -- view/theme/blog/settings_features.tpl | 22 -- view/theme/blog/settings_nick_set.tpl | 1 - view/theme/blog/settings_nick_subdir.tpl | 6 - view/theme/blog/settings_oauth.tpl | 28 -- view/theme/blog/settings_oauth_edit.tpl | 19 - .../{smarty3 => templates}/admin_aside.tpl | 0 .../{smarty3 => templates}/admin_logs.tpl | 0 .../{smarty3 => templates}/admin_plugins.tpl | 0 .../admin_plugins_details.tpl | 0 .../admin_remoteupdate.tpl | 0 .../{smarty3 => templates}/admin_site.tpl | 0 .../{smarty3 => templates}/admin_summary.tpl | 0 .../{smarty3 => templates}/admin_users.tpl | 0 .../{smarty3 => templates}/comment_item.tpl | 0 .../{smarty3 => templates}/common_tabs.tpl | 0 .../blog/{smarty3 => templates}/config.tpl | 0 .../contact_template.tpl | 0 .../{smarty3 => templates}/contacts-head.tpl | 0 .../contacts-template.tpl | 0 .../{smarty3 => templates}/directory_end.tpl | 0 .../directory_header.tpl | 0 .../{smarty3 => templates}/directory_item.tpl | 0 .../theme/blog/{smarty3 => templates}/end.tpl | 0 .../{smarty3 => templates}/field_input.tpl | 0 .../blog/{smarty3 => templates}/jot-end.tpl | 0 .../{smarty3 => templates}/jot-header.tpl | 0 .../theme/blog/{smarty3 => templates}/jot.tpl | 0 .../{smarty3 => templates}/jot_geotag.tpl | 0 .../theme/blog/{smarty3 => templates}/nav.tpl | 0 .../profile-hide-friends.tpl | 0 .../profile-hide-wall.tpl | 0 .../profile_advanced.tpl | 0 .../{smarty3 => templates}/profile_edit.tpl | 0 .../{smarty3 => templates}/profile_edlink.tpl | 0 .../{smarty3 => templates}/profile_entry.tpl | 0 .../profile_listing_header.tpl | 0 .../{smarty3 => templates}/profile_vcard.tpl | 0 .../blog/{smarty3 => templates}/removeme.tpl | 0 .../{smarty3 => templates}/search_item.tpl | 0 .../blog/{smarty3 => templates}/settings.tpl | 0 .../settings_addons.tpl | 0 .../settings_connectors.tpl | 0 .../settings_display.tpl | 0 .../settings_features.tpl | 0 .../settings_nick_set.tpl | 0 .../settings_nick_subdir.tpl | 0 .../{smarty3 => templates}/settings_oauth.tpl | 0 .../settings_oauth_edit.tpl | 0 .../threaded_conversation.tpl | 0 .../blog/{smarty3 => templates}/uexport.tpl | 0 .../{smarty3 => templates}/wall_thread.tpl | 0 .../wall_thread_comment.tpl | 0 view/theme/blog/theme.php | 1 + view/theme/blog/threaded_conversation.tpl | 44 --- view/theme/blog/uexport.tpl | 11 - view/theme/blog/wall_thread.tpl | 122 ------- view/theme/blog/wall_thread_comment.tpl | 38 -- 96 files changed, 6 insertions(+), 2186 deletions(-) delete mode 100644 view/theme/blog/admin_aside.tpl delete mode 100644 view/theme/blog/admin_logs.tpl delete mode 100644 view/theme/blog/admin_plugins.tpl delete mode 100644 view/theme/blog/admin_plugins_details.tpl delete mode 100644 view/theme/blog/admin_remoteupdate.tpl delete mode 100644 view/theme/blog/admin_site.tpl delete mode 100644 view/theme/blog/admin_summary.tpl delete mode 100644 view/theme/blog/admin_users.tpl delete mode 100644 view/theme/blog/comment_item.tpl delete mode 100644 view/theme/blog/common_tabs.tpl delete mode 100644 view/theme/blog/config.tpl delete mode 100644 view/theme/blog/contact_template.tpl delete mode 100644 view/theme/blog/contacts-head.tpl delete mode 100644 view/theme/blog/contacts-template.tpl delete mode 100644 view/theme/blog/directory_end.tpl delete mode 100644 view/theme/blog/directory_header.tpl delete mode 100644 view/theme/blog/directory_item.tpl delete mode 100644 view/theme/blog/end.tpl delete mode 100644 view/theme/blog/field_input.tpl delete mode 100644 view/theme/blog/jot-end.tpl delete mode 100644 view/theme/blog/jot-header.tpl delete mode 100644 view/theme/blog/jot.tpl delete mode 100644 view/theme/blog/jot_geotag.tpl delete mode 100644 view/theme/blog/nav.tpl delete mode 100644 view/theme/blog/profile-hide-friends.tpl delete mode 100644 view/theme/blog/profile-hide-wall.tpl delete mode 100644 view/theme/blog/profile_advanced.tpl delete mode 100644 view/theme/blog/profile_edit.tpl delete mode 100644 view/theme/blog/profile_edlink.tpl delete mode 100644 view/theme/blog/profile_entry.tpl delete mode 100644 view/theme/blog/profile_listing_header.tpl delete mode 100644 view/theme/blog/profile_vcard.tpl delete mode 100644 view/theme/blog/removeme.tpl delete mode 100644 view/theme/blog/search_item.tpl delete mode 100644 view/theme/blog/settings.tpl delete mode 100644 view/theme/blog/settings_addons.tpl delete mode 100644 view/theme/blog/settings_connectors.tpl delete mode 100644 view/theme/blog/settings_display.tpl delete mode 100644 view/theme/blog/settings_features.tpl delete mode 100644 view/theme/blog/settings_nick_set.tpl delete mode 100644 view/theme/blog/settings_nick_subdir.tpl delete mode 100644 view/theme/blog/settings_oauth.tpl delete mode 100644 view/theme/blog/settings_oauth_edit.tpl rename view/theme/blog/{smarty3 => templates}/admin_aside.tpl (100%) rename view/theme/blog/{smarty3 => templates}/admin_logs.tpl (100%) rename view/theme/blog/{smarty3 => templates}/admin_plugins.tpl (100%) rename view/theme/blog/{smarty3 => templates}/admin_plugins_details.tpl (100%) rename view/theme/blog/{smarty3 => templates}/admin_remoteupdate.tpl (100%) rename view/theme/blog/{smarty3 => templates}/admin_site.tpl (100%) rename view/theme/blog/{smarty3 => templates}/admin_summary.tpl (100%) rename view/theme/blog/{smarty3 => templates}/admin_users.tpl (100%) rename view/theme/blog/{smarty3 => templates}/comment_item.tpl (100%) rename view/theme/blog/{smarty3 => templates}/common_tabs.tpl (100%) rename view/theme/blog/{smarty3 => templates}/config.tpl (100%) rename view/theme/blog/{smarty3 => templates}/contact_template.tpl (100%) rename view/theme/blog/{smarty3 => templates}/contacts-head.tpl (100%) rename view/theme/blog/{smarty3 => templates}/contacts-template.tpl (100%) rename view/theme/blog/{smarty3 => templates}/directory_end.tpl (100%) rename view/theme/blog/{smarty3 => templates}/directory_header.tpl (100%) rename view/theme/blog/{smarty3 => templates}/directory_item.tpl (100%) rename view/theme/blog/{smarty3 => templates}/end.tpl (100%) rename view/theme/blog/{smarty3 => templates}/field_input.tpl (100%) rename view/theme/blog/{smarty3 => templates}/jot-end.tpl (100%) rename view/theme/blog/{smarty3 => templates}/jot-header.tpl (100%) rename view/theme/blog/{smarty3 => templates}/jot.tpl (100%) rename view/theme/blog/{smarty3 => templates}/jot_geotag.tpl (100%) rename view/theme/blog/{smarty3 => templates}/nav.tpl (100%) rename view/theme/blog/{smarty3 => templates}/profile-hide-friends.tpl (100%) rename view/theme/blog/{smarty3 => templates}/profile-hide-wall.tpl (100%) rename view/theme/blog/{smarty3 => templates}/profile_advanced.tpl (100%) rename view/theme/blog/{smarty3 => templates}/profile_edit.tpl (100%) rename view/theme/blog/{smarty3 => templates}/profile_edlink.tpl (100%) rename view/theme/blog/{smarty3 => templates}/profile_entry.tpl (100%) rename view/theme/blog/{smarty3 => templates}/profile_listing_header.tpl (100%) rename view/theme/blog/{smarty3 => templates}/profile_vcard.tpl (100%) rename view/theme/blog/{smarty3 => templates}/removeme.tpl (100%) rename view/theme/blog/{smarty3 => templates}/search_item.tpl (100%) rename view/theme/blog/{smarty3 => templates}/settings.tpl (100%) rename view/theme/blog/{smarty3 => templates}/settings_addons.tpl (100%) rename view/theme/blog/{smarty3 => templates}/settings_connectors.tpl (100%) rename view/theme/blog/{smarty3 => templates}/settings_display.tpl (100%) rename view/theme/blog/{smarty3 => templates}/settings_features.tpl (100%) rename view/theme/blog/{smarty3 => templates}/settings_nick_set.tpl (100%) rename view/theme/blog/{smarty3 => templates}/settings_nick_subdir.tpl (100%) rename view/theme/blog/{smarty3 => templates}/settings_oauth.tpl (100%) rename view/theme/blog/{smarty3 => templates}/settings_oauth_edit.tpl (100%) rename view/theme/blog/{smarty3 => templates}/threaded_conversation.tpl (100%) rename view/theme/blog/{smarty3 => templates}/uexport.tpl (100%) rename view/theme/blog/{smarty3 => templates}/wall_thread.tpl (100%) rename view/theme/blog/{smarty3 => templates}/wall_thread_comment.tpl (100%) delete mode 100644 view/theme/blog/threaded_conversation.tpl delete mode 100644 view/theme/blog/uexport.tpl delete mode 100644 view/theme/blog/wall_thread.tpl delete mode 100644 view/theme/blog/wall_thread_comment.tpl diff --git a/view/theme/blog/admin_aside.tpl b/view/theme/blog/admin_aside.tpl deleted file mode 100644 index 54a7859..0000000 --- a/view/theme/blog/admin_aside.tpl +++ /dev/null @@ -1,49 +0,0 @@ - -
-

$admtxt

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

$plugadmtxt

- -
-{{ endif }} - -
-

$logtxt

- - -
diff --git a/view/theme/blog/admin_logs.tpl b/view/theme/blog/admin_logs.tpl deleted file mode 100644 index 9f672e2..0000000 --- a/view/theme/blog/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/theme/blog/admin_plugins.tpl b/view/theme/blog/admin_plugins.tpl deleted file mode 100644 index 6078033..0000000 --- a/view/theme/blog/admin_plugins.tpl +++ /dev/null @@ -1,15 +0,0 @@ -
-

$title - $page

- - -
diff --git a/view/theme/blog/admin_plugins_details.tpl b/view/theme/blog/admin_plugins_details.tpl deleted file mode 100644 index b71778c..0000000 --- a/view/theme/blog/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/theme/blog/admin_remoteupdate.tpl b/view/theme/blog/admin_remoteupdate.tpl deleted file mode 100644 index 874c6e6..0000000 --- a/view/theme/blog/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/theme/blog/admin_site.tpl b/view/theme/blog/admin_site.tpl deleted file mode 100644 index 121aad0..0000000 --- a/view/theme/blog/admin_site.tpl +++ /dev/null @@ -1,108 +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 }} - - -
- -

$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_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 }} - -
- -

$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/blog/admin_summary.tpl b/view/theme/blog/admin_summary.tpl deleted file mode 100644 index 4160255..0000000 --- a/view/theme/blog/admin_summary.tpl +++ /dev/null @@ -1,41 +0,0 @@ -
-

$title - $page

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

$title - $page

- -
- - -

$h_pending

- {{ if $pending }} - - - - {{ for $th_pending as $th }}{{ endfor }} - - - - - - {{ for $pending as $u }} - - - - - - - - {{ endfor }} - -
$th
$u.created$u.name - - -
-
$select_all
-
- {{ 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 }} -
-
- $select_all - -
- {{ else }} - NO USERS?!? - {{ endif }} -
- diff --git a/view/theme/blog/comment_item.tpl b/view/theme/blog/comment_item.tpl deleted file mode 100644 index f933fe6..0000000 --- a/view/theme/blog/comment_item.tpl +++ /dev/null @@ -1,29 +0,0 @@ -
-
-

- Leave a Reply -

-
- - - - - - - - - -

- - -

- -

- - {{ if $preview }}$preview{{ endif }} -

-
- -
- -
\ No newline at end of file diff --git a/view/theme/blog/common_tabs.tpl b/view/theme/blog/common_tabs.tpl deleted file mode 100644 index a389c45..0000000 --- a/view/theme/blog/common_tabs.tpl +++ /dev/null @@ -1,5 +0,0 @@ - diff --git a/view/theme/blog/config.php b/view/theme/blog/config.php index 203d546..9587fff 100644 --- a/view/theme/blog/config.php +++ b/view/theme/blog/config.php @@ -49,7 +49,7 @@ function blogtheme_form(&$a, $headimg, $headimghome){ ".wheel.jpg" => "wheel.jpg", ); - + /* // get_markup_template() load templates from current enabled theme // if this theme is not the current one, it will fail $template = dirname(__file__)."/smarty3/config.tpl"; @@ -58,7 +58,10 @@ function blogtheme_form(&$a, $headimg, $headimghome){ $t->filename = $template; } else { $t = get_markup_template( $template ); - } + }*/ + + // load template from theme folder + $t = get_markup_template('config.tpl', 'view/theme/blog'); $o .= replace_macros($t, array( '$submit' => t('Submit'), diff --git a/view/theme/blog/config.tpl b/view/theme/blog/config.tpl deleted file mode 100644 index 3fb45e6..0000000 --- a/view/theme/blog/config.tpl +++ /dev/null @@ -1,9 +0,0 @@ - -{{inc field_select.tpl with $field=$headimg}}{{endinc}} - -{{inc field_yesno.tpl with $field=$headimghome}}{{endinc}} - -
- -
- diff --git a/view/theme/blog/contact_template.tpl b/view/theme/blog/contact_template.tpl deleted file mode 100644 index 231eb9a..0000000 --- a/view/theme/blog/contact_template.tpl +++ /dev/null @@ -1,9 +0,0 @@ -
- $contact.name -

$contact.name

- {{ if $contact.photo_menu }} -
    - $contact.photo_menu -
- {{ endif }} -
diff --git a/view/theme/blog/contacts-head.tpl b/view/theme/blog/contacts-head.tpl deleted file mode 100644 index 011f55b..0000000 --- a/view/theme/blog/contacts-head.tpl +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/view/theme/blog/contacts-template.tpl b/view/theme/blog/contacts-template.tpl deleted file mode 100644 index 288f953..0000000 --- a/view/theme/blog/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/theme/blog/directory_end.tpl b/view/theme/blog/directory_end.tpl deleted file mode 100644 index c63a94a..0000000 --- a/view/theme/blog/directory_end.tpl +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/view/theme/blog/directory_header.tpl b/view/theme/blog/directory_header.tpl deleted file mode 100644 index 0dff344..0000000 --- a/view/theme/blog/directory_header.tpl +++ /dev/null @@ -1,16 +0,0 @@ -
-

$sitedir

- -$globaldir -$admin - -$finding - -
-
-$desc - - -
-
-
diff --git a/view/theme/blog/directory_item.tpl b/view/theme/blog/directory_item.tpl deleted file mode 100644 index 5b86a57..0000000 --- a/view/theme/blog/directory_item.tpl +++ /dev/null @@ -1,6 +0,0 @@ -
- $alt_text -

$name

-
$details
-
- diff --git a/view/theme/blog/end.tpl b/view/theme/blog/end.tpl deleted file mode 100644 index 252b924..0000000 --- a/view/theme/blog/end.tpl +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/view/theme/blog/field_input.tpl b/view/theme/blog/field_input.tpl deleted file mode 100644 index 850b93d..0000000 --- a/view/theme/blog/field_input.tpl +++ /dev/null @@ -1,6 +0,0 @@ - -
- - - $field.3 -
diff --git a/view/theme/blog/jot-end.tpl b/view/theme/blog/jot-end.tpl deleted file mode 100644 index e69de29..0000000 diff --git a/view/theme/blog/jot-header.tpl b/view/theme/blog/jot-header.tpl deleted file mode 100644 index 630df97..0000000 --- a/view/theme/blog/jot-header.tpl +++ /dev/null @@ -1,344 +0,0 @@ - - - - - diff --git a/view/theme/blog/jot.tpl b/view/theme/blog/jot.tpl deleted file mode 100644 index 2d4957a..0000000 --- a/view/theme/blog/jot.tpl +++ /dev/null @@ -1,64 +0,0 @@ -
-
-
-
 
-
-
-
- -
- - - - - - - - -
- {{ if $placeholdercategory }} -
- {{ endif }} -
- - -
- -
-
-
-
-
-
-
-
-
$bang
-
-
-
-
- {{ if $preview }}
$preview
{{ endif }} -
- - -
- - - - -
-
-
-
- $acl -
-
$emailcc
-
- $jotnets -
- Ok -
-
-
- -$share diff --git a/view/theme/blog/jot_geotag.tpl b/view/theme/blog/jot_geotag.tpl deleted file mode 100644 index b0f71e7..0000000 --- a/view/theme/blog/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/theme/blog/nav.tpl b/view/theme/blog/nav.tpl deleted file mode 100644 index 54947d4..0000000 --- a/view/theme/blog/nav.tpl +++ /dev/null @@ -1,104 +0,0 @@ - - - diff --git a/view/theme/blog/profile-hide-friends.tpl b/view/theme/blog/profile-hide-friends.tpl deleted file mode 100644 index b32c132..0000000 --- a/view/theme/blog/profile-hide-friends.tpl +++ /dev/null @@ -1,8 +0,0 @@ -
- -
- - $no_str - $yes_str -
-
diff --git a/view/theme/blog/profile-hide-wall.tpl b/view/theme/blog/profile-hide-wall.tpl deleted file mode 100644 index 10185e2..0000000 --- a/view/theme/blog/profile-hide-wall.tpl +++ /dev/null @@ -1,16 +0,0 @@ -

-$desc -

- -
- - - -
-
-
- - - -
-
diff --git a/view/theme/blog/profile_advanced.tpl b/view/theme/blog/profile_advanced.tpl deleted file mode 100644 index 1eb1525..0000000 --- a/view/theme/blog/profile_advanced.tpl +++ /dev/null @@ -1,171 +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/theme/blog/profile_edit.tpl b/view/theme/blog/profile_edit.tpl deleted file mode 100644 index fbe6d2f..0000000 --- a/view/theme/blog/profile_edit.tpl +++ /dev/null @@ -1,235 +0,0 @@ -
- $default - -
- $profpic - $viewprof - $cl_prof -
- {{ if $disabled }}{{ else }} -
- $del_prof -
- {{ endif }} - -

$banner

- -
- - - -
- - -
- -
- - -
- -
- - -
- -
- - $gender -
- -
- - $dob $age -
- - $hide_friends - - -
- -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- - -
- -
- - -
- - $marital -
- -
- - -
- -
- - -
- - -
- - $sexual -
- -
- - -
- -
- - -
- -
- - -
- -
- - - $lbl_pubdsc -
- -
- - - $lbl_prvdsc -
- - -
- -
- - - -
- - -
- - -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- -
- - -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- -
- - -
- - -
- -
- - -
- - -
- - -
- - -
- -
- -
- - -
\ No newline at end of file diff --git a/view/theme/blog/profile_edlink.tpl b/view/theme/blog/profile_edlink.tpl deleted file mode 100644 index e69de29..0000000 diff --git a/view/theme/blog/profile_entry.tpl b/view/theme/blog/profile_entry.tpl deleted file mode 100644 index 075a254..0000000 --- a/view/theme/blog/profile_entry.tpl +++ /dev/null @@ -1,5 +0,0 @@ -
- $alt -

$profile_name

- $visible -
diff --git a/view/theme/blog/profile_listing_header.tpl b/view/theme/blog/profile_listing_header.tpl deleted file mode 100644 index 10029cb..0000000 --- a/view/theme/blog/profile_listing_header.tpl +++ /dev/null @@ -1,6 +0,0 @@ -
-

$header

-
- $chg_photo - $cr_new -
\ No newline at end of file diff --git a/view/theme/blog/profile_vcard.tpl b/view/theme/blog/profile_vcard.tpl deleted file mode 100644 index 5f5fb53..0000000 --- a/view/theme/blog/profile_vcard.tpl +++ /dev/null @@ -1,65 +0,0 @@ - - -$contact_block - - diff --git a/view/theme/blog/removeme.tpl b/view/theme/blog/removeme.tpl deleted file mode 100644 index a463283..0000000 --- a/view/theme/blog/removeme.tpl +++ /dev/null @@ -1,20 +0,0 @@ -
-

$title

- -
- -
$desc
- -
- - -
- - -
- - - -
-
-
diff --git a/view/theme/blog/search_item.tpl b/view/theme/blog/search_item.tpl deleted file mode 100644 index 0192fde..0000000 --- a/view/theme/blog/search_item.tpl +++ /dev/null @@ -1,34 +0,0 @@ - - diff --git a/view/theme/blog/settings.tpl b/view/theme/blog/settings.tpl deleted file mode 100644 index a92b6a4..0000000 --- a/view/theme/blog/settings.tpl +++ /dev/null @@ -1,149 +0,0 @@ -
-

$ptitle

- -$nickname_block - -
- - -

$h_pass

- -{{inc field_password.tpl with $field=$password1 }}{{endinc}} -{{inc field_password.tpl with $field=$password2 }}{{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_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}} -
-
- -
- - -$group_select - -
- $permissions $permdesc -
- - -
-
-
- - -
- -
- - - -

$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/blog/settings_addons.tpl b/view/theme/blog/settings_addons.tpl deleted file mode 100644 index 073c8af..0000000 --- a/view/theme/blog/settings_addons.tpl +++ /dev/null @@ -1,12 +0,0 @@ -
-

$title

- - - - - -$settings_addons - - - -
\ No newline at end of file diff --git a/view/theme/blog/settings_connectors.tpl b/view/theme/blog/settings_connectors.tpl deleted file mode 100644 index 271ffa1..0000000 --- a/view/theme/blog/settings_connectors.tpl +++ /dev/null @@ -1,37 +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 }} - -
- -
\ No newline at end of file diff --git a/view/theme/blog/settings_display.tpl b/view/theme/blog/settings_display.tpl deleted file mode 100644 index 01eb2d3..0000000 --- a/view/theme/blog/settings_display.tpl +++ /dev/null @@ -1,24 +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_yesno.tpl with $field=$nosmile}}{{endinc}} - - -
- -
- -{{ if $theme_config }} -

Theme settings

-$theme_config -{{ endif }} - -
-
\ No newline at end of file diff --git a/view/theme/blog/settings_features.tpl b/view/theme/blog/settings_features.tpl deleted file mode 100644 index e2170f6..0000000 --- a/view/theme/blog/settings_features.tpl +++ /dev/null @@ -1,22 +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/theme/blog/settings_nick_set.tpl b/view/theme/blog/settings_nick_set.tpl deleted file mode 100644 index 2094ee9..0000000 --- a/view/theme/blog/settings_nick_set.tpl +++ /dev/null @@ -1 +0,0 @@ -
$desc '$nickname@$basepath'$subdir
diff --git a/view/theme/blog/settings_nick_subdir.tpl b/view/theme/blog/settings_nick_subdir.tpl deleted file mode 100644 index 303c24d..0000000 --- a/view/theme/blog/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/theme/blog/settings_oauth.tpl b/view/theme/blog/settings_oauth.tpl deleted file mode 100644 index 7c5fcc3..0000000 --- a/view/theme/blog/settings_oauth.tpl +++ /dev/null @@ -1,28 +0,0 @@ -
-

$title

- - -
- - - -$add - - {{ for $apps as $app }} -
- -

{{ if $app.name }}$app.name{{ else }}$noname{{ endif }}

- {{ if $app.my }} - {{ if $app.oauth_token }} - - {{ endif }} - {{ endif }} - {{ if $app.my }} - $edit - $delete - {{ endif }} -
- {{ endfor }} - -
-
\ No newline at end of file diff --git a/view/theme/blog/settings_oauth_edit.tpl b/view/theme/blog/settings_oauth_edit.tpl deleted file mode 100644 index 3902bf0..0000000 --- a/view/theme/blog/settings_oauth_edit.tpl +++ /dev/null @@ -1,19 +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 }} - -
- - -
- -
-
\ No newline at end of file diff --git a/view/theme/blog/smarty3/admin_aside.tpl b/view/theme/blog/templates/admin_aside.tpl similarity index 100% rename from view/theme/blog/smarty3/admin_aside.tpl rename to view/theme/blog/templates/admin_aside.tpl diff --git a/view/theme/blog/smarty3/admin_logs.tpl b/view/theme/blog/templates/admin_logs.tpl similarity index 100% rename from view/theme/blog/smarty3/admin_logs.tpl rename to view/theme/blog/templates/admin_logs.tpl diff --git a/view/theme/blog/smarty3/admin_plugins.tpl b/view/theme/blog/templates/admin_plugins.tpl similarity index 100% rename from view/theme/blog/smarty3/admin_plugins.tpl rename to view/theme/blog/templates/admin_plugins.tpl diff --git a/view/theme/blog/smarty3/admin_plugins_details.tpl b/view/theme/blog/templates/admin_plugins_details.tpl similarity index 100% rename from view/theme/blog/smarty3/admin_plugins_details.tpl rename to view/theme/blog/templates/admin_plugins_details.tpl diff --git a/view/theme/blog/smarty3/admin_remoteupdate.tpl b/view/theme/blog/templates/admin_remoteupdate.tpl similarity index 100% rename from view/theme/blog/smarty3/admin_remoteupdate.tpl rename to view/theme/blog/templates/admin_remoteupdate.tpl diff --git a/view/theme/blog/smarty3/admin_site.tpl b/view/theme/blog/templates/admin_site.tpl similarity index 100% rename from view/theme/blog/smarty3/admin_site.tpl rename to view/theme/blog/templates/admin_site.tpl diff --git a/view/theme/blog/smarty3/admin_summary.tpl b/view/theme/blog/templates/admin_summary.tpl similarity index 100% rename from view/theme/blog/smarty3/admin_summary.tpl rename to view/theme/blog/templates/admin_summary.tpl diff --git a/view/theme/blog/smarty3/admin_users.tpl b/view/theme/blog/templates/admin_users.tpl similarity index 100% rename from view/theme/blog/smarty3/admin_users.tpl rename to view/theme/blog/templates/admin_users.tpl diff --git a/view/theme/blog/smarty3/comment_item.tpl b/view/theme/blog/templates/comment_item.tpl similarity index 100% rename from view/theme/blog/smarty3/comment_item.tpl rename to view/theme/blog/templates/comment_item.tpl diff --git a/view/theme/blog/smarty3/common_tabs.tpl b/view/theme/blog/templates/common_tabs.tpl similarity index 100% rename from view/theme/blog/smarty3/common_tabs.tpl rename to view/theme/blog/templates/common_tabs.tpl diff --git a/view/theme/blog/smarty3/config.tpl b/view/theme/blog/templates/config.tpl similarity index 100% rename from view/theme/blog/smarty3/config.tpl rename to view/theme/blog/templates/config.tpl diff --git a/view/theme/blog/smarty3/contact_template.tpl b/view/theme/blog/templates/contact_template.tpl similarity index 100% rename from view/theme/blog/smarty3/contact_template.tpl rename to view/theme/blog/templates/contact_template.tpl diff --git a/view/theme/blog/smarty3/contacts-head.tpl b/view/theme/blog/templates/contacts-head.tpl similarity index 100% rename from view/theme/blog/smarty3/contacts-head.tpl rename to view/theme/blog/templates/contacts-head.tpl diff --git a/view/theme/blog/smarty3/contacts-template.tpl b/view/theme/blog/templates/contacts-template.tpl similarity index 100% rename from view/theme/blog/smarty3/contacts-template.tpl rename to view/theme/blog/templates/contacts-template.tpl diff --git a/view/theme/blog/smarty3/directory_end.tpl b/view/theme/blog/templates/directory_end.tpl similarity index 100% rename from view/theme/blog/smarty3/directory_end.tpl rename to view/theme/blog/templates/directory_end.tpl diff --git a/view/theme/blog/smarty3/directory_header.tpl b/view/theme/blog/templates/directory_header.tpl similarity index 100% rename from view/theme/blog/smarty3/directory_header.tpl rename to view/theme/blog/templates/directory_header.tpl diff --git a/view/theme/blog/smarty3/directory_item.tpl b/view/theme/blog/templates/directory_item.tpl similarity index 100% rename from view/theme/blog/smarty3/directory_item.tpl rename to view/theme/blog/templates/directory_item.tpl diff --git a/view/theme/blog/smarty3/end.tpl b/view/theme/blog/templates/end.tpl similarity index 100% rename from view/theme/blog/smarty3/end.tpl rename to view/theme/blog/templates/end.tpl diff --git a/view/theme/blog/smarty3/field_input.tpl b/view/theme/blog/templates/field_input.tpl similarity index 100% rename from view/theme/blog/smarty3/field_input.tpl rename to view/theme/blog/templates/field_input.tpl diff --git a/view/theme/blog/smarty3/jot-end.tpl b/view/theme/blog/templates/jot-end.tpl similarity index 100% rename from view/theme/blog/smarty3/jot-end.tpl rename to view/theme/blog/templates/jot-end.tpl diff --git a/view/theme/blog/smarty3/jot-header.tpl b/view/theme/blog/templates/jot-header.tpl similarity index 100% rename from view/theme/blog/smarty3/jot-header.tpl rename to view/theme/blog/templates/jot-header.tpl diff --git a/view/theme/blog/smarty3/jot.tpl b/view/theme/blog/templates/jot.tpl similarity index 100% rename from view/theme/blog/smarty3/jot.tpl rename to view/theme/blog/templates/jot.tpl diff --git a/view/theme/blog/smarty3/jot_geotag.tpl b/view/theme/blog/templates/jot_geotag.tpl similarity index 100% rename from view/theme/blog/smarty3/jot_geotag.tpl rename to view/theme/blog/templates/jot_geotag.tpl diff --git a/view/theme/blog/smarty3/nav.tpl b/view/theme/blog/templates/nav.tpl similarity index 100% rename from view/theme/blog/smarty3/nav.tpl rename to view/theme/blog/templates/nav.tpl diff --git a/view/theme/blog/smarty3/profile-hide-friends.tpl b/view/theme/blog/templates/profile-hide-friends.tpl similarity index 100% rename from view/theme/blog/smarty3/profile-hide-friends.tpl rename to view/theme/blog/templates/profile-hide-friends.tpl diff --git a/view/theme/blog/smarty3/profile-hide-wall.tpl b/view/theme/blog/templates/profile-hide-wall.tpl similarity index 100% rename from view/theme/blog/smarty3/profile-hide-wall.tpl rename to view/theme/blog/templates/profile-hide-wall.tpl diff --git a/view/theme/blog/smarty3/profile_advanced.tpl b/view/theme/blog/templates/profile_advanced.tpl similarity index 100% rename from view/theme/blog/smarty3/profile_advanced.tpl rename to view/theme/blog/templates/profile_advanced.tpl diff --git a/view/theme/blog/smarty3/profile_edit.tpl b/view/theme/blog/templates/profile_edit.tpl similarity index 100% rename from view/theme/blog/smarty3/profile_edit.tpl rename to view/theme/blog/templates/profile_edit.tpl diff --git a/view/theme/blog/smarty3/profile_edlink.tpl b/view/theme/blog/templates/profile_edlink.tpl similarity index 100% rename from view/theme/blog/smarty3/profile_edlink.tpl rename to view/theme/blog/templates/profile_edlink.tpl diff --git a/view/theme/blog/smarty3/profile_entry.tpl b/view/theme/blog/templates/profile_entry.tpl similarity index 100% rename from view/theme/blog/smarty3/profile_entry.tpl rename to view/theme/blog/templates/profile_entry.tpl diff --git a/view/theme/blog/smarty3/profile_listing_header.tpl b/view/theme/blog/templates/profile_listing_header.tpl similarity index 100% rename from view/theme/blog/smarty3/profile_listing_header.tpl rename to view/theme/blog/templates/profile_listing_header.tpl diff --git a/view/theme/blog/smarty3/profile_vcard.tpl b/view/theme/blog/templates/profile_vcard.tpl similarity index 100% rename from view/theme/blog/smarty3/profile_vcard.tpl rename to view/theme/blog/templates/profile_vcard.tpl diff --git a/view/theme/blog/smarty3/removeme.tpl b/view/theme/blog/templates/removeme.tpl similarity index 100% rename from view/theme/blog/smarty3/removeme.tpl rename to view/theme/blog/templates/removeme.tpl diff --git a/view/theme/blog/smarty3/search_item.tpl b/view/theme/blog/templates/search_item.tpl similarity index 100% rename from view/theme/blog/smarty3/search_item.tpl rename to view/theme/blog/templates/search_item.tpl diff --git a/view/theme/blog/smarty3/settings.tpl b/view/theme/blog/templates/settings.tpl similarity index 100% rename from view/theme/blog/smarty3/settings.tpl rename to view/theme/blog/templates/settings.tpl diff --git a/view/theme/blog/smarty3/settings_addons.tpl b/view/theme/blog/templates/settings_addons.tpl similarity index 100% rename from view/theme/blog/smarty3/settings_addons.tpl rename to view/theme/blog/templates/settings_addons.tpl diff --git a/view/theme/blog/smarty3/settings_connectors.tpl b/view/theme/blog/templates/settings_connectors.tpl similarity index 100% rename from view/theme/blog/smarty3/settings_connectors.tpl rename to view/theme/blog/templates/settings_connectors.tpl diff --git a/view/theme/blog/smarty3/settings_display.tpl b/view/theme/blog/templates/settings_display.tpl similarity index 100% rename from view/theme/blog/smarty3/settings_display.tpl rename to view/theme/blog/templates/settings_display.tpl diff --git a/view/theme/blog/smarty3/settings_features.tpl b/view/theme/blog/templates/settings_features.tpl similarity index 100% rename from view/theme/blog/smarty3/settings_features.tpl rename to view/theme/blog/templates/settings_features.tpl diff --git a/view/theme/blog/smarty3/settings_nick_set.tpl b/view/theme/blog/templates/settings_nick_set.tpl similarity index 100% rename from view/theme/blog/smarty3/settings_nick_set.tpl rename to view/theme/blog/templates/settings_nick_set.tpl diff --git a/view/theme/blog/smarty3/settings_nick_subdir.tpl b/view/theme/blog/templates/settings_nick_subdir.tpl similarity index 100% rename from view/theme/blog/smarty3/settings_nick_subdir.tpl rename to view/theme/blog/templates/settings_nick_subdir.tpl diff --git a/view/theme/blog/smarty3/settings_oauth.tpl b/view/theme/blog/templates/settings_oauth.tpl similarity index 100% rename from view/theme/blog/smarty3/settings_oauth.tpl rename to view/theme/blog/templates/settings_oauth.tpl diff --git a/view/theme/blog/smarty3/settings_oauth_edit.tpl b/view/theme/blog/templates/settings_oauth_edit.tpl similarity index 100% rename from view/theme/blog/smarty3/settings_oauth_edit.tpl rename to view/theme/blog/templates/settings_oauth_edit.tpl diff --git a/view/theme/blog/smarty3/threaded_conversation.tpl b/view/theme/blog/templates/threaded_conversation.tpl similarity index 100% rename from view/theme/blog/smarty3/threaded_conversation.tpl rename to view/theme/blog/templates/threaded_conversation.tpl diff --git a/view/theme/blog/smarty3/uexport.tpl b/view/theme/blog/templates/uexport.tpl similarity index 100% rename from view/theme/blog/smarty3/uexport.tpl rename to view/theme/blog/templates/uexport.tpl diff --git a/view/theme/blog/smarty3/wall_thread.tpl b/view/theme/blog/templates/wall_thread.tpl similarity index 100% rename from view/theme/blog/smarty3/wall_thread.tpl rename to view/theme/blog/templates/wall_thread.tpl diff --git a/view/theme/blog/smarty3/wall_thread_comment.tpl b/view/theme/blog/templates/wall_thread_comment.tpl similarity index 100% rename from view/theme/blog/smarty3/wall_thread_comment.tpl rename to view/theme/blog/templates/wall_thread_comment.tpl diff --git a/view/theme/blog/theme.php b/view/theme/blog/theme.php index 8304a56..20fe008 100644 --- a/view/theme/blog/theme.php +++ b/view/theme/blog/theme.php @@ -11,6 +11,7 @@ function blog_init(&$a) { $a->theme_info = array(); + set_template_engine($a, 'smarty3'); } function blog_install(&$a){ diff --git a/view/theme/blog/threaded_conversation.tpl b/view/theme/blog/threaded_conversation.tpl deleted file mode 100644 index 4b23f3f..0000000 --- a/view/theme/blog/threaded_conversation.tpl +++ /dev/null @@ -1,44 +0,0 @@ -$live_update - -{{ for $threads as $thread }} - {{ inc $thread.template with $item=$thread }}{{ endinc }} -{{ endfor }} - - -{{ if $dropping }} - -{{ endif }} - - - -{# scroll to and hiligh comment in display mode #} -{{ if $mode == display }} - -{{ endif }} diff --git a/view/theme/blog/uexport.tpl b/view/theme/blog/uexport.tpl deleted file mode 100644 index 2f2d2be..0000000 --- a/view/theme/blog/uexport.tpl +++ /dev/null @@ -1,11 +0,0 @@ -
-

$title

- - -{{ for $options as $o }} -
-
$o.1
-
$o.2
-
-{{ endfor }} -
\ No newline at end of file diff --git a/view/theme/blog/wall_thread.tpl b/view/theme/blog/wall_thread.tpl deleted file mode 100644 index c8c6d4d..0000000 --- a/view/theme/blog/wall_thread.tpl +++ /dev/null @@ -1,122 +0,0 @@ -
-
- {{ if $item.title }}

$item.title

{{ endif }} - -
- {{if $mode != profile}}{{endif}} - {{ if $item.lock }}{{ endif }} - Posted - - - - - by - - - - - - -
- -
- $item.total_comments_num -
-
- -
- $item.body -
- -
- {{ if $item.categories }} - - Posted in - {{ for $item.categories as $cat }} - $cat.name{{if $cat.removeurl}} (x) {{endif}} - {{ endfor }} - - | - {{ endif }} - {{ if $item.hashtags }} - - Tagged - {{ for $item.hashtags as $tag }} - $tag - {{ endfor }} - - | - {{ endif }} - {{ if $item.mentions }} - - Mention - {{ for $item.mentions as $men }} - $men - {{ endfor }} - - | - {{ endif }} - - $item.total_comments_num $item.total_comments_text - -
- - -
- - {{ if $item.vote }} - - {{ if $item.vote.dislike }}{{ endif }} - · - {{ endif }} - - {{ if $item.vote.share }} - - · - {{ endif }} - - {{ if $item.star }} - - {{ endif }} - {{ if $item.tagger }} - - {{ endif }} - {{ if $item.filer }} - - {{ endif }} - - {{ if $item.edpost }} - - · - {{ endif }} - {{ if $item.drop.dropping }}{{ endif }} - {{ if $item.drop.pagedrop }}{{ endif }} - - - -
-
- -{{ if $mode != profile }} - -
- {{if $mode != network}} -

- $item.total_comments_num $item.total_comments_text {{if $item.title}}on “$item.title”{{endif}} -

- {{endif}} -
    - - {{ for $item.children as $child }} - {{ inc wall_thread_comment.tpl with $item=$child }}{{ endinc }} - {{ endfor }} - - -
- $item.comment - {{if $mode == network}}Add a comment{{endif}} -
-{{ endif }} - diff --git a/view/theme/blog/wall_thread_comment.tpl b/view/theme/blog/wall_thread_comment.tpl deleted file mode 100644 index 09d3802..0000000 --- a/view/theme/blog/wall_thread_comment.tpl +++ /dev/null @@ -1,38 +0,0 @@ -
  • -
    - -
    -

    $item.body

    -
    -
    - {{ for $item.children as $child }} - {{ inc wall_thread_comment.tpl with $item=$child }}{{ endinc }} - {{ endfor }} - -
    - -
    - - $item.comment -