]> 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: 0f2fb0a)
added alternate picture block to css media object
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Sat, 11 Dec 2010 23:20:50 +0000 (23:20 +0000)
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Sat, 11 Dec 2010 23:20:50 +0000 (23:20 +0000)
git-svn-id: http://code.elgg.org/elgg/trunk@7602 36083f99-b078-4883-b0ff-0f9b5a30f544

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

diff --git a/views/default/css/elements/page_layout.php b/views/default/css/elements/page_layout.php
index 87a3b38b1e9bd30857aa1ba81d80d1bd42f81fef..24445ea01c4bfe68881fe38881808ef20f583d62 100644 (file)
--- a/views/default/css/elements/page_layout.php
+++ b/views/default/css/elements/page_layout.php
@@ -61,13 +61,17 @@
        float: left;
        margin-right: 5px;
 }
-
+.elgg-media .elgg-pict-alt {
+       float: right;
+       margin-left: 5px;
+}
 
 
 
 .elgg-list {
     border-top: 1px dotted #CCCCCC;
        margin: 5px 0;
+       clear: both;
 }
 
 .elgg-list li {
diff --git a/views/default/layout/objects/media.php b/views/default/layout/objects/media.php
index 6fee9193277322915a007e75dd74ac807fa8f016..f91f9e0abd5857acf68420ef0282b3f2e72c09ad 100644 (file)
--- a/views/default/layout/objects/media.php
+++ b/views/default/layout/objects/media.php
@@ -2,21 +2,26 @@
 /**
  * Elgg media element
  *
- * ---------------------------------------------------
- * |          |                                      |
- * | picture  |               body                   |
- * |  block   |               block                  |
- * |          |                                      |
- * ---------------------------------------------------
+ * Common pattern where there is an image, icon, media object to the left
+ * and a descriptive block of text to the left.
+ * 
+ * ---------------------------------------------------------------
+ * |          |                                      |    alt    |
+ * | picture  |               body                   |  picture  |
+ * |  block   |               block                  |   block   |
+ * |          |                                      | (optional)|
+ * ---------------------------------------------------------------
  *
  * @uses $vars['body']        HTML content of the body block
  * @uses $vars['pict']        HTML content of the picture block
+ * @uses $vars['pict_alt']    HTML content of the alternate picture block
  * @uses $vars['class']       Optional additional class for media element
  * @uses $vars['id']          Optional id for the media element
  */
 
 $body = elgg_get_array_value('body', $vars, '');
 $pict_block = elgg_get_array_value('pict', $vars, '');
+$alt_pict_block = elgg_get_array_value('pict_alt', $vars, '');
 
 $class = 'elgg-media';
 $additional_class = elgg_get_array_value('class', $vars, '');
@@ -36,8 +41,12 @@ if ($pict_block) {
        $pict_block = "<div class=\"elgg-pict\">$pict_block</div>";
 }
 
+if ($alt_pict_block) {
+       $alt_pict_block = "<div class=\"elgg-pict-alt\">$alt_pict_block</div>";
+}
+
 echo <<<HTML
 <div class="$class clearfix" $id>
-       $pict_block$body
+       $pict_block$alt_pict_block$body
 </div>
 HTML;
Social Networking Engine