]> 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: dbdf001)
introducing elgg-subtext as replacement for elgg-list-subtitle and elgg-subtitle
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Thu, 27 Jan 2011 15:15:43 +0000 (15:15 +0000)
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Thu, 27 Jan 2011 15:15:43 +0000 (15:15 +0000)
git-svn-id: http://code.elgg.org/elgg/trunk@7950 36083f99-b078-4883-b0ff-0f9b5a30f544

mod/blog/views/default/blog/sidebar/revisions.php patch | blob | history
mod/blog/views/default/forms/blog/save.php patch | blob | history
mod/pages/views/default/annotation/page.php patch | blob | history
views/default/annotation/default.php patch | blob | history
views/default/annotation/generic_comment.php patch | blob | history
views/default/annotation/likes.php patch | blob | history
views/default/css/admin.php patch | blob | history
views/default/css/elements/core.php patch | blob | history
views/default/layout/objects/list/body.php patch | blob | history

diff --git a/mod/blog/views/default/blog/sidebar/revisions.php b/mod/blog/views/default/blog/sidebar/revisions.php
index b6c33fb38bdd25372bb0e306eba7990a356d4552..e8a8748e7c7d1ea0bfd114854ce28ecee567cd02 100644 (file)
--- a/mod/blog/views/default/blog/sidebar/revisions.php
+++ b/mod/blog/views/default/blog/sidebar/revisions.php
@@ -42,14 +42,14 @@ if (elgg_instanceof($blog, 'object', 'blog') && $blog->canEdit()) {
                                'text' => elgg_echo('blog:status:published')
                        ));
 
-                       $time = "<span class='elgg-subtitle'>"
+                       $time = "<span class='elgg-subtext'>"
                                . elgg_view_friendly_time($blog->publish_date) . "</span>";
 
                        $body .= "<li>$load : $time</li>";
                }
 
                foreach ($revisions as $revision) {
-                       $time = "<span class='elgg-subtitle'>"
+                       $time = "<span class='elgg-subtext'>"
                                . elgg_view_friendly_time($revision->time_created) . "</span>";
 
                        if ($revision->name == 'blog_auto_save') {
diff --git a/mod/blog/views/default/forms/blog/save.php b/mod/blog/views/default/forms/blog/save.php
index 76b47413829b57fa68aab76d36b53b5093d81864..9d6265a2a4c6c85f3291f12ecde03ef655abc9b1 100644 (file)
--- a/mod/blog/views/default/forms/blog/save.php
+++ b/mod/blog/views/default/forms/blog/save.php
@@ -142,7 +142,7 @@ $body_input
 
 $categories_input
 
-<p class="elgg-subtitle ptm pbm mbn elgg_hrt">
+<p class="elgg-subtext ptm pbm mbn elgg_hrt">
        $save_status <span class="blog-save-status-time">$saved</span>
 </p>
 
diff --git a/mod/pages/views/default/annotation/page.php b/mod/pages/views/default/annotation/page.php
index 87d32e23ba19463ae7fbbacbbb25b7a2523d29ed..f7a7a78a1545f0b00edcdb9d9bba15399b90019d 100644 (file)
--- a/mod/pages/views/default/annotation/page.php
+++ b/mod/pages/views/default/annotation/page.php
@@ -34,7 +34,7 @@ $subtitle = elgg_echo('pages:revision:subtitle', array($date, $owner_link));
 
 $body = <<< HTML
 <h3>$title_link</h3>
-<p class="elgg-subtitle">$subtitle</p>
+<p class="elgg-subtext">$subtitle</p>
 HTML;
 
 echo elgg_view_image_block($icon, $body);
\ No newline at end of file
diff --git a/views/default/annotation/default.php b/views/default/annotation/default.php
index b7ae2146e955644fbbd4633a9d6e5b1e8d6b022e..dc13373623c6130685ccebfaba065a752ef6abf2 100644 (file)
--- a/views/default/annotation/default.php
+++ b/views/default/annotation/default.php
@@ -1,6 +1,8 @@
 <?php
 /**
  * Elgg default annotation view
+ *
+ * @uses $vars['annotation']
  */
 
 $owner = get_user($vars['annotation']->owner_guid);
diff --git a/views/default/annotation/generic_comment.php b/views/default/annotation/generic_comment.php
index eeceba344204daced8513d8242dc3f815480aaaa..f168546c3bb9e48875f9e4570c659ee92ba7a3e8 100644 (file)
--- a/views/default/annotation/generic_comment.php
+++ b/views/default/annotation/generic_comment.php
@@ -46,7 +46,7 @@ if ($full_view) {
 <p class="mbn">
        $delete_button
        $commenter_link
-       <span class="elgg-subtitle">
+       <span class="elgg-subtext">
                $friendlytime
        </span>
        $comment_text
@@ -63,7 +63,7 @@ HTML;
        $on = elgg_echo('on');
 
        $body = <<<HTML
-<span class="elgg-subtitle">
+<span class="elgg-subtext">
        $commenter_link $on $entity_link ($friendlytime)
 </span>
 HTML;
diff --git a/views/default/annotation/likes.php b/views/default/annotation/likes.php
index 20965f456ff9813d3184598bac8e3c11f21d6bb5..748d0b60179b42699afbb8f373b64caf05caee6c 100644 (file)
--- a/views/default/annotation/likes.php
+++ b/views/default/annotation/likes.php
@@ -39,7 +39,7 @@ $body = <<<HTML
 <p class="mbn">
        $delete_button
        $user_link $likes_string
-       <span class="elgg-list-subtitle">
+       <span class="elgg-subtext">
                $friendlytime
        </span>
 </p>
diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index 03476ca5b0abc5132901e9126cb0cfe3821cb9ed..4aa1b5b52917389ac3280796c4698d28b447b6bf 100644 (file)
--- 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 b86af351bd06bb3471817299f8c7a39f0a8c11c2..304ae615e2ecd373dbde8531a77945458a3fba97 100644 (file)
--- 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 00bc1c058dbf895df5a1212bc911ea9c9eeb9985..5f7fc74f99d964713ee1c931664ef2707a2c5390 100644 (file)
--- a/views/default/layout/objects/list/body.php
+++ b/views/default/layout/objects/list/body.php
@@ -5,7 +5,7 @@
  * Sample output
  * <ul class="elgg-list-metadata"><li>Public</li><li>Like this</li></ul>
  * <h3><a href="">Title</a></h3>
- * <p class="elgg-list-subtitle">Posted 3 hours ago by George</p>
+ * <p class="elgg-subtext">Posted 3 hours ago by George</p>
  * <p class="elgg-tags"><a href="">one</a>, <a href="">two</a></p>
  * <div class="elgg-list-content">Excerpt text</div>
  *
@@ -49,7 +49,7 @@ if ($metadata) {
        echo $metadata;
 }
 echo "<h3>$title_link</h3>";
-echo "<p class=\"elgg-list-subtitle\">$subtitle</p>";
+echo "<p class=\"elgg-subtext\">$subtitle</p>";
 echo $tags;
 if ($content) {
        echo "<div class=\"elgg-list-content\">$content</div>";
Social Networking Engine