[portal-commits] JBoss Portal SVN: r13061 - in branches/JBoss_Portal_Branch_2_7/core-cms/src: resources/portal-cms-war/WEB-INF/jsp/cms/admin and 1 other directory.

Author: sohil.shah(a)jboss.com Date: 2009-03-22 23:55:47 -0400 (Sun, 22 Mar 2009) New Revision: 13061 Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp Log: JBPORTAL-2331 - CMS Modifies URLs Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java 2009-03-23 03:06:40 UTC (rev 13060) +++ branches/JBoss_Portal_Branch_2_7/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java 2009-03-23 03:55:47 UTC (rev 13061) @@ -844,7 +844,7 @@ } Content pendingContent = CMSWorkflowUtil.getPendingContent(Long.parseLong(processId), contentPath); - String viewableContent = Util.getViewableContent(rReq, rRes, pendingContent.getContentAsString()); + String viewableContent = pendingContent.getContentAsString(); rReq.setAttribute("pendingPreviewContent", viewableContent); Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp 2009-03-23 03:06:40 UTC (rev 13060) +++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp 2009-03-23 03:55:47 UTC (rev 13061) @@ -61,8 +61,8 @@ content_css : "<%= sCSSURL %>", plugin_insertdate_dateFormat : "%Y-%m-%d", plugin_insertdate_timeFormat : "%H:%M:%S", - relative_urls : "true", - convert_urls: "false", + relative_urls : true, + convert_urls: false, document_base_url : "<%= sDocBase %>", extended_valid_elements : "style[type],a[name|href|target|title|onclick],img[class|src|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name],font[face|size|color],hr[class|width|size|noshade]" Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp 2009-03-23 03:06:40 UTC (rev 13060) +++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp 2009-03-23 03:55:47 UTC (rev 13061) @@ -39,8 +39,8 @@ content_css : "<%= sCSSURL %>", plugin_insertdate_dateFormat : "%Y-%m-%d", plugin_insertdate_timeFormat : "%H:%M:%S", - relative_urls : "true", - convert_urls: "false", + relative_urls : true, + convert_urls: false, document_base_url : "<%= sDocBase %>", extended_valid_elements : "style[type],a[name|href|target|title|onclick],img[class|src|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name],font[face|size|color],hr[class|width|size|noshade]" Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp 2009-03-23 03:06:40 UTC (rev 13060) +++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp 2009-03-23 03:55:47 UTC (rev 13061) @@ -125,8 +125,8 @@ content_css : "<%= sCSSURL %>", plugin_insertdate_dateFormat : "%Y-%m-%d", plugin_insertdate_timeFormat : "%H:%M:%S", - relative_urls : "true", - convert_urls: "false", + relative_urls : true, + convert_urls: false, document_base_url : "<%= sDocBase %>", extended_valid_elements : "style[type],a[name|href|target|title|onclick],img[class|src|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name],font[face|size|color],hr[class|width|size|noshade]" @@ -157,10 +157,7 @@ </portlet:actionURL>" <table width="100%"> - <tr> - <!-- - <td style="border: 1px solid #000000;"><%=pendingPreviewContent%></td> - --> + <tr> <td> <textarea id="elm1" name="elm1" rows="20" cols="80" style="width: 100%" class="textarea"> <%=pendingPreviewContent%>