roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ganes...@apache.org
Subject svn commit: r773037 [1/6] - in /roller/branches/roller_mediablogging/apps/weblogger/web: WEB-INF/jsps/editor/ roller-ui/authoring/editors/ roller-ui/scripts/yui/ roller-ui/styles/yui/
Date Fri, 08 May 2009 15:43:35 GMT
Author: ganeshmb
Date: Fri May  8 15:43:35 2009
New Revision: 773037

URL: http://svn.apache.org/viewvc?rev=773037&view=rev
Log:
Code cleanup, removed external library references.

Added:
    roller/branches/roller_mediablogging/apps/weblogger/web/roller-ui/scripts/yui/
    roller/branches/roller_mediablogging/apps/weblogger/web/roller-ui/scripts/yui/animation-min.js
    roller/branches/roller_mediablogging/apps/weblogger/web/roller-ui/scripts/yui/connection-min.js
    roller/branches/roller_mediablogging/apps/weblogger/web/roller-ui/scripts/yui/container-min.js
    roller/branches/roller_mediablogging/apps/weblogger/web/roller-ui/scripts/yui/container_core-min.js
    roller/branches/roller_mediablogging/apps/weblogger/web/roller-ui/scripts/yui/menu-min.js
    roller/branches/roller_mediablogging/apps/weblogger/web/roller-ui/scripts/yui/treeview-min.js
    roller/branches/roller_mediablogging/apps/weblogger/web/roller-ui/scripts/yui/yahoo-dom-event.js
    roller/branches/roller_mediablogging/apps/weblogger/web/roller-ui/scripts/yui/yahoo-min.js
    roller/branches/roller_mediablogging/apps/weblogger/web/roller-ui/styles/yui/
    roller/branches/roller_mediablogging/apps/weblogger/web/roller-ui/styles/yui/container.css
    roller/branches/roller_mediablogging/apps/weblogger/web/roller-ui/styles/yui/fonts-min.css
    roller/branches/roller_mediablogging/apps/weblogger/web/roller-ui/styles/yui/menu.css
    roller/branches/roller_mediablogging/apps/weblogger/web/roller-ui/styles/yui/reset-fonts-grids.css
    roller/branches/roller_mediablogging/apps/weblogger/web/roller-ui/styles/yui/tree.css
    roller/branches/roller_mediablogging/apps/weblogger/web/roller-ui/styles/yui/treeview.css
Modified:
    roller/branches/roller_mediablogging/apps/weblogger/web/WEB-INF/jsps/editor/MediaFileAdd.jsp
    roller/branches/roller_mediablogging/apps/weblogger/web/WEB-INF/jsps/editor/MediaFileAddExternalInclude.jsp
    roller/branches/roller_mediablogging/apps/weblogger/web/WEB-INF/jsps/editor/MediaFileAddSuccess.jsp
    roller/branches/roller_mediablogging/apps/weblogger/web/WEB-INF/jsps/editor/MediaFileAddSuccessInclude.jsp
    roller/branches/roller_mediablogging/apps/weblogger/web/WEB-INF/jsps/editor/MediaFileEdit.jsp
    roller/branches/roller_mediablogging/apps/weblogger/web/WEB-INF/jsps/editor/MediaFileHierarchicalView.jsp
    roller/branches/roller_mediablogging/apps/weblogger/web/WEB-INF/jsps/editor/MediaFileSearch.jsp
    roller/branches/roller_mediablogging/apps/weblogger/web/WEB-INF/jsps/editor/MediaFileView.jsp
    roller/branches/roller_mediablogging/apps/weblogger/web/roller-ui/authoring/editors/editor-text.jsp

Modified: roller/branches/roller_mediablogging/apps/weblogger/web/WEB-INF/jsps/editor/MediaFileAdd.jsp
URL: http://svn.apache.org/viewvc/roller/branches/roller_mediablogging/apps/weblogger/web/WEB-INF/jsps/editor/MediaFileAdd.jsp?rev=773037&r1=773036&r2=773037&view=diff
==============================================================================
--- roller/branches/roller_mediablogging/apps/weblogger/web/WEB-INF/jsps/editor/MediaFileAdd.jsp (original)
+++ roller/branches/roller_mediablogging/apps/weblogger/web/WEB-INF/jsps/editor/MediaFileAdd.jsp Fri May  8 15:43:35 2009
@@ -67,7 +67,7 @@
             </td>
        </tr>
 
-	    <tr>
+       <tr>
             <td class="entryEditFormLabel">
                 <label for="status">A short Description of file</label>
             </td>
@@ -76,7 +76,7 @@
             </td>
        </tr>
 
-	    <tr>
+       <tr>
             <td class="entryEditFormLabel">
                 <label for="status">Copyright Statement (optional)</label>
             </td>
@@ -85,7 +85,7 @@
             </td>
        </tr>
 
-	   <tr>
+       <tr>
             <td class="entryEditFormLabel">
                 <label for="status">Tags (separated by spaces)</label>
             </td>
@@ -94,7 +94,7 @@
             </td>
        </tr>
 
-	    <tr>
+       <tr>
             <td class="entryEditFormLabel">
                 <label for="status">Place file under</label>
             </td>
@@ -103,11 +103,11 @@
             </td>
        </tr>
 
-	   <tr>
+       <tr>
             <td class="entryEditFormLabel">
                 <label for="status">Include in Gallery?</label>
             </td>
-			<td>
+            <td>
                 <s:checkbox name="bean.sharedForGallery" />
             </td>
        </tr>

Modified: roller/branches/roller_mediablogging/apps/weblogger/web/WEB-INF/jsps/editor/MediaFileAddExternalInclude.jsp
URL: http://svn.apache.org/viewvc/roller/branches/roller_mediablogging/apps/weblogger/web/WEB-INF/jsps/editor/MediaFileAddExternalInclude.jsp?rev=773037&r1=773036&r2=773037&view=diff
==============================================================================
--- roller/branches/roller_mediablogging/apps/weblogger/web/WEB-INF/jsps/editor/MediaFileAddExternalInclude.jsp (original)
+++ roller/branches/roller_mediablogging/apps/weblogger/web/WEB-INF/jsps/editor/MediaFileAddExternalInclude.jsp Fri May  8 15:43:35 2009
@@ -42,7 +42,7 @@
             </td>
        </tr>
 
-	    <tr>
+       <tr>
             <td class="entryEditFormLabel">
                 <label for="status">Title</label>
             </td>
@@ -58,7 +58,7 @@
     <br>
     <div class="control">
        <input type="button" value="Insert" name="submit" onclick="submitPage(this.form)" />
-	    <input type="button" value="Cancel" onClick="javascript:window.parent.onClose();" />
+       <input type="button" value="Cancel" onClick="javascript:window.parent.onClose();" />
     </div>
 
 </s:form>

Modified: roller/branches/roller_mediablogging/apps/weblogger/web/WEB-INF/jsps/editor/MediaFileAddSuccess.jsp
URL: http://svn.apache.org/viewvc/roller/branches/roller_mediablogging/apps/weblogger/web/WEB-INF/jsps/editor/MediaFileAddSuccess.jsp?rev=773037&r1=773036&r2=773037&view=diff
==============================================================================
--- roller/branches/roller_mediablogging/apps/weblogger/web/WEB-INF/jsps/editor/MediaFileAddSuccess.jsp (original)
+++ roller/branches/roller_mediablogging/apps/weblogger/web/WEB-INF/jsps/editor/MediaFileAddSuccess.jsp Fri May  8 15:43:35 2009
@@ -22,7 +22,7 @@
 </p>
 
 <s:form id="entry" action="addMedia!submit" onsubmit="editorCleanup()">
-    <s:hidden name="weblog" />
+<s:hidden name="weblog" />
 
 <div style="border:1px solid; width=80px;background-color: #cfc;margin-bottom:5px;">
 <ul>
@@ -60,28 +60,14 @@
 </div>
 
 
-
-
-
-
-
-
-
-
     <%-- ================================================================== --%>
     <%-- Weblog edit or preview --%>
 
 
-
-
-
-
     <%-- ================================================================== --%>
     <%-- plugin chooser --%>
 
 
-
-
     <%-- ================================================================== --%>
     <%-- advanced settings  --%>
 

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=773037&r1=773036&r2=773037&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 Fri May  8 15:43:35 2009
@@ -22,7 +22,6 @@
 </s:if>
 <s:else>
 <script type="text/javascript">
-//parent.document.getElementById('overlay_img').style.display = 'none';
     <s:url id="mediaFileURL" value="/roller-ui/rendering/media-resources/%{bean.id}" />
     var filePointer = "<a href='<s:property value="%{mediaFileURL}" />'><s:property value="bean.name" /></a>";
     parent.onClose(filePointer);

