From d072c12e7dcc5871c52a0ef552a60cb40a9b7fa2 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Mon, 23 Apr 2012 15:47:18 +0200 Subject: diabook-themes: bugfix in admin-section --- view/theme/diabook/admin_site.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view') diff --git a/view/theme/diabook/admin_site.tpl b/view/theme/diabook/admin_site.tpl index 33d0f508c..dd89b81a9 100644 --- a/view/theme/diabook/admin_site.tpl +++ b/view/theme/diabook/admin_site.tpl @@ -8,7 +8,7 @@

$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 }} -- cgit v1.2.3 From c5c419a785c901b6aab4d58455fc2efcce23f3f3 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Mon, 23 Apr 2012 17:22:22 +0200 Subject: diabook-themes: small fix in nets_aside, group_aside and delete obsolete .tpls in subfolders --- view/theme/diabook/diabook-aerith/admin_users.tpl | 88 ---- .../diabook/diabook-aerith/ch_directory_item.tpl | 10 - view/theme/diabook/diabook-aerith/comment_item.tpl | 41 -- .../theme/diabook/diabook-aerith/communityhome.tpl | 86 ---- view/theme/diabook/diabook-aerith/config.php | 84 ---- .../diabook/diabook-aerith/contact_template.tpl | 25 -- .../diabook/diabook-aerith/directory_item.tpl | 11 - .../diabook-aerith/generic_links_widget.tpl | 11 - view/theme/diabook/diabook-aerith/group_side.tpl | 34 -- view/theme/diabook/diabook-aerith/jot.tpl | 85 ---- view/theme/diabook/diabook-aerith/js/README | 22 - .../diabook-aerith/js/jquery.ae.image.resize.js | 69 --- .../js/jquery.ae.image.resize.min.js | 1 - .../diabook-aerith/js/jquery.autogrow.textarea.js | 46 -- .../diabook/diabook-aerith/js/jquery.cookie.js | 47 -- view/theme/diabook/diabook-aerith/login.tpl | 33 -- view/theme/diabook/diabook-aerith/mail_conv.tpl | 60 --- view/theme/diabook/diabook-aerith/mail_display.tpl | 12 - view/theme/diabook/diabook-aerith/mail_list.tpl | 8 - view/theme/diabook/diabook-aerith/message_side.tpl | 10 - view/theme/diabook/diabook-aerith/nav.tpl | 190 -------- view/theme/diabook/diabook-aerith/nets.tpl | 15 - view/theme/diabook/diabook-aerith/oembed_video.tpl | 4 - view/theme/diabook/diabook-aerith/photo_item.tpl | 65 --- view/theme/diabook/diabook-aerith/photo_view.tpl | 35 -- view/theme/diabook/diabook-aerith/profile_side.tpl | 21 - .../theme/diabook/diabook-aerith/profile_vcard.tpl | 64 --- view/theme/diabook/diabook-aerith/right_aside.tpl | 20 - view/theme/diabook/diabook-aerith/screenshot.png | Bin 216868 -> 0 bytes view/theme/diabook/diabook-aerith/search_item.tpl | 100 ----- view/theme/diabook/diabook-aerith/style.php | 277 ------------ view/theme/diabook/diabook-aerith/theme.php | 488 --------------------- .../diabook/diabook-aerith/theme_settings.tpl | 10 - view/theme/diabook/diabook-aerith/wall_item.tpl | 100 ----- .../theme/diabook/diabook-aerith/wallwall_item.tpl | 106 ----- view/theme/diabook/diabook-blue/admin_users.tpl | 88 ---- .../diabook/diabook-blue/ch_directory_item.tpl | 10 - view/theme/diabook/diabook-blue/comment_item.tpl | 41 -- view/theme/diabook/diabook-blue/communityhome.tpl | 87 ---- view/theme/diabook/diabook-blue/config.php | 84 ---- .../diabook/diabook-blue/contact_template.tpl | 25 -- view/theme/diabook/diabook-blue/directory_item.tpl | 11 - .../diabook/diabook-blue/generic_links_widget.tpl | 11 - view/theme/diabook/diabook-blue/group_side.tpl | 34 -- view/theme/diabook/diabook-blue/jot.tpl | 85 ---- view/theme/diabook/diabook-blue/js/README | 22 - .../diabook-blue/js/jquery.ae.image.resize.js | 69 --- .../diabook-blue/js/jquery.ae.image.resize.min.js | 1 - .../diabook-blue/js/jquery.autogrow.textarea.js | 46 -- .../theme/diabook/diabook-blue/js/jquery.cookie.js | 47 -- view/theme/diabook/diabook-blue/login.tpl | 33 -- view/theme/diabook/diabook-blue/mail_conv.tpl | 60 --- view/theme/diabook/diabook-blue/mail_display.tpl | 12 - view/theme/diabook/diabook-blue/mail_list.tpl | 8 - view/theme/diabook/diabook-blue/message_side.tpl | 10 - view/theme/diabook/diabook-blue/nav.tpl | 190 -------- view/theme/diabook/diabook-blue/nets.tpl | 15 - view/theme/diabook/diabook-blue/oembed_video.tpl | 4 - view/theme/diabook/diabook-blue/photo_item.tpl | 65 --- view/theme/diabook/diabook-blue/photo_view.tpl | 37 -- view/theme/diabook/diabook-blue/profile_side.tpl | 21 - view/theme/diabook/diabook-blue/profile_vcard.tpl | 64 --- view/theme/diabook/diabook-blue/right_aside.tpl | 20 - view/theme/diabook/diabook-blue/screenshot.png | Bin 215811 -> 0 bytes view/theme/diabook/diabook-blue/search_item.tpl | 100 ----- view/theme/diabook/diabook-blue/style.php | 277 ------------ view/theme/diabook/diabook-blue/theme.php | 486 -------------------- view/theme/diabook/diabook-blue/theme_settings.tpl | 10 - view/theme/diabook/diabook-blue/wall_item.tpl | 100 ----- view/theme/diabook/diabook-blue/wallwall_item.tpl | 106 ----- view/theme/diabook/diabook-dark/admin_users.tpl | 88 ---- .../diabook/diabook-dark/ch_directory_item.tpl | 10 - view/theme/diabook/diabook-dark/comment_item.tpl | 41 -- view/theme/diabook/diabook-dark/communityhome.tpl | 86 ---- view/theme/diabook/diabook-dark/config.php | 84 ---- .../diabook/diabook-dark/contact_template.tpl | 25 -- view/theme/diabook/diabook-dark/directory_item.tpl | 11 - .../diabook/diabook-dark/generic_links_widget.tpl | 11 - view/theme/diabook/diabook-dark/group_side.tpl | 34 -- view/theme/diabook/diabook-dark/jot.tpl | 85 ---- view/theme/diabook/diabook-dark/js/README | 22 - .../diabook-dark/js/jquery.ae.image.resize.js | 69 --- .../diabook-dark/js/jquery.ae.image.resize.min.js | 1 - .../diabook-dark/js/jquery.autogrow.textarea.js | 46 -- .../theme/diabook/diabook-dark/js/jquery.cookie.js | 47 -- view/theme/diabook/diabook-dark/login.tpl | 33 -- view/theme/diabook/diabook-dark/mail_conv.tpl | 60 --- view/theme/diabook/diabook-dark/mail_display.tpl | 12 - view/theme/diabook/diabook-dark/mail_list.tpl | 8 - view/theme/diabook/diabook-dark/message_side.tpl | 10 - view/theme/diabook/diabook-dark/nav.tpl | 190 -------- view/theme/diabook/diabook-dark/nets.tpl | 15 - view/theme/diabook/diabook-dark/oembed_video.tpl | 4 - view/theme/diabook/diabook-dark/photo_item.tpl | 65 --- view/theme/diabook/diabook-dark/photo_view.tpl | 35 -- view/theme/diabook/diabook-dark/profile_side.tpl | 21 - view/theme/diabook/diabook-dark/profile_vcard.tpl | 64 --- view/theme/diabook/diabook-dark/right_aside.tpl | 20 - view/theme/diabook/diabook-dark/search_item.tpl | 100 ----- view/theme/diabook/diabook-dark/style.php | 277 ------------ view/theme/diabook/diabook-dark/theme.php | 488 --------------------- view/theme/diabook/diabook-dark/theme_settings.tpl | 10 - view/theme/diabook/diabook-dark/wall_item.tpl | 100 ----- view/theme/diabook/diabook-dark/wallwall_item.tpl | 106 ----- view/theme/diabook/diabook-green/admin_users.tpl | 88 ---- .../diabook/diabook-green/ch_directory_item.tpl | 10 - view/theme/diabook/diabook-green/comment_item.tpl | 41 -- view/theme/diabook/diabook-green/communityhome.tpl | 86 ---- view/theme/diabook/diabook-green/config.php | 84 ---- .../diabook/diabook-green/contact_template.tpl | 25 -- .../theme/diabook/diabook-green/directory_item.tpl | 11 - .../diabook/diabook-green/generic_links_widget.tpl | 11 - view/theme/diabook/diabook-green/group_side.tpl | 34 -- view/theme/diabook/diabook-green/jot.tpl | 85 ---- view/theme/diabook/diabook-green/js/README | 22 - .../diabook-green/js/jquery.ae.image.resize.js | 69 --- .../diabook-green/js/jquery.ae.image.resize.min.js | 1 - .../diabook-green/js/jquery.autogrow.textarea.js | 46 -- .../diabook/diabook-green/js/jquery.cookie.js | 47 -- view/theme/diabook/diabook-green/login.tpl | 33 -- view/theme/diabook/diabook-green/mail_conv.tpl | 60 --- view/theme/diabook/diabook-green/mail_display.tpl | 12 - view/theme/diabook/diabook-green/mail_list.tpl | 8 - view/theme/diabook/diabook-green/message_side.tpl | 10 - view/theme/diabook/diabook-green/nav.tpl | 190 -------- view/theme/diabook/diabook-green/nets.tpl | 15 - view/theme/diabook/diabook-green/oembed_video.tpl | 4 - view/theme/diabook/diabook-green/photo_item.tpl | 65 --- view/theme/diabook/diabook-green/photo_view.tpl | 35 -- view/theme/diabook/diabook-green/profile_side.tpl | 21 - view/theme/diabook/diabook-green/profile_vcard.tpl | 64 --- view/theme/diabook/diabook-green/right_aside.tpl | 20 - view/theme/diabook/diabook-green/screenshot.png | Bin 216868 -> 0 bytes view/theme/diabook/diabook-green/search_item.tpl | 100 ----- view/theme/diabook/diabook-green/style.php | 277 ------------ view/theme/diabook/diabook-green/theme.php | 488 --------------------- .../theme/diabook/diabook-green/theme_settings.tpl | 10 - view/theme/diabook/diabook-green/wall_item.tpl | 100 ----- view/theme/diabook/diabook-green/wallwall_item.tpl | 106 ----- view/theme/diabook/diabook-pink/admin_users.tpl | 88 ---- .../diabook/diabook-pink/ch_directory_item.tpl | 10 - view/theme/diabook/diabook-pink/comment_item.tpl | 41 -- view/theme/diabook/diabook-pink/communityhome.tpl | 86 ---- view/theme/diabook/diabook-pink/config.php | 84 ---- .../diabook/diabook-pink/contact_template.tpl | 25 -- view/theme/diabook/diabook-pink/directory_item.tpl | 11 - .../diabook/diabook-pink/generic_links_widget.tpl | 11 - view/theme/diabook/diabook-pink/group_side.tpl | 34 -- view/theme/diabook/diabook-pink/jot.tpl | 85 ---- view/theme/diabook/diabook-pink/js/README | 22 - .../diabook-pink/js/jquery.ae.image.resize.js | 69 --- .../diabook-pink/js/jquery.ae.image.resize.min.js | 1 - .../diabook-pink/js/jquery.autogrow.textarea.js | 46 -- .../theme/diabook/diabook-pink/js/jquery.cookie.js | 47 -- view/theme/diabook/diabook-pink/login.tpl | 33 -- view/theme/diabook/diabook-pink/mail_conv.tpl | 60 --- view/theme/diabook/diabook-pink/mail_display.tpl | 12 - view/theme/diabook/diabook-pink/mail_list.tpl | 8 - view/theme/diabook/diabook-pink/message_side.tpl | 10 - view/theme/diabook/diabook-pink/nav.tpl | 190 -------- view/theme/diabook/diabook-pink/nets.tpl | 15 - view/theme/diabook/diabook-pink/oembed_video.tpl | 4 - view/theme/diabook/diabook-pink/photo_item.tpl | 65 --- view/theme/diabook/diabook-pink/photo_view.tpl | 35 -- view/theme/diabook/diabook-pink/profile_side.tpl | 21 - view/theme/diabook/diabook-pink/profile_vcard.tpl | 64 --- view/theme/diabook/diabook-pink/right_aside.tpl | 20 - view/theme/diabook/diabook-pink/screenshot.png | Bin 216868 -> 0 bytes view/theme/diabook/diabook-pink/search_item.tpl | 100 ----- view/theme/diabook/diabook-pink/style.php | 277 ------------ view/theme/diabook/diabook-pink/theme.php | 488 --------------------- view/theme/diabook/diabook-pink/theme_settings.tpl | 10 - view/theme/diabook/diabook-pink/wall_item.tpl | 100 ----- view/theme/diabook/diabook-pink/wallwall_item.tpl | 106 ----- view/theme/diabook/diabook-red/admin_users.tpl | 88 ---- .../diabook/diabook-red/ch_directory_item.tpl | 10 - view/theme/diabook/diabook-red/comment_item.tpl | 41 -- view/theme/diabook/diabook-red/communityhome.tpl | 87 ---- view/theme/diabook/diabook-red/config.php | 84 ---- .../theme/diabook/diabook-red/contact_template.tpl | 25 -- view/theme/diabook/diabook-red/directory_item.tpl | 11 - .../diabook/diabook-red/generic_links_widget.tpl | 11 - view/theme/diabook/diabook-red/group_side.tpl | 34 -- view/theme/diabook/diabook-red/jot.tpl | 85 ---- view/theme/diabook/diabook-red/js/README | 22 - .../diabook-red/js/jquery.ae.image.resize.js | 69 --- .../diabook-red/js/jquery.ae.image.resize.min.js | 1 - .../diabook-red/js/jquery.autogrow.textarea.js | 46 -- view/theme/diabook/diabook-red/js/jquery.cookie.js | 47 -- view/theme/diabook/diabook-red/login.tpl | 33 -- view/theme/diabook/diabook-red/mail_conv.tpl | 60 --- view/theme/diabook/diabook-red/mail_display.tpl | 12 - view/theme/diabook/diabook-red/mail_list.tpl | 8 - view/theme/diabook/diabook-red/message_side.tpl | 10 - view/theme/diabook/diabook-red/nav.tpl | 190 -------- view/theme/diabook/diabook-red/nets.tpl | 15 - view/theme/diabook/diabook-red/oembed_video.tpl | 4 - view/theme/diabook/diabook-red/photo_item.tpl | 65 --- view/theme/diabook/diabook-red/photo_view.tpl | 36 -- view/theme/diabook/diabook-red/profile_side.tpl | 21 - view/theme/diabook/diabook-red/profile_vcard.tpl | 64 --- view/theme/diabook/diabook-red/right_aside.tpl | 20 - view/theme/diabook/diabook-red/screenshot.png | Bin 217403 -> 0 bytes view/theme/diabook/diabook-red/search_item.tpl | 100 ----- view/theme/diabook/diabook-red/style.php | 277 ------------ view/theme/diabook/diabook-red/theme.php | 483 -------------------- view/theme/diabook/diabook-red/theme_settings.tpl | 10 - view/theme/diabook/diabook-red/wall_item.tpl | 100 ----- view/theme/diabook/diabook-red/wallwall_item.tpl | 106 ----- view/theme/diabook/group_side.tpl | 2 +- view/theme/diabook/nets.tpl | 6 +- 211 files changed, 5 insertions(+), 13669 deletions(-) delete mode 100644 view/theme/diabook/diabook-aerith/admin_users.tpl delete mode 100755 view/theme/diabook/diabook-aerith/ch_directory_item.tpl delete mode 100644 view/theme/diabook/diabook-aerith/comment_item.tpl delete mode 100644 view/theme/diabook/diabook-aerith/communityhome.tpl delete mode 100644 view/theme/diabook/diabook-aerith/config.php delete mode 100644 view/theme/diabook/diabook-aerith/contact_template.tpl delete mode 100755 view/theme/diabook/diabook-aerith/directory_item.tpl delete mode 100644 view/theme/diabook/diabook-aerith/generic_links_widget.tpl delete mode 100755 view/theme/diabook/diabook-aerith/group_side.tpl delete mode 100644 view/theme/diabook/diabook-aerith/jot.tpl delete mode 100644 view/theme/diabook/diabook-aerith/js/README delete mode 100644 view/theme/diabook/diabook-aerith/js/jquery.ae.image.resize.js delete mode 100644 view/theme/diabook/diabook-aerith/js/jquery.ae.image.resize.min.js delete mode 100644 view/theme/diabook/diabook-aerith/js/jquery.autogrow.textarea.js delete mode 100644 view/theme/diabook/diabook-aerith/js/jquery.cookie.js delete mode 100644 view/theme/diabook/diabook-aerith/login.tpl delete mode 100644 view/theme/diabook/diabook-aerith/mail_conv.tpl delete mode 100644 view/theme/diabook/diabook-aerith/mail_display.tpl delete mode 100644 view/theme/diabook/diabook-aerith/mail_list.tpl delete mode 100644 view/theme/diabook/diabook-aerith/message_side.tpl delete mode 100644 view/theme/diabook/diabook-aerith/nav.tpl delete mode 100644 view/theme/diabook/diabook-aerith/nets.tpl delete mode 100644 view/theme/diabook/diabook-aerith/oembed_video.tpl delete mode 100644 view/theme/diabook/diabook-aerith/photo_item.tpl delete mode 100644 view/theme/diabook/diabook-aerith/photo_view.tpl delete mode 100644 view/theme/diabook/diabook-aerith/profile_side.tpl delete mode 100644 view/theme/diabook/diabook-aerith/profile_vcard.tpl delete mode 100644 view/theme/diabook/diabook-aerith/right_aside.tpl delete mode 100644 view/theme/diabook/diabook-aerith/screenshot.png delete mode 100644 view/theme/diabook/diabook-aerith/search_item.tpl delete mode 100644 view/theme/diabook/diabook-aerith/style.php delete mode 100644 view/theme/diabook/diabook-aerith/theme.php delete mode 100644 view/theme/diabook/diabook-aerith/theme_settings.tpl delete mode 100644 view/theme/diabook/diabook-aerith/wall_item.tpl delete mode 100644 view/theme/diabook/diabook-aerith/wallwall_item.tpl delete mode 100644 view/theme/diabook/diabook-blue/admin_users.tpl delete mode 100755 view/theme/diabook/diabook-blue/ch_directory_item.tpl delete mode 100644 view/theme/diabook/diabook-blue/comment_item.tpl delete mode 100644 view/theme/diabook/diabook-blue/communityhome.tpl delete mode 100644 view/theme/diabook/diabook-blue/config.php delete mode 100644 view/theme/diabook/diabook-blue/contact_template.tpl delete mode 100755 view/theme/diabook/diabook-blue/directory_item.tpl delete mode 100644 view/theme/diabook/diabook-blue/generic_links_widget.tpl delete mode 100755 view/theme/diabook/diabook-blue/group_side.tpl delete mode 100644 view/theme/diabook/diabook-blue/jot.tpl delete mode 100644 view/theme/diabook/diabook-blue/js/README delete mode 100644 view/theme/diabook/diabook-blue/js/jquery.ae.image.resize.js delete mode 100644 view/theme/diabook/diabook-blue/js/jquery.ae.image.resize.min.js delete mode 100644 view/theme/diabook/diabook-blue/js/jquery.autogrow.textarea.js delete mode 100644 view/theme/diabook/diabook-blue/js/jquery.cookie.js delete mode 100644 view/theme/diabook/diabook-blue/login.tpl delete mode 100644 view/theme/diabook/diabook-blue/mail_conv.tpl delete mode 100644 view/theme/diabook/diabook-blue/mail_display.tpl delete mode 100644 view/theme/diabook/diabook-blue/mail_list.tpl delete mode 100644 view/theme/diabook/diabook-blue/message_side.tpl delete mode 100644 view/theme/diabook/diabook-blue/nav.tpl delete mode 100644 view/theme/diabook/diabook-blue/nets.tpl delete mode 100644 view/theme/diabook/diabook-blue/oembed_video.tpl delete mode 100644 view/theme/diabook/diabook-blue/photo_item.tpl delete mode 100644 view/theme/diabook/diabook-blue/photo_view.tpl delete mode 100644 view/theme/diabook/diabook-blue/profile_side.tpl delete mode 100644 view/theme/diabook/diabook-blue/profile_vcard.tpl delete mode 100644 view/theme/diabook/diabook-blue/right_aside.tpl delete mode 100644 view/theme/diabook/diabook-blue/screenshot.png delete mode 100644 view/theme/diabook/diabook-blue/search_item.tpl delete mode 100644 view/theme/diabook/diabook-blue/style.php delete mode 100644 view/theme/diabook/diabook-blue/theme.php delete mode 100644 view/theme/diabook/diabook-blue/theme_settings.tpl delete mode 100644 view/theme/diabook/diabook-blue/wall_item.tpl delete mode 100644 view/theme/diabook/diabook-blue/wallwall_item.tpl delete mode 100644 view/theme/diabook/diabook-dark/admin_users.tpl delete mode 100755 view/theme/diabook/diabook-dark/ch_directory_item.tpl delete mode 100644 view/theme/diabook/diabook-dark/comment_item.tpl delete mode 100644 view/theme/diabook/diabook-dark/communityhome.tpl delete mode 100644 view/theme/diabook/diabook-dark/config.php delete mode 100644 view/theme/diabook/diabook-dark/contact_template.tpl delete mode 100755 view/theme/diabook/diabook-dark/directory_item.tpl delete mode 100644 view/theme/diabook/diabook-dark/generic_links_widget.tpl delete mode 100755 view/theme/diabook/diabook-dark/group_side.tpl delete mode 100644 view/theme/diabook/diabook-dark/jot.tpl delete mode 100644 view/theme/diabook/diabook-dark/js/README delete mode 100644 view/theme/diabook/diabook-dark/js/jquery.ae.image.resize.js delete mode 100644 view/theme/diabook/diabook-dark/js/jquery.ae.image.resize.min.js delete mode 100644 view/theme/diabook/diabook-dark/js/jquery.autogrow.textarea.js delete mode 100644 view/theme/diabook/diabook-dark/js/jquery.cookie.js delete mode 100644 view/theme/diabook/diabook-dark/login.tpl delete mode 100644 view/theme/diabook/diabook-dark/mail_conv.tpl delete mode 100644 view/theme/diabook/diabook-dark/mail_display.tpl delete mode 100644 view/theme/diabook/diabook-dark/mail_list.tpl delete mode 100644 view/theme/diabook/diabook-dark/message_side.tpl delete mode 100644 view/theme/diabook/diabook-dark/nav.tpl delete mode 100644 view/theme/diabook/diabook-dark/nets.tpl delete mode 100644 view/theme/diabook/diabook-dark/oembed_video.tpl delete mode 100644 view/theme/diabook/diabook-dark/photo_item.tpl delete mode 100644 view/theme/diabook/diabook-dark/photo_view.tpl delete mode 100644 view/theme/diabook/diabook-dark/profile_side.tpl delete mode 100644 view/theme/diabook/diabook-dark/profile_vcard.tpl delete mode 100644 view/theme/diabook/diabook-dark/right_aside.tpl delete mode 100644 view/theme/diabook/diabook-dark/search_item.tpl delete mode 100644 view/theme/diabook/diabook-dark/style.php delete mode 100644 view/theme/diabook/diabook-dark/theme.php delete mode 100644 view/theme/diabook/diabook-dark/theme_settings.tpl delete mode 100644 view/theme/diabook/diabook-dark/wall_item.tpl delete mode 100644 view/theme/diabook/diabook-dark/wallwall_item.tpl delete mode 100644 view/theme/diabook/diabook-green/admin_users.tpl delete mode 100755 view/theme/diabook/diabook-green/ch_directory_item.tpl delete mode 100644 view/theme/diabook/diabook-green/comment_item.tpl delete mode 100644 view/theme/diabook/diabook-green/communityhome.tpl delete mode 100644 view/theme/diabook/diabook-green/config.php delete mode 100644 view/theme/diabook/diabook-green/contact_template.tpl delete mode 100755 view/theme/diabook/diabook-green/directory_item.tpl delete mode 100644 view/theme/diabook/diabook-green/generic_links_widget.tpl delete mode 100755 view/theme/diabook/diabook-green/group_side.tpl delete mode 100644 view/theme/diabook/diabook-green/jot.tpl delete mode 100644 view/theme/diabook/diabook-green/js/README delete mode 100644 view/theme/diabook/diabook-green/js/jquery.ae.image.resize.js delete mode 100644 view/theme/diabook/diabook-green/js/jquery.ae.image.resize.min.js delete mode 100644 view/theme/diabook/diabook-green/js/jquery.autogrow.textarea.js delete mode 100644 view/theme/diabook/diabook-green/js/jquery.cookie.js delete mode 100644 view/theme/diabook/diabook-green/login.tpl delete mode 100644 view/theme/diabook/diabook-green/mail_conv.tpl delete mode 100644 view/theme/diabook/diabook-green/mail_display.tpl delete mode 100644 view/theme/diabook/diabook-green/mail_list.tpl delete mode 100644 view/theme/diabook/diabook-green/message_side.tpl delete mode 100644 view/theme/diabook/diabook-green/nav.tpl delete mode 100644 view/theme/diabook/diabook-green/nets.tpl delete mode 100644 view/theme/diabook/diabook-green/oembed_video.tpl delete mode 100644 view/theme/diabook/diabook-green/photo_item.tpl delete mode 100644 view/theme/diabook/diabook-green/photo_view.tpl delete mode 100644 view/theme/diabook/diabook-green/profile_side.tpl delete mode 100644 view/theme/diabook/diabook-green/profile_vcard.tpl delete mode 100644 view/theme/diabook/diabook-green/right_aside.tpl delete mode 100644 view/theme/diabook/diabook-green/screenshot.png delete mode 100644 view/theme/diabook/diabook-green/search_item.tpl delete mode 100644 view/theme/diabook/diabook-green/style.php delete mode 100644 view/theme/diabook/diabook-green/theme.php delete mode 100644 view/theme/diabook/diabook-green/theme_settings.tpl delete mode 100644 view/theme/diabook/diabook-green/wall_item.tpl delete mode 100644 view/theme/diabook/diabook-green/wallwall_item.tpl delete mode 100644 view/theme/diabook/diabook-pink/admin_users.tpl delete mode 100755 view/theme/diabook/diabook-pink/ch_directory_item.tpl delete mode 100644 view/theme/diabook/diabook-pink/comment_item.tpl delete mode 100644 view/theme/diabook/diabook-pink/communityhome.tpl delete mode 100644 view/theme/diabook/diabook-pink/config.php delete mode 100644 view/theme/diabook/diabook-pink/contact_template.tpl delete mode 100755 view/theme/diabook/diabook-pink/directory_item.tpl delete mode 100644 view/theme/diabook/diabook-pink/generic_links_widget.tpl delete mode 100755 view/theme/diabook/diabook-pink/group_side.tpl delete mode 100644 view/theme/diabook/diabook-pink/jot.tpl delete mode 100644 view/theme/diabook/diabook-pink/js/README delete mode 100644 view/theme/diabook/diabook-pink/js/jquery.ae.image.resize.js delete mode 100644 view/theme/diabook/diabook-pink/js/jquery.ae.image.resize.min.js delete mode 100644 view/theme/diabook/diabook-pink/js/jquery.autogrow.textarea.js delete mode 100644 view/theme/diabook/diabook-pink/js/jquery.cookie.js delete mode 100644 view/theme/diabook/diabook-pink/login.tpl delete mode 100644 view/theme/diabook/diabook-pink/mail_conv.tpl delete mode 100644 view/theme/diabook/diabook-pink/mail_display.tpl delete mode 100644 view/theme/diabook/diabook-pink/mail_list.tpl delete mode 100644 view/theme/diabook/diabook-pink/message_side.tpl delete mode 100644 view/theme/diabook/diabook-pink/nav.tpl delete mode 100644 view/theme/diabook/diabook-pink/nets.tpl delete mode 100644 view/theme/diabook/diabook-pink/oembed_video.tpl delete mode 100644 view/theme/diabook/diabook-pink/photo_item.tpl delete mode 100644 view/theme/diabook/diabook-pink/photo_view.tpl delete mode 100644 view/theme/diabook/diabook-pink/profile_side.tpl delete mode 100644 view/theme/diabook/diabook-pink/profile_vcard.tpl delete mode 100644 view/theme/diabook/diabook-pink/right_aside.tpl delete mode 100644 view/theme/diabook/diabook-pink/screenshot.png delete mode 100644 view/theme/diabook/diabook-pink/search_item.tpl delete mode 100644 view/theme/diabook/diabook-pink/style.php delete mode 100644 view/theme/diabook/diabook-pink/theme.php delete mode 100644 view/theme/diabook/diabook-pink/theme_settings.tpl delete mode 100644 view/theme/diabook/diabook-pink/wall_item.tpl delete mode 100644 view/theme/diabook/diabook-pink/wallwall_item.tpl delete mode 100644 view/theme/diabook/diabook-red/admin_users.tpl delete mode 100755 view/theme/diabook/diabook-red/ch_directory_item.tpl delete mode 100644 view/theme/diabook/diabook-red/comment_item.tpl delete mode 100644 view/theme/diabook/diabook-red/communityhome.tpl delete mode 100644 view/theme/diabook/diabook-red/config.php delete mode 100644 view/theme/diabook/diabook-red/contact_template.tpl delete mode 100755 view/theme/diabook/diabook-red/directory_item.tpl delete mode 100644 view/theme/diabook/diabook-red/generic_links_widget.tpl delete mode 100755 view/theme/diabook/diabook-red/group_side.tpl delete mode 100644 view/theme/diabook/diabook-red/jot.tpl delete mode 100644 view/theme/diabook/diabook-red/js/README delete mode 100644 view/theme/diabook/diabook-red/js/jquery.ae.image.resize.js delete mode 100644 view/theme/diabook/diabook-red/js/jquery.ae.image.resize.min.js delete mode 100644 view/theme/diabook/diabook-red/js/jquery.autogrow.textarea.js delete mode 100644 view/theme/diabook/diabook-red/js/jquery.cookie.js delete mode 100644 view/theme/diabook/diabook-red/login.tpl delete mode 100644 view/theme/diabook/diabook-red/mail_conv.tpl delete mode 100644 view/theme/diabook/diabook-red/mail_display.tpl delete mode 100644 view/theme/diabook/diabook-red/mail_list.tpl delete mode 100644 view/theme/diabook/diabook-red/message_side.tpl delete mode 100644 view/theme/diabook/diabook-red/nav.tpl delete mode 100644 view/theme/diabook/diabook-red/nets.tpl delete mode 100644 view/theme/diabook/diabook-red/oembed_video.tpl delete mode 100644 view/theme/diabook/diabook-red/photo_item.tpl delete mode 100644 view/theme/diabook/diabook-red/photo_view.tpl delete mode 100644 view/theme/diabook/diabook-red/profile_side.tpl delete mode 100644 view/theme/diabook/diabook-red/profile_vcard.tpl delete mode 100644 view/theme/diabook/diabook-red/right_aside.tpl delete mode 100644 view/theme/diabook/diabook-red/screenshot.png delete mode 100644 view/theme/diabook/diabook-red/search_item.tpl delete mode 100644 view/theme/diabook/diabook-red/style.php delete mode 100644 view/theme/diabook/diabook-red/theme.php delete mode 100644 view/theme/diabook/diabook-red/theme_settings.tpl delete mode 100644 view/theme/diabook/diabook-red/wall_item.tpl delete mode 100644 view/theme/diabook/diabook-red/wallwall_item.tpl (limited to 'view') diff --git a/view/theme/diabook/diabook-aerith/admin_users.tpl b/view/theme/diabook/diabook-aerith/admin_users.tpl deleted file mode 100644 index 8aabb51ec..000000000 --- a/view/theme/diabook/diabook-aerith/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 - - -
-
$select_all
-
- {{ 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 - - -
-
$select_all
-
- {{ else }} - NO USERS?!? - {{ endif }} - -
diff --git a/view/theme/diabook/diabook-aerith/ch_directory_item.tpl b/view/theme/diabook/diabook-aerith/ch_directory_item.tpl deleted file mode 100755 index db1936e4b..000000000 --- a/view/theme/diabook/diabook-aerith/ch_directory_item.tpl +++ /dev/null @@ -1,10 +0,0 @@ - -
-
-
- - $alt-text - -
-
-
diff --git a/view/theme/diabook/diabook-aerith/comment_item.tpl b/view/theme/diabook/diabook-aerith/comment_item.tpl deleted file mode 100644 index ee4dfba45..000000000 --- a/view/theme/diabook/diabook-aerith/comment_item.tpl +++ /dev/null @@ -1,41 +0,0 @@ -
-
- - - - - - - -
- $mytitle -
-
- - img - url - video - u - i - b - quote - {{ if $qcomment }} - - {{ endif }} - -
- - -
-
- -
diff --git a/view/theme/diabook/diabook-aerith/communityhome.tpl b/view/theme/diabook/diabook-aerith/communityhome.tpl deleted file mode 100644 index 875d83f1b..000000000 --- a/view/theme/diabook/diabook-aerith/communityhome.tpl +++ /dev/null @@ -1,86 +0,0 @@ -
-{{ if $page }} -
$page
-{{ endif }} -
- -
-{{ if $lastusers_title }} -

$helpers.title.1

-NewHere
-Friendica Support
-Let's talk
-Local Friendica -{{ endif }} -
- -
-{{ if $lastusers_title }} -

$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 }} -
diff --git a/view/theme/diabook/diabook-aerith/config.php b/view/theme/diabook/diabook-aerith/config.php deleted file mode 100644 index 0083a4df7..000000000 --- a/view/theme/diabook/diabook-aerith/config.php +++ /dev/null @@ -1,84 +0,0 @@ -"1.3", - "---"=>"---", - "1.5"=>"1.5", - "1.4"=>"1.4", - "1.2"=>"1.2", - "1.1"=>"1.1", - ); - - $font_sizes = array( - '13'=>'13', - "---"=>"---", - "15"=>"15", - '14'=>'14', - '13.5'=>'13.5', - '12.5'=>'12.5', - '12'=>'12', - ); - $resolutions = array( - 'normal'=>'normal', - 'wide'=>'wide', - ); - - - - $t = file_get_contents( dirname(__file__). "/theme_settings.tpl" ); - $o .= replace_macros($t, array( - '$submit' => t('Submit'), - '$baseurl' => $a->get_baseurl(), - '$title' => t("Theme settings"), - '$font_size' => array('diabook-aerith_font_size', t('Set font-size for posts and comments'), $font_size, '', $font_sizes), - '$line_height' => array('diabook-aerith_line_height', t('Set line-height for posts and comments'), $line_height, '', $line_heights), - '$resolution' => array('diabook-aerith_resolution', t('Set resolution for middle column'), $resolution, '', $resolutions), - )); - return $o; -} diff --git a/view/theme/diabook/diabook-aerith/contact_template.tpl b/view/theme/diabook/diabook-aerith/contact_template.tpl deleted file mode 100644 index 48930b48a..000000000 --- a/view/theme/diabook/diabook-aerith/contact_template.tpl +++ /dev/null @@ -1,25 +0,0 @@ - -
-
-
- - $contact.name - - {{ if $contact.photo_menu }} - menu -
-
    - $contact.photo_menu -
