From 0bc9b2e730bb6368d36ba5bb3f2df1bf1432adad Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Mon, 15 Jun 2009 03:21:15 +0000
Subject: Cross-browser notice_attach

---
 theme/base/css/display.css | 20 +++++++++++---------
 theme/base/css/ie.css      |  9 +++++++++
 2 files changed, 20 insertions(+), 9 deletions(-)

(limited to 'theme/base/css')

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%;
-- 
cgit v1.2.3-54-g00ecf


From e18504d1d246c48f64964e176c9134e56cd20db9 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Mon, 15 Jun 2009 05:38:18 +0000
Subject: Styles for group block

---
 theme/base/css/display.css     | 2 ++
 theme/default/css/display.css  | 8 +++++++-
 theme/identica/css/display.css | 8 +++++++-
 3 files changed, 16 insertions(+), 2 deletions(-)

(limited to 'theme/base/css')

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 060fdfd0d..0cbd0d774 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -618,6 +618,8 @@ display:block;
 
 .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,
 .entity_edit a,
 .form_user_nudge input.submit,
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index 34f6b3b8a..166e62157 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -57,6 +57,8 @@ 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,
@@ -148,6 +150,8 @@ background-image:url(../../base/images/icons/icon_foaf.gif);
 .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 {
 background-position: 0 40%;
 background-repeat: no-repeat;
@@ -177,7 +181,9 @@ background-image:url(../../base/images/icons/twotone/green/quote.gif);
 background-image:url(../../base/images/icons/twotone/green/mail.gif);
 }
 .form_user_block input.submit,
-.form_user_unblock 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);
 }
 
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 8a03a4d77..cab42f16f 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -57,6 +57,8 @@ 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,
@@ -148,6 +150,8 @@ background-image:url(../../base/images/icons/icon_foaf.gif);
 .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 {
 background-position: 0 40%;
 background-repeat: no-repeat;
@@ -177,7 +181,9 @@ background-image:url(../../base/images/icons/twotone/green/quote.gif);
 background-image:url(../../base/images/icons/twotone/green/mail.gif);
 }
 .form_user_block input.submit,
-.form_user_unblock 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);
 }
 
-- 
cgit v1.2.3-54-g00ecf


From c74a079e47e1ad71bdb92f8659626730b1b0cae3 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Tue, 16 Jun 2009 19:40:23 +0000
Subject: UI updates: Added box-shadow to local views, input focus, content
 Removed borders from local views, content, aside_primary Some cleaning

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

(limited to 'theme/base/css')

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 0cbd0d774..3595d6aa3 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -303,10 +303,6 @@ padding:4px 11px;
 -moz-border-radius-topright:4px;
 -webkit-border-top-left-radius:4px;
 -webkit-border-top-right-radius:4px;
-border-width:1px;
-border-style:solid;
-border-bottom:0;
-text-shadow: 2px 2px 2px #ddd;
 font-weight:bold;
 }
 #site_nav_local_views .nav {
@@ -396,8 +392,6 @@ border-radius:7px;
 -moz-border-radius-topleft:0;
 -webkit-border-radius:7px;
 -webkit-border-top-left-radius:0;
-border-style:solid;
-border-width:1px;
 }
 #shownotice #content {
 min-height:0;
@@ -413,13 +407,11 @@ float:left;
 width:27.917%;
 min-height:259px;
 float:left;
-margin-left:0.385%;
+margin-left:0.7%;
 padding:1.795%;
 border-radius:7px;
 -moz-border-radius:7px;
 -webkit-border-radius:7px;
-border-width:1px;
-border-style:solid;
 }
 
 #form_notice {
@@ -469,7 +461,6 @@ height:16px;
 #form_notice #notice_data-attach {
 left:183px;
 padding:0;
-
 height:16px;
 }
 #form_notice .form_note {
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index 166e62157..148ce6e60 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -19,7 +19,7 @@ font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
 font-size:1em;
 }
 address {
-margin-right:7.18%;
+margin-right:7.1%;
 }
 
 input, textarea, select, option {
@@ -27,7 +27,7 @@ font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
 }
 input, textarea, select,
 .entity_remote_subscribe {
-border-color:#aaa;
+border-color:#AAAAAA;
 }
 #filter_tags ul li {
 border-color:#C3D6DF;
@@ -47,10 +47,13 @@ background-color:#A9BF4F;
 input:focus, textarea:focus, select:focus,
 #form_notice.warning #notice_data-text {
 border-color:#A9BF4F;
+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 {
-color:#fff;
+color:#FFFFFF;
 }
 
 a,
@@ -79,10 +82,10 @@ background-color:#CEE1E9;
 }
 
 #notice_text-count {
-color:#333;
+color:#333333;
 }
 #form_notice.warning #notice_text-count {
-color:#000;
+color:#000000;
 }
 #form_notice label[for=notice_data-attach] {
 background:transparent url(../../base/images/icons/twotone/green/clip-01.gif) no-repeat 0 45%;
@@ -92,27 +95,38 @@ opacity:0;
 }
 
 #form_notice.processing #notice_action-submit {
-background:#fff url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
+background:#FFFFFF url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
 cursor:wait;
 text-indent:-9999px;
 }
 
