GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch '1.0.x' into profile-fixups 

* 1.0.x:
  Style changes for equal column heights.
  Adding wrapper divs for equal height columns.
  Fix incorrect parameter documentation. Spotted by Nikerabbit.
This commit is contained in:
Zach Copley 2011-03-14 12:34:19 -07:00
parent 2f8b7f3dea 640a033f8b
commit 4cdb3e64cc
3 changed files with 57 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actions/apigrouplist.php
View File

@ -100,7 +100,7 @@ class ApiGroupListAction extends ApiBareAuthAction
); );
$subtitle = sprintf( $subtitle = sprintf(
// TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name. // TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
_('%1$s groups %2$s is a member of.'), _('%1$s groups %2$s is a member of.'),
$sitename, $sitename,
$this->user->nickname $this->user->nickname

6
lib/action.php
View File

@ -681,6 +681,9 @@ class Action extends HTMLOutputter // lawsuit
function showCore() function showCore()
{ {
$this->elementStart('div', array('id' => 'core')); $this->elementStart('div', array('id' => 'core'));
$this->elementStart('div', array('id' => 'aside_primary_wrapper'));
$this->elementStart('div', array('id' => 'content_wrapper'));
$this->elementStart('div', array('id' => 'site_nav_local_views_wrapper'));
if (Event::handle('StartShowLocalNavBlock', array($this))) { if (Event::handle('StartShowLocalNavBlock', array($this))) {
$this->showLocalNavBlock(); $this->showLocalNavBlock();
Event::handle('EndShowLocalNavBlock', array($this)); Event::handle('EndShowLocalNavBlock', array($this));
@ -694,6 +697,9 @@ class Action extends HTMLOutputter // lawsuit
Event::handle('EndShowAside', array($this)); Event::handle('EndShowAside', array($this));
} }
$this->elementEnd('div'); $this->elementEnd('div');
$this->elementEnd('div');
$this->elementEnd('div');
$this->elementEnd('div');
} }
/** /**

64
theme/neo/css/display.css
View File

@ -137,21 +137,46 @@ address {
#core { #core {
clear: both; clear: both;
margin: 0px; margin: 0px;
width: 960px; width: 958px;
border-top: 5px solid #FB6104; border-top: 5px solid #FB6104;
border-left: 1px solid #d8dae6;
border-right: 1px solid #d8dae6;
}
#aside_primary_wrapper {
width: 100%;
float: left;
overflow: hidden;
position: relative;
background-color: #ececf2;
}
#content_wrapper {
width: 100%;
float: left;
position: relative;
right: 239px;
background-color: #fff;
border-right: 1px solid #d8dae6;
}
#site_nav_local_views_wrapper {
width: 100%;
float: left;
position: relative;
right: 561px;
background-color: #ececf2;
border-right: 1px solid #d8dae6;
} }
#site_nav_local_views { #site_nav_local_views {
display: block;
float: left;
width: 138px; width: 138px;
float: left;
overflow: hidden;
position: relative;
left: 800px;
margin-top: 0px; margin-top: 0px;
padding: 10px; padding: 22px 10px 40px 10px;
padding-top: 22px;
background-color: #ececf2;
border-left: 1px solid #d8dae6;
border-right: 1px solid #d8dae6;
min-height: 800px; /* XXX set up equal column heights! */
} }
#site_nav_local_views H3 { #site_nav_local_views H3 {
@ -196,8 +221,12 @@ address {
#content { #content {
width: 520px; width: 520px;
margin-right: 0px; float: left;
padding: 20px; overflow: hidden;
position: relative;
left: 801px;
margin: 0px;
padding: 20px 20px 40px 20px;
} }
/* Input forms */ /* Input forms */
@ -357,13 +386,12 @@ address {
#aside_primary { #aside_primary {
width: 218px; width: 218px;
padding: 10px; float: left;
padding-top: 22px; overflow: hidden;
position: relative;
left: 802px;
padding: 22px 10px 40px 10px;
margin-top: 0px; margin-top: 0px;
background-color: #ececf2;
border-left: 1px solid #d8dae6;
border-right: 1px solid #d8dae6;
min-height: 800px; /* XXX set up equal column heights! */
} }
#aside_primary .section { #aside_primary .section {
@ -665,6 +693,8 @@ div.entry-content a.response:after {
} }
#footer { #footer {
position: relative;
top: -6px;
color: #000; color: #000;
margin-left: 0px; margin-left: 0px;
margin-right: 0px; margin-right: 0px;