From 8e5ee568235a540a884e2a1003b1e3021a4a8e09 Mon Sep 17 00:00:00 2001 From: aragonc Date: Tue, 28 Oct 2014 12:57:58 -0500 Subject: [PATCH 01/27] css update skill, template skill refs CT#7347 --- main/css/base.css | 40 ++++ main/inc/lib/javascript/tag/style.css | 231 ++++++++++++++++---- main/template/default/skill/skill_wheel.tpl | 111 ++++++---- 3 files changed, 289 insertions(+), 93 deletions(-) diff --git a/main/css/base.css b/main/css/base.css index d150a485ac..4d991e22a9 100755 --- a/main/css/base.css +++ b/main/css/base.css @@ -3334,6 +3334,46 @@ form .formw .freeze { } /* jsPlumb */ +/* **************************************************** + CSS SKILL + **************************************************** */ +.skill-options .legend{ + border: 1px dashed #cccccc; + padding: 1em; + -webkit-border-radius: 10px; + -moz-border-radius: 10px; + border-radius: 10px; + margin-bottom: 1em; + margin-top: 1em; +} +.skill-options .legend .title-skill{ + color: #666655; + padding-bottom: 1em; + font-size: 16px; +} +.skill-options .skill-home{ + margin-top: 1em; +} +.skill-options .btn-block { + box-sizing: border-box; + display: block; + padding-left: 0; + padding-right: 0; + width: 100%; +} +.skill-options .accordion-heading { + border-bottom: 0px none; + background: #3FA5C3; +} +.skill-options .accordion-heading a{ + color: #FFFFFF; +} +.skill-options .button-skill{ + margin-top: 1em; +} +/* **************************************************** + END SKILL + **************************************************** */ .skill_root { box-shadow: 2px 2px 19px #aaa; diff --git a/main/inc/lib/javascript/tag/style.css b/main/inc/lib/javascript/tag/style.css index efc444ed0f..04dbbe66df 100755 --- a/main/inc/lib/javascript/tag/style.css +++ b/main/inc/lib/javascript/tag/style.css @@ -17,65 +17,204 @@ ul.holder li { white-space:nowrap; } -ul.holder li.bit-box, ul.holder li.bit-input input { - box-shadow: none; +ul.holder li.bit-box,ul.holder li.bit-input input { + box-shadow:none } -ul.holder li.bit-box { -moz-border-radius: 6px; -webkit-border-radius: 6px; border-radius: 6px; border: 1px solid #CAD8F3; background: #DEE7F8; padding: 1px 5px 2px; } -ul.holder li.bit-box-focus { border-color: #598BEC; background: #598BEC; color: #fff; } -ul.holder li.bit-input input { - width: auto; overflow:visible; margin: 0; border: 0px; outline: 0; padding: 3px 0px 2px; } /* no left/right padding here please */ + +ul.holder li.bit-box { + -moz-border-radius:6px; + -webkit-border-radius:6px; + border-radius:6px; + border:1px solid #CAD8F3; + background:#DEE7F8; + padding:1px 5px 2px +} + +ul.holder li.bit-box-focus { + border-color:#598BEC; + background:#598BEC; + color:#fff +} + +ul.holder li.bit-input input { + width:auto; + overflow:visible; + margin:0; + border:0; + outline:0; + padding:3px 0 2px +} + ul.holder li.bit-input input.smallinput { - width: 20px; + width:20px +} + +#add { + border:1px solid #999; + width:550px; + margin:50px; + padding:20px 30px 10px +} + +form ol li { + list-style-type:none +} + +form ol { + font:11px "Lucida Grande",Verdana; + margin:0; + padding:0 } -/* Facebook demo CSS */ -#add { border: 1px solid #999; width: 550px; margin: 50px; padding: 20px 30px 10px; } -form ol li { list-style-type: none; } -form ol { font: 11px "Lucida Grande", "Verdana"; margin: 0; padding: 0; } -form ol li.input-text { margin-bottom: 10px; list-style-type: none; padding-bottom: 10px; } -form ol li.input-text label { font-weight: bold; cursor: pointer; display: block; font-size: 13px; margin-bottom: 10px; } -form ol li.input-text input { background-image:none; width: 500px; padding: 5px 5px 6px; font: 11px "Lucida Grande", "Verdana"; border: 1px solid #999; } +form ol li.input-text { + margin-bottom:10px; + list-style-type:none; + padding-bottom:10px +} -/* This hide the shadow.gid image of dokeos*/ -ul.holder input[type="text"]:focus, ul.holder input-text input[type="password"]:focus { - background-image:none; +form ol li.input-text label { + font-weight:700; + cursor:pointer; + display:block; + font-size:13px; + margin-bottom:10px } +form ol li.input-text input { + background-image:none; + width:500px; + padding:5px 5px 6px; + font:11px "Lucida Grande",Verdana; + border:1px solid #999 +} +ul.holder input[type="text"]:focus,ul.holder input-text input[type="password"]:focus { + background-image:none +} +form ul { + margin:0!important +} -/*form ul.holder { width: 500px; } */ -form ul { margin: 0 !important } -ul.holder li.bit-box, #apple-list ul.holder li.bit-box { padding-right: 15px; position: relative; z-index:1000;} -#apple-list ul.holder li.bit-input { margin: 0; } -#apple-list ul.holder li.bit-input input.smallinput { width: 5px; } -ul.holder li.bit-hover { background: #BBCEF1; border: 1px solid #6D95E0; } -ul.holder li.bit-box-focus { border-color: #598BEC; background: #598BEC; color: #fff; } -ul.holder li.bit-box a.closebutton { position: absolute; right: 4px; top: 5px; display: block; width: 7px; height: 7px; font-size: 1px; background: url('close.gif'); } -ul.holder li.bit-box a.closebutton:hover { background-position: 7px; } -ul.holder li.bit-box-focus a.closebutton, ul.holder li.bit-box-focus a.closebutton:hover { background-position: bottom; } +ul.holder li.bit-box,#apple-list ul.holder li.bit-box { + padding-right:15px; + position:relative; + z-index:1000 +} -/* Autocompleter */ +#apple-list ul.holder li.bit-input { + margin:0 +} -.facebook-auto { - z-index:2000; - display: none; - position: absolute; -/* width: 512px; */ - background: #eee; +#apple-list ul.holder li.bit-input input.smallinput { + width:5px } -.facebook-auto .default { z-index:2000; padding: 5px 7px; border: 1px solid #ccc; border-width: 0 1px 1px;font-family:"Lucida Grande","Verdana"; font-size:11px; } -.facebook-auto ul { display: none; margin: 0; padding: 0; overflow: auto; position:absolute; z-index:9999} -.facebook-auto ul li { padding: 5px 12px; z-index: 1000; cursor: pointer; margin: 0; list-style-type: none; border: 1px solid #ccc; border-width: 0 1px 1px; font: 11px "Lucida Grande", "Verdana"; background-color: #eee } -.facebook-auto ul li em { font-weight: bold; font-style: normal; background: #ccc; } -.facebook-auto ul li.auto-focus { background: #4173CC; color: #fff; } -.facebook-auto ul li.auto-focus em { background: none; } -.deleted { background-color:#4173CC !important; color:#ffffff !important;} -.hidden { display:none;} -#demo ul.holder li.bit-input input { padding: 2px 0 1px; border: 1px solid #999; } -.ie6fix {height:1px;width:1px; position:absolute;top:0px;left:0px;z-index:1;} +ul.holder li.bit-hover { + background:#BBCEF1; + border:1px solid #6D95E0 +} -.holder_simple { - border:none !important; +ul.holder li.bit-box-focus { + border-color:#598BEC; + background:#598BEC; + color:#fff +} + +ul.holder li.bit-box a.closebutton { + position:absolute; + right:4px; + top:5px; + display:block; + width:7px; + height:7px; + font-size:1px; + background:url(close.gif) } + +ul.holder li.bit-box a.closebutton:hover { + background-position:7px +} + +ul.holder li.bit-box-focus a.closebutton,ul.holder li.bit-box-focus a.closebutton:hover { + background-position:bottom +} + +.facebook-auto { + z-index:2000; + display:none; + position:absolute; + background:#eee +} + +.facebook-auto .default { + z-index:2000; + padding:5px 7px; + border:1px solid #ccc; + border-width:0 1px 1px; + font-family:"Lucida Grande","Verdana"; + font-size:11px +} + +.facebook-auto ul { + display:none; + margin:0; + padding:0; + overflow:auto; + position:absolute; + z-index:9999 +} + +.facebook-auto ul li { + padding:5px 12px; + z-index:1000; + cursor:pointer; + margin:0; + list-style-type:none; + border:1px solid #ccc; + border-width:0 1px 1px; + font:11px "Lucida Grande",Verdana; + background-color:#eee +} + +.facebook-auto ul li em { + font-weight:700; + font-style:normal; + background:#ccc +} + +.facebook-auto ul li.auto-focus { + background:#4173CC; + color:#fff +} + +.facebook-auto ul li.auto-focus em { + background:none +} + +.deleted { + background-color:#4173CC!important; + color:#fff!important +} + +.hidden { + display:none +} + +#demo ul.holder li.bit-input input { + padding:2px 0 1px; + border:1px solid #999 +} + +.ie6fix { + height:1px; + width:1px; + position:absolute; + top:0; + left:0; + z-index:1 +} + +.holder_simple { + border:none!important +} \ No newline at end of file diff --git a/main/template/default/skill/skill_wheel.tpl b/main/template/default/skill/skill_wheel.tpl index 8517a208ea..7e160d6b37 100644 --- a/main/template/default/skill/skill_wheel.tpl +++ b/main/template/default/skill/skill_wheel.tpl @@ -446,59 +446,78 @@ $(document).ready(function() { }*/ }); -
- -
-
-
-

