Author: simoneg
Date: Fri Mar 12 16:35:32 2010
New Revision: 922322
URL: http://svn.apache.org/viewvc?rev=922322&view=rev
Log:
Fixes inline administration to new HTML structure
Modified:
labs/magma/trunk/website-administration-inline/src/main/java/org/apache/magma/website/admin/InlineMenuProducer.java
labs/magma/trunk/website-administration-inline/src/main/java/org/apache/magma/website/admin/PupupizeMenuElements.aj
labs/magma/trunk/website-administration-inline/src/main/resources/org/apache/magma/website/admin/inlineMenu.js
Modified:
labs/magma/trunk/website-administration-inline/src/main/java/org/apache/magma/website/admin/InlineMenuProducer.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/website-administration-inline/src/main/java/org/apache/magma/website/admin/InlineMenuProducer.java?rev=922322&r1=922321&r2=922322&view=diff
==============================================================================
---
labs/magma/trunk/website-administration-inline/src/main/java/org/apache/magma/website/admin/InlineMenuProducer.java
(original)
+++
labs/magma/trunk/website-administration-inline/src/main/java/org/apache/magma/website/admin/InlineMenuProducer.java
Fri Mar 12 16:35:32 2010
@@ -41,8 +41,8 @@ public class InlineMenuProducer extends
@Override
public void head(Head head) {
head.addJQuery();
- head.addExternalScript("inlineMenu.js");
- head.addCss("inlineMenu.css");
+ head.addExternalScript("magma:/common/admin/inlineMenu.js");
+ head.addCss("magma:/common/admin/inlineMenu.css");
}
@Override
Modified:
labs/magma/trunk/website-administration-inline/src/main/java/org/apache/magma/website/admin/PupupizeMenuElements.aj
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/website-administration-inline/src/main/java/org/apache/magma/website/admin/PupupizeMenuElements.aj?rev=922322&r1=922321&r2=922322&view=diff
==============================================================================
---
labs/magma/trunk/website-administration-inline/src/main/java/org/apache/magma/website/admin/PupupizeMenuElements.aj
(original)
+++
labs/magma/trunk/website-administration-inline/src/main/java/org/apache/magma/website/admin/PupupizeMenuElements.aj
Fri Mar 12 16:35:32 2010
@@ -23,8 +23,8 @@ public aspect PupupizeMenuElements {
after(Head head) : execution(* HtmlProducer.head(Head)) && args(head)
&& this(AdminTopMenuProducer) {
head.addJQuery();
- head.addExternalScript("inlineMenu.js");
- head.addCss("inlineMenu.css");
+ head.addExternalScript("magma:/common/admin/inlineMenu.js");
+ head.addCss("magma:/common/admin/inlineMenu.css");
}
}
Modified:
labs/magma/trunk/website-administration-inline/src/main/resources/org/apache/magma/website/admin/inlineMenu.js
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/website-administration-inline/src/main/resources/org/apache/magma/website/admin/inlineMenu.js?rev=922322&r1=922321&r2=922322&view=diff
==============================================================================
---
labs/magma/trunk/website-administration-inline/src/main/resources/org/apache/magma/website/admin/inlineMenu.js
(original)
+++
labs/magma/trunk/website-administration-inline/src/main/resources/org/apache/magma/website/admin/inlineMenu.js
Fri Mar 12 16:35:32 2010
@@ -17,7 +17,16 @@
function setupInlineMenu() {
$('.MagmaInlineAdminMenu').each(function() {
if (!this.targetDiv) {
+ /* Currenct structure is :
+ * div of generic compund,
+ * div of specific compound,
+ * ul of menu.
+ *
+ * so starting from the ul we need to go up a few times.
+ */
var parent = this.parentNode;
+ parent = parent.parentNode;
+ parent = parent.parentNode;
document.body.appendChild(this);
this.style.zIndex = "400";
var hilite = hiliteBoxFor(parent, this);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