Modified: roller/branches/roller_mediablogging/apps/weblogger/web/WEB-INF/jsps/editor/MediaFileEdit.jsp
URL: http://svn.apache.org/viewvc/roller/branches/roller_mediablogging/apps/weblogger/web/WEB-INF/jsps/editor/MediaFileEdit.jsp?rev=773037&r1=773036&r2=773037&view=diff
==============================================================================
--- roller/branches/roller_mediablogging/apps/weblogger/web/WEB-INF/jsps/editor/MediaFileEdit.jsp (original)
+++ roller/branches/roller_mediablogging/apps/weblogger/web/WEB-INF/jsps/editor/MediaFileEdit.jsp Fri May  8 15:43:35 2009
@@ -39,7 +39,7 @@
             </td>
        </tr>
 
-	    <tr>
+        <tr>
             <td class="entryEditFormLabel">
                 <label for="status">A short Description of file</label>
             </td>
@@ -48,7 +48,7 @@
             </td>
        </tr>
 
-	    <tr>
+       <tr>
             <td class="entryEditFormLabel">
                 <label for="status">Copyright Statement (optional)</label>
             </td>
@@ -57,7 +57,7 @@
             </td>
        </tr>
 
-	   <tr>
+       <tr>
             <td class="entryEditFormLabel">
                 <label for="status">Tags (separated by spaces)</label>
             </td>
@@ -66,7 +66,7 @@
             </td>
        </tr>
 
-	    <tr>
+       <tr>
             <td class="entryEditFormLabel">
                 <label for="status">Place file under</label>
             </td>
@@ -75,11 +75,11 @@
             </td>
        </tr>
 
-	   <tr>
+       <tr>
             <td class="entryEditFormLabel">
                 <label for="status">Include in Gallery?</label>
             </td>
-			<td>
+            <td>
                 <s:checkbox name="bean.sharedForGallery" />
             </td>
        </tr>
@@ -116,7 +116,7 @@
     <br>
     <div class="control">
        <input type="submit" value="Submit" name="submit" />
-	   <input type="button" value="Cancel" onClick="javascript:window.parent.onClose();" />
+       <input type="button" value="Cancel" onClick="javascript:window.parent.onClose();" />
     </div>
 
 </s:form>

Modified: roller/branches/roller_mediablogging/apps/weblogger/web/WEB-INF/jsps/editor/MediaFileHierarchicalView.jsp
URL: http://svn.apache.org/viewvc/roller/branches/roller_mediablogging/apps/weblogger/web/WEB-INF/jsps/editor/MediaFileHierarchicalView.jsp?rev=773037&r1=773036&r2=773037&view=diff
==============================================================================
--- roller/branches/roller_mediablogging/apps/weblogger/web/WEB-INF/jsps/editor/MediaFileHierarchicalView.jsp (original)
+++ roller/branches/roller_mediablogging/apps/weblogger/web/WEB-INF/jsps/editor/MediaFileHierarchicalView.jsp Fri May  8 15:43:35 2009
@@ -25,24 +25,22 @@
     width : 95%;}
 </style>
 
-<link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/2.6.0/build/fonts/fonts-min.css" />
-<link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/2.6.0/build/treeview/assets/skins/sam/treeview.css" />
-<script type="text/javascript" src="http://yui.yahooapis.com/2.6.0/build/yahoo-dom-event/yahoo-dom-event.js"></script>
-<script type="text/javascript" src="http://yui.yahooapis.com/2.6.0/build/treeview/treeview-min.js"></script>
-
-
+<link rel="stylesheet" type="text/css" href="<s:url value='/roller-ui/styles/yui/fonts-min.css'/>" />
+<link rel="stylesheet" type="text/css" href="<s:url value='/roller-ui/styles/yui/treeview.css'/>" />
+<script type="text/javascript" src="<s:url value='/roller-ui/scripts/yui/yahoo-dom-event.js'/>"></script>
+<script type="text/javascript" src="<s:url value='/roller-ui/scripts/yui/treeview-min.js'/>"></script>
 <!--begin custom header content for this example-->
 <!--bring in the folder-style CSS for the TreeView Control-->
-<link rel="stylesheet" type="text/css" href="http://developer.yahoo.com/yui/examples/treeview/assets/css/folders/tree.css">
 
+<link rel="stylesheet" type="text/css" href="<s:url value='/roller-ui/styles/yui/tree.css'/>" />
 <!-- Some custom style for the expand/contract section-->
 <style>
 #expandcontractdiv {border:1px dotted #dedede; background-color:#EBE4F2; margin:0 0 .5em 0; padding:0.4em;}
 #treeDiv1 { background: #fff; padding:1em; margin-top:1em; }
 </style>
 
-<script src="http://yui.yahooapis.com/2.2.2/build/yahoo/yahoo-min.js" type="text/javascript"></script>
-<script src="http://yui.yahooapis.com/2.2.2/build/connection/connection-min.js" type="text/javascript"></script>
+<script type="text/javascript" src="<s:url value='/roller-ui/scripts/yui/yahoo-min.js'/>"></script>
+<script type="text/javascript" src="<s:url value='/roller-ui/scripts/yui/connection-min.js'/>"></script>
 
 <p class="subtitle">
    View Uploaded Files
@@ -70,37 +68,15 @@
         buildTree();
     }
 
-        function loadNodeData(node, fnLoadComplete)  {
+    function loadNodeData(node, fnLoadComplete)  {
 
-            //We'll load node data based on what we get back when we
-            //use Connection Manager topass the text label of the
-            //expanding node to the Yahoo!
-            //Search "related suggestions" API.  Here, we're at the
-            //first part of the request -- we'll make the request to the
-            //server.  In our success handler, we'll build our new children
-            //and then return fnLoadComplete back to the tree.
-
-            //Get the node's label and urlencode it; this is the word/s
-            //on which we'll search for related words:
-            //alert(node.label);
-            //alert(node.data.key);
             var nodeLabel = encodeURI(node.label);
             var nodeKey = node.data.key;
 
-            //prepare URL for XHR request:
             var sUrl = 'mediaFileView!fetchDirectoryContentLight.rol?directoryId=media-directory-id&weblog=<s:property value="actionWeblog.handle" />'.replace("media-directory-id", nodeKey);
 
-
-
-
-            //prepare our callback object
             var callback = {
-
-                //if our XHR call is successful, we want to make use
-                //of the returned data and create child nodes.
                 success: function(oResponse) {
-                    YAHOO.log("XHR transaction was successful.", "info", "example");
-                    //YAHOO.log(oResponse.responseText);
                     var oResults = eval("(" + oResponse.responseText + ")");
                     if((oResults.Result) && (oResults.Result.length)) {
                         //Result is an array if more than one result, string otherwise
@@ -117,51 +93,32 @@
                         }
                     }
 
-                    //When we're done creating child nodes, we execute the node's
-                    //loadComplete callback method which comes in via the argument
-                    //in the response object (we could also access it at node.loadComplete,
-                    //if necessary):
                     oResponse.argument.fnLoadComplete();
                 },
 
-                //if our XHR call is not successful, we want to
-                //fire the TreeView callback and let the Tree
-                //proceed with its business.
                 failure: function(oResponse) {
                     YAHOO.log("Failed to process XHR transaction.", "info", "example");
                     oResponse.argument.fnLoadComplete();
                 },
 
-                //our handlers for the XHR response will need the same
-                //argument information we got to loadNodeData, so
-                //we'll pass those along:
                 argument: {
                     "node": node,
                     "fnLoadComplete": fnLoadComplete
                 },
 
-                //timeout -- if more than 7 seconds go by, we'll abort
-                //the transaction and assume there are no children:
                 timeout: 7000
             };
 
-            //With our callback object ready, it's now time to
-            //make our XHR call using Connection Manager's
-            //asyncRequest method:
             YAHOO.util.Connect.asyncRequest('POST', sUrl, callback);
         }
 
