Permalink
Browse files

Slatwall content changes

  • Loading branch information...
1 parent 98930c7 commit 14decb33e7a84fbe9e81502d655ab923de44abf4 @sumitverma sumitverma committed Apr 17, 2012
@@ -46,5 +46,6 @@ Notes:
<cf_SlatwallSetting settingName="contentProductListingFlag" settingObject="#rc.content#" />
<cf_SlatwallSetting settingName="contentDefaultProductsPerPage" settingObject="#rc.content#" />
<cf_SlatwallSetting settingName="contentIncludeChildContentProductsFlag" settingObject="#rc.content#" />
+ <cf_SlatwallSetting settingName="contentRestrictedContentDisplayTemplate" settingObject="#rc.content#" />
</cf_SlatwallSettingTable>
</cfoutput>
@@ -48,20 +48,13 @@ Notes:
<cf_SlatwallPropertyDisplay object="#rc.content#" property="title">
<cf_SlatwallPropertyDisplay object="#rc.content#" property="cmsContentID" edit="false">
<cf_SlatwallPropertyDisplay object="#rc.content#" property="templateFlag" edit="#rc.edit#">
- <cf_SlatwallPropertyDisplay object="#rc.content#" property="productListingFlag" edit="#rc.edit#">
- <cf_SlatwallPropertyDisplay object="#rc.content#" property="defaultProductsPerPage" edit="#rc.edit#">
- <cf_SlatwallPropertyDisplay object="#rc.content#" property="showProductInSubPagesFlag" edit="#rc.edit#">
<cf_SlatwallPropertyDisplay object="#rc.content#" property="disableProductAssignmentFlag" edit="#rc.edit#">
- <cf_SlatwallPropertyDisplay object="#rc.content#" property="showProductInSubPagesFlag" edit="#rc.edit#">
- <cf_SlatwallPropertyDisplay object="#rc.content#" property="restrictAccessFlag" edit="false">
<cf_SlatwallPropertyDisplay object="#rc.content#" property="allowPurchaseFlag" edit="false">
- <cf_SlatwallPropertyDisplay object="#rc.content#" property="requirePurchaseFlag" edit="false">
- <cf_SlatwallPropertyDisplay object="#rc.content#" property="requireSubscriptionFlag" edit="false">
</cf_SlatwallPropertyList>
</cf_SlatwallDetailHeader>
<cf_SlatwallTabGroup object="#rc.content#">
- <cf_SlatwallTab view="admin:setting/contenttabs/contentsettings">
+ <cf_SlatwallTab view="admin:setting/contenttabs/settings">
</cf_SlatwallTabGroup>
</cf_SlatwallDetailForm>
View
@@ -50,15 +50,15 @@ component displayname="Content" entityname="SlatwallContent" table="SlatwallCont
property name="disableProductAssignmentFlag" ormtype="boolean"; // property
property name="templateFlag" ormtype="boolean"; // property
- property name="restrictAccessFlag" ormtype="boolean"; // setting
- property name="requirePurchaseFlag" ormtype="boolean"; // setting
- property name="requireSubscriptionFlag" ormtype="boolean"; // setting
- property name="productListingFlag" ormtype="boolean"; // setting
- property name="defaultProductsPerPage" ormtype="integer"; // setting
- property name="showProductInSubPagesFlag" ormtype="boolean"; // setting
+ //property name="restrictAccessFlag" ormtype="boolean"; // setting
+ //property name="requirePurchaseFlag" ormtype="boolean"; // setting
+ //property name="requireSubscriptionFlag" ormtype="boolean"; // setting
+ //property name="productListingFlag" ormtype="boolean"; // setting
+ //property name="defaultProductsPerPage" ormtype="integer"; // setting
+ //property name="showProductInSubPagesFlag" ormtype="boolean"; // setting
// Related Object Properties (many-to-one)
- property name="restrictedContentTemplateContent" cfc="Content" fieldtype="many-to-one" fkcolumn="restrictedContentTemplateContentID"; // setting
+ //property name="restrictedContentTemplateContent" cfc="Content" fieldtype="many-to-one" fkcolumn="restrictedContentTemplateContentID"; // setting
property name="parentContent" cfc="Content" fieldtype="many-to-one" fkcolumn="parentContentID";
// Related Object Properties (one-to-many)
@@ -89,6 +89,7 @@ globalEncryptionKeySize
contentProductListingFlag = {fieldType="yesno"},
contentDefaultProductsPerPage = {fieldType="text"},
contentIncludeChildContentProductsFlag = {fieldType="yesno"},
+ contentRestrictedContentDisplayTemplate = {fieldType="select"},
// Fulfillment Method
fulfillmentMethodEmailFrom = {fieldType="text"},
@@ -174,7 +175,7 @@ globalEncryptionKeySize
public array function getSettingOptions(required string settingName) {
switch(arguments.settingName) {
- case "brandDisplayTemplate": case "productDisplayTemplate": case "productTypeDisplayTemplate" :
+ case "brandDisplayTemplate": case "productDisplayTemplate": case "productTypeDisplayTemplate" : case "contentRestrictedContentDisplayTemplate" :
return getContentService().getDisplayTemplateOptions();
case "globalCurrencyLocale":
return ['Chinese (China)','Chinese (Hong Kong)','Chinese (Taiwan)','Dutch (Belgian)','Dutch (Standard)','English (Australian)','English (Canadian)','English (New Zealand)','English (UK)','English (US)','French (Belgian)','French (Canadian)','French (Standard)','French (Swiss)','German (Austrian)','German (Standard)','German (Swiss)','Italian (Standard)', 'Italian (Swiss)','Japanese','Korean','Norwegian (Bokmal)','Norwegian (Nynorsk)','Portuguese (Brazilian)','Portuguese (Standard)','Spanish (Mexican)','Spanish (Modern)','Spanish (Standard)','Swedish'];
@@ -116,6 +116,7 @@ admin.setting.addresszonetabs.locations=Locations
admin.setting.attributesettabs.attributes=Attributes
admin.setting.attributetabs.attributeoptions=Attribute Options
admin.setting.attributetabs.description=Description
+admin.setting.contenttabs.settings=Settings
admin.setting.createaddresszone=Create New Address Zone
admin.setting.createaddresszonelocation=Add Location to Zone
admin.setting.createaddresszonelocation_nav=Add Location to Zone
@@ -488,20 +489,8 @@ entity.content.cmsContentID=CMS Content ID
entity.content.cmsContentIDPath=CMS Content ID Path
entity.content.cmsSiteID=CMS Site ID
entity.content.contentID=Content ID
-entity.content.defaultProductsPerPage=Products per page
-entity.content.defaultProductsPerPage_hint=Default number of products per page
entity.content.disableProductAssignmentFlag=Disable product assignment
entity.content.disableProductAssignmentFlag_hint=Disable product assignment
-entity.content.productListingFlag=Product listing page
-entity.content.productListingFlag_hint=Use as a product listing page
-entity.content.requirePurchaseFlag=Require purchase
-entity.content.requirePurchaseFlag_hint=Restrict access through purchase
-entity.content.requireSubscriptionFlag=Require subscription
-entity.content.requireSubscriptionFlag_hint=Restrict access through subscription
-entity.content.restrictAccessFlag=Restrict access
-entity.content.restrictAccessFlag_hint=Restrict access through subscription and/or purchase
-entity.content.showProductInSubPagesFlag=Show product in sub pages
-entity.content.showProductInSubPagesFlag_hint=Show product in sub pages
entity.content.templateFlag=Template
entity.content.templateFlag_hint=Use this as a template for Product/Brand/Product Type
entity.content.title=Content Title
@@ -1161,6 +1150,20 @@ frontend.checkout.saveaccount=Save & Continue
frontend.checkout.saveshippingaddress=Save & Continue
frontend.checkout.saveshippingmethod=Save & Continue
setting.brandDisplayTemplate=Brand Display Template
+setting.contentProductListingFlag=Product listing page
+setting.contentProductListingFlag_hint=Use as a product listing page
+setting.contentDefaultProductsPerPage=Products per page
+setting.contentDefaultProductsPerPage_hint=Default number of products per page
+setting.contentIncludeChildContentProductsFlag=Show product in sub pages
+setting.contentIncludeChildContentProductsFlag_hint=Show product in sub pages
+setting.contentRestrictAccessFlag=Restrict access
+setting.contentRestrictAccessFlag_hint=Restrict access through subscription and/or purchase
+setting.contentRequirePurchaseFlag=Require purchase
+setting.contentRequirePurchaseFlag_hint=Restrict access through purchase
+setting.contentRequireSubscriptionFlag=Require subscription
+setting.contentRequireSubscriptionFlag_hint=Restrict access through subscription
+setting.contentRestrictedContentDisplayTemplate=Restricted Content template
+setting.contentRestrictedContentDisplayTemplate_hint=Barrier page or pay-wall template
setting.globalCurrencyLocale=Currency Locale
setting.globalCurrencyType=Currency Type
setting.globalDateFormat=Date Format

0 comments on commit 14decb3

Please sign in to comment.