From 1c0700f371f96466be113a4184d7ab9acd39e22f Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Sat, 7 Apr 2012 16:39:43 +0200 Subject: [PATCH] changelog 1.014 : image-rezise via jquery-plugin in stream comments under uploaded pictues add Diabook's version-number in head-section css-fixes: tabs youtube-iframe title-bar in jot-wrapper blockquote & .oembed --- view/theme/diabook-aerith/js/README | 22 +++ .../js/jquery.ae.image.resize.js | 69 +++++++++ .../js/jquery.ae.image.resize.min.js | 1 + view/theme/diabook-aerith/photo_item.tpl | 65 ++++++++ view/theme/diabook-aerith/photo_view.tpl | 10 +- view/theme/diabook-aerith/style-network.css | 13 +- view/theme/diabook-aerith/style-profile.css | 13 +- view/theme/diabook-aerith/style.css | 129 +++++++++++++++- view/theme/diabook-aerith/theme.php | 27 +++- view/theme/diabook-blue/js/README | 22 +++ .../diabook-blue/js/jquery.ae.image.resize.js | 69 +++++++++ .../js/jquery.ae.image.resize.min.js | 1 + view/theme/diabook-blue/photo_item.tpl | 65 ++++++++ view/theme/diabook-blue/photo_view.tpl | 9 ++ view/theme/diabook-blue/style-network.css | 13 +- view/theme/diabook-blue/style-profile.css | 13 +- view/theme/diabook-blue/style.css | 130 +++++++++++++++- view/theme/diabook-blue/theme.php | 27 +++- view/theme/diabook-red/js/README | 22 +++ .../diabook-red/js/jquery.ae.image.resize.js | 69 +++++++++ .../js/jquery.ae.image.resize.min.js | 1 + view/theme/diabook-red/photo_item.tpl | 65 ++++++++ view/theme/diabook-red/photo_view.tpl | 11 +- view/theme/diabook-red/style-network.css | 13 +- view/theme/diabook-red/style-profile.css | 13 +- view/theme/diabook-red/style.css | 129 +++++++++++++++- view/theme/diabook-red/theme.php | 27 +++- view/theme/diabook/js/README | 22 +++ .../diabook/js/jquery.ae.image.resize.js | 69 +++++++++ .../diabook/js/jquery.ae.image.resize.min.js | 1 + view/theme/diabook/oembed_video.tpl | 4 + view/theme/diabook/photo_item.tpl | 65 ++++++++ view/theme/diabook/photo_view.tpl | 26 ++-- view/theme/diabook/style-network.css | 13 +- view/theme/diabook/style-profile.css | 13 +- view/theme/diabook/style.css | 142 +++++++++++++++--- view/theme/diabook/theme.php | 49 +++++- 37 files changed, 1373 insertions(+), 79 deletions(-) create mode 100644 view/theme/diabook-aerith/js/README create mode 100644 view/theme/diabook-aerith/js/jquery.ae.image.resize.js create mode 100644 view/theme/diabook-aerith/js/jquery.ae.image.resize.min.js create mode 100644 view/theme/diabook-aerith/photo_item.tpl create mode 100644 view/theme/diabook-blue/js/README create mode 100644 view/theme/diabook-blue/js/jquery.ae.image.resize.js create mode 100644 view/theme/diabook-blue/js/jquery.ae.image.resize.min.js create mode 100644 view/theme/diabook-blue/photo_item.tpl create mode 100644 view/theme/diabook-red/js/README create mode 100644 view/theme/diabook-red/js/jquery.ae.image.resize.js create mode 100644 view/theme/diabook-red/js/jquery.ae.image.resize.min.js create mode 100644 view/theme/diabook-red/photo_item.tpl create mode 100644 view/theme/diabook/js/README create mode 100644 view/theme/diabook/js/jquery.ae.image.resize.js create mode 100644 view/theme/diabook/js/jquery.ae.image.resize.min.js create mode 100644 view/theme/diabook/oembed_video.tpl create mode 100644 view/theme/diabook/photo_item.tpl mode change 100755 => 100644 view/theme/diabook/photo_view.tpl diff --git a/view/theme/diabook-aerith/js/README b/view/theme/diabook-aerith/js/README new file mode 100644 index 0000000000..c93b2118ee --- /dev/null +++ b/view/theme/diabook-aerith/js/README @@ -0,0 +1,22 @@ +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-aerith/js/jquery.ae.image.resize.js b/view/theme/diabook-aerith/js/jquery.ae.image.resize.js new file mode 100644 index 0000000000..bac09cd457 --- /dev/null +++ b/view/theme/diabook-aerith/js/jquery.ae.image.resize.js @@ -0,0 +1,69 @@ +(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-aerith/js/jquery.ae.image.resize.min.js b/view/theme/diabook-aerith/js/jquery.ae.image.resize.min.js new file mode 100644 index 0000000000..16c30b1239 --- /dev/null +++ b/view/theme/diabook-aerith/js/jquery.ae.image.resize.min.js @@ -0,0 +1 @@ +(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-aerith/photo_item.tpl b/view/theme/diabook-aerith/photo_item.tpl new file mode 100644 index 0000000000..5d65a89b79 --- /dev/null +++ b/view/theme/diabook-aerith/photo_item.tpl @@ -0,0 +1,65 @@ +{{ 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-aerith/photo_view.tpl b/view/theme/diabook-aerith/photo_view.tpl index 511fc73acb..071972e0c6 100755 --- a/view/theme/diabook-aerith/photo_view.tpl +++ b/view/theme/diabook-aerith/photo_view.tpl @@ -24,4 +24,12 @@ {{ endif }} {{ if $tags.2 }}
$tags.3
{{ endif }} -{{ if $edit }}$edit{{ endif }} \ No newline at end of file +{{ if $edit }}$edit{{ endif }} + +
+
+
+$comments +
+ +$paginate diff --git a/view/theme/diabook-aerith/style-network.css b/view/theme/diabook-aerith/style-network.css index 9925a90aaf..c1309313be 100644 --- a/view/theme/diabook-aerith/style-network.css +++ b/view/theme/diabook-aerith/style-network.css @@ -1233,7 +1233,6 @@ body .pageheader{ padding: 0; } .tab.button { - margin-right: 5px; margin-left: 5px; /*background: none repeat scroll 0 0 #F8F8F8;*/ border: 1px solid #CCCCCC; @@ -1369,6 +1368,7 @@ transition: all 0.2s ease-in-out; max-width: 420px; word-wrap: break-word; line-height: 1.2; + margin-bottom: 14px; } .wall-item-container .wall-item-content img { @@ -1469,9 +1469,9 @@ transition: all 0.2s ease-in-out; border: 1px solid #2d2d2d; } .comment-edit-preview { - width: 710px; - border: 1px solid #2d2d2d; + width: 500px; margin-top: 10px; + background-color: #fff797; } .comment-edit-preview .contact-photo { width: 32px; @@ -1707,7 +1707,7 @@ transition: all 0.2s ease-in-out; height: 20px; margin: 0 0 5px; width: 60%; - border: 1px solid #ffffff; + border: 1px solid #d2d2d2; } #profile-jot-form #jot-title:-webkit-input-placeholder { font-weight: normal; @@ -2169,6 +2169,11 @@ blockquote { border-left: 1px solid #D2D2D2; padding-left: 9px; margin: 0 0 0 .8ex; + color: #777; +} +.oembed { + font-size: large; + font-weight: bold; } .aprofile dt{ box-shadow: 1px 1px 5px 0; diff --git a/view/theme/diabook-aerith/style-profile.css b/view/theme/diabook-aerith/style-profile.css index 19fea9a83a..48134e124b 100644 --- a/view/theme/diabook-aerith/style-profile.css +++ b/view/theme/diabook-aerith/style-profile.css @@ -1228,7 +1228,6 @@ body .pageheader{ padding: 0; } .tab.button { - margin-right: 5px; margin-left: 5px; /*background: none repeat scroll 0 0 #F8F8F8;*/ border: 1px solid #CCCCCC; @@ -1362,6 +1361,7 @@ transition: all 0.2s ease-in-out; max-width: 420px; word-wrap: break-word; line-height: 1.2; + margin-bottom: 14px; } .wall-item-container .wall-item-content img { @@ -1459,9 +1459,9 @@ transition: all 0.2s ease-in-out; border: 1px solid #2d2d2d; } .comment-edit-preview { - width: 710px; - border: 1px solid #2d2d2d; + width: 500px; margin-top: 10px; + background-color: #fff797; } .comment-edit-preview .contact-photo { width: 32px; @@ -1697,7 +1697,7 @@ transition: all 0.2s ease-in-out; height: 20px; margin: 0 0 5px; width: 60%; - border: 1px solid #ffffff; + border: 1px solid #d2d2d2; } #profile-jot-form #jot-title:-webkit-input-placeholder { font-weight: normal; @@ -2158,6 +2158,11 @@ blockquote { border-left: 1px solid #D2D2D2; padding-left: 9px; margin: 0 0 0 .8ex; + color: #777; +} +.oembed { + font-size: large; + font-weight: bold; } .aprofile dt{ box-shadow: 1px 1px 5px 0; diff --git a/view/theme/diabook-aerith/style.css b/view/theme/diabook-aerith/style.css index f7bdaeef6a..f826521542 100644 --- a/view/theme/diabook-aerith/style.css +++ b/view/theme/diabook-aerith/style.css @@ -1308,7 +1308,6 @@ body .pageheader{ padding: 0; } .tab.button { - margin-right: 5px; margin-left: 5px; /*background: none repeat scroll 0 0 #F8F8F8;*/ border: 1px solid #CCCCCC; @@ -1347,6 +1346,122 @@ body .pageheader{ display: table; width: 780px; } +.wall-item-photo-container .wall-item-item, .wall-item-container .wall-item-bottom { + display: table-row; +} +.wall-item-photo-container .wall-item-info { + display: table-cell; + vertical-align: top; + text-align: left; + width: 80px; +} +.wall-item-photo-container .wall-item-location { + padding-right: 40px; + display: table-cell; +} +.wall-item-photo-container .wall-item-ago { + word-wrap: break-word; + width: 50px; + margin-left: 10px; + color: #999; +} +.wall-item-photo-container .wall-item-content { + font-size: 12.5px; + max-width: 720px; + word-wrap: break-word; + line-height: 1.2; + margin-bottom: 14px; +} +.wall-item-photo-container .wall-item-content img { + max-width: 700px; +} +.wall-item-photo-container .wall-item-links, .wall-item-photo-container .wall-item-actions { + display: table-cell; + vertical-align: middle; +} +.wall-item-photo-container .wall-item-links .icon, .wall-item-photo-container .wall-item-actions .icon { + opacity: 0.5; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.wall-item-photo-container .wall-item-links .icon:hover, .wall-item-photo-container .wall-item-actions .icon:hover { + opacity: 1; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.wall-item-photo-container .wall-item-name { + font-weight: bold; +} +.wall-item-photo-container .wall-item-actions-author { + width: 100%; + margin-bottom: 0.3em; +} +.wall-item-photo-container .wall-item-actions-social { + float: left; + margin-bottom: 1px; + display: table-cell; +} +.wall-item-photo-container .wall-item-actions-social a { + margin-right: 1em; +} +.wall-item-photo-container .wall-item-actions-tools { + float: right; + width: 80px; + display: table-cell; +} +.wall-item-photo-container .wall-item-actions-tools a { + float: right; +} +.wall-item-photo-container .wall-item-actions-tools input { + float: right; +} +.wall-item-photo-container.comment { + margin-top: 5px; + margin-bottom: 5px; + margin-left: 40px; + width: 650px; + border-bottom: 1px solid #D2D2D2; +} +.wall-item-photo-container.comment { + top: 15px !important; + left: 15px !important; +} +.wall-item-photo-container { + display: table; + width: 780px; +} +.my-comment-photo { + width: 48px; + margin-left: 40px; + margin-right: 32px; + } +.comment-edit-preview { + width: 500px; + margin-top: 10px; +} +.comment-edit-text-empty { + width: 500px; + border: 1px solid #D2D2D2; + height: 3.2em; + color: #2d2d2d; +} +.comment-edit-text-full { + font-size: 12.5px; + height: 3.3em; + + border: 1px solid #D2D2D2; + width: 500px; +} +.comment-edit-photo { + margin: 10px 0 0; + display: table-cell; +} .wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom { @@ -1400,6 +1515,7 @@ body .pageheader{ max-width: 720px; word-wrap: break-word; line-height: 1.2; + margin-bottom: 14px; } .wall-item-container .wall-item-content img { @@ -1497,9 +1613,9 @@ body .pageheader{ border: 1px solid #2d2d2d; } .comment-edit-preview { - width: 710px; - border: 1px solid #2d2d2d; + width: 500px; margin-top: 10px; + background-color: #fff797; } .comment-edit-preview .contact-photo { width: 32px; @@ -1735,7 +1851,7 @@ body .pageheader{ height: 20px; margin: 0 0 5px; width: 60%; - border: 1px solid #ffffff; + border: 1px solid #d2d2d2; } #profile-jot-form #jot-title:-webkit-input-placeholder { font-weight: normal; @@ -2205,6 +2321,11 @@ blockquote { border-left: 1px solid #D2D2D2; padding-left: 9px; margin: 0 0 0 .8ex; + color: #777; +} +.oembed { + font-size: large; + font-weight: bold; } .aprofile dt{ box-shadow: 1px 1px 5px 0; diff --git a/view/theme/diabook-aerith/theme.php b/view/theme/diabook-aerith/theme.php index b48f061fd1..a1ea51e82f 100755 --- a/view/theme/diabook-aerith/theme.php +++ b/view/theme/diabook-aerith/theme.php @@ -3,11 +3,16 @@ /* * Name: Diabook-aerith * Description: Diabook-aerith : report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu - * Version: (Version: 1.013) + * Version: (Version: 1.014) * Author: */ +//print diabook-version for debugging +$diabook_version = "Diabook-aerith (Version: 1.014)"; +$a->page['htmlhead'] .= sprintf('', $diabook_version); + + //change css on network and profilepages $cssFile = null; @@ -333,8 +338,24 @@ if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('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); //js scripts +//comment-edit-wrapper on photo_view +if ($a->argv[0].$a->argv[2] === "photos"."image"){ + +$a->page['htmlhead'] .= ' +'; + +} $a->page['htmlhead'] .= ' @@ -350,6 +371,10 @@ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] == $a->page['htmlhead'] .= ' ', $diabook_version); + //change css on network and profilepages $cssFile = null; @@ -333,8 +337,25 @@ if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('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); //js scripts +//comment-edit-wrapper on photo_view +if ($a->argv[0].$a->argv[2] === "photos"."image"){ + +$a->page['htmlhead'] .= ' +'; + +} + $a->page['htmlhead'] .= ' @@ -350,6 +371,10 @@ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] == $a->page['htmlhead'] .= ' ', $diabook_version); + //change css on network and profilepages $cssFile = null; @@ -334,8 +338,25 @@ if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('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); + //js scripts +//comment-edit-wrapper on photo_view +if ($a->argv[0].$a->argv[2] === "photos"."image"){ + +$a->page['htmlhead'] .= ' +'; + +} $a->page['htmlhead'] .= ' @@ -351,6 +372,10 @@ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] == $a->page['htmlhead'] .= ' ', $diabook_version); //change css on network and profilepages $cssFile = null; @@ -285,6 +288,8 @@ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){ } } + + //tabs at aside on settings page if ($a->argv[0] === "settings"){ @@ -340,10 +345,27 @@ if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.cookie.js"; -$a->page['htmlhead'] .= sprintf('', $cookieJS); +$a->page['htmlhead'] .= sprintf('', $cookieJS); + +//load jquery.ae.image.resize.js +$imageresizeJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.ae.image.resize.js"; +$a->page['htmlhead'] .= sprintf('', $imageresizeJS); //js scripts +//comment-edit-wrapper on photo_view +if ($a->argv[0].$a->argv[2] === "photos"."image"){ + +$a->page['htmlhead'] .= ' +'; + +} $a->page['htmlhead'] .= ' @@ -354,11 +376,34 @@ $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'] .= '