summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZach Copley <zach@controlyourself.ca>2009-06-25 12:52:55 -0700
committerZach Copley <zach@controlyourself.ca>2009-06-25 12:52:55 -0700
commit6262fdbe78330894f5f9d90b778acf5cff8032d1 (patch)
tree594b97f20500cf5059518c6a1b8296f7092f35fd
parent27076227620d0beca7586affa8e89154a1648d70 (diff)
parent28b4e85af0e230e8399d8cc2098ed6150afdead6 (diff)
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
* '0.8.x' of git@gitorious.org:laconica/dev: Added fragment identifier to the "in context" URL which points to Adds a scrollbar if the filename is too long for the attached file
-rw-r--r--lib/noticelist.php2
-rw-r--r--theme/base/css/display.css1
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/noticelist.php b/lib/noticelist.php
index 6f05c63d6..44726a17b 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -432,7 +432,7 @@ class NoticeListItem extends Widget
$this->out->elementStart('dl', 'response');
$this->out->element('dt', null, _('To'));
$this->out->elementStart('dd');
- $this->out->element('a', array('href' => $convurl),
+ $this->out->element('a', array('href' => $convurl.'#notice-'.$this->notice->id),
_('in context'));
$this->out->elementEnd('dd');
$this->out->elementEnd('dl');
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index bfcc9a7fa..c8f23e4f5 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -517,6 +517,7 @@ clear:both;
width:81.5%;
margin-bottom:0;
line-height:1.618;
+overflow:auto;
}
/* entity_profile */