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

main/auth/inscription.php

@@ -4,7 +4,7 @@
 use ChamiloSession as Session;
 
 /**
- *  This script displays a form for registering new users.
+ * This script displays a form for registering new users.
  *
  * @package    chamilo.auth
  */

main/inc/lib/pear/HTML/QuickForm/file.php

@@ -257,7 +257,7 @@ class HTML_QuickForm_file extends HTML_QuickForm_input
             $ratio = 'aspectRatio: '.$param['ratio'].',';
         }
         $scalable = 'false';
-        if (!empty($param['scalable'])) {
+        if (!empty($param['scalable']) && $param['scalable'] != 'false') {
             $ratio = '';
             $scalable = $param['scalable'];
         }

main/template/default/session/about.tpl

@@ -235,24 +235,24 @@
                     </div>
                 </div>
                 {% if is_premiun == false %}
-                    <div class="panel panel-default panel-subscription">
-                        <div class="panel-heading">
-                            <h4>{{ 'CourseSubscription'|get_lang }}</h4>
-                        </div>
-                        <div class="panel-body">
-                            <div class="panel-subscribe text-center">
-                                {% if _u.logged and not is_subscribed %}
-                                {{ subscribe_button }}
-                                {% elseif not _u.logged %}
-                                {% if 'allow_registration'|api_get_setting != 'false' %}
+                <div class="panel panel-default panel-subscription">
+                    <div class="panel-heading">
+                        <h4>{{ 'CourseSubscription'|get_lang }}</h4>
+                    </div>
+                    <div class="panel-body">
+                        <div class="panel-subscribe text-center">
+                        {% if _u.logged and not is_subscribed %}
+                            {{ subscribe_button }}
+                        {% elseif not _u.logged %}
+                            {% if 'allow_registration'|api_get_setting != 'false' %}
                                 <a href="{{ _p.web_main ~ 'auth/inscription.php' ~ redirect_to_session }}" class="btn btn-success btn-block btn-lg">
                                     <i class="fa fa-pencil" aria-hidden="true"></i> {{ 'SignUp'|get_lang }}
                                 </a>
-                                {% endif %}
-                                {% endif %}
-                            </div>
+                            {% endif %}
+                        {% endif %}
                         </div>
                     </div>
+                </div>
                 {% else %}
                 <div class="panel panel-default">
                     <div class="panel-heading">
@@ -271,6 +271,4 @@
             </div>
         </div>
     {% endfor %}
-
-
 </div>