Changeset 38076 for gs3-installations


Ignore:
Timestamp:
2023-09-10T17:17:34+12:00 (9 months ago)
Author:
davidb
Message:

Range of changes based on v1 feedback from Vicki, and some initial WCAG testing

Location:
gs3-installations/thewillow/trunk/interfaces/thewillow
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • gs3-installations/thewillow/trunk/interfaces/thewillow/js/thumbnail-timeline.js

    r37951 r38076  
    1919
    2020    //content.push( "<h3> Play from: " + mins_and_secs_str +"</h3>" );
    21     content.push( "<img onclick=\"seekThenPlayVideo('video-feature'," + all_in_secs + ")\" src=\""+thumbnail_url+"\"/>" );
     21    content.push( "<img onclick=\"seekThenPlayVideo('video-feature'," + all_in_secs + ")\" src=\""+thumbnail_url+"\" alt=\"" + opt_caption + "\" />" );
    2222    content.push( "<p><i>"+mins_and_secs_str + ": " + opt_caption+"</i></p>" );
    2323   

  • gs3-installations/thewillow/trunk/interfaces/thewillow/static-html/supporting_files/style.css

    r37986 r38076  
    1818h3 {color: var(--primary-colour); font-size: 28px; margin-bottom: 0}
    1919hr {color: #EEE}
    20 p {line-height: 150%}
     20p {line-height: 175%} /* GS3, changed from 150% to 175% on require of ThomFong */
    2121span.blockquote-source {display: block; font-style: normal; font-size: 16px; font-weight: bold; text-align: right}
    2222span.intro {color: var(--secondary-colour); font-size: 22px; font-weight: bold}

  • gs3-installations/thewillow/trunk/interfaces/thewillow/style/core-extra.css

    r37987 r38076  
    139139    font-weight: normal;
    140140    color: #000000 !important;
     141    line-height: 120%;
    141142}
    142143

  • gs3-installations/thewillow/trunk/interfaces/thewillow/transform/layouts/header.xsl

    r37987 r38076  
    291291        <div style="float: right">
    292292          <br />
    293           <img src="interfaces/thewillow/images/streetlife-york-logocircle.png"/>
     293          <img alt="" src="interfaces/thewillow/images/streetlife-york-logocircle.png"/>
    294294        </div>
    295295      </div>
    … …  
    481481
    482482        <xsl:if test="/page/pageRequest/@action = 'd'">
    483           <xsl:if test="/page/pageRequest/paramList/param[@name='d']/@value = 'In-The-Beginning-Video'">
    484             #new-banner {
    485               background-image: url(interfaces/<xsl:value-of select="$interface_name"/>/images/banner-images/3-Soo-and-Tommy-in-the-Willow-Restaurant-%20Vicki-Fong.png);
    486         }
    487           </xsl:if>
    488           <xsl:if test="/page/pageRequest/paramList/param[@name='d']/@value = 'Willow-Girl-Video'">
    489             #new-banner {
    490               background-image: url(interfaces/<xsl:value-of select="$interface_name"/>/images/banner-images/4-I-love-Willow-The-Tab.png);
    491         }
    492           </xsl:if>
    493           <xsl:if test="/page/pageRequest/paramList/param[@name='d']/@value = 'Love-It-Video'">
    494             #new-banner {
    495               background-image: url(interfaces/<xsl:value-of select="$interface_name"/>/images/banner-images/5-love-it-Ceri-Oakes.png);
    496         }
    497           </xsl:if>
    498           <xsl:if test="/page/pageRequest/paramList/param[@name='d']/@value = 'Cheap-Drinks-Video'">
    499             #new-banner {
    500               background-image: url(interfaces/<xsl:value-of select="$interface_name"/>/images/banner-images/6-cheap-drinks-Ceri-Oakes.png);
    501         }
    502           </xsl:if>
    503           <xsl:if test="/page/pageRequest/paramList/param[@name='d']/@value = 'Cheesy-Music-Video'">
    504             #new-banner {
    505               background-image: url(interfaces/<xsl:value-of select="$interface_name"/>/images/banner-images/7-Cheesy-Music.png);
    506         }
    507           </xsl:if>
    508           <xsl:if test="/page/pageRequest/paramList/param[@name='d']/@value = 'The-Last-Night-Video'">
    509             #new-banner {
    510               background-image: url(interfaces/<xsl:value-of select="$interface_name"/>/images/banner-images/8-The-Last-Night.png);
    511         }
    512           </xsl:if>
     483          <xsl:choose>     
     484        <xsl:when test="/page/pageRequest/paramList/param[@name='d']/@value = 'In-The-Beginning-Video'">
     485              #new-banner {
     486                background-image: url(interfaces/<xsl:value-of select="$interface_name"/>/images/banner-images/3-Soo-and-Tommy-in-the-Willow-Restaurant-%20Vicki-Fong.png);
     487          }
     488        </xsl:when>
     489        <xsl:when test="/page/pageRequest/paramList/param[@name='d']/@value = 'Willow-Girl-Video'">
     490              #new-banner {
     491                background-image: url(interfaces/<xsl:value-of select="$interface_name"/>/images/banner-images/4-I-love-Willow-The-Tab.png);
     492          }
     493        </xsl:when>
     494        <xsl:when test="/page/pageRequest/paramList/param[@name='d']/@value = 'Love-It-Video'">
     495              #new-banner {
     496                background-image: url(interfaces/<xsl:value-of select="$interface_name"/>/images/banner-images/5-love-it-Ceri-Oakes.png);
     497          }
     498        </xsl:when>
     499        <xsl:when test="/page/pageRequest/paramList/param[@name='d']/@value = 'Cheap-Drinks-Video'">
     500              #new-banner {
     501                background-image: url(interfaces/<xsl:value-of select="$interface_name"/>/images/banner-images/6-cheap-drinks-Ceri-Oakes.png);
     502          }
     503        </xsl:when>
     504        <xsl:when test="/page/pageRequest/paramList/param[@name='d']/@value = 'Cheesy-Music-Video'">
     505              #new-banner {
     506                background-image: url(interfaces/<xsl:value-of select="$interface_name"/>/images/banner-images/7-Cheesy-Music.png);
     507          }
     508        </xsl:when>
     509        <xsl:when test="/page/pageRequest/paramList/param[@name='d']/@value = 'The-Last-Night-Video'">
     510              #new-banner {
     511                background-image: url(interfaces/<xsl:value-of select="$interface_name"/>/images/banner-images/8-The-Last-Night.png);
     512          }
     513        </xsl:when>
     514        <xsl:otherwise>
     515              #new-banner {
     516                background-image: url(interfaces/<xsl:value-of select="$interface_name"/>/images/banner-images/1-Willow-Exterior-York-Press.png);
     517          }     
     518        </xsl:otherwise>
     519          </xsl:choose>
     520         
    513521        </xsl:if>
    514522
    … …  
    612620    <div style="float: right">
    613621      <!-- <br /> -->
    614       <img height="240" src="interfaces/thewillow/images/willow-streetlife-motif-logo-vicki-fong-2023.png"/>
     622      <img alt="" height="240" src="interfaces/thewillow/images/willow-streetlife-motif-logo-vicki-fong-2023.png"/>
    615623      <div style="position: absolute; right: 1rem; bottom: -1.5rem; font-size: 80%; font-style:italic;">
    616624        <xsl:comment>non-collapsing filler</xsl:comment>

  • gs3-installations/thewillow/trunk/interfaces/thewillow/transform/layouts/main.xsl

    r37987 r38076  
    8282      display: flex;
    8383          justify-content: center;
    84           align-items: center;
     84          align-items: end; /* used to be center */
    8585
    8686      float: left;
    87       width: 15%;
     87      width: 13.5%; /* used to be 15% */
    8888          height: 100px;
    8989    }
    … …  
    148148          <br id="br-beforeDMLogos"/>
    149149          <a target="_blank" href="https://exploreyork.org.uk/">
    150         <img width="32" src="interfaces/{$interface_name}/images/footer-logos/Facebook logo.png"/>
     150        <img width="32" alt="Goto Facebook"  src="interfaces/{$interface_name}/images/footer-logos/Facebook logo.png"/>
    151151          </a>
    152152          <a target="_blank" href="https://www.instagram.com/streetlifeyork/">
    153         <img width="32" src="interfaces/{$interface_name}/images/footer-logos/Instagram logo.png"/>
     153        <img width="32" alt="Goto Instagram" src="interfaces/{$interface_name}/images/footer-logos/Instagram logo.png"/>
    154154          </a>
    155155          <a target="_blank" href="https://twitter.com/StreetLifeYork/">
    156         <img width="32" src="interfaces/{$interface_name}/images/footer-logos/Twitter logo.png"/>
     156        <img width="32" alt="Goto Twitter"   src="interfaces/{$interface_name}/images/footer-logos/Twitter logo.png"/>
    157157          </a>
    158158         
    … …  
    165165
    166166      <div style="padding-top: 1rem; padding-bottom: 1rem; valign: middle;">
    167         <div class="ftlogo-column" style="width: 6%;"><xsl:text disable-output-escaping="yes">&amp;nbsp;</xsl:text></div>
     167        <div class="ftlogo-column" style="width: 8%;"><xsl:text disable-output-escaping="yes">&amp;nbsp;</xsl:text></div> <!-- used to be 6% -->
    168168        <div class="ftlogo-column">
    169169          <a target="_blank" href="https://www.streetlifeyork.uk/">
    170         <img height="80" src="interfaces/{$interface_name}/images/footer-logos/1 StreetLife-logo.png"/>
     170        <img height="80"
     171             alt="Streetlife York Logo"         
     172             src="interfaces/{$interface_name}/images/footer-logos/1 StreetLife-logo.png"/>
    171173          </a>
    172174        </div>
    173175        <div class="ftlogo-column">
    174176          <a target="_blank" href="https://www.streetlifeyork.uk/">
    175           <img height="60" src="interfaces/{$interface_name}/images/footer-logos/2 UOY-Logo-Stacked-shield-Black.png"/>
     177        <img height="45" style="margin-bottom: 5px;"
     178             alt="University of York Logo"
     179             src="interfaces/{$interface_name}/images/footer-logos/2 UOY-Logo-Stacked-shield-Black.png"/><!-- used to be 60 -->
    176180          </a>
    177181        </div>
    178182        <div class="ftlogo-column">   
    179183          <a target="_blank" href="https://www.streetlifeyork.uk/">
    180           <img height="40" src="interfaces/{$interface_name}/images/footer-logos/3 UK-Research-and-Innovation-(UKRI).png"/>
     184        <img height="33" style="margin-bottom: 14px;"
     185             alt="UK Research and Innovation Logo"
     186             src="interfaces/{$interface_name}/images/footer-logos/3 UK-Research-and-Innovation-(UKRI).png"/> <!-- used to be 40 -->
    181187          </a>
    182188        </div>
    183189        <div class="ftlogo-column">   
    184190          <a target="_blank" href="http://thomfong.com/">
    185           <img height="80" src="interfaces/{$interface_name}/images/footer-logos/4 ThomFong-illustrated-small-logo.png"/>
     191        <img height="80"
     192             alt="ThomFong Logo"
     193             src="interfaces/{$interface_name}/images/footer-logos/4 ThomFong-illustrated-small-logo.png"/>
    186194          </a>
    187195        </div>
    188196        <div class="ftlogo-column">   
    189197          <a target="_blank" href="https://exploreyork.org.uk/">
    190           <img height="80" src="interfaces/{$interface_name}/images/footer-logos/5 Explore-LibArch-coloured.png"/>
     198        <img height="45"  style="margin-bottom: 7px;"
     199             alt="Explore Libraries and Archives Logo"
     200             src="interfaces/{$interface_name}/images/footer-logos/5 Explore-LibArch-coloured.png"/> <!-- used to be 80 -->
    191201          </a>       
    192202        </div>
    193203        <div class="ftlogo-column">   
    194           <div>
     204          <div style="margin-bottom: -2px">
    195205        <a target="_blank" href="https://www.greenstone.org/">
    196           <img height="85" src="interfaces/{$interface_name}/images/footer-logos/6 gsdl-server.png"/><br />
     206          <img height="55"
     207               alt="Greenstone Digital Library Software Logo"
     208               src="interfaces/{$interface_name}/images/footer-logos/6 gsdl-server.png"/><!-- used to be 85 -->
    197209        </a>
    198210        <a target="_blank" href="https://www.greenstone.org/">
    199           <div style="font-size:120%">Greenstone</div>
     211          <div style="font-size:120%">Greenstone</div> 
    200212        </a>
    201213          </div>

  • gs3-installations/thewillow/trunk/interfaces/thewillow/transform/pages/query.xsl

    r37987 r38076  
    1919      <form id="QueryForm" name="QueryForm" method="get" action="{$form_action}"
    2020         onsubmit="return twFormToGSQuery()"
    21         style="width: 100%; background-color: #E6E6E6; margin-top: 1.5rem; padding: 0 1.5rem 1.5rem 1.5rem;">
     21        style="width: 100%; background-color: #E6E6E6; margin-top: 1.5rem; padding: 1.0rem 2.0rem 2.0rem 2.0rem;">
    2222    <div>
    2323      <input type="hidden" name="a" value="q"/>
    … …  
    7676          float: left;
    7777          width: 33%;
    78           padding-bottom: 1.0rem;
     78          padding-bottom: 1.2rem;
    7979        }
    8080
    … …  
    9696
    9797      <div class="exploremore-row">
    98         <div style="float: left; width: 20%;">
    99           <b>Keywords</b>
     98        <div style="float: left; width: 20%; margin-top: 0.5rem;">
     99          <label for="fulltext-search-terms"><b style="font-size: 120%">Keyword(s)</b></label>
    100100        </div>
    101101        <div style="float: left; width: 80%">
    … …  
    103103          <input type="hidden" name="s1.fqv" value="" class="fulltext-query-term"/>
    104104          <input type="hidden" name="s1.fqf" value="TE"/>         
    105           <input style="width: 100%;" type="text" id="fulltext-search-terms"/>
     105          <input style="width: 100%; font-size: 110%; padding: 0.5rem;" type="text" id="fulltext-search-terms"/>
    106106        </div>
    107107      </div>
    108108     
    109       <div class="exploremore-row">
     109      <div class="exploremore-row" style="margin-top: 2rem;">
    110110        <div style="float: left; width: 20%;">
    111           <b>Category</b>
     111          <b style="font-size: 120%;">Category</b>
    112112        </div>
    113113        <div style="float: left; width: 80%">
Note: See TracChangeset for help on using the changeset viewer.