Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[4319] magnoliamodules/trunk/ openutils-mgnlcontextmenu/src/main
|
From: <fg...@us...> - 2013-09-18 11:01:54
|
Revision: 4319
http://openutils.svn.sourceforge.net/openutils/?rev=4319&view=rev
Author: fgiust
Date: 2013-09-18 11:01:51 +0000 (Wed, 18 Sep 2013)
Log Message:
-----------
styles
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/website.sample-contextmenu.xml
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/css/jquery.contextMenu.css
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java 2013-09-18 08:48:42 UTC (rev 4318)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java 2013-09-18 11:01:51 UTC (rev 4319)
@@ -23,6 +23,7 @@
import info.magnolia.context.MgnlContext;
import info.magnolia.context.WebContext;
import info.magnolia.jcr.util.NodeUtil;
+import info.magnolia.jcr.util.PropertyUtil;
import info.magnolia.jcr.wrapper.HTMLEscapingNodeWrapper;
import info.magnolia.objectfactory.Components;
@@ -79,9 +80,11 @@
{
ContextMenuModule module = Components.getComponent(ContextMenuModule.class);
PersistenceStrategy strategy = module.getPersistenceStrategy();
- // LB crazy command! mgnl argsss
Node nodeUnwrapped = NodeUtil.deepUnwrap(node, HTMLEscapingNodeWrapper.class);
- return strategy != null ? strategy.readEntry(nodeUnwrapped, name) : null;
+
+ String result = strategy != null ? strategy.readEntry(nodeUnwrapped, name) : null;
+
+ return result;
}
public static String scripts()
@@ -104,16 +107,16 @@
out.append("<link rel=\"stylesheet\" type=\"text/css\" href=\""
+ ctx
+ "/.resources/contextmenu/css/jquery.contextMenu.css\" media=\"screen\" />\n");
-// out.append("<link rel=\"stylesheet\" type=\"text/css\" href=\""
-// + ctx
-// + "/.resources/contextmenu/css/contextmenu.css\" media=\"screen\" />\n");
-// out.append("<script src=\"" + ctx + "/.resources/contextmenu/js/contextmenu-jquery.js\"></script>\n");
+ // out.append("<link rel=\"stylesheet\" type=\"text/css\" href=\""
+ // + ctx
+ // + "/.resources/contextmenu/css/contextmenu.css\" media=\"screen\" />\n");
+ // out.append("<script src=\"" + ctx + "/.resources/contextmenu/js/contextmenu-jquery.js\"></script>\n");
out.append("<script src=\"" + ctx + "/.resources/contextmenu/js/mgnladmin-custom.js\"></script>\n");
out.append("<script src=\"" + ctx + "/.resources/contextmenu/js/jquery.contextMenu.js\"></script>\n");
out.append("<script src=\"" + ctx + "/.resources/contextmenu/js/contextmenu-addMenu.js\"></script>\n");
-// if(mgnlSortLists != null){
+ // if(mgnlSortLists != null){
out.append("<script src=\"" + ctx + "/.resources/contextmenu/js/contextmenu-sortList.js\"></script>\n");
-// }
+ // }
out.append("<!-- end contextmenu:links -->\n");
}
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/website.sample-contextmenu.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/website.sample-contextmenu.xml 2013-09-18 08:48:42 UTC (rev 4318)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/website.sample-contextmenu.xml 2013-09-18 11:01:51 UTC (rev 4319)
@@ -29,7 +29,7 @@
<sv:value>2010-05-18T14:33:10.812+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2013-09-17T00:12:45.280+02:00</sv:value>
+ <sv:value>2013-09-18T12:52:41.534+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:template" sv:type="String">
<sv:value>contextmenu:pages/contextmenu-template-jsp</sv:value>
@@ -62,7 +62,7 @@
<sv:value>2010-05-18T16:43:29.812+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2013-09-17T00:12:45.280+02:00</sv:value>
+ <sv:value>2013-09-18T12:52:41.534+02:00</sv:value>
</sv:property>
</sv:node>
<sv:node sv:name="0">
@@ -270,7 +270,7 @@
<sv:value>admin</sv:value>
</sv:property>
<sv:property sv:name="message" sv:type="String">
- <sv:value>Right click here to edit a</sv:value>
+ <sv:value>Right click here to edit</sv:value>
</sv:property>
<sv:node sv:name="MetaData">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
@@ -286,7 +286,7 @@
<sv:value>2013-09-15T20:41:06.907+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2013-09-17T00:09:46.142+02:00</sv:value>
+ <sv:value>2013-09-18T12:38:34.813+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:template" sv:type="String">
<sv:value>contextmenu:components/samples-contextmenu-message-freemarker</sv:value>
@@ -366,14 +366,14 @@
<sv:value>f9c61bcf-32de-45c2-8ceb-1435e1411060</sv:value>
</sv:property>
<sv:property sv:name="firstname" sv:type="String">
- <sv:value>label</sv:value>
+ <sv:value>First Name:</sv:value>
</sv:property>
+ <sv:property sv:name="firstname.help" sv:type="String">
+ <sv:value><p>help!</p></sv:value>
+ </sv:property>
<sv:property sv:name="jcr:createdBy" sv:type="String">
<sv:value>admin</sv:value>
</sv:property>
- <sv:property sv:name="lastname.help" sv:type="String">
- <sv:value><p>luca</p></sv:value>
- </sv:property>
<sv:node sv:name="MetaData">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:metaData</sv:value>
@@ -388,7 +388,7 @@
<sv:value>2013-09-13T18:56:07.081+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2013-09-13T19:00:55.111+02:00</sv:value>
+ <sv:value>2013-09-18T12:52:41.533+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:template" sv:type="String">
<sv:value>contextmenu:components/samples-contextmenu-form</sv:value>
@@ -412,14 +412,14 @@
<sv:value>1,0</sv:value>
</sv:property>
<sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>superuser</sv:value>
+ <sv:value>admin</sv:value>
</sv:property>
<sv:node sv:name="MetaData">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:metaData</sv:value>
</sv:property>
<sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>superuser</sv:value>
+ <sv:value>admin</sv:value>
</sv:property>
<sv:property sv:name="mgnl:authorid" sv:type="String">
<sv:value>superuser</sv:value>
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/css/jquery.contextMenu.css
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/css/jquery.contextMenu.css 2013-09-18 08:48:42 UTC (rev 4318)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/css/jquery.contextMenu.css 2013-09-18 11:01:51 UTC (rev 4319)
@@ -1,79 +1,126 @@
/* Generic context menu styles */
.contextMenu {
- position: absolute;
- width: 150px;
- z-index: 99999;
- border: solid 1px #CCC;
- background: #EEE;
- padding: 0px;
- margin: 0px;
- display: none;
+ position: absolute;
+ width: 150px;
+ z-index: 99999;
+ border: solid 1px #CCC;
+ background: #EEE;
+ padding: 0px;
+ margin: 0px;
+ display: none;
}
-.contextMenu LI {
- list-style: none;
- padding: 0px;
- margin: 0px;
+.contextMenu li {
+ list-style: none;
+ padding: 0px;
+ margin: 0px;
}
-.contextMenu A {
- color: #333;
- text-decoration: none;
- display: block;
- line-height: 20px;
- height: 20px;
- background-position: 6px center;
- background-repeat: no-repeat;
- outline: none;
- padding: 1px 5px;
- padding-left: 28px;
+.contextMenu a {
+ color: #333;
+ text-decoration: none;
+ display: block;
+ line-height: 20px;
+ height: 20px;
+ background-position: 6px center;
+ background-repeat: no-repeat;
+ outline: none;
+ padding: 1px 5px;
+ padding-left: 28px;
+ font-family: arial, helvetica, sans-serif;
+ font-size: 12px;
}
-.contextMenu LI.hover A {
- color: #FFF;
- background-color: #3399FF;
+.contextMenu LI.hover a {
+ color: #FFF;
+ background-color: #3399FF;
}
-.contextMenu LI.disabled A {
- color: #AAA;
- cursor: default;
+.contextMenu LI.disabled a {
+ color: #AAA;
+ cursor: default;
}
-.contextMenu LI.hover.disabled A {
- background-color: transparent;
+.contextMenu LI.hover.disabled a {
+ background-color: transparent;
}
.contextMenu LI.separator {
- border-top: solid 1px #CCC;
+ border-top: solid 1px #CCC;
}
-.contextMenu LI.menuText A { background-image: url(images/menu-text.png); }
-.contextMenu LI.menuHelp A { background-image: url(images/menu-help.png); }
-.contextMenu LI.menuMove A { background-image: url(images/menu-move.gif); }
+.contextMenu li.menuText a {
+ background-image: url(images/menu-text.png);
+}
-.contextMenu LI.menuLabel A { background-image: url(images/menu-label.png); }
-.contextMenu LI.menuDescription A { background-image: url(images/menu-description.png); }
-.contextMenu LI.menuMedia A { background-image: url(images/menu-media.png); }
-.contextMenu LI.menuInfo A { background-image: url(images/menu-info.png); }
-.contextMenu LI.menuValidation A { background-image: url(images/menu-validation.gif); }
-.contextMenu LI.menuHeader A { background-image: url(images/menu-header.png); }
-.contextMenu LI.menuScTrackAction A { background-image: url(images/power_off.png); }
-.contextMenu LI.menuScTrackAction A.scTrackOn { background-image: url(images/power_on.png); }
+.contextMenu li.menuHelp a {
+ background-image: url(images/menu-help.png);
+}
+.contextMenu li.menuMove a {
+ background-image: url(images/menu-move.gif);
+}
+.contextMenu li.menuLabel a {
+ background-image: url(images/menu-label.png);
+}
+
+.contextMenu li.menuDescription a {
+ background-image: url(images/menu-description.png);
+}
+
+.contextMenu li.menuMedia a {
+ background-image: url(images/menu-media.png);
+}
+
+.contextMenu li.menuInfo a {
+ background-image: url(images/menu-info.png);
+}
+
+.contextMenu li.menuValidation a {
+ background-image: url(images/menu-validation.gif);
+}
+
+.contextMenu li.menuHeader a {
+ background-image: url(images/menu-header.png);
+}
+
+.contextMenu li.menuScTrackAction a {
+ background-image: url(images/power_off.png);
+}
+
+.contextMenu li.menuScTrackAction a.scTrackOn {
+ background-image: url(images/power_on.png);
+}
+
.sort-list .drop {
display: none;
margin: 0;
padding: 0;
}
-.move .drop {
+.move .dropXX {
display: block;
height: 8px;
border: 1px solid #666;
background-color: #CCC;
- -webkit-border-radius: 4px;
- -moz-border-radius: 4px;
- border-radius: 4px;
cursor: pointer;
+}
+
+.move .drop {
+ margin: 2px 0;
+ height: 12px;
+ display: block;
+ font-size: 12px;
+ color: #ffffff;
+ text-align: center;
+ background-color: #5cb85c;
+ -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+ box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+ -webkit-transition: width 0.6s ease;
+ transition: width 0.6s ease;
+ -webkit-border-radius: 2px;
+ -moz-border-radius: 2px;
+ border-radius: 2px;
+ cursor: pointer;
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
