From 7347381183bfee96db8b2f89a4ba0ce5d04f76e2 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 27 Jan 2010 21:42:13 -0800
Subject: [PATCH 01/16] Fix for Mapstraction plugin's zoomed map links

Move definition of NICKNAME_FMT above plugin initialization but below loading of Validate package.
A merge error when refactoring setup lead to this not being defined yet when plugins were initialized, causing the router setup in MapstractionPlugin which tried to use this constant to fail.
Result was bogus links and if you hit the URL directly the action would be "unrecognized".
---
 lib/common.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/common.php b/lib/common.php
index b4e4a653c8..b482464aac 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -115,6 +115,10 @@ function __autoload($cls)
 require_once 'Validate.php';
 require_once 'markdown.php';
 
+// XXX: other formats here
+
+define('NICKNAME_FMT', VALIDATE_NUM.VALIDATE_ALPHA_LOWER);
+
 require_once INSTALLDIR.'/lib/util.php';
 require_once INSTALLDIR.'/lib/action.php';
 require_once INSTALLDIR.'/lib/mail.php';
@@ -136,6 +140,3 @@ try {
     exit;
 }
 
-// XXX: other formats here
-
-define('NICKNAME_FMT', VALIDATE_NUM.VALIDATE_ALPHA_LOWER);

From dcce323d18d4b779d2456f32aa99dfac5e2b7520 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Thu, 28 Jan 2010 15:05:23 +0100
Subject: [PATCH 02/16] Removed unused variable assignment for avatar URL and
 added missing fn

---
 lib/noticelist.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/lib/noticelist.php b/lib/noticelist.php
index 78abf34a76..85c169716a 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -555,11 +555,8 @@ class NoticeListItem extends Widget
 
             $this->out->raw(_('Repeated by'));
 
-            $avatar = $repeater->getAvatar(AVATAR_MINI_SIZE);
-
             $this->out->elementStart('a', $attrs);
-
-            $this->out->element('span', 'nickname', $repeater->nickname);
+            $this->out->element('span', 'fn nickname', $repeater->nickname);
             $this->out->elementEnd('a');
 
             $this->out->elementEnd('span');

From 5b1245a32a04de602196d2216b9d25ac32e0fd3b Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Thu, 28 Jan 2010 15:06:03 +0100
Subject: [PATCH 03/16] Removed avatar from repeat of username (matches
 noticelist)

---
 actions/showstream.php | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/actions/showstream.php b/actions/showstream.php
index 90ff67073a..c529193860 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -291,23 +291,6 @@ class ProfileNoticeListItem extends NoticeListItem
 
             $this->out->elementStart('span', 'repeat');
 
-            $this->out->elementStart('a', $attrs);
-
-            $avatar = $this->profile->getAvatar(AVATAR_MINI_SIZE);
-
-            $this->out->element('img', array('src' => ($avatar) ?
-                                             $avatar->displayUrl() :
-                                             Avatar::defaultImage(AVATAR_MINI_SIZE),
-                                             'class' => 'avatar photo',
-                                             'width' => AVATAR_MINI_SIZE,
-                                             'height' => AVATAR_MINI_SIZE,
-                                             'alt' =>
-                                             ($this->profile->fullname) ?
-                                             $this->profile->fullname :
-                                             $this->profile->nickname));
-
-            $this->out->elementEnd('a');
-
             $text_link = XMLStringer::estring('a', $attrs, $this->profile->nickname);
 
             $this->out->raw(sprintf(_('Repeat of %s'), $text_link));

From c6f8b94fa91e3e5559a9b79766e7320b096b839e Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Thu, 28 Jan 2010 16:02:39 +0100
Subject: [PATCH 04/16] Showing processing indicator for form_repeat on submit
 instead of form

---
 theme/base/css/display.css     | 11 ++++++++++-
 theme/default/css/display.css  |  9 +++++----
 theme/identica/css/display.css |  9 +++++----
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 65dd159900..3c51deb312 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -1127,8 +1127,17 @@ top:3px;
 }
 
 .dialogbox .submit_dialogbox {
-text-indent:0;
 font-weight:bold;
+text-indent:0;
+min-width:46px;
+}
+
+#wrap form.processing input.submit,
+.entity_actions a.processing,
+.dialogbox.processing .submit_dialogbox {
+cursor:wait;
+outline:none;
+text-indent:-9999px;
 }
 
 .notice-options {
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index 3aebb239d3..06711850fc 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -196,11 +196,12 @@ background-color:transparent;
 }
 
 #wrap form.processing input.submit,
