Skip to content

Commit

Permalink
* Merged from HEAD
Browse files Browse the repository at this point in the history
  • Loading branch information
VOS Maintainer committed Jul 14, 2009
1 parent a47beee commit d9424d0
Show file tree
Hide file tree
Showing 32 changed files with 316 additions and 332 deletions.
4 changes: 2 additions & 2 deletions CREDITS
View file
Expand Up @@ -184,8 +184,8 @@ Ruby
PHP
<http://www.php.net/>

Virtuoso may be linked against libphp4.so or libphp5.so to provide a
PHP hosting environment.
Virtuoso may be linked against libphp5.so to provide a PHP hosting
environment.

PHP is distributed under the terms of the PHP License:
<http://php.net/license/>
Expand Down
12 changes: 3 additions & 9 deletions README.WINDOWS
View file
Expand Up @@ -116,7 +116,6 @@ Optional components
* virtodbc - Virtuoso ODBC Driver
* virtuoso_clr_t - .NET CLR-hosting server (requires .NET Framework SDK v1.1)
* virtuoso_javavm_t - Java hosting server (requires Java SDK)
* virtuoso_php_t - PHP4 hosting server (requires PHP4 library)
* virtuoso_sample_t - sample of the Virtuoso server with extensions
* hosting_perl - Perl hosting plugin (requires Active Perl)
* hosting_python - Python hosting plugin (requires Active Python)
Expand All @@ -135,11 +134,11 @@ Building Virtuoso Open Source with Microsoft Visual Studio 2003
Building optional components
----------------------------

PHP4 library notes
PHP5 library notes
------------------

The following directories with the header files from the PHP4 source tree need
to be placed under /win32/php4/ :
The following directories with the header files from the PHP5 source tree need
to be placed under /win32/php5/ :

* ext/
* main/
Expand All @@ -148,11 +147,6 @@ to be placed under /win32/php4/ :
* win32/
* Zend/

In the same directory (/win32/php4) you should also copy the following:

* php4ts.dll
* php4ts.lib
* php_version.h

Building the Virtuoso Open-Source Java hosting binary under Visual Studio 2003
------------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion appsrc/ODS-Calendar/make_vad.sh
View file
Expand Up @@ -28,7 +28,7 @@ export LANG LC_ALL

