Browse Source

added toolbar in edit; added missing button title

tags/v0.1.0^0
Robin Thoni 8 years ago
parent
commit
f5a992fb6f
3 changed files with 18 additions and 7 deletions
  1. 1
    0
      app/translations/en.json
  2. 1
    1
      app/views/pkguid.html
  3. 16
    6
      app/views/pkguidedit.html

+ 1
- 0
app/translations/en.json View File

17
     "undo": "Undo",
17
     "undo": "Undo",
18
     "view": "View",
18
     "view": "View",
19
     "save": "Save",
19
     "save": "Save",
20
+    "back": "Back",
20
     "confirmDelete": "Confirm deletion",
21
     "confirmDelete": "Confirm deletion",
21
     "pagination": {
22
     "pagination": {
22
       "of": "of",
23
       "of": "of",

+ 1
- 1
app/views/pkguid.html View File

35
             <div class="md-toolbar-tools">
35
             <div class="md-toolbar-tools">
36
                 <span>{{ 'pkguid.selectedItems' | translate:{count:selected.length} }}</span>
36
                 <span>{{ 'pkguid.selectedItems' | translate:{count:selected.length} }}</span>
37
                 <span flex></span>
37
                 <span flex></span>
38
-                <md-button class="md-icon-button" ng-click="askRemoveSelected()">
38
+                <md-button class="md-icon-button" ng-click="askRemoveSelected()" title="{{ 'common.delete' | translate }}">
39
                     <md-icon class="material-icons">delete</md-icon>
39
                     <md-icon class="material-icons">delete</md-icon>
40
                 </md-button>
40
                 </md-button>
41
             </div>
41
             </div>

+ 16
- 6
app/views/pkguidedit.html View File

1
 <div layout="column" ng-cloak class="md-inline-form" angular-busy="appUtils.cgBusy('pkguid.edit')">
1
 <div layout="column" ng-cloak class="md-inline-form" angular-busy="appUtils.cgBusy('pkguid.edit')">
2
+    <div flex>
3
+
4
+        <md-toolbar class="md-table-toolbar md-default" >
5
+            <div class="md-toolbar-tools">
6
+                <md-button class="md-icon-button" ui-sref="pkguid" title="{{ 'common.back' | translate }}">
7
+                    <md-icon class="material-icons">arrow_back</md-icon>
8
+                </md-button>
9
+                <span>{{ 'pkguid.name' | translate:{count:selected.length} }}</span>
10
+                <span flex></span>
11
+                <md-button class="md-icon-button" ng-show="pkguid.id != null" ng-click="askRemoveOne(pkguid)" title="{{ 'common.delete' | translate }}">
12
+                    <md-icon class="material-icons">delete</md-icon>
13
+                </md-button>
14
+            </div>
15
+        </md-toolbar>
16
+    </div>
2
     <md-content layout-padding>
17
     <md-content layout-padding>
3
         <form name="editForm">
18
         <form name="editForm">
4
             <div layout-gt-sm="row">
19
             <div layout-gt-sm="row">
15
             <div flex>
30
             <div flex>
16
                 <md-progress-linear ng-disabled="!running" md-mode="indeterminate"></md-progress-linear>
31
                 <md-progress-linear ng-disabled="!running" md-mode="indeterminate"></md-progress-linear>
17
             </div>
32
             </div>
18
-            <div layout="row" layout-align="space-between center">
19
-                <md-button class="md-raised md-primary" type="submit" ng-click="!editForm.$invalid && submit()">{{ 'common.save' | translate }}</md-button>
20
-                <md-button class="md-warn md-icon-button" ng-show="pkguid.id != null" ng-click="askRemoveOne(pkguid)" title="{{ 'common.delete' | translate }}">
21
-                    <md-icon class="material-icons">delete</md-icon>
22
-                </md-button>
23
-            </div>
33
+            <md-button class="md-raised md-primary" type="submit" ng-click="!editForm.$invalid && submit()">{{ 'common.save' | translate }}</md-button>
24
             <div ng-repeat="error in busy.errors('pkguid.edit')" class="isa_error">
34
             <div ng-repeat="error in busy.errors('pkguid.edit')" class="isa_error">
25
                 <i class="fa fa-times-circle"></i>
35
                 <i class="fa fa-times-circle"></i>
26
                 {{ error.data.message }}
36
                 {{ error.data.message }}

Loading…
Cancel
Save