From b6f6c5d8fd0e4cdad460dffff21a18b40375f0d2 Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Mon, 28 Sep 2015 16:07:28 -0500
Subject: [PATCH 1/2] Improve button on session catalog when user is not logged
 - refs BT#10343 #TMI

---
 main/template/default/auth/session_catalog.tpl | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/main/template/default/auth/session_catalog.tpl b/main/template/default/auth/session_catalog.tpl
index e8d9b1013f..0b3876f8d3 100644
--- a/main/template/default/auth/session_catalog.tpl
+++ b/main/template/default/auth/session_catalog.tpl
@@ -105,21 +105,26 @@
                                 </ul>
 
                                 <div class="options">
+                                    {% if not _u.logged %}
+                                        <p>
+                                            <a class="btn btn-info btn-block btn-sm" href="{{ "#{_p.web}session/#{session.id}/about/" }}" title="{{ session.name }}">{{ 'SeeCourseInformationAndRequirements'|get_lang }}</a>
+                                        </p>
+                                    {% else %}
                                     <p>
                                         <a class="btn btn-info btn-block btn-sm" role="button" data-toggle="popover" id="session-{{ session.id }}-sequences">{{ 'SeeSequences'|get_lang }}</a>
                                     </p>
                                     <p class="buttom-subscribed">
                                         {% if session.is_subscribed %}
                                             {{ already_subscribed_label }}
-                                        {% elseif _u.logged == 0 %}
-                                            {{ '' }}
                                         {% else %}
                                             {{ session.subscribe_button }}
                                         {% endif %}
                                     </p>
+                                    {% endif %}
                                 </div>
                             </div>
 
+                            {% if _u.logged %}
                             <script>
                                 $('#session-{{ session.id }}-sequences').popover({
                                     placement: 'bottom',
@@ -170,6 +175,7 @@
                                     }
                                 });
                             </script>
+                            {% endif %}
                         </div>
                     </div>
                 {% else %}

From e9b5c070a14498c900d92846ea326b85e68b2c5d Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Mon, 28 Sep 2015 16:13:22 -0500
Subject: [PATCH 2/2] Minor - Format code - refs BT#10343 #TMI

---
 .../template/default/auth/session_catalog.tpl | 120 +++++++++---------
 1 file changed, 60 insertions(+), 60 deletions(-)

diff --git a/main/template/default/auth/session_catalog.tpl b/main/template/default/auth/session_catalog.tpl
index 0b3876f8d3..09bd6351b4 100644
--- a/main/template/default/auth/session_catalog.tpl
+++ b/main/template/default/auth/session_catalog.tpl
@@ -110,71 +110,71 @@
                                             <a class="btn btn-info btn-block btn-sm" href="{{ "#{_p.web}session/#{session.id}/about/" }}" title="{{ session.name }}">{{ 'SeeCourseInformationAndRequirements'|get_lang }}</a>
                                         </p>
                                     {% else %}
-                                    <p>
-                                        <a class="btn btn-info btn-block btn-sm" role="button" data-toggle="popover" id="session-{{ session.id }}-sequences">{{ 'SeeSequences'|get_lang }}</a>
-                                    </p>
-                                    <p class="buttom-subscribed">
-                                        {% if session.is_subscribed %}
-                                            {{ already_subscribed_label }}
-                                        {% else %}
-                                            {{ session.subscribe_button }}
-                                        {% endif %}
-                                    </p>
+                                        <p>
+                                            <a class="btn btn-info btn-block btn-sm" role="button" data-toggle="popover" id="session-{{ session.id }}-sequences">{{ 'SeeSequences'|get_lang }}</a>
+                                        </p>
+                                        <p class="buttom-subscribed">
+                                            {% if session.is_subscribed %}
+                                                {{ already_subscribed_label }}
+                                            {% else %}
+                                                {{ session.subscribe_button }}
+                                            {% endif %}
+                                        </p>
                                     {% endif %}
                                 </div>
                             </div>
 
                             {% if _u.logged %}
