cvs update -dPA
cvs update -kk -j MOODLE_XX_WIDGET
diff --git a/lang/en_utf8/docs/docstyles.css b/lang/en_utf8/docs/docstyles.css index 0af1b88cdb..7ddb9a21f8 100755 --- a/lang/en_utf8/docs/docstyles.css +++ b/lang/en_utf8/docs/docstyles.css @@ -28,7 +28,7 @@ form { li { - margin-bottom: 10px; + margin-bottom: 10px; } @@ -49,10 +49,10 @@ li { } .normaltext { - font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; - font-size: medium; - border: none; - margin-left: 30px; + font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; + font-size: medium; + border: none; + margin-left: 30px; } @@ -71,64 +71,64 @@ li { } .examplecode { - font-family: "Courier New", Courier, mono; - font-size: small; - border: thin dashed #999999; - background-color: #FBFBFB; - margin: auto; - padding: 30px; - height: auto; - width: auto; + font-family: "Courier New", Courier, mono; + font-size: small; + border: thin dashed #999999; + background-color: #FBFBFB; + margin: auto; + padding: 30px; + height: auto; + width: auto; } h1 { - font-weight: bold; - color: #000000; - background-color: #CCCCCC; - padding: 5px; - font-size: large; + font-weight: bold; + color: #000000; + background-color: #CCCCCC; + padding: 5px; + font-size: large; border-width: 1px; border-color: #CCCCCC; -moz-border-radius: 10px; } h2 { - font-weight: bold; - color: #FFFFFF; - background-color: #666666; - padding: 5px; - font-size: medium; + font-weight: bold; + color: #FFFFFF; + background-color: #666666; + padding: 5px; + font-size: medium; border-width: 1px; border-color: #666666; -moz-border-radius: 10px; } h3 { - font-weight: normal; - color: #FFFFFF; - background-color: #666666; - padding: 5px; - font-size: medium; + font-weight: normal; + color: #FFFFFF; + background-color: #666666; + padding: 5px; + font-size: medium; -moz-border-radius: 10px; } .spaced { - margin-bottom: 30px; + margin-bottom: 30px; } ul { - margin-top: 10px; + margin-top: 10px; } .commandline { - font-family: "Courier New", Courier, mono; - font-size: x-small; - background-color: #FBFBFB; - margin: auto auto 20px 30px; - padding: 5px; - height: auto; - width: auto; - font-weight: bold; - border: 1px solid #999999; - white-space: nowrap; - display: compact; - clear: both; - float: none; + font-family: "Courier New", Courier, mono; + font-size: x-small; + background-color: #FBFBFB; + margin: auto auto 20px 30px; + padding: 5px; + height: auto; + width: auto; + font-weight: bold; + border: 1px solid #999999; + white-space: nowrap; + display: compact; + clear: both; + float: none; } diff --git a/lang/en_utf8/docs/future.html b/lang/en_utf8/docs/future.html index 74f88c06f9..f5d0e93062 100644 --- a/lang/en_utf8/docs/future.html +++ b/lang/en_utf8/docs/future.html @@ -4,7 +4,7 @@ Moodle Docs: Future - + diff --git a/lang/en_utf8/docs/installamp.html b/lang/en_utf8/docs/installamp.html index b6e093bcd3..50fa38eb93 100644 --- a/lang/en_utf8/docs/installamp.html +++ b/lang/en_utf8/docs/installamp.html @@ -3,7 +3,7 @@ Moodle Docs: Installing PHP and MySQL - + diff --git a/lang/en_utf8/docs/licence.html b/lang/en_utf8/docs/licence.html index 02f38fddcc..c02ada19d2 100644 --- a/lang/en_utf8/docs/licence.html +++ b/lang/en_utf8/docs/licence.html @@ -35,7 +35,7 @@

		    GNU GENERAL PUBLIC LICENSE
		       Version 2, June 1991

 Copyright (C) 1989, 1991 Free Software Foundation, Inc.
 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

			    Preamble

  The licenses for most software are designed to take away your
freedom to share and change it.  By contrast, the GNU General Public
License is intended to guarantee your freedom to share and change free
software--to make sure the software is free for all its users.  This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it.  (Some other Free Software Foundation software is covered by
the GNU Library General Public License instead.)  You can apply it to
your programs, too.

  When we speak of free software, we are referring to freedom, not
price.  Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
this service if you wish), that you receive source code or can get it
if you want it, that you can change the software or use pieces of it
in new free programs; and that you know you can do these things.

  To protect your rights, we need to make restrictions that forbid
anyone to deny you these rights or to ask you to surrender the rights.
These restrictions translate to certain responsibilities for you if you
distribute copies of the software, or if you modify it.

  For example, if you distribute copies of such a program, whether
gratis or for a fee, you must give the recipients all the rights that
you have.  You must make sure that they, too, receive or can get the
source code.  And you must show them these terms so they know their
rights.

  We protect your rights with two steps: (1) copyright the software, and
(2) offer you this license which gives you legal permission to copy,
distribute and/or modify the software.

  Also, for each author's protection and ours, we want to make certain
that everyone understands that there is no warranty for this free
software.  If the software is modified by someone else and passed on, we
want its recipients to know that what they have is not the original, so
that any problems introduced by others will not reflect on the original
authors' reputations.

  Finally, any free program is threatened constantly by software
patents.  We wish to avoid the danger that redistributors of a free
program will individually obtain patent licenses, in effect making the
program proprietary.  To prevent this, we have made it clear that any
patent must be licensed for everyone's free use or not licensed at all.

  The precise terms and conditions for copying, distribution and
modification follow.

		    GNU GENERAL PUBLIC LICENSE
   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

  0. This License applies to any program or other work which contains
a notice placed by the copyright holder saying it may be distributed
under the terms of this General Public License.  The "Program", below,
refers to any such program or work, and a "work based on the Program"
means either the Program or any derivative work under copyright law:
that is to say, a work containing the Program or a portion of it,
either verbatim or with modifications and/or translated into another
language.  (Hereinafter, translation is included without limitation in
the term "modification".)  Each licensee is addressed as "you".

Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope.  The act of
running the Program is not restricted, and the output from the Program
is covered only if its contents constitute a work based on the
Program (independent of having been made by running the Program).
Whether that is true depends on what the Program does.

  1. You may copy and distribute verbatim copies of the Program's
source code as you receive it, in any medium, provided that you
conspicuously and appropriately publish on each copy an appropriate
copyright notice and disclaimer of warranty; keep intact all the
notices that refer to this License and to the absence of any warranty;
and give any other recipients of the Program a copy of this License
along with the Program.

You may charge a fee for the physical act of transferring a copy, and
you may at your option offer warranty protection in exchange for a fee.

  2. You may modify your copy or copies of the Program or any portion
of it, thus forming a work based on the Program, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:

    a) You must cause the modified files to carry prominent notices
    stating that you changed the files and the date of any change.

    b) You must cause any work that you distribute or publish, that in
    whole or in part contains or is derived from the Program or any
    part thereof, to be licensed as a whole at no charge to all third
    parties under the terms of this License.

    c) If the modified program normally reads commands interactively
    when run, you must cause it, when started running for such
    interactive use in the most ordinary way, to print or display an
    announcement including an appropriate copyright notice and a
    notice that there is no warranty (or else, saying that you provide
    a warranty) and that users may redistribute the program under
    these conditions, and telling the user how to view a copy of this
    License.  (Exception: if the Program itself is interactive but
    does not normally print such an announcement, your work based on
    the Program is not required to print an announcement.)

