Author: simoneg
Date: Thu Jan 7 14:30:44 2010
New Revision: 896894
URL: http://svn.apache.org/viewvc?rev=896894&view=rev
Log:
LABS-494 : better CSS support in administration
Modified:
labs/magma/trunk/website-administration/src/main/java/org/apache/magma/website/admin/AdminMenuProducer.java
labs/magma/trunk/website-administration/src/main/java/org/apache/magma/website/admin/AdminSideMenuProducer.java
labs/magma/trunk/website-administration/src/main/resources/org/apache/magma/website/admin/adminSideMenu.css
Modified:
labs/magma/trunk/website-administration/src/main/java/org/apache/magma/website/admin/AdminMenuProducer.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/website-administration/src/main/java/org/apache/magma/website/admin/AdminMenuProducer.java?rev=896894&r1=896893&r2=896894&view=diff
==============================================================================
---
labs/magma/trunk/website-administration/src/main/java/org/apache/magma/website/admin/AdminMenuProducer.java
(original)
+++
labs/magma/trunk/website-administration/src/main/java/org/apache/magma/website/admin/AdminMenuProducer.java
Thu Jan 7 14:30:44 2010
@@ -46,9 +46,11 @@
}
protected void renderAction(AdminAction action, Object bean, Writer
osw) throws IOException {
- osw.write("<li class=\"MagmaAdminMenuAction\">");
+ osw.write("<li class=\"MagmaAdminMenuAction " +
action.getAction() + "\">");
osw.write("<a href=\"" + action.getUrl(bean) + "\">");
+ osw.write("<span>");
osw.append(new
LocalizableString(action.getAction()).toString());
+ osw.write("</span>");
osw.write("</a>");
osw.write("</li>");
}
Modified:
labs/magma/trunk/website-administration/src/main/java/org/apache/magma/website/admin/AdminSideMenuProducer.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/website-administration/src/main/java/org/apache/magma/website/admin/AdminSideMenuProducer.java?rev=896894&r1=896893&r2=896894&view=diff
==============================================================================
---
labs/magma/trunk/website-administration/src/main/java/org/apache/magma/website/admin/AdminSideMenuProducer.java
(original)
+++
labs/magma/trunk/website-administration/src/main/java/org/apache/magma/website/admin/AdminSideMenuProducer.java
Thu Jan 7 14:30:44 2010
@@ -23,6 +23,7 @@
import java.util.List;
import org.apache.magma.basics.LocalizableString;
+import org.apache.magma.beans.MagmaBeanSupport;
import org.apache.magma.website.Head;
import org.apache.magma.website.HtmlProducer;
@@ -53,7 +54,13 @@
osw.write("<h1>");
osw.write(new
LocalizableString(beanClass.getSimpleName()).toString());
osw.write("</h1>");
- osw.write("<div class=\"MagmaAdminSideMenu\"><ul>");
+ osw.write("<div class=\"MagmaAdminSideMenu\">");
+ if (bean != null) {
+ if (bean instanceof MagmaBeanSupport) {
+ osw.write("<h2>" +
((MagmaBeanSupport)bean).toUser() + "</h2>");
+ }
+ }
+ osw.write("<ul>");
super.renderActions(actions, bean, osw);
osw.write("</ul></div>");
}
Modified:
labs/magma/trunk/website-administration/src/main/resources/org/apache/magma/website/admin/adminSideMenu.css
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/website-administration/src/main/resources/org/apache/magma/website/admin/adminSideMenu.css?rev=896894&r1=896893&r2=896894&view=diff
==============================================================================
---
labs/magma/trunk/website-administration/src/main/resources/org/apache/magma/website/admin/adminSideMenu.css
(original)
+++
labs/magma/trunk/website-administration/src/main/resources/org/apache/magma/website/admin/adminSideMenu.css
Thu Jan 7 14:30:44 2010
@@ -27,3 +27,8 @@
.MagmaAdminSideMenu .MagmaAdminMenuAction a:hover {
background:#d0dfe2;
}
+
+.MagmaAdminSideMenu li.MagmaAdminMenuSeparator {
+ background: #6F8992;
+ height: 2px;
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
