Browse Source

Merge branch '1.11.x' of https://github.com/chamilo/chamilo-lms into 1.11.x

Alex Aragon 7 years ago
parent
commit
0a768ea9a6
21 changed files with 21 additions and 21 deletions
  1. 1 1
      plugin/advanced_subscription/views/admin_accepted_notice_admin.tpl
  2. 1 1
      plugin/advanced_subscription/views/admin_accepted_notice_student.tpl
  3. 1 1
      plugin/advanced_subscription/views/admin_accepted_notice_superior.tpl
  4. 1 1
      plugin/advanced_subscription/views/admin_rejected_notice_admin.tpl
  5. 1 1
      plugin/advanced_subscription/views/admin_rejected_notice_student.tpl
  6. 1 1
      plugin/advanced_subscription/views/admin_rejected_notice_superior.tpl
  7. 1 1
      plugin/advanced_subscription/views/reminder_notice_admin.tpl
  8. 1 1
      plugin/advanced_subscription/views/reminder_notice_student.tpl
  9. 1 1
      plugin/advanced_subscription/views/reminder_notice_superior.tpl
  10. 1 1
      plugin/advanced_subscription/views/reminder_notice_superior_max.tpl
  11. 1 1
      plugin/advanced_subscription/views/student_no_superior_notice_admin.tpl
  12. 1 1
      plugin/advanced_subscription/views/student_no_superior_notice_student.tpl
  13. 1 1
      plugin/advanced_subscription/views/student_notice_student.tpl
  14. 1 1
      plugin/advanced_subscription/views/student_notice_superior.tpl
  15. 1 1
      plugin/advanced_subscription/views/superior_accepted_notice_admin.tpl
  16. 1 1
      plugin/advanced_subscription/views/superior_accepted_notice_student.tpl
  17. 1 1
      plugin/advanced_subscription/views/superior_accepted_notice_superior.tpl
  18. 1 1
      plugin/advanced_subscription/views/superior_rejected_notice_student.tpl
  19. 1 1
      plugin/advanced_subscription/views/superior_rejected_notice_superior.tpl
  20. 1 1
      plugin/buycourses/view/catalog.tpl
  21. 1 1
      plugin/show_user_info/template.tpl

+ 1 - 1
plugin/advanced_subscription/views/admin_accepted_notice_admin.tpl

@@ -17,7 +17,7 @@
         <td valign="top"><table width="700" border="0" cellspacing="0" cellpadding="0">
                 <tr>
                     <td width="50">&nbsp;</td>
-                    <td width="394"><img src="{{ _p.web_css }}/themes/{{ "stylesheets" | get_setting }}/images/header-logo.png" width="230" height="60" alt="Ministerio de Educación"></td>
+                    <td width="394"><img src="{{ _p.web_css }}/themes/{{ "stylesheets"|api_get_setting }}/images/header-logo.png" width="230" height="60" alt="Ministerio de Educación"></td>
                     <td width="50">&nbsp;</td>
                 </tr>
                 <tr>

+ 1 - 1
plugin/advanced_subscription/views/admin_accepted_notice_student.tpl

@@ -17,7 +17,7 @@
         <td valign="top"><table width="700" border="0" cellspacing="0" cellpadding="0">
                 <tr>
                     <td width="50">&nbsp;</td>
-                    <td width="394"><img src="{{ _p.web_css }}/themes/{{ "stylesheets" | get_setting }}/images/header-logo.png" width="230" height="60" alt="Ministerio de Educación"></td>
+                    <td width="394"><img src="{{ _p.web_css }}/themes/{{ "stylesheets"|api_get_setting }}/images/header-logo.png" width="230" height="60" alt="Ministerio de Educación"></td>
                     <td width="50">&nbsp;</td>
                 </tr>
                 <tr>

+ 1 - 1
plugin/advanced_subscription/views/admin_accepted_notice_superior.tpl

@@ -17,7 +17,7 @@
         <td valign="top"><table width="700" border="0" cellspacing="0" cellpadding="0">
                 <tr>
                     <td width="50">&nbsp;</td>
-                    <td width="394"><img src="{{ _p.web_css }}/themes/{{ "stylesheets" | get_setting }}/images/header-logo.png" width="230" height="60" alt="Ministerio de Educación"></td>
+                    <td width="394"><img src="{{ _p.web_css }}/themes/{{ "stylesheets"|api_get_setting }}/images/header-logo.png" width="230" height="60" alt="Ministerio de Educación"></td>
                     <td width="50">&nbsp;</td>
                 </tr>
                 <tr>

