Author: ghuber
Date: Tue Apr 8 09:50:50 2014
New Revision: 1585671
URL: http://svn.apache.org/r1585671
Log:
fix WARN org.apache.struts2.interceptor.CookieInterceptor CommonsLogger:warn -
Cookie name [control-pluginControl] does not match accepted cookie names
pattern [[a-zA-Z0-9\.\]\[_'\s]+]. ie replace - (dash) with _ (underscore).
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/MediaFileHierarchicalView.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/TemplateEdit.jsp
roller/trunk/app/src/main/webapp/theme/scripts/roller.js
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=1585671&r1=1585670&r2=1585671&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 Apr
8 09:50:50 2014
@@ -227,14 +227,14 @@
<script type="text/javascript">
//Get cookie to determine state of control
-if (getCookie('control-miscControl') != null) {
- if(getCookie('control-miscControl') == 'true'){
+if (getCookie('control_miscControl') != null) {
+ if(getCookie('control_miscControl') == 'true'){
toggle('miscControl');
togglePlusMinus('imiscControl');
}
}
-if (getCookie('control-pluginControl') != null) {
- if(getCookie('control-pluginControl') == 'true'){
+if (getCookie('control_pluginControl') != null) {
+ if(getCookie('control_pluginControl') == 'true'){
toggle('pluginControl');
togglePlusMinus('ipluginControl');
}
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=1585671&r1=1585670&r2=1585671&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 Apr
8 09:50:50 2014
@@ -314,14 +314,14 @@ function fullPreviewMode() {
<script type="text/javascript">
//Get cookie to determine state of control
-if (getCookie('control-miscControl') != null) {
- if(getCookie('control-miscControl') == 'true'){
+if (getCookie('control_miscControl') != null) {
+ if(getCookie('control_miscControl') == 'true'){
toggle('miscControl');
togglePlusMinus('imiscControl');
}
}
-if (getCookie('control-pluginControl') != null) {
- if(getCookie('control-pluginControl') == 'true'){
+if (getCookie('control_pluginControl') != null) {
+ if(getCookie('control_pluginControl') == 'true'){
toggle('pluginControl');
togglePlusMinus('ipluginControl');
}
Modified:
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileHierarchicalView.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileHierarchicalView.jsp?rev=1585671&r1=1585670&r2=1585671&view=diff
==============================================================================
---
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileHierarchicalView.jsp
(original)
+++
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileHierarchicalView.jsp
Tue Apr 8 09:50:50 2014
@@ -30,7 +30,7 @@
<script type="text/javascript" src="<s:url
value='/roller-ui/scripts/yui/yahoo-dom-event.js'/>"></script>
<script type="text/javascript" src="<s:url
value='/roller-ui/scripts/yui/treeview-min.js'/>"></script>
<!--begin custom header content for this example-->
-<!--bring in the folder-style CSS for the TreeView Control-->
+<!--bring in the folder-style CSS for the TreeView Control -->
<link rel="stylesheet" type="text/css" href="<s:url
value='/roller-ui/styles/yui/tree.css'/>" />
<!-- Some custom style for the expand/contract section-->
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/TemplateEdit.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/TemplateEdit.jsp?rev=1585671&r1=1585670&r2=1585671&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/TemplateEdit.jsp
(original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/TemplateEdit.jsp Tue
Apr 8 09:50:50 2014
@@ -289,8 +289,8 @@ function changeSize1(num) {
setCookie("templateEditorRows", standardElem.rows, expires);
}
//Get cookie to determine state of control
-if (getCookie('control-advancedControl') != null) {
- if(getCookie('control-advancedControl') == 'true'){
+if (getCookie('control_advancedControl') != null) {
+ if(getCookie('control_advancedControl') == 'true'){
toggle('advancedControl');
togglePlusMinus('iadvancedControl');
}
Modified: roller/trunk/app/src/main/webapp/theme/scripts/roller.js
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/theme/scripts/roller.js?rev=1585671&r1=1585670&r2=1585671&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/theme/scripts/roller.js (original)
+++ roller/trunk/app/src/main/webapp/theme/scripts/roller.js Tue Apr 8
09:50:50 2014
@@ -164,7 +164,7 @@ function toggleControl(toggleId, targetI
// set a cookie to remember this preference
var expires = new Date();
expires.setTime(expires.getTime() + 24 * 365 * 60 * 60 * 1000); //
sets it for approx 365 days.
- setCookie("control-"+targetId,expanded,expires,"/");
+ setCookie("control_"+targetId,expanded,expires,"/");
}
}
