From d1648dedc4c5a63d4f3bdfdac28b5325055770bf Mon Sep 17 00:00:00 2001 From: aragonc Date: Fri, 18 Dec 2015 18:46:28 -0500 Subject: [PATCH 1/2] fix badges red social skill BT#7683 --- app/Resources/public/css/base.css | 7 +++++-- main/social/skills_ranking.php | 10 +++++----- main/template/default/social/skills_block.tpl | 9 +++++++++ 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/app/Resources/public/css/base.css b/app/Resources/public/css/base.css index 8b49366f78..0aa1eea7fb 100644 --- a/app/Resources/public/css/base.css +++ b/app/Resources/public/css/base.css @@ -2643,7 +2643,9 @@ form .formw .freeze { table#skill_holder { margin-top: 15px; } - +.badges-siderbar{ + 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; diff --git a/main/social/skills_ranking.php b/main/social/skills_ranking.php index 5e8dcc4abb..60a17480c0 100755 --- a/main/social/skills_ranking.php +++ b/main/social/skills_ranking.php @@ -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', ), ); diff --git a/main/template/default/social/skills_block.tpl b/main/template/default/social/skills_block.tpl index 0c7abe196a..997fdc5ffc 100644 --- a/main/template/default/social/skills_block.tpl +++ b/main/template/default/social/skills_block.tpl @@ -26,9 +26,16 @@ +
{% if skills %} + +
    {% for skill in skills %}
  • @@ -41,6 +48,8 @@
  • {% endfor %}
+
+ {% else %}

{{ 'WithoutAchievedSkills'|get_lang }}

From fa39498e7c4d684a875f327055536fbeac5e67cd Mon Sep 17 00:00:00 2001 From: aragonc Date: Fri, 18 Dec 2015 19:01:42 -0500 Subject: [PATCH 2/2] fix badges red social skill BT#7683 --- app/Resources/public/css/base.css | 2 +- main/template/default/social/skills_block.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Resources/public/css/base.css b/app/Resources/public/css/base.css index 0aa1eea7fb..433e971a62 100644 --- a/app/Resources/public/css/base.css +++ b/app/Resources/public/css/base.css @@ -2643,7 +2643,7 @@ form .formw .freeze { table#skill_holder { margin-top: 15px; } -.badges-siderbar{ +.badges-sidebar{ height: 250px; } /* **************************************************** diff --git a/main/template/default/social/skills_block.tpl b/main/template/default/social/skills_block.tpl index 997fdc5ffc..7c66d61a83 100644 --- a/main/template/default/social/skills_block.tpl +++ b/main/template/default/social/skills_block.tpl @@ -35,7 +35,7 @@

{% if skills %} -
+
    {% for skill in skills %}