+#content {
+box-shadow:5px 7px 7px rgba(194, 194, 194, 0.3);
+-moz-box-shadow:5px 7px 7px rgba(194, 194, 194, 0.3);
+-webkit-box-shadow:5px 7px 7px rgba(194, 194, 194, 0.3);
+}
 #content,
 #site_nav_local_views a,
 #aside_primary {
-border-color:#fff;
+border-color:#FFFFFF;
 }
 #content,
 #site_nav_local_views .current a {
-background-color:#fff;
+background-color:#FFFFFF;
 }
 
 #site_nav_local_views a {
-background-color:rgba(255, 255, 255, 0.2);
+background-color:rgba(194, 194, 194, 0.4);
+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);
 }
 #site_nav_local_views a:hover {
 background-color:rgba(255, 255, 255, 0.7);
 }
+#site_nav_local_views .current a {
+text-shadow: rgba(194,194,194,0.5) 1px 1px 1px;
+}
 
 .error {
 background-color:#F7E8E8;
@@ -123,8 +137,8 @@ background-color:#EFF3DC;
 
 #anon_notice {
 background-color:#C3D6DF;
-color:#fff;
-border-color:#fff;
+color:#FFFFFF;
+border-color:#FFFFFF;
 }
 
 #showstream #anon_notice {
@@ -162,7 +176,7 @@ background-color:transparent;
 .form_user_subscribe input.submit,
 .form_user_unsubscribe input.submit {
 background-color:#A9BF4F;
-color:#fff;
+color:#FFFFFF;
 }
 .form_user_unsubscribe input.submit,
 .form_group_leave input.submit,
@@ -214,7 +228,7 @@ background:transparent url(../../base/images/icons/twotone/green/trash.gif) no-r
 .notices div.entry-content,
 .notices div.notice-options,
 .notices li.hover .notices div.entry-content,
-.notices li.hover .notices div.notice-options  {
+.notices li.hover .notices div.notice-options {
 opacity:0.4;
 }
 .notices li.hover div.entry-content,
@@ -222,14 +236,14 @@ opacity:0.4;
 opacity:1;
 }
 div.entry-content {
-color:#333;
+color:#333333;
 }
 div.notice-options a,
 div.notice-options input {
 font-family:sans-serif;
 }
 .notices li.hover {
-background-color:#fcfcfc;
+background-color:#FCFCFC;
 }
 
 .notices .notices {
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index cab42f16f..ff538f1f1 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -19,7 +19,7 @@ font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
 font-size:1em;
 }
 address {
-margin-right:7.18%;
+margin-right:7.1%;
 }
 
 input, textarea, select, option {
@@ -27,10 +27,10 @@ font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
 }
 input, textarea, select,
 .entity_remote_subscribe {
-border-color:#aaa;
+border-color:#AAAAAA;
 }
 #filter_tags ul li {
-border-color:#ddd;
+border-color:#DDDDDD;
 }
 
 .form_settings input.form_action-primary {
@@ -47,10 +47,13 @@ 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 {
-color:#fff;
+color:#FFFFFF;
 }
 
 a,
@@ -79,10 +82,10 @@ background-color:#CEE1E9;
 }
 
 #notice_text-count {
-color:#333;
+color:#333333;
 }
 #form_notice.warning #notice_text-count {
-color:#000;
+color:#000000;
 }
 #form_notice label[for=notice_data-attach] {
 background:transparent url(../../base/images/icons/twotone/green/clip-01.gif) no-repeat 0 45%;
@@ -92,27 +95,38 @@ opacity:0;
 }
 
 #form_notice.processing #notice_action-submit {
-background:#fff url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
+background:#FFFFFF url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
 cursor:wait;
 text-indent:-9999px;
 }
 
+#content {
+box-shadow:5px 7px 7px rgba(194, 194, 194, 0.3);
+-moz-box-shadow:5px 7px 7px rgba(194, 194, 194, 0.3);
+-webkit-box-shadow:5px 7px 7px rgba(194, 194, 194, 0.3);
+}
 #content,
 #site_nav_local_views a,
 #aside_primary {
-border-color:#fff;
+border-color:#FFFFFF;
 }
 #content,
 #site_nav_local_views .current a {
-background-color:#fff;
+background-color:#FFFFFF;
 }
 
 #site_nav_local_views a {
-background-color:rgba(135, 180, 200, 0.3);
+background-color:rgba(194, 194, 194, 0.4);
+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);
 }
 #site_nav_local_views a:hover {
 background-color:rgba(255, 255, 255, 0.7);
 }
+#site_nav_local_views .current a {
+text-shadow: rgba(194,194,194,0.5) 1px 1px 1px;
+}
 
 .error {
 background-color:#F7E8E8;
@@ -123,8 +137,8 @@ background-color:#EFF3DC;
 
 #anon_notice {
 background-color:#87B4C8;
-color:#fff;
-border-color:#fff;
+color:#FFFFFF;
+border-color:#FFFFFF;
 }
 
 #showstream #anon_notice {
@@ -162,7 +176,7 @@ background-color:transparent;
 .form_user_subscribe input.submit,
 .form_user_unsubscribe input.submit {
 background-color:#9BB43E;
-color:#fff;
+color:#FFFFFF;
 }
 .form_user_unsubscribe input.submit,
 .form_group_leave input.submit,
