Skip to content

Commit

Permalink
Fixed achievements
Browse files Browse the repository at this point in the history
  • Loading branch information
phlindstedt committed Dec 16, 2018
1 parent 77541b5 commit 21aacbf
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
1 change: 1 addition & 0 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -885,6 +885,7 @@
var list = JSON.parse(result);
var html = "";

html += "<div style='font-size:20px;margin-left:-2px;margin-top:-0.5em;' onclick=\"tileClick('./SelfEvaluation/index.html?p='+(new Date()).getTime() ,'Achievements', event);\"><img class=\"achievement-icon icon ml-2\" src=\"./images/white-star-icon-32.png\" style=\"left:0px;min-width:20.82px;min-height:19.78px;max-width:20.82px;max-height:19.78px;margin-top:-0.25em;\"><span>Achievements</span></div>";
for (i = 0; i < list.DATA.length; i++) {
var riga = list.DATA[i];

Expand Down
7 changes: 5 additions & 2 deletions js/window-management.js
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,11 @@ function openIframeWindow(toolUrl, toolName, event) {

var toolTile = $(event.srcElement).closest('[data-role], tile');
var bgColor = toolTile.css("background-color");
var tIcon = $(event.srcElement).closest('.tile').find('.slide-front').find('.icon').attr('src');
if(bgColor=="rgba(0, 0, 0, 0)" || bgColor=="rgb(255, 255, 255)")
var tIcon = $(event.srcElement).closest('.tile').find('.slide-front').find('.icon').attr('src') || $('.achievement-icon').attr('src');
console.log(tIcon);
if(toolName=='Achievements')
bgColor="rgb(255,150,30)";
else if(bgColor=="rgba(0, 0, 0, 0)" || bgColor=="rgb(255, 255, 255)")
bgColor="rgb(64,64,64)";

Metro.window.create({
Expand Down

0 comments on commit 21aacbf

Please sign in to comment.