Changeset 32094 for main/trunk

Show
Ignore:
Timestamp:
12.12.2017 11:14:26 (23 months ago)
Author:
kjdon
Message:

a couple of small changes. when you click on the screen image, open the full size one in a new window. add some space to document text if it was empty, to prevent empty div which results in ckeditor apllying to teh entire content, not just the small piece of text

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/web/interfaces/default/transform/pages/document.xsl

    r32072 r32094  
    9696    <xsl:template name="wrappedSectionTextForEditing"> 
    9797        <br /><br /> 
    98         <div id="text{@nodeID}" class="sectionText"><!-- *** --> 
     98        <div id="text{@nodeID}" class="sectionText" style="display:block;"><!-- *** --> 
    9999                        <xsl:attribute name="contenteditable"> 
    100100                    <xsl:text>true</xsl:text> 
     
    560560                    <div id="wrap{util:replace(@nodeID, '.', '_')}" class="zoomImage" style="position:relative; width: {$screenImageWidth}px; height: {$screenImageHeight}px;"> 
    561561                        <div id="small{util:replace(@nodeID, '.', '_')}" style="position:relative; width: {$screenImageWidth}px; height: {$screenImageHeight}px;"> 
    562                             <gsf:link type="source"><gsf:image type="screen"/></gsf:link> 
     562                            <gsf:link type="source" target="_blank"><gsf:image type="screen"/></gsf:link> 
    563563                        </div> 
    564564                        <div id="mover{util:replace(@nodeID, '.', '_')}" style="border: 1px solid green; position: absolute; top: 0; left: 0; width: 598px; height: 598px; overflow: hidden; z-index: 100; background: white; display: none;"> 
     
    651651    <!-- The default template for displaying the document node text in 
    652652    editing mode --> 
     653    <!-- Note: we need to put some content in if the nodeContent is empty, otherwise you end up with an empty div, it gets changed to <div> and the ckeditor ends up being attached to everything else afterwards. --> 
    653654    <!-- equivalent to gsf:text --> 
    654655    <xsl:template name="documentNodeTextForEditing"> 
    655656      <!-- Section text --> 
    656657      <xsl:for-each select="nodeContent"> 
     658        <xsl:if test="not(node())"><gsf:space/></xsl:if> 
    657659        <xsl:for-each select="node()"> 
    658660          <xsl:choose>