Author: snoopdave
Date: Sun Jul 6 15:19:16 2014
New Revision: 1608220
URL: http://svn.apache.org/r1608220
Log:
Uncomment and fix broken Tag Auto-complete feature.
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/tiles/head-ajax.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/head.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=1608220&r1=1608219&r2=1608220&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 Sun Jul
6 15:19:16 2014
@@ -24,17 +24,19 @@
<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/yui/dragdrop/dragdrop-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>
-<!-- Combo-handled YUI JS files: TODO add to roller-ui/yui or remove??
-<link rel="stylesheet" type="text/css"
href="http://yui.yahooapis.com/combo?2.8.0r4/build/autocomplete/assets/skins/sam/autocomplete.css";>
-<script type="text/javascript"
src="http://yui.yahooapis.com/combo?2.8.0r4/build/animation/animation-min.js&2.8.0r4/build/connection/connection-min.js&2.8.0r4/build/datasource/datasource-min.js&2.8.0r4/build/autocomplete/autocomplete-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>
+
<style>
#tagAutoCompleteWrapper {
width:40em; /* set width here or else widget will expand to fit its
container */
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=1608220&r1=1608219&r2=1608220&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 Sun Jul
6 15:19:16 2014
@@ -24,18 +24,19 @@
<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/yui/dragdrop/dragdrop-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>
-<!-- Combo-handled YUI JS files: TODO add to roller-ui/yui or remove??
-<link rel="stylesheet" type="text/css"
href="http://yui.yahooapis.com/combo?2.8.0r4/build/autocomplete/assets/skins/sam/autocomplete.css";>
-<script type="text/javascript"
src="http://yui.yahooapis.com/combo?2.8.0r4/build/animation/animation-min.js&2.8.0r4/build/connection/connection-min.js&2.8.0r4/build/datasource/datasource-min.js&2.8.0r4/build/autocomplete/autocomplete-min.js";></script>
--->
-<style>
+<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>
+
#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/tiles/head-ajax.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/head-ajax.jsp?rev=1608220&r1=1608219&r2=1608220&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 Sun Jul
6 15:19:16 2014
@@ -13,7 +13,7 @@ You can override it with your own file v
<link rel="stylesheet" type="text/css" media="all" href='<s:url
value="/roller-ui/styles/menu.css"/>' />
<link rel="stylesheet" type="text/css" media="all" href="<s:url
value="/roller-ui/theme/"/><s:property value="getProp('editor.theme')"
/>/colors.css" />
-<link rel="stylesheet" type="text/css" media="all" href='<s:url
value="/roller-ui/theme/sunny/jquery-ui-1.10.4.custom.min.css"/>' />
+<link rel="stylesheet" type="text/css" media="all" href='<s:url
value="/roller-ui/styles/jquery-ui-1.10.4.custom.min.css"/>' />
<script type="text/javascript" src="<s:url
value="/theme/scripts/roller.js"/>"></script>
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=1608220&r1=1608219&r2=1608220&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 Sun Jul 6
15:19:16 2014
@@ -13,6 +13,6 @@ You can override it with your own file v
<link rel="stylesheet" type="text/css" media="all" href='<s:url
value="/roller-ui/styles/menu.css"/>' />
<link rel="stylesheet" type="text/css" media="all" href="<s:url
value="/roller-ui/theme/"/><s:property
value="getProp('editor.theme')"/>/colors.css" />
-<link rel="stylesheet" type="text/css" media="all" href='<s:url
value="/roller-ui/theme/sunny/jquery-ui-1.10.4.custom.min.css"/>' />
+<link rel="stylesheet" type="text/css" media="all" href='<s:url
value="/roller-ui/styles/jquery-ui-1.10.4.custom.min.css"/>' />
<script type="text/javascript" src="<s:url
value="/theme/scripts/roller.js"/>"></script>
