Author: gmazza
Date: Tue Mar 25 08:17:28 2014
New Revision: 1581270
URL: http://svn.apache.org/r1581270
Log:
ROL-1991 Switch to JQuery date-picker which provides ability to pick year and
month from drop-downs; upgrade from JQuery 1.4.2 to 1.11
Added:
roller/trunk/app/src/main/webapp/roller-ui/scripts/jquery-1.11.0.min.js
roller/trunk/app/src/main/webapp/roller-ui/theme/sunny/
roller/trunk/app/src/main/webapp/roller-ui/theme/sunny/images/
roller/trunk/app/src/main/webapp/roller-ui/theme/sunny/images/animated-overlay.gif
(with props)
roller/trunk/app/src/main/webapp/roller-ui/theme/sunny/images/ui-bg_diagonals-medium_20_d34d17_40x40.png
(with props)
roller/trunk/app/src/main/webapp/roller-ui/theme/sunny/images/ui-bg_flat_30_cccccc_40x100.png
(with props)
roller/trunk/app/src/main/webapp/roller-ui/theme/sunny/images/ui-bg_flat_50_5c5c5c_40x100.png
(with props)
roller/trunk/app/src/main/webapp/roller-ui/theme/sunny/images/ui-bg_gloss-wave_45_817865_500x100.png
(with props)
roller/trunk/app/src/main/webapp/roller-ui/theme/sunny/images/ui-bg_gloss-wave_60_fece2f_500x100.png
(with props)
roller/trunk/app/src/main/webapp/roller-ui/theme/sunny/images/ui-bg_gloss-wave_70_ffdd57_500x100.png
(with props)
roller/trunk/app/src/main/webapp/roller-ui/theme/sunny/images/ui-bg_gloss-wave_90_fff9e5_500x100.png
(with props)
roller/trunk/app/src/main/webapp/roller-ui/theme/sunny/images/ui-bg_highlight-soft_100_feeebd_1x100.png
(with props)
roller/trunk/app/src/main/webapp/roller-ui/theme/sunny/images/ui-bg_inset-soft_30_ffffff_1x100.png
(with props)
roller/trunk/app/src/main/webapp/roller-ui/theme/sunny/images/ui-icons_3d3d3d_256x240.png
(with props)
roller/trunk/app/src/main/webapp/roller-ui/theme/sunny/images/ui-icons_bd7b00_256x240.png
(with props)
roller/trunk/app/src/main/webapp/roller-ui/theme/sunny/images/ui-icons_d19405_256x240.png
(with props)
roller/trunk/app/src/main/webapp/roller-ui/theme/sunny/images/ui-icons_eb990f_256x240.png
(with props)
roller/trunk/app/src/main/webapp/roller-ui/theme/sunny/images/ui-icons_ed9f26_256x240.png
(with props)
roller/trunk/app/src/main/webapp/roller-ui/theme/sunny/images/ui-icons_fadc7a_256x240.png
(with props)
roller/trunk/app/src/main/webapp/roller-ui/theme/sunny/images/ui-icons_ffe180_256x240.png
(with props)
roller/trunk/app/src/main/webapp/roller-ui/theme/sunny/jquery-ui-1.10.4.custom.min.css
roller/trunk/app/src/main/webapp/roller-ui/theme/sunny/jquery.ui.all.css
roller/trunk/app/src/main/webapp/roller-ui/theme/sunny/jquery.ui.base.css
Removed:
roller/trunk/app/src/main/webapp/roller-ui/scripts/calendar.js
roller/trunk/app/src/main/webapp/roller-ui/scripts/jquery-1.4.2.min.js
roller/trunk/app/src/main/webapp/roller-ui/styles/calendar.css
Modified:
roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/GlobalCommentManagementSidebar.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CommentsSidebar.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntriesSidebar.jsp
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/MediaFileAdd.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAddSuccess.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
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/head-ajax.jsp
Modified:
roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/GlobalCommentManagementSidebar.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/GlobalCommentManagementSidebar.jsp?rev=1581270&r1=1581269&r2=1581270&view=diff
==============================================================================
---
roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/GlobalCommentManagementSidebar.jsp
(original)
+++
roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/GlobalCommentManagementSidebar.jsp
Tue Mar 25 08:17:28 2014
@@ -17,6 +17,11 @@
--%>
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
+<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/theme/sunny/jquery.ui.all.css"/>' />
+<script type="text/javascript" src='<s:url
value="/roller-ui/scripts/jquery-ui.custom.min.js"/>'></script>
+
<div class="sidebarFade">
<div class="menu-tr">
<div class="menu-tl">
@@ -41,37 +46,33 @@
<div class="sideformrow">
<label for="startDateString" class="sideformrow"><s:text
name="commentManagement.startDate" />:</label>
<script type="text/javascript" >
- <!--
- if (document.layers) { // Netscape 4 hack
- var calStart = new CalendarPopup();
- } else {
- var calStart = new CalendarPopup("datetagdiv");
- document.write(calStart.getStyles());
- }
- // -->
+ $(function() {
+ $( "#comments_bean_startDateString" ).datepicker({
+ showOn: "button",
+ buttonImage: "/roller/images/calendar.png",
+ buttonImageOnly: true,
+ changeMonth: true,
+ changeYear: true
+ });
+ });
</script>
- <s:textfield name="bean.startDateString" size="12" />
- <a href="#" id="anchorCalStart" name="anchorCalStart"
-
onclick="calStart.select(document.getElementById('comments_bean_startDateString'),'anchorCalStart','MM/dd/yy');
return false">
- <img src='<s:url value="/images/calendar.png"/>' class="calIcon"
alt="Calendar" /></a>
+ <s:textfield name="bean.startDateString" size="12"
readonly="true"/>
</div>
<div class="sideformrow">
<label for="endDateString" class="sideformrow"><s:text
name="commentManagement.endDate" />:</label>
<script type="text/javascript" >
- <!--
- if (document.layers) { // Netscape 4 hack
- var calEnd = new CalendarPopup();
- } else {
- var calEnd = new CalendarPopup("datetagdiv");
- document.write(calEnd.getStyles());
- }
- // -->
+ $(function() {
+ $( "#comments_bean_endDateString" ).datepicker({
+ showOn: "button",
+ buttonImage: "/roller/images/calendar.png",
+ buttonImageOnly: true,
+ changeMonth: true,
+ changeYear: true
+ });
+ });
</script>
- <s:textfield name="bean.endDateString" size="12" />
- <a href="#" id="anchorCalEnd" name="anchorCalEnd"
-
onclick="calEnd.select(document.getElementById('comments_bean_endDateString'),'anchorCalEnd','MM/dd/yy');
return false">
- <img src='<s:url value="/images/calendar.png"/>' class="calIcon"
alt="Calendar" /></a>
+ <s:textfield name="bean.endDateString" size="12" readonly="true"/>
</div>
<br />
<br />
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp?rev=1581270&r1=1581269&r2=1581270&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp Tue Mar
25 08:17:28 2014
@@ -17,7 +17,7 @@
--%>
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
-<script type="text/javascript" src="<s:url
value="/roller-ui/scripts/jquery-1.4.2.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">
<!--
Modified:
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CommentsSidebar.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CommentsSidebar.jsp?rev=1581270&r1=1581269&r2=1581270&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CommentsSidebar.jsp
(original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CommentsSidebar.jsp
Tue Mar 25 08:17:28 2014
@@ -17,6 +17,11 @@
--%>
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
+<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/theme/sunny/jquery.ui.all.css"/>' />
+<script type="text/javascript" src='<s:url
value="/roller-ui/scripts/jquery-ui.custom.min.js"/>'></script>
+
<div class="sidebarFade">
<div class="menu-tr">
<div class="menu-tl">
@@ -42,37 +47,33 @@
<div class="sideformrow">
<label for="startDateString" class="sideformrow"><s:text
name="commentManagement.startDate" />:</label>
<script type="text/javascript" >
- <!--
- if (document.layers) { // Netscape 4 hack
- var calStart = new CalendarPopup();
- } else {
- var calStart = new CalendarPopup("datetagdiv");
- document.write(calStart.getStyles());
- }
- // -->
+ $(function() {
+ $( "#commentsQuery_bean_startDateString" ).datepicker({
+ showOn: "button",
+ buttonImage: "/roller/images/calendar.png",
+ buttonImageOnly: true,
+ changeMonth: true,
+ changeYear: true
+ });
+ });
</script>
- <s:textfield name="bean.startDateString" size="12" />
- <a href="#" id="anchorCalStart" name="anchorCalStart"
-
onclick="calStart.select(document.getElementById('commentsQuery_bean_startDateString'),'anchorCalStart','MM/dd/yy');
return false">
- <img src='<s:url value="/images/calendar.png"/>' class="calIcon"
alt="Calendar" /></a>
+ <s:textfield name="bean.startDateString" size="12"
readonly="true"/>
</div>
<div class="sideformrow">
<label for="endDateString" class="sideformrow"><s:text
name="commentManagement.endDate" />:</label>
<script type="text/javascript" >
- <!--
- if (document.layers) { // Netscape 4 hack
- var calEnd = new CalendarPopup();
- } else {
- var calEnd = new CalendarPopup("datetagdiv");
- document.write(calEnd.getStyles());
- }
- // -->
+ $(function() {
+ $( "#commentsQuery_bean_endDateString" ).datepicker({
+ showOn: "button",
+ buttonImage: "/roller/images/calendar.png",
+ buttonImageOnly: true,
+ changeMonth: true,
+ changeYear: true
+ });
+ });
</script>
- <s:textfield name="bean.endDateString" size="12" />
- <a href="#" id="anchorCalEnd" name="anchorCalEnd"
-
onclick="calEnd.select(document.getElementById('commentsQuery_bean_endDateString'),'anchorCalEnd','MM/dd/yy');
return false">
- <img src='<s:url value="/images/calendar.png"/>' class="calIcon"
alt="Calendar" /></a>
+ <s:textfield name="bean.endDateString" size="12" readonly="true"/>
</div>
<br />
<br />
Modified:
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntriesSidebar.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntriesSidebar.jsp?rev=1581270&r1=1581269&r2=1581270&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntriesSidebar.jsp
(original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntriesSidebar.jsp Tue
Mar 25 08:17:28 2014
@@ -17,6 +17,11 @@
--%>
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
+<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/theme/sunny/jquery.ui.all.css"/>' />
+<script type="text/javascript" src='<s:url
value="/roller-ui/scripts/jquery-ui.custom.min.js"/>'></script>
+
<div class="sidebarFade">
<div class="menu-tr">
<div class="menu-tl">
@@ -73,37 +78,33 @@
<div class="sideformrow">
<label for="startDateString"
class="sideformrow"><s:text name="weblogEntryQuery.label.startDate" />:</label>
<script type="text/javascript" >
- <!--
- if (document.layers) { // Netscape 4 hack
- var calStart = new CalendarPopup();
- } else {
- var calStart = new CalendarPopup("datetagdiv");
- document.write(calStart.getStyles());
- }
- // -->
+ $(function() {
+ $( "#entries_bean_startDateString" ).datepicker({
+ showOn: "button",
+ buttonImage: "/roller/images/calendar.png",
+ buttonImageOnly: true,
+ changeMonth: true,
+ changeYear: true
+ });
+ });
</script>
- <s:textfield name="bean.startDateString" size="12" />
- <a href="#" id="anchorCalStart" name="anchorCalStart"
-
onclick="calStart.select(document.getElementById('entries_bean_startDateString'),'anchorCalStart','MM/dd/yy');
return false">
- <img src='<s:url value="/images/calendar.png"/>'
class="calIcon" alt="Calendar" /></a>
+ <s:textfield name="bean.startDateString" size="12"
readonly="true"/>
</div>
<div class="sideformrow">
<label for="endDateString" class="sideformrow"><s:text
name="weblogEntryQuery.label.endDate" />:</label>
<script type="text/javascript" >
- <!--
- if (document.layers) { // Netscape 4 hack
- var calEnd = new CalendarPopup();
- } else {
- var calEnd = new CalendarPopup("datetagdiv");
- document.write(calEnd.getStyles());
- }
- // -->
+ $(function() {
+ $( "#entries_bean_endDateString" ).datepicker({
+ showOn: "button",
+ buttonImage: "/roller/images/calendar.png",
+ buttonImageOnly: true,
+ changeMonth: true,
+ changeYear: true
+ });
+ });
</script>
- <s:textfield name="bean.endDateString" size="12" />
- <a href="#" id="anchorCalEnd" name="anchorCalEnd"
-
onclick="calEnd.select(document.getElementById('entries_bean_endDateString'),'anchorCalEnd','MM/dd/yy');
return false">
- <img src='<s:url value="/images/calendar.png"/>'
class="calIcon" alt="Calendar" /></a>
+ <s:textfield name="bean.endDateString" size="12"
readonly="true"/>
</div>
<br />
<br />
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=1581270&r1=1581269&r2=1581270&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 Tue Mar
25 08:17:28 2014
@@ -26,7 +26,11 @@
<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.4.2.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/theme/sunny/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>
@@ -159,19 +163,17 @@
<s:select name="bean.seconds" list="secondsList" />
<script type="text/javascript" >
- <!--
- if (document.layers) { // Netscape 4 hack
- var cal = new CalendarPopup();
- } else {
- var cal = new CalendarPopup("datetagdiv");
- document.write(cal.getStyles());
- }
- // -->
+ $(function() {
+ $( "#entry_bean_dateString" ).datepicker({
+ showOn: "button",
+ buttonImage: "/roller/images/calendar.png",
+ buttonImageOnly: true,
+ changeMonth: true,
+ changeYear: true
+ });
+ });
</script>
- <s:textfield name="bean.dateString" size="12" />
- <a href="#" id="anchorCal" name="anchorCal"
-
onclick="cal.select(document.getElementById('entry_bean_dateString'),'anchorCal','MM/dd/yy');
return false">
- <img src='<s:url value="/images/calendar.png"/>' class="calIcon"
alt="Calendar" /></a>
+ <s:textfield name="bean.dateString" size="12" readonly="true"/>
<s:property value="actionWeblog.timeZone" />
</div>
<br />
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=1581270&r1=1581269&r2=1581270&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 Tue Mar
25 08:17:28 2014
@@ -26,7 +26,11 @@
<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.4.2.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/theme/sunny/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>
@@ -217,19 +221,17 @@ function fullPreviewMode() {
<s:select name="bean.seconds" list="secondsList" />
<script type="text/javascript" >
- <!--
- if (document.layers) { // Netscape 4 hack
- var cal = new CalendarPopup();
- } else {
- var cal = new CalendarPopup("datetagdiv");
- document.write(cal.getStyles());
- }
- // -->
+ $(function() {
+ $( "#entry_bean_dateString" ).datepicker({
+ showOn: "button",
+ buttonImage: "/roller/images/calendar.png",
+ buttonImageOnly: true,
+ changeMonth: true,
+ changeYear: true
+ });
+ });
</script>
- <s:textfield name="bean.dateString" size="12" />
- <a href="#" id="anchorCal" name="anchorCal"
-
onclick="cal.select(document.getElementById('entry_bean_dateString'),'anchorCal','MM/dd/yy');
return false">
- <img src='<s:url value="/images/calendar.png"/>' class="calIcon"
alt="Calendar" /></a>
+ <s:textfield name="bean.dateString" size="12" readonly="true"/>
<s:property value="actionWeblog.timeZone" />
</div>
<br />
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAdd.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAdd.jsp?rev=1581270&r1=1581269&r2=1581270&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAdd.jsp
(original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAdd.jsp Tue
Mar 25 08:17:28 2014
@@ -16,7 +16,7 @@
directory of this distribution.
--%>
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
-<script type="text/javascript" src='<s:url
value="/roller-ui/scripts/jquery-1.4.2.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">
Modified:
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAddSuccess.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAddSuccess.jsp?rev=1581270&r1=1581269&r2=1581270&view=diff
==============================================================================
---
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAddSuccess.jsp
(original)
+++
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAddSuccess.jsp
Tue Mar 25 08:17:28 2014
@@ -16,7 +16,7 @@
directory of this distribution.
--%>
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
-<script type="text/javascript" src="<s:url
value="/roller-ui/scripts/jquery-1.4.2.min.js" />"></script>
+<script type="text/javascript" src="<s:url
value="/roller-ui/scripts/jquery-1.11.0.min.js" />"></script>
<style type="text/css">
table.mediaFileTable {
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=1581270&r1=1581269&r2=1581270&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 Tue
Mar 25 08:17:28 2014
@@ -18,7 +18,7 @@
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
<%@ page import="org.apache.roller.weblogger.config.WebloggerConfig" %>
-<script type="text/javascript" src='<s:url
value="/roller-ui/scripts/jquery-1.4.2.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="/custom-ui/ZeroClipboard.js"
/>'></script>
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=1581270&r1=1581269&r2=1581270&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
Tue Mar 25 08:17:28 2014
@@ -26,7 +26,7 @@
<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.4.2.min.js" />"></script>
+<script type="text/javascript" src="<s:url
value="/roller-ui/scripts/jquery-1.11.0.min.js" />"></script>
<style>
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=1581270&r1=1581269&r2=1581270&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 Tue
Mar 25 08:17:28 2014
@@ -26,7 +26,7 @@
<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-1.4.2.min.js" />'></script>
+<script type="text/javascript" src='<s:url
value="/roller-ui/scripts/jquery-1.11.0.min.js" />'></script>
<style>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp?rev=1581270&r1=1581269&r2=1581270&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp
(original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp Tue Mar
25 08:17:28 2014
@@ -16,7 +16,7 @@
directory of this distribution.
--%>
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
-<script type="text/javascript" src="<s:url
value="/roller-ui/scripts/jquery-1.4.2.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">
<!--
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=1581270&r1=1581269&r2=1581270&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 Tue Mar
25 08:17:28 2014
@@ -10,14 +10,11 @@ You can override it with your own file v
<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"/>' />
<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/styles/calendar.css"/>' />
<link rel="stylesheet" type="text/css" media="all"
href="<%= request.getContextPath() %>/roller-ui/theme/<s:property
value="getProp('editor.theme')"/>/colors.css" />
<script type="text/javascript" src="<s:url
value="/theme/scripts/roller.js"/>"></script>
-<script type="text/javascript" src='<s:url
value="/roller-ui/scripts/calendar.js"/>'></script>
<%-- struts2 head disabled until we need it --%>
<%-- <s:head theme="ajax"/> --%>
-