You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by ra...@apache.org on 2007/11/20 11:51:36 UTC
svn commit: r596608 - in /lenya/trunk/src/webapp/lenya:
resources/css/ie6hacksonly.css resources/css/tabs.css
xslt/menu/menu2xslt.xsl xslt/util/page2xhtml.xsl
Author: ragaller
Date: Tue Nov 20 02:51:35 2007
New Revision: 596608
URL: http://svn.apache.org/viewvc?rev=596608&view=rev
Log:
Improvements for browser compatibility (ie6, 7, safari >2 and firefox should work now) and stability (prevents collapsing) at small screen sizes
Please report admin gui layout problems
fixes bug 43899
http://issues.apache.org/bugzilla/show_bug.cgi?id=43899
Added:
lenya/trunk/src/webapp/lenya/resources/css/ie6hacksonly.css (with props)
Modified:
lenya/trunk/src/webapp/lenya/resources/css/tabs.css
lenya/trunk/src/webapp/lenya/xslt/menu/menu2xslt.xsl
lenya/trunk/src/webapp/lenya/xslt/util/page2xhtml.xsl
Added: lenya/trunk/src/webapp/lenya/resources/css/ie6hacksonly.css
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/resources/css/ie6hacksonly.css?rev=596608&view=auto
==============================================================================
--- lenya/trunk/src/webapp/lenya/resources/css/ie6hacksonly.css (added)
+++ lenya/trunk/src/webapp/lenya/resources/css/ie6hacksonly.css Tue Nov 20 02:51:35 2007
@@ -0,0 +1,77 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+/* internet explorer 6 hacks
+ the hacks work around the quirks mode
+ it is in effect because ie 6 misinterprets
+ the xml declaration */
+
+/* font size fixes */
+#lenya-info-treecanvas span {
+ font-size: 11px;
+}
+
+.lenya-tabs,
+.lenya-tablink,
+.lenya-tablink-active,
+.lenya-tab,
+.lenya-tab-sitetree,
+table.lenya-table-noborder td,
+table.lenya-table-noborder th,
+table.lenya-table-list th,
+table.lenya-table-list td,
+table.lenya-table-list-noborder th,
+table.lenya-table-list-noborder td,
+div.lenya-box,
+p,
+.lenya-body p,
+li {
+ font-size: x-small;
+}
+
+.lenya-tab h1,
+.lenya-tab-sitetree h1 {
+ font-size: small;
+}
+
+/* hacks for the broken box model */
+#contentblock1.lenya-tab {
+ margin-left: 160px;
+}
+
+.lenya-tabs {
+ width: 160px;
+}
+
+/* fix for some malpositioned svg rounded corners (bottom right) */
+div.lenya-box-bottom {
+ position: relative;
+ right: 2px;
+ background-position: 2px bottom;
+}
+
+#contentblock1 div.lenya-box-bottom {
+ right: 0;
+ background-position: left bottom;
+}
+
+/* ie 6 does not understand min-width, this is a workaround
+ sorry for not beeing standards compliant here
+ possibly this hack needs the quirks mode */
+.lenya-tab, .lenya-tab-sitetree {
+ height: expression(body.offsetHeight>100?'400':'auto');
+}
\ No newline at end of file
Propchange: lenya/trunk/src/webapp/lenya/resources/css/ie6hacksonly.css
------------------------------------------------------------------------------
svn:eol-style = native
Modified: lenya/trunk/src/webapp/lenya/resources/css/tabs.css
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/resources/css/tabs.css?rev=596608&r1=596607&r2=596608&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/resources/css/tabs.css (original)
+++ lenya/trunk/src/webapp/lenya/resources/css/tabs.css Tue Nov 20 02:51:35 2007
@@ -22,9 +22,9 @@
background-color: #F5F4E9;
color: black;
border: solid 1px #CCCCCC;
- display: table-cell;
vertical-align: top;
padding: 0 20px 20px 20px;
+ width: inherit;
min-height: 400px;
}
@@ -38,11 +38,31 @@
.lenya-tab h2, .lenya-tab-sitetree h2 {
font-size: medium;
}
+
+#contentblock1.lenya-tab-sitetree {
+ position: absolute;
+ left: 30px;
+ margin-left: 410px;
+}
+
+#contentblock1.lenya-tab {
+ position: absolute;
+ left: 30px;
+ margin-left: 140px;
+}
+
+#contentblock1 .lenya-box {
+ display: relative;
+}
.lenya-tabs {
- display: table-cell;
+ float: left;
vertical-align: top;
- /* margin-top: 40px; */
+ width: 140px;
+}
+
+#lenya-info-treecanvas .lenya-tabs {
+ width: 200px;
}
#lenya-info-treecanvas .lenya-tablink,
@@ -103,10 +123,10 @@
}
#lenya-info-treecanvas {
- font-size: 8pt;
+ font-size: 11px;
float: left;
padding-right: 20px;
- width: 20%;
+ width: 250px;
}
#lenya-info-tree {
@@ -120,8 +140,6 @@
}
#lenya-info-tree span {
- font-family: verdana, helvetica, sans-serif;
- font-size: small;
color: #333333;
text-decoration: none;
cursor: pointer;
Modified: lenya/trunk/src/webapp/lenya/xslt/menu/menu2xslt.xsl
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/xslt/menu/menu2xslt.xsl?rev=596608&r1=596607&r2=596608&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/xslt/menu/menu2xslt.xsl (original)
+++ lenya/trunk/src/webapp/lenya/xslt/menu/menu2xslt.xsl Tue Nov 20 02:51:35 2007
@@ -52,6 +52,12 @@
<link href="{$contextprefix}/lenya/css/menu.css" rel="stylesheet" type="text/css"/>
<link rel="icon" href="{$contextprefix}/favicon.ico" type="image/ico"/>
<xso:apply-templates select="xhtml:html/xhtml:head/*[local-name() != 'title']"/>
+ <!-- internet explorer 6 switches to quirks mode with the xml declaration
+ the quirks layout inconsistencies are fixed in a ie6 only stylesheet -->
+ <xso:variable name="contextprefix">
+ <xsl:value-of select="$contextprefix"/>
+ </xso:variable>
+ <xso:comment>[if IE 6]<![CDATA[>]]><link rel="stylesheet" type="text/css" href="<xso:value-of select="$contextprefix"/>/lenya/css/ie6hacksonly.css" /><![CDATA[<![endif]]]></xso:comment>
</head>
<body>
<xso:apply-templates select="xhtml:html/xhtml:body/@*"/>
Modified: lenya/trunk/src/webapp/lenya/xslt/util/page2xhtml.xsl
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/xslt/util/page2xhtml.xsl?rev=596608&r1=596607&r2=596608&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/xslt/util/page2xhtml.xsl (original)
+++ lenya/trunk/src/webapp/lenya/xslt/util/page2xhtml.xsl Tue Nov 20 02:51:35 2007
@@ -34,6 +34,7 @@
<head>
<title><xsl:apply-templates select="page:title/node()" mode="htmlTitle"/></title>
<link rel="stylesheet" type="text/css" href="/lenya/css/default.css" title="default css"/>
+ <xsl:comment>[if IE 6]<![CDATA[>]]><link rel="stylesheet" type="text/css" href="/lenya/css/ie6hacksonly.css" /><![CDATA[<![endif]]]></xsl:comment>
<link rel="icon" href="/favicon.ico" type="image/ico"/>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8"/>
<xsl:apply-templates select="xhtml:script"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org