From 92f27f915e3a5e536cefb3e1c7f13ef2b4efc467 Mon Sep 17 00:00:00 2001 From: cash Date: Tue, 8 Feb 2011 02:51:33 +0000 Subject: bringing us a little closer to validating git-svn-id: http://code.elgg.org/elgg/trunk@8066 36083f99-b078-4883-b0ff-0f9b5a30f544 --- views/default/annotation/generic_comment.php | 4 ++-- views/default/css/elements/forms.php | 2 ++ views/default/css/elements/navigation.php | 3 +++ views/default/css/elements/typography.php | 7 ++++++- views/default/icon/default.php | 8 +++++++- views/default/input/form.php | 2 +- views/default/navigation/menu/user_hover.php | 2 +- views/default/output/tagcloud.php | 3 ++- 8 files changed, 24 insertions(+), 7 deletions(-) (limited to 'views/default') diff --git a/views/default/annotation/generic_comment.php b/views/default/annotation/generic_comment.php index f168546c3..040d24552 100644 --- a/views/default/annotation/generic_comment.php +++ b/views/default/annotation/generic_comment.php @@ -43,14 +43,14 @@ if ($full_view) { $comment_text = elgg_view("output/longtext", array("value" => $comment->value)); $body = << +
$delete_button $commenter_link $friendlytime $comment_text -

+
HTML; echo elgg_view_image_block($commenter_icon, $body); diff --git a/views/default/css/elements/forms.php b/views/default/css/elements/forms.php index e8916d76d..1cac80b58 100644 --- a/views/default/css/elements/forms.php +++ b/views/default/css/elements/forms.php @@ -10,6 +10,8 @@ /* *************************************** Form Elements *************************************** */ +.elgg-fieldset { +} label { font-weight: bold; color: #333333; diff --git a/views/default/css/elements/navigation.php b/views/default/css/elements/navigation.php index 0d275f09c..0c92f069a 100644 --- a/views/default/css/elements/navigation.php +++ b/views/default/css/elements/navigation.php @@ -262,6 +262,9 @@ .elgg-menu-hover > li:last-child { border-bottom: none; } +.elgg-menu-hover .elgg-heading-basic { + display: block; +} .elgg-menu-hover a { display: block; padding: 2px 8px; diff --git a/views/default/css/elements/typography.php b/views/default/css/elements/typography.php index cc1ee3ed2..c76802231 100644 --- a/views/default/css/elements/typography.php +++ b/views/default/css/elements/typography.php @@ -39,5 +39,10 @@ h6 { font-size: 0.8em; } font-family: Monaco,"Courier New",Courier,monospace; } + - \ No newline at end of file +.elgg-heading-basic { + color: #0054A7; + font-size: 1.2em; + font-weight: bold; +} diff --git a/views/default/icon/default.php b/views/default/icon/default.php index a29886064..c033a256b 100644 --- a/views/default/icon/default.php +++ b/views/default/icon/default.php @@ -18,13 +18,19 @@ if (!in_array($vars['size'], $sizes)) { $vars['size'] = "medium"; } +if (isset($entity->name)) { + $title = $entity->name; +} else { + $title = $entity->title; +} + $url = $entity->getURL(); if (isset($vars['href'])) { $url = $vars['href']; } $img_src = $entity->getIcon($vars['size']); -$img = ""; +$img = "\"$title\""; if ($url) { echo elgg_view('output/url', array( diff --git a/views/default/input/form.php b/views/default/input/form.php index 31c221688..50c51be73 100644 --- a/views/default/input/form.php +++ b/views/default/input/form.php @@ -35,4 +35,4 @@ unset($vars['disable_security']); $attributes = elgg_format_attributes($vars); -echo "
$body
"; \ No newline at end of file +echo "
$body
"; \ No newline at end of file diff --git a/views/default/navigation/menu/user_hover.php b/views/default/navigation/menu/user_hover.php index 10db3a006..25bed11f5 100644 --- a/views/default/navigation/menu/user_hover.php +++ b/views/default/navigation/menu/user_hover.php @@ -18,7 +18,7 @@ echo '