diff --git a/README b/README index 7489a2d..46f2706 100644 --- a/README +++ b/README @@ -1 +1,2 @@ -This is where we keep all of the code for the indroid project. +A sample jQuery Mobile application that my team wrote for a Masters +capstone project prototype. diff --git a/_notes/dwsync.xml b/_notes/dwsync.xml index 579ed98..8afac96 100644 --- a/_notes/dwsync.xml +++ b/_notes/dwsync.xml @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/css/_notes/dwsync.xml b/css/_notes/dwsync.xml index 835fc0e..5dcc499 100644 --- a/css/_notes/dwsync.xml +++ b/css/_notes/dwsync.xml @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/css/marco.css b/css/marco.css index 0f5413d..b96b2f9 100644 --- a/css/marco.css +++ b/css/marco.css @@ -144,9 +144,15 @@ background-color: gray; ----------------------------------*/ .pti-graph-img{ margin-left:18px; + +} + +.pt-navbar a:hover{ +//code here } + /* home header ----------------------------------*/ .pt-header { diff --git a/css/rebeca.css b/css/rebeca.css index ecc44de..b73bb50 100644 --- a/css/rebeca.css +++ b/css/rebeca.css @@ -159,6 +159,8 @@ DISCUSSION & RECOMMENDATION - fullscreen view - common elements */ } + + .ui-li-icon { } diff --git a/data/_notes/dwsync.xml b/data/_notes/dwsync.xml index fb8e885..1167517 100644 --- a/data/_notes/dwsync.xml +++ b/data/_notes/dwsync.xml @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/graph.html b/graph.html index aacc14e..09a28ad 100644 --- a/graph.html +++ b/graph.html @@ -35,11 +35,11 @@

Paulo's Grade History

diff --git a/graph.js b/graph.js index 16f10ab..bfeae25 100644 --- a/graph.js +++ b/graph.js @@ -17,15 +17,16 @@ //picker variables var pickerValue= $('#pt-graph-subjectpicker').val(); - var buttonValue="4th"; + var buttonValue="All"; //listeners for year and subject - $('#pt-graph-subjectpicker').change( function() { + $('#pt-graph-subjectpicker').change( function() { pickerValue = $(this).val(); init(); //always redraw graph when changed }); - $('#pt-graph-yearpicker a').click( function() { + $('#pt-graph-yearpicker a').click( function() { + $(this).addClass("ui-btn-active"); buttonValue = $(this).text(); init(); //always redraw graph when clicked }); @@ -115,7 +116,7 @@ "&chxr=0,0,4|1,1,3"+ "&chxt=y,x"+ "&chbh=a"+ - "&chs=333x250"+ + "&chs=250x225"+ "&cht=bvg"+ "&chco=A2C180,3D7930"+ "&chds=0,4,0,4"+ diff --git a/images/_notes/dwsync.xml b/images/_notes/dwsync.xml index f1e2b1d..2273585 100644 --- a/images/_notes/dwsync.xml +++ b/images/_notes/dwsync.xml @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/settings.html b/settings.html index 9725d3a..35318d6 100644 --- a/settings.html +++ b/settings.html @@ -20,15 +20,34 @@

Welcome, Gabriela


- Settings go here (not currently implemented):
- - -
+ + + +
+ + +
+
+
+ Default grade format + + + + + +
+
+
+ Edit profile +