Skip to content

Path-aware view ordering for modal search; assorted fixes #301

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
namedgraph merged 1 commit into from
May 17, 2026
Merged

Path-aware view ordering for modal search; assorted fixes #301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions src/main/webapp/static/com/atomgraph/linkeddatahub/css/bootstrap.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
html { height: 100%; overscroll-behavior-y: none; }
html { height: 100%; }
/* only the main navbar is fixed-top now; tab bar + action bar are sticky inside #tab-body */
body { height: calc(100% - 51px); padding-top: 51px; padding-bottom: 0; }
#tab-bar { position: sticky; top: 51px; z-index: 1000; margin-bottom: 0; }
Expand Down Expand Up @@ -27,8 +27,10 @@ ul.dropdown-menu ul { margin: 0; }
.dropdown-menu li form { margin-bottom: 0; }
.dropdown-menu li form button { width: 100%; text-align: left; }
#collapsing-top-navbar .brand.context { display: inline-block; vertical-align: middle; }
.navbar-form input#uri { width: calc(100% - 50px); }
.navbar-form .btn-search { background-image: url('../icons/ic_search_white_24px.svg'); background-position: center center; background-repeat: no-repeat; width: 34px; height: 34px; }
.btn-search { background-image: url('../icons/ic_search_white_24px.svg'); background-position: center center; background-repeat: no-repeat; width: 34px; height: 34px; }
.search-form .input-append, .search-form-modal .input-append { display: flex; width: 100%; align-items: stretch; }
.search-form .input-append .search-query, .search-form-modal .input-append .search-query { flex: 1 1 auto; min-width: 0; height: 34px; box-sizing: border-box; margin: 0; }
.search-form .input-append .btn-search, .search-form-modal .input-append .btn-search { flex: 0 0 34px; margin: 0; }
.action-bar { position: sticky; top: var(--action-bar-top, 51px); z-index: 999; background: #dfdfdf; padding: 0; box-shadow: none; }
.action-bar form { margin-bottom: 0; }
.action-bar .span7 .row-fluid > * { margin-top: 10px; }
Expand Down Expand Up @@ -165,7 +167,7 @@ fieldset fieldset { margin-left: 3%; margin-bottom: 3%; }
.constructor-triple .controls label.radio { display: inline-block; padding-top: 10px; margin-right: 10px; }
.constructor-triple .controls .help-inline { vertical-align: top; padding-top: 5px; }
.control-group.error .checkbox, .control-group.error .radio, .control-group.error input, .control-group.error select, .control-group.error textarea { color: unset; }
#uri { height: 24px; }
#uri { height: 24px; width: 100%; }
#query-form fieldset { border: initial; margin: initial; }
button.add-typeahead { width: 219px; }
.btn.btn-remove-property, .btn.btn-remove-resource { background-image: url('../icons/ic_remove_black_24px.svg'); background-position: center center; background-repeat: no-repeat; height: 30px; width: 30px; }
Expand Down
17 changes: 11 additions & 6 deletions src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,10 +237,14 @@ exclude-result-prefixes="#all"

<xsl:template match="div[contains-token(@class, 'block')][key('elements-by-class', 'drag-handle', .)][acl:mode() = '&acl;Write'][not(ixsl:style(ancestor::div[contains-token(@class, 'tab-pane')]/div[contains-token(@class, 'left-sidebar')])?display = 'block')]" mode="ixsl:onmousemove" priority="2">
<xsl:variable name="uri" select="xs:anyURI(ancestor::div[contains-token(@class, 'document-body')]/@about)" as="xs:anyURI"/>
<xsl:variable name="results" select="ixsl:get(ixsl:get(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || $uri || '`'), 'results')" as="document-node()"/>
<xsl:variable name="mode" select="ac:mode($results)" as="xs:anyURI"/>

<xsl:if test="$mode = xs:anyURI('&ldh;ContentMode')">
<xsl:variable name="contents" select="ixsl:get(ixsl:window(), 'LinkedDataHub.contents')"/>
<xsl:variable name="cache-key" select="'`' || $uri || '`'" as="xs:string"/>
<!-- cache may not have an entry for the hovered block's document URI (e.g. inactive tab); skip silently to avoid an ixsl:get warning on every mousemove -->
<xsl:if test="ixsl:contains($contents, $cache-key) and ixsl:contains(ixsl:get($contents, $cache-key), 'results')">
<xsl:variable name="results" select="ixsl:get(ixsl:get($contents, $cache-key), 'results')" as="document-node()"/>
<xsl:variable name="mode" select="ac:mode($results)" as="xs:anyURI"/>

<xsl:if test="$mode = xs:anyURI('&ldh;ContentMode')">
<xsl:variable name="dom-x" select="ixsl:get(ixsl:event(), 'clientX')" as="xs:double"/>
<xsl:variable name="rect" select="ixsl:call(., 'getBoundingClientRect', [])"/>
<xsl:variable name="offset-x" select="$dom-x - ixsl:get($rect, 'x')" as="xs:double"/>
Expand Down Expand Up @@ -286,10 +290,11 @@ exclude-result-prefixes="#all"
</xsl:choose>

<!-- call the next matching template to preserve existing block controls functionality -->
<xsl:next-match/>
<xsl:next-match/>
</xsl:if>
</xsl:if>
</xsl:template>

<!-- hide drag handle when mouse leaves block -->

<xsl:template match="div[contains-token(@class, 'block')][key('elements-by-class', 'drag-handle', .)][acl:mode() = '&acl;Write']" mode="ixsl:onmouseout">
Expand Down
Loading
Loading