diff options
Diffstat (limited to 'views')
| -rw-r--r-- | views/default/core/friends/collection.php | 4 | ||||
| -rw-r--r-- | views/default/core/friends/collections.php | 2 | ||||
| -rw-r--r-- | views/default/core/friends/collectiontabs.php | 2 | ||||
| -rw-r--r-- | views/default/css/elements/components.php | 13 | ||||
| -rw-r--r-- | views/default/css/elements/modules.php | 11 | ||||
| -rw-r--r-- | views/default/css/elements/navigation.php | 16 | ||||
| -rw-r--r-- | views/default/page/elements/owner_block.php | 6 | ||||
| -rw-r--r-- | views/default/page/elements/topbar.php | 1 |
8 files changed, 27 insertions, 28 deletions
diff --git a/views/default/core/friends/collection.php b/views/default/core/friends/collection.php index 95f5944e7..dac98bc5d 100644 --- a/views/default/core/friends/collection.php +++ b/views/default/core/friends/collection.php @@ -51,9 +51,9 @@ if ($friends) { ?> <?php //@todo JS 1.8: no ?> <script type="text/javascript"> - $(document).ready(function () { + $(function () { - $('#friends-picker_placeholder<?php echo $vars['friendspicker']; ?>').load('<?php echo elgg_get_site_url(); ?>pages/friends/collections/pickercallback.php?username=<?php echo elgg_get_logged_in_user_entity()->username; ?>&type=list&collection=<?php echo $vars['collection']->id; ?>'); + $('#friends-picker_placeholder<?php echo $vars['friendspicker']; ?>').load(elgg.config.wwwroot + 'pages/friends/collections/pickercallback.php?username=<?php echo elgg_get_logged_in_user_entity()->username; ?>&type=list&collection=<?php echo $vars['collection']->id; ?>'); }); </script> diff --git a/views/default/core/friends/collections.php b/views/default/core/friends/collections.php index d88d591ad..c6ee082c8 100644 --- a/views/default/core/friends/collections.php +++ b/views/default/core/friends/collections.php @@ -30,7 +30,7 @@ if (is_array($vars['collections']) && sizeof($vars['collections'])) { ?> <?php //@todo JS 1.8: no ?> <script> -$(document).ready(function(){ +$(function(){ $('#friends_collections_accordian h2').click(function () { $(this.parentNode).children("[class=friends-picker-main-wrapper]").slideToggle("fast"); //return false; diff --git a/views/default/core/friends/collectiontabs.php b/views/default/core/friends/collectiontabs.php index 2fafe6a8c..bf12e0edb 100644 --- a/views/default/core/friends/collectiontabs.php +++ b/views/default/core/friends/collectiontabs.php @@ -31,7 +31,7 @@ $ownerid = $vars['owner']->getGUID(); <?php //@todo JS 1.8: no ?> <script type="text/javascript"> -$(document).ready(function () { +$(function () { $('a.collectionmembers<?php echo $friendspicker; ?>').click(function () { // load collection members pane diff --git a/views/default/css/elements/components.php b/views/default/css/elements/components.php index b51c15f21..5818c4bf9 100644 --- a/views/default/css/elements/components.php +++ b/views/default/css/elements/components.php @@ -127,11 +127,6 @@ .elgg-owner-block { margin-bottom: 20px; } -.elgg-menu-owner-block li { - float: left; - width: 50%; - font-size: 90%; -} /* *************************************** Messages @@ -196,7 +191,6 @@ margin: 10px 0; } -<?php //@todo do we need another elgg-tabs extension? ?> .elgg-river-comments-tab { display: block; background-color: #EEEEEE; @@ -210,7 +204,7 @@ -webkit-border-radius: 5px 5px 0 0; } -<?php //@todo lists.php ?> +<?php //@todo components.php ?> .elgg-river-comments { margin: 0; border-top: none; @@ -256,11 +250,6 @@ .elgg-river-item input[type=submit] { margin: 0 0 0 10px; } -.elgg-river-item > .elgg-image-alt a { - font-size: 90%; - float: right; - clear: both; -} /* *************************************** Likes diff --git a/views/default/css/elements/modules.php b/views/default/css/elements/modules.php index d4707ed08..7bf478010 100644 --- a/views/default/css/elements/modules.php +++ b/views/default/css/elements/modules.php @@ -130,7 +130,6 @@ color: #888888; } -<?php //@todo Still too many location-dependent/overly-qualified styles ?> .elgg-module-widget { background-color: #dedede; padding: 2px; @@ -162,22 +161,22 @@ height: 18px; border: 1px solid transparent; } -a.elgg-widget-collapse-button { +.elgg-widget-collapse-button { left: 5px; background:transparent url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat 0px -385px; } -a.elgg-widget-collapsed { +.elgg-widget-collapsed { background-position: 0px -365px; } -a.elgg-widget-delete-button { +.elgg-widget-delete-button { right: 5px; background:transparent url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat -198px 3px; } -a.elgg-widget-edit-button { +.elgg-widget-edit-button { right: 25px; background:transparent url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat -300px -1px; } -a.elgg-widget-edit-button:hover, a.elgg-widget-delete-button:hover { +.elgg-widget-edit-button:hover, a.elgg-widget-delete-button:hover { border: 1px solid #cccccc; } .elgg-module-widget > .elgg-body { diff --git a/views/default/css/elements/navigation.php b/views/default/css/elements/navigation.php index 21df87f9f..bedc4ad8b 100644 --- a/views/default/css/elements/navigation.php +++ b/views/default/css/elements/navigation.php @@ -433,6 +433,22 @@ li:hover > .elgg-menu-site-more { /* *************************************** LONGTEXT *************************************** */ +.elgg-menu-owner_block > li { + float: left; + width: 50%; + font-size: 90%; +} + +/* *************************************** + LONGTEXT +*************************************** */ .elgg-menu-longtext { float: right; } + +/* *************************************** + RIVER +*************************************** */ +.elgg-menu-river { + font-size: 90%; +}
\ No newline at end of file diff --git a/views/default/page/elements/owner_block.php b/views/default/page/elements/owner_block.php index 11b942dcc..c525a38aa 100644 --- a/views/default/page/elements/owner_block.php +++ b/views/default/page/elements/owner_block.php @@ -17,14 +17,10 @@ if ($owner instanceof ElggGroup || $header = elgg_view_entity($owner, false); - $body = elgg_view_menu('owner_block', array( - 'entity' => $owner, - 'class' => 'elgg-menu-owner-block', - )); + $body = elgg_view_menu('owner_block', array('entity' => $owner)); $body .= elgg_view('page/elements/owner_block/extend', $vars); - //@todo elgg-module-owner-block? echo elgg_view('page/components/module', array( 'header' => $header, 'body' => $body, diff --git a/views/default/page/elements/topbar.php b/views/default/page/elements/topbar.php index b69c101a2..17c5d938b 100644 --- a/views/default/page/elements/topbar.php +++ b/views/default/page/elements/topbar.php @@ -11,5 +11,4 @@ echo elgg_view_menu('topbar', array('sort_by' => 'priority', array('elgg-menu-hz // elgg tools menu // need to echo this empty view for backward compatibility. -// @todo -- do we really? So much else is broken, and the new menu system is so much nicer... echo elgg_view("navigation/topbar_tools"); |