Changeset 4440


Ignore:
Timestamp:
02/05/14 10:24:07 (10 years ago)
Author:
andmor
Message:

Updated to AngularJS 1.2.11
UserService? on index.html now created using sloot.dpml

Location:
cats/SCHEMAcat/trunk/urn.org.isocat.schemacat.site/site
Files:
13 added
4 deleted
4 edited

Legend:

Unmodified
Added
Removed

  • cats/SCHEMAcat/trunk/urn.org.isocat.schemacat.site/site/completeuserdetails.html

    r4371 r4440  
    6969        <!-- Placed at the end of the document so the pages load faster -->
    7070        <!--<script src="./lib/jQuery/1.10.2/jquery-1.10.2.min.js"></script>-->
    71         <script src="./lib/AngularJS-1.2.10/angular.min.js"></script>
    72         <script src="./lib/AngularJS-1.2.10/angular-resource.min.js"></script>
    73         <script src="./lib/AngularJS-1.2.10/angular-route.min.js"></script>
     71        <script src="./lib/AngularJS-1.2.11/angular.min.js"></script>
     72        <script src="./lib/AngularJS-1.2.11/angular-resource.min.js"></script>
     73        <script src="./lib/AngularJS-1.2.11/angular-route.min.js"></script>
    7474        <script src="./lib/UI-bootstrap/ui-bootstrap-tpls-0.10.0.min.js"></script>
    7575        <script src="./scripts/modules.min.js"></script>

  • cats/SCHEMAcat/trunk/urn.org.isocat.schemacat.site/site/index.html

    r4371 r4440  
    5050                                                <ul class="dropdown-menu">
    5151                                                    <li>
    52                                                         <!-- <a class="cursor-pointer" data-ng-click="loginClick()">  -->
    53                                                         <a href="{{shibURL}}"><!-- uncomment first one for development -->
     52                                                        <!-- uncomment the first of the following two lines for development -->
     53                                                        <!-- <a class="cursor-pointer" data-ng-click="loginClick()"> -->
     54                                                        <a href="{{shibURL}}">
    5455                                                            <i class="glyphicon glyphicon-log-in"><!--i--></i>
    5556                                                            <span>&#160;Login as a different user...</span>
    … …  
    9899        <!-- Placed at the end of the document so the pages load faster -->
    99100        <!--<script src="./lib/jQuery/1.10.2/jquery-1.10.2.min.js"></script>-->
    100         <script src="./lib/AngularJS-1.2.10/angular.min.js"></script>
    101         <script src="./lib/AngularJS-1.2.10/angular-resource.min.js"></script>
    102         <script src="./lib/AngularJS-1.2.10/angular-route.min.js"></script>
     101        <script src="./lib/AngularJS-1.2.11/angular.min.js"></script>
     102        <script src="./lib/AngularJS-1.2.11/angular-resource.min.js"></script>
     103        <script src="./lib/AngularJS-1.2.11/angular-route.min.js"></script>
    103104        <script src="./lib/UI-bootstrap/ui-bootstrap-tpls-0.10.0.min.js"></script>
    104105        <script src="./lib/pretify/prettify.js"></script>
    … …  
    110111            <xrl:eval xmlns:xrl="http://netkernel.org/xrl">
    111112                <xrl:xpath>..</xrl:xpath>
    112                 <xrl:identifier>active:dpml</xrl:identifier>
     113                <xrl:identifier>active:sloot.dpml</xrl:identifier>
    113114                <xrl:argument name="user">scratch:user</xrl:argument>
    114115                <!-- get the user id -->

  • cats/SCHEMAcat/trunk/urn.org.isocat.schemacat.site/site/test/e2e/runner.html

    r4371 r4440  
    44    <title>SCHEMAcat end2end Test Runner</title>
    55    <meta charset="utf-8"/>
    6     <script src="../lib/AngularJS-1.2.10/angular-scenario.js" data-ng-autotest=""></script>
     6    <script src="../lib/AngularJS-1.2.11/angular-scenario.js" data-ng-autotest=""></script>
    77    <script src="../lib/window-dialog-commands.js" data-ng-autotest=""></script>
    88    <script src="scenarios.js"></script>

  • cats/SCHEMAcat/trunk/urn.org.isocat.schemacat.site/site/test/karma/karma.config.js

    r4371 r4440  
    1515    // list of files / patterns to load in the browser
    1616    files: [
    17       'lib/AngularJS-1.2.10/angular.js',
    18       'lib/AngularJS-1.2.10/angular-route.js',
    19       'lib/AngularJS-1.2.10/angular-resource.js',
     17      'lib/AngularJS-1.2.11/angular.js',
     18      'lib/AngularJS-1.2.11/angular-route.js',
     19      'lib/AngularJS-1.2.11/angular-resource.js',
    2020      'lib/UI-bootstrap/ui-bootstrap-tpls-0.10.0.js',
    21       'test/lib/AngularJS-1.2.10/angular-mocks.js',
     21      'test/lib/AngularJS-1.2.11/angular-mocks.js',
    2222      'scripts/modules.js',
    2323      'scripts/controllers.js',
Note: See TracChangeset for help on using the changeset viewer.