-
- {{ endif }} -
- -
-
-
$contact.name
- -
-
diff --git a/view/theme/diabook/diabook-aerith/directory_item.tpl b/view/theme/diabook/diabook-aerith/directory_item.tpl deleted file mode 100755 index bc2af16c2..000000000 --- a/view/theme/diabook/diabook-aerith/directory_item.tpl +++ /dev/null @@ -1,11 +0,0 @@ - -
-
-
- - $alt-text - -
-
-
$name
-
diff --git a/view/theme/diabook/diabook-aerith/generic_links_widget.tpl b/view/theme/diabook/diabook-aerith/generic_links_widget.tpl deleted file mode 100644 index 001c1395e..000000000 --- a/view/theme/diabook/diabook-aerith/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/diabook-aerith/group_side.tpl b/view/theme/diabook/diabook-aerith/group_side.tpl deleted file mode 100755 index 8600402f2..000000000 --- a/view/theme/diabook/diabook-aerith/group_side.tpl +++ /dev/null @@ -1,34 +0,0 @@ -
-
-

$title

-
- - - {{ if $ungrouped }} - - {{ endif }} -
- diff --git a/view/theme/diabook/diabook-aerith/jot.tpl b/view/theme/diabook/diabook-aerith/jot.tpl deleted file mode 100644 index 0928c9f36..000000000 --- a/view/theme/diabook/diabook-aerith/jot.tpl +++ /dev/null @@ -1,85 +0,0 @@ - -
-
-
 
-
-
- -
- - - - - - - - -
-
- - - - -
- -
-
-
-
-
-
- - -
- -
-
- -
-
- -
- - - - - $preview - -
- $bang -
- - -
- $jotplugins -
- -
- -
- -
-
- - - -
-
- $acl -
-
$emailcc
-
- $jotnets -
-
- - - - -
-
- {{ if $content }}{{ endif }} diff --git a/view/theme/diabook/diabook-aerith/js/README b/view/theme/diabook/diabook-aerith/js/README deleted file mode 100644 index c93b2118e..000000000 --- a/view/theme/diabook/diabook-aerith/js/README +++ /dev/null @@ -1,22 +0,0 @@ -jQuery Resize Plugin Demo - -Version: v2.1.1 -Author: Adeel Ejaz (http://adeelejaz.com/) -License: Dual licensed under MIT and GPL licenses. - -Introduction -aeImageResize is a jQuery plugin to dynamically resize the images without distorting the proportions. - -Usage: -.aeImageResize( height, width ) - -height -An integer representing the maximum height for the image. - -width -An integer representing the maximum width for the image. - -Example -$(function() { - $( ".resizeme" ).aeImageResize({ height: 250, width: 250 }); -}); \ No newline at end of file diff --git a/view/theme/diabook/diabook-aerith/js/jquery.ae.image.resize.js b/view/theme/diabook/diabook-aerith/js/jquery.ae.image.resize.js deleted file mode 100644 index bac09cd45..000000000 --- a/view/theme/diabook/diabook-aerith/js/jquery.ae.image.resize.js +++ /dev/null @@ -1,69 +0,0 @@ -(function( $ ) { - - $.fn.aeImageResize = function( params ) { - - var aspectRatio = 0 - // Nasty I know but it's done only once, so not too bad I guess - // Alternate suggestions welcome :) - , isIE6 = $.browser.msie && (6 == ~~ $.browser.version) - ; - - // We cannot do much unless we have one of these - if ( !params.height && !params.width ) { - return this; - } - - // Calculate aspect ratio now, if possible - if ( params.height && params.width ) { - aspectRatio = params.width / params.height; - } - - // Attach handler to load - // Handler is executed just once per element - // Load event required for Webkit browsers - return this.one( "load", function() { - - // Remove all attributes and CSS rules - this.removeAttribute( "height" ); - this.removeAttribute( "width" ); - this.style.height = this.style.width = ""; - - var imgHeight = this.height - , imgWidth = this.width - , imgAspectRatio = imgWidth / imgHeight - , bxHeight = params.height - , bxWidth = params.width - , bxAspectRatio = aspectRatio; - - // Work the magic! - // If one parameter is missing, we just force calculate it - if ( !bxAspectRatio ) { - if ( bxHeight ) { - bxAspectRatio = imgAspectRatio + 1; - } else { - bxAspectRatio = imgAspectRatio - 1; - } - } - - // Only resize the images that need resizing - if ( (bxHeight && imgHeight > bxHeight) || (bxWidth && imgWidth > bxWidth) ) { - - if ( imgAspectRatio > bxAspectRatio ) { - bxHeight = ~~ ( imgHeight / imgWidth * bxWidth ); - } else { - bxWidth = ~~ ( imgWidth / imgHeight * bxHeight ); - } - - this.height = bxHeight; - this.width = bxWidth; - } - }) - .each(function() { - - // Trigger load event (for Gecko and MSIE) - if ( this.complete || isIE6 ) { - $( this ).trigger( "load" ); - } - }); - }; -})( jQuery ); \ No newline at end of file diff --git a/view/theme/diabook/diabook-aerith/js/jquery.ae.image.resize.min.js b/view/theme/diabook/diabook-aerith/js/jquery.ae.image.resize.min.js deleted file mode 100644 index 16c30b123..000000000 --- a/view/theme/diabook/diabook-aerith/js/jquery.ae.image.resize.min.js +++ /dev/null @@ -1 +0,0 @@ -(function(d){d.fn.aeImageResize=function(a){var i=0,j=d.browser.msie&&6==~~d.browser.version;if(!a.height&&!a.width)return this;if(a.height&&a.width)i=a.width/a.height;return this.one("load",function(){this.removeAttribute("height");this.removeAttribute("width");this.style.height=this.style.width="";var e=this.height,f=this.width,g=f/e,b=a.height,c=a.width,h=i;h||(h=b?g+1:g-1);if(b&&e>b||c&&f>c){if(g>h)b=~~(e/f*c);else c=~~(f/e*b);this.height=b;this.width=c}}).each(function(){if(this.complete||j)d(this).trigger("load")})}})(jQuery); \ No newline at end of file diff --git a/view/theme/diabook/diabook-aerith/js/jquery.autogrow.textarea.js b/view/theme/diabook/diabook-aerith/js/jquery.autogrow.textarea.js deleted file mode 100644 index 806e34f51..000000000 --- a/view/theme/diabook/diabook-aerith/js/jquery.autogrow.textarea.js +++ /dev/null @@ -1,46 +0,0 @@ -(function($) { - - /* - * Auto-growing textareas; technique ripped from Facebook - */ - $.fn.autogrow = function(options) { - - this.filter('textarea').each(function() { - - var $this = $(this), - minHeight = $this.height(), - lineHeight = $this.css('lineHeight'); - - var shadow = $('
').css({ - position: 'absolute', - top: -10000, - left: -10000, - width: $(this).width(), - fontSize: $this.css('fontSize'), - fontFamily: $this.css('fontFamily'), - lineHeight: $this.css('lineHeight'), - resize: 'none' - }).appendTo(document.body); - - var update = function() { - - var val = this.value.replace(//g, '>') - .replace(/&/g, '&') - .replace(/\n/g, '
'); - - shadow.html(val); - $(this).css('height', Math.max(shadow.height() + 20, minHeight)); - } - - $(this).change(update).keyup(update).keydown(update); - - update.apply(this); - - }); - - return this; - - } - -})(jQuery); \ No newline at end of file diff --git a/view/theme/diabook/diabook-aerith/js/jquery.cookie.js b/view/theme/diabook/diabook-aerith/js/jquery.cookie.js deleted file mode 100644 index 6d5974a2c..000000000 --- a/view/theme/diabook/diabook-aerith/js/jquery.cookie.js +++ /dev/null @@ -1,47 +0,0 @@ -/*! - * jQuery Cookie Plugin - * https://github.com/carhartl/jquery-cookie - * - * Copyright 2011, Klaus Hartl - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://www.opensource.org/licenses/mit-license.php - * http://www.opensource.org/licenses/GPL-2.0 - */ -(function($) { - $.cookie = function(key, value, options) { - - // key and at least value given, set cookie... - if (arguments.length > 1 && (!/Object/.test(Object.prototype.toString.call(value)) || value === null || value === undefined)) { - options = $.extend({}, options); - - if (value === null || value === undefined) { - options.expires = -1; - } - - if (typeof options.expires === 'number') { - var days = options.expires, t = options.expires = new Date(); - t.setDate(t.getDate() + days); - } - - value = String(value); - - return (document.cookie = [ - encodeURIComponent(key), '=', options.raw ? value : encodeURIComponent(value), - options.expires ? '; expires=' + options.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE - options.path ? '; path=' + options.path : '', - options.domain ? '; domain=' + options.domain : '', - options.secure ? '; secure' : '' - ].join('')); - } - - // key and possibly options given, get cookie... - options = value || {}; - var decode = options.raw ? function(s) { return s; } : decodeURIComponent; - - var pairs = document.cookie.split('; '); - for (var i = 0, pair; pair = pairs[i] && pairs[i].split('='); i++) { - if (decode(pair[0]) === key) return decode(pair[1] || ''); // IE saves cookies with empty string as "c; ", e.g. without "=" as opposed to EOMB, thus pair[1] may be undefined - } - return null; - }; -})(jQuery); diff --git a/view/theme/diabook/diabook-aerith/login.tpl b/view/theme/diabook/diabook-aerith/login.tpl deleted file mode 100644 index efa7c2d6d..000000000 --- a/view/theme/diabook/diabook-aerith/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/diabook-aerith/mail_conv.tpl b/view/theme/diabook/diabook-aerith/mail_conv.tpl deleted file mode 100644 index 989f17878..000000000 --- a/view/theme/diabook/diabook-aerith/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/diabook/diabook-aerith/mail_display.tpl b/view/theme/diabook/diabook-aerith/mail_display.tpl deleted file mode 100644 index 8b82e95c6..000000000 --- a/view/theme/diabook/diabook-aerith/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/diabook-aerith/mail_list.tpl b/view/theme/diabook/diabook-aerith/mail_list.tpl deleted file mode 100644 index 6bc6c84f6..000000000 --- a/view/theme/diabook/diabook-aerith/mail_list.tpl +++ /dev/null @@ -1,8 +0,0 @@ -
- $subject - $from_name - $date - $count - - -
diff --git a/view/theme/diabook/diabook-aerith/message_side.tpl b/view/theme/diabook/diabook-aerith/message_side.tpl deleted file mode 100644 index 9f1587096..000000000 --- a/view/theme/diabook/diabook-aerith/message_side.tpl +++ /dev/null @@ -1,10 +0,0 @@ -
- - -
    - {{ for $tabs as $t }} -
  • $t.label
    • - {{ endfor }} -
- -
diff --git a/view/theme/diabook/diabook-aerith/nav.tpl b/view/theme/diabook/diabook-aerith/nav.tpl deleted file mode 100644 index e3aabaa8b..000000000 --- a/view/theme/diabook/diabook-aerith/nav.tpl +++ /dev/null @@ -1,190 +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/diabook-aerith/nets.tpl b/view/theme/diabook/diabook-aerith/nets.tpl deleted file mode 100644 index be25ddee1..000000000 --- a/view/theme/diabook/diabook-aerith/nets.tpl +++ /dev/null @@ -1,15 +0,0 @@ -
-

$title

-
$desc
- -
    -
  • - - $all
    • - {{ for $nets as $net }} -
  • - - $net.name
    • - {{ endfor }} -
-
diff --git a/view/theme/diabook/diabook-aerith/oembed_video.tpl b/view/theme/diabook/diabook-aerith/oembed_video.tpl deleted file mode 100644 index d6d29f724..000000000 --- a/view/theme/diabook/diabook-aerith/oembed_video.tpl +++ /dev/null @@ -1,4 +0,0 @@ - - -
- diff --git a/view/theme/diabook/diabook-aerith/photo_item.tpl b/view/theme/diabook/diabook-aerith/photo_item.tpl deleted file mode 100644 index 5d65a89b7..000000000 --- a/view/theme/diabook/diabook-aerith/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/diabook-aerith/photo_view.tpl b/view/theme/diabook/diabook-aerith/photo_view.tpl deleted file mode 100644 index 071972e0c..000000000 --- a/view/theme/diabook/diabook-aerith/photo_view.tpl +++ /dev/null @@ -1,35 +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/diabook-aerith/profile_side.tpl b/view/theme/diabook/diabook-aerith/profile_side.tpl deleted file mode 100644 index 01e80f238..000000000 --- a/view/theme/diabook/diabook-aerith/profile_side.tpl +++ /dev/null @@ -1,21 +0,0 @@ - - - diff --git a/view/theme/diabook/diabook-aerith/profile_vcard.tpl b/view/theme/diabook/diabook-aerith/profile_vcard.tpl deleted file mode 100644 index 6fcffcc9b..000000000 --- a/view/theme/diabook/diabook-aerith/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/diabook-aerith/right_aside.tpl b/view/theme/diabook/diabook-aerith/right_aside.tpl deleted file mode 100644 index a65677696..000000000 --- a/view/theme/diabook/diabook-aerith/right_aside.tpl +++ /dev/null @@ -1,20 +0,0 @@ - - - \ No newline at end of file diff --git a/view/theme/diabook/diabook-aerith/screenshot.png b/view/theme/diabook/diabook-aerith/screenshot.png deleted file mode 100644 index 4eee5be5a..000000000 Binary files a/view/theme/diabook/diabook-aerith/screenshot.png and /dev/null differ diff --git a/view/theme/diabook/diabook-aerith/search_item.tpl b/view/theme/diabook/diabook-aerith/search_item.tpl deleted file mode 100644 index 123834064..000000000 --- a/view/theme/diabook/diabook-aerith/search_item.tpl +++ /dev/null @@ -1,100 +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 -
-
-
-
-
-
- {{ 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.dropping }} - - $item.drop.delete - {{ endif }} - {{ if $item.edpost }} - - {{ endif }} -
-
$item.location 
-
-
-
-
- -
$item.dislike
-
-
- -
- $item.comment -
diff --git a/view/theme/diabook/diabook-aerith/style.php b/view/theme/diabook/diabook-aerith/style.php deleted file mode 100644 index b8c37fc96..000000000 --- a/view/theme/diabook/diabook-aerith/style.php +++ /dev/null @@ -1,277 +0,0 @@ -page['htmlhead'] .= sprintf('', $diabook_version); - - -//change css on network and profilepages -$cssFile = null; -$resolution=false; -$resolution = get_pconfig(local_user(), "diabook-aerith", "resolution"); -if ($resolution===false) $resolution="normal"; - -/** - * prints last community activity - */ -function diabook_aerith_community_info(){ - $a = get_app(); - - // last 12 users - $aside['$lastusers_title'] = t('Last users'); - $aside['$lastusers_items'] = array(); - $sql_extra = ""; - $publish = (get_config('system','publish_all') ? '' : " AND `publish` = 1 " ); - $order = " ORDER BY `register_date` DESC "; - - $r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname` - FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` - WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra $order LIMIT %d , %d ", - 0, - 9 - ); - $tpl = file_get_contents( dirname(__file__).'/ch_directory_item.tpl'); - if(count($r)) { - $photo = 'thumb'; - foreach($r as $rr) { - $profile_link = $a->get_baseurl() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']); - $entry = replace_macros($tpl,array( - '$id' => $rr['id'], - '$profile-link' => $profile_link, - '$photo' => $rr[$photo], - '$alt-text' => $rr['name'], - )); - $aside['$lastusers_items'][] = $entry; - } - } - - - // last 10 liked items - $aside['$like_title'] = t('Last likes'); - $aside['$like_items'] = array(); - $r = q("SELECT `T1`.`created`, `T1`.`liker`, `T1`.`liker-link`, `item`.* FROM - (SELECT `parent-uri`, `created`, `author-name` AS `liker`,`author-link` AS `liker-link` - FROM `item` WHERE `verb`='http://activitystrea.ms/schema/1.0/like' GROUP BY `parent-uri` ORDER BY `created` DESC) AS T1 - INNER JOIN `item` ON `item`.`uri`=`T1`.`parent-uri` - WHERE `T1`.`liker-link` LIKE '%s%%' OR `item`.`author-link` LIKE '%s%%' - GROUP BY `uri` - ORDER BY `T1`.`created` DESC - LIMIT 0,5", - $a->get_baseurl(),$a->get_baseurl() - ); - - foreach ($r as $rr) { - $author = '' . $rr['liker'] . ''; - $objauthor = '' . $rr['author-name'] . ''; - - //var_dump($rr['verb'],$rr['object-type']); killme(); - switch($rr['verb']){ - case 'http://activitystrea.ms/schema/1.0/post': - switch ($rr['object-type']){ - case 'http://activitystrea.ms/schema/1.0/event': - $post_type = t('event'); - break; - default: - $post_type = t('status'); - } - break; - default: - if ($rr['resource-id']){ - $post_type = t('photo'); - $m=array(); preg_match("/\[url=([^]]*)\]/", $rr['body'], $m); - $rr['plink'] = $m[1]; - } else { - $post_type = t('status'); - } - } - $plink = '' . $post_type . ''; - - $aside['$like_items'][] = sprintf( t('%1$s likes %2$s\'s %3$s'), $author, $objauthor, $plink); - - } - - - // last 12 photos - $aside['$photos_title'] = t('Last photos'); - $aside['$photos_items'] = array(); - $r = q("SELECT `photo`.`id`, `photo`.`resource-id`, `photo`.`scale`, `photo`.`desc`, `user`.`nickname`, `user`.`username` FROM - (SELECT `resource-id`, MAX(`scale`) as maxscale FROM `photo` - WHERE `profile`=0 AND `contact-id`=0 AND `album` NOT IN ('Contact Photos', '%s', 'Profile Photos', '%s') - AND `allow_cid`='' AND `allow_gid`='' AND `deny_cid`='' AND `deny_gid`='' GROUP BY `resource-id`) AS `t1` - INNER JOIN `photo` ON `photo`.`resource-id`=`t1`.`resource-id` AND `photo`.`scale` = `t1`.`maxscale`, - `user` - WHERE `user`.`uid` = `photo`.`uid` - AND `user`.`blockwall`=0 - AND `user`.`hidewall`=0 - ORDER BY `photo`.`edited` DESC - LIMIT 0, 9", - dbesc(t('Contact Photos')), - dbesc(t('Profile Photos')) - ); - if(count($r)) { - $tpl = file_get_contents( dirname(__file__).'/ch_directory_item.tpl'); - foreach($r as $rr) { - $photo_page = $a->get_baseurl() . '/photos/' . $rr['nickname'] . '/image/' . $rr['resource-id']; - $photo_url = $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['scale'] .'.jpg'; - - $entry = replace_macros($tpl,array( - '$id' => $rr['id'], - '$profile-link' => $photo_page, - '$photo' => $photo_url, - '$alt-text' => $rr['username']." : ".$rr['desc'], - )); - - $aside['$photos_items'][] = $entry; - } - } - - - - //nav FIND FRIENDS - if(local_user()) { - $nv = array(); - $nv['title'] = Array("", t('Find Friends'), "", ""); - $nv['directory'] = Array('directory', t('Local Directory'), "", ""); - $nv['global_directory'] = Array('http://dir.friendica.com/', t('Global Directory'), "", ""); - $nv['match'] = Array('match', t('Similar Interests'), "", ""); - $nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", ""); - $nv['invite'] = Array('invite', t('Invite Friends'), "", ""); - - $nv['search'] = '
- - - - - '; - - $aside['$nv'] = $nv; - }; - //Community Page - if(local_user()) { - $page = '
-
-

'.t("Community Pages").'

-
    '; - - $pagelist = array(); - - $contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact` - WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d - ORDER BY `name` ASC", - intval($a->user['uid']) - ); - - $pageD = array(); - - // Look if the profile is a community page - foreach($contacts as $contact) { - $pageD[] = array("url"=>$contact["url"], "name"=>$contact["name"], "id"=>$contact["id"], "micro"=>$contact['micro']); - }; - - - $contacts = $pageD; - - foreach($contacts as $contact) { - $page .= '
  • ' . $contact['url'] . ' '. - $contact["name"]."
    • "; - } - $page .= '
'; - //if (sizeof($contacts) > 0) - - $aside['$page'] = $page; - } - //END Community Page - //helpers - $helpers = array(); - $helpers['title'] = Array("", t('Help or @NewHere ?'), "", ""); - - $aside['$helpers'] = $helpers; - //end helpers - //connectable services - $con_services = array(); - $con_services['title'] = Array("", t('Connect Services'), "", ""); - - $aside['$con_services'] = $con_services; - //end connectable services - - - //get_baseurl - $url = $a->get_baseurl($ssl_state); - $aside['$url'] = $url; - - $tpl = file_get_contents(dirname(__file__).'/communityhome.tpl'); - $a->page['right_aside'] = replace_macros($tpl, $aside); - -} - - -//profile_side at networkpages -if ($a->argv[0] === "network" && local_user()){ - - // USER MENU - if(local_user()) { - - $r = q("SELECT micro FROM contact WHERE uid=%d AND self=1", intval($a->user['uid'])); - - $userinfo = array( - 'icon' => (count($r) ? $r[0]['micro']: $a->get_baseurl()."/images/default-profile-mm.jpg"), - 'name' => $a->user['username'], - ); - $ps = array('usermenu'=>array()); - $ps['usermenu']['status'] = Array('profile/' . $a->user['nickname'], t('Home'), "", t('Your posts and conversations')); - $ps['usermenu']['profile'] = Array('profile/' . $a->user['nickname']. '?tab=profile', t('Profile'), "", t('Your profile page')); - $ps['usermenu']['contacts'] = Array('contacts' , t('Contacts'), "", t('Your contacts')); - $ps['usermenu']['photos'] = Array('photos/' . $a->user['nickname'], t('Photos'), "", t('Your photos')); - $ps['usermenu']['events'] = Array('events/', t('Events'), "", t('Your events')); - $ps['usermenu']['notes'] = Array('notes/', t('Personal notes'), "", t('Your personal photos')); - $ps['usermenu']['community'] = Array('community/', t('Community'), "", ""); - $ps['usermenu']['pgroups'] = Array('http://dir.friendika.com/directory/forum', t('Community Pages'), "", ""); - - $tpl = get_markup_template('profile_side.tpl'); - - $a->page['aside'] .= replace_macros($tpl, array( - '$userinfo' => $userinfo, - '$ps' => $ps, - )); - - } - - $ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes']; - - if($ccCookie != "7") { - // COMMUNITY - diabook_aerith_community_info(); - - // CUSTOM CSS - if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/style-network.css";} - if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/style-network-wide.css";} - } -} - - - -//right_aside at profile pages -if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){ - if($ccCookie != "7") { - // COMMUNITY - diabook_aerith_community_info(); - - // CUSTOM CSS - if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/style-profile.css";} - if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/style-profile-wide.css";} - } -} - - - -// custom css -if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('', $cssFile); - -//load jquery.cookie.js -$cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/js/jquery.cookie.js"; -$a->page['htmlhead'] .= sprintf('', $cookieJS); - -//load jquery.ae.image.resize.js -$imageresizeJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/js/jquery.ae.image.resize.js"; -$a->page['htmlhead'] .= sprintf('', $imageresizeJS); - -//load jquery.autogrow-textarea.js -$autogrowJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/js/jquery.autogrow.textarea.js"; -$a->page['htmlhead'] .= sprintf('', $autogrowJS); - -//js scripts -//comment-edit-wrapper on photo_view -if ($a->argv[0].$a->argv[2] === "photos"."image"){ - -$a->page['htmlhead'] .= ' -'; - -} - -$a->page['htmlhead'] .= ' - -'; - -$a->page['htmlhead'] .= ' - -'; - -$a->page['htmlhead'] .= ' - '; - -if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){ -$a->page['htmlhead'] .= ' -'; - - - if($ccCookie != "7") { -$a->page['htmlhead'] .= ' -';} - -$a->page['htmlhead'] .= ' -';} - -$a->page['htmlhead'] .= ' - - '; \ No newline at end of file diff --git a/view/theme/diabook/diabook-aerith/theme_settings.tpl b/view/theme/diabook/diabook-aerith/theme_settings.tpl deleted file mode 100644 index 472232cf0..000000000 --- a/view/theme/diabook/diabook-aerith/theme_settings.tpl +++ /dev/null @@ -1,10 +0,0 @@ -{{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}} - -
- -
- diff --git a/view/theme/diabook/diabook-aerith/wall_item.tpl b/view/theme/diabook/diabook-aerith/wall_item.tpl deleted file mode 100644 index 123834064..000000000 --- a/view/theme/diabook/diabook-aerith/wall_item.tpl +++ /dev/null @@ -1,100 +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 -
-
-
-
-
-
- {{ 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.dropping }} - - $item.drop.delete - {{ endif }} - {{ if $item.edpost }} - - {{ endif }} -
-
$item.location 
-
-
-
-
- -
$item.dislike
-
-
- -
- $item.comment -
diff --git a/view/theme/diabook/diabook-aerith/wallwall_item.tpl b/view/theme/diabook/diabook-aerith/wallwall_item.tpl deleted file mode 100644 index 6a0c93f88..000000000 --- a/view/theme/diabook/diabook-aerith/wallwall_item.tpl +++ /dev/null @@ -1,106 +0,0 @@ -{{ if $item.indent }}{{ else }} -
- -
-{{ endif }} -
-
-
-
- - $item.owner_name - -
-
- - $item.name - - menu - - -
-
-
- $item.name - $item.to $item.owner_name - $item.vwall -   - {{ 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.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.dropping }} - - $item.drop.delete - {{ endif }} - {{ if $item.edpost }} - - {{ endif }} -
-
$item.location 
-
-
-
-
- -
$item.dislike
-
-
- -
- $item.comment -
\ No newline at end of file diff --git a/view/theme/diabook/diabook-blue/admin_users.tpl b/view/theme/diabook/diabook-blue/admin_users.tpl deleted file mode 100644 index 8aabb51ec..000000000 --- a/view/theme/diabook/diabook-blue/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 - - -
-
$select_all
-
- {{ 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 - - -
-
$select_all
-
- {{ else }} - NO USERS?!? - {{ endif }} - -
diff --git a/view/theme/diabook/diabook-blue/ch_directory_item.tpl b/view/theme/diabook/diabook-blue/ch_directory_item.tpl deleted file mode 100755 index db1936e4b..000000000 --- a/view/theme/diabook/diabook-blue/ch_directory_item.tpl +++ /dev/null @@ -1,10 +0,0 @@ - -
-
-
- - $alt-text - -
-
-
diff --git a/view/theme/diabook/diabook-blue/comment_item.tpl b/view/theme/diabook/diabook-blue/comment_item.tpl deleted file mode 100644 index ee4dfba45..000000000 --- a/view/theme/diabook/diabook-blue/comment_item.tpl +++ /dev/null @@ -1,41 +0,0 @@ -
-
- - - - - - - -
- $mytitle -
-
- - img - url - video - u - i - b - quote - {{ if $qcomment }} - - {{ endif }} - -
- - -
-
- -
diff --git a/view/theme/diabook/diabook-blue/communityhome.tpl b/view/theme/diabook/diabook-blue/communityhome.tpl deleted file mode 100644 index 6ac414ef4..000000000 --- a/view/theme/diabook/diabook-blue/communityhome.tpl +++ /dev/null @@ -1,87 +0,0 @@ -
-{{ if $page }} -
$page
-{{ endif }} -
- -
-{{ if $lastusers_title }} -

$helpers.title.1

-NewHere
-Friendica Support
-Let's talk
-Local Friendica -{{ endif }} -
- -
-{{ if $lastusers_title }} -

$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 }} -
diff --git a/view/theme/diabook/diabook-blue/config.php b/view/theme/diabook/diabook-blue/config.php deleted file mode 100644 index 40a6415f0..000000000 --- a/view/theme/diabook/diabook-blue/config.php +++ /dev/null @@ -1,84 +0,0 @@ -"1.3", - "---"=>"---", - "1.5"=>"1.5", - "1.4"=>"1.4", - "1.2"=>"1.2", - "1.1"=>"1.1", - ); - - $font_sizes = array( - '13'=>'13', - "---"=>"---", - "15"=>"15", - '14'=>'14', - '13.5'=>'13.5', - '12.5'=>'12.5', - '12'=>'12', - ); - $resolutions = array( - 'normal'=>'normal', - 'wide'=>'wide', - ); - - - - $t = file_get_contents( dirname(__file__). "/theme_settings.tpl" ); - $o .= replace_macros($t, array( - '$submit' => t('Submit'), - '$baseurl' => $a->get_baseurl(), - '$title' => t("Theme settings"), - '$font_size' => array('diabook-blue_font_size', t('Set font-size for posts and comments'), $font_size, '', $font_sizes), - '$line_height' => array('diabook-blue_line_height', t('Set line-height for posts and comments'), $line_height, '', $line_heights), - '$resolution' => array('diabook-blue_resolution', t('Set resolution for middle column'), $resolution, '', $resolutions), - )); - return $o; -} diff --git a/view/theme/diabook/diabook-blue/contact_template.tpl b/view/theme/diabook/diabook-blue/contact_template.tpl deleted file mode 100644 index 48930b48a..000000000 --- a/view/theme/diabook/diabook-blue/contact_template.tpl +++ /dev/null @@ -1,25 +0,0 @@ - -
-
-
- - $contact.name - - {{ if $contact.photo_menu }} - menu -
-
    - $contact.photo_menu -
-
- {{ endif }} -
- -
-
-
$contact.name
- -
-
diff --git a/view/theme/diabook/diabook-blue/directory_item.tpl b/view/theme/diabook/diabook-blue/directory_item.tpl deleted file mode 100755 index bc2af16c2..000000000 --- a/view/theme/diabook/diabook-blue/directory_item.tpl +++ /dev/null @@ -1,11 +0,0 @@ - -
-
-
- - $alt-text - -
-
-
$name
-
diff --git a/view/theme/diabook/diabook-blue/generic_links_widget.tpl b/view/theme/diabook/diabook-blue/generic_links_widget.tpl deleted file mode 100644 index 001c1395e..000000000 --- a/view/theme/diabook/diabook-blue/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/diabook-blue/group_side.tpl b/view/theme/diabook/diabook-blue/group_side.tpl deleted file mode 100755 index 8600402f2..000000000 --- a/view/theme/diabook/diabook-blue/group_side.tpl +++ /dev/null @@ -1,34 +0,0 @@ -
-
-

$title

-
- - - {{ if $ungrouped }} - - {{ endif }} -
- diff --git a/view/theme/diabook/diabook-blue/jot.tpl b/view/theme/diabook/diabook-blue/jot.tpl deleted file mode 100644 index 982201f56..000000000 --- a/view/theme/diabook/diabook-blue/jot.tpl +++ /dev/null @@ -1,85 +0,0 @@ - -
-
-
 
