|
diff --git a/lib/WebGUI/i18n/English/MetaData.pm b/lib/WebGUI/i18n/English/MetaData.pm
index 76096939a..56bb6c4f8 100644
--- a/lib/WebGUI/i18n/English/MetaData.pm
+++ b/lib/WebGUI/i18n/English/MetaData.pm
@@ -6,16 +6,20 @@ our $I18N = {
lastUpdated => 1089039511,
context => 'Label for tab'
},
+ 'errorEmptyField' => {
+ message => q|Error: Field name may not be empty.
|,
+ lastUpdated => 1089039511,
+ },
'duplicateField' => {
message => q|Error: Fieldname "%field%" is already in use.
|,
lastUpdated => 1089039511,
},
'Delete Metadata field' => {
- message => q|Delete Metadata field|,
+ message => q|Delete Metadata property|,
lastUpdated => 1089039511,
},
'deleteConfirm' => {
- message => q|Are you certain you want to delete this Metadata field ?|,
+ message => q|Are you certain you want to delete this Metadata property ?|,
lastUpdated => 1089039511,
},
'Manage Metadata' => {
@@ -27,15 +31,15 @@ our $I18N = {
lastUpdated => 1089039511,
},
'Add new field' => {
- message => q|Add new field|,
+ message => q|Add new metadata property|,
lastUpdated => 1089039511,
},
'Manage Metadata fields' => {
- message => q|Manage Metadata fields|,
+ message => q|Manage metadata properties|,
lastUpdated => 1089039511,
},
'Edit Metadata' => {
- message => q|Edit Metadata|,
+ message => q|Edit Metadata property|,
lastUpdated => 1089039511,
},
'Field Id' => {
diff --git a/lib/WebGUI/i18n/English/WebGUI.pm b/lib/WebGUI/i18n/English/WebGUI.pm
index 5e5b3fe63..26cd9067d 100644
--- a/lib/WebGUI/i18n/English/WebGUI.pm
+++ b/lib/WebGUI/i18n/English/WebGUI.pm
@@ -3008,6 +3008,7 @@ The style-sheet id is the word "wobjectId" plus the Wobject Id for that wobject
Title The title of the wobject. This is typically displayed at the top of each wobject.
Note: You should always specify a title even if you are going to turn it off (with the next property). This is because the title shows up in the trash and clipboard and you'll want to be able to distinguish which wobject is which.
Display title?
Do you wish to display the title you specified? On some sites, displaying the title is not necessary.
+
Metadata
Under the Metadata tab you can set the metadata properties for this content. Metadata must be enabled in the Manage Settings menu.
Process macros?
Do you wish to process macros in the content of this wobject? Sometimes you'll want to do this, but more often than not you'll want to say "no" to this question. By disabling the processing of macros on the wobjects that don't use them, you'll speed up your web server slightly.
Template Position
Template positions range from 0 (zero) to any number. How many are available depends upon the Template associated with this page. The default template has only one template position, others may have more. By selecting a template position, you're specifying where this wobject should be placed within the template.
Start Date
On what date should this wobject become visible? Before this date, the wobject will only be displayed to Content Managers.
@@ -4537,6 +4538,14 @@ Displays a small text message to a user who is in admin mode. Example: ^Admi
Places a link on the page which is only visible to content managers and adminstrators. The link toggles on/off admin mode. You can optionally specify other messages to display like this: ^AdminToggle("Edit On","Edit Off"); This macro optionally takes a third parameter that allows you to specify an alternate template name in the Macro/AdminToggle namespace.
+^AOIHits();
+Displays the number of views for a metadata property/value pair. Example: ^AOIHits(contenttype,sport); would display 99 if this user has looked at content that was tagged "contenttype = sport" 99 times.
+
+
+^AOIRank();
+Diplays the highest ranked metadata property for this user. Example ^AOIRank(contenttype); would display "sport" if this user has looked mostly to content tagged "contenttype = sport". Optionally the rank can also be displayed. Example ^AOIRank(contenttype, 2); would return the second highest ranked contenttype.
+
+
^CanEditText();
Display a message to a user that can edit the current page.
@@ -7025,7 +7034,103 @@ Following a guide like the above will help you get good ranking on search engine
message => q|Decimal|,
lastUpdated => 1089039511,
context => q|A label that tells the user that this field uses a floating point number, aka a Decimal number, aka a Real number.|
- }
+ },
+ 'Metadata, Edit property' => {
+ message => q|Metadata, Edit property|,
+ lastUpdated => 1089039511,
+ context => q|Metadata edit property help title|
+ },
+ 'metadata edit property body' => {
+ message => q|
+You may add as many Metadata properties as you like.
+
+Field Name
+The name of this metadata propertie.It must be unique.
+It is advisable to use only letters (a-z), numbers (0-9) or underscores (_) for
+the field names.
+
Description
+An optional description for this metadata property. This text is displayed
+as mouseover text in the wobject properties tab.
+Data Type
+Choose the type of form element for this field.
+
+Possible Values
+This field is used for the list types (Radio List and Select List). Enter
+the values you wish to appear, one per line.
+|,
+ lastUpdated => 1089039511,
+ context => q|Metadata edit property help|
+ },
+ 'Metadata, Manage' => {
+ message => q|Metadata, Manage|,
+ lastUpdated => 1089039511,
+ context => q|Metadata help title|
+ },
+ 'metadata manage body' => {
+ message => q|
+The metadata system in WebGUI allows you to identify content. Metadata is
+information about the content, and is defined in terms of property-value pairs.
+Examples of metadata:
+
+ - contenttype: sport
+ - adult content: no
+ - source: newspaper
+
+In the example source: newspaper is source the property
+and newspaper the value.
+Metadata properties are defined globally, while Metadata values are set for
+each wobject under the tab "Metadata" in the wobject properties.
+Before you can use metadata, you'll have to switch the "Enable Metadata
+?" setting to Yes.
+Usage of metadata:
+
+ - Passive Profiling
+ When passive profiling is switched on, every wobject viewed by a user will
+ be logged.
+ The WebGUI scheduler summarizes the profiling information on a regular
+ basis.
+ The metadata is used to generate the summary. This is basically content
+ ranking based upon the user's Areas of Interest (AOI).
+ By default the summarizer runs once a day. However you can change that by
+ setting: passiveProfileInterval = <number of seconds> in the
+ WebGUI config file.
+
+
+
+ - Areas of Interest Ranking
+ Metadata in combination with passive profiling produces AOI (Areas of
+ Interest) information. You can retrieve the value of a metadata property
+ with the ^AOIRank macro:
+
+ ^AOIRank(contenttype);
+ This would return the highest ranked contenttype for this user, such as
+ "sport".
+
+ ^AOIRank(contenttype,2);
+ This would return the second highest ranked contenttype for this user.
+
+ You can also retrieve the number of hits a particular AOI has gotten:
+
+ ^AOIHits(contenttype,sport);
+ This would return 99 is this user has looked at content that was tagged
+ "contenttype = sport" 99 times.
+
+
+ - Show content based upon criteria
+ The Wobject Proxy allows you to select content based upon criteria like:
+ contenttype = sport AND source != newspaper
+
+ You can use the AOI macro's described above in the criteria, so you can
+ present content based upon the users Areas of Interest. Example:
+ type = ^AOIRank(contenttype);
+
|,
+ lastUpdated => 1089039511,
+ context => q|Metadata help|
+ },
+
+
+
+
};
diff --git a/lib/WebGUI/i18n/English/WobjectProxy.pm b/lib/WebGUI/i18n/English/WobjectProxy.pm
index e49f8813b..c83af82bb 100644
--- a/lib/WebGUI/i18n/English/WobjectProxy.pm
+++ b/lib/WebGUI/i18n/English/WobjectProxy.pm
@@ -27,31 +27,45 @@ our $I18N = {
},
'6' => {
- message => q|With the Wobject Proxy (aka Shortcut) you can mirror a wobject from another page to any other page. This is useful if you want to reuse the same content in multiple sections of your site.
-
-
-NOTE: The wobject proxy is not available through the Add Content menu, but instead through the shortcut icon on each wobject's toolbar.
-
-
-Wobject To Proxy
-Provides a link to the orignal wobject being proxied.
-
-
-Override title?
-Set to "yes" to use the title of the wobject proxy instead of the original title of the wobject.
-
-
-Override description?
-Set to "yes" to use the description of the wobject proxy instead of the original description of the wobject.
-
-
-Override display title?
-Set to "yes" to use the display title setting of the wobject proxy instead of the original display title setting of the wobject.
-
-
-Override template?
-Set to "yes" to use the template of the wobject proxy instead of the original template of the wobject.
-
+ message => q|With the Wobject Proxy (aka Shortcut) you can mirror a wobject from another page to any other page. This is useful if you want to reuse the same content in multiple sections of your site.
+
+
+NOTE: The wobject proxy is not available through the Add Content menu, but instead through the shortcut icon on each wobject's toolbar.
+
+
+Wobject To Proxy
+Provides a link to the orignal wobject being proxied.
+
+
+Override title?
+Set to "yes" to use the title of the wobject proxy instead of the original title of the wobject.
+
+
+Override description?
+Set to "yes" to use the description of the wobject proxy instead of the original description of the wobject.
+
+
+Override display title?
+Set to "yes" to use the display title setting of the wobject proxy instead of the original display title setting of the wobject.
+
+
+Override template?
+Set to "yes" to use the template of the wobject proxy instead of the original template of the wobject.
+
+
+Proxy by alternate criteria?
+Set to "yes" to enable selecting a wobject based upon custom criteria. Metadata must be enabled for this option to function properly.
+
+
+Resolve Multiples?
+Sets the order to use when multiple wobjects are selected. Random means that if multiple wobjects match the proxy criteria then the wobject proxy will select a random wobject to proxy.
+Most Recent will select the most recent wobject that match the proxy criteria.
+
+
+Criteria
+A statement to determinate what to proxy, in the form of "color = blue and weight != heavy". Multiple expressions may be joined with "and" and "or".
+A property or value must be quoted if it contains spaces. Feel free to use the criteria builder to build your statements.
+
|,
lastUpdated => 1057091098
},
diff --git a/www/extras/wobject/WobjectProxy/querybuilder.js b/www/extras/wobject/WobjectProxy/querybuilder.js
index 1e0dd7c40..27dd1a2d5 100644
--- a/www/extras/wobject/WobjectProxy/querybuilder.js
+++ b/www/extras/wobject/WobjectProxy/querybuilder.js
@@ -11,7 +11,7 @@ function addCriteria ( fieldname, opform, valform ) {
if(/\s+/.test(fieldname)) {
fieldname = '"' + fieldname + '"';
}
- if(/^\D+$/.test(value)) {
+ if(/^\D*$/.test(value)) {
value = '"' + value + '"';
}
var statement = fieldname + " " + operator + " " + value;