From c11064a5398db824f2623c5763b3fdfdf8ae3c39 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 25 Mar 2010 14:15:54 -0700
Subject: Updated 'more' anchor for attachments to do an XHR GET

Conflicts:

	lib/attachmentlist.php
	plugins/OStatus/classes/Ostatus_profile.php

Merge tried to delete things that it seems it shouldn't, very confusing order. Hope rest of the cherry-picking isn't a problem.
---
 theme/identica/css/display.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'theme/identica/css')

diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 59cb3c38a..62a9e25d8 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -409,7 +409,8 @@ background-position: 0 -1714px;
 .notice .attachment {
 background-position:0 -394px;
 }
-#attachments .attachment {
+#attachments .attachment,
+.notice .attachment.more {
 background:none;
 }
 .notice-options .notice_reply {
-- 
cgit v1.2.3-54-g00ecf


From f137946607f5f5350333e1c91dddcbac68772569 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Thu, 18 Mar 2010 14:29:35 +0100
Subject: Using an icon to represent the action for more text

---
 theme/base/css/display.css           |   9 +++++++++
 theme/base/images/icons/icons-01.gif | Bin 4080 -> 4120 bytes
 theme/default/css/display.css        |   4 +++-
 theme/identica/css/display.css       |   4 +++-
 4 files changed, 15 insertions(+), 2 deletions(-)

(limited to 'theme/identica/css')

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 757ce7ff1..fdbf59781 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -1284,6 +1284,15 @@ 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;
diff --git a/theme/base/images/icons/icons-01.gif b/theme/base/images/icons/icons-01.gif
index bf0f1230e..e0850aa88 100644
Binary files a/theme/base/images/icons/icons-01.gif and b/theme/base/images/icons/icons-01.gif differ
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index c08a03061..a283930e5 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -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..69d265a6b 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -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 {
-- 
cgit v1.2.3-54-g00ecf


From 72cf8e712d7d34920fc2002a54d5ebaeef514b9f Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Thu, 18 Mar 2010 23:00:38 +0100
Subject: Added processing indicator for more anchor

---
 js/util.js                     | 1 +
 theme/default/css/display.css  | 2 +-
 theme/identica/css/display.css | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'theme/identica/css')

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/theme/default/css/display.css b/theme/default/css/display.css
index a283930e5..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%;
 }
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 69d265a6b..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%;
 }
-- 
cgit v1.2.3-54-g00ecf


From e01bc7a33925640f8ef3a7b734c654a4c4311eca Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Fri, 19 Mar 2010 19:06:54 +0100
Subject: Using opacity on the notice more link icon

---
 theme/default/css/display.css  | 3 +++
 theme/identica/css/display.css | 3 +++
 2 files changed, 6 insertions(+)

(limited to 'theme/identica/css')

diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index d89607ebe..dd18b86ce 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -435,10 +435,12 @@ background-position:0 -1582px;
 background-position:0 -1648px;
 }
 
+.notices .attachment.more,
 .notices div.entry-content,
 .notices div.notice-options {
 opacity:0.4;
 }