-.entity_actions a.processing {
+.entity_actions a.processing,
+.dialogbox.processing .submit_dialogbox {
 background:#FFFFFF url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
-cursor:wait;
-text-indent:-9999px;
-outline:none;
+}
+.notice-options .form_repeat.processing {
+background-image:none;
 }
 
 #content {
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 2818196c20..1ac96ab5be 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -196,11 +196,12 @@ background-color:transparent;
 }
 
 #wrap form.processing input.submit,
-.entity_actions a.processing {
+.entity_actions a.processing,
+.dialogbox.processing .submit_dialogbox {
 background:#FFFFFF url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
-cursor:wait;
-text-indent:-9999px;
-outline:none;
+}
+.notice-options .form_repeat.processing {
+background-image:none;
 }
 
 #content {

From 61114ceff7c4124519cb5aa59b4d06ec73127e9d Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Thu, 28 Jan 2010 16:39:20 +0100
Subject: [PATCH 05/16] Fixed layout for powered by statusnet in biz

---
 theme/biz/css/base.css | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/theme/biz/css/base.css b/theme/biz/css/base.css
index 6357e55b4e..471ac580d9 100644
--- a/theme/biz/css/base.css
+++ b/theme/biz/css/base.css
@@ -224,6 +224,15 @@ font-weight:bold;
 address img + .fn {
 display:none;
 }
+address .poweredby {
+float:left;
+clear:left;
+display:block;
+position:relative;
+top:7px;
+margin-right:-47px;
+}
+
 
 #header {
 width:100%;

From d4289cb34e9aefe7ffea3ca506ea0223f7858cb6 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Thu, 28 Jan 2010 16:41:28 +0100
Subject: [PATCH 06/16] Fixed layout when ad plugin is on for biz

---
 theme/biz/css/base.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/theme/biz/css/base.css b/theme/biz/css/base.css
index 471ac580d9..2d4ac85ba6 100644
--- a/theme/biz/css/base.css
+++ b/theme/biz/css/base.css
@@ -396,7 +396,7 @@ margin-bottom:1em;
 }
 
 #content {
-width:51.009%;
+width:50%;
 min-height:259px;
 padding:1.795%;
 float:left;

From b969fba2f5de4edf43e514e23565e1a90f916d04 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Thu, 28 Jan 2010 16:49:33 +0100
Subject: [PATCH 07/16] Updated geo sharing styles for biz

---
 theme/biz/css/base.css    | 21 +++++++++++++++++++++
 theme/biz/css/display.css | 15 ++++++++++++++-
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/theme/biz/css/base.css b/theme/biz/css/base.css
index 2d4ac85ba6..47845421a3 100644
--- a/theme/biz/css/base.css
+++ b/theme/biz/css/base.css
@@ -518,6 +518,27 @@ margin-bottom:0;
 line-height:1.618;
 }
 
+.form_notice #notice_data-geo_wrap label,
+.form_notice #notice_data-geo_wrap input {
+position:absolute;
+top:25px;
+right:4px;
+left:auto;
+cursor:pointer;
+width:16px;
+height:16px;
+display:block;
+}
+.form_notice #notice_data-geo_wrap input {
+visibility:hidden;
+}
+.form_notice #notice_data-geo_wrap label {
+font-weight:normal;
+font-size:1em;
+margin-bottom:0;
+text-indent:-9999px;
+}
+
 /* entity_profile */
 .entity_profile {
 position:relative;
diff --git a/theme/biz/css/display.css b/theme/biz/css/display.css
index 7ea4515769..7a53b02bfc 100644
--- a/theme/biz/css/display.css
+++ b/theme/biz/css/display.css
@@ -60,6 +60,13 @@ input.submit,
 color:#FFFFFF;
 }
 
+.form_notice label[for=notice_data-geo] {
+background-position:0 -1780px;
+}
+.form_notice label[for=notice_data-geo].checked {
+background-position:0 -1846px;
+}
+
 a,
 #site_nav_local_views .current a,
 div.notice-options input,
@@ -115,6 +122,12 @@ text-indent:-9999px;
 outline:none;
 }
 
+.form_notice label[for=notice_data-geo] {
+background-image:url(../../base/images/icons/icons-01.gif);
+background-repeat:no-repeat;
+background-color:transparent;
+}
+
 #content {
 box-shadow:5px 7px 7px rgba(194, 194, 194, 0.3);
 -moz-box-shadow:5px 7px 7px rgba(194, 194, 194, 0.3);
@@ -130,7 +143,7 @@ border-color:#FFFFFF;
 background-color:#FFFFFF;
 }
 
-#site_nav_local_views li {
+#site_nav_local_views li.current {
 box-shadow:3px 7px 5px rgba(194, 194, 194, 0.5);
 -moz-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.5);
 -webkit-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.5);

From e881888789be64576cb299611c80a0d191fa5682 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Thu, 28 Jan 2010 17:08:24 +0100
Subject: [PATCH 08/16] Updated biz theme to use the single icons file

