Author: enorman Date: Fri Mar 25 04:18:18 2011 New Revision: 1085250 URL: http://svn.apache.org/viewvc?rev=1085250&view=rev Log: SLING-1756 [explorer] should use spaces instead of tabs
Modified: sling/trunk/bundles/extensions/explorer/src/main/resources/libs/sling/explorer/css/explorer.css sling/trunk/bundles/extensions/explorer/src/main/resources/libs/sling/explorer/css/jquery-ui.css sling/trunk/bundles/extensions/explorer/src/main/resources/libs/sling/explorer/js/explorer.js sling/trunk/bundles/extensions/explorer/src/main/resources/libs/sling/explorer/js/ui.datetimebox.js sling/trunk/bundles/extensions/explorer/src/main/resources/libs/sling/servlet/default/explorer/edit.esp sling/trunk/bundles/extensions/explorer/src/main/resources/libs/sling/servlet/default/explorer/edit/sling_redirect.esp sling/trunk/bundles/extensions/explorer/src/main/resources/libs/sling/servlet/default/explorer/explorer.esp sling/trunk/bundles/extensions/explorer/src/main/resources/libs/sling/servlet/default/explorer/item.esp sling/trunk/bundles/extensions/explorer/src/main/resources/libs/sling/servlet/default/explorer/node.esp sling/trunk/bundles/extensions/explorer/src/main/resources/libs/sling/servlet/default/explorer/search.esp Modified: sling/trunk/bundles/extensions/explorer/src/main/resources/libs/sling/explorer/css/explorer.css URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/explorer/src/main/resources/libs/sling/explorer/css/explorer.css?rev=1085250&r1=1085249&r2=1085250&view=diff ============================================================================== --- sling/trunk/bundles/extensions/explorer/src/main/resources/libs/sling/explorer/css/explorer.css (original) +++ sling/trunk/bundles/extensions/explorer/src/main/resources/libs/sling/explorer/css/explorer.css Fri Mar 25 04:18:18 2011 @@ -22,7 +22,7 @@ /* ################################################################# */ /* --- Main-Seperator --- */ /* ################################################################# */ - + /* ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: */ /* --- Sub-Seperator ---*/ /* ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: */ @@ -31,9 +31,9 @@ * { - margin: 0; - padding: 0; - border: none; + margin: 0; + padding: 0; + border: none; } html, body @@ -42,18 +42,18 @@ html, body html /* shows always scrollbar in Firefox*/ { - overflow: visible; -} - + overflow: visible; +} + body { - font-size: 13px; - color: #545D66; - margin: 0; - padding: 0; - text-align: center; - font-family: Verdana, Arial, Helvetica, sans-serif; - overflow: hidden; + font-size: 13px; + color: #545D66; + margin: 0; + padding: 0; + text-align: center; + font-family: Verdana, Arial, Helvetica, sans-serif; + overflow: hidden; } /* ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: */ @@ -62,60 +62,60 @@ body h1, h2, h3, h4, h5, h6 { - font-family: Arial, Helvetica, sans-serif; - color: #485573; - margin: 0 0 20px 0; - padding: 0px; + font-family: Arial, Helvetica, sans-serif; + color: #485573; + margin: 0 0 20px 0; + padding: 0px; } - + h1 { - font-size: 22px; - line-height: /**/; + font-size: 22px; + line-height: /**/; } h2 { - font-size: 18px; - line-height: /**/; + font-size: 18px; + line-height: /**/; } h3 { - font-size: 14px; - background-color: #527EA3; - color: #F6FBFE; - padding: 5px 10px; - -moz-border-radius: 5px; - border-radius: 5px; - margin: 0 0 10px 0; + font-size: 14px; + background-color: #527EA3; + color: #F6FBFE; + padding: 5px 10px; + -moz-border-radius: 5px; + border-radius: 5px; + margin: 0 0 10px 0; } h4, h5, h6 { - font-size: 12px; - background-color: #a4bcd0; - color: #FFFFFF; - padding: 5px 10px; - -moz-border-radius: 5px; - border-radius: 5px; - margin: 0 0 10px 0; + font-size: 12px; + background-color: #a4bcd0; + color: #FFFFFF; + padding: 5px 10px; + -moz-border-radius: 5px; + border-radius: 5px; + margin: 0 0 10px 0; } b, strong, b *, strong * { - font-weight: bold; + font-weight: bold; } i, em, i *, em * { - font-style: italic; + font-style: italic; } ul, ol { - clear: both; -/* margin: 10px 0 10px 35px; */ + clear: both; +/* margin: 10px 0 10px 35px; */ } ul @@ -128,101 +128,101 @@ ol li { - margin: 5px 0; + margin: 5px 0; } p { - line-height: 18px; - margin: 0 0 10px 0; + line-height: 18px; + margin: 0 0 10px 0; } div.hr { - clear: both; - height: 1px; + clear: both; + height: 1px; } hr { - height: 1px; - color: #333333; - background-color: inherit; + height: 1px; + color: #333333; + background-color: inherit; } a, a:visited { - color: #527EA3; - text-decoration: underline; + color: #527EA3; + text-decoration: underline; } a:hover { - color: #ABC8E2; - text-decoration: underline; + color: #ABC8E2; + text-decoration: underline; } a:focus, input:focus, button:focus, :focus { - outline: none; + outline: none; } button, .button { - background-color: #eff4f9; - border: 1px solid #354F66; - padding: 2px 5px; - font-size: 10px; - color: #354F66; - font-weight: bold; - width: auto!important; - -moz-border-radius: 10px; - border-radius: 10px; + background-color: #eff4f9; + border: 1px solid #354F66; + padding: 2px 5px; + font-size: 10px; + color: #354F66; + font-weight: bold; + width: auto!important; + -moz-border-radius: 10px; + border-radius: 10px; } input.button { - padding: 1px 3px; + padding: 1px 3px; } a.button { - color: #354F66; - text-decoration: none; + color: #354F66; + text-decoration: none; } button:hover, .button:hover { - color: #354F66; - background-color: #BDD2E5; - border: 2px solid #354F66; - padding: 1px 4px; - cursor: pointer; + color: #354F66; + background-color: #BDD2E5; + border: 2px solid #354F66; + padding: 1px 4px; + cursor: pointer; } input.button:hover { - padding: 0px 2px; + padding: 0px 2px; } img, a img { - border: none; + border: none; } /* <div class="clear"></div> or <br class="clear" /> in <p></p> */ .clear { - clear:both; + clear:both; height:0; font-size: 1px; line-height: 0px; - overflow: hidden; - white-space: nowrap; - margin: 0; - padding: 0; + overflow: hidden; + white-space: nowrap; + margin: 0; + padding: 0; } /* ################################################################# */ @@ -231,40 +231,40 @@ img, a img table { - font-size: inherit; - color: inherit; - border-collapse: collapse; - border-spacing: /**/; + font-size: inherit; + color: inherit; + border-collapse: collapse; + border-spacing: /**/; } - + table caption, table tr, table th, table td { - text-align: left; - font-weight: normal; + text-align: left; + font-weight: normal; } table td { - padding: /**/; + padding: /**/; } - + td.colLabel { - width: /**/; + width: /**/; } td.colInput { - width: /**/; + width: /**/; } td.colspan2 { - width: /* FULL CONTENT WIDTH */; + width: /* FULL CONTENT WIDTH */; } /* ################################################################# */ @@ -274,35 +274,35 @@ td.colspan2 form { } - + fieldset { - border: none; - margin: 0; - padding: 0; + border: none; + margin: 0; + padding: 0; } form fieldset p { - clear: both; - padding-bottom: 15px; + clear: both; + padding-bottom: 15px; } .required { - margin-left: /* width von label*/; + margin-left: /* width von label*/; } .submit { - margin: 0; + margin: 0; } - + label { - width: 25%; - float: left; - display: inline; + width: 25%; + float: left; + display: inline; } @@ -312,84 +312,84 @@ label input, select, textarea { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 13px; - color: #32373C; - background-color: #FFFFFF; - padding: 2px 4px; - line-height: 16px; - border: 1px solid #354F66; - overflow: visible; /* Fix for IE */ + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 13px; + color: #32373C; + background-color: #FFFFFF; + padding: 2px 4px; + line-height: 16px; + border: 1px solid #354F66; + overflow: visible; /* Fix for IE */ } input:focus, select:focus, textarea:focus { - border: 1px solid #527EA3; - background-color: #e6f2fd; + border: 1px solid #527EA3; + background-color: #e6f2fd; } input[type=hidden], input.hidden -{ - float: left; - display: inline; - border: none; - background-color: transparent; - height: 12px; - width: 12px; - padding: 0; - position: absolute; - top: -100px; +{ + float: left; + display: inline; + border: none; + background-color: transparent; + height: 12px; + width: 12px; + padding: 0; + position: absolute; + top: -100px; } input[type=disabled], input.disabled, select[type=disabled], select.disabled, .protected { - background-color: #CCCCCC; + background-color: #CCCCCC; } input.text { - float: left; - display: inline; - width: 65%; - margin: 0 5px 0 5%; + float: left; + display: inline; + width: 65%; + margin: 0 5px 0 5%; } input.checkbox, input.radio, input[type=checkbox], input[type=radio] { - float: none; - border: none; - background-color: transparent; - height: 16px!important; - width: 16px!important; - padding: 0; - margin: 2px 2px 2px 5%!important; + float: none; + border: none; + background-color: transparent; + height: 16px!important; + width: 16px!important; + padding: 0; + margin: 2px 2px 2px 5%!important; } #newsletter input.checkbox { - position: relative; + position: relative; } input.radio { } -input.checkbox +input.checkbox { } select { - float: left; - display: inline; - width: 65%; - margin: 0 5px 0 5%; - padding: 1px 2px; + float: left; + display: inline; + width: 65%; + margin: 0 5px 0 5%; + padding: 1px 2px; } textarea { - height: 100px; + height: 100px; width: 408px; } @@ -405,51 +405,51 @@ textarea #login-dialog { - background-color: #f6fbfe; - border-bottom: 2px solid #bdd2e5; + background-color: #f6fbfe; + border-bottom: 2px solid #bdd2e5; } #menu_login { - text-align: center; + text-align: center; } #show_login_dialog { - float: right; - display: block; - margin: -2px 12px 0 auto; - background: url(../img/login_bg.png); - background-repeat: no-repeat; - background-position: 0 -27px; - height: 19px; - width: 70px; - padding: 6px 10px 0 0; - font-size: 10px; - text-decoration: none; + float: right; + display: block; + margin: -2px 12px 0 auto; + background: url(../img/login_bg.png); + background-repeat: no-repeat; + background-position: 0 -27px; + height: 19px; + width: 70px; + padding: 6px 10px 0 0; + font-size: 10px; + text-decoration: none; } #show_login_dialog.login_open { - background-position: 0 0; + background-position: 0 0; } form#login-form { - padding: 20px; + padding: 20px; } form#login-form fieldset label { - width: auto; - float: none; - display: inline; + width: auto; + float: none; + display: inline; } form#login-form fieldset p { - padding-bottom: 0px; - margin: 0; + padding-bottom: 0px; + margin: 0; } @@ -459,15 +459,15 @@ form#login-form fieldset p #menu_logout { - float: right; - display: inline; - margin: 10px 20px; - font-size: 11px; - background-color: #f6fbfe; - border: 1px solid #bdd2e5; - -moz-border-radius: 5px; - border-radius: 5px; - padding: 5px 7px; + float: right; + display: inline; + margin: 10px 20px; + font-size: 11px; + background-color: #f6fbfe; + border: 1px solid #bdd2e5; + -moz-border-radius: 5px; + border-radius: 5px; + padding: 5px 7px; } @@ -477,70 +477,70 @@ form#login-form fieldset p #query_container { - clear: both; - margin: 20px; - border: 1px solid #527EA3; - -moz-border-radius: 5px; - border-radius: 5px; - background-color: #F6FBFE; + clear: both; + margin: 20px; + border: 1px solid #527EA3; + -moz-border-radius: 5px; + border-radius: 5px; + background-color: #F6FBFE; } #expl_search { - margin: 10px; + margin: 10px; } #expl_search form { - height: 90px; + height: 90px; } #show_query_dialog { - background-color: transparent; - line-height: normal; - border: none; - float: left; - display: inline; - overflow: visible; /* Fix for IE */ + background-color: transparent; + line-height: normal; + border: none; + float: left; + display: inline; + overflow: visible; /* Fix for IE */ } .foundQueries { - float: left; - display: inline; - margin: 8px 0 0 50px; - font-size: 10px; + float: left; + display: inline; + margin: 8px 0 0 50px; + font-size: 10px; } button#show_query_dialog { - font-weight: normal; - text-decoration: underline; - width: 80px; - height: 25px; - margin: 0px 0px 0px 5px; - padding: 0px 0px 1px 18px; - background: url(../img/query_bg.png); - background-repeat: no-repeat; - background-color: #F6FBFE; - background-position: 8px -24px; - height: 25px; - width: 100%; - display: block; - font-size: 13px; - text-decoration: none; - text-align: left; + font-weight: normal; + text-decoration: underline; + width: 80px; + height: 25px; + margin: 0px 0px 0px 5px; + padding: 0px 0px 1px 18px; + background: url(../img/query_bg.png); + background-repeat: no-repeat; + background-color: #F6FBFE; + background-position: 8px -24px; + height: 25px; + width: 100%; + display: block; + font-size: 13px; + text-decoration: none; + text-align: left; } button#show_query_dialog.query_open { - background-position: 8px 1px; + background-position: 8px 1px; } #sql_search_result h4 { - margin-left: -40px; + margin-left: -40px; } @@ -550,13 +550,13 @@ button#show_query_dialog.query_open #page_navigation { - margin: 20px 0; - font-size: 10px; + margin: 20px 0; + font-size: 10px; } #page_navigation a { - margin-right: 5px; + margin-right: 5px; } @@ -567,16 +567,16 @@ button#show_query_dialog.query_open #expl_logo { - margin: 10px 20px; - float: left; - display: inline; + margin: 10px 20px; + float: left; + display: inline; } #expl_container { - text-align: left; - margin: 0 auto; - width: auto; + text-align: left; + margin: 0 auto; + width: auto; } #expl_header @@ -585,47 +585,47 @@ button#show_query_dialog.query_open #expl_content_container { - margin: 0 20px; + margin: 0 20px; } #expl_sidebar { - border: 1px solid #527EA3; - -moz-border-radius: 5px; - border-radius: 5px; - width: 30%; - float: left; - display: inline; - padding-bottom: 20px; - background-color: #F6FBFE; - overflow: auto; + border: 1px solid #527EA3; + -moz-border-radius: 5px; + border-radius: 5px; + width: 30%; + float: left; + display: inline; + padding-bottom: 20px; + background-color: #F6FBFE; + overflow: auto; } #expl_content { - margin: 0 0 0 10px; - float: left; - display: inline; - width: 65%; - border: 1px solid #527EA3; - -moz-border-radius: 5px; - border-radius: 5px; - padding: 20px; - background-color: #F6FBFE; - overflow: auto; + margin: 0 0 0 10px; + float: left; + display: inline; + width: 65%; + border: 1px solid #527EA3; + -moz-border-radius: 5px; + border-radius: 5px; + padding: 20px; + background-color: #F6FBFE; + overflow: auto; } #expl_footer { - height: 20px; - margin: 20px; - clear: both; - font-size: 11px; + height: 20px; + margin: 20px; + clear: both; + font-size: 11px; } #expl_footer p { - margin: 0; + margin: 0; } /* ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: */ @@ -634,96 +634,96 @@ button#show_query_dialog.query_open #expl_sidebar li p { - cursor: pointer; + cursor: pointer; } #expl_sidebar ul, #expl_sidebar li { - list-style: none; - margin: 0; - padding: 0; + list-style: none; + margin: 0; + padding: 0; } #expl_sidebar ul { - padding-left: 1em; + padding-left: 1em; } #expl_sidebar li { - padding-left: 10px; - border: 1px dotted #354F66; - border-width: 0 0 1px 1px; + padding-left: 10px; + border: 1px dotted #354F66; + border-width: 0 0 1px 1px; } #expl_sidebar li.branch { - border-bottom: none; + border-bottom: none; } #expl_sidebar li.empty { - font-style: italic; - color: silver; - border-color: silver; + font-style: italic; + color: silver; + border-color: silver; } #expl_sidebar li p { - margin: 0; - padding: 0 10px 0 0; - position: relative; - top: 12px; - background-color: #F6FBFE; + margin: 0; + padding: 0 10px 0 0; + position: relative; + top: 12px; + background-color: #F6FBFE; } #expl_sidebar li p a { - color: #545D66; - display: block; - padding: 2px 5px; - text-decoration: none; - border: 1px solid #F6FBFE; - -moz-border-radius: 5px; - border-radius: 5px; + color: #545D66; + display: block; + padding: 2px 5px; + text-decoration: none; + border: 1px solid #F6FBFE; + -moz-border-radius: 5px; + border-radius: 5px; } #expl_sidebar li p a:hover { - color: #545D66; - border: 1px solid #BDD2E5; + color: #545D66; + border: 1px solid #BDD2E5; } #expl_sidebar li p.selected { - margin: 0; - position: relative; - top: 12px; + margin: 0; + position: relative; + top: 12px; } #expl_sidebar li p.selected a { - display: block; - padding: 2px 5px; - text-decoration: none; - border: 1px solid #354F66; - -moz-border-radius: 5px; - border-radius: 5px; - background-color: #527EA3; - color: #FFFFFF; + display: block; + padding: 2px 5px; + text-decoration: none; + border: 1px solid #354F66; + -moz-border-radius: 5px; + border-radius: 5px; + background-color: #527EA3; + color: #FFFFFF; } #expl_sidebar li p.selected a:hover { - color: #FFFFFF; - background-color: #83a3be; + color: #FFFFFF; + background-color: #83a3be; } #expl_sidebar li ul { - border-top: 1px dotted black; - margin-left: -10px; - padding-left: 18px; + border-top: 1px dotted black; + margin-left: -10px; + padding-left: 18px; } /* ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: */ @@ -732,8 +732,8 @@ button#show_query_dialog.query_open .smallLabel { - color: #545D66; - font-size: 11px; + color: #545D66; + font-size: 11px; } @@ -748,15 +748,15 @@ button#show_query_dialog.query_open #expl_content_header h2 { - float: left; - display: inline; + float: left; + display: inline; } #expl_content_header form.deleteNote { - float: right; - display: inline; + float: right; + display: inline; } @@ -766,8 +766,8 @@ button#show_query_dialog.query_open .edit_properties_container { - margin: 10px 0 0 0; - padding: 10px 0; + margin: 10px 0 0 0; + padding: 10px 0; } .add_property @@ -776,23 +776,23 @@ button#show_query_dialog.query_open .property_element { - padding: 10px; - border: 1px solid #BDD2E5; - -moz-border-radius: 5px; - border-radius: 5px; - margin: 0 0 10px 0; + padding: 10px; + border: 1px solid #BDD2E5; + -moz-border-radius: 5px; + border-radius: 5px; + margin: 0 0 10px 0; } .edit_properties { - margin: 20px 0 0 30%; + margin: 20px 0 0 30%; } .saveAs { - float: left; - display: inline; - margin-left: 5%; + float: left; + display: inline; + margin-left: 5%; } @@ -802,50 +802,50 @@ button#show_query_dialog.query_open .multivalued ul { - width: 66%; - float: left; - display: inline; - margin-left: 5%; - clear: none; - padding: 0 0 0 15px; + width: 66%; + float: left; + display: inline; + margin-left: 5%; + clear: none; + padding: 0 0 0 15px; } .addMultivalueproperty { - clear: both; - margin: 0 0 0 30%; + clear: both; + margin: 0 0 0 30%; } .addMultivalueproperty input, .addMultivalueproperty select { - width: 88%; - margin-left: 0; + width: 88%; + margin-left: 0; } .addMultivalueproperty a.button { - float: left; - display: inline; - margin-top: 2px; + float: left; + display: inline; + margin-top: 2px; } .multivalued ul li { - padding: 3px 5px 5px 5px; + padding: 3px 5px 5px 5px; } .multivalued ul li a.button { - float: right; - display: inline; + float: right; + display: inline; } .multivalued ul li:hover { - -moz-border-radius: 5px; - border-radius: 5px; - background-color: #BDD2E5; + -moz-border-radius: 5px; + border-radius: 5px; + background-color: #BDD2E5; } @@ -855,21 +855,21 @@ button#show_query_dialog.query_open table.propoerty_table { - border-collapse: separate; - border-spacing: 0; - table-layout: fixed; - width: 100%; + border-collapse: separate; + border-spacing: 0; + table-layout: fixed; + width: 100%; } table.propoerty_table td { - text-align: left; - vertical-align: top; + text-align: left; + vertical-align: top; } table.propoerty_table td input, table.propoerty_table td select { - margin: 0; - width: 90%; + margin: 0; + width: 90%; } \ No newline at end of file Modified: sling/trunk/bundles/extensions/explorer/src/main/resources/libs/sling/explorer/css/jquery-ui.css URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/explorer/src/main/resources/libs/sling/explorer/css/jquery-ui.css?rev=1085250&r1=1085249&r2=1085250&view=diff ============================================================================== --- sling/trunk/bundles/extensions/explorer/src/main/resources/libs/sling/explorer/css/jquery-ui.css (original) +++ sling/trunk/bundles/extensions/explorer/src/main/resources/libs/sling/explorer/css/jquery-ui.css Fri Mar 25 04:18:18 2011 @@ -66,7 +66,7 @@ * * http://docs.jquery.com/UI/Autocomplete#theming */ -.ui-autocomplete { position: absolute; cursor: default; } +.ui-autocomplete { position: absolute; cursor: default; } /* workarounds */ * html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */ @@ -81,34 +81,34 @@ * http://docs.jquery.com/UI/Menu#theming */ .ui-menu { - list-style:none; - padding: 2px; - margin: 0; - display:block; - float: left; + list-style:none; + padding: 2px; + margin: 0; + display:block; + float: left; } .ui-menu .ui-menu { - margin-top: -3px; + margin-top: -3px; } .ui-menu .ui-menu-item { - margin:0; - padding: 0; - zoom: 1; - float: left; - clear: left; - width: 100%; + margin:0; + padding: 0; + zoom: 1; + float: left; + clear: left; + width: 100%; } .ui-menu .ui-menu-item a { - text-decoration:none; - display:block; - padding:.2em .4em; - line-height:1.5; - zoom:1; + text-decoration:none; + display:block; + padding:.2em .4em; + line-height:1.5; + zoom:1; } .ui-menu .ui-menu-item a.ui-state-hover, .ui-menu .ui-menu-item a.ui-state-active { - font-weight: normal; - margin: -1px; + font-weight: normal; + margin: -1px; } /* * jQuery UI Button @VERSION Modified: sling/trunk/bundles/extensions/explorer/src/main/resources/libs/sling/explorer/js/explorer.js URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/explorer/src/main/resources/libs/sling/explorer/js/explorer.js?rev=1085250&r1=1085249&r2=1085250&view=diff ============================================================================== --- sling/trunk/bundles/extensions/explorer/src/main/resources/libs/sling/explorer/js/explorer.js (original) +++ sling/trunk/bundles/extensions/explorer/src/main/resources/libs/sling/explorer/js/explorer.js Fri Mar 25 04:18:18 2011 @@ -19,9 +19,9 @@ /** replace the default get and post jQuery utility functions */ (function($) { - $.ajaxSetup({ - timeout: 5 * 60 * 1000 // in ms, 5 minutes - }); + $.ajaxSetup({ + timeout: 5 * 60 * 1000 // in ms, 5 minutes + }); $.getRaw = $.get; $.getJSONRaw = $.getJSON; $.postRaw = $.post; @@ -43,40 +43,40 @@ init_load = function(path) { load_branch(path, function() { load_props(path); } ); // load properties return; - // load root node - $.get("/.explorer.item.html", function( data, textStatus, XMLHttpRequest ) { - $('#_').append( data ); - }); + // load root node + $.get("/.explorer.item.html", function( data, textStatus, XMLHttpRequest ) { + $('#_').append( data ); + }); $.ajax({ - url: path, - type: 'GET', - // data: params, - success: function( data, textStatus, xmlHttpRequest ) { - try - { - // load others - var paths = path.split("/"); - paths.splice(0, 1); // remove first slash - var rPath = ""; - for (p in paths) { - rPath += paths[p]; - load_branch(rPath); - rPath += "/"; - } - - // load properties - load_props( path ); - } - catch(e) - { - show_error( e ); - } - }, - error: function( xmlHttpRequest, textStatus, errorThrown ) { - show_error( "(" + textStatus + ")" + xmlHttpRequest.responseText ); - } - }); + url: path, + type: 'GET', + // data: params, + success: function( data, textStatus, xmlHttpRequest ) { + try + { + // load others + var paths = path.split("/"); + paths.splice(0, 1); // remove first slash + var rPath = ""; + for (p in paths) { + rPath += paths[p]; + load_branch(rPath); + rPath += "/"; + } + + // load properties + load_props( path ); + } + catch(e) + { + show_error( e ); + } + }, + error: function( xmlHttpRequest, textStatus, errorThrown ) { + show_error( "(" + textStatus + ")" + xmlHttpRequest.responseText ); + } + }); } /** toggle a node in the menu */ @@ -103,7 +103,7 @@ explorer_toggle = function( path ) { $('p#'+id).parent().removeClass('branch'); // remove css class load_props( path ); } else { - // just reload properties + // just reload properties load_branch(path, function(){ load_props( path ); }); } } @@ -114,63 +114,63 @@ var lastloaded = null; /** load branch/subtree **/ load_branch = function( path, callback, reload ) { - if ( loadingbranch ) { - alert("busy..."); - return; - } - if ( path != '' ) - { - loadingbranch = true; - var id = path_2_id( path ); - $('p#' + id + ">a").removeAttr('href'); // remove onclick - - var uri = path + ".explorer.item.html"; - if (uri[0] != '/') - { - uri = '/' + uri; - }; + if ( loadingbranch ) { + alert("busy..."); + return; + } + if ( path != '' ) + { + loadingbranch = true; + var id = path_2_id( path ); + $('p#' + id + ">a").removeAttr('href'); // remove onclick + + var uri = path + ".explorer.item.html"; + if (uri[0] != '/') + { + uri = '/' + uri; + }; // fetch children/subnodes $.ajax({ url: uri, type: 'GET', success: function( data, textStatus, xmlHttpRequest ) { - try - { - if ( data.length > 0 ) { - $('p#' + id).parent().addClass('branch'); // add css class - if ( reload ) - { - $('ul', $('p#' + id).parent()).remove(); - } - $('p#' + id).after( data ); // add data - $('p#' + id + ">a").attr('href', "#"); // reactivate onclick - $('p#' + id + ">a").addClass('open'); // open - $('p#' + id).addClass('loaded'); - lastloaded = path; - if ( callback ) { - loadingbranch = false; - callback() - }; - } - } - catch(e) - { - show_error( e + data ); - } + try + { + if ( data.length > 0 ) { + $('p#' + id).parent().addClass('branch'); // add css class + if ( reload ) + { + $('ul', $('p#' + id).parent()).remove(); + } + $('p#' + id).after( data ); // add data + $('p#' + id + ">a").attr('href', "#"); // reactivate onclick + $('p#' + id + ">a").addClass('open'); // open + $('p#' + id).addClass('loaded'); + lastloaded = path; + if ( callback ) { + loadingbranch = false; + callback() + }; + } + } + catch(e) + { + show_error( e + data ); + } }, error: function( xmlHttpRequest, textStatus, errorThrown ) { show_error( "(" + textStatus + ")" + xmlHttpRequest.responseText ); }, - complete: function( xmlHttpRequest, textStatus) { - loadingbranch = false; - if ( textStatus.equals("timeout") ) - { - show_error("Timeout!"); - } - } + complete: function( xmlHttpRequest, textStatus) { + loadingbranch = false; + if ( textStatus.equals("timeout") ) + { + show_error("Timeout!"); + } + } }); - } + } } var currentPath = null; @@ -178,170 +178,170 @@ var currentPath = null; load_props = function( path ) { var id = path_2_id( path ); $('#expl_content').data("currently_selected_node", id); - if ( $('p#' + id) ) - { - $('p', $('#expl_sidebar')).removeClass('selected'); // deselect all - $('p[id="' + id + '"]').addClass('selected'); // select the current node - } + if ( $('p#' + id) ) + { + $('p', $('#expl_sidebar')).removeClass('selected'); // deselect all + $('p[id="' + id + '"]').addClass('selected'); // select the current node + } $.get( ((path[0]!='/') ? '/' : '') + path + ".explorer.node.html", - function( data, textStatus, XMLHttpRequest ) { - if ( data.length > 0 ) { - $('#expl_content').html( data ); - currentPath = path; - } - }); - // window.location.replace( path ); + function( data, textStatus, XMLHttpRequest ) { + if ( data.length > 0 ) { + $('#expl_content').html( data ); + currentPath = path; + } + }); + // window.location.replace( path ); } reload_properties = function() { - load_props(currentPath); + load_props(currentPath); } add_prop = function( node ) { - var name = $('#expl_add_prop_name').attr('value'); - var type = $('#expl_add_prop_type').val(); - if ( $('#expl_add_prop_multi').is(':checked') ) - { - type += '[]'; - } - var value = $('#expl_add_prop_value').attr('value'); - - var params = {}; - params[name + '@TypeHint'] = type; - params[name] = value; - $.ajax({ - url: node, - type: 'POST', - data: params, - success: function( data, textStatus, xmlHttpRequest ) { - try - { - reload_properties(); - } - catch(e) - { - show_error( e ); - } - - }, - error: function( xmlHttpRequest, textStatus, errorThrown ) { - show_error( "(" + textStatus + ")" + xmlHttpRequest.responseText ); - } - }); + var name = $('#expl_add_prop_name').attr('value'); + var type = $('#expl_add_prop_type').val(); + if ( $('#expl_add_prop_multi').is(':checked') ) + { + type += '[]'; + } + var value = $('#expl_add_prop_value').attr('value'); + + var params = {}; + params[name + '@TypeHint'] = type; + params[name] = value; + $.ajax({ + url: node, + type: 'POST', + data: params, + success: function( data, textStatus, xmlHttpRequest ) { + try + { + reload_properties(); + } + catch(e) + { + show_error( e ); + } + + }, + error: function( xmlHttpRequest, textStatus, errorThrown ) { + show_error( "(" + textStatus + ")" + xmlHttpRequest.responseText ); + } + }); } search = function( language, expression, page ) { - if ( page != null ) - { - // $('#sql_search_result').html( "" ); - // adjust_height(); - } - $('#searchButton').attr("value", "Please Wait..."); - $('#searchButton').attr('disabled', true); - // search and load search results - $.ajax({ - url: "/.explorer.search.html", - type: 'GET', - data: { "language" : language, "expression" : expression, "page" : page }, - success: function( data, textStatus, xmlHttpRequest ) { - try - { - $('#sql_search_result').html( data ); - adjust_height(); - } - catch(e) - { - show_error( e ); - } - - }, - error: function( xmlHttpRequest, textStatus, errorThrown ) { - - show_error( "(" + textStatus + ")" + xmlHttpRequest.responseText ); - }, - complete: function( xmlHttpRequest, textStatus) { - $('#searchButton').attr("value", "Execute!"); - $('#searchButton').removeAttr('disabled'); - } - }); + if ( page != null ) + { + // $('#sql_search_result').html( "" ); + // adjust_height(); + } + $('#searchButton').attr("value", "Please Wait..."); + $('#searchButton').attr('disabled', true); + // search and load search results + $.ajax({ + url: "/.explorer.search.html", + type: 'GET', + data: { "language" : language, "expression" : expression, "page" : page }, + success: function( data, textStatus, xmlHttpRequest ) { + try + { + $('#sql_search_result').html( data ); + adjust_height(); + } + catch(e) + { + show_error( e ); + } + + }, + error: function( xmlHttpRequest, textStatus, errorThrown ) { + + show_error( "(" + textStatus + ")" + xmlHttpRequest.responseText ); + }, + complete: function( xmlHttpRequest, textStatus) { + $('#searchButton').attr("value", "Execute!"); + $('#searchButton').removeAttr('disabled'); + } + }); } skip_to = function( path ) { - expand_tree( path, function() { load_props(path); } ); + expand_tree( path, function() { load_props(path); } ); } expand_tree = function( path, callback ) { - // expand tree and select corresponding node - var pathParts = path.split('/'); - var partialPath = ''; - for (idx in pathParts) - { - if (pathParts[idx] != '') - { - partialPath += (((partialPath != '') ? '/' : '') + pathParts[idx]); - var id = path_2_id( partialPath ); // replacing / with _ - if (($('p#' + id).length === 0) || !$('p#' + id).hasClass('loaded')) - { - if ( partialPath == lastloaded ) - { - show_error("failed to expand path " + partialPath); - } - else - { - // asynchronous recursion: expand_tree is re-called after ajax call has finished - load_branch( partialPath, function() { expand_tree( path, callback ); } ); - } - return; - } - } - } - callback(); + // expand tree and select corresponding node + var pathParts = path.split('/'); + var partialPath = ''; + for (idx in pathParts) + { + if (pathParts[idx] != '') + { + partialPath += (((partialPath != '') ? '/' : '') + pathParts[idx]); + var id = path_2_id( partialPath ); // replacing / with _ + if (($('p#' + id).length === 0) || !$('p#' + id).hasClass('loaded')) + { + if ( partialPath == lastloaded ) + { + show_error("failed to expand path " + partialPath); + } + else + { + // asynchronous recursion: expand_tree is re-called after ajax call has finished + load_branch( partialPath, function() { expand_tree( path, callback ); } ); + } + return; + } + } + } + callback(); } path_2_id = function( path ) { - // WARNING: have a look at item.esp - duplicate code! - var id = path.replace(/\//g, "_"); // replacing / with _ + // WARNING: have a look at item.esp - duplicate code! + var id = path.replace(/\//g, "_"); // replacing / with _ if (path.length > 1) { id = id.replace(/^_/, ""); // remove trailing _ } - id = id.replace(/\./g, '_');// due to the css selectors - id = id.replace(/\,/g, '_');// due to the css selectors - id = id.replace(/:/g, '_');// due to the css selectors - id = id.replace(/\[/g, '_');// due to the css selectors - id = id.replace(/\]/g, '_');// due to the css selectors + id = id.replace(/\./g, '_');// due to the css selectors + id = id.replace(/\,/g, '_');// due to the css selectors + id = id.replace(/:/g, '_');// due to the css selectors + id = id.replace(/\[/g, '_');// due to the css selectors + id = id.replace(/\]/g, '_');// due to the css selectors id = id.replace(/\+/g, '_');// due to the css selectors - id = id.replace(/\-/g, '_');// due to the css selectors - id = id.replace(/\(/g, '_');// due to the css selectors - id = id.replace(/\)/g, '_');// due to the css selectors - id = id.replace(/\s/g, '_');// due to the css selectors - return id; + id = id.replace(/\-/g, '_');// due to the css selectors + id = id.replace(/\(/g, '_');// due to the css selectors + id = id.replace(/\)/g, '_');// due to the css selectors + id = id.replace(/\s/g, '_');// due to the css selectors + return id; } update_credentials = function() { - var info = Sling.getSessionInfo(); + var info = Sling.getSessionInfo(); // alert(info.authType); - if ( info ) - { - $("#username").html(info.userID); - $("#workspace").html(info.workspace); - $("#menu_username").html(info.userID); - } - if ( info && (info.authType == 'FORM') ) { - $("#login").hide(); - $("#logout").show(); - $("#menu_login").hide(); - $("#menu_logout").show(); - } else { - $("#login").show(); - $("#logout").hide(); - $("#menu_login").show(); - $("#menu_logout").hide(); - } + if ( info ) + { + $("#username").html(info.userID); + $("#workspace").html(info.workspace); + $("#menu_username").html(info.userID); + } + if ( info && (info.authType == 'FORM') ) { + $("#login").hide(); + $("#logout").show(); + $("#menu_login").hide(); + $("#menu_logout").show(); + } else { + $("#login").show(); + $("#logout").hide(); + $("#menu_login").show(); + $("#menu_logout").hide(); + } } show_error = function(msg) { - $('#error_dialog').html( msg ); - $('#error_dialog').dialog('open'); + $('#error_dialog').html( msg ); + $('#error_dialog').dialog('open'); } \ No newline at end of file Modified: sling/trunk/bundles/extensions/explorer/src/main/resources/libs/sling/explorer/js/ui.datetimebox.js URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/explorer/src/main/resources/libs/sling/explorer/js/ui.datetimebox.js?rev=1085250&r1=1085249&r2=1085250&view=diff ============================================================================== --- sling/trunk/bundles/extensions/explorer/src/main/resources/libs/sling/explorer/js/ui.datetimebox.js (original) +++ sling/trunk/bundles/extensions/explorer/src/main/resources/libs/sling/explorer/js/ui.datetimebox.js Fri Mar 25 04:18:18 2011 @@ -395,16 +395,16 @@ k = document.documentElement.clientHeigh _selectDay: function(id, month, year, hour, minute, td) { var inst = d(id); - if (!(d(td).hasClass(this._unselectableClass) || this._isDisabledDatepicker(inst[0]))) { + if (!(d(td).hasClass(this._unselectableClass) || this._isDisabledDatepicker(inst[0]))) { inst = this._getInst(inst[0]); - inst.selectedDay = inst.currentDay = td != null ? d("a", td).html() : inst.currentDay; - inst.selectedMonth = inst.currentMonth = month != null ? month : inst.currentMonth; - inst.selectedYear = inst.currentYear = year != null ? year : inst.currentYear; + inst.selectedDay = inst.currentDay = td != null ? d("a", td).html() : inst.currentDay; + inst.selectedMonth = inst.currentMonth = month != null ? month : inst.currentMonth; + inst.selectedYear = inst.currentYear = year != null ? year : inst.currentYear; inst.selectedHour = inst.currentHour = hour != null ? hour : inst.currentHour; inst.selectedMinute = inst.currentMinute = minute != null ? minute : inst.currentMinute; - this._selectDate(id, this._formatDateTime(inst, inst.currentDay, inst.currentMonth, inst.currentYear, inst.currentHour, inst.currentMinute)); + this._selectDate(id, this._formatDateTime(inst, inst.currentDay, inst.currentMonth, inst.currentYear, inst.currentHour, inst.currentMinute)); } - }, + }, _clearDate: function (a) { @@ -460,116 +460,116 @@ k = document.documentElement.clientHeigh parseDate: function (format, value, settings) { - if (format == null || value == null) - throw 'Invalid arguments'; - value = (typeof value == 'object' ? value.toString() : value + ''); - if (value == '') - return null; - var shortYearCutoff = (settings ? settings.shortYearCutoff : null) || this._defaults.shortYearCutoff; - var dayNamesShort = (settings ? settings.dayNamesShort : null) || this._defaults.dayNamesShort; - var dayNames = (settings ? settings.dayNames : null) || this._defaults.dayNames; - var monthNamesShort = (settings ? settings.monthNamesShort : null) || this._defaults.monthNamesShort; - var monthNames = (settings ? settings.monthNames : null) || this._defaults.monthNames; - var year = -1; - var month = -1; - var day = -1; - var hour = -1; - var minute = -1; - var literal = false; - // Check whether a format character is doubled - var lookAhead = function(match) { - var matches = (iFormat + 1 < format.length && format.charAt(iFormat + 1) == match); - if (matches) - iFormat++; - return matches; - }; - // Extract a number from the string value - var getNumber = function(match) { - lookAhead(match); - var size = (match == 'y' ? 4 : 2); - var num = 0; - while (size > 0 && iValue < value.length && - value.charAt(iValue) >= '0' && value.charAt(iValue) <= '9') { - num = num * 10 + (value.charAt(iValue++) - 0); - size--; - } - if (size == (match == 'y' ? 4 : 2)) - throw 'Missing number at position ' + iValue; - return num; - }; - // Extract a name from the string value and convert to an index - var getName = function(match, shortNames, longNames) { - var names = (lookAhead(match) ? longNames : shortNames); - var size = 0; - for (var j = 0; j < names.length; j++) - size = Math.max(size, names[j].length); - var name = ''; - var iInit = iValue; - while (size > 0 && iValue < value.length) { - name += value.charAt(iValue++); - for (var i = 0; i < names.length; i++) - if (name == names[i]) - return i + 1; - size--; - } - throw 'Unknown name at position ' + iInit; - }; - // Confirm that a literal character matches the string value - var checkLiteral = function() { - if (value.charAt(iValue) != format.charAt(iFormat)) - throw 'Unexpected literal at position ' + iValue; - iValue++; - }; - var iValue = 0; - for (var iFormat = 0; iFormat < format.length; iFormat++) { - if (literal) - if (format.charAt(iFormat) == "'" && !lookAhead("'")) - literal = false; - else - checkLiteral(); - else - switch (format.charAt(iFormat)) { - case 'h': - hour = getNumber('h'); - break; - case 'i': - minute = getNumber('i'); - break; - case 'd': - day = getNumber('d'); - break; - case 'D': - getName('D', dayNamesShort, dayNames); - break; - case 'm': - month = getNumber('m'); - break; - case 'M': - month = getName('M', monthNamesShort, monthNames); - break; - case 'y': - year = getNumber('y'); - break; - case "'": - if (lookAhead("'")) - checkLiteral(); - else - literal = true; - break; - default: - checkLiteral(); - } - } - if (year < 100) { - year += new Date().getFullYear() - new Date().getFullYear() % 100 + - (year <= shortYearCutoff ? 0 : -100); - } - var date = new Date(year, month - 1, day,hour,minute); - if (date.getFullYear() != year || date.getMonth() + 1 != month || date.getDate() != day) { - throw 'Invalid date'; // E.g. 31/02/* - } - return date; - }, + if (format == null || value == null) + throw 'Invalid arguments'; + value = (typeof value == 'object' ? value.toString() : value + ''); + if (value == '') + return null; + var shortYearCutoff = (settings ? settings.shortYearCutoff : null) || this._defaults.shortYearCutoff; + var dayNamesShort = (settings ? settings.dayNamesShort : null) || this._defaults.dayNamesShort; + var dayNames = (settings ? settings.dayNames : null) || this._defaults.dayNames; + var monthNamesShort = (settings ? settings.monthNamesShort : null) || this._defaults.monthNamesShort; + var monthNames = (settings ? settings.monthNames : null) || this._defaults.monthNames; + var year = -1; + var month = -1; + var day = -1; + var hour = -1; + var minute = -1; + var literal = false; + // Check whether a format character is doubled + var lookAhead = function(match) { + var matches = (iFormat + 1 < format.length && format.charAt(iFormat + 1) == match); + if (matches) + iFormat++; + return matches; + }; + // Extract a number from the string value + var getNumber = function(match) { + lookAhead(match); + var size = (match == 'y' ? 4 : 2); + var num = 0; + while (size > 0 && iValue < value.length && + value.charAt(iValue) >= '0' && value.charAt(iValue) <= '9') { + num = num * 10 + (value.charAt(iValue++) - 0); + size--; + } + if (size == (match == 'y' ? 4 : 2)) + throw 'Missing number at position ' + iValue; + return num; + }; + // Extract a name from the string value and convert to an index + var getName = function(match, shortNames, longNames) { + var names = (lookAhead(match) ? longNames : shortNames); + var size = 0; + for (var j = 0; j < names.length; j++) + size = Math.max(size, names[j].length); + var name = ''; + var iInit = iValue; + while (size > 0 && iValue < value.length) { + name += value.charAt(iValue++); + for (var i = 0; i < names.length; i++) + if (name == names[i]) + return i + 1; + size--; + } + throw 'Unknown name at position ' + iInit; + }; + // Confirm that a literal character matches the string value + var checkLiteral = function() { + if (value.charAt(iValue) != format.charAt(iFormat)) + throw 'Unexpected literal at position ' + iValue; + iValue++; + }; + var iValue = 0; + for (var iFormat = 0; iFormat < format.length; iFormat++) { + if (literal) + if (format.charAt(iFormat) == "'" && !lookAhead("'")) + literal = false; + else + checkLiteral(); + else + switch (format.charAt(iFormat)) { + case 'h': + hour = getNumber('h'); + break; + case 'i': + minute = getNumber('i'); + break; + case 'd': + day = getNumber('d'); + break; + case 'D': + getName('D', dayNamesShort, dayNames); + break; + case 'm': + month = getNumber('m'); + break; + case 'M': + month = getName('M', monthNamesShort, monthNames); + break; + case 'y': + year = getNumber('y'); + break; + case "'": + if (lookAhead("'")) + checkLiteral(); + else + literal = true; + break; + default: + checkLiteral(); + } + } + if (year < 100) { + year += new Date().getFullYear() - new Date().getFullYear() % 100 + + (year <= shortYearCutoff ? 0 : -100); + } + var date = new Date(year, month - 1, day,hour,minute); + if (date.getFullYear() != year || date.getMonth() + 1 != month || date.getDate() != day) { + throw 'Invalid date'; // E.g. 31/02/* + } + return date; + }, ATOM: "yy-mm-dd", COOKIE: "D, dd M yy", @@ -603,11 +603,11 @@ k = document.documentElement.clientHeigh else switch (a.charAt(j)) { case 'h': - l += g('h', b.getHours(), 2); - break; - case 'i': - l += g('i', b.getMinutes(), 2); - break; + l += g('h', b.getHours(), 2); + break; + case 'i': + l += g('i', b.getMinutes(), 2); + break; case "d": l += g("d", b.getDate(), 2); break; @@ -963,21 +963,21 @@ e = function (h) { (h = f + 1 < a.length j += '<br />'; j += '<span class="ui-datepicker-time">' + tm + '</span>'; - j += '<select id="'+a.id+'_selectHour" class="ui-datepicker-hour" onchange="DP_jQuery_' + y + ".datetimebox._selectHourMinute('#" + a.id + "', this, 'h');\" onclick=\"DP_jQuery_" + y + ".datetimebox._clickHourMinute('#" + a.id + "');\">"; - for (hour=0; hour < 24; hour++) { - j += '<option value="' + hour + '"' + - (hour == drawHour ? ' selected="selected"' : '') + - '>' + ((hour<10)?'0'+hour:hour) + '</option>'; - } - j += '</select>'; - j += '<span class="ui-datepicker-time"> : </span>'; - j += '<select id="'+a.id+'_selectMinute" class="ui-datepicker-minute" onchange="DP_jQuery_' + y + ".datetimebox._selectHourMinute('#" + a.id + "', this, 'i');\" onclick=\"DP_jQuery_" + y + ".datetimebox._clickHourMinute('#" + a.id + "');\">"; - for (minute=0; minute < 60; minute++) { - j += '<option value="' + minute + '"' + - (minute == drawMinute ? ' selected="selected"' : '') + - '>' + ((minute<10)?'0'+minute:minute) + '</option>'; - } - j += '</select>'; + j += '<select id="'+a.id+'_selectHour" class="ui-datepicker-hour" onchange="DP_jQuery_' + y + ".datetimebox._selectHourMinute('#" + a.id + "', this, 'h');\" onclick=\"DP_jQuery_" + y + ".datetimebox._clickHourMinute('#" + a.id + "');\">"; + for (hour=0; hour < 24; hour++) { + j += '<option value="' + hour + '"' + + (hour == drawHour ? ' selected="selected"' : '') + + '>' + ((hour<10)?'0'+hour:hour) + '</option>'; + } + j += '</select>'; + j += '<span class="ui-datepicker-time"> : </span>'; + j += '<select id="'+a.id+'_selectMinute" class="ui-datepicker-minute" onchange="DP_jQuery_' + y + ".datetimebox._selectHourMinute('#" + a.id + "', this, 'i');\" onclick=\"DP_jQuery_" + y + ".datetimebox._clickHourMinute('#" + a.id + "');\">"; + for (minute=0; minute < 60; minute++) { + j += '<option value="' + minute + '"' + + (minute == drawMinute ? ' selected="selected"' : '') + + '>' + ((minute<10)?'0'+minute:minute) + '</option>'; + } + j += '</select>'; j += "</div>";