-
-
- -
- - - - - - - - -
-
- - - - -
- -
-
-
-
-
-
- - -
- -
-
- -
-
- -
-
- -
- - - - $preview - -
- $bang -
- - -
- $jotplugins -
- -
- -
- -
-
- - - -
-
- $acl -
-
$emailcc
-
- $jotnets -
-
- - - - -
-
- {{ if $content }}{{ endif }} diff --git a/view/theme/diabook/diabook-blue/js/README b/view/theme/diabook/diabook-blue/js/README deleted file mode 100644 index c93b2118e..000000000 --- a/view/theme/diabook/diabook-blue/js/README +++ /dev/null @@ -1,22 +0,0 @@ -jQuery Resize Plugin Demo - -Version: v2.1.1 -Author: Adeel Ejaz (http://adeelejaz.com/) -License: Dual licensed under MIT and GPL licenses. - -Introduction -aeImageResize is a jQuery plugin to dynamically resize the images without distorting the proportions. - -Usage: -.aeImageResize( height, width ) - -height -An integer representing the maximum height for the image. - -width -An integer representing the maximum width for the image. - -Example -$(function() { - $( ".resizeme" ).aeImageResize({ height: 250, width: 250 }); -}); \ No newline at end of file diff --git a/view/theme/diabook/diabook-blue/js/jquery.ae.image.resize.js b/view/theme/diabook/diabook-blue/js/jquery.ae.image.resize.js deleted file mode 100644 index bac09cd45..000000000 --- a/view/theme/diabook/diabook-blue/js/jquery.ae.image.resize.js +++ /dev/null @@ -1,69 +0,0 @@ -(function( $ ) { - - $.fn.aeImageResize = function( params ) { - - var aspectRatio = 0 - // Nasty I know but it's done only once, so not too bad I guess - // Alternate suggestions welcome :) - , isIE6 = $.browser.msie && (6 == ~~ $.browser.version) - ; - - // We cannot do much unless we have one of these - if ( !params.height && !params.width ) { - return this; - } - - // Calculate aspect ratio now, if possible - if ( params.height && params.width ) { - aspectRatio = params.width / params.height; - } - - // Attach handler to load - // Handler is executed just once per element - // Load event required for Webkit browsers - return this.one( "load", function() { - - // Remove all attributes and CSS rules - this.removeAttribute( "height" ); - this.removeAttribute( "width" ); - this.style.height = this.style.width = ""; - - var imgHeight = this.height - , imgWidth = this.width - , imgAspectRatio = imgWidth / imgHeight - , bxHeight = params.height - , bxWidth = params.width - , bxAspectRatio = aspectRatio; - - // Work the magic! - // If one parameter is missing, we just force calculate it - if ( !bxAspectRatio ) { - if ( bxHeight ) { - bxAspectRatio = imgAspectRatio + 1; - } else { - bxAspectRatio = imgAspectRatio - 1; - } - } - - // Only resize the images that need resizing - if ( (bxHeight && imgHeight > bxHeight) || (bxWidth && imgWidth > bxWidth) ) { - - if ( imgAspectRatio > bxAspectRatio ) { - bxHeight = ~~ ( imgHeight / imgWidth * bxWidth ); - } else { - bxWidth = ~~ ( imgWidth / imgHeight * bxHeight ); - } - - this.height = bxHeight; - this.width = bxWidth; - } - }) - .each(function() { - - // Trigger load event (for Gecko and MSIE) - if ( this.complete || isIE6 ) { - $( this ).trigger( "load" ); - } - }); - }; -})( jQuery ); \ No newline at end of file diff --git a/view/theme/diabook/diabook-blue/js/jquery.ae.image.resize.min.js b/view/theme/diabook/diabook-blue/js/jquery.ae.image.resize.min.js deleted file mode 100644 index 16c30b123..000000000 --- a/view/theme/diabook/diabook-blue/js/jquery.ae.image.resize.min.js +++ /dev/null @@ -1 +0,0 @@ -(function(d){d.fn.aeImageResize=function(a){var i=0,j=d.browser.msie&&6==~~d.browser.version;if(!a.height&&!a.width)return this;if(a.height&&a.width)i=a.width/a.height;return this.one("load",function(){this.removeAttribute("height");this.removeAttribute("width");this.style.height=this.style.width="";var e=this.height,f=this.width,g=f/e,b=a.height,c=a.width,h=i;h||(h=b?g+1:g-1);if(b&&e>b||c&&f>c){if(g>h)b=~~(e/f*c);else c=~~(f/e*b);this.height=b;this.width=c}}).each(function(){if(this.complete||j)d(this).trigger("load")})}})(jQuery); \ No newline at end of file diff --git a/view/theme/diabook/diabook-blue/js/jquery.autogrow.textarea.js b/view/theme/diabook/diabook-blue/js/jquery.autogrow.textarea.js deleted file mode 100644 index 806e34f51..000000000 --- a/view/theme/diabook/diabook-blue/js/jquery.autogrow.textarea.js +++ /dev/null @@ -1,46 +0,0 @@ -(function($) { - - /* - * Auto-growing textareas; technique ripped from Facebook - */ - $.fn.autogrow = function(options) { - - this.filter('textarea').each(function() { - - var $this = $(this), - minHeight = $this.height(), - lineHeight = $this.css('lineHeight'); - - var shadow = $('
').css({ - position: 'absolute', - top: -10000, - left: -10000, - width: $(this).width(), - fontSize: $this.css('fontSize'), - fontFamily: $this.css('fontFamily'), - lineHeight: $this.css('lineHeight'), - resize: 'none' - }).appendTo(document.body); - - var update = function() { - - var val = this.value.replace(//g, '>') - .replace(/&/g, '&') - .replace(/\n/g, '
'); - - shadow.html(val); - $(this).css('height', Math.max(shadow.height() + 20, minHeight)); - } - - $(this).change(update).keyup(update).keydown(update); - - update.apply(this); - - }); - - return this; - - } - -})(jQuery); \ No newline at end of file diff --git a/view/theme/diabook/diabook-blue/js/jquery.cookie.js b/view/theme/diabook/diabook-blue/js/jquery.cookie.js deleted file mode 100644 index 6d5974a2c..000000000 --- a/view/theme/diabook/diabook-blue/js/jquery.cookie.js +++ /dev/null @@ -1,47 +0,0 @@ -/*! - * jQuery Cookie Plugin - * https://github.com/carhartl/jquery-cookie - * - * Copyright 2011, Klaus Hartl - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://www.opensource.org/licenses/mit-license.php - * http://www.opensource.org/licenses/GPL-2.0 - */ -(function($) { - $.cookie = function(key, value, options) { - - // key and at least value given, set cookie... - if (arguments.length > 1 && (!/Object/.test(Object.prototype.toString.call(value)) || value === null || value === undefined)) { - options = $.extend({}, options); - - if (value === null || value === undefined) { - options.expires = -1; - } - - if (typeof options.expires === 'number') { - var days = options.expires, t = options.expires = new Date(); - t.setDate(t.getDate() + days); - } - - value = String(value); - - return (document.cookie = [ - encodeURIComponent(key), '=', options.raw ? value : encodeURIComponent(value), - options.expires ? '; expires=' + options.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE - options.path ? '; path=' + options.path : '', - options.domain ? '; domain=' + options.domain : '', - options.secure ? '; secure' : '' - ].join('')); - } - - // key and possibly options given, get cookie... - options = value || {}; - var decode = options.raw ? function(s) { return s; } : decodeURIComponent; - - var pairs = document.cookie.split('; '); - for (var i = 0, pair; pair = pairs[i] && pairs[i].split('='); i++) { - if (decode(pair[0]) === key) return decode(pair[1] || ''); // IE saves cookies with empty string as "c; ", e.g. without "=" as opposed to EOMB, thus pair[1] may be undefined - } - return null; - }; -})(jQuery); diff --git a/view/theme/diabook/diabook-blue/login.tpl b/view/theme/diabook/diabook-blue/login.tpl deleted file mode 100644 index efa7c2d6d..000000000 --- a/view/theme/diabook/diabook-blue/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/diabook-blue/mail_conv.tpl b/view/theme/diabook/diabook-blue/mail_conv.tpl deleted file mode 100644 index 989f17878..000000000 --- a/view/theme/diabook/diabook-blue/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/diabook/diabook-blue/mail_display.tpl b/view/theme/diabook/diabook-blue/mail_display.tpl deleted file mode 100644 index 8b82e95c6..000000000 --- a/view/theme/diabook/diabook-blue/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/diabook-blue/mail_list.tpl b/view/theme/diabook/diabook-blue/mail_list.tpl deleted file mode 100644 index 6bc6c84f6..000000000 --- a/view/theme/diabook/diabook-blue/mail_list.tpl +++ /dev/null @@ -1,8 +0,0 @@ -
- $subject - $from_name - $date - $count - - -
diff --git a/view/theme/diabook/diabook-blue/message_side.tpl b/view/theme/diabook/diabook-blue/message_side.tpl deleted file mode 100644 index 9f1587096..000000000 --- a/view/theme/diabook/diabook-blue/message_side.tpl +++ /dev/null @@ -1,10 +0,0 @@ -
- - -
    - {{ for $tabs as $t }} -
  • $t.label
    • - {{ endfor }} -
- -
diff --git a/view/theme/diabook/diabook-blue/nav.tpl b/view/theme/diabook/diabook-blue/nav.tpl deleted file mode 100644 index e3aabaa8b..000000000 --- a/view/theme/diabook/diabook-blue/nav.tpl +++ /dev/null @@ -1,190 +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/diabook-blue/nets.tpl b/view/theme/diabook/diabook-blue/nets.tpl deleted file mode 100644 index be25ddee1..000000000 --- a/view/theme/diabook/diabook-blue/nets.tpl +++ /dev/null @@ -1,15 +0,0 @@ -
-

$title

-
$desc
- -
    -
  • - - $all
    • - {{ for $nets as $net }} -
  • - - $net.name
    • - {{ endfor }} -
-
diff --git a/view/theme/diabook/diabook-blue/oembed_video.tpl b/view/theme/diabook/diabook-blue/oembed_video.tpl deleted file mode 100644 index d6d29f724..000000000 --- a/view/theme/diabook/diabook-blue/oembed_video.tpl +++ /dev/null @@ -1,4 +0,0 @@ - - -
- diff --git a/view/theme/diabook/diabook-blue/photo_item.tpl b/view/theme/diabook/diabook-blue/photo_item.tpl deleted file mode 100644 index 5d65a89b7..000000000 --- a/view/theme/diabook/diabook-blue/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/diabook-blue/photo_view.tpl b/view/theme/diabook/diabook-blue/photo_view.tpl deleted file mode 100644 index 93b01d623..000000000 --- a/view/theme/diabook/diabook-blue/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 }} - -
-
-
-$comments -
- -$paginate - - diff --git a/view/theme/diabook/diabook-blue/profile_side.tpl b/view/theme/diabook/diabook-blue/profile_side.tpl deleted file mode 100644 index 01e80f238..000000000 --- a/view/theme/diabook/diabook-blue/profile_side.tpl +++ /dev/null @@ -1,21 +0,0 @@ - - - diff --git a/view/theme/diabook/diabook-blue/profile_vcard.tpl b/view/theme/diabook/diabook-blue/profile_vcard.tpl deleted file mode 100644 index 6fcffcc9b..000000000 --- a/view/theme/diabook/diabook-blue/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/diabook-blue/right_aside.tpl b/view/theme/diabook/diabook-blue/right_aside.tpl deleted file mode 100644 index a65677696..000000000 --- a/view/theme/diabook/diabook-blue/right_aside.tpl +++ /dev/null @@ -1,20 +0,0 @@ - - - \ No newline at end of file diff --git a/view/theme/diabook/diabook-blue/screenshot.png b/view/theme/diabook/diabook-blue/screenshot.png deleted file mode 100644 index 5b719c701..000000000 Binary files a/view/theme/diabook/diabook-blue/screenshot.png and /dev/null differ diff --git a/view/theme/diabook/diabook-blue/search_item.tpl b/view/theme/diabook/diabook-blue/search_item.tpl deleted file mode 100644 index 123834064..000000000 --- a/view/theme/diabook/diabook-blue/search_item.tpl +++ /dev/null @@ -1,100 +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 -
-
-
-
-
-
- {{ 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.dropping }} - - $item.drop.delete - {{ endif }} - {{ if $item.edpost }} - - {{ endif }} -
-
$item.location 
-
-
-
-
- -
$item.dislike
-
-
- -
- $item.comment -
diff --git a/view/theme/diabook/diabook-blue/style.php b/view/theme/diabook/diabook-blue/style.php deleted file mode 100644 index c6b467999..000000000 --- a/view/theme/diabook/diabook-blue/style.php +++ /dev/null @@ -1,277 +0,0 @@ -page['htmlhead'] .= sprintf('', $diabook_version); - -//change css on network and profilepages -$cssFile = null; -$resolution=false; -$resolution = get_pconfig(local_user(), "diabook-blue", "resolution"); -if ($resolution===false) $resolution="normal"; - -/** - * prints last community activity - */ -function diabook_blue_community_info(){ - $a = get_app(); - - // last 12 users - $aside['$lastusers_title'] = t('Last users'); - $aside['$lastusers_items'] = array(); - $sql_extra = ""; - $publish = (get_config('system','publish_all') ? '' : " AND `publish` = 1 " ); - $order = " ORDER BY `register_date` DESC "; - - $r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname` - FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` - WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra $order LIMIT %d , %d ", - 0, - 9 - ); - $tpl = file_get_contents( dirname(__file__).'/ch_directory_item.tpl'); - if(count($r)) { - $photo = 'thumb'; - foreach($r as $rr) { - $profile_link = $a->get_baseurl() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']); - $entry = replace_macros($tpl,array( - '$id' => $rr['id'], - '$profile-link' => $profile_link, - '$photo' => $rr[$photo], - '$alt-text' => $rr['name'], - )); - $aside['$lastusers_items'][] = $entry; - } - } - - - // last 10 liked items - $aside['$like_title'] = t('Last likes'); - $aside['$like_items'] = array(); - $r = q("SELECT `T1`.`created`, `T1`.`liker`, `T1`.`liker-link`, `item`.* FROM - (SELECT `parent-uri`, `created`, `author-name` AS `liker`,`author-link` AS `liker-link` - FROM `item` WHERE `verb`='http://activitystrea.ms/schema/1.0/like' GROUP BY `parent-uri` ORDER BY `created` DESC) AS T1 - INNER JOIN `item` ON `item`.`uri`=`T1`.`parent-uri` - WHERE `T1`.`liker-link` LIKE '%s%%' OR `item`.`author-link` LIKE '%s%%' - GROUP BY `uri` - ORDER BY `T1`.`created` DESC - LIMIT 0,5", - $a->get_baseurl(),$a->get_baseurl() - ); - - foreach ($r as $rr) { - $author = '' . $rr['liker'] . ''; - $objauthor = '' . $rr['author-name'] . ''; - - //var_dump($rr['verb'],$rr['object-type']); killme(); - switch($rr['verb']){ - case 'http://activitystrea.ms/schema/1.0/post': - switch ($rr['object-type']){ - case 'http://activitystrea.ms/schema/1.0/event': - $post_type = t('event'); - break; - default: - $post_type = t('status'); - } - break; - default: - if ($rr['resource-id']){ - $post_type = t('photo'); - $m=array(); preg_match("/\[url=([^]]*)\]/", $rr['body'], $m); - $rr['plink'] = $m[1]; - } else { - $post_type = t('status'); - } - } - $plink = '' . $post_type . ''; - - $aside['$like_items'][] = sprintf( t('%1$s likes %2$s\'s %3$s'), $author, $objauthor, $plink); - - } - - - // last 12 photos - $aside['$photos_title'] = t('Last photos'); - $aside['$photos_items'] = array(); - $r = q("SELECT `photo`.`id`, `photo`.`resource-id`, `photo`.`scale`, `photo`.`desc`, `user`.`nickname`, `user`.`username` FROM - (SELECT `resource-id`, MAX(`scale`) as maxscale FROM `photo` - WHERE `profile`=0 AND `contact-id`=0 AND `album` NOT IN ('Contact Photos', '%s', 'Profile Photos', '%s') - AND `allow_cid`='' AND `allow_gid`='' AND `deny_cid`='' AND `deny_gid`='' GROUP BY `resource-id`) AS `t1` - INNER JOIN `photo` ON `photo`.`resource-id`=`t1`.`resource-id` AND `photo`.`scale` = `t1`.`maxscale`, - `user` - WHERE `user`.`uid` = `photo`.`uid` - AND `user`.`blockwall`=0 - AND `user`.`hidewall`=0 - ORDER BY `photo`.`edited` DESC - LIMIT 0, 9", - dbesc(t('Contact Photos')), - dbesc(t('Profile Photos')) - ); - if(count($r)) { - $tpl = file_get_contents( dirname(__file__).'/ch_directory_item.tpl'); - foreach($r as $rr) { - $photo_page = $a->get_baseurl() . '/photos/' . $rr['nickname'] . '/image/' . $rr['resource-id']; - $photo_url = $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['scale'] .'.jpg'; - - $entry = replace_macros($tpl,array( - '$id' => $rr['id'], - '$profile-link' => $photo_page, - '$photo' => $photo_url, - '$alt-text' => $rr['username']." : ".$rr['desc'], - )); - - $aside['$photos_items'][] = $entry; - } - } - - - //nav FIND FRIENDS - if(local_user()) { - $nv = array(); - $nv['title'] = Array("", t('Find Friends'), "", ""); - $nv['directory'] = Array('directory', t('Local Directory'), "", ""); - $nv['global_directory'] = Array('http://dir.friendica.com/', t('Global Directory'), "", ""); - $nv['match'] = Array('match', t('Similar Interests'), "", ""); - $nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", ""); - $nv['invite'] = Array('invite', t('Invite Friends'), "", ""); - - $nv['search'] = '
- - - - - '; - - $aside['$nv'] = $nv; - }; - //Community Page - if(local_user()) { - $page = '
-
-

'.t("Community Pages").'

-
    '; - - $pagelist = array(); - - $contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact` - WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d - ORDER BY `name` ASC", - intval($a->user['uid']) - ); - - $pageD = array(); - - // Look if the profile is a community page - foreach($contacts as $contact) { - $pageD[] = array("url"=>$contact["url"], "name"=>$contact["name"], "id"=>$contact["id"], "micro"=>$contact['micro']); - }; - - - $contacts = $pageD; - - foreach($contacts as $contact) { - $page .= '
  • ' . $contact['url'] . ' '. - $contact["name"]."
    • "; - } - $page .= '
'; - //if (sizeof($contacts) > 0) - - $aside['$page'] = $page; - } - //END Community Page - //helpers - $helpers = array(); - $helpers['title'] = Array("", t('Help or @NewHere ?'), "", ""); - - $aside['$helpers'] = $helpers; - //end helpers - //connectable services - $con_services = array(); - $con_services['title'] = Array("", t('Connect Services'), "", ""); - - $aside['$con_services'] = $con_services; - //end connectable services - - - //get_baseurl - $url = $a->get_baseurl($ssl_state); - $aside['$url'] = $url; - - $tpl = file_get_contents(dirname(__file__).'/communityhome.tpl'); - $a->page['right_aside'] = replace_macros($tpl, $aside); - -} - - -//profile_side at networkpages -if ($a->argv[0] === "network" && local_user()){ - - // USER MENU - if(local_user()) { - - $r = q("SELECT micro FROM contact WHERE uid=%d AND self=1", intval($a->user['uid'])); - - $userinfo = array( - 'icon' => (count($r) ? $r[0]['micro']: $a->get_baseurl()."/images/default-profile-mm.jpg"), - 'name' => $a->user['username'], - ); - $ps = array('usermenu'=>array()); - $ps['usermenu']['status'] = Array('profile/' . $a->user['nickname'], t('Home'), "", t('Your posts and conversations')); - $ps['usermenu']['profile'] = Array('profile/' . $a->user['nickname']. '?tab=profile', t('Profile'), "", t('Your profile page')); - $ps['usermenu']['contacts'] = Array('contacts' , t('Contacts'), "", t('Your contacts')); - $ps['usermenu']['photos'] = Array('photos/' . $a->user['nickname'], t('Photos'), "", t('Your photos')); - $ps['usermenu']['events'] = Array('events/', t('Events'), "", t('Your events')); - $ps['usermenu']['notes'] = Array('notes/', t('Personal notes'), "", t('Your personal photos')); - $ps['usermenu']['community'] = Array('community/', t('Community'), "", ""); - $ps['usermenu']['pgroups'] = Array('http://dir.friendika.com/directory/forum', t('Community Pages'), "", ""); - - $tpl = get_markup_template('profile_side.tpl'); - - $a->page['aside'] .= replace_macros($tpl, array( - '$userinfo' => $userinfo, - '$ps' => $ps, - )); - - } - - $ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes']; - - if($ccCookie != "7") { - // COMMUNITY - diabook_blue_community_info(); - - // CUSTOM CSS - if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/style-network.css";} - if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/style-network-wide.css";} - } -} - - - -//right_aside at profile pages -if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){ - if($ccCookie != "7") { - // COMMUNITY - diabook_blue_community_info(); - - // CUSTOM CSS - if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/style-profile.css";} - if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/style-profile-wide.css";} - } -} - - -// custom css -if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('', $cssFile); - -//load jquery.cookie.js -$cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/js/jquery.cookie.js"; -$a->page['htmlhead'] .= sprintf('', $cookieJS); - -//load jquery.ae.image.resize.js -$imageresizeJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/js/jquery.ae.image.resize.js"; -$a->page['htmlhead'] .= sprintf('', $imageresizeJS); - -//load jquery.autogrow-textarea.js -$autogrowJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/js/jquery.autogrow.textarea.js"; -$a->page['htmlhead'] .= sprintf('', $autogrowJS); - -//js scripts -//comment-edit-wrapper on photo_view -if ($a->argv[0].$a->argv[2] === "photos"."image"){ - -$a->page['htmlhead'] .= ' -'; - -} - - -$a->page['htmlhead'] .= ' - -'; - -$a->page['htmlhead'] .= ' - -'; - -$a->page['htmlhead'] .= ' - '; - - -if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){ -$a->page['htmlhead'] .= ' -'; - - - if($ccCookie != "7") { -$a->page['htmlhead'] .= ' -';} - -$a->page['htmlhead'] .= ' -';} - -$a->page['htmlhead'] .= ' - - '; diff --git a/view/theme/diabook/diabook-blue/theme_settings.tpl b/view/theme/diabook/diabook-blue/theme_settings.tpl deleted file mode 100644 index 0e5f4eb21..000000000 --- a/view/theme/diabook/diabook-blue/theme_settings.tpl +++ /dev/null @@ -1,10 +0,0 @@ -{{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}} - -
- -
- diff --git a/view/theme/diabook/diabook-blue/wall_item.tpl b/view/theme/diabook/diabook-blue/wall_item.tpl deleted file mode 100644 index 123834064..000000000 --- a/view/theme/diabook/diabook-blue/wall_item.tpl +++ /dev/null @@ -1,100 +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 -
-
-
-
-
-
- {{ 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.dropping }} - - $item.drop.delete - {{ endif }} - {{ if $item.edpost }} - - {{ endif }} -
-
$item.location 
-
-
-
-
- -
$item.dislike
-
-
- -
- $item.comment -
diff --git a/view/theme/diabook/diabook-blue/wallwall_item.tpl b/view/theme/diabook/diabook-blue/wallwall_item.tpl deleted file mode 100644 index bee75ad99..000000000 --- a/view/theme/diabook/diabook-blue/wallwall_item.tpl +++ /dev/null @@ -1,106 +0,0 @@ -{{ if $item.indent }}{{ else }} -
- -
-{{ endif }} -
-
-
-
- - $item.owner_name - -
-
- - $item.name - - menu - - -
-
-
- $item.name - $item.to $item.owner_name - $item.vwall -   - {{ 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.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.dropping }} - - $item.drop.delete - {{ endif }} - {{ if $item.edpost }} - - {{ endif }} -
-
$item.location 
-
-
-
-
- -
$item.dislike
-
-
- -
- $item.comment -
\ No newline at end of file diff --git a/view/theme/diabook/diabook-dark/admin_users.tpl b/view/theme/diabook/diabook-dark/admin_users.tpl deleted file mode 100644 index 8aabb51ec..000000000 --- a/view/theme/diabook/diabook-dark/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 - - -
-
$select_all
-
- {{ 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 - - -
-
$select_all
-
- {{ else }} - NO USERS?!? - {{ endif }} - -
diff --git a/view/theme/diabook/diabook-dark/ch_directory_item.tpl b/view/theme/diabook/diabook-dark/ch_directory_item.tpl deleted file mode 100755 index db1936e4b..000000000 --- a/view/theme/diabook/diabook-dark/ch_directory_item.tpl +++ /dev/null @@ -1,10 +0,0 @@ - -
-
-
- - $alt-text - -
-
-
diff --git a/view/theme/diabook/diabook-dark/comment_item.tpl b/view/theme/diabook/diabook-dark/comment_item.tpl deleted file mode 100644 index ee4dfba45..000000000 --- a/view/theme/diabook/diabook-dark/comment_item.tpl +++ /dev/null @@ -1,41 +0,0 @@ -
-
- - - - - - - -
- $mytitle -
-
- - img - url - video - u - i - b - quote - {{ if $qcomment }} - - {{ endif }} - -
- - -
-
- -
diff --git a/view/theme/diabook/diabook-dark/communityhome.tpl b/view/theme/diabook/diabook-dark/communityhome.tpl deleted file mode 100644 index 875d83f1b..000000000 --- a/view/theme/diabook/diabook-dark/communityhome.tpl +++ /dev/null @@ -1,86 +0,0 @@ -
-{{ if $page }} -
$page
-{{ endif }} -
- -
-{{ if $lastusers_title }} -

$helpers.title.1

-NewHere
-Friendica Support
-Let's talk
-Local Friendica -{{ endif }} -
- -
-{{ if $lastusers_title }} -

$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 }} -
diff --git a/view/theme/diabook/diabook-dark/config.php b/view/theme/diabook/diabook-dark/config.php deleted file mode 100644 index a8dd1376a..000000000 --- a/view/theme/diabook/diabook-dark/config.php +++ /dev/null @@ -1,84 +0,0 @@ -"1.3", - "---"=>"---", - "1.5"=>"1.5", - "1.4"=>"1.4", - "1.2"=>"1.2", - "1.1"=>"1.1", - ); - - $font_sizes = array( - '13'=>'13', - "---"=>"---", - "15"=>"15", - '14'=>'14', - '13.5'=>'13.5', - '12.5'=>'12.5', - '12'=>'12', - ); - $resolutions = array( - 'normal'=>'normal', - 'wide'=>'wide', - ); - - - - $t = file_get_contents( dirname(__file__). "/theme_settings.tpl" ); - $o .= replace_macros($t, array( - '$submit' => t('Submit'), - '$baseurl' => $a->get_baseurl(), - '$title' => t("Theme settings"), - '$font_size' => array('diabook-dark_font_size', t('Set font-size for posts and comments'), $font_size, '', $font_sizes), - '$line_height' => array('diabook-dark_line_height', t('Set line-height for posts and comments'), $line_height, '', $line_heights), - '$resolution' => array('diabook-dark_resolution', t('Set resolution for middle column'), $resolution, '', $resolutions), - )); - return $o; -} diff --git a/view/theme/diabook/diabook-dark/contact_template.tpl b/view/theme/diabook/diabook-dark/contact_template.tpl deleted file mode 100644 index 48930b48a..000000000 --- a/view/theme/diabook/diabook-dark/contact_template.tpl +++ /dev/null @@ -1,25 +0,0 @@ - -
-
-
- - $contact.name - - {{ if $contact.photo_menu }} - menu -
-
    - $contact.photo_menu -
-
- {{ endif }} -
- -
-
-
$contact.name
- -
-
diff --git a/view/theme/diabook/diabook-dark/directory_item.tpl b/view/theme/diabook/diabook-dark/directory_item.tpl deleted file mode 100755 index bc2af16c2..000000000 --- a/view/theme/diabook/diabook-dark/directory_item.tpl +++ /dev/null @@ -1,11 +0,0 @@ - -
-
-
- - $alt-text - -
-
-
$name
-
diff --git a/view/theme/diabook/diabook-dark/generic_links_widget.tpl b/view/theme/diabook/diabook-dark/generic_links_widget.tpl deleted file mode 100644 index 001c1395e..000000000 --- a/view/theme/diabook/diabook-dark/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/diabook-dark/group_side.tpl b/view/theme/diabook/diabook-dark/group_side.tpl deleted file mode 100755 index 8600402f2..000000000 --- a/view/theme/diabook/diabook-dark/group_side.tpl +++ /dev/null @@ -1,34 +0,0 @@ -
-
-

$title

-
- - - {{ if $ungrouped }} - - {{ endif }} -
- diff --git a/view/theme/diabook/diabook-dark/jot.tpl b/view/theme/diabook/diabook-dark/jot.tpl deleted file mode 100644 index 0928c9f36..000000000 --- a/view/theme/diabook/diabook-dark/jot.tpl +++ /dev/null @@ -1,85 +0,0 @@ - -
-
-
 