---
 theme/biz/css/base.css    |  20 +++---
 theme/biz/css/display.css | 132 +++++++++++++++++++++++++++++---------
 2 files changed, 110 insertions(+), 42 deletions(-)

diff --git a/theme/biz/css/base.css b/theme/biz/css/base.css
index 47845421a3..4ce7b49caa 100644
--- a/theme/biz/css/base.css
+++ b/theme/biz/css/base.css
@@ -911,25 +911,21 @@ margin-right:11px;
 .notice-options a {
 float:left;
 }
-.notice-options .notice_delete,
 .notice-options .notice_reply,
+.notice-options .form_repeat,
 .notice-options .form_favor,
-.notice-options .form_disfavor {
-position:absolute;
-top:0;
+.notice-options .form_disfavor,
+.notice-options .repeated {
+float:left;
+margin-left:14.2%;
 }
 .notice-options .form_favor,
 .notice-options .form_disfavor {
-left:0;
-}
-.notice-options .notice_reply {
-left:29px;
-}
-.notice-options .notice_delete {
-right:0;
+margin-left:0;
 }
 .notice-options input,
-.notice-options a {
+.notice-options a,
+.notice-options .repeated {
 text-indent:-9999px;
 outline:none;
 }
diff --git a/theme/biz/css/display.css b/theme/biz/css/display.css
index 7a53b02bfc..4dfd25a996 100644
--- a/theme/biz/css/display.css
+++ b/theme/biz/css/display.css
@@ -108,26 +108,63 @@ color:#333333;
 #form_notice.warning #notice_text-count {
 color:#000000;
 }
-#form_notice label[for=notice_data-attach] {
-background:transparent url(../../base/images/icons/twotone/green/clip-01.gif) no-repeat 0 45%;
+.form_notice label[for=notice_data-attach] {
+background-position:0 -328px;
 }
-#form_notice #notice_data-attach {
+.form_notice #notice_data-attach {
 opacity:0;
 }
 
-#wrap form.processing input.submit {
-background:#FFFFFF url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
-cursor:wait;
-text-indent:-9999px;
-outline:none;
-}
-
-.form_notice label[for=notice_data-geo] {
+.form_notice label[for=notice_data-attach],
+#export_data li a.rss,
+#export_data li a.atom,
+#export_data li a.foaf,
+.entity_edit a,
+.entity_send-a-message a,
+.entity_nudge p,
+.form_user_nudge input.submit,
+.form_user_block input.submit,
+.form_user_unblock input.submit,
+.form_group_block input.submit,
+.form_group_unblock input.submit,
+.form_make_admin input.submit,
+.notice .attachment,
+.notice-options .notice_reply,
+.notice-options form.form_favor input.submit,
+.notice-options form.form_disfavor input.submit,
+.notice-options .notice_delete,
+.notice-options form.form_repeat input.submit,
+#new_group a,
+.pagination .nav_prev a,
+.pagination .nav_next a,
+button.close,
+.form_group_leave input.submit,
+.form_user_unsubscribe input.submit,
+.form_group_join input.submit,
+.form_user_subscribe input.submit,
+.entity_subscribe a,
+.entity_moderation p,
+.entity_sandbox input.submit,
+.entity_silence input.submit,
+.entity_delete input.submit,
+.notice-options .repeated,
+.form_notice label[for=notice_data-geo],
+button.minimize,
+.form_reset_key input.submit {
 background-image:url(../../base/images/icons/icons-01.gif);
 background-repeat:no-repeat;
 background-color:transparent;
 }
 
+#wrap form.processing input.submit,
+.entity_actions a.processing,
+.dialogbox.processing .submit_dialogbox {
+background:#FFFFFF url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
+}
+.notice-options .form_repeat.processing {
+background-image:none;
+}
+
 #content {
 box-shadow:5px 7px 7px rgba(194, 194, 194, 0.3);
 -moz-box-shadow:5px 7px 7px rgba(194, 194, 194, 0.3);
@@ -175,13 +212,13 @@ background-repeat:no-repeat;
 background-position:0 45%;
 }
 #export_data li a.rss {
-background-image:url(../../base/images/icons/icon_rss.png);
+background-position:0 -130px;
 }
 #export_data li a.atom {
-background-image:url(../../base/images/icons/icon_atom.png);
+background-position:0 -64px;
 }
 #export_data li a.foaf {
-background-image:url(../../base/images/icons/icon_foaf.gif);
+background-position:0 1px;
 }
 
 .entity_edit a,
@@ -211,43 +248,65 @@ background-color:#87B4C8;
 }
 
 .entity_edit a {
-background-image:url(../../base/images/icons/twotone/green/edit.gif);
+background-position: 5px -718px;
 }
 .entity_send-a-message a {
-background-image:url(../../base/images/icons/twotone/green/quote.gif);
+background-position: 5px -852px;
 }