These requirements apply to the modified work as a whole.  If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works.  But when you
distribute the same sections as part of a whole which is a work based
on the Program, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote it.

Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Program.

In addition, mere aggregation of another work not based on the Program
with the Program (or with a work based on the Program) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.

  3. You may copy and distribute the Program (or a work based on it,
under Section 2) in object code or executable form under the terms of
Sections 1 and 2 above provided that you also do one of the following:

    a) Accompany it with the complete corresponding machine-readable
    source code, which must be distributed under the terms of Sections
    1 and 2 above on a medium customarily used for software interchange; or,

    b) Accompany it with a written offer, valid for at least three
    years, to give any third party, for a charge no more than your
    cost of physically performing source distribution, a complete
    machine-readable copy of the corresponding source code, to be
    distributed under the terms of Sections 1 and 2 above on a medium
    customarily used for software interchange; or,

    c) Accompany it with the information you received as to the offer
    to distribute corresponding source code.  (This alternative is
    allowed only for noncommercial distribution and only if you
    received the program in object code or executable form with such
    an offer, in accord with Subsection b above.)

The source code for a work means the preferred form of the work for
making modifications to it.  For an executable work, complete source
code means all the source code for all modules it contains, plus any
associated interface definition files, plus the scripts used to
control compilation and installation of the executable.  However, as a
special exception, the source code distributed need not include
anything that is normally distributed (in either source or binary
form) with the major components (compiler, kernel, and so on) of the
operating system on which the executable runs, unless that component
itself accompanies the executable.

If distribution of executable or object code is made by offering
access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.

  4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License.  Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
void, and will automatically terminate your rights under this License.
However, parties who have received copies, or rights, from you under
this License will not have their licenses terminated so long as such
parties remain in full compliance.

  5. You are not required to accept this License, since you have not
signed it.  However, nothing else grants you permission to modify or
distribute the Program or its derivative works.  These actions are
prohibited by law if you do not accept this License.  Therefore, by
modifying or distributing the Program (or any work based on the
Program), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Program or works based on it.

  6. Each time you redistribute the Program (or any work based on the
Program), the recipient automatically receives a license from the
original licensor to copy, distribute or modify the Program subject to
these terms and conditions.  You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties to
this License.

  7. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License.  If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Program at all.  For example, if a patent
license would not permit royalty-free redistribution of the Program by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Program.

If any portion of this section is held invalid or unenforceable under
any particular circumstance, the balance of the section is intended to
apply and the section as a whole is intended to apply in other
circumstances.

It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system, which is
implemented by public license practices.  Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.

This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.

  8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
may add an explicit geographical distribution limitation excluding
those countries, so that distribution is permitted only in or among
countries not thus excluded.  In such case, this License incorporates
the limitation as if written in the body of this License.

  9. The Free Software Foundation may publish revised and/or new versions
of the General Public License from time to time.  Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.

Each version is given a distinguishing version number.  If the Program
specifies a version number of this License which applies to it and "any
later version", you have the option of following the terms and conditions
either of that version or of any later version published by the Free
Software Foundation.  If the Program does not specify a version number of
this License, you may choose any version ever published by the Free Software
Foundation.

  10. If you wish to incorporate parts of the Program into other free
programs whose distribution conditions are different, write to the author
to ask for permission.  For software which is copyrighted by the Free
Software Foundation, write to the Free Software Foundation; we sometimes
make exceptions for this.  Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.

			    NO WARRANTY

  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
REPAIR OR CORRECTION.

  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.

		     END OF TERMS AND CONDITIONS

            GNU GENERAL PUBLIC LICENSE
               Version 2, June 1991

 Copyright (C) 1989, 1991 Free Software Foundation, Inc.
 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

                Preamble

  The licenses for most software are designed to take away your
freedom to share and change it.  By contrast, the GNU General Public
License is intended to guarantee your freedom to share and change free
software--to make sure the software is free for all its users.  This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it.  (Some other Free Software Foundation software is covered by
the GNU Library General Public License instead.)  You can apply it to
your programs, too.

  When we speak of free software, we are referring to freedom, not
