From 7c3569d92bb83b2b3404a87f1a7a7276cc3d3b95 Mon Sep 17 00:00:00 2001 From: Yannick Warnier Date: Fri, 20 Jul 2012 09:28:06 -0500 Subject: [PATCH 1/4] Updated changelog --- documentation/changelog.html | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/documentation/changelog.html b/documentation/changelog.html index 9867d3d152..f1dd0f0676 100644 --- a/documentation/changelog.html +++ b/documentation/changelog.html @@ -220,6 +220,21 @@ This version of Chamilo only includes new features:
  • Removed the "Use document title" option - now we force users to use a document title - this avoids many issues with documents names - see #3781
    • +

    Chamilo 1.8.8.6 - Rottweil, 20th of July 2012

    + +

    Release notes - summary

    +

    Chamilo 1.8.8.6 is a minor security fix, stable version for version 1.8.8.4. If you are using Chamilo 1.8.8.4, we highly recommend you upgrade to this version, either by following the usual upgrade procedure, or by applying a very small patch, as explained on our security issues listing page. The security fixes are all considered "moderate". This means you could loose data (specifically dropbox tool data in this case) and your users might get tricked into providing credentials to potential hackers, but the integrity of your server will not be in direct danger. 1.8.8.6 was developed in a separate branch, but fixes were applied to the 1.9 branch, which means 1.9 can be considered as the follower of 1.8.8.6 as much as of 1.8.8.4. If you have 1.8.8.4, migrating to 1.9 will effectively remove the need for migrating to the intermediary step of 1.8.8.6

    +

    Why Rottweil?

    +

    Rottweil is a small medieval German town where the occasional tourist might feel very relaxed and secure. This feeling is increased by the obviously-difficult-to-attack strategical position. Considering the security-only aspect of this release, we wanted a small city name that would represent this more secure aspect. Rottweil has been visited by one of our team members in the past... that's all it takes.

    + +

    Fixes

    + +

    Chamilo 1.8.8.4 - La Molina, August 2011

    From 5836247ae65229d46da559ba58055b36ea183c8e Mon Sep 17 00:00:00 2001 From: Laurent Opprecht Date: Fri, 20 Jul 2012 16:52:19 +0200 Subject: [PATCH 2/4] see #5228: glossary adding twig templates --- main/template/default/glossary/csv.tpl | 0 main/template/default/glossary/edit.tpl | 8 +++ main/template/default/glossary/header.tpl | 7 ++ main/template/default/glossary/index.tpl | 23 ++++++ main/template/default/glossary/javascript.tpl | 28 ++++++++ main/template/default/glossary/list.tpl | 35 +++++++++ main/template/default/glossary/table.tpl | 72 +++++++++++++++++++ main/template/default/glossary/upload.tpl | 8 +++ 8 files changed, 181 insertions(+) create mode 100644 main/template/default/glossary/csv.tpl create mode 100644 main/template/default/glossary/edit.tpl create mode 100644 main/template/default/glossary/header.tpl create mode 100644 main/template/default/glossary/index.tpl create mode 100644 main/template/default/glossary/javascript.tpl create mode 100644 main/template/default/glossary/list.tpl create mode 100644 main/template/default/glossary/table.tpl create mode 100644 main/template/default/glossary/upload.tpl diff --git a/main/template/default/glossary/csv.tpl b/main/template/default/glossary/csv.tpl new file mode 100644 index 0000000000..e69de29bb2 diff --git a/main/template/default/glossary/edit.tpl b/main/template/default/glossary/edit.tpl new file mode 100644 index 0000000000..f935fd496c --- /dev/null +++ b/main/template/default/glossary/edit.tpl @@ -0,0 +1,8 @@ + +{% include 'default/glossary/header.tpl' %} + +
    + +
    + +{{form.return_form()}} \ No newline at end of file diff --git a/main/template/default/glossary/header.tpl b/main/template/default/glossary/header.tpl new file mode 100644 index 0000000000..f201381af4 --- /dev/null +++ b/main/template/default/glossary/header.tpl @@ -0,0 +1,7 @@ +{{javascript}} + +
    + {% for message in messages %} + {{ message }} + {% endfor %} +
    \ No newline at end of file diff --git a/main/template/default/glossary/index.tpl b/main/template/default/glossary/index.tpl new file mode 100644 index 0000000000..275e3b76eb --- /dev/null +++ b/main/template/default/glossary/index.tpl @@ -0,0 +1,23 @@ +{% include 'default/glossary/header.tpl' %} +{% include 'default/glossary/javascript.tpl' %} + +
    + {% if is_allowed_to_edit %} + + + + + {% endif %} + {% if view == 'table' %} + + {% else %} + + {% endif %} + +
    + +{% if view == 'table' %} + {% include 'default/glossary/table.tpl' %} +{% else %} + {% include 'default/glossary/list.tpl' %} +{% endif %} diff --git a/main/template/default/glossary/javascript.tpl b/main/template/default/glossary/javascript.tpl new file mode 100644 index 0000000000..03fec01a0f --- /dev/null +++ b/main/template/default/glossary/javascript.tpl @@ -0,0 +1,28 @@ + + + + + \ No newline at end of file diff --git a/main/template/default/glossary/list.tpl b/main/template/default/glossary/list.tpl new file mode 100644 index 0000000000..c169003010 --- /dev/null +++ b/main/template/default/glossary/list.tpl @@ -0,0 +1,35 @@ + + \ No newline at end of file diff --git a/main/template/default/glossary/table.tpl b/main/template/default/glossary/table.tpl new file mode 100644 index 0000000000..247e004810 --- /dev/null +++ b/main/template/default/glossary/table.tpl @@ -0,0 +1,72 @@ + + + + + + + + {% if is_allowed_to_edit %} + + {% endif %} + + + + {% for item in items %} + + + + {% if is_allowed_to_edit %} + + {% endif %} + + {% endfor %} + +
    + {{'TermName'|get_lang}} + + {{'TermDefinition'|get_lang}} + + {{'Actions'|get_lang}} +
    + {{item.name}} + + {{item.description}} + + {% if session_id == item.session_id %} + + + + + {% else %} + {{'EditionNotAvailableFromSession'|get_lang}} + {% endif %} +
    +
    + diff --git a/main/template/default/glossary/upload.tpl b/main/template/default/glossary/upload.tpl new file mode 100644 index 0000000000..445a09ee86 --- /dev/null +++ b/main/template/default/glossary/upload.tpl @@ -0,0 +1,8 @@ +{% include 'default/glossary/header.tpl' %} + + +
    + +
    + +{{form.return_form()}} \ No newline at end of file From b5a2d341c8907728ecd9a4fbf18b34b99cf170af Mon Sep 17 00:00:00 2001 From: Laurent Opprecht Date: Fri, 20 Jul 2012 16:52:59 +0200 Subject: [PATCH 3/4] see #5192: link adding twig templates --- main/template/default/link/edit_category.tpl | 12 + main/template/default/link/edit_link.tpl | 12 + main/template/default/link/index.tpl | 309 +++++++++++++++++++ 3 files changed, 333 insertions(+) create mode 100644 main/template/default/link/edit_category.tpl create mode 100644 main/template/default/link/edit_link.tpl create mode 100644 main/template/default/link/index.tpl diff --git a/main/template/default/link/edit_category.tpl b/main/template/default/link/edit_category.tpl new file mode 100644 index 0000000000..c7b3f67653 --- /dev/null +++ b/main/template/default/link/edit_category.tpl @@ -0,0 +1,12 @@ + +{{javascript}} + +
    + +
    + +{% for message in messages %} + {{ message }} +{% endfor %} + +{{form.return_form()}} \ No newline at end of file diff --git a/main/template/default/link/edit_link.tpl b/main/template/default/link/edit_link.tpl new file mode 100644 index 0000000000..c7b3f67653 --- /dev/null +++ b/main/template/default/link/edit_link.tpl @@ -0,0 +1,12 @@ + +{{javascript}} + +
    + +
    + +{% for message in messages %} + {{ message }} +{% endfor %} + +{{form.return_form()}} \ No newline at end of file diff --git a/main/template/default/link/index.tpl b/main/template/default/link/index.tpl new file mode 100644 index 0000000000..7b3fd99831 --- /dev/null +++ b/main/template/default/link/index.tpl @@ -0,0 +1,309 @@ + +{{javascript}} + + + +
    +{% for message in messages %} + {{ message }} +{% endfor %} +
    + +
    + {% if is_allowed_to_edit %} + + + + + {% endif %} + + + +
    + +
    +
      + {% for link in links %} + {% set link_class %} + {% if loop.first %}first{% endif %} + {% if loop.last %}last{% endif %} + {% if loop.index is odd %}odd{% else %}even{% endif %} + {% if link.is_visible() %}visible{% else %}invisible{% endif %} + {% endset %} + + + {% endfor%} +
    + + +
    \ No newline at end of file From df1e5b47cd9007f65f90046e18a9a082325e4a43 Mon Sep 17 00:00:00 2001 From: Laurent Opprecht Date: Fri, 20 Jul 2012 16:53:34 +0200 Subject: [PATCH 4/4] see #5193 course description adding twig templates --- .../default/course_description/edit.tpl | 25 +++++ .../default/course_description/index.tpl | 99 +++++++++++++++++++ .../default/course_description/upload.tpl | 11 +++ 3 files changed, 135 insertions(+) create mode 100644 main/template/default/course_description/edit.tpl create mode 100644 main/template/default/course_description/index.tpl create mode 100644 main/template/default/course_description/upload.tpl diff --git a/main/template/default/course_description/edit.tpl b/main/template/default/course_description/edit.tpl new file mode 100644 index 0000000000..0e071a54c3 --- /dev/null +++ b/main/template/default/course_description/edit.tpl @@ -0,0 +1,25 @@ +{{javascript}} + +{% for message in messages %} + {{ message }} +{% endfor %} + +
    + + {% for type in types %} + + type.title + + {% endfor %} +
    + +{% if type.question %} +
    +
    + {{'QuestionPlan'|get_lang}} +
    + {{type.question}} +
    +{% endif %} + +{{form.return_form()}} \ No newline at end of file diff --git a/main/template/default/course_description/index.tpl b/main/template/default/course_description/index.tpl new file mode 100644 index 0000000000..5a290d8237 --- /dev/null +++ b/main/template/default/course_description/index.tpl @@ -0,0 +1,99 @@ +{{javascript}} + + + +{% for message in messages %} + {{ message }} +{% endfor %} + +{% if is_allowed_to_edit %} +
    + {% for type in types %} + + {{type.title}} + + {% endfor %} + + + +
    +{% endif %} + +
      +{% for description in descriptions %} +
    • +
      + {% if is_allowed_to_edit %} +
      + {% if session_id == description.session_id %} + + + + + + {% else %} + {{'EditionNotAvailableFromSession'|get_lang}} + {% endif %} +
      + {% endif %} + + {{description.type.title}} + {{description.title}} +
      +
      + {{description.content}} +
      +
      • +{% endfor %} +
    \ No newline at end of file diff --git a/main/template/default/course_description/upload.tpl b/main/template/default/course_description/upload.tpl new file mode 100644 index 0000000000..c17dca2a86 --- /dev/null +++ b/main/template/default/course_description/upload.tpl @@ -0,0 +1,11 @@ +{{javascript}} + +{% for message in messages %} + {{ message }} +{% endfor %} + +
    + +
    + +{{form.return_form()}} \ No newline at end of file