diff --git a/app/controllers/student/Student.js b/app/controllers/student/Student.js
index 735668e..7a8eb7f 100644
--- a/app/controllers/student/Student.js
+++ b/app/controllers/student/Student.js
@@ -3,15 +3,30 @@ Ext.regController('Student', {
// Just show the info pane
UPSApp.views.viewport.setActiveItem('studentinfo');
},
+ news: function() {
+ UPSApp.views.viewport.setActiveItem('studentnews');
+ },
+ tickettotacoma: function() {
+ UPSApp.views.viewport.setActiveItem('tickettotacoma');
+ },
+ heyyousubmission: function() {
+ UPSApp.views.viewport.setActiveItem('heyyousubmission');
+ },
+ submitheyyou: function(params) {
+ console.log("Hey you submission:");
+ console.log(params.data.heyyoutext);
+ },
login: function(params) {
// TODO: Attempt to login and store a session cookie
// For now, we just create some fake user info
+ /*
if(!params)
console.log("No username or password passed to login, assuming we're resuming session");
else
console.log("Username and password supplied \"logging in\"");
+ */
if(!UPSApp.stores.studentinfo.first())
UPSApp.stores.studentinfo.add({username:''});
diff --git a/app/views/Viewport.js b/app/views/Viewport.js
index 7493969..48a9ab6 100644
--- a/app/views/Viewport.js
+++ b/app/views/Viewport.js
@@ -31,17 +31,26 @@ UPSApp.views.Viewport = Ext.extend(Ext.Panel, {
UPSApp.views.studentLogin = new UPSApp.views.StudentLogin();
UPSApp.views.studentInfo = new UPSApp.views.StudentInfo();
UPSApp.views.studentHome = new UPSApp.views.StudentHome();
+ UPSApp.views.studentNews = new UPSApp.views.StudentNews();
+ UPSApp.views.newsDetail = new UPSApp.views.NewsDetail();
+ UPSApp.views.ticketToTacoma = new UPSApp.views.TicketToTacoma();
+ UPSApp.views.heyYouSubmission = new UPSApp.views.HeyYouSubmission();
this.add(UPSApp.views.selectUserType);
this.add(UPSApp.views.parentHome);
this.add(UPSApp.views.studentLogin);
this.add(UPSApp.views.studentInfo);
- this.add(UPSApp.views.studentHome);
+ this.add(UPSApp.views.studentHome);
+ this.add(UPSApp.views.studentNews);
+ this.add(UPSApp.views.newsDetail);
+ this.add(UPSApp.views.ticketToTacoma);
+ this.add(UPSApp.views.heyYouSubmission);
if(User.GetUserType() == "none") // Go to the select user type panel
this.setActiveItem('selectusertype');
else if(User.GetUserType() == "parent") // DEBUG: just reset to none, otherwise we will probably go to school website
{
+ // TEMP
User.SetUserType("none");
this.setActiveItem('selectusertype');
}
diff --git a/app/views/student/StudentHome.js b/app/views/student/StudentHome.js
index afe49ee..05a2d14 100644
--- a/app/views/student/StudentHome.js
+++ b/app/views/student/StudentHome.js
@@ -11,10 +11,16 @@ UPSApp.views.StudentHome = Ext.extend(Ext.Panel, {
var elements = [
{xtype:'button',text:'Student Info',handler:function(){Ext.dispatch({controller: 'Student',action:'info'});}},
- {xtype:'button',text:'News'},
+ {xtype:'button',text:'News', handler:function(){
+ Ext.dispatch({controller:'Student', action:'news'});
+ }},
{xtype:'button',text:'Events'},
- {xtype:'button',text:'Finances'},
- {xtype:'button',text:'Fifth element'}
+ {xtype:'button',text:'Hey You!', handler:function(){
+ Ext.dispatch({controller:'Student', action:'heyyousubmission'});
+ }},
+ {xtype:'button',text:'Ticket To Tacoma', handler:function(){
+ Ext.dispatch({controller:'Student', action:'tickettotacoma'});
+ }}
];
var idx = 0; var hboxes = [header];
diff --git a/index.html b/index.html
index 4676e49..28ed59d 100644
--- a/index.html
+++ b/index.html
@@ -18,12 +18,19 @@
+
+
+
+
+
+
+
+
-
-
+