price.  Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
this service if you wish), that you receive source code or can get it
if you want it, that you can change the software or use pieces of it
in new free programs; and that you know you can do these things.

  To protect your rights, we need to make restrictions that forbid
anyone to deny you these rights or to ask you to surrender the rights.
These restrictions translate to certain responsibilities for you if you
distribute copies of the software, or if you modify it.

  For example, if you distribute copies of such a program, whether
gratis or for a fee, you must give the recipients all the rights that
you have.  You must make sure that they, too, receive or can get the
source code.  And you must show them these terms so they know their
rights.

  We protect your rights with two steps: (1) copyright the software, and
(2) offer you this license which gives you legal permission to copy,
distribute and/or modify the software.

  Also, for each author's protection and ours, we want to make certain
that everyone understands that there is no warranty for this free
software.  If the software is modified by someone else and passed on, we
want its recipients to know that what they have is not the original, so
that any problems introduced by others will not reflect on the original
authors' reputations.

  Finally, any free program is threatened constantly by software
patents.  We wish to avoid the danger that redistributors of a free
program will individually obtain patent licenses, in effect making the
program proprietary.  To prevent this, we have made it clear that any
patent must be licensed for everyone's free use or not licensed at all.

  The precise terms and conditions for copying, distribution and
modification follow.

            GNU GENERAL PUBLIC LICENSE
   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

  0. This License applies to any program or other work which contains
a notice placed by the copyright holder saying it may be distributed
under the terms of this General Public License.  The "Program", below,
refers to any such program or work, and a "work based on the Program"
means either the Program or any derivative work under copyright law:
that is to say, a work containing the Program or a portion of it,
either verbatim or with modifications and/or translated into another
language.  (Hereinafter, translation is included without limitation in
the term "modification".)  Each licensee is addressed as "you".

Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope.  The act of
running the Program is not restricted, and the output from the Program
is covered only if its contents constitute a work based on the
Program (independent of having been made by running the Program).
Whether that is true depends on what the Program does.

  1. You may copy and distribute verbatim copies of the Program's
source code as you receive it, in any medium, provided that you
conspicuously and appropriately publish on each copy an appropriate
copyright notice and disclaimer of warranty; keep intact all the
notices that refer to this License and to the absence of any warranty;
and give any other recipients of the Program a copy of this License
along with the Program.

You may charge a fee for the physical act of transferring a copy, and
you may at your option offer warranty protection in exchange for a fee.

  2. You may modify your copy or copies of the Program or any portion
of it, thus forming a work based on the Program, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:

    a) You must cause the modified files to carry prominent notices
    stating that you changed the files and the date of any change.

    b) You must cause any work that you distribute or publish, that in
    whole or in part contains or is derived from the Program or any
    part thereof, to be licensed as a whole at no charge to all third
    parties under the terms of this License.

    c) If the modified program normally reads commands interactively
    when run, you must cause it, when started running for such
    interactive use in the most ordinary way, to print or display an
    announcement including an appropriate copyright notice and a
    notice that there is no warranty (or else, saying that you provide
    a warranty) and that users may redistribute the program under
    these conditions, and telling the user how to view a copy of this
    License.  (Exception: if the Program itself is interactive but
    does not normally print such an announcement, your work based on
    the Program is not required to print an announcement.)

These requirements apply to the modified work as a whole.  If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works.  But when you
distribute the same sections as part of a whole which is a work based
on the Program, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote it.

Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Program.

In addition, mere aggregation of another work not based on the Program
with the Program (or with a work based on the Program) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.

  3. You may copy and distribute the Program (or a work based on it,
under Section 2) in object code or executable form under the terms of
Sections 1 and 2 above provided that you also do one of the following:

    a) Accompany it with the complete corresponding machine-readable
    source code, which must be distributed under the terms of Sections
    1 and 2 above on a medium customarily used for software interchange; or,

    b) Accompany it with a written offer, valid for at least three
    years, to give any third party, for a charge no more than your
    cost of physically performing source distribution, a complete
    machine-readable copy of the corresponding source code, to be
    distributed under the terms of Sections 1 and 2 above on a medium
    customarily used for software interchange; or,

    c) Accompany it with the information you received as to the offer
    to distribute corresponding source code.  (This alternative is
    allowed only for noncommercial distribution and only if you
    received the program in object code or executable form with such
    an offer, in accord with Subsection b above.)

The source code for a work means the preferred form of the work for
making modifications to it.  For an executable work, complete source
code means all the source code for all modules it contains, plus any
associated interface definition files, plus the scripts used to
control compilation and installation of the executable.  However, as a
special exception, the source code distributed need not include
anything that is normally distributed (in either source or binary
form) with the major components (compiler, kernel, and so on) of the
operating system on which the executable runs, unless that component
itself accompanies the executable.

If distribution of executable or object code is made by offering
access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.

  4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License.  Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
void, and will automatically terminate your rights under this License.
However, parties who have received copies, or rights, from you under
this License will not have their licenses terminated so long as such
parties remain in full compliance.

  5. You are not required to accept this License, since you have not
signed it.  However, nothing else grants you permission to modify or
distribute the Program or its derivative works.  These actions are
prohibited by law if you do not accept this License.  Therefore, by
modifying or distributing the Program (or any work based on the
Program), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Program or works based on it.

  6. Each time you redistribute the Program (or any work based on the
Program), the recipient automatically receives a license from the
original licensor to copy, distribute or modify the Program subject to
these terms and conditions.  You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties to
this License.

  7. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License.  If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Program at all.  For example, if a patent
license would not permit royalty-free redistribution of the Program by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Program.

If any portion of this section is held invalid or unenforceable under
any particular circumstance, the balance of the section is intended to
apply and the section as a whole is intended to apply in other
circumstances.

It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system, which is
implemented by public license practices.  Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.

This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.

  8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
