Merge branch 'testing'

7 files changed, 98 insertions, 46 deletions

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 44d1d0300..2f4636391 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -112,7 +112,6 @@ border-style:solid;
 line-height:0;
 }
 
-
 .form_settings input.remove {
 margin-left:11px;
 }
@@ -246,7 +245,6 @@ margin-left:11px;
 width:auto;
 }
 
-
 address {
 float:left;
 margin-bottom:18px;
@@ -672,8 +670,7 @@ display:block;
 text-align:left;
 width:100%;
 }
-.entity_actions a,
-.entity_remote_subscribe {
+.entity_actions a {
 text-decoration:none;
 font-weight:bold;
 display:block;
@@ -688,7 +685,8 @@ border-radius:4px;
 .entity_actions a,
 .entity_actions input,
 .entity_actions p {
-border:0;
+border-width:2px;
+border-style:solid;
 padding-left:23px;
 }
 
@@ -697,19 +695,10 @@ padding-left:23px;
 padding:2px 4px 1px 26px;
 }
 
-.entity_remote_subscribe {
-padding:4px;
-border-width:2px;
-border-style:solid;
-border-radius:4px;
--moz-border-radius:4px;
--webkit-border-radius:4px;
-}
 .entity_actions .accept {
 margin-bottom:18px;
 }
 
-
 .entity_send-a-message button {
 position:absolute;
 top:3px;
@@ -975,7 +964,7 @@ float:left;
 font-size:0.95em;
 margin-left:59px;
 min-width:60%;
-max-width:74%;
+max-width:70%;
 }
 #showstream .notice div.entry-content,
 #shownotice .notice div.entry-content {
@@ -993,10 +982,21 @@ font-size:1.025em;
 display:inline-block;
 }
 
+.entry-content .repeat {
+display:block;
+}
+.entry-content .repeat .photo {
+float:none;
+margin-right:1px;
+position:relative;
+top:4px;
+left:0;
+}
+
 .notice-options {
 position:relative;
 font-size:0.95em;
-width:90px;
+width:125px;
 float:right;
 }
 
@@ -1005,17 +1005,20 @@ float:left;
 }
 .notice-options .notice_delete,
 .notice-options .notice_reply,
+.notice-options .form_repeat,
 .notice-options .form_favor,
-.notice-options .form_disfavor {
+.notice-options .form_disfavor,
+.notice-options .repeated {
 float:left;
-margin-left:20%;
+margin-left:14%;
 }
 .notice-options .form_favor,
 .notice-options .form_disfavor {
 margin-left:0;
 }
 .notice-options input,
-.notice-options a {
+.notice-options a,
+.notice-options .repeated {
 text-indent:-9999px;
 outline:none;
 }
@@ -1035,16 +1038,19 @@ border-radius:0;
 -moz-border-radius:0;
 -webkit-border-radius: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;
 }
-.notice-options a {
+.notice-options a,
+.notice-options .repeated {
 width:16px;
 height:16px;
 }
diff --git a/theme/base/images/icons/icons-01.gif b/theme/base/images/icons/icons-01.gif
index e910c86c0..417327881 100644
--- a/theme/base/images/icons/icons-01.gif
+++ b/theme/base/images/icons/icons-01.gif
diff --git a/theme/base/images/icons/twotone/green/recycle-02.gif b/theme/base/images/icons/twotone/green/recycle-02.gif
new file mode 100644
index 000000000..060a8c72f
--- /dev/null
+++ b/theme/base/images/icons/twotone/green/recycle-02.gif
diff --git a/theme/base/images/icons/twotone/green/recycle.gif b/theme/base/images/icons/twotone/green/recycle.gif
new file mode 100644
index 000000000..1fab5dcc7
--- /dev/null
+++ b/theme/base/images/icons/twotone/green/recycle.gif
diff --git a/theme/base/images/illustrations/illu_pattern-01.png b/theme/base/images/illustrations/illu_pattern-01.png
new file mode 100644
index 000000000..833309e58
--- /dev/null
+++ b/theme/base/images/illustrations/illu_pattern-01.png
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index ad64b4198..f1d9a9d0b 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -30,8 +30,7 @@ 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;
 }
 
@@ -55,17 +54,13 @@ border-color:#DDDDDD;
 background:none;
 }
 
-input.submit,
 .form_notice.warning #notice_text-count,
-.form_settings .form_note,
-.entity_remote_subscribe,
-.entity_actions .form_notice input.submit {
+.form_settings .form_note {
 background-color:#9BB43E;
 }
 input.submit,
 .form_notice.warning #notice_text-count,
 .form_settings .form_note,
-.entity_remote_subscribe,
 .entity_actions a,
 .entity_actions input,
 .entity_moderation p,
@@ -83,15 +78,35 @@ 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,
-.entity_remote_subscribe {
+.form_settings .form_note {
 border-color:#9BB43E;
 }
-input.submit,
-.entity_remote_subscribe,
-.entity_actions .form_notice input.submit {
+input.submit {
 color:#FFFFFF;
 }
+.entity_actions input.submit {
+border-color:transparent;
+text-shadow:none;
+}
+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;
+}
+input.submit:hover {
+background-position:0 -5px;
+}
+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;
+}
 
 a,
 .form_settings input.form_action-primary,
@@ -145,6 +160,7 @@ opacity:0;
 .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,
@@ -157,7 +173,8 @@ button.close,
 .entity_moderation p,
 .entity_sandbox input.submit,
 .entity_silence input.submit,
-.entity_delete input.submit {
+.entity_delete input.submit,
+.notice-options .repeated {
 background-image:url(../../base/images/icons/icons-01.gif);
 background-repeat:no-repeat;
 background-color:transparent;
@@ -319,6 +336,12 @@ background-position:0 -526px;
 .notice-options .notice_delete {
 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,
 .notices div.notice-options {
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index d5a5d38de..aa02070ac 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -30,8 +30,7 @@ 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;
 }
 
@@ -55,17 +54,13 @@ border-color:#DDDDDD;
 background:none;
 }
 
-input.submit,
 .form_notice.warning #notice_text-count,
-.form_settings .form_note,
-.entity_remote_subscribe,
-.entity_actions .form_notice input.submit {
+.form_settings .form_note {
 background-color:#9BB43E;
 }
 input.submit,
 .form_notice.warning #notice_text-count,
 .form_settings .form_note,
-.entity_remote_subscribe,
 .entity_actions a,
 .entity_actions input,
 .entity_moderation p,
@@ -83,15 +78,35 @@ 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,
-.entity_remote_subscribe {
+.form_settings .form_note {
 border-color:#9BB43E;
 }
-input.submit,
-.entity_remote_subscribe,
-.entity_actions .form_notice input.submit {
+input.submit {
 color:#FFFFFF;
 }
+.entity_actions input.submit {
+border-color:transparent;
+text-shadow:none;
+}
+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;
+}
+input.submit:hover {
+background-position:0 -5px;
+}
+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;
+}
 
 a,
 .form_settings input.form_action-primary,
@@ -145,6 +160,7 @@ opacity:0;
 .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,
@@ -157,7 +173,8 @@ button.close,
 .entity_moderation p,
 .entity_sandbox input.submit,
 .entity_silence input.submit,
-.entity_delete input.submit {
+.entity_delete input.submit,
+.notice-options .repeated {
 background-image:url(../../base/images/icons/icons-01.gif);
 background-repeat:no-repeat;
 background-color:transparent;
@@ -318,6 +335,12 @@ background-position:0 -526px;
 .notice-options .notice_delete {
 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,
 .notices div.notice-options {