svn commit: r1566564 [12/12] - in /ofbiz/branches/release13.07: ./ applications/humanres/widget/ applications/product/webapp/catalog/WEB-INF/ applications/product/webapp/catalog/imagemanagement/ applications/product/webapp/catalog/imagemanagement/js/ a...

Modified: ofbiz/branches/release13.07/framework/widget/dtd/widget-screen.xsd
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/framework/widget/dtd/widget-screen.xsd?rev=1566564&r1=1566563&r2=1566564&view=diff
==============================================================================
--- ofbiz/branches/release13.07/framework/widget/dtd/widget-screen.xsd (original)
+++ ofbiz/branches/release13.07/framework/widget/dtd/widget-screen.xsd Mon Feb 10 10:20:07 2014
@@ -789,7 +789,11 @@ under the License.
                     <xs:restriction base="xs:token">
                         <xs:enumeration value="auto">
                             <xs:annotation>
-                                <xs:documentation>If selected the hidden-form type will be used if the url-mode is intra-app and the request specified has an event, otherwise the anchor type will be used.</xs:documentation>
+                                <xs:documentation>
+                                    If selected the hidden-form type will be used if the url-mode is intra-app
+                                    and the request specified has an event, otherwise the anchor type will be used,
+                                    except if the ajax-window mode is specified.
+                                </xs:documentation>
                             </xs:annotation>
                         </xs:enumeration>
                         <xs:enumeration value="anchor" />

Modified: ofbiz/branches/release13.07/framework/widget/templates/htmlScreenMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/framework/widget/templates/htmlScreenMacroLibrary.ftl?rev=1566564&r1=1566563&r2=1566564&view=diff
==============================================================================
--- ofbiz/branches/release13.07/framework/widget/templates/htmlScreenMacroLibrary.ftl (original)
+++ ofbiz/branches/release13.07/framework/widget/templates/htmlScreenMacroLibrary.ftl Mon Feb 10 10:20:07 2014
@@ -91,52 +91,60 @@ under the License.
 </#macro>
 
 <#macro renderLink parameterList targetWindow target uniqueItemName linkType actionUrl id style name height width linkUrl text imgStr>