may add an explicit geographical distribution limitation excluding
those countries, so that distribution is permitted only in or among
countries not thus excluded.  In such case, this License incorporates
the limitation as if written in the body of this License.

  9. The Free Software Foundation may publish revised and/or new versions
of the General Public License from time to time.  Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.

Each version is given a distinguishing version number.  If the Program
specifies a version number of this License which applies to it and "any
later version", you have the option of following the terms and conditions
either of that version or of any later version published by the Free
Software Foundation.  If the Program does not specify a version number of
this License, you may choose any version ever published by the Free Software
Foundation.

  10. If you wish to incorporate parts of the Program into other free
programs whose distribution conditions are different, write to the author
to ask for permission.  For software which is copyrighted by the Free
Software Foundation, write to the Free Software Foundation; we sometimes
make exceptions for this.  Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.

                NO WARRANTY

  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
REPAIR OR CORRECTION.

  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.

             END OF TERMS AND CONDITIONS

'; + if ($item->id == $selected_page) $contents .= '

'; $contents .= ''.$item->title.''; if ($item->id == $selected_page) $contents .= '

'; } else { diff --git a/mod/scorm/README.txt b/mod/scorm/README.txt index 25fe1dd873..e31eb70547 100644 --- a/mod/scorm/README.txt +++ b/mod/scorm/README.txt @@ -23,7 +23,7 @@ Moodle 1.6 A popup window display mode. DONE New Moodle course format: SCORM. DONE Add prerequisites support to SCORM 1.2. DONE -Customizable player page. DONE +Customizable player page. DONE Multiple attempt management. Complete AICC conformance. diff --git a/mod/wiki/TODO.txt b/mod/wiki/TODO.txt index ba31a2bd79..66c885653c 100644 --- a/mod/wiki/TODO.txt +++ b/mod/wiki/TODO.txt @@ -1,8 +1,8 @@ ToDo Mike: - Group Handling (Mike) - > deal with changing group mode on active wikis - > handle group mode for teacher wikis + > deal with changing group mode on active wikis + > handle group mode for teacher wikis - Rating - Commenting - Grading diff --git a/mod/wiki/ewiki/fragments/calendar.css b/mod/wiki/ewiki/fragments/calendar.css index aeb0434447..a83734c88b 100644 --- a/mod/wiki/ewiki/fragments/calendar.css +++ b/mod/wiki/ewiki/fragments/calendar.css @@ -5,35 +5,35 @@ */ - table.caltable{ - background-color: #CDBDAD; - } - td.calhead { - font-family: Verdana, Arial, sans-serif; - font-size: 8pt; - text-align:center; - } - th.caldays{ - color:#BA997A; - font-family: Verdana, Arial, sans-serif; - font-size: 8pt; - text-align:center; - } - td.calday{ - font-family: Verdana, Arial, sans-serif; - font-size: 8pt; - text-align:right; - } - td.caltoday{ - background-color:#D7CFC7; - font-family: Verdana, Arial, sans-serif; - font-size: 8pt; - text-align:right; - } - a.calpg{ - text-decoration: none; - font-weight:600; - } - a.calhide{ - text-decoration: none; - } + table.caltable{ + background-color: #CDBDAD; + } + td.calhead { + font-family: Verdana, Arial, sans-serif; + font-size: 8pt; + text-align:center; + } + th.caldays{ + color:#BA997A; + font-family: Verdana, Arial, sans-serif; + font-size: 8pt; + text-align:center; + } + td.calday{ + font-family: Verdana, Arial, sans-serif; + font-size: 8pt; + text-align:right; + } + td.caltoday{ + background-color:#D7CFC7; + font-family: Verdana, Arial, sans-serif; + font-size: 8pt; + text-align:right; + } + a.calpg{ + text-decoration: none; + font-weight:600; + } + a.calhide{ + text-decoration: none; + } diff --git a/mod/wiki/ewiki/fragments/core.css b/mod/wiki/ewiki/fragments/core.css index 2f5f1647a1..e56c93a4b6 100644 --- a/mod/wiki/ewiki/fragments/core.css +++ b/mod/wiki/ewiki/fragments/core.css @@ -5,59 +5,59 @@ */ - body, td { - line-height:140%; - } - - a { - text-decoration:none; - } - - a:hover { - text-decoration:underline; - } - - p { - line-height:110%; - } - - em { - text-decoration:none; - font-style:normal; - background-color:#cccc22; - } - - strong { - font-weight:700; - } - - .box { - background-color:#222266; - border:1px #111133 solid; - } - - .box hr { - display:none; - } - - hr { - visibility:hidden; - } - - form[name=ewiki] { - border:2px #ffffff dashed; - padding:5px; - background-color:#444444; - } - - textarea[name=content] { - border:2px #000000 dotted; - background-color:#B4D3D7; - } - - input[name=save], input[name=preview] { - border:1px #000000 solid; - background-color:#B4D3D7; - -moz-border-redius:10px; - } + body, td { + line-height:140%; + } + + a { + text-decoration:none; + } + + a:hover { + text-decoration:underline; + } + + p { + line-height:110%; + } + + em { + text-decoration:none; + font-style:normal; + background-color:#cccc22; + } + + strong { + font-weight:700; + } + + .box { + background-color:#222266; + border:1px #111133 solid; + } + + .box hr { + display:none; + } + + hr { + visibility:hidden; + } + + form[name=ewiki] { + border:2px #ffffff dashed; + padding:5px; + background-color:#444444; + } + + textarea[name=content] { + border:2px #000000 dotted; + background-color:#B4D3D7; + } + + input[name=save], input[name=preview] { + border:1px #000000 solid; + background-color:#B4D3D7; + -moz-border-redius:10px; + } diff --git a/mod/wiki/ewiki/plugins/moodle/downloads.php b/mod/wiki/ewiki/plugins/moodle/downloads.php index 2d58cf592f..e3148d6307 100644 --- a/mod/wiki/ewiki/plugins/moodle/downloads.php +++ b/mod/wiki/ewiki/plugins/moodle/downloads.php @@ -29,13 +29,13 @@ if (defined("EWIKI_ACTION_ATTACHMENTS") && EWIKI_ACTION_ATTACHMENTS) { #-- icons (best given absolute to www root) /*$ewiki_binary_icons = array( - ".bin" => "/icons/exec.gif", + ".bin" => "/icons/exec.gif", "application/" => "/icons/exec.gif", "application/octet-stream" => "/icons/exec.gif", - ".ogg" => "/icons/son.gif", - ".jpeg" => "/icons/pic.gif", - "text/" => "/icons/txt.gif", - ".pdf" => "/icons/txt.gif", + ".ogg" => "/icons/son.gif", + ".jpeg" => "/icons/pic.gif", + "text/" => "/icons/txt.gif", + ".pdf" => "/icons/txt.gif", );*/ @@ -61,7 +61,7 @@ $ewiki_t["en"]["of"] = "of"; $ewiki_t["en"]["comment"] = "Comment"; $ewiki_t["en"]["dwnl_section"] = "download section"; $ewiki_t["en"]["DWNL_ENTRY_FORMAT"] = - '

