diff options
21 files changed, 164 insertions, 306 deletions
diff --git a/mod/bookmarks/views/default/river/object/bookmarks/create.php b/mod/bookmarks/views/default/river/object/bookmarks/create.php index 1c55c0bb2..8de1c27b0 100644 --- a/mod/bookmarks/views/default/river/object/bookmarks/create.php +++ b/mod/bookmarks/views/default/river/object/bookmarks/create.php @@ -13,6 +13,6 @@ $performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubje $object = get_entity($vars['item']->object_guid); $url = $object->getURL(); $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>"; -$string = "<div class=\"river_content_title\">" . sprintf(elgg_echo("bookmarks:river:created"),$url) . " "; -$string .= "<a href=\"" . $object->address . "\">" . $object->title . "</a> <span class=\"river_item_time\">" . friendly_time($object->time_updated) . "</span></div>"; //elgg_echo("bookmarks:river:item") . "</a></div>"; +$string = sprintf(elgg_echo("bookmarks:river:created"),$url) . " "; +$string .= "<a href=\"" . $object->address . "\">" . $object->title . "</a> <span class='entity_subtext'>" . friendly_time($object->time_updated) . "</span>"; echo $string;
\ No newline at end of file diff --git a/mod/profile/views/default/river/user/default/profileiconupdate.php b/mod/profile/views/default/river/user/default/profileiconupdate.php index 7dc2c0371..1dca77df6 100644 --- a/mod/profile/views/default/river/user/default/profileiconupdate.php +++ b/mod/profile/views/default/river/user/default/profileiconupdate.php @@ -3,6 +3,6 @@ $performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject(); $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>"; - $string = "<div class=\"river_content_title\">" . sprintf(elgg_echo("profile:river:update"),$url) ." <span class=\"river_item_time\">" . friendly_time($vars['item']->posted) . "</span></div>"; + $string = sprintf(elgg_echo("profile:river:update"),$url) ." <span class='entity_subtext'>" . friendly_time($vars['item']->posted) . "</span>"; echo $string;
\ No newline at end of file diff --git a/mod/profile/views/default/river/user/default/profileupdate.php b/mod/profile/views/default/river/user/default/profileupdate.php index 325d806e4..e609e1a40 100644 --- a/mod/profile/views/default/river/user/default/profileupdate.php +++ b/mod/profile/views/default/river/user/default/profileupdate.php @@ -3,7 +3,7 @@ $performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject(); $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>"; - $string = "<div class=\"river_content_title\">" . sprintf(elgg_echo("profile:river:update"),$url) ." <span class=\"river_item_time\">" . friendly_time($vars['item']->posted) . "</span></div>"; + $string = sprintf(elgg_echo("profile:river:update"),$url) ." <span class='entity_subtext'>" . friendly_time($vars['item']->posted) . "</span>"; ?> diff --git a/mod/riverdashboard/endpoint/ping.php b/mod/riverdashboard/endpoint/ping.php index 2a87da746..c5613dd0c 100644 --- a/mod/riverdashboard/endpoint/ping.php +++ b/mod/riverdashboard/endpoint/ping.php @@ -45,8 +45,7 @@ $all_activity = $annotations + $entity_creation + $entity_update; if ($all_activity > 0) {
$s = ($all_activity == 1) ? '' : 's';
- echo "<a href=\"\" onClick=\"window.location.reload();\" class=\"update_wire\" style='margin-top:9px;'>$all_activity update$s!</a>";
- //echo "<script type=\"text/javascript\">$(document).ready(function() { document.title = \"[{$all_activity}] new item{$s}!\"; }); </script>";
+ echo "<a href='' onClick=\"window.location.reload();\" class='update_link'>$all_activity update$s!</a>";
?>
<script type="text/javascript">
$(document).ready(function(){
diff --git a/mod/riverdashboard/graphics/refresh.png b/mod/riverdashboard/graphics/refresh.png Binary files differnew file mode 100644 index 000000000..71aa8e5e2 --- /dev/null +++ b/mod/riverdashboard/graphics/refresh.png diff --git a/mod/riverdashboard/views/default/river/item/list.php b/mod/riverdashboard/views/default/river/item/list.php index 25774ff08..0c0d7a4db 100644 --- a/mod/riverdashboard/views/default/river/item/list.php +++ b/mod/riverdashboard/views/default/river/item/list.php @@ -1,9 +1,4 @@ <?php -/** - */ -?> -<div class="river_item_list"> -<?php if (isset($vars['items']) && is_array($vars['items'])) { $i = 0; @@ -33,7 +28,7 @@ $nexturl=$baseurl . '?' . $urladdition; } - $nav .= '<a class="back" href="'.$nexturl.'">« ' . elgg_echo('previous') . '</a> '; + $nav .= '<a class="pagination_previous" href="'.$nexturl.'">« ' . elgg_echo('previous') . '</a> '; } if ($vars['offset'] > 0) { @@ -48,12 +43,11 @@ $prevurl=$baseurl . '?' . $urladdition; } - $nav .= '<a class="forward" href="'.$prevurl.'">' . elgg_echo('next') . ' »</a> '; + $nav .= '<a class="pagination_next" href="'.$prevurl.'">' . elgg_echo('next') . ' »</a> '; } if (!empty($nav)) { - echo '<div class="river_pagination"><p>'.$nav.'</p><div class="clearfloat"></div></div>'; + echo '<div class="pagination clearfloat">'.$nav.'</div>'; } } -?> -</div>
\ No newline at end of file +?>
\ No newline at end of file diff --git a/mod/riverdashboard/views/default/river/item/wrapper.php b/mod/riverdashboard/views/default/river/item/wrapper.php index 1aa508d99..eabe48e53 100644 --- a/mod/riverdashboard/views/default/river/item/wrapper.php +++ b/mod/riverdashboard/views/default/river/item/wrapper.php @@ -47,73 +47,65 @@ else $num_comments = $comment_count - 3; ?> <div class="river_item"> - <!-- avatar --> - <span class="river_item_useravatar" style="float:left;margin:0 10px 10px 0;"> - <?php - echo elgg_view("profile/icon",array('entity' => $user, 'size' => 'small')); - ?> + <span class="river_item_useravatar"> + <?php echo elgg_view("profile/icon",array('entity' => $user, 'size' => 'small')); ?> </span> - <!-- body contents, generated by the river view in each plugin --> - <?php - echo $vars['body']; - ?> - <div class="clearfloat"></div> - <!-- display comments and likes if on the dashboard/live feed --> - <div class="river_item_annotation"> - <?php - //display the number of comments and likes if there are any - if($num_comments != 0){ - echo "<div class='river_more_comments'><span class='more_comments'>"; - //set the correct context comment or comments - if($num_comments == 1) - echo "<a href=\"{$object_url}\">+{$num_comments} more comment</a>"; - else - echo "<a href=\"{$object_url}\">+{$num_comments} more comments</a>"; - - echo "</span></div>"; - } - //display latest 2 comments if there are any - if($get_comments){ - $counter = 0; - $background = ""; - echo "<div class='river_comments'>"; - foreach($get_comments as $gc){ - //get the comment owner - $comment_owner = get_user($gc->owner_guid); - //get the comment owner's profile url - $comment_owner_url = $comment_owner->getURL(); - // color-code each of the 3 comments - if( ($counter == 2 && $comment_count >= 4) || ($counter == 1 && $comment_count == 2) || ($counter == 0 && $comment_count == 1) || ($counter == 2 && $comment_count == 3) ) - $alt = 'latest'; - else if( ($counter == 1 && $comment_count >= 4) || ($counter == 0 && $comment_count == 2) || ($counter == 1 && $comment_count == 3) ) - $alt = 'penultimate'; - - //display comment - echo "<div class='river_comment {$alt}'>"; - echo "<div class='river_comment_owner_icon'>"; - echo elgg_view("profile/icon",array('entity' => $comment_owner, 'size' => 'tiny')); - echo "</div>"; - //truncate comment to 150 characters - if(strlen($gc->value) > 150) { - $gc->value = substr($gc->value, 0, strpos($gc->value, ' ', 150)) . "..."; - } - $contents = strip_tags($gc->value); - echo "<div class='comment_wrapper'>"; - echo "<a href=\"{$comment_owner_url}\">" . $comment_owner->name . "</a> " . parse_urls($contents); - echo "<br /><span class='river_item_time'>" . friendly_time($gc->time_created) . "</span>"; - echo "<div class=\"clearfloat\"></div>"; - echo "</div></div>"; - $counter++; - } - echo "</div>"; - } + <div class="river_item_contents clearfloat"> + <!-- body contents, generated by the river view in each plugin --> + <?php echo $vars['body']; ?> + </div> + +<!-- display comments --> +<?php + //display latest 2 comments if there are any + if($get_comments){ + $counter = 0; + $background = ""; + echo "<div class='river_comments'>"; + + //display the number of comments if there are any + if($num_comments != 0){ + //set the correct context comment or comments + if($num_comments == 1) + echo "<a class='river_more_comments' href=\"{$object_url}\">+{$num_comments} more comment</a>"; + else + echo "<a class='river_more_comments' href=\"{$object_url}\">+{$num_comments} more comments</a>"; + } + + foreach($get_comments as $gc){ + //get the comment owner + $comment_owner = get_user($gc->owner_guid); + //get the comment owner's profile url + $comment_owner_url = $comment_owner->getURL(); + // color-code each of the 3 comments + if( ($counter == 2 && $comment_count >= 4) || ($counter == 1 && $comment_count == 2) || ($counter == 0 && $comment_count == 1) || ($counter == 2 && $comment_count == 3) ) + $alt = 'latest'; + else if( ($counter == 1 && $comment_count >= 4) || ($counter == 0 && $comment_count == 2) || ($counter == 1 && $comment_count == 3) ) + $alt = 'penultimate'; + + //display comment + echo "<div class='river_comment {$alt} clearfloat'>"; + echo "<span class='river_comment_owner_icon'>"; + echo elgg_view("profile/icon",array('entity' => $comment_owner, 'size' => 'tiny')); + echo "</span>"; + //truncate comment to 150 characters + if(strlen($gc->value) > 150) { + $gc->value = substr($gc->value, 0, strpos($gc->value, ' ', 150)) . "..."; + } + $contents = strip_tags($gc->value); + echo "<div class='river_comment_contents'>"; + echo "<a href=\"{$comment_owner_url}\">" . $comment_owner->name . "</a> " . parse_urls($contents); + echo "<span class='entity_subtext'>" . friendly_time($gc->time_created) . "</span>"; + echo "</div></div>"; + $counter++; + } + echo "</div>"; + } //display the comment link - if($vars['item']->type != 'user'){ - //for now don't display the comment link on bookmarks and wire messages - if($vars['item']->subtype != 'thewire' && $vars['item']->subtype != 'bookmarks' && $vars['item']->subtype != '') - echo "<span class='comment_link'><a href=\"{$object_url}\">Comment</a></span>"; + if($vars['item']->type != 'user'){ + //for now don't display the comment link on bookmarks and wire messages + if($vars['item']->subtype != 'thewire' && $vars['item']->subtype != 'bookmarks' && $vars['item']->subtype != '') + echo "<a class='comment_link' href=\"{$object_url}\">Comment</a>"; } ?> - </div> - <div class="clearfloat"></div> </div>
\ No newline at end of file diff --git a/mod/riverdashboard/views/default/riverdashboard/container.php b/mod/riverdashboard/views/default/riverdashboard/container.php index a72de9fc4..2d2d5b069 100644 --- a/mod/riverdashboard/views/default/riverdashboard/container.php +++ b/mod/riverdashboard/views/default/riverdashboard/container.php @@ -1,4 +1,4 @@ -<div id="river_container"><?php echo $vars['body']; ?></div><!-- /river_container -->
+<?php echo $vars['body']; ?>
<script type="text/JavaScript">
$(document).ready(function(){
@@ -30,7 +30,7 @@ function thewireUpdateChecker(interval) { 'data': {'seconds_passed': this.seconds_passed},
'success': function(data) {
if (data) {
- $('#the-wire-updates-notice').html(data).slideDown();
+ $('#riverdashboard_updates').html(data).slideDown();
// could crank down the interval here.
// if we change the message to simply "New Posts!"
// we could stop the polling altogether.
diff --git a/mod/riverdashboard/views/default/riverdashboard/css.php b/mod/riverdashboard/views/default/riverdashboard/css.php index d558b215a..c8c004213 100644 --- a/mod/riverdashboard/views/default/riverdashboard/css.php +++ b/mod/riverdashboard/views/default/riverdashboard/css.php @@ -1,138 +1,67 @@ <?php - - /** - * Elgg riverdashboard CSS - * - */ - +/** + * Elgg riverdashboard CSS + * + */ ?> - -.riverdashboard_filtermenu { - margin:10px 0 10px 0; - float:right; -} - -.river_pagination .forward, -.river_pagination .back { - display:block; - float:left; - border:1px solid #cccccc; - color:#4690d6; - text-align: center; - font-size: 12px; - font-weight: normal; - margin:0 6px 0 0; - padding:0 4px 1px 4px; - cursor: pointer; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; +#riverdashboard_updates { + border-bottom:1px solid #cccccc; } -.river_pagination .forward:hover, -.river_pagination .back:hover { - background:#4690d6; +#riverdashboard_updates a.update_link { + display: inline-table; + color:white; + font-weight: bold; + padding:1px 8px 2px 24px; + margin-top:9px; + cursor: pointer; + background: red url("<?php echo $vars['url']; ?>mod/riverdashboard/graphics/refresh.png") no-repeat 5px 3px; + -webkit-border-radius: 10px; + -moz-border-radius: 10px; +} +#riverdashboard_updates a.update_link:hover { + background: #4690D6 url("<?php echo $vars['url']; ?>mod/riverdashboard/graphics/refresh.png") no-repeat 5px -22px; color:white; text-decoration: none; - border:1px solid #4690d6; } -.river_pagination .back { - margin:0 20px 0 0; +.riverdashboard_filtermenu { + margin:10px 0 10px 0; + float:right; } -/* IE6 */ -* html .river_pagination { margin-top:17px; } -/* IE7 */ -*:first-child+html .river_pagination { margin-top:17px; } -/* activity widget */ -.collapsable_box_content .content_area_user_title h2 { - font-size:1.0em; +/* RIVER ENTRY */ +.river_item { + border-bottom:1px solid #cccccc; + padding:7px 0 7px 0; } -.collapsable_box_content .ContentWrapper.ActivityWidget { - +.river_item p { + margin:0; } - -.river_content img { - margin:2px 0 2px 20px; +.river_item_useravatar { + float:left; + margin-top:3px; + margin-left:1px; } - -.river_content_title { +.river_item_contents { margin-left:55px; - -} -.river_content_title a { - font-weight: bold; - /* color:#333333; */ } - .river_content_display { border-left:1px solid #DDDDDD; font-size:90%; - margin:8px 0 6px 55px; + margin:8px 0 6px 0; padding-left:5px; } - -.river_content_display p { - padding:0; - margin:0; -} - .following_icon { width:20px; height:25px; margin:0 2px 0 2px; background: url(<?php echo $vars['url']; ?>mod/riverdashboard/graphics/follow_icon.png) no-repeat left -7px; } -.river_content_display div.usericon a.icon img { - width:25px; - height:25px; -} - -/* *************************************** - ACTIVITY RIVER -*************************************** */ -.river_item_list { - border-top:1px solid #cccccc; -} -.river_item p { - margin:0; -} -.river_item { - border-bottom:1px solid #cccccc; - padding:7px 0 10px 0; -/* - margin-top:5px; - margin-bottom:5px; -*/ -} -.river_item_annotation { - -} -span.more_comments { - -} -.river_more_comments { - display:block; - float:right; - padding:2px 4px 7px 30px; - text-align:right; - width:auto; -} +/* LATEST COMMENTS IN RIVER */ .river_comments { margin:5px 0 0 55px; width:auto; } -.comment_wrapper { - margin-left:34px; -} -.comment_link { - margin-left:55px; -} - -.river_comment_owner_icon { - float:left; - margin:0 8px 4px 2px; -} - .river_comment { background-color: #f8f8f8; padding:3px; @@ -147,50 +76,30 @@ span.more_comments { background-color: #dedede; margin-bottom:0; } - -.river_item_time { - font-size:90%; - color:#666666; +a.river_more_comments { + display:block; + float:right; + padding:2px 4px 7px 30px; + text-align:right; + width:auto; } -.river_item .river_item_useravatar { +.river_comment_owner_icon { float:left; - margin:3px 0 0 1px; + margin:3px 8px 4px 2px; } -/* IE6 fix */ -* html .river_item p { - /* padding:3px 0 3px 20px; */ +.river_comment_contents { + margin-left:34px; } -/* IE7 */ -*:first-child+html .river_item p { - /* min-height:17px; */ +.river_item .comment_link { + margin-left:55px; } - -/* .river_object_blog_update, */ - -.river_object_blog_create, -.river_object_page_create, -.river_object_page_update { - float:left; - width:26px; - height:32px; - border:none; - background-color: transparent; - margin-right:6px; - margin-top:2px; -} -.river_object_blog_create { - background-image: url(<?php echo $vars['url']; ?>mod/riverdashboard/graphics/icon_activity_blogs.png); - background-position: left top; - background-repeat: no-repeat; -} -.river_object_page_create, -.river_object_page_update { - background-image: url(<?php echo $vars['url']; ?>mod/riverdashboard/graphics/icon_activity_pages.png); - background-position: left top; - background-repeat: no-repeat; +.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; } @@ -291,5 +200,6 @@ span.more_comments { background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_comment.gif) no-repeat left -1px; } +*/ diff --git a/mod/riverdashboard/views/default/riverdashboard/menu.php b/mod/riverdashboard/views/default/riverdashboard/menu.php index 44084cec9..8a8964384 100644 --- a/mod/riverdashboard/views/default/riverdashboard/menu.php +++ b/mod/riverdashboard/views/default/riverdashboard/menu.php @@ -14,7 +14,7 @@ switch($vars['orient']) { break;
}
?>
-<div id="Submenu"><ul>
+<div class="submenu"><ul>
<?php
if(isloggedin()){
?>
diff --git a/mod/riverdashboard/views/default/riverdashboard/nav.php b/mod/riverdashboard/views/default/riverdashboard/nav.php index db868db51..b38a4e20a 100644 --- a/mod/riverdashboard/views/default/riverdashboard/nav.php +++ b/mod/riverdashboard/views/default/riverdashboard/nav.php @@ -27,27 +27,25 @@ switch($vars['orient']) { break;
}
?>
-<div class="ContentWrapper">
- <div class="riverdashboard_filtermenu">
- <?php
- $location_filter = "<select onchange=\"window.open(this.options[this.selectedIndex].value,'_top')\" name=\"file_filter\" class='Notstyled' >";
- $current = get_input('subtype');
- foreach($contents as $label => $content) {
- $get_values = explode(",", $content);
- //select the current filter
- if($get_values[1] == $current)
- $selected = "SELECTED";
- //set the drop down filter
- if($content[0] && $content[1])
- $location_filter .= "<option {$selected} class='Nomenuoption' value=\"{$CONFIG->url}mod/riverdashboard/index.php?type={$get_values[0]}&subtype={$get_values[1]}{$display_option}\" >" . elgg_echo($label) . "</option>";
- //reset selected
- $selected = '';
- }
- $location_filter .= "</select>";
- echo $location_filter;
- ?>
- <input type="hidden" name="display" id="display" value="<?php echo htmlentities($vars['orient']); ?>" />
- </div>
-<!-- </div> don't close ContentWrapper here, it happens later -->
+<div class="riverdashboard_filtermenu">
+ <?php
+ $location_filter = "<select onchange=\"window.open(this.options[this.selectedIndex].value,'_top')\" name=\"file_filter\" class='Notstyled' >";
+ $current = get_input('subtype');
+ foreach($contents as $label => $content) {
+ $get_values = explode(",", $content);
+ //select the current filter
+ if($get_values[1] == $current)
+ $selected = "SELECTED";
+ //set the drop down filter
+ if($content[0] && $content[1])
+ $location_filter .= "<option {$selected} class='Nomenuoption' value=\"{$CONFIG->url}mod/riverdashboard/index.php?type={$get_values[0]}&subtype={$get_values[1]}{$display_option}\" >" . elgg_echo($label) . "</option>";
+ //reset selected
+ $selected = '';
+ }
+ $location_filter .= "</select>";
+ echo $location_filter;
+ ?>
+ <input type="hidden" name="display" id="display" value="<?php echo htmlentities($vars['orient']); ?>" />
+</div>
-<div id="the-wire-updates-notice" class="ContentWrapper clearfloat"></div>
+<div id="riverdashboard_updates" class="clearfloat"></div>
diff --git a/mod/riverdashboard/views/default/riverdashboard/newestmembers.php b/mod/riverdashboard/views/default/riverdashboard/newestmembers.php deleted file mode 100644 index 562f4b114..000000000 --- a/mod/riverdashboard/views/default/riverdashboard/newestmembers.php +++ /dev/null @@ -1,28 +0,0 @@ -<?php - - /** - * Elgg thewire view page - * - * @package ElggTheWire - * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2 - * @author Curverider <info@elgg.com> - * @copyright Curverider Ltd 2008-2010 - * @link http://elgg.com/ - * - */ - - $newest_members = elgg_get_entities_from_metadata(array('metadata_names' => 'icontime', 'types' => 'user', 'limit' => 18)); - -?> - -<div class="sidebarBox"> -<h3><?php echo elgg_echo('riverdashboard:recentmembers') ?></h3> -<div class="membersWrapper"><br /> -<?php - foreach($newest_members as $mem){ - echo "<div class=\"recentMember\">" . elgg_view("profile/icon",array('entity' => $mem, 'size' => 'tiny')) . "</div>"; - } -?> -<div class="clearfloat"></div> -</div> -</div>
\ No newline at end of file diff --git a/mod/riverdashboard/views/default/riverdashboard/sitemessage.php b/mod/riverdashboard/views/default/riverdashboard/sitemessage.php index 6cc2bc60d..058c0d17f 100644 --- a/mod/riverdashboard/views/default/riverdashboard/sitemessage.php +++ b/mod/riverdashboard/views/default/riverdashboard/sitemessage.php @@ -26,7 +26,6 @@ ?> - <div class="sidebarBox"> <?php @@ -95,4 +94,3 @@ EOT; }//end of admin check }//end of main if ?> -</div> diff --git a/mod/riverdashboard/views/default/riverdashboard/welcome.php b/mod/riverdashboard/views/default/riverdashboard/welcome.php index ac809c2a0..3f8d705df 100644 --- a/mod/riverdashboard/views/default/riverdashboard/welcome.php +++ b/mod/riverdashboard/views/default/riverdashboard/welcome.php @@ -5,6 +5,4 @@ */
?>
-<div id="content_area_user_title">
-<h2><?php echo sprintf(elgg_echo('welcome:user'), $_SESSION['user']->name); ?></h2>
-</div>
\ No newline at end of file +<h2><?php echo sprintf(elgg_echo('welcome:user'), $_SESSION['user']->name); ?></h2>
\ No newline at end of file diff --git a/mod/thewire/views/default/river/object/thewire/create.php b/mod/thewire/views/default/river/object/thewire/create.php index 9984e99e7..5308e7ba9 100644 --- a/mod/thewire/views/default/river/object/thewire/create.php +++ b/mod/thewire/views/default/river/object/thewire/create.php @@ -9,7 +9,7 @@ $desc = preg_replace('/\@([A-Za-z0-9\_\.\-]*)/i','@<a href="' . $vars['url'] . 'pg/thewire/$1">$1</a>',$desc); $string .= parse_urls($desc); - $string .= " <span class=\"river_item_time\"><a href=\"{$vars['url']}mod/thewire/add.php?wire_username={$object->getOwnerEntity()->username}\" class=\"reply\">" . elgg_echo('thewire:reply') . "</a></span>"; + $string .= " <span class='entity_subtext'>" . friendly_time($object->time_created) . "</span> <a href=\"{$vars['url']}mod/thewire/add.php?wire_username={$object->getOwnerEntity()->username}\" class='reply_link'>" . elgg_echo('thewire:reply') . "</a>"; ?> <?php diff --git a/mod/thewire/views/default/thewire/css.php b/mod/thewire/views/default/thewire/css.php index 9f460458d..6cd92dd99 100644 --- a/mod/thewire/views/default/thewire/css.php +++ b/mod/thewire/views/default/thewire/css.php @@ -96,5 +96,7 @@ right:5px; } - - +/* river wire entry */ +.river_item .reply_link { + display:block; +} diff --git a/views/default/annotation/annotate.php b/views/default/annotation/annotate.php index 9e0d20881..a1940bed7 100644 --- a/views/default/annotation/annotate.php +++ b/views/default/annotation/annotate.php @@ -11,8 +11,8 @@ if($vars['item']->annotation_id != 0) $comment = get_annotation($vars['item']->annotation_id)->value; $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>"; - $string = "<div class=\"river_content_title\">" . sprintf(elgg_echo("river:posted:generic"),$url) . " "; - $string .= elgg_echo("{$subtype}:river:annotate") . " <a href=\"{$object->getURL()}\">" . $title . "</a> " . friendly_time($object->time_created) . "</div>"; + $string = sprintf(elgg_echo("river:posted:generic"),$url) . " "; + $string .= elgg_echo("{$subtype}:river:annotate") . " <a href=\"{$object->getURL()}\">" . $title . "</a> " . friendly_time($object->time_created); if(get_context() != 'riverdashboard'){ $string .= "<div class=\"river_content_display\">"; if($comment){ diff --git a/views/default/css.php b/views/default/css.php index 6673df876..91d93acf5 100644 --- a/views/default/css.php +++ b/views/default/css.php @@ -688,11 +688,8 @@ h2 { PAGINATION *************************************** */ .pagination { - -webkit-border-radius: 8px; - -moz-border-radius: 8px; - background:white; - margin:5px 10px 5px 10px; - padding:5px; + margin:5px 0 5px 0; + padding:5px 0; } .pagination .pagination_number { display:block; @@ -732,7 +729,7 @@ h2 { .pagination .pagination_next { display:block; float:left; - border:1px solid #4690d6; + border:1px solid #cccccc; color:#4690d6; text-align: center; font-size: 12px; @@ -746,6 +743,7 @@ h2 { .pagination .pagination_previous:hover, .pagination .pagination_next:hover { background:#4690d6; + border:1px solid #4690d6; color:white; text-decoration: none; } @@ -753,7 +751,7 @@ h2 { display:block; float:left; background:#4690d6; - border:1px solid #4690d6; + border:1px solid #cccccc; text-align: center; color:white; font-size: 12px; @@ -952,21 +950,18 @@ select.styled .select_option { margin:0; line-height:1.2em; } -p.entity_title { +.entity_title { font-weight: bold; font-size: 1.1em; line-height:1.2em; color:#666666; } -p.entity_title a { +.entity_title a { color:#0054A7; } -p.entity_subtext { - margin:0; - padding:0; +.entity_subtext { color:#666666; font-size: 90%; - line-height:1.2em; } /* entity metadata block */ .entity_metadata { diff --git a/views/default/friends/river/create.php b/views/default/friends/river/create.php index da9dde1f0..3b0b7c309 100644 --- a/views/default/friends/river/create.php +++ b/views/default/friends/river/create.php @@ -13,8 +13,8 @@ $performed_on = get_entity($vars['item']->object_guid); $url = $performed_on->getURL(); $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>"; -$string = "<div class=\"river_content_title\">" . sprintf(elgg_echo("friends:river:add"),$url) . " "; -$string .= "<a href=\"{$performed_on->getURL()}\">{$performed_on->name}</a></div>"; +$string = sprintf(elgg_echo("friends:river:add"),$url) . " "; +$string .= "<a href=\"{$performed_on->getURL()}\">{$performed_on->name}</a>"; $string .= "<div class=\"river_content_display\">"; $string .= "<table><tr><td>" . elgg_view("profile/icon",array('entity' => $performed_by, 'size' => 'tiny')) . "</td>"; $string .= "<td><div class=\"following_icon\"></div></td><td>" . elgg_view("profile/icon",array('entity' => $performed_on, 'size' => 'tiny')) . "</td></tr></table>"; diff --git a/views/default/river/item/wrapper.php b/views/default/river/item/wrapper.php index 0080cf48b..a00273648 100644 --- a/views/default/river/item/wrapper.php +++ b/views/default/river/item/wrapper.php @@ -26,7 +26,7 @@ if($avatar_icon == "icon"){ <?php echo $vars['body']; ?> - <span class="river_item_time"> + <span class="entity_subtext"> (<?php echo friendly_time($vars['item']->posted); ?>) @@ -51,7 +51,7 @@ if($avatar_icon == "icon"){ <?php echo $vars['body']; ?> - <span class="river_item_time"> + <span class="entity_subtext"> (<?php echo friendly_time($vars['item']->posted); ?>) diff --git a/views/default/river/wrapper.php b/views/default/river/wrapper.php index 0b5bfad62..eddf5e2a2 100644 --- a/views/default/river/wrapper.php +++ b/views/default/river/wrapper.php @@ -34,7 +34,7 @@ if ($statement->getObject() instanceof ElggEntity) { echo $vars['entry']; ?> - <span class="river_item_time"> + <span class="entity_subtext"> (<?php echo friendly_time($time); |
