Merge pull request #962 from aragonc/1.10.x

fix badges red social skill BT#7683
1.10.x
Yannick Warnier 9 years ago
commit 46dc39f966
  1. 7
      app/Resources/public/css/base.css
  2. 10
      main/social/skills_ranking.php
  3. 9
      main/template/default/social/skills_block.tpl

@ -2643,7 +2643,9 @@ form .formw .freeze {
table#skill_holder {
margin-top: 15px;
}
.badges-sidebar{
height: 250px;
}
/* ****************************************************
END SKILL
**************************************************** */
@ -4008,7 +4010,7 @@ i.size-32.icon-new-work{
margin-right: 15px;
padding: 0;
vertical-align: top;
width: 120px;
width: 95px;
}
#skillList .list-badges .thumbnail img{
margin-bottom: 4px;
@ -4016,6 +4018,7 @@ i.size-32.icon-new-work{
}
#skillList .list-badges .thumbnail .caption{
background: #D9EDF7;
font-size: 12px;
}
#skillList .list-badges .thumbnail .caption p{
margin-bottom: 0;

@ -40,35 +40,35 @@ $column_model = array(
'name' => 'firstname',
'index' => 'firstname',
'width' => '70',
'align' => 'left',
'align' => 'center',
'sortable' => 'false',
),
array(
'name' => 'lastname',
'index' => 'lastname',
'width' => '70',
'align' => 'left',
'align' => 'center',
'sortable' => 'false',
),
array(
'name' => 'skills_acquired',
'index' => 'skills_acquired',
'width' => '30 ',
'align' => 'left',
'align' => 'center',
'sortable' => 'false',
),
array(
'name' => 'currently_learning',
'index' => 'currently_learning',
'width' => '30',
'align' => 'left',
'align' => 'center',
'sortable' => 'false',
),
array(
'name' => 'rank',
'index' => 'rank',
'width' => '30',
'align' => 'left',
'align' => 'center',
'sortable' => 'false',
),
);

@ -26,9 +26,16 @@
</div>
</h4>
</div>
<script type="text/javascript">
jQuery(document).ready(function(){
jQuery('.scrollbar-inner').scrollbar();
});
</script>
<div id="skillList" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingOne">
<div class="panel-body">
{% if skills %}
<div class="scrollbar-inner badges-sidebar">
<ul class="list-unstyled list-badges">
{% for skill in skills %}
<li class="thumbnail">
@ -41,6 +48,8 @@
</li>
{% endfor %}
</ul>
</div>
{% else %}
<p>{{ 'WithoutAchievedSkills'|get_lang }}</p>
<p>

Loading…
Cancel
Save