diff options
Diffstat (limited to 'view/theme/diabook-blue')
41 files changed, 74 insertions, 3 deletions
diff --git a/view/theme/diabook-blue/comment_item.tpl b/view/theme/diabook-blue/comment_item.tpl index 09fd8da3d..47046c371 100644 --- a/view/theme/diabook-blue/comment_item.tpl +++ b/view/theme/diabook-blue/comment_item.tpl @@ -11,7 +11,7 @@ <a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a> </div> <div class="comment-edit-photo-end"></div> - <textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea> + <textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);tautogrow($id)" onBlur="commentClose(this,$id);" >$comment</textarea> <a class="icon bb-image" onclick="insertFormatting('$comment','img',$id);">img</a> <a class="icon bb-url" onclick="insertFormatting('$comment','url',$id);">url</a> <a class="icon bb-video" onclick="insertFormatting('$comment','video',$id);">video</a> diff --git a/view/theme/diabook-blue/communityhome.tpl b/view/theme/diabook-blue/communityhome.tpl index 6e126827b..6e126827b 100755..100644 --- a/view/theme/diabook-blue/communityhome.tpl +++ b/view/theme/diabook-blue/communityhome.tpl diff --git a/view/theme/diabook-blue/contact_template.tpl b/view/theme/diabook-blue/contact_template.tpl index 48930b48a..48930b48a 100755..100644 --- a/view/theme/diabook-blue/contact_template.tpl +++ b/view/theme/diabook-blue/contact_template.tpl diff --git a/view/theme/diabook-blue/directory_item.tpl b/view/theme/diabook-blue/directory_item.tpl index db1936e4b..db1936e4b 100755..100644 --- a/view/theme/diabook-blue/directory_item.tpl +++ b/view/theme/diabook-blue/directory_item.tpl diff --git a/view/theme/diabook-blue/fpostit/fpostit.js b/view/theme/diabook-blue/fpostit/fpostit.js index d183c7573..d183c7573 100755..100644 --- a/view/theme/diabook-blue/fpostit/fpostit.js +++ b/view/theme/diabook-blue/fpostit/fpostit.js diff --git a/view/theme/diabook-blue/group_side.tpl b/view/theme/diabook-blue/group_side.tpl index 642019049..642019049 100755..100644 --- a/view/theme/diabook-blue/group_side.tpl +++ b/view/theme/diabook-blue/group_side.tpl diff --git a/view/theme/diabook-blue/icons/attach.png b/view/theme/diabook-blue/icons/attach.png Binary files differindex 1958041cf..1958041cf 100755..100644 --- a/view/theme/diabook-blue/icons/attach.png +++ b/view/theme/diabook-blue/icons/attach.png diff --git a/view/theme/diabook-blue/icons/audio.png b/view/theme/diabook-blue/icons/audio.png Binary files differindex 8d779a409..8d779a409 100755..100644 --- a/view/theme/diabook-blue/icons/audio.png +++ b/view/theme/diabook-blue/icons/audio.png diff --git a/view/theme/diabook-blue/icons/camera.png b/view/theme/diabook-blue/icons/camera.png Binary files differindex a5c7f1236..a5c7f1236 100755..100644 --- a/view/theme/diabook-blue/icons/camera.png +++ b/view/theme/diabook-blue/icons/camera.png diff --git a/view/theme/diabook-blue/icons/close_box.png b/view/theme/diabook-blue/icons/close_box.png Binary files differindex 28e2675b8..28e2675b8 100755..100644 --- a/view/theme/diabook-blue/icons/close_box.png +++ b/view/theme/diabook-blue/icons/close_box.png diff --git a/view/theme/diabook-blue/icons/contacts2.png b/view/theme/diabook-blue/icons/contacts2.png Binary files differindex 7817279f4..7817279f4 100755..100644 --- a/view/theme/diabook-blue/icons/contacts2.png +++ b/view/theme/diabook-blue/icons/contacts2.png diff --git a/view/theme/diabook-blue/icons/drop.png b/view/theme/diabook-blue/icons/drop.png Binary files differindex 2abb82ef2..2abb82ef2 100755..100644 --- a/view/theme/diabook-blue/icons/drop.png +++ b/view/theme/diabook-blue/icons/drop.png diff --git a/view/theme/diabook-blue/icons/file_as.png b/view/theme/diabook-blue/icons/file_as.png Binary files differindex 16713fa53..16713fa53 100755..100644 --- a/view/theme/diabook-blue/icons/file_as.png +++ b/view/theme/diabook-blue/icons/file_as.png diff --git a/view/theme/diabook-blue/icons/link.png b/view/theme/diabook-blue/icons/link.png Binary files differindex 0ef666a67..0ef666a67 100755..100644 --- a/view/theme/diabook-blue/icons/link.png +++ b/view/theme/diabook-blue/icons/link.png diff --git a/view/theme/diabook-blue/icons/lock.png b/view/theme/diabook-blue/icons/lock.png Binary files differindex 7e34bf279..7e34bf279 100755..100644 --- a/view/theme/diabook-blue/icons/lock.png +++ b/view/theme/diabook-blue/icons/lock.png diff --git a/view/theme/diabook-blue/icons/lupe.png b/view/theme/diabook-blue/icons/lupe.png Binary files differindex f8b228347..f8b228347 100755..100644 --- a/view/theme/diabook-blue/icons/lupe.png +++ b/view/theme/diabook-blue/icons/lupe.png diff --git a/view/theme/diabook-blue/icons/messages.png b/view/theme/diabook-blue/icons/messages.png Binary files differindex f7010c98c..f7010c98c 100755..100644 --- a/view/theme/diabook-blue/icons/messages.png +++ b/view/theme/diabook-blue/icons/messages.png diff --git a/view/theme/diabook-blue/icons/next.png b/view/theme/diabook-blue/icons/next.png Binary files differindex 7b5e25b90..7b5e25b90 100755..100644 --- a/view/theme/diabook-blue/icons/next.png +++ b/view/theme/diabook-blue/icons/next.png diff --git a/view/theme/diabook-blue/icons/notifications.png b/view/theme/diabook-blue/icons/notifications.png Binary files differindex c23673dbd..c23673dbd 100755..100644 --- a/view/theme/diabook-blue/icons/notifications.png +++ b/view/theme/diabook-blue/icons/notifications.png diff --git a/view/theme/diabook-blue/icons/notify.png b/view/theme/diabook-blue/icons/notify.png Binary files differindex 8a7bdc38f..8a7bdc38f 100755..100644 --- a/view/theme/diabook-blue/icons/notify.png +++ b/view/theme/diabook-blue/icons/notify.png diff --git a/view/theme/diabook-blue/icons/pencil.png b/view/theme/diabook-blue/icons/pencil.png Binary files differindex 772e49b17..772e49b17 100755..100644 --- a/view/theme/diabook-blue/icons/pencil.png +++ b/view/theme/diabook-blue/icons/pencil.png diff --git a/view/theme/diabook-blue/icons/prev.png b/view/theme/diabook-blue/icons/prev.png Binary files differindex 55c1464ba..55c1464ba 100755..100644 --- a/view/theme/diabook-blue/icons/prev.png +++ b/view/theme/diabook-blue/icons/prev.png diff --git a/view/theme/diabook-blue/icons/recycle.png b/view/theme/diabook-blue/icons/recycle.png Binary files differindex c3b8d2bf4..c3b8d2bf4 100755..100644 --- a/view/theme/diabook-blue/icons/recycle.png +++ b/view/theme/diabook-blue/icons/recycle.png diff --git a/view/theme/diabook-blue/icons/remote.png b/view/theme/diabook-blue/icons/remote.png Binary files differindex a560cc55e..a560cc55e 100755..100644 --- a/view/theme/diabook-blue/icons/remote.png +++ b/view/theme/diabook-blue/icons/remote.png diff --git a/view/theme/diabook-blue/icons/scroll_top.png b/view/theme/diabook-blue/icons/scroll_top.png Binary files differindex 0e7f7ae6a..0e7f7ae6a 100755..100644 --- a/view/theme/diabook-blue/icons/scroll_top.png +++ b/view/theme/diabook-blue/icons/scroll_top.png diff --git a/view/theme/diabook-blue/icons/star.png b/view/theme/diabook-blue/icons/star.png Binary files differindex 0b00cb189..0b00cb189 100755..100644 --- a/view/theme/diabook-blue/icons/star.png +++ b/view/theme/diabook-blue/icons/star.png diff --git a/view/theme/diabook-blue/icons/starred.png b/view/theme/diabook-blue/icons/starred.png Binary files differindex 2b82dfca3..2b82dfca3 100755..100644 --- a/view/theme/diabook-blue/icons/starred.png +++ b/view/theme/diabook-blue/icons/starred.png diff --git a/view/theme/diabook-blue/icons/tagged.png b/view/theme/diabook-blue/icons/tagged.png Binary files differindex 144649ef8..144649ef8 100755..100644 --- a/view/theme/diabook-blue/icons/tagged.png +++ b/view/theme/diabook-blue/icons/tagged.png diff --git a/view/theme/diabook-blue/icons/unlock.png b/view/theme/diabook-blue/icons/unlock.png Binary files differindex a0cda0ae5..a0cda0ae5 100755..100644 --- a/view/theme/diabook-blue/icons/unlock.png +++ b/view/theme/diabook-blue/icons/unlock.png diff --git a/view/theme/diabook-blue/icons/unstarred.png b/view/theme/diabook-blue/icons/unstarred.png Binary files differindex ba3183f5c..ba3183f5c 100755..100644 --- a/view/theme/diabook-blue/icons/unstarred.png +++ b/view/theme/diabook-blue/icons/unstarred.png diff --git a/view/theme/diabook-blue/icons/video.png b/view/theme/diabook-blue/icons/video.png Binary files differindex a03d1d818..a03d1d818 100755..100644 --- a/view/theme/diabook-blue/icons/video.png +++ b/view/theme/diabook-blue/icons/video.png diff --git a/view/theme/diabook-blue/icons/weblink.png b/view/theme/diabook-blue/icons/weblink.png Binary files differindex 216e78344..216e78344 100755..100644 --- a/view/theme/diabook-blue/icons/weblink.png +++ b/view/theme/diabook-blue/icons/weblink.png diff --git a/view/theme/diabook-blue/jot.tpl b/view/theme/diabook-blue/jot.tpl index bd43994b5..bd43994b5 100755..100644 --- a/view/theme/diabook-blue/jot.tpl +++ b/view/theme/diabook-blue/jot.tpl diff --git a/view/theme/diabook-blue/js/jquery.autogrow.textarea.js b/view/theme/diabook-blue/js/jquery.autogrow.textarea.js new file mode 100644 index 000000000..806e34f51 --- /dev/null +++ b/view/theme/diabook-blue/js/jquery.autogrow.textarea.js @@ -0,0 +1,46 @@ +(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 = $('<div></div>').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(/&/g, '&') + .replace(/\n/g, '<br/>'); + + 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-blue/mail_conv.tpl b/view/theme/diabook-blue/mail_conv.tpl index 989f17878..989f17878 100755..100644 --- a/view/theme/diabook-blue/mail_conv.tpl +++ b/view/theme/diabook-blue/mail_conv.tpl diff --git a/view/theme/diabook-blue/photo_view.tpl b/view/theme/diabook-blue/photo_view.tpl index 93b01d623..93b01d623 100755..100644 --- a/view/theme/diabook-blue/photo_view.tpl +++ b/view/theme/diabook-blue/photo_view.tpl diff --git a/view/theme/diabook-blue/search_item.tpl b/view/theme/diabook-blue/search_item.tpl index 123834064..123834064 100755..100644 --- a/view/theme/diabook-blue/search_item.tpl +++ b/view/theme/diabook-blue/search_item.tpl diff --git a/view/theme/diabook-blue/style-network.css b/view/theme/diabook-blue/style-network.css index 2f25372a9..59d4fafe7 100644 --- a/view/theme/diabook-blue/style-network.css +++ b/view/theme/diabook-blue/style-network.css @@ -2190,6 +2190,9 @@ box-shadow: 1px 1px 5px 0; #group-separator, #prof-separator { display: none;} */ +#prof-members-end{ + clear: both; + } #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label { margin-bottom: 10px; diff --git a/view/theme/diabook-blue/style-profile.css b/view/theme/diabook-blue/style-profile.css index f0b4fbd02..135cdb1c6 100644 --- a/view/theme/diabook-blue/style-profile.css +++ b/view/theme/diabook-blue/style-profile.css @@ -2170,6 +2170,9 @@ box-shadow: 1px 1px 5px 0; #group-separator, #prof-separator { display: none;} */ +#prof-members-end{ + clear: both; + } #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label { margin-bottom: 10px; diff --git a/view/theme/diabook-blue/style.css b/view/theme/diabook-blue/style.css index 923e63e3e..5459c65bd 100644 --- a/view/theme/diabook-blue/style.css +++ b/view/theme/diabook-blue/style.css @@ -1190,6 +1190,9 @@ aside #side-peoplefind-url { float: left; margin-right: 20px; } +#login-submit-wrapper{ + margin-top: 20px; + } .group_selected { background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center; float: left; @@ -1205,7 +1208,7 @@ aside #side-peoplefind-url { .icon.text_add { background-image: url("../../../images/icons/16/add.png"); float: right; - opacity: 0.1; + opacity: 0.2; margin-right: 14px; } .icon.text_add:hover { @@ -1222,7 +1225,7 @@ transition: all 0.2s ease-in-out; } .icon.text_edit { background-image: url("../../../images/icons/10/edit.png"); - opacity: 0.1; + opacity: 0.2; margin-top: 6px; float: right; height: 10px; @@ -2444,6 +2447,9 @@ box-shadow: 1px 1px 5px 0; #group-separator, #prof-separator { display: none;} */ +#prof-members-end{ + clear: both; + } #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label { margin-bottom: 10px; diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php index 844682943..eb2d484ba 100755..100644 --- a/view/theme/diabook-blue/theme.php +++ b/view/theme/diabook-blue/theme.php @@ -290,6 +290,10 @@ $a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></scrip $imageresizeJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/js/jquery.ae.image.resize.js"; $a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $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('<script language="JavaScript" src="%s" ></script>', $autogrowJS); + //js scripts //comment-edit-wrapper on photo_view if ($a->argv[0].$a->argv[2] === "photos"."image"){ @@ -314,6 +318,15 @@ $a->page['htmlhead'] .= ' }); </script>'; + +$a->page['htmlhead'] .= ' + +<script type="text/javascript"> + +function tautogrow(id){ + $("textarea#comment-edit-text-" +id).autogrow(); + }; + </script>'; $a->page['htmlhead'] .= ' <script> |
