Updates to Profile edit, likes js, and tools css for IE7 rendering.

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

diff --git a/mod/profile/views/default/profile/edit.php b/mod/profile/views/default/profile/edit.php
index 7b918b00074613453cb7d4d442bd58b476aad4d0..f67d6e5d53c89eb2a9c2c642ad8ace692bab2979 100644 (file)
--- a/mod/profile/views/default/profile/edit.php
+++ b/mod/profile/views/default/profile/edit.php
@@ -42,6 +42,20 @@
                                $access_id = ACCESS_DEFAULT;
                        }
 
+       if ($shortname == 'description') { // change label positioning to allow for additional longtext field controls 
+?>
+       <p>
+               <label>
+                       <?php echo elgg_echo("profile:{$shortname}") ?></label>
+                       <?php echo elgg_view("input/{$valtype}",array(
+                                                                                                                       'internalname' => $shortname,
+                                                                                                                       'value' => $value,
+                                                                                                                       )); ?>
+               
+                       <?php echo elgg_view('input/access',array('internalname' => 'accesslevel['.$shortname.']', 'value' => $access_id)); ?>
+       </p>
+<?php                  
+       } else {
 ?>
 
        <p>
@@ -56,6 +70,7 @@
        </p>
 
 <?php
+       }
 
                }
 

diff --git a/views/default/css_ie.php b/views/default/css_ie.php
index c78b06018868295a653235c72cecbc8ec7df6e7a..f2b3575bbd912f6ad615a5858fce81119349f14b 100644 (file)
--- a/views/default/css_ie.php
+++ b/views/default/css_ie.php
@@ -11,18 +11,23 @@
 .navigation li.navigation_more ul li a {width:150px;background-color: #dedede;}
 
 .clearfloat { display: block; }
-#elgg_page_contents {overflow:hidden;}
+#elgg_page_contents {overflow: hidden;} /* remove horizontal scroll on riverdash */
 #breadcrumbs {top:-2px; margin-bottom: 5px;}
 
 .entity_metadata {max-width: 300px;}
 .entity_edit {float:right;}
 .access_level {float:left;}
 
+.likes_list {display:none;}
+.likes_list_holder .likes_list {top:20px !important;} /* position likes list below link in IE to prevent clipping */
+.elgg_likes_user .entity_metadata .delete_button {float:none;}
 
 /* profile */
-.elgg_horizontal_tabbed_nav.profile .profile_name {
-       margin-left: -260px;
-}
+.elgg_horizontal_tabbed_nav.profile .profile_name {margin-left: -260px;}
+
+/* notifications */
+.friends_picker_navigation {margin:0;padding:0;}
+.friends_picker_container h3 {margin:0;padding:0;line-height: 1em;}
 
 /* private messages */
 #elgg_topbar_contents a.privatemessages.new span { 
@@ -34,26 +39,14 @@
        top:-1px;
        right:auto; 
 }
-#elgg_topbar_contents a.privatemessages.new  {
-       padding:0 0 0 20px;
-}
-#elgg_topbar_contents a.privatemessages:hover {
-       background-position:left 2px;
-}
-#elgg_topbar_contents a.privatemessages.new:hover {
-       background-position: left 2px;
-}
+#elgg_topbar_contents a.privatemessages.new  {padding:0 0 0 20px;}
+#elgg_topbar_contents a.privatemessages:hover {background-position:left 2px;}
+#elgg_topbar_contents a.privatemessages.new:hover {background-position: left 2px;}
 
 /* riverdashboard mod rules */
-#riverdashboard_updates {
-       clear:both;
-}
-#riverdashboard_updates a.update_link {
-       margin:0 0 9px 0;
-}
-.riverdashboard_filtermenu {
-       margin:10px 0 0 0;
-}
+#riverdashboard_updates {clear:both;}
+#riverdashboard_updates a.update_link {margin:0 0 9px 0;}
+.riverdashboard_filtermenu {margin:10px 0 0 0;}
 .river_comment_form.hidden .input_text {
        width:530px;
        float:left;
@@ -61,4 +54,9 @@
 .river_link_divider {
        width:10px;
        text-align: center;
-}
\ No newline at end of file
+}
+
+/* shared access */
+.shared_access_collection h2.shared_access_name {margin-top:-15px;}
+
+

diff --git a/views/default/js/initialise_elgg.php b/views/default/js/initialise_elgg.php
index 056e22ee047c7dc5371bbd49aeb797a848228528..2e8d663f78f219fd26b7ebce27385e6430ca89f1 100644 (file)
--- a/views/default/js/initialise_elgg.php
+++ b/views/default/js/initialise_elgg.php
@@ -57,7 +57,9 @@ $(document).ready(function () {
        $(".likes_list_button").click(function(event) { 
                if ($(this).next(".likes_list").css('display') == 'none') {     // show list
                        var topPosition = - $(this).next(".likes_list").height();
-                       $('.likes_list').css('top',topPosition + 10);
+                       topPosition10 = topPosition + 10 + "px";
+                       topPosition = topPosition + "px";
+                       $('.likes_list').css('top',topPosition10);
                        $('.likes_list').css('left', -$('.likes_list').width()+40);
                        $(this).next(".likes_list").animate({opacity: "toggle", top: topPosition}, 500);
                } else { // hide list