Merge commit 'upstream/0.7.x' into 0.7.x

Conflicts:

	actions/showstream.php

7 files changed, 15 insertions, 247 deletions

diff --git a/theme/identica/bg-body.gif b/theme/identica/bg-body.gif
deleted file mode 100644
index d87e2e8d7..000000000
--- a/theme/identica/bg-body.gif
+++ /dev/null
diff --git a/theme/identica/bg-header.gif b/theme/identica/bg-header.gif
deleted file mode 100644
index 5154b2e5e..000000000
--- a/theme/identica/bg-header.gif
+++ /dev/null
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index beb5a2c13..576a2e14b 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -34,6 +34,9 @@ border-color:#aaa;
 border-color:#ddd;
 }
 
+.form_settings input.form_action-secondary {
+background:none;
+}
 
 input.submit,
 #form_notice.warning #notice_text-count,
@@ -59,7 +62,8 @@ div.notice-options input,
 .form_user_unblock input.submit,
 .entity_send-a-message a,
 .form_user_nudge input.submit,
-.entity_nudge p {
+.entity_nudge p,
+.form_settings input.form_action-secondary {
 color:#002E6E;
 }
 
@@ -67,7 +71,6 @@ color:#002E6E;
 .profile {
 border-top-color:#CEE1E9;
 }
-.section .notice,
 .section .profile {
 border-top-color:#87B4C8;
 }
@@ -92,12 +95,6 @@ color:#333;
 color:#000;
 }
 
-#form_notice #notice_data-attach_view {
-background-image:url(../images/icons/twotone/green/paper-clip.gif);
-background-repeat:no-repeat;
-background-position:0 45%;
-background-color:transparent;
-}
 
 #nav_register a {
 text-decoration:none;
@@ -123,8 +120,6 @@ background-color:rgba(255, 255, 255, 0.7);
 }
 
 
-
-
 #page_notice .error {
 background-color:#F7E8E8;
 }
@@ -144,26 +139,21 @@ background-color:#9BB43E;
 }
 
 
-
-
 #export_data li a {
 background-repeat:no-repeat;
 background-position:0 45%;
 }
 #export_data li a.rss {
-background-image:url(../../base/images/icons/icon_rss.jpg);
+background-image:url(../../base/images/icons/icon_rss.png);
 }
 #export_data li a.atom {
-background-image:url(../../base/images/icons/icon_atom.jpg);
+background-image:url(../../base/images/icons/icon_atom.png);
 }
 #export_data li a.foaf {
 background-image:url(../../base/images/icons/icon_foaf.gif);
 }
-#export_data li a.export_vcard {
-background-image:url(../../base/images/icons/icon_vcard.gif);
-}
-
 
+.entity_edit a,
 .entity_send-a-message a,
 .form_user_nudge input.submit,
 .form_user_block input.submit,
@@ -185,6 +175,9 @@ color:#fff;
 background-color:#87B4C8;
 }
 
+.entity_edit a {
+background-image:url(../images/icons/twotone/green/edit.gif);
+}
 .entity_send-a-message a {
 background-image:url(../images/icons/twotone/green/quote.gif);
 }
@@ -204,30 +197,6 @@ background-image:url(../images/icons/twotone/green/shield.gif);
 background-color:#fcfcfc;
 }
 
-.notice-data a span {
-background-color:transparent;
-background-repeat:no-repeat;
-background-position:0 45%;
-}
-.notice_video .notice-data a span {
-background-image:url(../images/icons/twotone/green/camera.gif);
-}
-.notice_audio .notice-data a span {
-background-image:url(../images/icons/twotone/green/music.gif);
-}
-.notice_image .notice-data a span {
-background-image:url(../images/icons/twotone/green/search.gif);
-}
-.notice_event .notice-data a span {
-background-image:url(../images/icons/twotone/green/calendar.gif);
-}
-.notice_location .notice-data a span {
-background-image:url(../images/icons/twotone/green/flag.gif);
-}
-.notice_document .notice-data a span {
-background-image:url(../images/icons/twotone/green/document.gif);
-}
-
 .notice-options .notice_reply a,
 .notice-options form input.submit {
 background-color:transparent;
@@ -269,7 +238,10 @@ background-color:#fcfcfc;
 #new_group a {
 background:transparent url(../images/icons/twotone/green/news.gif) no-repeat 0 45%;
 }