-
-
- -
- - - - - - - - -
-
- - - - -
- -
-
-
-
-
-
- - -
- -
-
- -
-
- -
- - - - - $preview - -
- $bang -
- - -
- $jotplugins -
- -
- -
- -
-
- - - -
-
- $acl -
-
$emailcc
-
- $jotnets -
-
- - - - -
-
- {{ if $content }}{{ endif }} diff --git a/view/theme/diabook/diabook-dark/js/README b/view/theme/diabook/diabook-dark/js/README deleted file mode 100644 index c93b2118e..000000000 --- a/view/theme/diabook/diabook-dark/js/README +++ /dev/null @@ -1,22 +0,0 @@ -jQuery Resize Plugin Demo - -Version: v2.1.1 -Author: Adeel Ejaz (http://adeelejaz.com/) -License: Dual licensed under MIT and GPL licenses. - -Introduction -aeImageResize is a jQuery plugin to dynamically resize the images without distorting the proportions. - -Usage: -.aeImageResize( height, width ) - -height -An integer representing the maximum height for the image. - -width -An integer representing the maximum width for the image. - -Example -$(function() { - $( ".resizeme" ).aeImageResize({ height: 250, width: 250 }); -}); \ No newline at end of file diff --git a/view/theme/diabook/diabook-dark/js/jquery.ae.image.resize.js b/view/theme/diabook/diabook-dark/js/jquery.ae.image.resize.js deleted file mode 100644 index bac09cd45..000000000 --- a/view/theme/diabook/diabook-dark/js/jquery.ae.image.resize.js +++ /dev/null @@ -1,69 +0,0 @@ -(function( $ ) { - - $.fn.aeImageResize = function( params ) { - - var aspectRatio = 0 - // Nasty I know but it's done only once, so not too bad I guess - // Alternate suggestions welcome :) - , isIE6 = $.browser.msie && (6 == ~~ $.browser.version) - ; - - // We cannot do much unless we have one of these - if ( !params.height && !params.width ) { - return this; - } - - // Calculate aspect ratio now, if possible - if ( params.height && params.width ) { - aspectRatio = params.width / params.height; - } - - // Attach handler to load - // Handler is executed just once per element - // Load event required for Webkit browsers - return this.one( "load", function() { - - // Remove all attributes and CSS rules - this.removeAttribute( "height" ); - this.removeAttribute( "width" ); - this.style.height = this.style.width = ""; - - var imgHeight = this.height - , imgWidth = this.width - , imgAspectRatio = imgWidth / imgHeight - , bxHeight = params.height - , bxWidth = params.width - , bxAspectRatio = aspectRatio; - - // Work the magic! - // If one parameter is missing, we just force calculate it - if ( !bxAspectRatio ) { - if ( bxHeight ) { - bxAspectRatio = imgAspectRatio + 1; - } else { - bxAspectRatio = imgAspectRatio - 1; - } - } - - // Only resize the images that need resizing - if ( (bxHeight && imgHeight > bxHeight) || (bxWidth && imgWidth > bxWidth) ) { - - if ( imgAspectRatio > bxAspectRatio ) { - bxHeight = ~~ ( imgHeight / imgWidth * bxWidth ); - } else { - bxWidth = ~~ ( imgWidth / imgHeight * bxHeight ); - } - - this.height = bxHeight; - this.width = bxWidth; - } - }) - .each(function() { - - // Trigger load event (for Gecko and MSIE) - if ( this.complete || isIE6 ) { - $( this ).trigger( "load" ); - } - }); - }; -})( jQuery ); \ No newline at end of file diff --git a/view/theme/diabook/diabook-dark/js/jquery.ae.image.resize.min.js b/view/theme/diabook/diabook-dark/js/jquery.ae.image.resize.min.js deleted file mode 100644 index 16c30b123..000000000 --- a/view/theme/diabook/diabook-dark/js/jquery.ae.image.resize.min.js +++ /dev/null @@ -1 +0,0 @@ -(function(d){d.fn.aeImageResize=function(a){var i=0,j=d.browser.msie&&6==~~d.browser.version;if(!a.height&&!a.width)return this;if(a.height&&a.width)i=a.width/a.height;return this.one("load",function(){this.removeAttribute("height");this.removeAttribute("width");this.style.height=this.style.width="";var e=this.height,f=this.width,g=f/e,b=a.height,c=a.width,h=i;h||(h=b?g+1:g-1);if(b&&e>b||c&&f>c){if(g>h)b=~~(e/f*c);else c=~~(f/e*b);this.height=b;this.width=c}}).each(function(){if(this.complete||j)d(this).trigger("load")})}})(jQuery); \ No newline at end of file diff --git a/view/theme/diabook/diabook-dark/js/jquery.autogrow.textarea.js b/view/theme/diabook/diabook-dark/js/jquery.autogrow.textarea.js deleted file mode 100644 index 806e34f51..000000000 --- a/view/theme/diabook/diabook-dark/js/jquery.autogrow.textarea.js +++ /dev/null @@ -1,46 +0,0 @@ -(function($) { - - /* - * Auto-growing textareas; technique ripped from Facebook - */ - $.fn.autogrow = function(options) { - - this.filter('textarea').each(function() { - - var $this = $(this), - minHeight = $this.height(), - lineHeight = $this.css('lineHeight'); - - var shadow = $('
').css({ - position: 'absolute', - top: -10000, - left: -10000, - width: $(this).width(), - fontSize: $this.css('fontSize'), - fontFamily: $this.css('fontFamily'), - lineHeight: $this.css('lineHeight'), - resize: 'none' - }).appendTo(document.body); - - var update = function() { - - var val = this.value.replace(//g, '>') - .replace(/&/g, '&') - .replace(/\n/g, '
'); - - shadow.html(val); - $(this).css('height', Math.max(shadow.height() + 20, minHeight)); - } - - $(this).change(update).keyup(update).keydown(update); - - update.apply(this); - - }); - - return this; - - } - -})(jQuery); \ No newline at end of file diff --git a/view/theme/diabook/diabook-dark/js/jquery.cookie.js b/view/theme/diabook/diabook-dark/js/jquery.cookie.js deleted file mode 100644 index 6d5974a2c..000000000 --- a/view/theme/diabook/diabook-dark/js/jquery.cookie.js +++ /dev/null @@ -1,47 +0,0 @@ -/*! - * jQuery Cookie Plugin - * https://github.com/carhartl/jquery-cookie - * - * Copyright 2011, Klaus Hartl - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://www.opensource.org/licenses/mit-license.php - * http://www.opensource.org/licenses/GPL-2.0 - */ -(function($) { - $.cookie = function(key, value, options) { - - // key and at least value given, set cookie... - if (arguments.length > 1 && (!/Object/.test(Object.prototype.toString.call(value)) || value === null || value === undefined)) { - options = $.extend({}, options); - - if (value === null || value === undefined) { - options.expires = -1; - } - - if (typeof options.expires === 'number') { - var days = options.expires, t = options.expires = new Date(); - t.setDate(t.getDate() + days); - } - - value = String(value); - - return (document.cookie = [ - encodeURIComponent(key), '=', options.raw ? value : encodeURIComponent(value), - options.expires ? '; expires=' + options.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE - options.path ? '; path=' + options.path : '', - options.domain ? '; domain=' + options.domain : '', - options.secure ? '; secure' : '' - ].join('')); - } - - // key and possibly options given, get cookie... - options = value || {}; - var decode = options.raw ? function(s) { return s; } : decodeURIComponent; - - var pairs = document.cookie.split('; '); - for (var i = 0, pair; pair = pairs[i] && pairs[i].split('='); i++) { - if (decode(pair[0]) === key) return decode(pair[1] || ''); // IE saves cookies with empty string as "c; ", e.g. without "=" as opposed to EOMB, thus pair[1] may be undefined - } - return null; - }; -})(jQuery); diff --git a/view/theme/diabook/diabook-dark/login.tpl b/view/theme/diabook/diabook-dark/login.tpl deleted file mode 100644 index efa7c2d6d..000000000 --- a/view/theme/diabook/diabook-dark/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/diabook-dark/mail_conv.tpl b/view/theme/diabook/diabook-dark/mail_conv.tpl deleted file mode 100644 index 989f17878..000000000 --- a/view/theme/diabook/diabook-dark/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/diabook/diabook-dark/mail_display.tpl b/view/theme/diabook/diabook-dark/mail_display.tpl deleted file mode 100644 index 8b82e95c6..000000000 --- a/view/theme/diabook/diabook-dark/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/diabook-dark/mail_list.tpl b/view/theme/diabook/diabook-dark/mail_list.tpl deleted file mode 100644 index 6bc6c84f6..000000000 --- a/view/theme/diabook/diabook-dark/mail_list.tpl +++ /dev/null @@ -1,8 +0,0 @@ -
- $subject - $from_name - $date - $count - - -
diff --git a/view/theme/diabook/diabook-dark/message_side.tpl b/view/theme/diabook/diabook-dark/message_side.tpl deleted file mode 100644 index 9f1587096..000000000 --- a/view/theme/diabook/diabook-dark/message_side.tpl +++ /dev/null @@ -1,10 +0,0 @@ -
- - -
    - {{ for $tabs as $t }} -
  • $t.label
    • - {{ endfor }} -
- -
diff --git a/view/theme/diabook/diabook-dark/nav.tpl b/view/theme/diabook/diabook-dark/nav.tpl deleted file mode 100644 index e3aabaa8b..000000000 --- a/view/theme/diabook/diabook-dark/nav.tpl +++ /dev/null @@ -1,190 +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/diabook-dark/nets.tpl b/view/theme/diabook/diabook-dark/nets.tpl deleted file mode 100644 index be25ddee1..000000000 --- a/view/theme/diabook/diabook-dark/nets.tpl +++ /dev/null @@ -1,15 +0,0 @@ -
-

$title

-
$desc
- -
    -
  • - - $all
    • - {{ for $nets as $net }} -
  • - - $net.name
    • - {{ endfor }} -
-
diff --git a/view/theme/diabook/diabook-dark/oembed_video.tpl b/view/theme/diabook/diabook-dark/oembed_video.tpl deleted file mode 100644 index d6d29f724..000000000 --- a/view/theme/diabook/diabook-dark/oembed_video.tpl +++ /dev/null @@ -1,4 +0,0 @@ - - -
- diff --git a/view/theme/diabook/diabook-dark/photo_item.tpl b/view/theme/diabook/diabook-dark/photo_item.tpl deleted file mode 100644 index 5d65a89b7..000000000 --- a/view/theme/diabook/diabook-dark/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/diabook-dark/photo_view.tpl b/view/theme/diabook/diabook-dark/photo_view.tpl deleted file mode 100644 index 071972e0c..000000000 --- a/view/theme/diabook/diabook-dark/photo_view.tpl +++ /dev/null @@ -1,35 +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/diabook-dark/profile_side.tpl b/view/theme/diabook/diabook-dark/profile_side.tpl deleted file mode 100644 index 01e80f238..000000000 --- a/view/theme/diabook/diabook-dark/profile_side.tpl +++ /dev/null @@ -1,21 +0,0 @@ - - - diff --git a/view/theme/diabook/diabook-dark/profile_vcard.tpl b/view/theme/diabook/diabook-dark/profile_vcard.tpl deleted file mode 100644 index 6fcffcc9b..000000000 --- a/view/theme/diabook/diabook-dark/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/diabook-dark/right_aside.tpl b/view/theme/diabook/diabook-dark/right_aside.tpl deleted file mode 100644 index a65677696..000000000 --- a/view/theme/diabook/diabook-dark/right_aside.tpl +++ /dev/null @@ -1,20 +0,0 @@ - - - \ No newline at end of file diff --git a/view/theme/diabook/diabook-dark/search_item.tpl b/view/theme/diabook/diabook-dark/search_item.tpl deleted file mode 100644 index 123834064..000000000 --- a/view/theme/diabook/diabook-dark/search_item.tpl +++ /dev/null @@ -1,100 +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 -
-
-
-
-
-
- {{ 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.dropping }} - - $item.drop.delete - {{ endif }} - {{ if $item.edpost }} - - {{ endif }} -
-
$item.location 
-
-
-
-
- -
$item.dislike
-
-
- -
- $item.comment -
diff --git a/view/theme/diabook/diabook-dark/style.php b/view/theme/diabook/diabook-dark/style.php deleted file mode 100644 index 1f6e965a9..000000000 --- a/view/theme/diabook/diabook-dark/style.php +++ /dev/null @@ -1,277 +0,0 @@ -page['htmlhead'] .= sprintf('', $diabook_version); - - -//change css on network and profilepages -$cssFile = null; -$resolution=false; -$resolution = get_pconfig(local_user(), "diabook-dark", "resolution"); -if ($resolution===false) $resolution="normal"; - -/** - * prints last community activity - */ -function diabook_dark_community_info(){ - $a = get_app(); - - // last 12 users - $aside['$lastusers_title'] = t('Last users'); - $aside['$lastusers_items'] = array(); - $sql_extra = ""; - $publish = (get_config('system','publish_all') ? '' : " AND `publish` = 1 " ); - $order = " ORDER BY `register_date` DESC "; - - $r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname` - FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` - WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra $order LIMIT %d , %d ", - 0, - 9 - ); - $tpl = file_get_contents( dirname(__file__).'/ch_directory_item.tpl'); - if(count($r)) { - $photo = 'thumb'; - foreach($r as $rr) { - $profile_link = $a->get_baseurl() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']); - $entry = replace_macros($tpl,array( - '$id' => $rr['id'], - '$profile-link' => $profile_link, - '$photo' => $rr[$photo], - '$alt-text' => $rr['name'], - )); - $aside['$lastusers_items'][] = $entry; - } - } - - - // last 10 liked items - $aside['$like_title'] = t('Last likes'); - $aside['$like_items'] = array(); - $r = q("SELECT `T1`.`created`, `T1`.`liker`, `T1`.`liker-link`, `item`.* FROM - (SELECT `parent-uri`, `created`, `author-name` AS `liker`,`author-link` AS `liker-link` - FROM `item` WHERE `verb`='http://activitystrea.ms/schema/1.0/like' GROUP BY `parent-uri` ORDER BY `created` DESC) AS T1 - INNER JOIN `item` ON `item`.`uri`=`T1`.`parent-uri` - WHERE `T1`.`liker-link` LIKE '%s%%' OR `item`.`author-link` LIKE '%s%%' - GROUP BY `uri` - ORDER BY `T1`.`created` DESC - LIMIT 0,5", - $a->get_baseurl(),$a->get_baseurl() - ); - - foreach ($r as $rr) { - $author = '' . $rr['liker'] . ''; - $objauthor = '' . $rr['author-name'] . ''; - - //var_dump($rr['verb'],$rr['object-type']); killme(); - switch($rr['verb']){ - case 'http://activitystrea.ms/schema/1.0/post': - switch ($rr['object-type']){ - case 'http://activitystrea.ms/schema/1.0/event': - $post_type = t('event'); - break; - default: - $post_type = t('status'); - } - break; - default: - if ($rr['resource-id']){ - $post_type = t('photo'); - $m=array(); preg_match("/\[url=([^]]*)\]/", $rr['body'], $m); - $rr['plink'] = $m[1]; - } else { - $post_type = t('status'); - } - } - $plink = '' . $post_type . ''; - - $aside['$like_items'][] = sprintf( t('%1$s likes %2$s\'s %3$s'), $author, $objauthor, $plink); - - } - - - // last 12 photos - $aside['$photos_title'] = t('Last photos'); - $aside['$photos_items'] = array(); - $r = q("SELECT `photo`.`id`, `photo`.`resource-id`, `photo`.`scale`, `photo`.`desc`, `user`.`nickname`, `user`.`username` FROM - (SELECT `resource-id`, MAX(`scale`) as maxscale FROM `photo` - WHERE `profile`=0 AND `contact-id`=0 AND `album` NOT IN ('Contact Photos', '%s', 'Profile Photos', '%s') - AND `allow_cid`='' AND `allow_gid`='' AND `deny_cid`='' AND `deny_gid`='' GROUP BY `resource-id`) AS `t1` - INNER JOIN `photo` ON `photo`.`resource-id`=`t1`.`resource-id` AND `photo`.`scale` = `t1`.`maxscale`, - `user` - WHERE `user`.`uid` = `photo`.`uid` - AND `user`.`blockwall`=0 - AND `user`.`hidewall`=0 - ORDER BY `photo`.`edited` DESC - LIMIT 0, 9", - dbesc(t('Contact Photos')), - dbesc(t('Profile Photos')) - ); - if(count($r)) { - $tpl = file_get_contents( dirname(__file__).'/ch_directory_item.tpl'); - foreach($r as $rr) { - $photo_page = $a->get_baseurl() . '/photos/' . $rr['nickname'] . '/image/' . $rr['resource-id']; - $photo_url = $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['scale'] .'.jpg'; - - $entry = replace_macros($tpl,array( - '$id' => $rr['id'], - '$profile-link' => $photo_page, - '$photo' => $photo_url, - '$alt-text' => $rr['username']." : ".$rr['desc'], - )); - - $aside['$photos_items'][] = $entry; - } - } - - - - //nav FIND FRIENDS - if(local_user()) { - $nv = array(); - $nv['title'] = Array("", t('Find Friends'), "", ""); - $nv['directory'] = Array('directory', t('Local Directory'), "", ""); - $nv['global_directory'] = Array('http://dir.friendica.com/', t('Global Directory'), "", ""); - $nv['match'] = Array('match', t('Similar Interests'), "", ""); - $nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", ""); - $nv['invite'] = Array('invite', t('Invite Friends'), "", ""); - - $nv['search'] = '
- - - - - '; - - $aside['$nv'] = $nv; - }; - //Community Page - if(local_user()) { - $page = '
-
-

'.t("Community Pages").'

-
    '; - - $pagelist = array(); - - $contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact` - WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d - ORDER BY `name` ASC", - intval($a->user['uid']) - ); - - $pageD = array(); - - // Look if the profile is a community page - foreach($contacts as $contact) { - $pageD[] = array("url"=>$contact["url"], "name"=>$contact["name"], "id"=>$contact["id"], "micro"=>$contact['micro']); - }; - - - $contacts = $pageD; - - foreach($contacts as $contact) { - $page .= '
  • ' . $contact['url'] . ' '. - $contact["name"]."
    • "; - } - $page .= '
'; - //if (sizeof($contacts) > 0) - - $aside['$page'] = $page; - } - //END Community Page - //helpers - $helpers = array(); - $helpers['title'] = Array("", t('Help or @NewHere ?'), "", ""); - - $aside['$helpers'] = $helpers; - //end helpers - //connectable services - $con_services = array(); - $con_services['title'] = Array("", t('Connect Services'), "", ""); - - $aside['$con_services'] = $con_services; - //end connectable services - - - //get_baseurl - $url = $a->get_baseurl($ssl_state); - $aside['$url'] = $url; - - $tpl = file_get_contents(dirname(__file__).'/communityhome.tpl'); - $a->page['right_aside'] = replace_macros($tpl, $aside); - -} - - -//profile_side at networkpages -if ($a->argv[0] === "network" && local_user()){ - - // USER MENU - if(local_user()) { - - $r = q("SELECT micro FROM contact WHERE uid=%d AND self=1", intval($a->user['uid'])); - - $userinfo = array( - 'icon' => (count($r) ? $r[0]['micro']: $a->get_baseurl()."/images/default-profile-mm.jpg"), - 'name' => $a->user['username'], - ); - $ps = array('usermenu'=>array()); - $ps['usermenu']['status'] = Array('profile/' . $a->user['nickname'], t('Home'), "", t('Your posts and conversations')); - $ps['usermenu']['profile'] = Array('profile/' . $a->user['nickname']. '?tab=profile', t('Profile'), "", t('Your profile page')); - $ps['usermenu']['contacts'] = Array('contacts' , t('Contacts'), "", t('Your contacts')); - $ps['usermenu']['photos'] = Array('photos/' . $a->user['nickname'], t('Photos'), "", t('Your photos')); - $ps['usermenu']['events'] = Array('events/', t('Events'), "", t('Your events')); - $ps['usermenu']['notes'] = Array('notes/', t('Personal notes'), "", t('Your personal photos')); - $ps['usermenu']['community'] = Array('community/', t('Community'), "", ""); - $ps['usermenu']['pgroups'] = Array('http://dir.friendika.com/directory/forum', t('Community Pages'), "", ""); - - $tpl = get_markup_template('profile_side.tpl'); - - $a->page['aside'] .= replace_macros($tpl, array( - '$userinfo' => $userinfo, - '$ps' => $ps, - )); - - } - - $ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes']; - - if($ccCookie != "7") { - // COMMUNITY - diabook_dark_community_info(); - - // CUSTOM CSS - if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-dark/style-network.css";} - if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-dark/style-network-wide.css";} - } -} - - - -//right_aside at profile pages -if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){ - if($ccCookie != "7") { - // COMMUNITY - diabook_dark_community_info(); - - // CUSTOM CSS - if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-dark/style-profile.css";} - if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-dark/style-profile-wide.css";} - } -} - - - -// custom css -if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('', $cssFile); - -//load jquery.cookie.js -$cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-dark/js/jquery.cookie.js"; -$a->page['htmlhead'] .= sprintf('', $cookieJS); - -//load jquery.ae.image.resize.js -$imageresizeJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-dark/js/jquery.ae.image.resize.js"; -$a->page['htmlhead'] .= sprintf('', $imageresizeJS); - -//load jquery.autogrow-textarea.js -$autogrowJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-dark/js/jquery.autogrow.textarea.js"; -$a->page['htmlhead'] .= sprintf('', $autogrowJS); - -//js scripts -//comment-edit-wrapper on photo_view -if ($a->argv[0].$a->argv[2] === "photos"."image"){ - -$a->page['htmlhead'] .= ' -'; - -} - -$a->page['htmlhead'] .= ' - -'; - -$a->page['htmlhead'] .= ' - -'; - -$a->page['htmlhead'] .= ' - '; - -if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){ -$a->page['htmlhead'] .= ' -'; - - - if($ccCookie != "7") { -$a->page['htmlhead'] .= ' -';} - -$a->page['htmlhead'] .= ' -';} - -$a->page['htmlhead'] .= ' - - '; \ No newline at end of file diff --git a/view/theme/diabook/diabook-dark/theme_settings.tpl b/view/theme/diabook/diabook-dark/theme_settings.tpl deleted file mode 100644 index 472232cf0..000000000 --- a/view/theme/diabook/diabook-dark/theme_settings.tpl +++ /dev/null @@ -1,10 +0,0 @@ -{{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}} - -
- -
- diff --git a/view/theme/diabook/diabook-dark/wall_item.tpl b/view/theme/diabook/diabook-dark/wall_item.tpl deleted file mode 100644 index 123834064..000000000 --- a/view/theme/diabook/diabook-dark/wall_item.tpl +++ /dev/null @@ -1,100 +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 -
-
-
-
-
-
- {{ 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.dropping }} - - $item.drop.delete - {{ endif }} - {{ if $item.edpost }} - - {{ endif }} -
-
$item.location 
-
-
-
-
- -
$item.dislike
-
-
- -
- $item.comment -
diff --git a/view/theme/diabook/diabook-dark/wallwall_item.tpl b/view/theme/diabook/diabook-dark/wallwall_item.tpl deleted file mode 100644 index 6a0c93f88..000000000 --- a/view/theme/diabook/diabook-dark/wallwall_item.tpl +++ /dev/null @@ -1,106 +0,0 @@ -{{ if $item.indent }}{{ else }} -
- -
-{{ endif }} -
-
-
-
- - $item.owner_name - -
-
- - $item.name - - menu - - -
-
-
- $item.name - $item.to $item.owner_name - $item.vwall -   - {{ 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.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.dropping }} - - $item.drop.delete - {{ endif }} - {{ if $item.edpost }} - - {{ endif }} -
-
$item.location 
-
-
-
-
- -
$item.dislike
-
-
- -
- $item.comment -
\ No newline at end of file diff --git a/view/theme/diabook/diabook-green/admin_users.tpl b/view/theme/diabook/diabook-green/admin_users.tpl deleted file mode 100644 index 8aabb51ec..000000000 --- a/view/theme/diabook/diabook-green/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 - - -
-
$select_all
-
- {{ 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 - - -
-
$select_all
-
- {{ else }} - NO USERS?!? - {{ endif }} - -
diff --git a/view/theme/diabook/diabook-green/ch_directory_item.tpl b/view/theme/diabook/diabook-green/ch_directory_item.tpl deleted file mode 100755 index db1936e4b..000000000 --- a/view/theme/diabook/diabook-green/ch_directory_item.tpl +++ /dev/null @@ -1,10 +0,0 @@ - -
-
-
- - $alt-text - -
-
-
diff --git a/view/theme/diabook/diabook-green/comment_item.tpl b/view/theme/diabook/diabook-green/comment_item.tpl deleted file mode 100644 index ee4dfba45..000000000 --- a/view/theme/diabook/diabook-green/comment_item.tpl +++ /dev/null @@ -1,41 +0,0 @@ -
-
- - - - - - - -
- $mytitle -
-
- - img - url - video - u - i - b - quote - {{ if $qcomment }} - - {{ endif }} - -
- - -
-
- -
diff --git a/view/theme/diabook/diabook-green/communityhome.tpl b/view/theme/diabook/diabook-green/communityhome.tpl deleted file mode 100644 index 875d83f1b..000000000 --- a/view/theme/diabook/diabook-green/communityhome.tpl +++ /dev/null @@ -1,86 +0,0 @@ -
-{{ if $page }} -
$page
-{{ endif }} -
- -
-{{ if $lastusers_title }} -

$helpers.title.1

-NewHere
-Friendica Support
-Let's talk
-Local Friendica -{{ endif }} -
- -
-{{ if $lastusers_title }} -

$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 }} -
diff --git a/view/theme/diabook/diabook-green/config.php b/view/theme/diabook/diabook-green/config.php deleted file mode 100644 index 0083a4df7..000000000 --- a/view/theme/diabook/diabook-green/config.php +++ /dev/null @@ -1,84 +0,0 @@ -"1.3", - "---"=>"---", - "1.5"=>"1.5", - "1.4"=>"1.4", - "1.2"=>"1.2", - "1.1"=>"1.1", - ); - - $font_sizes = array( - '13'=>'13', - "---"=>"---", - "15"=>"15", - '14'=>'14', - '13.5'=>'13.5', - '12.5'=>'12.5', - '12'=>'12', - ); - $resolutions = array( - 'normal'=>'normal', - 'wide'=>'wide', - ); - - - - $t = file_get_contents( dirname(__file__). "/theme_settings.tpl" ); - $o .= replace_macros($t, array( - '$submit' => t('Submit'), - '$baseurl' => $a->get_baseurl(), - '$title' => t("Theme settings"), - '$font_size' => array('diabook-aerith_font_size', t('Set font-size for posts and comments'), $font_size, '', $font_sizes), - '$line_height' => array('diabook-aerith_line_height', t('Set line-height for posts and comments'), $line_height, '', $line_heights), - '$resolution' => array('diabook-aerith_resolution', t('Set resolution for middle column'), $resolution, '', $resolutions), - )); - return $o; -} diff --git a/view/theme/diabook/diabook-green/contact_template.tpl b/view/theme/diabook/diabook-green/contact_template.tpl deleted file mode 100644 index 48930b48a..000000000 --- a/view/theme/diabook/diabook-green/contact_template.tpl +++ /dev/null @@ -1,25 +0,0 @@ - -
-
-
- - $contact.name - - {{ if $contact.photo_menu }} - menu -
-
    - $contact.photo_menu -
-
- {{ endif }} -
- -
-
-
$contact.name
- -
-
diff --git a/view/theme/diabook/diabook-green/directory_item.tpl b/view/theme/diabook/diabook-green/directory_item.tpl deleted file mode 100755 index bc2af16c2..000000000 --- a/view/theme/diabook/diabook-green/directory_item.tpl +++ /dev/null @@ -1,11 +0,0 @@ - -
-
-
- - $alt-text - -
-
-
$name
-
diff --git a/view/theme/diabook/diabook-green/generic_links_widget.tpl b/view/theme/diabook/diabook-green/generic_links_widget.tpl deleted file mode 100644 index 001c1395e..000000000 --- a/view/theme/diabook/diabook-green/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/diabook-green/group_side.tpl b/view/theme/diabook/diabook-green/group_side.tpl deleted file mode 100755 index 8600402f2..000000000 --- a/view/theme/diabook/diabook-green/group_side.tpl +++ /dev/null @@ -1,34 +0,0 @@ -
-
-

$title

-
- - - {{ if $ungrouped }} - - {{ endif }} -
- diff --git a/view/theme/diabook/diabook-green/jot.tpl b/view/theme/diabook/diabook-green/jot.tpl deleted file mode 100644 index 0928c9f36..000000000 --- a/view/theme/diabook/diabook-green/jot.tpl +++ /dev/null @@ -1,85 +0,0 @@ - -
-
-
 
