From dea90f2e6af72473e24e5e67b154754faf84513e Mon Sep 17 00:00:00 2001 From: Evan Winslow Date: Mon, 13 Jun 2011 19:47:17 -0700 Subject: elgg-river-message and elgg-river-attachments now get the old elgg-river-content styling --- views/default/css/elements/components.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'views/default/css/elements/components.php') diff --git a/views/default/css/elements/components.php b/views/default/css/elements/components.php index 0fcbe3619..4b0034dd3 100644 --- a/views/default/css/elements/components.php +++ b/views/default/css/elements/components.php @@ -161,12 +161,15 @@ font-style: italic; line-height: 1.2em; } + +.elgg-river-attachments, +.elgg-river-message, .elgg-river-content { - border-left: 1px solid #CCC; - font-size: 85%; - line-height: 1.5em; - margin: 8px 0 5px 0; - padding-left: 5px; + border-left: 1px solid #CCC; + font-size: 85%; + line-height: 1.5em; + margin: 8px 0 5px 0; + padding-left: 5px; } -- cgit v1.2.3 From cf85a49c7e74133feaec7d52d8f289d22b59a56c Mon Sep 17 00:00:00 2001 From: Evan Winslow Date: Mon, 13 Jun 2011 22:31:48 -0700 Subject: Using tabs, not spaces for indentation --- views/default/css/elements/components.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'views/default/css/elements/components.php') diff --git a/views/default/css/elements/components.php b/views/default/css/elements/components.php index 4b0034dd3..203f6d257 100644 --- a/views/default/css/elements/components.php +++ b/views/default/css/elements/components.php @@ -165,11 +165,11 @@ .elgg-river-attachments, .elgg-river-message, .elgg-river-content { - border-left: 1px solid #CCC; - font-size: 85%; - line-height: 1.5em; - margin: 8px 0 5px 0; - padding-left: 5px; + border-left: 1px solid #CCC; + font-size: 85%; + line-height: 1.5em; + margin: 8px 0 5px 0; + padding-left: 5px; } -- cgit v1.2.3 From 43e2672f65d12a36d75ad9257a936dc93a2108f3 Mon Sep 17 00:00:00 2001 From: cash Date: Fri, 24 Jun 2011 19:55:58 -0400 Subject: cleaned up the list/gallery css classes to use standard class naming - minor modifications only --- engine/lib/views.php | 4 ++-- mod/search/views/default/search/list.php | 4 ++-- views/default/css/admin.php | 2 +- views/default/css/elements/components.php | 4 ++-- views/default/object/elements/summary.php | 2 +- views/default/page/components/gallery.php | 31 ++++++++++++++++++++++++++++--- views/default/page/components/list.php | 6 +++--- 7 files changed, 39 insertions(+), 14 deletions(-) (limited to 'views/default/css/elements/components.php') diff --git a/engine/lib/views.php b/engine/lib/views.php index 4911171c8..df69593f9 100644 --- a/engine/lib/views.php +++ b/engine/lib/views.php @@ -969,7 +969,7 @@ $list_type_toggle = true, $pagination = true) { // new function $defaults = array( 'items' => $entities, - 'list_class' => 'elgg-entity-list', + 'list_class' => 'elgg-list-entity', 'full_view' => true, 'pagination' => true, 'gallery' => false, @@ -992,7 +992,7 @@ $list_type_toggle = true, $pagination = true) { 'pagination' => $pagination, 'gallery' => false, 'list_type_toggle' => $list_type_toggle, - 'list_class' => 'elgg-entity-list', + 'list_class' => 'elgg-list-entity', ); } diff --git a/mod/search/views/default/search/list.php b/mod/search/views/default/search/list.php index c5afaaa86..11860c094 100644 --- a/mod/search/views/default/search/list.php +++ b/mod/search/views/default/search/list.php @@ -82,7 +82,7 @@ $more = ($more_check > 0) ? $more_check : 0; if ($more) { $title_key = ($more == 1) ? 'comment' : 'comments'; $more_str = elgg_echo('search:more', array($count, $type_str)); - $more_link = "
  • $more_str
    • "; + $more_link = "
  • $more_str
    • "; } else { $more_link = ''; } @@ -98,7 +98,7 @@ if ($view) { $body .= '
      '; foreach ($entities as $entity) { $id = "elgg-{$entity->getType()}-{$entity->getGUID()}"; - $body .= "
    • "; + $body .= "
    • "; $body .= elgg_view($view, array( 'entity' => $entity, 'params' => $vars['params'], diff --git a/views/default/css/admin.php b/views/default/css/admin.php index a56c7b214..d7c154438 100644 --- a/views/default/css/admin.php +++ b/views/default/css/admin.php @@ -383,7 +383,7 @@ table.mceLayout { margin-left: 5px; } -.elgg-list-item { +.elgg-item { margin: 3px; } .elgg-menu-metadata { diff --git a/views/default/css/elements/components.php b/views/default/css/elements/components.php index 203f6d257..594694e60 100644 --- a/views/default/css/elements/components.php +++ b/views/default/css/elements/components.php @@ -47,10 +47,10 @@ border-bottom: 1px dotted #CCCCCC; } -.elgg-list-item .elgg-subtext { +.elgg-item .elgg-subtext { margin-bottom: 5px; } -.elgg-list-content { +.elgg-item .elgg-content { margin: 10px 5px; } diff --git a/views/default/object/elements/summary.php b/views/default/object/elements/summary.php index d3a6ea862..9206ada66 100644 --- a/views/default/object/elements/summary.php +++ b/views/default/object/elements/summary.php @@ -49,5 +49,5 @@ echo "

      $title_link

      "; echo "
      $subtitle
      "; echo $tags; if ($content) { - echo "
      $content
      "; + echo "
      $content
      "; } diff --git a/views/default/page/components/gallery.php b/views/default/page/components/gallery.php index e86b9f885..f03eb1109 100644 --- a/views/default/page/components/gallery.php +++ b/views/default/page/components/gallery.php @@ -2,7 +2,17 @@ /** * Gallery view * - * @uses $vars['items'] + * Implemented as an unorder list + * + * @uses $vars['items'] Array of ElggEntity or ElggAnnotation objects + * @uses $vars['offset'] Index of the first list item in complete list + * @uses $vars['limit'] Number of items per page + * @uses $vars['count'] Number of items in the complete list + * @uses $vars['pagination'] Show pagination? (default: true) + * @uses $vars['position'] Position of the pagination: before, after, or both + * @uses $vars['full_view'] Show the full view of the items (default: false) + * @uses $vars['gallery_class'] Additional CSS class for the
        element + * @uses $vars['item_class'] Additional CSS class for the
      • elements */ $items = $vars['items']; @@ -19,6 +29,16 @@ $pagination = elgg_extract('pagination', $vars, true); $offset_key = elgg_extract('offset_key', $vars, 'offset'); $position = elgg_extract('position', $vars, 'after'); +$gallery_class = 'elgg-gallery'; +if (isset($vars['gallery_class'])) { + $gallery_class = "$gallery_class {$vars['gallery_class']}"; +} + +$item_class = 'elgg-item'; +if (isset($vars['item_class'])) { + $item_class = "$item_class {$vars['item_class']}"; +} + if ($pagination && $count) { $nav .= elgg_view('navigation/pagination', array( 'offset' => $offset, @@ -33,10 +53,15 @@ if ($position == 'before' || $position == 'both') { } ?> -
          +
            '; + if (elgg_instanceof($item)) { + $id = "elgg-{$item->getType()}-{$item->getGUID()}"; + } else { + $id = "item-{$item->getType()}-{$item->id}"; + } + echo "
          • "; echo elgg_view_list_item($item, $vars); echo "
            • "; } diff --git a/views/default/page/components/list.php b/views/default/page/components/list.php index ae951c89f..c83fa0966 100644 --- a/views/default/page/components/list.php +++ b/views/default/page/components/list.php @@ -27,12 +27,12 @@ $position = elgg_extract('position', $vars, 'after'); $list_class = 'elgg-list'; if (isset($vars['list_class'])) { - $list_class = "{$vars['list_class']} $list_class"; + $list_class = "$list_class {$vars['list_class']}"; } -$item_class = 'elgg-list-item'; +$item_class = 'elgg-item'; if (isset($vars['item_class'])) { - $item_class = "{$vars['item_class']} $item_class"; + $item_class = "$item_class {$vars['item_class']}"; } $html = ""; -- cgit v1.2.3 From f0c01363ac796a5b11490c6570db9827360f3118 Mon Sep 17 00:00:00 2001 From: cash Date: Fri, 24 Jun 2011 20:37:57 -0400 Subject: Fixes #3559 adds .elgg-gallery-users --- mod/custom_index/index.php | 1 + mod/groups/views/default/groups/sidebar/members.php | 1 + views/default/css/elements/components.php | 5 ++++- 3 files changed, 6 insertions(+), 1 deletion(-) (limited to 'views/default/css/elements/components.php') diff --git a/mod/custom_index/index.php b/mod/custom_index/index.php index 831114127..53990a006 100644 --- a/mod/custom_index/index.php +++ b/mod/custom_index/index.php @@ -36,6 +36,7 @@ $newest_members = elgg_list_entities_from_metadata(array( 'full_view' => false, 'pagination' => false, 'list_type' => 'gallery', + 'gallery_class' => 'elgg-gallery-users', 'size' => 'small', )); diff --git a/mod/groups/views/default/groups/sidebar/members.php b/mod/groups/views/default/groups/sidebar/members.php index 3026c05f2..7249ffbf4 100644 --- a/mod/groups/views/default/groups/sidebar/members.php +++ b/mod/groups/views/default/groups/sidebar/members.php @@ -22,6 +22,7 @@ $body = elgg_list_entities_from_relationship(array( 'types' => 'user', 'limit' => $limit, 'list_type' => 'gallery', + 'gallery_class' => 'elgg-gallery-users', )); $body .= "
            $all_link
            "; diff --git a/views/default/css/elements/components.php b/views/default/css/elements/components.php index 594694e60..3f30a6422 100644 --- a/views/default/css/elements/components.php +++ b/views/default/css/elements/components.php @@ -65,9 +65,12 @@ .elgg-gallery td { padding: 5px; } -.elgg-gallery-fluid li { +.elgg-gallery-fluid > li { float: left; } +.elgg-gallery-users > li { + margin: 0 2px; +} /* *************************************** Tables -- cgit v1.2.3 From 7ebbba7b47fef2d6fbd0256fa9508685a18289a1 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Thu, 7 Jul 2011 06:32:36 -0400 Subject: fixed the float issue with the friends river view --- views/default/css/elements/components.php | 5 ++--- views/default/river/elements/body.php | 2 +- views/default/river/relationship/friend/create.php | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) (limited to 'views/default/css/elements/components.php') diff --git a/views/default/css/elements/components.php b/views/default/css/elements/components.php index 3f30a6422..4a09ca74e 100644 --- a/views/default/css/elements/components.php +++ b/views/default/css/elements/components.php @@ -174,9 +174,8 @@ margin: 8px 0 5px 0; padding-left: 5px; } - - -.elgg-river-content .elgg-avatar { +.elgg-river-attachments .elgg-avatar, +.elgg-river-attachments .elgg-icon { float: left; } .elgg-river-layout .elgg-input-dropdown { diff --git a/views/default/river/elements/body.php b/views/default/river/elements/body.php index f7a9d2426..c5a525733 100644 --- a/views/default/river/elements/body.php +++ b/views/default/river/elements/body.php @@ -37,7 +37,7 @@ if ($message !== false) { $attachments = elgg_extract('attachments', $vars, false); if ($attachments !== false) { - $attachments = "
            $attachments
            "; + $attachments = "
            $attachments
            "; } $responses = elgg_view('river/elements/responses', $vars); diff --git a/views/default/river/relationship/friend/create.php b/views/default/river/relationship/friend/create.php index f3f4a9b14..a191e7b1e 100644 --- a/views/default/river/relationship/friend/create.php +++ b/views/default/river/relationship/friend/create.php @@ -10,5 +10,5 @@ $object_icon = elgg_view_entity_icon($object, 'tiny'); echo elgg_view('river/item', array( 'item' => $vars['item'], - 'attachments' => $subject_icon . elgg_view_icon('arrow-right', true) . $object_icon, + 'attachments' => $subject_icon . elgg_view_icon('arrow-right') . $object_icon, )); -- cgit v1.2.3