+
 .entity_nudge p,
 .form_user_nudge input.submit {
-background-image:url(../../base/images/icons/twotone/green/mail.gif);
+background-position: 5px -785px;
 }
 .form_user_block input.submit,
 .form_user_unblock input.submit,
 .form_group_block input.submit,
 .form_group_unblock input.submit {
-background-image:url(../../base/images/icons/twotone/green/shield.gif);
+background-position: 5px -918px;
 }
 .form_make_admin input.submit {
-background-image:url(../../base/images/icons/twotone/green/admin.gif);
+background-position: 5px -983px;
+}
+.entity_moderation p {
+background-position: 5px -1313px;
+}
+.entity_sandbox input.submit {
+background-position: 5px -1380px;
+}
+.entity_silence input.submit {
+background-position: 5px -1445px;
+}
+.entity_delete input.submit {
+background-position: 5px -1511px;
+}
+.form_reset_key input.submit {
+background-position: 5px -1973px;
 }
 
 /* NOTICES */
 .notice .attachment {
-background:transparent url(../../base/images/icons/twotone/green/clip-02.gif) no-repeat 0 45%;
+background-position:0 -394px;
 }
 #attachments .attachment {
 background:none;
 }
 .notice-options .notice_reply {
-background:transparent url(../../base/images/icons/twotone/green/reply.gif) no-repeat 0 45%;
+background-position:0 -592px;
 }
 .notice-options form.form_favor input.submit {
-background:transparent url(../../base/images/icons/twotone/green/favourite.gif) no-repeat 0 45%;
+background-position:0 -460px;
 }
 .notice-options form.form_disfavor input.submit {
-background:transparent url(../../base/images/icons/twotone/green/disfavourite.gif) no-repeat 0 45%;
+background-position:0 -526px;
 }
 .notice-options .notice_delete {
-background:transparent url(../../base/images/icons/twotone/green/trash.gif) no-repeat 0 45%;
+background-position:0 -658px;
+}
+.notice-options form.form_repeat input.submit {
+background-position:0 -1582px;
+}
+.notice-options .repeated {
+background-position:0 -1648px;
 }
 
 .notices div.entry-content,
@@ -284,19 +343,32 @@ background-color:rgba(200, 200, 200, 0.300);
 /*END: NOTICES */
 
 #new_group a {
-background:transparent url(../../base/images/icons/twotone/green/news.gif) no-repeat 0 45%;
+background-position:0 -1054px;
 }
 
 .pagination .nav_prev a,
 .pagination .nav_next a {
 background-repeat:no-repeat;
-border-color:#CEE1E9;
+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);
 }
 .pagination .nav_prev a {
-background-image:url(../../base/images/icons/twotone/green/arrow-left.gif);
-background-position:10% 45%;
+background-position:10% -187px;
 }
 .pagination .nav_next a {
-background-image:url(../../base/images/icons/twotone/green/arrow-right.gif);
-background-position:90% 45%;
+background-position:105% -252px;
+}
+.pagination .nav .processing {
+background-image:url(../../base/images/icons/icon_processing.gif);
+box-shadow:none;
+-moz-box-shadow:none;
+-webkit-box-shadow:none;
+outline:none;
+}
+.pagination .nav_next a.processing {
+background-position:90% 47%;
+}
+.pagination .nav_prev a.processing {
+background-position:10% 47%;
 }

From 6e556e502a13a1cfef51492707932635322f4bc4 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Thu, 28 Jan 2010 17:09:35 +0100
Subject: [PATCH 09/16] Updated biz theme to hide form_repeat legend

---
 theme/biz/css/base.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/theme/biz/css/base.css b/theme/biz/css/base.css
index 4ce7b49caa..ec8ca22f5f 100644
--- a/theme/biz/css/base.css
+++ b/theme/biz/css/base.css
@@ -942,17 +942,18 @@ padding-left:16px;
 width:16px;
 padding:2px 0;
 }
+.notice-options .form_repeat legend,
 .notice-options .form_favor legend,
 .notice-options .form_disfavor legend {
 display:none;
 }
+.notice-options .form_repeat fieldset,
 .notice-options .form_favor fieldset,
 .notice-options .form_disfavor fieldset {
 border:0;
 padding:0;
 }
 
-
 #usergroups #new_group {
 float: left;
 margin-right: 2em;

From 83087e9d9b14b4425368dbd2f95ff6fcc909e7f6 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Thu, 28 Jan 2010 17:12:48 +0100
Subject: [PATCH 10/16] Updated biz theme notice options

---
 theme/biz/css/base.css | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/theme/biz/css/base.css b/theme/biz/css/base.css
