Author: tmortagne
Date: 2007-11-15 15:35:14 +0100 (Thu, 15 Nov 2007)
New Revision: 5886
Added:
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/css/lightbox/lightboxIE.css
Modified:
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/css/lightbox/lightbox.css
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/global.vm
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/scripts/lightbox/lightbox.js
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/style.css
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/stylesheets.vm
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/suggest/ajaxSuggest.css
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/usersandgroups.css
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/usersandgroups.js
Log:
XWIKI-1780: Improve rights management
Fixed some CSS validation errors.
(Apply Evelina's patch without modifications)
Modified:
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/css/lightbox/lightbox.css
===================================================================
---
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/css/lightbox/lightbox.css
2007-11-15 14:35:08 UTC (rev 5885)
+++
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/css/lightbox/lightbox.css
2007-11-15 14:35:14 UTC (rev 5886)
@@ -8,17 +8,8 @@
background: #EEF3F6 none repeat scroll 0% 50%;
height: 1px;
border-width: 0 1px;
- _margin: 0;
- _padding: 0;
- _zoom: 1;
- _line-height: 1px;
}
-.rounded, .rounded .top, .rounded .bottom {
- _height: 16px ;
-}
-.roundedlight, .roundedlight .top, .roundedlight .bottom {
- _height: 5px ;
-}
+
.roundedlight .b1, .roundedlight .b1b { background: #A9B6C3 none repeat scroll
0% 50%; margin: 0 5px; border-width: 0; }
.roundedlight .b2, .roundedlight .b2b { border-width: 0 2px; margin: 0 3px; }
.roundedlight .b3, .roundedlight .b3b { margin: 0pt 2px; }
@@ -41,13 +32,9 @@
height: 100%;
left: 0;
position: fixed;
- _position:absolute;
top: 0;
width: 100%;
z-index: 100000;
- filter: alpha(opacity=70);
- -moz-opacity: 0.7;
- -khtml-opacity: 0.7;
opacity: 0.7;
overflow: auto;
}
@@ -57,7 +44,7 @@
}
#lb button{
- cursor: hand;
+ cursor: pointer;
}
#lb-align {
@@ -71,13 +58,12 @@
}
#lb {
-position: absolute;
-left: 50%;
-top: 50px;
-margin-left: -450px;
-z-index: 100005;
-width: 900px;
-
+ position: absolute;
+ left: 50%;
+ top: 50px;
+ margin-left: -450px;
+ z-index: 100005;
+ width: 900px;
}
.lb-content {
@@ -88,9 +74,7 @@
text-align: center;
}
-#lb ul li {
- _zoom:1;
-}
+
#lb-top {}
#lb-bottom {}
.lb-squarred {
@@ -110,43 +94,26 @@
margin-top: 0;
padding-top: 0;
}
-<!-- IE sucks -->
-<!-- roundedlight -->
+
+
*+html #lb-top .roundedlight, * html #lb-top .roundedlight {
margin-top: -1em;
}
-#lb-top .roundedlight {
- _margin-bottom: -0.15em;
- _margin-top: -0.9em;
-}
-
* html #lb-bottom .roundedlight {
margin-top: -1em;
}
-#lb-bottom .roundedlight {
- _margin-top: -0.75em;
-}
-<!-- IE sucks -->
-<!-- rounded -->
*+html #lb-top .rounded, * html #lb-top .rounded {
margin-top: -1em;
}
-#lb-top .rounded {
- _margin-bottom: 0em;/* avant 0.1 pour IE7 ?*/
- _margin-top: 0em; /* avant 0.3 pour IE7 ?*/
-}
/* *+html #lb-bottom .rounded, */
* html #lb-bottom .rounded {
margin-top: 0em; /* avant -1em*/
}
-#lb-bottom .rounded {
- _margin-top: -0.2em;
-}
*+html #lb-top .rounded .b1, * html #lb-top .rounded .b1, *+html
#lb-top .roundedlight .b1, * html #lb-top .roundedlight .b1 {
@@ -161,7 +128,7 @@
#lb .lb-content {
-padding: 0 18px;
+ padding: 0 18px;
}
.lb-content{
Added:
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/css/lightbox/lightboxIE.css
===================================================================
---
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/css/lightbox/lightboxIE.css
(rev 0)
+++
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/css/lightbox/lightboxIE.css
2007-11-15 14:35:14 UTC (rev 5886)
@@ -0,0 +1,163 @@
+/* -------------------------------------------------------- */
+.rounded .top *, .rounded .bottom *, .roundedlight .top *,
+.roundedlight .bottom * {
+ display: block;
+ overflow: hidden;
+ border-color: #A9B6C3;
+ border-style: solid;
+ background: #EEF3F6 none repeat scroll 0% 50%;
+ height: 1px;
+ border-width: 0 1px;
+ margin: 0;
+ padding: 0;
+ zoom: 1;
+ line-height: 1px;
+ }
+.rounded, .rounded .top, .rounded .bottom {
+ height: 16px ;
+}
+
+
+.roundedlight, .roundedlight .top, .roundedlight .bottom {
+ height: 5px ;
+}
+.roundedlight .b1, .roundedlight .b1b { background: #A9B6C3 none repeat scroll
0% 50%; margin: 0 5px; border-width: 0; }
+.roundedlight .b2, .roundedlight .b2b { border-width: 0 2px; margin: 0 3px; }
+.roundedlight .b3, .roundedlight .b3b { margin: 0pt 2px; }
+.roundedlight .b4, .roundedlight .b4b { height: 2px; margin: 0 1px; }
+.rounded .b1, .rounded .b1b { border-width: 0; margin: 0 16px; background:
#A9B6C3 none repeat scroll 0% 50%; }
+.rounded .b2, .rounded .b2b { border-width: 0 3px; margin: 0 13px; }
+.rounded .b3, .rounded .b3b { border-width: 0 2px; margin: 0 11px; }
+.rounded .b4, .rounded .b4b { border-width: 0 2px; margin: 0 9px; }
+.rounded .b5, .rounded .b5b { margin: 0 8px; }
+.rounded .b6, .rounded .b6b { margin: 0 7px; }
+.rounded .b7, .rounded .b7b { margin: 0 6px; }
+.rounded .b8, .rounded .b8b { margin: 0 5px; }
+.rounded .b9, .rounded .b9b { margin: 0 4px; }
+.rounded .b10, .rounded .b10b { height: 2px; margin: 0 3px; }
+.rounded .b11, .rounded .b11b { height: 2px; margin: 0 2px; }
+.rounded .b12, .rounded .b12b { height: 3px; margin: 0 1px; }
+
+#lb-bg {
+ background-color: #000;
+ height: 100%;
+ left: 0;
+ position:absolute;
+ top: 0;
+ width: 100%;
+ z-index: 100000;
+ filter: alpha(opacity=70);
+ opacity: 0.7;
+ overflow: auto;
+}
+
+#lb input[type=text], #lb textarea {
+ cursor: text;
+}
+
+#lb button{
+ cursor: hand;
+}
+
+#lb-align {
+ min-height: 100%;
+ position: absolute;
+ width: 100%;
+ left: 0;
+ text-align: center;
+ vertical-align: middle;
+ z-index: 100002;
+}
+
+#lb {
+ position: absolute;
+ left: 50%;
+ top: 50px;
+ margin-left: -450px;
+ z-index: 100005;
+ width: 900px;
+}
+
+.lb-content {
+ background: #eef3f6;
+ border: 1px solid #A9B6C3;
+ border-width: 0 1px;
+ padding: 0px;
+ text-align: center;
+}
+
+#lb ul li {
+ _zoom:1;
+}
+#lb-top {}
+#lb-bottom {}
+.lb-squarred {
+ background: #eef3f6;
+ border: 1px solid #A9B6C3;
+}
+
+#lb-bottom .lb-squarred {
+ border-top-width: 0;
+}
+
+#lb-top .lb-squarred {
+ border-bottom-width: 0;
+}
+
+#lb-content h1, #lb-content h2, #lb-content h3 {
+ margin-top: 0;
+ padding-top: 0;
+}
+<!-- IE sucks -->
+
+#lb-top .roundedlight {
+ _margin-bottom: -0.15em;
+ _margin-top: -0.9em;
+}
+
+
+#lb-bottom .roundedlight {
+ margin-top: -0.75em;
+}
+
+#lb-top .rounded {
+ margin-bottom: 0em;/* avant 0.1 pour IE7 ?*/
+ margin-top: 0em; /* avant 0.3 pour IE7 ?*/
+}
+
+
+#lb-bottom .rounded {
+ margin-top: -0.2em;
+}
+
+*+html #lb-top .rounded .b1, * html #lb-top .rounded .b1, *+html
+#lb-top .roundedlight .b1, * html #lb-top .roundedlight .b1 {
+ margin-bottom: -0.15em;
+}
+
+*+html #lb-bottom .rounded .b12b, * html #lb-bottom .rounded .b12b,
+*+html #lb-bottom .roundedlight .b4b, * html #lb-bottom .roundedlight
+.b4b {
+ margin-bottom: -0.1em;
+}
+
+
+#lb .lb-content {
+ padding: 0 18px;
+}
+
+.lb-content{
+ overflow: hidden;
+ text-align: left;
+}
+
+.lbClose {
+ position: relative;
+ top: 20px;
+ right: 20px;
+ width: 30px;
+ cursor: pointer;
+ z-index: 100007;
+ background-image:
url("$xwiki.getSkinFile("icons/rights-manager/btnClose.png")");
+ background-repeat: no-repeat;
+}
Property changes on:
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/css/lightbox/lightboxIE.css
___________________________________________________________________
Name: svn:eol-style
+ native
Modified:
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/global.vm
===================================================================
---
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/global.vm
2007-11-15 14:35:08 UTC (rev 5885)
+++
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/global.vm
2007-11-15 14:35:14 UTC (rev 5886)
@@ -49,12 +49,10 @@
#end
#if($isguest && $xwiki.hasAccessLevel("register", "XWiki.XWikiPreferences"))
#set($regurl = $xwiki.getURL("XWiki.Register", "register"))
- <a class="glink" href="$!regurl"
id="headerregister">$!msg.get("register")</a>#sep()
+ <a class="glink" href="$!regurl"
id="headerregister">$!msg.get("core.register")</a>#sep()
#end
-#if($xwiki.hasAccessLevel("admin", $context.user, "XWiki.XWikiPreferences"))
+#if($hasadmin)
<a class="glink" href="$!xwiki.getURL("XWiki.XWikiPreferences","admin")"
id="headeradmin">$!msg.get("admin")</a> #sep()
-#elseif($xwiki.hasAccessLevel("admin", $context.user,
"${doc.space}.WebPreferences"))
- <a class="glink" href="$!xwiki.getURL("${doc.space}.WebPreferences",
"admin")" id="headeradmin">$!msg.get("admin")</a> #sep()
#end
#if($xwiki.isMultiLingual())
<span class="glink" id="headerlanguages">
Modified:
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/scripts/lightbox/lightbox.js
===================================================================
---
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/scripts/lightbox/lightbox.js
2007-11-15 14:35:08 UTC (rev 5885)
+++
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/scripts/lightbox/lightbox.js
2007-11-15 14:35:14 UTC (rev 5886)
@@ -4,7 +4,7 @@
initialize: function(formUrl, saveUrl, redirectUrl) {
this.formUrl = formUrl;
this.saveUrl = saveUrl;
- this.redirectUrl = redirectUrl;
+ this.redirectUrl = redirectUrl;
this.formData = "";
this.loadedForms = new Object();
this.lbinit();
@@ -151,41 +151,31 @@
return str;
},
- roundedlightbottom: function(bgcolor, bordercolor) {
+ roundedlightbottom: function(bgcolor, bordercolor) {
var str = '<div class="roundedlight"><b class="top">' +
- '<b class="b4b" style="background:' + bordercolor +
';"></b>' +
- '<b class="b3b" style="background:' + bgcolor + ';
border-color:' + bordercolor + ';"></b>' +
- '<b class="b3b" style="background:' + bgcolor + ';
border-color:' + bordercolor + ';"></b>' +
- '<b class="b1b" style="background:' + bgcolor + ';
border-color:' + bordercolor + ';"></b></b> </div>';
+ '<b class="b4b" style="background:' + bordercolor + ';"></b>' +
+ '<b class="b3b" style="background:' + bgcolor + ';
border-color:' + bordercolor + ';"></b>' +
+ '<b class="b3b" style="background:' + bgcolor + ';
border-color:' + bordercolor + ';"></b>' +
+ '<b class="b1b" style="background:' + bgcolor + ';
border-color:' + bordercolor + ';"></b></b> </div>';
return str;
},
-
- roundedlightbottom: function(bgcolor) {
- return this.roundedlightbottom(bgcolor, "");
- },
-
-
- roundedlightbottom: function(bgcolor, bordercolor) {
- return this.roundedlightbottom(bgcolor, bordercolor);
- },
-
roundedbottom: function(bgcolor, bordercolor) {
var str = '<div class="rounded">' +
- '<b class="bottom">' +
- '<b class="b12b" style="background:' + bordercolor
+';"></b>' +
- '<b class="b11b" style="background:' + bgcolor + ';
border-color:' + bordercolor + ';"></b>' +
- '<b class="b10b" style="background:' + bgcolor + ';
border-color:' + bordercolor + ';"></b>' +
- '<b class="b9b" style="background:' + bgcolor + ';
border-color:' + bordercolor + ';"></b>' +
- '<b class="b8b" style="background:' + bgcolor + ';
border-color:' + bordercolor + ';"></b>' +
- '<b class="b7b" style="background:' + bgcolor + ';
border-color:' + bordercolor + ';"></b>' +
- '<b class="b6b" style="background:' + bgcolor + ';
border-color:' + bordercolor + ';"></b>' +
- '<b class="b5b" style="background:' + bgcolor + ';
border-color:' + bordercolor + ';"></b>' +
- '<b class="b4b" style="background:' + bgcolor + ';
border-color:' + bordercolor + ';"></b>' +
- '<b class="b3b" style="background:'+ bgcolor + ';
border-color:' + bordercolor + ';"></b>' +
- '<b class="b2b" style="background:'+ bgcolor + ';
border-color:' + bordercolor + ';"></b>' +
- '<b class="b1b" style="background:'+ bgcolor + ';
border-color:' + bordercolor + ';"></b>' +
- '</b></div>';
+ '<b class="bottom">' +
+ '<b class="b12b" style="background:' + bordercolor +';"></b>' +
+ '<b class="b11b" style="background:' + bgcolor + ';
border-color:' + bordercolor + ';"></b>' +
+ '<b class="b10b" style="background:' + bgcolor + ';
border-color:' + bordercolor + ';"></b>' +
+ '<b class="b9b" style="background:' + bgcolor + ';
border-color:' + bordercolor + ';"></b>' +
+ '<b class="b8b" style="background:' + bgcolor + ';
border-color:' + bordercolor + ';"></b>' +
+ '<b class="b7b" style="background:' + bgcolor + ';
border-color:' + bordercolor + ';"></b>' +
+ '<b class="b6b" style="background:' + bgcolor + ';
border-color:' + bordercolor + ';"></b>' +
+ '<b class="b5b" style="background:' + bgcolor + ';
border-color:' + bordercolor + ';"></b>' +
+ '<b class="b4b" style="background:' + bgcolor + ';
border-color:' + bordercolor + ';"></b>' +
+ '<b class="b3b" style="background:'+ bgcolor + '; border-color:'
+ bordercolor + ';"></b>' +
+ '<b class="b2b" style="background:'+ bgcolor + '; border-color:'
+ bordercolor + ';"></b>' +
+ '<b class="b1b" style="background:'+ bgcolor + '; border-color:'
+ bordercolor + ';"></b>' +
+ '</b></div>';
return str;
},
@@ -195,7 +185,7 @@
'<b class="b2" style="background:' + bgcolor + ';
border-color:' + bordercolor + ';"></b>' +
'<b class="b3" style="background:' + bgcolor + ';
border-color:' + bordercolor + ';"></b>' +
'<b class="b4" style="background:' + bgcolor + ';
border-color:' + bordercolor + ';"></b></b> </div>';
- return str;
+ return str;
},
roundedtop: function(bgcolor, bordercolor) {
@@ -205,15 +195,15 @@
'<b class="b2" style="background:' + bgcolor + ';
border-color:' + bordercolor + ';"></b>' +
'<b class="b3" style="background:' + bgcolor + ';
border-color:' + bordercolor + ';"></b>' +
'<b class="b4" style="background:' + bgcolor + ';
border-color:' + bordercolor + ';"></b>' +
- '<b class="b5" style="background:' +
bgcolor + '; border-color:' + bordercolor + ';"></b>' +
- '<b class="b6" style="background:' +
bgcolor + '; border-color:' + bordercolor + ';"></b>' +
+ '<b
class="b5" style="background:' + bgcolor + '; border-color:' + bordercolor +
';"></b>' +
+ '<b
class="b6" style="background:' + bgcolor + '; border-color:' + bordercolor +
';"></b>' +
'<b class="b7" style="background:' + bgcolor + ';
border-color:' + bordercolor + ';"></b>' +
'<b class="b8" style="background:' + bgcolor + ';
border-color:' + bordercolor + ';"></b>' +
- '<b class="b9" style="background:' +
bgcolor + '; border-color:' + bordercolor + ';"></b>' +
- '<b class="b10" style="background:'+
bgcolor + '; border-color:' + bordercolor + ';"></b>' +
- '<b class="b11" style="background:'+
bgcolor + '; border-color:' + bordercolor + ';"></b>' +
- '<b class="b12" style="background:'+
bgcolor + '; border-color:' + bordercolor + ';"></b>' +
- '</b></div>';
+ '<b
class="b9" style="background:' + bgcolor + '; border-color:' + bordercolor +
';"></b>' +
+ '<b
class="b10" style="background:'+ bgcolor + '; border-color:' + bordercolor +
';"></b>' +
+ '<b
class="b11" style="background:'+ bgcolor + '; border-color:' + bordercolor +
';"></b>' +
+ '<b
class="b12" style="background:'+ bgcolor + '; border-color:' + bordercolor +
';"></b>' +
+
'</b></div>';
return str;
},
Modified:
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/style.css
===================================================================
---
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/style.css
2007-11-15 14:35:08 UTC (rev 5885)
+++
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/style.css
2007-11-15 14:35:14 UTC (rev 5886)
@@ -27,8 +27,6 @@
@import "usersandgroups.css";
[EMAIL PROTECTED] "css/lightbox/lightbox.css";
-
@import "suggest/ajaxSuggest.css";
.rightmenu a {
Modified:
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/stylesheets.vm
===================================================================
---
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/stylesheets.vm
2007-11-15 14:35:08 UTC (rev 5885)
+++
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/stylesheets.vm
2007-11-15 14:35:14 UTC (rev 5886)
@@ -23,4 +23,10 @@
<link href="$xwiki.getSkinFile("style2.css")" rel="alternate stylesheet"
type="text/css" title="Alternate StyleSheet 2" />
<link href="$xwiki.getSkinFile("style3.css")" rel="alternate stylesheet"
type="text/css" title="Alternate StyleSheet 3" />
#end
-<link href="${request.contextPath}/yui/treeview/assets/tree.css"
rel="stylesheet" type="text/css"/>
\ No newline at end of file
+<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" />
+<![endif]-->
\ No newline at end of file
Modified:
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/suggest/ajaxSuggest.css
===================================================================
---
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/suggest/ajaxSuggest.css
2007-11-15 14:35:08 UTC (rev 5885)
+++
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/suggest/ajaxSuggest.css
2007-11-15 14:35:14 UTC (rev 5886)
@@ -1,4 +1,3 @@
-
body
{
position: relative;
Modified:
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/usersandgroups.css
===================================================================
---
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/usersandgroups.css
2007-11-15 14:35:08 UTC (rev 5885)
+++
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/usersandgroups.css
2007-11-15 14:35:14 UTC (rev 5886)
@@ -7,7 +7,6 @@
padding:0px;
width: 25px;
left: -10px;
- /* _left: -5px; css hack for ie! */
position: relative;
}
@@ -107,6 +106,11 @@
width: 15%;
}
+.hmanage {
+ width: 15%;
+ padding-left: 10px;
+}
+
.rights {
text-align: center;
padding-left: 0px !important;
Modified:
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/usersandgroups.js
===================================================================
---
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/usersandgroups.js
2007-11-15 14:35:08 UTC (rev 5885)
+++
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/usersandgroups.js
2007-11-15 14:35:14 UTC (rev 5886)
@@ -48,6 +48,7 @@
onSuccess: function( transport ) {
$('ajax-loader').style.display = "none";
var res = eval( '(' + transport.responseText + ')');
+
if(res.totalrows <= res.returnedrows)
pivot.scroller.domNode.style.display = "none";
else
@@ -76,7 +77,7 @@
},
displayRows: function( offset, limit ) {
-
+
var f = offset + limit - 1;
if(f > this.totalRows) f = this.totalRows;
var off = (this.totalRows > 0 ) ? offset : 0;
@@ -90,13 +91,14 @@
this.domNode.appendChild( elem );
}
- var raport = this.totalRows / limit;
- var outheight = this.domNode.parentNode.offsetHeight;
- // the header?
- var inheight = Math.round(outheight * raport) + 10;
-
- this.scroller.domNode.style.height = outheight + "px";
- this.scroller.domNode.firstChild.style.height = inheight + "px";
+ var raport = this.totalRows / limit;
+ var outheight = this.domNode.parentNode.offsetHeight;
+ // the header?
+ var inheight = Math.round(outheight * raport)+10;
+ this.scroller.domNode.style.height = outheight + "px";
+ this.scroller.domNode.firstChild.style.height = inheight + "px";
+ this.scroller.domNode.style.display = "block";
+
},
showRows: function( offset, limit )
@@ -133,7 +135,7 @@
//we need get new rows
else
{
- buff += 'we need to get rows '+min+' to '+(max+1)+' <br />\n';
+ buff += 'we need to get rows '+min+' to '+ (max+1) +' <br />\n';
this.getRows( min, max - min + 1, offset, limit );
}
return buff;
@@ -165,9 +167,9 @@
//compute new refresh offset
var newoffset = this.lastoffset;
if(indx > this.totalRows - this.limit - 1)
- newoffset -= 1;
+ newoffset -= 1;
if(newoffset <= 0)
- newoffset = 1;
+ newoffset = 1;
this.totalRows -= 1;
this.showRows(newoffset, this.limit);
this.scroller.refreshScrollbar();
@@ -330,6 +332,7 @@
{
var raport = this.table.totalRows / this.table.limit;
var outheight = this.table.domNode.parentNode.offsetHeight;
+ //
var inheight = Math.round(outheight * raport);
this.domNode.style.height = outheight + "px";
@@ -398,8 +401,7 @@
refreshContent : function()
{
- this.table.filters = this.getFilters();
-
+ this.table.filters = this.getFilters();
this.table.totalRows = -1;
this.table.fetchedRows = new Array();
this.table.showRows(1, this.table.limit);
@@ -432,17 +434,17 @@
draw: function(state)
{
- //remove image
+ //remove image
if(this.domNode.childNodes.length > 0)
this.domNode.removeChild( this.domNode.firstChild );
- //remove label
+ //remove label
if(this.domNode.childNodes.length > 0)
this.domNode.removeChild( this.domNode.lastChild );
- //add new image
+ //add new image
var img = document.createElement('img');
img.src = this.images[ state ];
this.domNode.appendChild( img );
- //add label
+ //add label
if( this.labels[ state ] != '')
{
var la = document.createElement('span');
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
