From 5026cb1b92ccd679bf9a425b1c9be401ab56eed7 Mon Sep 17 00:00:00 2001 From: cash Date: Thu, 27 Jan 2011 15:15:43 +0000 Subject: introducing elgg-subtext as replacement for elgg-list-subtitle and elgg-subtitle git-svn-id: http://code.elgg.org/elgg/trunk@7950 36083f99-b078-4883-b0ff-0f9b5a30f544 --- views/default/annotation/default.php | 2 ++ views/default/annotation/generic_comment.php | 4 ++-- views/default/annotation/likes.php | 2 +- views/default/css/admin.php | 2 +- views/default/css/elements/core.php | 6 ++++-- views/default/layout/objects/list/body.php | 4 ++-- 6 files changed, 12 insertions(+), 8 deletions(-) (limited to 'views') diff --git a/views/default/annotation/default.php b/views/default/annotation/default.php index b7ae2146e..dc1337362 100644 --- a/views/default/annotation/default.php +++ b/views/default/annotation/default.php @@ -1,6 +1,8 @@ owner_guid); diff --git a/views/default/annotation/generic_comment.php b/views/default/annotation/generic_comment.php index eeceba344..f168546c3 100644 --- a/views/default/annotation/generic_comment.php +++ b/views/default/annotation/generic_comment.php @@ -46,7 +46,7 @@ if ($full_view) {

$delete_button $commenter_link - + $friendlytime $comment_text @@ -63,7 +63,7 @@ HTML; $on = elgg_echo('on'); $body = << + $commenter_link $on $entity_link ($friendlytime) HTML; diff --git a/views/default/annotation/likes.php b/views/default/annotation/likes.php index 20965f456..748d0b601 100644 --- a/views/default/annotation/likes.php +++ b/views/default/annotation/likes.php @@ -39,7 +39,7 @@ $body = << $delete_button $user_link $likes_string - + $friendlytime

diff --git a/views/default/css/admin.php b/views/default/css/admin.php index 03476ca5b..4aa1b5b52 100644 --- a/views/default/css/admin.php +++ b/views/default/css/admin.php @@ -560,7 +560,7 @@ a.elgg-widget-edit-button:hover, a.elgg-widget-delete-button:hover { -.elgg-list-subtitle, .elgg-subtitle { +.elgg-subtext { color: #666666; font-size: 85%; line-height: 1.2em; diff --git a/views/default/css/elements/core.php b/views/default/css/elements/core.php index b86af351b..304ae615e 100644 --- a/views/default/css/elements/core.php +++ b/views/default/css/elements/core.php @@ -46,12 +46,14 @@ .elgg-list-metadata, .elgg-list-metadata a { color: #aaaaaa; } -.elgg-list-subtitle, .elgg-subtitle { +.elgg-list-item .elgg-subtext { + margin-bottom: 5px; +} +.elgg-subtext { color: #666666; font-size: 85%; line-height: 1.2em; font-style: italic; - margin-bottom: 5px; } .elgg-tags { margin-bottom: 5px; diff --git a/views/default/layout/objects/list/body.php b/views/default/layout/objects/list/body.php index 00bc1c058..5f7fc74f9 100644 --- a/views/default/layout/objects/list/body.php +++ b/views/default/layout/objects/list/body.php @@ -5,7 +5,7 @@ * Sample output * *

Title

- *

Posted 3 hours ago by George

+ *

Posted 3 hours ago by George

*

one, two

*
Excerpt text
* @@ -49,7 +49,7 @@ if ($metadata) { echo $metadata; } echo "

$title_link

"; -echo "

$subtitle

"; +echo "

$subtitle

"; echo $tags; if ($content) { echo "
$content
"; -- cgit v1.2.3