index ec8ca22f5f..d5873b0b07 100644
--- a/theme/biz/css/base.css
+++ b/theme/biz/css/base.css
@@ -903,9 +903,10 @@ text-transform:lowercase;
 .notice-options {
 position:relative;
 font-size:0.95em;
-width:90px;
+width:113px;
 float:right;
-margin-right:11px;
+margin-top:3px;
+margin-right:4px;
 }
 
 .notice-options a {
@@ -936,11 +937,17 @@ border:0;
 .notice-options .notice_reply,
 .notice-options .notice_delete {
 text-decoration:none;
-padding-left:16px;
+}
+.notice .notice-options .notice_delete {
+float:right;
 }
 .notice-options form input.submit {
 width:16px;
-padding:2px 0;
+height:16px;
+padding:0;
+border-radius:0;
+-moz-border-radius:0;
+-webkit-border-radius:0;
 }
 .notice-options .form_repeat legend,
 .notice-options .form_favor legend,
@@ -953,6 +960,11 @@ display:none;
 border:0;
 padding:0;
 }
+.notice-options a,
+.notice-options .repeated {
+width:16px;
+height:16px;
+}
 
 #usergroups #new_group {
 float: left;

From 156efda37a2a6d2e16b061180fea828581691560 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Thu, 28 Jan 2010 17:16:11 +0100
Subject: [PATCH 11/16] Updated biz theme to use dialogbox styles

---
 theme/biz/css/base.css    | 43 ++++++++++++++++++++++++++++++++++++++
 theme/biz/css/display.css | 44 ++++++++++++++++++++++++---------------
 2 files changed, 70 insertions(+), 17 deletions(-)

diff --git a/theme/biz/css/base.css b/theme/biz/css/base.css
index d5873b0b07..a8834ca570 100644
--- a/theme/biz/css/base.css
+++ b/theme/biz/css/base.css
@@ -900,6 +900,49 @@ display:inline-block;
 text-transform:lowercase;
 }
 
+.dialogbox {
+position:absolute;
+top:-4px;
+right:29px;
+z-index:9;
+min-width:199px;
+float:none;
+background-color:#FFF;
+padding:11px;
+border-radius:7px;
+-moz-border-radius:7px;
+-webkit-border-radius:7px;
+border-style:solid;
+border-width:1px;
+border-color:#DDDDDD;
+-moz-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
+}
+
+.dialogbox legend {
+display:block !important;
+margin-right:18px;
+}
+
+.dialogbox button.close {
+position:absolute;
+right:3px;
+top:3px;
+}
+
+.dialogbox .submit_dialogbox {
+font-weight:bold;
+text-indent:0;
+min-width:46px;
+}
+
+#wrap form.processing input.submit,
+.entity_actions a.processing,
+.dialogbox.processing .submit_dialogbox {
+cursor:wait;
+outline:none;
+text-indent:-9999px;
+}
+
 .notice-options {
 position:relative;
 font-size:0.95em;
diff --git a/theme/biz/css/display.css b/theme/biz/css/display.css
index 4dfd25a996..52f36ab54a 100644
--- a/theme/biz/css/display.css
+++ b/theme/biz/css/display.css
@@ -40,25 +40,35 @@ border-color:#DDDDDD;
 background:none;
 }
 
-input.submit,
-#form_notice.warning #notice_text-count,
-.form_settings .form_note,
-.entity_remote_subscribe {
-background-color:#9BB43E;
-}
-
-input:focus, textarea:focus, select:focus,
-#form_notice.warning #notice_data-text {
-border-color:#9BB43E;
-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);
-}
-input.submit,
-.entity_remote_subscribe,
-#site_nav_local_views a {
+input.submit {
 color:#FFFFFF;
 }
