1 files changed, 78 insertions, 77 deletions

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index cfe445a98..253cbfa38 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -149,7 +149,9 @@ font-weight:bold;
 #form_login legend,
 #form_register legend,
 #form_password legend,
-#form_settings_avatar legend {
+#form_settings_avatar legend,
+#newgroup legend,
+#editgroup legend {
 display:none;
 }
 
@@ -189,6 +191,8 @@ border-radius:4px;
 padding:0 7px;
 }
 
+
+
 /* FORM SETTINGS */
 
 
@@ -445,7 +449,7 @@ margin-left:4px;
 
 #form_notice .form_note {
 position:absolute;
-top:120px;
+top:118px;
 right:98px;
 z-index:9;
 }
@@ -457,6 +461,7 @@ display:none;
 #notice_text-count {
 font-weight:bold;
 line-height:1.15;
+padding:1px 2px;
 }
 
 #form_notice #notice_data-attach_view {
@@ -504,8 +509,8 @@ float:left;
 
 
 
-/* user_profile */
-#user_profile {
+/* entity_profile */
+.entity_profile {
 position:relative;
 width:475px;
 min-height:123px;
@@ -513,23 +518,23 @@ float:left;
 margin-bottom:17px;
 margin-left:0;
 }
-#user_profile dt,
-#user_statistics dt {
+.entity_profile dt,
+#entity_statistics dt {
 font-weight:bold;
 }
-#user_profile .user_depiction {
+.entity_profile .entity_depiction {
 float:left;
 position:absolute;
 top:0;
 left:0;
 width:96px;
 }
-#user_profile .user_fn,
-#user_profile .user_nickname,
-#user_profile .user_location,
-#user_profile .user_url,
-#user_profile .user_note,
-#user_profile .user_tags {
+.entity_profile .entity_fn,
+.entity_profile .entity_nickname,
+.entity_profile .entity_location,
+.entity_profile .entity_url,
+.entity_profile .entity_note,
+.entity_profile .entity_tags {
 float:left;
 clear:left;
 margin-left:113px;
@@ -537,81 +542,81 @@ width:322px;
 margin-bottom:4px;
 }
 
-#user_profile .user_fn,
-#user_profile .user_nickname {
+.entity_profile .entity_fn,
+.entity_profile .entity_nickname {
 width:auto;
 clear:none;
 }
-#user_profile .user_fn {
+.entity_profile .entity_fn {
 margin-left:11px;
 margin-right:4px;
 }
-#user_profile .user_fn .fn {
+.entity_profile .entity_fn .fn {
 font-weight:bold;
 font-style:normal;
 }
-#user_profile .nickname {
+.entity_profile .nickname {
 font-style:italic;
 font-weight:bold;
 }
 
-#user_profile .user_fn dd:before {
+.entity_profile .entity_fn dd:before {
 content: "(";
 font-weight:normal;
 }
-#user_profile .user_fn dd:after {
+.entity_profile .entity_fn dd:after {
 content: ")";
 font-weight:normal;
 }
 
-#user_profile dt {
+.entity_profile dt {
 display:none;
 }
-#user_profile h2 {
+.entity_profile h2 {
 display:none;
 }
 
-/* user_profile */
+/* entity_profile */
 
 
 
 
 
-/*user_actions*/
-#user_actions {
+/*entity_actions*/
+.entity_actions {
 clear:left;
 float:left;
 position:absolute;
 top:0;
 right:0;
 }
-#user_actions h2 {
+.entity_actions h2 {
 display:none;
 }
-#user_actions ul {
+.entity_actions ul {
 list-style-type:none;
 }
-#user_actions li {
+.entity_actions li {
 margin-bottom:4px;
 }
-#user_actions li:first-child {
+.entity_actions li:first-child {
 border-top:0;
 }
-#user_actions fieldset {
+.entity_actions fieldset {
 border:0;
 padding:0;
 }
-#user_actions legend {
+.entity_actions legend {
 display:none;
 }
 
-#user_actions input.submit {
+.entity_actions input.submit {
 display:block;
 text-align:left;
 cursor:pointer;
 width:100%;
 }
-#user_actions a {
+.entity_actions a {
 text-decoration:none;
 font-weight:bold;
 width:100%;
@@ -622,35 +627,22 @@ display:block;
 
 .form_user_block input.submit,
 .form_user_unblock input.submit,
-#user_send-a-message a,
+#entity_send-a-message a,
 .form_user_nudge input.submit {
 border:0;
 padding-left:20px;
 }
 
-#user_send-a-message a {
+#entity_send-a-message a {
 padding:4px 4px 4px 23px;
-
 }
 
 
