From f2a7fcf8220ef497c8f39f0c9ec3175757f53128 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 9 Aug 2012 19:09:55 -0700 Subject: more theme modularisation and css/js management --- include/plugin.php | 7 +- index.php | 40 +++---- view/php/theme_init.php | 26 +++++ view/theme/quattro/birthdays_reminder.tpl | 1 - view/theme/quattro/comment_item.tpl | 61 ----------- view/theme/quattro/contact_template.tpl | 26 ----- view/theme/quattro/conversation.tpl | 48 -------- view/theme/quattro/events_reminder.tpl | 39 ------- view/theme/quattro/fileas_widget.tpl | 12 -- view/theme/quattro/generic_links_widget.tpl | 11 -- view/theme/quattro/group_side.tpl | 29 ----- view/theme/quattro/jot.tpl | 52 --------- view/theme/quattro/mail_conv.tpl | 60 ---------- view/theme/quattro/mail_display.tpl | 12 -- view/theme/quattro/mail_list.tpl | 8 -- view/theme/quattro/message_side.tpl | 10 -- view/theme/quattro/msg-header.tpl | 97 ---------------- view/theme/quattro/nav.tpl | 95 ---------------- view/theme/quattro/nets.tpl | 12 -- view/theme/quattro/photo_view.tpl | 37 ------- view/theme/quattro/profile_vcard.tpl | 63 ----------- view/theme/quattro/saved_searches_aside.tpl | 15 --- view/theme/quattro/search_item.tpl | 91 --------------- view/theme/quattro/theme_settings.tpl | 8 -- view/theme/quattro/tpl/birthdays_reminder.tpl | 1 + view/theme/quattro/tpl/comment_item.tpl | 61 +++++++++++ view/theme/quattro/tpl/contact_template.tpl | 26 +++++ view/theme/quattro/tpl/conversation.tpl | 48 ++++++++ view/theme/quattro/tpl/events_reminder.tpl | 39 +++++++ view/theme/quattro/tpl/fileas_widget.tpl | 12 ++ view/theme/quattro/tpl/generic_links_widget.tpl | 11 ++ view/theme/quattro/tpl/group_side.tpl | 29 +++++ view/theme/quattro/tpl/jot.tpl | 52 +++++++++ view/theme/quattro/tpl/mail_conv.tpl | 60 ++++++++++ view/theme/quattro/tpl/mail_display.tpl | 12 ++ view/theme/quattro/tpl/mail_list.tpl | 8 ++ view/theme/quattro/tpl/message_side.tpl | 10 ++ view/theme/quattro/tpl/msg-header.tpl | 97 ++++++++++++++++ view/theme/quattro/tpl/nav.tpl | 95 ++++++++++++++++ view/theme/quattro/tpl/nets.tpl | 12 ++ view/theme/quattro/tpl/photo_view.tpl | 37 +++++++ view/theme/quattro/tpl/profile_vcard.tpl | 63 +++++++++++ view/theme/quattro/tpl/saved_searches_aside.tpl | 15 +++ view/theme/quattro/tpl/search_item.tpl | 91 +++++++++++++++ view/theme/quattro/tpl/theme_settings.tpl | 8 ++ view/theme/quattro/tpl/threaded_conversation.tpl | 35 ++++++ view/theme/quattro/tpl/wall_item.tpl | 90 +++++++++++++++ view/theme/quattro/tpl/wall_item_tag.tpl | 25 +++++ view/theme/quattro/tpl/wall_thread.tpl | 127 +++++++++++++++++++++ view/theme/quattro/tpl/wallwall_item.tpl | 96 ++++++++++++++++ view/theme/quattro/tpl/wallwall_thread.tpl | 134 +++++++++++++++++++++++ view/theme/quattro/wall_item.tpl | 90 --------------- view/theme/quattro/wall_item_tag.tpl | 25 ----- view/theme/quattro/wallwall_item.tpl | 96 ---------------- view/tpl/head.tpl | 38 +------ view/tpl/threaded_conversation.tpl | 13 +++ view/tpl/wall_thread.tpl | 100 +++++++++++++++++ view/tpl/wallwall_thread.tpl | 105 ++++++++++++++++++ 58 files changed, 1560 insertions(+), 1061 deletions(-) create mode 100644 view/php/theme_init.php delete mode 100644 view/theme/quattro/birthdays_reminder.tpl delete mode 100644 view/theme/quattro/comment_item.tpl delete mode 100644 view/theme/quattro/contact_template.tpl delete mode 100644 view/theme/quattro/conversation.tpl delete mode 100644 view/theme/quattro/events_reminder.tpl delete mode 100644 view/theme/quattro/fileas_widget.tpl delete mode 100644 view/theme/quattro/generic_links_widget.tpl delete mode 100644 view/theme/quattro/group_side.tpl delete mode 100644 view/theme/quattro/jot.tpl delete mode 100644 view/theme/quattro/mail_conv.tpl delete mode 100644 view/theme/quattro/mail_display.tpl delete mode 100644 view/theme/quattro/mail_list.tpl delete mode 100644 view/theme/quattro/message_side.tpl delete mode 100644 view/theme/quattro/msg-header.tpl delete mode 100644 view/theme/quattro/nav.tpl delete mode 100644 view/theme/quattro/nets.tpl delete mode 100644 view/theme/quattro/photo_view.tpl delete mode 100644 view/theme/quattro/profile_vcard.tpl delete mode 100644 view/theme/quattro/saved_searches_aside.tpl delete mode 100644 view/theme/quattro/search_item.tpl delete mode 100644 view/theme/quattro/theme_settings.tpl create mode 100644 view/theme/quattro/tpl/birthdays_reminder.tpl create mode 100644 view/theme/quattro/tpl/comment_item.tpl create mode 100644 view/theme/quattro/tpl/contact_template.tpl create mode 100644 view/theme/quattro/tpl/conversation.tpl create mode 100644 view/theme/quattro/tpl/events_reminder.tpl create mode 100644 view/theme/quattro/tpl/fileas_widget.tpl create mode 100644 view/theme/quattro/tpl/generic_links_widget.tpl create mode 100644 view/theme/quattro/tpl/group_side.tpl create mode 100644 view/theme/quattro/tpl/jot.tpl create mode 100644 view/theme/quattro/tpl/mail_conv.tpl create mode 100644 view/theme/quattro/tpl/mail_display.tpl create mode 100644 view/theme/quattro/tpl/mail_list.tpl create mode 100644 view/theme/quattro/tpl/message_side.tpl create mode 100644 view/theme/quattro/tpl/msg-header.tpl create mode 100644 view/theme/quattro/tpl/nav.tpl create mode 100644 view/theme/quattro/tpl/nets.tpl create mode 100644 view/theme/quattro/tpl/photo_view.tpl create mode 100644 view/theme/quattro/tpl/profile_vcard.tpl create mode 100644 view/theme/quattro/tpl/saved_searches_aside.tpl create mode 100644 view/theme/quattro/tpl/search_item.tpl create mode 100644 view/theme/quattro/tpl/theme_settings.tpl create mode 100644 view/theme/quattro/tpl/threaded_conversation.tpl create mode 100644 view/theme/quattro/tpl/wall_item.tpl create mode 100644 view/theme/quattro/tpl/wall_item_tag.tpl create mode 100644 view/theme/quattro/tpl/wall_thread.tpl create mode 100644 view/theme/quattro/tpl/wallwall_item.tpl create mode 100644 view/theme/quattro/tpl/wallwall_thread.tpl delete mode 100644 view/theme/quattro/wall_item.tpl delete mode 100644 view/theme/quattro/wall_item_tag.tpl delete mode 100644 view/theme/quattro/wallwall_item.tpl create mode 100644 view/tpl/threaded_conversation.tpl create mode 100644 view/tpl/wall_thread.tpl create mode 100644 view/tpl/wallwall_thread.tpl diff --git a/include/plugin.php b/include/plugin.php index a6780d701..c9490eb8a 100644 --- a/include/plugin.php +++ b/include/plugin.php @@ -406,8 +406,7 @@ function upgrade_bool_message($bbcode = false) { function head_add_css($src,$media = 'screen') { - get_app()->css_sources[] = array($src,$type); - + get_app()->css_sources[] = array($src,$media); } function head_get_css() { @@ -430,7 +429,7 @@ function format_css_if_exists($source) { elseif(file_exists('view/css/' . $source[0])) $path = 'view/css/' . $source[0]; if($path) - return ''; + return '' . "\r\n"; } @@ -459,7 +458,7 @@ function format_js_if_exists($source) { elseif(file_exists('view/js/' . $source)) $path = 'view/js/' . $source[0]; if($path) - return '' . "\r\n" ; } diff --git a/index.php b/index.php index 02d853d06..4de315520 100644 --- a/index.php +++ b/index.php @@ -336,30 +336,18 @@ if($a->module != 'install') { * Build the page - now that we have all the components */ +if(file_exists('view/theme/' . current_theme() . '/php/theme_init.php')) + require_once('view/theme/' . current_theme() . '/php/theme_init.php'); +elseif(file_exists('view/theme/' . $a->theme_info['extends'] . '/php/theme_init.php')) + require_once('view/theme/' . $a->theme_info['extends'] . '/php/theme_init.php'); +else + require_once('view/php/theme_init.php'); -$page_css = 'view/theme/' . current_theme() . '/css/' - . ((x($a->page,'template')) ? $a->page['template'] : 'default' ) . '.css'; - -if(! file_exists($page_css)) - $page_css = str_replace('theme/' . current_theme() . '/', '', $page_css); - -$module_css = 'view/theme/' . current_theme() . '/css/mod_' . $a->module . '.css'; - -if(! file_exists($module_css)) - $module_css = str_replace('theme/' . current_theme() . '/', '', $module_css); - -if(! file_exists($module_css)) - $module_css = null; - - -$module_js = 'view/theme/' . current_theme() . '/js/mod_' . $a->module . '.js'; - -if(! file_exists($module_js)) - $module_js = str_replace('theme/' . current_theme() . '/', '', $module_js); - -if(! file_exists($module_js)) - $module_js = null; +head_add_css(((x($a->page,'template')) ? $a->page['template'] : 'default' ) . '.css'); +head_add_css('mod_' . $a->module . '.css'); +head_add_css('style.css'); +head_add_js('mod_' . $a->module . '.js'); $interval = ((local_user()) ? get_pconfig(local_user(),'system','update_interval') : 40000); @@ -378,11 +366,9 @@ if(! file_exists($module_js)) '$showmore' => t('show more'), '$showfewer' => t('show fewer'), '$update_interval' => $interval, - '$page_css' => $a->get_baseurl() . '/' . $page_css, - '$module_css' => (($module_css) ? $a->get_baseurl() . '/' . $module_css : null), - '$module_js' => (($module_js) ? $a->get_baseurl() . '/' . $module_js : null), - '$stylesheet' => current_theme_url(), - '$theme' => current_theme(), + '$head_css' => head_get_css(), + '$head_js' => head_get_js(), + // localisations for jquery.timeago.js, see https://github.com/rmm5t/jquery-timeago // TRANSLATORS - only translate the conditionals if you require them! diff --git a/view/php/theme_init.php b/view/php/theme_init.php new file mode 100644 index 000000000..7a8f2d7a0 --- /dev/null +++ b/view/php/theme_init.php @@ -0,0 +1,26 @@ + -
- - - - - - - -
- $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 b826acc65..000000000 --- a/view/theme/quattro/contact_template.tpl +++ /dev/null @@ -1,26 +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 48ab4364a..000000000 --- a/view/theme/quattro/conversation.tpl +++ /dev/null @@ -1,48 +0,0 @@ -
-{{ 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 fc13fa68b..000000000 --- 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 1e5a76044..000000000 --- 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 29580bbc7..000000000 --- a/view/theme/quattro/generic_links_widget.tpl +++ /dev/null @@ -1,11 +0,0 @@ -
- {{if $title}}

$title

{{endif}} - {{if $desc}}
$desc
{{endif}} - - - -
diff --git a/view/theme/quattro/group_side.tpl b/view/theme/quattro/group_side.tpl deleted file mode 100644 index 596a8d13f..000000000 --- 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 95c0ff6b1..000000000 --- a/view/theme/quattro/jot.tpl +++ /dev/null @@ -1,52 +0,0 @@ -
-
-
 
- -
- - - - - - - - - - - - - - -
- - - -
-
- $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 989f17878..000000000 --- a/view/theme/quattro/mail_conv.tpl +++ /dev/null @@ -1,60 +0,0 @@ -
-
-
- -
-
- $mail.body -
-
-
-
-
-
-
-
-
-
-
-
-
- $mail.from_name $mail.date -
- -
-
- -
- $mail.delete -
- -
-
-
-
-
- - -{# - - -
-
- $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 e87eca485..000000000 --- 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 6bc6c84f6..000000000 --- a/view/theme/quattro/mail_list.tpl +++ /dev/null @@ -1,8 +0,0 @@ -
- $subject - $from_name - $date - $count - - -
diff --git a/view/theme/quattro/message_side.tpl b/view/theme/quattro/message_side.tpl deleted file mode 100644 index 9f1587096..000000000 --- a/view/theme/quattro/message_side.tpl +++ /dev/null @@ -1,10 +0,0 @@ -
- - - - -
diff --git a/view/theme/quattro/msg-header.tpl b/view/theme/quattro/msg-header.tpl deleted file mode 100644 index 2d1ea7a61..000000000 --- a/view/theme/quattro/msg-header.tpl +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - diff --git a/view/theme/quattro/nav.tpl b/view/theme/quattro/nav.tpl deleted file mode 100644 index af1fc9414..000000000 --- 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 cbadf1361..000000000 --- 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 3b7a66271..000000000 --- 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 }}
$tags.3
{{ 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 7cd02f164..000000000 --- a/view/theme/quattro/profile_vcard.tpl +++ /dev/null @@ -1,63 +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/saved_searches_aside.tpl b/view/theme/quattro/saved_searches_aside.tpl deleted file mode 100644 index 9c10a26de..000000000 --- a/view/theme/quattro/saved_searches_aside.tpl +++ /dev/null @@ -1,15 +0,0 @@ -
-

$title

- - - - $searchbox - -
diff --git a/view/theme/quattro/search_item.tpl b/view/theme/quattro/search_item.tpl deleted file mode 100644 index 80d6678fb..000000000 --- a/view/theme/quattro/search_item.tpl +++ /dev/null @@ -1,91 +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.dropping }} - - $item.drop.delete - {{ endif }} - {{ if $item.edpost }} - - {{ endif }} -
- -
-
-
-
- -
$item.dislike
- {{ if $item.conv }} -
- $item.conv.title - {{ endif }} -
-
- - -
- diff --git a/view/theme/quattro/theme_settings.tpl b/view/theme/quattro/theme_settings.tpl deleted file mode 100644 index 9771ae162..000000000 --- a/view/theme/quattro/theme_settings.tpl +++ /dev/null @@ -1,8 +0,0 @@ -{{inc field_select.tpl with $field=$color}}{{endinc}} - -{{inc field_select.tpl with $field=$align}}{{endinc}} - -
- -
- diff --git a/view/theme/quattro/tpl/birthdays_reminder.tpl b/view/theme/quattro/tpl/birthdays_reminder.tpl new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/view/theme/quattro/tpl/birthdays_reminder.tpl @@ -0,0 +1 @@ + diff --git a/view/theme/quattro/tpl/comment_item.tpl b/view/theme/quattro/tpl/comment_item.tpl new file mode 100644 index 000000000..ea24d95cc --- /dev/null +++ b/view/theme/quattro/tpl/comment_item.tpl @@ -0,0 +1,61 @@ +
+
+ + + + + + + +
+ $mytitle +
+
+
    +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
+
+ + {{ if $qcomment }} + + {{ endif }} + +
+ + +
+
+ +
diff --git a/view/theme/quattro/tpl/contact_template.tpl b/view/theme/quattro/tpl/contact_template.tpl new file mode 100644 index 000000000..b826acc65 --- /dev/null +++ b/view/theme/quattro/tpl/contact_template.tpl @@ -0,0 +1,26 @@ + +
+
+
+ + $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/tpl/conversation.tpl b/view/theme/quattro/tpl/conversation.tpl new file mode 100644 index 000000000..48ab4364a --- /dev/null +++ b/view/theme/quattro/tpl/conversation.tpl @@ -0,0 +1,48 @@ +
+{{ 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/tpl/events_reminder.tpl b/view/theme/quattro/tpl/events_reminder.tpl new file mode 100644 index 000000000..fc13fa68b --- /dev/null +++ b/view/theme/quattro/tpl/events_reminder.tpl @@ -0,0 +1,39 @@ + + + +
+
diff --git a/view/theme/quattro/tpl/fileas_widget.tpl b/view/theme/quattro/tpl/fileas_widget.tpl new file mode 100644 index 000000000..1e5a76044 --- /dev/null +++ b/view/theme/quattro/tpl/fileas_widget.tpl @@ -0,0 +1,12 @@ +
+

$title

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

$title

{{endif}} + {{if $desc}}
$desc
{{endif}} + + + +
diff --git a/view/theme/quattro/tpl/group_side.tpl b/view/theme/quattro/tpl/group_side.tpl new file mode 100644 index 000000000..596a8d13f --- /dev/null +++ b/view/theme/quattro/tpl/group_side.tpl @@ -0,0 +1,29 @@ +
+
+

$title

+ $add +
+ + +
+ diff --git a/view/theme/quattro/tpl/jot.tpl b/view/theme/quattro/tpl/jot.tpl new file mode 100644 index 000000000..95c0ff6b1 --- /dev/null +++ b/view/theme/quattro/tpl/jot.tpl @@ -0,0 +1,52 @@ +
+
+
 
+ +
+ + + + + + + + + + + + + + +
+ + + +
+
+ $acl +
+
$emailcc
+
+ $jotnets +
+
+ +
+ +{{ if $content }}{{ endif }} diff --git a/view/theme/quattro/tpl/mail_conv.tpl b/view/theme/quattro/tpl/mail_conv.tpl new file mode 100644 index 000000000..989f17878 --- /dev/null +++ b/view/theme/quattro/tpl/mail_conv.tpl @@ -0,0 +1,60 @@ +
+
+
+ +
+
+ $mail.body +
+
+
+
+
+
+
+
+
+
+
+
+
+ $mail.from_name $mail.date +
+ +
+
+ +
+ $mail.delete +
+ +
+
+
+
+
+ + +{# + + +
+
+ $mail.from_name +
+
+
$mail.from_name
+
$mail.date
+
$mail.subject
+
$mail.body
+
+
+
+
+
+ +#} diff --git a/view/theme/quattro/tpl/mail_display.tpl b/view/theme/quattro/tpl/mail_display.tpl new file mode 100644 index 000000000..e87eca485 --- /dev/null +++ b/view/theme/quattro/tpl/mail_display.tpl @@ -0,0 +1,12 @@ +
+ $thread_subject + +
+ +{{ for $mails as $mail }} +
+ {{ inc mail_conv.tpl }}{{endinc}} +
+{{ endfor }} + +{{ inc prv_message.tpl }}{{ endinc }} diff --git a/view/theme/quattro/tpl/mail_list.tpl b/view/theme/quattro/tpl/mail_list.tpl new file mode 100644 index 000000000..6bc6c84f6 --- /dev/null +++ b/view/theme/quattro/tpl/mail_list.tpl @@ -0,0 +1,8 @@ +
+ $subject + $from_name + $date + $count + + +
diff --git a/view/theme/quattro/tpl/message_side.tpl b/view/theme/quattro/tpl/message_side.tpl new file mode 100644 index 000000000..9f1587096 --- /dev/null +++ b/view/theme/quattro/tpl/message_side.tpl @@ -0,0 +1,10 @@ +
+ + + + +
diff --git a/view/theme/quattro/tpl/msg-header.tpl b/view/theme/quattro/tpl/msg-header.tpl new file mode 100644 index 000000000..2d1ea7a61 --- /dev/null +++ b/view/theme/quattro/tpl/msg-header.tpl @@ -0,0 +1,97 @@ + + + + + + diff --git a/view/theme/quattro/tpl/nav.tpl b/view/theme/quattro/tpl/nav.tpl new file mode 100644 index 000000000..af1fc9414 --- /dev/null +++ b/view/theme/quattro/tpl/nav.tpl @@ -0,0 +1,95 @@ +
+ {# $langselector #} + +
$sitelocation
+ +
+ + + +
$langselector
diff --git a/view/theme/quattro/tpl/nets.tpl b/view/theme/quattro/tpl/nets.tpl new file mode 100644 index 000000000..cbadf1361 --- /dev/null +++ b/view/theme/quattro/tpl/nets.tpl @@ -0,0 +1,12 @@ +
+

$title

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

$album.1

+ + + +
+{{ if $prevlink }}{{ endif }} +{{ if $nextlink }}{{ endif }} +
$desc
+{{ if $tags }} +
$tags.0
+
$tags.1
+{{ endif }} +{{ if $tags.2 }}
$tags.3
{{ endif }} + +{{ if $edit }}$edit{{ endif }} + +{{ if $likebuttons }} +
+ $likebuttons + $like + $dislike +
+{{ endif }} +
+ $comments +
+ +$paginate + diff --git a/view/theme/quattro/tpl/profile_vcard.tpl b/view/theme/quattro/tpl/profile_vcard.tpl new file mode 100644 index 000000000..7cd02f164 --- /dev/null +++ b/view/theme/quattro/tpl/profile_vcard.tpl @@ -0,0 +1,63 @@ +
+ +
+
$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/tpl/saved_searches_aside.tpl b/view/theme/quattro/tpl/saved_searches_aside.tpl new file mode 100644 index 000000000..9c10a26de --- /dev/null +++ b/view/theme/quattro/tpl/saved_searches_aside.tpl @@ -0,0 +1,15 @@ +
+

$title

+ + + + $searchbox + +
diff --git a/view/theme/quattro/tpl/search_item.tpl b/view/theme/quattro/tpl/search_item.tpl new file mode 100644 index 000000000..80d6678fb --- /dev/null +++ b/view/theme/quattro/tpl/search_item.tpl @@ -0,0 +1,91 @@ + +
+ $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.dropping }} + + $item.drop.delete + {{ endif }} + {{ if $item.edpost }} + + {{ endif }} +
+ +
+
+
+
+ +
$item.dislike
+ {{ if $item.conv }} +
+ $item.conv.title + {{ endif }} +
+
+ + +
+ diff --git a/view/theme/quattro/tpl/theme_settings.tpl b/view/theme/quattro/tpl/theme_settings.tpl new file mode 100644 index 000000000..9771ae162 --- /dev/null +++ b/view/theme/quattro/tpl/theme_settings.tpl @@ -0,0 +1,8 @@ +{{inc field_select.tpl with $field=$color}}{{endinc}} + +{{inc field_select.tpl with $field=$align}}{{endinc}} + +
+ +
+ diff --git a/view/theme/quattro/tpl/threaded_conversation.tpl b/view/theme/quattro/tpl/threaded_conversation.tpl new file mode 100644 index 000000000..491c47302 --- /dev/null +++ b/view/theme/quattro/tpl/threaded_conversation.tpl @@ -0,0 +1,35 @@ +{{ for $threads as $item }} +
+ + {{ if $item.type == tag }} + {{ inc wall_item_tag.tpl }}{{ endinc }} + {{ else }} + {{ inc $item.template }}{{ endinc }} + {{ endif }} + +
+{{ endfor }} + +
+ +{{ if $dropping }} + + $dropping + +{{ endif }} + + + +{{ if $mode == display }} + +{{ endif }} + diff --git a/view/theme/quattro/tpl/wall_item.tpl b/view/theme/quattro/tpl/wall_item.tpl new file mode 100644 index 000000000..411879def --- /dev/null +++ b/view/theme/quattro/tpl/wall_item.tpl @@ -0,0 +1,90 @@ + +
+ $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.filer }} + $item.filer + {{ 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.dropping }} + + $item.drop.delete + {{ endif }} + {{ if $item.edpost }} + + {{ endif }} +
+ +
+
+
+
+ +
$item.dislike
+
+
+ +
+ $item.comment +
diff --git a/view/theme/quattro/tpl/wall_item_tag.tpl b/view/theme/quattro/tpl/wall_item_tag.tpl new file mode 100644 index 000000000..205fcfebc --- /dev/null +++ b/view/theme/quattro/tpl/wall_item_tag.tpl @@ -0,0 +1,25 @@ +
+
+
+
+ + $item.name + + + +
+
$item.location
+
+
+ $item.ago $item.body +
+
+
+ +{{ if $item.flatten }} +
+ $item.comment +
+{{ endif }} diff --git a/view/theme/quattro/tpl/wall_thread.tpl b/view/theme/quattro/tpl/wall_thread.tpl new file mode 100644 index 000000000..4d454f00d --- /dev/null +++ b/view/theme/quattro/tpl/wall_thread.tpl @@ -0,0 +1,127 @@ +{{if $mode == display}} +{{ else }} +{{if $item.comment_firstcollapsed}} +
+ $item.num_comments $item.hide_text +
+ {{endif}} +{{ endif }} + +{{ if $item.flatten }} +
+ $item.comment +
+{{ endif }} diff --git a/view/theme/quattro/tpl/wallwall_item.tpl b/view/theme/quattro/tpl/wallwall_item.tpl new file mode 100644 index 000000000..2e3cf821f --- /dev/null +++ b/view/theme/quattro/tpl/wallwall_item.tpl @@ -0,0 +1,96 @@ +
+ $item.star.starred + {{ if $item.lock }}$item.lock{{ endif }} + +
+ +
+
+
+
+ + $item.name + + menu + + +
+
+ + $item.owner_name + +
+
$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 +
$item.to $item.owner_name $item.vwall + +
+ +
+ {{ if $item.star }} + $item.star.do + $item.star.undo + $item.star.tagger + + {{ endif }} + {{ if $item.filer }} + $item.filer + {{ 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.dropping }} + + $item.drop.delete + {{ endif }} + {{ if $item.edpost }} + + {{ endif }} +
+ +
+
+
+
+ +
$item.dislike
+
+
+
+ $item.comment +
diff --git a/view/theme/quattro/tpl/wallwall_thread.tpl b/view/theme/quattro/tpl/wallwall_thread.tpl new file mode 100644 index 000000000..cc2f8e362 --- /dev/null +++ b/view/theme/quattro/tpl/wallwall_thread.tpl @@ -0,0 +1,134 @@ +{{if $mode == display}} +{{ else }} +{{if $item.comment_firstcollapsed}} +
+ $item.num_comments $item.hide_text +
+ {{endif}} +{{ endif }} + +{{ if $item.flatten }} +
+ $item.comment +
+{{ endif }} diff --git a/view/theme/quattro/wall_item.tpl b/view/theme/quattro/wall_item.tpl deleted file mode 100644 index 411879def..000000000 --- a/view/theme/quattro/wall_item.tpl +++ /dev/null @@ -1,90 +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.filer }} - $item.filer - {{ 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.dropping }} - - $item.drop.delete - {{ endif }} - {{ if $item.edpost }} - - {{ endif }} -
- -
-
-
-
- -
$item.dislike
-
-
- -
- $item.comment -
diff --git a/view/theme/quattro/wall_item_tag.tpl b/view/theme/quattro/wall_item_tag.tpl deleted file mode 100644 index 205fcfebc..000000000 --- a/view/theme/quattro/wall_item_tag.tpl +++ /dev/null @@ -1,25 +0,0 @@ -
-
-
-
- - $item.name - - - -
-
$item.location
-
-
- $item.ago $item.body -
-
-
- -{{ if $item.flatten }} -
- $item.comment -
-{{ endif }} diff --git a/view/theme/quattro/wallwall_item.tpl b/view/theme/quattro/wallwall_item.tpl deleted file mode 100644 index 2e3cf821f..000000000 --- a/view/theme/quattro/wallwall_item.tpl +++ /dev/null @@ -1,96 +0,0 @@ -
- $item.star.starred - {{ if $item.lock }}$item.lock{{ endif }} - -
- -
-
-
-
- - $item.name - - menu - - -
-
- - $item.owner_name - -
-
$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 -
$item.to $item.owner_name $item.vwall - -
- -
- {{ if $item.star }} - $item.star.do - $item.star.undo - $item.star.tagger - - {{ endif }} - {{ if $item.filer }} - $item.filer - {{ 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.dropping }} - - $item.drop.delete - {{ endif }} - {{ if $item.edpost }} - - {{ endif }} -
- -
-
-
-
- -
$item.dislike
-
-
-
- $item.comment -
diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl index 7853361d9..08fe8303a 100644 --- a/view/tpl/head.tpl +++ b/view/tpl/head.tpl @@ -2,16 +2,13 @@ - - - - + - -{{ if $module_css }} - -{{ endif }} - +$head_css + +$head_js - - - - - - - - - - - - - - -{{ if $module_js }} - -{{ endif }} - - - -