+.notices li:hover .attachment.more,
 .notices li:hover div.entry-content,
 .notices li:hover div.notice-options {
 opacity:1;
@@ -446,6 +448,7 @@ opacity:1;
 .opaque {
 opacity:1 !important;
 }
+.attachment.more,
 .notice-options a,
 .notice-options input {
 font-family:sans-serif;
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 1af853c49..bef598383 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -434,10 +434,12 @@ background-position:0 -1582px;
 background-position:0 -1648px;
 }
 
+.notices .attachment.more,
 .notices div.entry-content,
 .notices div.notice-options {
 opacity:0.4;
 }
+.notices li:hover .attachment.more,
 .notices li:hover div.entry-content,
 .notices li:hover div.notice-options {
 opacity:1;
@@ -445,6 +447,7 @@ opacity:1;
 .opaque {
 opacity:1 !important;
 }
+.attachment.more,
 .notice-options a,
 .notice-options input {
 font-family:sans-serif;
-- 
cgit v1.2.3-54-g00ecf


From f9cfc0ee60fd6d31cac876df22244a99c1f4d0ca Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Fri, 19 Mar 2010 22:26:50 +0100
Subject: Removed box-shadow and outline on notice more link focus

---
 theme/default/css/display.css  | 6 ++++++
 theme/identica/css/display.css | 6 ++++++
 2 files changed, 12 insertions(+)

(limited to 'theme/identica/css')

diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index dd18b86ce..d7f15cc46 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -456,6 +456,12 @@ box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
 -moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
 -webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
 }
+.attachment.more:focus {
+box-shadow:none;
+-moz-box-shadow:none;
+-webkit-box-shadow:none;
+outline:none;
+}
 #content .notices li:hover,
 #content .applications li:hover,
 #content tbody tr:hover {
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index bef598383..d9f39e780 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -455,6 +455,12 @@ box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
 -moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
 -webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
 }
+.attachment.more:focus {
+box-shadow:none;
+-moz-box-shadow:none;
+-webkit-box-shadow:none;
+outline:none;
+}
 #content .notices li:hover,
 #content .applications li:hover,
 #content tbody tr:hover {
-- 
cgit v1.2.3-54-g00ecf


From 41c8048efd0d4b8053ee6f72fd277b9f602ded17 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Wed, 24 Mar 2010 14:50:12 +0100
Subject: Moved print inside base stylesheet using media rules. One less HTTP
 GET.

---
 lib/action.php                       |  3 +--
 theme/base/css/display.css           | 32 ++++++++++++++++++++++++++++++++
 theme/biz/css/base.css               | 32 ++++++++++++++++++++++++++++++++
 theme/biz/css/display.css            |  3 ++-
 theme/cloudy/css/display.css         | 30 ++++++++++++++++++++++++++++++
 theme/default/css/display.css        |  4 +++-
 theme/h4ck3r/css/base.css            | 32 ++++++++++++++++++++++++++++++++
 theme/h4ck3r/css/display.css         |  5 ++++-
 theme/identica/css/display.css       |  4 +++-
 theme/pigeonthoughts/css/base.css    | 32 ++++++++++++++++++++++++++++++++
 theme/pigeonthoughts/css/display.css |  4 +++-
 11 files changed, 174 insertions(+), 7 deletions(-)

(limited to 'theme/identica/css')

diff --git a/lib/action.php b/lib/action.php
index 491d7d481..09113a598 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -198,8 +198,7 @@ class Action extends HTMLOutputter // lawsuit
 
             if (Event::handle('StartShowStatusNetStyles', array($this)) &&
                 Event::handle('StartShowLaconicaStyles', array($this))) {
-                $this->cssLink('css/display.css',null,'screen, projection, tv');
-                $this->cssLink('css/print.css','base','print');
+                $this->cssLink('css/display.css',null, 'screen, projection, tv, print');
                 Event::handle('EndShowStatusNetStyles', array($this));
                 Event::handle('EndShowLaconicaStyles', array($this));
             }
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index d58684efb..36f0533b1 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -7,6 +7,7 @@
  * @link      http://status.net/
  */
 
+@media screen, projection, tv {
 * { margin:0; padding:0; }
 img { display:block; border:0; }
 a abbr { cursor: pointer; border-bottom:0; }
@@ -1688,3 +1689,34 @@ width:auto;
 #bookmarklet #wrap {
 min-width:0;
 }
+
+}/*end of @media screen, projection, tv*/
+
+
+@media print {
+a:after { background-color:#FFFFFF; }
+a:not([href^="#"]):after { content:" <"attr(href)"> "; }
+img { border:none; }
+p { orphans: 2; widows: 1; }
+
+#site_nav_global_primary,
+#site_nav_local_views,
+#form_notice,
+.pagination,
+#site_nav_global_secondary,
+.entity_actions,
+.notice-options,
+#aside_primary,
+.form_subscription_edit .submit {
+display:none;
+}
+.timestamp dt, .timestamp dd,
+.device dt, .device dd {
+display:inline;
+}
+.profiles li,
+.notices li {
+margin-bottom:18px;
+}
+
+}/*end of @media print*/
diff --git a/theme/biz/css/base.css b/theme/biz/css/base.css
index 2c2ab33a0..43b8e4656 100644
--- a/theme/biz/css/base.css
+++ b/theme/biz/css/base.css
@@ -7,6 +7,7 @@
  * @link      http://status.net/
  */
 
+@media screen, projection, tv {
 * { margin:0; padding:0; }
 img { display:block; border:0; }
 a abbr { cursor: pointer; border-bottom:0; }
@@ -1358,3 +1359,34 @@ display:none;
 .guide {
 clear:both;
 }
+
+}/*end of @media screen, projection, tv*/
+
+
+@media print {
+a:after { background-color:#FFFFFF; }
+a:not([href^="#"]):after { content:" <"attr(href)"> "; }
+img { border:none; }
+p { orphans: 2; widows: 1; }
+
+#site_nav_global_primary,
+#site_nav_local_views,
+#form_notice,
+.pagination,
+#site_nav_global_secondary,
+.entity_actions,
+.notice-options,
+#aside_primary,
+.form_subscription_edit .submit {
+display:none;
+}
+.timestamp dt, .timestamp dd,
+.device dt, .device dd {
+display:inline;
+}
+.profiles li,
+.notices li {
+margin-bottom:18px;
+}
+
+}/*end of @media print*/
diff --git a/theme/biz/css/display.css b/theme/biz/css/display.css
index 3e97444f1..cafb152dc 100644
--- a/theme/biz/css/display.css
+++ b/theme/biz/css/display.css
@@ -7,8 +7,9 @@
  * @link      http://status.net/
  */
 
-@import url(base.css);
+@import url(base.css) screen, projection, tv, print;
 
+@media screen, projection, tv {
 html {
 background-color:#144A6E;
 }
diff --git a/theme/cloudy/css/display.css b/theme/cloudy/css/display.css
index 5bc32e6d9..d9e9f3ce2 100644
--- a/theme/cloudy/css/display.css
+++ b/theme/cloudy/css/display.css
@@ -7,6 +7,7 @@
  * @link      http://status.net/
  */
 
+@media screen, projection, tv {
 * { margin:0; padding:0; }
 img { display:block; border:0; }
 a abbr { cursor: pointer; border-bottom:0; }
@@ -2099,4 +2100,33 @@ border-left-color:#FFFFFF;
 #footer {
 background-color:#FFFFFF;
 }
+}/*end of @media screen, projection, tv*/
 
+
+@media print {
+a:after { background-color:#FFFFFF; }
+a:not([href^="#"]):after { content:" <"attr(href)"> "; }
+img { border:none; }
+p { orphans: 2; widows: 1; }
+
+#site_nav_global_primary,
+#site_nav_local_views,
+#form_notice,
+.pagination,
+#site_nav_global_secondary,
+.entity_actions,
+.notice-options,
+#aside_primary,
+.form_subscription_edit .submit {
+display:none;
+}
+.timestamp dt, .timestamp dd,
+.device dt, .device dd {
+display:inline;
+}
+.profiles li,
+.notices li {
+margin-bottom:18px;
+}
+
+}/*end of @media print*/
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index d7f15cc46..7ccd234cd 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -7,8 +7,9 @@
  * @link      http://status.net/
  */
 
-@import url(../../base/css/display.css);
+@import url(../../base/css/display.css) screen, projection, tv, print;
 
+@media screen, projection, tv {
 body,
 a:active {
 background-color:#CEE1E9;
@@ -516,3 +517,4 @@ background-position:90% 47%;
 background-position:10% 47%;
 }
 
+}/*end of @media screen, projection, tv*/
diff --git a/theme/h4ck3r/css/base.css b/theme/h4ck3r/css/base.css
index 18ea742a5..0302653fd 100644
--- a/theme/h4ck3r/css/base.css
+++ b/theme/h4ck3r/css/base.css
@@ -7,6 +7,7 @@
  * @link      http://status.net/
  */
 
+@media screen, projection, tv {
 * { margin:0; padding:0; }
 img { display:block; border:0; }
 a abbr { cursor: pointer; border-bottom:0; }
@@ -1137,3 +1138,34 @@ display:none;
 .guide {
 clear:both;
 }
+
+}/*end of @media screen, projection, tv*/
+
+
+@media print {
+a:after { background-color:#FFFFFF; }
+a:not([href^="#"]):after { content:" <"attr(href)"> "; }
+img { border:none; }
+p { orphans: 2; widows: 1; }
+
+#site_nav_global_primary,
+#site_nav_local_views,
+#form_notice,
+.pagination,
+#site_nav_global_secondary,
+.entity_actions,
+.notice-options,
+#aside_primary,
+.form_subscription_edit .submit {
+display:none;
+}
+.timestamp dt, .timestamp dd,
+.device dt, .device dd {
+display:inline;
+}
+.profiles li,
+.notices li {
+margin-bottom:18px;
+}
+
+}/*end of @media print*/
diff --git a/theme/h4ck3r/css/display.css b/theme/h4ck3r/css/display.css
index 58b3f242a..7112765ab 100644
--- a/theme/h4ck3r/css/display.css
+++ b/theme/h4ck3r/css/display.css
@@ -7,8 +7,9 @@
  * @link      http://status.net/
  */
 
-@import url(base.css);
+@import url(base.css) screen, projection, tv, print;
 
+@media screen, projection, tv {
 html,
 body,
 a:active {
@@ -234,3 +235,5 @@ background-position:10% 45%;
 background-image:url(../../base/images/icons/twotone/green/arrow-right.gif);
 background-position:90% 45%;
 }
+
+}/*end of @media screen, projection, tv*/
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index d9f39e780..3972657a7 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -7,8 +7,9 @@
  * @link      http://status.net/
  */
 
-@import url(../../base/css/display.css);
+@import url(../../base/css/display.css) screen, projection, tv, print;
 
+@media screen, projection, tv {
 body,
 a:active {
 background-color:#F0F2F5;
@@ -515,3 +516,4 @@ background-position:90% 47%;
 background-position:10% 47%;
 }
 
+}/*end of @media screen, projection, tv*/
diff --git a/theme/pigeonthoughts/css/base.css b/theme/pigeonthoughts/css/base.css
index 2814260bd..bd12e6eaa 100644
--- a/theme/pigeonthoughts/css/base.css
+++ b/theme/pigeonthoughts/css/base.css
@@ -7,6 +7,7 @@
  * @link      http://status.net/
  */
 
+@media screen, projection, tv {
 * { margin:0; padding:0; }
 img { display:block; border:0; }
 a abbr { cursor: pointer; border-bottom:0; }
@@ -1383,3 +1384,34 @@ display:none;
 .guide {
 clear:both;
 }
+
+}/*end of @media screen, projection, tv*/
+
+
+@media print {
+a:after { background-color:#FFFFFF; }
+a:not([href^="#"]):after { content:" <"attr(href)"> "; }
+img { border:none; }
+p { orphans: 2; widows: 1; }
+
+#site_nav_global_primary,
+#site_nav_local_views,
+#form_notice,
+.pagination,
+#site_nav_global_secondary,
+.entity_actions,
+.notice-options,
+#aside_primary,
+.form_subscription_edit .submit {
+display:none;
+}
+.timestamp dt, .timestamp dd,
+.device dt, .device dd {
+display:inline;
+}
+.profiles li,
+.notices li {
+margin-bottom:18px;
+}
+
+}/*end of @media print*/
diff --git a/theme/pigeonthoughts/css/display.css b/theme/pigeonthoughts/css/display.css
index dfeb01b48..de5164ea8 100644
--- a/theme/pigeonthoughts/css/display.css
+++ b/theme/pigeonthoughts/css/display.css
@@ -7,8 +7,9 @@
  * @link      http://status.net/
  */
 
-@import url(base.css);
+@import url(base.css) screen, projection, tv, print;
 
+@media screen, projection, tv {
 html {
 background:url(../images/illustrations/illu_pigeons-01.png) no-repeat 0 100%;
 }
@@ -496,3 +497,4 @@ background-position:90% 47%;
 background-position:10% 47%;
 }
 
+}/*end of @media screen, projection, tv*/
-- 
cgit v1.2.3-54-g00ecf


From 353659764b1daef8fd078fa1c3da0a710bbe62f8 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Thu, 25 Mar 2010 17:33:59 +0100
Subject: Fix for processing indicator for aside

---
 theme/cloudy/css/display.css         | 3 ++-
 theme/default/css/display.css        | 2 +-
 theme/identica/css/display.css       | 2 +-
 theme/pigeonthoughts/css/display.css | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'theme/identica/css')

diff --git a/theme/cloudy/css/display.css b/theme/cloudy/css/display.css
index 5c3d8b5f7..caea5cf44 100644
--- a/theme/cloudy/css/display.css
+++ b/theme/cloudy/css/display.css
@@ -1663,7 +1663,8 @@ background-color:transparent;
 }
 
 #wrap form.processing input.submit,
-.entity_actions a.processing {
+#core a.processing,
+.dialogbox.processing .submit_dialogbox {
 background:#FFFFFF url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
 cursor:wait;
 text-indent:-9999px;
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index 7ccd234cd..5e3748cb7 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -214,7 +214,7 @@ background-color:transparent;
 }
 
 #wrap form.processing input.submit,
-#content a.processing,
+#core a.processing,
 .dialogbox.processing .submit_dialogbox {
 background:#FFFFFF url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
 }
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 3972657a7..440dd8be2 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -215,7 +215,7 @@ background-color:transparent;
 }
 
 #wrap form.processing input.submit,
-#content a.processing,
+#core a.processing,
 .dialogbox.processing .submit_dialogbox {
 background:#FFFFFF url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
 }
diff --git a/theme/pigeonthoughts/css/display.css b/theme/pigeonthoughts/css/display.css
index 62fa8817a..e584683fc 100644
--- a/theme/pigeonthoughts/css/display.css
+++ b/theme/pigeonthoughts/css/display.css
@@ -250,7 +250,7 @@ background-color:transparent;
 
 
 #wrap form.processing input.submit,
-.entity_actions a.processing,
+#core a.processing,
 .dialogbox.processing .submit_dialogbox {
 background:#FFFFFF url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
 }
-- 
cgit v1.2.3-54-g00ecf