Author: ludovic
Date: 2007-11-12 02:21:14 +0100 (Mon, 12 Nov 2007)
New Revision: 5822
Added:
xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/ie6.css
Modified:
xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/helpheader.vm
xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/htmlheader.vm
Log:
CURRIKI-1089 Implement Help for Curriculum Builder Styling
Modified:
xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/helpheader.vm
===================================================================
---
xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/helpheader.vm
2007-11-11 21:30:20 UTC (rev 5821)
+++
xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/helpheader.vm
2007-11-12 01:21:14 UTC (rev 5822)
@@ -35,6 +35,12 @@
<script type="text/javascript" src="$xwiki.getSkinFile("xwiki.js")"></script>
<script type="text/javascript"
src="$xwiki.getSkinFile("browserdetect.js")"></script>
<script type="text/javascript"
src="$xwiki.getSkinFile("ajax/wzToolTip.js")"></script>
+#set($ua = $request.getHeader("user-agent"))
+#if($ua.indexOf("MSIE 6")!=-1)
+#if(($ua.indexOf("MSIE 6")==-1)&&($ua.indexOf("MSIE 5")==-1))
+<link href="$xwiki.getSkinFile("ie6.css", true)" rel="stylesheet"
type="text/css" />
+#end
+#end
<link rel="stylesheet" href="/xwiki/bin/view/XWiki/style?xpage=plain"
type="text/css" />
</head>
<body id="body" class="help">
Modified:
xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/htmlheader.vm
===================================================================
---
xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/htmlheader.vm
2007-11-11 21:30:20 UTC (rev 5821)
+++
xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/htmlheader.vm
2007-11-12 01:21:14 UTC (rev 5822)
@@ -45,17 +45,9 @@
<script type="text/javascript"
src="$xwiki.getSkinFile("suggest/ajaxSuggest.js")"></script>
<script type="text/javascript"
src="$xwiki.getSkinFile("scripts/lightbox/lightbox.js")"></script>
#end
-<link rel="stylesheet" href="/xwiki/bin/view/XWiki/style?xpage=plain"
type="text/css" />
-#if($request.getHeader("user-agent").indexOf("MSIE")!=-1)
-<!--[if IE 7]>
+#set($ua = $request.getHeader("user-agent"))
+#if($ua.indexOf("MSIE")!=-1)
<style type="text/css">
-#browse-btn{
- padding: 4px 0px !important;
-}
-</style>
-<![endif]-->
-<!--[if IE]>
-<style type="text/css">
* html #actionmenu{
width: expression(document.body.clientWidth) !important;
}
@@ -63,13 +55,22 @@
height: 18px;
line-height: 18px;
}
-.tk-ModalDialog-content .find-selector-container .find-selector
SELECT.gwt-ListBox {
+.tk-ModalDialog-content .find-selector-container .find-selector
SELECT.gwt-ListBox {
height: 19px;
line-height: 19px;
}
</style>
-<![endif]-->
+#if(($ua.indexOf("MSIE 6")!=-1)||($ua.indexOf("MSIE 5")!=-1))
+<link href="$xwiki.getSkinFile("ie6.css", true)" rel="stylesheet"
type="text/css" />
+#else
+<style type="text/css">
+#browse-btn{
+ padding: 4px 0px !important;
+}
+</style>
#end
+#end
+<link rel="stylesheet" href="/xwiki/bin/view/XWiki/style?xpage=plain"
type="text/css" />
#if(($context.action=="inline")||($context.action=="edit") ||
($context.action=="admin"))
<script type="text/javascript">
var cancelEditNextOnunload;
Added: xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/ie6.css
===================================================================
--- xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/ie6.css
(rev 0)
+++ xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/ie6.css
2007-11-12 01:21:14 UTC (rev 5822)
@@ -0,0 +1,26 @@
+/* IE6 method for menu */
+#leftPanels.left {
+ margin-left: -215px;
+}
+.contenthideright {
+ border-left: 220px solid #ffffff;
+ margin-right: 10px;
+}
+.contenthideright {
+ margin-left: auto;
+}
+/* end ie6 menu */
+
+/* ie6 help */
+.help #contentcolumn {
+ padding-left: 0px;
+ float: right;
+}
+.help #leftPanels.left {
+ margin-left: 0px;
+}
+.help .contenthideright {
+ border-left: 0px;
+ margin-left: auto;
+}
+/* end ie6 help */
\ No newline at end of file
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
