From 0f60e8ece523cda8dce44d24e41370c08bf50f12 Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Fri, 31 Oct 2014 10:16:32 -0500
Subject: [PATCH 1/4] Fix lang variable - refs #7347

---
 main/template/default/skill/profile.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/template/default/skill/profile.tpl b/main/template/default/skill/profile.tpl
index 22f1865d57..171c7146f1 100755
--- a/main/template/default/skill/profile.tpl
+++ b/main/template/default/skill/profile.tpl
@@ -55,7 +55,7 @@
                 </div>
                 <div class="info-profile">
                     <h4><a href="{{ _p.web_main }}social/profile.php?u={{ user['user'].user_id }}">{{ user['user'].complete_name }} </a></h4>
-                    <p>Usuario:{{user['user'].username}} </p>
+                    <p>{{ 'User' | get_lang }}: {{user['user'].username}} </p>
                 </div>
                 <div class="number-skill">{{ "Skills"|get_lang }} {{ user.total_found_skills }} / {{ total_search_skills }}</div>
                 <div class="skill-user-items">

From 59f1e2503b3ca387b93d2bb95d633ad6ea09faec Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Fri, 31 Oct 2014 10:21:46 -0500
Subject: [PATCH 2/4] Minor - Format code - refs #7347

---
 main/template/default/skill/profile.tpl | 112 ++++++++++++------------
 1 file changed, 56 insertions(+), 56 deletions(-)

diff --git a/main/template/default/skill/profile.tpl b/main/template/default/skill/profile.tpl
index 171c7146f1..db2800a761 100755
--- a/main/template/default/skill/profile.tpl
+++ b/main/template/default/skill/profile.tpl
@@ -28,68 +28,68 @@
 
 {% if order_user_list is not null %}
     {% for count, user_list in order_user_list %}
-<div class="page-items-profile">
-        <div class="row-fluid">
-            <div class="span12">
-                <h4 class="title-skill">
-                    {% if count == total_search_skills %}
-                        {{ "CompleteMatch"|get_lang }}
-                    {% else %}
-                    {% if (total_search_skills - count) == 1 %}
-                        {{ "MissingOneStepToMatch"|get_lang }}
-                    {% else %}
-                        {{ "MissingXStepsToMatch"|get_lang | format(total_search_skills - count)}}                        
-                    {% endif %}
-            {% endif %}
-                </h4>
-            </div>
-        </div>
-
-        <div class="row-fluid">
-        {% for user in user_list %}
-            <div class="block-items">
-                <div class="border-items">
-                <div class="items-info">
-                <div class="avatar-profile">
-                    <img width="96px" src="{{user.user.avatar}}" />
-                </div>
-                <div class="info-profile">
-                    <h4><a href="{{ _p.web_main }}social/profile.php?u={{ user['user'].user_id }}">{{ user['user'].complete_name }} </a></h4>
-                    <p>{{ 'User' | get_lang }}: {{user['user'].username}} </p>
-                </div>
-                <div class="number-skill">{{ "Skills"|get_lang }} {{ user.total_found_skills }} / {{ total_search_skills }}</div>
-                <div class="skill-user-items">
-                    <ul class="award-items">
-                        {% for skill_data in user.skills %}
-                        <li>
-                            {% if skill_list[skill_data.skill_id].name is not null %}
-                            {% if skill_data.found %}
-                            <img src="{{ _p.web }}main/img/icons/22/award_red_start.png" />{{ skill_list[skill_data.skill_id].name }}
-                            {% else %}
-                            <img src="{{ _p.web }}main/img/icons/22/award_green.png" />{{ skill_list[skill_data.skill_id].name }}
-                            {% endif %}
-
+        <div class="page-items-profile">
+            <div class="row-fluid">
+                <div class="span12">
+                    <h4 class="title-skill">
+                        {% if count == total_search_skills %}
+                            {{ "CompleteMatch"|get_lang }}
+                        {% else %}
+                            {% if (total_search_skills - count) == 1 %}
+                                {{ "MissingOneStepToMatch"|get_lang }}
                             {% else %}
-                            {{ "SkillNotFound"|get_lang }}
+                                {{ "MissingXStepsToMatch"|get_lang | format(total_search_skills - count)}}                        
                             {% endif %}
