Skip to content

Commit

Permalink
Merged new settings from stable
Browse files Browse the repository at this point in the history
  • Loading branch information
moodler committed Aug 28, 2004
1 parent 285ae71 commit 3393524
Show file tree
Hide file tree
Showing 7 changed files with 147 additions and 23 deletions.
28 changes: 28 additions & 0 deletions mod/resource/config.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,34 @@
echo "</tr>";
}
?>
<tr valign=top>
<td align=right><p>resource_windowsettings:</td>
<td>
<?php
unset($choices);
$choices["0"] = get_string("hidesettings");
$choices["1"] = get_string("showsettings");
choose_from_menu ($choices, "resource_windowsettings", $CFG->resource_windowsettings, "");
?>
</td>
<td>
<?php print_string("configwindowsettings", "resource") ?>
</td>
</tr>
<tr valign=top>
<td align=right><p>resource_parametersettings:</td>
<td>
<?php
unset($choices);
$choices["0"] = get_string("hidesettings");
$choices["1"] = get_string("showsettings");
choose_from_menu ($choices, "resource_parametersettings", $CFG->resource_parametersettings, "");
?>
</td>
<td>
<?php print_string("configparametersettings", "resource") ?>
</td>
</tr>
<tr>
<td colspan=3 align=center>
<input type="submit" value="<?php print_string("savechanges") ?>"></td>
Expand Down
22 changes: 22 additions & 0 deletions mod/resource/lib.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,14 @@
set_config("resource_popup", "");
}

if (!isset($CFG->resource_windowsettings)) {
set_config("resource_windowsettings", "0");
}

if (!isset($CFG->resource_parametersettings)) {
set_config("resource_parametersettings", "0");
}

$RESOURCE_WINDOW_OPTIONS = array("resizable", "scrollbars", "directories", "location",
"menubar", "toolbar", "status", "height", "width");

Expand Down Expand Up @@ -155,6 +163,13 @@ function add_instance($resource) {
}
}

if (isset($resource->parametersettingspref)) {
set_user_preference('resource_parametersettingspref', $resource->parametersettingspref);
}
if (isset($resource->windowsettingspref)) {
set_user_preference('resource_windowsettingspref', $resource->windowsettingspref);
}

return insert_record("resource", $resource);
}

Expand Down Expand Up @@ -189,6 +204,13 @@ function update_instance($resource) {
}
}

if (isset($resource->parametersettingspref)) {
set_user_preference('resource_parametersettingspref', $resource->parametersettingspref);
}
if (isset($resource->windowsettingspref)) {
set_user_preference('resource_windowsettingspref', $resource->windowsettingspref);
}

return update_record("resource", $resource);
}

