Changeset 63

Show
Ignore:
Timestamp:
02/01/06 23:00:26
Author:
douglm
Message:

Renamed all en_US directories as default.
Changed XSLT code to try locale first then "default"

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/calendar3

    • Property svn:ignore changed from dist to dist temp .settings .classpath .project

  • trunk/calendar3/common/src/edu/rpi/sss/util/servlets/XSLTFilterConfigInfo.java

    r2 r63  
    7878  /** Try to obtain from Locale.getDefault() 
    7979   */ 
    80   private static final String localeInfoDefault; 
    8180  private static final Locale localeDefault = Locale.getDefault(); 
    8281  private static final String langDefault; 
    8382  private static final String countryDefault; 
    8483 
     84  //private static final String localeInfoDefault; 
    8585  static { 
    8686    langDefault = localeDefault.getLanguage(); 
    8787    countryDefault = localeDefault.getCountry(); 
    8888 
    89     localeInfoDefault = makeLocale(langDefault, countryDefault); 
    90   } 
    91  
     89    //localeInfoDefault = makeLocale(langDefault, countryDefault); 
     90  } 
     91 
     92  private static final String localeInfoDefault = "default"; 
    9293  private static final String browserTypeDefault = "default"; 
    9394  private static final String skinNameDefault = "default"; 

  • trunk/calendar3/config/src/org/bedework/webconfig/collections/Globals.java

    r2 r63  
    7171    super("globals", "global"); 
    7272 
    73     addProperty(new ConfigProperty("version", "version", true)); 
     73    addProperty(new ConfigProperty("system.name", "system.name", true)); 
    7474 
    7575    addProperty(new ConfigProperty("hibernate.dialect", "hibernate.dialect", true)); 
    7676 
    77     addProperty(new ConfigProperty("systemid", "systemid", true)); 
    78  
    79     addProperty(new BooleanProperty("dirbrowsingDisallowed", 
    80                                          "directory.browsing.disallowed", 
    81                                          true)); 
    82  
    83     addProperty(new IntProperty("http.connections.peruser", "http connections per user", true, true)); 
    84  
    85     addProperty(new IntProperty("http.connections.perhost", "http connections per host", true, true)); 
    86  
    87     addProperty(new IntProperty("http.connections", "http connections", true, true)); 
    88  
    89     addProperty(new ConfigProperty("public.calroot", "public.calroot", 
    90                                    true, true)); 
    91  
    92     addProperty(new ConfigProperty("user.calroot", "user.calroot", 
    93                                    true, true)); 
    94  
    95     addProperty(new ConfigProperty("default.user.calendar", 
    96                                    "default.user.calendar", true)); 
    97  
    98     addProperty(new ConfigProperty("public.user", "public.user", true, true)); 
    99  
    100     addProperty(new ConfigProperty("userauthclass", "userauthclass", true)); 
    101  
    102     addProperty(new ConfigProperty("mailerclass", "mailerclass", true)); 
    103  
    10477    addProperty(new ConfigProperty("calintfclass", "calintfclass", true)); 
    105  
    106     addProperty(new IntProperty("update.check.interval", "update.check.interval", true)); 
    107  
    108     addProperty(new ConfigProperty("admingroupsclass", "admingroupsclass", true)); 
    109  
    110     addProperty(new ConfigProperty("usergroupsclass", "usergroupsclass", true)); 
    11178  } 
    11279} 

  • trunk/calendar3/deployment/webadmin/webapp/resources/default/default/default.xsl

    r62 r63  
    128128        <title>Calendar Admin: Events Calendar Administration</title> 
    129129        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> 
    130         <link rel="stylesheet" href="{$resourcesRoot}/en_US/default/default.css"/> 
     130        <link rel="stylesheet" href="{$resourcesRoot}/default/default/default.css"/> 
    131131        <xsl:if test="/bedeworkadmin/page='modEvent'"> 
    132132          <script language="JavaScript" type="text/javascript" src="{$resourcesRoot}/resources/includes.js"></script> 

  • trunk/calendar3/deployment/webadmin/webapp/resources/default/default/defaultSatish.xsl

    r2 r63  
    126126        <title>Calendar Admin: Events Calendar Administration</title> 
    127127        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> 
    128         <link rel="stylesheet" href="{$resourcesRoot}/en_US/default/default.css"/> 
     128        <link rel="stylesheet" href="{$resourcesRoot}/default/default/default.css"/> 
    129129        <xsl:if test="/bedeworkadmin/page='modEvent'"> 
    130           <script language="JavaScript" type="text/javascript" src="{$resourcesRoot}/en_US/default/includes.js"></script> 
     130          <script language="JavaScript" type="text/javascript" src="{$resourcesRoot}/default/default/includes.js"></script> 
    131131          <script language="JavaScript" type="text/javascript"> 
    132          var location = new Array(<xsl:for-each select="/bedeworkadmin/formElements/location/all/select/option">'<xsl:value-of select="."/>'<xsl:if test="position()!=last()">,</xsl:if></xsl:for-each>); 
    133          </script> 
     132    var location = new Array(<xsl:for-each select="/bedeworkadmin/formElements/location/all/select/option">'<xsl:value-of select="."/>'<xsl:if test="position()!=last()">,</xsl:if></xsl:for-each>); 
     133    </script> 
    134134        </xsl:if> 
    135135        <!--<link rel="icon" type="image/ico" href="{}/favicon.ico" />--> 
    136136 
    137        <script type='text/javascript' src="{$resourcesRoot}/en_US/default/AutoComplete.js"></script> 
     137  <script type='text/javascript' src="{$resourcesRoot}/default/default/AutoComplete.js"></script> 
    138138      </head> 
    139139      <body> 

  • trunk/calendar3/deployment/webconfig/webapp/resources/default/default/default.xsl

    r2 r63  
    4242      <head> 
    4343        <title>Bedework: open-source institutional events calendar - <xsl:value-of select="$currentView"/></title> 
    44         <link rel="stylesheet" type="text/css" media="screen,all" href="{$appRoot}/en_US/default/bedeworkConfig.css"/> 
     44        <link rel="stylesheet" type="text/css" media="screen,all" href="{$appRoot}/default/default/bedeworkConfig.css"/> 
    4545        <script language="JavaScript" type="text/javascript"> 
    4646          <![CDATA[ 

  • trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/default.xsl

    r43 r63  
    104104        <xsl:choose> 
    105105          <xsl:when test="/ucalendar/appvar[key='style']/value='red'"> 
    106             <link rel="stylesheet" href="{$resourcesRoot}/en_US/default/red.css"/> 
     106            <link rel="stylesheet" href="{$resourcesRoot}/default/default/red.css"/> 
    107107          </xsl:when> 
    108108          <xsl:when test="/ucalendar/appvar[key='style']/value='blue'"> 
    109             <link rel="stylesheet" href="{$resourcesRoot}/en_US/default/blue.css"/> 
     109            <link rel="stylesheet" href="{$resourcesRoot}/default/default/blue.css"/> 
    110110          </xsl:when> 
    111111          <xsl:otherwise> 
    112             <link rel="stylesheet" href="{$resourcesRoot}/en_US/default/green.css"/> 
     112            <link rel="stylesheet" href="{$resourcesRoot}/default/default/green.css"/> 
    113113          </xsl:otherwise> 
    114114        </xsl:choose> 
    115         <link rel="stylesheet" type="text/css" media="print" href="{$resourcesRoot}/en_US/default/print.css" /> 
     115        <link rel="stylesheet" type="text/css" media="print" href="{$resourcesRoot}/default/default/print.css" /> 
    116116      </head> 
    117117      <body> 

  • trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/rensselaer.xsl

    r2 r63  
    148148  <xsl:template name="headSection"> 
    149149     <title>Rensselaer Calendar of Events</title> 
    150       <link rel="stylesheet" href="{$resourcesRoot}/en_US/default/rensselaer.css"/> 
     150      <link rel="stylesheet" href="{$resourcesRoot}/default/default/rensselaer.css"/> 
    151151      <meta name="robots" content="noindex,nofollow"/> 
    152       <link rel="stylesheet" type="text/css" media="print" href="{$resourcesRoot}/en_US/default/rensselaer-print.css" /> 
     152      <link rel="stylesheet" type="text/css" media="print" href="{$resourcesRoot}/default/default/rensselaer-print.css" /> 
    153153      <link rel="icon" type="image/ico" href="http://www.rpi.edu/x/favicon.ico" /> 
    154154      <script language="JavaScript"> 

  • trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/washington.xsl

    r2 r63  
    9898      </xsl:if> 
    9999    </title> 
    100     <link rel="stylesheet" href="{$resourcesRoot}/en_US/default/washington.css" /> 
     100    <link rel="stylesheet" href="{$resourcesRoot}/default/default/washington.css" /> 
    101101  </xsl:template> 
    102102 

  • trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl

    r2 r63  
    169169  <xsl:template name="headSection"> 
    170170     <title>Bedework: Personal Calendar Client</title> 
    171       <link rel="stylesheet" href="{$resourcesRoot}/en_US/default/default.css"/> 
     171      <link rel="stylesheet" href="{$resourcesRoot}/default/default/default.css"/> 
    172172      <meta name="robots" content="noindex,nofollow"/> 
    173       <link rel="stylesheet" type="text/css" media="print" href="{$resourcesRoot}/en_US/default/print.css" /> 
     173      <link rel="stylesheet" type="text/css" media="print" href="{$resourcesRoot}/default/default/print.css" /> 
    174174      <!--<link rel="icon" type="image/ico" href="{}/favicon.ico" />--> 
    175175      <script language="JavaScript"> 

  • trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/rensselaer.xsl

    r2 r63  
    164164  <xsl:template name="headSection"> 
    165165     <title>Rensselaer Personal Calendar</title> 
    166       <link rel="stylesheet" href="{$resourcesRoot}/en_US/default/rensselaer.css"/> 
     166      <link rel="stylesheet" href="{$resourcesRoot}/default/default/rensselaer.css"/> 
    167167      <meta name="robots" content="noindex,nofollow"/> 
    168       <link rel="stylesheet" type="text/css" media="print" href="{$resourcesRoot}/en_US/default/rensselaer-print.css" /> 
     168      <link rel="stylesheet" type="text/css" media="print" href="{$resourcesRoot}/default/default/rensselaer-print.css" /> 
    169169      <link rel="icon" type="image/ico" href="http://www.rpi.edu/favicon.ico" /> 
    170170      <script language="JavaScript"> 

  • trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/washington.xsl

    r2 r63  
    144144          </xsl:choose> 
    145145        </title> 
    146         <link rel="stylesheet" href="{$resourcesRoot}/en_US/default/washington.css" /> 
     146        <link rel="stylesheet" href="{$resourcesRoot}/default/default/washington.css" /> 
    147147  </xsl:template> 
    148148