Ignore:
Timestamp:
12/17/15 10:55:41 (8 years ago)
Author:
Twan Goosen
Message:

merged various changes into 2.0 branch

Location:
ComponentRegistry/branches/ComponentRegistry-2.0
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • ComponentRegistry/branches/ComponentRegistry-2.0

  • ComponentRegistry/branches/ComponentRegistry-2.0/ComponentRegistry

  • ComponentRegistry/branches/ComponentRegistry-2.0/ComponentRegistry/src/main/webapp/META-INF/context.xml

    r5917 r6871  
    5050        Space-separated list of users (getRemoteUser()) that should have access to the admin area of the ComponentRegistry
    5151    -->
    52   <Parameter name="eu.clarin.cmdi.componentregistry.adminUsers" value="twagoo@mpi.nl olhsha@mpi.nl daan.broeder@mpi.nl dietuyt@mpi.nl Menzo.Windhouwer@mpi.nl"/>
     52  <Parameter name="eu.clarin.cmdi.componentregistry.adminUsers" value="twagoo@mpi.nl olhsha@mpi.nl daan.broeder@mpi.nl dietuyt@mpi.nl menwin@mpi.nl"/>
    5353  <!--
    5454        Location of the CMDI general component schema that validates component specifications
  • ComponentRegistry/branches/ComponentRegistry-2.0/ComponentRegistry/src/main/webapp/index.jsp

    r6592 r6871  
    2323            <input type="submit" value="Log in"/>
    2424        </form>
    25            
    26         <!-- Piwik -->
    27         <script type="text/javascript">
    28           var _paq = _paq || [];
    29           _paq.push(['trackPageView']);
    30           _paq.push(['enableLinkTracking']);
    31           (function() {
    32             var u="//stats.clarin.eu/";
    33             _paq.push(['setTrackerUrl', u+'piwik.php']);
    34             _paq.push(['setSiteId', 17]);
    35             var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
    36             g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
    37           })();
    38         </script>
    39         <noscript><p><img src="//stats.clarin.eu/piwik.php?idsite=17" style="border:0;" alt="" /></p></noscript>
    40         <!-- End Piwik Code -->
    41            
    42     </body>
     25
     26<!-- Piwik -->
     27<script type="text/javascript">
     28  var _paq = _paq || [];
     29  _paq.push(['trackPageView']);
     30  _paq.push(['enableLinkTracking']);
     31  (function() {
     32    var u="//stats.clarin.eu/";
     33    _paq.push(['setTrackerUrl', u+'piwik.php']);
     34    _paq.push(['setSiteId', 17]);
     35    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
     36    g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
     37  })();
     38</script>
     39<noscript><p><img src="//stats.clarin.eu/piwik.php?idsite=17" style="border:0;" alt="" /></p></noscript>
     40<!-- End Piwik Code -->
     41
     42</body>
    4343</html>
Note: See TracChangeset for help on using the changeset viewer.