소스 검색

added toolbar in edit; added missing button title

tags/v0.1.0^0
Robin Thoni 8 년 전
부모
커밋
f5a992fb6f
3개의 변경된 파일18개의 추가작업 그리고 7개의 파일을 삭제
  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 파일 보기

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

+ 1
- 1
app/views/pkguid.html 파일 보기

@@ -35,7 +35,7 @@
35 35
             <div class="md-toolbar-tools">
36 36
                 <span>{{ 'pkguid.selectedItems' | translate:{count:selected.length} }}</span>
37 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 39
                     <md-icon class="material-icons">delete</md-icon>
40 40
                 </md-button>
41 41
             </div>

+ 16
- 6
app/views/pkguidedit.html 파일 보기

@@ -1,4 +1,19 @@
1 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 17
     <md-content layout-padding>
3 18
         <form name="editForm">
4 19
             <div layout-gt-sm="row">
@@ -15,12 +30,7 @@
15 30
             <div flex>
16 31
                 <md-progress-linear ng-disabled="!running" md-mode="indeterminate"></md-progress-linear>
17 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 34
             <div ng-repeat="error in busy.errors('pkguid.edit')" class="isa_error">
25 35
                 <i class="fa fa-times-circle"></i>
26 36
                 {{ error.data.message }}

Loading…
취소
저장