holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix for netscape not working with Netscape 6

Browse Source
This commit is contained in:
skeeter 2000-11-28 04:46:18 +00:00
parent 962f21660d
commit a33feebe8e
4 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
calendar/matrixselect.php
View File

@ -81,8 +81,8 @@
// View type // View type
$phpgw->template->set_var("field",lang("View")); $phpgw->template->set_var("field",lang("View"));
$str = "<select name=\"view\">"; $str = "<select name=\"matrixtype\">";
$str .= "<option value=\"free/busy\">".lang("free/busy")."</option>\n"; $str .= "<option value=\"free/busy\" selected>".lang("free/busy")."</option>\n";
$str .= "<option value=\"weekly\">".lang("Weekly")."</option>\n"; $str .= "<option value=\"weekly\">".lang("Weekly")."</option>\n";
$str .= "</select>\n"; $str .= "</select>\n";
$phpgw->template->set_var("data",$str); $phpgw->template->set_var("data",$str);
@ -126,11 +126,14 @@
$phpgw->template->set_var("data",$str); $phpgw->template->set_var("data",$str);
$phpgw->template->parse("output","list",True); $phpgw->template->parse("output","list",True);
$phpgw->template->set_var("action_url_button",""); // $phpgw->template->set_var("action_url_button","");
$phpgw->template->set_var("action_text_button",lang("Submit")); // $phpgw->template->set_var("action_text_button",lang("Submit"));
$phpgw->template->set_var("action_confirm_button","onClick=\"document.matrixform.submit();\""); // $phpgw->template->set_var("action_confirm_button","onClick=\"document.matrixform.submit();\"");
// $phpgw->template->parse("submit_button","form_button");
$phpgw->template->set_var("submit_button",lang("Submit"));
//<!-- {submit_button} -->
$phpgw->template->parse("submit_button","form_button");
$phpgw->template->set_var("action_url_button",""); $phpgw->template->set_var("action_url_button","");

5
calendar/templates/default/matrix_query.tpl
View File

@ -3,7 +3,7 @@
<center> <center>
<h2><font color="#000000">{matrix_action}</font></h2> <h2><font color="#000000">{matrix_action}</font></h2>
<form action="{action_url}" method="post" name="matrixform" target="viewmatrix"> <form target="viewmatrix" action="{action_url}" method="post" name="matrixform">
<table border="0" width="75%"> <table border="0" width="75%">
<!-- END matrix_query_begin --> <!-- END matrix_query_begin -->
@ -11,9 +11,8 @@
<!-- BEGIN matrix_query_end --> <!-- BEGIN matrix_query_end -->
</table> </table>
<input type="submit" value="{submit_button}">
</form> </form>
{submit_button}
{cancel_button} {cancel_button}
</center> </center>
<!-- END matrix_query_end --> <!-- END matrix_query_end -->

4
calendar/viewmatrix.php
View File

@ -53,7 +53,7 @@
} }
} }
switch($view) { switch($matrixtype) {
case "free/busy" : case "free/busy" :
echo $phpgw->calendar->timematrix($phpgw->calendar->date_to_epoch($date),$phpgw->calendar->splittime("000000"),0,$participants); echo $phpgw->calendar->timematrix($phpgw->calendar->date_to_epoch($date),$phpgw->calendar->splittime("000000"),0,$participants);
break; break;
@ -64,7 +64,7 @@
echo "<center>"; echo "<center>";
echo "<form action=\"".$phpgw->link("viewmatrix.php")."\" method=\"post\" name=\"matrixform\" target=\"viewmatrix\">"; echo "<form action=\"".$phpgw->link("viewmatrix.php")."\" method=\"post\" name=\"matrixform\" target=\"viewmatrix\">";
echo "<input type=\"hidden\" name=\"date\" value=\"".$date."\">"; echo "<input type=\"hidden\" name=\"date\" value=\"".$date."\">";
echo "<input type=\"hidden\" name=\"view\" value=\"".$view."\">"; echo "<input type=\"hidden\" name=\"matrixtype\" value=\"".$matrixtype."\">";
for ($i=0;$i<count($participants);$i++) for ($i=0;$i<count($participants);$i++)
echo "<input type=\"hidden\" name=\"participants[]\" value=\"".$participants[$i]."\">"; echo "<input type=\"hidden\" name=\"participants[]\" value=\"".$participants[$i]."\">";
echo "<input type=\"submit\" value=\"Refresh\">"; echo "<input type=\"submit\" value=\"Refresh\">";

1
doc/CHANGELOG
View File

@ -8,6 +8,7 @@
- Fix for TTS with Update by non-email user. - Fix for TTS with Update by non-email user.
- Fixed admin/accesslog.php wasn't using phpgw_access_log - Fixed admin/accesslog.php wasn't using phpgw_access_log
- Fix for Week View warning in calendar. - Fix for Week View warning in calendar.
- Fix for Matrix View not working with Netscape 6.
[0.9.6] - Fix user permissions where not being checked properly. [0.9.6] - Fix user permissions where not being checked properly.