diff options
author | pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-04-07 14:10:51 +0000 |
---|---|---|
committer | pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-04-07 14:10:51 +0000 |
commit | 538a22b85384008533aeef2ac356ff668766e0cb (patch) | |
tree | 0070a18c9d09241a15df94fcbeeeda16feed4138 /mod/riverdashboard/views/default/riverdashboard | |
parent | 90cb880ec6b629376df97c89bc4a0b3e2db32c8e (diff) | |
download | elgg-538a22b85384008533aeef2ac356ff668766e0cb.tar.gz elgg-538a22b85384008533aeef2ac356ff668766e0cb.tar.bz2 |
Riverdashboard refreshed, and updated display of comments and likes (the loading of these needs to be moved to ajax callbacks)
git-svn-id: http://code.elgg.org/elgg/trunk@5643 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'mod/riverdashboard/views/default/riverdashboard')
3 files changed, 108 insertions, 124 deletions
diff --git a/mod/riverdashboard/views/default/riverdashboard/css.php b/mod/riverdashboard/views/default/riverdashboard/css.php index c8c004213..9a6109de0 100644 --- a/mod/riverdashboard/views/default/riverdashboard/css.php +++ b/mod/riverdashboard/views/default/riverdashboard/css.php @@ -36,6 +36,11 @@ .river_item p { margin:0; } +.river_item .entity_subtext { + padding-left:5px; + padding-right:5px; + font-size:85%; +} .river_item_useravatar { float:left; margin-top:3px; @@ -46,8 +51,9 @@ } .river_content_display { border-left:1px solid #DDDDDD; - font-size:90%; - margin:8px 0 6px 0; + font-size:85%; + line-height:1.5em; + margin:8px 0 5px 0; padding-left:5px; } .following_icon { @@ -58,148 +64,95 @@ } /* LATEST COMMENTS IN RIVER */ +.river_comments_tabs { + max-height: 19px; + overflow:hidden; +} .river_comments { - margin:5px 0 0 55px; - width:auto; + -moz-border-radius-bottomleft:5px; + -moz-border-radius-bottomright:5px; + -moz-border-radius-topleft:5px; + -moz-border-radius-topright:0; + -webkit-border-top-left-radius:5px; + -webkit-border-top-right-radius:0; + -webkit-border-bottom-right-radius:5px; + -webkit-border-bottom-left-radius:5px; + background-color: #eeeeee; } .river_comment { - background-color: #f8f8f8; padding:3px; - margin-bottom:3px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; + border-bottom:1px solid white; } .river_comment.penultimate { - background-color: #eeeeee; + } .river_comment.latest { - background-color: #dedede; - margin-bottom:0; -} -a.river_more_comments { - display:block; - float:right; - padding:2px 4px 7px 30px; - text-align:right; - width:auto; -} -.river_comment_owner_icon { - float:left; - margin:3px 8px 4px 2px; -} -.river_comment_contents { - margin-left:34px; -} -.river_item .comment_link { - margin-left:55px; -} -.river_comments .entity_subtext { - display: block; -} -/* ACTIVITY WIDGET? - @todo - -.collapsable_box_content .river_user_update { - background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_profile.gif) no-repeat left -1px; -} -.collapsable_box_content .river_object_user_profileupdate { - background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_profile.gif) no-repeat left -1px; -} -.collapsable_box_content .river_object_user_profileiconupdate { - background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_profile.gif) no-repeat left -1px; -} -.collapsable_box_content .river_object_annotate { - background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_comment.gif) no-repeat left -1px; -} -.collapsable_box_content .river_object_bookmarks_create { - background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_bookmarks.gif) no-repeat left -1px; -} -.collapsable_box_content .river_object_bookmarks_comment { - background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_comment.gif) no-repeat left -1px; -} -.collapsable_box_content .river_object_status_create { - background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_status.gif) no-repeat left -1px; } -.collapsable_box_content .river_object_file_create { - background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_files.gif) no-repeat left -1px; +/* hidden inline comment form */ +.river_comment_form.hidden { + padding:5px; } -.collapsable_box_content .river_object_file_update { - background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_files.gif) no-repeat left -1px; -} -.collapsable_box_content .river_object_file_comment { - background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_comment.gif) no-repeat left -1px; -} -.collapsable_box_content .river_object_widget_create { - background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_plugin.gif) no-repeat left -1px; -} -.collapsable_box_content .river_object_forums_create { - background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_forum.gif) no-repeat left -1px; -} -.collapsable_box_content .river_object_forums_update { - background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_forum.gif) no-repeat left -1px; -} -.collapsable_box_content .river_object_widget_update { - background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_plugin.gif) no-repeat left -1px; -} -.collapsable_box_content .river_object_blog_create { - background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_blog.gif) no-repeat left -1px; -} -.collapsable_box_content .river_object_blog_update { - background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_blog.gif) no-repeat left -1px; -} -.collapsable_box_content .river_object_blog_comment { - background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_comment.gif) no-repeat left -1px; -} -.collapsable_box_content .river_object_forumtopic_create { - background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_forum.gif) no-repeat left -1px; -} -.collapsable_box_content .river_user_friend { - background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_friends.gif) no-repeat left -1px; -} -.collapsable_box_content .river_object_relationship_friend_create { - background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_friends.gif) no-repeat left -1px; +.river_comment_form.hidden .input_text { + width:560px; + padding:3px; } -.collapsable_box_content .river_object_relationship_member_create { - background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_forum.gif) no-repeat left -1px; +.river_comment_form.hidden .submit_button { + margin:0 0 0 10px; + float:right; } -.collapsable_box_content .river_object_thewire_create { - background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_thewire.gif) no-repeat left -1px; +.river_link_divider { + color:#999999; } -.collapsable_box_content .river_group_join { - background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_forum.gif) no-repeat left -1px; +.river_comment_form_button, +.river_user_like_button { + font-size:85%; } -.collapsable_box_content .river_object_groupforumtopic_annotate { - background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_comment.gif) no-repeat left -1px; +.elgg_likes_user { + border-bottom:1px solid white; + padding:3px; } -.collapsable_box_content .river_object_groupforumtopic_create { - background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_forum.gif) no-repeat left -1px; +.elgg_likes_user .entity_listing_icon { + margin:3px 0 4px 2px; } -.collapsable_box_content .river_object_sitemessage_create { - background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_blog.gif) no-repeat left -1px; +.elgg_likes_user .entity_listing_info { + width:635px; } -.collapsable_box_content .river_user_messageboard { - background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_comment.gif) no-repeat left -1px; +.elgg_likes_user .entity_metadata { + margin-top:3px; } -.collapsable_box_content .river_object_page_create { - background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_pages.gif) no-repeat left -1px; +.river_item p.elgg_likes_owner { + padding-top:4px; } -.collapsable_box_content .river_object_page_update { - background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_pages.gif) no-repeat left -1px; +a.river_more_comments { + display:block; + float:right; + padding:1px 7px 1px 7px; + margin-left:6px; + text-align:right; + font-size:85%; + width:auto; + background-color: #eeeeee; + -moz-border-radius-topleft:4px; + -moz-border-radius-topright:4px; + -webkit-border-top-left-radius:4px; + -webkit-border-top-right-radius:4px; } -.collapsable_box_content .river_object_page_top_create { - background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_pages.gif) no-repeat left -1px; +a.river_more_comments.off { + background-color: white; } -.collapsable_box_content .river_object_page_top_update { - background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_pages.gif) no-repeat left -1px; +.river_comment_owner_icon { + float:left; + margin:3px 8px 4px 2px; } -.collapsable_box_content .river_object_page_top_comment { - background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_comment.gif) no-repeat left -1px; +.river_comment_contents { + margin-left:34px; } -.collapsable_box_content .river_object_page_comment { - background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_comment.gif) no-repeat left -1px; +/* +.river_item .comment_link { + margin-left:55px; } - */ + diff --git a/mod/riverdashboard/views/default/riverdashboard/js.php b/mod/riverdashboard/views/default/riverdashboard/js.php index ad96a6069..b1bace04a 100644 --- a/mod/riverdashboard/views/default/riverdashboard/js.php +++ b/mod/riverdashboard/views/default/riverdashboard/js.php @@ -1,7 +1,35 @@ <script type="text/javascript"> $(document).ready(function() { $('.river_comment_form_button').click(function() { - $(this).next('.river_comment_form').toggle(); + elgg_slide_toggle(this,'.river_item','.river_comment_form'); }); + + $('.likes_user_list_button').click(function() { + var myParent = $(this).closest('.river_item'); + if (myParent.find('.likes_list').css('display') == 'none') { + // hide comments + myParent.find('.river_comment').animate({"height": "toggle", "opacity": "toggle"}, { duration: 400 }); + // change selected tab + myParent.find('.show_comments_button').addClass('off'); + myParent.find('.likes_user_list_button').removeClass('off'); + // show users that liked object + elgg_slide_toggle(this,'.river_item','.likes_list'); + } + }); + + + $('.show_comments_button').click(function() { + var myParent = $(this).closest('.river_item'); + if (myParent.find('.river_comment').css('display') == 'none') { + // hide comments + myParent.find('.likes_list').animate({"height": "toggle", "opacity": "toggle"}, { duration: 400 }); + // change selected tab + myParent.find('.show_comments_button').removeClass('off'); + myParent.find('.likes_user_list_button').addClass('off'); + // show users that liked object + elgg_slide_toggle(this,'.river_item','.river_comment'); + } + }); + }); </script>
\ No newline at end of file diff --git a/mod/riverdashboard/views/default/riverdashboard/rivercomment.php b/mod/riverdashboard/views/default/riverdashboard/rivercomment.php index 32d1b4675..d440e7ab6 100644 --- a/mod/riverdashboard/views/default/riverdashboard/rivercomment.php +++ b/mod/riverdashboard/views/default/riverdashboard/rivercomment.php @@ -5,11 +5,14 @@ */ if (isset($vars['entity']) && isloggedin()) { - $form_body = "<a class=\"river_comment_form_button\">Add comment</a>"; - $form_body .= "<div class=\"river_comment_form\" style=\"display:none;\">"; - $form_body .= elgg_view('input/text',array('internalname' => 'generic_comment', 'value' => 'Add a comment...')); + $form_body = "<div class='river_comment_form hidden'>"; + $form_body .= elgg_view('input/text',array( + 'internalname' => 'generic_comment', + 'value' => 'Add a comment...', + 'js' => "onfocus=\"if (this.value=='Add a comment...') { this.value='' };\" onblur=\"if (this.value=='') { this.value='Add a comment...' }\"" + )); $form_body .= elgg_view('input/hidden', array('internalname' => 'entity_guid', 'value' => $vars['entity']->getGUID())); - $form_body .= elgg_view('input/submit', array('value' => elgg_echo("post"))); + $form_body .= elgg_view('input/submit', array('value' => elgg_echo("Comment"))); $form_body .= "</div>"; echo elgg_view('input/form', array('body' => $form_body, 'action' => "{$vars['url']}action/comments/add")); }
\ No newline at end of file |