Don't hide the progress bar when ldh:Object finishes loading

AtomGraph · Dec 20, 2024 · 44b946c · 44b946c
1 parent 7021ba1
commit 44b946c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 16 deletions.
diff --git a/...ain/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/object.xsl b/...ain/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/object.xsl
@@ -67,7 +67,7 @@ exclude-result-prefixes="#all"
 
         <xsl:for-each select="$block//div[contains-token(@class, 'bar')]">
             <!-- update progress bar -->
-            <ixsl:set-style name="width" select="'75%'" object="."/>
+            <ixsl:set-style name="width" select="'50%'" object="."/>
         </xsl:for-each>
 
         <!-- don't use ldh:base-uri(.) because its value comes from the last HTML document load -->
@@ -175,14 +175,11 @@ exclude-result-prefixes="#all"
                     </xsl:apply-templates>
                 </xsl:variable>
 
-            <xsl:message>
-                ldh:LoadBlockObjectMetadata $resource: <xsl:value-of select="serialize($resource)"/>
-                ldh:LoadBlockObjectMetadata $row: <xsl:value-of select="serialize($row)"/>
-            </xsl:message>
+                <xsl:message>
+                    ldh:LoadBlockObjectMetadata $resource: <xsl:value-of select="serialize($resource)"/>
+                    ldh:LoadBlockObjectMetadata $row: <xsl:value-of select="serialize($row)"/>
+                </xsl:message>
 
-                <!-- hide the row with the block controls -->
-                <ixsl:set-style name="z-index" select="'-1'" object="key('elements-by-class', 'row-block-controls', $block)"/>
-
                 <xsl:for-each select="$container">
                     <xsl:result-document href="?." method="ixsl:replace-content">
                         <!-- wrap the row -->
@@ -193,13 +190,16 @@ exclude-result-prefixes="#all"
 
                     <xsl:apply-templates mode="ldh:RenderRow"/> <!-- recurse down the block hierarchy -->
                 </xsl:for-each>
+
+                <!-- hide the row with the block controls -->
+<!--                <ixsl:set-style name="z-index" select="'-1'" object="key('elements-by-class', 'row-block-controls', $block)"/>-->
 
                 <!-- hide the progress bar -->
-                <xsl:for-each select="$block/div[contains-token(@class, 'span12')]">
+<!--                <xsl:for-each select="$block/div[contains-token(@class, 'span12')]">
                     <xsl:sequence select="ixsl:call(ixsl:get(., 'classList'), 'toggle', [ 'progress', false() ])[current-date() lt xs:date('2000-01-01')]"/>
                     <xsl:sequence select="ixsl:call(ixsl:get(., 'classList'), 'toggle', [ 'progress-striped', false() ])[current-date() lt xs:date('2000-01-01')]"/>
                     <xsl:sequence select="ixsl:call(ixsl:get(., 'classList'), 'toggle', [ 'active', false() ])[current-date() lt xs:date('2000-01-01')]"/>
-                </xsl:for-each>
+                </xsl:for-each>-->
             </xsl:when>
             <xsl:otherwise>
                 <xsl:value-of select="ixsl:call(ixsl:window(), 'alert', [ ?message ])[current-date() lt xs:date('2000-01-01')]"/>

diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/view.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/view.xsl
@@ -215,8 +215,6 @@ exclude-result-prefixes="#all"
                                     </div>
                                 </xsl:result-document>
                             </xsl:for-each>
-
-<!--                            <xsl:apply-templates select="$container" mode="ldh:BlockRendered"/>-->
                         </xsl:otherwise>
                     </xsl:choose>
                 </xsl:for-each>
@@ -1607,9 +1605,6 @@ exclude-result-prefixes="#all"
                             </xsl:result-document>
                         </xsl:for-each>
 
-<!--                        <xsl:apply-templates select="$container" mode="ldh:BlockRendered"/>-->
-
-                        <!-- make sure the asynchronous templates below execute after ldh:BlockRendered -->
                         <xsl:for-each select="$bgp-triples-map">
                             <!-- only simple properties in the BGP are supported, not property paths etc. -->
                             <xsl:if test="json:string[@key = 'predicate']">

diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/resource.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/resource.xsl
@@ -507,7 +507,7 @@ extension-element-prefixes="ixsl"
                             </button>
                         </xsl:if>
                         <div class="row-fluid">
-                            <div style="width: 50%;" class="span12 bar"></div>
+                            <div style="width: 25%;" class="span12 bar"></div>
                         </div>
                     </div>
                 </div>