svn commit: r1296782 - in /ofbiz/trunk: applications/order/webapp/orde
Locked
svn commit: r1296782 - in /ofbiz/trunk: applications/order/webapp/orde
 
|
Author: jleroux
Date: Sun Mar 4 11:54:13 2012 New Revision: 1296782 URL: http://svn.apache.org/viewvc?rev=1296782&view=rev Log: A patch from Wai "widget <image> tag to use css for resizing" https://issues.apache.org/jira/browse/OFBIZ-4678 Summary: The purpose of this patch is to address the following: 1. Provide a standardized set of image width and height specs for page layout in ofbiz. This gives ofbiz a uniform look throughout as it applies to image display. 2. Preserve the aspect ratio of the image when using these standardized image sizes. 3. One place to make styling modifications (eg. css file). 4. Decouple styling from code (eg. java,ftl,xml,html,jsp,etc). Regarding including the real image size, the width/height attributes in <img> specifies the boundary of the image when shown on the page. If you need to specify the real size of the image, the server code would have to perform the determination. Afterwards, you can include the actual dimensions of the image in the title attribute of <img> Details: Manually specifying the image width and height does help with preserving the layout of a page regardless of the image size to be shown. The challenge with this method is that the image shown on the page in question may be distorted if the aspect ratio of the image differed from that of the width and height attributes of <img>. This basically forces the person uploading the image to be more vigilant about image aspect ratios. The purpose is to harmonize on the display size of images with a standardized set of width/height constraints in which an image must fit and preserve the aspect ratio of images. Currently the source files (eg. ftl, xml) either manually specifies the width or height of a displayed image (ie widget <image> and html <img> tag). The problem with specifying only one constraint is that an image can affect the layout of the page if the user uploads an image where the aspect ratio could be large. Some ftl and xml files specify both the width and the height. The problem with this is that if the aspect ratio of the image in question does not match that of the width and height of the <img> tag, the image would be displayed distorted. The solution was to create a standardized set of CSS styles that both configure the displayed image size and preserve the image aspect ratio (eg. thumbnail size, medium size and large size). Of course, the developers can further define or modify the styles to suit their need. By using CSS, one can change the size of displayed images without having to tamper with the ftl and/or xml files. This helps to reduce potential bugs that come with modifying the ftl and xml files. The existing way of doing things is to go through each ftl or xml file in question and manually modify the width and/or height of the <image> and/or <img> tag. The question about the "border" around images. If you do not wish to have a border around the image, just remove it from the CSS style. It's that easy No need to change anything else. Ie. configuration to the image is done on the CSS style and not on the <image>, <img> tag. NB: The current patch does not apply to all displayed images. I have only made appropriate modifications to widget <image> and html <img> tags that have either specified the width and/or height. There are numerous <image> and <img> tags spread all over the project that do not specify dimensions. I would have to modify them as I encountered them when I could see where and how they are displayed on the screen. Note that these images would not be affect by this patch. jleroux: despite my efforts I was not able to check all screens. But I think it's ok Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/inlineProductDetail.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml ofbiz/trunk/applications/product/webapp/catalog/category/EditCategory.ftl ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProducts.ftl ofbiz/trunk/applications/product/webapp/catalog/config/EditProductConfigItemContent.ftl ofbiz/trunk/applications/product/webapp/catalog/product/AddAdditionalImages.ftl ofbiz/trunk/applications/product/webapp/catalog/product/EditProductContent.ftl ofbiz/trunk/applications/product/widget/catalog/ImageManagementForms.xml ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml ofbiz/trunk/framework/widget/dtd/widget-form.xsd ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl ofbiz/trunk/specialpurpose/ebay/widget/CommonScreens.xml ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/editforumarticle.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/splitship.ftl ofbiz/trunk/specialpurpose/googlebase/widget/CommonScreens.xml ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml ofbiz/trunk/specialpurpose/webpos/webapp/webpos/cart/ShowCart.ftl ofbiz/trunk/specialpurpose/webpos/webapp/webpos/cart/ShowCartItemSelected.ftl ofbiz/trunk/specialpurpose/webpos/webapp/webpos/catalog/CategoryDetail.ftl ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/style.css ofbiz/trunk/themes/bluelight/webapp/bluelight/style.css ofbiz/trunk/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css ofbiz/trunk/themes/flatgrey/webapp/flatgrey/maincss.css ofbiz/trunk/themes/multiflex/webapp/multiflex/style.css ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/style.css Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl?rev=1296782&r1=1296781&r2=1296782&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl Sun Mar 4 11:54:13 2012 @@ -103,7 +103,7 @@ under the License. <div> <#if categoryImageUrl?string?has_content> <#assign height=100/> - <img src='<@ofbizContentUrl>${categoryImageUrl}</@ofbizContentUrl>' vspace='5' hspace='5' border='1' height='${height}' align='left' alt="" /> + <img src='<@ofbizContentUrl>${categoryImageUrl}</@ofbizContentUrl>' vspace='5' hspace='5' align='left' class='cssImgLarge' /> </#if> <#if longDescription?has_content> ${longDescription} Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl?rev=1296782&r1=1296781&r2=1296782&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl Sun Mar 4 11:54:13 2012 @@ -199,7 +199,7 @@ function getConfigDetails() { <#assign productLargeImageUrl = firstLargeImage> </#if> <#if productLargeImageUrl?string?has_content> - <a href="javascript:popupDetail();"><img src='<@ofbizContentUrl>${contentPathPrefix?if_exists}${productLargeImageUrl?if_exists}</@ofbizContentUrl>' name='mainImage' vspace='5' hspace='5' border='0' width='200' align='left' alt="" /></a> + <a href="javascript:popupDetail();"><img src='<@ofbizContentUrl>${contentPathPrefix?if_exists}${productLargeImageUrl?if_exists}</@ofbizContentUrl>' name='mainImage' vspace='5' hspace='5' class='cssImgLarge' align='left' alt="" /></a> </#if> </td> <td align="right" valign="top"> @@ -402,7 +402,7 @@ function getConfigDetails() { <#assign imageUrl = "/images/defaultImage.jpg"> </#if> <td align="center" valign="bottom"> - <a href="javascript:getList('FT${featureOrderFirst}','${indexer}',1);"><img src="<@ofbizContentUrl>${contentPathPrefix?if_exists}${imageUrl}</@ofbizContentUrl>" border="0" width="60" height="60" alt="" /></a> + <a href="javascript:getList('FT${featureOrderFirst}','${indexer}',1);"><img src="<@ofbizContentUrl>${contentPathPrefix?if_exists}${imageUrl}</@ofbizContentUrl>" class='cssImgStandard' alt="" /></a> <br /> <a href="javascript:getList('FT${featureOrderFirst}','${indexer}',1);" class="buttontext">${key}</a> </td> @@ -463,7 +463,7 @@ function getConfigDetails() { </#if> <#assign image = question.content.get("IMAGE_URL")?if_exists> <#if image?has_content> - <img src='<@ofbizContentUrl>${contentPathPrefix?if_exists}${image?if_exists}</@ofbizContentUrl>' vspace='5' hspace='5' border='0' width='200' align='left' alt="" /> + <img src='<@ofbizContentUrl>${contentPathPrefix?if_exists}${image?if_exists}</@ofbizContentUrl>' vspace='5' hspace='5' class='cssImgSmall' align='left' alt="" /> </#if> <#else> <div><a href='#${question.getConfigItem().getString("configItemId")}' class="buttontext">Details</a></div> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/inlineProductDetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/inlineProductDetail.ftl?rev=1296782&r1=1296781&r2=1296782&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/inlineProductDetail.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/inlineProductDetail.ftl Sun Mar 4 11:54:13 2012 @@ -264,7 +264,7 @@ ${virtualJavaScript?if_exists} </#if> <#if productLargeImageUrl?string?has_content> <input type="hidden" name="detailImage${inlineCounter}" value="${firstDetailImage?default(mainDetailImageUrl?default("_NONE_"))}"/> - <a href="javascript:popupDetailInline('${inlineCounter}');"><img src='<@ofbizContentUrl>${contentPathPrefix?if_exists}${productLargeImageUrl?if_exists}</@ofbizContentUrl>' name='mainImage${inlineCounter}' vspace='5' hspace='5' border='0' width='100' align='left' alt="" /></a> + <a href="javascript:popupDetailInline('${inlineCounter}');"><img src='<@ofbizContentUrl>${contentPathPrefix?if_exists}${productLargeImageUrl?if_exists}</@ofbizContentUrl>' name='mainImage${inlineCounter}' vspace='5' hspace='5' class='cssImgLarge' align='left' alt="" /></a> </#if> </td> <td align="right" valign="top" width="100%"> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl?rev=1296782&r1=1296781&r2=1296782&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl Sun Mar 4 11:54:13 2012 @@ -310,7 +310,7 @@ ${virtualJavaScript?if_exists} <#assign productLargeImageUrl = firstLargeImage> </#if> <#if productLargeImageUrl?string?has_content> - <a href="javascript:popupDetail();"><img src="<@ofbizContentUrl>${contentPathPrefix?if_exists}${productLargeImageUrl?if_exists}</@ofbizContentUrl>" name="mainImage" vspace="5" hspace="5" border="0" width="200" alt="" /></a> + <a href="javascript:popupDetail();"><img src="<@ofbizContentUrl>${contentPathPrefix?if_exists}${productLargeImageUrl?if_exists}</@ofbizContentUrl>" name="mainImage" vspace="5" hspace="5" class='cssImgLarge' alt="" /></a> </#if> </td> <td align="right" valign="top"> @@ -604,7 +604,7 @@ ${virtualJavaScript?if_exists} <#assign imageUrl = "/images/defaultImage.jpg"> </#if> <td align="center" valign="bottom"> - <a href="javascript:getList('FT${featureOrderFirst}','${indexer}',1);"><img src="<@ofbizContentUrl>${contentPathPrefix?if_exists}${imageUrl}</@ofbizContentUrl>" border="0" width="60" height="60" alt="" /></a> + <a href="javascript:getList('FT${featureOrderFirst}','${indexer}',1);"><img src="<@ofbizContentUrl>${contentPathPrefix?if_exists}${imageUrl}</@ofbizContentUrl>" class='cssImgSmall' alt="" /></a> <br /> <a href="javascript:getList('FT${featureOrderFirst}','${indexer}',1);" class="linktext">${key}</a> </td> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl?rev=1296782&r1=1296781&r2=1296782&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl Sun Mar 4 11:54:13 2012 @@ -45,7 +45,7 @@ under the License. <td valign="top" width="0" colspan='2'> <div> <#if productCategory.categoryImageUrl?exists> - <img src="<@ofbizContentUrl>${productCategory.categoryImageUrl}</@ofbizContentUrl>" vspace="5" hspace="5" border="1" height='100' alt="" /> + <img src="<@ofbizContentUrl>${productCategory.categoryImageUrl}</@ofbizContentUrl>" vspace="5" hspace="5" class="cssImgLarge" alt="" /> </#if> ${productCategory.longDescription?if_exists} </div> Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml?rev=1296782&r1=1296781&r2=1296782&view=diff ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml Sun Mar 4 11:54:13 2012 @@ -134,7 +134,7 @@ under the License. <form name="ViewPartyGroup" type="single" default-map-name="lookupGroup"> <auto-fields-entity entity-name="PartyGroup" default-field-type="display"/> - <field name="logo" use-when="partyGroupLogoLinkUrl!=null" title="${uiLabelMap.CommonOrganizationLogo}"><image alternate="${uiLabelMap.CommonOrganizationLogo}" value="${partyGroupLogoLinkUrl}"/></field> + <field name="logo" use-when="partyGroupLogoLinkUrl!=null" title="${uiLabelMap.CommonOrganizationLogo}"><image alternate="${uiLabelMap.CommonOrganizationLogo}" value="${partyGroupLogoLinkUrl}" style="cssImgStandard"/></field> <field name="partyTypeId"><ignored/></field> <field name="comments"><ignored/></field> <field name="logoImageUrl"><ignored/></field> @@ -159,7 +159,7 @@ under the License. </form> <form name="ViewPartyPerson" type="single" default-map-name="lookupPerson"> - <field name="personalImage" use-when="partyContentId!=null" title="${uiLabelMap.FormFieldTitle_personalImage}"><image value="${personalImage}"/></field> + <field name="personalImage" use-when="partyContentId!=null" title="${uiLabelMap.FormFieldTitle_personalImage}"><image value="${personalImage}" style="cssImgStandard"/></field> <field name="partyId"><display/></field> <field name="name" title="${uiLabelMap.PartyName}"><display description="${lookupPerson.personalTitle} ${lookupPerson.firstName} ${lookupPerson.middleName} ${lookupPerson.lastName}"/></field> <field name="comments" title="${uiLabelMap.PartyComments}"><display/></field> Modified: ofbiz/trunk/applications/product/webapp/catalog/category/EditCategory.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/EditCategory.ftl?rev=1296782&r1=1296781&r2=1296782&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/category/EditCategory.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/category/EditCategory.ftl Sun Mar 4 11:54:13 2012 @@ -122,7 +122,7 @@ function insertImageName(type,nameValue) <td width="20%" align="right" valign="top" class="label"> ${uiLabelMap.ProductCategoryImageUrl} <#if (productCategory.categoryImageUrl)?exists> - <a href="<@ofbizContentUrl>${(productCategory.categoryImageUrl)?if_exists}</@ofbizContentUrl>" target="_blank"><img alt="Category Image" src="<@ofbizContentUrl>${(productCategory.categoryImageUrl)?if_exists}</@ofbizContentUrl>" height="40" width="40" /></a> + <a href="<@ofbizContentUrl>${(productCategory.categoryImageUrl)?if_exists}</@ofbizContentUrl>" target="_blank"><img alt="Category Image" src="<@ofbizContentUrl>${(productCategory.categoryImageUrl)?if_exists}</@ofbizContentUrl>" class="cssImgSmall" /></a> </#if> </td> <td> </td> @@ -142,7 +142,7 @@ function insertImageName(type,nameValue) <td width="20%" align="right" valign="top" class="label"> ${uiLabelMap.ProductLinkOneImageUrl} <#if (productCategory.linkOneImageUrl)?exists> - <a href="<@ofbizContentUrl>${(productCategory.linkOneImageUrl)?if_exists}</@ofbizContentUrl>" target="_blank"><img alt="Link One Image" src="<@ofbizContentUrl>${(productCategory.linkOneImageUrl)?if_exists}</@ofbizContentUrl>" height="40" width="40" /></a> + <a href="<@ofbizContentUrl>${(productCategory.linkOneImageUrl)?if_exists}</@ofbizContentUrl>" target="_blank"><img alt="Link One Image" src="<@ofbizContentUrl>${(productCategory.linkOneImageUrl)?if_exists}</@ofbizContentUrl>" class="cssImgSmall" /></a> </#if> </td> <td> </td> @@ -162,7 +162,7 @@ function insertImageName(type,nameValue) <td width="20%" align="right" valign="top" class="label"> ${uiLabelMap.ProductLinkTwoImageUrl} <#if (productCategory.linkTwoImageUrl)?exists> - <a href="<@ofbizContentUrl>${(productCategory.linkTwoImageUrl)?if_exists}</@ofbizContentUrl>" target="_blank"><img alt="Link One Image" src="<@ofbizContentUrl>${(productCategory.linkTwoImageUrl)?if_exists}</@ofbizContentUrl>" height="40" width="40" /></a> + <a href="<@ofbizContentUrl>${(productCategory.linkTwoImageUrl)?if_exists}</@ofbizContentUrl>" target="_blank"><img alt="Link One Image" src="<@ofbizContentUrl>${(productCategory.linkTwoImageUrl)?if_exists}</@ofbizContentUrl>" class="cssImgSmall" /></a> </#if> </td> <td> </td> Modified: ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProducts.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProducts.ftl?rev=1296782&r1=1296781&r2=1296782&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProducts.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProducts.ftl Sun Mar 4 11:54:13 2012 @@ -75,7 +75,7 @@ under the License. <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>> <td> <#if (product.smallImageUrl)?exists> - <a href="<@ofbizUrl>EditProduct?productId=${(productCategoryMember.productId)?if_exists}</@ofbizUrl>"><img alt="Small Image" src="<@ofbizContentUrl>${product.smallImageUrl}</@ofbizContentUrl>" height="40" width="40" align="middle" /></a> + <a href="<@ofbizUrl>EditProduct?productId=${(productCategoryMember.productId)?if_exists}</@ofbizUrl>"><img alt="Small Image" src="<@ofbizContentUrl>${product.smallImageUrl}</@ofbizContentUrl>" class="cssImgSmall" align="middle" /></a> </#if> <a href="<@ofbizUrl>EditProduct?productId=${(productCategoryMember.productId)?if_exists}</@ofbizUrl>" class="buttontext"><#if product?exists>${(product.internalName)?if_exists}</#if> [${(productCategoryMember.productId)?if_exists}]</a> </td> Modified: ofbiz/trunk/applications/product/webapp/catalog/config/EditProductConfigItemContent.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/config/EditProductConfigItemContent.ftl?rev=1296782&r1=1296781&r2=1296782&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/config/EditProductConfigItemContent.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/config/EditProductConfigItemContent.ftl Sun Mar 4 11:54:13 2012 @@ -115,7 +115,7 @@ function insertImageName(size,nameValue) <td width="20%" align="right" valign="top" class="label"> ${uiLabelMap.ProductSmallImage} <#if (configItem.imageUrl)?exists> - <a href="<@ofbizContentUrl>${configItem.imageUrl}</@ofbizContentUrl>" target="_blank"><img alt="Image" src="<@ofbizContentUrl>${configItem.imageUrl}</@ofbizContentUrl>" height="40" width="40" /></a> + <a href="<@ofbizContentUrl>${configItem.imageUrl}</@ofbizContentUrl>" target="_blank"><img alt="Image" src="<@ofbizContentUrl>${configItem.imageUrl}</@ofbizContentUrl>" class="cssImgSmall" /></a> </#if> </td> <td> </td> Modified: ofbiz/trunk/applications/product/webapp/catalog/product/AddAdditionalImages.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/AddAdditionalImages.ftl?rev=1296782&r1=1296781&r2=1296782&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/product/AddAdditionalImages.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/product/AddAdditionalImages.ftl Sun Mar 4 11:54:13 2012 @@ -27,19 +27,19 @@ under the License. <table> <tbody> <tr> - <td><#if productAdditionalImage1?has_content><a href="javascript:void(0);" swapDetail="<@ofbizContentUrl>${productAdditionalImage1}</@ofbizContentUrl>"><img src="<@ofbizContentUrl>${productAdditionalImage1}</@ofbizContentUrl>" height="50" width="50" alt="" /></a></#if></td> + <td><#if productAdditionalImage1?has_content><a href="javascript:void(0);" swapDetail="<@ofbizContentUrl>${productAdditionalImage1}</@ofbizContentUrl>"><img src="<@ofbizContentUrl>${productAdditionalImage1}</@ofbizContentUrl>" class="cssImgSmall" alt="" /></a></#if></td> <td><input id="additionalImageOne" type="file" size="20" name="additionalImageOne" /></td> </tr> <tr> - <td><#if productAdditionalImage2?has_content><a href="javascript:void(0);" swapDetail="<@ofbizContentUrl>${productAdditionalImage2}</@ofbizContentUrl>" ><img src="<@ofbizContentUrl>${productAdditionalImage2}</@ofbizContentUrl>" height="50" width="50" alt="" /></a></#if></td> + <td><#if productAdditionalImage2?has_content><a href="javascript:void(0);" swapDetail="<@ofbizContentUrl>${productAdditionalImage2}</@ofbizContentUrl>" ><img src="<@ofbizContentUrl>${productAdditionalImage2}</@ofbizContentUrl>" class="cssImgSmall" alt="" /></a></#if></td> <td><input type="file" size="20" name="additionalImageTwo" /></td> </tr> <tr> - <td><#if productAdditionalImage3?has_content><a href="javascript:void(0);" swapDetail="<@ofbizContentUrl>${productAdditionalImage3}</@ofbizContentUrl>"><img src="<@ofbizContentUrl>${productAdditionalImage3}</@ofbizContentUrl>" height="50" width="50" alt="" /></a></#if></td> + <td><#if productAdditionalImage3?has_content><a href="javascript:void(0);" swapDetail="<@ofbizContentUrl>${productAdditionalImage3}</@ofbizContentUrl>"><img src="<@ofbizContentUrl>${productAdditionalImage3}</@ofbizContentUrl>" class="cssImgSmall" alt="" /></a></#if></td> <td><input type="file" size="20" name="additionalImageThree" /></td> </tr> <tr> - <td><#if productAdditionalImage4?has_content><a href="javascript:void(0);" swapDetail="<@ofbizContentUrl>${productAdditionalImage4}</@ofbizContentUrl>"><img src="<@ofbizContentUrl>${productAdditionalImage4}</@ofbizContentUrl>" height="50" width="50" alt="" /></a></#if></td> + <td><#if productAdditionalImage4?has_content><a href="javascript:void(0);" swapDetail="<@ofbizContentUrl>${productAdditionalImage4}</@ofbizContentUrl>"><img src="<@ofbizContentUrl>${productAdditionalImage4}</@ofbizContentUrl>" class="cssImgSmall" alt="" /></a></#if></td> <td><input type="file" size="20" name="additionalImageFour" /></td> </tr> <tr> Modified: ofbiz/trunk/applications/product/webapp/catalog/product/EditProductContent.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/EditProductContent.ftl?rev=1296782&r1=1296781&r2=1296782&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/product/EditProductContent.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/product/EditProductContent.ftl Sun Mar 4 11:54:13 2012 @@ -74,7 +74,7 @@ under the License. <td width="20%" align="right" valign="top"> <div><b>${uiLabelMap.ProductSmallImage}</b></div> <#if (product.smallImageUrl)?exists> - <a href="<@ofbizContentUrl>${(product.smallImageUrl)?if_exists}</@ofbizContentUrl>" target="_blank"><img alt="Small Image" src="<@ofbizContentUrl>${(product.smallImageUrl)?if_exists}</@ofbizContentUrl>" height="40" width="40"/></a> + <a href="<@ofbizContentUrl>${(product.smallImageUrl)?if_exists}</@ofbizContentUrl>" target="_blank"><img alt="Small Image" src="<@ofbizContentUrl>${(product.smallImageUrl)?if_exists}</@ofbizContentUrl>" class="cssImgSmall"/></a> </#if> </td> <td> </td> @@ -94,7 +94,7 @@ under the License. <td width="20%" align="right" valign="top"> <div><b>${uiLabelMap.ProductMediumImage}</b></div> <#if (product.mediumImageUrl)?exists> - <a href="<@ofbizContentUrl>${product.mediumImageUrl}</@ofbizContentUrl>" target="_blank"><img alt="Medium Image" src="<@ofbizContentUrl>${product.mediumImageUrl}</@ofbizContentUrl>" height="40" width="40"/></a> + <a href="<@ofbizContentUrl>${product.mediumImageUrl}</@ofbizContentUrl>" target="_blank"><img alt="Medium Image" src="<@ofbizContentUrl>${product.mediumImageUrl}</@ofbizContentUrl>" class="cssImgSmall"/></a> </#if> </td> <td> </td> @@ -114,7 +114,7 @@ under the License. <td width="20%" align="right" valign="top"> <div><b>${uiLabelMap.ProductLargeImage}</b></div> <#if (product.largeImageUrl)?exists> - <a href="<@ofbizContentUrl>${product.largeImageUrl}</@ofbizContentUrl>" target="_blank"><img alt="Large Image" src="<@ofbizContentUrl>${product.largeImageUrl}</@ofbizContentUrl>" height="40" width="40"/></a> + <a href="<@ofbizContentUrl>${product.largeImageUrl}</@ofbizContentUrl>" target="_blank"><img alt="Large Image" src="<@ofbizContentUrl>${product.largeImageUrl}</@ofbizContentUrl>" class="cssImgSmall"/></a> </#if> </td> <td> </td> @@ -134,7 +134,7 @@ under the License. <td width="20%" align="right" valign="top"> <div><b>${uiLabelMap.ProductDetailImage}</b></div> <#if (product.detailImageUrl)?exists> - <a href="<@ofbizContentUrl>${product.detailImageUrl}</@ofbizContentUrl>" target="_blank"><img alt="Detail Image" src="<@ofbizContentUrl>${product.detailImageUrl}</@ofbizContentUrl>" height="40" width="40"/></a> + <a href="<@ofbizContentUrl>${product.detailImageUrl}</@ofbizContentUrl>" target="_blank"><img alt="Detail Image" src="<@ofbizContentUrl>${product.detailImageUrl}</@ofbizContentUrl>" class="cssImgSmall"/></a> </#if> </td> <td> </td> @@ -154,7 +154,7 @@ under the License. <td width="20%" align="right" valign="top"> <div><b>${uiLabelMap.ProductOriginalImage}</b></div> <#if (product.originalImageUrl)?exists> - <a href="<@ofbizContentUrl>${product.originalImageUrl}</@ofbizContentUrl>" target="_blank"><img alt="Original Image" src="<@ofbizContentUrl>${product.originalImageUrl}</@ofbizContentUrl>" height="40" width="40"/></a> + <a href="<@ofbizContentUrl>${product.originalImageUrl}</@ofbizContentUrl>" target="_blank"><img alt="Original Image" src="<@ofbizContentUrl>${product.originalImageUrl}</@ofbizContentUrl>" class="cssImgSmall"/></a> </#if> </td> <td> </td> Modified: ofbiz/trunk/applications/product/widget/catalog/ImageManagementForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ImageManagementForms.xml?rev=1296782&r1=1296781&r2=1296782&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/ImageManagementForms.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/ImageManagementForms.xml Sun Mar 4 11:54:13 2012 @@ -44,7 +44,7 @@ under the License. <field-map field-name="contentId"/> </entity-and> </row-actions> - <field name="drObjectInfo" title="${uiLabelMap.CommonImage}"><image width="100"/></field> + <field name="drObjectInfo" title="${uiLabelMap.CommonImage}"><image style="cssImgLarge"/></field> <field name="drDataResourceName" title="${uiLabelMap.ImageManagementImageName}"> <hyperlink target="${currentFormName}" description="${drDataResourceName}"> <parameter param-name="productId"/> @@ -106,7 +106,7 @@ under the License. </radio> </field> <field name="_rowSubmit" position="2" title=" " widget-style="hidden"><check all-checked="true"/></field> - <field name="drObjectInfo" position="2" title="${uiLabelMap.CommonImage}"><image width="100"/></field> + <field name="drObjectInfo" position="2" title="${uiLabelMap.CommonImage}"><image style="cssImgLarge"/></field> <field name="checkStatusId" position="2" title="${uiLabelMap.CommonStatus}"> <radio no-current-selected-key="${checkRadio}"> <option key="IM_APPROVED/${productId}" description="${uiLabelMap.FormFieldTitle_approve}"/> @@ -153,7 +153,7 @@ under the License. <field name="productId" title="${uiLabelMap.ProductProductName} [${uiLabelMap.ProductProductId}] - ${uiLabelMap.FormFieldTitle_categoryName}" entry-name="productId" position="1" use-when="${bsh:String prev=(String)previousItem.get("productId");return new Boolean(!(prev!=null&&prev.equals(productId)));}"> <display-entity entity-name="Product" key-field-name="productId" description="${internalName} [${productId}] - ${productCategory.categoryName}" also-hidden="false"/> </field> - <field name="drObjectInfo" position="2" title="${uiLabelMap.CommonImage}"><image width="100"/></field> + <field name="drObjectInfo" position="2" title="${uiLabelMap.CommonImage}"><image style="cssImgLarge"/></field> <field name="drDataResourceName" position="2" title="${uiLabelMap.ImageManagementImageName}"><display/></field> <field name="contentId" position="2"><display/></field> <field name="dataResourceId" position="2"><display/></field> @@ -193,7 +193,7 @@ under the License. <display-entity entity-name="Product" key-field-name="productId" description="${internalName} [${productId}] - ${productCategory.categoryName}" also-hidden="false"/> </field> <field name="_rowSubmit" position="2" title=" " widget-style="hidden"><check all-checked="true"/></field> - <field name="drObjectInfo" position="2" title="${uiLabelMap.CommonImage}"><image width="100"/></field> + <field name="drObjectInfo" position="2" title="${uiLabelMap.CommonImage}"><image style="cssImgLarge"/></field> <field name="drDataResourceName" position="2" title="${uiLabelMap.ImageManagementImageName}"><display/></field> <field name="contentId" position="2"><display/></field> <field name="dataResourceId" position="2"><display/></field> @@ -247,7 +247,7 @@ under the License. <field name="productId" title="${uiLabelMap.ProductProductName} [${uiLabelMap.ProductProductId}] - ${uiLabelMap.FormFieldTitle_categoryName}" entry-name="productId" position="1" use-when="${bsh:String prev=(String)previousItem.get("productId");return new Boolean(!(prev!=null&&prev.equals(productId)));}"> <display-entity entity-name="Product" key-field-name="productId" description="${internalName} [${productId}] - ${productCategory.categoryName}" also-hidden="false"/> </field> - <field name="drObjectInfo" position="2" title="${uiLabelMap.CommonImage}"><image width="100"/></field> + <field name="drObjectInfo" position="2" title="${uiLabelMap.CommonImage}"><image style="cssImgLarge"/></field> <field name="drDataResourceName" position="2" title="${uiLabelMap.ImageManagementImageName}"><display/></field> <field name="contentId" position="2"><display/></field> <field name="dataResourceId" position="2"><display/></field> @@ -305,7 +305,7 @@ under the License. <field name="dataResourceId"><hidden/></field> <field name="fromDate"><hidden/></field> <field name="_rowSubmit" title=" " widget-style="hidden"><check all-checked="true"/></field> - <field name="drObjectInfo" title="${uiLabelMap.CommonImage}"><image width="100"/></field> + <field name="drObjectInfo" title="${uiLabelMap.CommonImage}"><image style="cssImgLarge"/></field> <field name="action" use-when="${groovy: return context.drMimeTypeId == 'image/jpeg';}" title="${uiLabelMap.ImageManagementAction}" event="onChange" action="javascript: document.ListImageManage.action='checkAction?productId=${productId}&contentId=${contentId}&dataResourceId=${dataResourceId}'; document.ListImageManage.submit();"> @@ -381,7 +381,7 @@ under the License. <field-map field-name="contentId"/> </entity-and> </actions> - <field name="drObjectInfo" title=" "><image width="100"/></field> + <field name="drObjectInfo" title=" "><image style="cssImgLarge"/></field> </form> <form name="ImageFrames" type="single" title="" target="uploadFrame" header-row-style="header-row" default-table-style="basic-table" target-window="_self"> @@ -622,7 +622,7 @@ under the License. <set field="drObjectInfo" from-field="contentDataResourceViews[0].drObjectInfo"/> </row-actions> <field name="productId"><hidden/></field> - <field name="drObjectInfo" title="${uiLabelMap.CommonImage}"><image width="100"/></field> + <field name="drObjectInfo" title="${uiLabelMap.CommonImage}"><image style="cssImgLarge"/></field> <field name="drDataResourceName" title="${uiLabelMap.ImageManagementImageName}"><display/></field> <field name="fromDate"><display/></field> <field name="status"><display description="Uploaded"/></field> @@ -660,7 +660,7 @@ under the License. <field-map field-name="contentId"/> </entity-and> </row-actions> - <field name="drObjectInfo" title="${uiLabelMap.CommonImage}"><image width="100"/></field> + <field name="drObjectInfo" title="${uiLabelMap.CommonImage}"><image style="cssImgLarge"/></field> <field name="drDataResourceName" title="${uiLabelMap.ImageManagementImageName}" widget-style="buttontext"> <hyperlink also-hidden="false" target-type="plain" description="${drDataResourceName}" target="javascript:set_value('${contentId}')"/> </field> @@ -711,7 +711,7 @@ under the License. <set field="ApprovedBy" value="${userLoginAndPartyDetails[0].firstName} ${userLoginAndPartyDetails[0].middleName} ${userLoginAndPartyDetails[0].lastName}"/> </row-actions> <field name="productId"><hidden/></field> - <field name="drObjectInfo" title="${uiLabelMap.CommonImage}"><image width="100"/></field> + <field name="drObjectInfo" title="${uiLabelMap.CommonImage}"><image style="cssImgLarge"/></field> <field name="drDataResourceName" title="${uiLabelMap.ImageManagementImageName}"><display/></field> <field name="contentId"><display/></field> <field name="dataResourceId"><display/></field> @@ -748,7 +748,7 @@ under the License. <field-map field-name="contentId"/> </entity-and> </row-actions> - <field name="drObjectInfo" title="${uiLabelMap.CommonImage}"><image width="100"/></field> + <field name="drObjectInfo" title="${uiLabelMap.CommonImage}"><image style="cssImgLarge"/></field> <field name="drDataResourceName" title="${uiLabelMap.ImageManagementImageName}"> <hyperlink target="ListImageReplace" description="${drDataResourceName}"> <parameter param-name="productId"/> @@ -789,7 +789,7 @@ under the License. <field-map field-name="contentId"/> </entity-and> </row-actions> - <field name="drObjectInfo" title="${uiLabelMap.CommonImage}"><image width="100"/></field> + <field name="drObjectInfo" title="${uiLabelMap.CommonImage}"><image style="cssImgLarge"/></field> <field name="drDataResourceName" title="${uiLabelMap.ImageManagementImageName}"> <hyperlink target="ListImageReplace" description="${drDataResourceName}"> <parameter param-name="productId"/> @@ -814,7 +814,7 @@ under the License. <condition-expr field-name="contentTypeId" value="IMAGE_FRAME"/> </entity-condition> </actions> - <field name="drObjectInfo" title="${uiLabelMap.CommonImage}"><image width="100"/></field> + <field name="drObjectInfo" title="${uiLabelMap.CommonImage}"><image style="cssImgLarge"/></field> <field name="drDataResourceName" title="${uiLabelMap.ImageManagementImageName}" widget-style="buttontext"> <hyperlink also-hidden="false" target-type="plain" description="${drDataResourceName}" target="javascript:set_value('${contentId}')"/> </field> Modified: ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml?rev=1296782&r1=1296781&r2=1296782&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml Sun Mar 4 11:54:13 2012 @@ -64,7 +64,7 @@ under the License. <widgets> <include-menu name="ProductTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> <include-menu name="ProductSubTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> - <image src="${product.smallImageUrl}" height="40" width="40" url-mode="content" alt="${product.internalName}"/> + <image src="${product.smallImageUrl}" url-mode="content" alt="${product.internalName}" style="cssImgSmall"/> <label style="h1">${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}: ${product.internalName} [${uiLabelMap.CommonId}:${productId}] ${${extraFunctionName}}</label> </widgets> <fail-widgets> Modified: ofbiz/trunk/framework/widget/dtd/widget-form.xsd URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/dtd/widget-form.xsd?rev=1296782&r1=1296781&r2=1296782&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/dtd/widget-form.xsd (original) +++ ofbiz/trunk/framework/widget/dtd/widget-form.xsd Sun Mar 4 11:54:13 2012 @@ -933,9 +933,7 @@ under the License. </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.image"> - <xs:attribute type="xs:nonNegativeInteger" name="border" default="0"/> - <xs:attribute type="xs:positiveInteger" name="width"/> - <xs:attribute type="xs:positiveInteger" name="height"/> + <xs:attribute type="xs:string" name="style"/> <xs:attribute type="xs:string" name="value"/> <xs:attribute type="xs:string" name="default-value"/> <xs:attribute type="xs:string" name="description"/> Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java?rev=1296782&r1=1296781&r2=1296782&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java (original) +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java Sun Mar 4 11:54:13 2012 @@ -2620,20 +2620,19 @@ public class MacroFormRenderer implement public void renderImageField(Appendable writer, Map<String, Object> context, ImageField imageField) throws IOException { ModelFormField modelFormField = imageField.getModelFormField(); - - String border = Integer.toString(imageField.getBorder()); String value = modelFormField.getEntry(context, imageField.getValue(context)); - String width = ""; - String height = ""; String description = imageField.getDescription(context); String alternate = imageField.getAlternate(context); + String style = imageField.getStyle(context); if(UtilValidate.isEmpty(description)){ description = imageField.getModelFormField().getTitle(context); } + if(UtilValidate.isEmpty(alternate)){ alternate = description; } + if (UtilValidate.isNotEmpty(value)) { if (!value.startsWith("http")) { StringBuilder buffer = new StringBuilder(); @@ -2645,14 +2644,6 @@ public class MacroFormRenderer implement value = ""; } - if (imageField.getWidth() != null) { - width = Integer.toString(imageField.getWidth()); - } - - if (imageField.getHeight() != null) { - height = Integer.toString(imageField.getHeight()); - } - String event = modelFormField.getEvent(); String action = modelFormField.getAction(context); @@ -2664,12 +2655,8 @@ public class MacroFormRenderer implement sr.append(encode(description, modelFormField, context)); sr.append("\" alternate=\""); sr.append(encode(alternate, modelFormField, context)); - sr.append("\" border=\""); - sr.append(border); - sr.append("\" width=\""); - sr.append(width); - sr.append("\" height=\""); - sr.append(height); + sr.append("\" style=\""); + sr.append(style); sr.append("\" event=\""); sr.append(event==null?"":event); sr.append("\" action=\""); Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java?rev=1296782&r1=1296781&r2=1296782&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java (original) +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java Sun Mar 4 11:54:13 2012 @@ -3653,14 +3653,12 @@ public class ModelFormField { } public static class ImageField extends FieldInfo { - protected int border = 0; - protected Integer width; - protected Integer height; protected FlexibleStringExpander defaultValue; protected FlexibleStringExpander value; protected SubHyperlink subHyperlink; protected FlexibleStringExpander description; protected FlexibleStringExpander alternate; + protected FlexibleStringExpander style; protected ImageField() { super(); @@ -3679,39 +3677,7 @@ public class ModelFormField { this.setValue(element.getAttribute("value")); this.setDescription(element.getAttribute("description")); this.setAlternate(element.getAttribute("alternate")); - - String borderStr = element.getAttribute("border"); - try { - border = Integer.parseInt(borderStr); - } catch (Exception e) { - if (UtilValidate.isNotEmpty(borderStr)) { - Debug.logError("Could not parse the border value of the text element: [" + borderStr + "], setting to the default of " + border, module); - } - } - - String widthStr = element.getAttribute("width"); - try { - width = Integer.valueOf(widthStr); - } catch (Exception e) { - width = null; - if (UtilValidate.isNotEmpty(widthStr)) { - Debug.logError( - "Could not parse the size value of the text element: [" + widthStr + "], setting to null; default of no width will be used", - module); - } - } - - String heightStr = element.getAttribute("height"); - try { - height = Integer.valueOf(heightStr); - } catch (Exception e) { - height = null; - if (UtilValidate.isNotEmpty(heightStr)) { - Debug.logError( - "Could not parse the size value of the text element: [" + heightStr + "], setting to null; default of no height will be used", - module); - } - } + this.setStyle(element.getAttribute("style")); Element subHyperlinkElement = UtilXml.firstChildElement(element, "sub-hyperlink"); if (subHyperlinkElement != null) { @@ -3738,16 +3704,6 @@ public class ModelFormField { public void setSubHyperlink(SubHyperlink newSubHyperlink) { this.subHyperlink = newSubHyperlink; } - public Integer getWidth() { - return width; - } - public Integer getHeight() { - return height; - } - - public int getBorder() { - return border; - } public String getDefaultValue(Map<String, Object> context) { if (this.defaultValue != null) { @@ -3785,6 +3741,14 @@ public class ModelFormField { this.alternate = FlexibleStringExpander.getInstance(alternate); } + public String getStyle(Map<String, Object> context) { + if (UtilValidate.isNotEmpty(this.style)) return this.style.expandString(context); + return ""; + } + + public void setStyle(String style) { + this.style = FlexibleStringExpander.getInstance(style); + } } public static class ContainerField extends FieldInfo { Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java?rev=1296782&r1=1296781&r2=1296782&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java (original) +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java Sun Mar 4 11:54:13 2012 @@ -2733,29 +2733,17 @@ public class HtmlFormRenderer extends Ht writer.append("<img "); - String value = modelFormField.getEntry(context, imageField.getValue(context)); if (UtilValidate.isNotEmpty(value)) { writer.append(" src=\""); appendContentUrl(writer, value); writer.append('"'); } - - writer.append(" border=\""); - writer.append(Integer.toString(imageField.getBorder())); - writer.append('"'); - - Integer width = imageField.getWidth(); - if (width != null) { - writer.append(" width=\""); - writer.append(width.toString()); - writer.append('"'); - } - - Integer height = imageField.getHeight(); - if (height != null) { - writer.append(" height=\""); - writer.append(height.toString()); + + value = modelFormField.getEntry(context, imageField.getStyle(context)); + if (UtilValidate.isNotEmpty(value)) { + writer.append(" class=\""); + appendContentUrl(writer, value); writer.append('"'); } Modified: ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl?rev=1296782&r1=1296781&r2=1296782&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl (original) +++ ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl Sun Mar 4 11:54:13 2012 @@ -709,7 +709,7 @@ Parameter: lastViewName, String, optiona <#macro renderFileField className alert name value size maxlength autocomplete><input type="file" <@renderClass className alert /><#if name?has_content> name="${name}"</#if><#if value?has_content> value="${value}"</#if><#if size?has_content> size="${size}"</#if><#if maxlength?has_content> maxlength="${maxlength}"</#if><#if autocomplete?has_content> autocomplete="off"</#if>/><#rt/></#macro> <#macro renderPasswordField className alert name value size maxlength id autocomplete><input type="password" <@renderClass className alert /><#if name?has_content> name="${name}"</#if><#if value?has_content> value="${value}"</#if><#if size?has_content> size="${size}"</#if><#if maxlength?has_content> maxlength="${maxlength}"</#if><#if id?has_content> id="${id}"</#if><#if autocomplete?has_content> autocomplete="off"</#if>/></#macro> -<#macro renderImageField value description alternate border width height event action><img<#if value?has_content> src="${value}"</#if><#if description?has_content> title="${description}"</#if> alt="<#if alternate?has_content>${alternate}"</#if>"<#if border?has_content> border="${border}"</#if><#if width?has_content> width="${width}"</#if><#if height?has_content> height="${height}"</#if><#if event?has_content> ${event?html}="${action}" </#if>/></#macro> +<#macro renderImageField value description alternate style event action><img<#if value?has_content> src="${value}"</#if><#if description?has_content> title="${description}"</#if> alt="<#if alternate?has_content>${alternate}"</#if><#if style?has_content> class="${style}"</#if><#if event?has_content> ${event?html}="${action}" </#if>/></#macro> <#macro renderBanner style leftStyle rightStyle leftText text rightText> <table width="100%"> <tr><#rt/> Modified: ofbiz/trunk/specialpurpose/ebay/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/widget/CommonScreens.xml?rev=1296782&r1=1296781&r2=1296782&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebay/widget/CommonScreens.xml (original) +++ ofbiz/trunk/specialpurpose/ebay/widget/CommonScreens.xml Sun Mar 4 11:54:13 2012 @@ -66,7 +66,7 @@ under the License. <include-menu name="ProductTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> <container> <label style="h1">${uiLabelMap.${labelTitleProperty}} ${uiLabelMap.CommonFor}: ${product.internalName} [${uiLabelMap.CommonId}:${productId}] ${${extraFunctionName}}</label> - <image src="${product.smallImageUrl}" height="40" width="40" url-mode="content"/> + <image src="${product.smallImageUrl}" url-mode="content" style="cssImgSmall"/> </container> <!-- add Create Product and View Product (in ecommerce) links --> Modified: ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml?rev=1296782&r1=1296781&r2=1296782&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml (original) +++ ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml Sun Mar 4 11:54:13 2012 @@ -608,8 +608,8 @@ under the License. <field name="productStoreId"><hidden value="${parameters.productStoreId}"/></field> <field name="itemId"><hidden value="${parameters.itemId}"/></field> <field name="listingType"><hidden/></field> - <field name="pictureURL" title="Picture" use-when="pictureURL==null"><image width="100" value="/images/defaultImage.jpg"></image></field> - <field name="pictureURL" title="Picture" use-when="pictureURL!=null"><image width="150"></image></field> + <field name="pictureURL" title="Picture" use-when="pictureURL==null"><image value="/images/defaultImage.jpg" style="cssImgLarge"/></field> + <field name="pictureURL" title="Picture" use-when="pictureURL!=null"><image style="cssImgLarge"/></field> <field name="imageData" title="${uiLabelMap.CommonUpload}"><file/></field> <field name="title"><text size="50"/></field> <field name="description" encode-output="true"><textarea/></field> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl?rev=1296782&r1=1296781&r2=1296782&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl Sun Mar 4 11:54:13 2012 @@ -190,7 +190,7 @@ function getConfigDetails(event) { <#assign productLargeImageUrl = firstLargeImage> </#if> <#if productLargeImageUrl?string?has_content> - <a href="javascript:popupDetail();"><img src='<@ofbizContentUrl>${contentPathPrefix?if_exists}${productLargeImageUrl?if_exists}</@ofbizContentUrl>' name='mainImage' vspace='5' hspace='5' border='0' width='200' align='left' alt="" /></a> + <a href="javascript:popupDetail();"><img src='<@ofbizContentUrl>${contentPathPrefix?if_exists}${productLargeImageUrl?if_exists}</@ofbizContentUrl>' name='mainImage' vspace='5' hspace='5' class='cssImgXLarge' align='left' alt="" /></a> </#if> </td> <td align="right" valign="top"> @@ -402,7 +402,7 @@ function getConfigDetails(event) { <#assign imageUrl = "/images/defaultImage.jpg"> </#if> <td align="center" valign="bottom"> - <a href="javascript:getList('FT${featureOrderFirst}','${indexer}',1);"><img src="<@ofbizContentUrl>${contentPathPrefix?if_exists}${imageUrl}</@ofbizContentUrl>" border="0" width="60" height="60" alt="" /></a> + <a href="javascript:getList('FT${featureOrderFirst}','${indexer}',1);"><img src="<@ofbizContentUrl>${contentPathPrefix?if_exists}${imageUrl}</@ofbizContentUrl>" class='cssImgSmall' alt="" /></a> <br /> <a href="javascript:getList('FT${featureOrderFirst}','${indexer}',1);" class="buttontext">${key}</a> </td> @@ -463,7 +463,7 @@ function getConfigDetails(event) { </#if> <#assign image = question.content.get("IMAGE_URL")?if_exists> <#if image?string?has_content> - <img src='<@ofbizContentUrl>${contentPathPrefix?if_exists}${image?if_exists}</@ofbizContentUrl>' vspace='5' hspace='5' border='0' width='200' align='left' alt="" /> + <img src='<@ofbizContentUrl>${contentPathPrefix?if_exists}${image?if_exists}</@ofbizContentUrl>' vspace='5' hspace='5' class='cssImgXLarge' align='left' alt="" /> </#if> <#else> <div><a href='#${question.getConfigItem().getString("configItemId")}' class="buttontext">Details</a></div> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl?rev=1296782&r1=1296781&r2=1296782&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl Sun Mar 4 11:54:13 2012 @@ -364,7 +364,7 @@ $(function(){ <#assign productLargeImageUrl = firstLargeImage /> </#if> <#if productLargeImageUrl?string?has_content> - <a href="javascript:popupDetail();"><img id="detailImage" src="<@ofbizContentUrl>${contentPathPrefix?if_exists}${productLargeImageUrl?if_exists}</@ofbizContentUrl>" name="mainImage" vspace="5" hspace="5" width="200" alt="" /></a> + <a href="javascript:popupDetail();"><img id="detailImage" src="<@ofbizContentUrl>${contentPathPrefix?if_exists}${productLargeImageUrl?if_exists}</@ofbizContentUrl>" name="mainImage" vspace="5" hspace="5" class="cssImgXLarge" alt="" /></a> <input type="hidden" id="originalImage" name="originalImage" value="<@ofbizContentUrl>${contentPathPrefix?if_exists}${productLargeImageUrl?if_exists}</@ofbizContentUrl>" /> </#if> <#if !productLargeImageUrl?string?has_content> @@ -390,7 +390,7 @@ $(function(){ <#assign productLargeImageUrl = firstLargeImage /> </#if> <#if productLargeImageUrl?string?has_content> - <a href="javascript:popupDetail();"><img id="detailImage" src="<@ofbizContentUrl>${contentPathPrefix?if_exists}${productLargeImageUrl?if_exists}</@ofbizContentUrl>" name="mainImage" vspace="5" hspace="5" width="200" alt="" /></a> + <a href="javascript:popupDetail();"><img id="detailImage" src="<@ofbizContentUrl>${contentPathPrefix?if_exists}${productLargeImageUrl?if_exists}</@ofbizContentUrl>" name="mainImage" vspace="5" hspace="5" class="cssImgXLarge" alt="" /></a> <input type="hidden" id="originalImage" name="originalImage" value="<@ofbizContentUrl>${contentPathPrefix?if_exists}${productLargeImageUrl?if_exists}</@ofbizContentUrl>" /> </#if> <#if !productLargeImageUrl?string?has_content> @@ -400,22 +400,22 @@ $(function(){ <div id="additionalImageBox"> <#if productAdditionalImage1?string?has_content> <div class="additionalImage"> - <a href="javascript:void(0);" swapDetail="<@ofbizContentUrl>${productAdditionalImage1}</@ofbizContentUrl>"><img src="<@ofbizContentUrl>${productAdditionalImage1}</@ofbizContentUrl>" vspace="5" hspace="5" width="200" alt="" /></a> + <a href="javascript:void(0);" swapDetail="<@ofbizContentUrl>${productAdditionalImage1}</@ofbizContentUrl>"><img src="<@ofbizContentUrl>${productAdditionalImage1}</@ofbizContentUrl>" vspace="5" hspace="5" class="cssImgXLarge" alt="" /></a> </div> </#if> <#if productAdditionalImage2?string?has_content> <div class="additionalImage"> - <a href="javascript:void(0);" swapDetail="<@ofbizContentUrl>${productAdditionalImage2}</@ofbizContentUrl>"><img src="<@ofbizContentUrl>${productAdditionalImage2}</@ofbizContentUrl>" vspace="5" hspace="5" width="200" alt="" /></a> + <a href="javascript:void(0);" swapDetail="<@ofbizContentUrl>${productAdditionalImage2}</@ofbizContentUrl>"><img src="<@ofbizContentUrl>${productAdditionalImage2}</@ofbizContentUrl>" vspace="5" hspace="5" class="cssImgXLarge" alt="" /></a> </div> </#if> <#if productAdditionalImage3?string?has_content> <div class="additionalImage"> - <a href="javascript:void(0);" swapDetail="<@ofbizContentUrl>${productAdditionalImage3}</@ofbizContentUrl>"><img src="<@ofbizContentUrl>${productAdditionalImage3}</@ofbizContentUrl>" vspace="5" hspace="5" width="200" alt="" /></a> + <a href="javascript:void(0);" swapDetail="<@ofbizContentUrl>${productAdditionalImage3}</@ofbizContentUrl>"><img src="<@ofbizContentUrl>${productAdditionalImage3}</@ofbizContentUrl>" vspace="5" hspace="5" class="cssImgXLarge" alt="" /></a> </div> </#if> <#if productAdditionalImage4?string?has_content> <div class="additionalImage"> - <a href="javascript:void(0);" swapDetail="<@ofbizContentUrl>${productAdditionalImage4}</@ofbizContentUrl>"><img src="<@ofbizContentUrl>${productAdditionalImage4}</@ofbizContentUrl>" vspace="5" hspace="5" width="200" alt="" /></a> + <a href="javascript:void(0);" swapDetail="<@ofbizContentUrl>${productAdditionalImage4}</@ofbizContentUrl>"><img src="<@ofbizContentUrl>${productAdditionalImage4}</@ofbizContentUrl>" vspace="5" hspace="5" class="cssImgXLarge" alt="" /></a> </div> </#if> </div> @@ -746,7 +746,7 @@ $(function(){ <#if !imageUrl?string?has_content> <#assign imageUrl = "/images/defaultImage.jpg" /> </#if> - <a href="javascript:getList('FT${featureOrderFirst}','${indexer}',1);"><img src="<@ofbizContentUrl>${contentPathPrefix?if_exists}${imageUrl}</@ofbizContentUrl>" width="60" height="60" alt="" /></a> + <a href="javascript:getList('FT${featureOrderFirst}','${indexer}',1);"><img src="<@ofbizContentUrl>${contentPathPrefix?if_exists}${imageUrl}</@ofbizContentUrl>" class="cssImgSmall" alt="" /></a> <br /> <a href="javascript:getList('FT${featureOrderFirst}','${indexer}',1);" class="linktext">${key}</a> </#if> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/editforumarticle.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/editforumarticle.ftl?rev=1296782&r1=1296781&r2=1296782&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/editforumarticle.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/editforumarticle.ftl Sun Mar 4 11:54:13 2012 @@ -59,7 +59,7 @@ under the License. <div class="screenlet-body"> <table> <tr><td align="right" nowrap="nowrap"><div class='tabletext'>${uiLabelMap.EcommerceImage}</div></td><td> </td><td><div class='tabletext'> - <img src="<@ofbizUrl>img?imgId=${imgDataResourceId?if_exists}</@ofbizUrl>" alt="" /> + <img src="<@ofbizUrl>img?imgId=${imgDataResourceId?if_exists}</@ofbizUrl>" alt="" class='cssImgStandard' /> <div></td></tr> </table> </div> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/splitship.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/splitship.ftl?rev=1296782&r1=1296781&r2=1296782&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/splitship.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/splitship.ftl Sun Mar 4 11:54:13 2012 @@ -180,7 +180,7 @@ function submitForm(form, mode, value) { <#if !smallImageUrl?string?has_content><#assign smallImageUrl = "/images/defaultImage.jpg"></#if> <#if smallImageUrl?string?has_content> <a href="<@ofbizUrl>product?product_id=${cartLine.getProductId()}</@ofbizUrl>"> - <img src="<@ofbizContentUrl>${requestAttributes.contentPathPrefix?if_exists}${smallImageUrl}</@ofbizContentUrl>" width="50" class="imageborder" border="0" alt="" /> + <img src="<@ofbizContentUrl>${requestAttributes.contentPathPrefix?if_exists}${smallImageUrl}</@ofbizContentUrl>" class="cssImgSmall" alt="" /> </a> </#if> <#-- end code to display a small image of the product --> Modified: ofbiz/trunk/specialpurpose/googlebase/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlebase/widget/CommonScreens.xml?rev=1296782&r1=1296781&r2=1296782&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/googlebase/widget/CommonScreens.xml (original) +++ ofbiz/trunk/specialpurpose/googlebase/widget/CommonScreens.xml Sun Mar 4 11:54:13 2012 @@ -91,7 +91,7 @@ under the License. <include-menu name="ProductTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> <container> <label style="h1">${uiLabelMap.${labelTitleProperty}} ${uiLabelMap.CommonFor}: ${product.internalName} [${uiLabelMap.CommonId}:${productId}] ${${extraFunctionName}}</label> - <image src="${product.smallImageUrl}" height="40" width="40" url-mode="content"/> + <image src="${product.smallImageUrl}" url-mode="content" style="cssImgSmall"/> </container> <!-- add Create Product and View Product (in ecommerce) links --> Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml?rev=1296782&r1=1296781&r2=1296782&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml (original) +++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml Sun Mar 4 11:54:13 2012 @@ -36,7 +36,7 @@ under the License. <field name="PASSWORD" title="${uiLabelMap.CommonPassword}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><password size="15" maxlength="250"/></field> <field name="CONFIRM_PASSWORD" title="${uiLabelMap.CommonPassword}" tooltip="* ${uiLabelMap.CommonConfirm}" widget-style="required"><password size="15" maxlength="250"/></field> <field name="VerifyCaptchaTitle" title="${uiLabelMap.MyPortalVerifyCaptcha}" title-area-style="group-label"><display description=" " also-hidden="false"/></field> - <field name="picOfcaptcha" title="${uiLabelMap.MyPortalPicCaptcha}"><image value="${parameters.captchaFileName}" height="40" width="149"/></field> + <field name="picOfcaptcha" title="${uiLabelMap.MyPortalPicCaptcha}"><image value="${parameters.captchaFileName}" style="cssImgSmall"/></field> <field name="reload" title="${uiLabelMap.CommonEmptyHeader}"><hyperlink target="newRegisterLogin" description="${uiLabelMap.MyPortalReloadImage}"/></field> <field name="captcha" title="${uiLabelMap.MyPortalVerifyCaptcha}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="23" maxlength="30"/></field> <field name="submitButton" title="${uiLabelMap.CommonSave}" title-area-style="group-label"><submit button-type="button"/></field> Modified: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/cart/ShowCart.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/cart/ShowCart.ftl?rev=1296782&r1=1296781&r2=1296782&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/cart/ShowCart.ftl (original) +++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/cart/ShowCart.ftl Sun Mar 4 11:54:13 2012 @@ -107,7 +107,7 @@ under the License. <#assign smallImageUrl = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(cartLine.getProduct(), "SMALL_IMAGE_URL", locale, dispatcher)?if_exists> <#if !smallImageUrl?string?has_content><#assign smallImageUrl = "/images/defaultImage.jpg"></#if> <#if smallImageUrl?string?has_content> - <img src="<@ofbizContentUrl>${requestAttributes.contentPathPrefix?if_exists}${smallImageUrl}</@ofbizContentUrl>" align="left" width="50" class="imageborder" border="0"/> + <img src="<@ofbizContentUrl>${requestAttributes.contentPathPrefix?if_exists}${smallImageUrl}</@ofbizContentUrl>" align="left" class="cssImgSmall" /> </#if> <#-- end code to display a small image of the product --> ${cartLine.getProductId()} - ${cartLine.getName()?if_exists} : ${cartLine.getDescription()?if_exists} Modified: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/cart/ShowCartItemSelected.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/cart/ShowCartItemSelected.ftl?rev=1296782&r1=1296781&r2=1296782&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/cart/ShowCartItemSelected.ftl (original) +++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/cart/ShowCartItemSelected.ftl Sun Mar 4 11:54:13 2012 @@ -31,7 +31,7 @@ under the License. </#if> <#if smallImageUrl?string?has_content> <div id="CartItemSelectedLeft"> - <img src="<@ofbizContentUrl>${requestAttributes.contentPathPrefix?if_exists}${smallImageUrl}</@ofbizContentUrl>" align="left" width="50" class="imageborder" border="0"/> + <img src="<@ofbizContentUrl>${requestAttributes.contentPathPrefix?if_exists}${smallImageUrl}</@ofbizContentUrl>" align="left" class="cssImgSmall" /> </div> </#if> <div id="CartItemSelectedRight"> Modified: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/catalog/CategoryDetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/catalog/CategoryDetail.ftl?rev=1296782&r1=1296781&r2=1296782&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/catalog/CategoryDetail.ftl (original) +++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/catalog/CategoryDetail.ftl Sun Mar 4 11:54:13 2012 @@ -39,7 +39,7 @@ under the License. <li id="${button}" class="notSelectedButton"> <#if smallImageUrl?string?has_content> <a href="${addItemLink}"> - <img src="<@ofbizContentUrl>${smallImageUrl}</@ofbizContentUrl>" align="center" width="60px" height="60px" border="0"/> + <img src="<@ofbizContentUrl>${smallImageUrl}</@ofbizContentUrl>" align="center" class="cssImgSmall"/> </a> </#if> </li> Modified: ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/style.css URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/style.css?rev=1296782&r1=1296781&r2=1296782&view=diff ============================================================================== --- ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/style.css (original) +++ ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/style.css Sun Mar 4 11:54:13 2012 @@ -1543,6 +1543,30 @@ width:10% width:10% } +img.cssImgXLarge { + /*border: 1px black solid;*/ + max-width: 200px; + max-height: 150px; +} + +img.cssImgLarge { + /*border: 1px black solid;*/ + max-width: 100px; + max-height: 75px; +} + +img.cssImgStandard { + /*border: 1px black solid;*/ + max-width: 70px; + max-height: 52px; +} + +img.cssImgSmall { + /*border: 1px black solid;*/ + max-width: 50px; + max-height: 37px; +} + /* ========================================================= */ /* ===== JavaScript jQuery widgets Smoothness Design ===== */ /* ========================================================== */ Modified: ofbiz/trunk/themes/bluelight/webapp/bluelight/style.css URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bluelight/webapp/bluelight/style.css?rev=1296782&r1=1296781&r2=1296782&view=diff ============================================================================== --- ofbiz/trunk/themes/bluelight/webapp/bluelight/style.css (original) +++ ofbiz/trunk/themes/bluelight/webapp/bluelight/style.css Sun Mar 4 11:54:13 2012 @@ -2046,6 +2046,30 @@ width:56px; background-image:url(/images/spinner.gif); } +img.cssImgXLarge { + /*border: 1px black solid;*/ + max-width: 200px; + max-height: 150px; +} + +img.cssImgLarge { + /*border: 1px black solid;*/ + max-width: 100px; + max-height: 75px; +} + +img.cssImgStandard { + /*border: 1px black solid;*/ + max-width: 70px; + max-height: 52px; +} + +img.cssImgSmall { + /*border: 1px black solid;*/ + max-width: 50px; + max-height: 37px; +} + /* ========================================================= */ /* ===== JavaScript jQuery widgets Smoothness Design ===== */ /* ========================================================== */ Modified: ofbiz/trunk/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css?rev=1296782&r1=1296781&r2=1296782&view=diff ============================================================================== --- ofbiz/trunk/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css (original) +++ ofbiz/trunk/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css Sun Mar 4 11:54:13 2012 @@ -2044,6 +2044,30 @@ background-image:url(/images/spinner.gif padding-top: 4px; } +img.cssImgXLarge { + /*border: 1px black solid;*/ + max-width: 200px; + max-height: 150px; +} + +img.cssImgLarge { + /*border: 1px black solid;*/ + max-width: 100px; + max-height: 75px; +} + +img.cssImgStandard { + /*border: 1px black solid;*/ + max-width: 70px; + max-height: 52px; +} + +img.cssImgSmall { + /*border: 1px black solid;*/ + max-width: 50px; + max-height: 37px; +} + /* ========================================================== */ /* ===== JavaScript jQuery widgets Smoothness Design ===== */ /* ========================================================== */ Modified: ofbiz/trunk/themes/flatgrey/webapp/flatgrey/maincss.css URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/webapp/flatgrey/maincss.css?rev=1296782&r1=1296781&r2=1296782&view=diff ============================================================================== --- ofbiz/trunk/themes/flatgrey/webapp/flatgrey/maincss.css (original) +++ ofbiz/trunk/themes/flatgrey/webapp/flatgrey/maincss.css Sun Mar 4 11:54:13 2012 @@ -2141,6 +2141,30 @@ overflow: auto; width: 30em; } +img.cssImgXLarge { + /*border: 1px black solid;*/ + max-width: 200px; + max-height: 150px; +} + +img.cssImgLarge { + /*border: 1px black solid;*/ + max-width: 100px; + max-height: 75px; +} + +img.cssImgStandard { + /*border: 1px black solid;*/ + max-width: 70px; + max-height: 52px; +} + +img.cssImgSmall { + /*border: 1px black solid;*/ + max-width: 50px; + max-height: 37px; +} + /* From http://jqueryui.com/demos/autocomplete/maxheight.html */ /* When displaying a long list of options, you can simply set the max-height for the autocomplete menu to prevent the menu from growing too large */ .ui-autocomplete { Modified: ofbiz/trunk/themes/multiflex/webapp/multiflex/style.css URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/multiflex/webapp/multiflex/style.css?rev=1296782&r1=1296781&r2=1296782&view=diff ============================================================================== --- ofbiz/trunk/themes/multiflex/webapp/multiflex/style.css (original) +++ ofbiz/trunk/themes/multiflex/webapp/multiflex/style.css Sun Mar 4 11:54:13 2012 @@ -2165,6 +2165,30 @@ height: 1px; padding-top: 4px; } +img.cssImgXLarge { + /*border: 1px black solid;*/ + max-width: 200px; + max-height: 150px; +} + +img.cssImgLarge { + /*border: 1px black solid;*/ + max-width: 100px; + max-height: 75px; +} + +img.cssImgStandard { + /*border: 1px black solid;*/ + max-width: 70px; + max-height: 52px; +} + +img.cssImgSmall { + /*border: 1px black solid;*/ + max-width: 50px; + max-height: 37px; +} + /* ========================================================== */ /* ===== JavaScript jQuery widgets ===== */ /* ========================================================== */ @@ -2818,4 +2842,3 @@ width:10% */ .ui-progressbar { height:2em; text-align: left; } .ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; } - Modified: ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/style.css URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/style.css?rev=1296782&r1=1296781&r2=1296782&view=diff ============================================================================== --- ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/style.css (original) +++ ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/style.css Sun Mar 4 11:54:13 2012 @@ -2431,6 +2431,30 @@ background-image:url(/tomahawk/images/sp padding-top: 4px; } +img.cssImgXLarge { + /*border: 1px black solid;*/ + max-width: 200px; + max-height: 150px; +} + +img.cssImgLarge { + /*border: 1px black solid;*/ + max-width: 100px; + max-height: 75px; +} + +img.cssImgStandard { + /*border: 1px black solid;*/ + max-width: 70px; + max-height: 52px; +} + +img.cssImgSmall { + /*border: 1px black solid;*/ + max-width: 50px; + max-height: 37px; +} + /* ========================================================= */ /* ===== JavaScript jQuery widgets ===== */ /* ========================================================== */ |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |