Browse Source

font awesome added

robert2206 8 years ago
parent
commit
0aca2205b8

+ 48 - 47
package.json

@@ -1,49 +1,50 @@
 {
-    "name": "ionic-hello-world",
-    "author": "Ionic Framework",
-    "homepage": "http://ionicframework.com/",
-    "private": true,
-    "scripts": {
-        "clean": "ionic-app-scripts clean",
-        "build": "ionic-app-scripts build",
-        "ionic:build": "ionic-app-scripts build",
-        "ionic:serve": "ionic-app-scripts serve"
-    },
-    "dependencies": {
-        "@angular/common": "2.4.8",
-        "@angular/compiler": "2.4.8",
-        "@angular/compiler-cli": "2.4.8",
-        "@angular/core": "2.4.8",
-        "@angular/forms": "2.4.8",
-        "@angular/http": "2.4.8",
-        "@angular/platform-browser": "2.4.8",
-        "@angular/platform-browser-dynamic": "2.4.8",
-        "@angular/platform-server": "2.4.8",
-        "@ionic-native/core": "3.1.0",
-        "@ionic-native/splash-screen": "3.1.0",
-        "@ionic-native/status-bar": "3.1.0",
-        "@ionic/storage": "2.0.0",
-        "angular2-odoo-jsonrpc": "0.0.7",
-        "ionic-angular": "2.3.0",
-        "ionicons": "3.0.0",
-        "pouchdb": "^6.1.2",
-        "pouchdb-find": "^0.10.5",
-        "rxjs": "5.0.1",
-        "sw-toolbox": "3.4.0",
-        "zone.js": "0.7.2"
-    },
-    "devDependencies": {
-        "@ionic/app-scripts": "1.1.4",
-        "typescript": "2.0.9"
-    },
-    "cordovaPlugins": [
-        "cordova-plugin-console",
-        "cordova-plugin-statusbar",
-        "cordova-plugin-whitelist",
-        "cordova-plugin-device",
-        "cordova-plugin-splashscreen",
-        "ionic-plugin-keyboard"
-    ],
-    "cordovaPlatforms": [],
-    "description": "myApp: An Ionic project"
+  "name": "ionic-hello-world",
+  "author": "Ionic Framework",
+  "homepage": "http://ionicframework.com/",
+  "private": true,
+  "scripts": {
+    "clean": "ionic-app-scripts clean",
+    "build": "ionic-app-scripts build",
+    "ionic:build": "ionic-app-scripts build",
+    "ionic:serve": "ionic-app-scripts serve"
+  },
+  "dependencies": {
+    "@angular/common": "2.4.8",
+    "@angular/compiler": "2.4.8",
+    "@angular/compiler-cli": "2.4.8",
+    "@angular/core": "2.4.8",
+    "@angular/forms": "2.4.8",
+    "@angular/http": "2.4.8",
+    "@angular/platform-browser": "2.4.8",
+    "@angular/platform-browser-dynamic": "2.4.8",
+    "@angular/platform-server": "2.4.8",
+    "@ionic-native/core": "3.1.0",
+    "@ionic-native/splash-screen": "3.1.0",
+    "@ionic-native/status-bar": "3.1.0",
+    "@ionic/storage": "2.0.0",
+    "angular2-odoo-jsonrpc": "0.0.7",
+    "font-awesome": "^4.7.0",
+    "ionic-angular": "2.3.0",
+    "ionicons": "3.0.0",
+    "pouchdb": "^6.1.2",
+    "pouchdb-find": "^0.10.5",
+    "rxjs": "5.0.1",
+    "sw-toolbox": "3.4.0",
+    "zone.js": "0.7.2"
+  },
+  "devDependencies": {
+    "@ionic/app-scripts": "1.1.4",
+    "typescript": "2.0.9"
+  },
+  "cordovaPlugins": [
+    "cordova-plugin-console",
+    "cordova-plugin-statusbar",
+    "cordova-plugin-whitelist",
+    "cordova-plugin-device",
+    "cordova-plugin-splashscreen",
+    "ionic-plugin-keyboard"
+  ],
+  "cordovaPlatforms": [],
+  "description": "myApp: An Ionic project"
 }

+ 5 - 5
src/pages/customer/customer.html

@@ -1,11 +1,6 @@
 <ion-header>
     <ion-navbar>
         <ion-title>{{ title }}</ion-title>
-        <ion-buttons end>
-            <button ion-button type="submit" form="details-form" [disabled]="customerForm.invalid">
-                GUARDAR
-            </button>
-        </ion-buttons>
     </ion-navbar>
 </ion-header>
 <ion-content>
@@ -35,4 +30,9 @@
             <ion-input type="text" formControlName="email"></ion-input>
         </ion-item>
     </form>
+    <ion-fab right top edge>
+        <button ion-fab mini type="submit" form="details-form" [hidden]="customerForm.invalid">
+            <i class="fa fa-save fa-lg"></i>
+        </button>
+    </ion-fab>
 </ion-content>

+ 2 - 2
src/pages/customers/customers.html

@@ -28,8 +28,8 @@
 			</p>
 		</ion-item>
 	</ion-list>
-	<ion-fab right bottom>
-        <button ion-fab (click)="goToDetails()">
+	<ion-fab right top edge>
+        <button ion-fab mini (click)="goToDetails()">
             <ion-icon name="add"></ion-icon>
         </button>
     </ion-fab>

