Author: gmazza
Date: Mon Jul 28 14:08:17 2014
New Revision: 1614035
URL: http://svn.apache.org/r1614035
Log:
ROL-2043 Switch from YUI3 to latest JQuery UI
Added:
roller/trunk/app/src/main/webapp/roller-ui/JQueryUI-README.txt
roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/
roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/
roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/animated-overlay.gif
(with props)
roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-bg_flat_0_aaaaaa_40x100.png
(with props)
roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-bg_flat_55_fbec88_40x100.png
(with props)
roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-bg_glass_75_d0e5f5_1x400.png
(with props)
roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-bg_glass_85_dfeffc_1x400.png
(with props)
roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-bg_glass_95_fef1ec_1x400.png
(with props)
roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png
(with props)
roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-bg_inset-hard_100_f5f8f9_1x100.png
(with props)
roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-bg_inset-hard_100_fcfdfd_1x100.png
(with props)
roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-icons_217bc0_256x240.png
(with props)
roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-icons_2e83ff_256x240.png
(with props)
roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-icons_469bdd_256x240.png
(with props)
roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-icons_6da8d5_256x240.png
(with props)
roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-icons_cd0a0a_256x240.png
(with props)
roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-icons_d8e7f3_256x240.png
(with props)
roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-icons_f9bd01_256x240.png
(with props)
roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/jquery-ui.min.css
roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/jquery-ui.min.js
Removed:
roller/trunk/app/src/main/webapp/roller-ui/scripts/jquery-ui.custom.min.js
roller/trunk/app/src/main/webapp/roller-ui/styles/images/
roller/trunk/app/src/main/webapp/roller-ui/styles/jquery-ui-1.10.4.custom.min.css
roller/trunk/app/src/main/webapp/roller-ui/styles/jquery.ui.accordion.css
roller/trunk/app/src/main/webapp/roller-ui/styles/jquery.ui.all.css
roller/trunk/app/src/main/webapp/roller-ui/styles/jquery.ui.autocomplete.css
roller/trunk/app/src/main/webapp/roller-ui/styles/jquery.ui.base.css
roller/trunk/app/src/main/webapp/roller-ui/styles/jquery.ui.button.css
roller/trunk/app/src/main/webapp/roller-ui/styles/jquery.ui.core.css
roller/trunk/app/src/main/webapp/roller-ui/styles/jquery.ui.datepicker.css
roller/trunk/app/src/main/webapp/roller-ui/styles/jquery.ui.dialog.css
roller/trunk/app/src/main/webapp/roller-ui/styles/jquery.ui.menu.css
roller/trunk/app/src/main/webapp/roller-ui/styles/jquery.ui.progressbar.css
roller/trunk/app/src/main/webapp/roller-ui/styles/jquery.ui.resizable.css
roller/trunk/app/src/main/webapp/roller-ui/styles/jquery.ui.selectable.css
roller/trunk/app/src/main/webapp/roller-ui/styles/jquery.ui.slider.css
roller/trunk/app/src/main/webapp/roller-ui/styles/jquery.ui.spinner.css
roller/trunk/app/src/main/webapp/roller-ui/styles/jquery.ui.tabs.css
roller/trunk/app/src/main/webapp/roller-ui/styles/jquery.ui.theme.css
roller/trunk/app/src/main/webapp/roller-ui/styles/jquery.ui.tooltip.css
roller/trunk/app/src/main/webapp/roller-ui/theme/sunny/images/
roller/trunk/app/src/main/webapp/roller-ui/yui3/array-extras/
roller/trunk/app/src/main/webapp/roller-ui/yui3/arraylist/
roller/trunk/app/src/main/webapp/roller-ui/yui3/assets/
roller/trunk/app/src/main/webapp/roller-ui/yui3/async-queue/
roller/trunk/app/src/main/webapp/roller-ui/yui3/attribute-base/
roller/trunk/app/src/main/webapp/roller-ui/yui3/attribute-complex/
roller/trunk/app/src/main/webapp/roller-ui/yui3/attribute-core/
roller/trunk/app/src/main/webapp/roller-ui/yui3/attribute-extras/
roller/trunk/app/src/main/webapp/roller-ui/yui3/attribute-observable/
roller/trunk/app/src/main/webapp/roller-ui/yui3/autocomplete-base/
roller/trunk/app/src/main/webapp/roller-ui/yui3/autocomplete-filters/
roller/trunk/app/src/main/webapp/roller-ui/yui3/autocomplete-list/
roller/trunk/app/src/main/webapp/roller-ui/yui3/autocomplete-list-keys/
roller/trunk/app/src/main/webapp/roller-ui/yui3/autocomplete-plugin/
roller/trunk/app/src/main/webapp/roller-ui/yui3/autocomplete-sources/
roller/trunk/app/src/main/webapp/roller-ui/yui3/base-base/
roller/trunk/app/src/main/webapp/roller-ui/yui3/base-build/
roller/trunk/app/src/main/webapp/roller-ui/yui3/base-core/
roller/trunk/app/src/main/webapp/roller-ui/yui3/base-observable/
roller/trunk/app/src/main/webapp/roller-ui/yui3/base-pluginhost/
roller/trunk/app/src/main/webapp/roller-ui/yui3/button-core/
roller/trunk/app/src/main/webapp/roller-ui/yui3/button-plugin/
roller/trunk/app/src/main/webapp/roller-ui/yui3/classnamemanager/
roller/trunk/app/src/main/webapp/roller-ui/yui3/cssbutton/
roller/trunk/app/src/main/webapp/roller-ui/yui3/dataschema-base/
roller/trunk/app/src/main/webapp/roller-ui/yui3/dataschema-json/
roller/trunk/app/src/main/webapp/roller-ui/yui3/datasource-io/
roller/trunk/app/src/main/webapp/roller-ui/yui3/datasource-jsonschema/
roller/trunk/app/src/main/webapp/roller-ui/yui3/datasource-local/
roller/trunk/app/src/main/webapp/roller-ui/yui3/dom-base/
roller/trunk/app/src/main/webapp/roller-ui/yui3/dom-core/
roller/trunk/app/src/main/webapp/roller-ui/yui3/dom-screen/
roller/trunk/app/src/main/webapp/roller-ui/yui3/dom-style/
roller/trunk/app/src/main/webapp/roller-ui/yui3/escape/
roller/trunk/app/src/main/webapp/roller-ui/yui3/event-base/
roller/trunk/app/src/main/webapp/roller-ui/yui3/event-custom-base/
roller/trunk/app/src/main/webapp/roller-ui/yui3/event-custom-complex/
roller/trunk/app/src/main/webapp/roller-ui/yui3/event-delegate/
roller/trunk/app/src/main/webapp/roller-ui/yui3/event-flick/
roller/trunk/app/src/main/webapp/roller-ui/yui3/event-focus/
roller/trunk/app/src/main/webapp/roller-ui/yui3/event-key/
roller/trunk/app/src/main/webapp/roller-ui/yui3/event-outside/
roller/trunk/app/src/main/webapp/roller-ui/yui3/event-resize/
roller/trunk/app/src/main/webapp/roller-ui/yui3/event-simulate/
roller/trunk/app/src/main/webapp/roller-ui/yui3/event-synthetic/
roller/trunk/app/src/main/webapp/roller-ui/yui3/event-valuechange/
roller/trunk/app/src/main/webapp/roller-ui/yui3/features/
roller/trunk/app/src/main/webapp/roller-ui/yui3/gesture-simulate/
roller/trunk/app/src/main/webapp/roller-ui/yui3/intl/
roller/trunk/app/src/main/webapp/roller-ui/yui3/intl-base/
roller/trunk/app/src/main/webapp/roller-ui/yui3/io-base/
roller/trunk/app/src/main/webapp/roller-ui/yui3/json-parse/
roller/trunk/app/src/main/webapp/roller-ui/yui3/json-stringify/
roller/trunk/app/src/main/webapp/roller-ui/yui3/node-base/
roller/trunk/app/src/main/webapp/roller-ui/yui3/node-core/
roller/trunk/app/src/main/webapp/roller-ui/yui3/node-event-delegate/
roller/trunk/app/src/main/webapp/roller-ui/yui3/node-event-simulate/
roller/trunk/app/src/main/webapp/roller-ui/yui3/node-focusmanager/
roller/trunk/app/src/main/webapp/roller-ui/yui3/node-pluginhost/
roller/trunk/app/src/main/webapp/roller-ui/yui3/node-screen/
roller/trunk/app/src/main/webapp/roller-ui/yui3/node-style/
roller/trunk/app/src/main/webapp/roller-ui/yui3/oop/
roller/trunk/app/src/main/webapp/roller-ui/yui3/panel/
roller/trunk/app/src/main/webapp/roller-ui/yui3/plugin/
roller/trunk/app/src/main/webapp/roller-ui/yui3/pluginhost-base/
roller/trunk/app/src/main/webapp/roller-ui/yui3/pluginhost-config/
roller/trunk/app/src/main/webapp/roller-ui/yui3/querystring-stringify-simple/
roller/trunk/app/src/main/webapp/roller-ui/yui3/selector/
roller/trunk/app/src/main/webapp/roller-ui/yui3/selector-css2/
roller/trunk/app/src/main/webapp/roller-ui/yui3/selector-css3/
roller/trunk/app/src/main/webapp/roller-ui/yui3/selector-native/
roller/trunk/app/src/main/webapp/roller-ui/yui3/shim-plugin/
roller/trunk/app/src/main/webapp/roller-ui/yui3/tabview/
roller/trunk/app/src/main/webapp/roller-ui/yui3/tabview-base/
roller/trunk/app/src/main/webapp/roller-ui/yui3/text-data-wordbreak/
roller/trunk/app/src/main/webapp/roller-ui/yui3/text-wordbreak/
roller/trunk/app/src/main/webapp/roller-ui/yui3/widget-autohide/
roller/trunk/app/src/main/webapp/roller-ui/yui3/widget-base/
roller/trunk/app/src/main/webapp/roller-ui/yui3/widget-buttons/
roller/trunk/app/src/main/webapp/roller-ui/yui3/widget-child/
roller/trunk/app/src/main/webapp/roller-ui/yui3/widget-htmlparser/
roller/trunk/app/src/main/webapp/roller-ui/yui3/widget-modality/
roller/trunk/app/src/main/webapp/roller-ui/yui3/widget-parent/
roller/trunk/app/src/main/webapp/roller-ui/yui3/widget-position/
roller/trunk/app/src/main/webapp/roller-ui/yui3/widget-position-align/
roller/trunk/app/src/main/webapp/roller-ui/yui3/widget-position-constrain/
roller/trunk/app/src/main/webapp/roller-ui/yui3/widget-skin/
roller/trunk/app/src/main/webapp/roller-ui/yui3/widget-stack/
roller/trunk/app/src/main/webapp/roller-ui/yui3/widget-stdmod/
roller/trunk/app/src/main/webapp/roller-ui/yui3/widget-uievents/
roller/trunk/app/src/main/webapp/roller-ui/yui3/yui/
roller/trunk/app/src/main/webapp/roller-ui/yui3/yui-base/
Modified:
roller/trunk/app/src/main/resources/ApplicationResources.properties
roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/GlobalCommentManagementSidebar.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoryAdd.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoryEdit.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/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/StylesheetEdit.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/TemplateEdit.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/roller-ui/authoring/editors/editor-text.jsp
roller/trunk/app/src/main/webapp/roller-ui/authoring/editors/editor-xinha.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=1614035&r1=1614034&r2=1614035&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources.properties Mon Jul
28 14:08:17 2014
@@ -716,7 +716,7 @@ maintenance.message.reset=Successfully r
# ----------------------------------------------------------- Media file
management
-mediaFileChooser.popupTitle=Media File Chooser
+mediaFileChooser.popupTitle=Insert Media File
mediaFileImageChooser.subtitle=Choose an image
mediaFileImageChooser.rootPageTip=Click to choose an image or click on a \
directory to enter it.
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=1614035&r1=1614034&r2=1614035&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
Mon Jul 28 14:08:17 2014
@@ -17,10 +17,9 @@
--%>
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
+<link rel="stylesheet" type="text/css" media="all" href='<s:url
value="/roller-ui/jquery-ui-1.11.0/jquery-ui.min.css"/>' />
<script type="text/javascript" src="<s:url
value="/roller-ui/scripts/jquery-2.1.1.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>
+<script type="text/javascript" src='<s:url
value="/roller-ui/jquery-ui-1.11.0/jquery-ui.min.js"/>'></script>
<div class="sidebarFade">
<div class="menu-tr">
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoryAdd.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoryAdd.jsp?rev=1614035&r1=1614034&r2=1614035&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoryAdd.jsp
(original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoryAdd.jsp Mon
Jul 28 14:08:17 2014
@@ -33,15 +33,15 @@
</tr>
<tr>
- <td><s:text name="generic.description" /></td>
- <td><s:textarea name="bean.description" rows="5" cols="50"
style="width:50%"/></td>
+ <td><s:text name="categoryForm.image" /></td>
+ <td><s:textfield name="bean.image" size="120"
style="width:80%"/></td>
</tr>
-
+
<tr>
- <td><s:text name="categoryForm.image" /></td>
- <td><s:textarea name="bean.image" rows="5" cols="50"
style="width:50%"/></td>
+ <td><s:text name="generic.description" /></td>
+ <td><s:textarea name="bean.description" rows="5" cols="50"
style="width:50%"/></td>
</tr>
-
+
</table>
<p>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoryEdit.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoryEdit.jsp?rev=1614035&r1=1614034&r2=1614035&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoryEdit.jsp
(original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoryEdit.jsp Mon
Jul 28 14:08:17 2014
@@ -30,19 +30,19 @@
<tr>
<td><s:text name="generic.name" /></td>
- <td><s:textfield name="bean.name" size="70" maxlength="255" /></td>
+ <td><s:textfield name="bean.name" size="70" maxlength="255"
style="width:50%"/></td>
</tr>
<tr>
- <td><s:text name="generic.description" /></td>
- <td><s:textarea name="bean.description" rows="5" cols="50" /></td>
+ <td><s:text name="categoryForm.image" /></td>
+ <td><s:textfield name="bean.image" size="120"
style="width:80%"/></td>
</tr>
-
+
<tr>
- <td><s:text name="categoryForm.image" /></td>
- <td><s:textarea name="bean.image" rows="5" cols="50" /></td>
+ <td><s:text name="generic.description" /></td>
+ <td><s:textarea name="bean.description" rows="5" cols="50"
style="width:50%"/></td>
</tr>
-
+
</table>
<p>
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=1614035&r1=1614034&r2=1614035&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
Mon Jul 28 14:08:17 2014
@@ -17,11 +17,9 @@
--%>
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
+<link rel="stylesheet" type="text/css" media="all" href='<s:url
value="/roller-ui/jquery-ui-1.11.0/jquery-ui.min.css"/>' />
<script type="text/javascript" src="<s:url
value="/roller-ui/scripts/jquery-2.1.1.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>
+<script type="text/javascript" src='<s:url
value="/roller-ui/jquery-ui-1.11.0/jquery-ui.min.js"/>'></script>
<div class="sidebarFade">
<div class="menu-tr">
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=1614035&r1=1614034&r2=1614035&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 Mon
Jul 28 14:08:17 2014
@@ -17,10 +17,9 @@
--%>
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
+<link rel="stylesheet" type="text/css" media="all" href='<s:url
value="/roller-ui/jquery-ui-1.11.0/jquery-ui.min.css"/>' />
<script type="text/javascript" src="<s:url
value="/roller-ui/scripts/jquery-2.1.1.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>
+<script type="text/javascript" src='<s:url
value="/roller-ui/jquery-ui-1.11.0/jquery-ui.min.js"/>'></script>
<div class="sidebarFade">
<div class="menu-tr">
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=1614035&r1=1614034&r2=1614035&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
28 14:08:17 2014
@@ -17,11 +17,10 @@
--%>
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
-<link rel="stylesheet" type="text/css" media="all" href='<s:url
value="/roller-ui/styles/jquery.ui.all.css"/>' />
+<link rel="stylesheet" type="text/css" media="all" href='<s:url
value="/roller-ui/jquery-ui-1.11.0/jquery-ui.min.css"/>' />
-<script type="text/javascript" src="<s:url
value='/roller-ui/yui3/yui/yui-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/scripts/jquery-ui.custom.min.js'/>"></script>
+<script type="text/javascript" src='<s:url
value="/roller-ui/jquery-ui-1.11.0/jquery-ui.min.js"/>'></script>
<style>
#tagAutoCompleteWrapper {
@@ -221,24 +220,47 @@ if (getCookie('control_pluginControl') !
togglePlusMinus('ipluginControl');
}
}
-YUI().use(['autocomplete', 'autocomplete-filters', "datasource-io",
"datasource-jsonschema"], function (Y) {
-
- var ds = new Y.DataSource.IO({
- source: "<s:property value="jsonAutocompleteUrl" />"
- });
-
- ds.plug({fn: Y.Plugin.DataSourceJSONSchema, cfg: {
- schema: {
- resultListLocator: 'tagcounts',
- resultFields: ['tag']
+$(function() {
+function split( val ) {
+ return val.split( / \s*/ );
+}
+function extractLast( term ) {
+ return split( term ).pop();
+}
+$( "#tagAutoComplete" )
+ // don't navigate away from the field on tab when selecting an item
+ .bind( "keydown", function( event ) {
+ if ( event.keyCode === $.ui.keyCode.TAB && $( this ).autocomplete(
"instance" ).menu.active ) {
+ event.preventDefault();
+ }
+ })
+ .autocomplete({
+ delay: 500,
+ source: function(request, response) {
+ $.getJSON("<s:property value="jsonAutocompleteUrl" />", { format:
'json', prefix: extractLast( request.term ) },
+ function(data) {
+ response($.map(data.tagcounts, function (dataValue) {
+ return {
+ value: dataValue.tag
+ };
+ }))
+ })
+ },
+ focus: function() {
+ // prevent value inserted on focus
+ return false;
+ },
+ select: function( event, ui ) {
+ var terms = split( this.value );
+ // remove the current input
+ terms.pop();
+ // add the selected item
+ terms.push( ui.item.value );
+ // add placeholder to get the space at the end
+ terms.push( "" );
+ this.value = terms.join( " " );
+ return false;
}
- }});
-
- Y.one('#tagAutoComplete').plug(Y.Plugin.AutoComplete, {
- queryDelimiter: ' ',
- requestTemplate: '?format=json&prefix={query}',
- resultTextLocator: 'tag',
- source: ds
});
});
</script>
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=1614035&r1=1614034&r2=1614035&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
28 14:08:17 2014
@@ -17,11 +17,10 @@
--%>
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
-<link rel="stylesheet" type="text/css" media="all" href='<s:url
value="/roller-ui/styles/jquery.ui.all.css"/>' />
+<link rel="stylesheet" type="text/css" media="all" href='<s:url
value="/roller-ui/jquery-ui-1.11.0/jquery-ui.min.css"/>' />
-<script type="text/javascript" src="<s:url
value='/roller-ui/yui3/yui/yui-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/scripts/jquery-ui.custom.min.js'/>"></script>
+<script type="text/javascript" src='<s:url
value="/roller-ui/jquery-ui-1.11.0/jquery-ui.min.js"/>'></script>
<style>
#tagAutoCompleteWrapper {
@@ -308,24 +307,47 @@ if (getCookie('control_pluginControl') !
togglePlusMinus('ipluginControl');
}
}
-YUI().use(['autocomplete', 'autocomplete-filters', "datasource-io",
"datasource-jsonschema"], function (Y) {
-
- var ds = new Y.DataSource.IO({
- source: "<s:property value="jsonAutocompleteUrl" />"
- });
-
- ds.plug({fn: Y.Plugin.DataSourceJSONSchema, cfg: {
- schema: {
- resultListLocator: 'tagcounts',
- resultFields: ['tag']
+$(function() {
+function split( val ) {
+ return val.split( / \s*/ );
+}
+function extractLast( term ) {
+ return split( term ).pop();
+}
+$( "#tagAutoComplete" )
+ // don't navigate away from the field on tab when selecting an item
+ .bind( "keydown", function( event ) {
+ if ( event.keyCode === $.ui.keyCode.TAB && $( this ).autocomplete(
"instance" ).menu.active ) {
+ event.preventDefault();
+ }
+ })
+ .autocomplete({
+ delay: 500,
+ source: function(request, response) {
+ $.getJSON("<s:property value="jsonAutocompleteUrl" />", { format:
'json', prefix: extractLast( request.term ) },
+ function(data) {
+ response($.map(data.tagcounts, function (dataValue) {
+ return {
+ value: dataValue.tag
+ };
+ }))
+ })
+ },
+ focus: function() {
+ // prevent value inserted on focus
+ return false;
+ },
+ select: function( event, ui ) {
+ var terms = split( this.value );
+ // remove the current input
+ terms.pop();
+ // add the selected item
+ terms.push( ui.item.value );
+ // add placeholder to get the space at the end
+ terms.push( "" );
+ this.value = terms.join( " " );
+ return false;
}
- }});
-
- Y.one('#tagAutoComplete').plug(Y.Plugin.AutoComplete, {
- queryDelimiter: ' ',
- requestTemplate: '?format=json&prefix={query}',
- resultTextLocator: 'tag',
- source: ds
});
});
</script>
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=1614035&r1=1614034&r2=1614035&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 28 14:08:17 2014
@@ -20,41 +20,6 @@
<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="/custom-ui/ZeroClipboard.js"
/>'></script>
-<!-- Can't distribute ZeroClipboard with Roller, LGPL violates ASF policy -->
-<!-- (1/2) For ZeroClipboard you would add this: -->
-<style type="text/css">
-#d_clip_button {
- text-align:center;
- border:1px solid black;
- background-color:#ccc;
- margin:5px; padding:5px;
-}
-#d_clip_button.hover { background-color:#eee; }
-#d_clip_button.active { background-color:#aaa; }
-</style>
-
-<script type="text/javascript">
-$("#d_clip_button").ready(function() {
- // assuming ZeroClipboard is at context/custom-ui path
- ZeroClipboard.setMoviePath( '<s:url value="/custom-ui/ZeroClipboard.swf"
/>' );
- var clip = new ZeroClipboard.Client();
- clip.setText(''); // will be set later on mouseDownv
- clip.setHandCursor( true );
- clip.setCSSEffects( true );
- clip.addEventListener( 'mouseDown', function(client) {
- // set text to copy here
- clip.setText( document.getElementById('clip_text').value );
- } );
- clip.addEventListener( 'complete', function(client, text) {
- alert("Copied link to the Clipboard.");
- } );
- clip.glue( 'd_clip_button' );
-});
-</script>
---%>
-
<s:if test="bean.isImage">
<div class="mediaFileThumbnail">
<a href='<s:property value="bean.permalink" />' target="_blank">
@@ -123,12 +88,7 @@ $("#d_clip_button").ready(function() {
<img border="0" src='<s:property value="%{linkIconURL}" />'
style="padding:2px 2px;" alt="link" />
</a>
- <input type="text" id="clip_text" size="50" value='<s:text
name="bean.permalink" />' readonly />
-
- <%--
- <!-- (2/2) For ZeroClipboard you would add this: -->
- <div id="d_clip_button"><s:text
name="mediaFileEdit.copyToClipboard" /></div>
- --%>
+ <input type="text" id="clip_text" size="50" style="width:90%"
value='<s:text name="bean.permalink" />' readonly />
</td>
</tr>
@@ -137,7 +97,7 @@ $("#d_clip_button").ready(function() {
<label for="status"><s:text name="generic.description"
/></label>
</td>
<td>
- <s:textarea name="bean.description" cols="50" rows="2"
tabindex="2"/>
+ <s:textarea name="bean.description" cols="50" rows="2"
tabindex="2" style="width:70%" />
</td>
</tr>
@@ -146,7 +106,7 @@ $("#d_clip_button").ready(function() {
<label for="tags"><s:text name="mediaFileEdit.tags" /></label>
</td>
<td>
- <s:textfield name="bean.tagsAsString" size="30"
maxlength="100" tabindex="3" />
+ <s:textfield name="bean.tagsAsString" size="30"
maxlength="100" tabindex="3" style="width:70%"/>
</td>
</tr>
@@ -155,7 +115,7 @@ $("#d_clip_button").ready(function() {
<label for="copyright"><s:text name="mediaFileEdit.copyright"
/></label>
</td>
<td>
- <s:textfield name="bean.copyrightText" size="30"
maxlength="100" tabindex="4"/>
+ <s:textfield name="bean.copyrightText" size="30"
maxlength="100" tabindex="4" style="width:70%"/>
</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=1614035&r1=1614034&r2=1614035&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 28 14:08:17 2014
@@ -17,10 +17,8 @@
--%>
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
-<script type="text/javascript" src="<s:url
value='/roller-ui/yui3/yui/yui-min.js' />"></script>
<script type="text/javascript" src="<s:url
value="/roller-ui/scripts/jquery-2.1.1.min.js" />"></script>
-
<style>
.mediaObject {
width:120px;
@@ -101,18 +99,13 @@
<script type="text/javascript">
function highlight(el, flag) {
if (flag) {
- YUI().use('node', function (Y) {
- Y.one(el).addClass("highlight");
- });
+ $(el).addClass("highlight");
} else {
- YUI().use('node', function (Y) {
- Y.one(el).removeClass("highlight");
- });
+ $(el).removeClass("highlight");
}
}
</script>
-
<div width="720px" height="500px">
<ul id = "myMenu">
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=1614035&r1=1614034&r2=1614035&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 28 14:08:17 2014
@@ -16,9 +16,10 @@
directory of this distribution.
--%>
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
+<link rel="stylesheet" type="text/css" media="all" href='<s:url
value="/roller-ui/jquery-ui-1.11.0/jquery-ui.min.css"/>' />
<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>
+<script type="text/javascript" src='<s:url
value="/roller-ui/jquery-ui-1.11.0/jquery-ui.min.js"/>'></script>
<style>
@@ -253,13 +254,9 @@
<script type="text/javascript">
function highlight(el, flag) {
if (flag) {
- YUI().use('node', function (Y) {
- Y.one(el).addClass("highlight");
- });
+ $(el).addClass("highlight");
} else {
- YUI().use('node', function (Y) {
- Y.one(el).removeClass("highlight");
- });
+ $(el).removeClass("highlight");
}
}
</script>
@@ -417,60 +414,39 @@
<%-- ***************************************************************** --%>
-<div id="mediafile_edit_lightbox">
- <div id="panelHeader" class="yui3-widget-hd"></div>
- <div class="yui3-widget-bd">
- <iframe id="mediaFileEditor"
- style="visibility:inherit"
- height="100%"
- width="100%"
- frameborder="no"
- scrolling="auto">
- </iframe>
- </div>
- <div class="yui3-widget-ft"></div>
+<div id="mediafile_edit_lightbox" title="<s:text
name='mediaFileEdit.popupTitle'/>">
+ <iframe id="mediaFileEditor"
+ style="visibility:inherit"
+ height="100%"
+ width="100%"
+ frameborder="no"
+ scrolling="auto">
+ </iframe>
</div>
<script>
- <%-- launch modal "lightbox" Media File Edit page --%>
- var mediapanel;
- YUI().use('panel', function (Y) {
- mediapanel = new Y.Panel({
- srcNode: '#mediafile_edit_lightbox',
- modal : true,
- width : 600,
- height : 700,
- visible: false,
- centered: true,
- constrain: true
- });
- mediapanel.render();
- <%-- Adding title bar text after it is made invisible above to avoid
its
- brief appearance on the screen after saves within the panel.
- --%>
- document.getElementById('panelHeader').innerHTML = '<s:text
name="mediaFileEdit.popupTitle"/>';
- });
-
-
function onClickEdit(mediaFileId) {
<s:url id="mediaFileEditURL" action="mediaFileEdit">
<s:param name="weblog" value="%{actionWeblog.handle}" />
</s:url>
- $("#mediaFileEditor").attr('src',
- '<s:property value="%{mediaFileEditURL}" />' + '&mediaFileId=' +
mediaFileId);
- mediapanel.show();
+ $("#mediaFileEditor").attr('src', '<s:property
value="%{mediaFileEditURL}" />' + '&mediaFileId=' + mediaFileId);
+ $(function() {
+ $("#mediafile_edit_lightbox").dialog({
+ modal : true,
+ width : 600,
+ height : 630
+ });
+ });
}
function onEditSuccess() {
- $("#mediaFileEditor").attr('src','about:blank');
- mediapanel.hide();
- document.getElementById('panelHeader').style.visibility = 'hidden';
+ onEditCancelled();
document.mediaFileViewForm.submit();
}
function onEditCancelled() {
+ $("#mediafile_edit_lightbox").dialog("close");
$("#mediaFileEditor").attr('src','about:blank');
- mediapanel.hide();
}
</script>
Modified:
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/StylesheetEdit.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/StylesheetEdit.jsp?rev=1614035&r1=1614034&r2=1614035&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/StylesheetEdit.jsp
(original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/StylesheetEdit.jsp Mon
Jul 28 14:08:17 2014
@@ -16,18 +16,9 @@
directory of this distribution.
--%>
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
-<script type="text/javascript" src="<s:url
value='/roller-ui/yui3/yui/yui-min.js' />"></script>
-<script type="text/javascript" src="<s:url
value='/roller-ui/yui3/tabview/tabview-min.js'></s:url>"></script>
+<link rel="stylesheet" type="text/css" media="all" href='<s:url
value="/roller-ui/jquery-ui-1.11.0/jquery-ui.min.css"/>' />
<script type="text/javascript">
- // Create a new YUI instance and populate it with the required modules.
- YUI().use('tabview', function (Y) {
- var tabview = new Y.TabView({
- srcNode: '#template-code-tabs'
- });
- tabview.render();
- });
-
function revertStylesheet() {
if (window.confirm('<s:text
name="stylesheetEdit.confirmRevert"/>')) {
document.stylesheetEdit.action = "<s:url
action='stylesheetEdit!revert' />";
@@ -130,3 +121,12 @@ function changeSize1(num) {
setCookie("templateEditorRows", standardElem.rows, expires);
}
</script>
+
+<script type="text/javascript" src="<s:url
value='/roller-ui/scripts/jquery-2.1.1.min.js'></s:url>"></script>
+<script type="text/javascript" src="<s:url
value='/roller-ui/jquery-ui-1.11.0/jquery-ui.min.js'></s:url>"></script>
+
+<script>
+ $(function() {
+ $( "#template-code-tabs" ).tabs();
+ });
+</script>
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=1614035&r1=1614034&r2=1614035&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 Mon
Jul 28 14:08:17 2014
@@ -16,8 +16,7 @@
directory of this distribution.
--%>
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
-<script type="text/javascript" src="<s:url
value='/roller-ui/yui3/yui/yui-min.js' />"></script>
-<script type="text/javascript" src="<s:url
value='/roller-ui/yui3/tabview/tabview-min.js'></s:url>"></script>
+<link rel="stylesheet" type="text/css" media="all" href='<s:url
value="/roller-ui/jquery-ui-1.11.0/jquery-ui.min.css"/>' />
<p class="subtitle">
<s:text name="pageForm.subtitle" >
@@ -117,17 +116,6 @@
</div>
</div>
- <script type="text/javascript">
- // Create a new YUI instance and populate it with the required modules.
- YUI().use('tabview', function (Y) {
- var tabview = new Y.TabView({
- srcNode: '#template-code-tabs'
- });
- tabview.render();
- });
- </script>
-
-
<%-- ==================================================================
--%>
<%-- Save, Close and Resize text area buttons--%>
@@ -304,4 +292,11 @@ if (getCookie('control_advancedControl')
}
</script>
-
\ No newline at end of file
+ <script type="text/javascript" src="<s:url
value='/roller-ui/scripts/jquery-2.1.1.min.js'></s:url>"></script>
+ <script type="text/javascript" src="<s:url
value='/roller-ui/jquery-ui-1.11.0/jquery-ui.min.js'></s:url>"></script>
+
+ <script>
+ $(function() {
+ $( "#template-code-tabs" ).tabs();
+ });
+ </script>
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=1614035&r1=1614034&r2=1614035&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 Mon Jul
28 14:08:17 2014
@@ -13,7 +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/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=1614035&r1=1614034&r2=1614035&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 Mon Jul 28
14:08:17 2014
@@ -13,6 +13,5 @@ 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/styles/jquery-ui-1.10.4.custom.min.css"/>' />
<script type="text/javascript" src="<s:url
value="/theme/scripts/roller.js"/>"></script>
Added: roller/trunk/app/src/main/webapp/roller-ui/JQueryUI-README.txt
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/roller-ui/JQueryUI-README.txt?rev=1614035&view=auto
==============================================================================
--- roller/trunk/app/src/main/webapp/roller-ui/JQueryUI-README.txt (added)
+++ roller/trunk/app/src/main/webapp/roller-ui/JQueryUI-README.txt Mon Jul 28
14:08:17 2014
@@ -0,0 +1,22 @@
+The JQuery UI folder (roller-ui/jquery-ui-1.11.0) was created by doing the
following:
+
+1. Going to the JQuery UI download builder (http://jqueryui.com/download/) and
choosing the latest stable version.
+2. Under Components, unselecting "toggle all" to make sure nothing selected.
+3. Choosing the components Roller uses: datepicker, dialog, autocomplete, and
tabs. Let the Download Builder select whatever additional prerequisites needed.
+4. Selecting theme "Redmond", or a different one if desired. (How each theme
looks can be determined by going to: http://jqueryui.com/themeroller/ and
selecting the "Gallery" tab.)
+5. For the subsequent download, extract into a new folder under roller-ui and
delete all the non-"min" CSS and JS files within that folder. Also delete:
+ a) the index.html and external/jquery/jquery.js files. (our JQuery is kept
in scripts.)
+ b) the structure and theme CSS files (they are unused subsets of the
jquery-ui.min.css)
+6. Update the Roller UI JSP's to point to the new JQuery UI folder and test
all works.
+7. Delete the old JQuery folder after the Roller UI has been updated.
+8. Update this README as necessary if anything's changed.
+
+Following the above process when upgrading the JQuery UI version or changing
the theme it uses will help to make sure all old files
+get deleted while no necessary files are accidentally removed.
+
+Notes:
+1. Recommended to keep the contents of the jquery-ui-1.11.0 folder within this
folder, i.e., don't move the images or CSS' to other folders. This way,
+when we delete this folder as a part of upgrading the JQueryUI version we'll
know that all the resources of this version have also been deleted.
+
+2. Recommended not to add non-JQuery resources into this folder; again, this
way, when we delete this folder we won't have to worry about other
+resources still needed by Roller also getting deleted.
Modified:
roller/trunk/app/src/main/webapp/roller-ui/authoring/editors/editor-text.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/roller-ui/authoring/editors/editor-text.jsp?rev=1614035&r1=1614034&r2=1614035&view=diff
==============================================================================
---
roller/trunk/app/src/main/webapp/roller-ui/authoring/editors/editor-text.jsp
(original)
+++
roller/trunk/app/src/main/webapp/roller-ui/authoring/editors/editor-text.jsp
Mon Jul 28 14:08:17 2014
@@ -32,45 +32,27 @@
</style>
<script type="text/javascript">
-var mediapanel;
-YUI().use(['panel'], function (Y) {
- Y.on("domready", function () {
- if (getCookie("editorSize1") != null) {
- document.getElementById('entry_bean_text').rows =
getCookie("editorSize1");
- }
- if (getCookie("editorSize") != null) {
- document.getElementById('entry_bean_summary').rows =
getCookie("editorSize");
- }
-
- mediapanel = new Y.Panel({
- srcNode: '#mediafile_edit_lightbox',
- modal : true,
- width : 600,
- height : 600,
- visible: false,
- centered: true,
- constrain: true
- });
- mediapanel.render();
- });
-});
-
function onClickAddImage(){
<s:url id="mediaFileImageChooser" action="mediaFileImageChooser"
namespace="overlay">
<s:param name="weblog" value="%{actionWeblog.handle}" />
</s:url>
$("#mediaFileEditor").attr('src','<s:property
value="%{mediaFileImageChooser}" />');
- mediapanel.show();
+ $(function() {
+ $("#mediafile_edit_lightbox").dialog({
+ modal : true,
+ width : 600,
+ height : 600
+ });
+ });
}
function onClose() {
$("#mediaFileEditor").attr('src','about:blank');
- mediapanel.hide();
}
function onSelectImage(name, url) {
+ $("#mediafile_edit_lightbox").dialog("close");
$("#mediaFileEditor").attr('src','about:blank');
- mediapanel.hide();
insertAtCursor(document.getElementById('entry_bean_text'),
'<a href="' + url + '"><img src="' + url + '?t=true" alt="' +
name+ '"></img></a>');
}
@@ -91,7 +73,6 @@ YUI().use(['panel'], function (Y) {
range.text = valueForInsertion;
}
else if (textAreaElement.selectionStart ||
textAreaElement.selectionStart == '0') {
-
var preText;
var postText;
if (textAreaElement.selectionStart == 0) {
@@ -170,16 +151,12 @@ YUI().use(['panel'], function (Y) {
onclick="changeSize(document.getElementById('entry_bean_summary'),
-5)" />
</td></tr></table>
-<div id="mediafile_edit_lightbox">
- <div class="yui3-widget-hd"><s:text
name="mediaFileChooser.popupTitle"/></div>
- <div class="yui3-widget-bd">
- <iframe id="mediaFileEditor"
- style="visibility:inherit"
- height="100%"
- width="100%"
- frameborder="no"
- scrolling="auto">
- </iframe>
- </div>
- <div class="yui3-widget-ft"></div>
+<div id="mediafile_edit_lightbox" title="<s:text
name='mediaFileChooser.popupTitle'/>">
+ <iframe id="mediaFileEditor"
+ style="visibility:inherit"
+ height="100%"
+ width="100%"
+ frameborder="no"
+ scrolling="auto">
+ </iframe>
</div>
Modified:
roller/trunk/app/src/main/webapp/roller-ui/authoring/editors/editor-xinha.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/roller-ui/authoring/editors/editor-xinha.jsp?rev=1614035&r1=1614034&r2=1614035&view=diff
==============================================================================
---
roller/trunk/app/src/main/webapp/roller-ui/authoring/editors/editor-xinha.jsp
(original)
+++
roller/trunk/app/src/main/webapp/roller-ui/authoring/editors/editor-xinha.jsp
Mon Jul 28 14:08:17 2014
@@ -89,39 +89,27 @@
<%-- Editor event handling, on close, on add image, etc. --%>
<script type="text/javascript">
-var mediapanel;
-YUI().use(['panel'], function (Y) {
- Y.on("domready", function () {
- mediapanel = new Y.Panel({
- srcNode: '#mediafile_edit_lightbox',
- modal : true,
- width : 600,
- height : 600,
- visible: false,
- centered: true,
- constrain: true
- });
- mediapanel.render();
- });
-});
-
function onClickAddImage(){
<s:url id="mediaFileImageChooser" action="mediaFileImageChooser"
namespace="overlay">
<s:param name="weblog" value="%{actionWeblog.handle}" />
</s:url>
$("#mediaFileEditor").attr('src','<s:property
value="%{mediaFileImageChooser}" />');
- mediapanel.show();
+ $(function() {
+ $("#mediafile_edit_lightbox").dialog({
+ modal : true,
+ width : 600,
+ height : 600
+ });
+ });
}
function onClose() {
$("#mediaFileEditor").attr('src','about:blank');
- mediapanel.hide();
}
function onSelectImage(name, url) {
+ $("#mediafile_edit_lightbox").dialog("close");
$("#mediaFileEditor").attr('src','about:blank');
- mediapanel.hide();
-
xinha_editors.xe_content.insertHTML(
'<a href="' + url + '"><img src="' + url + '?t=true" alt="' + name+
'"></img></a>');
}
@@ -155,16 +143,12 @@ YUI().use(['panel'], function (Y) {
<%-- ********************************************************************* --%>
<%-- Lightbox for popping up image chooser --%>
-<div id="mediafile_edit_lightbox">
- <div class="yui3-widget-hd"><s:text name="mediaFileChooser.popupTitle"
/></div>
- <div class="yui3-widget-bd">
- <iframe id="mediaFileEditor"
- style="visibility:inherit"
- height="100%"
- width="100%"
- frameborder="no"
- scrolling="auto">
- </iframe>
- </div>
- <div class="yui3-widget-ft"></div>
+<div id="mediafile_edit_lightbox" title="<s:text
name='mediaFileChooser.popupTitle'/>">
+ <iframe id="mediaFileEditor"
+ style="visibility:inherit"
+ height="100%"
+ width="100%"
+ frameborder="no"
+ scrolling="auto">
+ </iframe>
</div>
Added:
roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/animated-overlay.gif
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/animated-overlay.gif?rev=1614035&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/animated-overlay.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-bg_flat_0_aaaaaa_40x100.png
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-bg_flat_0_aaaaaa_40x100.png?rev=1614035&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-bg_flat_0_aaaaaa_40x100.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-bg_flat_55_fbec88_40x100.png
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-bg_flat_55_fbec88_40x100.png?rev=1614035&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-bg_flat_55_fbec88_40x100.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-bg_glass_75_d0e5f5_1x400.png
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-bg_glass_75_d0e5f5_1x400.png?rev=1614035&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-bg_glass_75_d0e5f5_1x400.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-bg_glass_85_dfeffc_1x400.png
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-bg_glass_85_dfeffc_1x400.png?rev=1614035&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-bg_glass_85_dfeffc_1x400.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-bg_glass_95_fef1ec_1x400.png
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-bg_glass_95_fef1ec_1x400.png?rev=1614035&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-bg_glass_95_fef1ec_1x400.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png?rev=1614035&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-bg_inset-hard_100_f5f8f9_1x100.png
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-bg_inset-hard_100_f5f8f9_1x100.png?rev=1614035&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-bg_inset-hard_100_f5f8f9_1x100.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-bg_inset-hard_100_fcfdfd_1x100.png
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-bg_inset-hard_100_fcfdfd_1x100.png?rev=1614035&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-bg_inset-hard_100_fcfdfd_1x100.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-icons_217bc0_256x240.png
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-icons_217bc0_256x240.png?rev=1614035&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-icons_217bc0_256x240.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-icons_2e83ff_256x240.png
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-icons_2e83ff_256x240.png?rev=1614035&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-icons_2e83ff_256x240.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-icons_469bdd_256x240.png
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-icons_469bdd_256x240.png?rev=1614035&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-icons_469bdd_256x240.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-icons_6da8d5_256x240.png
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-icons_6da8d5_256x240.png?rev=1614035&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-icons_6da8d5_256x240.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-icons_cd0a0a_256x240.png
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-icons_cd0a0a_256x240.png?rev=1614035&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-icons_cd0a0a_256x240.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-icons_d8e7f3_256x240.png
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-icons_d8e7f3_256x240.png?rev=1614035&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-icons_d8e7f3_256x240.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-icons_f9bd01_256x240.png
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-icons_f9bd01_256x240.png?rev=1614035&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-icons_f9bd01_256x240.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/jquery-ui.min.css
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/jquery-ui.min.css?rev=1614035&view=auto
==============================================================================
---
roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/jquery-ui.min.css
(added)
+++
roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/jquery-ui.min.css
Mon Jul 28 14:08:17 2014
@@ -0,0 +1,7 @@
+/*! jQuery UI - v1.11.0 - 2014-07-27
+* http://jqueryui.com
+* Includes: core.css, draggable.css, resizable.css, autocomplete.css,
button.css, datepicker.css, dialog.css, menu.css, tabs.css, theme.css
+* To view and modify this theme, visit
http://jqueryui.com/themeroller/?ffDefault=Lucida%20Grande%2CLucida%20Sans%2CArial%2Csans-serif&fwDefault=bold&fsDefault=1.1em&cornerRadius=5px&bgColorHeader=5c9ccc&bgTextureHeader=gloss_wave&bgImgOpacityHeader=55&borderColorHeader=4297d7&fcHeader=ffffff&iconColorHeader=d8e7f3&bgColorContent=fcfdfd&bgTextureContent=inset_hard&bgImgOpacityContent=100&borderColorContent=a6c9e2&fcContent=222222&iconColorContent=469bdd&bgColorDefault=dfeffc&bgTextureDefault=glass&bgImgOpacityDefault=85&borderColorDefault=c5dbec&fcDefault=2e6e9e&iconColorDefault=6da8d5&bgColorHover=d0e5f5&bgTextureHover=glass&bgImgOpacityHover=75&borderColorHover=79b7e7&fcHover=1d5987&iconColorHover=217bc0&bgColorActive=f5f8f9&bgTextureActive=inset_hard&bgImgOpacityActive=100&borderColorActive=79b7e7&fcActive=e17009&iconColorActive=f9bd01&bgColorHighlight=fbec88&bgTextureHighlight=flat&bgImgOpacityHighlight=55&borderColorHighlight=fad42e&fcHighlight=363636&iconColorHighlight=2e83ff&;
bgColorError=fef1ec&bgTextureError=glass&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=flat&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=flat&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px
+* Copyright 2014 jQuery Foundation and other contributors; Licensed MIT */
+
+.ui-helper-hidden{display:none}.ui-helper-hidden-accessible{border:0;clip:rect(0
0 0
0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.ui-helper-reset{margin:0;padding:0;border:0;outline:0;line-height:1.3;text-decoration:none;font-size:100%;list-style:none}.ui-helper-clearfix:before,.ui-helper-clearfix:after{content:"";display:table;border-collapse:collapse}.ui-helper-clearfix:after{clear:both}.ui-helper-clearfix{min-height:0}.ui-helper-zfix{width:100%;height:100%;top:0;left:0;position:absolute;opacity:0;filter:Alpha(Opacity=0)}.ui-front{z-index:100}.ui-state-disabled{cursor:default!important}.ui-icon{display:block;text-indent:-99999px;overflow:hidden;background-repeat:no-repeat}.ui-widget-overlay{position:fixed;top:0;left:0;width:100%;height:100%}.ui-draggable-handle{-ms-touch-action:none;touch-action:none}.ui-resizable{position:relative}.ui-resizable-handle{position:absolute;font-size:0.1px;display:block;-ms-touch-action:none;touch-action:none}.ui-re
sizable-disabled .ui-resizable-handle,.ui-resizable-autohide
.ui-resizable-handle{display:none}.ui-resizable-n{cursor:n-resize;height:7px;width:100%;top:-5px;left:0}.ui-resizable-s{cursor:s-resize;height:7px;width:100%;bottom:-5px;left:0}.ui-resizable-e{cursor:e-resize;width:7px;right:-5px;top:0;height:100%}.ui-resizable-w{cursor:w-resize;width:7px;left:-5px;top:0;height:100%}.ui-resizable-se{cursor:se-resize;width:12px;height:12px;right:1px;bottom:1px}.ui-resizable-sw{cursor:sw-resize;width:9px;height:9px;left:-5px;bottom:-5px}.ui-resizable-nw{cursor:nw-resize;width:9px;height:9px;left:-5px;top:-5px}.ui-resizable-ne{cursor:ne-resize;width:9px;height:9px;right:-5px;top:-5px}.ui-autocomplete{position:absolute;top:0;left:0;cursor:default}.ui-button{display:inline-block;position:relative;padding:0;line-height:normal;margin-right:.1em;cursor:pointer;vertical-align:middle;text-align:center;overflow:visible}.ui-button,.ui-button:link,.ui-button:visited,.ui-button:hover,.ui-button:active{t
ext-decoration:none}.ui-button-icon-only{width:2.2em}button.ui-button-icon-only{width:2.4em}.ui-button-icons-only{width:3.4em}button.ui-button-icons-only{width:3.7em}.ui-button
.ui-button-text{display:block;line-height:normal}.ui-button-text-only
.ui-button-text{padding:.4em 1em}.ui-button-icon-only
.ui-button-text,.ui-button-icons-only
.ui-button-text{padding:.4em;text-indent:-9999999px}.ui-button-text-icon-primary
.ui-button-text,.ui-button-text-icons .ui-button-text{padding:.4em 1em .4em
2.1em}.ui-button-text-icon-secondary .ui-button-text,.ui-button-text-icons
.ui-button-text{padding:.4em 2.1em .4em 1em}.ui-button-text-icons
.ui-button-text{padding-left:2.1em;padding-right:2.1em}input.ui-button{padding:.4em
1em}.ui-button-icon-only .ui-icon,.ui-button-text-icon-primary
.ui-icon,.ui-button-text-icon-secondary .ui-icon,.ui-button-text-icons
.ui-icon,.ui-button-icons-only
.ui-icon{position:absolute;top:50%;margin-top:-8px}.ui-button-icon-only
.ui-icon{left:50%;margin-left:-8px}.ui-
button-text-icon-primary .ui-button-icon-primary,.ui-button-text-icons
.ui-button-icon-primary,.ui-button-icons-only
.ui-button-icon-primary{left:.5em}.ui-button-text-icon-secondary
.ui-button-icon-secondary,.ui-button-text-icons
.ui-button-icon-secondary,.ui-button-icons-only
.ui-button-icon-secondary{right:.5em}.ui-buttonset{margin-right:7px}.ui-buttonset
.ui-button{margin-left:0;margin-right:-.3em}input.ui-button::-moz-focus-inner,button.ui-button::-moz-focus-inner{border:0;padding:0}.ui-datepicker{width:17em;padding:.2em
.2em 0;display:none}.ui-datepicker
.ui-datepicker-header{position:relative;padding:.2em 0}.ui-datepicker
.ui-datepicker-prev,.ui-datepicker
.ui-datepicker-next{position:absolute;top:2px;width:1.8em;height:1.8em}.ui-datepicker
.ui-datepicker-prev-hover,.ui-datepicker
.ui-datepicker-next-hover{top:1px}.ui-datepicker
.ui-datepicker-prev{left:2px}.ui-datepicker
.ui-datepicker-next{right:2px}.ui-datepicker
.ui-datepicker-prev-hover{left:1px}.ui-datepicker .ui-datepic
ker-next-hover{right:1px}.ui-datepicker .ui-datepicker-prev
span,.ui-datepicker .ui-datepicker-next
span{display:block;position:absolute;left:50%;margin-left:-8px;top:50%;margin-top:-8px}.ui-datepicker
.ui-datepicker-title{margin:0
2.3em;line-height:1.8em;text-align:center}.ui-datepicker .ui-datepicker-title
select{font-size:1em;margin:1px 0}.ui-datepicker
select.ui-datepicker-month,.ui-datepicker
select.ui-datepicker-year{width:49%}.ui-datepicker
table{width:100%;font-size:.9em;border-collapse:collapse;margin:0 0
.4em}.ui-datepicker th{padding:.7em
.3em;text-align:center;font-weight:bold;border:0}.ui-datepicker
td{border:0;padding:1px}.ui-datepicker td span,.ui-datepicker td
a{display:block;padding:.2em;text-align:right;text-decoration:none}.ui-datepicker
.ui-datepicker-buttonpane{background-image:none;margin:.7em 0 0 0;padding:0
.2em;border-left:0;border-right:0;border-bottom:0}.ui-datepicker
.ui-datepicker-buttonpane button{float:right;margin:.5em .2em
.4em;cursor:pointer;padding
:.2em .6em .3em .6em;width:auto;overflow:visible}.ui-datepicker
.ui-datepicker-buttonpane
button.ui-datepicker-current{float:left}.ui-datepicker.ui-datepicker-multi{width:auto}.ui-datepicker-multi
.ui-datepicker-group{float:left}.ui-datepicker-multi .ui-datepicker-group
table{width:95%;margin:0 auto .4em}.ui-datepicker-multi-2
.ui-datepicker-group{width:50%}.ui-datepicker-multi-3
.ui-datepicker-group{width:33.3%}.ui-datepicker-multi-4
.ui-datepicker-group{width:25%}.ui-datepicker-multi .ui-datepicker-group-last
.ui-datepicker-header,.ui-datepicker-multi .ui-datepicker-group-middle
.ui-datepicker-header{border-left-width:0}.ui-datepicker-multi
.ui-datepicker-buttonpane{clear:left}.ui-datepicker-row-break{clear:both;width:100%;font-size:0}.ui-datepicker-rtl{direction:rtl}.ui-datepicker-rtl
.ui-datepicker-prev{right:2px;left:auto}.ui-datepicker-rtl
.ui-datepicker-next{left:2px;right:auto}.ui-datepicker-rtl
.ui-datepicker-prev:hover{right:1px;left:auto}.ui-datepicker-rtl .ui-datepicker-
next:hover{left:1px;right:auto}.ui-datepicker-rtl
.ui-datepicker-buttonpane{clear:right}.ui-datepicker-rtl
.ui-datepicker-buttonpane button{float:left}.ui-datepicker-rtl
.ui-datepicker-buttonpane button.ui-datepicker-current,.ui-datepicker-rtl
.ui-datepicker-group{float:right}.ui-datepicker-rtl .ui-datepicker-group-last
.ui-datepicker-header,.ui-datepicker-rtl .ui-datepicker-group-middle
.ui-datepicker-header{border-right-width:0;border-left-width:1px}.ui-dialog{overflow:hidden;position:absolute;top:0;left:0;padding:.2em;outline:0}.ui-dialog
.ui-dialog-titlebar{padding:.4em 1em;position:relative}.ui-dialog
.ui-dialog-title{float:left;margin:.1em
0;white-space:nowrap;width:90%;overflow:hidden;text-overflow:ellipsis}.ui-dialog
.ui-dialog-titlebar-close{position:absolute;right:.3em;top:50%;width:20px;margin:-10px
0 0 0;padding:1px;height:20px}.ui-dialog
.ui-dialog-content{position:relative;border:0;padding:.5em
1em;background:none;overflow:auto}.ui-dialog .ui-dialog-buttonpane{text-ali
gn:left;border-width:1px 0 0
0;background-image:none;margin-top:.5em;padding:.3em 1em .5em .4em}.ui-dialog
.ui-dialog-buttonpane .ui-dialog-buttonset{float:right}.ui-dialog
.ui-dialog-buttonpane button{margin:.5em .4em .5em 0;cursor:pointer}.ui-dialog
.ui-resizable-se{width:12px;height:12px;right:-5px;bottom:-5px;background-position:16px
16px}.ui-draggable
.ui-dialog-titlebar{cursor:move}.ui-menu{list-style:none;padding:0;margin:0;display:block;outline:none}.ui-menu
.ui-menu{position:absolute}.ui-menu
.ui-menu-item{position:relative;margin:0;padding:3px 1em 3px
.4em;cursor:pointer;min-height:0;list-style-image:url("data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7")}.ui-menu
.ui-menu-divider{margin:5px
0;height:0;font-size:0;line-height:0;border-width:1px 0 0 0}.ui-menu
.ui-state-focus,.ui-menu
.ui-state-active{margin:-1px}.ui-menu-icons{position:relative}.ui-menu-icons
.ui-menu-item{padding-left:2em}.ui-menu
.ui-icon{position:absolute;top:0;bottom:0;lef
t:.2em;margin:auto 0}.ui-menu
.ui-menu-icon{left:auto;right:0}.ui-tabs{position:relative;padding:.2em}.ui-tabs
.ui-tabs-nav{margin:0;padding:.2em .2em 0}.ui-tabs .ui-tabs-nav
li{list-style:none;float:left;position:relative;top:0;margin:1px .2em 0
0;border-bottom-width:0;padding:0;white-space:nowrap}.ui-tabs .ui-tabs-nav
.ui-tabs-anchor{float:left;padding:.5em 1em;text-decoration:none}.ui-tabs
.ui-tabs-nav li.ui-tabs-active{margin-bottom:-1px;padding-bottom:1px}.ui-tabs
.ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor,.ui-tabs .ui-tabs-nav
li.ui-state-disabled .ui-tabs-anchor,.ui-tabs .ui-tabs-nav li.ui-tabs-loading
.ui-tabs-anchor{cursor:text}.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active
.ui-tabs-anchor{cursor:pointer}.ui-tabs
.ui-tabs-panel{display:block;border-width:0;padding:1em
1.4em;background:none}.ui-widget{font-family:Lucida Grande,Lucida
Sans,Arial,sans-serif;font-size:1.1em}.ui-widget
.ui-widget{font-size:1em}.ui-widget input,.ui-widget select,.ui-widget
textarea,.ui-w
idget button{font-family:Lucida Grande,Lucida
Sans,Arial,sans-serif;font-size:1em}.ui-widget-content{border:1px solid
#a6c9e2;background:#fcfdfd url("images/ui-bg_inset-hard_100_fcfdfd_1x100.png")
50% bottom repeat-x;color:#222}.ui-widget-content
a{color:#222}.ui-widget-header{border:1px solid #4297d7;background:#5c9ccc
url("images/ui-bg_gloss-wave_55_5c9ccc_500x100.png") 50% 50%
repeat-x;color:#fff;font-weight:bold}.ui-widget-header
a{color:#fff}.ui-state-default,.ui-widget-content
.ui-state-default,.ui-widget-header .ui-state-default{border:1px solid
#c5dbec;background:#dfeffc url("images/ui-bg_glass_85_dfeffc_1x400.png") 50%
50% repeat-x;font-weight:bold;color:#2e6e9e}.ui-state-default
a,.ui-state-default a:link,.ui-state-default
a:visited{color:#2e6e9e;text-decoration:none}.ui-state-hover,.ui-widget-content
.ui-state-hover,.ui-widget-header
.ui-state-hover,.ui-state-focus,.ui-widget-content
.ui-state-focus,.ui-widget-header .ui-state-focus{border:1px solid
#79b7e7;background:#d0
e5f5 url("images/ui-bg_glass_75_d0e5f5_1x400.png") 50% 50%
repeat-x;font-weight:bold;color:#1d5987}.ui-state-hover a,.ui-state-hover
a:hover,.ui-state-hover a:link,.ui-state-hover a:visited,.ui-state-focus
a,.ui-state-focus a:hover,.ui-state-focus a:link,.ui-state-focus
a:visited{color:#1d5987;text-decoration:none}.ui-state-active,.ui-widget-content
.ui-state-active,.ui-widget-header .ui-state-active{border:1px solid
#79b7e7;background:#f5f8f9 url("images/ui-bg_inset-hard_100_f5f8f9_1x100.png")
50% 50% repeat-x;font-weight:bold;color:#e17009}.ui-state-active
a,.ui-state-active a:link,.ui-state-active
a:visited{color:#e17009;text-decoration:none}.ui-state-highlight,.ui-widget-content
.ui-state-highlight,.ui-widget-header .ui-state-highlight{border:1px solid
#fad42e;background:#fbec88 url("images/ui-bg_flat_55_fbec88_40x100.png") 50%
50% repeat-x;color:#363636}.ui-state-highlight a,.ui-widget-content
.ui-state-highlight a,.ui-widget-header .ui-state-highlight
a{color:#363636}.ui-state
-error,.ui-widget-content .ui-state-error,.ui-widget-header
.ui-state-error{border:1px solid #cd0a0a;background:#fef1ec
url("images/ui-bg_glass_95_fef1ec_1x400.png") 50% 50%
repeat-x;color:#cd0a0a}.ui-state-error a,.ui-widget-content .ui-state-error
a,.ui-widget-header .ui-state-error
a{color:#cd0a0a}.ui-state-error-text,.ui-widget-content
.ui-state-error-text,.ui-widget-header
.ui-state-error-text{color:#cd0a0a}.ui-priority-primary,.ui-widget-content
.ui-priority-primary,.ui-widget-header
.ui-priority-primary{font-weight:bold}.ui-priority-secondary,.ui-widget-content
.ui-priority-secondary,.ui-widget-header
.ui-priority-secondary{opacity:.7;filter:Alpha(Opacity=70);font-weight:normal}.ui-state-disabled,.ui-widget-content
.ui-state-disabled,.ui-widget-header
.ui-state-disabled{opacity:.35;filter:Alpha(Opacity=35);background-image:none}.ui-state-disabled
.ui-icon{filter:Alpha(Opacity=35)}.ui-icon{width:16px;height:16px}.ui-icon,.ui-widget-content
.ui-icon{background-image:url("images
/ui-icons_469bdd_256x240.png")}.ui-widget-header
.ui-icon{background-image:url("images/ui-icons_d8e7f3_256x240.png")}.ui-state-default
.ui-icon{background-image:url("images/ui-icons_6da8d5_256x240.png")}.ui-state-hover
.ui-icon,.ui-state-focus
.ui-icon{background-image:url("images/ui-icons_217bc0_256x240.png")}.ui-state-active
.ui-icon{background-image:url("images/ui-icons_f9bd01_256x240.png")}.ui-state-highlight
.ui-icon{background-image:url("images/ui-icons_2e83ff_256x240.png")}.ui-state-error
.ui-icon,.ui-state-error-text
.ui-icon{background-image:url("images/ui-icons_cd0a0a_256x240.png")}.ui-icon-blank{background-position:16px
16px}.ui-icon-carat-1-n{background-position:0
0}.ui-icon-carat-1-ne{background-position:-16px
0}.ui-icon-carat-1-e{background-position:-32px
0}.ui-icon-carat-1-se{background-position:-48px
0}.ui-icon-carat-1-s{background-position:-64px
0}.ui-icon-carat-1-sw{background-position:-80px
0}.ui-icon-carat-1-w{background-position:-96px 0}.ui-icon-carat-1-nw{backg
round-position:-112px 0}.ui-icon-carat-2-n-s{background-position:-128px
0}.ui-icon-carat-2-e-w{background-position:-144px
0}.ui-icon-triangle-1-n{background-position:0
-16px}.ui-icon-triangle-1-ne{background-position:-16px
-16px}.ui-icon-triangle-1-e{background-position:-32px
-16px}.ui-icon-triangle-1-se{background-position:-48px
-16px}.ui-icon-triangle-1-s{background-position:-64px
-16px}.ui-icon-triangle-1-sw{background-position:-80px
-16px}.ui-icon-triangle-1-w{background-position:-96px
-16px}.ui-icon-triangle-1-nw{background-position:-112px
-16px}.ui-icon-triangle-2-n-s{background-position:-128px
-16px}.ui-icon-triangle-2-e-w{background-position:-144px
-16px}.ui-icon-arrow-1-n{background-position:0
-32px}.ui-icon-arrow-1-ne{background-position:-16px
-32px}.ui-icon-arrow-1-e{background-position:-32px
-32px}.ui-icon-arrow-1-se{background-position:-48px
-32px}.ui-icon-arrow-1-s{background-position:-64px
-32px}.ui-icon-arrow-1-sw{background-position:-80px -32px}.ui-icon-arrow-1-w{ba
ckground-position:-96px -32px}.ui-icon-arrow-1-nw{background-position:-112px
-32px}.ui-icon-arrow-2-n-s{background-position:-128px
-32px}.ui-icon-arrow-2-ne-sw{background-position:-144px
-32px}.ui-icon-arrow-2-e-w{background-position:-160px
-32px}.ui-icon-arrow-2-se-nw{background-position:-176px
-32px}.ui-icon-arrowstop-1-n{background-position:-192px
-32px}.ui-icon-arrowstop-1-e{background-position:-208px
-32px}.ui-icon-arrowstop-1-s{background-position:-224px
-32px}.ui-icon-arrowstop-1-w{background-position:-240px
-32px}.ui-icon-arrowthick-1-n{background-position:0
-48px}.ui-icon-arrowthick-1-ne{background-position:-16px
-48px}.ui-icon-arrowthick-1-e{background-position:-32px
-48px}.ui-icon-arrowthick-1-se{background-position:-48px
-48px}.ui-icon-arrowthick-1-s{background-position:-64px
-48px}.ui-icon-arrowthick-1-sw{background-position:-80px
-48px}.ui-icon-arrowthick-1-w{background-position:-96px
-48px}.ui-icon-arrowthick-1-nw{background-position:-112px
-48px}.ui-icon-arrowthick-2
-n-s{background-position:-128px
-48px}.ui-icon-arrowthick-2-ne-sw{background-position:-144px
-48px}.ui-icon-arrowthick-2-e-w{background-position:-160px
-48px}.ui-icon-arrowthick-2-se-nw{background-position:-176px
-48px}.ui-icon-arrowthickstop-1-n{background-position:-192px
-48px}.ui-icon-arrowthickstop-1-e{background-position:-208px
-48px}.ui-icon-arrowthickstop-1-s{background-position:-224px
-48px}.ui-icon-arrowthickstop-1-w{background-position:-240px
-48px}.ui-icon-arrowreturnthick-1-w{background-position:0
-64px}.ui-icon-arrowreturnthick-1-n{background-position:-16px
-64px}.ui-icon-arrowreturnthick-1-e{background-position:-32px
-64px}.ui-icon-arrowreturnthick-1-s{background-position:-48px
-64px}.ui-icon-arrowreturn-1-w{background-position:-64px
-64px}.ui-icon-arrowreturn-1-n{background-position:-80px
-64px}.ui-icon-arrowreturn-1-e{background-position:-96px
-64px}.ui-icon-arrowreturn-1-s{background-position:-112px
-64px}.ui-icon-arrowrefresh-1-w{background-position:-128px -64px}.u
i-icon-arrowrefresh-1-n{background-position:-144px
-64px}.ui-icon-arrowrefresh-1-e{background-position:-160px
-64px}.ui-icon-arrowrefresh-1-s{background-position:-176px
-64px}.ui-icon-arrow-4{background-position:0
-80px}.ui-icon-arrow-4-diag{background-position:-16px
-80px}.ui-icon-extlink{background-position:-32px
-80px}.ui-icon-newwin{background-position:-48px
-80px}.ui-icon-refresh{background-position:-64px
-80px}.ui-icon-shuffle{background-position:-80px
-80px}.ui-icon-transfer-e-w{background-position:-96px
-80px}.ui-icon-transferthick-e-w{background-position:-112px
-80px}.ui-icon-folder-collapsed{background-position:0
-96px}.ui-icon-folder-open{background-position:-16px
-96px}.ui-icon-document{background-position:-32px
-96px}.ui-icon-document-b{background-position:-48px
-96px}.ui-icon-note{background-position:-64px
-96px}.ui-icon-mail-closed{background-position:-80px
-96px}.ui-icon-mail-open{background-position:-96px
-96px}.ui-icon-suitcase{background-position:-112px -96px}.ui-
icon-comment{background-position:-128px
-96px}.ui-icon-person{background-position:-144px
-96px}.ui-icon-print{background-position:-160px
-96px}.ui-icon-trash{background-position:-176px
-96px}.ui-icon-locked{background-position:-192px
-96px}.ui-icon-unlocked{background-position:-208px
-96px}.ui-icon-bookmark{background-position:-224px
-96px}.ui-icon-tag{background-position:-240px
-96px}.ui-icon-home{background-position:0
-112px}.ui-icon-flag{background-position:-16px
-112px}.ui-icon-calendar{background-position:-32px
-112px}.ui-icon-cart{background-position:-48px
-112px}.ui-icon-pencil{background-position:-64px
-112px}.ui-icon-clock{background-position:-80px
-112px}.ui-icon-disk{background-position:-96px
-112px}.ui-icon-calculator{background-position:-112px
-112px}.ui-icon-zoomin{background-position:-128px
-112px}.ui-icon-zoomout{background-position:-144px
-112px}.ui-icon-search{background-position:-160px
-112px}.ui-icon-wrench{background-position:-176px -112px}.ui-icon-gear{backgrou
nd-position:-192px -112px}.ui-icon-heart{background-position:-208px
-112px}.ui-icon-star{background-position:-224px
-112px}.ui-icon-link{background-position:-240px
-112px}.ui-icon-cancel{background-position:0
-128px}.ui-icon-plus{background-position:-16px
-128px}.ui-icon-plusthick{background-position:-32px
-128px}.ui-icon-minus{background-position:-48px
-128px}.ui-icon-minusthick{background-position:-64px
-128px}.ui-icon-close{background-position:-80px
-128px}.ui-icon-closethick{background-position:-96px
-128px}.ui-icon-key{background-position:-112px
-128px}.ui-icon-lightbulb{background-position:-128px
-128px}.ui-icon-scissors{background-position:-144px
-128px}.ui-icon-clipboard{background-position:-160px
-128px}.ui-icon-copy{background-position:-176px
-128px}.ui-icon-contact{background-position:-192px
-128px}.ui-icon-image{background-position:-208px
-128px}.ui-icon-video{background-position:-224px
-128px}.ui-icon-script{background-position:-240px
-128px}.ui-icon-alert{background-po
sition:0 -144px}.ui-icon-info{background-position:-16px
-144px}.ui-icon-notice{background-position:-32px
-144px}.ui-icon-help{background-position:-48px
-144px}.ui-icon-check{background-position:-64px
-144px}.ui-icon-bullet{background-position:-80px
-144px}.ui-icon-radio-on{background-position:-96px
-144px}.ui-icon-radio-off{background-position:-112px
-144px}.ui-icon-pin-w{background-position:-128px
-144px}.ui-icon-pin-s{background-position:-144px
-144px}.ui-icon-play{background-position:0
-160px}.ui-icon-pause{background-position:-16px
-160px}.ui-icon-seek-next{background-position:-32px
-160px}.ui-icon-seek-prev{background-position:-48px
-160px}.ui-icon-seek-end{background-position:-64px
-160px}.ui-icon-seek-start{background-position:-80px
-160px}.ui-icon-seek-first{background-position:-80px
-160px}.ui-icon-stop{background-position:-96px
-160px}.ui-icon-eject{background-position:-112px
-160px}.ui-icon-volume-off{background-position:-128px
-160px}.ui-icon-volume-on{background-positio
n:-144px -160px}.ui-icon-power{background-position:0
-176px}.ui-icon-signal-diag{background-position:-16px
-176px}.ui-icon-signal{background-position:-32px
-176px}.ui-icon-battery-0{background-position:-48px
-176px}.ui-icon-battery-1{background-position:-64px
-176px}.ui-icon-battery-2{background-position:-80px
-176px}.ui-icon-battery-3{background-position:-96px
-176px}.ui-icon-circle-plus{background-position:0
-192px}.ui-icon-circle-minus{background-position:-16px
-192px}.ui-icon-circle-close{background-position:-32px
-192px}.ui-icon-circle-triangle-e{background-position:-48px
-192px}.ui-icon-circle-triangle-s{background-position:-64px
-192px}.ui-icon-circle-triangle-w{background-position:-80px
-192px}.ui-icon-circle-triangle-n{background-position:-96px
-192px}.ui-icon-circle-arrow-e{background-position:-112px
-192px}.ui-icon-circle-arrow-s{background-position:-128px
-192px}.ui-icon-circle-arrow-w{background-position:-144px
-192px}.ui-icon-circle-arrow-n{background-position:-160px -
192px}.ui-icon-circle-zoomin{background-position:-176px
-192px}.ui-icon-circle-zoomout{background-position:-192px
-192px}.ui-icon-circle-check{background-position:-208px
-192px}.ui-icon-circlesmall-plus{background-position:0
-208px}.ui-icon-circlesmall-minus{background-position:-16px
-208px}.ui-icon-circlesmall-close{background-position:-32px
-208px}.ui-icon-squaresmall-plus{background-position:-48px
-208px}.ui-icon-squaresmall-minus{background-position:-64px
-208px}.ui-icon-squaresmall-close{background-position:-80px
-208px}.ui-icon-grip-dotted-vertical{background-position:0
-224px}.ui-icon-grip-dotted-horizontal{background-position:-16px
-224px}.ui-icon-grip-solid-vertical{background-position:-32px
-224px}.ui-icon-grip-solid-horizontal{background-position:-48px
-224px}.ui-icon-gripsmall-diagonal-se{background-position:-64px
-224px}.ui-icon-grip-diagonal-se{background-position:-80px
-224px}.ui-corner-all,.ui-corner-top,.ui-corner-left,.ui-corner-tl{border-top-left-radius:5px}.ui-co
rner-all,.ui-corner-top,.ui-corner-right,.ui-corner-tr{border-top-right-radius:5px}.ui-corner-all,.ui-corner-bottom,.ui-corner-left,.ui-corner-bl{border-bottom-left-radius:5px}.ui-corner-all,.ui-corner-bottom,.ui-corner-right,.ui-corner-br{border-bottom-right-radius:5px}.ui-widget-overlay{background:#aaa
url("images/ui-bg_flat_0_aaaaaa_40x100.png") 50% 50%
repeat-x;opacity:.3;filter:Alpha(Opacity=30)}.ui-widget-shadow{margin:-8px 0 0
-8px;padding:8px;background:#aaa url("images/ui-bg_flat_0_aaaaaa_40x100.png")
50% 50% repeat-x;opacity:.3;filter:Alpha(Opacity=30);border-radius:8px}
\ No newline at end of file
