Browse Source

fix pagination catalog sessions

aragonc 10 years ago
parent
commit
467d59b291

+ 1 - 1
main/auth/courses_controller.php

@@ -532,7 +532,7 @@ class CoursesController
      */
     public function getSessionIcon($sessionName)
     {
-        return Display::return_icon('window_list.png', $sessionName, null, ICON_SIZE_BIG);
+        return Display::return_icon('window_list.png', $sessionName, null,ICON_SIZE_MEDIUM);
     }
 
     /**

+ 5 - 10
main/inc/lib/course_category.lib.php

@@ -932,6 +932,7 @@ function getCataloguePagination($pageCurrent, $pageLength, $pageTotal)
 {
     // Start empty html
     $pageDiv = '';
+    $html='';
     $pageBottom = max(1, $pageCurrent - 3);
     $pageTop = min($pageTotal, $pageCurrent + 3);
 
@@ -970,17 +971,11 @@ function getCataloguePagination($pageCurrent, $pageLength, $pageTotal)
     }
 
     // Complete pagination html
-    $pageDiv = Display::div(
-        Display::tag(
-            'ul',
-            $pageDiv
-        ),
-        array(
-            'class' => 'pagination pagination-centered',
-        )
-    );
+    $pageDiv = Display::tag('ul',$pageDiv,array('class' => 'pagination'));
+
 
-    return $pageDiv;
+    $html.='<nav>'.$pageDiv.'</nav>';
+    return $html;
 }
 
 /**

+ 67 - 70
main/template/default/auth/sessions_catalog.tpl

@@ -7,13 +7,13 @@
                 dateFormat: 'yy-mm-dd'
             });
 
-            $('.accordion').click(function(e) {
+            $('#list-course').click(function(e) {
                 e.preventDefault();
                 var tempTarget = e.target.toString().split('#');
                 tempTarget = '#' + tempTarget[1];
                 // use the target of the link as the ID of the element to find
                 var target = $(tempTarget);
-                var targetContent = target.find('.accordion-inner');
+                var targetContent = target.find('.list');
 
                 if (targetContent.is(':empty')) {
                     var idParts = tempTarget.split('-');
@@ -42,11 +42,11 @@
                             targetContent.html('<ul class="items-session">' + coursesUL + '</ul>');
                             target.css({
                                 height: targetContent.outerHeight()
-                            }).addClass('in');
+                            }).addClass(' in');
                         }
                     });
                 } else {
-                    target.addClass('in');
+                    target.addClass(' in');
                 }
             });
         });
@@ -54,105 +54,102 @@
 
     <div class="col-md-3">
         {% if showCourses %}
-            <div class="well">
-                {% if not hiddenLinks %}
+            <div class="panel panel-default">
+                <div class="panel-body">
+                    {% if not hiddenLinks %}
                     <form class="form-search" method="post" action="{{ courseUrl }}">
-                        <fieldset>
+
                             <input type="hidden" name="sec_token" value="{{ searchToken }}">
                             <input type="hidden" name="search_course" value="1" />
-                            <div class="control-group">
-                                <div class="controls">
-                                    <div class="input-append">
-                                        <input class="span2" type="text" name="search_term" />
-                                        <button class="btn btn-default" type="submit"><i class="fa fa-search"></i> {{ 'Search' | get_lang }}</button>
-                                    </div>
-                                </div>
+                            <div class="form-group">
+                                <input  type="text" name="search_term" class="form-control"/>
+                                <button class="btn btn-block btn-default" type="submit"><i class="fa fa-search"></i> {{ 'Search' | get_lang }}</button>
                             </div>
-                        </fieldset>
+
                     </form>
-                {% endif %}
+                    {% endif %}
 
-                {% if coursesCategoriesList is not empty %}
-                    <a class="btn btn-default" href="{{ api_get_self }}?action=display_random_courses">{{ 'RandomPick' | get_lang }}</a>
-                {% endif %}
+                    {% if coursesCategoriesList is not empty %}
+                    <a class="btn btn-block btn-default" href="{{ api_get_self }}?action=display_random_courses">{{ 'RandomPick' | get_lang }}</a>
+                    {% endif %}
+                </div>
             </div>
 
             {% if coursesCategoriesList is not empty %}
-                <div class="well sidebar-nav">
-                    <h4>{{ 'CourseCategories' | get_lang }}</h4>
-                    <ul class="nav nav-list">
-                        {{ coursesCategoriesList }}
-                    </ul>
+                <div class="sidebar-nav">
+                    <div class="panel panel-default">
+                        <div class="panel-heading">
+                            {{ 'CourseCategories' | get_lang }}
+                        </div>
+                        <div class="panel-body">
+                            <ul class="list-categories">
+                                {{ coursesCategoriesList }}
+                            </ul>
+                        </div>
+                    </div>
                 </div>
             {% endif %}
         {% endif %}
 
         {% if showSessions %}
-            <div class="well sidebar-nav">
-                <h4>{{ 'Sessions' | get_lang }}</h4>
-                <ul class="nav nav-list">
-                    <li>{{ 'SearchSessions' | get_lang }}</li>
-                    <li>
+            <div class="sidebar-nav">
+
+                <div class="panel panel-default">
+                    <div class="panel-heading">
+                        {{ 'Sessions' | get_lang }}
+                    </div>
+                    <div class="panel-body">
                         <form class="form-search" method="post" action="{{ api_get_self }}?action=display_sessions">
-                            <div class="input-append">
-                                <input type="date" name="date" id="date" class="span2 search-session" value="{{ searchDate }}" readonly>
-                                <button class="btn btn-default" type="submit"><i class="fa fa-search"></i> {{ 'Search' | get_lang }}</button>
+                            <div class="form-group">
+                                <input type="date" name="date" id="date" class="form-control" value="{{ searchDate }}" readonly>
+                                <button class="btn btn-block btn-default" type="submit"><i class="fa fa-search"></i> {{ 'Search' | get_lang }}</button>
                             </div>
                         </form>
-                    </li>
-                </ul>
+                    </div>
+                </div>
+
             </div>
         {% endif %}
     </div>
     <div class="col-md-9">
         {% for session in sessions_blocks %}
-            <div class="well well-small session-group" id="session-{{ session.id }}">
-                <div class="row">
-                    <div class="col-md-9">
-                        <div class="row padding-clear">
-                            <div class="col-md-2">
-                                <span class="thumbnail">
-                                    {{ session.icon }}
-                                </span>
-                            </div>
-                            <div class="col-md-10 border-info">
-                                <h3>{{ session.name }}</h3>
-                                <div class="tutor">
-                                    <img src="{{ 'teacher.png' | icon(22) }}" width="16"> {{ 'GeneralCoach' | get_lang }} {{ session.coach_name }}
-                                </div>
+
+            <div class="panel panel-default" id="panel-{{ session.id }}">
+                <div class="panel-heading">
+                    {{ session.icon }} {{ session.name }}
+                </div>
+                <div class="panel-body">
+                    <div class="row">
+                        <div class="col-md-9">
+                            <div class="tutor">
+                                <img src="{{ 'teacher.png' | icon(22) }}" width="16"> {{ 'GeneralCoach' | get_lang }} {{ session.coach_name }}
                             </div>
-                        </div>
-                        <div class="row">
-                            <div class="accordion" id="session-{{ session.id }}-accordion">
-                                <div class="accordion-group">
-                                    <div class="accordion-heading">
-                                        <a class="accordion-toggle" data-toggle="collapse" data-parent="#session-{{ session.id }}-accordion" href="#session-{{ session.id }}-courses">
-                                            {{ 'CourseList' | get_lang }}
-                                        </a>
-                                    </div>
-                                    <div id="session-{{ session.id }}-courses" class="accordion-body collapse in">
-                                        <div class="accordion-inner"></div>
-                                    </div>
-                                </div>
+                            <a id="list-course" class="btn btn-default" data-toggle="collapse" href="#session-{{ session.id }}-courses">
+                                {{ 'CourseList' | get_lang }}
+                            </a>
+                            <div class="collapse" id="session-{{ session.id }}-courses">
+                                <div class="list"></div>
                             </div>
+
                         </div>
-                    </div>
-                    <div class="col-md-3">
-                        {% if session.showDescription %}
+                        <div class="col-md-3">
+                            {% if session.showDescription %}
                             <div class="buttom-subscribed">
                                 <a class="ajax btn btn-large btn-info" href="{{ _p.web_ajax }}session.ajax.php?a=get_description&session={{ session.id }}">{{ 'Description' | get_lang }}</a>
                             </div>
-                        {% endif %}
+                            {% endif %}
 
-                        <div class="buttom-subscribed">
-                            {% if session.is_subscribed %}
+                            <div class="buttom-subscribed">
+                                {% if session.is_subscribed %}
                                 {{ already_subscribed_label }}
-                            {% else %}
+                                {% else %}
                                 {{ session.subscribe_button }}
-                            {% endif %}
+                                {% endif %}
+                            </div>
+                            <div class="time"><img src="{{ 'agenda.png' | icon(22) }}"> {{ session.date }}</div>
                         </div>
-                        <div class="time"><img src="{{ 'agenda.png' | icon(22) }}"> {{ session.date }}</div>
                     </div>
+
                 </div>
             </div>
         {% endfor %}

+ 65 - 29
main/template/default/skill/skill_wheel_student.tpl

@@ -133,7 +133,7 @@ $(document).ready(function() {
     /* Close button in gradebook select */
     $("#gradebook_holder").on("click", "a.closebutton", function() {
         gradebook_id = $(this).attr('rel');
-        skill_id = $('input[name="id"]').attr('value');
+        skill_id = $('#id').attr('value');
         delete_gradebook_from_skill(skill_id, gradebook_id);
     });
 
