summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--js/util.js1
-rw-r--r--plugins/OStatus/classes/Ostatus_profile.php11
-rw-r--r--theme/base/css/display.css15
-rw-r--r--theme/base/images/icons/icons-01.gifbin4080 -> 4120 bytes
-rw-r--r--theme/default/css/display.css6
-rw-r--r--theme/identica/css/display.css6
6 files changed, 22 insertions, 17 deletions
diff --git a/js/util.js b/js/util.js
index 79fd40deb..60eeb418f 100644
--- a/js/util.js
+++ b/js/util.js
@@ -402,6 +402,7 @@ var SN = { // StatusNet
var attachment_more = notice.find('.attachment.more');
if (attachment_more.length > 0) {
attachment_more.click(function() {
+ $(this).addClass(SN.C.S.Processing);
$.get($(this).attr('href')+'/ajax', null, function(data) {
notice.find('.entry-title .entry-content').html($(data).find('#attachment_view .entry-content').html());
});
diff --git a/plugins/OStatus/classes/Ostatus_profile.php b/plugins/OStatus/classes/Ostatus_profile.php
index d37596d54..95c002b01 100644
--- a/plugins/OStatus/classes/Ostatus_profile.php
+++ b/plugins/OStatus/classes/Ostatus_profile.php
@@ -500,7 +500,6 @@ class Ostatus_profile extends Memcached_DataObject
$shortSummary = substr($shortSummary,
0,
Notice::maxContent() - (mb_strlen($url) + 2));
- $shortSummary .= '…';
$content = $shortSummary . ' ' . $url;
// We mark up the attachment link specially for the HTML output
@@ -508,12 +507,10 @@ class Ostatus_profile extends Memcached_DataObject
$attachUrl = common_local_url('attachment',
array('attachment' => $attachment->id));
$rendered = common_render_text($shortSummary) .
- ' ' .
- '<a href="' .
- htmlspecialchars($attachUrl) .
- '" class="attachment more">' .
- // TRANS: expansion link for too-long remote messages
- htmlspecialchars(_m('more')) .
+ '<a href="' . htmlspecialchars($attachUrl) .'"'.
+ ' class="attachment more"' .
+ ' title="'. htmlspecialchars(_m('Show more')) . '">' .
+ '&#8230;' .
'</a>';
}
}
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 9044021f5..fdbf59781 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -1284,16 +1284,19 @@ height:16px;
position:relative;
padding-left:16px;
}
+.notice .attachment.more {
+text-indent:-9999px;
+width:16px;
+height:16px;
+display:inline-block;
+overflow:hidden;
+vertical-align:middle;
+}
+
#attachments .attachment,
.notice .attachment.more {
padding-left:0;
}
-.notice .attachment.more:before {
-content:'( ';
-}
-.notice .attachment.more:after {
-content:' )';
-}
.notice .attachment img {
position:absolute;
top:18px;
diff --git a/theme/base/images/icons/icons-01.gif b/theme/base/images/icons/icons-01.gif
index bf0f1230e..e0850aa88 100644
--- a/theme/base/images/icons/icons-01.gif
+++ b/theme/base/images/icons/icons-01.gif
Binary files differ
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index c08a03061..d89607ebe 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -213,7 +213,7 @@ background-color:transparent;
}
#wrap form.processing input.submit,
-.entity_actions a.processing,
+#content a.processing,
.dialogbox.processing .submit_dialogbox {
background:#FFFFFF url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
}
@@ -410,8 +410,10 @@ background-position: 0 -1714px;
.notice .attachment {
background-position:0 -394px;
}
-#attachments .attachment,
.notice .attachment.more {
+background-position:0 -2770px;
+}
+#attachments .attachment {
background:none;
}
.notice-options .notice_reply {
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 62a9e25d8..1af853c49 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -214,7 +214,7 @@ background-color:transparent;
}
#wrap form.processing input.submit,
-.entity_actions a.processing,
+#content a.processing,
.dialogbox.processing .submit_dialogbox {
background:#FFFFFF url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
}
@@ -409,8 +409,10 @@ background-position: 0 -1714px;
.notice .attachment {
background-position:0 -394px;
}
-#attachments .attachment,
.notice .attachment.more {
+background-position:0 -2770px;
+}
+#attachments .attachment {
background:none;
}
.notice-options .notice_reply {