-
-
- -
- - - - - - - - -
-
- - - - -
- -
-
-
-
-
-
- - -
- -
-
- -
-
- -
- - - - - $preview - -
- $bang -
- - -
- $jotplugins -
- -
- -
- -
-
- - - -
-
- $acl -
-
$emailcc
-
- $jotnets -
-
- - - - -
-
- {{ if $content }}{{ endif }} diff --git a/view/theme/diabook/diabook-green/js/README b/view/theme/diabook/diabook-green/js/README deleted file mode 100644 index c93b2118e..000000000 --- a/view/theme/diabook/diabook-green/js/README +++ /dev/null @@ -1,22 +0,0 @@ -jQuery Resize Plugin Demo - -Version: v2.1.1 -Author: Adeel Ejaz (http://adeelejaz.com/) -License: Dual licensed under MIT and GPL licenses. - -Introduction -aeImageResize is a jQuery plugin to dynamically resize the images without distorting the proportions. - -Usage: -.aeImageResize( height, width ) - -height -An integer representing the maximum height for the image. - -width -An integer representing the maximum width for the image. - -Example -$(function() { - $( ".resizeme" ).aeImageResize({ height: 250, width: 250 }); -}); \ No newline at end of file diff --git a/view/theme/diabook/diabook-green/js/jquery.ae.image.resize.js b/view/theme/diabook/diabook-green/js/jquery.ae.image.resize.js deleted file mode 100644 index bac09cd45..000000000 --- a/view/theme/diabook/diabook-green/js/jquery.ae.image.resize.js +++ /dev/null @@ -1,69 +0,0 @@ -(function( $ ) { - - $.fn.aeImageResize = function( params ) { - - var aspectRatio = 0 - // Nasty I know but it's done only once, so not too bad I guess - // Alternate suggestions welcome :) - , isIE6 = $.browser.msie && (6 == ~~ $.browser.version) - ; - - // We cannot do much unless we have one of these - if ( !params.height && !params.width ) { - return this; - } - - // Calculate aspect ratio now, if possible - if ( params.height && params.width ) { - aspectRatio = params.width / params.height; - } - - // Attach handler to load - // Handler is executed just once per element - // Load event required for Webkit browsers - return this.one( "load", function() { - - // Remove all attributes and CSS rules - this.removeAttribute( "height" ); - this.removeAttribute( "width" ); - this.style.height = this.style.width = ""; - - var imgHeight = this.height - , imgWidth = this.width - , imgAspectRatio = imgWidth / imgHeight - , bxHeight = params.height - , bxWidth = params.width - , bxAspectRatio = aspectRatio; - - // Work the magic! - // If one parameter is missing, we just force calculate it - if ( !bxAspectRatio ) { - if ( bxHeight ) { - bxAspectRatio = imgAspectRatio + 1; - } else { - bxAspectRatio = imgAspectRatio - 1; - } - } - - // Only resize the images that need resizing - if ( (bxHeight && imgHeight > bxHeight) || (bxWidth && imgWidth > bxWidth) ) { - - if ( imgAspectRatio > bxAspectRatio ) { - bxHeight = ~~ ( imgHeight / imgWidth * bxWidth ); - } else { - bxWidth = ~~ ( imgWidth / imgHeight * bxHeight ); - } - - this.height = bxHeight; - this.width = bxWidth; - } - }) - .each(function() { - - // Trigger load event (for Gecko and MSIE) - if ( this.complete || isIE6 ) { - $( this ).trigger( "load" ); - } - }); - }; -})( jQuery ); \ No newline at end of file diff --git a/view/theme/diabook/diabook-green/js/jquery.ae.image.resize.min.js b/view/theme/diabook/diabook-green/js/jquery.ae.image.resize.min.js deleted file mode 100644 index 16c30b123..000000000 --- a/view/theme/diabook/diabook-green/js/jquery.ae.image.resize.min.js +++ /dev/null @@ -1 +0,0 @@ -(function(d){d.fn.aeImageResize=function(a){var i=0,j=d.browser.msie&&6==~~d.browser.version;if(!a.height&&!a.width)return this;if(a.height&&a.width)i=a.width/a.height;return this.one("load",function(){this.removeAttribute("height");this.removeAttribute("width");this.style.height=this.style.width="";var e=this.height,f=this.width,g=f/e,b=a.height,c=a.width,h=i;h||(h=b?g+1:g-1);if(b&&e>b||c&&f>c){if(g>h)b=~~(e/f*c);else c=~~(f/e*b);this.height=b;this.width=c}}).each(function(){if(this.complete||j)d(this).trigger("load")})}})(jQuery); \ No newline at end of file diff --git a/view/theme/diabook/diabook-green/js/jquery.autogrow.textarea.js b/view/theme/diabook/diabook-green/js/jquery.autogrow.textarea.js deleted file mode 100644 index 806e34f51..000000000 --- a/view/theme/diabook/diabook-green/js/jquery.autogrow.textarea.js +++ /dev/null @@ -1,46 +0,0 @@ -(function($) { - - /* - * Auto-growing textareas; technique ripped from Facebook - */ - $.fn.autogrow = function(options) { - - this.filter('textarea').each(function() { - - var $this = $(this), - minHeight = $this.height(), - lineHeight = $this.css('lineHeight'); - - var shadow = $('
').css({ - position: 'absolute', - top: -10000, - left: -10000, - width: $(this).width(), - fontSize: $this.css('fontSize'), - fontFamily: $this.css('fontFamily'), - lineHeight: $this.css('lineHeight'), - resize: 'none' - }).appendTo(document.body); - - var update = function() { - - var val = this.value.replace(//g, '>') - .replace(/&/g, '&') - .replace(/\n/g, '
'); - - shadow.html(val); - $(this).css('height', Math.max(shadow.height() + 20, minHeight)); - } - - $(this).change(update).keyup(update).keydown(update); - - update.apply(this); - - }); - - return this; - - } - -})(jQuery); \ No newline at end of file diff --git a/view/theme/diabook/diabook-green/js/jquery.cookie.js b/view/theme/diabook/diabook-green/js/jquery.cookie.js deleted file mode 100644 index 6d5974a2c..000000000 --- a/view/theme/diabook/diabook-green/js/jquery.cookie.js +++ /dev/null @@ -1,47 +0,0 @@ -/*! - * jQuery Cookie Plugin - * https://github.com/carhartl/jquery-cookie - * - * Copyright 2011, Klaus Hartl - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://www.opensource.org/licenses/mit-license.php - * http://www.opensource.org/licenses/GPL-2.0 - */ -(function($) { - $.cookie = function(key, value, options) { - - // key and at least value given, set cookie... - if (arguments.length > 1 && (!/Object/.test(Object.prototype.toString.call(value)) || value === null || value === undefined)) { - options = $.extend({}, options); - - if (value === null || value === undefined) { - options.expires = -1; - } - - if (typeof options.expires === 'number') { - var days = options.expires, t = options.expires = new Date(); - t.setDate(t.getDate() + days); - } - - value = String(value); - - return (document.cookie = [ - encodeURIComponent(key), '=', options.raw ? value : encodeURIComponent(value), - options.expires ? '; expires=' + options.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE - options.path ? '; path=' + options.path : '', - options.domain ? '; domain=' + options.domain : '', - options.secure ? '; secure' : '' - ].join('')); - } - - // key and possibly options given, get cookie... - options = value || {}; - var decode = options.raw ? function(s) { return s; } : decodeURIComponent; - - var pairs = document.cookie.split('; '); - for (var i = 0, pair; pair = pairs[i] && pairs[i].split('='); i++) { - if (decode(pair[0]) === key) return decode(pair[1] || ''); // IE saves cookies with empty string as "c; ", e.g. without "=" as opposed to EOMB, thus pair[1] may be undefined - } - return null; - }; -})(jQuery); diff --git a/view/theme/diabook/diabook-green/login.tpl b/view/theme/diabook/diabook-green/login.tpl deleted file mode 100644 index efa7c2d6d..000000000 --- a/view/theme/diabook/diabook-green/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/diabook-green/mail_conv.tpl b/view/theme/diabook/diabook-green/mail_conv.tpl deleted file mode 100644 index 989f17878..000000000 --- a/view/theme/diabook/diabook-green/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/diabook/diabook-green/mail_display.tpl b/view/theme/diabook/diabook-green/mail_display.tpl deleted file mode 100644 index 8b82e95c6..000000000 --- a/view/theme/diabook/diabook-green/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/diabook-green/mail_list.tpl b/view/theme/diabook/diabook-green/mail_list.tpl deleted file mode 100644 index 6bc6c84f6..000000000 --- a/view/theme/diabook/diabook-green/mail_list.tpl +++ /dev/null @@ -1,8 +0,0 @@ -
- $subject - $from_name - $date - $count - - -
diff --git a/view/theme/diabook/diabook-green/message_side.tpl b/view/theme/diabook/diabook-green/message_side.tpl deleted file mode 100644 index 9f1587096..000000000 --- a/view/theme/diabook/diabook-green/message_side.tpl +++ /dev/null @@ -1,10 +0,0 @@ -
- - -
    - {{ for $tabs as $t }} -
  • $t.label
    • - {{ endfor }} -
- -
diff --git a/view/theme/diabook/diabook-green/nav.tpl b/view/theme/diabook/diabook-green/nav.tpl deleted file mode 100644 index e3aabaa8b..000000000 --- a/view/theme/diabook/diabook-green/nav.tpl +++ /dev/null @@ -1,190 +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/diabook-green/nets.tpl b/view/theme/diabook/diabook-green/nets.tpl deleted file mode 100644 index be25ddee1..000000000 --- a/view/theme/diabook/diabook-green/nets.tpl +++ /dev/null @@ -1,15 +0,0 @@ -
-

$title

-
$desc
- -
    -
  • - - $all
    • - {{ for $nets as $net }} -
  • - - $net.name
    • - {{ endfor }} -
-
diff --git a/view/theme/diabook/diabook-green/oembed_video.tpl b/view/theme/diabook/diabook-green/oembed_video.tpl deleted file mode 100644 index d6d29f724..000000000 --- a/view/theme/diabook/diabook-green/oembed_video.tpl +++ /dev/null @@ -1,4 +0,0 @@ - - -
- diff --git a/view/theme/diabook/diabook-green/photo_item.tpl b/view/theme/diabook/diabook-green/photo_item.tpl deleted file mode 100644 index 5d65a89b7..000000000 --- a/view/theme/diabook/diabook-green/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/diabook-green/photo_view.tpl b/view/theme/diabook/diabook-green/photo_view.tpl deleted file mode 100644 index 071972e0c..000000000 --- a/view/theme/diabook/diabook-green/photo_view.tpl +++ /dev/null @@ -1,35 +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/diabook-green/profile_side.tpl b/view/theme/diabook/diabook-green/profile_side.tpl deleted file mode 100644 index 01e80f238..000000000 --- a/view/theme/diabook/diabook-green/profile_side.tpl +++ /dev/null @@ -1,21 +0,0 @@ - - - diff --git a/view/theme/diabook/diabook-green/profile_vcard.tpl b/view/theme/diabook/diabook-green/profile_vcard.tpl deleted file mode 100644 index 6fcffcc9b..000000000 --- a/view/theme/diabook/diabook-green/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/diabook-green/right_aside.tpl b/view/theme/diabook/diabook-green/right_aside.tpl deleted file mode 100644 index a65677696..000000000 --- a/view/theme/diabook/diabook-green/right_aside.tpl +++ /dev/null @@ -1,20 +0,0 @@ - - - \ No newline at end of file diff --git a/view/theme/diabook/diabook-green/screenshot.png b/view/theme/diabook/diabook-green/screenshot.png deleted file mode 100644 index 4eee5be5a..000000000 Binary files a/view/theme/diabook/diabook-green/screenshot.png and /dev/null differ diff --git a/view/theme/diabook/diabook-green/search_item.tpl b/view/theme/diabook/diabook-green/search_item.tpl deleted file mode 100644 index 123834064..000000000 --- a/view/theme/diabook/diabook-green/search_item.tpl +++ /dev/null @@ -1,100 +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 -
-
-
-
-
-
- {{ 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.dropping }} - - $item.drop.delete - {{ endif }} - {{ if $item.edpost }} - - {{ endif }} -
-
$item.location 
-
-
-
-
- -
$item.dislike
-
-
- -
- $item.comment -
diff --git a/view/theme/diabook/diabook-green/style.php b/view/theme/diabook/diabook-green/style.php deleted file mode 100644 index b8c37fc96..000000000 --- a/view/theme/diabook/diabook-green/style.php +++ /dev/null @@ -1,277 +0,0 @@ -page['htmlhead'] .= sprintf('', $diabook_version); - - -//change css on network and profilepages -$cssFile = null; -$resolution=false; -$resolution = get_pconfig(local_user(), "diabook-aerith", "resolution"); -if ($resolution===false) $resolution="normal"; - -/** - * prints last community activity - */ -function diabook_aerith_community_info(){ - $a = get_app(); - - // last 12 users - $aside['$lastusers_title'] = t('Last users'); - $aside['$lastusers_items'] = array(); - $sql_extra = ""; - $publish = (get_config('system','publish_all') ? '' : " AND `publish` = 1 " ); - $order = " ORDER BY `register_date` DESC "; - - $r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname` - FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` - WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra $order LIMIT %d , %d ", - 0, - 9 - ); - $tpl = file_get_contents( dirname(__file__).'/ch_directory_item.tpl'); - if(count($r)) { - $photo = 'thumb'; - foreach($r as $rr) { - $profile_link = $a->get_baseurl() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']); - $entry = replace_macros($tpl,array( - '$id' => $rr['id'], - '$profile-link' => $profile_link, - '$photo' => $rr[$photo], - '$alt-text' => $rr['name'], - )); - $aside['$lastusers_items'][] = $entry; - } - } - - - // last 10 liked items - $aside['$like_title'] = t('Last likes'); - $aside['$like_items'] = array(); - $r = q("SELECT `T1`.`created`, `T1`.`liker`, `T1`.`liker-link`, `item`.* FROM - (SELECT `parent-uri`, `created`, `author-name` AS `liker`,`author-link` AS `liker-link` - FROM `item` WHERE `verb`='http://activitystrea.ms/schema/1.0/like' GROUP BY `parent-uri` ORDER BY `created` DESC) AS T1 - INNER JOIN `item` ON `item`.`uri`=`T1`.`parent-uri` - WHERE `T1`.`liker-link` LIKE '%s%%' OR `item`.`author-link` LIKE '%s%%' - GROUP BY `uri` - ORDER BY `T1`.`created` DESC - LIMIT 0,5", - $a->get_baseurl(),$a->get_baseurl() - ); - - foreach ($r as $rr) { - $author = '' . $rr['liker'] . ''; - $objauthor = '' . $rr['author-name'] . ''; - - //var_dump($rr['verb'],$rr['object-type']); killme(); - switch($rr['verb']){ - case 'http://activitystrea.ms/schema/1.0/post': - switch ($rr['object-type']){ - case 'http://activitystrea.ms/schema/1.0/event': - $post_type = t('event'); - break; - default: - $post_type = t('status'); - } - break; - default: - if ($rr['resource-id']){ - $post_type = t('photo'); - $m=array(); preg_match("/\[url=([^]]*)\]/", $rr['body'], $m); - $rr['plink'] = $m[1]; - } else { - $post_type = t('status'); - } - } - $plink = '' . $post_type . ''; - - $aside['$like_items'][] = sprintf( t('%1$s likes %2$s\'s %3$s'), $author, $objauthor, $plink); - - } - - - // last 12 photos - $aside['$photos_title'] = t('Last photos'); - $aside['$photos_items'] = array(); - $r = q("SELECT `photo`.`id`, `photo`.`resource-id`, `photo`.`scale`, `photo`.`desc`, `user`.`nickname`, `user`.`username` FROM - (SELECT `resource-id`, MAX(`scale`) as maxscale FROM `photo` - WHERE `profile`=0 AND `contact-id`=0 AND `album` NOT IN ('Contact Photos', '%s', 'Profile Photos', '%s') - AND `allow_cid`='' AND `allow_gid`='' AND `deny_cid`='' AND `deny_gid`='' GROUP BY `resource-id`) AS `t1` - INNER JOIN `photo` ON `photo`.`resource-id`=`t1`.`resource-id` AND `photo`.`scale` = `t1`.`maxscale`, - `user` - WHERE `user`.`uid` = `photo`.`uid` - AND `user`.`blockwall`=0 - AND `user`.`hidewall`=0 - ORDER BY `photo`.`edited` DESC - LIMIT 0, 9", - dbesc(t('Contact Photos')), - dbesc(t('Profile Photos')) - ); - if(count($r)) { - $tpl = file_get_contents( dirname(__file__).'/ch_directory_item.tpl'); - foreach($r as $rr) { - $photo_page = $a->get_baseurl() . '/photos/' . $rr['nickname'] . '/image/' . $rr['resource-id']; - $photo_url = $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['scale'] .'.jpg'; - - $entry = replace_macros($tpl,array( - '$id' => $rr['id'], - '$profile-link' => $photo_page, - '$photo' => $photo_url, - '$alt-text' => $rr['username']." : ".$rr['desc'], - )); - - $aside['$photos_items'][] = $entry; - } - } - - - - //nav FIND FRIENDS - if(local_user()) { - $nv = array(); - $nv['title'] = Array("", t('Find Friends'), "", ""); - $nv['directory'] = Array('directory', t('Local Directory'), "", ""); - $nv['global_directory'] = Array('http://dir.friendica.com/', t('Global Directory'), "", ""); - $nv['match'] = Array('match', t('Similar Interests'), "", ""); - $nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", ""); - $nv['invite'] = Array('invite', t('Invite Friends'), "", ""); - - $nv['search'] = '
- - - - - '; - - $aside['$nv'] = $nv; - }; - //Community Page - if(local_user()) { - $page = '
-
-

'.t("Community Pages").'

-
    '; - - $pagelist = array(); - - $contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact` - WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d - ORDER BY `name` ASC", - intval($a->user['uid']) - ); - - $pageD = array(); - - // Look if the profile is a community page - foreach($contacts as $contact) { - $pageD[] = array("url"=>$contact["url"], "name"=>$contact["name"], "id"=>$contact["id"], "micro"=>$contact['micro']); - }; - - - $contacts = $pageD; - - foreach($contacts as $contact) { - $page .= '
  • ' . $contact['url'] . ' '. - $contact["name"]."
    • "; - } - $page .= '
'; - //if (sizeof($contacts) > 0) - - $aside['$page'] = $page; - } - //END Community Page - //helpers - $helpers = array(); - $helpers['title'] = Array("", t('Help or @NewHere ?'), "", ""); - - $aside['$helpers'] = $helpers; - //end helpers - //connectable services - $con_services = array(); - $con_services['title'] = Array("", t('Connect Services'), "", ""); - - $aside['$con_services'] = $con_services; - //end connectable services - - - //get_baseurl - $url = $a->get_baseurl($ssl_state); - $aside['$url'] = $url; - - $tpl = file_get_contents(dirname(__file__).'/communityhome.tpl'); - $a->page['right_aside'] = replace_macros($tpl, $aside); - -} - - -//profile_side at networkpages -if ($a->argv[0] === "network" && local_user()){ - - // USER MENU - if(local_user()) { - - $r = q("SELECT micro FROM contact WHERE uid=%d AND self=1", intval($a->user['uid'])); - - $userinfo = array( - 'icon' => (count($r) ? $r[0]['micro']: $a->get_baseurl()."/images/default-profile-mm.jpg"), - 'name' => $a->user['username'], - ); - $ps = array('usermenu'=>array()); - $ps['usermenu']['status'] = Array('profile/' . $a->user['nickname'], t('Home'), "", t('Your posts and conversations')); - $ps['usermenu']['profile'] = Array('profile/' . $a->user['nickname']. '?tab=profile', t('Profile'), "", t('Your profile page')); - $ps['usermenu']['contacts'] = Array('contacts' , t('Contacts'), "", t('Your contacts')); - $ps['usermenu']['photos'] = Array('photos/' . $a->user['nickname'], t('Photos'), "", t('Your photos')); - $ps['usermenu']['events'] = Array('events/', t('Events'), "", t('Your events')); - $ps['usermenu']['notes'] = Array('notes/', t('Personal notes'), "", t('Your personal photos')); - $ps['usermenu']['community'] = Array('community/', t('Community'), "", ""); - $ps['usermenu']['pgroups'] = Array('http://dir.friendika.com/directory/forum', t('Community Pages'), "", ""); - - $tpl = get_markup_template('profile_side.tpl'); - - $a->page['aside'] .= replace_macros($tpl, array( - '$userinfo' => $userinfo, - '$ps' => $ps, - )); - - } - - $ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes']; - - if($ccCookie != "7") { - // COMMUNITY - diabook_aerith_community_info(); - - // CUSTOM CSS - if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/style-network.css";} - if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/style-network-wide.css";} - } -} - - - -//right_aside at profile pages -if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){ - if($ccCookie != "7") { - // COMMUNITY - diabook_aerith_community_info(); - - // CUSTOM CSS - if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/style-profile.css";} - if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/style-profile-wide.css";} - } -} - - - -// custom css -if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('', $cssFile); - -//load jquery.cookie.js -$cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/js/jquery.cookie.js"; -$a->page['htmlhead'] .= sprintf('', $cookieJS); - -//load jquery.ae.image.resize.js -$imageresizeJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/js/jquery.ae.image.resize.js"; -$a->page['htmlhead'] .= sprintf('', $imageresizeJS); - -//load jquery.autogrow-textarea.js -$autogrowJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/js/jquery.autogrow.textarea.js"; -$a->page['htmlhead'] .= sprintf('', $autogrowJS); - -//js scripts -//comment-edit-wrapper on photo_view -if ($a->argv[0].$a->argv[2] === "photos"."image"){ - -$a->page['htmlhead'] .= ' -'; - -} - -$a->page['htmlhead'] .= ' - -'; - -$a->page['htmlhead'] .= ' - -'; - -$a->page['htmlhead'] .= ' - '; - -if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){ -$a->page['htmlhead'] .= ' -'; - - - if($ccCookie != "7") { -$a->page['htmlhead'] .= ' -';} - -$a->page['htmlhead'] .= ' -';} - -$a->page['htmlhead'] .= ' - - '; \ No newline at end of file diff --git a/view/theme/diabook/diabook-green/theme_settings.tpl b/view/theme/diabook/diabook-green/theme_settings.tpl deleted file mode 100644 index 472232cf0..000000000 --- a/view/theme/diabook/diabook-green/theme_settings.tpl +++ /dev/null @@ -1,10 +0,0 @@ -{{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}} - -
- -
- diff --git a/view/theme/diabook/diabook-green/wall_item.tpl b/view/theme/diabook/diabook-green/wall_item.tpl deleted file mode 100644 index 123834064..000000000 --- a/view/theme/diabook/diabook-green/wall_item.tpl +++ /dev/null @@ -1,100 +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 -
-
-
-
-
-
- {{ 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.dropping }} - - $item.drop.delete - {{ endif }} - {{ if $item.edpost }} - - {{ endif }} -
-
$item.location 
-
-
-
-
- -
$item.dislike
-
-
- -
- $item.comment -
diff --git a/view/theme/diabook/diabook-green/wallwall_item.tpl b/view/theme/diabook/diabook-green/wallwall_item.tpl deleted file mode 100644 index 6a0c93f88..000000000 --- a/view/theme/diabook/diabook-green/wallwall_item.tpl +++ /dev/null @@ -1,106 +0,0 @@ -{{ if $item.indent }}{{ else }} -
- -
-{{ endif }} -
-
-
-
- - $item.owner_name - -
-
- - $item.name - - menu - - -
-
-
- $item.name - $item.to $item.owner_name - $item.vwall -   - {{ 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.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.dropping }} - - $item.drop.delete - {{ endif }} - {{ if $item.edpost }} - - {{ endif }} -
-
$item.location 
-
-
-
-
- -
$item.dislike
-
-
- -
- $item.comment -
\ No newline at end of file diff --git a/view/theme/diabook/diabook-pink/admin_users.tpl b/view/theme/diabook/diabook-pink/admin_users.tpl deleted file mode 100644 index 8aabb51ec..000000000 --- a/view/theme/diabook/diabook-pink/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 - - -
-
$select_all
-
- {{ 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 - - -
-
$select_all
-
- {{ else }} - NO USERS?!? - {{ endif }} - -
diff --git a/view/theme/diabook/diabook-pink/ch_directory_item.tpl b/view/theme/diabook/diabook-pink/ch_directory_item.tpl deleted file mode 100755 index db1936e4b..000000000 --- a/view/theme/diabook/diabook-pink/ch_directory_item.tpl +++ /dev/null @@ -1,10 +0,0 @@ - -
-
-
- - $alt-text - -
-
-
diff --git a/view/theme/diabook/diabook-pink/comment_item.tpl b/view/theme/diabook/diabook-pink/comment_item.tpl deleted file mode 100644 index ee4dfba45..000000000 --- a/view/theme/diabook/diabook-pink/comment_item.tpl +++ /dev/null @@ -1,41 +0,0 @@ -
-
- - - - - - - -
- $mytitle -
-
- - img - url - video - u - i - b - quote - {{ if $qcomment }} - - {{ endif }} - -
- - -
-
- -
diff --git a/view/theme/diabook/diabook-pink/communityhome.tpl b/view/theme/diabook/diabook-pink/communityhome.tpl deleted file mode 100644 index 875d83f1b..000000000 --- a/view/theme/diabook/diabook-pink/communityhome.tpl +++ /dev/null @@ -1,86 +0,0 @@ -
-{{ if $page }} -
$page
-{{ endif }} -
- -
-{{ if $lastusers_title }} -

$helpers.title.1

-NewHere
-Friendica Support
-Let's talk
-Local Friendica -{{ endif }} -
- -
-{{ if $lastusers_title }} -

$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 }} -
diff --git a/view/theme/diabook/diabook-pink/config.php b/view/theme/diabook/diabook-pink/config.php deleted file mode 100644 index 0083a4df7..000000000 --- a/view/theme/diabook/diabook-pink/config.php +++ /dev/null @@ -1,84 +0,0 @@ -"1.3", - "---"=>"---", - "1.5"=>"1.5", - "1.4"=>"1.4", - "1.2"=>"1.2", - "1.1"=>"1.1", - ); - - $font_sizes = array( - '13'=>'13', - "---"=>"---", - "15"=>"15", - '14'=>'14', - '13.5'=>'13.5', - '12.5'=>'12.5', - '12'=>'12', - ); - $resolutions = array( - 'normal'=>'normal', - 'wide'=>'wide', - ); - - - - $t = file_get_contents( dirname(__file__). "/theme_settings.tpl" ); - $o .= replace_macros($t, array( - '$submit' => t('Submit'), - '$baseurl' => $a->get_baseurl(), - '$title' => t("Theme settings"), - '$font_size' => array('diabook-aerith_font_size', t('Set font-size for posts and comments'), $font_size, '', $font_sizes), - '$line_height' => array('diabook-aerith_line_height', t('Set line-height for posts and comments'), $line_height, '', $line_heights), - '$resolution' => array('diabook-aerith_resolution', t('Set resolution for middle column'), $resolution, '', $resolutions), - )); - return $o; -} diff --git a/view/theme/diabook/diabook-pink/contact_template.tpl b/view/theme/diabook/diabook-pink/contact_template.tpl deleted file mode 100644 index 48930b48a..000000000 --- a/view/theme/diabook/diabook-pink/contact_template.tpl +++ /dev/null @@ -1,25 +0,0 @@ - -
-
-
- - $contact.name - - {{ if $contact.photo_menu }} - menu -
-
    - $contact.photo_menu -
-
- {{ endif }} -
- -
-
-
$contact.name
- -
-
diff --git a/view/theme/diabook/diabook-pink/directory_item.tpl b/view/theme/diabook/diabook-pink/directory_item.tpl deleted file mode 100755 index bc2af16c2..000000000 --- a/view/theme/diabook/diabook-pink/directory_item.tpl +++ /dev/null @@ -1,11 +0,0 @@ - -
-
-
- - $alt-text - -
-
-
$name
-
diff --git a/view/theme/diabook/diabook-pink/generic_links_widget.tpl b/view/theme/diabook/diabook-pink/generic_links_widget.tpl deleted file mode 100644 index 001c1395e..000000000 --- a/view/theme/diabook/diabook-pink/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/diabook-pink/group_side.tpl b/view/theme/diabook/diabook-pink/group_side.tpl deleted file mode 100755 index 8600402f2..000000000 --- a/view/theme/diabook/diabook-pink/group_side.tpl +++ /dev/null @@ -1,34 +0,0 @@ -
-
-

$title

-
- - - {{ if $ungrouped }} - - {{ endif }} -
- diff --git a/view/theme/diabook/diabook-pink/jot.tpl b/view/theme/diabook/diabook-pink/jot.tpl deleted file mode 100644 index 0928c9f36..000000000 --- a/view/theme/diabook/diabook-pink/jot.tpl +++ /dev/null @@ -1,85 +0,0 @@ - -
-
-
 
