Return-Path: Delivered-To: apmail-roller-commits-archive@www.apache.org Received: (qmail 12557 invoked from network); 28 Apr 2009 06:30:37 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 28 Apr 2009 06:30:37 -0000 Received: (qmail 90515 invoked by uid 500); 28 Apr 2009 06:30:37 -0000 Delivered-To: apmail-roller-commits-archive@roller.apache.org Received: (qmail 90480 invoked by uid 500); 28 Apr 2009 06:30:37 -0000 Mailing-List: contact commits-help@roller.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@roller.apache.org Delivered-To: mailing list commits@roller.apache.org Received: (qmail 90471 invoked by uid 99); 28 Apr 2009 06:30:36 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 Apr 2009 06:30:36 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 Apr 2009 06:30:35 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 8E40C23889DD; Tue, 28 Apr 2009 06:30:15 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r769262 - in /roller/branches/roller_mediablogging/apps/weblogger: src/java/org/apache/roller/weblogger/ui/struts2/editor/ web/WEB-INF/ web/WEB-INF/classes/ web/WEB-INF/jsps/editor/ Date: Tue, 28 Apr 2009 06:30:14 -0000 To: commits@roller.apache.org From: ganeshmb@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090428063015.8E40C23889DD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ganeshmb Date: Tue Apr 28 06:30:13 2009 New Revision: 769262 URL: http://svn.apache.org/viewvc?rev=769262&view=rev Log: (empty) Added: roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileImageDim.java roller/branches/roller_mediablogging/apps/weblogger/web/WEB-INF/jsps/editor/MediaFileImageDimension.jsp Modified: roller/branches/roller_mediablogging/apps/weblogger/web/WEB-INF/classes/struts.xml roller/branches/roller_mediablogging/apps/weblogger/web/WEB-INF/jsps/editor/MediaFileAddSuccessInclude.jsp roller/branches/roller_mediablogging/apps/weblogger/web/WEB-INF/jsps/editor/MediaFileSearch.jsp roller/branches/roller_mediablogging/apps/weblogger/web/WEB-INF/tiles.xml Added: roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileImageDim.java URL: http://svn.apache.org/viewvc/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileImageDim.java?rev=769262&view=auto ============================================================================== --- roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileImageDim.java (added) +++ roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileImageDim.java Tue Apr 28 06:30:13 2009 @@ -0,0 +1,75 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. The ASF licenses this file to You + * under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. For additional information regarding + * copyright in this work, please see the NOTICE file in the top level + * directory of this distribution. + */ + +package org.apache.roller.weblogger.ui.struts2.editor; + +import java.io.File; +import java.io.FileInputStream; + +import org.apache.commons.lang.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.roller.weblogger.WebloggerException; +import org.apache.roller.weblogger.business.FileIOException; +import org.apache.roller.weblogger.business.MediaFileManager; +import org.apache.roller.weblogger.business.WebloggerFactory; +import org.apache.roller.weblogger.config.WebloggerRuntimeConfig; +import org.apache.roller.weblogger.pojos.MediaFile; +import org.apache.roller.weblogger.pojos.MediaFileDirectory; +import org.apache.roller.weblogger.pojos.MediaFileType; +import org.apache.struts2.interceptor.validation.SkipValidation; + +/** + * Adds a new media file. + */ +@SuppressWarnings("serial") +public class MediaFileImageDim extends MediaFileBase { + private static Log log = LogFactory.getLog(MediaFileImageDim.class); + + private MediaFileBean bean = new MediaFileBean(); + + public MediaFileImageDim() { + this.actionName = "mediaFileImageDim"; + } + + /** + * Show form for adding a new media file. + * + * @return String The result of the action. + */ + @SkipValidation + public String execute() { + try { + MediaFileManager mgr = WebloggerFactory.getWeblogger().getMediaFileManager(); + MediaFile mediaFile = mgr.getMediaFile(getMediaFileId()); + bean.copyFrom(mediaFile); + } catch (WebloggerException ex) { + log.error("Error looking up media file directory", ex); + } + return SUCCESS; + } + + public MediaFileBean getBean() { + return bean; + } + + public void setBean(MediaFileBean bean) { + this.bean = bean; + } + +} Modified: roller/branches/roller_mediablogging/apps/weblogger/web/WEB-INF/classes/struts.xml URL: http://svn.apache.org/viewvc/roller/branches/roller_mediablogging/apps/weblogger/web/WEB-INF/classes/struts.xml?rev=769262&r1=769261&r2=769262&view=diff ============================================================================== --- roller/branches/roller_mediablogging/apps/weblogger/web/WEB-INF/classes/struts.xml (original) +++ roller/branches/roller_mediablogging/apps/weblogger/web/WEB-INF/classes/struts.xml Tue Apr 28 06:30:13 2009 @@ -262,12 +262,11 @@ .MediaFileSearch - - .TabularView + + .MediaFileImageDimension - - + .EntryEdit Modified: roller/branches/roller_mediablogging/apps/weblogger/web/WEB-INF/jsps/editor/MediaFileAddSuccessInclude.jsp URL: http://svn.apache.org/viewvc/roller/branches/roller_mediablogging/apps/weblogger/web/WEB-INF/jsps/editor/MediaFileAddSuccessInclude.jsp?rev=769262&r1=769261&r2=769262&view=diff ============================================================================== --- roller/branches/roller_mediablogging/apps/weblogger/web/WEB-INF/jsps/editor/MediaFileAddSuccessInclude.jsp (original) +++ roller/branches/roller_mediablogging/apps/weblogger/web/WEB-INF/jsps/editor/MediaFileAddSuccessInclude.jsp Tue Apr 28 06:30:13 2009 @@ -17,14 +17,14 @@ --%> <%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %> - + Added: roller/branches/roller_mediablogging/apps/weblogger/web/WEB-INF/jsps/editor/MediaFileImageDimension.jsp URL: http://svn.apache.org/viewvc/roller/branches/roller_mediablogging/apps/weblogger/web/WEB-INF/jsps/editor/MediaFileImageDimension.jsp?rev=769262&view=auto ============================================================================== --- roller/branches/roller_mediablogging/apps/weblogger/web/WEB-INF/jsps/editor/MediaFileImageDimension.jsp (added) +++ roller/branches/roller_mediablogging/apps/weblogger/web/WEB-INF/jsps/editor/MediaFileImageDimension.jsp Tue Apr 28 06:30:13 2009 @@ -0,0 +1,103 @@ +<%-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. The ASF licenses this file to You + under the Apache License, Version 2.0 (the "License"); you may not + use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. For additional information regarding + copyright in this work, please see the NOTICE file in the top level + directory of this distribution. +--%> +<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %> + + + + + +