$icon$title$size
'. + '

$icon$title$size
'. 'uploaded on $time, downloaded $hits times
'. '($id)
'. '$section'.'file is of type $type'. @@ -70,10 +70,10 @@ $ewiki_t["en"]["DWNL_ENTRY_FORMAT"] = $ewiki_t["de"]["UPLOAD0"] = "Mit diesem Formular kannst du beliebige Dateien in das Wiki abspeichern:
"; $ewiki_t["de"]["UPL_NEWNAM"] = "Mit unterschiedlichem Dateinamen speichern"; $ewiki_t["de"]["UPL_INSECT"] = "Hochladen in Bereich:"; -$ewiki_t["de"]["UPL_TOOLARGE"] = "Deine Datei wurde nicht aufgenommen, weil sie zu groß war!"; -$ewiki_t["de"]["UPL_REJSECT"] = 'Der angegebene Download-Bereich "$sect" wird nicht verwendet. Bitte verwende einen von den voreingestellten Bereichen, damit Andere die Datei später auch finden können, oder frag den Administrator das Hochladen für beliebige Seiten zu aktivieren.

'; +$ewiki_t["de"]["UPL_TOOLARGE"] = "Deine Datei wurde nicht aufgenommen, weil sie zu groï¿½ war!"; +$ewiki_t["de"]["UPL_REJSECT"] = 'Der angegebene Download-Bereich "$sect" wird nicht verwendet. Bitte verwende einen von den voreingestellten Bereichen, damit Andere die Datei spï¿½ter auch finden kï¿½nnen, oder frag den Administrator das Hochladen fï¿½r beliebige Seiten zu aktivieren.

'; $ewiki_t["de"]["UPL_OK"] = "Deine Datei wurde korrekt hochgeladen, sehe einfach auf der ".EWIKI_PAGE_DOWNLOAD." nach.

"; -$ewiki_t["de"]["UPL_ERROR"] = "'Tschuldige, aber irgend etwas ist während des Hochladens gründlich schief gelaufen.

"; +$ewiki_t["de"]["UPL_ERROR"] = "'Tschuldige, aber irgend etwas ist wï¿½hrend des Hochladens grï¿½ndlich schief gelaufen.

"; $ewiki_t["de"]["DWNL_SEEUPL"] = 'Siehe auch DateiHochladen, auf dieser Seite stehen nur die Downloads.

'; $ewiki_t["de"]["DWNL_NOFILES"] = "Noch keine Dateien hochgeladen.
\n"; $ewiki_t["de"]["file"] = "Datei"; @@ -81,7 +81,7 @@ $ewiki_t["de"]["of"] = "von"; $ewiki_t["de"]["comment"] = "Kommentar"; $ewiki_t["de"]["dwnl_section"] = "Download Bereich"; $ewiki_t["de"]["DWNL_ENTRY_FORMAT"] = - '

$icon$title$size
'. + '

