Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
  • 3 commits
  • 4 files changed
  • 0 commit comments
  • 2 contributors
Showing with 27 additions and 6 deletions.
  1. +1 −1 ADIM/app.js
  2. +3 −1 ADIM/app/controller/Students.js
  3. +21 −4 ADIM/app/view/Main.js
  4. +2 −0 ADIM/app/view/StudentDetailsPage.js
View
2 ADIM/app.js
@@ -51,7 +51,7 @@ Ext.application({
Ext.Viewport.add(main_container);
// and show student list page as front page
- main_container.push(Ext.create('ADIM.view.StudentListPage'));
+ main_container.getComponent('student-tab').push(Ext.create('ADIM.view.StudentListPage'));
},
onUpdated: function() {
View
4 ADIM/app/controller/Students.js
@@ -29,7 +29,7 @@ Ext.define('ADIM.controller.Students', {
studentEditSaveBtn : 'student-edit-page #save_edit_student_btn',
editStudentForm : 'adim-student-edit-form',
- main : 'main-view'
+ main : 'main-view #student-tab'
},
control : {
@@ -65,6 +65,8 @@ Ext.define('ADIM.controller.Students', {
var view = Ext.create('ADIM.view.StudentDetailsPage')
view.getComponent('studentDetails').setRecord(record);
this.getMain().push(view);
+// this.getMain().setActiveItem(view);
+// this.getMain().add(view);
},
deselectList : function(){
View
25 ADIM/app/view/Main.js
@@ -1,10 +1,27 @@
Ext.define("ADIM.view.Main", {
- extend: 'Ext.NavigationView',
- requires : ['Ext.NavigationView'],
+ extend: 'Ext.TabPanel',
+ requires : ['Ext.TabPanel', 'Ext.NavigationView'],
xtype : 'main-view',
config: {
fullscreen : true,
- navigationBar : false,
- items: [ ]
+ tabBarPosition: 'bottom',
+ defaults: {
+ styleHtmlContent: true
+ },
+ items: [
+ {
+ itemId : 'student-tab',
+ title: 'Students',
+ iconCls: 'home',
+ xtype : 'navigationview',
+ navigationBar : false
+ },
+ {
+ itemId : 'payment-tab',
+ title : 'Payments',
+ iconCls: 'favorites',
+ html : '<h1>Payments to be implemented here</h1>'
+ }
+ ]
}
});
View
2 ADIM/app/view/StudentDetailsPage.js
@@ -3,6 +3,8 @@ Ext.define('ADIM.view.StudentDetailsPage', {
xtype : 'student-details-page',
requires : [],
config: {
+ iconCls : 'home',
+ title : 'yo',
items: [
{
xtype : 'toolbar',

No commit comments for this range

Something went wrong with that request. Please try again.