MODE=$1
LOGDIR=`pwd`
VERSION="1.6.46"
VERSION="1.6.47"
LOGFILE="${LOGDIR}/vad_make.log"
STICKER_DAV="vad_dav.xml"
STICKER_FS="vad_filesystem.xml"
Expand Down
3 changes: 2 additions & 1 deletion appsrc/ODS-Calendar/www/css/style.css
View file
Expand Up @@ -1324,7 +1324,8 @@ span.toolbarLabel
position: relative;
width: 100%;
}
.chip * {
.chip *
{
-moz-user-select:none;
}

Expand Down
70 changes: 43 additions & 27 deletions appsrc/ODS-Calendar/www/home.vspx
View file
Expand Up @@ -1602,16 +1602,25 @@
<v:select-list name="tvf_status" xhtml_id="tvf_status" xhtml_onchange="javascript: this.form.submit();">
<v:on-init>
<![CDATA[
declare x any;
declare x, y any;
x := make_array (6, 'any');
x := make_array (7, 'any');
x[0] := 'All';
x[1] := 'Not Started';
x[2] := 'In Progress';
x[3] := 'Completed';
x[4] := 'Waiting.';
x[5] := 'Deferred';
control.vsl_item_values := x;
x[1] := 'Completed';
x[2] := 'Not Completed';
x[3] := '~ Not Started';
x[4] := '~ In Progress';
x[5] := '~ Waiting';
x[6] := '~ Deferred';
y := make_array (7, 'any');
y[0] := 'All';
y[1] := 'Completed';
y[2] := 'Not Completed';
y[3] := 'Not Started';
y[4] := 'In Progress';
y[5] := 'Waiting';
y[6] := 'Deferred';
control.vsl_item_values := y;
control.vsl_items := x;
control.ufl_value := '';
]]>
Expand Down Expand Up @@ -1894,7 +1903,14 @@
self.cPrivacy
);
if (self.tv_status <> 'All')
{
if (self.tv_status = 'Not Completed')
{
control.ds_sql := control.ds_sql || ' and a.E_STATUS <> \'Completed\'';
} else {
control.ds_sql := control.ds_sql || sprintf (' and a.E_STATUS = ''%s''', self.tv_status);
}
}
self.sortChange (get_keyword ('t_sortColumn', e.ve_params), 'ts_order', 'ts_direction', self.ds);
control.ds_sql := sprintf ('%s order by %s %s', control.ds_sql, self.ts_order, self.ts_direction);
Expand Down Expand Up @@ -3014,7 +3030,7 @@
<?vsp
}
M := 4;
http (sprintf ('<tr id="s_tr_no" style="display: %s"><td colspan="%d"><b>No Sharings</b></td></tr>', case when L = 0 then '' else 'none' end, M));
http (sprintf ('<tr id="s_tr_no" style="display: %s";><td colspan="%d"><b>No Sharings</b></td></tr>', case when L = 0 then 'run-in' else 'none' end, M));
?>
</table>
<input type="hidden" id="s_no" name="s_no" value="<?V L+1 ?>" />
Expand Down Expand Up @@ -3306,8 +3322,8 @@
<v:label for="t_eventEndDate" value="Start Date"/>
</th>
<td>
<v:text name="t_eventStartDate" xhtml_id="t_eventStartDate" null-value="--''" value="--CAL.WA.dt_datestring (self.v_eventStart, self.cDateFormat)" xhtml_onclick="--sprintf ('cPopup.select(document.forms[0].t_eventStartDate, \'t_eventStartDate_select\', \'%s\');', self.cDateFormat)" xhtml_class="textbox" xhtml_size="10" />
<a href="#" id="t_eventStartDate_select" onclick="cPopup.select(document.forms[0].t_eventStartDate, 't_eventStartDate_select', '<?V self.cDateFormat ?>'); return false;" class="noapp">
<v:text name="t_eventStartDate" xhtml_id="t_eventStartDate" null-value="--''" value="--CAL.WA.dt_datestring (self.v_eventStart, self.cDateFormat)" xhtml_onclick="javascript: calendarPopup(\'t_eventStartDate\');" xhtml_class="textbox" xhtml_size="10" />
<a href="#" id="t_eventStartDate_select" onclick="calendarPopup('t_eventStartDate'); return false;" class="noapp">
<img border="0" title="pick" alt="pick" src="image/pick_calendar.gif"/>
</a>
</td>
Expand All @@ -3317,8 +3333,8 @@
<v:label for="t_eventEndDate" value="Due Date"/>
</th>
<td>
<v:text name="t_eventEndDate" xhtml_id="t_eventEndDate" null-value="--''" value="--CAL.WA.dt_datestring (self.v_eventEnd, self.cDateFormat)" xhtml_onclick="--sprintf ('cPopup.select(document.forms[0].t_eventEndDate, \'t_eventEndDate_select\', \'%s\');', self.cDateFormat)" xhtml_class="textbox" xhtml_size="10" />
<a href="#" id="t_eventEndDate_select" onclick="cPopup.select(document.forms[0].t_eventEndDate, 't_eventEndDate_select', '<?V self.cDateFormat ?>'); return false;" class="noapp">
<v:text name="t_eventEndDate" xhtml_id="t_eventEndDate" null-value="--''" value="--CAL.WA.dt_datestring (self.v_eventEnd, self.cDateFormat)" xhtml_onclick="javascript: calendarPopup(\'t_eventEndDate\', \'t_eventStartDate\', \'t_eventStartDate\');" xhtml_class="textbox" xhtml_size="10" />
<a href="#" id="t_eventEndDate_select" onclick="calendarPopup('t_eventEndDate', 't_eventStartDate', 't_eventStartDate'); return false;" class="noapp">
<img border="0" title="pick" alt="pick" src="image/pick_calendar.gif"/>
</a>
</td>
Expand All @@ -3328,8 +3344,8 @@
<v:label for="t_completed" value="Completed" />
</th>
<td>
<v:text name="t_completed" xhtml_id="t_completed" null-value="--''" value="--CAL.WA.dt_datestring (self.v_completed, self.cDateFormat)" xhtml_onclick="--sprintf ('cPopup.select(document.forms[0].t_completed, \'t_completed_select\', \'%s\');', self.cDateFormat)" xhtml_class="textbox" xhtml_size="10" />
<a href="#" id="t_completed_select" onclick="cPopup.select(document.forms[0].t_completed, 't_completed_select', '<?V self.cDateFormat ?>'); return false;" class="noapp">
<v:text name="t_completed" xhtml_id="t_completed" null-value="--''" value="--CAL.WA.dt_datestring (self.v_completed, self.cDateFormat)" xhtml_onclick="javascript: calendarPopup(\'t_completed\', \'t_eventEndDate\', \'t_eventStartDate\'); changeComplete(this);" xhtml_class="textbox" xhtml_size="10" xhtml_onchange="javascript: changeComplete(this);"/>
<a href="#" id="t_completed_select" onclick="calendarPopup('t_completed', 't_eventEndDate', 't_eventStartDate'); changeComplete('t_completed'); return false;" class="noapp">
<img border="0" title="pick" alt="pick" src="image/pick_calendar.gif" />
</a>
</td>
Expand Down Expand Up @@ -3372,7 +3388,7 @@
<v:label for="t_status" value="Status"/>
</th>
<td>
<v:select-list name="t_status" xhtml_id="t_status" xhtml_onchange="javascript: changeComplete(); ">
<v:select-list name="t_status" xhtml_id="t_status" xhtml_onchange="javascript: changeComplete(this);">
<v:on-init>
<![CDATA[
declare x any;
Expand All @@ -3381,7 +3397,7 @@
x[0] := 'Not Started';
x[1] := 'In Progress';
x[2] := 'Completed';
x[3] := 'Waiting.';
x[3] := 'Waiting';
x[4] := 'Deferred';
control.vsl_item_values := x;
control.vsl_items := x;
Expand All @@ -3398,10 +3414,10 @@
</tr>
<tr>
<th>
<v:label for="t_complete" value="% Complete"/>
<v:label for="t_complete" value="Complete (%)" />
</th>
<td>
<v:select-list name="t_complete" xhtml_id="t_complete" xhtml_onchange="javascript: changeComplete(); ">>
<v:select-list name="t_complete" xhtml_id="t_complete" xhtml_onchange="javascript: changeComplete(this);">
<v:on-init>
<![CDATA[
declare x any;
Expand Down Expand Up @@ -3596,7 +3612,7 @@
<?vsp
}
M := 4;
http (sprintf ('<tr id="s_tr_no" style="display: %s"><td colspan="%d"><b>No Sharings</b></td></tr>', case when L = 0 then '' else 'none' end, M));
http (sprintf ('<tr id="s_tr_no" style="display: %s"><td colspan="%d"><b>No Sharings</b></td></tr>', case when L = 0 then 'run-in' else 'none' end, M));
?>
</table>
<input type="hidden" id="s_no" name="s_no" value="<?V L+1 ?>" />
Expand Down Expand Up @@ -3836,10 +3852,10 @@
<th>
Source name
</th>
<td id="imp_td_0" style="display: <?V case when self.icSource < 1 then '' else 'none' end ?>;">
<td id="imp_td_0" style="display: <?V case when self.icSource < 1 then 'run-in' else 'none' end ?>;">
<input type="file" name="f_file" size="60" />
</td>
<td id="imp_td_1" style="display: <?V case when self.icSource = 1 then '' else 'none' end ?>;">
<td id="imp_td_1" style="display: <?V case when self.icSource = 1 then 'run-in' else 'none' end ?>;">
<v:text name="f_dav" xhtml_id="f_dav" value="--''" xhtml_size="60" /><v:button action="browse" name="browse" value="Browse...">
<v:after-data-bind>
<![CDATA[
Expand All @@ -3848,19 +3864,19 @@
</v:after-data-bind>
</v:button>
</td>
<td id="imp_td_2" style="display: <?V case when self.icSource = 2 then '' else 'none' end ?>;">
<td id="imp_td_2" style="display: <?V case when self.icSource = 2 then 'run-in' else 'none' end ?>;">
<v:text name="f_uri" value="--''" xhtml_size="60" />
</td>
</tr>
<tr id="imp_tr_31" style="display: <?V case when self.icSource < 1 then 'none' else '' end ?>;">
<tr id="imp_tr_31" style="display: <?V case when self.icSource < 1 then 'none' else 'run-in' end ?>;">
<th>
User
</th>
<td>
<v:text name="i_user" value="--self.icUser" xhtml_class="" />
</td>
</tr>
<tr id="imp_tr_32" style="display: <?V case when self.icSource < 1 then 'none' else '' end ?>;">
<tr id="imp_tr_32" style="display: <?V case when self.icSource < 1 then 'none' else 'run-in' end ?>;">
<th>
Password
</th>
Expand Down Expand Up @@ -4049,15 +4065,15 @@
</v:button>
</td>
</tr>
<tr id="ex_tr_0" style="display: <?V case when self.exType < 1 then 'none' else '' end ?>;">
<tr id="ex_tr_0" style="display: <?V case when self.exType < 1 then 'none' else 'run-in' end ?>;">
<th>
User
</th>
<td>
<v:text name="ex_user" value="--self.exUser" xhtml_class="" />
</td>
</tr>
<tr id="ex_tr_1" style="display: <?V case when self.exType < 1 then 'none' else '' end ?>;">
<tr id="ex_tr_1" style="display: <?V case when self.exType < 1 then 'none' else 'run-in' end ?>;">
<th>
Password
</th>
Expand Down

0 comments on commit d9424d0

Please sign in to comment.