-<#if "ajax-window" != linkType>
-<#if "hidden-form" == linkType>
-<form method="post" action="${actionUrl}" <#if targetWindow?has_content>target="${targetWindow}"</#if> onsubmit="javascript:submitFormDisableSubmits(this)" name="${uniqueItemName}"><#rt/>
-<#list parameterList as parameter>
-<input name="${parameter.name}" value="${parameter.value}" type="hidden"/><#rt/>
-</#list>
-</form><#rt/>
-</#if>
-<a <#if id?has_content>id="${id}"</#if> <#if style?has_content>class="${style}"</#if> <#if name?has_content>name="${name}"</#if> <#if targetWindow?has_content>target="${targetWindow}"</#if> href="<#if "hidden-form"==linkType>javascript:document.${uniqueItemName}.submit()<#else>${linkUrl}</#if>"><#rt/>
-<#if imgStr?has_content>${imgStr}</#if><#if text?has_content>${text}</#if></a>
-<#else>
-<div id="${uniqueItemName}"></div>
-
-<a href="javascript:void(0);" id="${uniqueItemName}_link" <#if style?has_content>class="${style}"</#if>><#if text?has_content>${text}</#if></a>
-<script type="text/javascript">
-    function getRequestData () {
-        var data =  {
-            <#list parameterList as parameter>
-                "${parameter.name}": "${parameter.value}",
-            </#list>
-            "presentation": "layer"
-        };
-
-        return data;
-    }
-    jQuery("#${uniqueItemName}_link").click( function () {
-        jQuery("#${uniqueItemName}").dialog("open");
-    });
-    jQuery("#${uniqueItemName}").dialog({
-         autoOpen: false,
-         <#if text?has_content>title: "${text}",</#if>
-         height: ${height},
-         width: ${width},
-         modal: true,
-         open: function() {
-                 jQuery.ajax({
-                     url: "${target}",
-                     type: "POST",
-                     data: getRequestData(),
-                     success: function(data) {jQuery("#${uniqueItemName}").html(data);}
-                 });
-         }
-    });
-</script>
-</#if>
+    <#if "ajax-window" != linkType>
+        <#if "hidden-form" == linkType>
+            <form method="post" action="${actionUrl}" <#if targetWindow?has_content>target="${targetWindow}"</#if> onsubmit="javascript:submitFormDisableSubmits(this)" name="${uniqueItemName}"><#rt/>
+                <#list parameterList as parameter>
+                <input name="${parameter.name}" value="${parameter.value}" type="hidden"/><#rt/>
+                </#list>
+            </form><#rt/>
+        </#if>
+        <a
+            <#if id?has_content>id="${id}"</#if>
+            <#if style?has_content>class="${style}"</#if>
+            <#if name?has_content>name="${name}"</#if>
+            <#if targetWindow?has_content>target="${targetWindow}"</#if>
+            href="<#if "hidden-form"==linkType>javascript:document.${uniqueItemName}.submit()<#else>${linkUrl}</#if>"><#rt/>
+            <#if imgStr?has_content>${imgStr}</#if><#if text?has_content>${text}</#if>
+        </a>
+    <#else>
+        <div id="${uniqueItemName}"></div>
+        <a href="javascript:void(0);" id="${uniqueItemName}_link"
+        <#if style?has_content>class="${style}"</#if>>
+        <#if text?has_content>${text}</#if></a>
+        <script type="text/javascript">
+            function getRequestData () {
+                var data =  {
+                    <#list parameterList as parameter>
+                        "${parameter.name}": "${parameter.value}",
+                    </#list>
+                    "presentation": "layer"
+                };
+        
+                return data;
+            }
+            jQuery("#${uniqueItemName}_link").click( function () {
+                jQuery("#${uniqueItemName}").dialog("open");
+            });
+            jQuery("#${uniqueItemName}").dialog({
+                 autoOpen: false,
+                 <#if text?has_content>title: "${text}",</#if>
+                 height: ${height},
+                 width: ${width},
+                 modal: true,
+                 open: function() {
+                         jQuery.ajax({
+                             url: "${target}",
+                             type: "POST",
+                             data: getRequestData(),
+                             success: function(data) {jQuery("#${uniqueItemName}").html(data);}
+                         });
+                 }
+            });
+        </script>
+    </#if>
 </#macro>
+
 <#macro renderImage src id style wid hgt border alt urlString>
 <#if src?has_content>
 <img <#if id?has_content>id="${id}"</#if><#if style?has_content> class="${style}"</#if><#if wid?has_content> width="${wid}"</#if><#if hgt?has_content> height="${hgt}"</#if><#if border?has_content> border="${border}"</#if> alt="<#if alt?has_content>${alt}</#if>" src="${urlString}" />

Modified: ofbiz/branches/release13.07/themes/flatgrey/webapp/flatgrey/javascript.css
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/themes/flatgrey/webapp/flatgrey/javascript.css?rev=1566564&r1=1566563&r2=1566564&view=diff
==============================================================================
--- ofbiz/branches/release13.07/themes/flatgrey/webapp/flatgrey/javascript.css (original)
+++ ofbiz/branches/release13.07/themes/flatgrey/webapp/flatgrey/javascript.css Mon Feb 10 10:20:07 2014
@@ -219,11 +219,11 @@ button.ui-button::-moz-focus-inner { bor
     left: -4px; /*must have*/
     width: 200px; /*must have*/
     height: 200px; /*must have*/
-}.ui-dialog { position: absolute; padding: .2em; width: 300px; overflow: hidden; }
-.ui-dialog .ui-dialog-titlebar { padding: .4em 1em; position: relative;  }
+}.ui-dialog { position: absolute; top: 0; left: 0; padding; padding: .2em; width: 300px; overflow: hidden; }
+.ui-dialog .ui-dialog-titlebar { padding: .4em 1em;  height: 16px; position: relative;}
 .ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .1em 0; }
 .ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
-.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
+/*.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }*/
 .ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
 .ui-dialog .ui-dialog-content { position: relative; border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
 .ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; }
