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/07 02:25:12 UTC
svn commit: r1608320 - in
/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor: EntryAdd.jsp
EntryEdit.jsp MediaFileEdit.jsp MediaFileImageChooser.jsp MediaFileView.jsp
Author: gmazza
Date: Mon Jul 7 00:25:11 2014
New Revision: 1608320
URL: http://svn.apache.org/r1608320
Log:
Simplified YUI2 config to make it easier to get rid of: unused menu & container-core itmes gone; fixed autocomplete.css link declaration (wasn't loading)
Modified:
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryAdd.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileImageChooser.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryAdd.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryAdd.jsp?rev=1608320&r1=1608319&r2=1608320&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryAdd.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryAdd.jsp Mon Jul 7 00:25:11 2014
@@ -17,25 +17,19 @@
--%>
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
+<%-- container* files needed for yui-overlay in editor-text.jsp --%>
<link rel="stylesheet" type="text/css" href="<s:url value='/roller-ui/yui/assets/skins/sam/container.css'/>" />
-<link rel="stylesheet" type="text/css" href="<s:url value='/roller-ui/yui/menu/assets/menu.css'/>" />
+<link rel="stylesheet" type="text/css" href="<s:url value='/roller-ui/yui/autocomplete/assets/skins/sam/autocomplete.css'/>">
+<link rel="stylesheet" type="text/css" media="all" href='<s:url value="/roller-ui/styles/jquery.ui.all.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/container/container_core-min.js'/>"></script>
<script type="text/javascript" src="<s:url value='/roller-ui/yui/container/container-min.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/scripts/jquery-1.11.0.min.js" />"></script>
-
-<%-- Below two needed only if using popup date picker --%>
-<link rel="stylesheet" type="text/css" media="all" href='<s:url value="/roller-ui/styles/jquery.ui.all.css"/>' />
-<script type="text/javascript" src='<s:url value="/roller-ui/scripts/jquery-ui.custom.min.js"/>'></script>
-
-<link rel="stylesheet" type="text/css" href="/roller-ui/yui/autocomplete/assets/skins/sam/autocomplete.css">
-<script type="text/javascript" src="<s:url value='/roller-ui/yui/animation/animation-min.js' />"></script>
-<script type="text/javascript" src="<s:url value='/roller-ui/yui/connection/connection-min.js' />"></script>
-<script type="text/javascript" src="<s:url value='/roller-ui/yui/datasource/datasource-min.js' />"></script>
-<script type="text/javascript" src="<s:url value='/roller-ui/yui/autocomplete/autocomplete.js' />"></script>
+<script type="text/javascript" src="<s:url value='/roller-ui/yui/datasource/datasource-min.js'/>"></script>
+<script type="text/javascript" src="<s:url value='/roller-ui/yui/animation/animation-min.js'/>"></script>
+<script type="text/javascript" src="<s:url value='/roller-ui/yui/connection/connection-min.js'/>"></script>
+<script type="text/javascript" src="<s:url value='/roller-ui/yui/autocomplete/autocomplete-min.js'/>"></script>
+<script type="text/javascript" src="<s:url value='/roller-ui/scripts/jquery-1.11.0.min.js'/>"></script>
+<script type="text/javascript" src="<s:url value='/roller-ui/scripts/jquery-ui.custom.min.js'/>"></script>
<style>
#tagAutoCompleteWrapper {
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp?rev=1608320&r1=1608319&r2=1608320&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp Mon Jul 7 00:25:11 2014
@@ -17,26 +17,21 @@
--%>
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
+<%-- container* files needed for yui-overlay in editor-text.jsp --%>
<link rel="stylesheet" type="text/css" href="<s:url value='/roller-ui/yui/assets/skins/sam/container.css'/>" />
-<link rel="stylesheet" type="text/css" href="<s:url value='/roller-ui/yui/menu/assets/menu.css'/>" />
+<link rel="stylesheet" type="text/css" href="<s:url value='/roller-ui/yui/autocomplete/assets/skins/sam/autocomplete.css'/>">
+<link rel="stylesheet" type="text/css" media="all" href='<s:url value="/roller-ui/styles/jquery.ui.all.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/container/container_core-min.js'/>"></script>
<script type="text/javascript" src="<s:url value='/roller-ui/yui/container/container-min.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/scripts/jquery-1.11.0.min.js" />"></script>
-
-<%-- Below two needed only if using popup date picker --%>
-<link rel="stylesheet" type="text/css" media="all" href='<s:url value="/roller-ui/styles/jquery.ui.all.css"/>' />
-<script type="text/javascript" src='<s:url value="/roller-ui/scripts/jquery-ui.custom.min.js"/>'></script>
-
-<link rel="stylesheet" type="text/css" href="/roller-ui/yui/autocomplete/assets/skins/sam/autocomplete.css">
-<script type="text/javascript" src="<s:url value='/roller-ui/yui/animation/animation-min.js' />"></script>
-<script type="text/javascript" src="<s:url value='/roller-ui/yui/connection/connection-min.js' />"></script>
-<script type="text/javascript" src="<s:url value='/roller-ui/yui/datasource/datasource-min.js' />"></script>
-<script type="text/javascript" src="<s:url value='/roller-ui/yui/autocomplete/autocomplete.js' />"></script>
+<script type="text/javascript" src="<s:url value='/roller-ui/yui/datasource/datasource-min.js'/>"></script>
+<script type="text/javascript" src="<s:url value='/roller-ui/yui/animation/animation-min.js'/>"></script>
+<script type="text/javascript" src="<s:url value='/roller-ui/yui/connection/connection-min.js'/>"></script>
+<script type="text/javascript" src="<s:url value='/roller-ui/yui/autocomplete/autocomplete-min.js'/>"></script>
+<script type="text/javascript" src="<s:url value='/roller-ui/scripts/jquery-1.11.0.min.js'/>"></script>
+<script type="text/javascript" src="<s:url value='/roller-ui/scripts/jquery-ui.custom.min.js'/>"></script>
+<style>
#tagAutoCompleteWrapper {
width:40em; /* set width here or else widget will expand to fit its container */
padding-bottom:2em;
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp?rev=1608320&r1=1608319&r2=1608320&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp Mon Jul 7 00:25:11 2014
@@ -90,7 +90,7 @@ $("#d_clip_button").ready(function() {
<label for="status"><s:text name="generic.name" /></label>
</td>
<td>
- <s:textfield name="bean.name" size="40" maxlength="100" tabindex="1" />
+ <s:textfield name="bean.name" size="35" maxlength="100" tabindex="1" />
</td>
</tr>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileImageChooser.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileImageChooser.jsp?rev=1608320&r1=1608319&r2=1608320&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileImageChooser.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileImageChooser.jsp Mon Jul 7 00:25:11 2014
@@ -18,12 +18,9 @@
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
<link rel="stylesheet" type="text/css" href="<s:url value='/roller-ui/yui/assets/skins/sam/container.css'/>" />
-<link rel="stylesheet" type="text/css" href="<s:url value='/roller-ui/yui/menu/assets/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/container/container_core-min.js'/>"></script>
<script type="text/javascript" src="<s:url value='/roller-ui/yui/container/container-min.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/scripts/jquery-1.11.0.min.js" />"></script>
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=1608320&r1=1608319&r2=1608320&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 Mon Jul 7 00:25:11 2014
@@ -18,11 +18,9 @@
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
<link rel="stylesheet" type="text/css" href="<s:url value='/roller-ui/yui/assets/skins/sam/container.css'/>" />
-<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/container/container-min.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>