]> 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: 901e117)
changed img | body media element to icon | body
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Sun, 5 Dec 2010 19:19:59 +0000 (19:19 +0000)
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Sun, 5 Dec 2010 19:19:59 +0000 (19:19 +0000)
git-svn-id: http://code.elgg.org/elgg/trunk@7537 36083f99-b078-4883-b0ff-0f9b5a30f544

mod/blog/views/default/object/blog.php patch | blob | history
views/default/annotation/generic_comment.php patch | blob | history
views/default/css/screen.php patch | blob | history
views/default/layout_elements/media.php patch | blob | history

diff --git a/mod/blog/views/default/object/blog.php b/mod/blog/views/default/object/blog.php
index 7e6be0b213e76968d7f7c4d5b74ea1961db0fe3c..75df11b62b48bbe36ba7b29101950a2fd1c333a8 100644 (file)
--- a/mod/blog/views/default/object/blog.php
+++ b/mod/blog/views/default/object/blog.php
@@ -93,7 +93,7 @@ if ($full) {
 HTML;
 
        $params = array(
-               'img' => $owner_icon,
+               'icon' => $owner_icon,
                'body' => $info,
        );
        $blog_info = elgg_view('layout_elements/media', $params);
@@ -125,7 +125,7 @@ HTML;
 HTML;
 
        $params = array(
-               'img' => $owner_icon,
+               'icon' => $owner_icon,
                'body' => $body,
        );
        echo elgg_view('layout_elements/media', $params);
diff --git a/views/default/annotation/generic_comment.php b/views/default/annotation/generic_comment.php
index 7b26756a3549789a41e7b9b6d03bc21b318fb1fb..3fc55e84ae85ddb128d9aa421d6ae207c7d9c5c5 100644 (file)
--- a/views/default/annotation/generic_comment.php
+++ b/views/default/annotation/generic_comment.php
@@ -43,7 +43,7 @@ if ($full_view) {
 HTML;
 
        $params = array(
-               'img' => $commenter_icon,
+               'icon' => $commenter_icon,
                'body' => $body,
        );
        echo elgg_view('layout_elements/media', $params);
diff --git a/views/default/css/screen.php b/views/default/css/screen.php
index 0026d803809e72bf84d0dd10620081a22f87c3db..d12591fe2f41715ff458c81d0626fc94c535bf1e 100644 (file)
--- a/views/default/css/screen.php
+++ b/views/default/css/screen.php
@@ -343,7 +343,7 @@ h2 {
        padding: 3px 0;
 }
 
-.elgg-media .elgg-img {
+.elgg-media .elgg-icon {
        float: left;
        margin-right: 5px;
 }
diff --git a/views/default/layout_elements/media.php b/views/default/layout_elements/media.php
index 8599d6c8af3fdd438530b63296336a4a68e33e3c..5f4e51d5729fb27668b58a2b2cf5bdc19c3b6729 100644 (file)
--- a/views/default/layout_elements/media.php
+++ b/views/default/layout_elements/media.php
@@ -4,20 +4,20 @@
  *
  * ---------------------------------------------------
  * |          |                                      |
- * |  image   |               body                   |
+ * |  icon    |               body                   |
  * |  block   |               block                  |
  * |          |                                      |
  * ---------------------------------------------------
  *
  * @uses $vars['body']        HTML content of the body block
- * @uses $vars['img']         HTML content of the image block
+ * @uses $vars['icon']        HTML content of the icon block
  * @uses $vars['class']       Optional additional class for media element
  * @uses $vars['body_class']  Optional additional class for body block
- * @uses $vars['img_class']   Optional additional class for image block
+ * @uses $vars['icon_class']   Optional additional class for icon block
  */
 
 $body = elgg_get_array_value('body', $vars, '');
-$image_block = elgg_get_array_value('img', $vars, '');
+$icon_block = elgg_get_array_value('icon', $vars, '');
 
 $class = 'elgg-media';
 $additional_class = elgg_get_array_value('class', $vars, '');
@@ -32,17 +32,17 @@ if ($additional_class) {
 }
 $body = "<div class=\"$body_class\">$body</div>";
 
-$img_class = 'elgg-img';
-$additional_class = elgg_get_array_value('img_class', $vars, '');
+$icon_class = 'elgg-icon';
+$additional_class = elgg_get_array_value('icon_class', $vars, '');
 if ($additional_class) {
-       $img_class = "$img_class $additional_class";
+       $icon_class = "$icon_class $additional_class";
 }
-if ($image_block) {
-       $image_block = "<div class=\"$img_class\">$image_block</div>";
+if ($icon_block) {
+       $icon_block = "<div class=\"$icon_class\">$icon_block</div>";
 }
 
 echo <<<HTML
 <div class="$class clearfix">
-       $image_block$body
+       $icon_block$body
 </div>
 HTML;
Social Networking Engine