Author: vmassol
Date: 2008-02-08 09:41:59 +0100 (Fri, 08 Feb 2008)
New Revision: 7370
Modified:
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/css/lightbox/lightboxIE.css
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/edituser.vm
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/stylesheets.vm
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/usersandgroups.css
Log:
XSALBATROSS-6: Interface bugs in Rights Management UI with IE6
Patch submitted by Evelina
* Note 1: I have NOT verified this patch. Could someone with IE6 please confirm
it works fine? Thanks
* Note 2: Do we need to update something in Toucan too?
Modified:
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/css/lightbox/lightboxIE.css
===================================================================
---
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/css/lightbox/lightboxIE.css
2008-02-08 01:58:51 UTC (rev 7369)
+++
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/css/lightbox/lightboxIE.css
2008-02-08 08:41:59 UTC (rev 7370)
@@ -46,8 +46,8 @@
top: 0;
width: 100%;
z-index: 100000;
- /* filter: alpha(opacity=70);
- opacity: 0.7; */
+ filter: alpha(opacity=70);
+ opacity: 0.7;
overflow: auto;
}
@@ -108,11 +108,11 @@
margin-top: 0;
padding-top: 0;
}
-<!-- IE sucks -->
+
#lb-top .roundedlight {
- _margin-bottom: -0.15em;
- _margin-top: -0.9em;
+ margin-bottom: -0.15em;
+ margin-top: -0.9em;
}
@@ -121,8 +121,8 @@
}
#lb-top .rounded {
- margin-bottom: 0em;/* avant 0.1 pour IE7 ?*/
- margin-top: 0em; /* avant 0.3 pour IE7 ?*/
+ margin-bottom: 0em;
+ margin-top: 0em;
}
@@ -132,13 +132,13 @@
*+html #lb-top .rounded .b1, * html #lb-top .rounded .b1, *+html
#lb-top .roundedlight .b1, * html #lb-top .roundedlight .b1 {
- margin-bottom: -0.15em;
+ margin-bottom: -1em;
}
*+html #lb-bottom .rounded .b12b, * html #lb-bottom .rounded .b12b,
*+html #lb-bottom .roundedlight .b4b, * html #lb-bottom .roundedlight
.b4b {
- margin-bottom: -0.1em;
+ margin-bottom: -1em;
}
@@ -163,6 +163,6 @@
margin-right: 10px;
width: 30px;
cursor: pointer;
- background-image:
url("$xwiki.getSkinFile("icons/rights-manager/btnClose.png")");
+ background-image:
url($xwiki.getSkinFile("icons/rights-manager/btnClose.png"));
background-repeat: no-repeat;
}
\ No newline at end of file
Modified:
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/edituser.vm
===================================================================
---
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/edituser.vm
2008-02-08 01:58:51 UTC (rev 7369)
+++
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/edituser.vm
2008-02-08 08:41:59 UTC (rev 7370)
@@ -21,6 +21,7 @@
#if($context.user == $doc.getFullName())
$msg.get("rightsmanager.edituserprofile") <a
href="$doc.getURL()">$msg.get("rightsmanager.userprofile")</a>
#end
-<span class="buttonwrapper"><input class="button" type="submit"
name="formactionsave" value="$msg.get("save")" onclick="
window.lb.lbSaveForm();"/></span>
-<span class="buttonwrapper"><input class="button" type="submit"
name="formactioncancel" value="$msg.get("cancel")" onclick="
window.lb.lbHide(); window.lb.lbClearData(); return false;"/></span>
+<br /><br />
+<span><input class="button" type="submit" name="formactionsave"
value="$msg.get("save")" onclick=" window.lb.lbSaveForm();"/></span>
+<span><input class="button" type="submit" name="formactioncancel"
value="$msg.get("cancel")" onclick=" window.lb.lbHide();
window.lb.lbClearData(); return false;"/></span>
</div>
\ No newline at end of file
Modified:
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/stylesheets.vm
===================================================================
---
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/stylesheets.vm
2008-02-08 01:58:51 UTC (rev 7369)
+++
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/stylesheets.vm
2008-02-08 08:41:59 UTC (rev 7370)
@@ -28,5 +28,5 @@
<link href="${request.contextPath}/yui/treeview/assets/tree.css"
rel="stylesheet" type="text/css"/>
<link href="$xwiki.getSkinFile("css/lightbox/lightbox.css", true)"
rel="stylesheet" type="text/css" />
<!--[if IE]>
- <link href="$xwiki.getSkinFile("css/lightbox/lightboxIE.css", true)"
rel="stylesheet" type="text/css" title="Lightbox Stylesheet For Ie" />
+ <link href="$xwiki.getSkinFile("css/lightbox/lightboxIE.css", true)"
rel="stylesheet" type="text/css" />
<![endif]-->
Modified:
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/usersandgroups.css
===================================================================
---
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/usersandgroups.css
2008-02-08 01:58:51 UTC (rev 7369)
+++
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/usersandgroups.css
2008-02-08 08:41:59 UTC (rev 7370)
@@ -80,7 +80,6 @@
}
#userstable, #groupstable, #usersandgroupstable {
- width: 100%;
position: relative;
padding: 0px;
margin: 0px;
@@ -140,28 +139,28 @@
#tdAddNewUserOrGroup a {
- color: #fff;
- font-weight: bold;
- font-size: 12px;
- text-decoration: none;
- background-image:
url("$xwiki.getSkinFile('icons/rights-manager/but1.png')");
+ color: #fff;
+ font-weight: bold;
+ font-size: 12px;
+ text-decoration: none;
+ background-image:
url($xwiki.getSkinFile('icons/rights-manager/but1.png'));
background-repeat: no-repeat !important;
- display: block;
- text-align: center;
- padding-top: 3px;
- width: 130px;
- height: 24px;
+ display: block;
+ text-align: center;
+ padding-top: 3px;
+ width: 130px;
+ height: 24px;
}
#errMsg {
- color: #DD7700;
- font-size: 12px;
- font-weight: bold;
+ color: #DD7700;
+ font-size: 12px;
+ font-weight: bold;
}
#XWikiGuestSpecial {
- background-color: #fff;
- color: #000;
+ background-color: #fff;
+ color: #000;
}
.suorg {
@@ -179,4 +178,4 @@
.addlabel {
font-weight: bold;
-}
\ No newline at end of file
+}
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