-#user_subscribe input.submit,
-.form_user_subscribe input.submit {
-
-}
-
-
-
-#user_send-a-message form {
-}
-
-#user_send-a-message textarea {
-}
 
-.user_tags ul {
+.entity_tags ul {
 list-style-type:none;
 }
-.user_tags li {
+.entity_tags li {
 display:inline;
 margin-right:1em;
 float:left;
@@ -661,41 +653,43 @@ float:left;
 .aside .section {
 margin-bottom:29px;
 clear:both;
+float:left;
+width:100%;
 }
 .aside .section h2 {
 text-transform:uppercase;
 font-size:1em;
 }
 
-#user_statistics dt,
-#user_statistics dd {
+#entity_statistics dt,
+#entity_statistics dd {
 display:inline;
 }
-#user_statistics dt:after {
+#entity_statistics dt:after {
 content: ":";
 }
 
 
 #user_subscriptions,
-#user_subscriptions-common {
-float:left;
+#user_subscribers,
+#user_groups, {
+
 }
-#user_subscriptions ul.users {
+.section ul.entities {
 width:220px;
 float:left;
 }
-#user_subscriptions .users li {
+.section .entities li {
 list-style-type:none;
 float:left;
 margin-right:7px;
 margin-bottom:7px;
 }
-#user_subscriptions .users li .photo {
-width:24px;
-height:24px;
+.section .entities li .photo {
 margin-right:0;
+margin-bottom:0;
 }
-#user_subscriptions .users li .fn {
+.section .entities li .fn {
 display:none;
 }
 .aside .section .more {
@@ -704,29 +698,36 @@ clear:both;
 
 
 
-.profile #user_profile {
+.profile .entity_profile {
 margin-bottom:0;
 min-height:60px;
 }
 
+.profile .form_user_subscribe,
 .profile .form_user_unsubscribe {
 float:right;
 }
+.profile .form_user_subscribe legend,
+.profile .form_user_unsubscribe legend {
+display:none;
+}
+
+
 .profiles {
 list-style-type:none;
 }
-.profile #user_profile .user_location {
+.profile .entity_profile .entity_location {
 width:auto;
 clear:none;
 margin-left:11px;
 }
-.profile #user_profile dl,
-.profile #user_profile dd {
+.profile .entity_profile dl,
+.profile .entity_profile dd {
 display:inline;
 float:none;
 }
-.profile #user_profile .user_note,
-.profile #user_profile .user_url {
+.profile .entity_profile .entity_note,
+.profile .entity_profile .entity_url {
 margin-left:59px;
 clear:none;
 display:block;
@@ -1051,9 +1052,9 @@ background-color:#D1D9E4;
 
 
 
-#user_actions #user_subscribe .form_note,
-#user_actions #user_subscribe .form_data,
-#user_actions #user_subscribe .form_actions label {
+.entity_actions #user_subscribe .form_note,
+.entity_actions #user_subscribe .form_data,
+.entity_actions #user_subscribe .form_actions label {
 display:none;
 }
 #form_user-relationship .form_note,
@@ -1062,7 +1063,7 @@ display:none;
 display:block;
 }
 
-#user_actions #user-relationship_submit {
+.entity_actions #user-relationship_submit {
 margin-bottom:0;
 }
 #form_user-relationship .form_data li label {
@@ -1193,34 +1194,34 @@ margin-bottom:0;
 
 
 
-.section .groups,
+#groups_related ul,
 #users_featured ul {
 list-style-type:none;
 }
-.section .groups li,
+#groups_related li,
 #users_featured li {
 margin-top:11px;
 float:left;
 width:100%;
 }
-.section .groups li:first-child,
+#groups_related li:first-child,
 #users_featured li:first-child {
 margin-top:0;
 }
 
-.section .groups .vcard,
+#groups_related .vcard,
 #users_featured .vcard {
 float:left;
 margin-bottom:-23px;
 }
 
-.section .groups dl,
+#groups_related dl,
 #users_featured dl {
 float:left;
 margin-left:63px;
 clear:left;
 }
-.section .groups dt,
+#groups_related dt,
 #users_featured dt {
 display:none;
 font-weight:bold;