+.entity_actions input.submit {
+border-color:transparent;
+text-shadow:none;
+}
+.dialogbox .submit_dialogbox,
+input.submit,
+.form_notice input.submit {
+background:#AAAAAA url(../../base/images/illustrations/illu_pattern-01.png) 0 0 repeat-x;
+text-shadow:0 1px 0 #FFFFFF;
+color:#000000;
+border-color:#AAAAAA;
+border-top-color:#CCCCCC;
+border-left-color:#CCCCCC;
+}
+.dialogbox .submit_dialogbox:hover,
+input.submit:hover {
+background-position:0 -5px;
+}
+.dialogbox .submit_dialogbox:focus,
+input.submit:focus {
+background-position:0 -15px;
+box-shadow:3px 3px 3px rgba(194, 194, 194, 0.1);
+-moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.1);
+-webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.1);
+text-shadow:none;
+}
 
 .form_notice label[for=notice_data-geo] {
 background-position:0 -1780px;

From d955fb5e374d94526f9af928d28514e7b9a27a8f Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Thu, 28 Jan 2010 17:22:01 +0100
Subject: [PATCH 12/16] Updated biz theme entity_actions styles

---
 theme/biz/css/base.css    | 110 ++++++++++++++++++++++++++++----------
 theme/biz/css/display.css |  41 +++++++-------
 2 files changed, 104 insertions(+), 47 deletions(-)

diff --git a/theme/biz/css/base.css b/theme/biz/css/base.css
index a8834ca570..bd70c083e2 100644
--- a/theme/biz/css/base.css
+++ b/theme/biz/css/base.css
@@ -605,8 +605,9 @@ display:none;
 /*entity_actions*/
 .entity_actions {
 float:right;
-margin-left:4.35%;
-max-width:25%;
+margin-left:2%;
+margin-bottom:18px;
+min-width:21%;
 }
 .entity_actions h2 {
 display:none;
@@ -615,7 +616,7 @@ display:none;
 list-style-type:none;
 }
 .entity_actions li {
-margin-bottom:4px;
+margin-bottom:7px;
 }
 .entity_actions li:first-child {
 border-top:0;
@@ -633,42 +634,97 @@ display:block;
 text-align:left;
 width:100%;
 }
-.entity_actions a,
-.entity_nudge p,
-.entity_remote_subscribe {
+.entity_actions a {
 text-decoration:none;
 font-weight:bold;
 display:block;
 }
-
-.form_user_block input.submit,
-.form_user_unblock input.submit,
-.entity_send-a-message a,
-.entity_edit a,
-.form_user_nudge input.submit,
-.entity_nudge p {
-border:0;
-padding-left:20px;
-}
-
-.entity_edit a,
-.entity_send-a-message a,
-.entity_nudge p {
-padding:4px 4px 4px 23px;
-}
-
-.entity_remote_subscribe {
-padding:4px;
-border-width:2px;
-border-style:solid;
+.entity_actions a,
+.entity_actions input {
 border-radius:4px;
 -moz-border-radius:4px;
 -webkit-border-radius:4px;
 }
+
+.entity_actions a,
+.entity_actions input,
+.entity_actions p {
+border-width:2px;
+border-style:solid;
+padding-left:23px;
+}
+
+.entity_actions a,
+.entity_actions p {
+padding:2px 4px 1px 26px;
+}
+
 .entity_actions .accept {
 margin-bottom:18px;
 }
 
+.entity_send-a-message button {
+position:absolute;
+top:3px;
+right:3px;
+}
+
+.entity_send-a-message .form_notice {
+position:absolute;
+top:34px;
+right:-1px;
+padding:1.795%;
+width:65%;
+z-index:2;
+ border-radius:7px;
+-moz-border-radius:7px;
+-webkit-border-radius:7px;
+border-width:1px;
+border-style:solid;
+}
+.entity_send-a-message .form_notice legend {
+display:block;
+margin-bottom:11px;
+}
+
+.entity_send-a-message .form_notice label,
+.entity_send-a-message .form_notice select {
+display:none;
+}
+.entity_send-a-message .form_notice input.submit {
+text-align:center;
+}
+
+.entity_moderation {
+position:relative;
+}
+.entity_moderation p {
+border-radius:4px;
+-moz-border-radius:4px;
+-webkit-border-radius:4px;
+font-weight:bold;
+padding-bottom:2px;
+margin-bottom:7px;
+}
+.entity_moderation ul {
+display:none;
+}
+.entity_moderation:hover ul {
+display:block;
+min-width:21%;
+width:100%;
+padding:11px;
+position:absolute;
+top:-1px;
+right:-1px;
+z-index:1;
+border-width:1px;
+border-style:solid;
+border-radius:7px;
+-moz-border-radius:7px;
+-webkit-border-radius:7px;
+}
+
 .entity_tags ul {
 list-style-type:none;
 display:inline;
diff --git a/theme/biz/css/display.css b/theme/biz/css/display.css
index 52f36ab54a..7fd78470f5 100644
--- a/theme/biz/css/display.css
+++ b/theme/biz/css/display.css
@@ -186,7 +186,9 @@ box-shadow:5px 7px 7px rgba(194, 194, 194, 0.3);
 border-color:#FFFFFF;
 }
 #content,
-#site_nav_local_views .current a {
+#site_nav_local_views .current a,
+.entity_send-a-message .form_notice,
+.entity_moderation:hover ul {
 background-color:#FFFFFF;
 }
 
@@ -231,30 +233,22 @@ background-position:0 -64px;
 background-position:0 1px;
 }
 
-.entity_edit a,
-.entity_send-a-message a,
-.form_user_nudge input.submit,
-.form_user_block input.submit,
-.form_user_unblock input.submit,
-.form_group_block input.submit,
-.form_group_unblock input.submit,
-.entity_nudge p,
-.form_make_admin input.submit {
-background-position: 0 40%;
-background-repeat: no-repeat;
-background-color:transparent;
-}
 .form_group_join input.submit,
-.form_group_leave input.submit
+.form_group_leave input.submit,
 .form_user_subscribe input.submit,
-.form_user_unsubscribe input.submit {
-background-color:#9BB43E;
+.form_user_unsubscribe input.submit,
+.entity_subscribe a {
+background-color:#AAAAAA;
 color:#FFFFFF;
 }
-.form_user_unsubscribe input.submit,
 .form_group_leave input.submit,
-.form_user_authorization input.reject {
-background-color:#87B4C8;
+.form_user_unsubscribe input.submit {
+background-position:5px -1246px;
+}
+.form_group_join input.submit,
+.form_user_subscribe input.submit,
+.entity_subscribe a {
+background-position:5px -1181px;
 }
 
 .entity_edit a {
@@ -263,6 +257,12 @@ background-position: 5px -718px;
 .entity_send-a-message a {
 background-position: 5px -852px;
 }
+.entity_send-a-message .form_notice,
+.entity_moderation:hover ul {
+box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
+-moz-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
+-webkit-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
+}
 
 .entity_nudge p,
 .form_user_nudge input.submit {
@@ -293,6 +293,7 @@ background-position: 5px -1511px;
 background-position: 5px -1973px;
 }
 
+
 /* NOTICES */
 .notice .attachment {
 background-position:0 -394px;

From d29af38a0be2f0944297898b166e86d0cebd9bd2 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Thu, 28 Jan 2010 17:28:11 +0100
Subject: [PATCH 13/16] Update to biz theme's input styles

---
 theme/biz/css/display.css | 69 +++++++++++++++++++++++++++++++--------
 1 file changed, 55 insertions(+), 14 deletions(-)

diff --git a/theme/biz/css/display.css b/theme/biz/css/display.css
index 7fd78470f5..0b7c17de76 100644
--- a/theme/biz/css/display.css
+++ b/theme/biz/css/display.css
@@ -25,14 +25,33 @@ address {
 margin-right:7.18%;
 }
 
+input, textarea, select {
+border-width:2px;
+border-style: solid;
+border-radius:4px;
+-moz-border-radius:4px;
+-webkit-border-radius:4px;
+}
 input, textarea, select, option {
 font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
 }
-input, textarea, select,
-.entity_remote_subscribe {
+input, textarea, select {
 border-color:#AAAAAA;
 }
-#filter_tags ul li {
+
+.form_settings fieldset fieldset {
+background:rgba(240, 240, 240, 0.2);
+box-shadow:3px 3px 7px rgba(194, 194, 194, 0.3);
+-moz-box-shadow:3px 3px 7px rgba(194, 194, 194, 0.3);
+-webkit-box-shadow:3px 3px 7px rgba(194, 194, 194, 0.3);
+}
+
+#filter_tags ul li,
+.entity_send-a-message .form_notice,
+.pagination .nav_prev a,
+.pagination .nav_next a,
+.form_settings fieldset fieldset,
+.entity_moderation:hover ul {
 border-color:#DDDDDD;
 }
 
@@ -40,6 +59,34 @@ border-color:#DDDDDD;
 background:none;
 }
 
+.form_notice.warning #notice_text-count,
+.form_settings .form_note {
+background-color:#9BB43E;
+}
+input.submit,
+.form_notice.warning #notice_text-count,
+.form_settings .form_note,
+.entity_actions a,
+.entity_actions input,
+.entity_moderation p,
+button {
+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);
+}
+.entity_actions a,
+.entity_actions input,
+.entity_actions p {
+border-color:transparent;
+background-color:transparent;
+}
+input:focus, textarea:focus, select:focus,
+.form_notice.warning #notice_data-text,
+.form_notice.warning #notice_text-count,
+.form_settings .form_note {
+border-color:#9BB43E;
+}
+
 input.submit {
 color:#FFFFFF;
 }
@@ -78,18 +125,12 @@ background-position:0 -1846px;
 }
 
 a,
-#site_nav_local_views .current a,
-div.notice-options input,
-.form_user_block input.submit,
-.form_user_unblock input.submit,
-.form_group_block input.submit,
-.form_group_unblock input.submit,
-.entity_send-a-message a,
-.form_user_nudge input.submit,
-.entity_nudge p,
 .form_settings input.form_action-primary,
-.form_make_admin input.submit {
-color:#002E6E;
+.notice-options input,
+.entity_actions a,
+.entity_actions input,
+.entity_moderation p {
+color:#002FA7;
 }
 
 #header a,

From 1662aa11139517cccc600d65b9e8eba07c541ea7 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Thu, 28 Jan 2010 17:32:24 +0100
Subject: [PATCH 14/16] Update to biz theme button close and minimize styles

---
 theme/biz/css/base.css    | 17 +++++++++++++++++
 theme/biz/css/display.css |  7 +++++++
 2 files changed, 24 insertions(+)

diff --git a/theme/biz/css/base.css b/theme/biz/css/base.css
index bd70c083e2..8a34425be2 100644
--- a/theme/biz/css/base.css
+++ b/theme/biz/css/base.css
@@ -518,6 +518,11 @@ margin-bottom:0;
 line-height:1.618;
 }
 
+.form_notice #notice_data-attach_selected button.close {
+float:right;
+font-size:0.8em;
+}
+
 .form_notice #notice_data-geo_wrap label,
 .form_notice #notice_data-geo_wrap input {
 position:absolute;
@@ -539,6 +544,18 @@ margin-bottom:0;
 text-indent:-9999px;
 }
 
+button.close,
+button.minimize {
+width:16px;
+height:16px;
+text-indent:-9999px;
+padding:0;
+border:0;
+text-align:center;
+font-weight:bold;
+cursor:pointer;
+}
+
 /* entity_profile */
 .entity_profile {
 position:relative;
diff --git a/theme/biz/css/display.css b/theme/biz/css/display.css
index 0b7c17de76..7768d5146a 100644
--- a/theme/biz/css/display.css
+++ b/theme/biz/css/display.css
@@ -256,6 +256,13 @@ background-color:#F7E8E8;
 background-color:#EFF3DC;
 }
 
+button.close {
+background-position:0 -1120px;
+}
+button.minimize {
+background-position:0 -1912px;
+}
+
 #anon_notice {
 color:#FFFFFF;
 }

From b4babedd29661a15a8dd135a20ffaf7059b7fa50 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Thu, 28 Jan 2010 17:36:33 +0100
Subject: [PATCH 15/16] Update to notice item in biz theme

---
 theme/biz/css/base.css | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/theme/biz/css/base.css b/theme/biz/css/base.css
index 8a34425be2..366339db28 100644
--- a/theme/biz/css/base.css
+++ b/theme/biz/css/base.css
@@ -903,6 +903,16 @@ float:left;
 #shownotice .vcard .photo {
 margin-bottom:4px;
 }
