6 files changed, 131 insertions, 13 deletions
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 52f97f6b1..0246065a7 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -345,10 +345,14 @@ list-style-type:none;
 float:left;
 text-decoration:none;
 padding:4px 11px;
+border-radius-topleft:4px;
+border-radius-topright:4px;
 -moz-border-radius-topleft:4px;
 -moz-border-radius-topright:4px;
 -webkit-border-top-left-radius:4px;
 -webkit-border-top-right-radius:4px;
+border-radius-topleft:0;
+border-radius-topright:0;
 border-width:1px;
 border-style:solid;
 border-bottom:0;
@@ -359,6 +363,54 @@ float:left;
 width:100%;
 }
 
+body[id$=adminpanel] #site_nav_local_views {
+position:relative;
+z-index:9;
+float:right;
+margin-right:10.65%;
+width:22.25%;
+}
+body[id$=adminpanel] #site_nav_local_views li {
+width:100%;
+margin-right:0;
+margin-bottom:7px;
+}
+body[id$=adminpanel] #site_nav_local_views a {
+display:block;
+width:80%;
+padding-right:10%;
+padding-left:10%;
+border-radius-toprleft:0;
+-moz-border-radius-topleft:0;
+-webkit-border-top-left-radius:0;
+border-radius-topright:4px;
+-moz-border-radius-topright:4px;
+-webkit-border-top-right-radius:4px;
+border-radius-bottomright:4px;
+-moz-border-radius-bottomright:4px;
+-webkit-border-bottom-right-radius:4px;
+}
+body[id$=adminpanel] #site_nav_local_views li.current {
+box-shadow:none;
+-moz-box-shadow:none;
+-webkit-box-shadow:none;
+}
+
+body[id$=adminpanel] #content {
+border-radius-topleft:7px;
+border-radius-topright:7px;
+-moz-border-radius-topleft:7px;
+-moz-border-radius-topright:7px;
+-webkit-border-top-left-radius:7px;
+-webkit-border-top-right-radius:7px;
+border-radius-topright:0;
+-moz-border-radius-topright:0;
+-webkit-border-top-right-radius:0;
+}
+body[id$=adminpanel] #aside_primary {
+display:none;
+}
+
 #site_nav_global_primary dt,
 #site_nav_global_secondary dt {
 display:none;
@@ -764,10 +816,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 +829,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;
@@ -799,8 +854,8 @@ list-style-type:none;
 display:inline;
 }
 .entity_tags li {
-float:left;
-margin-right:11px;
+display:inline;
+margin-right:7px;
 }
 
 .aside .section {
diff --git a/theme/base/css/ie.css b/theme/base/css/ie.css
index 70a6fd11a..41d053ac4 100644
--- a/theme/base/css/ie.css
+++ b/theme/base/css/ie.css
@@ -47,3 +47,7 @@ z-index:9999;
 .notice .thumbnail img {
 z-index:9999;
 }
+
+.form_settings fieldset fieldset legend {
+line-height:auto;
+}
diff --git a/theme/base/css/ie6.css b/theme/base/css/ie6.css
index edc49478f..6df5e01ce 100644
--- a/theme/base/css/ie6.css
+++ b/theme/base/css/ie6.css
@@ -12,11 +12,11 @@ margin:0 auto;
 }
 
 #content {
-width:69%;
+width:66%;
 }
 #aside_primary {
-padding:5%;
-width:29.5%;
+padding:1.8%;
+width:24%;
 }
 .entity_profile .entity_nickname,
 .entity_profile .entity_location,
@@ -32,9 +32,9 @@ margin-bottom:123px;
 width:20%;
 }
 .notice div.entry-content {
-width:50%;
+width:65%;
 margin-left:30px;
 }
 .notice-options a {
 width:16px;
-}
-\ No newline at end of file
+}
diff --git a/theme/base/images/icons/README b/theme/base/images/icons/README
new file mode 100644
index 000000000..f701959ca
--- /dev/null
+++ b/theme/base/images/icons/README
@@ -0,0 +1,59 @@
+/**
+ * @author    Paul Jarvis http://code.google.com/p/twotiny/
+ * @license   http://dev.perl.org/licenses/ Artistic License/GPL
+ * @note
+        White left arrow with green background
+        White right arrow with green background
+        White clip with green background
+        White heart with green background
+        White reply with green background
+        White garbage with green background
+        White pencil with green background
+        White envelope with green background
+        White speech bubble with green background
+        White shield with green background
+        White asterisk with green background
+        White x with green background
+        White plus with green background
+        White minus with green background
+        White skull with green background
+        White recycle with green background
+        White external with green background
+        White key with green background
+        White flag with green background
+        White checkmark with green background
+        White reject with green background
+        White play with green background
+        White pause with green background
+ */
+
+
+/**
+ * @author    Sarven Capadisli <csarven@status.net>
+ * @copyright 2008-2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ * @note
+        Green clip with transparent background
+        Green heart with white background
+        White person with tie with green background
+        White sherif badge with green background
+        White boxes with green background
+        White speech bubble broken with green background
+        Green recycle with transparent background
+        Green pin with white background
+        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
+* FOAF icon from http://iandavis.com/2006/foaf-icons/ with Public Domain license
+* Atom feed icon from http://intertwingly.net/wiki/pie/Icon with Public Domain license
+* RSS feed icon from http://www.feedicons.com/ (Mozilla, Microsoft, Matt Brett) with MPL/GPL/LGPL tri-license
+* Processing icon from/by Unknown with Unknown license //FIXME
diff --git a/theme/base/images/icons/icon_geo.png b/theme/base/images/icons/icon_geo.png
deleted file mode 100644
index 8df245699..000000000
--- a/theme/base/images/icons/icon_geo.png
+++ /dev/null
diff --git a/theme/base/images/icons/icons-01.gif b/theme/base/images/icons/icons-01.gif
index 6f284f023..bf0f1230e 100644
--- a/theme/base/images/icons/icons-01.gif
+++ b/theme/base/images/icons/icons-01.gif