Browse Source

Merge pull request #1386 from aragonc/1.11.x

1.11.x
Alex Aragon Calixto 8 years ago
parent
commit
5460118b0c

+ 18 - 39
app/Resources/public/css/base.css

@@ -21,10 +21,10 @@ body{
     position: absolute;
     bottom: 0;
     width: 100%;
-    height: 120px;
+    
 }
 #content-section{
-    margin-bottom: 150px;
+    margin-bottom: 230px;
 }
 /* End Sticky footer style */
 select {
@@ -198,7 +198,6 @@ header{
 .panelSliders .ui-slider-handle {
   border-color: #000;
 }
-
 #panelSliders {
   width: 75%;
   margin: 25px auto;
@@ -3056,34 +3055,21 @@ a.forum_group_link {
     text-align: center;
 }
 .new_actions {
-    background: #ffffff; /* Old browsers */
-    background: -moz-linear-gradient(top, #ffffff 0%, #e5e5e5 100%); /* FF3.6+ */
-    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(100%,#e5e5e5)); /* Chrome,Safari4+ */
-    background: -webkit-linear-gradient(top, #ffffff 0%,#e5e5e5 100%); /* Chrome10+,Safari5.1+ */
-    background: -o-linear-gradient(top, #ffffff 0%,#e5e5e5 100%); /* Opera 11.10+ */
-    background: -ms-linear-gradient(top, #ffffff 0%,#e5e5e5 100%); /* IE10+ */
-    background: linear-gradient(to bottom, #ffffff 0%,#e5e5e5 100%); /* W3C */
-    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#e5e5e5',GradientType=0 ); /* IE6-9 */
-    border: 1px solid #E5E5E5;
-    border-radius: 4px 4px 4px 4px;
+    background: #ffffff;
     min-height: 50px;
+    border: 1px solid #E5E5E5;
+}
+.new_actions .nav > li{
+    margin-left: 0;
 }
 .new_actions .nav > li > a {
-
-    border-radius: 0 0 0 0;
+    border-radius: 0;
     border-right: 1px solid #E5E5E5;
     margin: 0;
     padding: 10px;
 }
 .new_actions .nav li a:hover{
-    background: #f4f4f4; /* Old browsers */
-    background: -moz-linear-gradient(top, #f4f4f4 0%, #dddddd 71%); /* FF3.6+ */
-    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f4f4f4), color-stop(71%,#dddddd)); /* Chrome,Safari4+ */
-    background: -webkit-linear-gradient(top, #f4f4f4 0%,#dddddd 71%); /* Chrome10+,Safari5.1+ */
-    background: -o-linear-gradient(top, #f4f4f4 0%,#dddddd 71%); /* Opera 11.10+ */
-    background: -ms-linear-gradient(top, #f4f4f4 0%,#dddddd 71%); /* IE10+ */
-    background: linear-gradient(to bottom, #f4f4f4 0%,#dddddd 71%); /* W3C */
-    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f4f4f4', endColorstr='#dddddd',GradientType=0 ); /* IE6-9 */
+    background: #ECF0F1;
 }
 .new_actions-fixed {
     border-color: #D5D5D5;
@@ -3106,14 +3092,7 @@ a.forum_group_link {
     padding:8px;
 }
 .new_actions .nav-pills li.active a{
-    background: #dddddd; /* Old browsers */
-    background: -moz-linear-gradient(top, #dddddd 10%, #f4f4f4 100%); /* FF3.6+ */
-    background: -webkit-gradient(linear, left top, left bottom, color-stop(10%,#dddddd), color-stop(100%,#f4f4f4)); /* Chrome,Safari4+ */
-    background: -webkit-linear-gradient(top, #dddddd 10%,#f4f4f4 100%); /* Chrome10+,Safari5.1+ */
-    background: -o-linear-gradient(top, #dddddd 10%,#f4f4f4 100%); /* Opera 11.10+ */
-    background: -ms-linear-gradient(top, #dddddd 10%,#f4f4f4 100%); /* IE10+ */
-    background: linear-gradient(to bottom, #dddddd 10%,#f4f4f4 100%); /* W3C */
-    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#dddddd', endColorstr='#f4f4f4',GradientType=0 ); /* IE6-9 */
+    background: #ECF0F1;
 }
 .subnav .nav > li > .logout {
     padding-top:8px;
@@ -3151,6 +3130,12 @@ a.forum_group_link {
     text-align: center;
     margin-bottom: 5px;
 }
+.section-parameters{
+    padding-top: 20px;
+    padding-bottom: 20px;
+    margin-top: 10px;
+    margin-bottom: 10px;
+}
 .handle{
     background-image: url('../../main/img/div_show.gif');
     background-repeat: no-repeat;
@@ -4669,15 +4654,9 @@ div#chat-remote-video video {
   height: 100px;
 }
 /* list courses classic*/
-.classic-courses .teachers{
-    margin: 0;
-    padding: 0;
-    display: inline-block;
+.classic-courses .list-teachers{
     font-size: 12px;
 }
-.classic-courses .teachers li{
-    display: inline-block;
-}
 /* list my course user*/
 .session .info-session{
     margin-bottom: 10px;
@@ -4686,7 +4665,7 @@ div#chat-remote-video video {
 .session .info-session span{
     margin-right: 10px;
 }
-.session .teachers{
+.session .list-teachers{
     font-size: 12px;
 }
 .session .sessions-items .courses{

+ 2 - 1
bower.json

@@ -27,7 +27,8 @@
     "cropper": "1.0.*",
     "jquery.scrollbar": "0.2.*",
     "jquery-file-upload": "*",
-    "pwstrength-bootstrap": "*"
+    "pwstrength-bootstrap": "*",
+    "readmore-js": "2.1.0"
   },
   "resolutions": {
     "jquery": "2.1.4"

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

@@ -706,7 +706,8 @@ class Template
             'mediaelement/build/mediaelement-and-player.min.js',
             'jqueryui-timepicker-addon/dist/jquery-ui-timepicker-addon.min.js',
             'image-map-resizer/js/imageMapResizer.min.js',
-            'jquery.scrollbar/jquery.scrollbar.min.js'
+            'jquery.scrollbar/jquery.scrollbar.min.js',
+            'readmore-js/readmore.min.js'
         ];
         if (CHAMILO_LOAD_WYSIWYG == true) {
             $bowerJsFiles[] = 'ckeditor/ckeditor.js';

+ 3 - 3
main/install/install.lib.php

@@ -1143,7 +1143,7 @@ function display_license_agreement()
     </div>
 
     <!-- Contact information form -->
-    <div>
+    <div class="section-parameters">
         <a href="javascript://" class = "advanced_parameters" >
         <span id="img_plus_and_minus">&nbsp;<img src="<?php echo api_get_path(WEB_IMG_PATH) ?>div_hide.gif" alt="<?php echo get_lang('Hide') ?>" title="<?php echo get_lang('Hide')?>" style ="vertical-align:middle" />&nbsp;<?php echo get_lang('ContactInformation') ?></span>
         </a>
@@ -1155,7 +1155,7 @@ function display_license_agreement()
             <p><?php echo get_contact_registration_form() ?></p><br />
         </div>
     </div>
-
+    <div class="text-center">
     <button type="submit" class="btn btn-default" name="step1" value="&lt; <?php echo get_lang('Previous'); ?>" >
         <em class="fa fa-backward"> </em> <?php echo get_lang('Previous'); ?>
     </button>
@@ -1163,7 +1163,7 @@ function display_license_agreement()
     <button type="submit" id="license-next" class="btn btn-success" name="step3" onclick="javascript: if(!document.getElementById('accept_licence').checked) { alert('<?php echo get_lang('YouMustAcceptLicence')?>');return false;}" value="<?php echo get_lang('Next'); ?> &gt;" >
         <em class="fa fa-forward"> </em> <?php echo get_lang('Next'); ?>
     </button>
-
+    </div>
     <?php
 }
 

+ 9 - 0
main/template/default/layout/footer.js.tpl

@@ -92,5 +92,14 @@
             placement: 'right'
         };
         $('.boot-tooltip').tooltip(tip_options);
+        var more = '{{ 'SeeMore' | get_lang }}';
+        var close = '{{ 'Close' | get_lang }}';
+        $('.list-teachers').readmore({
+            speed: 75,
+            moreLink: '<a href="#">' + more + '</a>',
+            lessLink: '<a href="#">' + close + '</a>',
+            collapsedHeight: 35,
+            blockCSS: 'display: block; width: 100%;'
+        });
     });
 </script>

+ 4 - 5
main/template/default/user_portal/classic_courses_without_category.tpl

@@ -45,19 +45,18 @@
                                 {% endif %}
                             </h4>
                             <div class="course-items-session">
-                                {{ 'teacher.png' | img(16, 'Professor'|get_lang ) }}
-                                <ul class="teachers">
+                                
+                                <div class="list-teachers">
+                                    {{ 'teacher.png' | img(16, 'Professor'|get_lang ) }}
                                     {% for teacher in item.teachers %}
-                                        <li>
                                             {% set counter = counter + 1 %}
                                             {% if counter > 1 %} | {% endif %}
                                             <a href="{{ teacher.url }}" class="ajax"
                                                data-title="{{ teacher.firstname }} {{ teacher.lastname }}">
                                                 {{ teacher.firstname }} {{ teacher.lastname }}
                                             </a>
-                                        </li>
                                     {% endfor %}
-                                </ul>
+                                </div>
                             </div>
                         </div>
                     </div>

+ 1 - 1
main/template/default/user_portal/classic_session.tpl

@@ -100,7 +100,7 @@
                                         </div>
                                         <div class="col-md-10">
                                             <h4>{{ item.title }}</h4>
-                                            <div class="teachers">
+                                            <div class="list-teachers">
                                                 {% if item.teachers|length > 0 %}
                                                     <img src="{{ 'teacher.png'|icon(16) }}" width="16" height="16">
                                                     {% for coach in item.teachers %}