-        function buildTree() {
-           //create a new tree:
+    function buildTree() {
            tree = new YAHOO.widget.TreeView("treeDiv1");
 
-           //turn dynamic loading on for entire tree:
            tree.setDynamicLoad(loadNodeData, currentIconMode);
 
-           //get root node for tree:
            var root = tree.getRoot();
 
-           //add child nodes for tree; our top level nodes are
            var aDirectories = [
     <s:iterator id="directory" value="childDirectories" status="dirStatus">
 {label:"<s:property value="#directory.name" />",key:"<s:property value="#directory.id" />"}<s:if test="!#dirStatus.last">,</s:if>
@@ -180,13 +137,9 @@
 
            for (var i=0, j=aFiles.length; i<j; i++) {
                 var tempNode = new YAHOO.widget.TextNode(aFiles[i], root, false);
-           // Use the isLeaf property to force the leaf node presentation for a given node.
-           // This disables dynamic loading for the node.
                 tempNode.isLeaf = true;
            }
 
-           //render tree with these toplevel nodes; all descendants of these nodes
-           //will be generated as needed by the dynamic loader.
            tree.draw();
         }
 
@@ -207,7 +160,6 @@
     }
 } ();
 
-//once the DOM has loaded, we can go ahead and set up our tree:
 YAHOO.util.Event.onDOMReady(hierarchicalViewImpl.init, hierarchicalViewImpl,true)
 
 </script>

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=773037&r1=773036&r2=773037&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 Fri May  8 15:43:35 2009
@@ -16,201 +16,158 @@
   directory of this distribution.
 --%>
 <%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
-<link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/combo?2.6.0/build/reset-fonts-grids/reset-fonts-grids.css&2.6.0/build/menu/assets/skins/sam/menu.css">
-<!-- Combo-handled YUI JS files: -->
-<script type="text/javascript" src="http://yui.yahooapis.com/combo?2.6.0/build/yahoo-dom-event/yahoo-dom-event.js&2.6.0/build/animation/animation-min.js&2.6.0/build/container/container_core-min.js&2.6.0/build/menu/menu-min.js"></script>
-<link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/2.6.0/build/fonts/fonts-min.css" />
-<link rel="stylesheet" type="text/css"
-href="http://yui.yahooapis.com/2.6.0/build/container/assets/skins/sam/container.css" />
-
-<script type="text/javascript" src="http://yui.yahooapis.com/2.6.0/build/yahoo-dom-event/yahoo-dom-event.js"></script>
-<script type="text/javascript"
-src="http://yui.yahooapis.com/2.6.0/build/container/container-min.js"></script>
+<link rel="stylesheet" type="text/css" href="<s:url value='/roller-ui/styles/yui/reset-fonts-grids.css'/>" />
+<link rel="stylesheet" type="text/css" href="<s:url value='/roller-ui/styles/yui/container.css'/>" />
+<link rel="stylesheet" type="text/css" href="<s:url value='/roller-ui/styles/yui/menu.css'/>" />
+
+<script type="text/javascript" src="<s:url value='/roller-ui/scripts/yui/yahoo-dom-event.js'/>"></script>
+<script type="text/javascript" src="<s:url value='/roller-ui/scripts/yui/container_core-min.js'/>"></script>
+<script type="text/javascript" src="<s:url value='/roller-ui/scripts/yui/menu-min.js'/>"></script>
+
 <style type="text/css">
 body {
-		margin:0;
-		padding:0;
-		text-align:left;
-	}
-	h1 {
-		font-size:20px;
-		font-weight:bold;
-	}
+                margin:0;
+                padding:0;
+                text-align:left;
+     }
+h1   {
+                font-size:20px;
+                font-weight:bold;
+      }
 .yui-overlay {
-		position:fixed;
-	  	background: #ffffff;
-	  	z-index: 112;
-	  	color:#000000;
-	  	border: 4px solid #525252;
-	  	text-align:left;
-	  	top: 50%;
-	  	left: 50%;
-	}
+                position:fixed;
+                background: #ffffff;
+                z-index: 112;
+                color:#000000;
+                border: 4px solid #525252;
+                text-align:left;
+                top: 50%;
+                left: 50%;
+            }
 </style>
 <script type="text/javascript">
 YAHOO.util.Event.onContentReady("myMenu", function () {
+    var oClones = this;
 
-
-                var oClones = this;
-
-
-                function findMediaFileIdForLineItem(lineItemNode) {
-                    var findMediaFileIdNode = function(node) {
-                        return (node.id == 'mediafileidentity');
-                    }
-                    var temp_elements = YAHOO.util.Dom.getElementsBy(findMediaFileIdNode,"input",lineItemNode);
-                    return temp_elements[0].value;
-                }
-
-
-                function deleteMedia(p_oLI) {
-
-                    var lineItemNode =	YAHOO.util.Dom.getAncestorByTagName(p_oLI, "LI");
-                    //var lineItemParentNode = lineItemNode.parentNode;
-                    var hidden_mediaFileId_value = findMediaFileIdForLineItem(lineItemNode);
-                    //lineItemParentNode.removeChild(lineItemNode);
-
-                    document.mediaFileSearchForm.mediaFileId.value=hidden_mediaFileId_value;
-                    document.mediaFileSearchForm.action='<s:url action="mediaFileSearch!delete" />';
-                    document.mediaFileSearchForm.submit();
-                }
-
-                function createPost(p_oLI) {
-                    var lineItemNode =	YAHOO.util.Dom.getAncestorByTagName(p_oLI, "LI");
-                    var hidden_mediaFileId_value = findMediaFileIdForLineItem(lineItemNode);
-                    document.mediaFileSearchForm.mediaFileId.value = hidden_mediaFileId_value;
-                    document.mediaFileSearchForm.action = '<s:url action="entryAddWithMediaFile"></s:url>';
-                    document.mediaFileSearchForm.submit();
-                }
-
-                function includeMedia(p_oLI) {
-                    var lineItemNode =	YAHOO.util.Dom.getAncestorByTagName(p_oLI, "LI");
-                    var hidden_mediaFileId_value = findMediaFileIdForLineItem(lineItemNode);
-                    document.mediaFileSearchForm.mediaFileId.value=hidden_mediaFileId_value;
-                    document.mediaFileSearchForm.action='<s:url action="mediaFileSearch!includeInGallery" />';
-                    document.mediaFileSearchForm.submit();
-                }
-
-
-                function onEweContextMenuClick(p_sType, p_aArgs) {
-
-                    /*
-                         The second item in the arguments array (p_aArgs)
-                         passed back to the "click" event handler is the
-                         MenuItem instance that was the target of the
-                         "click" event.
-                    */
-
-                    var oItem = p_aArgs[1], // The MenuItem that was clicked
-                    	oTarget = this.contextEventTarget,
-                        oLI;
-
-
-                    if (oItem) {
-
-					oLI = oTarget.className == "contextMenu" ?
-								oTarget : YAHOO.util.Dom.getAncestorByClassName(oTarget, "contextMenu");
-
-
-                        switch (oItem.index) {
-
-                            case 0:     // delete
-
-                                deleteMedia(oLI);
-
-                            break;
-
-
-                            case 1:     // create post
-
-                                createPost(oLI);
-
-                            break;
-
-
-                            case 2:     // include in gallery
-
-                                includeMedia(oLI);
-
-                            break;
-
+        function findMediaFileIdForLineItem(lineItemNode) {
+           var findMediaFileIdNode = function(node) {
+           return (node.id == 'mediafileidentity');
+           }
+           var temp_elements = YAHOO.util.Dom.getElementsBy(findMediaFileIdNode,"input",lineItemNode);
+           return temp_elements[0].value;
+        }
+
+        function deleteMedia(p_oLI) {
+           var lineItemNode = YAHOO.util.Dom.getAncestorByTagName(p_oLI, "LI");
+           var hidden_mediaFileId_value = findMediaFileIdForLineItem(lineItemNode);
+           document.mediaFileSearchForm.mediaFileId.value=hidden_mediaFileId_value;
+           document.mediaFileSearchForm.action='<s:url action="mediaFileSearch!delete" />';
+           document.mediaFileSearchForm.submit();
+        }
+
+        function createPost(p_oLI) {
+           var lineItemNode = YAHOO.util.Dom.getAncestorByTagName(p_oLI, "LI");
+           var hidden_mediaFileId_value = findMediaFileIdForLineItem(lineItemNode);
+           document.mediaFileSearchForm.mediaFileId.value = hidden_mediaFileId_value;
+           document.mediaFileSearchForm.action = '<s:url action="entryAddWithMediaFile"></s:url>';
+           document.mediaFileSearchForm.submit();
+        }
+
+        function includeMedia(p_oLI) {
+           var lineItemNode = YAHOO.util.Dom.getAncestorByTagName(p_oLI, "LI");
+           var hidden_mediaFileId_value = findMediaFileIdForLineItem(lineItemNode);
+           document.mediaFileSearchForm.mediaFileId.value=hidden_mediaFileId_value;
+           document.mediaFileSearchForm.action='<s:url action="mediaFileSearch!includeInGallery" />';
+           document.mediaFileSearchForm.submit();
+        }
+
+        function onEweContextMenuClick(p_sType, p_aArgs) {
+
+             var oItem = p_aArgs[1],
+             oTarget = this.contextEventTarget,
+             oLI;
+
+             if (oItem) {
+                oLI = oTarget.className == "contextMenu" ?
+                oTarget : YAHOO.util.Dom.getAncestorByClassName(oTarget, "contextMenu");
+                   switch (oItem.index) {
+
+                   case 0:// delete
+                          deleteMedia(oLI);
+                          break;
+                   case 1:// create post
+                          createPost(oLI);
+                          break;
+                   case 2:// include in gallery
+                          includeMedia(oLI);
+                          break;
+                   }
+             }
+       }
+
+            /*
+              Array of text labels for the MenuItem instances to be
+              added to the ContextMenu instanc.
+            */
+
+              var aMenuItems = ["Delete", "Create Post", "Include in Gallery" ];
+
+            /*
+              Instantiate a ContextMenu:  The first argument passed to the constructor
+              is the id for the Menu element to be created, the second is an
+              object literal of configuration properties.
+             */
+
+              var oEweContextMenu = new YAHOO.widget.ContextMenu(
+                                               "ewecontextmenu",
+                       {
+                         trigger: oClones.getElementsByClassName("contextMenu"),
+                         itemdata: aMenuItems,
+                         lazyload: true
                         }
+              );
 
-                    }
-
-                }
-
-
-                /*
-                     Array of text labels for the MenuItem instances to be
-                     added to the ContextMenu instanc.
-                */
-
-                var aMenuItems = ["Delete", "Create Post", "Include in Gallery" ];
+              // "render" event handler for the ewe context menu
 
+              function onContextMenuRender(p_sType, p_aArgs) {
 
-                /*
-					Instantiate a ContextMenu:  The first argument passed to the constructor
-					is the id for the Menu element to be created, the second is an
-					object literal of configuration properties.
-                */
+              //  Add a "click" event handler to the ewe context menu
 
-                var oEweContextMenu = new YAHOO.widget.ContextMenu(
-                                            "ewecontextmenu",
-                                            {
-                                                trigger: oClones.getElementsByClassName("contextMenu"),
-                                                itemdata: aMenuItems,
-                                                lazyload: true
-                                            }
-                                        );
+              this.subscribe("click", onEweContextMenuClick);
 
+              }
 
-                // "render" event handler for the ewe context menu
+              // Add a "render" event handler to the ewe context menu
 
-                function onContextMenuRender(p_sType, p_aArgs) {
+              oEweContextMenu.subscribe("render", onContextMenuRender);
 
-                 //  Add a "click" event handler to the ewe context menu
 
-                    this.subscribe("click", onEweContextMenuClick);
+});
 
-                }
-
-
-                // Add a "render" event handler to the ewe context menu
-
-                oEweContextMenu.subscribe("render", onContextMenuRender);
-
-
-            });
 YAHOO.example = function() {
-			var $D = YAHOO.util.Dom;
-			var $E = YAHOO.util.Event;
-			return {
-				init : function() {
-					var overlay_img = new YAHOO.widget.Overlay("overlay_img", { fixedcenter:true,
-																			visible:false,
-																			width:"577px",height:"550px"
-																		   });
-					overlay_img.render();
-					var overlay = document.createElement('div');
-					overlay.id = 'overlay';
-
-					// Assign 100% height and width
-					overlay.style.width = '100%';
-					overlay.style.height = '100%';
-
-                    document.getElementsByTagName('body')[0].appendChild(overlay);
-					overlay.style.display = 'none';
-			}
-			};
-
-		}();
-
-		YAHOO.util.Event.addListener(window, "load", YAHOO.example.init);
+    var $D = YAHOO.util.Dom;
+    var $E = YAHOO.util.Event;
+        return {
+          init : function() {
+             var overlay_img = new YAHOO.widget.Overlay("overlay_img", { fixedcenter:true,
+                                                                         visible:false,
+                                                                         width:"577px",height:"550px"
+                                                                       });
+             overlay_img.render();
+             var overlay = document.createElement('div');
+             overlay.id = 'overlay';
+             // Assign 100% height and width
+             overlay.style.width = '100%';
+             overlay.style.height = '100%';
+             document.getElementsByTagName('body')[0].appendChild(overlay);
+             overlay.style.display = 'none';
+          }
+        };
+}();
 
