Fairplay icon in game list; updated PSD files

mideind · Apr 8, 2015 · a57860a · a57860a
1 parent 2ae8acf
commit a57860a
Show file tree

Hide file tree

Showing 13 changed files with 8 additions and 1 deletion.
diff --git a/netskrafl.py b/netskrafl.py
@@ -335,6 +335,7 @@ def _gamelist():
             "my_turn": False,
             "overdue": False,
             "zombie": True,
+            "fairplay": u.fairplay(),
             "tile_count" : Alphabet.BAG_SIZE # All tiles accounted for
         })
     # Sort zombies in decreasing order by last move, i.e. most recently completed games first
@@ -349,13 +350,15 @@ def _gamelist():
         opp = g["opp"] # User id of opponent
         ts = g["ts"]
         overdue = False
+        fairplay = False
         if opp is None:
             # Autoplayer opponent
             nick = Game.autoplayer_name(g["robot_level"])
         else:
             # Human opponent
             u = User.load(opp)
             nick = u.nickname()
+            fairplay = u.fairplay()
             delta = now - ts
             if g["my_turn"]:
                 # Start to show warning after 12 days
@@ -373,6 +376,7 @@ def _gamelist():
             "my_turn": g["my_turn"],
             "overdue": overdue,
             "zombie": False,
+            "fairplay": fairplay,
             "tile_count" : g["tile_count"]
         })
     return result

diff --git a/resources/NetskraflFacebookBanner.psd b/resources/NetskraflFacebookBanner.psd
diff --git a/resources/NetskraflFacebookCover.psd b/resources/NetskraflFacebookCover.psd
diff --git a/resources/NetskraflFacebookCoverLarge.psd b/resources/NetskraflFacebookCoverLarge.psd
diff --git a/resources/NetskraflFacebookImage.psd b/resources/NetskraflFacebookImage.psd
diff --git a/resources/NetskraflFacebookImageSq.psd b/resources/NetskraflFacebookImageSq.psd
diff --git a/static/NetskraflFacebookBanner.jpg b/static/NetskraflFacebookBanner.jpg
diff --git a/static/NetskraflFacebookCover.jpg b/static/NetskraflFacebookCover.jpg
diff --git a/static/NetskraflFacebookCoverLarge.jpg b/static/NetskraflFacebookCoverLarge.jpg
diff --git a/static/NetskraflFacebookImage.jpg b/static/NetskraflFacebookImage.jpg
diff --git a/static/NetskraflFacebookImageSq.jpg b/static/NetskraflFacebookImageSq.jpg
diff --git a/static/main.js b/static/main.js
@@ -510,6 +510,9 @@ function populateGameList(json) {
       else
       if (item.zombie)
          flagClass = " zombie";
+      // Fair play commitment
+      if (item.fairplay)
+         opp = "<span class='fairplay-btn' title='Skraflar án hjálpartækja'></span> " + opp;
       var myTurn = "<span title='" + turnText + "' class='glyphicon glyphicon-flag" +
          flagClass + "'></span>";
       var overdueText = item.overdue ?

diff --git a/templates/login.html b/templates/login.html
@@ -19,7 +19,7 @@
       <span class="caption"></span>Skemmtilegt | skerpandi | ókeypis
    </div>
    <div class="welcome">
-      <span class="caption"></span>Netskrafl er vettvangur yfir 6.000 íslenskra skraflara á netinu.
+      <span class="caption"></span>Netskrafl er vettvangur yfir 7.000 íslenskra skraflara á netinu.
    </div>
    <div class="welcome">
       <span class="caption"></span>Netskrafl notar Google Accounts innskráningu, þá