Expand Down
33 changes: 25 additions & 8 deletions mod/resource/type/file/file.html
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,26 @@
<script language="javascript">
function showhide (id) {
function showhide (id, set) {
divobj = document.getElementById(id);
butobj = document.getElementById(id+'button');
if (divobj.style.display != 'none') {
divobj.style.display = 'none';
butobj.value = '<?php print_string("showsettings") ?>...';
prefobj = document.getElementById(id+'pref');
if (set == true) {
if (prefobj.value == '1') {
divobj.style.display = 'block';
butobj.value = '<?php print_string("hidesettings") ?>';
} else {
divobj.style.display = 'none';
butobj.value = '<?php print_string("showsettings") ?>...';
}
} else {
divobj.style.display = 'block';
butobj.value = '<?php print_string("hidesettings") ?>';
if (prefobj.value == '1') {
divobj.style.display = 'none';
butobj.value = '<?php print_string("showsettings") ?>...';
prefobj.value = '0';
} else {
divobj.style.display = 'block';
butobj.value = '<?php print_string("hidesettings") ?>';
prefobj.value = '1';
}
}
}
</script>
Expand Down Expand Up @@ -35,6 +48,8 @@
<td align="right"><p><b><?php print_string("display", "resource") ?>:</b></p></td>
<td>
<input type="button" value="hide settings" id="windowsettingsbutton" onClick="javascript: return showhide('windowsettings');" />
<input type="hidden" name="windowsettingspref" id="windowsettingspref"
value="<?php echo get_user_preferences('resource_windowsettingspref', $CFG->resource_windowsettings); ?>" />
</td>
</tr>
<tr><td colspan="2">
Expand Down Expand Up @@ -116,6 +131,8 @@
<td align="right"><p><b><?php print_string("parameters", "resource") ?>:</b></p></td>
<td>
<input type="button" value="hide settings" id="parametersettingsbutton" onClick="javascript: return showhide('parametersettings');" />
<input type="hidden" name="parametersettingspref" id="parametersettingspref"
value="<?php echo get_user_preferences('resource_parametersettingspref', $CFG->resource_parametersettings); ?>" />
<?php helpbutton("parameters", get_string("parameters", "resource"), "resource", true) ?>
</td>
</tr>
Expand Down Expand Up @@ -169,6 +186,6 @@


<script language="javascript">
showhide('parametersettings');
showhide('windowsettings');
showhide('parametersettings', true);
showhide('windowsettings', true);
</script>
30 changes: 22 additions & 8 deletions mod/resource/type/html/html.html
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,31 @@
<script language="javascript">
function showhide (id) {
function showhide (id, set) {
divobj = document.getElementById(id);
butobj = document.getElementById(id+'button');
if (divobj.style.display != 'none') {
divobj.style.display = 'none';
butobj.value = '<?php print_string("showsettings") ?>...';
prefobj = document.getElementById(id+'pref');
if (set == true) {
if (prefobj.value == '1') {
divobj.style.display = 'block';
butobj.value = '<?php print_string("hidesettings") ?>';
} else {
divobj.style.display = 'none';
butobj.value = '<?php print_string("showsettings") ?>...';
}
} else {
divobj.style.display = 'block';
butobj.value = '<?php print_string("hidesettings") ?>';
if (prefobj.value == '1') {
divobj.style.display = 'none';
butobj.value = '<?php print_string("showsettings") ?>...';
prefobj.value = '0';
} else {
divobj.style.display = 'block';
butobj.value = '<?php print_string("hidesettings") ?>';
prefobj.value = '1';
}
}
}
</script>



<tr valign="top">
<td align="right" nowrap>
<p><b><?php print_string("fulltext", "resource") ?>:</b></p><br />
Expand All @@ -34,6 +46,8 @@
<td align="right"><p><b><?php print_string("display", "resource") ?>:</b></p></td>
<td>
<input type="button" value="hide settings" id="windowsettingsbutton" onClick="javascript: return showhide('windowsettings');" />
<input type="hidden" name="windowsettingspref" id="windowsettingspref"
value="<?php echo get_user_preferences('resource_windowsettingspref', $CFG->resource_windowsettings); ?>" />
</td>
</tr>
<tr><td colspan="2">
Expand Down Expand Up @@ -101,6 +115,6 @@


<script language="javascript">
showhide('windowsettings');
showhide('windowsettings', true);
</script>

14 changes: 14 additions & 0 deletions mod/resource/type/html/resource.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,13 @@ function add_instance($resource) {
$resource->popup = "";
}

if (isset($resource->parametersettingspref)) {
set_user_preference('resource_parametersettingspref', $resource->parametersettingspref);
}
if (isset($resource->windowsettingspref)) {
set_user_preference('resource_windowsettingspref', $resource->windowsettingspref);
}

return insert_record("resource", $resource);
}

Expand Down Expand Up @@ -57,6 +64,13 @@ function update_instance($resource) {
$resource->popup = "";
}

if (isset($resource->parametersettingspref)) {
set_user_preference('resource_parametersettingspref', $resource->parametersettingspref);
}
if (isset($resource->windowsettingspref)) {
set_user_preference('resource_windowsettingspref', $resource->windowsettingspref);
}

return update_record("resource", $resource);
}

Expand Down
14 changes: 14 additions & 0 deletions mod/resource/type/text/resource.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,13 @@ function add_instance($resource) {
$resource->popup = "";
}

if (isset($resource->parametersettingspref)) {
set_user_preference('resource_parametersettingspref', $resource->parametersettingspref);
}
if (isset($resource->windowsettingspref)) {
set_user_preference('resource_windowsettingspref', $resource->windowsettingspref);
}

return insert_record("resource", $resource);
}

Expand All @@ -57,6 +64,13 @@ function update_instance($resource) {
$resource->popup = "";
}

if (isset($resource->parametersettingspref)) {
set_user_preference('resource_parametersettingspref', $resource->parametersettingspref);
}
if (isset($resource->windowsettingspref)) {
set_user_preference('resource_windowsettingspref', $resource->windowsettingspref);
}

return update_record("resource", $resource);
}

Expand Down
29 changes: 22 additions & 7 deletions mod/resource/type/text/text.html
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,26 @@
<script language="javascript">
function showhide (id) {
function showhide (id, set) {
divobj = document.getElementById(id);
butobj = document.getElementById(id+'button');
if (divobj.style.display != 'none') {
divobj.style.display = 'none';
butobj.value = '<?php print_string("showsettings") ?>...';
prefobj = document.getElementById(id+'pref');
if (set == true) {
if (prefobj.value == '1') {
divobj.style.display = 'block';
butobj.value = '<?php print_string("hidesettings") ?>';
} else {
divobj.style.display = 'none';
butobj.value = '<?php print_string("showsettings") ?>...';
}
} else {
divobj.style.display = 'block';
butobj.value = '<?php print_string("hidesettings") ?>';
if (prefobj.value == '1') {
divobj.style.display = 'none';
butobj.value = '<?php print_string("showsettings") ?>...';
prefobj.value = '0';
} else {
divobj.style.display = 'block';
butobj.value = '<?php print_string("hidesettings") ?>';
prefobj.value = '1';
}
}
}
</script>
Expand Down Expand Up @@ -45,6 +58,8 @@
<td align="right"><p><b><?php print_string("display", "resource") ?>:</b></p></td>
<td>
<input type="button" value="hide settings" id="windowsettingsbutton" onClick="javascript: return showhide('windowsettings');" />
<input type="hidden" name="windowsettingspref" id="windowsettingspref"
value="<?php echo get_user_preferences('resource_windowsettingspref', $CFG->resource_windowsettings); ?>" />
</td>
</tr>
<tr><td colspan="2">
Expand Down Expand Up @@ -114,6 +129,6 @@


<script language="javascript">
showhide('windowsettings');
showhide('windowsettings', true);
</script>

0 comments on commit 3393524

Please sign in to comment.