Commit 549daee8 authored by Aaron Wells's avatar Aaron Wells Committed by Gerrit Code Review
Browse files

Merge "Made wall posts into an unordered list (Bug #1259762)"

parents ae111d0f 0fcd2ff5
...@@ -180,7 +180,7 @@ function wallpost_success(form, data) { ...@@ -180,7 +180,7 @@ function wallpost_success(form, data) {
var wall = getFirstElementByTagAndClassName('div', 'wall', 'blockinstance_' + data.block); var wall = getFirstElementByTagAndClassName('div', 'wall', 'blockinstance_' + data.block);
var temp = DIV(); var temp = DIV();
temp.innerHTML = data.posts; temp.innerHTML = data.posts;
newposts = getElementsByTagAndClassName('div', 'wallpost', temp); newposts = getElementsByTagAndClassName('li', 'wallpost', temp);
replaceChildNodes(wall, newposts); replaceChildNodes(wall, newposts);
if ($('wallpost_' + data.block + '_text')) { if ($('wallpost_' + data.block + '_text')) {
$('wallpost_' + data.block + '_text').value = ''; $('wallpost_' + data.block + '_text').value = '';
......
...@@ -3,8 +3,9 @@ ...@@ -3,8 +3,9 @@
<div class="message">{$wallmessage}</div> <div class="message">{$wallmessage}</div>
{/if} {/if}
{if $wallposts} {if $wallposts}
<ul>
{foreach from=$wallposts item=wallpost} {foreach from=$wallposts item=wallpost}
<div class="wallpost{if $wallpost->private} private{/if} {cycle name=rows values='r0,r1'}"> <li class="wallpost{if $wallpost->private} private{/if} {cycle name=rows values='r0,r1'}">
<div class="userinfo"><img src="{profile_icon_url user=$wallpost maxheight=25 maxwidth=25}" alt="{str tag=profileimagetext arg1=$wallpost|display_default_name}"><a href="{$wallpost->profileurl}">{$wallpost->displayname}</a> - <span class="postedon">{$wallpost->postdate|format_date}</span></div> <div class="userinfo"><img src="{profile_icon_url user=$wallpost maxheight=25 maxwidth=25}" alt="{str tag=profileimagetext arg1=$wallpost|display_default_name}"><a href="{$wallpost->profileurl}">{$wallpost->displayname}</a> - <span class="postedon">{$wallpost->postdate|format_date}</span></div>
<div class="detail">{$wallpost->text|parse_bbcode|safe}</div> <div class="detail">{$wallpost->text|parse_bbcode|safe}</div>
<div class="controls"> <div class="controls">
...@@ -15,8 +16,9 @@ ...@@ -15,8 +16,9 @@
<div class="wallpostdeletebutton"><a href="{$WWWROOT}blocktype/wall/deletepost.php?postid={$wallpost->postid}&return={if $wholewall}wall{else}profile{/if}" class="btn-big-del">{str tag='delete' section='blocktype.wall'}</a></div> <div class="wallpostdeletebutton"><a href="{$WWWROOT}blocktype/wall/deletepost.php?postid={$wallpost->postid}&return={if $wholewall}wall{else}profile{/if}" class="btn-big-del">{str tag='delete' section='blocktype.wall'}</a></div>
{/if} {/if}
</div> </div>
</div> </li>
{/foreach} {/foreach}
</ul>
{/if} {/if}
</div> </div>
{if !$wholewall} {if !$wholewall}
......
...@@ -4164,6 +4164,13 @@ ul.searchtab li span.inactive { ...@@ -4164,6 +4164,13 @@ ul.searchtab li span.inactive {
top: 5px; top: 5px;
right: 5px; right: 5px;
} }
.wall ul {
margin: 0;
}
li.wallpost {
list-style-type: none;
margin: 0;
}
.wallpost .userinfo { .wallpost .userinfo {
margin: 3px 30px; margin: 3px 30px;
} }
......
Supports Markdown
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