Index: contrib/explorers/jquery/src/main/resources/libs/sling/servlet/default/explorer/explorer.esp =================================================================== --- contrib/explorers/jquery/src/main/resources/libs/sling/servlet/default/explorer/explorer.esp (revision 991822) +++ contrib/explorers/jquery/src/main/resources/libs/sling/servlet/default/explorer/explorer.esp (working copy) @@ -64,82 +64,13 @@

-    +      

- - -
@@ -155,11 +86,12 @@
- + +
@@ -209,8 +142,7 @@
content -
- +
@@ -218,10 +150,7 @@ - + + function adjust_height() { + var newHeight = $(window).height() - $("#expl_logo").outerHeight(true) - $("#query_container").outerHeight(true) - $("#expl_footer").outerHeight(true); + var offset_top = $("#expl_content_container").offset().top; + var newHeight2 = $(window).height() - offset_top - $("#expl_footer").outerHeight(true); + // $("#height").html(" window height " + $(window).height() + " height1 " + newHeight + " offset top " + offset_top + " height2 " + newHeight2 ); + $("#expl_sidebar").height(newHeight2 - 25); + $("#expl_content").height(newHeight2 - 45); + } + + // ]]> + Index: contrib/explorers/jquery/src/main/resources/libs/sling/servlet/default/explorer/search.esp =================================================================== --- contrib/explorers/jquery/src/main/resources/libs/sling/servlet/default/explorer/search.esp (revision 991822) +++ contrib/explorers/jquery/src/main/resources/libs/sling/servlet/default/explorer/search.esp (working copy) @@ -31,7 +31,7 @@ var page = parseInt(request.getParameter("page") || 1); var queryManager = session.getWorkspace().getQueryManager(); %> -Query results: +

Query results:

<% if (page > 1) { %> - |< - + |< + <%= ((page - 2) * entriesPerPage) + 1 %>..<%= ((page - 1) * entriesPerPage) %> + +<% function create_input_for_type( id, type, val, editable, omitName ) { + switch ( type ) { + case Packages.javax.jcr.PropertyType.DATE : %> + name="<%= id %>" <% } %> id="<%= id %>" value="<%= val %>" /> + <% + break; + case Packages.javax.jcr.PropertyType.BOOLEAN : %> + + class="protected" <%}%> <% if ( val.getBoolean() ) { %>checked<% } %> onchange="$('[id=<%= id %>_cb]').val( this.checked ? 'true' : 'false' );"> + <% + break; + case Packages.javax.jcr.PropertyType.REFERENCE : + case Packages.javax.jcr.PropertyType.WEAKREFERENCE : + case Packages.javax.jcr.PropertyType.PATH : + try { + var refNode = val.getNode(); + var resourceType = ''; + /* + var node = refNode.adaptTo(Packages.javax.jcr.Node); + if ( node && node.hasProperty( 'sling:resourceType' ) ) { + resourceType = node.getProperty('sling:resourceType'); + } + */ + %> + -> <%= refNode.getPath() %> (<%= refNode.getIdentifier() %>) + name="<%= id %>" <% } %> value="<%= val %>" /> + <% + } catch ( ex ) {} + break; + case Packages.javax.jcr.PropertyType.BINARY : + %> + Download content (use "Save as...") + <% + break; + default: %> + name="<%= id %>" <% } %> value="<%= val %>" /> + <% + break; + } // switch +} %> +<% function create_multivalueinput_for_type( id, type, multivalue_property, include_add_field ) { +%> + + +
+ <% if ( include_add_field && canModifyProperties && !multivalue_property.getDefinition().isProtected() ) { + create_input_for_type( id+"_new_entry", type, '', true, true ); + %> + add +
+
+ <% + + } + +} +%> \ No newline at end of file Index: contrib/explorers/jquery/src/main/resources/libs/sling/explorer/js/explorer.js =================================================================== --- contrib/explorers/jquery/src/main/resources/libs/sling/explorer/js/explorer.js (revision 991822) +++ contrib/explorers/jquery/src/main/resources/libs/sling/explorer/js/explorer.js (working copy) @@ -42,15 +42,35 @@ } /** toggle a node in the menu */ -explorer_toggle = function(path, resourceType) { +explorer_toggle = function( path, resourceType ) { + var id = path_2_id( path ); // replacing / with _ + var is_open = $('p#'+id+'>a').hasClass('open'); + + load_props("/" + path); + + if (is_open){ + //remove children + $('p#'+id).parent().find('ul').each(function(){ + $(this).empty(); + this.parentNode.removeChild( this ) + }); + $('p#'+id+">a").removeClass('open'); // closed + $('p#'+id).parent().removeClass('branch'); // remove css class + } else { + load_branch(path); + } +} + +/** NOT IN USE: cached toggling - subtree is cached **/ +explorer_toggle2 = function( path, resourceType ) { var id = path_2_id( path ); // replacing / with _ var is_open = $('p#' + id + '>a').hasClass('open'); load_props("/" + path, resourceType); var subtree = $('ul', $('p#' + id).parent()); - if (is_open) { - if (subtree.length != 0) // should always resolve to true... + if ( is_open ) { + if ( subtree.length != 0 ) // should always resolve to true... { subtree.hide(); } @@ -70,7 +90,7 @@ /** load branch/subtree **/ load_branch = function( path, callback ) { if (path != '') { - var id = path_2_id( path ); // replacing / with _ + var id = path_2_id( path ); $('p#' + id + ">a").removeAttr('href'); // remove onclick // fetch children @@ -87,25 +107,34 @@ } } -load_props = function(path, resourceType) { - var id = path_2_id( path ); // replacing / with _ - //id = id.replace(/^_/, ""); // remove trailing _ +var currentPath = null; +var currentResourceType = null; +load_props = function( path, resourceType ) { + // check whether currently selected node is on 'path' + //var currently_selected_node = $('#expl_content').data( "currently_selected_node" ); + //if (currently_selected_node && path == currently_selected_node) return; + + $('#expl_content').data("currently_selected_node", path); + + var id = path_2_id( path ); if ($('p#' + id)) { $('p', $('#expl_sidebar')).removeClass('selected'); // deselect all $('p[id="' + id + '"]').addClass('selected'); // select the current node } - else - { - alert('p#' + id); - } $.get(path + ".explorer.edit."+ (resourceType == null ? '' : (resourceType.replace(':','_') + '.') ) + "html", function(data) { - if (data.length > 0) { - $('#expl_content').html(data); + if ( data.length > 0 ) { + $('#expl_content').html( data ); + currentPath = path; + currentResourceType = resourceType; } }); } +reload_properties = function() { + load_props(currentPath, currentResourceType); +} + add_prop = function(node) { var name = $('#expl_add_prop_name').attr('value'); var type = $('#expl_add_prop_type').val(); @@ -119,7 +148,8 @@ params[name + '@TypeHint'] = type; params[name] = value; $.post(node, params, function(data) { - window.location = node + '.explorer.html'; + reload_properties(); + // window.location = node + '.explorer.html'; }); } @@ -127,6 +157,7 @@ // search and load search results $.get("/.explorer.search.html", { "language" : language, "expression" : expression, "page" : page }, function(data) { $('#sql_search_result').html(data); + adjust_height(); }); } @@ -165,3 +196,24 @@ id = id.replace(/\]/g, '_');// due to the css selectors return id; } + +update_credentials = function() { + var info = Sling.getSessionInfo(); + if ( info ) + { + document.getElementById("username").innerHTML = info.userID; + document.getElementById("workspace").innerHTML = info.workspace; + document.getElementById("menu_username").innerHTML = info.userID; + } + if ( info && info.authType ) { + document.getElementById("login").style.display="none"; + document.getElementById("logout").style.display="block"; + document.getElementById("menu_login").style.display="none"; + document.getElementById("menu_logout").style.display="block"; + } else { + document.getElementById("login").style.display="block"; + document.getElementById("logout").style.display="none"; + document.getElementById("menu_login").style.display="block"; + document.getElementById("menu_logout").style.display="none"; + } +} Index: contrib/explorers/jquery/src/main/resources/libs/sling/explorer/css/explorer.css =================================================================== --- contrib/explorers/jquery/src/main/resources/libs/sling/explorer/css/explorer.css (revision 991822) +++ contrib/explorers/jquery/src/main/resources/libs/sling/explorer/css/explorer.css (working copy) @@ -42,7 +42,7 @@ html /* shows always scrollbar in Firefox*/ { - overflow-y: scroll; + overflow: visible; } body @@ -50,9 +50,10 @@ font-size: 13px; color: #545D66; margin: 0; - padding: 0 0 20px 0; + padding: 0; text-align: center; font-family: Verdana, Arial, Helvetica, sans-serif; + overflow: hidden; } /* ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: */ @@ -81,14 +82,24 @@ h3 { - font-size: 16px; - line-height: /**/; + 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: 13px; - line-height: /**/; + 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 * @@ -103,7 +114,8 @@ ul, ol { - margin: 10px 0 10px 35px; + clear: both; +/* margin: 10px 0 10px 35px; */ } ul @@ -116,7 +128,7 @@ li { - margin: 3px 0; + margin: 5px 0; } p @@ -150,7 +162,7 @@ text-decoration: underline; } -a:focus, input:focus, button:focus +a:focus, input:focus, button:focus, :focus { outline: none; } @@ -164,6 +176,8 @@ color: #354F66; font-weight: bold; width: auto!important; + -moz-border-radius: 10px; + border-radius: 10px; } input.button @@ -171,8 +185,16 @@ padding: 1px 3px; } + +a.button +{ + color: #354F66; + text-decoration: none; +} + button:hover, .button:hover { + color: #354F66; background-color: #BDD2E5; border: 2px solid #354F66; padding: 1px 4px; @@ -278,7 +300,7 @@ label { - width: 200px; + width: 25%; float: left; display: inline; } @@ -319,21 +341,28 @@ top: -100px; } +input[type=disabled], input.disabled, select[type=disabled], select.disabled, .protected +{ + background-color: #CCCCCC; +} + input.text { + float: left; display: inline; - width: 200px; + width: 65%; + margin: 0 5px 0 5%; } -input.checkbox, input.radio +input.checkbox, input.radio, input[type=checkbox], input[type=radio] { float: none; border: none; background-color: transparent; - height: 12px; - width: 12px; + height: 16px!important; + width: 16px!important; padding: 0; - position: absolute; + margin: 2px 2px 2px 5%!important; } #newsletter input.checkbox @@ -351,7 +380,11 @@ select { + float: left; display: inline; + width: 65%; + margin: 0 5px 0 5%; + padding: 1px 2px; } textarea @@ -431,7 +464,7 @@ margin: 10px 20px; font-size: 11px; background-color: #f6fbfe; - border: 2px solid #bdd2e5; + border: 1px solid #bdd2e5; -moz-border-radius: 5px; border-radius: 5px; padding: 5px 7px; @@ -439,23 +472,27 @@ /* ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: */ -/* --- Query Dialog ---*/ +/* --- Query Search Dialog ---*/ /* ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: */ #query_container { clear: both; margin: 20px; - border: 2px solid #527EA3; - -moz-border-radius: 3px; - border-radius: 3px; + border: 1px solid #527EA3; + -moz-border-radius: 5px; + border-radius: 5px; background-color: #F6FBFE; } #expl_search { - padding: 10px; - background-color: #F6FBFE; + margin: 10px; +} + +#expl_search form +{ + height: 90px; } #show_query_dialog @@ -463,16 +500,27 @@ 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; +} + button#show_query_dialog { font-weight: normal; text-decoration: underline; width: 80px; height: 25px; - margin: 0px 0px 0px 0px; + margin: 0px 0px 0px 5px; + padding: 0px 0px 1px 18px; background: url(../img/query_bg.png); background-repeat: no-repeat; background-color: #F6FBFE; @@ -480,8 +528,7 @@ height: 25px; width: 100%; display: block; - padding: 0px 0px 1px 18px; - font-size: 10px; + font-size: 13px; text-decoration: none; text-align: left; } @@ -489,9 +536,31 @@ button#show_query_dialog.query_open { background-position: 8px 1px; - border-bottom: 1px solid #BDD2E5; } +#sql_search_result h4 +{ + margin-left: -40px; +} + + +/* ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: */ +/* --- Page Navigation ---*/ +/* ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: */ + +#page_navigation +{ + margin: 20px 0; + font-size: 10px; +} + +#page_navigation a +{ + margin-right: 5px; +} + + + /* ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: */ /* --- Main Layout - Header / Logo / Content / Footer ---*/ /* ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: */ @@ -521,34 +590,41 @@ #expl_sidebar { - border: 2px solid #527EA3; - -moz-border-radius: 3px; - border-radius: 3px; + border: 1px solid #527EA3; + -moz-border-radius: 5px; + border-radius: 5px; width: 340px; float: left; display: inline; padding-bottom: 20px; - min-height: 600px; background-color: #F6FBFE; + overflow: auto; } #expl_content { margin: 0 0 0 354px; - border: 2px solid #527EA3; - -moz-border-radius: 3px; - border-radius: 3px; + border: 1px solid #527EA3; + -moz-border-radius: 5px; + border-radius: 5px; padding: 20px; background-color: #F6FBFE; + overflow: auto; } #expl_footer { - margin: 20px 20px 0 20px; + height: 20px; + margin: 20px; clear: both; font-size: 11px; } +#expl_footer p +{ + margin: 0; +} + /* ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: */ /* --- Sidebar Explorer ---*/ /* ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: */ @@ -579,7 +655,7 @@ #expl_sidebar li.branch { - border-bottom: 0px; + border-bottom: none; } #expl_sidebar li.empty @@ -600,16 +676,18 @@ #expl_sidebar li p a { + color: #545D66; display: block; padding: 2px 5px; text-decoration: none; border: 1px solid #F6FBFE; - -moz-border-radius: 3px; - border-radius: 3px; + -moz-border-radius: 5px; + border-radius: 5px; } #expl_sidebar li p a:hover { + color: #545D66; border: 1px solid #BDD2E5; } @@ -626,22 +704,23 @@ padding: 2px 5px; text-decoration: none; border: 1px solid #354F66; - -moz-border-radius: 3px; - border-radius: 3px; + -moz-border-radius: 5px; + border-radius: 5px; background-color: #527EA3; - color: #BDD2E5; + color: #FFFFFF; } #expl_sidebar li p.selected a:hover { color: #FFFFFF; + background-color: #83a3be; } #expl_sidebar li ul { border-top: 1px dotted black; - margin-left: -1em; - padding-left: 2em; + margin-left: -10px; + padding-left: 18px; } /* ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: */ @@ -661,30 +740,133 @@ /* ################################################################# */ /* ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: */ -/* --- Properties ---*/ +/* --- Header ---*/ /* ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: */ -.edit_properties_container +#expl_content_header h2 { - border-top: 1px dotted #354F66; - margin: 30px 0 0 0; - padding: 10px 0; + float: left; + display: inline; } -.edit_properties_container form fieldset ul#multiyvalueproperty + +#expl_content_header form.deleteNote { - margin: 0 0 0 313px; - padding: 0; + float: right; + display: inline; +} + + +/* ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: */ +/* --- Properties ---*/ +/* ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: */ + +.edit_properties_container +{ + margin: 10px 0 0 0; + padding: 10px 0; } .add_property { - margin: 0 10px 0 300px; } .property_element { 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%; +} + +.saveAs +{ + float: left; + display: inline; + margin-left: 5%; +} + + +/* ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: */ +/* --- Multivalue Properties ---*/ +/* ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: */ + +.multivalued ul +{ + width: 66%; + float: left; + display: inline; + margin-left: 5%; + clear: none; + padding: 0 0 0 15px; +} + +.addMultivalueproperty +{ + clear: both; + margin: 0 0 0 30%; +} + +.addMultivalueproperty input, +.addMultivalueproperty select +{ + width: 88%; + margin-left: 0; +} + +.addMultivalueproperty a.button +{ + float: left; + display: inline; + margin-top: 2px; +} + +.multivalued ul li +{ + padding: 3px 5px 5px 5px; +} + +.multivalued ul li a.button +{ + float: right; + display: inline; +} + +.multivalued ul li:hover +{ + -moz-border-radius: 5px; + border-radius: 5px; + background-color: #BDD2E5; +} + + +/* ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: */ +/* --- Propoerty Table ---*/ +/* ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: */ + +table.propoerty_table +{ + border-collapse: separate; + border-spacing: 0; + table-layout: fixed; + width: 100%; +} + +table.propoerty_table td +{ + text-align: left; + vertical-align: top; +} + +table.propoerty_table td input, +table.propoerty_table td select +{ + margin: 0; + width: 90%; } \ No newline at end of file