aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mod/riverdashboard/views/default/river/item/wrapper.php26
-rw-r--r--views/default/css_ie.php25
2 files changed, 40 insertions, 11 deletions
diff --git a/mod/riverdashboard/views/default/river/item/wrapper.php b/mod/riverdashboard/views/default/river/item/wrapper.php
index f7a2e282f..7a3285382 100644
--- a/mod/riverdashboard/views/default/river/item/wrapper.php
+++ b/mod/riverdashboard/views/default/river/item/wrapper.php
@@ -104,15 +104,21 @@ else
echo "</div>"; // close river_comments
} else {
// tab bar nav - for users that liked object
- echo "<div class='river_comments_tabs clearfloat'>";
- $numoflikes = elgg_count_likes($object);
- if($numoflikes != 0){
- echo elgg_view('likes/forms/display', array('entity' => $object));
- }
- echo "</div>"; // close river_comments_tabs
-
- echo "<div class='river_comments'>";
+ $numoflikes = elgg_count_likes($object);
+ if ($vars['item']->type != 'user' && $numoflikes != 0) {
+ echo "<div class='river_comments_tabs clearfloat'>";
+ }
+ if($numoflikes != 0){
+ echo elgg_view('likes/forms/display', array('entity' => $object));
+ }
+ if ($vars['item']->type != 'user' && $numoflikes != 0) {
+ echo "</div>"; // close river_comments_tabs
+ }
+
+ if ($vars['item']->type != 'user') {
+ echo "<div class='river_comments'>";
+ }
if($numoflikes != 0){
//show the users who liked the object
echo "<div class='likes_list hidden'>";
@@ -125,7 +131,9 @@ else
if($vars['item']->type != 'user' && $vars['item']->subtype != 'groupforumtopic') {
echo elgg_make_river_comment($object);
}
- echo "</div>";
+ if ($vars['item']->type != 'user') {
+ echo "</div>";
+ }
}
echo "</div>"; // close river_item_contents
?>
diff --git a/views/default/css_ie.php b/views/default/css_ie.php
index 1ec19b69f..ed6cb1945 100644
--- a/views/default/css_ie.php
+++ b/views/default/css_ie.php
@@ -4,13 +4,15 @@
*/
* {zoom: 1;} /* trigger hasLayout in IE */
-/* main nav drop-down */
+/* tools drop-down menu */
#elgg_header {z-index:1;}
.navigation li a:hover ul {display:block; position:absolute; top:21px; left:0;}
.navigation li a:hover ul li a {display:block;}
.navigation li.navigation_more ul li a {width:150px;background-color: #dedede;}
-
+.clearfloat {
+ display: block;
+}
#elgg_topbar_contents a.privatemessages_new span {
display:block;
padding:1px;
@@ -23,3 +25,22 @@
#elgg_topbar_contents a.privatemessages_new {
padding:0 0 0 20px;
}
+
+/* riverdashboard rules - placed here temporarily */
+#riverdashboard_updates {
+ clear:both;
+}
+#riverdashboard_updates a.update_link {
+ margin:0 0 9px 0;
+}
+.riverdashboard_filtermenu {
+ margin:10px 0 0 0;
+}
+.river_comment_form.hidden .input_text {
+ width:530px;
+ float:left;
+}
+.river_link_divider {
+ width:10px;
+ text-align: center;
+} \ No newline at end of file