+ 1 - 1
plugin/advanced_subscription/views/admin_rejected_notice_admin.tpl

@@ -17,7 +17,7 @@
         <td valign="top"><table width="700" border="0" cellspacing="0" cellpadding="0">
                 <tr>
                     <td width="50">&nbsp;</td>
-                    <td width="394"><img src="{{ _p.web_css }}/themes/{{ "stylesheets" | get_setting }}/images/header-logo.png" width="230" height="60" alt="Ministerio de Educación"></td>
+                    <td width="394"><img src="{{ _p.web_css }}/themes/{{ "stylesheets"|api_get_setting }}/images/header-logo.png" width="230" height="60" alt="Ministerio de Educación"></td>
                     <td width="50">&nbsp;</td>
                 </tr>
                 <tr>

+ 1 - 1
plugin/advanced_subscription/views/admin_rejected_notice_student.tpl

@@ -17,7 +17,7 @@
         <td valign="top"><table width="700" border="0" cellspacing="0" cellpadding="0">
                 <tr>
                     <td width="50">&nbsp;</td>
-                    <td width="394"><img src="{{ _p.web_css }}/themes/{{ "stylesheets" | get_setting }}/images/header-logo.png" width="230" height="60" alt="Ministerio de Educación"></td>
+                    <td width="394"><img src="{{ _p.web_css }}/themes/{{ "stylesheets"|api_get_setting }}/images/header-logo.png" width="230" height="60" alt="Ministerio de Educación"></td>
                     <td width="50">&nbsp;</td>
                 </tr>
                 <tr>

+ 1 - 1
plugin/advanced_subscription/views/admin_rejected_notice_superior.tpl

@@ -17,7 +17,7 @@
         <td valign="top"><table width="700" border="0" cellspacing="0" cellpadding="0">
                 <tr>
                     <td width="50">&nbsp;</td>
-                    <td width="394"><img src="{{ _p.web_css }}/themes/{{ "stylesheets" | get_setting }}/images/header-logo.png" width="230" height="60" alt="Ministerio de Educación"></td>
+                    <td width="394"><img src="{{ _p.web_css }}/themes/{{ "stylesheets"|api_get_setting }}/images/header-logo.png" width="230" height="60" alt="Ministerio de Educación"></td>
                     <td width="50">&nbsp;</td>
                 </tr>
                 <tr>

+ 1 - 1
plugin/advanced_subscription/views/reminder_notice_admin.tpl

@@ -17,7 +17,7 @@
         <td valign="top"><table width="700" border="0" cellspacing="0" cellpadding="0">
                 <tr>
                     <td width="50">&nbsp;</td>
-                    <td width="394"><img src="{{ _p.web_css }}/themes/{{ "stylesheets" | get_setting }}/images/header-logo.png" width="230" height="60" alt="Ministerio de Educación"></td>
+                    <td width="394"><img src="{{ _p.web_css }}/themes/{{ "stylesheets"|api_get_setting }}/images/header-logo.png" width="230" height="60" alt="Ministerio de Educación"></td>
                     <td width="50">&nbsp;</td>
                 </tr>
                 <tr>

+ 1 - 1
plugin/advanced_subscription/views/reminder_notice_student.tpl

@@ -17,7 +17,7 @@
         <td valign="top"><table width="700" border="0" cellspacing="0" cellpadding="0">
                 <tr>
                     <td width="50">&nbsp;</td>
-                    <td width="394"><img src="{{ _p.web_css }}/themes/{{ "stylesheets" | get_setting }}/images/header-logo.png" width="230" height="60" alt="Ministerio de Educación"></td>
+                    <td width="394"><img src="{{ _p.web_css }}/themes/{{ "stylesheets"|api_get_setting }}/images/header-logo.png" width="230" height="60" alt="Ministerio de Educación"></td>
                     <td width="50">&nbsp;</td>
                 </tr>
                 <tr>

+ 1 - 1
plugin/advanced_subscription/views/reminder_notice_superior.tpl

@@ -17,7 +17,7 @@
         <td valign="top"><table width="700" border="0" cellspacing="0" cellpadding="0">
                 <tr>
                     <td width="50">&nbsp;</td>
-                    <td width="394"><img src="{{ _p.web_css }}/themes/{{ "stylesheets" | get_setting }}/images/header-logo.png" width="230" height="60" alt="Ministerio de Educación"></td>
+                    <td width="394"><img src="{{ _p.web_css }}/themes/{{ "stylesheets"|api_get_setting }}/images/header-logo.png" width="230" height="60" alt="Ministerio de Educación"></td>
                     <td width="50">&nbsp;</td>
                 </tr>
                 <tr>