{{ 'Skills'|get_lang }}

+ +
+
+ {{ "ReturnToCourseList"|get_lang }} +
+ +
+

{{ "Legend"|get_lang }}

+

     {{ "SkillsYouCanLearn"|get_lang }}

+

     {{ "SkillsSearchedFor"|get_lang }}

+
+ + + + +
+
+
+ +

Busqueda de {{ 'Skills'|get_lang }}

+
- - -
@@ -559,8 +578,6 @@ $(document).ready(function() {
- - @@ -494,7 +494,7 @@ $(document).ready(function() {

{{ 'ProfileSearch'|get_lang }}

-
+
From 0126024643c05b8681d40dce1e9123f6bc12c123 Mon Sep 17 00:00:00 2001 From: aragcar Date: Wed, 29 Oct 2014 01:25:22 -0500 Subject: [PATCH 03/27] update --- main/css/base.css | 2 +- main/inc/lib/javascript/tag/style.css | 16 ++++++++-------- main/template/default/skill/profile_item.tpl | 6 ++---- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/main/css/base.css b/main/css/base.css index 1f05b4d1c9..f3a61a1830 100755 --- a/main/css/base.css +++ b/main/css/base.css @@ -3379,7 +3379,7 @@ form .formw .freeze { } .skill-options .accordion-inner { padding: 9px 15px; - border: 1px solid #dadada; + /*border: 1px solid #dadada;*/ background-color: #FFFFFF; } /* **************************************************** diff --git a/main/inc/lib/javascript/tag/style.css b/main/inc/lib/javascript/tag/style.css index c09d95c876..aa9bdd71fb 100755 --- a/main/inc/lib/javascript/tag/style.css +++ b/main/inc/lib/javascript/tag/style.css @@ -5,7 +5,7 @@ ul.holder { height: 1%; } *:first-child+html ul.holder { padding-bottom: 2px; } * html ul.holder { padding-bottom: 2px; } /* ie7 and below */ -ul.holder li { +ul.holder_simple li { float: left; list-style-type: none; margin: 0 5px 4px 0; @@ -16,19 +16,19 @@ ul.holder li.bit-box,ul.holder li.bit-input input { box-shadow:none } -ul.holder li.bit-box { +ul.holder_simple li.bit-box { -moz-border-radius:6px; -webkit-border-radius:6px; border-radius:6px; - border:1px solid #CAD8F3; - background:#DEE7F8; + border:1px solid #FCF8E3; + background:#FCF8E3; padding:1px 5px 2px } -ul.holder li.bit-box-focus { - border-color:#598BEC; - background:#598BEC; - color:#fff +ul.holder_simple li.bit-box-focus { + border-color:#FCF8E3; + background:#FCF8E3; + color:#333; } ul.holder li.bit-input input { diff --git a/main/template/default/skill/profile_item.tpl b/main/template/default/skill/profile_item.tpl index be30ab9cd0..7e71eb754f 100755 --- a/main/template/default/skill/profile_item.tpl +++ b/main/template/default/skill/profile_item.tpl @@ -1,8 +1,6 @@ {% if profiles is not null %} -
-

{{ "SkillProfiles"|get_lang }}

-
-
    +

    {{ "SkillProfiles"|get_lang }}

    +
      {%for profile in profiles %}
    • {{ profile.name }} From d892639ce4cb1865d98dfb433d337ecc61d22114 Mon Sep 17 00:00:00 2001 From: aragonc Date: Wed, 29 Oct 2014 10:57:44 -0500 Subject: [PATCH 04/27] update options background color refs CT#7374 --- main/css/base.css | 40 ++++++++++++++------ main/inc/lib/javascript/d3/colorbrewer.js | 2 +- main/inc/lib/javascript/tag/style.css | 10 ++--- main/template/default/skill/profile_item.tpl | 12 +++--- main/template/default/skill/skill_wheel.tpl | 40 +++++++++++++++++++- 5 files changed, 81 insertions(+), 23 deletions(-) diff --git a/main/css/base.css b/main/css/base.css index f3a61a1830..ee69948acb 100755 --- a/main/css/base.css +++ b/main/css/base.css @@ -3347,7 +3347,7 @@ form .formw .freeze { margin-top: 1em; background-color: #FFFFFF; } -.skill-options .legend .title-skill{ +.skill-options .legend .title-skill, .skill-options .saved_profiles .title-skill{ color: #666655; padding-bottom: 1em; font-size: 16px; @@ -3382,6 +3382,34 @@ form .formw .freeze { /*border: 1px solid #dadada;*/ background-color: #FFFFFF; } +.skill-options .items_save{ + margin-top: .5em; + margin-bottom: .5em; + display: inline-block; + height: auto !important; + clear: both; + width: 100%; +} +.skill-options .accordion-group { + margin-bottom: 2px; + border: 1px solid #3FA5C3; + border-radius: 4px; +} +.skill-options .accordion-inner { + padding: 9px 15px; + border-top: 1px solid #3FA5C3; +} +.skill_partition { + cursor: pointer; + stroke: #000000; + stroke-width: 0.5px; +} + +#skill_holder li { + float:left; + padding-right: 10px; +} + /* **************************************************** END SKILL **************************************************** */ @@ -4890,16 +4918,6 @@ i.size-32.icon-new-work{ } /* Default skill partition colors */ -.skill_partition { - cursor: pointer; - stroke: #000000; - stroke-width: 1.5; -} - -#skill_holder li { - float:left; - padding-right: 10px; -} #filepaths input{ margin-bottom:5px; diff --git a/main/inc/lib/javascript/d3/colorbrewer.js b/main/inc/lib/javascript/d3/colorbrewer.js index 7261590924..9595aa834c 100755 --- a/main/inc/lib/javascript/d3/colorbrewer.js +++ b/main/inc/lib/javascript/d3/colorbrewer.js @@ -6,7 +6,7 @@ var colorbrewer = { YlGn:{3:["rgb(247,252,185)","rgb(173,221,142)","rgb(49,163,84)"],4:["rgb(255,255,204)","rgb(194,230,153)","rgb(120,198,121)","rgb(35,132,67)"],5:["rgb(255,255,204)","rgb(194,230,153)","rgb(120,198,121)","rgb(49,163,84)","rgb(0,104,55)"],6:["rgb(255,255,204)","rgb(217,240,163)","rgb(173,221,142)","rgb(120,198,121)","rgb(49,163,84)","rgb(0,104,55)"],7:["rgb(255,255,204)","rgb(217,240,163)","rgb(173,221,142)","rgb(120,198,121)","rgb(65,171,93)","rgb(35,132,67)","rgb(0,90,50)"],8:["rgb(255,255,229)","rgb(247,252,185)","rgb(217,240,163)","rgb(173,221,142)","rgb(120,198,121)","rgb(65,171,93)","rgb(35,132,67)","rgb(0,90,50)"],9:["rgb(255,255,229)","rgb(247,252,185)","rgb(217,240,163)","rgb(173,221,142)","rgb(120,198,121)","rgb(65,171,93)","rgb(35,132,67)","rgb(0,104,55)","rgb(0,69,41)"]}, YlGnBu:{3:["rgb(237,248,177)","rgb(127,205,187)","rgb(44,127,184)"],4:["rgb(255,255,204)","rgb(161,218,180)","rgb(65,182,196)","rgb(34,94,168)"],5:["rgb(255,255,204)","rgb(161,218,180)","rgb(65,182,196)","rgb(44,127,184)","rgb(37,52,148)"],6:["rgb(255,255,204)","rgb(199,233,180)","rgb(127,205,187)","rgb(65,182,196)","rgb(44,127,184)","rgb(37,52,148)"],7:["rgb(255,255,204)","rgb(199,233,180)","rgb(127,205,187)","rgb(65,182,196)","rgb(29,145,192)","rgb(34,94,168)","rgb(12,44,132)"],8:["rgb(255,255,217)","rgb(237,248,177)","rgb(199,233,180)","rgb(127,205,187)","rgb(65,182,196)","rgb(29,145,192)","rgb(34,94,168)","rgb(12,44,132)"],9:["rgb(255,255,217)","rgb(237,248,177)","rgb(199,233,180)","rgb(127,205,187)","rgb(65,182,196)","rgb(29,145,192)","rgb(34,94,168)","rgb(37,52,148)","rgb(8,29,88)"]}, GnBu:{3:["rgb(224,243,219)","rgb(168,221,181)","rgb(67,162,202)"],4:["rgb(240,249,232)","rgb(186,228,188)","rgb(123,204,196)","rgb(43,140,190)"],5:["rgb(240,249,232)","rgb(186,228,188)","rgb(123,204,196)","rgb(67,162,202)","rgb(8,104,172)"],6:["rgb(240,249,232)","rgb(204,235,197)","rgb(168,221,181)","rgb(123,204,196)","rgb(67,162,202)","rgb(8,104,172)"],7:["rgb(240,249,232)","rgb(204,235,197)","rgb(168,221,181)","rgb(123,204,196)","rgb(78,179,211)","rgb(43,140,190)","rgb(8,88,158)"],8:["rgb(247,252,240)","rgb(224,243,219)","rgb(204,235,197)","rgb(168,221,181)","rgb(123,204,196)","rgb(78,179,211)","rgb(43,140,190)","rgb(8,88,158)"],9:["rgb(247,252,240)","rgb(224,243,219)","rgb(204,235,197)","rgb(168,221,181)","rgb(123,204,196)","rgb(78,179,211)","rgb(43,140,190)","rgb(8,104,172)","rgb(8,64,129)"]}, -BuGn:{3:["rgb(229,245,249)","rgb(153,216,201)","rgb(44,162,95)"],4:["rgb(237,248,251)","rgb(178,226,226)","rgb(102,194,164)","rgb(35,139,69)"],5:["rgb(237,248,251)","rgb(178,226,226)","rgb(102,194,164)","rgb(44,162,95)","rgb(0,109,44)"],6:["rgb(237,248,251)","rgb(204,236,230)","rgb(153,216,201)","rgb(102,194,164)","rgb(44,162,95)","rgb(0,109,44)"],7:["rgb(237,248,251)","rgb(204,236,230)","rgb(153,216,201)","rgb(102,194,164)","rgb(65,174,118)","rgb(35,139,69)","rgb(0,88,36)"],8:["rgb(247,252,253)","rgb(229,245,249)","rgb(204,236,230)","rgb(153,216,201)","rgb(102,194,164)","rgb(65,174,118)","rgb(35,139,69)","rgb(0,88,36)"],9:["rgb(247,252,253)","rgb(229,245,249)","rgb(204,236,230)","rgb(153,216,201)","rgb(102,194,164)","rgb(65,174,118)","rgb(35,139,69)","rgb(0,109,44)","rgb(0,68,27)"]}, +BuGn:{3:["rgb(229,245,249)","rgb(153git c,216,201)","rgb(44,162,95)"],4:["rgb(237,248,251)","rgb(178,226,226)","rgb(102,194,164)","rgb(35,139,69)"],5:["rgb(237,248,251)","rgb(178,226,226)","rgb(102,194,164)","rgb(44,162,95)","rgb(0,109,44)"],6:["rgb(237,248,251)","rgb(204,236,230)","rgb(153,216,201)","rgb(102,194,164)","rgb(44,162,95)","rgb(0,109,44)"],7:["rgb(237,248,251)","rgb(204,236,230)","rgb(153,216,201)","rgb(102,194,164)","rgb(65,174,118)","rgb(35,139,69)","rgb(0,88,36)"],8:["rgb(247,252,253)","rgb(229,245,249)","rgb(204,236,230)","rgb(153,216,201)","rgb(102,194,164)","rgb(65,174,118)","rgb(35,139,69)","rgb(0,88,36)"],9:["rgb(247,252,253)","rgb(229,245,249)","rgb(204,236,230)","rgb(153,216,201)","rgb(102,194,164)","rgb(65,174,118)","rgb(35,139,69)","rgb(0,109,44)","rgb(0,68,27)"]}, PuBuGn:{3:["rgb(236,226,240)","rgb(166,189,219)","rgb(28,144,153)"],4:["rgb(246,239,247)","rgb(189,201,225)","rgb(103,169,207)","rgb(2,129,138)"],5:["rgb(246,239,247)","rgb(189,201,225)","rgb(103,169,207)","rgb(28,144,153)","rgb(1,108,89)"],6:["rgb(246,239,247)","rgb(208,209,230)","rgb(166,189,219)","rgb(103,169,207)","rgb(28,144,153)","rgb(1,108,89)"],7:["rgb(246,239,247)","rgb(208,209,230)","rgb(166,189,219)","rgb(103,169,207)","rgb(54,144,192)","rgb(2,129,138)","rgb(1,100,80)"],8:["rgb(255,247,251)","rgb(236,226,240)","rgb(208,209,230)","rgb(166,189,219)","rgb(103,169,207)","rgb(54,144,192)","rgb(2,129,138)","rgb(1,100,80)"],9:["rgb(255,247,251)","rgb(236,226,240)","rgb(208,209,230)","rgb(166,189,219)","rgb(103,169,207)","rgb(54,144,192)","rgb(2,129,138)","rgb(1,108,89)","rgb(1,70,54)"]}, PuBu:{3:["rgb(236,231,242)","rgb(166,189,219)","rgb(43,140,190)"],4:["rgb(241,238,246)","rgb(189,201,225)","rgb(116,169,207)","rgb(5,112,176)"],5:["rgb(241,238,246)","rgb(189,201,225)","rgb(116,169,207)","rgb(43,140,190)","rgb(4,90,141)"],6:["rgb(241,238,246)","rgb(208,209,230)","rgb(166,189,219)","rgb(116,169,207)","rgb(43,140,190)","rgb(4,90,141)"],7:["rgb(241,238,246)","rgb(208,209,230)","rgb(166,189,219)","rgb(116,169,207)","rgb(54,144,192)","rgb(5,112,176)","rgb(3,78,123)"],8:["rgb(255,247,251)","rgb(236,231,242)","rgb(208,209,230)","rgb(166,189,219)","rgb(116,169,207)","rgb(54,144,192)","rgb(5,112,176)","rgb(3,78,123)"],9:["rgb(255,247,251)","rgb(236,231,242)","rgb(208,209,230)","rgb(166,189,219)","rgb(116,169,207)","rgb(54,144,192)","rgb(5,112,176)","rgb(4,90,141)","rgb(2,56,88)"]}, BuPu:{3:["rgb(224,236,244)","rgb(158,188,218)","rgb(136,86,167)"],4:["rgb(237,248,251)","rgb(179,205,227)","rgb(140,150,198)","rgb(136,65,157)"],5:["rgb(237,248,251)","rgb(179,205,227)","rgb(140,150,198)","rgb(136,86,167)","rgb(129,15,124)"],6:["rgb(237,248,251)","rgb(191,211,230)","rgb(158,188,218)","rgb(140,150,198)","rgb(136,86,167)","rgb(129,15,124)"],7:["rgb(237,248,251)","rgb(191,211,230)","rgb(158,188,218)","rgb(140,150,198)","rgb(140,107,177)","rgb(136,65,157)","rgb(110,1,107)"],8:["rgb(247,252,253)","rgb(224,236,244)","rgb(191,211,230)","rgb(158,188,218)","rgb(140,150,198)","rgb(140,107,177)","rgb(136,65,157)","rgb(110,1,107)"],9:["rgb(247,252,253)","rgb(224,236,244)","rgb(191,211,230)","rgb(158,188,218)","rgb(140,150,198)","rgb(140,107,177)","rgb(136,65,157)","rgb(129,15,124)","rgb(77,0,75)"]}, diff --git a/main/inc/lib/javascript/tag/style.css b/main/inc/lib/javascript/tag/style.css index aa9bdd71fb..a6f55bba2c 100755 --- a/main/inc/lib/javascript/tag/style.css +++ b/main/inc/lib/javascript/tag/style.css @@ -20,15 +20,15 @@ ul.holder_simple li.bit-box { -moz-border-radius:6px; -webkit-border-radius:6px; border-radius:6px; - border:1px solid #FCF8E3; + border:1px solid #C09853; background:#FCF8E3; - padding:1px 5px 2px + padding:1px 5px 2px; + color:#333; } ul.holder_simple li.bit-box-focus { border-color:#FCF8E3; background:#FCF8E3; - color:#333; } ul.holder li.bit-input input { @@ -178,8 +178,8 @@ ul.holder li.bit-box-focus a.closebutton,ul.holder li.bit-box-focus a.closebutto } .facebook-auto ul li.auto-focus { - background:#4173CC; - color:#fff + background:#F0F0F0; + color:#333; } .facebook-auto ul li.auto-focus em { diff --git a/main/template/default/skill/profile_item.tpl b/main/template/default/skill/profile_item.tpl index 7e71eb754f..1a485bc17d 100755 --- a/main/template/default/skill/profile_item.tpl +++ b/main/template/default/skill/profile_item.tpl @@ -1,10 +1,12 @@ {% if profiles is not null %} -

      {{ "SkillProfiles"|get_lang }}

      -
        - {%for profile in profiles %} +

        {{ "SkillProfiles"|get_lang }}

        +
        + + {% endfor %} +
      +
{% endif %} \ No newline at end of file diff --git a/main/template/default/skill/skill_wheel.tpl b/main/template/default/skill/skill_wheel.tpl index 7ec259516e..669a4e5e03 100644 --- a/main/template/default/skill/skill_wheel.tpl +++ b/main/template/default/skill/skill_wheel.tpl @@ -429,7 +429,24 @@ $(document).ready(function() { } }); } - +/* change background color */ + $(document).ready(function () { + $("#celestial").click(function () { + $("#page-back").css("background","#A9E2F3"); + }); + $("#white").click(function () { + $("#page-back").css("background","#FFFFFF"); + }); + $("#black").click(function () { + $("#page-back").css("background","#000000"); + }); + $("#lead").click(function () { + $("#page-back").css("background","#848484"); + }); + $("#light-yellow").click(function () { + $("#page-back").css("background","#F7F8E0"); + }); + }); /* Generated random colour */ /* function colour(d) { @@ -446,6 +463,7 @@ $(document).ready(function() { }*/ }); +
@@ -514,6 +532,25 @@ $(document).ready(function() {
+
+
+ +

Opciones de presentación

+ +
+
+
+

Escoge un color de fondo:

+ +
+
+
@@ -597,3 +634,4 @@ $(document).ready(function() {
+
From 3aef1e95a743e7bf1947411a8f64376bab3bda08 Mon Sep 17 00:00:00 2001 From: aragonc Date: Wed, 29 Oct 2014 12:05:22 -0500 Subject: [PATCH 05/27] update css skill student --- main/template/default/skill/profile.tpl | 2 +- .../default/skill/skill_wheel_student.tpl | 139 +++++++++++++----- 2 files changed, 102 insertions(+), 39 deletions(-) diff --git a/main/template/default/skill/profile.tpl b/main/template/default/skill/profile.tpl index 4509208ac9..9a32570862 100755 --- a/main/template/default/skill/profile.tpl +++ b/main/template/default/skill/profile.tpl @@ -1,4 +1,4 @@ -{% if search_skill_list is not null %} +{% if search_skill_list is not null %}

{{"Skills"|get_lang}}

    diff --git a/main/template/default/skill/skill_wheel_student.tpl b/main/template/default/skill/skill_wheel_student.tpl index 6253e46561..c61a49ab1f 100755 --- a/main/template/default/skill/skill_wheel_student.tpl +++ b/main/template/default/skill/skill_wheel_student.tpl @@ -119,7 +119,25 @@ $(document).ready(function() { } }); }); - + + /* change background color */ + $(document).ready(function () { + $("#celestial").click(function () { + $("#page-back").css("background","#A9E2F3"); + }); + $("#white").click(function () { + $("#page-back").css("background","#FFFFFF"); + }); + $("#black").click(function () { + $("#page-back").css("background","#000000"); + }); + $("#lead").click(function () { + $("#page-back").css("background","#848484"); + }); + $("#light-yellow").click(function () { + $("#page-back").css("background","#F7F8E0"); + }); + }); /* Wheel skill popup form */ @@ -255,51 +273,95 @@ $(document).ready(function() { } } }); - + +
    -
    -
    - -
    -

    {{ 'MySkills'|get_lang }}

    -
    - -
    -
    - - -
    -

    {{ 'GetNewSkills'|get_lang }}

    +
    + +
    + {{ "ReturnToCourseList"|get_lang }} +
    + +
    +

    {{ "Legend"|get_lang }}

    +

         {{ "SkillsYouAcquired"|get_lang }}

    +

         {{ "SkillsYouCanLearn"|get_lang }}

    +

         {{ "SkillsSearchedFor"|get_lang }}

    +
    + + + + +
    +
    +
    + +

    {{ 'MySkills'|get_lang }}

    +     +
    +
    +
    + +
    +
    + +
    +
    - -
    @@ -312,3 +374,4 @@ $(document).ready(function() {
    +
    \ No newline at end of file From d0ef086eff1de7d8652883f550c6d79631335d73 Mon Sep 17 00:00:00 2001 From: Angel Fernando Quiroz Campos Date: Wed, 29 Oct 2014 12:47:56 -0500 Subject: [PATCH 06/27] Add user block - refs #7347 --- main/social/skills_wheel.php | 9 +++++++++ .../default/skill/skill_wheel_student.tpl | 19 +++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/main/social/skills_wheel.php b/main/social/skills_wheel.php index b55c6686be..d8868a8df8 100755 --- a/main/social/skills_wheel.php +++ b/main/social/skills_wheel.php @@ -31,6 +31,11 @@ $htmlHeadXtra[] = '
    +
    +
    + + + +
    +

    {{ userInfo.complete_name }}

    +

    {{ 'YourSkillRankingX' | get_lang | format(ranking) }}

    +
    + {% for i in 1..ranking %} + + + {% endfor %} + {% for i in 1..(countSkill - ranking) %} + - + {% endfor %} +
    +
    +
    +
    From 1f28368741da99772dbfcb96eba5b2e4d0a1f3c6 Mon Sep 17 00:00:00 2001 From: aragonc Date: Wed, 29 Oct 2014 12:53:05 -0500 Subject: [PATCH 07/27] add img winner skills items user --- main/css/base.css | 18 ++++++++++++++++++ main/img/icons/16/winner.png | Bin 0 -> 786 bytes main/img/icons/22/winner.png | Bin 0 -> 1080 bytes .../default/skill/skill_wheel_student.tpl | 4 +++- main/template/default/skill/user_skills.tpl | 8 ++------ 5 files changed, 23 insertions(+), 7 deletions(-) create mode 100644 main/img/icons/16/winner.png create mode 100644 main/img/icons/22/winner.png diff --git a/main/css/base.css b/main/css/base.css index ee69948acb..898a75f1cd 100755 --- a/main/css/base.css +++ b/main/css/base.css @@ -3399,6 +3399,23 @@ form .formw .freeze { padding: 9px 15px; border-top: 1px solid #3FA5C3; } +.skill-options .load_wheel{ + -moz-border-radius:6px; + -webkit-border-radius:6px; + border-radius:6px; + border:1px solid #C09853; + background:#FCF8E3; + padding:1px 5px 2px; + color:#333; +} +.skill-options .skill-winner{ + list-style: none; + margin: 0; + padding: 0; +} +.skill-options .skill-winner li a{ + background: url("../img/icons/16/winner.png") no-repeat; +} .skill_partition { cursor: pointer; stroke: #000000; @@ -3410,6 +3427,7 @@ form .formw .freeze { padding-right: 10px; } + /* **************************************************** END SKILL **************************************************** */ diff --git a/main/img/icons/16/winner.png b/main/img/icons/16/winner.png new file mode 100644 index 0000000000000000000000000000000000000000..4c303819d8ec5fdc48da3f81885833336ac81d8b GIT binary patch literal 786 zcmV+t1MU2YP)BJDCg=andvo8tE!3D1?X2#1xaYuk&PNc3-L+4X z4we)gF(t{V0)P+#06+)<0T5JKXmDi8G4ZHIUDL?%1`~5j+izc}>~w}`23HyUz9;}7 zE!_y3B%>^qd!N}IhXDN8&>%(9;a5d;#;1cRF)X?j06-R(ASV-8wji1!>4?N>XuLtT z*+8628qt}Ku)-lJUPy`;VTD6yI-E-y$u=7ZHZw5Be41-9KpB@2jzn>%;5C|dbs-qm zz_<+8Vt^WBJ}q7&#Scp(y#c1hT!x%IwtO-}FP_{9OI|)cjs3wwNa&MYt(PWVwK%XI z&d246L`7ryi}pGueBDC$y2Z=(I);kIgim8_M^_qJBgWgSip;)m4}}n6&KSu!ajrUP z=Wz-E>U1CXzU_EJWrHAum^|tGYxZ5X&n2{=&wsy?eXFyIton+OA3U_0 zw?bEbfyDfPh(S;ax-|zCdrcMq>ZW%9fNm>1Pz5Ojs?1}2&^0vvb$*C46_A3+EG(^D zuSpmN>NBl|+$<||kLtsHKkc@LFE(3)!#3PIYiI6J-H@AQ9jMQ=#%mH*2&Uy}t`B`Z zlk?h??cQiBfG_|YzA<>Fvp#&a&^lcZNXydz5B>)k0Bxx){zt67=?0nMFGd0|6t<8 literal 0 HcmV?d00001 diff --git a/main/img/icons/22/winner.png b/main/img/icons/22/winner.png new file mode 100644 index 0000000000000000000000000000000000000000..cc0845539e298f426c57f81c09fc1679c290f254 GIT binary patch literal 1080 zcmV-81jqY{P)M}L|nIqG|#+q*8?%kbtyWVr|`SCveaYvvX@zNJwIPiYo z&-1+R^E^ipqZhhPG~6minaCIgVB7kh{V+5DSX#^Cq&4>Qr>__8XV`Jz+jmOuez5iV zJ&p#Ypm^6uD+PcNAz9}j0=|L$J->bobXNuTyi$5ubDG0{WNAp)3=ZUR918&7k9cNH zGX*zfds`EpS4zh*V!@837|oY)<_tE1jZ`v5umJ}u9!pU*xW-nD=6#~j;0FfRiwLCh z&S5#i4-8Rg7|r|C*zsT;54QA3J|K()HxOJe;x*?4oz4l|a)cWQVI+*?18QtbSDkUW zFgZMxo5D#p5CuZ346}RPO(Id8?iKRNrk06IeSghMHAQy1 zW#g>VqPCR3rmb@eR?CyjUg_gf-7EOHzs=3_z1@RHKRRUB)cPh0c&P08Nd+`zHh1k> z``JY!y&FW_fy(NAR@UylXfm6-b^%Ru-Umx=z7ZRve_#6rbG=*4%<0Oy-Yxz6+AqXC zqnv&D-|u^(4ISC=T)oL3784nOD2S+Ex#X#2$0wF4-Ktc(b}_{>UD3?Y#GjTu50s#^ zWlgKbx1QMk+dypbtYY@<<{ihL#uyM?=~_QP+$jiVD_OZolAHEgsTb915YQU5P3g;R z?*rT7il?$g>qf>sziLt4*rQ@*F{K>hjw9h6KtK!%CWVY0P3Tw^6H1rA6ECIk~z;H4oHigLba`hU3cUB`z5 zJBBB{ksy*F792zp0<%5+*)!`Jg2dy?GV68Se8hw(6cQ8=Z>%zbcaog?{@hocpI_Sz z+zuk~A2uK%Fui<9ZCa(8Frf>Pj|uZ2L8acxLZ=q8d`V&fkgIy60UlYD-l|h6OmP_T zCor=!n4$*=5_;%VElU@r-+a*dSn#QxOWSKQtF`gQK`WwMk(0ecM^E-%KN@8VpakQM z<78IrQ#+ToSN*SOU0C1Yw4}5YhL{?e%J%&-h)&;mUjU8B(|a0000{{ "ViewSkillsWheel"|get_lang }}
    -
      +
        +

        {{ 'SkillInfo'|get_lang }}

        +
        diff --git a/main/template/default/skill/user_skills.tpl b/main/template/default/skill/user_skills.tpl index b1e8a51a8b..f445818566 100755 --- a/main/template/default/skill/user_skills.tpl +++ b/main/template/default/skill/user_skills.tpl @@ -1,12 +1,8 @@ {% if skills is not null %} -
          + From aef49c4b2d2fdd64b631670faf054d198f075a44 Mon Sep 17 00:00:00 2001 From: aragonc Date: Wed, 29 Oct 2014 15:43:13 -0500 Subject: [PATCH 08/27] add icon level skill refs CT#7347 --- main/img/icons/16/award_red.png | Bin 0 -> 793 bytes main/img/icons/16/award_red_na.png | Bin 0 -> 775 bytes main/img/icons/22/award_red.png | Bin 0 -> 1109 bytes main/img/icons/22/award_red_na.png | Bin 0 -> 1102 bytes main/img/icons/32/award_red.png | Bin 0 -> 1520 bytes main/img/icons/32/award_red_na.png | Bin 0 -> 1570 bytes 6 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 main/img/icons/16/award_red.png create mode 100644 main/img/icons/16/award_red_na.png create mode 100644 main/img/icons/22/award_red.png create mode 100644 main/img/icons/22/award_red_na.png create mode 100644 main/img/icons/32/award_red.png create mode 100644 main/img/icons/32/award_red_na.png diff --git a/main/img/icons/16/award_red.png b/main/img/icons/16/award_red.png new file mode 100644 index 0000000000000000000000000000000000000000..7675b93890fe0e825993f1cbc3a05f6810a5bca5 GIT binary patch literal 793 zcmV+!1LpjRP)1HM3p)@*pdgkh9&&D7%&5%6YAVd>&ifAAzNZVboGkzF!1F%5|KH2=ybp&>dc7a& z+~SghOlQ=AqTrMW0DzbZ;CLv()!_W6vGK|&NE;r0GhlTN*@v!IztSyE8%YdB6iK$QVb zp0RKwg%Aq|;f|>Q0O?^Ll2{Cp84IV%0EgxO06ZGVUWbhtv}p(g1F#;y0j9)oV59~5 zWDZ`3jd?VXv7PG7sIpe7qeIn2WS?=6ea1l_&lHliQXQ=`qbi}P=|N}QxjqY}J`K93Get_UouN=Yptg;+?Cpb&wG;0=cH%e96t-xri89o?q2kW!!`l}3BM75oSSbpnT!UAq69&V zfQY~tLuQ5nxqFICz`r#H0Ja6d%msNzRjOnJ!!jl&Ew)L^lr5$ZRD3eb1$kv#J)2uV zMNLEY>9WHYy}m%|;LuQi+wGg@h6nq5jhVal8V$zXrgVei{+S-P{g+DnI0Ef00000NkvXXu0mjf`>kCg literal 0 HcmV?d00001 diff --git a/main/img/icons/16/award_red_na.png b/main/img/icons/16/award_red_na.png new file mode 100644 index 0000000000000000000000000000000000000000..5a5d3242c15a2d4df09a92109f387ae8a70f397a GIT binary patch literal 775 zcmV+i1Ni)jP)_k9n(?+F;F)zwvLX=&-{ z`1rV+h(JUD06`ES2m(ygY~}O$%+b*i?{maKfnu>ZySce}aD9C(bIwt#)c^oquNRUe z!RPb+Oe7Ld0DK=QAW0J1?RKY9slc)hXWH66CFvC1}Vb=vMdXwQc2*P z!!%7;mIVMX3E`7$w_#Jji4+Im0l1xm>PiM8w+dHu}$`>pC<|!^Oo#Z+CY$8jr^#0NQs=Y^$o8 zGEK9(u&@wxyWJonbUGb$yIttIj=jCTH~ahhF#yexF#@m@MG5$PK5)*_>2yFuV2r`< z_d`*X004e3g~3@-lot+%1Ey&ro6Vl)^ZC~P?8?f@+eV|| zNhXtDBaz6fWHR}2YHCW6W%;q+@9){Roj5x?(?<%dt*trBOr1w`U_f!*7fSNnD3sZteg8002ovPDHLk FV1nzqYcc=; literal 0 HcmV?d00001 diff --git a/main/img/icons/22/award_red.png b/main/img/icons/22/award_red.png new file mode 100644 index 0000000000000000000000000000000000000000..478b69129b610757e15a1bfea5a968e33517a8ff GIT binary patch literal 1109 zcmV-b1giUqP)LmaG1L8?U zK~y-)os?~8)m0qFKj-}K|K2&K}G# zNCT0*2F8q4dFVt6dmi>- zKE4ynrY?vP2*w0|B#kXWYQJ&_!IgjJ73D+~lNj2i>75F8zp=~T3&8pGDA zxLp#Rsr9Vc^c0KcH`3jcW_hlg5v$;zxSDT!;hcOw7SfLEb8FR@2q4+Eg6$X9;qNGDU{wit!t6aev>7+-wTrLOc1{AQXa z8Zd+~A|df)+sm7K1DlsCSey6m*m9538hjr;1Gg$RuBWD7WyR*PwJnCZ?!kKjq?8!a z;MLa;yaYTQ)I4EZQ-6#V>}C;(-L8C1sbo>KD%g$(XtdVYjz_6nVQ?fvHeY05Xq3;| zzwG$#_~AX*uMLd`PQ{;@vB{3p$G?wOC#w_5hWlc%sE|USwf=j7CRenOQj(dN^p71q zc4+_J9nWVc#(wveas$D>QXWw3`KhxbG^eg=@!};bYieRBUr&E(u1C?bkwTE0%yHz% z=kI>{-oBl{n6H#`s|Vr%lZ{QOy87BUN-305RBUhN#^7r~eO;W!rulP$Owc&Vn~h&0 z*|4d;E>6Bs#7V%a^r^Q_ zwjcZiU}Aji@&TG7_rMh}flG(@%hXE2mGmrwR0&G{{iB>UNiJAI~ b|Lge+%R9yBJT5C$00000NkvXXu0mjfb4MJu literal 0 HcmV?d00001 diff --git a/main/img/icons/22/award_red_na.png b/main/img/icons/22/award_red_na.png new file mode 100644 index 0000000000000000000000000000000000000000..5ce6d1ff51740d5609318a504550cdf6d6665afb GIT binary patch literal 1102 zcmV-U1hM;xP)M79Bo&rlkunpEj{{$*pcOjJ!*_GXH)7{^8v%9nVoAHt^R)5vS2XlGv z&1W9pnfFEzV$;*pLpwV=sUQf15CYq_pNV%m9gHzpmSy(u-@kq7(xvL(8Fm=BTrQtE zefsn{+qMxxP_0(6EDL}j2pAd~!WcuR)8XR9i=PAMdjhvwtynUdB$LSyjYhe9_b#sM z0-%)Q@ZrPMYBkd7G_6)E7RCq#+qO-qR02S2jcwcAif!9QYYjlDRQiWZ{|a^-hkQPd zQVPqmXti1xW4aYLn@yBbl{$larGiKYkpbTXC^iq+YK-2xC}bGURf(Un7x7(AU@ZmeyKC zA`woWJV`Q{WMg9kr4+vJ>uffAer09lE5~uvQ{A5n)>`AbZhLcc^XEt;veVz+|MtoUcE&x}rUhOi(Ur(8zpFgIQ`dVwPg%BvE7#|;hIh{^h zzV8DtI5OU+%JyfV2nXZX*rJb-r2Kf?}a`$-}gV9ot=F}YmL?#V@&rIbUGaX z8jS|&blRGlntByLN{MaT%+1Yx0=yrlvDn?+{k>YPj=8Qosgx9c0|QWi~c8@;yzrcsxFtN~L6_QX!YiJzQB?`C@5l z>ASsAnLTmh#K&V}V~JEMCFAkSpyS26Tla$g2SXx^8 z=FXivKb|^uYVN>+1IIkiOVEq${S(sHL<6^_`f-S0@$7B U*9#@8@Bjb+07*qoM6N<$g3wD1jsO4v literal 0 HcmV?d00001 diff --git a/main/img/icons/32/award_red.png b/main/img/icons/32/award_red.png new file mode 100644 index 0000000000000000000000000000000000000000..6242df7e5ad702570bedb67508fa5cb2ed6ad740 GIT binary patch literal 1520 zcmVa|$qaelynqq>0*bXSQR4LFjfIy`TrIbqPyzkt{aqrt(?9^sjGbEmL%{g=SUVE+X zIptpAw*2P=5c(ZnpkX^y$N>^J7gaKP*lKF@!kAtJPE*vNtH6zKpePP zeD3zMfT8_e*?Xa97JbCo;n+z$JC###e0A|+u0im}?LZt1lNJD9C(QltKq?C0azU>@ z0-+MMw_8#|ng(1m7XrEtVOda@yaMKOjYJFxutt{`h82YrDis%qh$INb71IG0Q!E2g zvH=q+ah$jq^bEv>0vMfM=(+}2WPp^SmIYy&u^phjWIY0D=m5o3;xLy-Vg>|Y+-QYC z#bGK?EFGF*LRc~SWWa723iv^1?-CKorDbX5$XXz2FVJ_E5qyq+_i_rQM z6>RH5?G+($ef(_9E}0Bn*BSQu>f}YZ0twFHT;@1jBM}1(v)9BEwWz2mSlu)+KO3Vm z(-8`X8TOj@IL0}B#LYwxVSf`T!MxIGj}{lgG<5hwQSfjjC1D2beR;Wb8h{(|#RoT_ zZrrwei=re|@RjNvQUVseFD9X!%rt}|QJALPU0(AZ$CM3~yS=Ka#1>Q(HoW1DwJWv& zum&^WR#jKUy7Fbvbi)>vtZx5F676~46^_shdjx4cVt5+nmlk2+%n}GiKsW*li6^^U zsI1!iCV=hicQ6CVLBFrIy5^U8$?Dqp`3v*;o7IWDt9#e^h3?^mH*rKz|=yF%+8>D?}D@j5O!X=0}*hW z6jeoccL1l(G~>{>`^t|UK5z^`JJ%kH0d{$t5IuM1x6u0XXXdSctLpPfg$1K$luSX? z(EssY8zvCaG#HkJ-0Up;{Oeh?v|MT5xq1Eb{_d_8=VpWm)=;k@Ck6?uW;E6v+mx4^ zyEDz5f^a0-M_eEpHK0XxrxOxsZWkiqFdFMTn@IdTfSUx3Aph-iKsv-*Q%h#dxo=z^ zfrWb%nSs`fB<@gNwoR*%V@rE$?l4xa75ZUoXZ^M zCTc)k@YvJK$B)THAQ%SekdOjjAc*?LCLFB(dNZT`R1@2K`3XYdb!X zo|EU~fujww^8GL5ii%hF0+>Y@OGsll>scJ*9L{A9bGb$w&G;P{F>=%}Kn8xSJBhl+ z(_J6!s$BNLw%0cUxa8dJAj4T-;uz;}E^`1G9PFSAauM&hA-kX8%pphUPiJi+cBq6@ z!bn1{v%XDe;kjQ2hI|HsPJt%Ec|sc@Fn~D2bYg8zZj-|eCh{E6W84o8Nr*CrO85)Z Wwg;e1aXF0u0000B6IU9?e>3C6M3vwVxq!hW$qSzf~?3uA==FJ{UpLdOkBMd{@KS-8k zWLf^<)~#EA0{rfATLN@NN(gcM^5x6;z8?d;di4rfmSd1G3=u-GfB*h?@BRJkKKxLyjFg)`n5v1|V+(AW4#h zX_^EZO_Yp!+ ztJSuwl^p|At5rPDLzZR2FpRIex4`qf7@%6M{{8>}K@i}19+D)*nP`JGo6Wdbe>VVG zmN5(iAq0{n;dvgdR*P&l%kc0p0MDL1V|{%+F2FDhF$@D)mUj&hHX4m3!!Z7!s%i}6 zx-JI}9Ebs4zkbb&7cXeFT5(of*QL>DECFv-y6q6%>FMb&E0xNUVHmVpEnL@S&z?O< zl0>msq*yG{+uMt#X}GRStJT6V3@Vk%()9H7mw>w)00;PaW@hHx#>U2yX_`2WLq4CU zP$;0PDyphdC=|$Mvp9}}X_{c6Rn0@Kf}zzZ(F6pbarMH+Mdh$vnyD^Q6;h9LK?N z9Mb7D`Fx&CCi7%&Zti@?;=!)FpbH|I$z(=GM@R8}pGKn*>;CBID9@ii9|8XLu8RXm z-Lfi4k}@?lH6_dP`A)@ai;b@96pKZC-^X$Ov%RTQibNv8qeqV@m&+)M@?WhS1i@b} zT(~d=i0#}kr6|hzGiT1wY&PSC+b;`RsZ(E!kB@&oGBSduX3{$lz%Rh_2M->6Wmy)gs>Yt*wq4hCv28ofOe&SaaUAa7 zzyFnGSx-*$g=HGU}*w|P)oldL${r$1< zv=17qtE)VH`jjvXWAAqyhyMP4(&@B1Ha3>tEr2pHG4a{p;9$JZvMf`t*I8a(W`2JD z%KZHNmF4ASEXzWcWrPsew$0$+AQKZ4p8?8lyr5Upw2yPS9FF6lC<-rMzGQWEb?w@< zYp1K#Y6W0%adGMF*|Xma4-bEs&*yO*hg>d)rfDAoe|wuHZ@HJZ&Pnx>6M>i63+FfcHn0`*d<^q%K= zzuvxm`-^h9{3H^U*FakoT7Y}~`t>Wiu77{x#EGwadU^(;_Dk&44LiT4fe)ikI}(&? zblq*YN+ezxARAp9QI?FY{u^!w&;#s=KD}sR?=5{TMPs#&cN!g;+A+ZYBs$mpH)c6P U#qRnt$p8QV07*qoM6N<$g1htTVgLXD literal 0 HcmV?d00001 From 27b7399d0407ff680d48decd817ffd72f131027c Mon Sep 17 00:00:00 2001 From: aragonc Date: Wed, 29 Oct 2014 15:43:56 -0500 Subject: [PATCH 09/27] update css template skill student refs CT#7347 --- main/css/base.css | 42 ++++++++++++++++++- .../default/skill/skill_wheel_student.tpl | 24 +++++------ 2 files changed, 52 insertions(+), 14 deletions(-) diff --git a/main/css/base.css b/main/css/base.css index 898a75f1cd..afca09eacc 100755 --- a/main/css/base.css +++ b/main/css/base.css @@ -3347,11 +3347,18 @@ form .formw .freeze { margin-top: 1em; background-color: #FFFFFF; } -.skill-options .legend .title-skill, .skill-options .saved_profiles .title-skill{ +.skill-options .legend .title-skill, +.skill-options .saved_profiles .title-skill +{ color: #666655; padding-bottom: 1em; font-size: 16px; } +.skill-options .skill-profile .title-skill{ + color: #666655; + padding-bottom: .5em; + font-size: 18px; +} .skill-options .skill-home{ margin-top: 1em; } @@ -3408,13 +3415,46 @@ form .formw .freeze { padding:1px 5px 2px; color:#333; } +.skill-options .skill-items{ + padding-bottom: 1em; + margin-bottom: .5em; + margin-top: .5em; +} .skill-options .skill-winner{ list-style: none; margin: 0; padding: 0; } +.skill-options .skill-winner li{ + float: left; + margin-right: 1em; + padding-bottom: 1em; +} .skill-options .skill-winner li a{ background: url("../img/icons/16/winner.png") no-repeat; + padding-left: 1.5em; + padding-bottom: 1em; +} +.skill-options .skill-profile{ + width: 100%; + display: block; + border: 1px solid #CCC; + border-radius: 10px; + -moz-border-radius: 10px; + -webkit-border-radius: 10px; + margin-top: 1em; + background-color: #FFFFFF; +} +.skill-options .skill-profile .avatar{ + display: block; + width: auto; + text-align: center; +} +.skill-options .skill-profile .info-user{ + display: block; + width: auto; + margin-left: 1em; + padding: 1em; } .skill_partition { cursor: pointer; diff --git a/main/template/default/skill/skill_wheel_student.tpl b/main/template/default/skill/skill_wheel_student.tpl index f91f6c0394..42a7e47d57 100755 --- a/main/template/default/skill/skill_wheel_student.tpl +++ b/main/template/default/skill/skill_wheel_student.tpl @@ -282,23 +282,21 @@ $(document).ready(function() {
          {{ "ReturnToCourseList"|get_lang }}
          -
          -
          - - - -
          -

          {{ userInfo.complete_name }}

          +
          + +
          + +
          +
          +

          {{ userInfo.complete_name }}

          {{ 'YourSkillRankingX' | get_lang | format(ranking) }}

          -
          + {% for i in 1..ranking %} - + + {% endfor %} {% for i in 1..(countSkill - ranking) %} - - + {% endfor %} -
          -
          @@ -322,7 +320,7 @@ $(document).ready(function() {
          -
          +
          From 5507678270316498bf4f27078e8cfc2f1bb4924b Mon Sep 17 00:00:00 2001 From: aragonc Date: Wed, 29 Oct 2014 16:15:29 -0500 Subject: [PATCH 10/27] update css fix skill studente refs CT#7347 --- main/css/base.css | 13 +++++++++++++ main/template/default/skill/skill_wheel.tpl | 1 + main/template/default/skill/skill_wheel_student.tpl | 7 ++++--- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/main/css/base.css b/main/css/base.css index afca09eacc..c60e58dc47 100755 --- a/main/css/base.css +++ b/main/css/base.css @@ -3444,6 +3444,15 @@ form .formw .freeze { -webkit-border-radius: 10px; margin-top: 1em; background-color: #FFFFFF; + padding-top: .5em; + padding-bottom: .5em; +} +.skill-options .section-info-skill{ + display: inline-block; + padding-top: .5em; + padding-bottom: .5em; + width: 100%; + clear: both; } .skill-options .skill-profile .avatar{ display: block; @@ -3456,6 +3465,9 @@ form .formw .freeze { margin-left: 1em; padding: 1em; } +.skill-options .button-skill{ + margin-bottom: .5em; +} .skill_partition { cursor: pointer; stroke: #000000; @@ -3465,6 +3477,7 @@ form .formw .freeze { #skill_holder li { float:left; padding-right: 10px; + margin-bottom: .5em; } diff --git a/main/template/default/skill/skill_wheel.tpl b/main/template/default/skill/skill_wheel.tpl index 669a4e5e03..5fe03918f8 100644 --- a/main/template/default/skill/skill_wheel.tpl +++ b/main/template/default/skill/skill_wheel.tpl @@ -635,3 +635,4 @@ $(document).ready(function() {
          +
          \ No newline at end of file diff --git a/main/template/default/skill/skill_wheel_student.tpl b/main/template/default/skill/skill_wheel_student.tpl index 42a7e47d57..5b34003760 100755 --- a/main/template/default/skill/skill_wheel_student.tpl +++ b/main/template/default/skill/skill_wheel_student.tpl @@ -348,9 +348,10 @@ $(document).ready(function() {
          - -

          {{ 'SkillInfo'|get_lang }}

          -
          +
          +

          {{ 'SkillInfo'|get_lang }}

          +
          +
        From acfb43936eb7c9fb187463534fcc3734c84e865e Mon Sep 17 00:00:00 2001 From: Angel Fernando Quiroz Campos Date: Wed, 29 Oct 2014 16:53:39 -0500 Subject: [PATCH 11/27] Allow delete searches skills profile - refs #7347 --- main/inc/ajax/skill.ajax.php | 12 ++++++++++++ main/inc/lib/skill.lib.php | 16 ++++++++++++++++ main/template/default/skill/profile_item.tpl | 5 +++-- main/template/default/skill/skill_wheel.tpl | 17 ++++++++++++++--- 4 files changed, 45 insertions(+), 5 deletions(-) diff --git a/main/inc/ajax/skill.ajax.php b/main/inc/ajax/skill.ajax.php index cd3c7c13c0..dfd985fc16 100755 --- a/main/inc/ajax/skill.ajax.php +++ b/main/inc/ajax/skill.ajax.php @@ -332,6 +332,18 @@ switch ($action) { } } break; + case 'delete_profile': + if (api_is_platform_admin() || api_is_drh()) { + $profileId = $_REQUEST['profile']; + + $skillProfile = new SkillProfile(); + $isDeleted = $skillProfile->delete($profileId); + + echo json_encode(array( + 'status' => $isDeleted + )); + } + break; case 'skill_exists': $skill_data = $skill->get($_REQUEST['skill_id']); if (!empty($skill_data)) { diff --git a/main/inc/lib/skill.lib.php b/main/inc/lib/skill.lib.php index 4fc584f39d..8e2c94a899 100755 --- a/main/inc/lib/skill.lib.php +++ b/main/inc/lib/skill.lib.php @@ -66,6 +66,22 @@ class SkillProfile extends Model } return false; } + + /** + * Delete a skill profile + * @param int $id The skill profile id + * @return boolean Whether delete a skill profile + */ + public function delete($id) { + Database::delete( + $this->table_rel_profile, + array( + 'profile_id' => $id + ) + ); + + return parent::delete($id); + } } class SkillRelProfile extends Model diff --git a/main/template/default/skill/profile_item.tpl b/main/template/default/skill/profile_item.tpl index 1a485bc17d..df6ed587d5 100755 --- a/main/template/default/skill/profile_item.tpl +++ b/main/template/default/skill/profile_item.tpl @@ -3,8 +3,9 @@
        diff --git a/main/template/default/skill/skill_wheel.tpl b/main/template/default/skill/skill_wheel.tpl index 669a4e5e03..55161a78ec 100644 --- a/main/template/default/skill/skill_wheel.tpl +++ b/main/template/default/skill/skill_wheel.tpl @@ -284,7 +284,7 @@ $(document).ready(function() { update_my_saved_profiles(); /* Click in profile */ - $("#saved_profiles").on("click", "a.load_profile", function() { + $("#saved_profiles").on("click", "li.load_profile", function() { profile_id = $(this).attr('rel'); $('#profile_id').attr('value',profile_id); $.ajax({ @@ -304,8 +304,19 @@ $(document).ready(function() { } }); }); - - + $("#saved_profiles").on('click', 'li.load_profile button.close', function () { + var $parent = $(this).parent(); + var profileId = $parent.attr('rel'); + + $.getJSON('{{ url }}&a=delete_profile', { + profile: profileId + }, function (response) { + if (response.status) { + $parent.remove(); + } + }); + }); + /* Wheel skill popup form */ /* Close button in gradebook select */ From aab3cbd859803f44a3c647bab475f99417bd22fa Mon Sep 17 00:00:00 2001 From: aragonc Date: Wed, 29 Oct 2014 17:33:48 -0500 Subject: [PATCH 12/27] update css skill wheel refs CT#7347 --- main/template/default/skill/skill_wheel.js.tpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/main/template/default/skill/skill_wheel.js.tpl b/main/template/default/skill/skill_wheel.js.tpl index f0618be517..49c8679ce8 100755 --- a/main/template/default/skill/skill_wheel.js.tpl +++ b/main/template/default/skill/skill_wheel.js.tpl @@ -45,7 +45,7 @@ color_patterns[17] = d3.scale.ordinal().domain(my_domain).range(colorbrewer.YlOr //Too make the gray tones lighter col = 3; -color_patterns[18] = d3.scale.ordinal().domain(my_domain).range(colorbrewer.Greys[col]); +color_patterns[18] = d3.scale.ordinal().domain(my_domain).range(colorbrewer.Greens[col]); //If you want to use the category10() //var normal_fill = d3.scale.category10().domain(my_domain); @@ -137,7 +137,7 @@ function get_color(d) { } return color; } - color = '#fefefe'; + color = '#fefefe'; return color; //missing colors } @@ -156,7 +156,7 @@ bright red for missing skills, in the "Required skills" view for a student when **/ function set_skill_style(d, attribute, searched_skill_id) { //Default border color (stroke) - return_stroke = 'black'; + return_stroke = '#000'; //0. Nice rainbow colors (Comment 1.0 to see the rainbow!) return_fill = get_color(d); @@ -168,7 +168,7 @@ function set_skill_style(d, attribute, searched_skill_id) { //2. Yellow - If the skill has a gradebook attached if (d.skill_has_gradebook) { - return_fill = '#F89406'; + return_fill = '#FFA800'; //return_stroke = 'grey'; } From cc553c4e4cbd72221913d9e5b7afdc78d3b36358 Mon Sep 17 00:00:00 2001 From: Angel Fernando Quiroz Campos Date: Wed, 29 Oct 2014 17:42:27 -0500 Subject: [PATCH 13/27] Don't show skills management link for students - refs #7347 --- main/inc/lib/userportal.lib.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/main/inc/lib/userportal.lib.php b/main/inc/lib/userportal.lib.php index 43b94bf0e4..43f47f7971 100755 --- a/main/inc/lib/userportal.lib.php +++ b/main/inc/lib/userportal.lib.php @@ -312,7 +312,9 @@ class IndexManager $content .= Display::tag('li', Display::url(get_lang('MySkills'), api_get_path(WEB_CODE_PATH).'social/skills_wheel.php')); - if (api_get_setting('allow_hr_skills_management') == 'true' || api_is_platform_admin()) { + $allowSkillsManagement = api_get_setting('allow_hr_skills_management') == 'true'; + + if (($allowSkillsManagement && api_is_drh()) || api_is_platform_admin()) { $content .= Display::tag('li', Display::url(get_lang('ManageSkills'), api_get_path(WEB_CODE_PATH).'admin/skills_wheel.php')); } $content .= '
      '; From f05980601c1aa51bf146b85336d6e35aa97972a8 Mon Sep 17 00:00:00 2001 From: aragonc Date: Wed, 29 Oct 2014 17:45:37 -0500 Subject: [PATCH 14/27] update color skill wheel refs CT#7347 --- main/template/default/skill/skill_wheel.js.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/template/default/skill/skill_wheel.js.tpl b/main/template/default/skill/skill_wheel.js.tpl index 49c8679ce8..670940a9de 100755 --- a/main/template/default/skill/skill_wheel.js.tpl +++ b/main/template/default/skill/skill_wheel.js.tpl @@ -12,7 +12,7 @@ var main_depth = 4; var main_parent_id = 0; // Used to split in two word or not -var max_size_text_length = 11; +var max_size_text_length = 20; /* ColorBrewer settings */ var my_domain = [1,2,3,4,5,6,7,8,9]; From bf8c1ec40a1ed57aeef85be3cbbd5244737e7ae5 Mon Sep 17 00:00:00 2001 From: aragonc Date: Wed, 29 Oct 2014 17:56:01 -0500 Subject: [PATCH 15/27] update color skill wheel refs CT#7347 --- main/template/default/skill/skill_wheel.js.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/template/default/skill/skill_wheel.js.tpl b/main/template/default/skill/skill_wheel.js.tpl index 670940a9de..139bb28188 100755 --- a/main/template/default/skill/skill_wheel.js.tpl +++ b/main/template/default/skill/skill_wheel.js.tpl @@ -168,7 +168,7 @@ function set_skill_style(d, attribute, searched_skill_id) { //2. Yellow - If the skill has a gradebook attached if (d.skill_has_gradebook) { - return_fill = '#FFA800'; + return_fill = '#F89406'; //return_stroke = 'grey'; } From d258a97387284fe719f77cb69d5ec1732a7d206c Mon Sep 17 00:00:00 2001 From: Angel Fernando Quiroz Campos Date: Wed, 29 Oct 2014 18:03:50 -0500 Subject: [PATCH 16/27] Add link to see the skill ranking - refs #7347 --- main/social/skills_wheel.php | 2 +- main/template/default/skill/skill_wheel_student.tpl | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/main/social/skills_wheel.php b/main/social/skills_wheel.php index d8868a8df8..1c3e78b84e 100755 --- a/main/social/skills_wheel.php +++ b/main/social/skills_wheel.php @@ -51,7 +51,7 @@ $url = api_get_path(WEB_AJAX_PATH).'skill.ajax.php?1=1'; $tpl->assign('url', $url); $tpl->assign('userInfo', $userInfo); -$tpl->assign('ranking', 2); +$tpl->assign('ranking', $ranking); $tpl->assign('countSkill', $countSkill); $content = $tpl->fetch('default/skill/skill_wheel_student.tpl'); diff --git a/main/template/default/skill/skill_wheel_student.tpl b/main/template/default/skill/skill_wheel_student.tpl index 5b34003760..a94cef9791 100755 --- a/main/template/default/skill/skill_wheel_student.tpl +++ b/main/template/default/skill/skill_wheel_student.tpl @@ -289,7 +289,9 @@ $(document).ready(function() {

      {{ userInfo.complete_name }}

      -

      {{ 'YourSkillRankingX' | get_lang | format(ranking) }}

      +

      + {{ 'YourSkillRankingX' | get_lang | format(ranking) }} +

      {% for i in 1..ranking %} From 00b1ba90473a86f6baafb04391c81f2a48139d4e Mon Sep 17 00:00:00 2001 From: aragonc Date: Thu, 30 Oct 2014 14:42:41 -0500 Subject: [PATCH 17/27] add img icons award skill --- main/img/icons/22/award_green.png | Bin 0 -> 1099 bytes main/img/icons/22/award_red_start.png | Bin 0 -> 1102 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 main/img/icons/22/award_green.png create mode 100644 main/img/icons/22/award_red_start.png diff --git a/main/img/icons/22/award_green.png b/main/img/icons/22/award_green.png new file mode 100644 index 0000000000000000000000000000000000000000..d358e4f47f78c6f7d999d9e3081b59c21d3a1e22 GIT binary patch literal 1099 zcmV-R1ho5!P)-FER;X&MGbR2WPQ!h*tr=#Q4v9}$8BA&OE{ zL2yC_^+%!>p-?e!8I>(1GYQ9-Y1+6p*~-miP50|=yXW5R{yOJ<-~PB42|L4E4;(l= z-|zXn?|I(meFPq{VV_wuHY*oNg%E&g0HP#nkP37$ucIMzxO1ztZ)aFu;IX9KvU6kW z9#d3f2uNkXFp8Q|5Uv8HLFzPZ?FV-OZDoOTS!(ZTT*9|k-X`dW_#pU7PRE7S%U~`K z&#ropT$Wldh9}rEVAB2#zXrdC3K#q(O}NFJtBW4Xfbzj6Oxb-17qkg73({BAqyyS5 zE-+>HVVVC0Y++2>{Rmlv=!}Kmx1m@j=R36PAS6uN{a6-8*+Q`ey=2UzoMg5F&N+Ia)Tn%%Y|Se!1Ak zf@qxhFzU=1+Tw>fXjM{B?j69&1z!MX>=J#2Fw=GwPdpYqARbyBqoTrOVl>9-n}_w~ z9^Sdq&d0t0wwq)AIM&tgS*q3@yMONP9n>R2JP^3ueE4|Jt#|QH zVb}YgH0KKHkkncUz$rM~xANXq&#!MbQ?qjbghN5TI^8Y*`2E^|&u2*um_nF-OKfa= zYg63w@RF&_roG!XKOnURrO-g3;E>7Xaa>vKihQ0Io@_RK&pf^gz%UF-~t-0HTi7bYgtw?5WP5Dns?5NPWZVV6ajcLZG$2^?)Xs&R`e@iOCst{F~!P_wU{I z`qbq3H6^9v306|NK)UyQ*IBEoHn4c{(lyo9L8Q_E6dadyCXXQm$(ba_j(z#z=Lg>1 z4vZ@)3wOF8E-=#=jn&rGgppDrr6iYkOFIUo1$DJy8lz2j0ST{mGUjW)NPWXgb+uva zRF-^RVyEXw&t@?V6Dc)yHDMz44K4G1?>RzRHgA7)?V5*Q3swaUS1HCO5}Z8I`RTww zf4m{u^kBF;h(O>o1y(rvec#3I8)eOkx=3W*(uFZ&Dw(4H>fq$*Qzt(-(Q)K6fXRvR zf%Q*4{l@*vm(?#_7&Gc3k#)d@vcREWpz+6ZmqcQGwEO6h{X0hf9K0+HBL#4xL!qjA$_ZaZ1waH?0mQtnZYdWlc_RMG0Of`#)nEKy&)?Oqx$Kz$ RA0Ge!002ovPDHLkV1n@93bg&#R8<(qf9Kq}^PtmqrcFzyMbfe;Mu{v)2qJ`q8W%z|2IDK5$ikh`fH8ov z8}JdM5{>Z@0^55ap%r`oa16hG~^Ph|IJCh z?|**D`M&Rbf)Jg2+-xTAtyTd7faom-w|+Tc9G??7`a?wLVEECGP7Rf%rh4%Pzl zseRZrQelixFea$%I5i1U2UMaBh-kbH))Juul!RDz9L!KcI9QnAO^xBYRU(e0;sqGO zuUEngh&x4mw~Cw^L;M$TB#v~ZNAbKWs_Ikm1B~_v2nc3v8mkt8=fU(SkvKAp5gN=n zOwQ*gP_B(<7pY1`(<3`*dU!iF0iIn%xi<6p333jTVGQHeKtlw+pOWL5csb~Z*<0hj zFDl76YhLW5p?e*jjzZSwYlI)2$YxcfKxX+uQ2p1K3rQ_yH?Z)k?ml`(&@Jyw0N zW9w$ovf)t-GlsV~M)uOE9=z)B@B5uE8cl7LeQqz^|3GNDPwna&shsH3dU8KX~_kN#xiKLhaZ#JShkZ%I_=KGT7(5a9a(E7x@1+xg_%hFZE-Z%S$v*>Cp; zH!f%Yh(zjaAq}IPXn*eh_s(AkoeH&d{iSsWzFUV<^}Z?vzK1I1(Qdi!u}gG5eaPrE z#C@PZN-#{$_3hjPybxAnvEZ6B?Xy3x?eMR38*Yi9G>5XL(T)XLfmUdzfU>UP|Mdgp zE>N2|%bCOdrw{#N9T?9$*F&3kwcr-M8lL;vk$o8EA8It=lMXPr!AI>raDlb1HOx@E8Je5W*OhP$_TeNU1RRjVZxWt>9$+R>*bG!SY;KMu98=HGKNM&UaGD3NN ziGh>j{R1b*`pa{RNFh+gEX} Date: Thu, 30 Oct 2014 14:42:59 -0500 Subject: [PATCH 18/27] css search skill profile --- main/css/base.css | 58 ++++++++++++++++ main/template/default/skill/profile.tpl | 89 +++++++++++++------------ 2 files changed, 104 insertions(+), 43 deletions(-) diff --git a/main/css/base.css b/main/css/base.css index c60e58dc47..97af853832 100755 --- a/main/css/base.css +++ b/main/css/base.css @@ -3468,6 +3468,64 @@ form .formw .freeze { .skill-options .button-skill{ margin-bottom: .5em; } +.page-items-profile{ + padding-top: 2em; + padding-bottom: 2em; + padding-left: 1em; + padding-right: 1em; +} +.page-items-profile .title-skill{ + margin-bottom: 1em; + font-size: 18px; + color: #333333; + margin-top: 1em; +} +.page-items-profile .block-items{ + display: block; + width: 22.5%; + margin:10px; + float: left; +} +.page-items-profile .award-items{ + list-style: none; + margin: 0; + padding: 0; +} +.page-items-profile .number-skill{ + background-color: #FFFFFF; + padding-top: .5em; + padding-bottom: .5em; + padding-left: .5em; + margin-bottom: 1em; + border: 1px solid #cccccc; + -webkit-border-radius: 10px; + -moz-border-radius: 10px; + border-radius: 10px; +} +.page-items-profile .block-items .border-items{ + background-color: #EFEFEF; + -webkit-border-radius: 10px; + -moz-border-radius: 10px; + border-radius: 10px; + border: 1px solid #cccccc; +} +.page-items-profile .items-info{ + padding:1em; +} +.page-items-profile .info-profile{ + margin-top: 1em; + margin-bottom: .5em; +} +.page-items-profile .items-info .avatar-profile{ + text-align: center; + background: #FFFFFF; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + padding-bottom: 5px; + padding-top: 5px; + border: 1px solid #cccccc; +} .skill_partition { cursor: pointer; stroke: #000000; diff --git a/main/template/default/skill/profile.tpl b/main/template/default/skill/profile.tpl index 9a32570862..22f1865d57 100755 --- a/main/template/default/skill/profile.tpl +++ b/main/template/default/skill/profile.tpl @@ -28,67 +28,70 @@ {% if order_user_list is not null %} {% for count, user_list in order_user_list %} +
      -
      -
      -

      - {% if count == total_search_skills %} - {{ "CompleteMatch"|get_lang }} - {% else %} +
      +

      + {% if count == total_search_skills %} + {{ "CompleteMatch"|get_lang }} + {% else %} {% if (total_search_skills - count) == 1 %} - {{ "MissingOneStepToMatch"|get_lang }}

      + {{ "MissingOneStepToMatch"|get_lang }} {% else %} {{ "MissingXStepsToMatch"|get_lang | format(total_search_skills - count)}} - {% endif %} - {% endif %} -

      - -
      + {% endif %} + {% endif %} +
      {% for user in user_list %} -
      -
      -

      - - {{ user['user'].complete_name }} ({{user['user'].username}}) -

      -
      -
      -

      {{ "Skills"|get_lang }} {{ user.total_found_skills }} / {{ total_search_skills }}

      -
        - {% for skill_data in user.skills %} -
      • - {% if skill_list[skill_data.skill_id].name is not null %} - {% if skill_data.found %} - {{ skill_list[skill_data.skill_id].name }} - {% else %} - {{ skill_list[skill_data.skill_id].name }} - {% endif %} - - {% else %} - {{ "SkillNotFound"|get_lang }} - {% endif %} - {# if $skill_data.found - IHaveThisSkill"|get_lang - #} +
        +
        +
        +
        + +
        +
        +

        {{ user['user'].complete_name }}

        +

        Usuario:{{user['user'].username}}

        +
        +
        {{ "Skills"|get_lang }} {{ user.total_found_skills }} / {{ total_search_skills }}
        +
        +
          + {% for skill_data in user.skills %} +
        • + {% if skill_list[skill_data.skill_id].name is not null %} + {% if skill_data.found %} + {{ skill_list[skill_data.skill_id].name }} + {% else %} + {{ skill_list[skill_data.skill_id].name }} + {% endif %} + + {% else %} + {{ "SkillNotFound"|get_lang }} + {% endif %} + {# if $skill_data.found + "IHaveThisSkill"|get_lang + #}
          • {% endfor %}
        -
        -
        +
        +
        +
      {% endfor %} {% endfor %}
      -{% else %} + + {% else %} {% if search_skill_list is null %}
      {{"NoResults"|get_lang}}
      - {% endif %} -{% endif %} - + {% endif %} + {% endif %} +