Changeset 1781

Timestamp:

22.12.2011 22:22:01 (5 months ago)

Author:

zmsdev

Message:

applied fix for double-click in zmi: open properties-form (requested by desy).

Location:

ZMS/trunk

Files:

• dtml/ZMSContainerObject/manage_main.dtml (modified) (2 diffs)
• plugins/www/jquery/jquery-all.min.js (modified) (1 diff)
• plugins/www/jquery/plugin/jquery.plugin.extensions.js (modified) (1 diff)

ZMS/trunk/dtml/ZMSContainerObject/manage_main.dtml

@@ -88 +88 @@
 </dtml-comment>
 <td class="zmiContainerColCenter zmiNeutralColorWhite">
- <div class="zmiRenderShort">
+ <div class="zmiRenderShort"><div class="contentEditable" id="contentEditable_<dtml-var id>_<dtml-var lang>">
   <dtml-let img="getObjProperty('titleimage',REQUEST)">
    <dtml-if img>
@@ -110 +110 @@
    <p class="form-element"><dtml-var "getZMILangStr('MSG_EMPTYCONTAINER')"> <dtml-var "display_type(REQUEST)"> <em><dtml-var "getTitlealt(REQUEST)" html_quote></em>!</p>
   </dtml-unless>
- </div>
+ </div><!-- .contentEditable --></div><!-- .zmiRenderShort -->
 </td>
 

ZMS/trunk/plugins/www/jquery/jquery-all.min.js

@@ -37 +37 @@
 pid=pid.substr(pid.indexOf('_')+1);if(pid.substr(pid.length-('_'+lang).length)==('_'+lang)){pid=pid.substr(0,pid.length-('_'+lang).length)}
 if(!href.endsWith('/'+pid)){href+='/'+pid}}}
-href+='/manage_main';if(self.location.href.indexOf('/manage_translate')>0){href+='_iframe';href+='?lang='+lang;href+='&ZMS_NO_BODY=1';zmiIframe(href,{},{})}
+if(self.location.href.indexOf(href+'/manage_main')==0){href+='/manage_properties'}
+else {href+='/manage_main'}
+if(self.location.href.indexOf('/manage_translate')>0){href+='_iframe';href+='?lang='+lang;href+='&ZMS_NO_BODY=1';zmiIframe(href,{},{})}
 else if(self.location.href.indexOf('/manage')>0){self.location.href=href}
 else {href+='_iframe';href+='?lang='+lang;showFancybox({'autoDimensions':false,'hideOnOverlayClick':false,'href':href,'transitionIn':'fade','transitionOut':'fade','type':'iframe','width':819

ZMS/trunk/plugins/www/jquery/plugin/jquery.plugin.extensions.js

@@ -87 +87 @@
                                         }
                                 }
-                                href += '/manage_main';
+                                if (self.location.href.indexOf(href+'/manage_main')==0) {
+                                        href += '/manage_properties';
+                                }
+                                else {
+                                        href += '/manage_main';
+                                }
                                 if (self.location.href.indexOf('/manage_translate')>0) {
                                         href += '_iframe';