$icon$title$size
'. 'am $time hochgeladen, $hits mal abgerufen
'. '($id)
'. '$section'.'Datei ist vom Typ $type'. diff --git a/mod/wiki/ewiki/plugins/moodle/moodle_binary_store.php b/mod/wiki/ewiki/plugins/moodle/moodle_binary_store.php index ed71ce4513..0d05f959c9 100644 --- a/mod/wiki/ewiki/plugins/moodle/moodle_binary_store.php +++ b/mod/wiki/ewiki/plugins/moodle/moodle_binary_store.php @@ -23,9 +23,9 @@ #-- config -define("EWIKI_DB_STORE_DIRECTORY", "/tmp"); // where to save binary files -define("EWIKI_DB_STORE_MINSIZE", 0); // send smaller files into db -define("EWIKI_DB_STORE_MAXSIZE", 32 <<20); // 32MB max per file (but +define("EWIKI_DB_STORE_DIRECTORY", "/tmp"); // where to save binary files +define("EWIKI_DB_STORE_MINSIZE", 0); // send smaller files into db +define("EWIKI_DB_STORE_MAXSIZE", 32 <<20); // 32MB max per file (but // there is actually no way to upload such large files via HTTP) # define("EWIKI_DB_STORE_URL", "http://example.com/wiki/files/store/"); diff --git a/mod/wiki/ewiki/plugins/moodle/moodle_wikidump.php b/mod/wiki/ewiki/plugins/moodle/moodle_wikidump.php index 28a1beeea7..ce2098b2fb 100644 --- a/mod/wiki/ewiki/plugins/moodle/moodle_wikidump.php +++ b/mod/wiki/ewiki/plugins/moodle/moodle_wikidump.php @@ -28,7 +28,7 @@ $ewiki_t["c"]["EWIKIDUMPCSS"] = ' body { background-color:#eeeeff; padding:2px; - } + } H2 { background:#000000; diff --git a/mod/wiki/ewiki/plugins/pluginloader.php b/mod/wiki/ewiki/plugins/pluginloader.php index 15290dca14..36ed4dda60 100644 --- a/mod/wiki/ewiki/plugins/pluginloader.php +++ b/mod/wiki/ewiki/plugins/pluginloader.php @@ -2,7 +2,7 @@ /* dynamic plugin loading - ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯ + ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ Will load plugins on demand, so they must not be included() one by one together with the core script. This is what commonly the "plugin idea" suggests, and only has minimal disadvantages. @@ -26,53 +26,53 @@ $ewiki_plugins["dl"]["action"] = array( - "view" => array("", "", 0), - "links" => array("", "", 0), - "info" => array("", "", 0), -# "edit" => array("spellcheck.php", "", 0), -# "calendar" => array("calendar.php", "ewiki_page_calendar", 0), -# "addpost" => array("contrib/aview_posts.php", "ewiki_add_post", 0), -# "imageappend" => array("contrib/aview_imgappend.php", "ewiki_action_image_append", 0), -# "extodo" => array("contrib/action_extracttodo.php", "ewiki_extract_todo", 0), -# "addthread" => array("contrib/aview_threads.php", "ewiki_add_thread", 0), -# "control" => array("admin/control.php", "ewiki_action_control_page", 0), -# "pdf" => array("pdf.php", "ewiki_send_page_as_pdf", 0), - "diff" => array("diff.php", "ewiki_page_stupid_diff", 0), -# "diff" => array("diff_gnu.php", "ewiki_page_gnu_diff", 0), -# "binary" => array("downloads.php", "ewiki_binary", 0), -# "attachments" => array("downloads.php", "ewiki_action_attachments", 0), - "like" => array("like_pages.php", "ewiki_page_like", 0), -# "verdiff" => array("action_verdiff.php", "ewiki_action_verdiff", 0), + "view" => array("", "", 0), + "links" => array("", "", 0), + "info" => array("", "", 0), +# "edit" => array("spellcheck.php", "", 0), +# "calendar" => array("calendar.php", "ewiki_page_calendar", 0), +# "addpost" => array("contrib/aview_posts.php", "ewiki_add_post", 0), +# "imageappend" => array("contrib/aview_imgappend.php", "ewiki_action_image_append", 0), +# "extodo" => array("contrib/action_extracttodo.php", "ewiki_extract_todo", 0), +# "addthread" => array("contrib/aview_threads.php", "ewiki_add_thread", 0), +# "control" => array("admin/control.php", "ewiki_action_control_page", 0), +# "pdf" => array("pdf.php", "ewiki_send_page_as_pdf", 0), + "diff" => array("diff.php", "ewiki_page_stupid_diff", 0), +# "diff" => array("diff_gnu.php", "ewiki_page_gnu_diff", 0), +# "binary" => array("downloads.php", "ewiki_binary", 0), +# "attachments" => array("downloads.php", "ewiki_action_attachments", 0), + "like" => array("like_pages.php", "ewiki_page_like", 0), +# "verdiff" => array("action_verdiff.php", "ewiki_action_verdiff", 0), ); $ewiki_plugins["dl"]["page"] = array( -# "PageCalendar" => array("calendar.php", "ewiki_page_calendar", 0), -# "PageYearCalendar" => array("calendar.php", "ewiki_page_year_calendar", 0), -# "WikiNews" => array("contrib/page_wikinews.php", "ewiki_page_wikinews", 0), -# "WikiDump" => array("contrib/page_wikidump.php", "ewiki_page_wiki_dump_tarball", 0), -# "README" => array("contrib/page_README.php", "ewiki_page_README", 0), -# "README.de" => array("contrib/page_README.php", "ewiki_page_README", 0), -# "plugins/auth/README.auth" => array("contrib/page_README.php", "ewiki_page_README", 0), -# "Fortune" => array("contrib/page_fortune.php", "ewiki_page_fortune", 0), -# "ScanDisk" => array("contrib/page_scandisk.php", "ewiki_page_scandisk", 0), - "InterWikiMap" => array("contrib/page_interwikimap.php", "ewiki_page_interwikimap", 0), -# "WikiUserLogin" => array("contrib/page_wikiuserlogin.php", "ewiki_page_wikiuserlogin", 0), -# "PhpInfo" => array("contrib/page_phpinfo.php", "ewiki_page_phpinfo", 0), -# "ImageGallery" => array("contrib/page_imagegallery.php", "ewiki_page_image_gallery", 0), -# "SinceUpdatedPages" => array("contrib/page_since_updates.php", "ewiki_page_since_updates", 0), -# "TextUpload" => array("contrib/page_textupload.php", "ewiki_page_textupload", 0), - "HitCounter" => array("contrib/page_hitcounter.php", "ewiki_page_hitcounter", 0), -# "SearchCache" => array("admin/page_searchcache.php", "ewiki_cache_generated_pages", 0), -# "SearchAndReplace" => array("admin/page_searchandreplace.php", "ewiki_page_searchandreplace", 0), -# "FileUpload" => array("downloads.php", "ewiki_page_fileupload", 0), -# "FileDownload" => array("downloads.php", "ewiki_page_filedownload", 0), - "PowerSearch" => array("page_powersearch.php", "ewiki_page_powersearch", 0), -# "AboutPlugins" => array("page_aboutplugins.php", "ewiki_page_aboutplugins", 0), - "OrphanedPages" => array("page_orphanedpages.php", "ewiki_page_orphanedpages", 0), - "PageIndex" => array("page_pageindex.php", "ewiki_page_index", 0), - "RandomPage" => array("page_randompage.php", "ewiki_page_random", 0), - "WantedPages" => array("page_wantedpages.php", "ewiki_page_wantedpages", 0), - "WordIndex" => array("page_wordindex.php", "ewiki_page_wordindex", 0), +# "PageCalendar" => array("calendar.php", "ewiki_page_calendar", 0), +# "PageYearCalendar" => array("calendar.php", "ewiki_page_year_calendar", 0), +# "WikiNews" => array("contrib/page_wikinews.php", "ewiki_page_wikinews", 0), +# "WikiDump" => array("contrib/page_wikidump.php", "ewiki_page_wiki_dump_tarball", 0), +# "README" => array("contrib/page_README.php", "ewiki_page_README", 0), +# "README.de" => array("contrib/page_README.php", "ewiki_page_README", 0), +# "plugins/auth/README.auth" => array("contrib/page_README.php", "ewiki_page_README", 0), +# "Fortune" => array("contrib/page_fortune.php", "ewiki_page_fortune", 0), +# "ScanDisk" => array("contrib/page_scandisk.php", "ewiki_page_scandisk", 0), + "InterWikiMap" => array("contrib/page_interwikimap.php", "ewiki_page_interwikimap", 0), +# "WikiUserLogin" => array("contrib/page_wikiuserlogin.php", "ewiki_page_wikiuserlogin", 0), +# "PhpInfo" => array("contrib/page_phpinfo.php", "ewiki_page_phpinfo", 0), +# "ImageGallery" => array("contrib/page_imagegallery.php", "ewiki_page_image_gallery", 0), +# "SinceUpdatedPages" => array("contrib/page_since_updates.php", "ewiki_page_since_updates", 0), +# "TextUpload" => array("contrib/page_textupload.php", "ewiki_page_textupload", 0), + "HitCounter" => array("contrib/page_hitcounter.php", "ewiki_page_hitcounter", 0), +# "SearchCache" => array("admin/page_searchcache.php", "ewiki_cache_generated_pages", 0), +# "SearchAndReplace" => array("admin/page_searchandreplace.php", "ewiki_page_searchandreplace", 0), +# "FileUpload" => array("downloads.php", "ewiki_page_fileupload", 0), +# "FileDownload" => array("downloads.php", "ewiki_page_filedownload", 0), + "PowerSearch" => array("page_powersearch.php", "ewiki_page_powersearch", 0), +# "AboutPlugins" => array("page_aboutplugins.php", "ewiki_page_aboutplugins", 0), + "OrphanedPages" => array("page_orphanedpages.php", "ewiki_page_orphanedpages", 0), + "PageIndex" => array("page_pageindex.php", "ewiki_page_index", 0), + "RandomPage" => array("page_randompage.php", "ewiki_page_random", 0), + "WantedPages" => array("page_wantedpages.php", "ewiki_page_wantedpages", 0), + "WordIndex" => array("page_wordindex.php", "ewiki_page_wordindex", 0), ); diff --git a/question/format/learnwise/learnwise-example.xml b/question/format/learnwise/learnwise-example.xml index 2752495790..4dae12b7d3 100644 --- a/question/format/learnwise/learnwise-example.xml +++ b/question/format/learnwise/learnwise-example.xml @@ -1,145 +1,145 @@ - Maths - - - The ages, in years, of 10 horses in a field were 3, 3, 4, 5, 7, 7, 7, 8, 8, 8, + Maths + + + The ages, in years, of 10 horses in a field were 3, 3, 4, 5, 7, 7, 7, 8, 8, 8, Which one of the following is true? - 1 - mean = (3+3+4+5+7+7+7+8+8+8)/10 = 6 + 1 + mean = (3+3+4+5+7+7+7+8+8+8)/10 = 6 median = 7 i.e the middle number range = 8-3 = 5 - - - - - - - - - At a college, students are given a points score calculated from their GCSE grades. + + + + + + + + + At a college, students are given a points score calculated from their GCSE grades. Someone with 4 A grades and 4 B grades gains a score of 36 points. Someone with 2 A grades and 4 B grades gains a score of 26 points. Someone with 3 A grades and 3 B grades would have a score of - 1 - 4A + 4B = 36 and 2A + 4B = 26solving simultaneously gives A = 5 and B = 4 - - - - - - - - - A sequence consists of adding the previous three terms together to form the next term. The first three terms of the sequence are 1, 2, 3. + 1 + 4A + 4B = 36 and 2A + 4B = 26solving simultaneously gives A = 5 and B = 4 + + + + + + + + + A sequence consists of adding the previous three terms together to form the next term. The first three terms of the sequence are 1, 2, 3. What is the sixth term in the sequence? - 1 - 1, 2, 3, 6, 11, ... - - - - - - - - - The value of an item is described as decreasing exponentially. Which description below best matches this statement? - 1 - No hint - you either know this or you don't! - - - - - - - - - Consider the statement + 1 + 1, 2, 3, 6, 11, ... + + + + + + + + + The value of an item is described as decreasing exponentially. Which description below best matches this statement? + 1 + No hint - you either know this or you don't! + + + + + + + + + Consider the statement "Schools with high numbers of pupils on free school meals do not do well in league tables." Which of the following statements follows logically from the one above? - 1 - Factors other than the number of pupils on free school meals affect how well a school does in league tables. - - - - - - - - - The force between two point electric charges is inversely proportional to the square of their distance apart. What effect does doubling this distance have on the force? - 1 - Inversely proportional means that increasing the distance decreases the force. 2 squared gives 4. - - - - - - - - - Two of the five playing cards that Colin has are aces. He shuffles the five cards, then puts them face down on the table. Madge takes a card and then another. The probability that she now has both of the aces is - 1 - 2/5 x 1/4 - - - - - - - - - A college's guidelines say that classes must have a minimum of 12 students and a maximum of 20 students. For what numbers of students studying a particular subject is it impossible to run classes without breaking the guidelines? - 1 - between 12 and 20 students - one class + 1 + Factors other than the number of pupils on free school meals affect how well a school does in league tables. + + + + + + + + + The force between two point electric charges is inversely proportional to the square of their distance apart. What effect does doubling this distance have on the force? + 1 + Inversely proportional means that increasing the distance decreases the force. 2 squared gives 4. + + + + + + + + + Two of the five playing cards that Colin has are aces. He shuffles the five cards, then puts them face down on the table. Madge takes a card and then another. The probability that she now has both of the aces is + 1 + 2/5 x 1/4 + + + + + + + + + A college's guidelines say that classes must have a minimum of 12 students and a maximum of 20 students. For what numbers of students studying a particular subject is it impossible to run classes without breaking the guidelines? + 1 + between 12 and 20 students - one class between 24 and 36 students - two classes between 36 and 40 students - two classes - - - - - - - - - The ages of two friends are in the ratio 3:4. In 8 years time their ages will be in the ratio 5:6. How old are they now? - 1 - (12+8):(16+8) = 20:24 = 5:6 - - - - - - - - - A heavy construction vehicle travels for 40 minutes between sites, at an average speed of 16 km per second. The distance between sites is - 1 - 16/60 x 40 - - - - - - - - - Which of the following are features of a Virtual Learning Environment? (Select all that apply) - - - - - - - - - - - Which of the following may a Virtual Learning Environment be used for? (Select all that apply) - - - - - - - - + + + + + + + + + The ages of two friends are in the ratio 3:4. In 8 years time their ages will be in the ratio 5:6. How old are they now? + 1 + (12+8):(16+8) = 20:24 = 5:6 + + + + + + + + + A heavy construction vehicle travels for 40 minutes between sites, at an average speed of 16 km per second. The distance between sites is + 1 + 16/60 x 40 + + + + + + + + + Which of the following are features of a Virtual Learning Environment? (Select all that apply) + + + + + + + + + + + Which of the following may a Virtual Learning Environment be used for? (Select all that apply) + + + + + + + + diff --git a/theme/formal_white/footer.html b/theme/formal_white/footer.html index dda49f3efb..5a43733773 100644 --- a/theme/formal_white/footer.html +++ b/theme/formal_white/footer.html @@ -6,7 +6,7 @@ '; echo page_doc_link(get_string('moodledocslink')); - echo '

'; + echo '

'; ?> diff --git a/theme/orangewhite/csshover.htc b/theme/orangewhite/csshover.htc index 7aa6c79e29..4d90d8105f 100644 --- a/theme/orangewhite/csshover.htc +++ b/theme/orangewhite/csshover.htc @@ -1,88 +1,88 @@ diff --git a/theme/standard/styles_color.css b/theme/standard/styles_color.css index 06c57072d8..f1807718fe 100644 --- a/theme/standard/styles_color.css +++ b/theme/standard/styles_color.css @@ -633,23 +633,23 @@ table.message_search_results td { ***/ .que { - border-color: #DDD; + border-color: #DDD; } .que .r0 { - background-color: #F5F5F5; + background-color: #F5F5F5; } .que .r1 { - background-color: #EEE; + background-color: #EEE; } .calculated .answer, .numerical .answer, .shortanswer .answer, .truefalse .answer { - background-color: #EEE; + background-color: #EEE; } .que .feedback { border-color: #DDD; -} +} .que.multianswer .incorrect { background-color: #faa; } diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css index 947228ea47..b882338a9a 100644 --- a/theme/standard/styles_layout.css +++ b/theme/standard/styles_layout.css @@ -1801,7 +1801,7 @@ body#mod-forum-search .introcontent { #mod-quiz-attempt #page { - text-align: center; + text-align: center; } body#mod-quiz-report table#attempts,

'.get_string('amountofloan','block_loancalc').'		'.get_string('amountofloan','block_loancalc').'

'.get_string('repaymentamount','block_loancalc').'

'.get_string('loanterm','block_loancalc').'

'.get_string('interestrate','block_loancalc').'

'.get_string('repaymentfreq','block_loancalc').'

'.get_string('repaymentamount','block_loancalc').'
'; +

'.get_string('loanterm','block_loancalc').'

'.get_string('interestrate','block_loancalc').'

'.get_string('repaymentfreq','block_loancalc').'
'; $options[52] = get_string('weekly','block_loancalc'); $options[26] = get_string('fortnightly','block_loancalc'); $options[12] = get_string('monthly','block_loancalc'); $this->content->text .= choose_from_menu($options,'LOANPAYPERIOD','12',NULL,NULL,NULL,true); $this->content->text .= '

'; - $str .= '' . get_string('latitude', 'data') . ':	Â°N
' . get_string('longitude', 'data') . ':	Â°E

'; + $str .= '' . get_string('latitude', 'data') . ':	Â°N
' . get_string('longitude', 'data') . ':	Â°E

"; - if ($preset->screenshot) { - echo ""; - } - echo "	$preset->name"; - if ($preset->user) { - $user = get_record('user', 'id', $preset->user); - echo " by $user->firstname $user->lastname"; - } - echo "		"; - if ($preset->user == $USER->id \|\| has_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID))) { - echo " "; - echo ""; - echo ""; - echo ""; - echo ""; - echo "name\" />"; - echo " "; - } - echo "
"; + if ($preset->screenshot) { + echo ""; + } + echo "	$preset->name"; + if ($preset->user) { + $user = get_record('user', 'id', $preset->user); + echo " by $user->firstname $user->lastname"; + } + echo "		"; + if ($preset->user == $USER->id \|\| has_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID))) { + echo " "; + echo ""; + echo ""; + echo ""; + echo ""; + echo "name\" />"; + echo " "; + } + echo "

Basic:

Basic:

Advanced:

Advanced: