Changeset 26484 for main

Show
Ignore:
Timestamp:
20.11.2012 15:46:22 (7 years ago)
Author:
kjdon
Message:

putting lesser used text strings into interface_default2.properties - help and debug pages

Location:
main/trunk/greenstone3/web/interfaces/default/transform/pages
Files:
2 modified

Legend:

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

    r26144 r26484  
    1010    <!-- use the 'main' layout --> 
    1111    <xsl:include href="layouts/main.xsl"/> 
    12  
     12  <xsl:variable name="debug_property_file" select="concat($interface_name, '2')"/> 
    1313    <!-- set page title --> 
    1414    <xsl:template name="pageTitle"><gslib:collectionName/></xsl:template> 
     
    1919    <!-- the page content --> 
    2020    <xsl:template match="/page"> 
    21       <p><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'debuginfo.usage')"/></p> 
     21      <p><xsl:value-of select="util:getInterfaceText($debug_property_file, /page/@lang, 'debuginfo.usage')"/></p> 
    2222 
    2323      <dl> 
    2424        <dt>o=xml</dt> 
    25         <dd><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'debuginfo.xml')"/></dd> 
     25        <dd><xsl:value-of select="util:getInterfaceText($debug_property_file, /page/@lang, 'debuginfo.xml')"/></dd> 
    2626        <dt>o=xmlfinal</dt> 
    27         <dd><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'debuginfo.xmlfinal')"/></dd> 
     27        <dd><xsl:value-of select="util:getInterfaceText($debug_property_file, /page/@lang, 'debuginfo.xmlfinal')"/></dd> 
    2828        <dt>o=skindoc</dt> 
    29         <dd><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'debuginfo.skindoc')"/></dd> 
     29        <dd><xsl:value-of select="util:getInterfaceText($debug_property_file, /page/@lang, 'debuginfo.skindoc')"/></dd> 
    3030        <dt>o=skinandlib</dt> 
    31         <dd><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'debuginfo.skinandlib')"/></dd> 
     31        <dd><xsl:value-of select="util:getInterfaceText($debug_property_file, /page/@lang, 'debuginfo.skinandlib')"/></dd> 
    3232        <dt>o=skinandlibdoc</dt> 
    33         <dd><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'debuginfo.skinandlibdoc')"/></dd> 
     33        <dd><xsl:value-of select="util:getInterfaceText($debug_property_file, /page/@lang, 'debuginfo.skinandlibdoc')"/></dd> 
    3434        <dt>formatedit=on</dt> 
    35         <dd><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'debuginfo.formatedit')"/></dd> 
     35        <dd><xsl:value-of select="util:getInterfaceText($debug_property_file, /page/@lang, 'debuginfo.formatedit')"/></dd> 
    3636      </dl>    
    3737 
     
    3939 
    4040 
    41       <!-- better to do the following with a util:getInterfaceText() 
     41      <!-- better to do the following with a util:getInterfaceText 
    4242           so language independent --> 
    4343      <p>Refresh all the collection configuration files:</p> 
  • main/trunk/greenstone3/web/interfaces/default/transform/pages/help.xsl

    r25704 r26484  
    1010    <!-- use the 'main' layout --> 
    1111    <xsl:include href="layouts/main.xsl"/> 
    12  
     12  <xsl:variable name="help_interface_name" select="concat($interface_name, '2')"/> 
    1313    <!-- set page title --> 
    14     <xsl:template name="pageTitle"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'help_b')"/></xsl:template> 
     14    <xsl:template name="pageTitle"><xsl:value-of select="util:getInterfaceText($help_interface_name, /page/@lang, 'help_b')"/></xsl:template> 
    1515 
    1616    <!-- set page breadcrumbs --> 
     
    2525    <xsl:template match="page"> 
    2626        <xsl:call-template name="helpTopics"/> 
    27         <xsl:if test="/page/pageResponse/collection"> 
     27        <xsl:choose> 
     28      <xsl:when test="/page/pageResponse/collection"> 
    2829            <xsl:call-template name="findingInformationHelp"/> 
    29         </xsl:if> 
     30    </xsl:when> 
     31      <xsl:otherwise> 
     32    <xsl:call-template name="homePageHelp"/> 
     33    </xsl:otherwise> 
     34        </xsl:choose> 
    3035        <xsl:call-template name="readingDocsHelp"/> 
    3136        <xsl:call-template name="searchingHelp"/> 
     
    3742    </xsl:template> 
    3843 
     44  <xsl:template name="homePageHelp"> 
     45    home page help 
     46  </xsl:template> 
    3947    <xsl:template name="findingInformationHelp"> 
    4048        <xsl:variable name="searchEnabled"> 
     
    4957        </xsl:variable> 
    5058 
    51         <xsl:value-of disable-output-escaping="yes" select="util:getInterfaceText($interface_name, /page/@lang, 'help.findinginformationtitle')"/> 
    52         <xsl:value-of disable-output-escaping="yes" select="util:getInterfaceText($interface_name, /page/@lang, 'help.findinginformation', $searchEnabled + $numClassifiers)"/> 
     59        <xsl:value-of disable-output-escaping="yes" select="util:getInterfaceText($help_interface_name, /page/@lang, 'help.findinginformationtitle')"/> 
     60        <xsl:value-of disable-output-escaping="yes" select="util:getInterfaceText($help_interface_name, /page/@lang, 'help.findinginformation', $searchEnabled + $numClassifiers)"/> 
    5361         
    5462        <!-- using actual <ul> and <li> tags here would cause the XML parser to break --> 
     
    5664        <xsl:if test="$searchEnabled = 1"> 
    5765            <xsl:text disable-output-escaping="yes">&lt;li&gt;</xsl:text> 
    58             <xsl:value-of disable-output-escaping="yes" select="util:getInterfaceText($interface_name, /page/@lang, 'help.searchdesc')"/> 
     66            <xsl:value-of disable-output-escaping="yes" select="util:getInterfaceText($help_interface_name, /page/@lang, 'help.searchdesc')"/> 
    5967            <xsl:text disable-output-escaping="yes">&lt;/li&gt;</xsl:text> 
    6068        </xsl:if> 
     
    6270        <xsl:for-each select="/page/pageResponse/collection[@name=$collName]/serviceList/service[@name = 'ClassifierBrowse']/classifierList/classifier"> 
    6371            <xsl:text disable-output-escaping="yes">&lt;li&gt;</xsl:text> 
    64             <xsl:value-of disable-output-escaping="yes" select="util:getInterfaceText($interface_name, /page/@lang, 'help.browsedesc', ./displayItem[@name = 'name'])"/> 
     72            <xsl:value-of disable-output-escaping="yes" select="util:getInterfaceText($help_interface_name, /page/@lang, 'help.browsedesc', ./displayItem[@name = 'name'])"/> 
    6573            <xsl:text disable-output-escaping="yes">&lt;/li&gt;</xsl:text> 
    6674        </xsl:for-each> 
     
    6977     
    7078    <xsl:template name="readingDocsHelp"> 
    71         <xsl:value-of disable-output-escaping="yes" select="util:getInterfaceText($interface_name, /page/@lang, 'help.readingdocstitle')"/> 
    72         <xsl:value-of disable-output-escaping="yes" select="util:getInterfaceText($interface_name, /page/@lang, 'help.readingdocs')"/> 
     79        <xsl:value-of disable-output-escaping="yes" select="util:getInterfaceText($help_interface_name, /page/@lang, 'help.readingdocstitle')"/> 
     80        <xsl:value-of disable-output-escaping="yes" select="util:getInterfaceText($help_interface_name, /page/@lang, 'help.readingdocs')"/> 
    7381         
    7482        <table> 
    7583            <tr> 
    7684                <td colspan="2"><img src="interfaces/default/images/bookshelf.png"/></td> 
    77                 <td><xsl:value-of disable-output-escaping="yes" select="util:getInterfaceText($interface_name, /page/@lang, 'help.openbookshelf')"/></td> 
     85                <td><xsl:value-of disable-output-escaping="yes" select="util:getInterfaceText($help_interface_name, /page/@lang, 'help.openbookshelf')"/></td> 
    7886            </tr> 
    7987            <tr> 
    8088                <td><img src="interfaces/default/images/previous.png"/></td> 
    8189                <td><img src="interfaces/default/images/next.png"/></td> 
    82                 <td><xsl:value-of disable-output-escaping="yes" select="util:getInterfaceText($interface_name, /page/@lang, 'help.sectionarrows')"/></td> 
     90                <td><xsl:value-of disable-output-escaping="yes" select="util:getInterfaceText($help_interface_name, /page/@lang, 'help.sectionarrows')"/></td> 
    8391            </tr> 
    8492        </table> 
     
    8694     
    8795    <xsl:template name="searchingHelp"> 
    88         <xsl:value-of disable-output-escaping="yes" select="util:getInterfaceText($interface_name, /page/@lang, 'help.searchingtitle')"/> 
    89         <xsl:value-of disable-output-escaping="yes" select="util:getInterfaceText($interface_name, /page/@lang, 'help.searching')"/> 
     96        <xsl:value-of disable-output-escaping="yes" select="util:getInterfaceText($help_interface_name, /page/@lang, 'help.searchingtitle')"/> 
     97        <xsl:value-of disable-output-escaping="yes" select="util:getInterfaceText($help_interface_name, /page/@lang, 'help.searching')"/> 
    9098         
    91         <xsl:value-of disable-output-escaping="yes" select="util:getInterfaceText($interface_name, /page/@lang, 'help.querytermstitle')"/> 
    92         <xsl:value-of disable-output-escaping="yes" select="util:getInterfaceText($interface_name, /page/@lang, 'help.queryterms')"/> 
     99        <xsl:value-of disable-output-escaping="yes" select="util:getInterfaceText($help_interface_name, /page/@lang, 'help.querytermstitle')"/> 
     100        <xsl:value-of disable-output-escaping="yes" select="util:getInterfaceText($help_interface_name, /page/@lang, 'help.queryterms')"/> 
    93101         
    94         <xsl:value-of disable-output-escaping="yes" select="util:getInterfaceText($interface_name, /page/@lang, 'help.querytypetitle')"/> 
    95         <xsl:value-of disable-output-escaping="yes" select="util:getInterfaceText($interface_name, /page/@lang, 'help.querytype')"/> 
     102        <xsl:value-of disable-output-escaping="yes" select="util:getInterfaceText($help_interface_name, /page/@lang, 'help.querytypetitle')"/> 
     103        <xsl:value-of disable-output-escaping="yes" select="util:getInterfaceText($help_interface_name, /page/@lang, 'help.querytype')"/> 
    96104         
    97         <xsl:value-of disable-output-escaping="yes" select="util:getInterfaceText($interface_name, /page/@lang, 'help.queryscopetitle')"/> 
    98         <xsl:value-of disable-output-escaping="yes" select="util:getInterfaceText($interface_name, /page/@lang, 'help.queryscope')"/> 
     105        <xsl:value-of disable-output-escaping="yes" select="util:getInterfaceText($help_interface_name, /page/@lang, 'help.queryscopetitle')"/> 
     106        <xsl:value-of disable-output-escaping="yes" select="util:getInterfaceText($help_interface_name, /page/@lang, 'help.queryscope')"/> 
    99107    </xsl:template> 
    100108     
    101109    <xsl:template name="preferencesHelp"> 
    102         <xsl:value-of disable-output-escaping="yes" select="util:getInterfaceText($interface_name, /page/@lang, 'help.changingpreferencestitle')"/> 
    103         <xsl:value-of disable-output-escaping="yes" select="util:getInterfaceText($interface_name, /page/@lang, 'help.changingpreferences')"/> 
     110        <xsl:value-of disable-output-escaping="yes" select="util:getInterfaceText($help_interface_name, /page/@lang, 'help.changingpreferencestitle')"/> 
     111        <xsl:value-of disable-output-escaping="yes" select="util:getInterfaceText($help_interface_name, /page/@lang, 'help.changingpreferences')"/> 
    104112         
    105         <xsl:value-of disable-output-escaping="yes" select="util:getInterfaceText($interface_name, /page/@lang, 'help.collectionpreferencestitle')"/> 
    106         <xsl:value-of disable-output-escaping="yes" select="util:getInterfaceText($interface_name, /page/@lang, 'help.collectionpreferences')"/> 
     113        <xsl:value-of disable-output-escaping="yes" select="util:getInterfaceText($help_interface_name, /page/@lang, 'help.collectionpreferencestitle')"/> 
     114        <xsl:value-of disable-output-escaping="yes" select="util:getInterfaceText($help_interface_name, /page/@lang, 'help.collectionpreferences')"/> 
    107115         
    108         <xsl:value-of disable-output-escaping="yes" select="util:getInterfaceText($interface_name, /page/@lang, 'help.languagepreferencestitle')"/> 
    109         <xsl:value-of disable-output-escaping="yes" select="util:getInterfaceText($interface_name, /page/@lang, 'help.languagepreferences')"/> 
     116        <xsl:value-of disable-output-escaping="yes" select="util:getInterfaceText($help_interface_name, /page/@lang, 'help.languagepreferencestitle')"/> 
     117        <xsl:value-of disable-output-escaping="yes" select="util:getInterfaceText($help_interface_name, /page/@lang, 'help.languagepreferences')"/> 
    110118         
    111         <xsl:value-of disable-output-escaping="yes" select="util:getInterfaceText($interface_name, /page/@lang, 'help.presentationpreferencestitle')"/> 
    112         <xsl:value-of disable-output-escaping="yes" select="util:getInterfaceText($interface_name, /page/@lang, 'help.presentationpreferences')"/> 
     119        <xsl:value-of disable-output-escaping="yes" select="util:getInterfaceText($help_interface_name, /page/@lang, 'help.presentationpreferencestitle')"/> 
     120        <xsl:value-of disable-output-escaping="yes" select="util:getInterfaceText($help_interface_name, /page/@lang, 'help.presentationpreferences')"/> 
    113121         
    114         <xsl:value-of disable-output-escaping="yes" select="util:getInterfaceText($interface_name, /page/@lang, 'help.searchpreferencestitle')"/> 
    115         <xsl:value-of disable-output-escaping="yes" select="util:getInterfaceText($interface_name, /page/@lang, 'help.searchpreferences1')"/> 
     122        <xsl:value-of disable-output-escaping="yes" select="util:getInterfaceText($help_interface_name, /page/@lang, 'help.searchpreferencestitle')"/> 
     123        <xsl:value-of disable-output-escaping="yes" select="util:getInterfaceText($help_interface_name, /page/@lang, 'help.searchpreferences1')"/> 
    116124        <xsl:if test="/page/pageResponse/collection[@name=$collName and (@type='mgpp' or @type='mg')]"> 
    117             <xsl:value-of disable-output-escaping="yes" select="util:getInterfaceText($interface_name, /page/@lang, 'help.mgsearchpreferences')"/> 
     125            <xsl:value-of disable-output-escaping="yes" select="util:getInterfaceText($help_interface_name, /page/@lang, 'help.mgsearchpreferences')"/> 
    118126        </xsl:if> 
    119         <xsl:value-of disable-output-escaping="yes" select="util:getInterfaceText($interface_name, /page/@lang, 'help.searchpreferences2')"/> 
     127        <xsl:value-of disable-output-escaping="yes" select="util:getInterfaceText($help_interface_name, /page/@lang, 'help.searchpreferences2')"/> 
    120128    </xsl:template> 
    121129</xsl:stylesheet>