Addressed several miscellaneous todo's

git-svn-id: http://code.elgg.org/elgg/trunk@8563 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/mod/tinymce/views/default/tinymce/css.php b/mod/tinymce/views/default/tinymce/css.php
index 69302bd489eeab480fd10838093c049345eda578..c8ef1954ff38a767b6e9fb23291ba5384d3a64a7 100644 (file)
--- a/mod/tinymce/views/default/tinymce/css.php
+++ b/mod/tinymce/views/default/tinymce/css.php
@@ -5,7 +5,8 @@
  * Overrides on the default TinyMCE skin
  * Gives the textarea and buttons rounded corners
  * 
- * @todo why the crazy long rules?
+ * The rules are extra long in order to have enough
+ * weight to override the TinyMCE rules
  */
 ?>
 /* TinyMCE */

diff --git a/views/default/core/friends/collection.php b/views/default/core/friends/collection.php
index 95f5944e7346d50d8dada132093b98efb3e82d11..dac98bc5d28d2d91daae060317b4c61481d39025 100644 (file)
--- 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 d88d591ad048a6b8c7d0c3470fd7ffb2fd9f6e5b..c6ee082c8ba9b43c52e98a8b9393df43a0b8d8ea 100644 (file)
--- 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 2fafe6a8c4cc56d61e1c7eea46966bfa27aec861..bf12e0edb9374b7d3e3f50e952f16be4b9933edc 100644 (file)
--- 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 b51c15f2151ca958486a9cf4e9771424800fe72f..5818c4bf96823ca9ef65a3841cd07dc9beeb803d 100644 (file)
--- 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 d4707ed0884ce0667cfd051de65890e951b1fa51..7bf47801060534013dea52fd96df5cc7f4cb3cca 100644 (file)
--- 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 21df87f9fa557f5f6f8d0369a60790db30e56b44..bedc4ad8be565220577d11cf7df148b7262cc3e7 100644 (file)
--- a/views/default/css/elements/navigation.php
+++ b/views/default/css/elements/navigation.php
@@ -430,9 +430,25 @@ li:hover > .elgg-menu-site-more {
        color: #aaa;
 }
 
+/* ***************************************
+       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 11b942dcc7d0f2fe1e01707ba7fb1c8ec22e3100..c525a38aa7c6e6bca6af0b752608d8e036dc1d37 100644 (file)
--- 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 b69c101a204e0a6e706aafff48477a3317e32b56..17c5d938b8b813d5c0a0343154380e7f16f7df5c 100644 (file)
--- 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");