Headers are now floating on the top of the window in Modern design

main
Inga 🏳‍🌈 13 years ago
parent fff6e037c9
commit 3237d07553
  1. 2
      Builder/IISMainHandler/build.txt
  2. 8
      Resources/FLocal/static/css/modern/global.css
  3. 23
      Resources/FLocal/static/js/modern.js
  4. 22
      Resources/FLocal/templates/Modern/elems/Main.xslt

@ -1,4 +1,8 @@
body { font-size:13.5pt; } body {
font-size:13.5pt;
margin:0;
padding:0;
}
FORM{ FORM{
DISPLAY:inline; DISPLAY:inline;
@ -30,7 +34,7 @@ pre
overflow-x: auto; overflow-x: auto;
overflow-y: hidden; overflow-y: hidden;
margin: 10px; margin: 10px;
width: 99%; width: 97%;
font-family:Consolas, monospace; font-family:Consolas, monospace;
} }

@ -27,3 +27,26 @@ function hideChildren(elem) {
clearTimeout(elem.interval); clearTimeout(elem.interval);
elem.interval = setTimeout(getChildrenHider(elem), 200); elem.interval = setTimeout(getChildrenHider(elem), 200);
} }
function makeMainboxScrollable() {
if(window.innerHeight > 0) {
var height = window.innerHeight;
height -= document.getElementById("headerContainer").clientHeight;
var width = window.innerWidth;
width -= document.getElementById("bjAndSlutsContainer").clientWidth;
var mainbox = document.getElementById("contentContainer");
mainbox.style.overflow = "auto";
mainbox.style.height = mainbox.style.maxHeight = height + "px";
mainbox.style.width = mainbox.style.maxWidth = width + "px";
}
}
function onLoad() {
if(typeof(window.addEventListener) == "function") {
makeMainboxScrollable();
window.addEventListener("resize", makeMainboxScrollable, false);
}
if(typeof(machicharaInit) == "function") {
machicharaInit();
}
}

@ -8,18 +8,18 @@
<html> <html>
<head> <head>
<meta http-equiv="x-ua-compatible" content="IE=8"/> <meta http-equiv="x-ua-compatible" content="IE=8"/>
<link rel="stylesheet" href="/static/css/modern/global.css?v6.4" type="text/css" /> <link rel="stylesheet" href="/static/css/modern/global.css?v6.5" type="text/css" />
<xsl:comment>[if lte IE 7]&gt;<![CDATA[ <xsl:comment>[if lte IE 7]&gt;<![CDATA[
<link rel="stylesheet" href="/static/css/modern/iefixes.css?v6.4" type="text/css" /> <link rel="stylesheet" href="/static/css/modern/iefixes.css?v6.5" type="text/css" />
]]>&lt;![endif]</xsl:comment> ]]>&lt;![endif]</xsl:comment>
<link rel="stylesheet" type="text/css" skin="skin"> <link rel="stylesheet" type="text/css" skin="skin">
<xsl:attribute name="href">/static/css/modern/<xsl:value-of select="modernSkin/name"/>.css?v6.4</xsl:attribute> <xsl:attribute name="href">/static/css/modern/<xsl:value-of select="modernSkin/name"/>.css?v6.5</xsl:attribute>
</link> </link>
<link rel="shortcut icon" href="/static/favicons/smirk.ico" type="image/x-icon" /> <link rel="shortcut icon" href="/static/favicons/smirk.ico" type="image/x-icon" />
<script language="Javascript" type="text/javascript" src="/static/js/common.js"><xsl:text> </xsl:text></script> <script language="Javascript" type="text/javascript" src="/static/js/common.js?v6.5"><xsl:text> </xsl:text></script>
<script language="Javascript" type="text/javascript" src="/static/js/modern.js?v6.4"><xsl:text> </xsl:text></script> <script language="Javascript" type="text/javascript" src="/static/js/modern.js?v6.5"><xsl:text> </xsl:text></script>
<script language="Javascript" type="text/javascript" src="/static/js/machichara/complex.js?v1"><xsl:text> </xsl:text></script> <script language="Javascript" type="text/javascript" src="/static/js/machichara/complex.js?v1"><xsl:text> </xsl:text></script>
<script language="Javascript" type="text/javascript" src="/static/js/machichara/simple.js?v6.4"><xsl:text> </xsl:text></script> <script language="Javascript" type="text/javascript" src="/static/js/machichara/simple.js?v6.5"><xsl:text> </xsl:text></script>
<script language="Javascript" type="text/javascript"> <script language="Javascript" type="text/javascript">
<xsl:attribute name="src"> <xsl:attribute name="src">
<xsl:text>/static/js/machichara/</xsl:text> <xsl:text>/static/js/machichara/</xsl:text>
@ -42,15 +42,17 @@
</title> </title>
</head> </head>
<body> <body>
<xsl:attribute name="onload">machicharaInit();</xsl:attribute> <xsl:attribute name="onload">onLoad();</xsl:attribute>
<xsl:if test="not(get/param[@name='headers'] = 'false')"> <xsl:if test="not(get/param[@name='headers'] = 'false')">
<xsl:call-template name="header"/> <div id="headerContainer">
<xsl:call-template name="header"/>
</div>
</xsl:if> </xsl:if>
<div style="float:left;width:97%;max-width:97%;overflow:visible;"> <div style="float:left;width:97%;max-width:97%;overflow:visible;" id="contentContainer">
<xsl:call-template name="specific"/> <xsl:call-template name="specific"/>
</div> </div>
<xsl:if test="not(get/param[@name='headers'] = 'false')"> <xsl:if test="not(get/param[@name='headers'] = 'false')">
<div style="min-width:20px;width:20px;max-width:20px;overflow:visible;position:absolute;top:4em;right:0px;text-align:right;z-index:4000"> <div style="min-width:20px;width:20px;max-width:20px;overflow:visible;position:absolute;top:4em;right:0px;text-align:right;z-index:4000" id="bjAndSlutsContainer">
<div style="min-width:20px;width:20px;max-width:20px;overflow:visible;text-align:right;height:260px;min-height:260px;max-height:260px;"> <div style="min-width:20px;width:20px;max-width:20px;overflow:visible;text-align:right;height:260px;min-height:260px;max-height:260px;">
<div style="position:absolute;top:0px;right:20px;display:none" id="pokerPlaceholder"> <div style="position:absolute;top:0px;right:20px;display:none" id="pokerPlaceholder">
<img border="0" src="/static/images/poker.jpg" alt="poker" align="top"/> <img border="0" src="/static/images/poker.jpg" alt="poker" align="top"/>

Loading…
Cancel
Save