-                                {# if $skill_data.found
-                                "IHaveThisSkill"|get_lang
-                                #}
-                                </li>
-                            {% endfor %}
-                        </ul>
+                        {% endif %}
+                    </h4>
                 </div>
-                </div>
-            </div>
             </div>
-        {% endfor %}
-    {% endfor %}
-    </div>
+
+            <div class="row-fluid">
+                {% for user in user_list %}
+                    <div class="block-items">
+                        <div class="border-items">
+                            <div class="items-info">
+                                <div class="avatar-profile">
+                                    <img width="96px" src="{{user.user.avatar}}" />
+                                </div>
+                                <div class="info-profile">
+                                    <h4><a href="{{ _p.web_main }}social/profile.php?u={{ user['user'].user_id }}">{{ user['user'].complete_name }} </a></h4>
+                                    <p>{{ 'User' | get_lang }}: {{user['user'].username}} </p>
+                                </div>
+                                <div class="number-skill">{{ "Skills"|get_lang }} {{ user.total_found_skills }} / {{ total_search_skills }}</div>
+                                <div class="skill-user-items">
+                                    <ul class="award-items">
+                                        {% for skill_data in user.skills %}
+                                            <li>
+                                                {% if skill_list[skill_data.skill_id].name is not null %}
+                                                    {% if skill_data.found %}
+                                                        <img src="{{ _p.web }}main/img/icons/22/award_red_start.png" />{{ skill_list[skill_data.skill_id].name }}
+                                                    {% else %}
+                                                        <img src="{{ _p.web }}main/img/icons/22/award_green.png" />{{ skill_list[skill_data.skill_id].name }}
+                                                    {% endif %}
+
+                                                {% else %}
+                                                    {{ "SkillNotFound"|get_lang }}
+                                                {% endif %}
+                                                {# if $skill_data.found
+                                                "IHaveThisSkill"|get_lang
+                                                #}
+                                            </li>
+                                        {% endfor %}
+                                    </ul>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                {% endfor %}
+            {% endfor %}
+        </div>
 
     {% else %}
-    {% if search_skill_list is null %}
-        <div class="warning-message">{{"NoResults"|get_lang}}</div>
-    {% endif %}
+        {% if search_skill_list is null %}
+            <div class="warning-message">{{"NoResults"|get_lang}}</div>
+        {% endif %}
     {% endif %}
 </div>
 <div id="dialog-form" style="display:none;">    

From 3cc07708bad7d8226dec2e4410b62db264f03904 Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Fri, 31 Oct 2014 10:24:52 -0500
Subject: [PATCH 3/4] Fix profile template - refs #7347

---
 main/template/default/skill/profile.tpl | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/main/template/default/skill/profile.tpl b/main/template/default/skill/profile.tpl
index db2800a761..6f54c91602 100755
--- a/main/template/default/skill/profile.tpl
+++ b/main/template/default/skill/profile.tpl
@@ -83,14 +83,14 @@
                         </div>
                     </div>
                 {% endfor %}
-            {% endfor %}
+            </div>
         </div>
-
-    {% else %}
-        {% if search_skill_list is null %}
-            <div class="warning-message">{{"NoResults"|get_lang}}</div>
-        {% endif %}
+    {% endfor %}
+{% else %}
+    {% if search_skill_list is null %}
+        <div class="warning-message">{{"NoResults"|get_lang}}</div>
     {% endif %}
+{% endif %}
 </div>
 <div id="dialog-form" style="display:none;">    
     <form id="save_profile_form" class="form-horizontal" name="form">       

From 37902bafdbf54566a6f89e579320f651a75e7e7c Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Fri, 31 Oct 2014 15:24:59 -0500
Subject: [PATCH 4/4] Sort the results of searched profiles - refs #7347

---
 main/inc/ajax/skill.ajax.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/inc/ajax/skill.ajax.php b/main/inc/ajax/skill.ajax.php
index dfd985fc16..0f3c323cd3 100755
--- a/main/inc/ajax/skill.ajax.php
+++ b/main/inc/ajax/skill.ajax.php
@@ -263,7 +263,7 @@ switch ($action) {
             }
 
             if (!empty($ordered_user_list)) {
-                arsort($ordered_user_list);
+                krsort($ordered_user_list);
             }
         }