[Bedework-commit] cachedfeeder r200 - in
releases/bedework-3.7/URLandWidgetBuilder: . javascript/bedework
svnadmin at bedework.org
svnadmin at bedework.org
Thu Apr 19 20:46:04 EDT 2012
Author: bleibson
Date: 2012-04-19 20:46:02 -0400 (Thu, 19 Apr 2012)
New Revision: 200
Modified:
releases/bedework-3.7/URLandWidgetBuilder/index.html
releases/bedework-3.7/URLandWidgetBuilder/javascript/bedework/builder.js
Log:
o expose new limit-events-list-to-n-events widget feature in the urlbuilder
o fix contacts-in-details and cost-in-details features.
Modified: releases/bedework-3.7/URLandWidgetBuilder/index.html
===================================================================
--- releases/bedework-3.7/URLandWidgetBuilder/index.html 2012-04-20 00:30:37 UTC (rev 199)
+++ releases/bedework-3.7/URLandWidgetBuilder/index.html 2012-04-20 00:46:02 UTC (rev 200)
@@ -1,4 +1,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!--
+ NOTE: Set the location of your webcache below. Search for "webcache"
+-->
<!--
Licensed to Jasig under one or more contributor license
@@ -210,7 +213,19 @@
<ul>
<li>
- Show a title above event list
+ Limit the number of events listed?
+ <input type="radio" id="jsShowLimitListTrue" class="trigger" name="jsLimitList" onclick='updateUrlDisplay()' value="true" />True
+ <input type="radio" id="jsShowLimitListFalse" class="trigger" name="jsLimitList" onclick='updateUrlDisplay()' value="false" checked="checked" />False
+ <em>(default: false)</em>
+ <br />
+ <br />
+ <div id="limitSlider" style="width:300px;"></div>
+ <label for="jsLimit">Limit to:</label>
+ <input class="slider" onclick='updateUrlDisplay()' type="text" size="3" id="jsLimit" />
+ </li>
+ </li>
+ <li>
+ Show a title above event list?
<input type="radio" id="jsShowTitleTrue" class="trigger" name="jsShowTitle" onclick='updateUrlDisplay()' value="true" checked="checked" />True
<input type="radio" id="jsShowTitleFalse" class="trigger" name="jsShowTitle" onclick='updateUrlDisplay()' value="false" />False
<em>(default: true)</em>
Modified: releases/bedework-3.7/URLandWidgetBuilder/javascript/bedework/builder.js
===================================================================
--- releases/bedework-3.7/URLandWidgetBuilder/javascript/bedework/builder.js 2012-04-20 00:30:37 UTC (rev 199)
+++ releases/bedework-3.7/URLandWidgetBuilder/javascript/bedework/builder.js 2012-04-20 00:46:02 UTC (rev 200)
@@ -17,7 +17,6 @@
// under the License.
//
-
function getCacheUrlPrefix() {
return urlPrefix = "http://localhost:8080/webcache/v1.0/"
}
@@ -37,6 +36,20 @@
$("#numDays").val($("#slider").slider("value"));
});
+$(function() {
+ $("#limitSlider").slider({
+ range: "min",
+ min: 0,
+ max: 50,
+ value: 5,
+ slide: function(event, ui) {
+ $("#jsLimit").val(ui.value);
+ updateUrlDisplay();
+ }
+ });
+ $("#jsLimit").val($("#limitSlider").slider("value"));
+});
+
// use JQuery UI datepicker widget for start date and end date
$(function() {
$("#startDate").datepicker({
@@ -188,7 +201,8 @@
if (categoryIDList == "") {
categoryIDList = "catuid='" + this.value + "'";
} else {
- categoryIDList = categoryIDList + "|catuid='" + this.value + "'";
+ // NTFS doesn't like the | character and cache may be stored on NTFS
+ categoryIDList = categoryIDList + "-_catuid='" + this.value + "'";
}
});
return '(' + categoryIDList + ')';
@@ -357,14 +371,16 @@
jsHtml += '<script type="text/javascript" src="' + url + '"> </script>\n';
jsHtml += '<script type="text/javascript">\n'
jsHtml += ' bwJsWidgetOptions.title = "' + $("input[name='jsTitleName']").val() + '";\n';
- jsHtml += ' bwJsWidgetOptions.showTitle = ' + $("input[name='jsShowTitle']:checked").val() + ';\n';
+ jsHtml += ' bwJsWidgetOptions.showTitle = ' + $("input[name='jsShowTitle']:checked").val() + ';\n';
jsHtml += ' bwJsWidgetOptions.displayEventDetailsInline = ' + $("input[name='jsDisplayInline']:checked").val() + ';\n';
jsHtml += ' bwJsWidgetOptions.displayStartDateOnlyInList = ' + $("input[name='jsDisplayEndDate']:checked").val() + ';\n';
jsHtml += ' bwJsWidgetOptions.displayTimeInList = ' + $("input[name='jsDisplayTime']:checked").val() + ';\n';
jsHtml += ' bwJsWidgetOptions.displayLocationInList = ' + $("input[name='jsDisplayLocation']:checked").val() + ';\n';
+ jsHtml += ' bwJsWidgetOptions.limitList = ' + $("input[name='jsLimitList']:checked").val() + ';\n';
+ jsHtml += ' bwJsWidgetOptions.limit = ' + jsLimit.value + ';\n';
jsHtml += ' bwJsWidgetOptions.listMode = "' + $("input[name='jsDisplayDateOrTitle']:checked").val() + '";\n';
- jsHtml += ' bwJsWidgetOptions.displayContactInDetails = ' + $("input[name='jsDisplayContact']:checked").val() + ';\n';
- jsHtml += ' bwJsWidgetOptions.displayCostInDetails = ' + $("input[name='jsDisplayCost']:checked").val() + ';\n';
+ jsHtml += ' bwJsWidgetOptions.displayContactInDetails = ' + $("input[name='jsDisplayContactInDetails']:checked").val() + ';\n';
+ jsHtml += ' bwJsWidgetOptions.displayCostInDetails = ' + $("input[name='jsDisplayCostInDetails']:checked").val() + ';\n';
jsHtml += ' bwJsWidgetOptions.displayTagsInDetails = ' + $("input[name='jsDisplayTags']:checked").val() + ';\n';
jsHtml += ' bwJsWidgetOptions.displayTimezoneInDetails = ' + $("input[name='jsDisplayTimezone']:checked").val() + ';\n\n';
jsHtml += ' insertBwEvents("bwOutput");\n'
More information about the Bedework-commit
mailing list