Browse Source

Merge branch 'master' of github.com:kakaranet/games

Roman Dayneko 11 years ago
parent
commit
b49ddea4f9
3 changed files with 18 additions and 17 deletions
  1. 5 0
      apps/face/priv/static/kakaranet.css
  2. 1 5
      apps/face/priv/templates/index.html
  3. 12 12
      apps/face/src/index.erl

+ 5 - 0
apps/face/priv/static/kakaranet.css

@@ -0,0 +1,5 @@
+
+  body   { font-size: 18pt; font-family:  Calibri, Lucida Sans, "Lucida Grande"; }
+  button { font-size: 18pt; }
+  select { font-size: 18pt; border: 1px solid #ccc; height: 34px; }
+  br { height: 1pt; }

+ 1 - 5
apps/face/priv/templates/index.html

@@ -1,11 +1,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<style>
-  body   { font-size: 18pt; font-family:  Calibri, Lucida Sans, "Lucida Grande"; }
-  button { font-size: 18pt; }
-  select { font-size: 18pt; border: 1px solid #ccc; height: 34px; width: 150px; }
-</style>
+<link href="/static/kakaranet.css" rel="stylesheet" type="text/css"/>
 <title>{{title}}</title>
 </head>
 <body>

+ 12 - 12
apps/face/src/index.erl

@@ -45,10 +45,10 @@ redraw_tiles([{Tile, _}| _ ] = TilesList, DropDown = #dropdown{id = ElementId})
 redraw_players(Players) ->
     User = user(),
     [ begin PN = player_name(PI),
-            wf:update(LabelId, [#label{id = LabelId,
+            wf:update(LabelId, #label{ id = LabelId,
                style= case User#user.id == Id of
                   true -> "font-weight: bold;";
-                  _ -> "" end, body = <<" ",PN/binary>>}]) 
+                  _ -> "" end, body = <<" ",PN/binary," ">>}) 
       end || #okey_player{label_id = LabelId, player_info =  #'PlayerInfo'{id = Id} = PI} <- Players].
 
 update_players(UpdatedPlayer = #okey_player{label_id = LabelId}, Players) ->
@@ -65,19 +65,19 @@ body() ->
     wf:wire(#api{name=plusLogin, tag=plus}),
     [ #panel{ id=history },
       #button{ id = plusloginbtn, body = <<"Login">>, postback=login_button},
-      #br{},
-
-      #label{ id = player1, body = "Player 1", style = "color=black;"},
-      #dropdown{ id = p1right_combo, options = []},
+      #label{ body = " Google"},#br{},#br{},
 
-      #label{ id = player2, body = "Player 2", style = "color=black;"},
-      #dropdown{ id = p2right_combo, options = []},
+      #label{ id = player1, body = "Player 1"},
+      #dropdown{ id = p1right_combo, options = []},#br{},
 
-      #label{ id = player3, body = "Player 3", style = "color=black;"},
-      #dropdown{ id = p3right_combo, options = []},
+      #label{ id = player2, body = "Player 2"},
+      #dropdown{ id = p2right_combo, options = []},#br{},
 
-      #label{ id = player4, body = "Player 4", style = "color=black;"},
-      #dropdown{ id = p4right_combo, options = []},
+      #label{ id = player3, body = "Player 3"},
+      #dropdown{ id = p3right_combo, options = []}, #br{},
+      
+      #label{ id = player4, body = "Player 4"},
+      #dropdown{ id = p4right_combo, options = []},#br{},
 
       #br{},
       #button{ id = attach, body = <<"Attach">>, postback = attach},