aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--views/default/canvas/layouts/widgets.php21
-rw-r--r--views/default/css.php38
2 files changed, 36 insertions, 23 deletions
diff --git a/views/default/canvas/layouts/widgets.php b/views/default/canvas/layouts/widgets.php
index c0f30e006..b73a5401d 100644
--- a/views/default/canvas/layouts/widgets.php
+++ b/views/default/canvas/layouts/widgets.php
@@ -85,16 +85,15 @@ Choose the features you want to add to your page by dragging them from the <b>Wi
<tr>
<td colspan="2" align="left" valign="top">
-
<?php
- if(get_context() == "profile"){
+ if(get_context() == "profile"){
?>
<h2 class="profile_box"><?php echo elgg_echo("widgets:profilebox"); ?></h2>
<div id="profile_box_widgets">
- <p><small>(<?php echo elgg_echo("widgets:fixed"); ?>)</small></p>
+ <p><small>(Fixed position on page)</small></p>
</div>
<?php
- }
+ }
?>
</td>
@@ -103,7 +102,6 @@ Choose the features you want to add to your page by dragging them from the <b>Wi
<td rowspan="2" align="left" valign="top">
<h2><?php echo elgg_echo("widgets:rightcolumn"); ?></h2>
<div id="rightcolumn_widgets" <?php if(get_context() == "profile")echo "class=\"long\""; ?>>
-
<?php
$sidebarwidgetstring = "";
if (is_array($area2widgets) && sizeof($area2widgets) > 0) {
@@ -240,6 +238,8 @@ Choose the features you want to add to your page by dragging them from the <b>Wi
<form action="<?php echo $vars['url']; ?>action/widgets/reorder" method="post">
<textarea type="textarea" value="Main widgets" style="display:none" name="debugField1" id="debugField1" /><?php echo $mainwidgetstring; ?></textarea>
<textarea type="textarea" value="Right widgets" style="display:none" name="debugField2" id="debugField2" /><?php echo $sidebarwidgetstring; ?></textarea>
+<textarea type="textarea" value="Left widgets" style="display:none" name="debugField3" id="debugField3" /><?php echo $leftbarwidgetstring; ?></textarea>
+
<input type="hidden" name="context" value="<?php echo get_context(); ?>" />
<input type="hidden" name="owner" value="<?php echo page_owner(); ?>" />
<input type="submit" value="Save changes" class="submit_button" onclick="$('a.toggle_customise_edit_panel').click();" />
@@ -258,7 +258,7 @@ Choose the features you want to add to your page by dragging them from the <b>Wi
<table cellspacing="0" id="widget_table">
<tr>
<td colspan="2" align="left" valign="top">
- <!-- profile box -->
+ <!-- profile box or 'dashboard info' notice -->
<?php echo $vars['area1']; ?>
</td>
<td rowspan="2" align="left" valign="top">
@@ -318,12 +318,3 @@ Choose the features you want to add to your page by dragging them from the <b>Wi
</table>
-
-
-
-
-
-
-
-
-<!-- <div class="clearfloat"></div> -->
diff --git a/views/default/css.php b/views/default/css.php
index dc3e5e64a..b4e5e30e1 100644
--- a/views/default/css.php
+++ b/views/default/css.php
@@ -181,7 +181,7 @@ h6 { font-size: 0.8em; }
/* canvas layout: 2 column left sidebar */
#two_column_left_sidebar {
- width:170px;
+ width:210px;
margin:20px 0 20px 20px;
min-height:360px;
float:left;
@@ -230,23 +230,29 @@ h6 { font-size: 0.8em; }
width:306px;
margin:20px;
min-height:360px;
+/*
background: white;
- padding:0;
+
+*/ padding:0;
}
#widgets_middle {
width:306px;
margin:20px 0 20px 0;
min-height:360px;
+/*
background: white;
- padding:0;
+
+*/ padding:0;
}
#widgets_right {
width:306px;
margin:20px 20px 20px 20px;
- min-height:760px;
+ min-height:360px;
float:left;
+/*
background: white;
- padding:0;
+
+*/ padding:0;
}
#widget_table td {
border:0;
@@ -586,7 +592,7 @@ a.toggle_customise_edit_panel:hover {
border-top:1px solid #cccccc;
background:white;
width:210px; /* was 210px */
- height:440px;
+ height:340px;
padding:10px;
overflow:scroll;
overflow-x:hidden;
@@ -646,10 +652,13 @@ a.toggle_customise_edit_panel:hover {
width:200px;
margin:0;
padding:5px 5px 40px 5px;
- min-height: 288px;
+ min-height: 190px;
border:1px solid #cccccc;
}
+#rightcolumn_widgets.long {
+ min-height: 288px;
+}
/* IE6 fix */
* html #leftcolumn_widgets {
height: 190px;
@@ -658,6 +667,9 @@ a.toggle_customise_edit_panel:hover {
height: 190px;
}
* html #rightcolumn_widgets {
+ height: 190px;
+}
+* html #rightcolumn_widgets.long {
height: 338px;
}
@@ -1116,7 +1128,13 @@ input[type="submit"] {
margin:0 0 0 0;
padding: 0;
}
-
+#dashboard_info {
+ margin:20px 0px 0 20px;
+ padding:20px;
+ border-bottom:1px solid #cccccc;
+ border-right:1px solid #cccccc;
+ background: white;
+}
#profile_menu_wrapper {
@@ -1131,7 +1149,11 @@ input[type="submit"] {
}
#profile_menu_wrapper a {
display:block;
+ width:200px;
+/*
width:180px;
+
+*/
padding:0 0 0 3px;
}
#profile_menu_wrapper a:hover {