diff options
| author | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-08-01 14:37:47 +0200 |
|---|---|---|
| committer | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-08-01 14:37:47 +0200 |
| commit | 5002c1c455fd3742698ee3efa14aae986c2a3ac5 (patch) | |
| tree | 02ad7c3e3960260a5a583896b4310b52da264454 /templates | |
| parent | f87c27a0d690f01d4c7e328b557e862cdd6045aa (diff) | |
Search, structure and design fixes for 14
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/main.php | 46 | ||||
| -rw-r--r-- | templates/newContactButton.html | 6 |
2 files changed, 26 insertions, 26 deletions
diff --git a/templates/main.php b/templates/main.php index c00cdcf9..a0a242a4 100644 --- a/templates/main.php +++ b/templates/main.php @@ -9,6 +9,7 @@ script('contacts', 'vendor/ui-select/select'); script('contacts', 'vendor/angular-click-outside/clickoutside.directive'); script('contacts', 'vendor/ngclipboard/ngclipboard.min'); +script('contacts', 'contacts-inject-14'); // DAV libraries script('contacts', 'dav/dav'); @@ -25,33 +26,30 @@ script('contacts', 'vendor/jquery-timepicker/jquery.timepicker'); style('contacts', 'style'); style('contacts', 'vendor/ui-select/select.min'); ?> - -<div id="app" ng-app="contactsApp"> - <div id="app-navigation"> - <div id="importscreen-sidebar-block" class="icon-loading" ng-show="$root.importing"></div> - <newContactButton></newContactButton> - <ul groupList></ul> - <div id="app-settings"> - <div id="app-settings-header"> - <button class="settings-button" - data-apps-slide-toggle="#app-settings-content"> - <?php p($l->t('Settings'));?> - </button> - </div> - <div id="app-settings-content"> - <addressBookList class="settings-section"></addressBookList> - <contactImport class="settings-section"></contactImport> - <sortBy class="settings-section"></sortBy> - </div> +<div id="app-navigation"> + <div id="importscreen-sidebar-block" class="icon-loading" ng-show="$root.importing"></div> + <newContactButton></newContactButton> + <ul groupList></ul> + <div id="app-settings"> + <div id="app-settings-header"> + <button class="settings-button" + data-apps-slide-toggle="#app-settings-content"> + <?php p($l->t('Settings'));?> + </button> + </div> + <div id="app-settings-content"> + <addressBookList class="settings-section"></addressBookList> + <contactImport class="settings-section"></contactImport> + <sortBy class="settings-section"></sortBy> </div> </div> +</div> - <div id="app-content"> - <div id="app-content-wrapper"> - <div class="app-content-list" contactlist> - </div> - <div class="app-content-detail" ng-view></div> - <importscreen id="importscreen-wrapper" ng-show="ctrl.importing"></importscreen> +<div id="app-content"> + <div id="app-content-wrapper"> + <div class="app-content-list" contactlist> </div> + <div class="app-content-details" ng-view></div> + <importscreen id="importscreen-wrapper" ng-show="ctrl.importing"></importscreen> </div> </div> diff --git a/templates/newContactButton.html b/templates/newContactButton.html index 9ec3dbae..14b16745 100644 --- a/templates/newContactButton.html +++ b/templates/newContactButton.html @@ -1,2 +1,4 @@ -<button ng-show="!ctrl.loading && !ctrl.invalid" class="icon-add" id="new-contact-button" - type="button" name="button" ng-click="ctrl.createContact()">{{ctrl.t.addContact}}</button> +<div class="app-navigation-new"> + <button ng-show="!ctrl.loading && !ctrl.invalid" class="icon-add" id="new-contact-button" + type="button" name="button" ng-click="ctrl.createContact()">{{ctrl.t.addContact}}</button> +</div>
\ No newline at end of file |