@@ -277,8 +277,8 @@ button.ui-button::-moz-focus-inner { bor
 /* TR overrides */
 span.ui-spinner { background: none; }
 .ui-spinner .ui-icon-triangle-1-s {
- /* need to fix icons sprite */
- background-position:-65px -16px;
+  /* need to fix icons sprite */
+  background-position:-65px -16px;
 }
 .ui-tabs { position: relative; padding: .2em; zoom: 1; } /* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
 .ui-tabs .ui-tabs-nav { margin: 0; padding: .2em .2em 0; }
@@ -289,17 +289,17 @@ span.ui-spinner { background: none; }
 .ui-tabs .ui-tabs-nav li a, .ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
 .ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em; background: none; }
 .ui-tooltip {
- padding:8px;
- position:absolute;
- z-index:9999;
- -o-box-shadow: 0 0 5px #aaa;
- -moz-box-shadow: 0 0 5px #aaa;
- -webkit-box-shadow: 0 0 5px #aaa;
- box-shadow: 0 0 5px #aaa;
+  padding:8px;
+  position:absolute;
+  z-index:9999;
+  -o-box-shadow: 0 0 5px #aaa;
+  -moz-box-shadow: 0 0 5px #aaa;
+  -webkit-box-shadow: 0 0 5px #aaa;
+  box-shadow: 0 0 5px #aaa;
 }
 /* Fades and background-images don't work well together in IE6, drop the image */
 * html .ui-tooltip {
- background-image: none;
+  background-image: none;
 }
 body .ui-tooltip { border-width:2px; }
 

Modified: ofbiz/branches/release13.07/themes/tomahawk/webapp/tomahawk/css/style.css
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/themes/tomahawk/webapp/tomahawk/css/style.css?rev=1566564&r1=1566563&r2=1566564&view=diff
==============================================================================
--- ofbiz/branches/release13.07/themes/tomahawk/webapp/tomahawk/css/style.css (original)
+++ ofbiz/branches/release13.07/themes/tomahawk/webapp/tomahawk/css/style.css Mon Feb 10 10:20:07 2014
@@ -2301,7 +2301,7 @@ border-right: 2px solid #000;
 border-left: 2px solid #000;
 border-bottom: 3px solid #000;
 position: absolute;
-padding: 3px 1 1 1;
+padding: 3px 1px 1px 1px;
 overflow: visible;
 z-index: 110000;
 visibility: visible;
@@ -2440,27 +2440,27 @@ background-image:url(/images/spinner.gif
 }
 
 img.cssImgXLarge {
- /*border: 1px black solid;*/
- max-width: 200px;
- max-height: 150px;
+  /*border: 1px black solid;*/
+  max-width: 200px;
+  max-height: 150px;
 }
 
 img.cssImgLarge {
- /*border: 1px black solid;*/
- max-width: 100px;
- max-height: 75px;
+  /*border: 1px black solid;*/
+  max-width: 100px;
+  max-height: 75px;
 }
 
 img.cssImgStandard {
- /*border: 1px black solid;*/
- max-width: 70px;
- max-height: 52px;
+  /*border: 1px black solid;*/
+  max-width: 70px;
+  max-height: 52px;
 }
 
 img.cssImgSmall {
- /*border: 1px black solid;*/
- max-width: 50px;
- max-height: 37px;
+  /*border: 1px black solid;*/
+  max-width: 50px;
+  max-height: 37px;
 }
 
 /* ========================================================= */
@@ -2478,9 +2478,13 @@ img.cssImgSmall {
 .ui-helper-hidden { display: none; }
 .ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px); }
 .ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; }
-.ui-helper-clearfix:before, .ui-helper-clearfix:after { content: ""; display: table; }
+.ui-helper-clearfix:before, .ui-helper-clearfix:after { content: ""; display: table;
+    border-collapse: collapse;
+}
 .ui-helper-clearfix:after { clear: both; }
-.ui-helper-clearfix { zoom: 1; }
+.ui-helper-clearfix { zoom: 1;
+    min-height: 0; /* support: IE7 */
+}
 .ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
 
 
