Merge pull request #8 from AngelFQC/7347

Sort the results of searched profiles - refs #7347
1.9.x
Alex Aragon Calixto 11 years ago
commit d172996caf
  1. 2
      main/inc/ajax/skill.ajax.php
  2. 108
      main/template/default/skill/profile.tpl

@ -263,7 +263,7 @@ switch ($action) {
}
if (!empty($ordered_user_list)) {
arsort($ordered_user_list);
krsort($ordered_user_list);
}
}

@ -28,69 +28,69 @@
{% 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>Usuario:{{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>
</div>
{% 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 %}
{% else %}
{{ "SkillNotFound"|get_lang }}
{% endif %}
{# if $skill_data.found
"IHaveThisSkill"|get_lang
#}
</li>
{% endfor %}
</ul>
</div>
</div>
</div>
</div>
{% endfor %}
</div>
{% endfor %}
</div>
{% endfor %}
</div>
{% else %}
{% else %}
{% if search_skill_list is null %}
<div class="warning-message">{{"NoResults"|get_lang}}</div>
{% endif %}
{% endif %}
{% endif %}
</div>
<div id="dialog-form" style="display:none;">
<form id="save_profile_form" class="form-horizontal" name="form">

Loading…
Cancel
Save