changelog shortlog tags manifest raw

changeset: skin server status

changeset 1933: b08a700beb8b
parent 1932:b6dec3d4afc6
child 1934:39a6c8b9afdc
author: loic@dachary.org
date: Tue Jun 01 13:52:33 2010 +0200 (3 months ago)
files: jpoker/js/skin-jpoker.js jpoker/sites/pokersource.eu/sources/index/PageTemplate.html jpoker/sites/pokersource.eu/sources/tiddlers/StyleSheet.css jpoker/themes/pokersource.eu/css/jpoker_server_status.css jpoker/themes/pokersource.eu/js/jpoker.js jpoker/themes/pokersource.eu/skin/login.html jpoker/themes/pokersource.eu/skin/status.html
description: skin server status
--- a/jpoker/js/skin-jpoker.js	Tue Jun 01 10:31:08 2010 +0200
+++ b/jpoker/js/skin-jpoker.js	Tue Jun 01 13:52:33 2010 +0200
@@ -885,6 +885,24 @@
         server.connectionState = 'connected';
         server.tablesCount = 10;
         server.playersCount = 23;
+        $(place).jpoker('serverStatus', 'url');
+}
+
+function jpoker_33_connectedAll(place) {
+        setUp();
+        if(explain) {
+            $('#explain').append('<b>jpoker_32_connectedAll</b> ');
+            $('#explain').append('connected to server, with cash game tables with players and tournaments with players.');
+            $('#explain').append('<hr>');
+        }
+
+        var server = $.jpoker.getServer('url');
+
+        server.connectionState = 'connected';
+        server.tablesCount = 10;
+        server.tourneysCount = 20;
+        server.playersCount = 33;
+        server.playersTourneysCount = 43;
         $(place).jpoker('serverStatus', 'url');
 }
 
--- a/jpoker/sites/pokersource.eu/sources/index/PageTemplate.html	Tue Jun 01 10:31:08 2010 +0200
+++ b/jpoker/sites/pokersource.eu/sources/index/PageTemplate.html	Tue Jun 01 13:52:33 2010 +0200
@@ -2,7 +2,8 @@
 <div id="stickybod">
 	<div id="header">
 		<div id="pokLogin" refresh="content" force="true" tiddler="Login"></div>
-		<div id="headerTitle" refresh="content" force="true" tiddler="SiteTitle"> </div>
+		<div id="jpokerServerStatus" refresh="content" force="true" tiddler="SiteStats"></div>
+<!--		<div id="headerTitle" refresh="content" force="true" tiddler="SiteTitle"> </div> -->
 <!--
 	<div id="headerImage"></div>
 -->
--- a/jpoker/sites/pokersource.eu/sources/tiddlers/StyleSheet.css	Tue Jun 01 10:31:08 2010 +0200
+++ b/jpoker/sites/pokersource.eu/sources/tiddlers/StyleSheet.css	Tue Jun 01 13:52:33 2010 +0200
@@ -25,24 +25,24 @@
         background: #5F8000 url(../../../themes/pokersource.eu/css/images/contentWrapper-background.jpg) no-repeat scroll left top;
 }
 
+#jpokerServerStatus {
+    position: absolute;
+    top: 0;
+    left: 430px;
+}
+
 #pokLogin {
-    width: 300px;
-    height: 80px;
     position: absolute;
     top: 0;
     right: 0;
 }
 
 #headerTitle{
-	/*font-size: 3.5em;*/
-	padding-bottom:0.5em;
-	height:87px;
 }
 
 #header{
-	background: transparent url("../../../themes/pokersource.eu/css/images/top-background.jpg") no-repeat left top;
         position: relative;
-        height: 125px;
+        height: 32px;
 	display:block;
 }
 
--- a/jpoker/themes/pokersource.eu/css/jpoker_server_status.css	Tue Jun 01 10:31:08 2010 +0200
+++ b/jpoker/themes/pokersource.eu/css/jpoker_server_status.css	Tue Jun 01 13:52:33 2010 +0200
@@ -1,5 +1,28 @@
 .jpoker_server_status {
-    padding: 2px 5px;
-    margin-left: 1.5em;
-	color: #444;
+    background: #81ac00;
+    font-size: 15px;
+    font-weight: bold;
+    color: #FFF;
+    overflow: hidden;
+    padding: 0px 10px;
 }