@@ -2597,11 +2601,13 @@ button.ui-button::-moz-focus-inner { bor
     left: -4px; /*must have*/
     width: 200px; /*must have*/
     height: 200px; /*must have*/
-}.ui-dialog { position: absolute; padding: .2em; width: 300px; overflow: hidden; }
-.ui-dialog .ui-dialog-titlebar { padding: .4em 1em; position: relative;  }
-.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .1em 0; }
-.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
-.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
+}
+.ui-dialog { position: absolute; top: 0; left: 0; padding: .2em; width: 300px; overflow: hidden; outline: 0;}
+.ui-dialog .ui-dialog-titlebar { padding: .4em 1em;  height: 16px; position: relative;}
+.ui-dialog .ui-dialog-title { float: left; margin: .1em 0 .1em 0;     white-space: nowrap; width: 90%; overflow: hidden; text-overflow: ellipsis;}
+
+.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 21px; margin: -10px 0 0 0; padding: 1px; height: 20px; }
+/*.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }*/
 .ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
 .ui-dialog .ui-dialog-content { position: relative; border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
 .ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; }
@@ -2611,9 +2617,14 @@ button.ui-button::-moz-focus-inner { bor
 .ui-draggable .ui-dialog-titlebar { cursor: move; }
 .ui-menu { list-style:none; padding: 2px; margin: 0; display:block; outline: none; }
 .ui-menu .ui-menu { margin-top: -3px; position: absolute; }
-.ui-menu .ui-menu-item { margin: 0; padding: 0; zoom: 1; width: 100%; }
+.ui-menu .ui-menu-item { margin: 0; padding: 0; zoom: 1; width: 100%;
+    /* support: IE10, see #8844 */
+    list-style-image: url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);
+}
 .ui-menu .ui-menu-divider { margin: 5px -2px 5px -2px; height: 0; font-size: 0; line-height: 0; border-width: 1px 0 0 0; }
-.ui-menu .ui-menu-item a { text-decoration: none; display: block; padding: 2px .4em; line-height: 1.5; zoom: 1; font-weight: normal; }
+.ui-menu .ui-menu-item a { text-decoration: none; display: block; padding: 2px .4em; line-height: 1.5; zoom: 1; font-weight: normal;
+    min-height: 0; /* support: IE7 */
+}
 .ui-menu .ui-menu-item a.ui-state-focus,
 .ui-menu .ui-menu-item a.ui-state-active { font-weight: normal; margin: -1px; }
 
@@ -2666,8 +2677,8 @@ button.ui-button::-moz-focus-inner { bor
 /* TR overrides */
 span.ui-spinner { background: none; }
 .ui-spinner .ui-icon-triangle-1-s {
- /* need to fix icons sprite */
- background-position:-65px -16px;
+  /* need to fix icons sprite */
+  background-position:-65px -16px;
 }
 .ui-tabs { position: relative; padding: .2em; zoom: 1; } /* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
 .ui-tabs .ui-tabs-nav { margin: 0; padding: .2em .2em 0; }
@@ -2678,17 +2689,17 @@ span.ui-spinner { background: none; }
 .ui-tabs .ui-tabs-nav li a, .ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
 .ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em; background: none; }
 .ui-tooltip {
- padding:8px;
- position:absolute;
- z-index:9999;
- -o-box-shadow: 0 0 5px #aaa;
- -moz-box-shadow: 0 0 5px #aaa;
- -webkit-box-shadow: 0 0 5px #aaa;
- box-shadow: 0 0 5px #aaa;
+  padding:8px;
+  position:absolute;
+  z-index:9999;
+  -o-box-shadow: 0 0 5px #aaa;
+  -moz-box-shadow: 0 0 5px #aaa;
+  -webkit-box-shadow: 0 0 5px #aaa;
+  box-shadow: 0 0 5px #aaa;
 }
 /* Fades and background-images don't work well together in IE6, drop the image */
 * html .ui-tooltip {
- background-image: none;
+  background-image: none;
 }
 body .ui-tooltip { border-width:2px; }