]> gitweb.fluxo.info Git - lorea/elgg.git/commitdiff
projects / lorea / elgg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 313f19f)
bringing us a little closer to validating
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Tue, 8 Feb 2011 02:51:33 +0000 (02:51 +0000)
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Tue, 8 Feb 2011 02:51:33 +0000 (02:51 +0000)
git-svn-id: http://code.elgg.org/elgg/trunk@8066 36083f99-b078-4883-b0ff-0f9b5a30f544

mod/reportedcontent/views/default/reportedcontent/footer_link.php patch | blob | history
views/default/annotation/generic_comment.php patch | blob | history
views/default/css/elements/forms.php patch | blob | history
views/default/css/elements/navigation.php patch | blob | history
views/default/css/elements/typography.php patch | blob | history
views/default/icon/default.php patch | blob | history
views/default/input/form.php patch | blob | history
views/default/navigation/menu/user_hover.php patch | blob | history
views/default/output/tagcloud.php patch | blob | history

diff --git a/mod/reportedcontent/views/default/reportedcontent/footer_link.php b/mod/reportedcontent/views/default/reportedcontent/footer_link.php
index 4e893522c383d4d29e92da15146a1d95b1996f98..58a19b34323e5d443b4a7e0ea540e0175e29a64e 100644 (file)
--- 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 f168546c3bb9e48875f9e4570c659ee92ba7a3e8..040d24552c00235a72e0b7ecc72ef252482aec75 100644 (file)
--- 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 e8916d76ddd37c5f24fd33c6d98fb8890f8f4a78..1cac80b587c151bcca1d41f721acc2dfc281ffe3 100644 (file)
--- 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 0d275f09c9e3d5c9f52e349bb2a72c83998ba940..0c92f069a25a28a56e00927968ff2265da2aae4b 100644 (file)
--- 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 cc1ee3ed25bfe5b7afb3f64b0f26e175a1cb63d7..c768022315fabd893c3407e4726e84bfda327ed5 100644 (file)
--- 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 a29886064ac499caa083316c43e7a0fd408b272c..c033a256bfc20347db82a07e39ed459782a018a7 100644 (file)
--- 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 31c22168804d8e57123c7beefdc203cac7aa5775..50c51be7338d59db18be9cd006e56a02cad9b2bf 100644 (file)
--- 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 10db3a0064acd60c94b888a829e0e4b415aa659e..25bed11f549ea835dde3c6763b6372404eecaac8 100644 (file)
--- 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 2f76d9cbe24530840a342bf010e3c030f426014e..442244d8d82d42a98b0bf3f44a1da54e580f20e1 100644 (file)
--- 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') {
Social Networking Engine