-
-
- -
- - - - - - - - -
-
- - - - -
- -
-
-
-
-
-
- - -
- -
-
- -
-
- -
- - - - - $preview - -
- $bang -
- - -
- $jotplugins -
- -
- -
- -
-
- - - -
-
- $acl -
-
$emailcc
-
- $jotnets -
-
- - - - -
-
- {{ if $content }}{{ endif }} diff --git a/view/theme/diabook/diabook-pink/js/README b/view/theme/diabook/diabook-pink/js/README deleted file mode 100644 index c93b2118e..000000000 --- a/view/theme/diabook/diabook-pink/js/README +++ /dev/null @@ -1,22 +0,0 @@ -jQuery Resize Plugin Demo - -Version: v2.1.1 -Author: Adeel Ejaz (http://adeelejaz.com/) -License: Dual licensed under MIT and GPL licenses. - -Introduction -aeImageResize is a jQuery plugin to dynamically resize the images without distorting the proportions. - -Usage: -.aeImageResize( height, width ) - -height -An integer representing the maximum height for the image. - -width -An integer representing the maximum width for the image. - -Example -$(function() { - $( ".resizeme" ).aeImageResize({ height: 250, width: 250 }); -}); \ No newline at end of file diff --git a/view/theme/diabook/diabook-pink/js/jquery.ae.image.resize.js b/view/theme/diabook/diabook-pink/js/jquery.ae.image.resize.js deleted file mode 100644 index bac09cd45..000000000 --- a/view/theme/diabook/diabook-pink/js/jquery.ae.image.resize.js +++ /dev/null @@ -1,69 +0,0 @@ -(function( $ ) { - - $.fn.aeImageResize = function( params ) { - - var aspectRatio = 0 - // Nasty I know but it's done only once, so not too bad I guess - // Alternate suggestions welcome :) - , isIE6 = $.browser.msie && (6 == ~~ $.browser.version) - ; - - // We cannot do much unless we have one of these - if ( !params.height && !params.width ) { - return this; - } - - // Calculate aspect ratio now, if possible - if ( params.height && params.width ) { - aspectRatio = params.width / params.height; - } - - // Attach handler to load - // Handler is executed just once per element - // Load event required for Webkit browsers - return this.one( "load", function() { - - // Remove all attributes and CSS rules - this.removeAttribute( "height" ); - this.removeAttribute( "width" ); - this.style.height = this.style.width = ""; - - var imgHeight = this.height - , imgWidth = this.width - , imgAspectRatio = imgWidth / imgHeight - , bxHeight = params.height - , bxWidth = params.width - , bxAspectRatio = aspectRatio; - - // Work the magic! - // If one parameter is missing, we just force calculate it - if ( !bxAspectRatio ) { - if ( bxHeight ) { - bxAspectRatio = imgAspectRatio + 1; - } else { - bxAspectRatio = imgAspectRatio - 1; - } - } - - // Only resize the images that need resizing - if ( (bxHeight && imgHeight > bxHeight) || (bxWidth && imgWidth > bxWidth) ) { - - if ( imgAspectRatio > bxAspectRatio ) { - bxHeight = ~~ ( imgHeight / imgWidth * bxWidth ); - } else { - bxWidth = ~~ ( imgWidth / imgHeight * bxHeight ); - } - - this.height = bxHeight; - this.width = bxWidth; - } - }) - .each(function() { - - // Trigger load event (for Gecko and MSIE) - if ( this.complete || isIE6 ) { - $( this ).trigger( "load" ); - } - }); - }; -})( jQuery ); \ No newline at end of file diff --git a/view/theme/diabook/diabook-pink/js/jquery.ae.image.resize.min.js b/view/theme/diabook/diabook-pink/js/jquery.ae.image.resize.min.js deleted file mode 100644 index 16c30b123..000000000 --- a/view/theme/diabook/diabook-pink/js/jquery.ae.image.resize.min.js +++ /dev/null @@ -1 +0,0 @@ -(function(d){d.fn.aeImageResize=function(a){var i=0,j=d.browser.msie&&6==~~d.browser.version;if(!a.height&&!a.width)return this;if(a.height&&a.width)i=a.width/a.height;return this.one("load",function(){this.removeAttribute("height");this.removeAttribute("width");this.style.height=this.style.width="";var e=this.height,f=this.width,g=f/e,b=a.height,c=a.width,h=i;h||(h=b?g+1:g-1);if(b&&e>b||c&&f>c){if(g>h)b=~~(e/f*c);else c=~~(f/e*b);this.height=b;this.width=c}}).each(function(){if(this.complete||j)d(this).trigger("load")})}})(jQuery); \ No newline at end of file diff --git a/view/theme/diabook/diabook-pink/js/jquery.autogrow.textarea.js b/view/theme/diabook/diabook-pink/js/jquery.autogrow.textarea.js deleted file mode 100644 index 806e34f51..000000000 --- a/view/theme/diabook/diabook-pink/js/jquery.autogrow.textarea.js +++ /dev/null @@ -1,46 +0,0 @@ -(function($) { - - /* - * Auto-growing textareas; technique ripped from Facebook - */ - $.fn.autogrow = function(options) { - - this.filter('textarea').each(function() { - - var $this = $(this), - minHeight = $this.height(), - lineHeight = $this.css('lineHeight'); - - var shadow = $('
').css({ - position: 'absolute', - top: -10000, - left: -10000, - width: $(this).width(), - fontSize: $this.css('fontSize'), - fontFamily: $this.css('fontFamily'), - lineHeight: $this.css('lineHeight'), - resize: 'none' - }).appendTo(document.body); - - var update = function() { - - var val = this.value.replace(//g, '>') - .replace(/&/g, '&') - .replace(/\n/g, '
'); - - shadow.html(val); - $(this).css('height', Math.max(shadow.height() + 20, minHeight)); - } - - $(this).change(update).keyup(update).keydown(update); - - update.apply(this); - - }); - - return this; - - } - -})(jQuery); \ No newline at end of file diff --git a/view/theme/diabook/diabook-pink/js/jquery.cookie.js b/view/theme/diabook/diabook-pink/js/jquery.cookie.js deleted file mode 100644 index 6d5974a2c..000000000 --- a/view/theme/diabook/diabook-pink/js/jquery.cookie.js +++ /dev/null @@ -1,47 +0,0 @@ -/*! - * jQuery Cookie Plugin - * https://github.com/carhartl/jquery-cookie - * - * Copyright 2011, Klaus Hartl - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://www.opensource.org/licenses/mit-license.php - * http://www.opensource.org/licenses/GPL-2.0 - */ -(function($) { - $.cookie = function(key, value, options) { - - // key and at least value given, set cookie... - if (arguments.length > 1 && (!/Object/.test(Object.prototype.toString.call(value)) || value === null || value === undefined)) { - options = $.extend({}, options); - - if (value === null || value === undefined) { - options.expires = -1; - } - - if (typeof options.expires === 'number') { - var days = options.expires, t = options.expires = new Date(); - t.setDate(t.getDate() + days); - } - - value = String(value); - - return (document.cookie = [ - encodeURIComponent(key), '=', options.raw ? value : encodeURIComponent(value), - options.expires ? '; expires=' + options.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE - options.path ? '; path=' + options.path : '', - options.domain ? '; domain=' + options.domain : '', - options.secure ? '; secure' : '' - ].join('')); - } - - // key and possibly options given, get cookie... - options = value || {}; - var decode = options.raw ? function(s) { return s; } : decodeURIComponent; - - var pairs = document.cookie.split('; '); - for (var i = 0, pair; pair = pairs[i] && pairs[i].split('='); i++) { - if (decode(pair[0]) === key) return decode(pair[1] || ''); // IE saves cookies with empty string as "c; ", e.g. without "=" as opposed to EOMB, thus pair[1] may be undefined - } - return null; - }; -})(jQuery); diff --git a/view/theme/diabook/diabook-pink/login.tpl b/view/theme/diabook/diabook-pink/login.tpl deleted file mode 100644 index efa7c2d6d..000000000 --- a/view/theme/diabook/diabook-pink/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/diabook-pink/mail_conv.tpl b/view/theme/diabook/diabook-pink/mail_conv.tpl deleted file mode 100644 index 989f17878..000000000 --- a/view/theme/diabook/diabook-pink/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/diabook/diabook-pink/mail_display.tpl b/view/theme/diabook/diabook-pink/mail_display.tpl deleted file mode 100644 index 8b82e95c6..000000000 --- a/view/theme/diabook/diabook-pink/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/diabook-pink/mail_list.tpl b/view/theme/diabook/diabook-pink/mail_list.tpl deleted file mode 100644 index 6bc6c84f6..000000000 --- a/view/theme/diabook/diabook-pink/mail_list.tpl +++ /dev/null @@ -1,8 +0,0 @@ -
- $subject - $from_name - $date - $count - - -
diff --git a/view/theme/diabook/diabook-pink/message_side.tpl b/view/theme/diabook/diabook-pink/message_side.tpl deleted file mode 100644 index 9f1587096..000000000 --- a/view/theme/diabook/diabook-pink/message_side.tpl +++ /dev/null @@ -1,10 +0,0 @@ -
- - -
    - {{ for $tabs as $t }} -
  • $t.label
    • - {{ endfor }} -
- -
diff --git a/view/theme/diabook/diabook-pink/nav.tpl b/view/theme/diabook/diabook-pink/nav.tpl deleted file mode 100644 index e3aabaa8b..000000000 --- a/view/theme/diabook/diabook-pink/nav.tpl +++ /dev/null @@ -1,190 +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/diabook-pink/nets.tpl b/view/theme/diabook/diabook-pink/nets.tpl deleted file mode 100644 index be25ddee1..000000000 --- a/view/theme/diabook/diabook-pink/nets.tpl +++ /dev/null @@ -1,15 +0,0 @@ -
-

$title

-
$desc
- -
    -
  • - - $all
    • - {{ for $nets as $net }} -
  • - - $net.name
    • - {{ endfor }} -
-
diff --git a/view/theme/diabook/diabook-pink/oembed_video.tpl b/view/theme/diabook/diabook-pink/oembed_video.tpl deleted file mode 100644 index d6d29f724..000000000 --- a/view/theme/diabook/diabook-pink/oembed_video.tpl +++ /dev/null @@ -1,4 +0,0 @@ - - -
- diff --git a/view/theme/diabook/diabook-pink/photo_item.tpl b/view/theme/diabook/diabook-pink/photo_item.tpl deleted file mode 100644 index 5d65a89b7..000000000 --- a/view/theme/diabook/diabook-pink/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/diabook-pink/photo_view.tpl b/view/theme/diabook/diabook-pink/photo_view.tpl deleted file mode 100644 index 071972e0c..000000000 --- a/view/theme/diabook/diabook-pink/photo_view.tpl +++ /dev/null @@ -1,35 +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/diabook-pink/profile_side.tpl b/view/theme/diabook/diabook-pink/profile_side.tpl deleted file mode 100644 index 01e80f238..000000000 --- a/view/theme/diabook/diabook-pink/profile_side.tpl +++ /dev/null @@ -1,21 +0,0 @@ - - - diff --git a/view/theme/diabook/diabook-pink/profile_vcard.tpl b/view/theme/diabook/diabook-pink/profile_vcard.tpl deleted file mode 100644 index 6fcffcc9b..000000000 --- a/view/theme/diabook/diabook-pink/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/diabook-pink/right_aside.tpl b/view/theme/diabook/diabook-pink/right_aside.tpl deleted file mode 100644 index a65677696..000000000 --- a/view/theme/diabook/diabook-pink/right_aside.tpl +++ /dev/null @@ -1,20 +0,0 @@ - - - \ No newline at end of file diff --git a/view/theme/diabook/diabook-pink/screenshot.png b/view/theme/diabook/diabook-pink/screenshot.png deleted file mode 100644 index 4eee5be5a..000000000 Binary files a/view/theme/diabook/diabook-pink/screenshot.png and /dev/null differ diff --git a/view/theme/diabook/diabook-pink/search_item.tpl b/view/theme/diabook/diabook-pink/search_item.tpl deleted file mode 100644 index 123834064..000000000 --- a/view/theme/diabook/diabook-pink/search_item.tpl +++ /dev/null @@ -1,100 +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 -
-
-
-
-
-
- {{ 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.dropping }} - - $item.drop.delete - {{ endif }} - {{ if $item.edpost }} - - {{ endif }} -
-
$item.location 
-
-
-
-
- -
$item.dislike
-
-
- -
- $item.comment -
diff --git a/view/theme/diabook/diabook-pink/style.php b/view/theme/diabook/diabook-pink/style.php deleted file mode 100644 index b8c37fc96..000000000 --- a/view/theme/diabook/diabook-pink/style.php +++ /dev/null @@ -1,277 +0,0 @@ -page['htmlhead'] .= sprintf('', $diabook_version); - - -//change css on network and profilepages -$cssFile = null; -$resolution=false; -$resolution = get_pconfig(local_user(), "diabook-aerith", "resolution"); -if ($resolution===false) $resolution="normal"; - -/** - * prints last community activity - */ -function diabook_aerith_community_info(){ - $a = get_app(); - - // last 12 users - $aside['$lastusers_title'] = t('Last users'); - $aside['$lastusers_items'] = array(); - $sql_extra = ""; - $publish = (get_config('system','publish_all') ? '' : " AND `publish` = 1 " ); - $order = " ORDER BY `register_date` DESC "; - - $r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname` - FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` - WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra $order LIMIT %d , %d ", - 0, - 9 - ); - $tpl = file_get_contents( dirname(__file__).'/ch_directory_item.tpl'); - if(count($r)) { - $photo = 'thumb'; - foreach($r as $rr) { - $profile_link = $a->get_baseurl() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']); - $entry = replace_macros($tpl,array( - '$id' => $rr['id'], - '$profile-link' => $profile_link, - '$photo' => $rr[$photo], - '$alt-text' => $rr['name'], - )); - $aside['$lastusers_items'][] = $entry; - } - } - - - // last 10 liked items - $aside['$like_title'] = t('Last likes'); - $aside['$like_items'] = array(); - $r = q("SELECT `T1`.`created`, `T1`.`liker`, `T1`.`liker-link`, `item`.* FROM - (SELECT `parent-uri`, `created`, `author-name` AS `liker`,`author-link` AS `liker-link` - FROM `item` WHERE `verb`='http://activitystrea.ms/schema/1.0/like' GROUP BY `parent-uri` ORDER BY `created` DESC) AS T1 - INNER JOIN `item` ON `item`.`uri`=`T1`.`parent-uri` - WHERE `T1`.`liker-link` LIKE '%s%%' OR `item`.`author-link` LIKE '%s%%' - GROUP BY `uri` - ORDER BY `T1`.`created` DESC - LIMIT 0,5", - $a->get_baseurl(),$a->get_baseurl() - ); - - foreach ($r as $rr) { - $author = '' . $rr['liker'] . ''; - $objauthor = '' . $rr['author-name'] . ''; - - //var_dump($rr['verb'],$rr['object-type']); killme(); - switch($rr['verb']){ - case 'http://activitystrea.ms/schema/1.0/post': - switch ($rr['object-type']){ - case 'http://activitystrea.ms/schema/1.0/event': - $post_type = t('event'); - break; - default: - $post_type = t('status'); - } - break; - default: - if ($rr['resource-id']){ - $post_type = t('photo'); - $m=array(); preg_match("/\[url=([^]]*)\]/", $rr['body'], $m); - $rr['plink'] = $m[1]; - } else { - $post_type = t('status'); - } - } - $plink = '' . $post_type . ''; - - $aside['$like_items'][] = sprintf( t('%1$s likes %2$s\'s %3$s'), $author, $objauthor, $plink); - - } - - - // last 12 photos - $aside['$photos_title'] = t('Last photos'); - $aside['$photos_items'] = array(); - $r = q("SELECT `photo`.`id`, `photo`.`resource-id`, `photo`.`scale`, `photo`.`desc`, `user`.`nickname`, `user`.`username` FROM - (SELECT `resource-id`, MAX(`scale`) as maxscale FROM `photo` - WHERE `profile`=0 AND `contact-id`=0 AND `album` NOT IN ('Contact Photos', '%s', 'Profile Photos', '%s') - AND `allow_cid`='' AND `allow_gid`='' AND `deny_cid`='' AND `deny_gid`='' GROUP BY `resource-id`) AS `t1` - INNER JOIN `photo` ON `photo`.`resource-id`=`t1`.`resource-id` AND `photo`.`scale` = `t1`.`maxscale`, - `user` - WHERE `user`.`uid` = `photo`.`uid` - AND `user`.`blockwall`=0 - AND `user`.`hidewall`=0 - ORDER BY `photo`.`edited` DESC - LIMIT 0, 9", - dbesc(t('Contact Photos')), - dbesc(t('Profile Photos')) - ); - if(count($r)) { - $tpl = file_get_contents( dirname(__file__).'/ch_directory_item.tpl'); - foreach($r as $rr) { - $photo_page = $a->get_baseurl() . '/photos/' . $rr['nickname'] . '/image/' . $rr['resource-id']; - $photo_url = $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['scale'] .'.jpg'; - - $entry = replace_macros($tpl,array( - '$id' => $rr['id'], - '$profile-link' => $photo_page, - '$photo' => $photo_url, - '$alt-text' => $rr['username']." : ".$rr['desc'], - )); - - $aside['$photos_items'][] = $entry; - } - } - - - - //nav FIND FRIENDS - if(local_user()) { - $nv = array(); - $nv['title'] = Array("", t('Find Friends'), "", ""); - $nv['directory'] = Array('directory', t('Local Directory'), "", ""); - $nv['global_directory'] = Array('http://dir.friendica.com/', t('Global Directory'), "", ""); - $nv['match'] = Array('match', t('Similar Interests'), "", ""); - $nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", ""); - $nv['invite'] = Array('invite', t('Invite Friends'), "", ""); - - $nv['search'] = '
- - - - - '; - - $aside['$nv'] = $nv; - }; - //Community Page - if(local_user()) { - $page = '
-
-

'.t("Community Pages").'

-
    '; - - $pagelist = array(); - - $contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact` - WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d - ORDER BY `name` ASC", - intval($a->user['uid']) - ); - - $pageD = array(); - - // Look if the profile is a community page - foreach($contacts as $contact) { - $pageD[] = array("url"=>$contact["url"], "name"=>$contact["name"], "id"=>$contact["id"], "micro"=>$contact['micro']); - }; - - - $contacts = $pageD; - - foreach($contacts as $contact) { - $page .= '
  • ' . $contact['url'] . ' '. - $contact["name"]."
    • "; - } - $page .= '
'; - //if (sizeof($contacts) > 0) - - $aside['$page'] = $page; - } - //END Community Page - //helpers - $helpers = array(); - $helpers['title'] = Array("", t('Help or @NewHere ?'), "", ""); - - $aside['$helpers'] = $helpers; - //end helpers - //connectable services - $con_services = array(); - $con_services['title'] = Array("", t('Connect Services'), "", ""); - - $aside['$con_services'] = $con_services; - //end connectable services - - - //get_baseurl - $url = $a->get_baseurl($ssl_state); - $aside['$url'] = $url; - - $tpl = file_get_contents(dirname(__file__).'/communityhome.tpl'); - $a->page['right_aside'] = replace_macros($tpl, $aside); - -} - - -//profile_side at networkpages -if ($a->argv[0] === "network" && local_user()){ - - // USER MENU - if(local_user()) { - - $r = q("SELECT micro FROM contact WHERE uid=%d AND self=1", intval($a->user['uid'])); - - $userinfo = array( - 'icon' => (count($r) ? $r[0]['micro']: $a->get_baseurl()."/images/default-profile-mm.jpg"), - 'name' => $a->user['username'], - ); - $ps = array('usermenu'=>array()); - $ps['usermenu']['status'] = Array('profile/' . $a->user['nickname'], t('Home'), "", t('Your posts and conversations')); - $ps['usermenu']['profile'] = Array('profile/' . $a->user['nickname']. '?tab=profile', t('Profile'), "", t('Your profile page')); - $ps['usermenu']['contacts'] = Array('contacts' , t('Contacts'), "", t('Your contacts')); - $ps['usermenu']['photos'] = Array('photos/' . $a->user['nickname'], t('Photos'), "", t('Your photos')); - $ps['usermenu']['events'] = Array('events/', t('Events'), "", t('Your events')); - $ps['usermenu']['notes'] = Array('notes/', t('Personal notes'), "", t('Your personal photos')); - $ps['usermenu']['community'] = Array('community/', t('Community'), "", ""); - $ps['usermenu']['pgroups'] = Array('http://dir.friendika.com/directory/forum', t('Community Pages'), "", ""); - - $tpl = get_markup_template('profile_side.tpl'); - - $a->page['aside'] .= replace_macros($tpl, array( - '$userinfo' => $userinfo, - '$ps' => $ps, - )); - - } - - $ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes']; - - if($ccCookie != "7") { - // COMMUNITY - diabook_aerith_community_info(); - - // CUSTOM CSS - if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/style-network.css";} - if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/style-network-wide.css";} - } -} - - - -//right_aside at profile pages -if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){ - if($ccCookie != "7") { - // COMMUNITY - diabook_aerith_community_info(); - - // CUSTOM CSS - if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/style-profile.css";} - if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/style-profile-wide.css";} - } -} - - - -// custom css -if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('', $cssFile); - -//load jquery.cookie.js -$cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/js/jquery.cookie.js"; -$a->page['htmlhead'] .= sprintf('', $cookieJS); - -//load jquery.ae.image.resize.js -$imageresizeJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/js/jquery.ae.image.resize.js"; -$a->page['htmlhead'] .= sprintf('', $imageresizeJS); - -//load jquery.autogrow-textarea.js -$autogrowJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/js/jquery.autogrow.textarea.js"; -$a->page['htmlhead'] .= sprintf('', $autogrowJS); - -//js scripts -//comment-edit-wrapper on photo_view -if ($a->argv[0].$a->argv[2] === "photos"."image"){ - -$a->page['htmlhead'] .= ' -'; - -} - -$a->page['htmlhead'] .= ' - -'; - -$a->page['htmlhead'] .= ' - -'; - -$a->page['htmlhead'] .= ' - '; - -if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){ -$a->page['htmlhead'] .= ' -'; - - - if($ccCookie != "7") { -$a->page['htmlhead'] .= ' -';} - -$a->page['htmlhead'] .= ' -';} - -$a->page['htmlhead'] .= ' - - '; \ No newline at end of file diff --git a/view/theme/diabook/diabook-pink/theme_settings.tpl b/view/theme/diabook/diabook-pink/theme_settings.tpl deleted file mode 100644 index 472232cf0..000000000 --- a/view/theme/diabook/diabook-pink/theme_settings.tpl +++ /dev/null @@ -1,10 +0,0 @@ -{{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}} - -
- -
- diff --git a/view/theme/diabook/diabook-pink/wall_item.tpl b/view/theme/diabook/diabook-pink/wall_item.tpl deleted file mode 100644 index 123834064..000000000 --- a/view/theme/diabook/diabook-pink/wall_item.tpl +++ /dev/null @@ -1,100 +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 -
-
-
-
-
-
- {{ 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.dropping }} - - $item.drop.delete - {{ endif }} - {{ if $item.edpost }} - - {{ endif }} -
-
$item.location 
-
-
-
-
- -
$item.dislike
-
-
- -
- $item.comment -
diff --git a/view/theme/diabook/diabook-pink/wallwall_item.tpl b/view/theme/diabook/diabook-pink/wallwall_item.tpl deleted file mode 100644 index 6a0c93f88..000000000 --- a/view/theme/diabook/diabook-pink/wallwall_item.tpl +++ /dev/null @@ -1,106 +0,0 @@ -{{ if $item.indent }}{{ else }} -
- -
-{{ endif }} -
-
-
-
- - $item.owner_name - -
-
- - $item.name - - menu - - -
-
-
- $item.name - $item.to $item.owner_name - $item.vwall -   - {{ 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.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.dropping }} - - $item.drop.delete - {{ endif }} - {{ if $item.edpost }} - - {{ endif }} -
-
$item.location 
-
-
-
-
- -
$item.dislike
-
-
- -
- $item.comment -
\ No newline at end of file diff --git a/view/theme/diabook/diabook-red/admin_users.tpl b/view/theme/diabook/diabook-red/admin_users.tpl deleted file mode 100644 index 8aabb51ec..000000000 --- a/view/theme/diabook/diabook-red/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 - - -
-
$select_all
-
- {{ 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 - - -
-
$select_all
-
- {{ else }} - NO USERS?!? - {{ endif }} - -
diff --git a/view/theme/diabook/diabook-red/ch_directory_item.tpl b/view/theme/diabook/diabook-red/ch_directory_item.tpl deleted file mode 100755 index db1936e4b..000000000 --- a/view/theme/diabook/diabook-red/ch_directory_item.tpl +++ /dev/null @@ -1,10 +0,0 @@ - -
-
-
- - $alt-text - -
-
-
diff --git a/view/theme/diabook/diabook-red/comment_item.tpl b/view/theme/diabook/diabook-red/comment_item.tpl deleted file mode 100644 index ee4dfba45..000000000 --- a/view/theme/diabook/diabook-red/comment_item.tpl +++ /dev/null @@ -1,41 +0,0 @@ -
-
- - - - - - - -
- $mytitle -
-
- - img - url - video - u - i - b - quote - {{ if $qcomment }} - - {{ endif }} - -
- - -
-
- -
diff --git a/view/theme/diabook/diabook-red/communityhome.tpl b/view/theme/diabook/diabook-red/communityhome.tpl deleted file mode 100644 index 179757f4a..000000000 --- a/view/theme/diabook/diabook-red/communityhome.tpl +++ /dev/null @@ -1,87 +0,0 @@ -
-{{ if $page }} -
$page
-{{ endif }} -
- -
-{{ if $lastusers_title }} -

$helpers.title.1

-NewHere
-Friendica Support
-Let's talk
-Local Friendica -{{ endif }} -
- -
-{{ if $lastusers_title }} -

$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 }} -
diff --git a/view/theme/diabook/diabook-red/config.php b/view/theme/diabook/diabook-red/config.php deleted file mode 100644 index 59a461178..000000000 --- a/view/theme/diabook/diabook-red/config.php +++ /dev/null @@ -1,84 +0,0 @@ -"1.3", - "---"=>"---", - "1.5"=>"1.5", - "1.4"=>"1.4", - "1.2"=>"1.2", - "1.1"=>"1.1", - ); - - $font_sizes = array( - '13'=>'13', - "---"=>"---", - "15"=>"15", - '14'=>'14', - '13.5'=>'13.5', - '12.5'=>'12.5', - '12'=>'12', - ); - $resolutions = array( - 'normal'=>'normal', - 'wide'=>'wide', - ); - - - - $t = file_get_contents( dirname(__file__). "/theme_settings.tpl" ); - $o .= replace_macros($t, array( - '$submit' => t('Submit'), - '$baseurl' => $a->get_baseurl(), - '$title' => t("Theme settings"), - '$font_size' => array('diabook-red_font_size', t('Set font-size for posts and comments'), $font_size, '', $font_sizes), - '$line_height' => array('diabook-red_line_height', t('Set line-height for posts and comments'), $line_height, '', $line_heights), - '$resolution' => array('diabook-red_resolution', t('Set resolution for middle column'), $resolution, '', $resolutions), - )); - return $o; -} diff --git a/view/theme/diabook/diabook-red/contact_template.tpl b/view/theme/diabook/diabook-red/contact_template.tpl deleted file mode 100644 index 48930b48a..000000000 --- a/view/theme/diabook/diabook-red/contact_template.tpl +++ /dev/null @@ -1,25 +0,0 @@ - -
-
-
- - $contact.name - - {{ if $contact.photo_menu }} - menu -
-
    - $contact.photo_menu -
-
- {{ endif }} -
- -
-
-
$contact.name
- -
-
diff --git a/view/theme/diabook/diabook-red/directory_item.tpl b/view/theme/diabook/diabook-red/directory_item.tpl deleted file mode 100755 index bc2af16c2..000000000 --- a/view/theme/diabook/diabook-red/directory_item.tpl +++ /dev/null @@ -1,11 +0,0 @@ - -
-
-
- - $alt-text - -
-
-
$name
-
diff --git a/view/theme/diabook/diabook-red/generic_links_widget.tpl b/view/theme/diabook/diabook-red/generic_links_widget.tpl deleted file mode 100644 index 001c1395e..000000000 --- a/view/theme/diabook/diabook-red/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/diabook-red/group_side.tpl b/view/theme/diabook/diabook-red/group_side.tpl deleted file mode 100755 index 8600402f2..000000000 --- a/view/theme/diabook/diabook-red/group_side.tpl +++ /dev/null @@ -1,34 +0,0 @@ -
-
-

$title

-
- - - {{ if $ungrouped }} - - {{ endif }} -
- diff --git a/view/theme/diabook/diabook-red/jot.tpl b/view/theme/diabook/diabook-red/jot.tpl deleted file mode 100644 index 982201f56..000000000 --- a/view/theme/diabook/diabook-red/jot.tpl +++ /dev/null @@ -1,85 +0,0 @@ - -
-
-
 
-
-
- -
- - - - - - - - -
-
- - - - -
- -
-
-
-
-
-
- - -
- -
-
- -
-
- -
-
- -
- - - - $preview - -
- $bang -
- - -
- $jotplugins -
- -
- -
- -
-
- - - -
-
- $acl -
-
$emailcc
-
- $jotnets -
-
- - - - -
-
- {{ if $content }}{{ endif }} diff --git a/view/theme/diabook/diabook-red/js/README b/view/theme/diabook/diabook-red/js/README deleted file mode 100644 index c93b2118e..000000000 --- a/view/theme/diabook/diabook-red/js/README +++ /dev/null @@ -1,22 +0,0 @@ -jQuery Resize Plugin Demo - -Version: v2.1.1 -Author: Adeel Ejaz (http://adeelejaz.com/) -License: Dual licensed under MIT and GPL licenses. - -Introduction -aeImageResize is a jQuery plugin to dynamically resize the images without distorting the proportions. - -Usage: -.aeImageResize( height, width ) - -height -An integer representing the maximum height for the image. - -width -An integer representing the maximum width for the image. - -Example -$(function() { - $( ".resizeme" ).aeImageResize({ height: 250, width: 250 }); -}); \ No newline at end of file diff --git a/view/theme/diabook/diabook-red/js/jquery.ae.image.resize.js b/view/theme/diabook/diabook-red/js/jquery.ae.image.resize.js deleted file mode 100644 index bac09cd45..000000000 --- a/view/theme/diabook/diabook-red/js/jquery.ae.image.resize.js +++ /dev/null @@ -1,69 +0,0 @@ -(function( $ ) { - - $.fn.aeImageResize = function( params ) { - - var aspectRatio = 0 - // Nasty I know but it's done only once, so not too bad I guess - // Alternate suggestions welcome :) - , isIE6 = $.browser.msie && (6 == ~~ $.browser.version) - ; - - // We cannot do much unless we have one of these - if ( !params.height && !params.width ) { - return this; - } - - // Calculate aspect ratio now, if possible - if ( params.height && params.width ) { - aspectRatio = params.width / params.height; - } - - // Attach handler to load - // Handler is executed just once per element - // Load event required for Webkit browsers - return this.one( "load", function() { - - // Remove all attributes and CSS rules - this.removeAttribute( "height" ); - this.removeAttribute( "width" ); - this.style.height = this.style.width = ""; - - var imgHeight = this.height - , imgWidth = this.width - , imgAspectRatio = imgWidth / imgHeight - , bxHeight = params.height - , bxWidth = params.width - , bxAspectRatio = aspectRatio; - - // Work the magic! - // If one parameter is missing, we just force calculate it - if ( !bxAspectRatio ) { - if ( bxHeight ) { - bxAspectRatio = imgAspectRatio + 1; - } else { - bxAspectRatio = imgAspectRatio - 1; - } - } - - // Only resize the images that need resizing - if ( (bxHeight && imgHeight > bxHeight) || (bxWidth && imgWidth > bxWidth) ) { - - if ( imgAspectRatio > bxAspectRatio ) { - bxHeight = ~~ ( imgHeight / imgWidth * bxWidth ); - } else { - bxWidth = ~~ ( imgWidth / imgHeight * bxHeight ); - } - - this.height = bxHeight; - this.width = bxWidth; - } - }) - .each(function() { - - // Trigger load event (for Gecko and MSIE) - if ( this.complete || isIE6 ) { - $( this ).trigger( "load" ); - } - }); - }; -})( jQuery ); \ No newline at end of file diff --git a/view/theme/diabook/diabook-red/js/jquery.ae.image.resize.min.js b/view/theme/diabook/diabook-red/js/jquery.ae.image.resize.min.js deleted file mode 100644 index 16c30b123..000000000 --- a/view/theme/diabook/diabook-red/js/jquery.ae.image.resize.min.js +++ /dev/null @@ -1 +0,0 @@ -(function(d){d.fn.aeImageResize=function(a){var i=0,j=d.browser.msie&&6==~~d.browser.version;if(!a.height&&!a.width)return this;if(a.height&&a.width)i=a.width/a.height;return this.one("load",function(){this.removeAttribute("height");this.removeAttribute("width");this.style.height=this.style.width="";var e=this.height,f=this.width,g=f/e,b=a.height,c=a.width,h=i;h||(h=b?g+1:g-1);if(b&&e>b||c&&f>c){if(g>h)b=~~(e/f*c);else c=~~(f/e*b);this.height=b;this.width=c}}).each(function(){if(this.complete||j)d(this).trigger("load")})}})(jQuery); \ No newline at end of file diff --git a/view/theme/diabook/diabook-red/js/jquery.autogrow.textarea.js b/view/theme/diabook/diabook-red/js/jquery.autogrow.textarea.js deleted file mode 100644 index 806e34f51..000000000 --- a/view/theme/diabook/diabook-red/js/jquery.autogrow.textarea.js +++ /dev/null @@ -1,46 +0,0 @@ -(function($) { - - /* - * Auto-growing textareas; technique ripped from Facebook - */ - $.fn.autogrow = function(options) { - - this.filter('textarea').each(function() { - - var $this = $(this), - minHeight = $this.height(), - lineHeight = $this.css('lineHeight'); - - var shadow = $('
').css({ - position: 'absolute', - top: -10000, - left: -10000, - width: $(this).width(), - fontSize: $this.css('fontSize'), - fontFamily: $this.css('fontFamily'), - lineHeight: $this.css('lineHeight'), - resize: 'none' - }).appendTo(document.body); - - var update = function() { - - var val = this.value.replace(//g, '>') - .replace(/&/g, '&') - .replace(/\n/g, '
'); - - shadow.html(val); - $(this).css('height', Math.max(shadow.height() + 20, minHeight)); - } - - $(this).change(update).keyup(update).keydown(update); - - update.apply(this); - - }); - - return this; - - } - -})(jQuery); \ No newline at end of file diff --git a/view/theme/diabook/diabook-red/js/jquery.cookie.js b/view/theme/diabook/diabook-red/js/jquery.cookie.js deleted file mode 100644 index 6d5974a2c..000000000 --- a/view/theme/diabook/diabook-red/js/jquery.cookie.js +++ /dev/null @@ -1,47 +0,0 @@ -/*! - * jQuery Cookie Plugin - * https://github.com/carhartl/jquery-cookie - * - * Copyright 2011, Klaus Hartl - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://www.opensource.org/licenses/mit-license.php - * http://www.opensource.org/licenses/GPL-2.0 - */ -(function($) { - $.cookie = function(key, value, options) { - - // key and at least value given, set cookie... - if (arguments.length > 1 && (!/Object/.test(Object.prototype.toString.call(value)) || value === null || value === undefined)) { - options = $.extend({}, options); - - if (value === null || value === undefined) { - options.expires = -1; - } - - if (typeof options.expires === 'number') { - var days = options.expires, t = options.expires = new Date(); - t.setDate(t.getDate() + days); - } - - value = String(value); - - return (document.cookie = [ - encodeURIComponent(key), '=', options.raw ? value : encodeURIComponent(value), - options.expires ? '; expires=' + options.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE - options.path ? '; path=' + options.path : '', - options.domain ? '; domain=' + options.domain : '', - options.secure ? '; secure' : '' - ].join('')); - } - - // key and possibly options given, get cookie... - options = value || {}; - var decode = options.raw ? function(s) { return s; } : decodeURIComponent; - - var pairs = document.cookie.split('; '); - for (var i = 0, pair; pair = pairs[i] && pairs[i].split('='); i++) { - if (decode(pair[0]) === key) return decode(pair[1] || ''); // IE saves cookies with empty string as "c; ", e.g. without "=" as opposed to EOMB, thus pair[1] may be undefined - } - return null; - }; -})(jQuery); diff --git a/view/theme/diabook/diabook-red/login.tpl b/view/theme/diabook/diabook-red/login.tpl deleted file mode 100644 index efa7c2d6d..000000000 --- a/view/theme/diabook/diabook-red/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/diabook-red/mail_conv.tpl b/view/theme/diabook/diabook-red/mail_conv.tpl deleted file mode 100644 index 989f17878..000000000 --- a/view/theme/diabook/diabook-red/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/diabook/diabook-red/mail_display.tpl b/view/theme/diabook/diabook-red/mail_display.tpl deleted file mode 100644 index 8b82e95c6..000000000 --- a/view/theme/diabook/diabook-red/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/diabook-red/mail_list.tpl b/view/theme/diabook/diabook-red/mail_list.tpl deleted file mode 100644 index 6bc6c84f6..000000000 --- a/view/theme/diabook/diabook-red/mail_list.tpl +++ /dev/null @@ -1,8 +0,0 @@ -
- $subject - $from_name - $date - $count - - -
diff --git a/view/theme/diabook/diabook-red/message_side.tpl b/view/theme/diabook/diabook-red/message_side.tpl deleted file mode 100644 index 9f1587096..000000000 --- a/view/theme/diabook/diabook-red/message_side.tpl +++ /dev/null @@ -1,10 +0,0 @@ -
- - -
    - {{ for $tabs as $t }} -
  • $t.label
    • - {{ endfor }} -
- -
diff --git a/view/theme/diabook/diabook-red/nav.tpl b/view/theme/diabook/diabook-red/nav.tpl deleted file mode 100644 index e3aabaa8b..000000000 --- a/view/theme/diabook/diabook-red/nav.tpl +++ /dev/null @@ -1,190 +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/diabook-red/nets.tpl b/view/theme/diabook/diabook-red/nets.tpl deleted file mode 100644 index be25ddee1..000000000 --- a/view/theme/diabook/diabook-red/nets.tpl +++ /dev/null @@ -1,15 +0,0 @@ -
-

$title

-
$desc
- -
    -
  • - - $all
    • - {{ for $nets as $net }} -
  • - - $net.name
    • - {{ endfor }} -
-
diff --git a/view/theme/diabook/diabook-red/oembed_video.tpl b/view/theme/diabook/diabook-red/oembed_video.tpl deleted file mode 100644 index d6d29f724..000000000 --- a/view/theme/diabook/diabook-red/oembed_video.tpl +++ /dev/null @@ -1,4 +0,0 @@ - - -
- diff --git a/view/theme/diabook/diabook-red/photo_item.tpl b/view/theme/diabook/diabook-red/photo_item.tpl deleted file mode 100644 index 5d65a89b7..000000000 --- a/view/theme/diabook/diabook-red/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/diabook-red/photo_view.tpl b/view/theme/diabook/diabook-red/photo_view.tpl deleted file mode 100644 index 09dfb2aae..000000000 --- a/view/theme/diabook/diabook-red/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 }} - -
-
-
-$comments -
- -$paginate - diff --git a/view/theme/diabook/diabook-red/profile_side.tpl b/view/theme/diabook/diabook-red/profile_side.tpl deleted file mode 100644 index 01e80f238..000000000 --- a/view/theme/diabook/diabook-red/profile_side.tpl +++ /dev/null @@ -1,21 +0,0 @@ - - - diff --git a/view/theme/diabook/diabook-red/profile_vcard.tpl b/view/theme/diabook/diabook-red/profile_vcard.tpl deleted file mode 100644 index e28ec2909..000000000 --- a/view/theme/diabook/diabook-red/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/diabook-red/right_aside.tpl b/view/theme/diabook/diabook-red/right_aside.tpl deleted file mode 100644 index a65677696..000000000 --- a/view/theme/diabook/diabook-red/right_aside.tpl +++ /dev/null @@ -1,20 +0,0 @@ - - - \ No newline at end of file diff --git a/view/theme/diabook/diabook-red/screenshot.png b/view/theme/diabook/diabook-red/screenshot.png deleted file mode 100644 index f7e9b41b7..000000000 Binary files a/view/theme/diabook/diabook-red/screenshot.png and /dev/null differ diff --git a/view/theme/diabook/diabook-red/search_item.tpl b/view/theme/diabook/diabook-red/search_item.tpl deleted file mode 100644 index 123834064..000000000 --- a/view/theme/diabook/diabook-red/search_item.tpl +++ /dev/null @@ -1,100 +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 -
-
-
-
-
-
- {{ 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.dropping }} - - $item.drop.delete - {{ endif }} - {{ if $item.edpost }} - - {{ endif }} -
-
$item.location 
-
-
-
-
- -
$item.dislike
-
-
- -
- $item.comment -
diff --git a/view/theme/diabook/diabook-red/style.php b/view/theme/diabook/diabook-red/style.php deleted file mode 100644 index bbdc32e6d..000000000 --- a/view/theme/diabook/diabook-red/style.php +++ /dev/null @@ -1,277 +0,0 @@ -page['htmlhead'] .= sprintf('', $diabook_version); - -//change css on network and profilepages -$cssFile = null; -$resolution=false; -$resolution = get_pconfig(local_user(), "diabook-red", "resolution"); -if ($resolution===false) $resolution="normal"; - -/** - * prints last community activity - */ -function diabook_red_community_info(){ - $a = get_app(); - - // last 12 users - $aside['$lastusers_title'] = t('Last users'); - $aside['$lastusers_items'] = array(); - $sql_extra = ""; - $publish = (get_config('system','publish_all') ? '' : " AND `publish` = 1 " ); - $order = " ORDER BY `register_date` DESC "; - - $r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname` - FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` - WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra $order LIMIT %d , %d ", - 0, - 9 - ); - $tpl = file_get_contents( dirname(__file__).'/ch_directory_item.tpl'); - if(count($r)) { - $photo = 'thumb'; - foreach($r as $rr) { - $profile_link = $a->get_baseurl() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']); - $entry = replace_macros($tpl,array( - '$id' => $rr['id'], - '$profile-link' => $profile_link, - '$photo' => $rr[$photo], - '$alt-text' => $rr['name'], - )); - $aside['$lastusers_items'][] = $entry; - } - } - - - // last 10 liked items - $aside['$like_title'] = t('Last likes'); - $aside['$like_items'] = array(); - $r = q("SELECT `T1`.`created`, `T1`.`liker`, `T1`.`liker-link`, `item`.* FROM - (SELECT `parent-uri`, `created`, `author-name` AS `liker`,`author-link` AS `liker-link` - FROM `item` WHERE `verb`='http://activitystrea.ms/schema/1.0/like' GROUP BY `parent-uri` ORDER BY `created` DESC) AS T1 - INNER JOIN `item` ON `item`.`uri`=`T1`.`parent-uri` - WHERE `T1`.`liker-link` LIKE '%s%%' OR `item`.`author-link` LIKE '%s%%' - GROUP BY `uri` - ORDER BY `T1`.`created` DESC - LIMIT 0,5", - $a->get_baseurl(),$a->get_baseurl() - ); - - foreach ($r as $rr) { - $author = '' . $rr['liker'] . ''; - $objauthor = '' . $rr['author-name'] . ''; - - //var_dump($rr['verb'],$rr['object-type']); killme(); - switch($rr['verb']){ - case 'http://activitystrea.ms/schema/1.0/post': - switch ($rr['object-type']){ - case 'http://activitystrea.ms/schema/1.0/event': - $post_type = t('event'); - break; - default: - $post_type = t('status'); - } - break; - default: - if ($rr['resource-id']){ - $post_type = t('photo'); - $m=array(); preg_match("/\[url=([^]]*)\]/", $rr['body'], $m); - $rr['plink'] = $m[1]; - } else { - $post_type = t('status'); - } - } - $plink = '' . $post_type . ''; - - $aside['$like_items'][] = sprintf( t('%1$s likes %2$s\'s %3$s'), $author, $objauthor, $plink); - - } - - - // last 12 photos - $aside['$photos_title'] = t('Last photos'); - $aside['$photos_items'] = array(); - $r = q("SELECT `photo`.`id`, `photo`.`resource-id`, `photo`.`scale`, `photo`.`desc`, `user`.`nickname`, `user`.`username` FROM - (SELECT `resource-id`, MAX(`scale`) as maxscale FROM `photo` - WHERE `profile`=0 AND `contact-id`=0 AND `album` NOT IN ('Contact Photos', '%s', 'Profile Photos', '%s') - AND `allow_cid`='' AND `allow_gid`='' AND `deny_cid`='' AND `deny_gid`='' GROUP BY `resource-id`) AS `t1` - INNER JOIN `photo` ON `photo`.`resource-id`=`t1`.`resource-id` AND `photo`.`scale` = `t1`.`maxscale`, - `user` - WHERE `user`.`uid` = `photo`.`uid` - AND `user`.`blockwall`=0 - AND `user`.`hidewall`=0 - ORDER BY `photo`.`edited` DESC - LIMIT 0, 9", - dbesc(t('Contact Photos')), - dbesc(t('Profile Photos')) - ); - if(count($r)) { - $tpl = file_get_contents( dirname(__file__).'/ch_directory_item.tpl'); - foreach($r as $rr) { - $photo_page = $a->get_baseurl() . '/photos/' . $rr['nickname'] . '/image/' . $rr['resource-id']; - $photo_url = $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['scale'] .'.jpg'; - - $entry = replace_macros($tpl,array( - '$id' => $rr['id'], - '$profile-link' => $photo_page, - '$photo' => $photo_url, - '$alt-text' => $rr['username']." : ".$rr['desc'], - )); - - $aside['$photos_items'][] = $entry; - } - } - - - //nav FIND FRIENDS - if(local_user()) { - $nv = array(); - $nv['title'] = Array("", t('Find Friends'), "", ""); - $nv['directory'] = Array('directory', t('Local Directory'), "", ""); - $nv['global_directory'] = Array('http://dir.friendica.com/', t('Global Directory'), "", ""); - $nv['match'] = Array('match', t('Similar Interests'), "", ""); - $nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", ""); - $nv['invite'] = Array('invite', t('Invite Friends'), "", ""); - - $nv['search'] = '
- - - - - '; - - $aside['$nv'] = $nv; - }; - //Community Page - if(local_user()) { - $page = '
-
-

'.t("Community Pages").'

