OFBiz › OFBiz - Commits

svn commit: r1305581 [36/36] - in /ofbiz/branches/20111205EmailHandling: ./ applications/accounting/config/ applications/accounting/data/ applications/accounting/entitydef/ applications/accounting/script/org/ofbiz/accounting/finaccount/ applications/ac...

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

erwan

svn commit: r1305581 [36/36] - in /ofbiz/branches/20111205EmailHandling: ./ applications/accounting/config/ applications/accounting/data/ applications/accounting/entitydef/ applications/accounting/script/org/ofbiz/accounting/finaccount/ applications/ac...

Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/shark/src/org/ofbiz/shark/instance/Assignment.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/shark/src/org/ofbiz/shark/instance/Assignment.java?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/specialpurpose/shark/src/org/ofbiz/shark/instance/Assignment.java (original)
+++ ofbiz/branches/20111205EmailHandling/specialpurpose/shark/src/org/ofbiz/shark/instance/Assignment.java Mon Mar 26 20:56:02 2012
@@ -60,7 +60,7 @@ public class Assignment extends Instance
super(mgr, delegator);
this.newValue = true;
this.assignment = delegator.makeValue(org.ofbiz.shark.SharkConstants.WfAssignment);
- Debug.log("******* New assignment created", module);
+ Debug.logInfo("******* New assignment created", module);
}