+#content .notice .author .photo {
+position:absolute;
+top:11px;
+left:0;
+float:none;
+}
+#content .notice .entry-title {
+margin-left:59px;
+}
+
 .vcard .url {
 text-decoration:none;
 }
@@ -911,12 +921,22 @@ text-decoration:underline;
 }
 
 .notice .entry-title {
-float:left;
-width:100%;
 overflow:hidden;
 }
+.notice .entry-title.ov {
+overflow:visible;
+}
+#showstream .notice .entry-title,
+#showstream .notice div.entry-content {
+margin-left:0;
+}
 #shownotice .notice .entry-title {
+margin-left:110px;
 font-size:2.2em;
+min-height:123px;
+}
+#shownotice .notice div.entry-content {
+margin-left:0;
 }
 
 .notice p.entry-content {
@@ -939,7 +959,7 @@ clear:left;
 float:left;
 font-size:0.95em;
 margin-left:59px;
-width:65%;
+width:64%;
 }
 #showstream .notice div.entry-content,
 #shownotice .notice div.entry-content {

From 22d9c32e7e755c36817912cb9e20554b23d211d4 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Thu, 28 Jan 2010 18:39:30 +0100
Subject: [PATCH 16/16] Update to aside styles in biz theme

---
 theme/biz/css/base.css    |  2 +-
 theme/biz/css/display.css | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/theme/biz/css/base.css b/theme/biz/css/base.css
index 366339db28..2c2ab33a01 100644
--- a/theme/biz/css/base.css
+++ b/theme/biz/css/base.css
@@ -422,7 +422,7 @@ float:left;
 width:29.917%;
 min-height:259px;
 float:left;
-margin-left:0.385%;
+margin-left:1%;
 }
 
 #form_notice {
diff --git a/theme/biz/css/display.css b/theme/biz/css/display.css
index 7768d5146a..f133ac30b9 100644
--- a/theme/biz/css/display.css
+++ b/theme/biz/css/display.css
@@ -138,10 +138,22 @@ color:#002FA7;
 color:#87B4C8;
 }
 
+
+
 .notice,
-.profile {
-border-top-color:#CEE1E9;
+.profile,
+.application,
+#content tbody tr {
+border-top-color:#C8D1D5;
 }
+.mark-top {
+border-color:#AAAAAA;
+}
+
+#aside_primary {
+background-color:#144A6E;
+}
+
 .section .profile {
 border-top-color:#87B4C8;
 }