-
    '; - - $pagelist = array(); - - $contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact` - WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d - ORDER BY `name` ASC", - intval($a->user['uid']) - ); - - $pageD = array(); - - // Look if the profile is a community page - foreach($contacts as $contact) { - $pageD[] = array("url"=>$contact["url"], "name"=>$contact["name"], "id"=>$contact["id"], "micro"=>$contact['micro']); - }; - - - $contacts = $pageD; - - foreach($contacts as $contact) { - $page .= '
  • ' . $contact['url'] . ' '. - $contact["name"]."
    • "; - } - $page .= '
'; - //if (sizeof($contacts) > 0) - - $aside['$page'] = $page; - } - //END Community Page - //helpers - $helpers = array(); - $helpers['title'] = Array("", t('Help or @NewHere ?'), "", ""); - - $aside['$helpers'] = $helpers; - //end helpers - //connectable services - $con_services = array(); - $con_services['title'] = Array("", t('Connect Services'), "", ""); - - $aside['$con_services'] = $con_services; - //end connectable services - - - //get_baseurl - $url = $a->get_baseurl($ssl_state); - $aside['$url'] = $url; - - $tpl = file_get_contents(dirname(__file__).'/communityhome.tpl'); - $a->page['right_aside'] = replace_macros($tpl, $aside); - -} - - -//profile_side at networkpages -if ($a->argv[0] === "network" && local_user()){ - - // USER MENU - if(local_user()) { - - $r = q("SELECT micro FROM contact WHERE uid=%d AND self=1", intval($a->user['uid'])); - - $userinfo = array( - 'icon' => (count($r) ? $r[0]['micro']: $a->get_baseurl()."/images/default-profile-mm.jpg"), - 'name' => $a->user['username'], - ); - $ps = array('usermenu'=>array()); - $ps['usermenu']['status'] = Array('profile/' . $a->user['nickname'], t('Home'), "", t('Your posts and conversations')); - $ps['usermenu']['profile'] = Array('profile/' . $a->user['nickname']. '?tab=profile', t('Profile'), "", t('Your profile page')); - $ps['usermenu']['contacts'] = Array('contacts' , t('Contacts'), "", t('Your contacts')); - $ps['usermenu']['photos'] = Array('photos/' . $a->user['nickname'], t('Photos'), "", t('Your photos')); - $ps['usermenu']['events'] = Array('events/', t('Events'), "", t('Your events')); - $ps['usermenu']['notes'] = Array('notes/', t('Personal notes'), "", t('Your personal photos')); - $ps['usermenu']['community'] = Array('community/', t('Community'), "", ""); - $ps['usermenu']['pgroups'] = Array('http://dir.friendika.com/directory/forum', t('Community Pages'), "", ""); - - $tpl = get_markup_template('profile_side.tpl'); - - $a->page['aside'] .= replace_macros($tpl, array( - '$userinfo' => $userinfo, - '$ps' => $ps, - )); - - } - - $ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes']; - - if($ccCookie != "7") { - // COMMUNITY - diabook_red_community_info(); - - // CUSTOM CSS - if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-red/style-network.css";} - if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-red/style-network-wide.css";} - } -} - - - -//right_aside at profile pages -if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){ - if($ccCookie != "7") { - // COMMUNITY - diabook_red_community_info(); - - // CUSTOM CSS - if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-red/style-profile.css";} - if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-red/style-profile-wide.css";} - } -} - -// custom css -if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('', $cssFile); - -//load jquery.cookie.js -$cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-red/js/jquery.cookie.js"; -$a->page['htmlhead'] .= sprintf('', $cookieJS); - -//load jquery.ae.image.resize.js -$imageresizeJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-red/js/jquery.ae.image.resize.js"; -$a->page['htmlhead'] .= sprintf('', $imageresizeJS); - -//load jquery.autogrow-textarea.js -$autogrowJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-red/js/jquery.autogrow.textarea.js"; -$a->page['htmlhead'] .= sprintf('', $autogrowJS); - -//js scripts -//comment-edit-wrapper on photo_view -if ($a->argv[0].$a->argv[2] === "photos"."image"){ - -$a->page['htmlhead'] .= ' -'; - -} - -$a->page['htmlhead'] .= ' - -'; - -$a->page['htmlhead'] .= ' - -'; - -$a->page['htmlhead'] .= ' - '; - - -if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){ -$a->page['htmlhead'] .= ' -'; - - - if($ccCookie != "7") { -$a->page['htmlhead'] .= ' -';} - -$a->page['htmlhead'] .= ' -';} - -$a->page['htmlhead'] .= ' - - '; \ No newline at end of file diff --git a/view/theme/diabook/diabook-red/theme_settings.tpl b/view/theme/diabook/diabook-red/theme_settings.tpl deleted file mode 100644 index 3ae5fdbf8..000000000 --- a/view/theme/diabook/diabook-red/theme_settings.tpl +++ /dev/null @@ -1,10 +0,0 @@ -{{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}} - -
- -
- diff --git a/view/theme/diabook/diabook-red/wall_item.tpl b/view/theme/diabook/diabook-red/wall_item.tpl deleted file mode 100644 index 123834064..000000000 --- a/view/theme/diabook/diabook-red/wall_item.tpl +++ /dev/null @@ -1,100 +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 -
-
-
-
-
-
- {{ 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.dropping }} - - $item.drop.delete - {{ endif }} - {{ if $item.edpost }} - - {{ endif }} -
-
$item.location 
-
-
-
-
- -
$item.dislike
-
-
- -
- $item.comment -
diff --git a/view/theme/diabook/diabook-red/wallwall_item.tpl b/view/theme/diabook/diabook-red/wallwall_item.tpl deleted file mode 100644 index bee75ad99..000000000 --- a/view/theme/diabook/diabook-red/wallwall_item.tpl +++ /dev/null @@ -1,106 +0,0 @@ -{{ if $item.indent }}{{ else }} -
- -
-{{ endif }} -
-
-
-
- - $item.owner_name - -
-
- - $item.name - - menu - - -
-
-
- $item.name - $item.to $item.owner_name - $item.vwall -   - {{ 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.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.dropping }} - - $item.drop.delete - {{ endif }} - {{ if $item.edpost }} - - {{ endif }} -
-
$item.location 
-
-
-
-
- -
$item.dislike
-
-
- -
- $item.comment -
\ No newline at end of file diff --git a/view/theme/diabook/group_side.tpl b/view/theme/diabook/group_side.tpl index 1c8ebcd9f..ce4b25fbf 100755 --- a/view/theme/diabook/group_side.tpl +++ b/view/theme/diabook/group_side.tpl @@ -7,8 +7,8 @@
    {{ for $groups as $group }}
  • - + $group.text {{ if $group.edit }} diff --git a/view/theme/diabook/nets.tpl b/view/theme/diabook/nets.tpl index be25ddee1..351e2c3e2 100644 --- a/view/theme/diabook/nets.tpl +++ b/view/theme/diabook/nets.tpl @@ -8,8 +8,10 @@ $all
    • {{ for $nets as $net }}
  • - - $net.name
    • + + + $net.name + {{ endfor }}
-- cgit v1.2.3 From a305cf9f5c55a54bf60161796137d4950be553b2 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Mon, 23 Apr 2012 18:42:37 +0200 Subject: diabok-themes: fixed bug in green-wide and dark-wide --- view/theme/diabook/style-network-wide.css | 4 ++-- view/theme/diabook/style-network.css | 4 ++-- view/theme/diabook/style-profile-wide.css | 4 ++-- view/theme/diabook/style-profile.css | 4 ++-- view/theme/diabook/style.php | 8 ++++---- 5 files changed, 12 insertions(+), 12 deletions(-) (limited to 'view') diff --git a/view/theme/diabook/style-network-wide.css b/view/theme/diabook/style-network-wide.css index 13801b6ba..06e9718fc 100644 --- a/view/theme/diabook/style-network-wide.css +++ b/view/theme/diabook/style-network-wide.css @@ -1242,12 +1242,12 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: #page-sidebar-right_aside .label {max-width: 128px;} right_aside .icon {width: 10px; height: 10px;} .close_box { - background-image: url("../../../view/theme/diabook-blue/icons/close_box.png"); + background-image: url("../../../view/theme/diabook/icons/close_box.png"); float: right; opacity: 0.1; } .close_box:hover { - background-image: url("../../../view/theme/diabook-blue/icons/close_box.png"); + background-image: url("../../../view/theme/diabook/icons/close_box.png"); float: right; cursor: pointer; opacity: 1; diff --git a/view/theme/diabook/style-network.css b/view/theme/diabook/style-network.css index 502e46f23..a8ed1e9a2 100644 --- a/view/theme/diabook/style-network.css +++ b/view/theme/diabook/style-network.css @@ -1236,12 +1236,12 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: #page-sidebar-right_aside .label {max-width: 128px;} right_aside .icon {width: 10px; height: 10px;} .close_box { - background-image: url("../../../view/theme/diabook-blue/icons/close_box.png"); + background-image: url("../../../view/theme/diabook/icons/close_box.png"); float: right; opacity: 0.1; } .close_box:hover { - background-image: url("../../../view/theme/diabook-blue/icons/close_box.png"); + background-image: url("../../../view/theme/diabook/icons/close_box.png"); float: right; cursor: pointer; opacity: 1; diff --git a/view/theme/diabook/style-profile-wide.css b/view/theme/diabook/style-profile-wide.css index 1c8257b7e..c4c72fb68 100644 --- a/view/theme/diabook/style-profile-wide.css +++ b/view/theme/diabook/style-profile-wide.css @@ -1217,13 +1217,13 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: #page-sidebar-right_aside .label {max-width: 128px;} right_aside .icon {width: 10px; height: 10px;} .close_box { - background-image: url("../../../view/theme/diabook-blue/icons/close_box.png"); + background-image: url("../../../view/theme/diabook/icons/close_box.png"); float: right; cursor: pointer; opacity: 0.1; } .close_box:hover { - background-image: url("../../../view/theme/diabook-blue/icons/close_box.png"); + background-image: url("../../../view/theme/diabook/icons/close_box.png"); float: right; cursor: pointer; opacity: 1; diff --git a/view/theme/diabook/style-profile.css b/view/theme/diabook/style-profile.css index cb7f1df69..a0a2adb53 100644 --- a/view/theme/diabook/style-profile.css +++ b/view/theme/diabook/style-profile.css @@ -1212,13 +1212,13 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: #page-sidebar-right_aside .label {max-width: 128px;} right_aside .icon {width: 10px; height: 10px;} .close_box { - background-image: url("../../../view/theme/diabook-blue/icons/close_box.png"); + background-image: url("../../../view/theme/diabook/icons/close_box.png"); float: right; cursor: pointer; opacity: 0.1; } .close_box:hover { - background-image: url("../../../view/theme/diabook-blue/icons/close_box.png"); + background-image: url("../../../view/theme/diabook/icons/close_box.png"); float: right; cursor: pointer; opacity: 1; diff --git a/view/theme/diabook/style.php b/view/theme/diabook/style.php index 12ffa7159..d926579da 100644 --- a/view/theme/diabook/style.php +++ b/view/theme/diabook/style.php @@ -1556,9 +1556,9 @@ } } - if($resolution == "green") { + if($resolution == "wide") { if (file_exists("$THEMEPATH/diabook-green/style-wide.css")){ - echo file_get_contents("$THEMEPATH/diabook-pink/style-green.css"); + echo file_get_contents("$THEMEPATH/diabook-green/style-wide.css"); } if($diabook_font_size == "16"){ echo " @@ -1834,9 +1834,9 @@ } } - if($resolution == "dark") { + if($resolution == "wide") { if (file_exists("$THEMEPATH/diabook-dark/style-wide.css")){ - echo file_get_contents("$THEMEPATH/diabook-dark/style-green.css"); + echo file_get_contents("$THEMEPATH/diabook-dark/style-wide.css"); } if($diabook_font_size == "16"){ echo " -- cgit v1.2.3 From af7abcea2715824cbd6460a7323c8bb64bd5b829 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Mon, 23 Apr 2012 20:55:48 +0200 Subject: DE strings, correction of a typo --- view/de/messages.po | 201 +++++++++++++--------------------------------------- view/de/strings.php | 95 ++++++++++++------------- 2 files changed, 98 insertions(+), 198 deletions(-) (limited to 'view') diff --git a/view/de/messages.po b/view/de/messages.po index 1dff9bfce..8dc3ec615 100644 --- a/view/de/messages.po +++ b/view/de/messages.po @@ -19,9 +19,9 @@ msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n" -"POT-Creation-Date: 2012-04-21 10:00-0700\n" -"PO-Revision-Date: 2012-04-22 09:36+0000\n" -"Last-Translator: Fabian Dost \n" +"POT-Creation-Date: 2012-04-22 10:00-0700\n" +"PO-Revision-Date: 2012-04-23 18:48+0000\n" +"Last-Translator: bavatar \n" "Language-Team: German (http://www.transifex.net/projects/p/friendica/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -170,8 +170,6 @@ msgstr "Neues Foto von dieser URL" #: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:375 #: ../../addon/irc/irc.php:55 ../../addon/blogger/blogger.php:102 #: ../../addon/posterous/posterous.php:90 -#: ../../view/theme/diabook-red/config.php:76 -#: ../../view/theme/diabook-blue/config.php:76 #: ../../view/theme/diabook/diabook-green/config.php:76 #: ../../view/theme/diabook/diabook-red/config.php:76 #: ../../view/theme/diabook/diabook-blue/config.php:76 @@ -179,9 +177,7 @@ msgstr "Neues Foto von dieser URL" #: ../../view/theme/diabook/diabook-aerith/config.php:76 #: ../../view/theme/diabook/diabook-pink/config.php:76 #: ../../view/theme/diabook/config.php:91 -#: ../../view/theme/quattro/config.php:52 -#: ../../view/theme/diabook-aerith/config.php:76 -#: ../../include/conversation.php:555 +#: ../../view/theme/quattro/config.php:52 ../../include/conversation.php:555 msgid "Submit" msgstr "Senden" @@ -239,17 +235,15 @@ msgstr "Veranstaltung bearbeiten" msgid "link to source" msgstr "Link zum Originalbeitrag" -#: ../../mod/events.php:296 ../../view/theme/diabook-red/theme.php:231 -#: ../../view/theme/diabook-blue/theme.php:231 +#: ../../mod/events.php:296 #: ../../view/theme/diabook/diabook-green/theme.php:233 #: ../../view/theme/diabook/diabook-red/theme.php:231 #: ../../view/theme/diabook/diabook-blue/theme.php:231 -#: ../../view/theme/diabook/theme.php:251 +#: ../../view/theme/diabook/theme.php:250 #: ../../view/theme/diabook/diabook-dark/theme.php:233 #: ../../view/theme/diabook/diabook-aerith/theme.php:233 #: ../../view/theme/diabook/diabook-pink/theme.php:233 -#: ../../view/theme/diabook-aerith/theme.php:233 ../../include/nav.php:52 -#: ../../boot.php:1471 +#: ../../include/nav.php:52 ../../boot.php:1471 msgid "Events" msgstr "Veranstaltungen" @@ -381,8 +375,6 @@ msgstr "Fotoalben" #: ../../mod/photos.php:51 ../../mod/photos.php:151 ../../mod/photos.php:879 #: ../../mod/photos.php:950 ../../mod/photos.php:965 ../../mod/photos.php:1382 #: ../../mod/photos.php:1394 ../../addon/communityhome/communityhome.php:110 -#: ../../view/theme/diabook-red/theme.php:115 -#: ../../view/theme/diabook-blue/theme.php:115 #: ../../view/theme/diabook/diabook-green/theme.php:116 #: ../../view/theme/diabook/diabook-red/theme.php:115 #: ../../view/theme/diabook/diabook-blue/theme.php:115 @@ -390,7 +382,6 @@ msgstr "Fotoalben" #: ../../view/theme/diabook/diabook-dark/theme.php:116 #: ../../view/theme/diabook/diabook-aerith/theme.php:116 #: ../../view/theme/diabook/diabook-pink/theme.php:116 -#: ../../view/theme/diabook-aerith/theme.php:116 msgid "Contact Photos" msgstr "Kontaktbilder" @@ -413,8 +404,6 @@ msgstr "Kontaktinformationen nicht verfügbar" #: ../../mod/profile_photo.php:74 ../../mod/profile_photo.php:174 #: ../../mod/profile_photo.php:252 ../../mod/profile_photo.php:261 #: ../../addon/communityhome/communityhome.php:111 -#: ../../view/theme/diabook-red/theme.php:116 -#: ../../view/theme/diabook-blue/theme.php:116 #: ../../view/theme/diabook/diabook-green/theme.php:117 #: ../../view/theme/diabook/diabook-red/theme.php:116 #: ../../view/theme/diabook/diabook-blue/theme.php:116 @@ -422,7 +411,6 @@ msgstr "Kontaktinformationen nicht verfügbar" #: ../../view/theme/diabook/diabook-dark/theme.php:117 #: ../../view/theme/diabook/diabook-aerith/theme.php:117 #: ../../view/theme/diabook/diabook-pink/theme.php:117 -#: ../../view/theme/diabook-aerith/theme.php:117 msgid "Profile Photos" msgstr "Profilbilder" @@ -444,8 +432,6 @@ msgstr "wurde getaggt in einem" #: ../../mod/photos.php:528 ../../mod/like.php:127 ../../mod/tagger.php:70 #: ../../addon/communityhome/communityhome.php:163 -#: ../../view/theme/diabook-red/theme.php:87 -#: ../../view/theme/diabook-blue/theme.php:87 #: ../../view/theme/diabook/diabook-green/theme.php:88 #: ../../view/theme/diabook/diabook-red/theme.php:87 #: ../../view/theme/diabook/diabook-blue/theme.php:87 @@ -453,9 +439,8 @@ msgstr "wurde getaggt in einem" #: ../../view/theme/diabook/diabook-dark/theme.php:88 #: ../../view/theme/diabook/diabook-aerith/theme.php:88 #: ../../view/theme/diabook/diabook-pink/theme.php:88 -#: ../../view/theme/diabook-aerith/theme.php:88 ../../include/text.php:1304 -#: ../../include/diaspora.php:1654 ../../include/conversation.php:53 -#: ../../include/conversation.php:126 +#: ../../include/text.php:1304 ../../include/diaspora.php:1654 +#: ../../include/conversation.php:53 ../../include/conversation.php:126 msgid "photo" msgstr "Foto" @@ -629,16 +614,15 @@ msgstr "Neueste Fotos" msgid "Not available." msgstr "Nicht verfügbar." -#: ../../mod/community.php:30 ../../view/theme/diabook-red/theme.php:233 -#: ../../view/theme/diabook-blue/theme.php:233 +#: ../../mod/community.php:30 #: ../../view/theme/diabook/diabook-green/theme.php:235 #: ../../view/theme/diabook/diabook-red/theme.php:233 #: ../../view/theme/diabook/diabook-blue/theme.php:233 -#: ../../view/theme/diabook/theme.php:253 +#: ../../view/theme/diabook/theme.php:252 #: ../../view/theme/diabook/diabook-dark/theme.php:235 #: ../../view/theme/diabook/diabook-aerith/theme.php:235 #: ../../view/theme/diabook/diabook-pink/theme.php:235 -#: ../../view/theme/diabook-aerith/theme.php:235 ../../include/nav.php:101 +#: ../../include/nav.php:101 msgid "Community" msgstr "Gemeinschaft" @@ -1280,17 +1264,15 @@ msgstr "Netzwerk" msgid "Personal" msgstr "Persönlich" -#: ../../mod/notifications.php:90 ../../view/theme/diabook-red/theme.php:227 -#: ../../view/theme/diabook-blue/theme.php:227 +#: ../../mod/notifications.php:90 #: ../../view/theme/diabook/diabook-green/theme.php:229 #: ../../view/theme/diabook/diabook-red/theme.php:227 #: ../../view/theme/diabook/diabook-blue/theme.php:227 -#: ../../view/theme/diabook/theme.php:247 +#: ../../view/theme/diabook/theme.php:246 #: ../../view/theme/diabook/diabook-dark/theme.php:229 #: ../../view/theme/diabook/diabook-aerith/theme.php:229 #: ../../view/theme/diabook/diabook-pink/theme.php:229 -#: ../../view/theme/diabook-aerith/theme.php:229 ../../include/nav.php:77 -#: ../../include/nav.php:115 +#: ../../include/nav.php:77 ../../include/nav.php:115 msgid "Home" msgstr "Pinnwand" @@ -1666,16 +1648,15 @@ msgstr "du bist Fan von" msgid "Edit contact" msgstr "Kontakt bearbeiten" -#: ../../mod/contacts.php:529 ../../view/theme/diabook-red/theme.php:229 -#: ../../view/theme/diabook-blue/theme.php:229 +#: ../../mod/contacts.php:529 #: ../../view/theme/diabook/diabook-green/theme.php:231 #: ../../view/theme/diabook/diabook-red/theme.php:229 #: ../../view/theme/diabook/diabook-blue/theme.php:229 -#: ../../view/theme/diabook/theme.php:249 +#: ../../view/theme/diabook/theme.php:248 #: ../../view/theme/diabook/diabook-dark/theme.php:231 #: ../../view/theme/diabook/diabook-aerith/theme.php:231 #: ../../view/theme/diabook/diabook-pink/theme.php:231 -#: ../../view/theme/diabook-aerith/theme.php:231 ../../include/nav.php:139 +#: ../../include/nav.php:139 msgid "Contacts" msgstr "Kontakte" @@ -2586,16 +2567,14 @@ msgstr "Ungültiger Profil-Bezeichner" msgid "Profile Visibility Editor" msgstr "Editor für die Profil-Sichtbarkeit" -#: ../../mod/profperm.php:103 ../../view/theme/diabook-red/theme.php:228 -#: ../../view/theme/diabook-blue/theme.php:228 +#: ../../mod/profperm.php:103 #: ../../view/theme/diabook/diabook-green/theme.php:230 #: ../../view/theme/diabook/diabook-red/theme.php:228 #: ../../view/theme/diabook/diabook-blue/theme.php:228 -#: ../../view/theme/diabook/theme.php:248 +#: ../../view/theme/diabook/theme.php:247 #: ../../view/theme/diabook/diabook-dark/theme.php:230 #: ../../view/theme/diabook/diabook-aerith/theme.php:230 #: ../../view/theme/diabook/diabook-pink/theme.php:230 -#: ../../view/theme/diabook-aerith/theme.php:230 #: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:74 #: ../../include/nav.php:50 ../../boot.php:1458 msgid "Profile" @@ -2781,10 +2760,6 @@ msgstr "Personen Suche" #: ../../addon/facebook/facebook.php:1655 #: ../../addon/communityhome/communityhome.php:158 #: ../../addon/communityhome/communityhome.php:167 -#: ../../view/theme/diabook-red/theme.php:82 -#: ../../view/theme/diabook-red/theme.php:91 -#: ../../view/theme/diabook-blue/theme.php:82 -#: ../../view/theme/diabook-blue/theme.php:91 #: ../../view/theme/diabook/diabook-green/theme.php:83 #: ../../view/theme/diabook/diabook-green/theme.php:92 #: ../../view/theme/diabook/diabook-red/theme.php:82 @@ -2799,8 +2774,6 @@ msgstr "Personen Suche" #: ../../view/theme/diabook/diabook-aerith/theme.php:92 #: ../../view/theme/diabook/diabook-pink/theme.php:83 #: ../../view/theme/diabook/diabook-pink/theme.php:92 -#: ../../view/theme/diabook-aerith/theme.php:83 -#: ../../view/theme/diabook-aerith/theme.php:92 #: ../../include/diaspora.php:1654 ../../include/conversation.php:48 #: ../../include/conversation.php:57 ../../include/conversation.php:121 #: ../../include/conversation.php:130 @@ -2809,8 +2782,6 @@ msgstr "Status" #: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1659 #: ../../addon/communityhome/communityhome.php:172 -#: ../../view/theme/diabook-red/theme.php:96 -#: ../../view/theme/diabook-blue/theme.php:96 #: ../../view/theme/diabook/diabook-green/theme.php:97 #: ../../view/theme/diabook/diabook-red/theme.php:96 #: ../../view/theme/diabook/diabook-blue/theme.php:96 @@ -2818,7 +2789,6 @@ msgstr "Status" #: ../../view/theme/diabook/diabook-dark/theme.php:97 #: ../../view/theme/diabook/diabook-aerith/theme.php:97 #: ../../view/theme/diabook/diabook-pink/theme.php:97 -#: ../../view/theme/diabook-aerith/theme.php:97 #: ../../include/diaspora.php:1670 ../../include/conversation.php:65 #, php-format msgid "%1$s likes %2$s's %3$s" @@ -2839,17 +2809,15 @@ msgstr "Beitrag nicht gefunden." msgid "Access denied." msgstr "Zugriff verweigert." -#: ../../mod/fbrowser.php:23 ../../view/theme/diabook-red/theme.php:230 -#: ../../view/theme/diabook-blue/theme.php:230 +#: ../../mod/fbrowser.php:23 #: ../../view/theme/diabook/diabook-green/theme.php:232 #: ../../view/theme/diabook/diabook-red/theme.php:230 #: ../../view/theme/diabook/diabook-blue/theme.php:230 -#: ../../view/theme/diabook/theme.php:250 +#: ../../view/theme/diabook/theme.php:249 #: ../../view/theme/diabook/diabook-dark/theme.php:232 #: ../../view/theme/diabook/diabook-aerith/theme.php:232 #: ../../view/theme/diabook/diabook-pink/theme.php:232 -#: ../../view/theme/diabook-aerith/theme.php:232 ../../include/nav.php:51 -#: ../../boot.php:1463 +#: ../../include/nav.php:51 ../../boot.php:1463 msgid "Photos" msgstr "Bilder" @@ -4002,16 +3970,14 @@ msgstr "Hinzufügen" msgid "No entries." msgstr "Keine Einträge" -#: ../../mod/suggest.php:38 ../../view/theme/diabook-red/theme.php:143 -#: ../../view/theme/diabook-blue/theme.php:143 +#: ../../mod/suggest.php:38 #: ../../view/theme/diabook/diabook-green/theme.php:145 #: ../../view/theme/diabook/diabook-red/theme.php:143 #: ../../view/theme/diabook/diabook-blue/theme.php:143 -#: ../../view/theme/diabook/theme.php:159 +#: ../../view/theme/diabook/theme.php:158 #: ../../view/theme/diabook/diabook-dark/theme.php:145 #: ../../view/theme/diabook/diabook-aerith/theme.php:145 #: ../../view/theme/diabook/diabook-pink/theme.php:145 -#: ../../view/theme/diabook-aerith/theme.php:145 #: ../../include/contact_widgets.php:34 msgid "Friend Suggestions" msgstr "Kontaktvorschläge" @@ -4026,16 +3992,14 @@ msgstr "Keine Vorschläge. Falls der Server frisch aufgesetzt wurde, versuche es msgid "Ignore/Hide" msgstr "Ignorieren/Verbergen" -#: ../../mod/directory.php:47 ../../view/theme/diabook-red/theme.php:141 -#: ../../view/theme/diabook-blue/theme.php:141 +#: ../../mod/directory.php:47 #: ../../view/theme/diabook/diabook-green/theme.php:143 #: ../../view/theme/diabook/diabook-red/theme.php:141 #: ../../view/theme/diabook/diabook-blue/theme.php:141 -#: ../../view/theme/diabook/theme.php:157 +#: ../../view/theme/diabook/theme.php:156 #: ../../view/theme/diabook/diabook-dark/theme.php:143 #: ../../view/theme/diabook/diabook-aerith/theme.php:143 #: ../../view/theme/diabook/diabook-pink/theme.php:143 -#: ../../view/theme/diabook-aerith/theme.php:143 msgid "Global Directory" msgstr "Weltweites Verzeichnis" @@ -4329,7 +4293,7 @@ msgstr "Fehler: der angegebene API Schlüssel scheint nicht korrekt zu sein (Zug #: ../../addon/facebook/facebook.php:707 msgid "The given API Key seems to work correctly." -msgstr "Der angegebene API Schlüssel scheint nicht korrekt zu funktionieren." +msgstr "Der angegebene API Schlüssel scheint korrekt zu funktionieren." #: ../../addon/facebook/facebook.php:709 msgid "" @@ -4565,8 +4529,6 @@ msgid "Latest likes" msgstr "Neueste Favoriten" #: ../../addon/communityhome/communityhome.php:155 -#: ../../view/theme/diabook-red/theme.php:79 -#: ../../view/theme/diabook-blue/theme.php:79 #: ../../view/theme/diabook/diabook-green/theme.php:80 #: ../../view/theme/diabook/diabook-red/theme.php:79 #: ../../view/theme/diabook/diabook-blue/theme.php:79 @@ -4574,8 +4536,8 @@ msgstr "Neueste Favoriten" #: ../../view/theme/diabook/diabook-dark/theme.php:80 #: ../../view/theme/diabook/diabook-aerith/theme.php:80 #: ../../view/theme/diabook/diabook-pink/theme.php:80 -#: ../../view/theme/diabook-aerith/theme.php:80 ../../include/text.php:1302 -#: ../../include/conversation.php:45 ../../include/conversation.php:118 +#: ../../include/text.php:1302 ../../include/conversation.php:45 +#: ../../include/conversation.php:118 msgid "event" msgstr "Veranstaltung" @@ -5468,8 +5430,6 @@ msgstr "Posterous-Passwort" msgid "Post to Posterous by default" msgstr "Veröffentliche öffentliche Beiträge standardmäßig bei Posterous" -#: ../../view/theme/diabook-red/theme.php:28 -#: ../../view/theme/diabook-blue/theme.php:28 #: ../../view/theme/diabook/diabook-green/theme.php:29 #: ../../view/theme/diabook/diabook-red/theme.php:28 #: ../../view/theme/diabook/diabook-blue/theme.php:28 @@ -5477,12 +5437,9 @@ msgstr "Veröffentliche öffentliche Beiträge standardmäßig bei Posterous" #: ../../view/theme/diabook/diabook-dark/theme.php:29 #: ../../view/theme/diabook/diabook-aerith/theme.php:29 #: ../../view/theme/diabook/diabook-pink/theme.php:29 -#: ../../view/theme/diabook-aerith/theme.php:29 msgid "Last users" msgstr "Letzte Nutzer" -#: ../../view/theme/diabook-red/theme.php:57 -#: ../../view/theme/diabook-blue/theme.php:57 #: ../../view/theme/diabook/diabook-green/theme.php:58 #: ../../view/theme/diabook/diabook-red/theme.php:57 #: ../../view/theme/diabook/diabook-blue/theme.php:57 @@ -5490,12 +5447,9 @@ msgstr "Letzte Nutzer" #: ../../view/theme/diabook/diabook-dark/theme.php:58 #: ../../view/theme/diabook/diabook-aerith/theme.php:58 #: ../../view/theme/diabook/diabook-pink/theme.php:58 -#: ../../view/theme/diabook-aerith/theme.php:58 msgid "Last likes" msgstr "Zuletzt gemocht" -#: ../../view/theme/diabook-red/theme.php:102 -#: ../../view/theme/diabook-blue/theme.php:102 #: ../../view/theme/diabook/diabook-green/theme.php:103 #: ../../view/theme/diabook/diabook-red/theme.php:102 #: ../../view/theme/diabook/diabook-blue/theme.php:102 @@ -5503,207 +5457,164 @@ msgstr "Zuletzt gemocht" #: ../../view/theme/diabook/diabook-dark/theme.php:103 #: ../../view/theme/diabook/diabook-aerith/theme.php:103 #: ../../view/theme/diabook/diabook-pink/theme.php:103 -#: ../../view/theme/diabook-aerith/theme.php:103 msgid "Last photos" msgstr "Letzte Fotos" -#: ../../view/theme/diabook-red/theme.php:139 -#: ../../view/theme/diabook-blue/theme.php:139 #: ../../view/theme/diabook/diabook-green/theme.php:141 #: ../../view/theme/diabook/diabook-red/theme.php:139 #: ../../view/theme/diabook/diabook-blue/theme.php:139 -#: ../../view/theme/diabook/theme.php:155 +#: ../../view/theme/diabook/theme.php:154 #: ../../view/theme/diabook/diabook-dark/theme.php:141 #: ../../view/theme/diabook/diabook-aerith/theme.php:141 #: ../../view/theme/diabook/diabook-pink/theme.php:141 -#: ../../view/theme/diabook-aerith/theme.php:141 msgid "Find Friends" msgstr "Freunde finden" -#: ../../view/theme/diabook-red/theme.php:140 -#: ../../view/theme/diabook-blue/theme.php:140 #: ../../view/theme/diabook/diabook-green/theme.php:142 #: ../../view/theme/diabook/diabook-red/theme.php:140 #: ../../view/theme/diabook/diabook-blue/theme.php:140 -#: ../../view/theme/diabook/theme.php:156 +#: ../../view/theme/diabook/theme.php:155 #: ../../view/theme/diabook/diabook-dark/theme.php:142 #: ../../view/theme/diabook/diabook-aerith/theme.php:142 #: ../../view/theme/diabook/diabook-pink/theme.php:142 -#: ../../view/theme/diabook-aerith/theme.php:142 msgid "Local Directory" msgstr "Lokales Verzeichnis" -#: ../../view/theme/diabook-red/theme.php:142 -#: ../../view/theme/diabook-blue/theme.php:142 #: ../../view/theme/diabook/diabook-green/theme.php:144 #: ../../view/theme/diabook/diabook-red/theme.php:142 #: ../../view/theme/diabook/diabook-blue/theme.php:142 -#: ../../view/theme/diabook/theme.php:158 +#: ../../view/theme/diabook/theme.php:157 #: ../../view/theme/diabook/diabook-dark/theme.php:144 #: ../../view/theme/diabook/diabook-aerith/theme.php:144 #: ../../view/theme/diabook/diabook-pink/theme.php:144 -#: ../../view/theme/diabook-aerith/theme.php:144 #: ../../include/contact_widgets.php:35 msgid "Similar Interests" msgstr "Ähnliche Interessen" -#: ../../view/theme/diabook-red/theme.php:144 -#: ../../view/theme/diabook-blue/theme.php:144 #: ../../view/theme/diabook/diabook-green/theme.php:146 #: ../../view/theme/diabook/diabook-red/theme.php:144 #: ../../view/theme/diabook/diabook-blue/theme.php:144 -#: ../../view/theme/diabook/theme.php:160 +#: ../../view/theme/diabook/theme.php:159 #: ../../view/theme/diabook/diabook-dark/theme.php:146 #: ../../view/theme/diabook/diabook-aerith/theme.php:146 #: ../../view/theme/diabook/diabook-pink/theme.php:146 -#: ../../view/theme/diabook-aerith/theme.php:146 #: ../../include/contact_widgets.php:37 msgid "Invite Friends" msgstr "Freunde einladen" -#: ../../view/theme/diabook-red/theme.php:159 -#: ../../view/theme/diabook-red/theme.php:234 -#: ../../view/theme/diabook-blue/theme.php:159 -#: ../../view/theme/diabook-blue/theme.php:234 #: ../../view/theme/diabook/diabook-green/theme.php:161 #: ../../view/theme/diabook/diabook-green/theme.php:236 #: ../../view/theme/diabook/diabook-red/theme.php:159 #: ../../view/theme/diabook/diabook-red/theme.php:234 #: ../../view/theme/diabook/diabook-blue/theme.php:159 #: ../../view/theme/diabook/diabook-blue/theme.php:234 -#: ../../view/theme/diabook/theme.php:176 -#: ../../view/theme/diabook/theme.php:254 +#: ../../view/theme/diabook/theme.php:175 +#: ../../view/theme/diabook/theme.php:253 #: ../../view/theme/diabook/diabook-dark/theme.php:161 #: ../../view/theme/diabook/diabook-dark/theme.php:236 #: ../../view/theme/diabook/diabook-aerith/theme.php:161 #: ../../view/theme/diabook/diabook-aerith/theme.php:236 #: ../../view/theme/diabook/diabook-pink/theme.php:161 #: ../../view/theme/diabook/diabook-pink/theme.php:236 -#: ../../view/theme/diabook-aerith/theme.php:161 -#: ../../view/theme/diabook-aerith/theme.php:236 msgid "Community Pages" msgstr "Foren" -#: ../../view/theme/diabook-red/theme.php:192 -#: ../../view/theme/diabook-blue/theme.php:192 #: ../../view/theme/diabook/diabook-green/theme.php:194 #: ../../view/theme/diabook/diabook-red/theme.php:192 #: ../../view/theme/diabook/diabook-blue/theme.php:192 -#: ../../view/theme/diabook/theme.php:209 +#: ../../view/theme/diabook/theme.php:208 #: ../../view/theme/diabook/diabook-dark/theme.php:194 #: ../../view/theme/diabook/diabook-aerith/theme.php:194 #: ../../view/theme/diabook/diabook-pink/theme.php:194 -#: ../../view/theme/diabook-aerith/theme.php:194 msgid "Help or @NewHere ?" msgstr "Hilfe oder @NewHere" -#: ../../view/theme/diabook-red/theme.php:198 -#: ../../view/theme/diabook-blue/theme.php:198 #: ../../view/theme/diabook/diabook-green/theme.php:200 #: ../../view/theme/diabook/diabook-red/theme.php:198 #: ../../view/theme/diabook/diabook-blue/theme.php:198 -#: ../../view/theme/diabook/theme.php:215 +#: ../../view/theme/diabook/theme.php:214 #: ../../view/theme/diabook/diabook-dark/theme.php:200 #: ../../view/theme/diabook/diabook-aerith/theme.php:200 #: ../../view/theme/diabook/diabook-pink/theme.php:200 -#: ../../view/theme/diabook-aerith/theme.php:200 msgid "Connect Services" msgstr "Verbinde Dienste" -#: ../../view/theme/diabook-red/theme.php:227 -#: ../../view/theme/diabook-blue/theme.php:227 #: ../../view/theme/diabook/diabook-green/theme.php:229 #: ../../view/theme/diabook/diabook-red/theme.php:227 #: ../../view/theme/diabook/diabook-blue/theme.php:227 -#: ../../view/theme/diabook/theme.php:247 +#: ../../view/theme/diabook/theme.php:246 #: ../../view/theme/diabook/diabook-dark/theme.php:229 #: ../../view/theme/diabook/diabook-aerith/theme.php:229 #: ../../view/theme/diabook/diabook-pink/theme.php:229 -#: ../../view/theme/diabook-aerith/theme.php:229 ../../include/nav.php:49 -#: ../../include/nav.php:115 +#: ../../include/nav.php:49 ../../include/nav.php:115 msgid "Your posts and conversations" msgstr "Deine Beiträge und Unterhaltungen" -#: ../../view/theme/diabook-red/theme.php:228 -#: ../../view/theme/diabook-blue/theme.php:228 #: ../../view/theme/diabook/diabook-green/theme.php:230 #: ../../view/theme/diabook/diabook-red/theme.php:228 #: ../../view/theme/diabook/diabook-blue/theme.php:228 -#: ../../view/theme/diabook/theme.php:248 +#: ../../view/theme/diabook/theme.php:247 #: ../../view/theme/diabook/diabook-dark/theme.php:230 #: ../../view/theme/diabook/diabook-aerith/theme.php:230 #: ../../view/theme/diabook/diabook-pink/theme.php:230 -#: ../../view/theme/diabook-aerith/theme.php:230 ../../include/nav.php:50 +#: ../../include/nav.php:50 msgid "Your profile page" msgstr "Deine Profilseite" -#: ../../view/theme/diabook-red/theme.php:229 -#: ../../view/theme/diabook-blue/theme.php:229 #: ../../view/theme/diabook/diabook-green/theme.php:231 #: ../../view/theme/diabook/diabook-red/theme.php:229 #: ../../view/theme/diabook/diabook-blue/theme.php:229 -#: ../../view/theme/diabook/theme.php:249 +#: ../../view/theme/diabook/theme.php:248 #: ../../view/theme/diabook/diabook-dark/theme.php:231 #: ../../view/theme/diabook/diabook-aerith/theme.php:231 #: ../../view/theme/diabook/diabook-pink/theme.php:231 -#: ../../view/theme/diabook-aerith/theme.php:231 msgid "Your contacts" msgstr "Deine Kontakte" -#: ../../view/theme/diabook-red/theme.php:230 -#: ../../view/theme/diabook-blue/theme.php:230 #: ../../view/theme/diabook/diabook-green/theme.php:232 #: ../../view/theme/diabook/diabook-red/theme.php:230 #: ../../view/theme/diabook/diabook-blue/theme.php:230 -#: ../../view/theme/diabook/theme.php:250 +#: ../../view/theme/diabook/theme.php:249 #: ../../view/theme/diabook/diabook-dark/theme.php:232 #: ../../view/theme/diabook/diabook-aerith/theme.php:232 #: ../../view/theme/diabook/diabook-pink/theme.php:232 -#: ../../view/theme/diabook-aerith/theme.php:232 ../../include/nav.php:51 +#: ../../include/nav.php:51 msgid "Your photos" msgstr "Deine Fotos" -#: ../../view/theme/diabook-red/theme.php:231 -#: ../../view/theme/diabook-blue/theme.php:231 #: ../../view/theme/diabook/diabook-green/theme.php:233 #: ../../view/theme/diabook/diabook-red/theme.php:231 #: ../../view/theme/diabook/diabook-blue/theme.php:231 -#: ../../view/theme/diabook/theme.php:251 +#: ../../view/theme/diabook/theme.php:250 #: ../../view/theme/diabook/diabook-dark/theme.php:233 #: ../../view/theme/diabook/diabook-aerith/theme.php:233 #: ../../view/theme/diabook/diabook-pink/theme.php:233 -#: ../../view/theme/diabook-aerith/theme.php:233 ../../include/nav.php:52 +#: ../../include/nav.php:52 msgid "Your events" msgstr "Deine Ereignisse" -#: ../../view/theme/diabook-red/theme.php:232 -#: ../../view/theme/diabook-blue/theme.php:232 #: ../../view/theme/diabook/diabook-green/theme.php:234 #: ../../view/theme/diabook/diabook-red/theme.php:232 #: ../../view/theme/diabook/diabook-blue/theme.php:232 -#: ../../view/theme/diabook/theme.php:252 +#: ../../view/theme/diabook/theme.php:251 #: ../../view/theme/diabook/diabook-dark/theme.php:234 #: ../../view/theme/diabook/diabook-aerith/theme.php:234 #: ../../view/theme/diabook/diabook-pink/theme.php:234 -#: ../../view/theme/diabook-aerith/theme.php:234 ../../include/nav.php:53 +#: ../../include/nav.php:53 msgid "Personal notes" msgstr "Persönliche Notizen" -#: ../../view/theme/diabook-red/theme.php:232 -#: ../../view/theme/diabook-blue/theme.php:232 #: ../../view/theme/diabook/diabook-green/theme.php:234 #: ../../view/theme/diabook/diabook-red/theme.php:232 #: ../../view/theme/diabook/diabook-blue/theme.php:232 -#: ../../view/theme/diabook/theme.php:252 +#: ../../view/theme/diabook/theme.php:251 #: ../../view/theme/diabook/diabook-dark/theme.php:234 #: ../../view/theme/diabook/diabook-aerith/theme.php:234 #: ../../view/theme/diabook/diabook-pink/theme.php:234 -#: ../../view/theme/diabook-aerith/theme.php:234 ../../include/nav.php:53 +#: ../../include/nav.php:53 msgid "Your personal photos" msgstr "Deine privaten Fotos" -#: ../../view/theme/diabook-red/config.php:78 -#: ../../view/theme/diabook-blue/config.php:78 #: ../../view/theme/diabook/diabook-green/config.php:78 #: ../../view/theme/diabook/diabook-red/config.php:78 #: ../../view/theme/diabook/diabook-blue/config.php:78 @@ -5712,12 +5623,9 @@ msgstr "Deine privaten Fotos" #: ../../view/theme/diabook/diabook-pink/config.php:78 #: ../../view/theme/diabook/config.php:93 #: ../../view/theme/quattro/config.php:54 -#: ../../view/theme/diabook-aerith/config.php:78 msgid "Theme settings" msgstr "Themen Einstellungen" -#: ../../view/theme/diabook-red/config.php:79 -#: ../../view/theme/diabook-blue/config.php:79 #: ../../view/theme/diabook/diabook-green/config.php:79 #: ../../view/theme/diabook/diabook-red/config.php:79 #: ../../view/theme/diabook/diabook-blue/config.php:79 @@ -5725,12 +5633,9 @@ msgstr "Themen Einstellungen" #: ../../view/theme/diabook/diabook-aerith/config.php:79 #: ../../view/theme/diabook/diabook-pink/config.php:79 #: ../../view/theme/diabook/config.php:94 -#: ../../view/theme/diabook-aerith/config.php:79 msgid "Set font-size for posts and comments" msgstr "Schriftgröße für Beiträge und Kommentare festlegen" -#: ../../view/theme/diabook-red/config.php:80 -#: ../../view/theme/diabook-blue/config.php:80 #: ../../view/theme/diabook/diabook-green/config.php:80 #: ../../view/theme/diabook/diabook-red/config.php:80 #: ../../view/theme/diabook/diabook-blue/config.php:80 @@ -5738,12 +5643,9 @@ msgstr "Schriftgröße für Beiträge und Kommentare festlegen" #: ../../view/theme/diabook/diabook-aerith/config.php:80 #: ../../view/theme/diabook/diabook-pink/config.php:80 #: ../../view/theme/diabook/config.php:95 -#: ../../view/theme/diabook-aerith/config.php:80 msgid "Set line-height for posts and comments" msgstr "Liniengröße für Beiträge und Kommantare festlegen" -#: ../../view/theme/diabook-red/config.php:81 -#: ../../view/theme/diabook-blue/config.php:81 #: ../../view/theme/diabook/diabook-green/config.php:81 #: ../../view/theme/diabook/diabook-red/config.php:81 #: ../../view/theme/diabook/diabook-blue/config.php:81 @@ -5751,7 +5653,6 @@ msgstr "Liniengröße für Beiträge und Kommantare festlegen" #: ../../view/theme/diabook/diabook-aerith/config.php:81 #: ../../view/theme/diabook/diabook-pink/config.php:81 #: ../../view/theme/diabook/config.php:96 -#: ../../view/theme/diabook-aerith/config.php:81 msgid "Set resolution for middle column" msgstr "Auflösung für die Mittelspalte setzen" diff --git a/view/de/strings.php b/view/de/strings.php index 4e31f97de..74125549d 100644 --- a/view/de/strings.php +++ b/view/de/strings.php @@ -128,7 +128,7 @@ $a->strings["Post to Email"] = "An E-Mail senden"; $a->strings["Edit"] = "Bearbeiten"; $a->strings["Upload photo"] = "Foto hochladen"; $a->strings["Attach file"] = "Datei anhängen"; -$a->strings["Insert web link"] = "eine Kontaktanfrage"; +$a->strings["Insert web link"] = "einen Link einfügen"; $a->strings["Insert YouTube video"] = "YouTube-Video einfügen"; $a->strings["Insert Vorbis [.ogg] video"] = "Vorbis [.ogg] Video einfügen"; $a->strings["Insert Vorbis [.ogg] audio"] = "Vorbis [.ogg] Audio einfügen"; @@ -156,7 +156,7 @@ $a->strings["Spam protection measures have been invoked."] = "Maßnahmen zum Spa $a->strings["Friends are advised to please try again in 24 hours."] = "Freunde sind angehalten, es in 24 Stunden erneut zu versuchen."; $a->strings["Invalid locator"] = "Ungültiger Locator"; $a->strings["Invalid email address."] = "Ungültige E-Mail Adresse."; -$a->strings["This account has not been configured for email. Request failed."] = ""; +$a->strings["This account has not been configured for email. Request failed."] = "Dieses Konto ist nicht für Email konfiguriert. Anfrage fehlgeschlagen."; $a->strings["Unable to resolve your name at the provided location."] = "Konnte deinen Namen an der angegebenen Stelle nicht finden."; $a->strings["You have already introduced yourself here."] = "Du hast dich hier bereits vorgestellt."; $a->strings["Apparently you are already friends with %s."] = "Es scheint so, als ob du bereits mit %s befreundet bist."; @@ -223,7 +223,7 @@ $a->strings["GD graphics PHP module"] = "PHP: GD-Grafikmodul"; $a->strings["OpenSSL PHP module"] = "PHP: OpenSSL-Modul"; $a->strings["mysqli PHP module"] = "PHP: mysqli-Modul"; $a->strings["mb_string PHP module"] = "PHP: mb_string-Modul"; -$a->strings["Apace mod_rewrite module"] = "Apache: mod_rewrite-Modul"; +$a->strings["Apache mod_rewrite module"] = "Apache mod_rewrite module"; $a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Fehler: Das Apache-Modul mod-rewrite wird benötigt, es ist allerdings nicht installiert."; $a->strings["Error: libCURL PHP module required but not installed."] = "Fehler: Das libCURL PHP Modul wird benötigt ist aber nicht installiert."; $a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Fehler: Das GD-Graphikmodul für PHP mit JPEG-Unterstützung ist nicht installiert."; @@ -474,9 +474,9 @@ $a->strings["Default Post Permissions"] = "Standard-Zugriffsrechte für Beiträg $a->strings["(click to open/close)"] = "(klicke zum öffnen/schließen)"; $a->strings["Maximum private messages per day from unknown people:"] = "Maximale Anzahl von privaten Nachrichten, die dir unbekannte Personen pro Tag senden dürfen:"; $a->strings["Notification Settings"] = "Benachrichtigungseinstellungen"; -$a->strings["By default post a status message when:"] = ""; +$a->strings["By default post a status message when:"] = "Standardmäßig eine Status-Nachricht posten wenn:"; $a->strings["accepting a friend request"] = "akzeptieren einer Freundschaftsanfrage"; -$a->strings["making an interesting profile change"] = ""; +$a->strings["making an interesting profile change"] = "interessante Änderungen am Profil gemacht werden"; $a->strings["Send a notification email when:"] = "Benachrichtigungs-E-Mail senden wenn:"; $a->strings["You receive an introduction"] = "- du eine Kontaktanfrage erhältst"; $a->strings["Your introductions are confirmed"] = "- eine deiner Kontaktanfragen akzeptiert wurde"; @@ -603,6 +603,8 @@ $a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s mag %2\$ss %3\$s"; $a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s mag %2\$ss %3\$s nicht"; $a->strings["Item not found."] = "Beitrag nicht gefunden."; $a->strings["Access denied."] = "Zugriff verweigert."; +$a->strings["Photos"] = "Bilder"; +$a->strings["Files"] = "Dateien"; $a->strings["Account approved."] = "Account freigegeben."; $a->strings["Registration revoked for %s"] = "Registrierung für %s wurde zurückgezogen"; $a->strings["Please login."] = "Bitte melde dich an."; @@ -679,7 +681,7 @@ $a->strings["Site name"] = "Seitenname"; $a->strings["Banner/Logo"] = "Banner/Logo"; $a->strings["System language"] = "Systemsprache"; $a->strings["System theme"] = "Systemweites Thema"; -$a->strings["Default system theme - may be over-ridden by user profiles - change theme settings"] = ""; +$a->strings["Default system theme - may be over-ridden by user profiles - change theme settings"] = "Vorgabe für das System-Theme - kann von Benutzerprofilen überschrieben werden - Theme-Einstellungen ändern"; $a->strings["SSL link policy"] = "Regeln für SSL Links"; $a->strings["Determines whether generated links should be forced to use SSL"] = "Bestimmt, ob generierte Links SSL verwenden müssen"; $a->strings["Maximum image size"] = "Maximale Größe von Bildern"; @@ -688,7 +690,7 @@ $a->strings["Register policy"] = "Registrierungsmethode"; $a->strings["Register text"] = "Registrierungstext"; $a->strings["Will be displayed prominently on the registration page."] = "Wird gut sichtbar auf der Registrierungs-Seite angezeigt."; $a->strings["Accounts abandoned after x days"] = "Accounts gelten nach x Tagen als unbenutzt"; -$a->strings["Will not waste system resources polling external sites for abandoned accounts. Enter 0 for no time limit."] = "Verschwende keine System-Ressourcen auf das Pollen externer Seiten, wenn Accounts nicht mehr benutzt werden. 0 eingeben für kein Limit."; +$a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "Verschwende keine System-Ressourcen auf das Pollen externer Seiten, wenn Accounts nicht mehr benutzt werden. 0 eingeben für kein Limit."; $a->strings["Allowed friend domains"] = "Erlaubte Domains für Kontakte"; $a->strings["Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"] = "Liste der Domains, die für Freundschaften erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben."; $a->strings["Allowed email domains"] = "Erlaubte Domains für Emails"; @@ -779,7 +781,7 @@ $a->strings["{0} is now friends with %s"] = "{0} ist jetzt mit %s befreundet"; $a->strings["{0} posted"] = "{0} hat etwas veröffentlicht"; $a->strings["{0} tagged %s's post with #%s"] = "{0} hat %ss Beitrag mit dem Schlagwort #%s versehen"; $a->strings["{0} mentioned you in a post"] = "{0} hat dich in einem Beitrag erwähnt"; -$a->strings["Contacts who are not members of a group"] = ""; +$a->strings["Contacts who are not members of a group"] = "Kontakte, die keiner Gruppe zugewiesen sind"; $a->strings["OpenID protocol error. No ID returned."] = "OpenID Protokollfehler. Keine ID zurückgegeben."; $a->strings["Account not found and OpenID registration is not permitted on this site."] = "Account wurde nicht gefunden und OpenID Registrierung auf diesem Server nicht gestattet."; $a->strings["Login failed."] = "Annmeldung fehlgeschlagen."; @@ -801,19 +803,19 @@ $a->strings["No installed applications."] = "Keine Applikationen installiert."; $a->strings["Search This Site"] = "Diese Seite durchsuchen"; $a->strings["Profile not found."] = "Profil nicht gefunden."; $a->strings["Profile Name is required."] = "Profilname ist erforderlich."; -$a->strings["Marital Status"] = ""; -$a->strings["Romantic Partner"] = ""; -$a->strings["Work/Employment"] = ""; +$a->strings["Marital Status"] = "Familienstand"; +$a->strings["Romantic Partner"] = "Romanze"; +$a->strings["Work/Employment"] = "Arbeit / Beschäftigung"; $a->strings["Religion"] = "Religion"; $a->strings["Political Views"] = "Politische Ansichten"; $a->strings["Gender"] = "Geschlecht"; $a->strings["Sexual Preference"] = "Sexuelle Vorlieben"; $a->strings["Homepage"] = "Webseite"; $a->strings["Interests"] = "Interessen"; -$a->strings["Location"] = ""; +$a->strings["Location"] = "Wohnort"; $a->strings["Profile updated."] = "Profil aktualisiert."; -$a->strings["public profile"] = ""; -$a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = ""; +$a->strings["public profile"] = "öffentliches Profil"; +$a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s hat folgendes aktualisiert %2\$s, verändert wurde %3\$s."; $a->strings["Profile deleted."] = "Profil gelöscht."; $a->strings["Profile-"] = "Profil-"; $a->strings["New profile created."] = "Neues Profil angelegt."; @@ -941,7 +943,7 @@ $a->strings["Facebook Connector Settings"] = "Facebook-Verbindungseinstellungen" $a->strings["Facebook API Key"] = "Facebook API Schlüssel"; $a->strings["Error: it appears that you have specified the App-ID and -Secret in your .htconfig.php file. As long as they are specified there, they cannot be set using this form.