public static Assignment getInstance(EntityPersistentMgr mgr, GenericValue assignment) {
@@ -88,7 +88,7 @@ public class Assignment extends Instance

public void setActivityId(String actId) {
assignment.set(org.ofbiz.shark.SharkConstants.activityId, actId);
- Debug.log("Set activityId on assignment : " + actId, module);
+ Debug.logInfo("Set activityId on assignment : " + actId, module);
// set the processId - kludge
/* should not be needed anymore
try {
@@ -108,7 +108,7 @@ public class Assignment extends Instance

public void setResourceUsername(String username) {
assignment.set(org.ofbiz.shark.SharkConstants.userName, username);
- Debug.log("Set userName on assignment : " + username, module);
+ Debug.logInfo("Set userName on assignment : " + username, module);
}

public String getResourceUsername() {
@@ -117,7 +117,7 @@ public class Assignment extends Instance

public void setProcessId(String procId) {
assignment.set(org.ofbiz.shark.SharkConstants.processId, procId);
- Debug.log("Set processId on assignment : " + procId, module);
+ Debug.logInfo("Set processId on assignment : " + procId, module);
}

public String getProcessId() {
@@ -139,7 +139,7 @@ public class Assignment extends Instance
} else {
delegator.store(assignment);
}
- Debug.log("Stored assignment : " + assignment, module);
+ Debug.logInfo("Stored assignment : " + assignment, module);
}

public void reload() throws GenericEntityException {
@@ -151,7 +151,7 @@ public class Assignment extends Instance
public void remove() throws GenericEntityException {
if (!newValue) {
delegator.removeValue(assignment);
- Debug.log("**** REMOVED : " + this, module);
+ Debug.logInfo("**** REMOVED : " + this, module);
}
}

Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/shark/src/org/ofbiz/shark/instance/EntityPersistentMgr.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/shark/src/org/ofbiz/shark/instance/EntityPersistentMgr.java?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/specialpurpose/shark/src/org/ofbiz/shark/instance/EntityPersistentMgr.java (original)
+++ ofbiz/branches/20111205EmailHandling/specialpurpose/shark/src/org/ofbiz/shark/instance/EntityPersistentMgr.java Mon Mar 26 20:56:02 2012
@@ -692,14 +692,14 @@ public class EntityPersistentMgr impleme
throw new PersistenceException(e);
}
if (UtilValidate.isNotEmpty(lookupList)) {
- Debug.log("Lookup list contains : " + lookupList.size(), module);
+ Debug.logInfo("Lookup list contains : " + lookupList.size(), module);
Iterator i = lookupList.iterator();
while (i.hasNext()) {
GenericValue v = (GenericValue) i.next();
createdList.add(ProcessVariable.getInstance(this, v));
}
} else {
- Debug.log("Lookup list empty", module);
+ Debug.logInfo("Lookup list empty", module);
}
if (Debug.verboseOn()) Debug.log("Returning list : " + createdList.size(), module);
return createdList;
@@ -948,7 +948,7 @@ public class EntityPersistentMgr impleme
Debug.logInfo(">>>>>>>>>>>>>>>>>>>>>>> getAssignmentsWhere(SharkTransaction trans, String sqlWhere)",module);
Debug.logInfo(">>>>>>>>>>>>>>>>>>>>>>> sqlWhere = " + sqlWhere ,module);
if (sqlWhere != null) {
- Debug.log("Call : Attempt to call getAssignmentsWhere() - " + sqlWhere, module);
+ Debug.logInfo("Call : Attempt to call getAssignmentsWhere() - " + sqlWhere, module);
throw new PersistenceException("Method not available to this implementation! (" + sqlWhere + ")");
}
return this.getAllAssignments(trans);

Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/shark/src/org/ofbiz/shark/instance/Process.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/shark/src/org/ofbiz/shark/instance/Process.java?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/specialpurpose/shark/src/org/ofbiz/shark/instance/Process.java (original)
+++ ofbiz/branches/20111205EmailHandling/specialpurpose/shark/src/org/ofbiz/shark/instance/Process.java Mon Mar 26 20:56:02 2012
@@ -80,11 +80,11 @@ public class Process extends InstanceEnt
public static Process getInstance(EntityPersistentMgr mgr, String processId) throws PersistenceException {
Process proc = new Process(mgr, SharkContainer.getDelegator(), processId);
if (proc.isLoaded()) {
- Debug.log("Returning loaded Process", module);
+ Debug.logInfo("Returning loaded Process", module);
return proc;
}
- Debug.log("Returning null Process ID : " + processId, module);
- if (processId == null) Debug.log(new Exception(), module);
+ Debug.logInfo("Returning null Process ID : " + processId, module);
+ if (processId == null) Debug.logError(new Exception(), module);
return null;
}

@@ -231,7 +231,7 @@ public class Process extends InstanceEnt
public void remove() throws GenericEntityException {
if (!newValue) {
delegator.removeValue(process);
- Debug.log("**** REMOVED : " + this, module);
+ Debug.logInfo("**** REMOVED : " + this, module);
}
delegator.removeByAnd(org.ofbiz.shark.SharkConstants.WfRequester, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.processId, this.getId()));
}

Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/shark/src/org/ofbiz/shark/instance/ProcessMgr.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/shark/src/org/ofbiz/shark/instance/ProcessMgr.java?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/specialpurpose/shark/src/org/ofbiz/shark/instance/ProcessMgr.java (original)
+++ ofbiz/branches/20111205EmailHandling/specialpurpose/shark/src/org/ofbiz/shark/instance/ProcessMgr.java Mon Mar 26 20:56:02 2012
@@ -144,7 +144,7 @@ public class ProcessMgr extends Instance
public void remove() throws GenericEntityException {
if (!newValue) {
delegator.removeValue(processMgr);
- Debug.log("**** REMOVED : " + this, module);
+ Debug.logInfo("**** REMOVED : " + this, module);
}
}

Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/shark/src/org/ofbiz/shark/instance/ProcessVariable.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/shark/src/org/ofbiz/shark/instance/ProcessVariable.java?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/specialpurpose/shark/src/org/ofbiz/shark/instance/ProcessVariable.java (original)
+++ ofbiz/branches/20111205EmailHandling/specialpurpose/shark/src/org/ofbiz/shark/instance/ProcessVariable.java Mon Mar 26 20:56:02 2012
@@ -61,7 +61,7 @@ public class ProcessVariable extends Ins
super(mgr, delegator);
this.newValue = true;
this.processVariable = delegator.makeValue(org.ofbiz.shark.SharkConstants.WfProcessVariable, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.processVariableId, delegator.getNextSeqId(org.ofbiz.shark.SharkConstants.WfProcessVariable)));
- Debug.log("******* New process variable created", module);
+ Debug.logInfo("******* New process variable created", module);
}

public static ProcessVariable getInstance(EntityPersistentMgr mgr, GenericValue processVariable) {

Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/shark/src/org/ofbiz/shark/instance/Resource.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/shark/src/org/ofbiz/shark/instance/Resource.java?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/specialpurpose/shark/src/org/ofbiz/shark/instance/Resource.java (original)
+++ ofbiz/branches/20111205EmailHandling/specialpurpose/shark/src/org/ofbiz/shark/instance/Resource.java Mon Mar 26 20:56:02 2012
@@ -119,7 +119,7 @@ public class Resource extends InstanceEn
public void remove() throws GenericEntityException {
if (!newValue) {
delegator.removeValue(resource);
- Debug.log("**** REMOVED : " + this, module);
+ Debug.logInfo("**** REMOVED : " + this, module);
}
}
}

Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/shark/src/org/ofbiz/shark/mapping/EntityParticipantMap.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/shark/src/org/ofbiz/shark/mapping/EntityParticipantMap.java?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/specialpurpose/shark/src/org/ofbiz/shark/mapping/EntityParticipantMap.java (original)
+++ ofbiz/branches/20111205EmailHandling/specialpurpose/shark/src/org/ofbiz/shark/mapping/EntityParticipantMap.java Mon Mar 26 20:56:02 2012
@@ -152,7 +152,7 @@ public class EntityParticipantMap implem
}

public void remove() throws RootException {
- Debug.log("::Remove Participant Map::", module);
+ Debug.logInfo("::Remove Participant Map::", module);
if (!newValue) {
try {
delegator.removeValue(participant);

Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/shark/src/org/ofbiz/shark/repository/EntityRepositoryMgr.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/shark/src/org/ofbiz/shark/repository/EntityRepositoryMgr.java?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/specialpurpose/shark/src/org/ofbiz/shark/repository/EntityRepositoryMgr.java (original)
+++ ofbiz/branches/20111205EmailHandling/specialpurpose/shark/src/org/ofbiz/shark/repository/EntityRepositoryMgr.java Mon Mar 26 20:56:02 2012
@@ -73,7 +73,7 @@ public class EntityRepositoryMgr impleme
}

public void deleteXPDL(RepositoryTransaction t, String xpdlId, String xpdlVersion) throws RepositoryException {
- Debug.log("XPDL Delete : " + xpdlId + "/" + xpdlVersion, module);
+ Debug.logInfo("XPDL Delete : " + xpdlId + "/" + xpdlVersion, module);
Delegator delegator = SharkContainer.getDelegator();
GenericValue value = this.getXpdlValue(xpdlId, xpdlVersion, false);
if (value != null) {
@@ -87,7 +87,7 @@ public class EntityRepositoryMgr impleme
}

public void moveToHistory(RepositoryTransaction t, String xpdlId, String xpdlVersion) throws RepositoryException {
- Debug.log("XPDL Move to History : " + xpdlId + "/" + xpdlVersion, module);
+ Debug.logInfo("XPDL Move to History : " + xpdlId + "/" + xpdlVersion, module);
Delegator delegator = SharkContainer.getDelegator();
GenericValue value = this.getXpdlValue(xpdlId, xpdlVersion, false);
value.set(org.ofbiz.shark.SharkConstants.isHistorical, "Y");
@@ -100,7 +100,7 @@ public class EntityRepositoryMgr impleme
}

public void deleteFromHistory(RepositoryTransaction t, String xpdlId, String xpdlVersion) throws RepositoryException {
- Debug.log("XPDL Delete from History: " + xpdlId + "/" + xpdlVersion, module);
+ Debug.logInfo("XPDL Delete from History: " + xpdlId + "/" + xpdlVersion, module);
GenericValue value = this.getXpdlValue(xpdlId, xpdlVersion, true);
if (value != null) {
try {
@@ -112,7 +112,7 @@ public class EntityRepositoryMgr impleme
}

public void clearRepository(RepositoryTransaction t) throws RepositoryException {
- Debug.log("XPDL Clear Repository", module);
+ Debug.logInfo("XPDL Clear Repository", module);
Delegator delegator = SharkContainer.getDelegator();
try {
delegator.removeAll(org.ofbiz.shark.SharkConstants.WfRepository);
@@ -123,7 +123,7 @@ public class EntityRepositoryMgr impleme

public String getCurrentVersion(RepositoryTransaction t, String xpdlId) throws RepositoryException
{
- Debug.log("XPDL get current version : " + xpdlId, module);
+ Debug.logInfo("XPDL get current version : " + xpdlId, module);
List lookupList = this.getXpdlValues(xpdlId, null, false);
GenericValue value = EntityUtil.getFirst(lookupList);
if (value != null) {
@@ -142,7 +142,7 @@ public class EntityRepositoryMgr impleme
}

public byte[] getXPDL(RepositoryTransaction t, String xpdlId) throws RepositoryException {
- Debug.log("XPDL Get : " + xpdlId, module);
+ Debug.logInfo("XPDL Get : " + xpdlId, module);
List lookupList = this.getXpdlValues(xpdlId, null, false);
GenericValue value = EntityUtil.getFirst(lookupList);
if (value != null) {
@@ -153,7 +153,7 @@ public class EntityRepositoryMgr impleme
}

public byte[] getXPDL(RepositoryTransaction t, String xpdlId, String xpdlVersion) throws RepositoryException {
- Debug.log("XPDL Get : " + xpdlId + "/" + xpdlVersion, module);
+ Debug.logInfo("XPDL Get : " + xpdlId + "/" + xpdlVersion, module);
GenericValue value = this.getXpdlValue(xpdlId, xpdlVersion, false);
if (value != null) {
return value.getBytes(org.ofbiz.shark.SharkConstants.xpdlData);
@@ -177,25 +177,25 @@ public class EntityRepositoryMgr impleme

public boolean doesXPDLExist(RepositoryTransaction t, String xpdlId) throws RepositoryException {
List xpdls = this.getXpdlValues(xpdlId, null, false);
- Debug.log("Does XPDL [" + xpdlId + "] Exist - " + xpdls + "(" + (UtilValidate.isNotEmpty(xpdls) ? true : false) + ")", module);
+ Debug.logInfo("Does XPDL [" + xpdlId + "] Exist - " + xpdls + "(" + (UtilValidate.isNotEmpty(xpdls) ? true : false) + ")", module);
return (UtilValidate.isNotEmpty(xpdls) ? true : false);
}

public boolean doesXPDLExist(RepositoryTransaction t, String xpdlId, String xpdlVersion) throws RepositoryException {
GenericValue xpdl = this.getXpdlValue(xpdlId, xpdlVersion, false);
- Debug.log("Does XPDL [" + xpdlId + "/" + xpdlVersion + "] Exist - " + xpdl + "(" + (xpdl != null) + ")", module);
+ Debug.logInfo("Does XPDL [" + xpdlId + "/" + xpdlVersion + "] Exist - " + xpdl + "(" + (xpdl != null) + ")", module);
return (xpdl != null);
}

public List getExistingXPDLIds(RepositoryTransaction t) throws RepositoryException {
- Debug.log("Get Existing XPDL IDs", module);
+ Debug.logInfo("Get Existing XPDL IDs", module);
List lookupList = this.getXpdlValues(null, null, true);
List idList = new ArrayList();
if (UtilValidate.isNotEmpty(lookupList)) {
Iterator i = lookupList.iterator();
while (i.hasNext()) {
GenericValue v = (GenericValue) i.next();
- Debug.log("Checking - " + v, module);
+ Debug.logInfo("Checking - " + v, module);
String id = v.getString(org.ofbiz.shark.SharkConstants.xpdlId);
if (!idList.contains(id)) {
idList.add(id);
@@ -206,7 +206,7 @@ public class EntityRepositoryMgr impleme
}

public List getReferringXPDLIds(RepositoryTransaction t, String referredXPDLId) throws RepositoryException {
- Debug.log("Get XPDL Reference IDs", module);
+ Debug.logInfo("Get XPDL Reference IDs", module);
Delegator delegator = SharkContainer.getDelegator();
List referringIds = new ArrayList();
List refs = null;
@@ -227,7 +227,7 @@ public class EntityRepositoryMgr impleme
}

public List getReferringXPDLVersions(RepositoryTransaction t, String referredXPDLId, String referringXPDLId) throws RepositoryException {
- Debug.log("Get Referring XPDL Versions", module);
+ Debug.logInfo("Get Referring XPDL Versions", module);
Delegator delegator = SharkContainer.getDelegator();
List referringVers = new ArrayList();
List refs = null;
@@ -247,7 +247,7 @@ public class EntityRepositoryMgr impleme
}

public List getReferredXPDLIds(RepositoryTransaction t, String referringXPDLId, String referringXPDLVersion) throws RepositoryException {
- Debug.log("Get Referring XPDL IDs", module);
+ Debug.logInfo("Get Referring XPDL IDs", module);
Delegator delegator = SharkContainer.getDelegator();
List referringIds = new ArrayList();
List refs = null;
@@ -323,7 +323,7 @@ public class EntityRepositoryMgr impleme
byte[] serializedPkg,
long xpdlClassVer) throws RepositoryException
{
- Debug.log("XPDL Upload : " + xpdlId, module);
+ Debug.logInfo("XPDL Upload : " + xpdlId, module);
//try {throw new Exception ("XPDL Upload");} catch (Exception e) {e.printStackTrace();};
String newVersion = null;
try {
@@ -342,7 +342,7 @@ public class EntityRepositoryMgr impleme
v.setBytes(org.ofbiz.shark.SharkConstants.serializedPkg,serializedPkg);
v.setBytes(org.ofbiz.shark.SharkConstants.xpdlData, xpdl);
delegator.create(v);
- Debug.log("Created Value - " + v, module);
+ Debug.logInfo("Created Value - " + v, module);
} catch (GenericEntityException e) {
throw new RepositoryException(e);
}
@@ -363,7 +363,7 @@ public class EntityRepositoryMgr impleme

public byte[] getSerializedXPDLObject(RepositoryTransaction arg0, String arg1, String arg2) throws RepositoryException
{
- Debug.log("XPDL Get : " + arg1, module);
+ Debug.logInfo("XPDL Get : " + arg1, module);
List lookupList = this.getXpdlValues(arg1, null, false);
GenericValue value = EntityUtil.getFirst(lookupList);
if (value != null) {
@@ -378,7 +378,7 @@ public class EntityRepositoryMgr impleme
String referringXPDLVersion,
int referredXPDLNumber) throws RepositoryException
{
- Debug.log("Add XPDL Reference", module);
+ Debug.logInfo("Add XPDL Reference", module);
Delegator delegator = SharkContainer.getDelegator();
GenericValue ref = delegator.makeValue(org.ofbiz.shark.SharkConstants.WfRepositoryRef);
ref.set(org.ofbiz.shark.SharkConstants.xpdlId, referringXPDLId);

Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/shark/src/org/ofbiz/shark/requester/LoggingRequester.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/shark/src/org/ofbiz/shark/requester/LoggingRequester.java?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/specialpurpose/shark/src/org/ofbiz/shark/requester/LoggingRequester.java (original)
+++ ofbiz/branches/20111205EmailHandling/specialpurpose/shark/src/org/ofbiz/shark/requester/LoggingRequester.java Mon Mar 26 20:56:02 2012
@@ -55,7 +55,7 @@ public class LoggingRequester extends Ab
// -------------------

public void receive_event(WfEventAudit event) throws BaseException, InvalidPerformer {
- Debug.log("Received event - " + event.event_type(), module);
+ Debug.logInfo("Received event - " + event.event_type(), module);
}

public void receive_event(SharkTransaction sharkTransaction, WfEventAudit event) throws BaseException, InvalidPerformer {

Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/webpos/src/org/ofbiz/webpos/transaction/WebPosTransaction.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/webpos/src/org/ofbiz/webpos/transaction/WebPosTransaction.java?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/specialpurpose/webpos/src/org/ofbiz/webpos/transaction/WebPosTransaction.java (original)
+++ ofbiz/branches/20111205EmailHandling/specialpurpose/webpos/src/org/ofbiz/webpos/transaction/WebPosTransaction.java Mon Mar 26 20:56:02 2012
@@ -193,7 +193,7 @@ public class WebPosTransaction {
}

public BigDecimal processSale() throws GeneralException {
- Debug.log("Process sale", module);
+ Debug.logInfo("Process sale", module);
BigDecimal grandTotal = this.getGrandTotal();
BigDecimal paymentAmt = this.getPaymentTotal();
if (grandTotal.compareTo(paymentAmt) > 0) {
@@ -204,14 +204,14 @@ public class WebPosTransaction {
getCart().setOrderPartyId(partyId);

// validate payment methods
- Debug.log("Validating payment methods", module);
+ Debug.logInfo("Validating payment methods", module);
Map<String, ? extends Object> valRes = UtilGenerics.cast(ch.validatePaymentMethods());
if (valRes != null && ServiceUtil.isError(valRes)) {
throw new GeneralException(ServiceUtil.getErrorMessage(valRes));
}

// store the order
- Debug.log("Store order", module);
+ Debug.logInfo("Store order", module);
Map<String, ? extends Object> orderRes = UtilGenerics.cast(ch.createOrder(webPosSession.getUserLogin()));

if (orderRes != null && ServiceUtil.isError(orderRes)) {
@@ -221,7 +221,7 @@ public class WebPosTransaction {
}

// process the payment(s)
- Debug.log("Processing the payment(s)", module);
+ Debug.logInfo("Processing the payment(s)", module);
Map<String, ? extends Object> payRes = null;
try {
payRes = UtilGenerics.cast(ch.processPayment(ProductStoreWorker.getProductStore(webPosSession.getProductStoreId(), webPosSession.getDelegator()), webPosSession.getUserLogin(), true));
@@ -330,7 +330,7 @@ public class WebPosTransaction {
Iterator<GenericValue> i = values.iterator();
while (i.hasNext() && isExternal) {
GenericValue v = (GenericValue) i.next();
- //Debug.log("Testing [" + paymentMethodTypeId + "] - " + v, module);
+ //Debug.logInfo("Testing [" + paymentMethodTypeId + "] - " + v, module);
if (!externalCode.equals(v.getString("paymentServiceTypeEnumId"))) {
isExternal = false;
}
@@ -372,7 +372,7 @@ public class WebPosTransaction {

public BigDecimal processAmount(BigDecimal amount) throws GeneralException {
if (UtilValidate.isEmpty(amount)) {
- Debug.log("Amount is empty; assumption is full amount : " + this.getTotalDue(), module);
+ Debug.logInfo("Amount is empty; assumption is full amount : " + this.getTotalDue(), module);
amount = this.getTotalDue();
if (amount.compareTo(BigDecimal.ZERO) <= 0) {
throw new GeneralException();
@@ -384,7 +384,7 @@ public class WebPosTransaction {
public synchronized void processNoPayment(String paymentMethodTypeId) {
try {
BigDecimal amount = processAmount(null);
- Debug.log("Processing [" + paymentMethodTypeId + "] Amount : " + amount, module);
+ Debug.logInfo("Processing [" + paymentMethodTypeId + "] Amount : " + amount, module);

// add the payment
addPayment(paymentMethodTypeId, amount, null, null);
@@ -401,7 +401,7 @@ public class WebPosTransaction {

try {
amount = processAmount(amount);
- Debug.log("Processing [" + paymentMethodTypeId + "] Amount : " + amount, module);
+ Debug.logInfo("Processing [" + paymentMethodTypeId + "] Amount : " + amount, module);

// add the payment
addPayment(paymentMethodTypeId, amount, refNum, null);
@@ -445,7 +445,7 @@ public class WebPosTransaction {
}

public void setPaymentRefNum(int paymentIndex, String refNum, String authCode) {
- Debug.log("setting payment index reference number " + paymentIndex + " / " + refNum + " / " + authCode, module);
+ Debug.logInfo("setting payment index reference number " + paymentIndex + " / " + refNum + " / " + authCode, module);
ShoppingCart.CartPaymentInfo inf = getCart().getPaymentInfo(paymentIndex);
inf.refNum[0] = refNum;
inf.refNum[1] = authCode;
@@ -453,7 +453,7 @@ public class WebPosTransaction {

/* CVV2 code should be entered when a card can't be swiped */
public void setPaymentSecurityCode(String paymentId, String refNum, String securityCode) {
- Debug.log("setting payment security code " + paymentId, module);
+ Debug.logInfo("setting payment security code " + paymentId, module);
int paymentIndex = getCart().getPaymentInfoIndex(paymentId, refNum);
ShoppingCart.CartPaymentInfo inf = getCart().getPaymentInfo(paymentIndex);
inf.securityCode = securityCode;
@@ -462,7 +462,7 @@ public class WebPosTransaction {

/* Track2 data should be sent to processor when a card is swiped. */
public void setPaymentTrack2(String paymentId, String refNum, String securityCode) {
- Debug.log("setting payment security code " + paymentId, module);
+ Debug.logInfo("setting payment security code " + paymentId, module);
int paymentIndex = getCart().getPaymentInfoIndex(paymentId, refNum);
ShoppingCart.CartPaymentInfo inf = getCart().getPaymentInfo(paymentIndex);
inf.securityCode = securityCode;
@@ -471,7 +471,7 @@ public class WebPosTransaction {

/* Postal code should be entered when a card can't be swiped */
public void setPaymentPostalCode(String paymentId, String refNum, String postalCode) {
- Debug.log("setting payment security code " + paymentId, module);
+ Debug.logInfo("setting payment security code " + paymentId, module);
int paymentIndex = getCart().getPaymentInfoIndex(paymentId, refNum);
ShoppingCart.CartPaymentInfo inf = getCart().getPaymentInfo(paymentIndex);
inf.postalCode = postalCode;

Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/webpos/webapp/webpos/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/webpos/webapp/webpos/WEB-INF/controller.xml?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/specialpurpose/webpos/webapp/webpos/WEB-INF/controller.xml (original)
+++ ofbiz/branches/20111205EmailHandling/specialpurpose/webpos/webapp/webpos/WEB-INF/controller.xml Mon Mar 26 20:56:02 2012
@@ -457,7 +457,7 @@

<request-map uri="EditAddress">
<security https="false" auth="true"/>
- <event type="groovy" path="component://webpos/webapp/webpos/WEB-INF/actions/customer/" invoke="EditAddress.groovy"/>
+ <event type="groovy" path="component://webpos/webapp/webpos/WEB-INF/actions/customer/EditAddress.groovy"/>
<response name="success" type="request" value="json"/>
<response name="error" type="request" value="json"/>
</request-map>

Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/webpos/webapp/webpos/cart/ShowCart.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/webpos/webapp/webpos/cart/ShowCart.ftl?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/specialpurpose/webpos/webapp/webpos/cart/ShowCart.ftl (original)
+++ ofbiz/branches/20111205EmailHandling/specialpurpose/webpos/webapp/webpos/cart/ShowCart.ftl Mon Mar 26 20:56:02 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/branches/20111205EmailHandling/specialpurpose/webpos/webapp/webpos/cart/ShowCartItemSelected.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/webpos/webapp/webpos/cart/ShowCartItemSelected.ftl?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/specialpurpose/webpos/webapp/webpos/cart/ShowCartItemSelected.ftl (original)
+++ ofbiz/branches/20111205EmailHandling/specialpurpose/webpos/webapp/webpos/cart/ShowCartItemSelected.ftl Mon Mar 26 20:56:02 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/branches/20111205EmailHandling/specialpurpose/webpos/webapp/webpos/catalog/CategoryDetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/webpos/webapp/webpos/catalog/CategoryDetail.ftl?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/specialpurpose/webpos/webapp/webpos/catalog/CategoryDetail.ftl (original)
+++ ofbiz/branches/20111205EmailHandling/specialpurpose/webpos/webapp/webpos/catalog/CategoryDetail.ftl Mon Mar 26 20:56:02 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/branches/20111205EmailHandling/specialpurpose/webpos/widget/CatalogScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/webpos/widget/CatalogScreens.xml?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/specialpurpose/webpos/widget/CatalogScreens.xml (original)
+++ ofbiz/branches/20111205EmailHandling/specialpurpose/webpos/widget/CatalogScreens.xml Mon Mar 26 20:56:02 2012
@@ -64,7 +64,7 @@ under the License.
<actions>
<set field="titleProperty" value="PageTitleCategoryPage"/>
<script location="component://webpos/webapp/webpos/WEB-INF/actions/catalog/Category.groovy"/>
- <script location="component://webpos/webapp/webpos/WEB-INF/actions/catalog/CategoryDetail.groovy"/>
+ <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/CategoryDetail.groovy"/>
</actions>
<widgets>
<container>

Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/webpos/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/webpos/widget/CommonScreens.xml?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/specialpurpose/webpos/widget/CommonScreens.xml (original)
+++ ofbiz/branches/20111205EmailHandling/specialpurpose/webpos/widget/CommonScreens.xml Mon Mar 26 20:56:02 2012
@@ -40,8 +40,6 @@ under the License.
<set field="applicationMenuName" value="WebPosAppBar" global="true"/>
<set field="applicationMenuLocation" value="component://webpos/widget/WebPosMenus.xml" global="true"/>
<set field="applicationTitle" value="${uiLabelMap.WebPosMenuMain}" global="true"/>
- <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.4.2.min.js" global="true"/>
- <set field="layoutSettings.javaScripts[]" value="/images/selectall.js" global="true"/>
<set field="layoutSettings.javaScripts[]" value="/webpos/images/js/jquery.hotkeys-0.7.9.min.js" global="true"/>
<set field="layoutSettings.javaScripts[]" value="/webpos/images/js/WebPosHotkeys.js" global="true"/>
<set field="layoutSettings.javaScripts[]" value="/webpos/images/js/Shortcuts.js" global="true"/>

Modified: ofbiz/branches/20111205EmailHandling/themes/bizznesstime/webapp/bizznesstime/css/style.css
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/themes/bizznesstime/webapp/bizznesstime/css/style.css?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/themes/bizznesstime/webapp/bizznesstime/css/style.css (original)
+++ ofbiz/branches/20111205EmailHandling/themes/bizznesstime/webapp/bizznesstime/css/style.css Mon Mar 26 20:56:02 2012
@@ -1429,7 +1429,13 @@ div.autocomplete ul li {
height:16px;
border: none;
}
-
+.screenlet-title-bar .indicator img {
+ float:right;
+ margin:0 3px;
+ width:16px;
+ height:16px;
+ display:inline;
+}
/***********************************************
Webtools
***********************************************/
@@ -1543,6 +1549,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 ===== */
/* ========================================================== */
@@ -1907,6 +1937,7 @@ width:10%
*
* http://docs.jquery.com/UI/Menu#theming
*/
+.ui-autocomplete-loading { background: white url('../images/ui-anim_basic_16x16.gif') right center no-repeat !important; }
.ui-menu {
list-style:none;
padding: 2px;

Modified: ofbiz/branches/20111205EmailHandling/themes/bluelight/webapp/bluelight/style.css
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/themes/bluelight/webapp/bluelight/style.css?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/themes/bluelight/webapp/bluelight/style.css (original)
+++ ofbiz/branches/20111205EmailHandling/themes/bluelight/webapp/bluelight/style.css Mon Mar 26 20:56:02 2012
@@ -1330,6 +1330,13 @@ div.autocomplete ul li {
border: none;
}

+.screenlet-title-bar .indicator img {
+ float:right;
+ margin:0 3px;
+ width:16px;
+ height:16px;
+ display:inline;
+}
/* ======================================================= */
/* ===== Basic Navigation (Vertical Menu) Style ========== */
/* ======================================================= */
@@ -2046,6 +2053,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 ===== */
/* ========================================================== */
@@ -2410,6 +2441,7 @@ background-image:url(/images/spinner.gif
*
* http://docs.jquery.com/UI/Menu#theming
*/
+.ui-autocomplete-loading { background: white url('images/ui-anim_basic_16x16.gif') right center no-repeat !important; }
.ui-menu {
list-style:none;
padding: 2px;

Modified: ofbiz/branches/20111205EmailHandling/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css (original)
+++ ofbiz/branches/20111205EmailHandling/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css Mon Mar 26 20:56:02 2012
@@ -1303,6 +1303,14 @@ div.autocomplete ul li {
height:16px;
border: none;
}
+
+.screenlet-title-bar .indicator img {
+ float:right;
+ margin:0 3px;
+ width:16px;
+ height:16px;
+ display:inline;
+}
/* ======================================================= */
/* ===== Basic Navigation (Vertical Menu) Style ========== */
/* ======================================================= */
@@ -2044,6 +2052,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 ===== */
/* ========================================================== */
@@ -2408,6 +2440,7 @@ background-image:url(/images/spinner.gif
*
* http://docs.jquery.com/UI/Menu#theming
*/
+.ui-autocomplete-loading { background: white url('../images/ui-anim_basic_16x16.gif') right center no-repeat !important; }
.ui-menu {
list-style:none;
padding: 2px;

Modified: ofbiz/branches/20111205EmailHandling/themes/flatgrey/webapp/flatgrey/javascript.css
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/themes/flatgrey/webapp/flatgrey/javascript.css?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/themes/flatgrey/webapp/flatgrey/javascript.css (original)
+++ ofbiz/branches/20111205EmailHandling/themes/flatgrey/webapp/flatgrey/javascript.css Mon Mar 26 20:56:02 2012
@@ -75,6 +75,13 @@ div.autocomplete ul li {
border: none;
}

+.screenlet-title-bar .indicator img {
+ float:right;
+ margin:0 3px;
+ width:16px;
+ height:16px;
+ display:inline;
+}
/* -------------------------------------------------- */
/* JavaScript jQuery widgets REDMOND Design */
/* -------------------------------------------------- */
@@ -439,6 +446,7 @@ div.autocomplete ul li {
*
* http://docs.jquery.com/UI/Menu#theming
*/
+.ui-autocomplete-loading { background: white url('images/ui-anim_basic_16x16.gif') right center no-repeat !important; }
.ui-menu {
list-style:none;
padding: 2px;

Modified: ofbiz/branches/20111205EmailHandling/themes/flatgrey/webapp/flatgrey/maincss.css
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/themes/flatgrey/webapp/flatgrey/maincss.css?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/themes/flatgrey/webapp/flatgrey/maincss.css (original)
+++ ofbiz/branches/20111205EmailHandling/themes/flatgrey/webapp/flatgrey/maincss.css Mon Mar 26 20:56:02 2012
@@ -745,6 +745,7 @@ padding: 0.1em;
}

.tab-bar {
+display: table;
margin: 0.5em 0.5em 0 0.5em;
}

@@ -2140,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/branches/20111205EmailHandling/themes/multiflex/webapp/multiflex/style.css
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/themes/multiflex/webapp/multiflex/style.css?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/themes/multiflex/webapp/multiflex/style.css (original)
+++ ofbiz/branches/20111205EmailHandling/themes/multiflex/webapp/multiflex/style.css Mon Mar 26 20:56:02 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 ===== */
/* ========================================================== */
@@ -2532,6 +2556,7 @@ height: 1px;
*
* http://docs.jquery.com/UI/Menu#theming
*/
+.ui-autocomplete-loading { background: white url('images/ui-anim_basic_16x16.gif') right center no-repeat !important; }
.ui-menu {
list-style:none;
padding: 2px;
@@ -2818,4 +2843,3 @@ width:10%
*/
.ui-progressbar { height:2em; text-align: left; }
.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }
-

Modified: ofbiz/branches/20111205EmailHandling/themes/tomahawk/includes/appbarClose.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/themes/tomahawk/includes/appbarClose.ftl?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/themes/tomahawk/includes/appbarClose.ftl (original)
+++ ofbiz/branches/20111205EmailHandling/themes/tomahawk/includes/appbarClose.ftl Mon Mar 26 20:56:02 2012
@@ -45,7 +45,7 @@ under the License.
<#assign portalPage = delegator.findByPrimaryKeyCache("PortalPage", findMap)>
<#if portalPage?has_content>
<div id="app-nav-selected-item">
- ${portalPage.portalPageName?if_exists}
+ ${portalPage.get("portalPageName", locale)?if_exists}
</div>
</#if>
</#if>
@@ -88,7 +88,7 @@ under the License.
<li class="org">${orgName}</li>
</#if>
<#if userLogin.partyId?exists>
- <li class="user"><a href="passwordChange">${userName}</a></li>
+ <li class="user"><a href="<@ofbizUrl>passwordChange</@ofbizUrl>">${userName}</a></li>
<#else>
<li class="user">${userName}</li>
</#if>

Modified: ofbiz/branches/20111205EmailHandling/themes/tomahawk/webapp/tomahawk/css/style.css
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/themes/tomahawk/webapp/tomahawk/css/style.css?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/themes/tomahawk/webapp/tomahawk/css/style.css (original)
+++ ofbiz/branches/20111205EmailHandling/themes/tomahawk/webapp/tomahawk/css/style.css Mon Mar 26 20:56:02 2012
@@ -1421,6 +1421,13 @@ div.autocomplete ul li {
height:16px;
border: none;
}
+.screenlet-title-bar .indicator img {
+ float:right;
+ margin:0 3px;
+ width:16px;
+ height:16px;
+ display:inline;
+}
/* ======================================================= */
/* ===== Basic Navigation (Vertical Menu) Style ========== */
/* ======================================================= */
@@ -2431,6 +2438,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 ===== */
/* ========================================================== */
@@ -2795,6 +2826,7 @@ background-image:url(/tomahawk/images/sp
*
* http://docs.jquery.com/UI/Menu#theming
*/
+.ui-autocomplete-loading { background: white url('../images/ui-anim_basic_16x16.gif') right center no-repeat !important; }
.ui-menu {
list-style:none;
padding: 2px;