diff options
Diffstat (limited to 'views')
| -rw-r--r-- | views/default/canvas/layouts/widgets.php | 96 | ||||
| -rw-r--r-- | views/default/css.php | 49 |
2 files changed, 83 insertions, 62 deletions
diff --git a/views/default/canvas/layouts/widgets.php b/views/default/canvas/layouts/widgets.php index 785ebabee..b8c06e132 100644 --- a/views/default/canvas/layouts/widgets.php +++ b/views/default/canvas/layouts/widgets.php @@ -187,54 +187,76 @@ Choose the features you want to add to your page by dragging them from the <b>Wi ?> -<!-- profile box --> -<?php echo $vars['area1']; ?> +<table cellspacing="0" id="widget_table"> + <tr> + <td colspan="2" align="left" valign="top"> + <!-- profile box --> + <?php echo $vars['area1']; ?> + </td> + <td rowspan="2" align="left" valign="top"> + <?php + if($_SESSION['user']->guid == page_owner()){ + ?> + <!-- customise page button --> + <a href="javascript:void(0);" class="toggle_customise_edit_panel">Edit page</a> + <!-- <div style="clear:both;"></div> --> + <?php + } + ?> -<!-- right sidebar --> -<div id="widgets_left"> + <div id="widgets_right"> + <!-- this is where we need another widget column adding --> + + </div><!-- /#widgets_right --> + </td> + </tr> + <tr> + <td align="left" valign="top"> - <?php - - if (is_array($area1widgets) && sizeof($area1widgets) > 0) - foreach($area1widgets as $widget) { - echo elgg_view_entity($widget); - } + <!-- left widgets --> + <div id="widgets_left"> + + <?php + + if (is_array($area1widgets) && sizeof($area1widgets) > 0) + foreach($area1widgets as $widget) { + echo elgg_view_entity($widget); + } + + ?> + + </div><!-- /#widgets_left --> - ?> + </td> + <td align="left" valign="top"> -</div><!-- /#widgets_left --> + <!-- widgets middle --> + <div id="widgets_middle"> + + <?php if (isset($vars['area2'])) echo $vars['area2']; ?> + <?php + + if (is_array($area2widgets) && sizeof($area2widgets) > 0) + foreach($area2widgets as $widget) { + echo elgg_view_entity($widget); + } + + ?> + + </div><!-- /#widgets_middle --> + + </td> + </tr> +</table> + + -<!-- main content --> -<div id="widgets_middle"> - - <?php if (isset($vars['area2'])) echo $vars['area2']; ?> - <?php - if (is_array($area2widgets) && sizeof($area2widgets) > 0) - foreach($area2widgets as $widget) { - echo elgg_view_entity($widget); - } - - ?> - -</div><!-- /#widgets_middle --> -<?php - if($_SESSION['user']->guid == page_owner()){ -?> - <!-- customise page button --> - <a href="javascript:void(0);" class="toggle_customise_edit_panel">Edit widgets</a> - <!-- <div style="clear:both;"></div> --> -<?php - } -?> -<div id="widgets_right"> -<!-- this is where we need another widget column adding --> -</div><!-- /#widgets_right --> <!-- <div class="clearfloat"></div> --> diff --git a/views/default/css.php b/views/default/css.php index 8f5ab7e32..5562607f8 100644 --- a/views/default/css.php +++ b/views/default/css.php @@ -230,7 +230,6 @@ h6 { font-size: 0.8em; } width:306px; margin:20px; min-height:360px; - float:left; background: white; padding:0; } @@ -238,19 +237,22 @@ h6 { font-size: 0.8em; } width:306px; margin:20px 0 20px 0; min-height:360px; - float:left; background: white; padding:0; } #widgets_right { width:306px; - margin:20px; - min-height:360px; + margin:20px 20px 20px 20px; + min-height:760px; float:left; background: white; padding:0; } - +#widget_table td { + border:0; + padding:0; + margin:0; +} /* IE 6 temp fix - for when page has no widgets */ @@ -630,7 +632,8 @@ h6 { font-size: 0.8em; } *************************************** */ /* open 'customise page' panel button */ a.toggle_customise_edit_panel { - float:left; + float:right; + clear:right; color: #4690d6; background: white; border:1px solid #cccccc; @@ -1165,7 +1168,7 @@ input[type="submit"] { PROFILE *************************************** */ #profile_info { - margin:20px 20px 0 20px; + margin:20px 0px 0 20px; padding:20px; border-bottom:1px solid #cccccc; border-right:1px solid #cccccc; @@ -1173,23 +1176,25 @@ input[type="submit"] { } #profile_info_column_left { float:left; - width:306px; padding: 0; + margin:0 20px 0 0; } #profile_info_column_middle { float:left; - width:306px; + width:100%; + padding: 0; } #profile_info_column_right { - float:left; - width:286px; - margin:0 0 0 20px; + width:590px; + margin:0 0 0 0; + padding: 0; } #profile_menu_wrapper { margin:10px 0 10px 0; + width:auto; } #profile_menu_wrapper p { border-bottom:1px solid #cccccc; @@ -1199,6 +1204,7 @@ input[type="submit"] { } #profile_menu_wrapper a { display:block; + width:180px; padding:0 0 0 3px; } #profile_menu_wrapper a:hover { @@ -1230,24 +1236,15 @@ p.user_menu_friends_of { line-height:1.4em; } /* edit profile button */ -#profile_info_column_right .profile_info_edit_buttons { +.profile_info_edit_buttons { float:right; margin:0; padding:0; } -#profile_info_column_right .profile_info_edit_buttons a { - color: #4690d6; - background: #f5f5f5; - border:1px solid #cccccc; - padding: 2px 3px 2px 3px; +.profile_info_edit_buttons a { + padding: 0; margin:0; text-align: right; - display:block; -} -#profile_info_column_right .profile_info_edit_buttons a:hover { - color: #ffffff; - background: #0054a7; - text-decoration:none; } /* *************************************** @@ -1815,8 +1812,10 @@ div.expandall p { /* temp. force profile pic size */ #profile_info_column_left #profile_icon_wrapper .usericon a.icon img { +/* width:276px; -} + +*/} |