Merge commit 'origin/testing' into 0.9.x

Conflicts:
	lib/action.php
	lib/adminpanelaction.php

5 files changed, 81 insertions, 8 deletions

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index f32c57ea4..01d5dd134 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -452,6 +452,13 @@ width:100%;
 float:left;
 }
 
+#content.admin {
+width:95.5%;
+}
+#content.admin #content_inner {
+width:66.3%;
+}
+
 #aside_primary {
 width:27.917%;
 min-height:259px;
@@ -764,10 +771,12 @@ display:none;
 text-align:center;
 }
 
-.entity_moderation {
+.entity_moderation,
+.entity_role {
 position:relative;
 }
-.entity_moderation p {
+.entity_moderation p,
+.entity_role p {
 border-radius:4px;
 -moz-border-radius:4px;
 -webkit-border-radius:4px;
@@ -775,13 +784,14 @@ font-weight:bold;
 padding-bottom:2px;
 margin-bottom:7px;
 }
-.entity_moderation ul {
+.entity_moderation ul,
+.entity_role ul {
 display:none;
 }
-.entity_moderation:hover ul {
+.entity_moderation:hover ul,
+.entity_role:hover ul {
 display:block;
-min-width:21%;
-width:100%;
+width:110%;
 padding:11px;
 position:absolute;
 top:-1px;
diff --git a/theme/base/images/icons/README b/theme/base/images/icons/README
index ea582149f..f701959ca 100644
--- a/theme/base/images/icons/README
+++ b/theme/base/images/icons/README
@@ -45,6 +45,11 @@
         White pin with green background
         White underscore with green background
         White C with green background
+        White magic wand with green background
+        Green badge with white background
+        Green sandbox with white background
+        Green speech bubble broken with white background
+        Green person with tie with white background
  */
 
 Created by various authors
diff --git a/theme/base/images/icons/icons-01.gif b/theme/base/images/icons/icons-01.gif
index be884ff48..bf0f1230e 100644
--- a/theme/base/images/icons/icons-01.gif
+++ b/theme/base/images/icons/icons-01.gif
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index 8ae2b4014..be341813a 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -49,6 +49,7 @@ box-shadow:3px 3px 7px rgba(194, 194, 194, 0.3);
 .pagination .nav_next a,
 .form_settings fieldset fieldset,
 .entity_moderation:hover ul,
+.entity_role:hover ul,
 .dialogbox {
 border-color:#DDDDDD;
 }
@@ -67,6 +68,7 @@ input.submit,
 .entity_actions a,
 .entity_actions input,
 .entity_moderation p,
+.entity_role 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);
@@ -127,7 +129,8 @@ a,
 .notice-options input,
 .entity_actions a,
 .entity_actions input,
-.entity_moderation p {
+.entity_moderation p,
+.entity_role p {
 color:#002FA7;
 }
 
@@ -190,6 +193,9 @@ button.close,
 .entity_sandbox input.submit,
 .entity_silence input.submit,
 .entity_delete input.submit,
+.entity_role p,
+.entity_role_administrator input.submit,
+.entity_role_moderator input.submit,
 .notice-options .repeated,
 .form_notice label[for=notice_data-geo],
 button.minimize,
@@ -229,6 +235,7 @@ border-color:transparent;
 #site_nav_local_views .current a,
 .entity_send-a-message .form_notice,
 .entity_moderation:hover ul,
+.entity_role:hover ul,
 .dialogbox {
 background-color:#FFFFFF;
 }
@@ -319,6 +326,7 @@ background-position: 5px -852px;
 }
 .entity_send-a-message .form_notice,
 .entity_moderation:hover ul,
+.entity_role:hover ul,
 .dialogbox {
 box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
 -moz-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
@@ -350,6 +358,27 @@ background-position: 5px -1445px;
 .entity_delete input.submit {
 background-position: 5px -1511px;
 }
+.entity_sandbox .form_user_unsandbox input.submit {
+background-position: 5px -2568px;
+}
+.entity_silence .form_user_unsilence input.submit {
+background-position: 5px -2633px;
+}
+.entity_role p {
+background-position: 5px -2436px;
+}
+.entity_role_administrator .form_user_grantrole input.submit {
+background-position: 5px -983px;
+}
+.entity_role_moderator .form_user_grantrole input.submit {
+background-position: 5px -1313px;
+}
+.entity_role_administrator .form_user_revokerole input.submit {
+background-position: 5px -2699px;
+}
+.entity_role_moderator .form_user_revokerole input.submit {
+background-position: 5px -2501px;
+}
 .form_reset_key input.submit {
 background-position: 5px -1973px;
 }
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 737e3a103..db85408eb 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -49,6 +49,7 @@ box-shadow:3px 3px 7px rgba(194, 194, 194, 0.3);
 .pagination .nav_next a,
 .form_settings fieldset fieldset,
 .entity_moderation:hover ul,
+.entity_role:hover ul,
 .dialogbox {
 border-color:#DDDDDD;
 }
@@ -67,6 +68,7 @@ input.submit,
 .entity_actions a,
 .entity_actions input,
 .entity_moderation p,
+.entity_role 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);
@@ -128,7 +130,8 @@ a,
 .notice-options input,
 .entity_actions a,
 .entity_actions input,
-.entity_moderation p {
+.entity_moderation p,
+.entity_role p {
 color:#002FA7;
 }
 
@@ -191,6 +194,9 @@ button.close,
 .entity_sandbox input.submit,
 .entity_silence input.submit,
 .entity_delete input.submit,
+.entity_role p,
+.entity_role_administrator input.submit,
+.entity_role_moderator input.submit,
 .notice-options .repeated,
 .form_notice label[for=notice_data-geo],
 button.minimize,
@@ -230,6 +236,7 @@ border-color:transparent;
 #site_nav_local_views .current a,
 .entity_send-a-message .form_notice,
 .entity_moderation:hover ul,
+.entity_role:hover ul,
 .dialogbox {
 background-color:#FFFFFF;
 }
@@ -319,6 +326,7 @@ background-position: 5px -852px;
 }
 .entity_send-a-message .form_notice,
 .entity_moderation:hover ul,
+.entity_role:hover ul,
 .dialogbox {
 box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
 -moz-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
@@ -350,6 +358,27 @@ background-position: 5px -1445px;
 .entity_delete input.submit {
 background-position: 5px -1511px;
 }
+.entity_sandbox .form_user_unsandbox input.submit {
+background-position: 5px -2568px;
+}
+.entity_silence .form_user_unsilence input.submit {
+background-position: 5px -2633px;
+}
+.entity_role p {
+background-position: 5px -2436px;
+}
+.entity_role_administrator .form_user_grantrole input.submit {
+background-position: 5px -983px;
+}
+.entity_role_moderator .form_user_grantrole input.submit {
+background-position: 5px -1313px;
+}
+.entity_role_administrator .form_user_revokerole input.submit {
+background-position: 5px -2699px;
+}
+.entity_role_moderator .form_user_revokerole input.submit {
+background-position: 5px -2501px;
+}
 .form_reset_key input.submit {
 background-position: 5px -1973px;
 }