diff options
| -rw-r--r-- | actions/blockedfromgroup.php | 2 | ||||
| -rw-r--r-- | actions/groupmembers.php | 2 | ||||
| -rw-r--r-- | lib/noticeform.php | 4 | ||||
| -rw-r--r-- | lib/profilelist.php | 18 | ||||
| -rw-r--r-- | lib/profileminilist.php | 5 | ||||
| -rw-r--r-- | theme/base/css/display.css | 20 | ||||
| -rw-r--r-- | theme/base/css/ie.css | 9 | ||||
| -rw-r--r-- | theme/default/css/ie.css | 7 | ||||
| -rw-r--r-- | theme/identica/css/ie.css | 7 |
9 files changed, 59 insertions, 15 deletions
diff --git a/actions/blockedfromgroup.php b/actions/blockedfromgroup.php index 1b7b31784..541ebcfd9 100644 --- a/actions/blockedfromgroup.php +++ b/actions/blockedfromgroup.php @@ -176,10 +176,12 @@ class GroupBlockListItem extends ProfileListItem $user = common_current_user(); if (!empty($user) && $user->id != $this->profile->id && $user->isAdmin($this->group)) { + $this->out->elementStart('li', 'entity_block'); $bf = new GroupUnblockForm($this->out, $this->profile, $this->group, array('action' => 'blockedfromgroup', 'nickname' => $this->group->nickname)); $bf->show(); + $this->out->elementEnd('li'); } } } diff --git a/actions/groupmembers.php b/actions/groupmembers.php index 150b60a54..65790b7ca 100644 --- a/actions/groupmembers.php +++ b/actions/groupmembers.php @@ -180,10 +180,12 @@ class GroupMemberListItem extends ProfileListItem $user = common_current_user(); if (!empty($user) && $user->id != $this->profile->id && $user->isAdmin($this->group)) { + $this->out->elementStart('li', 'entity_block'); $bf = new GroupBlockForm($this->out, $this->profile, $this->group, array('action' => 'groupmembers', 'nickname' => $this->group->nickname)); $bf->show(); + $this->out->elementEnd('li'); } } diff --git a/lib/noticeform.php b/lib/noticeform.php index 3212f382a..0ad365856 100644 --- a/lib/noticeform.php +++ b/lib/noticeform.php @@ -148,12 +148,12 @@ class NoticeForm extends Form $this->out->element('dd', array('id' => 'notice_text-count'), '140'); $this->out->elementEnd('dl'); - $this->out->hidden('MAX_FILE_SIZE', common_config('attachments', 'file_quota')); - $this->out->element('label', array('for' => 'notice_data-attach'), _('Attach')); + $this->out->element('label', array('for' => 'notice_data-attach'),_('Attach')); $this->out->element('input', array('id' => 'notice_data-attach', 'type' => 'file', 'name' => 'attach', 'title' => _('Attach a file'))); + $this->out->hidden('MAX_FILE_SIZE', common_config('attachments', 'file_quota')); if ($this->action) { $this->out->hidden('notice_return-to', $this->action, 'returnto'); } diff --git a/lib/profilelist.php b/lib/profilelist.php index e2faf10af..a604230f8 100644 --- a/lib/profilelist.php +++ b/lib/profilelist.php @@ -62,8 +62,24 @@ class ProfileList extends Widget function show() { + $this->startList(); + $cnt = $this->showProfiles(); + $this->endList(); + return $cnt; + } + + function startList() + { $this->out->elementStart('ul', 'profiles'); + } + + function endList() + { + $this->out->elementEnd('ul'); + } + function showProfiles() + { $cnt = 0; while ($this->profile->fetch()) { @@ -75,8 +91,6 @@ class ProfileList extends Widget $pli->show(); } - $this->out->elementEnd('ul'); - return $cnt; } diff --git a/lib/profileminilist.php b/lib/profileminilist.php index f11cae8a5..09bef6f7c 100644 --- a/lib/profileminilist.php +++ b/lib/profileminilist.php @@ -47,6 +47,11 @@ define('PROFILES_PER_MINILIST', 27); class ProfileMiniList extends ProfileList { + function startList() + { + $this->out->elementStart('ul', 'entities users xoxo'); + } + function newListItem($profile) { return new ProfileMiniListItem($profile, $this->action); diff --git a/theme/base/css/display.css b/theme/base/css/display.css index dc275e19f..060fdfd0d 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -445,6 +445,8 @@ width:80.789%; height:67px; line-height:1.5; padding:7px 7px 16px 7px; +position:relative; +z-index:2; } #form_notice label { display:block; @@ -452,23 +454,23 @@ float:left; font-size:1.3em; margin-bottom:7px; } -#form_notice label[for=notice_data-attach] { -text-indent:-9999px; -} #form_notice label[for=notice_data-attach], #form_notice #notice_data-attach { position:absolute; top:25px; -right:49px; +cursor:pointer; +} +#form_notice label[for=notice_data-attach] { +text-indent:-9999px; +left:394px; width:16px; height:16px; -cursor:pointer; } #form_notice #notice_data-attach { -text-indent:-279px; -} -#form_notice #notice_submit label { -display:none; +left:183px; +padding:0; + +height:16px; } #form_notice .form_note { position:absolute; diff --git a/theme/base/css/ie.css b/theme/base/css/ie.css index 8183fee67..d1b0558ec 100644 --- a/theme/base/css/ie.css +++ b/theme/base/css/ie.css @@ -8,6 +8,15 @@ top:0; #form_notice textarea { width:78%; } +#form_notice .form_note + label { +position:absolute; +top:25px; +left:380px; +text-indent:-9999px; +height:16px; +width:16px; +display:block; +} #form_notice #notice_action-submit { width:17%; max-width:17%; diff --git a/theme/default/css/ie.css b/theme/default/css/ie.css index 2b06768ea..6501f4e48 100644 --- a/theme/default/css/ie.css +++ b/theme/default/css/ie.css @@ -3,7 +3,12 @@ .notice-options input.submit { color:#fff; } - #site_nav_local_views a { background-color:#ACCCDA; } +#form_notice .form_note + label { +background:transparent url(../../base/images/icons/twotone/green/clip-01.gif) no-repeat 0 45%; +} +#form_notice #notice_data-attach { +filter: alpha(opacity=0); +}
\ No newline at end of file diff --git a/theme/identica/css/ie.css b/theme/identica/css/ie.css index 2f463bb44..69db16aad 100644 --- a/theme/identica/css/ie.css +++ b/theme/identica/css/ie.css @@ -3,7 +3,12 @@ .notice-options input.submit { color:#fff; } - #site_nav_local_views a { background-color:#D0DFE7; } +#form_notice .form_note + label { +background:transparent url(../../base/images/icons/twotone/green/clip-01.gif) no-repeat 0 45%; +} +#form_notice #notice_data-attach { +filter: alpha(opacity=0); +}
\ No newline at end of file |