User icons made circles, shadow in river messages.

diff --git a/views/default/css/elements/components.php b/views/default/css/elements/components.php
index e62e65d5a430909cabad270d197298b0e7fc766c..8f2c3925a65ad9120398a69dfc926417304e05df 100644 (file)
--- a/views/default/css/elements/components.php
+++ b/views/default/css/elements/components.php
@@ -175,8 +175,8 @@
 .elgg-river-content {
        color: #444;
        background-color: #DDD;
-       border-right: solid px #888;
-       border-bottom: solid px #888;
+       border-right: solid 1px #888;
+       border-bottom: solid 1px #888;
        font-size: 85%;
        line-height: 1.5em;
        margin: 8px 0 5px 0;

diff --git a/views/default/css/elements/forms.php b/views/default/css/elements/forms.php
index a5778760bfd6c32e1a89ba58fa49cdcfe2097240..746fd8204d66963dc898da99b393ae2f1768c941 100644 (file)
--- a/views/default/css/elements/forms.php
+++ b/views/default/css/elements/forms.php
@@ -22,9 +22,7 @@ fieldset > div:last-child {
 }
 
 label {
-       font-weight: bold;
        color: #333;
-       font-size: 110%;
 }
 
 input, textarea {

diff --git a/views/default/css/elements/icons.php b/views/default/css/elements/icons.php
index f7c789e33fdd6bd1a49b6ea2f8c7f46b5aff9fda..f99a41a7ca9cbd8c6759b8fc8ef6b0106b54889d 100644 (file)
--- a/views/default/css/elements/icons.php
+++ b/views/default/css/elements/icons.php
@@ -275,6 +275,10 @@
 .elgg-icon-video {
        background-position: 0 -1512px;
 }
+.elgg-icon-logout {
+       background: transparent url(<?php echo elgg_get_site_url(); ?>mod/_graphics/usernavicons.png) no-repeat left;
+       background-position: 0 0;
+}
 
 
 .elgg-avatar > .elgg-icon-hover-menu {
@@ -307,9 +311,9 @@
        height: 25px;
        
        /* remove the border-radius if you don't want rounded avatars in supported browsers */
-       -webkit-border-radius: 3px;
-       -moz-border-radius: 3px;
-       border-radius: 3px;
+       -webkit-border-radius: 13px;
+       -moz-border-radius: 13px;
+       border-radius: 13px;
        
        -moz-background-clip:  border;
        background-clip:  border;
@@ -325,9 +329,9 @@
        height: 40px;
        
        /* remove the border-radius if you don't want rounded avatars in supported browsers */
-       -webkit-border-radius: 5px;
-       -moz-border-radius: 5px;
-       border-radius: 5px;
+       -webkit-border-radius: 20px;
+       -moz-border-radius: 20px;
+       border-radius: 20px;
        
        -moz-background-clip:  border;
        background-clip:  border;

diff --git a/views/default/css/n1_theme/landing.php b/views/default/css/n1_theme/landing.php
index 1e8c9d1af80cb2f9fb012536973836a81e0af3e1..1343d51aa040f0c1042c6d1720f28fbb9aed5440 100644 (file)
--- a/views/default/css/n1_theme/landing.php
+++ b/views/default/css/n1_theme/landing.php
@@ -23,6 +23,10 @@
        color: #666;
 }
 
+.elgg-sidebar h3 {
+       font-size: 1.6em;
+}
+
 #login-dropdown {
        display:none;
 }

diff --git a/views/default/river/elements/body.php b/views/default/river/elements/body.php
new file mode 100644 (file)
index 0000000..b8e6c11
--- /dev/null
+++ b/views/default/river/elements/body.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Body of river item
+ *
+ * @uses $vars['item']        ElggRiverItem
+ * @uses $vars['summary']     Alternate summary (the short text summary of action)
+ * @uses $vars['message']     Optional message (usually excerpt of text)
+ * @uses $vars['attachments'] Optional attachments (displaying icons or other non-text data)
+ * @uses $vars['responses']   Alternate respones (comments, replies, etc.)
+ */
+
+$item = $vars['item'];
+
+$menu = elgg_view_menu('river', array(
+       'item' => $item,
+       'sort_by' => 'priority',
+       'class' => 'elgg-menu-hz',
+));
+
+// river item header
+$timestamp = elgg_view_friendly_time($item->getPostedTime());
+
+$summary = elgg_extract('summary', $vars, elgg_view('river/elements/summary', array('item' => $vars['item'])));
+if ($summary === false) {
+       $subject = $item->getSubjectEntity();
+       $summary = elgg_view('output/url', array(
+               'href' => $subject->getURL(),
+               'text' => $subject->name,
+               'class' => 'elgg-river-subject',
+               'is_trusted' => true,
+       ));
+}
+
+$message = elgg_extract('message', $vars, false);
+if ($message) {
+       $message = "<div class=\"elgg-river-message\">$message</div>";
+}
+
+$attachments = elgg_extract('attachments', $vars, false);
+if ($attachments) {
+       $attachments = "<div class=\"elgg-river-attachments clearfix\">$attachments</div>";
+}
+
+$responses = elgg_view('river/elements/responses', $vars);
+if ($responses) {
+       $responses = "<div class=\"elgg-river-responses\">$responses</div>";
+}
+
+$group_string = '';
+$object = $item->getObjectEntity();
+$container = $object->getContainerEntity();
+if ($container instanceof ElggGroup && $container->guid != elgg_get_page_owner_guid()) {
+       $group_link = elgg_view('output/url', array(
+               'href' => $container->getURL(),
+               'text' => $container->name,
+               'is_trusted' => true,
+       ));
+       $group_string = elgg_echo('river:ingroup', array($group_link));
+}
+
+echo <<<RIVER
+$menu
+<div class="elgg-river-summary">$summary $group_string <span class="elgg-river-timestamp">$timestamp</span></div>
+$message
+$attachments
+$responses
+RIVER;