@@ -180,7 +180,7 @@ $(document).ready(function() {
     $("#dialog-form").dialog({
         autoOpen: false,
         modal   : true,
-        width   : 900,
+        width   : 600,
         height  : 550
     });
 
@@ -215,7 +215,7 @@ $(document).ready(function() {
         if (skill) {
             var parent_info = get_skill_info(skill.extra.parent_id);
 
-            $('input[name="id"]').attr('value',   skill.id);
+            $("#id").attr('value',   skill.id);
             $("#name").attr('value', skill.name);
             $("#short_code").attr('value', skill.short_code);
             $("#description").attr('value', skill.description);
@@ -232,30 +232,21 @@ $(document).ready(function() {
             });
 
             $("#dialog-form").dialog({
-                buttons: [
-                    {
-                        text: "{{ "Edit"|get_lang }}",
-                        class: 'btn btn-primary',
-                        click: function() {
-                            var params = $("#add_item").find(':input').serialize();
-                            add_skill(params);
-                        }
-                    },
-                    {
-                        text: "{{ "CreateChildSkill"|get_lang }}",
-                        class: 'btn btn-primary',
-                        click: function() {
-                            open_popup(0, skill.id);
-                        }
-                    },
-                    {
-                        text: "{{ "AddSkillToProfileSearch"|get_lang }}",
-                        class: 'btn btn-primary',
-                        click: function() {
-                            add_skill_in_profile_list(skill.id, skill.name);
-                        }
-                    }
-                ],
+                buttons: {
+                     "{{ "Edit"|get_lang }}" : function() {
+                         var params = $("#add_item").find(':input').serialize();
+                         add_skill(params);
+                      },
+                      /*"{{ "Delete"|get_lang }}" : function() {
+                      },*/
+                      "{{ "CreateChildSkill"|get_lang }}" : function() {
+                          open_popup(0, skill.id);
+
+                      },
+                      "{{ "AddSkillToProfileSearch"|get_lang }}" : function() {
+                          add_skill_in_profile_list(skill.id, skill.name);
+                      }
+                },
                 close: function() {
                     $("#name").attr('value','');
                     $("#description").attr('value', '');
@@ -276,7 +267,7 @@ $(document).ready(function() {
         <div class="row">
             <div class="col-md-3 skill-options">
                 <div class="skill-home">
-                    <a class="btn btn-large btn-block btn-success" href="{{ _p.web }}user_portal.php"><i class="fa fa-home"></i> {{ "ReturnToCourseList"|get_lang }}</a>
+                    <a class="btn btn-large btn-block btn-success" href="{{ _p.web }}user_portal.php"><i class="fa fa-home"></i>{{ "ReturnToCourseList"|get_lang }}</a>
                 </div>
                 <div class="skill-profile">
                     <div class="avatar">
@@ -387,5 +378,50 @@ $(document).ready(function() {
 
 <div id="dialog-form" style="">
     <p class="validateTips"></p>
-    {{ dialogForm }}
+    <form id="add_item" class="form-horizontal" name="form">
+        <fieldset>
+            <div class="control-group">
+                <label class="control-label" for="name">{{ 'Name' | get_lang }}</label>
+                <div class="controls">
+                    <!--<input type="text" name="name" id="name" class="span4" readonly />-->
+                    <p id="name" class="span4">
+                    </p>
+                </div>
+            </div>
+            <div class="control-group">
+                <label class="control-label">{{ 'ShortCode' | get_lang }}</label>
+                <div class="controls">
+                    <!--<input type="text" name="short_code" id="short_code" class="span2" readonly />-->
+                    <p id="short_code" class="span4">
+                    </p>
+                </div>
+            </div>
+            <div id="skill_row" class="control-group">
+                <label class="control-label" for="name">{{'Parent'|get_lang}}</label>
+                <div class="controls">
+                    <ul id="skill_edit_holder" class="holder holder_simple">
+                    </ul>
+                </div>
+            </div>
+            <div id="gradebook_row" class="control-group">
+                <label class="control-label" for="name">{{'Gradebook'|get_lang}}</label>
+                <div class="controls">
+                    <ul id="gradebook_holder" class="holder holder_simple">
+                    </ul>
+                    <span class="help-block">
+                    {{ 'WithCertificate'|get_lang }}
+                    </span>
+                </div>
+            </div>
+            <div class="control-group">
+                <label class="control-label" for="name">{{ 'Description'|get_lang }}</label>
+                <div class="controls">
+                    <!--<textarea name="description" id="description" class="span4" rows="7" readonly>
+                    </textarea>-->
+                    <p id="description" class="span4">
+                    </p>
+                </div>
+            </div>
+        </fieldset>
+    </form>
 </div>