You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2018/02/25 22:08:34 UTC
[1/2] roller git commit: Fix layout problem on entry edit page.
Repository: roller
Updated Branches:
refs/heads/bootstrap-ui 0ec5df068 -> d2320b067
Fix layout problem on entry edit page.
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/378c2ed7
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/378c2ed7
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/378c2ed7
Branch: refs/heads/bootstrap-ui
Commit: 378c2ed7c10d3d435617239be26d125e85ee3934
Parents: 0ec5df0
Author: Dave Johnson <sn...@gmail.com>
Authored: Sun Feb 25 17:08:10 2018 -0500
Committer: Dave Johnson <sn...@gmail.com>
Committed: Sun Feb 25 17:08:10 2018 -0500
----------------------------------------------------------------------
app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/roller/blob/378c2ed7/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp
index 5867b02..92c3717 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp
@@ -54,7 +54,7 @@
</s:text>
</p>
-<s:form id="entry" theme="bootstrap" cssClass="form-horizontal">
+<s:form id="entry" theme="bootstrap" cssClass="form-vertical">
<s:hidden name="salt"/>
<s:hidden name="weblog"/>
<s:hidden name="bean.status"/>
@@ -115,6 +115,7 @@
<label class="col-sm-3 control-label" for="weblogEdit.status"><s:text name="weblogEdit.status"/></label>
<div class="col-sm-9 controls">
+
<p class="form-control-static">
<s:if test="bean.published">
<span class="label label-success">
@@ -148,6 +149,7 @@
<span class="label label-danger"><s:text name="weblogEdit.unsaved"/></span>
</s:else>
</p>
+
</div>
</div>
[2/2] roller git commit: Fix problem introduced in merge from master
to bootstrap-ui
Posted by sn...@apache.org.
Fix problem introduced in merge from master to bootstrap-ui
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/d2320b06
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/d2320b06
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/d2320b06
Branch: refs/heads/bootstrap-ui
Commit: d2320b067a39129013c1f117f1306a04c6ebca8f
Parents: 378c2ed
Author: Dave Johnson <sn...@gmail.com>
Authored: Sun Feb 25 17:08:30 2018 -0500
Committer: Dave Johnson <sn...@gmail.com>
Committed: Sun Feb 25 17:08:30 2018 -0500
----------------------------------------------------------------------
app/src/main/webapp/WEB-INF/jsps/editor/Entries.jsp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/roller/blob/d2320b06/app/src/main/webapp/WEB-INF/jsps/editor/Entries.jsp
----------------------------------------------------------------------
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 198de1d..6374a79 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/Entries.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/Entries.jsp
@@ -103,8 +103,8 @@
</td>
<td>
- <s:set name="postId" value="#post.id" />
- <s:set name="postTitle" value="#post.title" />
+ <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>