@@ -222,14 +236,14 @@ opacity:0.4;
 opacity:1;
 }
 div.entry-content {
-color:#333;
+color:#333333;
 }
 div.notice-options a,
 div.notice-options input {
 font-family:sans-serif;
 }
 .notices li.hover {
-background-color:#fcfcfc;
+background-color:#FCFCFC;
 }
 
 .notices .notices {
-- 
cgit v1.2.3-54-g00ecf


From 3974ab633c1f75fee71a3a74f7088ca2927468c9 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Tue, 16 Jun 2009 21:47:58 +0000
Subject: Brought back borders for content, navigation, aside_primary but
 applied transparent colour instead, hence not visible. This way, other
 laconica instances make use of the border if they change only the colour.

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

(limited to 'theme/base/css')

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 3595d6aa3..49907058e 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -303,6 +303,9 @@ padding:4px 11px;
 -moz-border-radius-topright:4px;
 -webkit-border-top-left-radius:4px;
 -webkit-border-top-right-radius:4px;
+border-width:1px;
+border-style:solid;
+border-bottom:0;
 font-weight:bold;
 }
 #site_nav_local_views .nav {
@@ -392,6 +395,8 @@ border-radius:7px;
 -moz-border-radius-topleft:0;
 -webkit-border-radius:7px;
 -webkit-border-top-left-radius:0;
+border-width:1px;
+border-style:solid;
 }
 #shownotice #content {
 min-height:0;
@@ -407,11 +412,13 @@ float:left;
 width:27.917%;
 min-height:259px;
 float:left;
-margin-left:0.7%;
+margin-left:0.5%;
 padding:1.795%;
 border-radius:7px;
 -moz-border-radius:7px;
 -webkit-border-radius:7px;
+border-width:1px;
+border-style:solid;
 }
 
 #form_notice {
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index 1ad823a5c..f0d6dace8 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -108,7 +108,7 @@ box-shadow:5px 7px 7px rgba(194, 194, 194, 0.3);
 #content,
 #site_nav_local_views a,
 #aside_primary {
-border-color:#FFFFFF;
+border-color:transparent;
 }
 #content,
 #site_nav_local_views .current a {
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index bc7ac80fb..25a01abe0 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -108,7 +108,7 @@ box-shadow:5px 7px 7px rgba(194, 194, 194, 0.3);
 #content,
 #site_nav_local_views a,
 #aside_primary {
-border-color:#FFFFFF;
+border-color:transparent;
 }
 #content,
 #site_nav_local_views .current a {
-- 
cgit v1.2.3-54-g00ecf


From a592ee6b99596d16da513c0ce8174aae3f3063cd Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Wed, 17 Jun 2009 04:33:01 +0000
Subject: Init styles for tile and image use on/off for user design settings

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

(limited to 'theme/base/css')

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 0cbd0d774..5b69b4f3d 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -77,7 +77,8 @@ margin:0 0 18px 0;
 form label {
 font-weight:bold;
 }
-input.checkbox {
+input.checkbox,
+input.radio {
 position:relative;
 top:2px;
 left:0;
@@ -168,7 +169,8 @@ margin-bottom:0;
 margin-bottom:11px;
 }
 
-.form_settings input.checkbox {
+.form_settings input.checkbox,
+.form_settings input.radio {
 margin-top:3px;
 margin-left:0;
 }
@@ -180,13 +182,19 @@ margin-left:11px;
 float:left;
 width:90%;
 }
-
+.form_settings label.radio {
+margin-top:0;
+margin-right:47px;
+margin-left:11px;
+width:auto;
+}
 
 #form_login p.form_guide,
 #form_register #settings_rememberme p.form_guide,
 #form_openid_login #settings_rememberme p.form_guide,
 #settings_twitter_remove p.form_guide,
-#form_search ul.form_data #q {
+#form_search ul.form_data #q,
+#design_background-image_onoff p.form_guide {
 margin-left:0;
 }
 
-- 
cgit v1.2.3-54-g00ecf


From 9aebcf442616c5b39ac2ea19ef011c2347a3bec3 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Wed, 17 Jun 2009 05:18:59 +0000
Subject: IE7/8 CSS update for user design

---
 theme/base/css/ie.css | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'theme/base/css')

diff --git a/theme/base/css/ie.css b/theme/base/css/ie.css
index d1b0558ec..da200388e 100644
--- a/theme/base/css/ie.css
+++ b/theme/base/css/ie.css
@@ -1,8 +1,6 @@
 /* IE specific styles */