+YAHOO.util.Event.addListener(window, "load", YAHOO.example.init);
 </script>
 
-
 <%-- JavaScript for media file search page--%>
 <script type="text/javascript">
 <!--
@@ -277,38 +234,30 @@
 }
 function onClose()
 {
-	document.getElementById('overlay').style.display = 'none';
-	document.getElementById('overlay_img').style.visibility = 'hidden';
+    document.getElementById('overlay').style.display = 'none';
+    document.getElementById('overlay_img').style.visibility = 'hidden';
 }
 function onClickEdit(mediaFileId)
 {
     var browser=navigator.appName;
-	document.getElementById("overlay_img").style.visibility = "visible";
-	document.getElementById('overlay').style.display = 'block';
-
-		var frame = document.createElement('iframe');
-				    frame.setAttribute("id","myframe");
-				    frame.setAttribute("frameborder","no");
-				    frame.setAttribute("scrolling","auto");
-
-				    frame.setAttribute('src','<s:url action="mediaFileEdit"><s:param name="weblog" value="%{actionWeblog.handle}" /></s:url>&mediaFileId='+mediaFileId );
-				    frame.style.width="100%";
-			    	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").innerHTML = '<div ><a href="#" class="container-close" onclick="onClose()"></a></div>';
-
-    document.getElementById("overlay_img").appendChild(frame);
-
+    document.getElementById("overlay_img").style.visibility = "visible";
+    document.getElementById('overlay').style.display = 'block';
 
+        var frame = document.createElement('iframe');
+        frame.setAttribute("id","myframe");
+        frame.setAttribute("frameborder","no");
+        frame.setAttribute("scrolling","auto");
+        frame.setAttribute('src','<s:url action="mediaFileEdit"><s:param name="weblog" value="%{actionWeblog.handle}" /></s:url>&mediaFileId='+mediaFileId );
+        frame.style.width="100%";
+        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").innerHTML = '<div ><a href="#" class="container-close" onclick="onClose()"></a></div>';
+        document.getElementById("overlay_img").appendChild(frame);
 }
-
 -->
 </script>
 
@@ -316,7 +265,7 @@
    Search uploaded files
 </p>
 
-	<s:form id="mediaFileSearchForm" name="mediaFileSearchForm" action="mediaFileSearch!search" onsubmit="editorCleanup()">
+<s:form id="mediaFileSearchForm" name="mediaFileSearchForm" action="mediaFileSearch!search" onsubmit="editorCleanup()">
     <s:hidden name="weblog" />
     <input type="hidden" name="mediaFileId" value="" />
     <table class="mediaFileSearchTable" cellpadding="0" cellspacing="3" width="100%">
@@ -347,7 +296,7 @@
                 <label for="tags">Tags</label>
             </td>
             <td>
-                <s:textfield name="bean.tags" size="20	" maxlength="50" />
+                <s:textfield name="bean.tags" size="20" maxlength="50" />
             </td>
         </tr>
         <tr>
@@ -358,21 +307,20 @@
             <td>&nbsp;</td>
             <td>&nbsp;</td>
         </tr>
-     </table>
-	 <div id="overlay_img" style="visibility:hidden">
+    </table>
+  <div id="overlay_img" style="visibility:hidden">
+  </div>
 
-</div>
-
- <div class="control">
+  <div class="control">
     <span style="padding-left:20px">Sort by:</span>
     <s:select name="bean.sortOption" list="sortOptions" listKey="key" listValue="value" />
-	<s:if test="!pager.justOnePage">
-	<span style="padding-left:300px">
-	<s:if test="pager.hasPrevious()"><a href="#" onclick="onPrevious()">&lt;Previous</a></s:if>
-	<s:if test="pager.hasNext()"><a href="#" onclick="onNext()">Next&gt;</a></s:if>
-	<span>
-	</s:if>
-    </div>
+        <s:if test="!pager.justOnePage">
+        <span style="padding-left:300px">
+        <s:if test="pager.hasPrevious()"><a href="#" onclick="onPrevious()">&lt;Previous</a></s:if>
+        <s:if test="pager.hasNext()"><a href="#" onclick="onNext()">Next&gt;</a></s:if>
+        <span>
+        </s:if>
+   </div>
 
     <s:hidden name="bean.pageNum" />
 
@@ -383,31 +331,36 @@
 
     <s:iterator id="mediaFile" value="pager.items">
     <li class="align-images">
-	<div style="border:1px solid #000000;width:120px;height:100px;margin:5px;">
-	<img border="0" <s:if test="#mediaFile.imageFile">src='<s:url value="/roller-ui/rendering/media-resources/%{#mediaFile.id}" />' width="120px" height="100px" </s:if> <s:else>src="/images/page.png" style="padding:40px 50px;"</s:else>/>
-	</div><br/>
-	 <div style="clear:left;width:130px;margin-left:5px;font-size:11px;"><label><s:property
-value="#mediaFile.name" /></label><br />
-<label style="color:blue"><s:property value="#mediaFile.directory.path" /></label>
-<div style="padding-top:5px;">   <!--  one -->
-    <input style="float:left;" type="checkbox" name="selectedMediaFiles" value="<s:property
-value="#mediaFile.id"/>"/>
-	<INPUT TYPE="hidden" id="mediafileidentity" value="<s:property value='#mediaFile.id'/>">
-<s:if test="overlayMode">
-<div style="float:right;">
+        <div style="border:1px solid #000000;width:120px;height:100px;margin:5px;">
+        <s:if test="#mediaFile.imageFile">
+        <s:url id="mediaFileURL" value="/roller-ui/rendering/media-resources/%{#mediaFile.id}"></s:url>
+        </s:if>
+        <s:else>
+        <s:url id="mediaFileURL" value="/images/page.png"></s:url>
+        </s:else>
+        <img border="0" src='<s:property value="%{mediaFileURL}" />' <s:if test="#mediaFile.imageFile">width="120px" height="100px" </s:if> <s:else>style="padding:40px 50px;"</s:else>/>
+        </div><br/>
+
+      <div style="clear:left;width:130px;margin-left:5px;font-size:11px;"><label><s:property value="#mediaFile.name" /></label><br />
+        <label style="color:blue"><s:property value="#mediaFile.directory.path" /></label>
+        <div style="padding-top:5px;">   <!--  one -->
+        <input style="float:left;" type="checkbox" name="selectedMediaFiles" value="<s:property value="#mediaFile.id"/>"/>
+        <INPUT TYPE="hidden" id="mediafileidentity" value="<s:property value='#mediaFile.id'/>">
+    <s:if test="overlayMode">
+    <div style="float:right;">
        <a  href="#" onclick="onClickInsert('<s:property value="#mediaFile.id" />', '<s:url value="/roller-ui/rendering/media-resources/%{#mediaFile.id}" />', '<s:property value="#mediaFile.name" />', <s:property value="#mediaFile.imageFile" />)">Insert</a>
     </div>
