You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@labs.apache.org by si...@apache.org on 2008/10/20 18:25:46 UTC
svn commit: r706328 - in
/labs/magma/trunk/website-administration-inline/src/main:
java/org/apache/magma/website/admin/
resources/org/apache/magma/website/admin/
Author: simoneg
Date: Mon Oct 20 09:25:45 2008
New Revision: 706328
URL: http://svn.apache.org/viewvc?rev=706328&view=rev
Log:
Inline administration now in its own template, and better fit with page below.
Added:
labs/magma/trunk/website-administration-inline/src/main/java/org/apache/magma/website/admin/InlinedAdminTemplate.java
labs/magma/trunk/website-administration-inline/src/main/java/org/apache/magma/website/admin/UseInlinedAdminTemplate.aj
labs/magma/trunk/website-administration-inline/src/main/resources/org/apache/magma/website/admin/inlinedAdminTemplate.css
labs/magma/trunk/website-administration-inline/src/main/resources/org/apache/magma/website/admin/inlinedAdminTemplate.html
Modified:
labs/magma/trunk/website-administration-inline/src/main/java/org/apache/magma/website/admin/AddInlineMenuMethod.aj
labs/magma/trunk/website-administration-inline/src/main/java/org/apache/magma/website/admin/AddMenuToDefaultTemplate.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/AddInlineMenuMethod.aj
URL: http://svn.apache.org/viewvc/labs/magma/trunk/website-administration-inline/src/main/java/org/apache/magma/website/admin/AddInlineMenuMethod.aj?rev=706328&r1=706327&r2=706328&view=diff
==============================================================================
--- labs/magma/trunk/website-administration-inline/src/main/java/org/apache/magma/website/admin/AddInlineMenuMethod.aj (original)
+++ labs/magma/trunk/website-administration-inline/src/main/java/org/apache/magma/website/admin/AddInlineMenuMethod.aj Mon Oct 20 09:25:45 2008
@@ -4,6 +4,7 @@
import org.apache.magma.website.admin.AdminWebHandler;
import java.util.Map;
import org.apache.magma.website.HtmlProducer;
+import org.apache.magma.website.RootWebHandler;
public aspect AddInlineMenuMethod {
@@ -11,4 +12,12 @@
return new InlineMenuProducer(founds);
}
+ public AdminWebHandler RootWebHandler.handleInlineAdministration() {
+ AdminWebHandler ret = new AdminWebHandler();
+ ret.inlined = true;
+ return ret;
+ }
+
+ public boolean AdminWebHandler.inlined = false;
+
}
Modified: labs/magma/trunk/website-administration-inline/src/main/java/org/apache/magma/website/admin/AddMenuToDefaultTemplate.aj
URL: http://svn.apache.org/viewvc/labs/magma/trunk/website-administration-inline/src/main/java/org/apache/magma/website/admin/AddMenuToDefaultTemplate.aj?rev=706328&r1=706327&r2=706328&view=diff
==============================================================================
--- labs/magma/trunk/website-administration-inline/src/main/java/org/apache/magma/website/admin/AddMenuToDefaultTemplate.aj (original)
+++ labs/magma/trunk/website-administration-inline/src/main/java/org/apache/magma/website/admin/AddMenuToDefaultTemplate.aj Mon Oct 20 09:25:45 2008
@@ -6,7 +6,7 @@
public privileged aspect AddMenuToDefaultTemplate {
after(Template tpl) :
- execution(void DefaultTemplate.layoutFooter())
+ execution(void DefaultTemplate.layoutFooter()) && within(DefaultTemplate)
&& this(tpl)
&& if(AdminWebHandler.isAdministrator()) {
tpl.always(tpl.root().handleAdministration().doMenu());
Added: labs/magma/trunk/website-administration-inline/src/main/java/org/apache/magma/website/admin/InlinedAdminTemplate.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/website-administration-inline/src/main/java/org/apache/magma/website/admin/InlinedAdminTemplate.java?rev=706328&view=auto
==============================================================================
--- labs/magma/trunk/website-administration-inline/src/main/java/org/apache/magma/website/admin/InlinedAdminTemplate.java (added)
+++ labs/magma/trunk/website-administration-inline/src/main/java/org/apache/magma/website/admin/InlinedAdminTemplate.java Mon Oct 20 09:25:45 2008
@@ -0,0 +1,9 @@
+package org.apache.magma.website.admin;
+
+public class InlinedAdminTemplate extends AdminTemplate {
+
+ public InlinedAdminTemplate() {
+ super.fileName = "inlinedAdminTemplate.html";
+ }
+
+}
Added: labs/magma/trunk/website-administration-inline/src/main/java/org/apache/magma/website/admin/UseInlinedAdminTemplate.aj
URL: http://svn.apache.org/viewvc/labs/magma/trunk/website-administration-inline/src/main/java/org/apache/magma/website/admin/UseInlinedAdminTemplate.aj?rev=706328&view=auto
==============================================================================
--- labs/magma/trunk/website-administration-inline/src/main/java/org/apache/magma/website/admin/UseInlinedAdminTemplate.aj (added)
+++ labs/magma/trunk/website-administration-inline/src/main/java/org/apache/magma/website/admin/UseInlinedAdminTemplate.aj Mon Oct 20 09:25:45 2008
@@ -0,0 +1,18 @@
+package org.apache.magma.website.admin;
+
+import org.apache.magma.website.Templatable;
+import org.apache.magma.website.WebHandler;
+import org.apache.magma.website.HandlerSetup;
+
+public aspect UseInlinedAdminTemplate {
+
+ declare precedence : UseInlinedAdminTemplate, UseAdminTemplate;
+
+ after(WebHandler h) returning (Templatable t) : execution(* AdminWebHandler+.*(..)) && (HandlerSetup.doMethod(h) || HandlerSetup.subHandle(h) || HandlerSetup.hiddenMethod(h)) {
+ if (t == null) return;
+ if (h instanceof AdminWebHandler && ((AdminWebHandler)h).inlined) {
+ t.setTemplate(new InlinedAdminTemplate());
+ }
+ }
+
+}
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=706328&r1=706327&r2=706328&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 Mon Oct 20 09:25:45 2008
@@ -73,6 +73,11 @@
menu.onmouseover = function() { display(menu) };
+ var links = menu.getElementsByTagName("a");
+ for (var i = 0; i < links.length; i++) {
+ links[i].onclick = function() { popup(this.href, div); return false; };
+ }
+
return hilite;
}
@@ -96,4 +101,45 @@
div.style.display = 'block';
}
+function popup(href, reference) {
+ var state = '';
+ var pos = findPos(reference);
+ var width = reference.offsetWidth + 250;
+ if (width < 700) width = 700;
+ var height = reference.offsetHeight + 120;
+ if (height < 600) height = 600;
+ state += 'width=' + width + ',';
+ state += 'height=' + height + ',';
+
+ var left = pos[0];
+ var top = pos[1];
+ var top = top - (document.all)?document.body.scrollTop:window.pageYOffset;
+
+ if (top < 0) top = 0;
+ if (left < 0) left = 0;
+
+ if (height > screen.height) height = screen.height;
+ if (width > screen.width) width = screen.width;
+
+ if (top + height > screen.height) top = screen.height - height;
+ if (left + width > screen.width) left = screen.height - height;
+
+ state += 'left=' + left + ',';
+ state += 'top=' + top + ',';
+ state += 'directories=no,location=no,menubar=no,resizable=yes,scrollbars=yes,status=yes,toolbar=no';
+ if (href.indexOf('inlineAdministration') == -1) {
+ href = href.replace('/administration/','/inlineAdministration/');
+ }
+ var inlw = window.open(href,'adminEdit', state);
+ inlw.timer = setInterval(
+ function() {
+ if (inlw.closed) {
+ document.location.reload();
+ clearInterval(inlw.timer);
+ inlw = null;
+ }
+ }, 100);
+
+}
+
addOnload(setupInlineMenu);
\ No newline at end of file
Added: labs/magma/trunk/website-administration-inline/src/main/resources/org/apache/magma/website/admin/inlinedAdminTemplate.css
URL: http://svn.apache.org/viewvc/labs/magma/trunk/website-administration-inline/src/main/resources/org/apache/magma/website/admin/inlinedAdminTemplate.css?rev=706328&view=auto
==============================================================================
--- labs/magma/trunk/website-administration-inline/src/main/resources/org/apache/magma/website/admin/inlinedAdminTemplate.css (added)
+++ labs/magma/trunk/website-administration-inline/src/main/resources/org/apache/magma/website/admin/inlinedAdminTemplate.css Mon Oct 20 09:25:45 2008
@@ -0,0 +1,41 @@
+* {
+ font-family: Arial, sans-serif;
+}
+
+h1 {
+ font-size: 16px;
+ margin: 0px;
+ padding: 0px;
+ border-bottom: 1px dashed #CCCCCC;
+}
+
+#zoneMain {
+ width: 100%;
+}
+
+#zoneMain div.mainContent {
+ width: auto;
+ border: 1px solid gray;
+ padding: 3px;
+}
+
+#zoneRight {
+ border: 1px solid gray;
+ padding: 5px;
+ background:#eaf0f2;
+}
+
+#MagmaAdminSideMenu {
+ float: left;
+}
+
+
+
+#closeInlineAdminWindow {
+ background: red;
+ display: block;
+ float: right;
+ border: 1px solid gray;
+ color: black;
+ font-weight: bold;
+}
Added: labs/magma/trunk/website-administration-inline/src/main/resources/org/apache/magma/website/admin/inlinedAdminTemplate.html
URL: http://svn.apache.org/viewvc/labs/magma/trunk/website-administration-inline/src/main/resources/org/apache/magma/website/admin/inlinedAdminTemplate.html?rev=706328&view=auto
==============================================================================
--- labs/magma/trunk/website-administration-inline/src/main/resources/org/apache/magma/website/admin/inlinedAdminTemplate.html (added)
+++ labs/magma/trunk/website-administration-inline/src/main/resources/org/apache/magma/website/admin/inlinedAdminTemplate.html Mon Oct 20 09:25:45 2008
@@ -0,0 +1,9 @@
+<html>
+ <head>
+ <link rel="stylesheet" href="inlinedAdminTemplate.css" type="text/css"/>
+ </head>
+ <body>
+ <div id="zoneMain"></div>
+ <div id="zoneRight"></div>
+ </body>
+</html>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org