Ver Fonte

Aadd api_get_web_url() to deal with app_dev.php symfony2 URL

jmontoyaa há 8 anos atrás
pai
commit
1cb9581839

+ 1 - 1
main/admin/index.php

@@ -232,7 +232,7 @@ if (api_is_platform_admin()) {
 
 
     if (api_get_configuration_value('chamilo_cms')) {
     if (api_get_configuration_value('chamilo_cms')) {
         $items[] = array(
         $items[] = array(
-            'url' => api_get_path(WEB_PATH) . 'web/app_dev.php/administration/dashboard',
+            'url' => api_get_web_url() . 'administration/dashboard',
             'label' => get_lang('CMS')
             'label' => get_lang('CMS')
         );
         );
     }
     }

+ 12 - 0
main/inc/lib/api.lib.php

@@ -8150,3 +8150,15 @@ function api_number_format($number, $decimals = 0)
 
 
     return number_format($number, $decimals);
     return number_format($number, $decimals);
 }
 }
+
+/**
+ * @return string
+ */
+function api_get_web_url()
+{
+    if (api_get_setting('server_type') == 'test') {
+        return api_get_path(WEB_PATH) . 'web/app_dev.php/';
+    } else {
+        return api_get_path(WEB_PATH) . 'web/';
+    }
+}

+ 1 - 0
main/inc/lib/template.lib.php