-
+#usergroups #new_group {
+float: left;
+margin-right: 2em;
+}
 
 .pagination .nav_prev a,
 .pagination .nav_next a {
diff --git a/theme/identica/display.css b/theme/identica/display.css
deleted file mode 100644
index 62d34f00e..000000000
--- a/theme/identica/display.css
+++ /dev/null
@@ -1,187 +0,0 @@
-/* CSS Document */
-/* Design & CSS by Marie-Claude Doyon http://www.marieclaudedoyon.com */
-
-@import url(../default/display.css);
-
-html {
-     background: url(bg-body.gif) repeat-y top center #d8e2d7;
-}
-
-body {
-     color: #193441;
-}
-
-a {
-     color: #C15D42;
-}
-
-#wrap {
-      background: url(bg-header.gif) repeat-x #FCFFF5;
-}
-
-#header h1.pagetitle {
-	color: #d8e2d7;
-}
-
-#header h2.sitename {
-	color: #FCFFF5;
-}
-
-#nav li a {
-     color: #91AA9D;
-}
-
-#nav_views li a {
-     color: #FCFFF5;
-     background-color: #91AA9D;
-     border-right: 1px solid #6A8787;
-}
-
-#nav_views li.current a, #nav_views li.current a:hover {
-     color: #3F606F;
-     background-color: #FCFFF5;
-     border-right: 1px solid #6A8787;
-}
-
-#nav_views li.current a:hover {
-     color: #193441;
-}
-
-#nav_views li a:hover {
-     color: #FCFFF5;
-     background-color: #3F606F;
-     border-right: 1px solid #6A8787;
-     }
-
-#nav_sub {
-     border-top: 1px solid #D8E2D7;
-     }
-
-.instructions p, .success, .error {
-     border: 1px solid #91AA9D;
-     color: #FCFFF5;
-     }
-.instructions a:hover, .success a:hover, .error a:hover {
-     color: #FCFFF5;
-     }
-
-#notices {
-     border-top: 1px solid #D8E2D7;
-     }
-
-.notice_single {
-     border-bottom: 1px solid #D8E2D7;
-}
-
-.notice_single:hover {
-     background-color: #F3F8EA;
-     }
-
-input#submit_yes, input#submit_no {
-     color: #FCFFF5;
-     background-color: #C15D42;
-     }
-
-input#submit_yes:hover, input#submit_no:hover {
-     background-color: #904632;
-     }
-
-p.time a {
-    color: #91AA9D;
-    }
-
-#profile {
-    border-top: 1px solid #D8E2D7;
-    }
-
-#profile h2 {
-    color: #91AA9D;
-    }
-
-#nav_pagination li {
-    background-color: #91AA9D;
-    }
-
-#nav_pagination li a {
-    background-color: #91AA9D;
-    color: #FCFFF5;
-    }
-
-#nav_pagination li a:hover {
-    color: #FCFFF5;
-    }
-
-#footer {
-    border-top: 1px solid #D8E2D7;
-    }
-
-form input {
-     border: 1px solid #D8E2D7;
-     }
-
-input#submit, input.submit  {
-    color: #FCFFF5;
-    background-color: #C15D42;
-    }
-
-input#submit:hover, input.submit:hover {
-    background-color: #904632;
-    }
-
-textarea, input {
-    color: #193441;
-    }
-
-textarea:focus, input:focus {
-    background-color: #f0f6eb;
-    }
-
-.input_instructions {
-    color: #91aa9d;
-    }
-
-#status_label {
-    color: #91AA9D;
-    }
-
-#status_textarea {
-    color: #193441;
-}
-
-#status_submit {
-    background-color: #C15D42;
-    color: #FCFFF5;
-    }
-
-#status_submit:hover {
-    background-color: #904632;
-    }
-
-#content .subscribe .submit, #content .unsubscribe .submit, #remotesubscribe .button, #remotesubscribe {
-    background-color: #c15d42;
-    color: #fcfff5;
-    }
-
-#profiles {
-    border-top: 1px solid #D8E2D7;
-    }
-
-.profile_single {
-    border-bottom: 1px solid #D8E2D7;
-    }
-
-.profile_single:hover {
-    background-color: #F3F8EA;
-    }
-
-#messages {
-    border-top: 1px solid #D8E2D7;
-    }
-
-.message_single {
-    border-bottom: 1px solid #D8E2D7;
-    }
-
-.message_single:hover {
-    background-color: #F3F8EA;
-    }
diff --git a/theme/identica/ie6.css b/theme/identica/ie6.css
deleted file mode 100644
index a301f1dc5..000000000
--- a/theme/identica/ie6.css
+++ /dev/null
@@ -1,14 +0,0 @@
-@charset "UTF-8";
-/* CSS Document */
-@import url(../default/ie6.css);
-#wrap {
-	background: url(bg-header.gif) repeat-x #FCFFF5;
-	}
-
-
-input.disfavor,
-input.favor {
-	text-indent:0px;
-	text-align:right;
-	padding-left:25px;
-}
\ No newline at end of file
diff --git a/theme/identica/ie7.css b/theme/identica/ie7.css
deleted file mode 100644
index cab6f4059..000000000
--- a/theme/identica/ie7.css
+++ /dev/null
@@ -1,3 +0,0 @@
-@charset "UTF-8";
-/* CSS Document */
-@import url(../default/ie7.css);
diff --git a/theme/identica/login-bg.gif b/theme/identica/login-bg.gif
deleted file mode 100644
index e2d8377db..000000000
--- a/theme/identica/login-bg.gif
+++ /dev/null