Repository: roller Updated Branches: refs/heads/roller-5.2.0 fe4f28dda -> add405bd6
Fixes Mediafile View to show image URL correctly. Project: http://git-wip-us.apache.org/repos/asf/roller/repo Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/add405bd Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/add405bd Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/add405bd Branch: refs/heads/roller-5.2.0 Commit: add405bd656ce638dc6f2d44b1b64afd9743963a Parents: fe4f28d Author: Dave Johnson <[email protected]> Authored: Sun Oct 1 09:39:40 2017 -0400 Committer: Dave Johnson <[email protected]> Committed: Sun Oct 1 09:39:40 2017 -0400 ---------------------------------------------------------------------- .../WEB-INF/jsps/editor/MediaFileEdit.jsp | 23 +++++++++++--------- 1 file changed, 13 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/roller/blob/add405bd/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp ---------------------------------------------------------------------- diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp index 474e674..670eaa6 100644 --- a/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp +++ b/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp @@ -77,20 +77,23 @@ </td> </tr> - <tr> + <tr> <td class="entryEditFormLabel"> - <label for="status"><s:text name="mediaFileEdit.permalink" /></label> + <label for="status"><s:text name="mediaFileEdit.permalink"/></label> </td> <td> - <a href='<s:text name="bean.permalink" />' target="_blank" + <s:url var="linkIconURL" value="/images/link.png"></s:url> + + <a href='<s:property value="bean.permalink" />' target="_blank" title='<s:text name="mediaFileEdit.linkTitle" />'> - <s:url var="linkIconURL" value="/images/link.png"></s:url> - <img border="0" src='<s:property value="%{linkIconURL}" />' - style="padding:2px 2px;" alt="link" /> + <img border="0" src='<s:property value="%{linkIconURL}" />' style="padding:2px 2px;" alt="link"/> </a> - <input type="text" id="clip_text" size="50" style="width:90%" value='<s:text name="bean.permalink" />' readonly /> + + <input type="text" id="clip_text" size="50" style="width:90%" + value='<s:property value="bean.permalink" />' readonly/> + </td> - </tr> + </tr> <tr> <td class="entryEditFormLabel"> @@ -158,8 +161,8 @@ <label for="originalPath"><s:text name="mediaFileEdit.originalPath" /></label> </td> <td> - <div id="fileControldiv" class="miscControl"> - <s:textfield name="bean.originalPath" size="30" maxlength="100" tabindex="3" /> + <div id="originalPathdiv" class="miscControl"> + <s:textfield name="bean.originalPath" id="originalPath" size="30" maxlength="100" tabindex="3" /> <br /> </div> </td>
