aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mod/reportedcontent/views/default/reportedcontent/footer_link.php8
-rw-r--r--views/default/annotation/generic_comment.php4
-rw-r--r--views/default/css/elements/forms.php2
-rw-r--r--views/default/css/elements/navigation.php3
-rw-r--r--views/default/css/elements/typography.php7
-rw-r--r--views/default/icon/default.php8
-rw-r--r--views/default/input/form.php2
-rw-r--r--views/default/navigation/menu/user_hover.php2
-rw-r--r--views/default/output/tagcloud.php3
9 files changed, 30 insertions, 9 deletions
diff --git a/mod/reportedcontent/views/default/reportedcontent/footer_link.php b/mod/reportedcontent/views/default/reportedcontent/footer_link.php
index 4e893522c..58a19b343 100644
--- a/mod/reportedcontent/views/default/reportedcontent/footer_link.php
+++ b/mod/reportedcontent/views/default/reportedcontent/footer_link.php
@@ -7,10 +7,14 @@
$title = elgg_echo('reportedcontent:this:tooltip');
$text = elgg_echo('reportedcontent:this');
-?>
+$url = elgg_get_site_url() . 'pg/reportedcontent/add/?address=';
+$href = "javascript:location.href='$url'";
+$href .= "+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)";
+$href = elgg_format_url($href);
+?>
-<a class="report-this" href="javascript:location.href='<?php echo elgg_get_site_url(); ?>pg/reportedcontent/add/?address='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)" title="<?php echo $title; ?>">
+<a class="report-this" href="<?php echo $href; ?>" title="<?php echo $title; ?>">
<span class="elgg-icon report-this-icon"></span>
<?php echo $text; ?>
</a>
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 = <<<HTML
-<p class="mbn">
+<div class="mbn">
$delete_button
$commenter_link
<span class="elgg-subtext">
$friendlytime
</span>
$comment_text
-</p>
+</div>
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;
}
+<?php //@todo many location-dependent styles are for styling headings. Move those here and make them into non-location-dependent classes ?>
-<?php //@todo many location-dependent styles are for styling headings. Move those here and make them into non-location-dependent classes ?> \ 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 src=\"$img_src\" />";
+$img = "<img src=\"$img_src\" alt=\"$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 "<form $attributes>$body</form>"; \ No newline at end of file
+echo "<form $attributes><fieldset>$body</fieldset></form>"; \ 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 '<ul class="elgg-menu elgg-menu-hover">';
// name and username
$name_link = elgg_view('output/url', array(
'href' => $user->getURL(),
- 'text' => "<h3>$user->name</h3>&#64;$user->username",
+ 'text' => "<span class=\"elgg-heading-basic\">$user->name</span>&#64;$user->username",
));
echo "<li>$name_link</li>";
diff --git a/views/default/output/tagcloud.php b/views/default/output/tagcloud.php
index 2f76d9cbe..442244d8d 100644
--- a/views/default/output/tagcloud.php
+++ b/views/default/output/tagcloud.php
@@ -50,7 +50,8 @@ if (!empty($vars['tagcloud']) && is_array($vars['tagcloud'])) {
$size = 100;
}
$url = elgg_get_site_url()."pg/search/?q=". urlencode($tag->tag) . "&search_type=tags$type$subtype";
- $cloud .= "<a href=\"$url\" style=\"font-size: $size%\" title=\"".addslashes($tag->tag)." ($tag->total)\" style=\"text-decoration:none;\">" . htmlspecialchars($tag->tag, ENT_QUOTES, 'UTF-8') . "</a>";
+ $url = elgg_format_url($url);
+ $cloud .= "<a href=\"$url\" style=\"font-size: $size%\" title=\"".addslashes($tag->tag)." ($tag->total)\">" . htmlspecialchars($tag->tag, ENT_QUOTES, 'UTF-8') . "</a>";
}
if ($context != 'tags') {