+ Choose layout for image +

+ +
+ +
+ +
+ + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + None + Left + Center + Right +
+ + + + +
Width
Height
+
+
+
+ + +
+ +
Modified: roller/branches/roller_mediablogging/apps/weblogger/web/WEB-INF/jsps/editor/MediaFileSearch.jsp URL: http://svn.apache.org/viewvc/roller/branches/roller_mediablogging/apps/weblogger/web/WEB-INF/jsps/editor/MediaFileSearch.jsp?rev=769262&r1=769261&r2=769262&view=diff ============================================================================== --- roller/branches/roller_mediablogging/apps/weblogger/web/WEB-INF/jsps/editor/MediaFileSearch.jsp (original) +++ roller/branches/roller_mediablogging/apps/weblogger/web/WEB-INF/jsps/editor/MediaFileSearch.jsp Tue Apr 28 06:30:13 2009 @@ -246,16 +246,18 @@ } } -function onClickInsert(url, text, isImage) +function onClickInsert(id, url, text, isImage) { var filePointer; if (isImage) { - filePointer = "" + text + ""; + document.mediaFileSearchForm.mediaFileId.value=id; + document.mediaFileSearchForm.action=''; + document.mediaFileSearchForm.submit(); } else { - filePointer = "" + text + ""; + var filePointer = "" + text + ""; + parent.onClose(filePointer); } - parent.onClose(filePointer); } function onCreateDirectory() @@ -294,11 +296,11 @@ frame.style.height="100%"; if (browser=="Microsoft Internet Explorer") { - document.getElementById("overlay_img").style.top= "40px"; - document.getElementById("overlay_img").style.left= "170px"; - document.getElementById("overlay_img").style.height= "500px"; + document.getElementById("overlay_img").style.top= "40px"; + document.getElementById("overlay_img").style.left= "170px"; + document.getElementById("overlay_img").style.height= "500px"; } - + document.getElementById("overlay_img").innerHTML = '
'; @@ -393,7 +395,7 @@ Modified: roller/branches/roller_mediablogging/apps/weblogger/web/WEB-INF/tiles.xml URL: http://svn.apache.org/viewvc/roller/branches/roller_mediablogging/apps/weblogger/web/WEB-INF/tiles.xml?rev=769262&r1=769261&r2=769262&view=diff ============================================================================== --- roller/branches/roller_mediablogging/apps/weblogger/web/WEB-INF/tiles.xml (original) +++ roller/branches/roller_mediablogging/apps/weblogger/web/WEB-INF/tiles.xml Tue Apr 28 06:30:13 2009 @@ -226,10 +226,16 @@ - + + + + + + + @@ -243,7 +249,7 @@ - +