From d6c8a14fb0f56825b1f5f8dc4108a89d8aa583db Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Sun, 22 Apr 2012 22:31:44 +0200 Subject: diabook-themes: fixed youtube-bug and added "Info/Impressum" to footer --- view/theme/diabook/diabook-dark/style-network-wide.css | 4 ++-- view/theme/diabook/diabook-dark/style-network.css | 4 ++-- view/theme/diabook/diabook-dark/style-profile-wide.css | 4 ++-- view/theme/diabook/diabook-dark/style-profile.css | 4 ++-- view/theme/diabook/diabook-dark/style-wide.css | 4 ++-- view/theme/diabook/diabook-dark/style.css | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) (limited to 'view/theme/diabook/diabook-dark') diff --git a/view/theme/diabook/diabook-dark/style-network-wide.css b/view/theme/diabook/diabook-dark/style-network-wide.css index 87efd8aa7..23118a2cd 100644 --- a/view/theme/diabook/diabook-dark/style-network-wide.css +++ b/view/theme/diabook/diabook-dark/style-network-wide.css @@ -121,7 +121,7 @@ display: block; width: 28px; height: 28px; background-repeat: no-repeat; } .video { background-image: url("../diabook-dark/icons/video.png"); - display: block; width: 100%; height: 28px; background-repeat: no-repeat; + display: block; width: 100%; height: 140px; background-repeat: no-repeat; } .audio2 { background-image: url("../diabook-dark/icons/audio.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; @@ -1372,7 +1372,7 @@ transition: all 0.2s ease-in-out; max-width: 690px; word-wrap: break-word; - margin-bottom: 14px; + } /*marker*/ .wall-item-container .wall-item-content img { diff --git a/view/theme/diabook/diabook-dark/style-network.css b/view/theme/diabook/diabook-dark/style-network.css index 4111bdb5b..5639bde29 100644 --- a/view/theme/diabook/diabook-dark/style-network.css +++ b/view/theme/diabook/diabook-dark/style-network.css @@ -121,7 +121,7 @@ display: block; width: 28px; height: 28px; background-repeat: no-repeat; } .video { background-image: url("../diabook-dark/icons/video.png"); - display: block; width: 100%; height: 28px; background-repeat: no-repeat; + display: block; width: 100%; height: 140px; background-repeat: no-repeat; } .audio2 { background-image: url("../diabook-dark/icons/audio.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; @@ -1351,7 +1351,7 @@ transition: all 0.2s ease-in-out; max-width: 420px; word-wrap: break-word; - margin-bottom: 14px; + } .wall-item-container .wall-item-content img { diff --git a/view/theme/diabook/diabook-dark/style-profile-wide.css b/view/theme/diabook/diabook-dark/style-profile-wide.css index 04d2a73ef..ad6b7ca21 100644 --- a/view/theme/diabook/diabook-dark/style-profile-wide.css +++ b/view/theme/diabook/diabook-dark/style-profile-wide.css @@ -121,7 +121,7 @@ display: block; width: 28px; height: 28px; background-repeat: no-repeat; } .video { background-image: url("../diabook-blue/icons/video.png"); - display: block; width: 100%; height: 28px; background-repeat: no-repeat; + display: block; width: 100%; height: 140px; background-repeat: no-repeat; } .audio2 { background-image: url("../diabook-blue/icons/audio.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; @@ -1337,7 +1337,7 @@ transition: all 0.2s ease-in-out; max-width: 690px; word-wrap: break-word; - margin-bottom: 14px; + } /*marker*/ .wall-item-container .wall-item-content img { diff --git a/view/theme/diabook/diabook-dark/style-profile.css b/view/theme/diabook/diabook-dark/style-profile.css index d4c99ac51..8824d18fe 100644 --- a/view/theme/diabook/diabook-dark/style-profile.css +++ b/view/theme/diabook/diabook-dark/style-profile.css @@ -121,7 +121,7 @@ display: block; width: 28px; height: 28px; background-repeat: no-repeat; } .video { background-image: url("../diabook-dark/icons/video.png"); - display: block; width: 100%; height: 28px; background-repeat: no-repeat; + display: block; width: 100%; height: 140px; background-repeat: no-repeat; } .audio2 { background-image: url("../diabook-dark/icons/audio.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; @@ -1329,7 +1329,7 @@ transition: all 0.2s ease-in-out; max-width: 420px; word-wrap: break-word; - margin-bottom: 14px; + } .wall-item-container .wall-item-content img { diff --git a/view/theme/diabook/diabook-dark/style-wide.css b/view/theme/diabook/diabook-dark/style-wide.css index 0a7cabcb0..73d0e4c0f 100644 --- a/view/theme/diabook/diabook-dark/style-wide.css +++ b/view/theme/diabook/diabook-dark/style-wide.css @@ -149,7 +149,7 @@ display: block; width: 28px; height: 28px; background-repeat: no-repeat; } .video { background-image: url("../../../view/theme/diabook/diabook-blue/icons/video.png"); - display: block; width: 100%; height: 28px; background-repeat: no-repeat; + display: block; width: 100%; height: 140px; background-repeat: no-repeat; } .audio2 { background-image: url("../../../view/theme/diabook/diabook-blue/icons/audio.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; @@ -1581,7 +1581,7 @@ body .pageheader{ max-width: 690px; word-wrap: break-word; - margin-bottom: 14px; + } .wall-item-container .wall-item-content img { diff --git a/view/theme/diabook/diabook-dark/style.css b/view/theme/diabook/diabook-dark/style.css index 631628a07..24de9f262 100644 --- a/view/theme/diabook/diabook-dark/style.css +++ b/view/theme/diabook/diabook-dark/style.css @@ -149,7 +149,7 @@ display: block; width: 28px; height: 28px; background-repeat: no-repeat; } .video { background-image: url("../../../view/theme/diabook/diabook-dark/icons/video.png"); - display: block; width: 100%; height: 28px; background-repeat: no-repeat; + display: block; width: 100%; height: 140px; background-repeat: no-repeat; } .audio2 { background-image: url("../../../view/theme/diabook/diabook-dark/icons/audio.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; @@ -1574,7 +1574,7 @@ body .pageheader{ max-width: 720px; word-wrap: break-word; - margin-bottom: 14px; + } .wall-item-container .wall-item-content img { -- cgit v1.2.3 From e74ae8b0310fd4b638ff5da674ba16b47fc5f294 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Sun, 22 Apr 2012 23:58:34 +0200 Subject: diabook-themes: bugfix --- view/theme/diabook/diabook-dark/admin_users.tpl | 6 +++--- view/theme/diabook/diabook-dark/nav.tpl | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'view/theme/diabook/diabook-dark') diff --git a/view/theme/diabook/diabook-dark/admin_users.tpl b/view/theme/diabook/diabook-dark/admin_users.tpl index 40f94f5fe..8aabb51ec 100644 --- a/view/theme/diabook/diabook-dark/admin_users.tpl +++ b/view/theme/diabook/diabook-dark/admin_users.tpl @@ -14,7 +14,7 @@

$title - $page

- +

$h_pending

{{ if $pending }} @@ -72,8 +72,8 @@ {{ endfor }} diff --git a/view/theme/diabook/diabook-dark/nav.tpl b/view/theme/diabook/diabook-dark/nav.tpl index 5f316bcdd..e3aabaa8b 100644 --- a/view/theme/diabook/diabook-dark/nav.tpl +++ b/view/theme/diabook/diabook-dark/nav.tpl @@ -138,7 +138,7 @@ -
+
$langselector
-- cgit v1.2.3 From c5c419a785c901b6aab4d58455fc2efcce23f3f3 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Mon, 23 Apr 2012 17:22:22 +0200 Subject: diabook-themes: small fix in nets_aside, group_aside and delete obsolete .tpls in subfolders --- view/theme/diabook/diabook-dark/admin_users.tpl | 88 ---- .../diabook/diabook-dark/ch_directory_item.tpl | 10 - view/theme/diabook/diabook-dark/comment_item.tpl | 41 -- view/theme/diabook/diabook-dark/communityhome.tpl | 86 ---- view/theme/diabook/diabook-dark/config.php | 84 ---- .../diabook/diabook-dark/contact_template.tpl | 25 -- view/theme/diabook/diabook-dark/directory_item.tpl | 11 - .../diabook/diabook-dark/generic_links_widget.tpl | 11 - view/theme/diabook/diabook-dark/group_side.tpl | 34 -- view/theme/diabook/diabook-dark/jot.tpl | 85 ---- view/theme/diabook/diabook-dark/js/README | 22 - .../diabook-dark/js/jquery.ae.image.resize.js | 69 --- .../diabook-dark/js/jquery.ae.image.resize.min.js | 1 - .../diabook-dark/js/jquery.autogrow.textarea.js | 46 -- .../theme/diabook/diabook-dark/js/jquery.cookie.js | 47 -- view/theme/diabook/diabook-dark/login.tpl | 33 -- view/theme/diabook/diabook-dark/mail_conv.tpl | 60 --- view/theme/diabook/diabook-dark/mail_display.tpl | 12 - view/theme/diabook/diabook-dark/mail_list.tpl | 8 - view/theme/diabook/diabook-dark/message_side.tpl | 10 - view/theme/diabook/diabook-dark/nav.tpl | 190 -------- view/theme/diabook/diabook-dark/nets.tpl | 15 - view/theme/diabook/diabook-dark/oembed_video.tpl | 4 - view/theme/diabook/diabook-dark/photo_item.tpl | 65 --- view/theme/diabook/diabook-dark/photo_view.tpl | 35 -- view/theme/diabook/diabook-dark/profile_side.tpl | 21 - view/theme/diabook/diabook-dark/profile_vcard.tpl | 64 --- view/theme/diabook/diabook-dark/right_aside.tpl | 20 - view/theme/diabook/diabook-dark/search_item.tpl | 100 ----- view/theme/diabook/diabook-dark/style.php | 277 ------------ view/theme/diabook/diabook-dark/theme.php | 488 --------------------- view/theme/diabook/diabook-dark/theme_settings.tpl | 10 - view/theme/diabook/diabook-dark/wall_item.tpl | 100 ----- view/theme/diabook/diabook-dark/wallwall_item.tpl | 106 ----- 34 files changed, 2278 deletions(-) delete mode 100644 view/theme/diabook/diabook-dark/admin_users.tpl delete mode 100755 view/theme/diabook/diabook-dark/ch_directory_item.tpl delete mode 100644 view/theme/diabook/diabook-dark/comment_item.tpl delete mode 100644 view/theme/diabook/diabook-dark/communityhome.tpl delete mode 100644 view/theme/diabook/diabook-dark/config.php delete mode 100644 view/theme/diabook/diabook-dark/contact_template.tpl delete mode 100755 view/theme/diabook/diabook-dark/directory_item.tpl delete mode 100644 view/theme/diabook/diabook-dark/generic_links_widget.tpl delete mode 100755 view/theme/diabook/diabook-dark/group_side.tpl delete mode 100644 view/theme/diabook/diabook-dark/jot.tpl delete mode 100644 view/theme/diabook/diabook-dark/js/README delete mode 100644 view/theme/diabook/diabook-dark/js/jquery.ae.image.resize.js delete mode 100644 view/theme/diabook/diabook-dark/js/jquery.ae.image.resize.min.js delete mode 100644 view/theme/diabook/diabook-dark/js/jquery.autogrow.textarea.js delete mode 100644 view/theme/diabook/diabook-dark/js/jquery.cookie.js delete mode 100644 view/theme/diabook/diabook-dark/login.tpl delete mode 100644 view/theme/diabook/diabook-dark/mail_conv.tpl delete mode 100644 view/theme/diabook/diabook-dark/mail_display.tpl delete mode 100644 view/theme/diabook/diabook-dark/mail_list.tpl delete mode 100644 view/theme/diabook/diabook-dark/message_side.tpl delete mode 100644 view/theme/diabook/diabook-dark/nav.tpl delete mode 100644 view/theme/diabook/diabook-dark/nets.tpl delete mode 100644 view/theme/diabook/diabook-dark/oembed_video.tpl delete mode 100644 view/theme/diabook/diabook-dark/photo_item.tpl delete mode 100644 view/theme/diabook/diabook-dark/photo_view.tpl delete mode 100644 view/theme/diabook/diabook-dark/profile_side.tpl delete mode 100644 view/theme/diabook/diabook-dark/profile_vcard.tpl delete mode 100644 view/theme/diabook/diabook-dark/right_aside.tpl delete mode 100644 view/theme/diabook/diabook-dark/search_item.tpl delete mode 100644 view/theme/diabook/diabook-dark/style.php delete mode 100644 view/theme/diabook/diabook-dark/theme.php delete mode 100644 view/theme/diabook/diabook-dark/theme_settings.tpl delete mode 100644 view/theme/diabook/diabook-dark/wall_item.tpl delete mode 100644 view/theme/diabook/diabook-dark/wallwall_item.tpl (limited to 'view/theme/diabook/diabook-dark') diff --git a/view/theme/diabook/diabook-dark/admin_users.tpl b/view/theme/diabook/diabook-dark/admin_users.tpl deleted file mode 100644 index 8aabb51ec..000000000 --- a/view/theme/diabook/diabook-dark/admin_users.tpl +++ /dev/null @@ -1,88 +0,0 @@ - -
-

$title - $page

- - - -

$h_pending

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

$no_pending

- {{ endif }} - - - - -

$h_users

- {{ if $users }} - - - - - {{ for $th_users as $th }}{{ endfor }} - - - - - - {{ for $users as $u }} - - - - - - - - - - - - {{ endfor }} - -
$th
$u.nickname$u.name$u.register_date$u.lastitem_date - - -
-
$select_all
-
- {{ else }} - NO USERS?!? - {{ endif }} -
- diff --git a/view/theme/diabook/diabook-dark/ch_directory_item.tpl b/view/theme/diabook/diabook-dark/ch_directory_item.tpl deleted file mode 100755 index db1936e4b..000000000 --- a/view/theme/diabook/diabook-dark/ch_directory_item.tpl +++ /dev/null @@ -1,10 +0,0 @@ - -
-
-
- - $alt-text - -
-
-
diff --git a/view/theme/diabook/diabook-dark/comment_item.tpl b/view/theme/diabook/diabook-dark/comment_item.tpl deleted file mode 100644 index ee4dfba45..000000000 --- a/view/theme/diabook/diabook-dark/comment_item.tpl +++ /dev/null @@ -1,41 +0,0 @@ -
-
- - - - - - - -
- $mytitle -
-
- - img - url - video - u - i - b - quote - {{ if $qcomment }} - - {{ endif }} - -
- - -
-
- -
diff --git a/view/theme/diabook/diabook-dark/communityhome.tpl b/view/theme/diabook/diabook-dark/communityhome.tpl deleted file mode 100644 index 875d83f1b..000000000 --- a/view/theme/diabook/diabook-dark/communityhome.tpl +++ /dev/null @@ -1,86 +0,0 @@ -
-{{ if $page }} -
$page
-{{ endif }} -
- -
-{{ if $lastusers_title }} -

$helpers.title.1

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

$con_services.title.1

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

$nv.title.1

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

$lastusers_title

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

$activeusers_title

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

$photos_title

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

$like_title

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

$title

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

$title

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

$title

-
$desc
- -
    -
  • - - $all
    • - {{ for $nets as $net }} -
  • - - $net.name
    • - {{ endfor }} -
-
diff --git a/view/theme/diabook/diabook-dark/oembed_video.tpl b/view/theme/diabook/diabook-dark/oembed_video.tpl deleted file mode 100644 index d6d29f724..000000000 --- a/view/theme/diabook/diabook-dark/oembed_video.tpl +++ /dev/null @@ -1,4 +0,0 @@ - - -
- diff --git a/view/theme/diabook/diabook-dark/photo_item.tpl b/view/theme/diabook/diabook-dark/photo_item.tpl deleted file mode 100644 index 5d65a89b7..000000000 --- a/view/theme/diabook/diabook-dark/photo_item.tpl +++ /dev/null @@ -1,65 +0,0 @@ -{{ if $indent }}{{ else }} -
- -
-{{ endif }} - -
-
-
-
- - $name - - menu - - -
-
-
- $name - - - {{ if $plink }}$ago{{ else }} $ago {{ endif }} - {{ if $lock }} - $lock {{ endif }} - -
-
- {{ if $title }}

$title

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

$album.1

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

-
- {{ if $profile.address }}
$profile.address
{{ endif }} - - $profile.locality{{ if $profile.locality }}, {{ endif }} - $profile.region - $profile.postal-code - - {{ if $profile.country-name }}$profile.country-name{{ endif }} -
-
- {{ endif }} - - {{ if $gender }}
$gender
$profile.gender
{{ endif }} - - {{ if $profile.pubkey }}{{ endif }} - - {{ if $marital }}
♥$marital
$profile.marital
{{ endif }} - - {{ if $homepage }}
$homepage
$profile.homepage
{{ endif }} - - {{ inc diaspora_vcard.tpl }}{{ endinc }} - - -
- -$contact_block - - diff --git a/view/theme/diabook/diabook-dark/right_aside.tpl b/view/theme/diabook/diabook-dark/right_aside.tpl deleted file mode 100644 index a65677696..000000000 --- a/view/theme/diabook/diabook-dark/right_aside.tpl +++ /dev/null @@ -1,20 +0,0 @@ - - - \ No newline at end of file diff --git a/view/theme/diabook/diabook-dark/search_item.tpl b/view/theme/diabook/diabook-dark/search_item.tpl deleted file mode 100644 index 123834064..000000000 --- a/view/theme/diabook/diabook-dark/search_item.tpl +++ /dev/null @@ -1,100 +0,0 @@ -{{ if $item.indent }}{{ else }} -
- -
-{{ endif }} -
-
-
-
- - $item.name - - menu - - -
-
-
- $item.name - - - {{ if $item.plink }}$item.ago{{ else }} $item.ago {{ endif }} - {{ if $item.lock }} - $item.lock {{ endif }} - -
-
- {{ if $item.title }}

$item.title

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

'.t("Community Pages").'

-
    '; - - $pagelist = array(); - - $contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact` - WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d - ORDER BY `name` ASC", - intval($a->user['uid']) - ); - - $pageD = array(); - - // Look if the profile is a community page - foreach($contacts as $contact) { - $pageD[] = array("url"=>$contact["url"], "name"=>$contact["name"], "id"=>$contact["id"], "micro"=>$contact['micro']); - }; - - - $contacts = $pageD; - - foreach($contacts as $contact) { - $page .= '
  • ' . $contact['url'] . ' '. - $contact["name"]."
    • "; - } - $page .= '
'; - //if (sizeof($contacts) > 0) - - $aside['$page'] = $page; - } - //END Community Page - //helpers - $helpers = array(); - $helpers['title'] = Array("", t('Help or @NewHere ?'), "", ""); - - $aside['$helpers'] = $helpers; - //end helpers - //connectable services - $con_services = array(); - $con_services['title'] = Array("", t('Connect Services'), "", ""); - - $aside['$con_services'] = $con_services; - //end connectable services - - - //get_baseurl - $url = $a->get_baseurl($ssl_state); - $aside['$url'] = $url; - - $tpl = file_get_contents(dirname(__file__).'/communityhome.tpl'); - $a->page['right_aside'] = replace_macros($tpl, $aside); - -} - - -//profile_side at networkpages -if ($a->argv[0] === "network" && local_user()){ - - // USER MENU - if(local_user()) { - - $r = q("SELECT micro FROM contact WHERE uid=%d AND self=1", intval($a->user['uid'])); - - $userinfo = array( - 'icon' => (count($r) ? $r[0]['micro']: $a->get_baseurl()."/images/default-profile-mm.jpg"), - 'name' => $a->user['username'], - ); - $ps = array('usermenu'=>array()); - $ps['usermenu']['status'] = Array('profile/' . $a->user['nickname'], t('Home'), "", t('Your posts and conversations')); - $ps['usermenu']['profile'] = Array('profile/' . $a->user['nickname']. '?tab=profile', t('Profile'), "", t('Your profile page')); - $ps['usermenu']['contacts'] = Array('contacts' , t('Contacts'), "", t('Your contacts')); - $ps['usermenu']['photos'] = Array('photos/' . $a->user['nickname'], t('Photos'), "", t('Your photos')); - $ps['usermenu']['events'] = Array('events/', t('Events'), "", t('Your events')); - $ps['usermenu']['notes'] = Array('notes/', t('Personal notes'), "", t('Your personal photos')); - $ps['usermenu']['community'] = Array('community/', t('Community'), "", ""); - $ps['usermenu']['pgroups'] = Array('http://dir.friendika.com/directory/forum', t('Community Pages'), "", ""); - - $tpl = get_markup_template('profile_side.tpl'); - - $a->page['aside'] .= replace_macros($tpl, array( - '$userinfo' => $userinfo, - '$ps' => $ps, - )); - - } - - $ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes']; - - if($ccCookie != "7") { - // COMMUNITY - diabook_dark_community_info(); - - // CUSTOM CSS - if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-dark/style-network.css";} - if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-dark/style-network-wide.css";} - } -} - - - -//right_aside at profile pages -if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){ - if($ccCookie != "7") { - // COMMUNITY - diabook_dark_community_info(); - - // CUSTOM CSS - if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-dark/style-profile.css";} - if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-dark/style-profile-wide.css";} - } -} - - - -// custom css -if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('', $cssFile); - -//load jquery.cookie.js -$cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-dark/js/jquery.cookie.js"; -$a->page['htmlhead'] .= sprintf('', $cookieJS); - -//load jquery.ae.image.resize.js -$imageresizeJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-dark/js/jquery.ae.image.resize.js"; -$a->page['htmlhead'] .= sprintf('', $imageresizeJS); - -//load jquery.autogrow-textarea.js -$autogrowJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-dark/js/jquery.autogrow.textarea.js"; -$a->page['htmlhead'] .= sprintf('', $autogrowJS); - -//js scripts -//comment-edit-wrapper on photo_view -if ($a->argv[0].$a->argv[2] === "photos"."image"){ - -$a->page['htmlhead'] .= ' -'; - -} - -$a->page['htmlhead'] .= ' - -'; - -$a->page['htmlhead'] .= ' - -'; - -$a->page['htmlhead'] .= ' - '; - -if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){ -$a->page['htmlhead'] .= ' -'; - - - if($ccCookie != "7") { -$a->page['htmlhead'] .= ' -';} - -$a->page['htmlhead'] .= ' -';} - -$a->page['htmlhead'] .= ' - - '; \ No newline at end of file diff --git a/view/theme/diabook/diabook-dark/theme_settings.tpl b/view/theme/diabook/diabook-dark/theme_settings.tpl deleted file mode 100644 index 472232cf0..000000000 --- a/view/theme/diabook/diabook-dark/theme_settings.tpl +++ /dev/null @@ -1,10 +0,0 @@ -{{inc field_select.tpl with $field=$font_size}}{{endinc}} - -{{inc field_select.tpl with $field=$line_height}}{{endinc}} - -{{inc field_select.tpl with $field=$resolution}}{{endinc}} - -
- -
- diff --git a/view/theme/diabook/diabook-dark/wall_item.tpl b/view/theme/diabook/diabook-dark/wall_item.tpl deleted file mode 100644 index 123834064..000000000 --- a/view/theme/diabook/diabook-dark/wall_item.tpl +++ /dev/null @@ -1,100 +0,0 @@ -{{ if $item.indent }}{{ else }} -
- -
-{{ endif }} -
-
-
-
- - $item.name - - menu - - -
-
-
- $item.name - - - {{ if $item.plink }}$item.ago{{ else }} $item.ago {{ endif }} - {{ if $item.lock }} - $item.lock {{ endif }} - -
-
- {{ if $item.title }}

$item.title

{{ endif }} - $item.body -
-
-
-
-
-
- {{ for $item.tags as $tag }} - $tag - {{ endfor }} -
-
-
-
- -
-
- -
- - - {{ if $item.vote }} - - - {{ endif }} - - {{ if $item.vote.share }} - - {{ endif }} - - - {{ if $item.star }} - - $item.star.do - - {{ endif }} - - {{ if $item.filer }} - - {{ endif }} - - {{ if $item.plink }}$item.plink.title{{ endif }} - - - -
- -
- - {{ if $item.drop.dropping }} - - $item.drop.delete - {{ endif }} - {{ if $item.edpost }} - - {{ endif }} -
-
$item.location 
-
-
-
-
- -
$item.dislike
-
-
- -
- $item.comment -
diff --git a/view/theme/diabook/diabook-dark/wallwall_item.tpl b/view/theme/diabook/diabook-dark/wallwall_item.tpl deleted file mode 100644 index 6a0c93f88..000000000 --- a/view/theme/diabook/diabook-dark/wallwall_item.tpl +++ /dev/null @@ -1,106 +0,0 @@ -{{ if $item.indent }}{{ else }} -
- -
-{{ endif }} -
-
-
-
- - $item.owner_name - -
-
- - $item.name - - menu - - -
-
-
- $item.name - $item.to $item.owner_name - $item.vwall -   - {{ if $item.plink }}$item.ago{{ else }} $item.ago {{ endif }} - {{ if $item.lock }} - $item.lock {{ endif }} - -
-
- {{ if $item.title }}

$item.title

{{ endif }} - $item.body -
-
-
-
-
-
- {{ for $item.tags as $tag }} - $tag - {{ endfor }} -
-
-
-
- -
-
- -
- - - {{ if $item.vote }} - - - {{ endif }} - - {{ if $item.vote.share }} - - {{ endif }} - - - {{ if $item.star }} - - $item.star.do - - {{ endif }} - - {{ if $item.filer }} - - {{ endif }} - - {{ if $item.plink }}$item.plink.title{{ endif }} - - - -
- -
- - {{ if $item.drop.dropping }} - - $item.drop.delete - {{ endif }} - {{ if $item.edpost }} - - {{ endif }} -
-
$item.location 
-
-
-
-
- -
$item.dislike
-
-
- -
- $item.comment -
\ No newline at end of file -- cgit v1.2.3 From 9443248fadb3df66efc73d34c877e289f2d3d3a8 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Tue, 24 Apr 2012 04:55:39 +0100 Subject: Improvements to diabook-dark Still a long way to go, but some icons and a few CSS fixes --- view/theme/diabook/diabook-dark/icons/contacts.png | Bin 803 -> 857 bytes view/theme/diabook/diabook-dark/icons/contacts2.png | Bin 568 -> 857 bytes view/theme/diabook/diabook-dark/icons/contacts3.png | Bin 568 -> 857 bytes view/theme/diabook/diabook-dark/icons/dislike.png | Bin 386 -> 625 bytes view/theme/diabook/diabook-dark/icons/drop.png | Bin 292 -> 563 bytes view/theme/diabook/diabook-dark/icons/file_as.png | Bin 352 -> 656 bytes view/theme/diabook/diabook-dark/icons/like.png | Bin 388 -> 636 bytes view/theme/diabook/diabook-dark/icons/link.png | Bin 365 -> 589 bytes view/theme/diabook/diabook-dark/icons/lock.png | Bin 366 -> 593 bytes view/theme/diabook/diabook-dark/icons/messages.png | Bin 901 -> 859 bytes view/theme/diabook/diabook-dark/icons/messages2.png | Bin 579 -> 859 bytes view/theme/diabook/diabook-dark/icons/messages3.png | Bin 579 -> 859 bytes .../theme/diabook/diabook-dark/icons/notifications.png | Bin 1033 -> 922 bytes .../diabook/diabook-dark/icons/notifications3.png | Bin 754 -> 922 bytes view/theme/diabook/diabook-dark/icons/notify.png | Bin 1100 -> 973 bytes view/theme/diabook/diabook-dark/icons/notify2.png | Bin 795 -> 973 bytes view/theme/diabook/diabook-dark/icons/notify3.png | Bin 795 -> 973 bytes view/theme/diabook/diabook-dark/icons/recycle.png | Bin 296 -> 722 bytes view/theme/diabook/diabook-dark/icons/tagged.png | Bin 353 -> 713 bytes view/theme/diabook/diabook-dark/icons/unstarred.png | Bin 468 -> 632 bytes view/theme/diabook/diabook-dark/style-network.css | 8 ++++---- 21 files changed, 4 insertions(+), 4 deletions(-) (limited to 'view/theme/diabook/diabook-dark') diff --git a/view/theme/diabook/diabook-dark/icons/contacts.png b/view/theme/diabook/diabook-dark/icons/contacts.png index 79f6d497c..08ea9c53e 100644 Binary files a/view/theme/diabook/diabook-dark/icons/contacts.png and b/view/theme/diabook/diabook-dark/icons/contacts.png differ diff --git a/view/theme/diabook/diabook-dark/icons/contacts2.png b/view/theme/diabook/diabook-dark/icons/contacts2.png index cd0e289a7..2c6013ced 100644 Binary files a/view/theme/diabook/diabook-dark/icons/contacts2.png and b/view/theme/diabook/diabook-dark/icons/contacts2.png differ diff --git a/view/theme/diabook/diabook-dark/icons/contacts3.png b/view/theme/diabook/diabook-dark/icons/contacts3.png index cd0e289a7..53ce579df 100644 Binary files a/view/theme/diabook/diabook-dark/icons/contacts3.png and b/view/theme/diabook/diabook-dark/icons/contacts3.png differ diff --git a/view/theme/diabook/diabook-dark/icons/dislike.png b/view/theme/diabook/diabook-dark/icons/dislike.png index 23de426c5..e9db47780 100644 Binary files a/view/theme/diabook/diabook-dark/icons/dislike.png and b/view/theme/diabook/diabook-dark/icons/dislike.png differ diff --git a/view/theme/diabook/diabook-dark/icons/drop.png b/view/theme/diabook/diabook-dark/icons/drop.png index 2abb82ef2..9799c31af 100644 Binary files a/view/theme/diabook/diabook-dark/icons/drop.png and b/view/theme/diabook/diabook-dark/icons/drop.png differ diff --git a/view/theme/diabook/diabook-dark/icons/file_as.png b/view/theme/diabook/diabook-dark/icons/file_as.png index 16713fa53..6a7343642 100644 Binary files a/view/theme/diabook/diabook-dark/icons/file_as.png and b/view/theme/diabook/diabook-dark/icons/file_as.png differ diff --git a/view/theme/diabook/diabook-dark/icons/like.png b/view/theme/diabook/diabook-dark/icons/like.png index b65edccc0..84b7db18a 100644 Binary files a/view/theme/diabook/diabook-dark/icons/like.png and b/view/theme/diabook/diabook-dark/icons/like.png differ diff --git a/view/theme/diabook/diabook-dark/icons/link.png b/view/theme/diabook/diabook-dark/icons/link.png index 0ef666a67..ac3bde7db 100644 Binary files a/view/theme/diabook/diabook-dark/icons/link.png and b/view/theme/diabook/diabook-dark/icons/link.png differ diff --git a/view/theme/diabook/diabook-dark/icons/lock.png b/view/theme/diabook/diabook-dark/icons/lock.png index 7e34bf279..641873ba2 100644 Binary files a/view/theme/diabook/diabook-dark/icons/lock.png and b/view/theme/diabook/diabook-dark/icons/lock.png differ diff --git a/view/theme/diabook/diabook-dark/icons/messages.png b/view/theme/diabook/diabook-dark/icons/messages.png index c83ba186a..3076f43cd 100644 Binary files a/view/theme/diabook/diabook-dark/icons/messages.png and b/view/theme/diabook/diabook-dark/icons/messages.png differ diff --git a/view/theme/diabook/diabook-dark/icons/messages2.png b/view/theme/diabook/diabook-dark/icons/messages2.png index e2bf7d24d..08af9f6b7 100644 Binary files a/view/theme/diabook/diabook-dark/icons/messages2.png and b/view/theme/diabook/diabook-dark/icons/messages2.png differ diff --git a/view/theme/diabook/diabook-dark/icons/messages3.png b/view/theme/diabook/diabook-dark/icons/messages3.png index e2bf7d24d..e02888c34 100644 Binary files a/view/theme/diabook/diabook-dark/icons/messages3.png and b/view/theme/diabook/diabook-dark/icons/messages3.png differ diff --git a/view/theme/diabook/diabook-dark/icons/notifications.png b/view/theme/diabook/diabook-dark/icons/notifications.png index 2bcd74927..4a0666f76 100644 Binary files a/view/theme/diabook/diabook-dark/icons/notifications.png and b/view/theme/diabook/diabook-dark/icons/notifications.png differ diff --git a/view/theme/diabook/diabook-dark/icons/notifications3.png b/view/theme/diabook/diabook-dark/icons/notifications3.png index 2b4fbb818..a75d1b71f 100644 Binary files a/view/theme/diabook/diabook-dark/icons/notifications3.png and b/view/theme/diabook/diabook-dark/icons/notifications3.png differ diff --git a/view/theme/diabook/diabook-dark/icons/notify.png b/view/theme/diabook/diabook-dark/icons/notify.png index 159cd2c59..610314941 100644 Binary files a/view/theme/diabook/diabook-dark/icons/notify.png and b/view/theme/diabook/diabook-dark/icons/notify.png differ diff --git a/view/theme/diabook/diabook-dark/icons/notify2.png b/view/theme/diabook/diabook-dark/icons/notify2.png index 9765bfd53..9092d6d6b 100644 Binary files a/view/theme/diabook/diabook-dark/icons/notify2.png and b/view/theme/diabook/diabook-dark/icons/notify2.png differ diff --git a/view/theme/diabook/diabook-dark/icons/notify3.png b/view/theme/diabook/diabook-dark/icons/notify3.png index 9765bfd53..4977b42f6 100644 Binary files a/view/theme/diabook/diabook-dark/icons/notify3.png and b/view/theme/diabook/diabook-dark/icons/notify3.png differ diff --git a/view/theme/diabook/diabook-dark/icons/recycle.png b/view/theme/diabook/diabook-dark/icons/recycle.png index c3b8d2bf4..94f5718e6 100644 Binary files a/view/theme/diabook/diabook-dark/icons/recycle.png and b/view/theme/diabook/diabook-dark/icons/recycle.png differ diff --git a/view/theme/diabook/diabook-dark/icons/tagged.png b/view/theme/diabook/diabook-dark/icons/tagged.png index 144649ef8..ee347db47 100644 Binary files a/view/theme/diabook/diabook-dark/icons/tagged.png and b/view/theme/diabook/diabook-dark/icons/tagged.png differ diff --git a/view/theme/diabook/diabook-dark/icons/unstarred.png b/view/theme/diabook/diabook-dark/icons/unstarred.png index ba3183f5c..b4c0bf679 100644 Binary files a/view/theme/diabook/diabook-dark/icons/unstarred.png and b/view/theme/diabook/diabook-dark/icons/unstarred.png differ diff --git a/view/theme/diabook/diabook-dark/style-network.css b/view/theme/diabook/diabook-dark/style-network.css index 5639bde29..d236297b7 100644 --- a/view/theme/diabook/diabook-dark/style-network.css +++ b/view/theme/diabook/diabook-dark/style-network.css @@ -387,7 +387,7 @@ margin-bottom: 1px; width: 484px; border-bottom: 1px solid #BDCDD4; - background-color: #fff; + background-color: #2e2e2f; padding: 8px; } @@ -439,7 +439,7 @@ a:hover { clear: both; } .fakelink { - color: #1872A2; + color: #88a9d2; /* color: #3e3e8c; */ text-decoration: none; cursor: pointer; @@ -493,7 +493,7 @@ code { float: right; } .tool a { - color: ##3F8FBA; + color: #3465a4; } .tool a:hover { text-decoration: none; @@ -1283,7 +1283,7 @@ transition: all 0.2s ease-in-out; padding-top: 10px; } .tread-wrapper a{ - color: #1872A2; + color: #88a9d2; } .wall-item-decor { -- cgit v1.2.3 From fade45ca767cbb8dbd73f8cf2b92a1607418bab4 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Tue, 24 Apr 2012 20:00:49 +0100 Subject: Diabook-dark, couple of new icons, and another css fix. --- view/theme/diabook/diabook-dark/icons/pencil.png | Bin 286 -> 567 bytes view/theme/diabook/diabook-dark/icons/pencil2.png | Bin 384 -> 567 bytes view/theme/diabook/diabook-dark/icons/scroll_top.png | Bin 296 -> 1062 bytes view/theme/diabook/diabook-dark/style-network.css | 2 +- 4 files changed, 1 insertion(+), 1 deletion(-) (limited to 'view/theme/diabook/diabook-dark') diff --git a/view/theme/diabook/diabook-dark/icons/pencil.png b/view/theme/diabook/diabook-dark/icons/pencil.png index 772e49b17..cc316a7de 100644 Binary files a/view/theme/diabook/diabook-dark/icons/pencil.png and b/view/theme/diabook/diabook-dark/icons/pencil.png differ diff --git a/view/theme/diabook/diabook-dark/icons/pencil2.png b/view/theme/diabook/diabook-dark/icons/pencil2.png index 3b47d1864..791433db7 100644 Binary files a/view/theme/diabook/diabook-dark/icons/pencil2.png and b/view/theme/diabook/diabook-dark/icons/pencil2.png differ diff --git a/view/theme/diabook/diabook-dark/icons/scroll_top.png b/view/theme/diabook/diabook-dark/icons/scroll_top.png index 0e7f7ae6a..fe20d1c4c 100644 Binary files a/view/theme/diabook/diabook-dark/icons/scroll_top.png and b/view/theme/diabook/diabook-dark/icons/scroll_top.png differ diff --git a/view/theme/diabook/diabook-dark/style-network.css b/view/theme/diabook/diabook-dark/style-network.css index d236297b7..7ddedb320 100644 --- a/view/theme/diabook/diabook-dark/style-network.css +++ b/view/theme/diabook/diabook-dark/style-network.css @@ -493,7 +493,7 @@ code { float: right; } .tool a { - color: #3465a4; + color: #88a9d2; } .tool a:hover { text-decoration: none; -- cgit v1.2.3 From a28fea987ef35220c654ebcba675efcc0f54264b Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Tue, 24 Apr 2012 20:07:08 +0100 Subject: Diabook-dark css fix --- view/theme/diabook/diabook-dark/style-profile.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'view/theme/diabook/diabook-dark') diff --git a/view/theme/diabook/diabook-dark/style-profile.css b/view/theme/diabook/diabook-dark/style-profile.css index 8824d18fe..b052b77ff 100644 --- a/view/theme/diabook/diabook-dark/style-profile.css +++ b/view/theme/diabook/diabook-dark/style-profile.css @@ -440,7 +440,7 @@ a:hover { clear: both; } .fakelink { - color: #1872A2; + color: #88a9d2; /* color: #3e3e8c; */ text-decoration: none; cursor: pointer; @@ -493,7 +493,7 @@ code { float: right; } .tool a { - color: ##3F8FBA; + color: ##3465a4; } .tool a:hover { text-decoration: none; @@ -1261,7 +1261,7 @@ transition: all 0.2s ease-in-out; padding-top: 10px; } .tread-wrapper a{ - color: #1872A2; + color: #88a9d2; } .wall-item-decor { -- cgit v1.2.3 From 20a9cdfc90dca68d431eb648018cd95617747b23 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Wed, 25 Apr 2012 23:40:40 +0100 Subject: Diabook-dark more CSS fixes. Slowly getting there. --- view/theme/diabook/diabook-dark/style-network.css | 8 ++++---- view/theme/diabook/diabook-dark/style.css | 13 ++++++++++++- 2 files changed, 16 insertions(+), 5 deletions(-) (limited to 'view/theme/diabook/diabook-dark') diff --git a/view/theme/diabook/diabook-dark/style-network.css b/view/theme/diabook/diabook-dark/style-network.css index 7ddedb320..6ff44748f 100644 --- a/view/theme/diabook/diabook-dark/style-network.css +++ b/view/theme/diabook/diabook-dark/style-network.css @@ -540,7 +540,7 @@ header #banner a:active, header #banner a:visited, header #banner a:link, header #banner a:hover { - color: #2e2f2e; + color: #eec; text-decoration: none; outline: none; vertical-align: middle; @@ -776,7 +776,7 @@ nav #nav-apps-link.selected { } .notify-seen { - background: none repeat scroll 0 0 #DDDDDD; + background: none repeat scroll 0 0 #666; } ul.menu-popup { @@ -966,7 +966,7 @@ aside { vertical-align: top; width: 160px; padding: 0px 10px 0px 10px; - border-right: 1px solid #D2D2D2; + border-right: 1px solid #eec; float: left; /* background: #F1F1F1; */ } @@ -1241,7 +1241,7 @@ right_aside { /* background: #F1F1F1; */ } -right_aside a{color: #1872A2;} +right_aside a{color: #88a9d2;} right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; margin-bottom: 0px; margin-top:30px;} right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; } diff --git a/view/theme/diabook/diabook-dark/style.css b/view/theme/diabook/diabook-dark/style.css index 24de9f262..638aeb455 100644 --- a/view/theme/diabook/diabook-dark/style.css +++ b/view/theme/diabook/diabook-dark/style.css @@ -1201,8 +1201,19 @@ aside #side-peoplefind-url { margin-right: 20px; } #login-submit-wrapper{ -margin-bottom: 15px; + padding-top: 120px; + margin-bottom: 12px; + } + +aside #login-submit-button{ + margin-left: 0px!important; + + } + +aside #login-extra-links{ + padding-top: 0px!important; } + .group_selected { background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center; float: left; -- cgit v1.2.3