@@ -489,6 +489,7 @@ class Template
         $this->theme = api_get_visual_theme();
         $this->theme = api_get_visual_theme();
         //Setting app paths/URLs
         //Setting app paths/URLs
         $_p = array(
         $_p = array(
+            'web_url' => api_get_web_url(),
             'web' => api_get_path(WEB_PATH),
             'web' => api_get_path(WEB_PATH),
             'web_relative' => api_get_path(REL_PATH),
             'web_relative' => api_get_path(REL_PATH),
             'web_course' => api_get_path(WEB_COURSE_PATH),
             'web_course' => api_get_path(WEB_COURSE_PATH),

+ 2 - 2
main/template/rainbow/layout/layout_2_col.tpl

@@ -78,7 +78,7 @@
             <script>
             <script>
             $(document).ready(function() {
             $(document).ready(function() {
                 $.ajax({
                 $.ajax({
-                    url: "{{ _p.web }}web/app_dev.php/{{ document_language }}-{{ document_language }}/cms/page/latest/3?_locale={{ document_language }}",
+                    url: "{{ _p.web_url }}{{ document_language }}-{{ document_language }}/cms/page/latest/3?_locale={{ document_language }}",
                     success: function (data) {
                     success: function (data) {
                         $('#latest_pages').html(data);
                         $('#latest_pages').html(data);
                     }
                     }
@@ -87,7 +87,7 @@
 
 
             $(document).ready(function() {
             $(document).ready(function() {
                 $.ajax({
                 $.ajax({
-                    url: "{{ _p.web }}web/app_dev.php/{{ document_language }}-{{ document_language }}/cms/page/blocks/4?_locale={{ document_language }}",
+                    url: "{{ _p.web_url }}{{ document_language }}-{{ document_language }}/cms/page/blocks/4?_locale={{ document_language }}",
                     success: function (data) {
                     success: function (data) {
                         $('#latest_blocks').html(data);
                         $('#latest_blocks').html(data);
                     }
                     }

+ 3 - 3
main/template/rainbow/layout/menu.tpl

@@ -26,7 +26,7 @@
                     {% endfor %}
                     {% endfor %}
                 {% endif %}
                 {% endif %}
                 {% if _u.logged == 1 %}
                 {% if _u.logged == 1 %}
-                    <li class="item-menu menu-5"><a href="{{ _p.web }}web/app_dev.php/faq?_locale={{ document_language }}">{{ "FAQ"|get_lang }}</a></li>
+                    <li class="item-menu menu-5"><a href="{{ _p.web_url }}faq?_locale={{ document_language }}">{{ "FAQ"|get_lang }}</a></li>
                 {% endif %}
                 {% endif %}
 
 
                 {% if _u.logged == 0 %}
                 {% if _u.logged == 0 %}
@@ -34,13 +34,13 @@
                         <a href="{{ _p.web }}?language={{ current_language }}">{{ "CampusHomepage"|get_lang }}</a>
                         <a href="{{ _p.web }}?language={{ current_language }}">{{ "CampusHomepage"|get_lang }}</a>
                     </li>
                     </li>
                     <li class="item-menu menu-2">
                     <li class="item-menu menu-2">
-                        <a href="{{ _p.web }}web/app_dev.php/faq?_locale={{ document_language }}">{{ "FAQ"|get_lang }}</a>
+                        <a href="{{ _p.web_url }}faq?_locale={{ document_language }}">{{ "FAQ"|get_lang }}</a>
                     </li>
                     </li>
                     <li class="item-menu menu-3 {% if _p.basename == 'inscription.php' %} active {% endif %}">
                     <li class="item-menu menu-3 {% if _p.basename == 'inscription.php' %} active {% endif %}">
                         <a href="{{ _p.web }}main/auth/inscription.php?language={{ current_language }}">{{ "Subscription"|get_lang }}</a>
                         <a href="{{ _p.web }}main/auth/inscription.php?language={{ current_language }}">{{ "Subscription"|get_lang }}</a>
                     </li>
                     </li>
                     <li class="item-menu menu-4"><a href="{{ "DemoMenuLink"|get_lang }}">{{ "Demo"|get_lang }}</a></li>
                     <li class="item-menu menu-4"><a href="{{ "DemoMenuLink"|get_lang }}">{{ "Demo"|get_lang }}</a></li>
-                    <li class="item-menu menu-5"><a href="{{ _p.web }}web/app_dev.php/contact?_locale={{ document_language }}">{{ "Contact"|get_lang }}</a></li>
+                    <li class="item-menu menu-5"><a href="{{ _p.web_url }}contact?_locale={{ document_language }}">{{ "Contact"|get_lang }}</a></li>
                 {% endif %}
                 {% endif %}
             </ul>
             </ul>
            {% if _u.logged == 1 %}
            {% if _u.logged == 1 %}

+ 2 - 2
src/Chamilo/CoreBundle/Resources/translations/messages.de.po

@@ -53,12 +53,12 @@ msgid "OFAJ"
 msgstr "Deutsch-Französisches Jugendwerk"
 msgstr "Deutsch-Französisches Jugendwerk"
 
 
 msgid "DemoMenuLink"
 msgid "DemoMenuLink"
-msgstr "https://ofaj.beeznest.com/web/app_dev.php/de/demo-seite?_locale=de"
+msgstr "https://ofaj.beeznest.com/web/de/demo-seite?_locale=de"
 
 
 msgid "MentionsLegales"
 msgid "MentionsLegales"
 msgstr "Impressum"
 msgstr "Impressum"
 
 
 msgid "MentionsLegalesLink"
 msgid "MentionsLegalesLink"
-msgstr "https://www.dfparkur.org/web/app_dev.php/de/impressum"
+msgstr "https://www.dfparkur.org/web/de/impressum"
 
 
 
 

+ 2 - 2
src/Chamilo/CoreBundle/Resources/translations/messages.fr.po

@@ -53,11 +53,11 @@ msgid "OFAJ"
 msgstr "Office franco-allemand pour la Jeunesse"
 msgstr "Office franco-allemand pour la Jeunesse"
 
 
 msgid "DemoMenuLink"
 msgid "DemoMenuLink"
-msgstr "https://ofaj.beeznest.com/web/app_dev.php/page-de-dmo-francais"
+msgstr "https://ofaj.beeznest.com/web/page-de-dmo-francais"
 
 
 msgid "MentionsLegales"
 msgid "MentionsLegales"
 msgstr "Mentions Légales"
 msgstr "Mentions Légales"
 
 
 msgid "MentionsLegalesLink"
 msgid "MentionsLegalesLink"
-msgstr "https://www.dfparkur.org/web/app_dev.php/mentions-lgales"
+msgstr "https://www.dfparkur.org/web/mentions-lgales"