+ 5 - 7
src/pages/lead/lead.html

@@ -1,14 +1,12 @@
 <ion-header>
     <ion-navbar>
         <ion-title>{{ title }}</ion-title>
-        <ion-buttons end>
-            <!--<button ion-button type="submit" form="details-form" [visible]="productForm.invalid">-->
-            <button ion-button type="submit" form="details-form">
-                GUARDAR
-            </button>
-        </ion-buttons>
     </ion-navbar>
 </ion-header>
 <ion-content>
-
+    <ion-fab right top edge>
+        <button ion-fab mini type="submit" form="details-form">
+            <i class="fa fa-save fa-lg"></i>
+        </button>
+    </ion-fab>
 </ion-content>

+ 2 - 2
src/pages/leads/leads.html

@@ -29,8 +29,8 @@
             </p>
         </ion-item>
     </ion-list>
-    <ion-fab right bottom>
-        <button ion-fab (click)="goToDetails()">
+    <ion-fab right top edge>
+        <button ion-fab mini (click)="goToDetails()">
             <ion-icon name="add"></ion-icon>
         </button>
     </ion-fab>

+ 16 - 7
src/pages/order/order.html

@@ -1,14 +1,23 @@
 <ion-header>
     <ion-navbar>
         <ion-title>{{ title }}</ion-title>
-         <ion-buttons end>
-            <!--<button ion-button type="submit" form="details-form" [visible]="productForm.invalid">-->
-            <button ion-button type="submit" form="details-form">
-                GUARDAR
-            </button>
-        </ion-buttons>
     </ion-navbar>
 </ion-header>
 <ion-content>
-
+<ion-fab right top edge>
+    <button ion-fab mini>
+        <ion-icon name="menu"></ion-icon>
+    </button>
+    <ion-fab-list side="bottom">
+        <button ion-fab>
+           <i class="fa fa-user fa-lg"></i>
+        </button>
+        <button ion-fab>
+            <i class="fa fa-cart-plus fa-lg"></i>
+        </button>
+        <button ion-fab>
+            <i class="fa fa-save fa-lg"></i>
+        </button>
+    </ion-fab-list>
+  </ion-fab>
 </ion-content>

+ 2 - 2
src/pages/orders/orders.html

@@ -32,8 +32,8 @@
             </p>
         </ion-item>
     </ion-list>
-    <ion-fab right bottom>
-        <button ion-fab (click)="goToDetails()">
+    <ion-fab right top edge>
+        <button ion-fab mini (click)="goToDetails()">
             <ion-icon name="add"></ion-icon>
         </button>
     </ion-fab>

+ 6 - 8
src/pages/phonecall/phonecall.html

@@ -1,14 +1,12 @@
 <ion-header>
     <ion-navbar>
         <ion-title>{{ title }}</ion-title>
-        <ion-buttons end>
-            <!--<button ion-button type="submit" form="details-form" [visible]="productForm.invalid">-->
-            <button ion-button type="submit" form="details-form">
-                GUARDAR
-            </button>
-        </ion-buttons>
     </ion-navbar>
 </ion-header>
-<ion-content padding>
-
+<ion-content>
+    <ion-fab right top edge>
+        <button ion-fab mini type="submit" form="details-form">
+            <i class="fa fa-save fa-lg"></i>
+        </button>
+    </ion-fab>
 </ion-content>

+ 2 - 2
src/pages/phonecalls/phonecalls.html

@@ -21,8 +21,8 @@
             </p>
         </ion-item>
     </ion-list>
-    <ion-fab right bottom>
-        <button ion-fab (click)="goToDetails()">
+    <ion-fab right top edge>
+        <button ion-fab mini (click)="goToDetails()">
             <ion-icon name="add"></ion-icon>
         </button>
     </ion-fab>

+ 5 - 5
src/pages/product/product.html

@@ -1,11 +1,6 @@
 <ion-header>
     <ion-navbar>
         <ion-title>{{ title }}</ion-title>
-        <ion-buttons end>
-            <button ion-button type="submit" form="details-form" [disabled]="productForm.invalid">
-                GUARDAR
-            </button>
-        </ion-buttons>
     </ion-navbar>
 </ion-header>
 <ion-content>
@@ -23,4 +18,9 @@
             <ion-input type="text" formControlName="defaultCode"></ion-input>
         </ion-item>
     </form>
+    <ion-fab right top edge>
+        <button ion-fab mini type="submit" form="details-form" [hidden]="productForm.invalid">
+            <i class="fa fa-save fa-lg"></i>
+        </button>
+    </ion-fab>
 </ion-content>

+ 2 - 2
src/pages/products/products.html

@@ -24,8 +24,8 @@
 			</p>
 		</ion-item>
 	</ion-list>
-	<ion-fab right bottom>
-        <button ion-fab (click)="goToDetails()">
+	<ion-fab right top edge>
+        <button ion-fab mini (click)="goToDetails()">
             <ion-icon name="add"></ion-icon>
         </button>
     </ion-fab>

+ 1 - 0
src/theme/variables.scss

@@ -14,3 +14,4 @@ $colors: (
 @import "ionic.ionicons";
 @import "roboto";
 @import "noto-sans";
+@import "font-awesome";