diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2016-02-15 14:42:27 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2016-02-15 14:42:27 +0100 |
| commit | 5b452bc093ebaca4dd95955bd47417d187968352 (patch) | |
| tree | f8a3ddace9bcbff466793291121bb60fc2604d01 /templates/main.php | |
| parent | fde119e5fb41323a323380b9d62ab4ac5215325f (diff) | |
| parent | f27619250b4124b53b952938b2efa7096ea345c2 (diff) | |
Merge pull request #33 from owncloud/remove-ui-router
Remove ui-router
Diffstat (limited to 'templates/main.php')
| -rw-r--r-- | templates/main.php | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/templates/main.php b/templates/main.php index a739a8ea..e232a439 100644 --- a/templates/main.php +++ b/templates/main.php @@ -1,11 +1,18 @@ <?php +// angular + components script('contactsrework', 'vendor/angular/angular'); -script('contactsrework', 'vendor/angular-ui-router/release/angular-ui-router'); -script('contactsrework', 'vendor/dav/dav'); -script('contactsrework', 'vendor/vcard/src/vcard'); +script('contactsrework', 'vendor/angular-route/angular-route'); script('contactsrework', 'vendor/angular-uuid4/angular-uuid4'); script('contactsrework', 'vendor/angular-cache/dist/angular-cache'); + +// DAV libraries +script('contactsrework', 'vendor/dav/dav'); +script('contactsrework', 'vendor/vcard/src/vcard'); + +// compiled version of app javascript script('contactsrework', 'public/script'); + +// all styles style('contactsrework', 'public/style'); ?> @@ -27,7 +34,9 @@ style('contactsrework', 'public/style'); </div> <div id="app-content"> - <div class="app-content-list" ui-view></div> - <div class="app-content-detail" ui-view="sidebar"></div> + <div class="app-content-list"> + <contactlist></contactlist> + </div> + <div class="app-content-detail" ng-view></div> </div> </div> |