-</s:if>
-<s:else>
-<div style="float:right;">
-   <a  href="#" id="<s:property value='#mediaFile.id'/>" onclick="onClickEdit(this.id)">Edit</a>
-
-<a  class="contextMenu" href="#">More...</a>
-</div>
-</s:else>
-</div>  <!-- one -->
-	</div>
-	</li>
+    </s:if>
+    <s:else>
+    <div style="float:right;">
+    <a  href="#" id="<s:property value='#mediaFile.id'/>" onclick="onClickEdit(this.id)">Edit</a>
+
+    <a  class="contextMenu" href="#">More...</a>
+     </div>
+    </s:else>
+       </div>  <!-- one -->
+      </div>
+    </li>
     </s:iterator>
     </ul>
 
@@ -449,16 +402,16 @@
     <%-- ================================================================== --%>
     <%-- the button box --%>
 
-	<br/>
-	<div class="control">
+<br/>
+    <div class="control">
      <s:if test="!overlayMode">
      <input type="button" style="padding-left:20px" value="Delete Selected" onclick="onDeleteSelected()" />
      <input type="button" style="padding-left:20px" value="Move Selected" onclick="onMoveSelected()" />
-	 <span style="padding-left:20px">
-         <s:select name="selectedDirectory" list="allDirectories" listKey="id" listValue="path" />
-	 </span>
-	 </s:if>
+     <span style="padding-left:20px">
+     <s:select name="selectedDirectory" list="allDirectories" listKey="id" listValue="path" />
+     </span>
+     </s:if>
     </div>
-	</s:form>
+</s:form>
 
 

Modified: roller/branches/roller_mediablogging/apps/weblogger/web/WEB-INF/jsps/editor/MediaFileView.jsp
URL: http://svn.apache.org/viewvc/roller/branches/roller_mediablogging/apps/weblogger/web/WEB-INF/jsps/editor/MediaFileView.jsp?rev=773037&r1=773036&r2=773037&view=diff
==============================================================================
--- roller/branches/roller_mediablogging/apps/weblogger/web/WEB-INF/jsps/editor/MediaFileView.jsp (original)
+++ roller/branches/roller_mediablogging/apps/weblogger/web/WEB-INF/jsps/editor/MediaFileView.jsp Fri May  8 15:43:35 2009
@@ -16,154 +16,124 @@
   directory of this distribution.
 --%>
 <%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
-<link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/combo?2.6.0/build/reset-fonts-grids/reset-fonts-grids.css&2.6.0/build/menu/assets/skins/sam/menu.css">
-<!-- Combo-handled YUI JS files: -->
-<script type="text/javascript" src="http://yui.yahooapis.com/combo?2.6.0/build/yahoo-dom-event/yahoo-dom-event.js&2.6.0/build/animation/animation-min.js&2.6.0/build/container/container_core-min.js&2.6.0/build/menu/menu-min.js"></script>
-<link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/2.6.0/build/fonts/fonts-min.css" />
-<link rel="stylesheet" type="text/css"
-href="http://yui.yahooapis.com/2.6.0/build/container/assets/skins/sam/container.css" />
-
-<script type="text/javascript" src="http://yui.yahooapis.com/2.6.0/build/yahoo-dom-event/yahoo-dom-event.js"></script>
-<script type="text/javascript"
-src="http://yui.yahooapis.com/2.6.0/build/container/container-min.js"></script>
 
