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 @@
-
-
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 @@
-
-
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 @@
-
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 }}
-
$con_services.title.1
-
-{{ 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 @@
-
-
-
-
-
-
-
- {{ if $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 @@
-
-
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 @@
-
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 @@
-
-
-
-
- {{ 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 @@
-
-
- {{ 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.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 @@
-
-
-{{ 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 @@
-
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
- $banner
-
-
-
-
-
-
-
- {{ if $nav.network }}
-
- {{ endif }}
-
- {{ if $nav.contacts }}
-
-
- {{ endif }}
-
- {{ if $nav.messages }}
-
- {{ endif }}
-
- {{ if $nav.notifications }}
-
- {{ endif }}
-
- {{ if $nav.search}}
-
-
-
-
-
- {{ endif }}
-
-
-
-
-
-
- {{ if $nav.directory }}
-
- {{ endif }}
-
- {{ if $nav.apps }}
-
- {{ endif }}
-
- {{ if $nav.home }}
-
- {{ endif }}
-
- {{ if $userinfo }}
-
- {{ endif }}
-
- {{ if $nav.login }}
-
- {{ endif }}
-
-
-
-
-
-
-
-
-
-
-
-$langselector
-
-
-
-
-
-
-
-
-
-{#
-
-{{ if $nav.logout }}$nav.logout.1 {{ endif }}
-{{ if $nav.login }}$nav.login.1 {{ 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 }}
-
-
-
-
-$banner
-#}
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 @@
-
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
-
-
- {{ if $plink }}$ago {{ else }} $ago {{ endif }}
- {{ if $lock }} - $lock {{ endif }}
-
-
-
- {{ if $title }}
{{ endif }}
- $body
-
-
-
-
-
-
- {{ for $tags as $tag }}
- $tag
- {{ endfor }}
-
-
-
-
-
-
-
-
-
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 @@
-
-
-
-
-
-
- {{ 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 @@
-
-
-
-
-
-
-
- {{ 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 }}
$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
-
-
- {{ if $item.plink }}$item.ago {{ else }} $item.ago {{ endif }}
- {{ if $item.lock }} - $item.lock {{ endif }}
-
-
-
- {{ if $item.title }}
{{ endif }}
- $item.body
-
-
-
-
-
-
- {{ for $item.tags as $tag }}
- $tag
- {{ endfor }}
-
-
-
-
-
-
-
-
-
-
-
- {{ if $item.vote }}
-
$item.vote.like.1
-
- {{ endif }}
-
- {{ if $item.vote.share }}
-
- {{ endif }}
-
-
- {{ if $item.star }}
-
-
-
- {{ endif }}
-
- {{ if $item.filer }}
-
- {{ endif }}
-
- {{ if $item.plink }}
$item.plink.title {{ endif }}
-
-
-
-
-
-
-
$item.location
-
-
-
-
-
$item.like
-
$item.dislike
-
-
-
-
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 = '';
- //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
-
-
- {{ if $item.plink }}$item.ago {{ else }} $item.ago {{ endif }}
- {{ if $item.lock }} - $item.lock {{ endif }}
-
-
-
- {{ if $item.title }}
{{ endif }}
- $item.body
-
-
-
-
-
-
- {{ for $item.tags as $tag }}
- $tag
- {{ endfor }}
-
-
-
-
-
-
-
-
-
-
-
- {{ if $item.vote }}
-
$item.vote.like.1
-
- {{ endif }}
-
- {{ if $item.vote.share }}
-
- {{ endif }}
-
-
- {{ if $item.star }}
-
-
-
- {{ endif }}
-
- {{ if $item.filer }}
-
- {{ endif }}
-
- {{ if $item.plink }}
$item.plink.title {{ endif }}
-
-
-
-
-
-
-
$item.location
-
-
-
-
-
$item.like
-
$item.dislike
-
-
-
-
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 }}
-
-
-
-
-
- {{ if $item.title }}
{{ endif }}
- $item.body
-
-
-
-
-
-
- {{ for $item.tags as $tag }}
- $tag
- {{ endfor }}
-
-
-
-
-
-
-
-
-
-
-
- {{ if $item.vote }}
-
$item.vote.like.1
-
- {{ endif }}
-
- {{ if $item.vote.share }}
-
- {{ endif }}
-
-
- {{ if $item.star }}
-
-
-
- {{ endif }}
-
- {{ if $item.filer }}
-
- {{ endif }}
-
- {{ if $item.plink }}
$item.plink.title {{ endif }}
-
-
-
-
-
-
-
$item.location
-
-
-
-
-
$item.like
-
$item.dislike
-
-
-
-
\ 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 @@
-
-
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 @@
-
-
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 @@
-
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 }}
-
$con_services.title.1
-
-{{ 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 @@
-
-
-
-
-
-
-
- {{ if $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 @@
-
-
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 @@
-
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 @@
-
-
-
-
- {{ 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 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ if $content }}$content{{ else }}$share{{ endif }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
$preview
-
-
-
-
-
- $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.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 @@
-
-
-{{ 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 @@
-
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
- $banner
-
-
-
-
-
-
-
- {{ if $nav.network }}
-
- {{ endif }}
-
- {{ if $nav.contacts }}
-
-
- {{ endif }}
-
- {{ if $nav.messages }}
-
- {{ endif }}
-
- {{ if $nav.notifications }}
-
- {{ endif }}
-
- {{ if $nav.search}}
-
-
-
-
-
- {{ endif }}
-
-
-
-
-
-
- {{ if $nav.directory }}
-
- {{ endif }}
-
- {{ if $nav.apps }}
-
- {{ endif }}
-
- {{ if $nav.home }}
-
- {{ endif }}
-
- {{ if $userinfo }}
-
- {{ endif }}
-
- {{ if $nav.login }}
-
- {{ endif }}
-
-
-
-
-
-
-
-
-
-
-
-$langselector
-
-
-
-
-
-
-
-
-
-{#
-
-{{ if $nav.logout }}$nav.logout.1 {{ endif }}
-{{ if $nav.login }}$nav.login.1 {{ 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 }}
-
-
-
-
-$banner
-#}
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 @@
-
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
-
-
- {{ if $plink }}$ago {{ else }} $ago {{ endif }}
- {{ if $lock }} - $lock {{ endif }}
-
-
-
- {{ if $title }}
{{ endif }}
- $body
-
-
-
-
-
-
- {{ for $tags as $tag }}
- $tag
- {{ endfor }}
-
-
-
-
-
-
-
-
-
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 @@
-
-
-
-
-
-
- {{ 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 @@
-
-
-
-
-
-
-
- {{ 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 }}
$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
-
-
- {{ if $item.plink }}$item.ago {{ else }} $item.ago {{ endif }}
- {{ if $item.lock }} - $item.lock {{ endif }}
-
-
-
- {{ if $item.title }}
{{ endif }}
- $item.body
-
-
-
-
-
-
- {{ for $item.tags as $tag }}
- $tag
- {{ endfor }}
-
-
-
-
-
-
-
-
-
-
-
- {{ if $item.vote }}
-
$item.vote.like.1
-
- {{ endif }}
-
- {{ if $item.vote.share }}
-
- {{ endif }}
-
-
- {{ if $item.star }}
-
-
-
- {{ endif }}
-
- {{ if $item.filer }}
-
- {{ endif }}
-
- {{ if $item.plink }}
$item.plink.title {{ endif }}
-
-
-
-
-
-
-
$item.location
-
-
-
-
-
$item.like
-
$item.dislike
-
-
-
-
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 = '';
- //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
-
-
- {{ if $item.plink }}$item.ago {{ else }} $item.ago {{ endif }}
- {{ if $item.lock }} - $item.lock {{ endif }}
-
-
-
- {{ if $item.title }}
{{ endif }}
- $item.body
-
-
-
-
-
-
- {{ for $item.tags as $tag }}
- $tag
- {{ endfor }}
-
-
-
-
-
-
-
-
-
-
-
- {{ if $item.vote }}
-
$item.vote.like.1
-
- {{ endif }}
-
- {{ if $item.vote.share }}
-
- {{ endif }}
-
-
- {{ if $item.star }}
-
-
-
- {{ endif }}
-
- {{ if $item.filer }}
-
- {{ endif }}
-
- {{ if $item.plink }}
$item.plink.title {{ endif }}
-
-
-
-
-
-
-
$item.location
-
-
-
-
-
$item.like
-
$item.dislike
-
-
-
-
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 }}
-
-
-
-
-
- {{ if $item.title }}
{{ endif }}
- $item.body
-
-
-
-
-
-
- {{ for $item.tags as $tag }}
- $tag
- {{ endfor }}
-
-
-
-
-
-
-
-
-
-
-
- {{ if $item.vote }}
-
$item.vote.like.1
-
- {{ endif }}
-
- {{ if $item.vote.share }}
-
- {{ endif }}
-
-
- {{ if $item.star }}
-
-
-
- {{ endif }}
-
- {{ if $item.filer }}
-
- {{ endif }}
-
- {{ if $item.plink }}
$item.plink.title {{ endif }}
-
-
-
-
-
-
-
$item.location
-
-
-
-
-
$item.like
-
$item.dislike
-
-
-
-
\ 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 @@
-
-
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 @@
-
-
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 @@
-
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 }}
-
$con_services.title.1
-
-{{ 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 @@
-
-
-
-
-
-
-
- {{ if $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 @@
-
-
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 @@
-
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 @@
-
-
-
-
- {{ 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 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ if $content }}$content{{ else }}$share{{ endif }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
$preview
-
-
-
-
-
- $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.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 @@
-
-
-{{ 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 @@
-
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
- $banner
-
-
-
-
-
-
-
- {{ if $nav.network }}
-
- {{ endif }}
-
- {{ if $nav.contacts }}
-
-
- {{ endif }}
-
- {{ if $nav.messages }}
-
- {{ endif }}
-
- {{ if $nav.notifications }}
-
- {{ endif }}
-
- {{ if $nav.search}}
-
-
-
-
-
- {{ endif }}
-
-
-
-
-
-
- {{ if $nav.directory }}
-
- {{ endif }}
-
- {{ if $nav.apps }}
-
- {{ endif }}
-
- {{ if $nav.home }}
-
- {{ endif }}
-
- {{ if $userinfo }}
-
- {{ endif }}
-
- {{ if $nav.login }}
-
- {{ endif }}
-
-
-
-
-
-
-
-
-
-
-
-$langselector
-
-
-
-
-
-
-
-
-
-{#
-
-{{ if $nav.logout }}$nav.logout.1 {{ endif }}
-{{ if $nav.login }}$nav.login.1 {{ 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 }}
-
-
-
-
-$banner
-#}
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 @@
-
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
-
-
- {{ if $plink }}$ago {{ else }} $ago {{ endif }}
- {{ if $lock }} - $lock {{ endif }}
-
-
-
- {{ if $title }}
{{ endif }}
- $body
-
-
-
-
-
-
- {{ for $tags as $tag }}
- $tag
- {{ endfor }}
-
-
-
-
-
-
-
-
-
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 @@
-
-
-
-
-
-
- {{ 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 @@
-
-
-
-
-
-
-
- {{ 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 }}
$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
-
-
- {{ if $item.plink }}$item.ago {{ else }} $item.ago {{ endif }}
- {{ if $item.lock }} - $item.lock {{ endif }}
-
-
-
- {{ if $item.title }}
{{ endif }}
- $item.body
-
-
-
-
-
-
- {{ for $item.tags as $tag }}
- $tag
- {{ endfor }}
-
-
-
-
-
-
-
-
-
-
-
- {{ if $item.vote }}
-
$item.vote.like.1
-
- {{ endif }}
-
- {{ if $item.vote.share }}
-
- {{ endif }}
-
-
- {{ if $item.star }}
-
-
-
- {{ endif }}
-
- {{ if $item.filer }}
-
- {{ endif }}
-
- {{ if $item.plink }}
$item.plink.title {{ endif }}
-
-
-
-
-
-
-
$item.location
-
-
-
-
-
$item.like
-
$item.dislike
-
-
-
-
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 = '';
- //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
-
-
- {{ if $item.plink }}$item.ago {{ else }} $item.ago {{ endif }}
- {{ if $item.lock }} - $item.lock {{ endif }}
-
-
-
- {{ if $item.title }}
{{ endif }}
- $item.body
-
-
-
-
-
-
- {{ for $item.tags as $tag }}
- $tag
- {{ endfor }}
-
-
-
-
-
-
-
-
-
-
-
- {{ if $item.vote }}
-
$item.vote.like.1
-
- {{ endif }}
-
- {{ if $item.vote.share }}
-
- {{ endif }}
-
-
- {{ if $item.star }}
-
-
-
- {{ endif }}
-
- {{ if $item.filer }}
-
- {{ endif }}
-
- {{ if $item.plink }}
$item.plink.title {{ endif }}
-
-
-
-
-
-
-
$item.location
-
-
-
-
-
$item.like
-
$item.dislike
-
-
-
-
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 }}
-
-
-
-
-
- {{ if $item.title }}
{{ endif }}
- $item.body
-
-
-
-
-
-
- {{ for $item.tags as $tag }}
- $tag
- {{ endfor }}
-
-
-
-
-
-
-
-
-
-
-
- {{ if $item.vote }}
-
$item.vote.like.1
-
- {{ endif }}
-
- {{ if $item.vote.share }}
-
- {{ endif }}
-
-
- {{ if $item.star }}
-
-
-
- {{ endif }}
-
- {{ if $item.filer }}
-
- {{ endif }}
-
- {{ if $item.plink }}
$item.plink.title {{ endif }}
-
-
-
-
-
-
-
$item.location
-
-
-
-
-
$item.like
-
$item.dislike
-
-
-
-
\ 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 @@
-
-
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 @@
-
-
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 @@
-
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 }}
-
$con_services.title.1
-
-{{ 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 @@
-
-
-
-
-
-
-
- {{ if $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 @@
-
-
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 @@
-
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 @@
-
-
-
-
- {{ 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 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ if $content }}$content{{ else }}$share{{ endif }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
$preview
-
-
-
-
-
- $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.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 @@
-
-
-{{ 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 @@
-
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
- $banner
-
-
-
-
-
-
-
- {{ if $nav.network }}
-
- {{ endif }}
-
- {{ if $nav.contacts }}
-
-
- {{ endif }}
-
- {{ if $nav.messages }}
-
- {{ endif }}
-
- {{ if $nav.notifications }}
-
- {{ endif }}
-
- {{ if $nav.search}}
-
-
-
-
-
- {{ endif }}
-
-
-
-
-
-
- {{ if $nav.directory }}
-
- {{ endif }}
-
- {{ if $nav.apps }}
-
- {{ endif }}
-
- {{ if $nav.home }}
-
- {{ endif }}
-
- {{ if $userinfo }}
-
- {{ endif }}
-
- {{ if $nav.login }}
-
- {{ endif }}
-
-
-
-
-
-
-
-
-
-
-
-$langselector
-
-
-
-
-
-
-
-
-
-{#
-
-{{ if $nav.logout }}$nav.logout.1 {{ endif }}
-{{ if $nav.login }}$nav.login.1 {{ 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 }}
-
-
-
-
-$banner
-#}
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 @@
-
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
-
-
- {{ if $plink }}$ago {{ else }} $ago {{ endif }}
- {{ if $lock }} - $lock {{ endif }}
-
-
-
- {{ if $title }}
{{ endif }}
- $body
-
-
-
-
-
-
- {{ for $tags as $tag }}
- $tag
- {{ endfor }}
-
-
-
-
-
-
-
-
-
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 @@
-
-
-
-
-
-
- {{ 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 @@
-
-
-
-
-
-
-
- {{ 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 }}
$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
-
-
- {{ if $item.plink }}$item.ago {{ else }} $item.ago {{ endif }}
- {{ if $item.lock }} - $item.lock {{ endif }}
-
-
-
- {{ if $item.title }}
{{ endif }}
- $item.body
-
-
-
-
-
-
- {{ for $item.tags as $tag }}
- $tag
- {{ endfor }}
-
-
-
-
-
-
-
-
-
-
-
- {{ if $item.vote }}
-
$item.vote.like.1
-
- {{ endif }}
-
- {{ if $item.vote.share }}
-
- {{ endif }}
-
-
- {{ if $item.star }}
-
-
-
- {{ endif }}
-
- {{ if $item.filer }}
-
- {{ endif }}
-
- {{ if $item.plink }}
$item.plink.title {{ endif }}
-
-
-
-
-
-
-
$item.location
-
-
-
-
-
$item.like
-
$item.dislike
-
-
-
-
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 = '';
- //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
-
-
- {{ if $item.plink }}$item.ago {{ else }} $item.ago {{ endif }}
- {{ if $item.lock }} - $item.lock {{ endif }}
-
-
-
- {{ if $item.title }}
{{ endif }}
- $item.body
-
-
-
-
-
-
- {{ for $item.tags as $tag }}
- $tag
- {{ endfor }}
-
-
-
-
-
-
-
-
-
-
-
- {{ if $item.vote }}
-
$item.vote.like.1
-
- {{ endif }}
-
- {{ if $item.vote.share }}
-
- {{ endif }}
-
-
- {{ if $item.star }}
-
-
-
- {{ endif }}
-
- {{ if $item.filer }}
-
- {{ endif }}
-
- {{ if $item.plink }}
$item.plink.title {{ endif }}
-
-
-
-
-
-
-
$item.location
-
-
-
-
-
$item.like
-
$item.dislike
-
-
-
-
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 }}
-
-
-
-
-
- {{ if $item.title }}
{{ endif }}
- $item.body
-
-
-
-
-
-
- {{ for $item.tags as $tag }}
- $tag
- {{ endfor }}
-
-
-
-
-
-
-
-
-
-
-
- {{ if $item.vote }}
-
$item.vote.like.1
-
- {{ endif }}
-
- {{ if $item.vote.share }}
-
- {{ endif }}
-
-
- {{ if $item.star }}
-
-
-
- {{ endif }}
-
- {{ if $item.filer }}
-
- {{ endif }}
-
- {{ if $item.plink }}
$item.plink.title {{ endif }}
-
-
-
-
-
-
-
$item.location
-
-
-
-
-
$item.like
-
$item.dislike
-
-
-
-
\ 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 @@
-
-
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 @@
-
-
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 @@
-
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 }}
-
$con_services.title.1
-
-{{ 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 @@
-
-
-
-
-
-
-
- {{ if $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 @@
-
-
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 @@
-
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 @@
-
-
-
-
- {{ 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 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ if $content }}$content{{ else }}$share{{ endif }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
$preview
-
-
-
-
-
- $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.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 @@
-
-
-{{ 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 @@
-
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
- $banner
-
-
-
-
-
-
-
- {{ if $nav.network }}
-
- {{ endif }}
-
- {{ if $nav.contacts }}
-
-
- {{ endif }}
-
- {{ if $nav.messages }}
-
- {{ endif }}
-
- {{ if $nav.notifications }}
-
- {{ endif }}
-
- {{ if $nav.search}}
-
-
-
-
-
- {{ endif }}
-
-
-
-
-
-
- {{ if $nav.directory }}
-
- {{ endif }}
-
- {{ if $nav.apps }}
-
- {{ endif }}
-
- {{ if $nav.home }}
-
- {{ endif }}
-
- {{ if $userinfo }}
-
- {{ endif }}
-
- {{ if $nav.login }}
-
- {{ endif }}
-
-
-
-
-
-
-
-
-
-
-
-$langselector
-
-
-
-
-
-
-
-
-
-{#
-
-{{ if $nav.logout }}$nav.logout.1 {{ endif }}
-{{ if $nav.login }}$nav.login.1 {{ 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 }}
-
-
-
-
-$banner
-#}
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 @@
-
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
-
-
- {{ if $plink }}$ago {{ else }} $ago {{ endif }}
- {{ if $lock }} - $lock {{ endif }}
-
-
-
- {{ if $title }}
{{ endif }}
- $body
-
-
-
-
-
-
- {{ for $tags as $tag }}
- $tag
- {{ endfor }}
-
-
-
-
-
-
-
-
-
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 @@
-
-
-
-
-
-
- {{ 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 @@
-
-
-
-
-
-
-
- {{ 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 }}
$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
-
-
- {{ if $item.plink }}$item.ago {{ else }} $item.ago {{ endif }}
- {{ if $item.lock }} - $item.lock {{ endif }}
-
-
-
- {{ if $item.title }}
{{ endif }}
- $item.body
-
-
-
-
-
-
- {{ for $item.tags as $tag }}
- $tag
- {{ endfor }}
-
-
-
-
-
-
-
-
-
-
-
- {{ if $item.vote }}
-
$item.vote.like.1
-
- {{ endif }}
-
- {{ if $item.vote.share }}
-
- {{ endif }}
-
-
- {{ if $item.star }}
-
-
-
- {{ endif }}
-
- {{ if $item.filer }}
-
- {{ endif }}
-
- {{ if $item.plink }}
$item.plink.title {{ endif }}
-
-
-
-
-
-
-
$item.location
-
-
-
-
-
$item.like
-
$item.dislike
-
-
-
-
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 = '';
- //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
-
-
- {{ if $item.plink }}$item.ago {{ else }} $item.ago {{ endif }}
- {{ if $item.lock }} - $item.lock {{ endif }}
-
-
-
- {{ if $item.title }}
{{ endif }}
- $item.body
-
-
-
-
-
-
- {{ for $item.tags as $tag }}
- $tag
- {{ endfor }}
-
-
-
-
-
-
-
-
-
-
-
- {{ if $item.vote }}
-
$item.vote.like.1
-
- {{ endif }}
-
- {{ if $item.vote.share }}
-
- {{ endif }}
-
-
- {{ if $item.star }}
-
-
-
- {{ endif }}
-
- {{ if $item.filer }}
-
- {{ endif }}
-
- {{ if $item.plink }}
$item.plink.title {{ endif }}
-
-
-
-
-
-
-
$item.location
-
-
-
-
-
$item.like
-
$item.dislike
-
-
-
-
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 }}
-
-
-
-
-
- {{ if $item.title }}
{{ endif }}
- $item.body
-
-
-
-
-
-
- {{ for $item.tags as $tag }}
- $tag
- {{ endfor }}
-
-
-
-
-
-
-
-
-
-
-
- {{ if $item.vote }}
-
$item.vote.like.1
-
- {{ endif }}
-
- {{ if $item.vote.share }}
-
- {{ endif }}
-
-
- {{ if $item.star }}
-
-
-
- {{ endif }}
-
- {{ if $item.filer }}
-
- {{ endif }}
-
- {{ if $item.plink }}
$item.plink.title {{ endif }}
-
-
-
-
-
-
-
$item.location
-
-
-
-
-
$item.like
-
$item.dislike
-
-
-
-
\ 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 @@
-
-
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 @@
-
-
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 @@
-
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 }}
-
$con_services.title.1
-
-{{ 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 @@
-
-
-
-
-
-
-
- {{ if $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 @@
-
-
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 @@
-
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 @@
-
-
-
-
- {{ 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 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ if $content }}$content{{ else }}$share{{ endif }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
$preview
-
-
-
-
-
- $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.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 @@
-
-
-{{ 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 @@
-
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
- $banner
-
-
-
-
-
-
-
- {{ if $nav.network }}
-
- {{ endif }}
-
- {{ if $nav.contacts }}
-
-
- {{ endif }}
-
- {{ if $nav.messages }}
-
- {{ endif }}
-
- {{ if $nav.notifications }}
-
- {{ endif }}
-
- {{ if $nav.search}}
-
-
-
-
-
- {{ endif }}
-
-
-
-
-
-
- {{ if $nav.directory }}
-
- {{ endif }}
-
- {{ if $nav.apps }}
-
- {{ endif }}
-
- {{ if $nav.home }}
-
- {{ endif }}
-
- {{ if $userinfo }}
-
- {{ endif }}
-
- {{ if $nav.login }}
-
- {{ endif }}
-
-
-
-
-
-
-
-
-
-
-
-$langselector
-
-
-
-
-
-
-
-
-
-{#
-
-{{ if $nav.logout }}$nav.logout.1 {{ endif }}
-{{ if $nav.login }}$nav.login.1 {{ 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 }}
-
-
-
-
-$banner
-#}
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 @@
-
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
-
-
- {{ if $plink }}$ago {{ else }} $ago {{ endif }}
- {{ if $lock }} - $lock {{ endif }}
-
-
-
- {{ if $title }}
{{ endif }}
- $body
-
-
-
-
-
-
- {{ for $tags as $tag }}
- $tag
- {{ endfor }}
-
-
-
-
-
-
-
-
-
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 @@
-
-
-
-
-
-
- {{ 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 @@
-
-
-
-
-
-
-
- {{ 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 }}
$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
-
-
- {{ if $item.plink }}$item.ago {{ else }} $item.ago {{ endif }}
- {{ if $item.lock }} - $item.lock {{ endif }}
-
-
-
- {{ if $item.title }}
{{ endif }}
- $item.body
-
-
-
-
-
-
- {{ for $item.tags as $tag }}
- $tag
- {{ endfor }}
-
-
-
-
-
-
-
-
-
-
-
- {{ if $item.vote }}
-
$item.vote.like.1
-
- {{ endif }}
-
- {{ if $item.vote.share }}
-
- {{ endif }}
-
-
- {{ if $item.star }}
-
-
-
- {{ endif }}
-
- {{ if $item.filer }}
-
- {{ endif }}
-
- {{ if $item.plink }}
$item.plink.title {{ endif }}
-
-
-
-
-
-
-
$item.location
-
-
-
-
-
$item.like
-
$item.dislike
-
-
-
-
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 = '';
- //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
-
-
- {{ if $item.plink }}$item.ago {{ else }} $item.ago {{ endif }}
- {{ if $item.lock }} - $item.lock {{ endif }}
-
-
-
- {{ if $item.title }}
{{ endif }}
- $item.body
-
-
-
-
-
-
- {{ for $item.tags as $tag }}
- $tag
- {{ endfor }}
-
-
-
-
-
-
-
-
-
-
-
- {{ if $item.vote }}
-
$item.vote.like.1
-
- {{ endif }}
-
- {{ if $item.vote.share }}
-
- {{ endif }}
-
-
- {{ if $item.star }}
-
-
-
- {{ endif }}
-
- {{ if $item.filer }}
-
- {{ endif }}
-
- {{ if $item.plink }}
$item.plink.title {{ endif }}
-
-
-
-
-
-
-
$item.location
-
-
-
-
-
$item.like
-
$item.dislike
-
-
-
-
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 }}
-
-
-
-
-
- {{ if $item.title }}
{{ endif }}
- $item.body
-
-
-
-
-
-
- {{ for $item.tags as $tag }}
- $tag
- {{ endfor }}
-
-
-
-
-
-
-
-
-
-
-
- {{ if $item.vote }}
-
$item.vote.like.1
-
- {{ endif }}
-
- {{ if $item.vote.share }}
-
- {{ endif }}
-
-
- {{ if $item.star }}
-
-
-
- {{ endif }}
-
- {{ if $item.filer }}
-
- {{ endif }}
-
- {{ if $item.plink }}
$item.plink.title {{ endif }}
-
-
-
-
-
-
-
$item.location
-
-
-
-
-
$item.like
-
$item.dislike
-
-
-
-
\ 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 @@