+ 1 - 1
plugin/advanced_subscription/views/reminder_notice_superior_max.tpl

@@ -17,7 +17,7 @@
     <td valign="top"><table width="700" border="0" cellspacing="0" cellpadding="0">
       <tr>
         <td width="50">&nbsp;</td>
-        <td width="394"><img src="{{ _p.web_css }}/themes/{{ "stylesheets" | get_setting }}/images/header-logo.png" width="230" height="60" alt="Ministerio de Educación"></td>
+        <td width="394"><img src="{{ _p.web_css }}/themes/{{ "stylesheets"|api_get_setting }}/images/header-logo.png" width="230" height="60" alt="Ministerio de Educación"></td>
         <td width="50">&nbsp;</td>
       </tr>
       <tr>

+ 1 - 1
plugin/advanced_subscription/views/student_no_superior_notice_admin.tpl

@@ -17,7 +17,7 @@
         <td valign="top"><table width="700" border="0" cellspacing="0" cellpadding="0">
                 <tr>
                     <td width="50">&nbsp;</td>
-                    <td width="394"><img src="{{ _p.web_css }}/themes/{{ "stylesheets" | get_setting }}/images/header-logo.png" width="230" height="60" alt="Ministerio de Educación"></td>
+                    <td width="394"><img src="{{ _p.web_css }}/themes/{{ "stylesheets"|api_get_setting }}/images/header-logo.png" width="230" height="60" alt="Ministerio de Educación"></td>
                     <td width="50">&nbsp;</td>
                 </tr>
                 <tr>

+ 1 - 1
plugin/advanced_subscription/views/student_no_superior_notice_student.tpl

@@ -17,7 +17,7 @@
         <td valign="top"><table width="700" border="0" cellspacing="0" cellpadding="0">
                 <tr>
                     <td width="50">&nbsp;</td>
-                    <td width="394"><img src="{{ _p.web_css }}/themes/{{ "stylesheets" | get_setting }}/images/header-logo.png" width="230" height="60" alt="Ministerio de Educación"></td>
+                    <td width="394"><img src="{{ _p.web_css }}/themes/{{ "stylesheets"|api_get_setting }}/images/header-logo.png" width="230" height="60" alt="Ministerio de Educación"></td>
                     <td width="50">&nbsp;</td>
                 </tr>
                 <tr>

+ 1 - 1
plugin/advanced_subscription/views/student_notice_student.tpl

@@ -17,7 +17,7 @@
         <td valign="top"><table width="700" border="0" cellspacing="0" cellpadding="0">
                 <tr>
                     <td width="50">&nbsp;</td>
-                    <td width="394"><img src="{{ _p.web_css }}/themes/{{ "stylesheets" | get_setting }}/images/header-logo.png" width="230" height="60" alt="Ministerio de Educación"></td>
+                    <td width="394"><img src="{{ _p.web_css }}/themes/{{ "stylesheets"|api_get_setting }}/images/header-logo.png" width="230" height="60" alt="Ministerio de Educación"></td>
                     <td width="50">&nbsp;</td>
                 </tr>
                 <tr>

+ 1 - 1
plugin/advanced_subscription/views/student_notice_superior.tpl

@@ -17,7 +17,7 @@
         <td valign="top"><table width="700" border="0" cellspacing="0" cellpadding="0">
                 <tr>
                     <td width="50">&nbsp;</td>
-                    <td width="394"><img src="{{ _p.web_css }}/themes/{{ "stylesheets" | get_setting }}/images/header-logo.png" width="230" height="60" alt="Ministerio de Educación"></td>
+                    <td width="394"><img src="{{ _p.web_css }}/themes/{{ "stylesheets"|api_get_setting }}/images/header-logo.png" width="230" height="60" alt="Ministerio de Educación"></td>
                     <td width="50">&nbsp;</td>
                 </tr>
                 <tr>

+ 1 - 1
plugin/advanced_subscription/views/superior_accepted_notice_admin.tpl

@@ -17,7 +17,7 @@
         <td valign="top"><table width="700" border="0" cellspacing="0" cellpadding="0">
                 <tr>
                     <td width="50">&nbsp;</td>
