Merge branch 'master' of https://github.com/apache/roller
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/Entries.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/Entries.jsp
index 6374a79..288fb65 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/Entries.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/Entries.jsp
@@ -64,7 +64,6 @@
<tr>
<th class="rollertable" width="5%"> </th>
- <th class="rollertable" width="5%"> </th>
<th class="rollertable" width="5%">
<s:text name="weblogEntryQuery.pubTime" />
</th>
@@ -74,9 +73,10 @@
<th class="rollertable">
<s:text name="weblogEntryQuery.title" />
</th>
- <th class="rollertable" width="5%">
+ <th class="rollertable" width="15%">
<s:text name="weblogEntryQuery.category" />
</th>
+ <th class="rollertable" width="5%"> </th>
</tr>
<s:iterator var="post" value="pager.items">
@@ -99,18 +99,14 @@
<s:param name="weblog" value="%{actionWeblog.handle}" />
<s:param name="bean.id" value="#post.id" />
</s:url>
- <s:a href="%{editUrl}"><span class="glyphicon glyphicon-edit"></s:a>
+ <s:a href="%{editUrl}">
+ <span class="glyphicon glyphicon-edit" data-toggle="tooltip" data-placement="top"
+ title="<s:text name='generic.edit'/>">
+ </span>
+ </s:a>
</td>
<td>
- <s:set var="postId" value="#post.id" />
- <s:set var="postTitle" value="#post.title" />
- <a href="#"
- onclick="showDeleteModal('<s:property value="postId" />', '<s:property value="postTitle"/>' )">
- <span class="glyphicon glyphicon-trash"></span></a>
- </td>
-
- <td>
<s:if test="#post.pubTime != null">
<s:text name="weblogEntryQuery.date.toStringFormat">
<s:param value="#post.pubTime" />
@@ -141,6 +137,17 @@
<s:property value="#post.category.name" />
</td>
+ <td>
+ <s:set var="postId" value="#post.id" />
+ <s:set var="postTitle" value="#post.title" />
+ <a href="#"
+ onclick="showDeleteModal('<s:property value="postId" />', '<s:property value="postTitle"/>' )">
+ <span class="glyphicon glyphicon-trash"
+ data-toggle="tooltip" data-placement="top" title="<s:text name='generic.delete'/>">
+ </span>
+ </a>
+ </td>
+
</tr>
</s:iterator>
