]> 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: e3561e5)
changed name of icon block to picture block in media object to avoid conflicts with...
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Fri, 10 Dec 2010 11:21:47 +0000 (11:21 +0000)
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Fri, 10 Dec 2010 11:21:47 +0000 (11:21 +0000)
git-svn-id: http://code.elgg.org/elgg/trunk@7592 36083f99-b078-4883-b0ff-0f9b5a30f544

engine/lib/views.php patch | blob | history
views/default/css/elements/page_layout.php patch | blob | history
views/default/layout/objects/media.php patch | blob | history

diff --git a/engine/lib/views.php b/engine/lib/views.php
index abc1f9221ef4504dc9ee1f9186617fa09949388a..7c542b289af2b070e0f2f0ed237d821ebcc3f586 100644 (file)
--- a/engine/lib/views.php
+++ b/engine/lib/views.php
@@ -983,15 +983,15 @@ function elgg_view_latest_comments($owner_guid, $type = 'object', $subtype = '',
  *
  * This is a shortcut for {@elgg_view layout/objects/media}.
  *
- * @param string $icon The icon and other information
- * @param string $body Description content
- * @param string $vars Additional parameters for the view
+ * @param string $picture The icon and other information
+ * @param string $body    Description content
+ * @param string $vars    Additional parameters for the view
  *
  * @return string
  * @since 1.8.0
  */
-function elgg_view_media($icon, $body, $vars = array()) {
-       $vars['icon'] = $icon;
+function elgg_view_media($picture, $body, $vars = array()) {
+       $vars['pict'] = $picture;
        $vars['body'] = $body;
        return elgg_view('layout/objects/media', $vars);
 }
diff --git a/views/default/css/elements/page_layout.php b/views/default/css/elements/page_layout.php
index 75f351781b63bdb46f97a8e36dadc2de4b549703..a1a3a48f0d081bf07f1a0ee608a9ac0dd50b8590 100644 (file)
--- a/views/default/css/elements/page_layout.php
+++ b/views/default/css/elements/page_layout.php
@@ -57,7 +57,7 @@
        padding: 3px 0;
 }
 
-.elgg-media .elgg-icon {
+.elgg-media .elgg-pict {
        float: left;
        margin-right: 5px;
 }
diff --git a/views/default/layout/objects/media.php b/views/default/layout/objects/media.php
index 232acc8f1f7a10863afc6af9dc902f9abbdcdcf2..6fee9193277322915a007e75dd74ac807fa8f016 100644 (file)
--- a/views/default/layout/objects/media.php
+++ b/views/default/layout/objects/media.php
@@ -4,21 +4,19 @@
  *
  * ---------------------------------------------------
  * |          |                                      |
- * |  icon    |               body                   |
+ * | picture  |               body                   |
  * |  block   |               block                  |
  * |          |                                      |
  * ---------------------------------------------------
  *
  * @uses $vars['body']        HTML content of the body block
- * @uses $vars['icon']        HTML content of the icon block
+ * @uses $vars['pict']        HTML content of the picture block
  * @uses $vars['class']       Optional additional class for media element
  * @uses $vars['id']          Optional id for the media element
- * @uses $vars['body_class']  Optional additional class for body block
- * @uses $vars['icon_class']  Optional additional class for icon block
  */
 
 $body = elgg_get_array_value('body', $vars, '');
-$icon_block = elgg_get_array_value('icon', $vars, '');
+$pict_block = elgg_get_array_value('pict', $vars, '');
 
 $class = 'elgg-media';
 $additional_class = elgg_get_array_value('class', $vars, '');
@@ -32,24 +30,14 @@ if (isset($vars['id'])) {
 }
 
 
-$body_class = 'elgg-body';
-$additional_class = elgg_get_array_value('body_class', $vars, '');
-if ($additional_class) {
-       $body_class = "$body_class $additional_class";
-}
-$body = "<div class=\"$body_class\">$body</div>";
+$body = "<div class=\"elgg-body\">$body</div>";
 
-$icon_class = 'elgg-icon';
-$additional_class = elgg_get_array_value('icon_class', $vars, '');
-if ($additional_class) {
-       $icon_class = "$icon_class $additional_class";
-}
-if ($icon_block) {
-       $icon_block = "<div class=\"$icon_class\">$icon_block</div>";
+if ($pict_block) {
+       $pict_block = "<div class=\"elgg-pict\">$pict_block</div>";
 }
 
 echo <<<HTML
 <div class="$class clearfix" $id>
-       $icon_block$body
+       $pict_block$body
 </div>
 HTML;
Social Networking Engine