-legend {
-margin-left:-7px;
-}
-input.checkbox {
+input.checkbox,
+input.radio {
 top:0;
 }
 #form_notice textarea {
-- 
cgit v1.2.3-54-g00ecf


From 4c640aace978a2a57b6d2d4658febde3f9826efa Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Wed, 17 Jun 2009 08:14:01 +0000
Subject: Updated markup yes/no form actions to be consistent with the rest of
 the site

---
 actions/block.php          | 17 ++++++++++-------
 actions/groupblock.php     | 17 ++++++++++-------
 theme/base/css/display.css |  3 ++-
 3 files changed, 22 insertions(+), 15 deletions(-)

(limited to 'theme/base/css')

diff --git a/actions/block.php b/actions/block.php
index 0efee5932..441016d4e 100644
--- a/actions/block.php
+++ b/actions/block.php
@@ -125,16 +125,18 @@ class BlockAction extends Action
     function areYouSureForm()
     {
         $id = $this->profile->id;
+        $this->elementStart('form', array('id' => 'block-' . $id,
+                                           'method' => 'post',
+                                           'class' => 'form_settings form_entity_block',
+                                           'action' => common_local_url('block')));
+        $this->elementStart('fieldset');
+        $this->hidden('token', common_session_token());
+        $this->element('legend', _('Block user'));
         $this->element('p', null,
                        _('Are you sure you want to block this user? '.
                          'Afterwards, they will be unsubscribed from you, '.
                          'unable to subscribe to you in the future, and '.
                          'you will not be notified of any @-replies from them.'));
-        $this->elementStart('form', array('id' => 'block-' . $id,
-                                           'method' => 'post',
-                                           'class' => 'block',
-                                           'action' => common_local_url('block')));
-        $this->hidden('token', common_session_token());
         $this->element('input', array('id' => 'blockto-' . $id,
                                       'name' => 'blockto',
                                       'type' => 'hidden',
@@ -144,8 +146,9 @@ class BlockAction extends Action
                 $this->hidden($k, $v);
             }
         }
-        $this->submit('no', _('No'));
-        $this->submit('yes', _('Yes'));
+        $this->submit('form_action-no', _('No'), 'submit form_action-primary', 'no', _("Do not block this user from this group"));
+        $this->submit('form_action-yes', _('Yes'), 'submit form_action-secondary', 'yes', _('Block this user from this group'));
+        $this->elementEnd('fieldset');
         $this->elementEnd('form');
     }
 
diff --git a/actions/groupblock.php b/actions/groupblock.php
index 93662da79..28685b1d5 100644
--- a/actions/groupblock.php
+++ b/actions/groupblock.php
@@ -151,17 +151,19 @@ class GroupblockAction extends Action
     function areYouSureForm()
     {
         $id = $this->profile->id;
+        $this->elementStart('form', array('id' => 'block-' . $id,
+                                           'method' => 'post',
+                                           'class' => 'form_settings form_entity_block',
+                                           'action' => common_local_url('groupblock')));
+        $this->elementStart('fieldset');
+        $this->hidden('token', common_session_token());
+        $this->element('legend', null, _('Block user'));
         $this->element('p', null,
                        sprintf(_('Are you sure you want to block user "%s" from the group "%s"? '.
                                  'They will be removed from the group, unable to post, and '.
                                  'unable to subscribe to the group in the future.'),
                                $this->profile->getBestName(),
                                $this->group->getBestName()));
-        $this->elementStart('form', array('id' => 'block-' . $id,
-                                           'method' => 'post',
-                                           'class' => 'block',
-                                           'action' => common_local_url('groupblock')));
-        $this->hidden('token', common_session_token());
         $this->hidden('blockto-' . $this->profile->id,
                       $this->profile->id,
                       'blockto');
@@ -173,8 +175,9 @@ class GroupblockAction extends Action
                 $this->hidden($k, $v);
             }
         }
-        $this->submit('no', _('No'));
-        $this->submit('yes', _('Yes'));
+        $this->submit('form_action-no', _('No'), 'submit form_action-primary', 'no', _("Do not block this user from this group"));
+        $this->submit('form_action-yes', _('Yes'), 'submit form_action-secondary', 'yes', _('Block this user from this group'));
+        $this->elementEnd('fieldset');
         $this->elementEnd('form');
     }
 
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 49907058e..403a9c37f 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -154,7 +154,8 @@ font-weight:bold;
 #form_invite legend,
 #form_notice_delete legend,
 #form_password_recover legend,
-#form_password_change legend {
+#form_password_change legend,
+.form_entity_block legend {
 display:none;
 }
 
-- 
cgit v1.2.3-54-g00ecf


From 85a4e32f30fcc1b081cde7c8e0267b4fd0c83e16 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Wed, 17 Jun 2009 09:03:59 +0000
Subject: Updated input submit for making a user admin of a group

---
 theme/base/css/display.css                      |   3 ++-
 theme/base/images/icons/twotone/green/admin.gif | Bin 0 -> 100 bytes
 theme/default/css/display.css                   |   9 +++++++--
 theme/identica/css/display.css                  |   9 +++++++--
 4 files changed, 16 insertions(+), 5 deletions(-)
 create mode 100644 theme/base/images/icons/twotone/green/admin.gif

(limited to 'theme/base/css')

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 403a9c37f..9e35d015d 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -622,7 +622,8 @@ display:block;
 .entity_send-a-message a,
 .entity_edit a,
 .form_user_nudge input.submit,