-<style>
-/*margin and padding on body element
-  can introduce errors in determining
-  element position and are not recommended;
-  we turn them off as a foundation for YUI
-  CSS treatments. */
-	body {
-		margin:0;
-		padding:0;
-		text-align:left;
-	}
-	h1 {
-		font-size:20px;
-		font-weight:bold;
-	}
-
-	.yui-overlay {
-		position:fixed;
-	  	background: #ffffff;
-	  	z-index: 112;
-	  	color:#000000;
-	  	border: 4px solid #525252;
-	  	text-align:left;
-	  	top: 50%;
-	  	left: 50%;
-	}
+<link rel="stylesheet" type="text/css" href="<s:url value='/roller-ui/styles/yui/reset-fonts-grids.css'/>" />
+<link rel="stylesheet" type="text/css" href="<s:url value='/roller-ui/styles/yui/container.css'/>" />
+<link rel="stylesheet" type="text/css" href="<s:url value='/roller-ui/styles/yui/menu.css'/>" />
+
+<script type="text/javascript" src="<s:url value='/roller-ui/scripts/yui/yahoo-dom-event.js'/>"></script>
+<script type="text/javascript" src="<s:url value='/roller-ui/scripts/yui/container_core-min.js'/>"></script>
+<script type="text/javascript" src="<s:url value='/roller-ui/scripts/yui/menu-min.js'/>"></script>
+
 
 
+<style>
+body   {
+              margin:0;
+              padding:0;
+              text-align:left;
+       }
+h1     {
+              font-size:20px;
+              font-weight:bold;
+       }
+.yui-overlay {
+              position:fixed;
+              background: #ffffff;
+              z-index: 112;
+              color:#000000;
+              border: 4px solid #525252;
+              text-align:left;
+              top: 50%;
+              left: 50%;
+           }
+
 </style>
 <script type="text/javascript">
 YAHOO.util.Event.onContentReady("myMenu", function () {
+      var oClones = this;
 
-
-                var oClones = this;
-
-
-                function findMediaFileIdForLineItem(lineItemNode) {
-                    var findMediaFileIdNode = function(node) {
-                        return (node.id == 'mediafileidentity');
-                    }
-                    var temp_elements = YAHOO.util.Dom.getElementsBy(findMediaFileIdNode,"input",lineItemNode);
-                    return temp_elements[0].value;
-                }
-
-                function deleteMedia(p_oLI) {
-
-                    var lineItemNode =	YAHOO.util.Dom.getAncestorByTagName(p_oLI, "LI");
-                    var hidden_mediaFileId_value = findMediaFileIdForLineItem(lineItemNode);
-                    document.mediaFileViewForm.mediaFileId.value=hidden_mediaFileId_value;
-                    document.mediaFileViewForm.action='<s:url action="mediaFileView!delete" />';
-                    document.mediaFileViewForm.submit();
-                }
-
-                function createPost(p_oLI) {
-                    var lineItemNode =	YAHOO.util.Dom.getAncestorByTagName(p_oLI, "LI");
-                    var hidden_mediaFileId_value = findMediaFileIdForLineItem(lineItemNode);
-                    document.mediaFileViewForm.mediaFileId.value = hidden_mediaFileId_value;
-                    document.mediaFileViewForm.action = '<s:url action="entryAddWithMediaFile"></s:url>';
-                    document.mediaFileViewForm.submit();
-                }
-
-                function includeMedia(p_oLI) {
-                    var lineItemNode =	YAHOO.util.Dom.getAncestorByTagName(p_oLI, "LI");
-                    var hidden_mediaFileId_value = findMediaFileIdForLineItem(lineItemNode);
-                    document.mediaFileViewForm.mediaFileId.value = hidden_mediaFileId_value;
-                    document.mediaFileViewForm.action = '<s:url action="mediaFileView!includeInGallery" />';
-                    document.mediaFileViewForm.submit();
-                }
-
-
-
-
-                function onEweContextMenuClick(p_sType, p_aArgs) {
-
-                    /*
-                         The second item in the arguments array (p_aArgs)
-                         passed back to the "click" event handler is the
-                         MenuItem instance that was the target of the
-                         "click" event.
-                    */
-
-                    var oItem = p_aArgs[1], // The MenuItem that was clicked
-                    	oTarget = this.contextEventTarget,
-                        oLI;
-
-
-                    if (oItem) {
-
-					oLI = oTarget.className == "contextMenu" ?
-								oTarget : YAHOO.util.Dom.getAncestorByClassName(oTarget, "contextMenu");
-
-
-                        switch (oItem.index) {
-
-                            case 0:     // delete
-
-                                deleteMedia(oLI);
-
-                            break;
-
-
-                            case 1:     // create post
-
-                                createPost(oLI);
-
-                            break;
-
-
-                            case 2:     // include in gallery
-
-                                includeMedia(oLI);
-
-                            break;
-
-                        }
-
-                    }
-
-                }
-
-
-                /*
-                     Array of text labels for the MenuItem instances to be
-                     added to the ContextMenu instanc.
-                */
-
-                var aMenuItems = ["Delete", "Create Post", "Include in Gallery" ];
+      function findMediaFileIdForLineItem(lineItemNode) {
+         var findMediaFileIdNode = function(node) {
+         return (node.id == 'mediafileidentity');
+         }
+         var temp_elements = YAHOO.util.Dom.getElementsBy(findMediaFileIdNode,"input",lineItemNode);
+         return temp_elements[0].value;
+      }
+
+     function deleteMedia(p_oLI) {
+       var lineItemNode = YAHOO.util.Dom.getAncestorByTagName(p_oLI, "LI");
+       var hidden_mediaFileId_value = findMediaFileIdForLineItem(lineItemNode);
+       document.mediaFileViewForm.mediaFileId.value=hidden_mediaFileId_value;
+       document.mediaFileViewForm.action='<s:url action="mediaFileView!delete" />';
+       document.mediaFileViewForm.submit();
+     }
+
+     function createPost(p_oLI) {
+       var lineItemNode = YAHOO.util.Dom.getAncestorByTagName(p_oLI, "LI");
+       var hidden_mediaFileId_value = findMediaFileIdForLineItem(lineItemNode);
+       document.mediaFileViewForm.mediaFileId.value = hidden_mediaFileId_value;
+       document.mediaFileViewForm.action = '<s:url action="entryAddWithMediaFile"></s:url>';
+       document.mediaFileViewForm.submit();
+     }
+
+     function includeMedia(p_oLI) {
+       var lineItemNode = YAHOO.util.Dom.getAncestorByTagName(p_oLI, "LI");
+       var hidden_mediaFileId_value = findMediaFileIdForLineItem(lineItemNode);
+       document.mediaFileViewForm.mediaFileId.value = hidden_mediaFileId_value;
+       document.mediaFileViewForm.action = '<s:url action="mediaFileView!includeInGallery" />';
+       document.mediaFileViewForm.submit();
+     }
+
+     function onEweContextMenuClick(p_sType, p_aArgs) {
+
+       /*
+         The second item in the arguments array (p_aArgs)
+         passed back to the "click" event handler is the
+         MenuItem instance that was the target of the
+         "click" event.
+        */
+
+         var oItem = p_aArgs[1], // The MenuItem that was clicked
+         oTarget = this.contextEventTarget,
+         oLI;
+
+         if (oItem) {
+
+         oLI = oTarget.className == "contextMenu" ?
+         oTarget : YAHOO.util.Dom.getAncestorByClassName(oTarget, "contextMenu");
+
+         switch (oItem.index) {
+
+         case 0:     // delete
+                deleteMedia(oLI);
+                break;
+         case 1:     // create post
+                createPost(oLI);
+                break;
+         case 2:     // include in gallery
+                includeMedia(oLI);
+                break;
+         }
+     }
+}
 
 
-                /*
-					Instantiate a ContextMenu:  The first argument passed to the constructor
-					is the id for the Menu element to be created, the second is an
-					object literal of configuration properties.
-                */
+       /*
+         Array of text labels for the MenuItem instances to be
+         added to the ContextMenu instanc.
+       */
+
+         var aMenuItems = ["Delete", "Create Post", "Include in Gallery" ];
+
+       /*
+         Instantiate a ContextMenu:  The first argument passed to the constructor
+         is the id for the Menu element to be created, the second is an
+         object literal of configuration properties.
+       */
 
-                var oEweContextMenu = new YAHOO.widget.ContextMenu(
-                                            "ewecontextmenu",
+         var oEweContextMenu = new YAHOO.widget.ContextMenu(
+                                          "ewecontextmenu",
                                             {
                                                 trigger: oClones.getElementsByClassName("contextMenu"),
                                                 itemdata: aMenuItems,
@@ -172,53 +142,51 @@
                                         );
 
 
-                // "render" event handler for the ewe context menu
+        // "render" event handler for the ewe context menu
+
+        function onContextMenuRender(p_sType, p_aArgs) {
 
-                function onContextMenuRender(p_sType, p_aArgs) {
+        //  Add a "click" event handler to the ewe context menu
 
-                 //  Add a "click" event handler to the ewe context menu
+        this.subscribe("click", onEweContextMenuClick);
 
-                    this.subscribe("click", onEweContextMenuClick);
+        }
 
-                }
 
+        // Add a "render" event handler to the ewe context menu
 
-                // Add a "render" event handler to the ewe context menu
+        oEweContextMenu.subscribe("render", onContextMenuRender);
 
-                oEweContextMenu.subscribe("render", onContextMenuRender);
 
+        });
 
-            });
+ YAHOO.example = function() {
 
-			YAHOO.example = function() {
-				
 
-			var $D = YAHOO.util.Dom;
-			var $E = YAHOO.util.Event;
-			return {
-				init : function() {
-					var overlay_img = new YAHOO.widget.Overlay("overlay_img", { fixedcenter:true,
-																			visible:false,
-																			width:"569px",height:"550px"
-																		   });
-				 
-				 
-					overlay_img.render();
-					var overlay = document.createElement('div');
-					overlay.id = 'overlay';
+       var $D = YAHOO.util.Dom;
+       var $E = YAHOO.util.Event;
+          return {
+              init : function() {
+                 var overlay_img = new YAHOO.widget.Overlay("overlay_img", { fixedcenter:true,
+                                                                             visible:false,
+                                                                             width:"569px",height:"550px"
+                                                                           });
 
-					// Assign 100% height and width
-					overlay.style.width = '100%';
-					overlay.style.height = '100%';
+                 overlay_img.render();
+                 var overlay = document.createElement('div');
+                 overlay.id = 'overlay';
+                 // Assign 100% height and width
+                 overlay.style.width = '100%';
+                 overlay.style.height = '100%';
 
-                    document.getElementsByTagName('body')[0].appendChild(overlay);
-					overlay.style.display = 'none';
-			}
-			};
+                 document.getElementsByTagName('body')[0].appendChild(overlay);
+                 overlay.style.display = 'none';
+               }
+          };
 
-		}();
+ }();
 
-		YAHOO.util.Event.addListener(window, "load", YAHOO.example.init);
+       YAHOO.util.Event.addListener(window, "load", YAHOO.example.init);
 
 </script>
 <script type="text/javascript">
@@ -231,16 +199,14 @@
 
 function onCreateDirectory()
 {
-    document.mediaFileViewForm.action='<s:url
-action="mediaFileView!createNewDirectory" />';
+    document.mediaFileViewForm.action='<s:url action="mediaFileView!createNewDirectory" />';
     document.mediaFileViewForm.submit();
 }
 
 function onDeleteSelected()
 {
     if ( confirm("<s:text name='mediaFile.delete.confirm' />") ) {
-        document.mediaFileViewForm.action='<s:url
-action="mediaFileView!deleteSelected" />';
+        document.mediaFileViewForm.action='<s:url action="mediaFileView!deleteSelected" />';
         document.mediaFileViewForm.submit();
     }
 }
@@ -248,42 +214,35 @@
 function onMoveSelected()
 {
     if ( confirm("<s:text name='mediaFile.move.confirm' />") ) {
-        document.mediaFileViewForm.action='<s:url
-action="mediaFileView!moveSelected" />';
+        document.mediaFileViewForm.action='<s:url action="mediaFileView!moveSelected" />';
         document.mediaFileViewForm.submit();
     }
 }
 function onClose()
 {
-	document.getElementById('overlay').style.display = 'none';
-	document.getElementById('overlay_img').style.visibility = 'hidden';
+    document.getElementById('overlay').style.display = 'none';
+    document.getElementById('overlay_img').style.visibility = 'hidden';
 }
 function onClickEdit(mediaFileId)
 {
     var browser=navigator.appName;
-	document.getElementById("overlay_img").style.visibility = "visible";
-	document.getElementById('overlay').style.display = 'block';
-
-		var frame = document.createElement('iframe');
-				    frame.setAttribute("id","myframe");
-				    frame.setAttribute("frameborder","no");
-				    frame.setAttribute("scrolling","auto");
-
-				    frame.setAttribute('src','<s:url action="mediaFileEdit"><s:param name="weblog" value="%{actionWeblog.handle}" /></s:url>&mediaFileId='+mediaFileId );
-				    frame.style.width="100%";
-			    	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").innerHTML = '<div ><a href="#" class="container-close" onclick="onClose()"></a></div>';
-
-    document.getElementById("overlay_img").appendChild(frame);
+    document.getElementById("overlay_img").style.visibility = "visible";
+    document.getElementById('overlay').style.display = 'block';
 
+      var frame = document.createElement('iframe');
+      frame.setAttribute("id","myframe");
+      frame.setAttribute("frameborder","no");
+      frame.setAttribute("scrolling","auto");
+      frame.setAttribute('src','<s:url action="mediaFileEdit"><s:param name="weblog" value="%{actionWeblog.handle}" /></s:url>&mediaFileId='+mediaFileId );
+      frame.style.width="100%";
+      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").innerHTML = '<div ><a href="#" class="container-close" onclick="onClose()"></a></div>';
+      document.getElementById("overlay_img").appendChild(frame);
 
 }
 -->
@@ -304,19 +263,16 @@
 </s:iterator>
 </p>
 
-<s:form id="mediaFileViewForm" name="mediaFileViewForm" action="mediaFileView"
-onsubmit="editorCleanup()">
-<s:url id="mediaFileHierarchicalViewURL" action="mediaFileHierarchicalView">
+<s:form id="mediaFileViewForm" name="mediaFileViewForm" action="mediaFileView" onsubmit="editorCleanup()">
+    <s:url id="mediaFileHierarchicalViewURL" action="mediaFileHierarchicalView">
     <s:param name="weblog" value="%{actionWeblog.handle}" />
-</s:url>
-<p><span style="font-weight:bold">Tabular</span> | <s:a
-href="%{mediaFileHierarchicalViewURL}">Hierarchical</s:a></p>
- <div class="control">
+    </s:url>
+    <p><span style="font-weight:bold">Tabular</span> | <s:a href="%{mediaFileHierarchicalViewURL}">Hierarchical</s:a></p>
+    <div class="control">
     <span style="padding-left:20px">Sort by:</span>
-    <s:select name="sortBy" list="sortOptions" listKey="key" listValue="value"
-onchange="document.mediaFileViewForm.submit();" />
-	</span>
- </div>
+    <s:select name="sortBy" list="sortOptions" listKey="key" listValue="value" onchange="document.mediaFileViewForm.submit();" />
+    </span>
+    </div>
 
     <s:hidden name="weblog" />
     <s:hidden name="directoryId" />
@@ -329,60 +285,52 @@
   <ul id = "myMenu">
 
     <s:iterator id="directory" value="childDirectories">
-	<li class="align-images" >
-	<div style="border:1px solid #000000;width:120px;height:100px;margin:5px;">
-	<img  border="0" src='<s:url value="/images/folder.png"/>'
-    class="dir-image" alt="mediaFolder.png"
-    onclick="onSelectDirectory('<s:property value="#directory.id"/>')"/>
-    </div>
-    <div style="clear:left;width:130px;margin-left:10px;font-size:11px;"><label><s:property
-    value="#directory.name" /></label>
-
-	</div>
-	</li>
+        <li class="align-images" >
+        <div style="border:1px solid #000000;width:120px;height:100px;margin:5px;">
+        <img  border="0" src='<s:url value="/images/folder.png"/>' class="dir-image" alt="mediaFolder.png" onclick="onSelectDirectory('<s:property value="#directory.id"/>')"/>
+        </div>
+        <div style="clear:left;width:130px;margin-left:10px;font-size:11px;"><label><s:property value="#directory.name" /></label>
+        </div>
+        </li>
     </s:iterator>
 
 
     <s:iterator id="mediaFile" value="childFiles">
-	<li class="align-images" >
-	<s:if test="#mediaFile.imageFile">
-    <s:url id="mediaFileURL"
-    value="/roller-ui/rendering/media-resources/%{#mediaFile.id}"></s:url>
-	</s:if>
-	<s:else>
-    <s:url id="mediaFileURL" value="/images/page.png"></s:url>
-	</s:else>
-    <div style="border:1px solid #000000;width:120px;height:100px;margin:5px;">
-	<img border="0" src='<s:property value="%{mediaFileURL}" />' <s:if test="#mediaFile.imageFile"> width="120px" height="100px" </s:if> <s:else>style="padding:40px 50px;"</s:else>/>
-	</div>
-    <div style="clear:left;width:130px;margin-left:5px;font-size:11px;"><label><s:property
-    value="#mediaFile.name" /></label>
-    <div style="padding-top:5px;">   <!--  one -->
-    <input style="float:left;" type="checkbox" name="selectedMediaFiles" value="<s:property
-    value="#mediaFile.id"/>"/>
-	<INPUT TYPE="hidden" id="mediafileidentity" value="<s:property value='#mediaFile.id'/>">
-
-    <div style="float:right;">
-    <a  href="#" id="<s:property value='#mediaFile.id'/>" onclick="onClickEdit(this.id)">Edit</a>
-    <a  class="contextMenu" href="#">More...</a>
-    </div>
-    </div>  <!-- one -->
-	</div>
-	</li>
+        <li class="align-images" >
+        <s:if test="#mediaFile.imageFile">
+        <s:url id="mediaFileURL" value="/roller-ui/rendering/media-resources/%{#mediaFile.id}"></s:url>
+        </s:if>
+        <s:else>
+        <s:url id="mediaFileURL" value="/images/page.png"></s:url>
+        </s:else>
+        <div style="border:1px solid #000000;width:120px;height:100px;margin:5px;">
+        <img border="0" src='<s:property value="%{mediaFileURL}" />' <s:if test="#mediaFile.imageFile"> width="120px" height="100px" </s:if> <s:else>style="padding:40px 50px;"</s:else>/>
+        </div>
+        <div style="clear:left;width:130px;margin-left:5px;font-size:11px;"><label><s:property value="#mediaFile.name" /></label>
+        <div style="padding-top:5px;">   <!--  one -->
+        <input style="float:left;" type="checkbox" name="selectedMediaFiles" value="<s:property value="#mediaFile.id"/>"/>
+        <INPUT TYPE="hidden" id="mediafileidentity" value="<s:property value='#mediaFile.id'/>">
+
+        <div style="float:right;">
+        <a  href="#" id="<s:property value='#mediaFile.id'/>" onclick="onClickEdit(this.id)">Edit</a>
+        <a  class="contextMenu" href="#">More...</a>
+        </div>
+        </div>  <!-- one -->
+        </div>
+        </li>
     </s:iterator>
 
   </ul>
   </div>
 
-<div style="margin-left:320px;clear:left;">
-New Directory Name:
-<input style="margin-top:5px;margin-bottom:5px;" type="text"
-name="newDirectoryName" size="30" />
-<input type="button" value="Create" onclick="onCreateDirectory()" />
-</div>
-<div id="overlay_img" style="visibility:hidden">
-
-</div>
+ <div style="margin-left:320px;clear:left;">
+ New Directory Name:
+ <input style="margin-top:5px;margin-bottom:5px;" type="text"
+ name="newDirectoryName" size="30" />
+ <input type="button" value="Create" onclick="onCreateDirectory()" />
+ </div>
+ <div id="overlay_img" style="visibility:hidden">
+ </div>
 
 
 
@@ -408,18 +356,15 @@
     <%-- ================================================================== --%>
     <%-- the button box --%>
 
-	<br/>
-	<div class="control">
-     <input type="button" style="padding-left:20px" value="Delete Selected"
-onclick="onDeleteSelected()" />
-     <input type="button" style="padding-left:20px" value="Move Selected"
-onclick="onMoveSelected()" />
-	 <span style="padding-left:20px">
-         <s:select name="selectedDirectory" list="allDirectories" listKey="id"
-listValue="path" />
-	 </span>
-    </div>
+ <br/>
+  <div class="control">
+     <input type="button" style="padding-left:20px" value="Delete Selected" onclick="onDeleteSelected()" />
+     <input type="button" style="padding-left:20px" value="Move Selected" onclick="onMoveSelected()" />
+     <span style="padding-left:20px">
+     <s:select name="selectedDirectory" list="allDirectories" listKey="id" listValue="path" />
+     </span>
+  </div>
 
-	</s:form>
+</s:form>
 
 

Modified: roller/branches/roller_mediablogging/apps/weblogger/web/roller-ui/authoring/editors/editor-text.jsp
URL: http://svn.apache.org/viewvc/roller/branches/roller_mediablogging/apps/weblogger/web/roller-ui/authoring/editors/editor-text.jsp?rev=773037&r1=773036&r2=773037&view=diff
==============================================================================
--- roller/branches/roller_mediablogging/apps/weblogger/web/roller-ui/authoring/editors/editor-text.jsp (original)
+++ roller/branches/roller_mediablogging/apps/weblogger/web/roller-ui/authoring/editors/editor-text.jsp Fri May  8 15:43:35 2009
@@ -17,68 +17,65 @@
 --%>
 <%-- This page is designed to be included in edit-weblog.jsp --%>
 <%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
-
-<script type="text/javascript" src="http://yui.yahooapis.com/2.6.0/build/yahoo-dom-event/yahoo-dom-event.js"></script>
-<script type="text/javascript" src="http://yui.yahooapis.com/2.6.0/build/container/container-min.js"></script>
+<script type="text/javascript" src="<s:url value='/roller-ui/scripts/yui/yahoo-dom-event.js'/>"></script>
+<script type="text/javascript" src="<s:url value='/roller-ui/scripts/yui/container-min.js'/>"></script>
 
 <style>
 a:link, a:visited, a:hover, a:active     { text-decoration:underline; }
-body {
-		margin:0;
-		padding:0;
-		text-align:left;
-	}
-	h1 {
-		font-size:20px;
-		font-weight:bold;
-	}
-
-	.yui-overlay {
-		position:fixed;
-	  	background: #ffffff;
-	  	z-index: 112;
-	  	color:#000000;
-	  	border: 4px solid #525252;
-	  	text-align:left;
-	  	top: 50%;
-	  	left: 50%;
-	}
+body        {
+                margin:0;
+                padding:0;
+                text-align:left;
+            }
+h1          {
+                font-size:20px;
+                font-weight:bold;
+            }
+.yui-overlay {
+                position:fixed;
+                background: #ffffff;
+                z-index: 112;
+                color:#000000;
+                border: 4px solid #525252;
+                text-align:left;
+                top: 50%;
+                left: 50%;
+        }
 </style>
 <script type="text/javascript">
 
 YAHOO.example = function() {
-			var $D = YAHOO.util.Dom;
-			var $E = YAHOO.util.Event;
-			return {
-				init : function() {
-					var overlay_img = new YAHOO.widget.Overlay("overlay_img", { fixedcenter:true,
-																			visible:false,
-																			width:"577px",height:"530px"
-																		   });
-					overlay_img.render();
-					var overlay = document.createElement('div');
-					overlay.id = 'overlay';
-
-					// Assign 100% height and width
-					overlay.style.width = '100%';
-					overlay.style.height = '100%';
-
-                    document.getElementsByTagName('body')[0].appendChild(overlay);
-					overlay.style.display = 'none';
-			}
-			};
+        var $D = YAHOO.util.Dom;
+        var $E = YAHOO.util.Event;
+            return {
+                init : function() {
+                var overlay_img = new YAHOO.widget.Overlay("overlay_img", { fixedcenter:true,
+                                                                            visible:false,
+                                                                            width:"577px",height:"530px"
+                                                                          });
+                overlay_img.render();
+                var overlay = document.createElement('div');
+                overlay.id = 'overlay';
+                // Assign 100% height and width
+                overlay.style.width = '100%';
+                overlay.style.height = '100%';
+
+                document.getElementsByTagName('body')[0].appendChild(overlay);
+                overlay.style.display = 'none';
+              }
+        };
 
-		}();
+}();
 
-		YAHOO.util.Event.addListener(window, "load", YAHOO.example.init);
+YAHOO.util.Event.addListener(window, "load", YAHOO.example.init);
 
 function onClose(textForInsertion)
 {
-	document.getElementById('overlay').style.display = 'none';
-	document.getElementById('overlay_img').style.visibility = 'hidden';
-	if (textForInsertion && textForInsertion.length > 0) {
-	    insertAtCursor(document.getElementById('EntryText'), textForInsertion);
-	}
+        document.getElementById('overlay').style.display = 'none';
+        document.getElementById('overlay_img').style.visibility = 'hidden';
+        if (textForInsertion && textForInsertion.length > 0) {
+            insertAtCursor(document.getElementById('EntryText'), textForInsertion);
+        }
 }
 
 function insertAtCursor(textAreaElement, valueForInsertion) {
@@ -111,97 +108,79 @@
 
 
 function onClickAdd(){
-	var browser=navigator.appName;
-	document.getElementById("overlay_img").style.visibility = "visible";
-	document.getElementById('overlay').style.display = 'block';
-	document.getElementById("overlay_img").style.width = "650px";
-	document.getElementById("overlay_img").style.height = "550px";
-	document.getElementById("overlay_img").style.top = "40px";
-
-
-		var frame = document.createElement('iframe');
-		frame.setAttribute("id","myframe");
-		frame.setAttribute("frameborder","no");
-		frame.setAttribute("scrolling","auto");
-
-		frame.setAttribute('src','<s:url action="mediaFileAdd" namespace="overlay"><s:param name="weblog" value="%{actionWeblog.handle}" /></s:url>' );
-		frame.style.width="100%";
-	    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").innerHTML = '<div ><a href="#" class="container-close" onclick="onClose()"></a></div>';
-
-    document.getElementById("overlay_img").appendChild(frame);
-
+        var browser=navigator.appName;
+        document.getElementById("overlay_img").style.visibility = "visible";
+        document.getElementById('overlay').style.display = 'block';
+        document.getElementById("overlay_img").style.width = "650px";
+        document.getElementById("overlay_img").style.height = "550px";
+        document.getElementById("overlay_img").style.top = "40px";
+
+
+                var frame = document.createElement('iframe');
+                frame.setAttribute("id","myframe");
+                frame.setAttribute("frameborder","no");
+                frame.setAttribute("scrolling","auto");
+
+                frame.setAttribute('src','<s:url action="mediaFileAdd" namespace="overlay"><s:param name="weblog"    value="%{actionWeblog.handle}" /></s:url>' );
+                frame.style.width="100%";
+                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").innerHTML = '<div ><a href="#" class="container-close" onclick="onClose()"></a></div>';
+                document.getElementById("overlay_img").appendChild(frame);
 }
 
 function onClickAddFromUpload(){
-	var browser=navigator.appName;
-    document.getElementById("overlay_img").style.visibility = "visible";
-	document.getElementById('overlay').style.display = 'block';
-	document.getElementById("overlay_img").style.width = "650px";
-	document.getElementById("overlay_img").style.height = "500px";
-	document.getElementById("overlay_img").style.top = "40px";
-
+        var browser=navigator.appName;
+        document.getElementById("overlay_img").style.visibility = "visible";
+        document.getElementById('overlay').style.display = 'block';
+        document.getElementById("overlay_img").style.width = "650px";
+        document.getElementById("overlay_img").style.height = "500px";
+        document.getElementById("overlay_img").style.top = "40px";
+                var frame = document.createElement('iframe');
+                frame.setAttribute("id","myframe");
+                frame.setAttribute("frameborder","no");
+                frame.setAttribute("scrolling","auto");
+                frame.setAttribute('src','<s:url action="mediaFileSearch" namespace="overlay"><s:param name="weblog" value="%{actionWeblog.handle}" /></s:url>' );
+                frame.style.width="100%";
+                frame.style.height="100%";
+                if (browser=="Microsoft Internet Explorer")
+                {
+                document.getElementById("overlay_img").style.top= "40px";
+                document.getElementById("overlay_img").style.left= "170px";
+                }
 
-
-		var frame = document.createElement('iframe');
-	    frame.setAttribute("id","myframe");
-	    frame.setAttribute("frameborder","no");
-	    frame.setAttribute("scrolling","auto");
-
-	    frame.setAttribute('src','<s:url action="mediaFileSearch" namespace="overlay"><s:param name="weblog" value="%{actionWeblog.handle}" /></s:url>' );
-	    frame.style.width="100%";
-		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").innerHTML = '<div ><a href="#" class="container-close" onclick="onClose()"></a></div>';
-
-    document.getElementById("overlay_img").appendChild(frame);
+                document.getElementById("overlay_img").innerHTML = '<div ><a href="#" class="container-close" onclick="onClose()"></a></div>';
+                document.getElementById("overlay_img").appendChild(frame);
 }
 
 function onClickAddExternal(){
-	var browser=navigator.appName;
-    document.getElementById("overlay_img").style.visibility = "visible";
-	document.getElementById('overlay').style.display = 'block';
-	document.getElementById("overlay_img").style.width = "515px";
-	document.getElementById("overlay_img").style.height = "400px";
-	document.getElementById("overlay_img").style.top = "100px";
-
-		var frame = document.createElement('iframe');
-		frame.setAttribute("id","myframe");
-	    frame.setAttribute("frameborder","no");
-	    frame.setAttribute("scrolling","auto");
-
-	    frame.setAttribute('src','<s:url action="mediaFileAddExternalInclude"><s:param name="weblog" value="%{actionWeblog.handle}" /></s:url>' );
-	    frame.style.width="100%";
-		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").innerHTML = '<div ><a href="#" class="container-close" onclick="onClose()"></a></div>';
-
-    document.getElementById("overlay_img").appendChild(frame);
-
+        var browser=navigator.appName;
+        document.getElementById("overlay_img").style.visibility = "visible";
+        document.getElementById('overlay').style.display = 'block';
+        document.getElementById("overlay_img").style.width = "515px";
+        document.getElementById("overlay_img").style.height = "400px";
+        document.getElementById("overlay_img").style.top = "100px";
+
+                var frame = document.createElement('iframe');
+                frame.setAttribute("id","myframe");
+                frame.setAttribute("frameborder","no");
+                frame.setAttribute("scrolling","auto");
+                frame.setAttribute('src','<s:url action="mediaFileAddExternalInclude"><s:param name="weblog" value="%{actionWeblog.handle}" /></s:url>' );
+                frame.style.width="100%";
+                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").innerHTML = '<div ><a href="#" class="container-close" onclick="onClose()"></a></div>';
+                document.getElementById("overlay_img").appendChild(frame);
 }
 
-
 </script>
 
 <script type="text/javascript">
@@ -233,8 +212,8 @@
     <span style="float:left;"><s:text name="weblogEdit.content" /></span>
     <span style="font-weight:normal;float:right;">
         <a href="#" onClick="onClickAdd();";>Add media </a>&nbsp;
-	    <a href="#" onClick="onClickAddFromUpload();">Attach uploaded file</a>&nbsp;
-	    <a href="#" onClick="onClickAddExternal();">Add media from URL</a>
+            <a href="#" onClick="onClickAddFromUpload();">Attach uploaded file</a>&nbsp;
+            <a href="#" onClick="onClickAddExternal();">Add media from URL</a>
     </span>
 </p>
 



Mime
View raw message