-                            <script>
-                                $('#session-{{ session.id }}-sequences').popover({
-                                    placement: 'bottom',
-                                    html: true,
-                                    trigger: 'click',
-                                    content: function () {
-                                        var content = '';
-
-                                        {% if session.sequences %}
-                                            {% for sequence in session.sequences %}
-                                                content += '<p class="lead">{{ sequence.name }}</p>';
-
-                                                {% if sequence.requirements %}
-                                                    content += '<p><i class="fa fa-sort-amount-desc"></i> {{ 'RequiredSessions'|get_lang }}</p>';
-                                                    content += '<ul>';
-
-                                                    {% for requirement in sequence.requirements %}
-                                                        content += '<li>';
-                                                        content += '<a href="{{ _p.web ~ 'session/' ~ requirement.id ~ '/about/' }}">{{ requirement.name }}</a>';
-                                                        content += '</li>';
-                                                    {% endfor %}
-
-                                                    content += '</ul>';
-                                                {% endif %}
-
-                                                {% if sequence.dependencies %}
-                                                    content += '<p><i class="fa fa-sort-amount-desc"></i> {{ 'DependentSessions'|get_lang }}</p>';
-                                                    content += '<ul>';
-
-                                                    {% for dependency in sequence.dependencies %}
-                                                        content += '<li>';
-                                                        content += '<a href="{{ _p.web ~ 'session/' ~ dependency.id ~ '/about/' }}">{{ dependency.name }}</a>';
-                                                        content += '</li>';
-                                                    {% endfor %}
-
-                                                    content += '</ul>';
-                                                {% endif %}
-
-                                                {% if session.sequences|length > 1 %}
-                                                    content += '<hr>';
-                                                {% endif %}
-                                            {% endfor %}
-                                        {% else %}
-                                            content = "{{ 'NoDependencies'|get_lang }}";
-                                        {% endif %}
-
-                                        return content;
-                                    }
-                                });
-                            </script>
+                                <script>
+                                    $('#session-{{ session.id }}-sequences').popover({
+                                        placement: 'bottom',
+                                        html: true,
+                                        trigger: 'click',
+                                        content: function () {
+                                            var content = '';
+
+                                            {% if session.sequences %}
+                                                {% for sequence in session.sequences %}
+                                                    content += '<p class="lead">{{ sequence.name }}</p>';
+
+                                                    {% if sequence.requirements %}
+                                                        content += '<p><i class="fa fa-sort-amount-desc"></i> {{ 'RequiredSessions'|get_lang }}</p>';
+                                                        content += '<ul>';
+
+                                                        {% for requirement in sequence.requirements %}
+                                                            content += '<li>';
+                                                            content += '<a href="{{ _p.web ~ 'session/' ~ requirement.id ~ '/about/' }}">{{ requirement.name }}</a>';
+                                                            content += '</li>';
+                                                        {% endfor %}
+
+                                                        content += '</ul>';
+                                                    {% endif %}
+
+                                                    {% if sequence.dependencies %}
+                                                        content += '<p><i class="fa fa-sort-amount-desc"></i> {{ 'DependentSessions'|get_lang }}</p>';
+                                                        content += '<ul>';
+
+                                                        {% for dependency in sequence.dependencies %}
+                                                            content += '<li>';
+                                                            content += '<a href="{{ _p.web ~ 'session/' ~ dependency.id ~ '/about/' }}">{{ dependency.name }}</a>';
+                                                            content += '</li>';
+                                                        {% endfor %}
+
+                                                        content += '</ul>';
+                                                    {% endif %}
+
+                                                    {% if session.sequences|length > 1 %}
+                                                        content += '<hr>';
+                                                    {% endif %}
+                                                {% endfor %}
+                                            {% else %}
+                                                content = "{{ 'NoDependencies'|get_lang }}";
+                                            {% endif %}
+
+                                            return content;
+                                        }
+                                    });
+                                </script>
                             {% endif %}
                         </div>
                     </div>