Skip to content
Snippets Groups Projects
Commit f98eeab0 authored by srosse's avatar srosse
Browse files

OO-1068: fix flickering of chat and roster window, fix some HTML warnings and errors

parent da4866eb
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 23 additions and 24 deletions
src/main/java/org/olat/core/commons/modules/bc/components/FolderComponentRenderer.java
+ 6
− 6
View file @ f98eeab0
...@@ -229,7 +229,7 @@ public class FolderComponentRenderer extends DefaultComponentRenderer { ...@@ -229,7 +229,7 @@ public class FolderComponentRenderer extends DefaultComponentRenderer {
target.append(FolderRunController.ACTION_PRE).append(FolderCommandFactory.COMMAND_MAIL); target.append(FolderRunController.ACTION_PRE).append(FolderCommandFactory.COMMAND_MAIL);
target.append("\" value=\""); target.append("\" value=\"");
target.append(StringHelper.escapeHtml(translator.translate("send"))); target.append(StringHelper.escapeHtml(translator.translate("send")));
target.append("\"/>"); target.append("\" />");
} }
if (canDelete) { if (canDelete) {
...@@ -238,7 +238,7 @@ public class FolderComponentRenderer extends DefaultComponentRenderer { ...@@ -238,7 +238,7 @@ public class FolderComponentRenderer extends DefaultComponentRenderer {
target.append(FolderRunController.ACTION_PRE).append(FolderCommandFactory.COMMAND_DEL); target.append(FolderRunController.ACTION_PRE).append(FolderCommandFactory.COMMAND_DEL);
target.append("\" value=\""); target.append("\" value=\"");
target.append(StringHelper.escapeHtml(translator.translate("del"))); target.append(StringHelper.escapeHtml(translator.translate("del")));
target.append("\"/>"); target.append("\" />");
} }
if (canWrite) { if (canWrite) {
...@@ -248,11 +248,11 @@ public class FolderComponentRenderer extends DefaultComponentRenderer { ...@@ -248,11 +248,11 @@ public class FolderComponentRenderer extends DefaultComponentRenderer {
target.append("\" value=\""); target.append("\" value=\"");
target.append(StringHelper.escapeHtml(translator.translate("move"))); target.append(StringHelper.escapeHtml(translator.translate("move")));
// copy // copy
target.append("\"/><input type=\"submit\" class='btn btn-default' name=\""); target.append("\" /><input type=\"submit\" class='btn btn-default' name=\"");
target.append(FolderRunController.ACTION_PRE).append(FolderCommandFactory.COMMAND_COPY); target.append(FolderRunController.ACTION_PRE).append(FolderCommandFactory.COMMAND_COPY);
target.append("\" value=\""); target.append("\" value=\"");
target.append(StringHelper.escapeHtml(translator.translate("copy"))); target.append(StringHelper.escapeHtml(translator.translate("copy")));
target.append("\"/>"); target.append("\" />");
} }
if (canWrite) { if (canWrite) {
...@@ -262,11 +262,11 @@ public class FolderComponentRenderer extends DefaultComponentRenderer { ...@@ -262,11 +262,11 @@ public class FolderComponentRenderer extends DefaultComponentRenderer {
target.append("\" value=\""); target.append("\" value=\"");
target.append(StringHelper.escapeHtml(translator.translate("zip"))); target.append(StringHelper.escapeHtml(translator.translate("zip")));
//unzip //unzip
target.append("\"/><input type=\"submit\" class='btn btn-default' name=\""); target.append("\" /><input type=\"submit\" class='btn btn-default' name=\"");
target.append(FolderRunController.ACTION_PRE).append(FolderCommandFactory.COMMAND_UNZIP); target.append(FolderRunController.ACTION_PRE).append(FolderCommandFactory.COMMAND_UNZIP);
target.append("\" value=\""); target.append("\" value=\"");
target.append(StringHelper.escapeHtml(translator.translate("unzip"))); target.append(StringHelper.escapeHtml(translator.translate("unzip")));
target.append("\"/>"); target.append("\" />");
} }
target.append("</div>"); target.append("</div>");
} }
......
src/main/java/org/olat/core/commons/modules/bc/components/ListRenderer.java
+ 1
− 2
View file @ f98eeab0
...@@ -341,8 +341,7 @@ public class ListRenderer { ...@@ -341,8 +341,7 @@ public class ListRenderer {
.append("</script>"); .append("</script>");
} }
} }
sb.append("</span>") sb.append("</td><td>");
.append("</td><td>");
// filesize // filesize
if (!isContainer) { if (!isContainer) {
......
src/main/java/org/olat/core/gui/components/Window.java
+ 3
− 4
View file @ f98eeab0
...@@ -565,7 +565,6 @@ public class Window extends AbstractComponent { ...@@ -565,7 +565,6 @@ public class Window extends AbstractComponent {
// [POST: !renderOnly && timestampID != null] // [POST: !renderOnly && timestampID != null]
// if we had a inline rendering at least once (latestTimestamp is // if we had a inline rendering at least once (latestTimestamp is
// set), then check for an old timestamp // set), then check for an old timestamp
//System.out.println("dispatch normal: compid:"+ureq.getComponentID()+" win-ts:"+ureq.getTimestampID()+" comp-ts:"+ureq.getComponentTimestamp());
if (latestTimestamp != null && !timestampID.equals(latestTimestamp)) { if (latestTimestamp != null && !timestampID.equals(latestTimestamp)) {
// this is not a link from the latest rendering, but from a previous // this is not a link from the latest rendering, but from a previous
// one, since it has a wrong timestamp parameter -> check for // one, since it has a wrong timestamp parameter -> check for
...@@ -762,9 +761,9 @@ public class Window extends AbstractComponent { ...@@ -762,9 +761,9 @@ public class Window extends AbstractComponent {
} }
//to check HTML by reload //to check HTML by reload
//System.out.println("****************************************************"); System.out.println();
//System.out.println(result.toString()); System.out.println(result.toString());
//System.out.println("****************************************************"); System.out.println();
// after rendering we know if some component awaits further async // after rendering we know if some component awaits further async
// calls // calls
......
src/main/java/org/olat/core/gui/control/floatingresizabledialog/_content/index.html
+ 1
− 1
View file @ f98eeab0
<div id="${panelName}" class="${panelName} ${cssClass}"> <div id="${panelName}" class="${panelName} ${cssClass}" style="display:none;">
#if ($r.available("collapsibleContent")) #if ($r.available("collapsibleContent"))
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
......
src/main/java/org/olat/course/nodes/projectbroker/ProjectManagerColumnRenderer.java
+ 5
− 4
View file @ f98eeab0
...@@ -63,11 +63,12 @@ public class ProjectManagerColumnRenderer implements CustomCellRenderer { ...@@ -63,11 +63,12 @@ public class ProjectManagerColumnRenderer implements CustomCellRenderer {
StringBuilder buf = new StringBuilder(); StringBuilder buf = new StringBuilder();
if (renderer!=null && row!=null) { if (renderer!=null && row != null) {
// if no renderer is set, then we assume it's a table export - in which case we don't want the htmls (<b>) // if no renderer is set, then we assume it's a table export - in which case we don't want the htmls (<b>)
// no row might occur during table-search // no row might occur during table-search
sb.append("<span class=\"projmgrrowcontent\""); sb.append("<span class='projmgrrowcontent' id='")
sb.append("id=\"" + PROJECTMANAGER_COLUMN_ROW_IDENT + row + "\">"); .append(PROJECTMANAGER_COLUMN_ROW_IDENT).append(row)
.append("'>");
} }
for (Identity identity : allIdents) { for (Identity identity : allIdents) {
...@@ -77,7 +78,7 @@ public class ProjectManagerColumnRenderer implements CustomCellRenderer { ...@@ -77,7 +78,7 @@ public class ProjectManagerColumnRenderer implements CustomCellRenderer {
} }
sb.append(buf.substring(0, buf.length() - 2)); sb.append(buf.substring(0, buf.length() - 2));
if (renderer!=null && row!=null) { if (renderer!=null && row != null) {
sb.append("</span>"); sb.append("</span>");
} }
} }
......
src/main/java/org/olat/gui/control/_content/olatFooter.html
+ 1
− 1
View file @ f98eeab0
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
</div> </div>
<div id="o_footer_powered" class="clearfix"> <div id="o_footer_powered" class="clearfix">
<a href="http://www.openolat.org" target="_blank" title="OpenOLAT - infinite learning"> <a href="http://www.openolat.org" target="_blank" title="OpenOLAT - infinite learning">
<img src="$r.staticLink("images/openolat/openolat_powerd_by_120x30.png")" alt="powered by OpenOLAT"/> <img src="$r.staticLink("images/openolat/openolat_powerd_by_120x30.png")" alt="powered by OpenOLAT" />
</a> </a>
</div> </div>
<div id="o_footer_version" class="clearfix"> <div id="o_footer_version" class="clearfix">
......
src/main/java/org/olat/instantMessaging/ui/_content/chatMsgField.html
+ 2
− 2
View file @ f98eeab0
...@@ -15,11 +15,11 @@ ...@@ -15,11 +15,11 @@
<div class="o_portrait"><div class="o_portrait_image"> <div class="o_portrait"><div class="o_portrait_image">
#if($message.anonym) #if($message.anonym)
<img src="$r.staticLink("images/transparent.gif")" alt="$altText" title="$altText" class="o_portrait_anonymous_small"/> <img src="$r.staticLink("images/transparent.gif")" alt="$altText" title="$altText" class="o_portrait_anonymous_small" />
#elseif ($message.avatarKey != "-1") #elseif ($message.avatarKey != "-1")
<img src="$r.staticLink("images/transparent.gif")" alt="$altText" title="$altText" class="o_portrait_avatar_small" style="background-image: url('${avatarBaseURL}/${message.avatarKey}/portrait_small.jpg')" /> <img src="$r.staticLink("images/transparent.gif")" alt="$altText" title="$altText" class="o_portrait_avatar_small" style="background-image: url('${avatarBaseURL}/${message.avatarKey}/portrait_small.jpg')" />
#else #else
<img src="$r.staticLink("images/transparent.gif")" alt="$altText" title="$altText" class="o_portrait_dummy_small"/> <img src="$r.staticLink("images/transparent.gif")" alt="$altText" title="$altText" class="o_portrait_dummy_small" />
#end #end
</div></div> </div></div>
......
src/main/java/org/olat/user/_content/displayportrait.html
+ 4
− 4
View file @ f98eeab0
...@@ -3,18 +3,18 @@ ...@@ -3,18 +3,18 @@
#if ($hasPortrait) #if ($hasPortrait)
#if ($canLinkToHomePage) #if ($canLinkToHomePage)
<a href="javascript:void(o_openPopUp('$r.commandURI("showuserinfo")', '${identityKey}', '900', '600', false))"> <a href="javascript:void(o_openPopUp('$r.commandURI("showuserinfo")', '${identityKey}', '900', '600', false))">
<img src="$r.staticLink("images/transparent.gif")" alt="$altText" title="$altText" class="$portraitCssClass" style="background-image : url('$mapperUrl');"/> <img src="$r.staticLink("images/transparent.gif")" alt="$altText" title="$altText" class="$portraitCssClass" style="background-image : url('$mapperUrl');" />
</a> </a>
#else #else
<img src="$r.staticLink("images/transparent.gif")" alt="$altText" title="$altText" class="$portraitCssClass" style="background-image : url('$mapperUrl');"/> <img src="$r.staticLink("images/transparent.gif")" alt="$altText" title="$altText" class="$portraitCssClass" style="background-image : url('$mapperUrl');" />
#end #end
#else #else
#if ($canLinkToHomePage) #if ($canLinkToHomePage)
<a href="javascript:void(o_openPopUp('$r.commandURI("showuserinfo")', '${identityKey}', '900', '600', false))"> <a href="javascript:void(o_openPopUp('$r.commandURI("showuserinfo")', '${identityKey}', '900', '600', false))">
<img src="$r.staticLink("images/transparent.gif")" alt="$altText" title="$altText" class="$portraitCssClass"/> <img src="$r.staticLink("images/transparent.gif")" alt="$altText" title="$altText" class="$portraitCssClass" />
</a> </a>
#else #else
<img src="$r.staticLink("images/transparent.gif")" alt="$altText" title="$altText" class="$portraitCssClass"/> <img src="$r.staticLink("images/transparent.gif")" alt="$altText" title="$altText" class="$portraitCssClass" />
#end #end
#end #end
</div> </div>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment