roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ganes...@apache.org
Subject svn commit: r768852 - in /roller/branches/roller_mediablogging/apps/weblogger/web: WEB-INF/ WEB-INF/jsps/editor/ roller-ui/authoring/editors/ roller-ui/styles/
Date Mon, 27 Apr 2009 01:17:35 GMT
Author: ganeshmb
Date: Mon Apr 27 01:17:34 2009
New Revision: 768852

URL: http://svn.apache.org/viewvc?rev=768852&view=rev
Log: (empty)

Modified:
    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/MediaFileEdit.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/WEB-INF/tiles.xml
    roller/branches/roller_mediablogging/apps/weblogger/web/roller-ui/authoring/editors/editor-text.jsp
    roller/branches/roller_mediablogging/apps/weblogger/web/roller-ui/styles/roller.css

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=768852&r1=768851&r2=768852&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
Mon Apr 27 01:17:34 2009
@@ -58,6 +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();"
/>
     </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=768852&r1=768851&r2=768852&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
Mon Apr 27 01:17:34 2009
@@ -37,9 +37,10 @@
 <div style="margin-bottom:10px;"><img border="0" src='<s:property value="%{mediaFileURL}"
/>' width="150px" alt="image"/></div>
 </s:if>
 
-<s:a href="%{mediaFileURL}">
-<s:property value="%{mediaFileURL}" />
-</s:a>
+
+<a style="font-size:11px;color:#000000;text-decoration:underline;" href="<s:property
value='%{mediaFileURL}'/>"><s:property value="%{mediaFileURL}" />
+<a>
+
 
 <div style="margin-top:20px;text-decoration:underline">
 

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=768852&r1=768851&r2=768852&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
Mon Apr 27 01:17:34 2009
@@ -116,6 +116,7 @@
     <br>
     <div class="control">
        <input type="submit" value="Submit" name="submit" />
+	   <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/MediaFileSearch.jsp
URL: http://svn.apache.org/viewvc/roller/branches/roller_mediablogging/apps/weblogger/web/WEB-INF/jsps/editor/MediaFileSearch.jsp?rev=768852&r1=768851&r2=768852&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
Mon Apr 27 01:17:34 2009
@@ -189,7 +189,7 @@
 				init : function() {
 					var overlay_img = new YAHOO.widget.Overlay("overlay_img", { fixedcenter:true,
 																			visible:false,
-																			width:"577px",height:"487px"
+																			width:"577px",height:"550px"
 																		   });
 					overlay_img.render();
 					var overlay = document.createElement('div');
@@ -280,7 +280,7 @@
 }
 function onClickEdit(mediaFileId)
 {
-
+    var browser=navigator.appName;
 	document.getElementById("overlay_img").style.visibility = "visible";
 	document.getElementById('overlay').style.display = 'block';
 
@@ -292,10 +292,13 @@
 				    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%";
-					//var mystring="<s:url action='mediaFileEdit'><s:param name='weblog' value='%{actionWeblog.handle}'
/></s:url>&mediaFileId="+mediaFileId;
-
-					//var innerstring = "<iframe id='myframe' frameborder='no' scrolling='auto' src="+mystring+"
width='100%' height='100%'></iframe>";
-
+					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>';
 
@@ -347,7 +350,7 @@
         </tr>
         <tr>
             <td>
-                <input type="submit" name="search" value="Search" />
+                <input style="margin:5px 0px;" type="submit" name="search" value="Search"
/>
             </td>
             <td>&nbsp;</td>
             <td>&nbsp;</td>

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=768852&r1=768851&r2=768852&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
Mon Apr 27 01:17:34 2009
@@ -191,14 +191,18 @@
             });
 
 			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:"465px"
+																			width:"569px",height:"550px"
 																		   });
+				 
+				 
 					overlay_img.render();
 					var overlay = document.createElement('div');
 					overlay.id = 'overlay';
@@ -256,7 +260,7 @@
 }
 function onClickEdit(mediaFileId)
 {
-
+    var browser=navigator.appName;
 	document.getElementById("overlay_img").style.visibility = "visible";
 	document.getElementById('overlay').style.display = 'block';
 
@@ -268,9 +272,12 @@
 				    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%";
-					var mystring="<s:url action='mediaFileEdit'><s:param name='weblog' value='%{actionWeblog.handle}'
/></s:url>&mediaFileId="+mediaFileId;
-
-					var innerstring = "<iframe id='myframe' frameborder='no' scrolling='auto' src="+mystring+"
width='100%' height='100%'></iframe>";
+					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>';

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=768852&r1=768851&r2=768852&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 Mon Apr 27 01:17:34
2009
@@ -69,8 +69,9 @@
     </definition>
     
 	<definition name=".tiles-popuppage" template="/WEB-INF/jsps/tiles/tiles-popuppage.jsp">
-       
+        <put-attribute name="banner"       value="/WEB-INF/jsps/tiles/empty.jsp" />
         <put-attribute name="messages"     value="/WEB-INF/jsps/tiles/messages.jsp" />
+		<put-attribute name="styles"       value="/WEB-INF/jsps/tiles/empty.jsp" />
         <put-attribute name="content"      value="${content}" />
        
     </definition>

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=768852&r1=768851&r2=768852&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
Mon Apr 27 01:17:34 2009
@@ -111,8 +111,13 @@
 
 
 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");
@@ -121,7 +126,13 @@
 
 		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%";
+	    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>';
@@ -129,40 +140,59 @@
     document.getElementById("overlay_img").appendChild(frame);
 
 }
+
 function onClickAddFromUpload(){
-document.getElementById("overlay_img").style.visibility = "visible";
+	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%";
+	    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);
 }
+
 function onClickAddExternal(){
-document.getElementById("overlay_img").style.visibility = "visible";
+	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 = "300px";
-	document.getElementById("overlay_img").style.top = "130px";
+	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%";
+		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>';
@@ -171,6 +201,7 @@
 
 }
 
+
 </script>
 
 <script type="text/javascript">

Modified: roller/branches/roller_mediablogging/apps/weblogger/web/roller-ui/styles/roller.css
URL: http://svn.apache.org/viewvc/roller/branches/roller_mediablogging/apps/weblogger/web/roller-ui/styles/roller.css?rev=768852&r1=768851&r2=768852&view=diff
==============================================================================
--- roller/branches/roller_mediablogging/apps/weblogger/web/roller-ui/styles/roller.css (original)
+++ roller/branches/roller_mediablogging/apps/weblogger/web/roller-ui/styles/roller.css Mon
Apr 27 01:17:34 2009
@@ -789,8 +789,8 @@
 		width:12px;
 		margin:0px;
 		padding:0px;
-		background:url(http://yui.yahooapis.com/2.6.0/build/container/assets/close12_1.gif) no-repeat;
-		cursor:pointer;	
+		background:url('http://yui.yahooapis.com/2.6.0/build/container/assets/close12_1.gif') no-repeat;
+		cursor:pointer	
 	}
 
 	.align-images {
@@ -802,8 +802,9 @@
 
 	.dir-image {
     	cursor:pointer;
-		width:120px;
-		height:100px;
+		width:25px;
+		height:25px;
+		padding:40px 45px;
 	}
 
 	/*** For context menu ***/



Mime
View raw message