Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[4349] magnoliamodules/trunk/ openutils-mgnlcontextmenu/src/main/resources
|
From: <luc...@us...> - 2013-09-26 16:23:55
|
Revision: 4349
http://openutils.svn.sourceforge.net/openutils/?rev=4349&view=rev
Author: lucaboati
Date: 2013-09-26 16:23:50 +0000 (Thu, 26 Sep 2013)
Log Message:
-----------
fix textmedia, refactoring addMenu, e sortList
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-form.jsp
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-textmedia.jsp
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/js/contextmenu-addMenu.js
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/js/contextmenu-sortList.js
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-form.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-form.jsp 2013-09-26 16:10:45 UTC (rev 4348)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-form.jsp 2013-09-26 16:23:50 UTC (rev 4349)
@@ -21,6 +21,8 @@
</label>
<div class="col-lg-4">
<input name="firstname" id="firstname" type="text" />
+ <c:set var="desc" value="${contextmenu:entryValue(cmsfn:asJCRNode(content), 'firstname.description')}" />
+ ${desc}
<c:set var="help" value="${contextmenu:entryValue(cmsfn:asJCRNode(content), 'firstname.help')}" />
<c:if test="${not empty help}">
<span class="help">
@@ -35,6 +37,8 @@
</label>
<div class="col-lg-4">
<input name="lastname" id="lastname" type="text" />
+ <c:set var="desc" value="${contextmenu:entryValue(cmsfn:asJCRNode(content), 'lastname.description')}" />
+ ${desc}
<c:set var="help" value="${contextmenu:entryValue(cmsfn:asJCRNode(content), 'lastname.help')}" />
<c:if test="${not empty help}">
<span class="help">
@@ -49,6 +53,8 @@
</label>
<div class="col-lg-4">
<input name="email" id="email" type="text" />
+ <c:set var="desc" value="${contextmenu:entryValue(cmsfn:asJCRNode(content), 'email.description')}" />
+ ${desc}
<c:set var="help" value="${contextmenu:entryValue(cmsfn:asJCRNode(content), 'email.help')}" />
<c:if test="${not empty help}">
<span class="help">
@@ -72,6 +78,8 @@
<option value="1942">1942</option>
<option value="1999">1999</option>
</select>
+ <c:set var="desc" value="${contextmenu:entryValue(cmsfn:asJCRNode(content), 'year.description')}" />
+ ${desc}
<c:set var="help" value="${contextmenu:entryValue(cmsfn:asJCRNode(content), 'year.help')}" />
<c:if test="${not empty help}">
<span class="help">
@@ -86,6 +94,8 @@
</label>
<div class="col-lg-4">
<input name="username" id="username" type="text" />
+ <c:set var="desc" value="${contextmenu:entryValue(cmsfn:asJCRNode(content), 'username.description')}" />
+ ${desc}
<c:set var="help" value="${contextmenu:entryValue(cmsfn:asJCRNode(content), 'username.help')}" />
<c:if test="${not empty help}">
<span class="help">
@@ -100,6 +110,8 @@
</label>
<div class="col-lg-4">
<input name="password" id="password" type="password" />
+ <c:set var="desc" value="${contextmenu:entryValue(cmsfn:asJCRNode(content), 'password.description')}" />
+ ${desc}
<c:set var="help" value="${contextmenu:entryValue(cmsfn:asJCRNode(content), 'password.help')}" />
<c:if test="${not empty help}">
<span class="help">
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-textmedia.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-textmedia.jsp 2013-09-26 16:10:45 UTC (rev 4348)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-textmedia.jsp 2013-09-26 16:23:50 UTC (rev 4349)
@@ -7,13 +7,11 @@
<h3>Text/media sample (jsp)</h3>
<p>Right click to edit text or media</p>
<pre>
- <![CDATA[<contextmenu:element menu="textmedia" name="media" >${'$'}{cmsfn:decode(content).text}</contextmenu:element>]]>
+ <![CDATA[<contextmenu:element menu="textmedia" name="text" >${'$'}{cmsfn:decode(content).text}</contextmenu:element>]]>
</pre>
<div class="testcontent">
<div style="float: left; margin-right: 10px;">
- <contextmenu:element menu="textmedia" name="media" wrapper="div">
- <media:media item="${content.media}" width="320" height="240" />
- </contextmenu:element>
+ <media:media item="${node.media}" width="60" height="60" />
</div>
<contextmenu:element menu="textmedia" name="text" wrapper="div">${cmsfn:decode(content).text}
</contextmenu:element>
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/js/contextmenu-addMenu.js
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/js/contextmenu-addMenu.js 2013-09-26 16:10:45 UTC (rev 4348)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/js/contextmenu-addMenu.js 2013-09-26 16:23:50 UTC (rev 4349)
@@ -21,68 +21,53 @@
});
jQuery.each(mgnlEditMessages, function(id, info){
+ var menu;
+ var menuName = info.contextMenu || 'default';
+ jQuery.each(mgnlContextMenuInfo.menus, function(){
+ if (this.name == menuName) {
+ menu = this;
+ }
+ });
+
var initTrigger = function(trigger){
- $(trigger).contextMenu({
+ jQuery(trigger).contextMenu({
menu: 'contextmenu-' + (info.contextMenu || 'default'),
showCallback: info.showCallback
- }, function(action) {
- switch (action){
- case 'default':
- case 'text':
- case 'header':
- mgnlOpenDialogEx(info.path,null,null,null,'website','.magnolia/dialogs/contextmenu-edit.html',null,null,null,{
- entryName: info.key
- });
- break;
- case 'fckText':
- mgnlOpenDialogEx(info.path,null,null,null,'website','.magnolia/dialogs/contextmenu-fckEdit.html',null,null,null,{
- entryName: info.key,
- enterMode: info.enterMode
- });
- break;
- case 'label':
- mgnlOpenDialogEx(info.path,null,null,null,'website','.magnolia/dialogs/contextmenu-edit.html',null,null,null,{
- entryName: info.key
- });
- break;
- case 'description':
- mgnlOpenDialogEx(info.path,null,null,null,'website','.magnolia/dialogs/contextmenu-edit.html',null,null,null,{
- entryName: info.key + '.description'
- });
- break;
- case 'media':
- mgnlOpenDialogEx(info.path,null,null,null,'website','.magnolia/dialogs/contextmenu-media.html',null,null,null,{
- entryName: info.key
- });
- break;
- case 'textmedia':
- // TO BE FIX
- mgnlOpenDialogEx(info.path,null,null,null,'website','.magnolia/dialogs/samples-contextmenu-textmedia.html',null,null,null,{
- entryName: info.key
- });
- break;
- case 'help':
- mgnlOpenDialogEx(info.path,null,null,null,'website','.magnolia/dialogs/contextmenu-fckEdit.html',null,null,null,{
- entryName: info.key + '.help',
- enterMode: 'br'
- });
- break;
- case 'info':
- mgnlOpenDialogEx(info.path,null,null,null,'website','.magnolia/dialogs/contextmenu-fckEdit.html',null,null,null,{
- entryName: info.key + '.info',
- enterMode: info.enterMode || 'br'
- });
- break;
+ }, function(itemName) {
+ switch (itemName){
case 'move':
el.parents('.control-group:first').trigger('drag');
- break;
-
+ return;
}
+
+ var entryName = info.entryName || '';
+ if (itemName && itemName != 'default'){
+ if (entryName) {
+ entryName += '.';
+ }
+ entryName += itemName;
+ }
+ var menuItem;
+ jQuery.each(menu.items, function(){
+ if (this.name == itemName)
+ {
+ menuItem = this;
+ }
+ });
+ mgnlOpenDialogEx(info.path,null,null,null,'website','.magnolia/dialogs/contextmenu-' + menuItem.controlType + '.html',null,null,null,{
+ entryName: entryName,
+ globalEnabled: menuItem.globalEnabled,
+ enterMode: info.enterMode
+ });
+
});
};
+
var el = jQuery('#' + id);
- initTrigger(info.parentTrigger ? el.parents(info.parentTrigger + ':first') : el);
+ var trigger = info.parentTrigger ? el.parents(info.parentTrigger + ':first') : el;
+ initTrigger(trigger);
el.data("initTrigger", initTrigger);
+
});
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/js/contextmenu-sortList.js
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/js/contextmenu-sortList.js 2013-09-26 16:10:45 UTC (rev 4348)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/js/contextmenu-sortList.js 2013-09-26 16:23:50 UTC (rev 4349)
@@ -12,12 +12,12 @@
$ol.find('> .control-group').each(function(i, el){
if (el.nodeType === 1){
drags.push(el);
- var li = $('<div class="control-drop"></div>');
- $(el).before(li);
+ var li = jQuery('<div class="control-drop"></div>');
+ jQuery(el).before(li);
drops.push(li[0]);
}
});
- var li = $('<div class="control-group"></div>');
+ var li = jQuery('<div class="control-group"></div>');
$ol.append(li);
drops.push(li[0]);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