"] = "Fehler: du scheinst die App-ID und das App-Geheimnis in deiner .htconfig.php Datei angegeben zu haben. Solange sie dort festgelegt werden kannst du dieses Formular hier nicht verwenden.

"; $a->strings["Error: the given API Key seems to be incorrect (the application access token could not be retrieved)."] = "Fehler: der angegebene API Schlüssel scheint nicht korrekt zu sein (Zugriffstoken konnte nicht empfangen werden)."; -$a->strings["The given API Key seems to work correctly."] = "Der angegebene API Schlüssel scheint nicht korrekt zu funktionieren."; +$a->strings["The given API Key seems to work correctly."] = "Der angegebene API Schlüssel scheint korrekt zu funktionieren."; $a->strings["The correctness of the API Key could not be detected. Somthing strange's going on."] = "Die Echtheit des API Schlüssels konnte nicht überprüft werden. Etwas Merkwürdiges ist hier im Gange."; $a->strings["App-ID / API-Key"] = "App-ID / API-Key"; $a->strings["Application secret"] = "Anwendungs-Geheimnis"; @@ -1088,19 +1090,19 @@ $a->strings["The URL for the javascript file that should be included to use Math $a->strings["Editplain settings updated."] = "Editplain Einstellungen aktualisiert"; $a->strings["Editplain Settings"] = "Editplain Einstellungen"; $a->strings["Disable richtext status editor"] = "RichText Editor deaktivieren"; -$a->strings["generic profile image"] = ""; -$a->strings["random geometric pattern"] = ""; -$a->strings["monster face"] = ""; -$a->strings["computer generated face"] = ""; -$a->strings["retro arcade style face"] = ""; +$a->strings["generic profile image"] = "allgemeines Profilbild"; +$a->strings["random geometric pattern"] = "zufällig erzeugtes geometrisches Muster"; +$a->strings["monster face"] = "Monstergesicht"; +$a->strings["computer generated face"] = "Computergesicht"; +$a->strings["retro arcade style face"] = "Retro Arcade Design Gesicht"; $a->strings["Default avatar image"] = "Standard Profilbild "; -$a->strings["Select default avatar image if none was found at Gravatar. See README"] = ""; -$a->strings["Rating of images"] = ""; -$a->strings["Select the appropriate avatar rating for your site. See README"] = ""; -$a->strings["Gravatar settings updated."] = ""; +$a->strings["Select default avatar image if none was found at Gravatar. See README"] = "Wähle das Standardgesicht, wenn kein Bild auf Gravatar gefunden wurde. Schaue auch sonst im README nach."; +$a->strings["Rating of images"] = "Bildbewertung"; +$a->strings["Select the appropriate avatar rating for your site. See README"] = "Wähle eine angemessene Bildbewertung für Deinen Server. Schaue auch sonst im README nach."; +$a->strings["Gravatar settings updated."] = "Gravatar Einstellungen aktualisiert."; $a->strings["Your account on %s will expire in a few days."] = "Dein Konto auf %s wird in ein paar Tagen verfallen."; $a->strings["Your Friendica test account is about to expire."] = "Dein Friendica Test Konto wird bald verfallen."; -$a->strings["Hi %1\$s,\n\nYour test account on %2\$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at http://dir.friendica.com/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at http://friendica.com."] = ""; +$a->strings["Hi %1\$s,\n\nYour test account on %2\$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at http://dir.friendica.com/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at http://friendica.com."] = "Hallo %1\$s,\n\ndein Test-Konto auf %2\$s wird in weniger als fünf Tagen verfallen. Wir hoffen, dass dir dieser Testlauf gefallen hat, so dass du die Gelegenheit nutzt und dir eine feste Friendica-Site für deine integrierte Social-Network-Kommunikation suchst. Eine Liste öffentlicher Sites findest du auf http://dir.friendica.com/siteinfo. Um mehr Information darüber zu bekommen, wie man einen eigenen Friendica-Server aufsetzt, kannst du auch einen Blick auf die Friendica Projektseite werfen: http://friendica.com"; $a->strings["\"pageheader\" Settings"] = "\"pageheader\"-Einstellungen"; $a->strings["pageheader Settings saved."] = "pageheader-Einstellungen gespeichert."; $a->strings["Post to Insanejournal"] = "Auf InsaneJournal posten."; @@ -1184,18 +1186,18 @@ $a->strings["Send #tag links to Twitter"] = "#Tags nach Twitter senden"; $a->strings["Consumer key"] = "Consumer Key"; $a->strings["Consumer secret"] = "Consumer Secret"; $a->strings["IRC Settings"] = "IRC Einstellungen"; -$a->strings["Channel(s) to auto connect (comma separated)"] = ""; -$a->strings["Popular Channels (comma separated)"] = ""; +$a->strings["Channel(s) to auto connect (comma separated)"] = "mit diesen Kanälen soll man automatisch verbunden werden (Komma getrennt)"; +$a->strings["Popular Channels (comma separated)"] = "Beliebte Kanäle (mit Komma getrennt)"; $a->strings["IRC settings saved."] = "IRC Einstellungen gespeichert."; $a->strings["IRC Chatroom"] = "IRC Chatraum"; $a->strings["Popular Channels"] = "Beliebte Räume"; -$a->strings["Post to blogger"] = ""; -$a->strings["Blogger Post Settings"] = ""; -$a->strings["Enable Blogger Post Plugin"] = ""; -$a->strings["Blogger username"] = ""; -$a->strings["Blogger password"] = ""; -$a->strings["Blogger API URL"] = ""; -$a->strings["Post to Blogger by default"] = ""; +$a->strings["Post to blogger"] = "Auf Blogger posten"; +$a->strings["Blogger Post Settings"] = "Einstellungen zum posten auf Blogger"; +$a->strings["Enable Blogger Post Plugin"] = "Blogger-Post-Plugin aktivieren"; +$a->strings["Blogger username"] = "Blogger-Benutzername"; +$a->strings["Blogger password"] = "Blogger-Passwort"; +$a->strings["Blogger API URL"] = "Blogger-API-URL"; +$a->strings["Post to Blogger by default"] = "Standardmäßig auf Blogger posten"; $a->strings["Post to Posterous"] = "Nach Posterous senden"; $a->strings["Posterous Post Settings"] = "Posterous Beitrags-Einstellungen"; $a->strings["Enable Posterous Post Plugin"] = "Posterous-Plugin aktivieren"; @@ -1212,21 +1214,18 @@ $a->strings["Invite Friends"] = "Freunde einladen"; $a->strings["Community Pages"] = "Foren"; $a->strings["Help or @NewHere ?"] = "Hilfe oder @NewHere"; $a->strings["Connect Services"] = "Verbinde Dienste"; -$a->strings["PostIt to Friendica"] = "Bei Friendica posten"; -$a->strings["Post to Friendica"] = "Wenn du diesen Link"; -$a->strings[" from anywhere by bookmarking this Link."] = "zu deinen Lesezeichen hinzufügst, kannst du von überallher Links bei Friendica veröffentlichen."; $a->strings["Your posts and conversations"] = "Deine Beiträge und Unterhaltungen"; $a->strings["Your profile page"] = "Deine Profilseite"; $a->strings["Your contacts"] = "Deine Kontakte"; -$a->strings["Photos"] = "Bilder"; $a->strings["Your photos"] = "Deine Fotos"; $a->strings["Your events"] = "Deine Ereignisse"; $a->strings["Personal notes"] = "Persönliche Notizen"; $a->strings["Your personal photos"] = "Deine privaten Fotos"; $a->strings["Theme settings"] = "Themen Einstellungen"; -$a->strings["Set font-size for posts and comments"] = ""; -$a->strings["Set line-height for posts and comments"] = ""; -$a->strings["Set resolution for middle column"] = ""; +$a->strings["Set font-size for posts and comments"] = "Schriftgröße für Beiträge und Kommentare festlegen"; +$a->strings["Set line-height for posts and comments"] = "Liniengröße für Beiträge und Kommantare festlegen"; +$a->strings["Set resolution for middle column"] = "Auflösung für die Mittelspalte setzen"; +$a->strings["Set color scheme"] = "Wähle Farbschema"; $a->strings["Alignment"] = "Ausrichtung"; $a->strings["Left"] = "Links"; $a->strings["Center"] = "Mitte"; @@ -1299,8 +1298,8 @@ $a->strings["Single"] = "Single"; $a->strings["Lonely"] = "Einsam"; $a->strings["Available"] = "Verfügbar"; $a->strings["Unavailable"] = "Nicht verfügbar"; -$a->strings["Has crush"] = ""; -$a->strings["Infatuated"] = ""; +$a->strings["Has crush"] = "verknallt"; +$a->strings["Infatuated"] = "verliebt"; $a->strings["Dating"] = "Dating"; $a->strings["Unfaithful"] = "Untreu"; $a->strings["Sex Addict"] = "Sexbesessen"; @@ -1309,10 +1308,10 @@ $a->strings["Friends/Benefits"] = "Freunde/Zuwendungen"; $a->strings["Casual"] = "Casual"; $a->strings["Engaged"] = "Verlobt"; $a->strings["Married"] = "Verheiratet"; -$a->strings["Imaginarily married"] = ""; +$a->strings["Imaginarily married"] = "imaginär verheiratet"; $a->strings["Partners"] = "Partner"; $a->strings["Cohabiting"] = "zusammenlebend"; -$a->strings["Common law"] = ""; +$a->strings["Common law"] = "wilde Ehe"; $a->strings["Happy"] = "Glücklich"; $a->strings["Not looking"] = "Nicht auf der Suche"; $a->strings["Swinger"] = "Swinger"; @@ -1320,7 +1319,7 @@ $a->strings["Betrayed"] = "Betrogen"; $a->strings["Separated"] = "Getrennt"; $a->strings["Unstable"] = "Unstabil"; $a->strings["Divorced"] = "Geschieden"; -$a->strings["Imaginarily divorced"] = ""; +$a->strings["Imaginarily divorced"] = "imaginär geschieden"; $a->strings["Widowed"] = "Verwitwet"; $a->strings["Uncertain"] = "Unsicher"; $a->strings["It's complicated"] = "Ist kompliziert"; @@ -1383,7 +1382,7 @@ $a->strings["edit"] = "bearbeiten"; $a->strings["Groups"] = "Gruppen"; $a->strings["Edit group"] = "Gruppe bearbeiten"; $a->strings["Create a new group"] = "Neue Gruppe erstellen"; -$a->strings["Contacts not in any group"] = ""; +$a->strings["Contacts not in any group"] = "Kontakte in keiner Gruppe"; $a->strings["Logout"] = "Abmelden"; $a->strings["End this session"] = "Diese Sitzung beenden"; $a->strings["Status"] = "Status"; @@ -1505,7 +1504,7 @@ $a->strings["link"] = "Verweis"; $a->strings["Welcome "] = "Willkommen "; $a->strings["Please upload a profile photo."] = "Bitte lade ein Profilbild hoch."; $a->strings["Welcome back "] = "Willkommen zurück "; -$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = ""; +$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "Das Sicherheits-Merkmal war nicht korrekt. Das passiert meistens wenn das Formular vor dem Absenden zu lange geöffnet war (länger als 3 Stunden)."; $a->strings["View Status"] = "Pinnwand anschauen"; $a->strings["View Profile"] = "Profil anschauen"; $a->strings["View Photos"] = "Bilder anschauen"; -- cgit v1.2.3