| changeset 527: |
079d2077ee5b |
| parent 526: | f43baa882327 |
| child 528: | 4e7500fdafe9 |
| author: |
loic@call.dachary.org |
| date: |
Wed Jul 02 12:18:52 2008 +0200 (3 months ago) |
| files: |
jpoker/css/jpoker_copyright.css jpoker/js/jquery.jpoker.js jpoker/js/skin-jpoker.js jpoker/skin.html |
| description: |
fix copyright box display bug by adding an enclosing div so that the dialog calculates the outer size properly. Change the class names of skin-jpoker.js setup function to match the new convention. Remove the close button of the copyright popup. Parameterize the copyright display timer. |
--- a/jpoker/css/jpoker_copyright.css Tue Jul 01 18:38:42 2008 +0200
+++ b/jpoker/css/jpoker_copyright.css Wed Jul 02 12:18:52 2008 +0200
@@ -1,5 +1,6 @@
/* copyright notice dialog box */
+
#jpoker_copyright {
background-color: #73BF60;
font-family: "trebuchet MS",arial,helvetica,sans-serif;
--- a/jpoker/js/jquery.jpoker.js Tue Jul 01 18:38:42 2008 +0200
+++ b/jpoker/js/jquery.jpoker.js Wed Jul 02 12:18:52 2008 +0200
@@ -49,10 +49,13 @@
verbose: 0,
+ copyrightTimeout: 5000,
+
copyright: function() {
- var copyright = $('<div id=\'jpoker_copyright\'><div class=\'jpoker_software\'>jpoker-' + this.VERSION + '</div><div class=\'jpoker_authors\'><div><span>Copyright 2008 </span><a href=\'mailto:loic@dachary.org\'>Loic Dachary</a></div><div><span class=\'jpoker_click\'>Copyright 2008 </span><a href=\'mailto:proppy@aminche.com\'>Johan Euphrosine</a></div></div><div class=\'jpoker_explain\'>jpoker runs on this web browser and is Free Software. You may use jpoker to run a business without asking the authors permissions. You may give a copy to your friends. However, the authors do not want jpoker to be used with proprietary software.</div><div class=\'jpoker_license\'>This program is free software: you can redistribute it and/or modify it under the terms of the <a href=\'http://www.fsf.org/licensing/licenses/gpl.txt\'>GNU General Public License</a> as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.</div> <div class=\'jpoker_full_copyright\'>Read the full <a href=\'http://jspoker.pokersource.info/jpoker/#Copyright\'>copyright information page.</a></div><div class=\'jpoker_download\'>Download <a href=\'http://upstream.jspoker.pokersource.info/file/tip/jpoker/js/jquery.jpoker.js\'>jpoker sources.</a></div><div class=\'jpoker_dismiss\'>Dismiss</div></div>').dialog({ width: 400, height: 400, resizable: false });
+ var copyright = $('<div><div id=\'jpoker_copyright\'><div class=\'jpoker_software\'>jpoker-' + this.VERSION + '</div><div class=\'jpoker_authors\'><div><span>Copyright 2008 </span><a href=\'mailto:loic@dachary.org\'>Loic Dachary</a></div><div><span class=\'jpoker_click\'>Copyright 2008 </span><a href=\'mailto:proppy@aminche.com\'>Johan Euphrosine</a></div></div><div class=\'jpoker_explain\'>jpoker runs on this web browser and is Free Software. You may use jpoker to run a business without asking the authors permissions. You may give a copy to your friends. However, the authors do not want jpoker to be used with proprietary software.</div><div class=\'jpoker_license\'>This program is free software: you can redistribute it and/or modify it under the terms of the <a href=\'http://www.fsf.org/licensing/licenses/gpl.txt\'>GNU General Public License</a> as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.</div> <div class=\'jpoker_full_copyright\'>Read the full <a href=\'http://jspoker.pokersource.info/jpoker/#Copyright\'>copyright information page.</a></div><div class=\'jpoker_download\'>Download <a href=\'http://upstream.jspoker.pokersource.info/file/tip/jpoker/js/jquery.jpoker.js\'>jpoker sources.</a></div><div class=\'jpoker_dismiss\'>Dismiss</div></div></div>').dialog({ width: 400, height: 400, resizable: false });
+ $('.ui-dialog-titlebar', copyright.parents('.ui-dialog-container')).hide();
var close = function() { copyright.dialog('destroy'); };
- window.setTimeout(close, 5000);
+ window.setTimeout(close, this.copyrightTimeout);
copyright.click(close);
return copyright;
},
@@ -2216,7 +2219,7 @@
if(rebuy.size() === 0) {
$('body').append('<div id=\'jpokerRebuy\' class=\'jpoker_jquery_ui\' title=\'' + _("Add chips") + '\' />');
rebuy = $('#jpokerRebuy');
- rebuy.dialog({ autoOpen: false });
+ rebuy.dialog({ autoOpen: false, resizable: false });
}
rebuy.empty();
rebuy.append('<div class=\'jpoker_rebuy_bound jpoker_rebuy_min\'>' + limits[0] + '</div>');
--- a/jpoker/js/skin-jpoker.js Tue Jul 01 18:38:42 2008 +0200
+++ b/jpoker/js/skin-jpoker.js Wed Jul 02 12:18:52 2008 +0200
@@ -79,11 +79,11 @@
$('#place').empty();
$('#text').hide();
- $('#jpokerCopyright').dialog('destroy');
- $('#jpokerDialog').dialog('destroy').remove();
- $('.jpokerLogin').remove();
- $('.jpokerTableList').remove();
- $('.jpokerServerStatus').remove();
+ $('#jpoker_copyright').dialog('destroy');
+ $('#jpoker_dialog').dialog('destroy').remove();
+ $('.jpoker_login').remove();
+ $('.jpoker_table_list').remove();
+ $('.jpoker_server_status').remove();
$.jpoker.uninit();
//
--- a/jpoker/skin.html Tue Jul 01 18:38:42 2008 +0200
+++ b/jpoker/skin.html Wed Jul 02 12:18:52 2008 +0200
@@ -36,6 +36,7 @@
<script language="JavaScript" type="text/javascript" src="js/skin-jpoker.js"></script>
<script type="text/javascript">
$.jpoker.verbose = 1;
+ $.jpoker.copyrightTimeout = 20000000;
</script>
<link href="css/jpoker.css" rel="stylesheet" type="text/css" />
</head>