You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by gm...@apache.org on 2014/07/17 16:44:32 UTC
svn commit: r1611372 - in /roller/trunk/app/src/main: resources/
webapp/WEB-INF/jsps/editor/ webapp/WEB-INF/jsps/tiles/
webapp/roller-ui/yui/animation/ webapp/roller-ui/yui/assets/
webapp/roller-ui/yui/autocomplete/ webapp/roller-ui/yui/button/ webapp/...
Author: gmazza
Date: Thu Jul 17 14:44:31 2014
New Revision: 1611372
URL: http://svn.apache.org/r1611372
Log:
Pulled out unused parts of YUI2, including deprecated blog-from-this-image menu button on Media File View not available in YUI3 (use the Media Image picker on the Edit Entry page instead.)
Removed:
roller/trunk/app/src/main/webapp/roller-ui/yui/animation/
roller/trunk/app/src/main/webapp/roller-ui/yui/assets/
roller/trunk/app/src/main/webapp/roller-ui/yui/autocomplete/
roller/trunk/app/src/main/webapp/roller-ui/yui/button/
roller/trunk/app/src/main/webapp/roller-ui/yui/connection/
roller/trunk/app/src/main/webapp/roller-ui/yui/container/
roller/trunk/app/src/main/webapp/roller-ui/yui/datasource/
roller/trunk/app/src/main/webapp/roller-ui/yui/element/
roller/trunk/app/src/main/webapp/roller-ui/yui/fonts/
roller/trunk/app/src/main/webapp/roller-ui/yui/menu/
roller/trunk/app/src/main/webapp/roller-ui/yui/reset-fonts/
roller/trunk/app/src/main/webapp/roller-ui/yui/tabview/
roller/trunk/app/src/main/webapp/roller-ui/yui/treeview/
roller/trunk/app/src/main/webapp/roller-ui/yui/yahoo-dom-event/
Modified:
roller/trunk/app/src/main/resources/ApplicationResources.properties
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/head-ajax.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/head.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-errorpage.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-installpage.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-mainmenupage.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-popuppage.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-simplepage.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-tabbedpage.jsp
Modified: roller/trunk/app/src/main/resources/ApplicationResources.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources.properties?rev=1611372&r1=1611371&r2=1611372&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources.properties Thu Jul 17 14:44:31 2014
@@ -785,8 +785,6 @@ mediaFileEdit.includeGalleryHelp=Check t
file included in the new media file RSS and Atom feeds for your weblog.
mediaFileEdit.updateFileContents=Update File Contents
mediaFileEdit.clickToView=Click to view in new window
-mediaFile.createWeblogPost=Post in weblog
-mediaFile.createPodcastPost=Post in weblog as podcast
mediaFileEdit.permalink=Link (URL)
mediaFileEdit.linkTitle=Link to Media File, opens in new window
mediaFileEdit.copyToClipboard=Copy Link (URL) to Clipboard
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp?rev=1611372&r1=1611371&r2=1611372&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp Thu Jul 17 14:44:31 2014
@@ -17,13 +17,6 @@
--%>
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
-<link rel="stylesheet" type="text/css" href="<s:url value='/roller-ui/yui/menu/assets/skins/sam/menu.css'/>" />
-
-<script type="text/javascript" src="<s:url value='/roller-ui/yui/yahoo-dom-event/yahoo-dom-event.js'/>"></script>
-<script type="text/javascript" src="<s:url value='/roller-ui/yui/menu/menu-min.js'/>"></script>
-<script type="text/javascript" src="<s:url value='/roller-ui/yui/element/element-min.js' />"></script>
-<script type="text/javascript" src="<s:url value='/roller-ui/yui/button/button-min.js' />"></script>
-
<script type="text/javascript" src="<s:url value="/roller-ui/scripts/jquery-2.1.1.min.js" />"></script>
<script type="text/javascript" src="<s:url value='/roller-ui/yui3/yui/yui-min.js' />"></script>
@@ -51,18 +44,6 @@
width:15px;
float:right;
}
- .yui-button button {
- border-style: none;
- background-color:transparent;
- *overflow:visible;
- cursor:pointer;
- }
- .yui-menu-button button {
- width:15px; height: 15px;
- background-repeat: no-repeat;
- background-position: center;
- background-image: url(<s:url value="/images/add.png"/>);
- }
</style>
@@ -115,35 +96,6 @@
document.mediaFileViewForm.submit();
}
- <%-- menu button for each image, launched from the plus sign image --%>
-
- var menuButtons = {};
-
- function setupMenuButton(id) {
- if (!menuButtons[id]) {
- var mediaFileMenu = [
- { text: "<s:text name='mediaFile.createWeblogPost' />", value: 1, onclick: { fn: onCreateWeblogPost, obj:id } },
- { text: "<s:text name='mediaFile.createPodcastPost' />", value: 2, onclick: { fn: onCreatePodcastPost, obj:id } }
- ];
- menuButtons[id] = new YAHOO.widget.Button({
- type: "menu", label: "", name: id,
- menu: mediaFileMenu, container: 'addbutton-' + id });
- $('#addbutton-img' + id).hide();
- }
- }
-
- function onCreateWeblogPost(p_sType, p_aArgs, id) {
- $("#selectedImage").get(0).value = id;
- $("#type").get(0).value = 'weblog';
- $("#createPostForm").get(0).submit();
- }
-
- function onCreatePodcastPost(p_sType, p_aArgs, id) {
- $("#selectedImage").get(0).value = id;
- $("#type").get(0).value = 'podcast';
- $("#createPostForm").get(0).submit();
- }
-
<%-- code to toggle buttons on/off as media file/directory selections change --%>
$(document).ready(function() {
@@ -359,15 +311,10 @@
<input type="hidden" id="mediafileidentity"
value="<s:property value='#mediaFile.id'/>" />
- <str:truncateNicely lower="47" upper="47">
+ <str:truncateNicely lower="70" upper="18">
<s:property value="#mediaFile.name" />
</str:truncateNicely>
- <span class="button" id="addbutton-<s:property value='#mediaFile.id' />">
- <img id="addbutton-img<s:property value='#mediaFile.id' />"
- src="<s:url value="/images/add.png"/>" alt="logo" />
- </span>
-
</div>
</li>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/head-ajax.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/head-ajax.jsp?rev=1611372&r1=1611371&r2=1611372&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/head-ajax.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/head-ajax.jsp Thu Jul 17 14:44:31 2014
@@ -4,9 +4,7 @@ You can override it with your own file v
--%>
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
-<link rel="stylesheet" type="text/css" media="all" href="<s:url value='/roller-ui/yui/reset-fonts-grids/reset-fonts-grids.css'/>" />
<link rel="stylesheet" type="text/css" media="all" href="<s:url value='/roller-ui/yui/base/base-min.css'/>" />
-<link rel="stylesheet" type="text/css" media="all" href='<s:url value="/roller-ui/yui3/assets/skins/sam/tabview.css"></s:url>'/>
<link rel="stylesheet" type="text/css" media="all" href='<s:url value="/roller-ui/styles/layout.css"/>' />
<link rel="stylesheet" type="text/css" media="all" href='<s:url value="/roller-ui/styles/roller.css"/>' />
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/head.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/head.jsp?rev=1611372&r1=1611371&r2=1611372&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/head.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/head.jsp Thu Jul 17 14:44:31 2014
@@ -6,7 +6,6 @@ You can override it with your own file v
<link rel="stylesheet" type="text/css" media="all" href="<s:url value='/roller-ui/yui/reset-fonts-grids/reset-fonts-grids.css'/>" />
<link rel="stylesheet" type="text/css" media="all" href="<s:url value='/roller-ui/yui/base/base-min.css'/>" />
-<link rel="stylesheet" type="text/css" media="all" href='<s:url value="/roller-ui/yui3/assets/skins/sam/tabview.css"></s:url>'/>
<link rel="stylesheet" type="text/css" media="all" href='<s:url value="/roller-ui/styles/layout.css"/>' />
<link rel="stylesheet" type="text/css" media="all" href='<s:url value="/roller-ui/styles/roller.css"/>' />
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-errorpage.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-errorpage.jsp?rev=1611372&r1=1611371&r2=1611372&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-errorpage.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-errorpage.jsp Thu Jul 17 14:44:31 2014
@@ -24,7 +24,7 @@
<link rel="shortcut icon" href="<%= request.getContextPath() %>/favicon.ico" type="image/x-icon" />
<tiles:insertAttribute name="head" />
</head>
- <body class="yui-skin-sam yui3-skin-sam">
+ <body class="yui3-skin-sam">
<div id="banner">
<tiles:insertAttribute name="banner" />
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-installpage.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-installpage.jsp?rev=1611372&r1=1611371&r2=1611372&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-installpage.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-installpage.jsp Thu Jul 17 14:44:31 2014
@@ -24,7 +24,7 @@
<link rel="shortcut icon" href="<%= request.getContextPath() %>/favicon.ico" type="image/x-icon" />
<tiles:insertAttribute name="head" />
</head>
- <body class="yui-skin-sam yui3-skin-sam">
+ <body class="yui3-skin-sam">
<div id="banner">
<tiles:insertAttribute name="banner" />
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-mainmenupage.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-mainmenupage.jsp?rev=1611372&r1=1611371&r2=1611372&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-mainmenupage.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-mainmenupage.jsp Thu Jul 17 14:44:31 2014
@@ -28,7 +28,7 @@
<tiles:insertAttribute name="styles" />
</style>
</head>
- <body class="yui-skin-sam yui3-skin-sam">
+ <body class="yui3-skin-sam">
<div id="banner">
<tiles:insertAttribute name="bannerStatus" />
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-popuppage.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-popuppage.jsp?rev=1611372&r1=1611371&r2=1611372&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-popuppage.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-popuppage.jsp Thu Jul 17 14:44:31 2014
@@ -23,7 +23,7 @@
<tiles:insertAttribute name="head" />
</head>
- <body class="yui-skin-sam yui3-skin-sam">
+ <body class="yui3-skin-sam">
<div id="wrapper">
<div id="leftcontent_wrap">
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-simplepage.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-simplepage.jsp?rev=1611372&r1=1611371&r2=1611372&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-simplepage.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-simplepage.jsp Thu Jul 17 14:44:31 2014
@@ -28,7 +28,7 @@
<tiles:insertAttribute name="styles" />
</style>
</head>
- <body class="yui-skin-sam yui3-skin-sam">
+ <body class="yui3-skin-sam">
<div id="banner">
<tiles:insertAttribute name="banner" />
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-tabbedpage.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-tabbedpage.jsp?rev=1611372&r1=1611371&r2=1611372&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-tabbedpage.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-tabbedpage.jsp Thu Jul 17 14:44:31 2014
@@ -28,7 +28,7 @@
<tiles:insertAttribute name="styles" />
</style>
</head>
- <body class="yui-skin-sam yui3-skin-sam">
+ <body class="yui3-skin-sam">
<div id="banner">
<tiles:insertAttribute name="bannerStatus" />