-                    <td width="394"><img src="{{ _p.web_css }}/themes/{{ "stylesheets" | get_setting }}/images/header-logo.png" width="230" height="60" alt="Ministerio de Educación"></td>
+                    <td width="394"><img src="{{ _p.web_css }}/themes/{{ "stylesheets"|api_get_setting }}/images/header-logo.png" width="230" height="60" alt="Ministerio de Educación"></td>
                     <td width="50">&nbsp;</td>
                 </tr>
                 <tr>

+ 1 - 1
plugin/advanced_subscription/views/superior_accepted_notice_student.tpl

@@ -17,7 +17,7 @@
         <td valign="top"><table width="700" border="0" cellspacing="0" cellpadding="0">
                 <tr>
                     <td width="50">&nbsp;</td>
-                    <td width="394"><img src="{{ _p.web_css }}/themes/{{ "stylesheets" | get_setting }}/images/header-logo.png" width="230" height="60" alt="Ministerio de Educación"></td>
+                    <td width="394"><img src="{{ _p.web_css }}/themes/{{ "stylesheets"|api_get_setting }}/images/header-logo.png" width="230" height="60" alt="Ministerio de Educación"></td>
                     <td width="50">&nbsp;</td>
                 </tr>
                 <tr>

+ 1 - 1
plugin/advanced_subscription/views/superior_accepted_notice_superior.tpl

@@ -17,7 +17,7 @@
         <td valign="top"><table width="700" border="0" cellspacing="0" cellpadding="0">
                 <tr>
                     <td width="50">&nbsp;</td>
-                    <td width="394"><img src="{{ _p.web_css }}/themes/{{ "stylesheets" | get_setting }}/images/header-logo.png" width="230" height="60" alt="Ministerio de Educación"></td>
+                    <td width="394"><img src="{{ _p.web_css }}/themes/{{ "stylesheets"|api_get_setting }}/images/header-logo.png" width="230" height="60" alt="Ministerio de Educación"></td>
                     <td width="50">&nbsp;</td>
                 </tr>
                 <tr>

+ 1 - 1
plugin/advanced_subscription/views/superior_rejected_notice_student.tpl

@@ -17,7 +17,7 @@
         <td valign="top"><table width="700" border="0" cellspacing="0" cellpadding="0">
                 <tr>
                     <td width="50">&nbsp;</td>
-                    <td width="394"><img src="{{ _p.web_css }}/themes/{{ "stylesheets" | get_setting }}/images/header-logo.png" width="230" height="60" alt="Ministerio de Educación"></td>
+                    <td width="394"><img src="{{ _p.web_css }}/themes/{{ "stylesheets"|api_get_setting }}/images/header-logo.png" width="230" height="60" alt="Ministerio de Educación"></td>
                     <td width="50">&nbsp;</td>
                 </tr>
                 <tr>

+ 1 - 1
plugin/advanced_subscription/views/superior_rejected_notice_superior.tpl

@@ -17,7 +17,7 @@
         <td valign="top"><table width="700" border="0" cellspacing="0" cellpadding="0">
                 <tr>
                     <td width="50">&nbsp;</td>
-                    <td width="394"><img src="{{ _p.web_css }}/themes/{{ "stylesheets" | get_setting }}/images/header-logo.png" width="230" height="60" alt="Ministerio de Educación"></td>
+                    <td width="394"><img src="{{ _p.web_css }}/themes/{{ "stylesheets"|api_get_setting }}/images/header-logo.png" width="230" height="60" alt="Ministerio de Educación"></td>
                     <td width="50">&nbsp;</td>
                 </tr>
                 <tr>

+ 1 - 1
plugin/buycourses/view/catalog.tpl

@@ -80,7 +80,7 @@
                                             <h4 class="title">
                                                 <a href="{{ _p.web ~ 'session/' ~ session.id ~ '/about/' }}">{{ session.name }}</a>
                                             </h4>
-                                            {% if 'show_session_coach'|get_setting == 'true' %}
+                                            {% if 'show_session_coach'|api_get_setting == 'true' %}
                                                 <p><em class="fa fa-user fa-fw"></em> {{ session.coach }}</p>
                                             {% endif %}
                                             <p><em class="fa fa-calendar fa-fw"></em> {{ session.dates.display }}</p>

+ 1 - 1
plugin/show_user_info/template.tpl

@@ -17,7 +17,7 @@
     
     3. Portal settings    
         You can access the portal settings using:
-        {{ "siteName"|get_setting }}
+        {{ "siteName"|api_get_setting }}
         For more settings check the settings_current database table
     4. Read more
         You can also see more examples in main/template/default/layout