+
+.jpoker_server_status .jpoker_server_status_players {
+    line-height: 32px;
+}
+
+.jpoker_server_status {
+    height: 32px;
+}
+
+.jpoker_server_status .jpoker_server_status_more {
+    font-size: smaller;
+    color: #444;
+}
+
+.jpoker_server_status:hover .jpoker_server_status_more {
+    display: none;
+}
+.jpoker_server_status:hover {
+    height: 70px;
+}
--- a/jpoker/themes/pokersource.eu/js/jpoker.js	Tue Jun 01 10:31:08 2010 +0200
+++ b/jpoker/themes/pokersource.eu/js/jpoker.js	Tue Jun 01 13:52:33 2010 +0200
@@ -16,7 +16,7 @@
 //
 (function($) {
     $.jpoker.plugins.login.templates.login = 
-        '<ul>' +
+        '<ul class=\'jpoker_login_login\'>' +
         ' <li class=\'jpoker_login_label\'>' +
         '  <div class=\'jpoker_login_name_label\'>{login}</div>' +
         '  <div class=\'jpoker_login_password_label\'>{password}</div>' +
@@ -30,4 +30,5 @@
         '  <div class=\'jpoker_login_signup\'><input type=\'text\' class=\'jpoker_login_signup\' value=\'{signup}\' /></div>' +
         ' </li>' + 
         '</ul>';
+    $.jpoker.plugins.serverStatus.templates.players = '<div class=\'jpoker_server_status_players\'> <span class=\'jpoker_server_status_players_count\'>{count}</span> <span class=\'jpoker_server_status_players_label\'>{players}</span> online <span class=\'jpoker_server_status_more\'>more...</span></div>';
 })(jQuery);
--- a/jpoker/themes/pokersource.eu/skin/login.html	Tue Jun 01 10:31:08 2010 +0200
+++ b/jpoker/themes/pokersource.eu/skin/login.html	Tue Jun 01 13:52:33 2010 +0200
@@ -49,7 +49,7 @@
         </script>
         <link href="../css/jpoker.css" rel="stylesheet" type="text/css" />
         <style type="text/css">
-          #place { position: absolute; right: 0; top: 0; width: 350px; height: 80px; }
+          #place { position: absolute; right: 0; top: 0; }
         </style>
 </head>
 
--- a/jpoker/themes/pokersource.eu/skin/status.html	Tue Jun 01 10:31:08 2010 +0200
+++ b/jpoker/themes/pokersource.eu/skin/status.html	Tue Jun 01 13:52:33 2010 +0200
@@ -39,6 +39,7 @@
 	<script language="JavaScript" type="text/javascript" src="../../../js/jquery.jpoker.js"></script>
 	<script language="JavaScript" type="text/javascript" src="../../../js/mockup.js"></script>
 	<script language="JavaScript" type="text/javascript" src="../../../js/skin-jpoker.js"></script>
+	<script language="JavaScript" type="text/javascript" src="../js/jpoker.js"></script>
 	<script type="text/javascript">
           $.jpoker.verbose = 1;
           $.jpoker.copyrightTimeout = 20000000;
@@ -47,6 +48,9 @@
 	  });
         </script>
         <link href="../css/jpoker.css" rel="stylesheet" type="text/css" />
+        <style type="text/css">
+          #place { position: absolute; left: 430px; top: 0; }
+        </style>
 </head>
 
 <body>
@@ -57,6 +61,7 @@
       <li><a href='#'>jpoker_30_statusDisconnected</a></li>
       <li><a href='#'>jpoker_31_connectedTables</a></li>
       <li><a href='#'>jpoker_32_connectedTablesPlayers</a></li>
+      <li><a href='#'>jpoker_33_connectedAll</a></li>
     </ul>
 </body>
 </html>