Merged changes from stable for new help button

diff --git a/lang/en/help/resource/window.html b/lang/en/help/resource/window.html
new file mode 100644 (file)
index 0000000..3c23f2c
--- /dev/null
+++ b/lang/en/help/resource/window.html
@@ -0,0 +1,58 @@
+<p align="center"><b>Window settings</b></p>
+
+<p>These settings can be hidden/shown by clicking the button labelled Hide settings or Show settings.</p>
+
+<p>Usually, resources are displayed in a normal framed window with the Moodle navigation 
+   controls in the top frame.  If you choose, you can remove this frame and have the 
+   resource fill the window like a normal web page.</p>
+
+<p>However, if you wish to have your resource appear in a new popup window follow these steps:</p>
+
+<ol>
+  <li>In the <b>Window:</b> section, select 'New Window'.</li>
+  <li>Deselect the options that you do not wish to use.<br />
+
+<blockquote>
+  <b>Allow the window to be resized?</b>
+  <p>
+  Keeping this item selected will allow users to change the size of the window that you have defined, 
+  and should almost always be left selected.  However, sometimes the resource is a fixed size and 
+  it may make sense to lock the window size.</p>
+
+  <b>Allow the window to be scrolled?</b>
+  <p>
+  This item will allow users to scroll through the window to see all your resource.  
+  If this item is unchecked, users will only see what what fits in the defined window size and will not 
+  be allowed to scroll the window to see the rest of the resource.</p>
+
+  <b>Show the directory links?</b>
+  <p>This will allow users to see the their directory links in this window.  This varies per browser: it might be 
+     known as the Links Bar (in IE), the Favourites Bar or the Bookmarks bar (in Mozilla/Firefox).</p>
+
+  <b>Show the location bar?</b>
+  <p>Do you want your users to see the URL (Web address) of the resource?  If so, leave this option checked.  Otherwise, the resource location will be hidden.</p>
+
+  <b>Show the menu bar?</b>
+  <p>To let your users have access to the menu bar in this window, leave this item checked.  Generally this is 
+     useful but for some graphical presentations it looks better without a menu bar.</p>
+
+  <b>Show the toolbar?</b>
+  <p>Showing the toolbar will make it easier for your users to navigate as it provides Back/Forward, Home, and Refresh buttons.</p>
+
+  <b>Show the status bar?</b>
+  <p>Showing the Status bar allows people to monitor browser information like how much of a resource has been loaded, or security information.</p>
+
+</blockquote>
+
+  <li>Determine the size window you wish to open. <br />
+
+<blockquote>
+  <p>Many people still use an average screen resolution of 800x600.  In most cases it's best if you 
+     initially size your window a little smaller than that, like 600 high and 480 wide.</p>
+
+  <p>If you leave these fields blank then the new popup window will be exactly the same size as the window they 
+     clicked on to get the popup.</p>
+
+</blockquote>
+</li>
+</ol>

diff --git a/mod/resource/type/file/file.html b/mod/resource/type/file/file.html
index b3cfb30ba02113e067d0834b130c9ff72cada15e..0459e74923a4e7f0b2610dd93a783ab33abb6787 100644 (file)
--- a/mod/resource/type/file/file.html
+++ b/mod/resource/type/file/file.html
@@ -50,6 +50,7 @@
         <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); ?>" />
+        <?php helpbutton("window", get_string("display", "resource"), "resource", true) ?>
     </td>
 </tr>
 <tr><td colspan="2">

diff --git a/mod/resource/type/html/html.html b/mod/resource/type/html/html.html
index 9c3807a8c1022dffb7c155743ffe86673a8f68a9..3a3b2aa92142f05ab75631ddf8b8069264adcabb 100644 (file)
--- a/mod/resource/type/html/html.html
+++ b/mod/resource/type/html/html.html
@@ -48,6 +48,7 @@
         <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); ?>" />
+        <?php helpbutton("window", get_string("display", "resource"), "resource", true) ?>
     </td>
 </tr>
 <tr><td colspan="2">

diff --git a/mod/resource/type/text/text.html b/mod/resource/type/text/text.html
index 2f92431f1599afd56f1b31b927223075fc14f4d9..fbcb687325c3e28db476005b8b2593c539c86db1 100644 (file)
--- a/mod/resource/type/text/text.html
+++ b/mod/resource/type/text/text.html
@@ -60,6 +60,7 @@
         <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); ?>" />
+        <?php helpbutton("window", get_string("display", "resource"), "resource", true) ?>
     </td>
 </tr>   
 <tr><td colspan="2">