Return-Path: <commits-return-9918-archive-asf-public=cust-asf.ponee.io@roller.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id 9EEFA200D43
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Mon,  6 Nov 2017 23:17:13 +0100 (CET)
Received: by cust-asf.ponee.io (Postfix)
	id 9DB7C160BEC; Mon,  6 Nov 2017 22:17:13 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id E23F4160C0B
	for <archive-asf-public@cust-asf.ponee.io>; Mon,  6 Nov 2017 23:17:11 +0100 (CET)
Received: (qmail 86429 invoked by uid 500); 6 Nov 2017 22:17:10 -0000
Mailing-List: contact commits-help@roller.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@roller.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@roller.apache.org>
List-Post: <mailto:commits@roller.apache.org>
List-Id: <commits.roller.apache.org>
Reply-To: dev@roller.apache.org
Delivered-To: mailing list commits@roller.apache.org
Received: (qmail 86071 invoked by uid 99); 6 Nov 2017 22:17:10 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Nov 2017 22:17:10 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 7A380F5D82; Mon,  6 Nov 2017 22:17:02 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: snoopdave@apache.org
To: commits@roller.apache.org
Date: Mon, 06 Nov 2017 22:17:18 -0000
Message-Id: <f375e2e5ffac44f2a298b48d824d5104@git.apache.org>
In-Reply-To: <1a3c6d4bcaf34a3581aedf8177f9d946@git.apache.org>
References: <1a3c6d4bcaf34a3581aedf8177f9d946@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [17/35] roller git commit: Fixes Mediafile View to show image URL
 correctly.
archived-at: Mon, 06 Nov 2017 22:17:13 -0000

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/master
Commit: add405bd656ce638dc6f2d44b1b64afd9743963a
Parents: fe4f28d
Author: Dave Johnson <snoopdave@gmail.com>
Authored: Sun Oct 1 09:39:40 2017 -0400
Committer: Dave Johnson <snoopdave@gmail.com>
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>