-.entity_nudge p {
+.entity_nudge p,
+.form_make_admin input.submit {
 border:0;
 padding-left:20px;
 }
diff --git a/theme/base/images/icons/twotone/green/admin.gif b/theme/base/images/icons/twotone/green/admin.gif
new file mode 100644
index 000000000..10fa431ce
Binary files /dev/null and b/theme/base/images/icons/twotone/green/admin.gif differ
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index 8dd5ca32c..935116a74 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -65,7 +65,8 @@ div.notice-options input,
 .entity_send-a-message a,
 .form_user_nudge input.submit,
 .entity_nudge p,
-.form_settings input.form_action-primary {
+.form_settings input.form_action-primary,
+.form_make_admin input.submit {
 color:#002E6E;
 }
 
@@ -166,7 +167,8 @@ background-image:url(../../base/images/icons/icon_foaf.gif);
 .form_user_unblock input.submit,
 .form_group_block input.submit,
 .form_group_unblock input.submit,
-.entity_nudge p {
+.entity_nudge p,
+.form_make_admin input.submit {
 background-position: 0 40%;
 background-repeat: no-repeat;
 background-color:transparent;
@@ -200,6 +202,9 @@ background-image:url(../../base/images/icons/twotone/green/mail.gif);
 .form_group_unblock input.submit {
 background-image:url(../../base/images/icons/twotone/green/shield.gif);
 }
+.form_make_admin input.submit {
+background-image:url(../../base/images/icons/twotone/green/admin.gif);
+}
 
 /* NOTICES */
 .notice .attachment {
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 975702faa..6845fda5f 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -65,7 +65,8 @@ div.notice-options input,
 .entity_send-a-message a,
 .form_user_nudge input.submit,
 .entity_nudge p,
-.form_settings input.form_action-primary {
+.form_settings input.form_action-primary,
+.form_make_admin input.submit {
 color:#002E6E;
 }
 
@@ -166,7 +167,8 @@ background-image:url(../../base/images/icons/icon_foaf.gif);
 .form_user_unblock input.submit,
 .form_group_block input.submit,
 .form_group_unblock input.submit,
-.entity_nudge p {
+.entity_nudge p,
+.form_make_admin input.submit {
 background-position: 0 40%;
 background-repeat: no-repeat;
 background-color:transparent;
@@ -200,6 +202,9 @@ background-image:url(../../base/images/icons/twotone/green/mail.gif);
 .form_group_unblock input.submit {
 background-image:url(../../base/images/icons/twotone/green/shield.gif);
 }
+.form_make_admin input.submit {
+background-image:url(../../base/images/icons/twotone/green/admin.gif);
+}
 
 /* NOTICES */
 .notice .attachment {
-- 
cgit v1.2.3-54-g00ecf


From d8b0fcbc50248e493dfda288fe538ea58ef66acf Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Thu, 18 Jun 2009 01:28:02 +0000
Subject: Removed height:100% for better background image repetition

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

(limited to 'theme/base/css')

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 2153ce9a0..99f2d9ece 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -12,7 +12,7 @@ img { display:block; border:0; }
 a abbr { cursor: pointer; border-bottom:0; }
 table { border-collapse:collapse; }
 ol { list-style-position:inside; }
-html { font-size: 87.5%; background-color:#fff; height:100%; }
+html { font-size: 87.5%; background-color:#fff; }
 body {
 background-color:#fff;
 color:#000;
-- 
cgit v1.2.3-54-g00ecf


From 00736bddd199b2a43820367c3476b9e9ec84c0db Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Thu, 18 Jun 2009 01:39:37 +0000
Subject: Fix for background image repetition for various page heights

---
 classes/Design.php             | 8 ++++----
 theme/base/css/display.css     | 4 ++--
 theme/default/css/display.css  | 1 -
 theme/identica/css/display.css | 1 -
 4 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'theme/base/css')

diff --git a/classes/Design.php b/classes/Design.php
index 5b28bf014..da4b670be 100644
--- a/classes/Design.php
+++ b/classes/Design.php
@@ -69,12 +69,12 @@ class Design extends Memcached_DataObject
                 __FILE__);
         }
 
-        $css  = 'html, body { background-color: #' . $bgcolor->hexValue() . '} ' . "\n";
+        $css  = 'body { background-color: #' . $bgcolor->hexValue() . ' }' . "\n";
         $css .= '#content, #site_nav_local_views .current a { background-color: #';
         $css .= $ccolor->hexValue() . '} '."\n";
-        $css .= '#aside_primary { background-color: #'. $sbcolor->hexValue() . '} ' . "\n";
-        $css .= 'html body { color: #'. $tcolor->hexValue() . '} '. "\n";
-        $css .= 'a { color: #' . $lcolor->hexValue() . '} ' . "\n";
+        $css .= '#aside_primary { background-color: #'. $sbcolor->hexValue() . ' }' . "\n";
+        $css .= 'html body { color: #'. $tcolor->hexValue() . ' }'. "\n";
+        $css .= 'a { color: #' . $lcolor->hexValue() . ' }' . "\n";
 
         if (!empty($this->backgroundimage) &&
             $this->disposition & BACKGROUND_ON) {
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 99f2d9ece..e1b92edce 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -12,9 +12,9 @@ img { display:block; border:0; }
 a abbr { cursor: pointer; border-bottom:0; }
 table { border-collapse:collapse; }
 ol { list-style-position:inside; }
-html { font-size: 87.5%; background-color:#fff; }
+html { font-size: 87.5%; height:100%; }
 body {
-background-color:#fff;
+background-color:#FFFFFF;
 color:#000;
 font-family:sans-serif;
 font-size:1em;
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index 935116a74..881e264da 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -9,7 +9,6 @@
 
 @import url(../../base/css/display.css);
 
-html,
 body,
 a:active {
 background-color:#C3D6DF;
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 6845fda5f..ad57a0f0e 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -9,7 +9,6 @@
 
 @import url(../../base/css/display.css);
 
-html,
 body,
 a:active {
 background-color:#F0F2F5;
-- 
cgit v1.2.3-54-g00ecf


From f36d90a7556da192df1afe5ba24fa32e276f4dc7 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Thu, 18 Jun 2009 01:41:53 +0000
Subject: Minor removal

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

(limited to 'theme/base/css')

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index e1b92edce..d6ecef2fc 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -12,7 +12,7 @@ img { display:block; border:0; }
 a abbr { cursor: pointer; border-bottom:0; }
 table { border-collapse:collapse; }
 ol { list-style-position:inside; }
-html { font-size: 87.5%; height:100%; }
+html { font-size: 87.5%; }
 body {
 background-color:#FFFFFF;
 color:#000;
-- 
cgit v1.2.3-54-g00ecf


From 65b4cfbb54f5b44820dd02bb9c3c2ca98dbbd321 Mon Sep 17 00:00:00 2001
From: Robin Millette <millette@controlyourself.ca>
Date: Thu, 18 Jun 2009 06:02:12 -0400
Subject: Display more oembed info in attachment popup.

---
 lib/attachmentlist.php     | 36 ++++++++++++++++++++++++++++++++++++
 theme/base/css/display.css |  6 ++++++
 2 files changed, 42 insertions(+)

(limited to 'theme/base/css')

diff --git a/lib/attachmentlist.php b/lib/attachmentlist.php
index 45e4fa319..a781c3092 100644
--- a/lib/attachmentlist.php
+++ b/lib/attachmentlist.php
@@ -244,6 +244,42 @@ class AttachmentListItem extends Widget
 
 class Attachment extends AttachmentListItem
 {
+    function showLink() {
+        $this->out->elementStart('a', $this->linkAttr());
+        $this->out->element('span', null, $this->linkTitle());
+        $this->showRepresentation();
+        $this->out->elementEnd('a');
+
+        if (empty($this->oembed->author_name) && empty($this->oembed->provider)) {
+            return;
+        }
+
+        $this->out->elementStart('dl', 'oembed_info');
+        
+        if (!empty($this->oembed->author_name)) {
+            $this->out->element('dt', null, _('Author:'));
+
+            $this->out->elementStart('dd');
+            if (empty($this->oembed->author_url)) {
+                $this->out->text($this->oembed->author_name);
+            } else {
+                $this->out->element('a', array('href' => $this->oembed->author_url), $this->oembed->author_name);
+            }
+            $this->out->elementEnd('dd');
+        }
+        if (!empty($this->oembed->provider)) {
+            $this->out->element('dt', null, _('Provider:'));
+            $this->out->elementStart('dd');
+            if (empty($this->oembed->provider_url)) {
+                $this->out->text($this->oembed->provider);
+            } else {
+                $this->out->element('a', array('href' => $this->oembed->provider_url), $this->oembed->provider);
+            }
+            $this->out->elementEnd('dd');
+        }
+        $this->out->elementEnd('dl');
+    }
+
     function show() {
         $this->showNoticeAttachment();
     }
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 9e35d015d..dd787f5e2 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -1276,3 +1276,9 @@ display:none;
 .guide {
 clear:both;
 }
+
+dl.oembed_info dt,
+dl.oembed_info dd {
+display: inline;
+}
+
-- 
cgit v1.2.3-54-g00ecf


From 730c173238841cdc4d52bb074e53d4a74f7871bf Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Thu, 18 Jun 2009 18:48:19 +0000
Subject: Updated markup and CSS for attachment_view

---
 lib/attachmentlist.php     | 62 ++++++++++++++++++++++++++--------------------
 theme/base/css/display.css | 22 +++++++++++-----
 2 files changed, 51 insertions(+), 33 deletions(-)

(limited to 'theme/base/css')

diff --git a/lib/attachmentlist.php b/lib/attachmentlist.php
index c80c0c418..7bd441bf4 100644
--- a/lib/attachmentlist.php
+++ b/lib/attachmentlist.php
@@ -210,7 +210,7 @@ class AttachmentListItem extends Widget
     function showRepresentation() {
         $thumbnail = File_thumbnail::staticGet('file_id', $this->attachment->id);
         if (!empty($thumbnail)) {
-            $this->out->element('img', array('alt' => 'nothing to say', 'src' => $thumbnail->url, 'width' => $thumbnail->width, 'height' => $thumbnail->height));
+            $this->out->element('img', array('alt' => '', 'src' => $thumbnail->url, 'width' => $thumbnail->width, 'height' => $thumbnail->height));
         }
     }
 
@@ -244,39 +244,47 @@ class AttachmentListItem extends Widget
 class Attachment extends AttachmentListItem
 {
     function showLink() {
+        $this->out->elementStart('div', array('id' => 'attachment_view',
+                                              'class' => 'hentry'));
+        $this->out->elementStart('div', 'entry-title');
         $this->out->elementStart('a', $this->linkAttr());
         $this->out->element('span', null, $this->linkTitle());
         $this->showRepresentation();
         $this->out->elementEnd('a');
-
-        if (empty($this->oembed->author_name) && empty($this->oembed->provider)) {
-            return;
-        }
-
-        $this->out->elementStart('dl', 'oembed_info');
-        
-        if (!empty($this->oembed->author_name)) {
-            $this->out->element('dt', null, _('Author:'));
-
-            $this->out->elementStart('dd');
-            if (empty($this->oembed->author_url)) {
-                $this->out->text($this->oembed->author_name);
-            } else {
-                $this->out->element('a', array('href' => $this->oembed->author_url), $this->oembed->author_name);
+        $this->out->elementEnd('div');
+
+        if ($this->oembed->author_name || $this->oembed->provider) {
+            $this->out->elementStart('div', array('id' => 'oembed_info', 
+                                                  'class' => 'entry-content'));
+            if (!empty($this->oembed->author_name)) {
+                $this->out->elementStart('dl', 'vcard author');
+                $this->out->element('dt', null, _('Author'));
+                $this->out->elementStart('dd', 'fn');
+                if (empty($this->oembed->author_url)) {
+                    $this->out->text($this->oembed->author_name);
+                } else {
+                    $this->out->element('a', array('href' => $this->oembed->author_url,
+                                                   'class' => 'url'), $this->oembed->author_name);
+                }
+                $this->out->elementEnd('dd');
+                $this->out->elementEnd('dl');
             }
-            $this->out->elementEnd('dd');
-        }
-        if (!empty($this->oembed->provider)) {
-            $this->out->element('dt', null, _('Provider:'));
-            $this->out->elementStart('dd');
-            if (empty($this->oembed->provider_url)) {
-                $this->out->text($this->oembed->provider);
-            } else {
-                $this->out->element('a', array('href' => $this->oembed->provider_url), $this->oembed->provider);
+            if (!empty($this->oembed->provider)) {
+                $this->out->elementStart('dl', 'vcard');
+                $this->out->element('dt', null, _('Provider'));
+                $this->out->elementStart('dd', 'fn');
+                if (empty($this->oembed->provider_url)) {
+                    $this->out->text($this->oembed->provider);
+                } else {
+                    $this->out->element('a', array('href' => $this->oembed->provider_url,
+                                                   'class' => 'url'), $this->oembed->provider);
+                }
+                $this->out->elementEnd('dd');
+                $this->out->elementEnd('dl');
             }
-            $this->out->elementEnd('dd');
+            $this->out->elementEnd('div');
         }
-        $this->out->elementEnd('dl');
+        $this->out->elementEnd('div');
     }
 
     function show() {
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index daf5ada1c..8957a5b40 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -1018,6 +1018,22 @@ border-radius:7px;
 -webkit-border-radius:7px;
 }
 
+#attachment_view #oembed_info {
+margin-top:11px;
+}
+#attachment_view #oembed_info dt,
+#attachment_view #oembed_info dd {
+float:left;
+}
+#attachment_view #oembed_info dt {
+clear:left;
+margin-right:11px;
+font-weight:bold;
+}
+#attachment_view #oembed_info dt:after {
+content: ":";
+}
+
 #usergroups #new_group {
 float: left;
 margin-right: 2em;
@@ -1284,9 +1300,3 @@ display:none;
 .guide {
 clear:both;
 }
-
-dl.oembed_info dt,
-dl.oembed_info dd {
-display: inline;
-}
-
-- 
cgit v1.2.3-54-g00ecf


From 7b269a6712ac740c961634b0c165e6f74f420236 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Mon, 22 Jun 2009 17:18:09 +0000
Subject: Layout fix for IE6

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

(limited to 'theme/base/css')

diff --git a/theme/base/css/ie6.css b/theme/base/css/ie6.css
index 76a82c004..dde4d6fc7 100644
--- a/theme/base/css/ie6.css
+++ b/theme/base/css/ie6.css
@@ -5,6 +5,12 @@ margin-left:7px;
 address .fn {
 display:none;
 }
+
+#wrap {
+width:1003px;
+margin:0 auto;
+}
+
 #content {
 width:70%;
 }
@@ -26,5 +32,6 @@ margin-bottom:123px;
 width:20%;
 }
 .notice div.entry-content {
-width:63%;
+width:50%;
+margin-left:30px;
 }
-- 
cgit v1.2.3-54-g00ecf


From 75d6b0707ce719a23526ed8c66de7240a9481285 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Thu, 25 Jun 2009 07:55:52 +0000
Subject: Style for entity_aliases

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

(limited to 'theme/base/css')

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 8957a5b40..d01be7700 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -548,7 +548,8 @@ margin-bottom:18px;
 .entity_profile .entity_location,
 .entity_profile .entity_url,
 .entity_profile .entity_note,
-.entity_profile .entity_tags {
+.entity_profile .entity_tags,
+.entity_profile .entity_aliases {
 margin-left:113px;
 margin-bottom:4px;
 }
-- 
cgit v1.2.3-54-g00ecf


From 1e17f1256a1166db6bd3acd35fd437262ba27ffd Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Thu, 25 Jun 2009 16:55:19 +0000
Subject: Shows the selected file attachment under the form_notice textarea

---
 js/util.js                 | 9 +++++++++
 theme/base/css/display.css | 5 +++--
 2 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'theme/base/css')

diff --git a/js/util.js b/js/util.js
index 221c85120..9156045bb 100644
--- a/js/util.js
+++ b/js/util.js
@@ -233,6 +233,7 @@ $(document).ready(function(){
 	$("#form_notice").each(addAjaxHidden);
     NoticeReply();
     NoticeAttachments();
+    NoticeDataAttachSelected();
 });
 
 function NoticeReply() {
@@ -310,3 +311,11 @@ function NoticeAttachments() {
         }
     );
 }
+
+function NoticeDataAttachSelected() {
+    $('#notice_data-attach').change(function() {
+        S = '<div id="notice_data-attach_selected" class="success">'+$(this).val()+'</div>';
+        NDAS = $('#notice_data-attach_selected');
+        (NDAS.length > 0) ? NDAS.replaceWith(S) : $('#form_notice').append(S);
+    });
+}
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index d01be7700..bfcc9a7fa 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -510,10 +510,11 @@ margin-bottom:7px;
 margin-left:18px;
 float:left;
 }
-#form_notice .error {
+#form_notice .error,
+#form_notice .success {
 float:left;
 clear:both;
-width:96.9%;
+width:81.5%;
 margin-bottom:0;
 line-height:1.618;
 }
-- 
cgit v1.2.3-54-g00ecf


From 5cc5bae4a91a6f0ac7bf3569d268e203da78274d Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Thu, 25 Jun 2009 17:00:32 +0000
Subject: Adds a scrollbar if the filename is too long for the attached file

---
 theme/base/css/display.css | 1 +
 1 file changed, 1 insertion(+)

(limited to 'theme/base/css')

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 */
-- 
cgit v1.2.3-54-g00ecf


From 6a0571d51b0cafb0dbc7caf3aa61cdfd17d6c7ce Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Thu, 25 Jun 2009 21:01:07 +0000
Subject: Added functionality to remove the notice data attachment

---
 js/util.js                 | 14 ++++++++++----
 theme/base/css/display.css | 11 +++++++++++
 2 files changed, 21 insertions(+), 4 deletions(-)

(limited to 'theme/base/css')

diff --git a/js/util.js b/js/util.js
index 9156045bb..e7c54b74a 100644
--- a/js/util.js
+++ b/js/util.js
@@ -222,6 +222,7 @@ $(document).ready(function(){
 													}
 													$("#notice_data-text").val("");
     												$("#notice_data-attach").val("");
+                                                    $('#notice_data-attach_selected').remove();
                                                     counter();
 												}
 												$("#form_notice").removeClass("processing");
@@ -233,7 +234,7 @@ $(document).ready(function(){
 	$("#form_notice").each(addAjaxHidden);
     NoticeReply();
     NoticeAttachments();
-    NoticeDataAttachSelected();
+    NoticeDataAttach();
 });
 
 function NoticeReply() {
@@ -312,10 +313,15 @@ function NoticeAttachments() {
     );
 }
 
-function NoticeDataAttachSelected() {
-    $('#notice_data-attach').change(function() {
-        S = '<div id="notice_data-attach_selected" class="success">'+$(this).val()+'</div>';
+function NoticeDataAttach() {
+    NDA = $('#notice_data-attach');
+    NDA.change(function() {
+        S = '<div id="notice_data-attach_selected" class="success"><code>'+$(this).val()+'</code> <button>&#215;</button></div>';
         NDAS = $('#notice_data-attach_selected');
         (NDAS.length > 0) ? NDAS.replaceWith(S) : $('#form_notice').append(S);
+        $('#notice_data-attach_selected button').click(function(){
+            $('#notice_data-attach_selected').remove();
+            NDA.val('');
+        });
     });
 }
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index c8f23e4f5..78fcd7ece 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -517,8 +517,19 @@ clear:both;
 width:81.5%;
 margin-bottom:0;
 line-height:1.618;
+}
+#form_notice #notice_data-attach_selected code {
+float:left;
+width:90%;
+display:block;
+font-size:1.1em;
+line-height:1.8;
 overflow:auto;
 }
+#form_notice #notice_data-attach_selected button {
+float:right;
+font-size:0.8em;
+}
 
 /* entity_profile */
 .entity_profile {
-- 
cgit v1.2.3-54-g00ecf


From c4da201fc01206817034207c01d9e2d051605757 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Thu, 25 Jun 2009 21:25:41 +0000
Subject: IE UI update for notice_data_attach_selected

---
 theme/base/css/ie.css | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'theme/base/css')

diff --git a/theme/base/css/ie.css b/theme/base/css/ie.css
index da200388e..43fb01492 100644
--- a/theme/base/css/ie.css
+++ b/theme/base/css/ie.css
@@ -19,6 +19,12 @@ display:block;
 width:17%;
 max-width:17%;
 }
+#form_notice #notice_data-attach_selected {
+width:78.5%;
+}
+#form_notice #notice_data-attach_selected button {
+padding:0 4px;
+}
 #anon_notice {
 max-width:39%;
 }
-- 
cgit v1.2.3-54-g00ecf