virtualcommons-svn Mailing List for Virtual Commons Experiment Software (Page 6)
Status: Beta
Brought to you by:
alllee
Menu
▾
▴
virtualcommons-svn — Virtual Commons source control (SVN/HG) commit traffic
You can subscribe to this list here.
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
(21) |
Aug
(31) |
Sep
(6) |
Oct
(15) |
Nov
(2) |
Dec
(9) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
(4) |
Feb
(6) |
Mar
(12) |
Apr
(52) |
May
(14) |
Jun
(19) |
Jul
(81) |
Aug
(115) |
Sep
(36) |
Oct
(88) |
Nov
(46) |
Dec
(58) |
| 2010 |
Jan
(52) |
Feb
(55) |
Mar
(48) |
Apr
(15) |
May
(5) |
Jun
(38) |
Jul
(27) |
Aug
(24) |
Sep
(28) |
Oct
(1) |
Nov
(2) |
Dec
(29) |
| 2011 |
Jan
(87) |
Feb
(39) |
Mar
(63) |
Apr
(42) |
May
(26) |
Jun
(53) |
Jul
(23) |
Aug
(43) |
Sep
(37) |
Oct
(25) |
Nov
(4) |
Dec
(7) |
| 2012 |
Jan
(73) |
Feb
(79) |
Mar
(62) |
Apr
(28) |
May
(12) |
Jun
(2) |
Jul
(9) |
Aug
(1) |
Sep
(8) |
Oct
|
Nov
(3) |
Dec
(3) |
| 2013 |
Jan
(8) |
Feb
(16) |
Mar
(38) |
Apr
(74) |
May
(62) |
Jun
(15) |
Jul
(49) |
Aug
(19) |
Sep
(9) |
Oct
|
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
(2) |
May
(25) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <com...@bi...> - 2013-05-21 00:23:52
|
3 new commits in vcweb: https://bitbucket.org/virtualcommons/vcweb/commits/cd5d4c68ca51/ Changeset: cd5d4c68ca51 User: RoleeSinha Date: 2013-05-21 02:23:16 Summary: fixing styling Affected #: 1 file diff -r d91da1669e5f48632e8b0d43a7bdb15a4751901f -r cd5d4c68ca51585ff2df9a71895955e337252fa8 vcweb/lighterprints/templates/lighterprints/mobile/index.html --- a/vcweb/lighterprints/templates/lighterprints/mobile/index.html +++ b/vcweb/lighterprints/templates/lighterprints/mobile/index.html @@ -37,9 +37,9 @@ $.post('/lighterprints/api/do-activity', formData, function(data){ if (data.success) { console.debug(data); + $("#popupDialog1").popup('open'); ko.mapping.fromJSON(data.viewModel, viewModel); viewModel.lastPerformedActivity(challengeModel); - $("#popupDialog1").popup('open'); console.debug('refreshing lists'); $('#challengesList1').listview('refresh'); $('#teamList1').listview('refresh'); @@ -63,9 +63,9 @@ $.post('/lighterprints/api/do-activity', formData, function(data){ if (data.success) { console.debug(data); + $("#popupDialog3").popup('open'); ko.mapping.fromJSON(data.viewModel, viewModel); viewModel.lastPerformedActivity(challengeModel); - $("#popupDialog3").popup('open'); console.debug('refreshing lists'); $('#challengesList3').listview('refresh'); $('#teamList3').listview('refresh'); @@ -74,7 +74,7 @@ else { console.debug("ERROR: " + data.message); } - }) + }) }; viewModel.send = function(){ @@ -103,7 +103,7 @@ $('#teamActivityList1').listview('refresh'); }); $("#dashboardLockedChallengesPage").on('pageshow', function(event){ - console.debug('dashboardLockedChallengesPage pageshow'); + console.debug('dashboardLockedChallengesPage pageshow'); $('#challengesList2').listview('refresh'); $('#teamList2').listview('refresh'); $('#teamActivityList2').listview('refresh'); @@ -125,7 +125,7 @@ $('#chatMessageList').listview('refresh'); }); $("#dashboardPage").on('pageinit', function(event){ - console.debug('dashboardPage pageinit'); + console.debug('dashboardPage pageinit'); $('#dashboardLockedChallengesPage').trigger('pageinit'); $('#challengesPage').trigger('pageinit'); $('#lockedChallengesPage').trigger('pageinit'); @@ -133,6 +133,8 @@ $('#helpPage').trigger('pageinit'); ko.applyBindings(viewModel); }); + $("#challengesPage").on('pageinit', function(event){$('#clickPg31').button();$('#clickPg32').button();$('#clickPg33').button();$('#clickPg34').button();$('#clickPg35').button(); + }); }); </script><!-- knockout templates --> @@ -145,7 +147,7 @@ </div><span class='group-activity'>Participant <strong data-bind='text: participant_number'></strong><small class='pull-right muted'> - <span data-bind='text: date_created'></span> + <span class="ui-li-aside" data-bind='text: date_created'></span></small><div><span data-bind='if: target_parameter_name() === "activity_performed"'>commented on your completed challenge, <em data-bind='text: target_data_value'></em></span> @@ -168,7 +170,7 @@ <span class='group-activity-icon'><span class='icon-heart lighterprints-red'></span></span><span class='group-activity'>Participant <strong data-bind='text: participant_number'></strong><small class='pull-right muted'> - <span data-bind='text: date_created'></span> + <span class="ui-li-aside" data-bind='text: date_created'></span></small><div> liked your<span data-bind='if: target_parameter_name() === "activity_performed"'>completed challenge, <em data-bind='text: target_data_value'></em></span> @@ -182,17 +184,9 @@ <span class='icon-comment lighterprints-blue'></span><strong>Participant <span data-bind='text: participant_number'></span></strong><small> - <span data-bind='text: date_created'></span> - </small> - <div> - <small> - <span class='icon-quote-left'></span> - </small> - <span data-bind='text:value'></span> - <small> - <span class='icon-quote-right'></span> - </small> - </div> + <span class="ui-li-aside" data-bind='text: date_created'></span> + </small><br> + <span data-bind='text:value'></span></span></li></script> @@ -201,45 +195,51 @@ <span class='icon-star text-gold'></span><strong>Participant <span data-bind='text: participant_number'></span></strong><small> - <span data-bind='text: date_created'></span> - </small> + <span class="ui-li-aside" data-bind='text: date_created'></span> + </small><br><span> earned <span class='lighterprints-green' data-bind='text:points'></span><span class='icon-leaf lighterprints-green'></span> for <span data-bind='text: $root.groupName'></span> by completing <em><span data-bind='text: display_name'></span></em>.</span></span></li></script><script type='text/html' id='dashboard-challenges-template'> - <li data-icon="false"> - <a href="#" data-bind='css: status, click: $root.perform1'> - <span data-bind='if: availableNow'>Perform</span> - <span data-bind='if: completed'>Completed <span class='icon-check'></span></span> - <span data-bind='if: expired'>Expired <span class='icon-warning-sign'></span></span> - <span data-bind='if: upcoming'>Not yet available <span class='icon-time'></span></span> - <span data-bind='if: locked'>Locked <span class='icon-lock'></span></span> - <img style='padding: 10px 0 0 10px; float:left;' data-bind='attr: {src: "https://vcweb.asu.edu/static/images/lighterprints/badges/" + name() + ".png" }'><h4 class='challenge-name' data-bind='css: status, text:display_name'></h4> - <p><span data-bind='css: status, text: summary'></span></p> + <li data-icon="false"><div style="text-align: center;"> +<img width="100px" height="100px" data-bind='attr: {src: "https://vcweb.asu.edu/static/images/lighterprints/badges/" + name() + ".png" }'><h4 style="white-space: normal;!" class='challenge-name' data-bind='css: status, text:display_name'></h4> + <p style="white-space: normal;!"><span data-bind='css: status, text: summary'></span></p><h4><span data-bind='text: points'></span><span class='lighterprints-green icon-leaf icon-2x'></span><br><span data-bind='text: time_slots'></span></h4> - </a> + <span data-bind='if: availableNow'> + <a href="#" style="text-decoration: none;" data-bind='css:status, click: $root.perform1'> Perform + </a> + </span> + <a style="text-decoration: none;" data-bind='css:status'> + <span data-bind='if: completed'> Completed <span class='icon-checkmark'></span></span> + <span data-bind='if: expired'> Expired <span class='icon-warning'></span></span> + <span data-bind='if: upcoming'> Not yet available <span class='icon-clock'></span></span> + <span data-bind='if: locked'> Locked <span class='icon-lock'></span></span> + </a></div></li></script><script type='text/html' id='challenges-template'> - <li data-icon="false"> - <a href="#" data-bind='css: status, click: $root.perform2'> - <span data-bind='if: availableNow'>Perform</span> - <span data-bind='if: completed'>Completed <span class='icon-check'></span></span> - <span data-bind='if: expired'>Expired <span class='icon-warning-sign'></span></span> - <span data-bind='if: upcoming'>Not yet available <span class='icon-time'></span></span> - <span data-bind='if: locked'>Locked <span class='icon-lock'></span></span> - <img style='padding: 10px 0 0 10px; float:left;' data-bind='attr: {src: "https://vcweb.asu.edu/static/images/lighterprints/badges/" + name() + ".png" }'><h4 class='challenge-name' data-bind='css: status, text:display_name'></h4> - <p><span data-bind='css: status, text: summary'></span></p> + <li data-icon="false"><div style="text-align: center;"> +<img width="100px" height="100px" data-bind='attr: {src: "https://vcweb.asu.edu/static/images/lighterprints/badges/" + name() + ".png" }'><h4 style="white-space: normal;!" class='challenge-name' data-bind='css: status, text:display_name'></h4> +<p style="white-space: normal;!"><span data-bind='css: status, text: summary'></span></p><h4><span data-bind='text: points'></span><span class='lighterprints-green icon-leaf icon-2x'></span><br><span data-bind='text: time_slots'></span></h4> - </a> + <span data-bind='if: availableNow'> + <a href="#" style="text-decoration: none;" data-bind='css:status, click: $root.perform2'> Perform + </a> + </span> + <a style="text-decoration: none;" data-bind='css:status'> + <span data-bind='if: completed'> Completed <span class='icon-check'></span></span> + <span data-bind='if: expired'> Expired <span class='icon-warning-sign'></span></span> + <span data-bind='if: upcoming'> Not yet available <span class='icon-time'></span></span> + <span data-bind='if: locked'> Locked <span class='icon-lock'></span></span> + </a></div></li></script> @@ -249,12 +249,14 @@ <span data-bind='css: { "bold lighterprints-blue": groupName() == $root.groupName()}'><span data-bind="text: groupName"></span></span> + <span class="ui-li-count ui-btn-up-c ui-btn-corner-all" +data-bind="text: averagePoints"></span></li></script><script type='text/html' id='myTeam-template'><li><span>Participant <span data-bind="text: participant_number"></span>: <span data-bind="text: value"></span> - <span data-bind="text: date_created"></span><br> ago + <span class="ui-li-aside" data-bind="text: date_created"></span></li></script><script type='text/html' id='no-group-activity-template'> @@ -266,8 +268,8 @@ <body><!-- Start of page1 #dashboardPage --><div data-role="page" id="dashboardPage" class="ui-responsive-panel"> - <div data-role="panel" id="defaultpanel1" data-position="left" data-display="overlay" data-dismissible="true" > - <a href="#" data-role="button" class="innerbutton"><h4><span class="icon-gauge"></span> Dashboard</h4></a> + <div data-role="panel" id="defaultpanel1" data-position="left" data-display="overlay" data-dismissible="true" data-theme="b"> + <a href="#" data-theme="b" data-role="button" class="innerbutton"><h4><span class="icon-gauge"></span> Dashboard</h4></a><a href="#challengesPage" data-role="button" class="innerbutton"><h4><span class="icon-star"></span> Challenges</h4></a><a href="#myTeamPage" reloadPage="true" data-role="button" class="innerbutton"><h4><span class="icon-user"></span> My Team</h4></a><a href="#helpPage" data-role="button" class="innerbutton"><h4><span class="icon-question"></span> Help</h4></a> @@ -284,7 +286,7 @@ <div class="ui-bar ui-bar-e" style="height:90px"> Today's Score <br> - <span data-bind="text: averagePoints"></span> + <span style="font-size:25px;"><span data-bind="text: averagePoints"></span><span class='icon-leaf lighterprints-green'></span><h1></div></div><div class="ui-block-b"> @@ -304,40 +306,44 @@ <div class="ui-bar ui-bar-e" style="height:90px"> Today's Progress <br> - Your group progress: <span data-bind="text: averagePoints"></span> / - <span data-bind="text:pointsToNextLevel"></span> + <span style="font-size:25px;" data-bind="text: averagePoints"></span><big> / </big> + <span style="font-size:25px;" data-bind="text:pointsToNextLevel"></span></div></div><div class="ui-block-b"><div class="ui-bar ui-bar-e" style="height:90px"> - Time Remaining - <table> - <tr> - <td> - <span data-bind="text: hoursLeft"></span>h - </td> - <td> - <span data-bind="text: minutesLeft"></span>m - </td> - </tr> - </table> + Time Remaining<br> + <span style="font-size:25px;" data-bind="text: hoursLeft"></span><big> : </big> + <span style="font-size:25px;" data-bind="text: minutesLeft"></span></div></div></div></div><div class="ui-bar-d"><div data-role="navbar" data-theme="d"> - <h4><span class="lighterprints-grey"> Challenges</span></h4> - <ul id="challengesNavbarList1"> - <li> - <a href="#" class="ui-btn-active" ><h3><span class="icon-star text-gold "> Unlocked</span></h3></a> + <h4><span class="lighterprints-grey"> Challenges</span></h4> + <ul> + <li> + <a href="#" data-theme="b" ><h3><span class="icon-star text-gold "> Unlocked</span></h3></a></li><li><a href="#dashboardLockedChallengesPage"><h3><span class="icon-lock lighterprints-grey"> Locked</span></h3></a></li></ul> - </div> - <ul id="challengesList1" data-role="listview" data-inset="true" data-theme="d" data-bind="template: { name: 'dashboard-challenges-template', foreach: unlockedChallenges() }"> + </div> + <ul id="challengesList1" data-role="listview" data-inset="true" data-theme="b" data-bind="foreach: unlockedChallenges() "> + <li data-icon="false"><div style="text-align: center;"> + <img width="100px" height="100px" data-bind='attr: {src: "https://vcweb.asu.edu/static/images/lighterprints/badges/" + name() + ".png" }'><h4 style="white-space: normal;!" class='challenge-name' data-bind='css: status, text:display_name'></h4> + <p style="white-space: normal;!"><span data-bind='css: status, text: summary'></span></p> + <h4><span data-bind='text: points'></span><span class='lighterprints-green icon-leaf icon-2x'></span><br> + <span data-bind='text: time_slots'></span> + </h4> + <span data-bind='if: availableNow'><a data-role="button" data-inline="true" style="text-decoration: none;" data-bind='css:status, click: $root.perform1'>Perform </a></span> + <span data-bind='if: completed'><a data-role="button" data-inline="true" style="text-decoration: none;" class="ui-disabled" data-bind='css:status'> Completed <span class='icon-checkmark'></span></a></span> + <span data-bind='if: expired'><a data-role="button" data-inline="true" style="text-decoration: none;" class="ui-disabled" data-bind='css:status'> Expired <span class='icon-warning'></span></a></span> + <span data-bind='if: upcoming'><a data-role="button" data-inline="true" style="text-decoration: none;" class="ui-disabled" data-bind='css:status'> Not yet available <span class='icon-clock'></span></a></span> + <span data-bind='if: locked'><a data-role="button" data-inline="true" style="text-decoration: none;" class="ui-disabled" data-bind='css:status'> Locked <span class='icon-lock'></span></a></span> + </div></li></ul></div><div class="ui-bar-d"> @@ -357,13 +363,13 @@ </div></div></div> - <div data-role="footer" data-theme="c"> + <div data-role="footer" data-theme="c" ><div class="ui-bar-b" style="font-size:15px;text-align:center;"><div data-role="controlgroup" data-type="horizontal" data-theme="b"> - <a href="#" data-theme="b"> Dashboard</a> - <a href="#challengesPage"> Challenges</a> - <a href="#myTeamPage"> My Team</a> - <a href="#helpPage"> Help</a> + <a href="#" style="text-decoration: none;"> Dashboard</a> + <a href="#challengesPage" style="text-decoration: none;"> Challenges</a> + <a href="#myTeamPage" style="text-decoration: none;"> My Team</a> + <a href="#helpPage" style="text-decoration: none;"> Help</a></div> 2013 Arizona Board Of Regents </div> @@ -374,15 +380,15 @@ </div><div data-role="popup" id="popupDialog1" data-overlay-theme="a" data-theme="c" class="ui-corner-all"><div data-role="header" data-theme="a" class="ui-corner-top"> - <h1>Performing Challenge...</h1> + <h1 style="white-space: normal;!">Performing Challenge...</h1></div><div data-role="content" data-theme="d" class="ui-corner-bottom ui-content"><div data-bind='with: lastPerformedActivity'><img alt='Lighterprints Activity Badge' data-bind='attr: {src: "/static/images/lighterprints/badges/" + name() + ".png" }'> - <h3>You completed a challenge!</h3> - <p><strong><em data-bind='text: display_name'></em></strong> for <span class='lighterprints-green' data-bind='text: points'></span><i class='icon-leaf lighterprints-green'></i> + <h3 style="white-space: normal;!">You completed a challenge!</h3> + <p style="white-space: normal;!"><strong><em data-bind='text: display_name'></em></strong> for <span class='lighterprints-green' data-bind='text: points'></span><i class='icon-leaf lighterprints-green'></i></p> - <p data-bind='text: summary'></p> + <p style="white-space: normal;!" data-bind='text: summary'></p></div><a href="#" data-role="button" data-inline="true" data-rel="back" data-theme="c">Continue</a></div> @@ -393,7 +399,7 @@ <!-- Start of page2 #dashboardLockedChallengesPage --><div data-role="page" id="dashboardLockedChallengesPage" class="ui-responsive-panel"><div data-role="panel" id="defaultpanel2" data-position="left" data-display="overlay" data-dismissible="true" > - <a href="#" data-role="button" class="innerbutton"><h4><span class="icon-gauge"></span> Dashboard</h4></a> + <a href="#" data-theme="b" data-role="button" class="innerbutton"><h4><span class="icon-gauge"></span> Dashboard</h4></a><a href="#challengesPage" data-role="button" class="innerbutton"><h4><span class="icon-star"></span> Challenges</h4></a><a href="#myTeamPage" reloadPage="true" data-role="button" class="innerbutton"><h4><span class="icon-user"></span> My Team</h4></a><a href="#helpPage" data-role="button" class="innerbutton"><h4><span class="icon-question"></span> Help</h4></a> @@ -410,7 +416,7 @@ <div class="ui-bar ui-bar-e" style="height:90px"> Today's Score <br> - <span data-bind="text: averagePoints"></span> + <span style="font-size:25px;"><span data-bind="text: averagePoints"></span><span class='icon-leaf lighterprints-green'></span><h1></div></div><div class="ui-block-b"> @@ -430,23 +436,15 @@ <div class="ui-bar ui-bar-e" style="height:90px"> Today's Progress <br> - Your group progress: <span data-bind="text: averagePoints"></span> / - <span data-bind="text:pointsToNextLevel"></span> + <span style="font-size:25px;" data-bind="text: averagePoints"></span><big> / </big> + <span style="font-size:25px;" data-bind="text:pointsToNextLevel"></span></div></div><div class="ui-block-b"><div class="ui-bar ui-bar-e" style="height:90px"> - Time Remaining - <table> - <tr> - <td> - <span data-bind="text: hoursLeft"></span>h - </td> - <td> - <span data-bind="text: minutesLeft"></span>m - </td> - </tr> - </table> + Time Remaining<br> + <span style="font-size:25px;" data-bind="text: hoursLeft"></span><big> : </big> + <span style="font-size:25px;" data-bind="text: minutesLeft"></span></div></div></div></div> @@ -454,17 +452,29 @@ <div class="ui-bar-d"><div data-role="navbar" data-theme="d"><h4><span class="lighterprints-grey"> Challenges</span></h4> - <ul id="challengesNavbarList2"> + <ul><li><a href="#dashboardPage"><h3><span class="icon-star text-gold "> Unlocked</span></h3></a></li><li> - <a href="#" class="ui-btn-active"><h3><span class="icon-lock lighterprints-grey"> Locked</span></h3></a> + <a href="#" data-theme="b"><h3><span class="icon-lock lighterprints-grey"> Locked</span></h3></a></li></ul></div> - <ul id="lockedChallengesList2" data-role="listview" data-inset="true" data-theme="d" data-bind="template: { name: 'challenges-template', foreach: lockedChallenges() }"> - </ul> + <ul id="lockedChallengesList2" data-role="listview" data-inset="true" data-theme="b" data-bind="foreach: lockedChallenges()"> + <li data-icon="false"><div style="text-align: center;"> + <img width="100px" height="100px" data-bind='attr: {src: "https://vcweb.asu.edu/static/images/lighterprints/badges/" + name() + ".png" }'><h4 style="white-space: normal;!" class='challenge-name' data-bind='css: status, text:display_name'></h4> + <p style="white-space: normal;!"><span data-bind='css: status, text: summary'></span></p> + <h4><span data-bind='text: points'></span><span class='lighterprints-green icon-leaf icon-2x'></span><br> + <span data-bind='text: time_slots'></span> + </h4> + <span data-bind='if: availableNow'><a data-role="button" data-inline="true" style="text-decoration: none;" data-bind='css:status, click: $root.perform1'>Perform </a></span> + <span data-bind='if: completed'><a data-role="button" data-inline="true" style="text-decoration: none;" class="ui-disabled" data-bind='css:status'> Completed <span class='icon-checkmark'></span></a></span> + <span data-bind='if: expired'><a data-role="button" data-inline="true" style="text-decoration: none;" class="ui-disabled" data-bind='css:status'> Expired <span class='icon-warning'></span></a></span> + <span data-bind='if: upcoming'><a data-role="button" data-inline="true" style="text-decoration: none;" class="ui-disabled" data-bind='css:status'> Not yet available <span class='icon-clock'></span></a></span> + <span data-bind='if: locked'><a data-role="button" data-inline="true" style="text-decoration: none;" class="ui-disabled" data-bind='css:status'> Locked <span class='icon-lock'></span></a></span> + </div></li> + </ul></div><div class="ui-bar-d"><h4><span class="icon-trophy text-gold "></span> Leaderboard</h4> @@ -486,10 +496,10 @@ <div data-role="footer" data-theme="c"><div class="ui-bar-b" style="font-size:15px;text-align:center;"><div data-role="controlgroup" data-type="horizontal" data-theme="b"> - <a href="#" data-theme="b"> Dashboard</a> - <a href="#challengesPage"> Challenges</a> - <a href="#myTeamPage"> My Team</a> - <a href="#helpPage"> Help</a> + <a href="#" style="text-decoration: none;"> Dashboard</a> + <a href="#challengesPage" style="text-decoration: none;"> Challenges</a> + <a href="#myTeamPage" style="text-decoration: none;"> My Team</a> + <a href="#helpPage" style="text-decoration: none;"> Help</a></div> 2013 Arizona Board Of Regents </div> @@ -504,7 +514,7 @@ <div data-role="page" id="challengesPage" class="ui-responsive-panel"><div data-role="panel" id="defaultpanel3" data-position="left" data-display="overlay" data-dismissible="true" ><a href="#dashboardPage" data-role="button" class="innerbutton"><h4><span class="icon-gauge"></span> Dashboard</h4></a> - <a href="#" data-role="button" class="innerbutton"><h4><span class="icon-star"></span> Challenges</h4></a> + <a href="#" data-theme="b" data-role="button" class="innerbutton"><h4><span class="icon-star"></span> Challenges</h4></a><a href="#myTeamPage" reloadPage="true" data-role="button" class="innerbutton"><h4><span class="icon-user"></span> My Team</h4></a><a href="#helpPage" data-role="button" class="innerbutton"><h4><span class="icon-question"></span> Help</h4></a></div> @@ -516,16 +526,27 @@ <div class="ui-bar-d"><div data-role="navbar" data-theme="d"><h4><span class="lighterprints-grey icon-star"> Challenges</span></h4> - <ul id="challengesNavbarList3"> + <ul><li> - <a href="#" class="ui-btn-active" ><h3><span class="icon-star text-gold "> Unlocked</span></h3></a> + <a href="#" data-theme="b" ><h3><span class="icon-star text-gold "> Unlocked</span></h3></a></li><li><a href="#lockedChallengesPage"><h3><span class="icon-lock lighterprints-grey"> Locked</span></h3></a></li></ul></div> - <ul id="challengesList3" data-role="listview" data-inset="true" data-theme="d" data-bind="template: { name: 'challenges-template', foreach: unlockedChallenges() }"> + <ul id="challengesList3" data-role="listview" data-inset="true" data-theme="b" data-bind="foreach: unlockedChallenges()"><li data-icon="false"><div style="text-align: center;"> + <img width="100px" height="100px" data-bind='attr: {src: "https://vcweb.asu.edu/static/images/lighterprints/badges/" + name() + ".png" }'><h4 style="white-space: normal;!" class='challenge-name' data-bind='css: status, text:display_name'></h4> + <p style="white-space: normal;!"><span data-bind='css: status, text: summary'></span></p> + <h4><span data-bind='text: points'></span><span class='lighterprints-green icon-leaf icon-2x'></span><br> + <span data-bind='text: time_slots'></span> + </h4> + <span data-bind='if: availableNow'><a id="clickPg31" data-role="button" data-inline="true" style="text-decoration: none;" data-bind='css:status, click: $root.perform2'>Perform </a></span> + <span data-bind='if: completed'><a id="clickPg32" data-role="button" data-inline="true" style="text-decoration: none;" class="ui-disabled" data-bind='css:status'> Completed <span class='icon-checkmark'></span></a></span> + <span data-bind='if: expired'><a id="clickPg33" data-role="button" data-inline="true" style="text-decoration: none;" class="ui-disabled" data-bind='css:status'> Expired <span class='icon-warning'></span></a></span> + <span data-bind='if: upcoming'><a id="clickPg34" data-role="button" data-inline="true" style="text-decoration: none;" class="ui-disabled" data-bind='css:status'> Not yet available <span class='icon-clock'></span></a></span> + <span data-bind='if: locked'><a id="clickPg35" data-role="button" data-inline="true" style="text-decoration: none;" class="ui-disabled" data-bind='css:status'> Locked <span class='icon-lock'></span></a></span> + </div></li></ul></div><div class="ui-bar-d"> @@ -548,10 +569,10 @@ <div data-role="footer" data-theme="c"><div class="ui-bar-b" style="font-size:15px;text-align:center;"><div data-role="controlgroup" data-type="horizontal" data-theme="b"> - <a href="#" data-theme="b"> Dashboard</a> - <a href="#challengesPage"> Challenges</a> - <a href="#myTeamPage"> My Team</a> - <a href="#helpPage"> Help</a> + <a href="#dashboardPage" style="text-decoration: none;"> Dashboard</a> + <a href="#"style="text-decoration: none;"> Challenges</a> + <a href="#myTeamPage" style="text-decoration: none;"> My Team</a> + <a href="#helpPage" style="text-decoration: none;"> Help</a></div> 2013 Arizona Board Of Regents </div> @@ -580,8 +601,8 @@ <!-- Start of page4 #lockedChallengesPage --><div data-role="page" id="lockedChallengesPage" class="ui-responsive-panel"><div data-role="panel" id="defaultpanel4" data-position="left" data-display="overlay" data-dismissible="true" > - <a href="#dashboard" data-role="button" class="innerbutton"><h4><span class="icon-gauge"></span> Dashboard</h4></a> - <a href="#" data-role="button" class="innerbutton"><h4><span class="icon-star"></span> Challenges</h4></a> + <a href="#dashboardPage" data-role="button" class="innerbutton"><h4><span class="icon-gauge"></span> Dashboard</h4></a> + <a href="#" data-theme="b" data-role="button" class="innerbutton"><h4><span class="icon-star"></span> Challenges</h4></a><a href="#myTeamPage" reloadPage="true" data-role="button" class="innerbutton"><h4><span class="icon-user"></span> My Team</h4></a><a href="#helpPage" data-role="button" class="innerbutton"><h4><span class="icon-question"></span> Help</h4></a></div> @@ -592,17 +613,28 @@ <div data-role="content" data-theme="d"><div class="ui-bar-d"><div data-role="navbar" data-theme="d"> - <h4><span class="lighterprints-grey"> Challenges</span></h4> - <ul id="challengesNavbarList4"> + <h4><span class="lighterprints-grey icon-star"> Challenges</span></h4> + <ul><li><a href="#challengesPage"><h3><span class="icon-star text-gold "> Unlocked</span></h3></a></li><li> - <a href="#" class="ui-btn-active"><h3><span class="icon-lock lighterprints-grey"> Locked</span></h3></a> + <a href="#" data-theme="b"><h3><span class="icon-lock lighterprints-grey"> Locked</span></h3></a></li></ul></div> - <ul id="lockedChallengesList4" data-role="listview" data-inset="true" data-theme="d" data-bind="template: { name: 'challenges-template', foreach: lockedChallenges() }"> + <ul id="lockedChallengesList4" data-role="listview" data-inset="true" data-theme="b" data-bind="foreach: lockedChallenges()"><li data-icon="false"><div style="text-align: center;"> + <img width="100px" height="100px" data-bind='attr: {src: "https://vcweb.asu.edu/static/images/lighterprints/badges/" + name() + ".png" }'><h4 style="white-space: normal;!" class='challenge-name' data-bind='css: status, text:display_name'></h4> + <p style="white-space: normal;!"><span data-bind='css: status, text: summary'></span></p> + <h4><span data-bind='text: points'></span><span class='lighterprints-green icon-leaf icon-2x'></span><br> + <span data-bind='text: time_slots'></span> + </h4> + <span data-bind='if: availableNow'><a data-role="button" data-inline="true" style="text-decoration: none;" data-bind='css:status, click: $root.perform2'>Perform </a></span> + <span data-bind='if: completed'><a data-role="button" data-inline="true" style="text-decoration: none;" class="ui-disabled" data-bind='css:status'> Completed <span class='icon-checkmark'></span></a></span> + <span data-bind='if: expired'><a data-role="button" data-inline="true" style="text-decoration: none;" class="ui-disabled" data-bind='css:status'> Expired <span class='icon-warning'></span></a></span> + <span data-bind='if: upcoming'><a data-role="button" data-inline="true" style="text-decoration: none;" class="ui-disabled" data-bind='css:status'> Not yet available <span class='icon-clock'></span></a></span> + <span data-bind='if: locked'><a data-role="button" data-inline="true" style="text-decoration: none;" class="ui-disabled" data-bind='css:status'> Locked <span class='icon-lock'></span></a></span> + </div></li></ul></div><div class="ui-bar-d"> @@ -625,10 +657,10 @@ <div data-role="footer" data-theme="c"><div class="ui-bar-b" style="font-size:15px;text-align:center;"><div data-role="controlgroup" data-type="horizontal" data-theme="b"> - <a href="#" data-theme="b"> Dashboard</a> - <a href="#challengesPage"> Challenges</a> - <a href="#myTeamPage"> My Team</a> - <a href="#helpPage"> Help</a> + <a href="#dashboardPage" style="text-decoration: none;"> Dashboard</a> + <a href="#" style="text-decoration: none;"> Challenges</a> + <a href="#myTeamPage" style="text-decoration: none;"> My Team</a> + <a href="#helpPage" style="text-decoration: none;"> Help</a></div> 2013 Arizona Board Of Regents </div> @@ -642,29 +674,28 @@ <!-- Start of page5: #myTeamPage --><div data-role="page" id="myTeamPage" class="ui-responsive-panel"><div data-role="panel" id="defaultpanel5" data-theme="b" data-position="left" data-display="overlay" data-dismissible="true" > - <a href="#dashboardPage" data-theme="c" data-role="button" class="innerbutton"><h4><span class="icon-gauge"></span> Dashboard</h4></a> - <a href="#challengesPage" data-theme="c" data-role="button" class="innerbutton"><h4><span class="icon-star"></span> Challenges</h4></a> - <a href="#" data-theme="c" data-role="button" class="innerbutton"><h4><span class="icon-user"></span> My Team</h4></a> - <a href="#helpPage" data-theme="c" data-role="button" class="innerbutton"><h4><span class="icon-question"></span> Help</h4></a> + <a href="#dashboardPage" data-role="button" class="innerbutton"><h4><span class="icon-gauge"></span> Dashboard</h4></a> + <a href="#challengesPage" data-role="button" class="innerbutton"><h4><span class="icon-star"></span> Challenges</h4></a> + <a href="#" data-theme="b" data-role="button" class="innerbutton"><h4><span class="icon-user"></span> My Team</h4></a> + <a href="#helpPage" data-role="button" class="innerbutton"><h4><span class="icon-question"></span> Help</h4></a></div><div data-role="header" data-theme="a" class="navbar" data-position="fixed" ><img width="30px" height="30px" src="https://vcweb.asu.edu/static/images/lighterprints/logo.png" alt="footprint logo">lighter<strong style="color:#b9ed2e;">footprints</strong><a href="#defaultpanel5" class="ui-btn-right" data-role="button" data-inline="true" data-iconpos="notext" data-theme="a" data-icon="align-justify"></a></div><div data-role="content" data-theme="d"> - <h4><span class="icon-comment"></span> My Team</h4> - <div class="ui-bar-c"> - <div data-role="fieldcontain"> + <h4><span class="icon-comment lighterprints-grey"> My Team</span></h4> + <div data-role="fieldcontain"><input type="hidden" name="participant_group_id" value='{{participant_group_relationship.id}}'><input type="text" id="chatText" name="message" placeholder="Send a message to your group"><a href="#" data-theme="a" data-inline="true" data-role="button" data-bind='click: $root.send'>Send</a> - </div> - - <div data-bind="ifnot: hasChatMessages() " data-inset="true" data-theme="d"> + </div> + <div class="ui-bar-c"> + <div data-bind="ifnot: hasChatMessages() " data-inset="true" data-theme="d"> No chat messages have been posted yet. </div><div data-bind="if: hasChatMessages()"> - <ul id="chatMessageList" data-role="listview" data-bind="template: {name:'myTeam-template', foreach: chatMessages}" data-inset="true" style="overflow-y: scroll;" data-theme="d"> + <ul id="chatMessageList" data-role="listview" data-bind="template: {name:'myTeam-template', foreach: chatMessages}" data-inset="true" style="overflow-y: scroll;height:600px;" data-theme="d"></ul></div></div> @@ -672,10 +703,10 @@ <div data-role="footer" data-theme="c"><div class="ui-bar-b" style="font-size:15px;text-align:center;"><div data-role="controlgroup" data-type="horizontal" data-theme="b"> - <a href="#dashboardPage" data-theme="b"> Dashboard</a> - <a href="#challengesPage"> Challenges</a> - <a href="#"> My Team</a> - <a href="#helpPage"> Help</a> + <a href="#dashboardPage" style="text-decoration: none;"> Dashboard</a> + <a href="#challengesPage" style="text-decoration: none;"> Challenges</a> + <a href="#" style="text-decoration: none;"> My Team</a> + <a href="#helpPage" style="text-decoration: none;"> Help</a></div> 2013 Arizona Board Of Regents </div> @@ -689,10 +720,10 @@ <!-- Start of page6: #helpPage --><div data-role="page" id="helpPage" class="ui-responsive-panel"><div data-role="panel" id="defaultpanel6" data-theme="b" data-position="left" data-display="overlay" data-dismissible="true" > - <a href="#dashboardPage" data-theme="c" data-role="button" class="innerbutton"><h4><span class="icon-gauge"></span> Dashboard</h4></a> - <a href="#challengesPage" data-theme="c" data-role="button" class="innerbutton"><h4><span class="icon-star"></span> Challenges</h4></a> - <a href="#myTeamPage" data-theme="c" data-role="button" class="innerbutton"><h4><span class="icon-user"></span> My Team</h4></a> - <a href="#" data-theme="c" data-role="button" class="innerbutton"><h4><span class="icon-question"></span> Help</h4></a> + <a href="#dashboardPage" data-role="button" class="innerbutton"><h4><span class="icon-gauge"></span> Dashboard</h4></a> + <a href="#challengesPage" data-role="button" class="innerbutton"><h4><span class="icon-star"></span> Challenges</h4></a> + <a href="#myTeamPage" data-role="button" class="innerbutton"><h4><span class="icon-user"></span> My Team</h4></a> + <a href="#" data-theme="b" data-role="button" class="innerbutton"><h4><span class="icon-question"></span> Help</h4></a></div><div data-role="header" data-theme="a" class="navbar" data-position="fixed" ><img width="30px" height="30px" src="https://vcweb.asu.edu/static/images/lighterprints/logo.png" alt="footprint logo">lighter<strong style="color:#b9ed2e;">footprints</strong> @@ -739,15 +770,15 @@ <h4>Frequently Asked Questions</h4><ul data-role="listview" data-inset="true" data-theme="b"><li> - <h4>I performed an activity worth 15 points but only 3 points were added to Today"s Progress and Today"s Score. Why?</h4> - <p> + <h4 style="white-space: normal;!">I performed an activity worth 15 points but only 3 points were added to Today"s Progress and Today's Score. Why?</h4> + <p style="white-space: normal;!"> The numbers in Today"s Score Today"s Progress represent your group"s <b>average number of earned green points</b>. If there are 5 people in your group, performing a 15 point activity adds 3 points to the group average (15 / 5 = 3). </p></li><li> - <h4>Why do the challenges performed in the previous day not count for today?</h4> - <p> + <h4 style="white-space: normal;!">Why do the challenges performed in the previous day not count for today?</h4> + <p style="white-space: normal;!"> In order to advance in level and unlock more challenges you must reach an average level of points in your group during one day, starting at 0.00AM. Every day at midnight the server will check your group"s average number of points and determine whether or not you should move on to the next level. @@ -757,8 +788,8 @@ </p></li><li> - <h4>I don"t have a car or anyone to carpool with, so how can I carpool?</h4> - <p> + <h4 style="white-space: normal;!">I don't have a car or anyone to carpool with, so how can I carpool?</h4> + <p style="white-space: normal;!"> You don"t have to actually perform the activity in the real world to click on "perform". These are just virtual challenges for the time being. In the future we plan to allow participants to gain points by actually performing these challenges. @@ -770,10 +801,10 @@ <div data-role="footer" data-theme="c"><div class="ui-bar-b" style="font-size:15px;text-align:center;"><div data-role="controlgroup" data-type="horizontal" data-theme="b"> - <a href="#dashboardPage"> Dashboard</a> - <a href="#challengesPage"> Challenges</a> - <a href="#myTeamPage"> My Team</a> - <a href="#"> Help</a> + <a href="#dashboardPage" style="text-decoration: none;"> Dashboard</a> + <a href="#challengesPage" style="text-decoration: none;"> Challenges</a> + <a href="#myTeamPage" style="text-decoration: none;"> My Team</a> + <a href="#" style="text-decoration: none;"> Help</a></div> 2013 Arizona Board Of Regents </div> https://bitbucket.org/virtualcommons/vcweb/commits/c2da410bce55/ Changeset: c2da410bce55 User: RoleeSinha Date: 2013-05-21 02:23:24 Summary: fixing styling Affected #: 1 file diff -r cd5d4c68ca51585ff2df9a71895955e337252fa8 -r c2da410bce55d72c4b7d2206bd818872c1504ebc vcweb/lighterprints/static/css/lighterprints/mobile/themeroller.css --- a/vcweb/lighterprints/static/css/lighterprints/mobile/themeroller.css +++ b/vcweb/lighterprints/static/css/lighterprints/mobile/themeroller.css @@ -47,7 +47,7 @@ .ui-bar-a select, .ui-bar-a textarea, .ui-bar-a button { - font-family: Arial /*{global-font-family}*/; + font-family: sans-serif /*{global-font-family}*/; } .ui-body-a, .ui-overlay-a { @@ -71,7 +71,7 @@ .ui-body-a select, .ui-body-a textarea, .ui-body-a button { - font-family: Arial /*{global-font-family}*/; + font-family: sans-serif /*{global-font-family}*/; } .ui-body-a .ui-link-inherit { color: #4d4d4d /*{a-body-color}*/; @@ -145,7 +145,7 @@ .ui-btn-up-a, .ui-btn-hover-a, .ui-btn-down-a { - font-family: Arial /*{global-font-family}*/; + font-family: sans-serif /*{global-font-family}*/; text-decoration: none; } /* B @@ -184,7 +184,7 @@ .ui-bar-b select, .ui-bar-b textarea, .ui-bar-b button { - font-family: Arial /*{global-font-family}*/; + font-family: sans-serif /*{global-font-family}*/; } .ui-body-b, .ui-overlay-b { @@ -208,7 +208,7 @@ .ui-body-b select, .ui-body-b textarea, .ui-body-b button { - font-family: Arial /*{global-font-family}*/; + font-family: sans-serif /*{global-font-family}*/; } .ui-body-b .ui-link-inherit { color: #5F6E77 /*{b-body-color}*/; @@ -282,7 +282,7 @@ .ui-btn-up-b, .ui-btn-hover-b, .ui-btn-down-b { - font-family: Arial /*{global-font-family}*/; + font-family: sans-serif /*{global-font-family}*/; text-decoration: none; } @@ -323,7 +323,7 @@ .ui-bar-c select, .ui-bar-c textarea, .ui-bar-c button { - font-family: Arial /*{global-font-family}*/; + font-family: sans-serif /*{global-font-family}*/; } .ui-body-c, .ui-overlay-c { @@ -347,7 +347,7 @@ .ui-body-c select, .ui-body-c textarea, .ui-body-c button { - font-family: Arial /*{global-font-family}*/; + font-family: sans-serif /*{global-font-family}*/; } .ui-body-c .ui-link-inherit { color: #5F6E77 /*{c-body-color}*/; @@ -421,7 +421,7 @@ .ui-btn-up-c, .ui-btn-hover-c, .ui-btn-down-c { - font-family: Arial /*{global-font-family}*/; + font-family: sans-serif /*{global-font-family}*/; text-decoration: none; } @@ -462,7 +462,7 @@ .ui-bar-d select, .ui-bar-d textarea, .ui-bar-d button { - font-family: Arial /*{global-font-family}*/; + font-family: sans-serif /*{global-font-family}*/; } .ui-body-d, .ui-overlay-d { @@ -486,7 +486,7 @@ .ui-body-d select, .ui-body-d textarea, .ui-body-d button { - font-family: Arial /*{global-font-family}*/; + font-family: sans-serif /*{global-font-family}*/; } .ui-body-d .ui-link-inherit { color: #5F6E77 /*{d-body-color}*/; @@ -560,7 +560,7 @@ .ui-btn-up-d, .ui-btn-hover-d, .ui-btn-down-d { - font-family: Arial /*{global-font-family}*/; + font-family: sans-serif /*{global-font-family}*/; text-decoration: none; } @@ -601,7 +601,7 @@ .ui-bar-e select, .ui-bar-e textarea, .ui-bar-e button { - font-family: Arial /*{global-font-family}*/; + font-family: sans-serif /*{global-font-family}*/; } .ui-body-e, .ui-overlay-e { @@ -625,7 +625,7 @@ .ui-body-e select, .ui-body-e textarea, .ui-body-e button { - font-family: Arial /*{global-font-family}*/; + font-family: sans-serif /*{global-font-family}*/; } .ui-body-e .ui-link-inherit { color: #5F6E77 /*{e-body-color}*/; @@ -699,7 +699,7 @@ .ui-btn-up-e, .ui-btn-hover-e, .ui-btn-down-e { - font-family: Arial /*{global-font-family}*/; + font-family: sans-serif /*{global-font-family}*/; text-decoration: none; } @@ -728,7 +728,7 @@ background-image: -ms-linear-gradient( #ffffff /*{global-active-background-start}*/, #ffffff /*{global-active-background-end}*/); /* IE10 */ background-image: -o-linear-gradient( #ffffff /*{global-active-background-start}*/, #ffffff /*{global-active-background-end}*/); /* Opera 11.10+ */ background-image: linear-gradient( #ffffff /*{global-active-background-start}*/, #ffffff /*{global-active-background-end}*/); - font-family: Arial /*{global-font-family}*/; + font-family: sans-serif /*{global-font-family}*/; } .ui-btn-active:visited, .ui-btn-active:hover, @@ -1072,4 +1072,4 @@ .ui-mobile-nosupport-boxshadow .ui-link-inherit:focus { outline-width: 1px; outline-style: auto; -} +} \ No newline at end of file https://bitbucket.org/virtualcommons/vcweb/commits/2fa80193c5eb/ Changeset: 2fa80193c5eb User: RoleeSinha Date: 2013-05-21 02:23:31 Summary: fixing styling Affected #: 1 file diff -r c2da410bce55d72c4b7d2206bd818872c1504ebc -r 2fa80193c5eb1f0f9ebbbc198ca16d2ee5a30562 vcweb/lighterprints/static/css/lighterprints/mobile/style.css --- a/vcweb/lighterprints/static/css/lighterprints/mobile/style.css +++ b/vcweb/lighterprints/static/css/lighterprints/mobile/style.css @@ -1,5 +1,6 @@ body{ text-align: left; + font-family: arial; } .navbar{ padding-left: 5px; @@ -29,36 +30,58 @@ .innerbutton{ text-align:left; } -a.upcoming-challenge, a.expired-challenge, a.perform-challenge, a.completed-challenge { - color: #4d4d4d !important; - -webkit-font-smoothing: antialiased; - background-repeat: repeat-x; +.challenges { + margin-top: -20px; + background-color: #FFFFFF; + border-left: 1px solid #ddd; + border-right: 1px solid #ddd; +} +a.upcoming-challenge, a.expired-challenge, a.perform-challenge, a.completed-challenge, a.locked-challenge { + text-transform: uppercase; + color: #FFF !important; + } a.upcoming-challenge { background-color: hsl(0, 0%, 54%) !important; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr="#f4f4f4", endColorstr="#898989"); - background-image: -khtml-gradient(linear, left top, left bottom, from(#f4f4f4), to(#898989)); - background-image: -moz-linear-gradient(top, #f4f4f4, #898989); - background-image: -ms-linear-gradient(top, #f4f4f4, #898989); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #f4f4f4), color-stop(100%, #898989)); - background-image: -webkit-linear-gradient(top, #f4f4f4, #898989); - background-image: -o-linear-gradient(top, #f4f4f4, #898989); - background-image: linear-gradient(#f4f4f4, #898989); - border-color: #898989 #898989 hsl(0, 0%, 43.5%); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr="#4d4d4d", endColorstr="#4d4d4d"); + background-image: -khtml-gradient(linear, left top, left bottom, from(#4d4d4d), to(#4d4d4d)); + background-image: -moz-linear-gradient(top, #4d4d4d, #4d4d4d); + background-image: -ms-linear-gradient(top, #4d4d4d, #4d4d4d); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #4d4d4d), color-stop(100%, #4d4d4d)); + background-image: -webkit-linear-gradient(top, #4d4d4d, #4d4d4d); + background-image: -o-linear-gradient(top, #4d4d4d, #4d4d4d); + background-image: linear-gradient(#4d4d4d, #4d4d4d); + border-color: #4d4d4d #4d4d4d hsl(0, 0%, 43.5%); + +} +a.locked-challenge { + background-color: hsl(0, 0%, 54%) !important; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr="#8c8787", endColorstr="#8c8787"); + background-image: -khtml-gradient(linear, left top, left bottom, from(#8c8787), to(#8c8787)); + background-image: -moz-linear-gradient(top, #8c8787, #8c8787); + background-image: -ms-linear-gradient(top, #8c8787, #8c8787); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #8c8787), color-stop(100%, #8c8787)); + background-image: -webkit-linear-gradient(top, #8c8787, #8c8787); + background-image: -o-linear-gradient(top, #8c8787, #8c8787); + background-image: linear-gradient(#8c8787, #8c8787); + border-color: #8c8787 #8c8787 hsl(0, 0%, 43.5%); + text-shadow: 0 1px 1px rgba(255, 255, 255, 0.69); } a.expired-challenge { background-color: hsl(0, 100%, 79%) !important; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr="#ffbcbc", endColorstr="#ff9393"); - background-image: -khtml-gradient(linear, left top, left bottom, from(#ffbcbc), to(#ff9393)); - background-image: -moz-linear-gradient(top, #ffbcbc, #ff9393); - background-image: -ms-linear-gradient(top, #ffbcbc, #ff9393); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffbcbc), color-stop(100%, #ff9393)); - background-image: -webkit-linear-gradient(top, #ffbcbc, #ff9393); - background-image: -o-linear-gradient(top, #ffbcbc, #ff9393); - background-image: linear-gradient(#ffbcbc, #ff9393); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr="#f03838", endColorstr="#f03838"); + background-image: -khtml-gradient(linear, left top, left bottom, from(#f03838), to(#f03838)); + background-image: -moz-linear-gradient(top, #f03838, #f03838); + background-image: -ms-linear-gradient(top, #f03838, #f03838); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #f03838), color-stop(100%, #f038383)); + background-image: -webkit-linear-gradient(top, #f03838, #f03838); + background-image: -o-linear-gradient(top, #f03838, #f03838); + background-image: linear-gradient(#f03838, #f03838); border-color: #ff9393 #ff9393 hsl(0, 100%, 77%); + text-shadow: 0 1px 1px rgba(255, 255, 255, 0.13); } -a.perform-challenge { + +a.perform-challenge,a.completed-challenge { background-color: hsl(96, 81%, 42%) !important; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr="#66dd17", endColorstr="#59c114"); background-image: -khtml-gradient(linear, left top, left bottom, from(#66dd17), to(#59c114)); @@ -69,25 +92,13 @@ background-image: -o-linear-gradient(top, #66dd17, #59c114); background-image: linear-gradient(#66dd17, #59c114); border-color: #59c114 #59c114 hsl(96, 81%, 40.5%); + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.09); } -a.completed-challenge { - background-color: hsl(96, 81%, 42%) !important; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr="#aed992", endColorstr="#aed992"); - background-image: -khtml-gradient(linear, left top, left bottom, from(#aed992), to(#aed992)); - background-image: -moz-linear-gradient(top, #aed992, #aed992); - background-image: -ms-linear-gradient(top, #aed992, #aed992); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #aed992), color-stop(100%, #aed992)); - background-image: -webkit-linear-gradient(top, #aed992, #aed992); - background-image: -o-linear-gradient(top, #aed992, #aed992); - background-image: linear-gradient(#aed992, #aed992); - border-color: #aed992 #aed992 hsl(96, 81%, 40.5%); -} - .lighterprints-red { color: #FF0066; } .lighterprints-grey { - color: #898989; + color:rgb(201,205,209); } .lighterprints-blue { color: #13a5e6; Repository URL: https://bitbucket.org/virtualcommons/vcweb/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. |
|
From: <com...@bi...> - 2013-05-16 00:39:48
|
1 new commit in vcweb: https://bitbucket.org/virtualcommons/vcweb/commits/d91da1669e5f/ Changeset: d91da1669e5f User: RoleeSinha Date: 2013-05-16 02:39:28 Summary: fixing styling Affected #: 1 file diff -r eea6018e3fe21444efbae145b37192e929452ebf -r d91da1669e5f48632e8b0d43a7bdb15a4751901f vcweb/lighterprints/templates/lighterprints/mobile/index.html --- a/vcweb/lighterprints/templates/lighterprints/mobile/index.html +++ b/vcweb/lighterprints/templates/lighterprints/mobile/index.html @@ -203,7 +203,7 @@ <small><span data-bind='text: date_created'></span></small> - <span>earned <span class='lighterprints-green' data-bind='text:points'></span><span class='icon-leaf lighterprints-green'></span>for <span data-bind='text: $root.groupName'></span>by completing <em><span data-bind='text: display_name'></span></em>.</span> + <span> earned <span class='lighterprints-green' data-bind='text:points'></span><span class='icon-leaf lighterprints-green'></span> for <span data-bind='text: $root.groupName'></span> by completing <em><span data-bind='text: display_name'></span></em>.</span></span></li> Repository URL: https://bitbucket.org/virtualcommons/vcweb/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. |
|
From: <com...@bi...> - 2013-05-16 00:34:05
|
2 new commits in vcweb: https://bitbucket.org/virtualcommons/vcweb/commits/4c4b2149ef1d/ Changeset: 4c4b2149ef1d User: RoleeSinha Date: 2013-05-16 02:33:16 Summary: fixing KO binding Affected #: 1 file diff -r ffc25b5278932ee202b68e75cc267014151e8cac -r 4c4b2149ef1d7d09e56b4ecafc5f38c3c34438a4 vcweb/lighterprints/templates/lighterprints/mobile/index.html --- a/vcweb/lighterprints/templates/lighterprints/mobile/index.html +++ b/vcweb/lighterprints/templates/lighterprints/mobile/index.html @@ -21,10 +21,10 @@ <script src='{% static "js/lighterprints/mobile/controller.js" %}'></script><script> - $(document).on('pageinit', function(event){ + $(document).on('pagecreate', function(event){ var viewModelData = $.parseJSON("{{view_model_json|escapejs}}"); var viewModel = new LighterFootprintsModel(viewModelData); - viewModel.perform = function(challengeModel){ + viewModel.perform1 = function(challengeModel){ if (!challengeModel.availableNow()) { console.debug("tried to perform an activity that's not available right now"); console.debug(challengeModel); @@ -37,16 +37,39 @@ $.post('/lighterprints/api/do-activity', formData, function(data){ if (data.success) { console.debug(data); - //$('#dashboardPage').trigger('pagecreate'); ko.mapping.fromJSON(data.viewModel, viewModel); viewModel.lastPerformedActivity(challengeModel); - ko.applyBindings(viewModel); - //$.mobile.changePage("/lighterprints/mobile"); - $("#popupDialog").popup('open'); + $("#popupDialog1").popup('open'); console.debug('refreshing lists'); - $('#challengesList').listview('refresh'); - $('#teamList').listview('refresh'); - $('#teamActivityList').listview('refresh'); + $('#challengesList1').listview('refresh'); + $('#teamList1').listview('refresh'); + $('#teamActivityList1').listview('refresh'); + } + else { + console.debug("ERROR: " + data.message); + } + }) + }; + viewModel.perform2 = function(challengeModel){ + if (!challengeModel.availableNow()) { + console.debug("tried to perform an activity that's not available right now"); + console.debug(challengeModel); + return; + } + var id = challengeModel.pk(); + var formData = { + participant_group_id: viewModel.participantGroupId(), activity_id:id + }; + $.post('/lighterprints/api/do-activity', formData, function(data){ + if (data.success) { + console.debug(data); + ko.mapping.fromJSON(data.viewModel, viewModel); + viewModel.lastPerformedActivity(challengeModel); + $("#popupDialog3").popup('open'); + console.debug('refreshing lists'); + $('#challengesList3').listview('refresh'); + $('#teamList3').listview('refresh'); + $('#teamActivityList3').listview('refresh'); } else { console.debug("ERROR: " + data.message); @@ -61,7 +84,6 @@ if (response.success) { console.debug("successful post - updated view model: "); ko.mapping.fromJS(response.viewModel, viewModel); - ko.applyBindings(viewModel); console.debug('refresh chatMessage List'); $('#chatMessageList').listview('refresh'); } @@ -73,18 +95,44 @@ $('#chatText').val(''); } }; - ko.applyBindings(viewModel); + //ko.applyBindings(viewModel,$("#dashboardPage")[0]); $("#dashboardPage").on('pageshow', function(event){ - console.debug('dashboardPage pageshow'); - $('#challengesList').listview('refresh'); - $('#teamList').listview('refresh'); - $('#teamActivityList').listview('refresh'); + console.debug('dashboardPage pageshow'); + $('#challengesList1').listview('refresh'); + $('#teamList1').listview('refresh'); + $('#teamActivityList1').listview('refresh'); }); - + $("#dashboardLockedChallengesPage").on('pageshow', function(event){ + console.debug('dashboardLockedChallengesPage pageshow'); + $('#challengesList2').listview('refresh'); + $('#teamList2').listview('refresh'); + $('#teamActivityList2').listview('refresh'); + }); + $("#challengesPage").on('pageshow', function(event){ + console.debug('dashboardPage pageshow'); + $('#challengesList3').listview('refresh'); + $('#teamList3').listview('refresh'); + $('#teamActivityList3').listview('refresh'); + }); + $("#lockedChallengesPage").on('pageshow', function(event){ + console.debug('dashboardLockedChallengesPage pageshow'); + $('#challengesList4').listview('refresh'); + $('#teamList4').listview('refresh'); + $('#teamActivityList4').listview('refresh'); + }); $("#myTeamPage").on('pageshow', function(event){ console.debug('myTeamPage pageshow'); $('#chatMessageList').listview('refresh'); }); + $("#dashboardPage").on('pageinit', function(event){ + console.debug('dashboardPage pageinit'); + $('#dashboardLockedChallengesPage').trigger('pageinit'); + $('#challengesPage').trigger('pageinit'); + $('#lockedChallengesPage').trigger('pageinit'); + $('#myTeamPage').trigger('pageinit'); + $('#helpPage').trigger('pageinit'); + ko.applyBindings(viewModel); + }); }); </script><!-- knockout templates --> @@ -160,9 +208,9 @@ </span></li></script> - <script type='text/html' id='challenges-template'> + <script type='text/html' id='dashboard-challenges-template'><li data-icon="false"> - <a href="#" data-bind='css: status, click: $root.perform'> + <a href="#" data-bind='css: status, click: $root.perform1'><span data-bind='if: availableNow'>Perform</span><span data-bind='if: completed'>Completed <span class='icon-check'></span></span><span data-bind='if: expired'>Expired <span class='icon-warning-sign'></span></span> @@ -177,6 +225,23 @@ </a></li></script> + <script type='text/html' id='challenges-template'> + <li data-icon="false"> + <a href="#" data-bind='css: status, click: $root.perform2'> + <span data-bind='if: availableNow'>Perform</span> + <span data-bind='if: completed'>Completed <span class='icon-check'></span></span> + <span data-bind='if: expired'>Expired <span class='icon-warning-sign'></span></span> + <span data-bind='if: upcoming'>Not yet available <span class='icon-time'></span></span> + <span data-bind='if: locked'>Locked <span class='icon-lock'></span></span> + <img style='padding: 10px 0 0 10px; float:left;' data-bind='attr: {src: "https://vcweb.asu.edu/static/images/lighterprints/badges/" + name() + ".png" }'><h4 class='challenge-name' data-bind='css: status, text:display_name'></h4> + <p><span data-bind='css: status, text: summary'></span></p> + <h4><span data-bind='text: points'></span><span class='lighterprints-green icon-leaf icon-2x'></span> + <br> + <span data-bind='text: time_slots'></span> + </h4> + </a> + </li> + </script><script type='text/html' id='leaderboard-template'><li> @@ -199,19 +264,17 @@ </script></head><body> - <!-- Start of #dashboardPage --> + <!-- Start of page1 #dashboardPage --><div data-role="page" id="dashboardPage" class="ui-responsive-panel"> - <!-- defaultpanel --> - <div data-role="panel" id="defaultpanel" data-position="left" data-display="overlay" data-dismissible="true" > + <div data-role="panel" id="defaultpanel1" data-position="left" data-display="overlay" data-dismissible="true" ><a href="#" data-role="button" class="innerbutton"><h4><span class="icon-gauge"></span> Dashboard</h4></a><a href="#challengesPage" data-role="button" class="innerbutton"><h4><span class="icon-star"></span> Challenges</h4></a><a href="#myTeamPage" reloadPage="true" data-role="button" class="innerbutton"><h4><span class="icon-user"></span> My Team</h4></a><a href="#helpPage" data-role="button" class="innerbutton"><h4><span class="icon-question"></span> Help</h4></a></div> - <!-- /defaultpanel --><div data-role="header" data-theme="a" class="navbar" data-position="fixed"><img width="30px" height="30px" src="https://vcweb.asu.edu/static/images/lighterprints/logo.png" alt="footprint logo">lighter<strong style="color:#b9ed2e;">footprints</strong> - <a href="#defaultpanel" class="ui-btn-right" data-role="button" data-inline="true" data-iconpos="notext" data-theme="a" data-icon="align-justify"></a> + <a href="#defaultpanel1" class="ui-btn-right" data-role="button" data-inline="true" data-iconpos="notext" data-theme="a" data-icon="align-justify"></a></div><div data-role="content" data-theme="d"><div class="ui-bar-d"> @@ -265,21 +328,21 @@ <div class="ui-bar-d"><div data-role="navbar" data-theme="d"><h4><span class="lighterprints-grey"> Challenges</span></h4> - <ul id="challengesNavbarList"> + <ul id="challengesNavbarList1"><li><a href="#" class="ui-btn-active" ><h3><span class="icon-star text-gold "> Unlocked</span></h3></a></li><li> - <a href="#dashboardLockedChallengePage"><h3><span class="icon-lock lighterprints-grey"> Locked</span></h3></a> + <a href="#dashboardLockedChallengesPage"><h3><span class="icon-lock lighterprints-grey"> Locked</span></h3></a></li></ul></div> - <ul id="challengesList" data-role="listview" data-inset="true" data-theme="d" data-bind="template: { name: 'challenges-template', foreach: unlockedChallenges() }"> + <ul id="challengesList1" data-role="listview" data-inset="true" data-theme="d" data-bind="template: { name: 'dashboard-challenges-template', foreach: unlockedChallenges() }"></ul></div><div class="ui-bar-d"><h4><span class="icon-trophy text-gold "></span> Leaderboard</h4> - <ul id="teamList" data-role="listview" data-bind="template: {name:'leaderboard-template', foreach: groupData}" data-inset="true" data-theme="b"> + <ul id="teamList1" data-role="listview" data-bind="template: {name:'leaderboard-template', foreach: groupData}" data-inset="true" data-theme="b"></ul></div><div class="ui-bar-d"> @@ -289,7 +352,7 @@ </div></div><div class='table group-activity'> - <ul id="teamActivityList" data-role="listview" data-inset="true" data-bind='template: { name: groupActivityTemplate, foreach: groupActivity.slice(0, 6) }'> + <ul id="teamActivityList1" data-role="listview" data-inset="true" data-bind='template: { name: groupActivityTemplate, foreach: groupActivity.slice(0, 6) }'></ul></div></div> @@ -309,7 +372,7 @@ lighter<strong>footprints</strong></div></div> - <div data-role="popup" id="popupDialog" data-overlay-theme="a" data-theme="c" class="ui-corner-all"> + <div data-role="popup" id="popupDialog1" data-overlay-theme="a" data-theme="c" class="ui-corner-all"><div data-role="header" data-theme="a" class="ui-corner-top"><h1>Performing Challenge...</h1></div> @@ -326,11 +389,259 @@ </div></div><!-- /page dashboardPage--> -><!-- Start of #dashboardLockedChallengePage --> - <!-- /page dashboardLockedChallengePage--><!-- Start of first page: #challengesPage --> - <!-- /page lockedChallengePage--><!-- Start of page: #myTeamPage --> + + <!-- Start of page2 #dashboardLockedChallengesPage --> + <div data-role="page" id="dashboardLockedChallengesPage" class="ui-responsive-panel"> + <div data-role="panel" id="defaultpanel2" data-position="left" data-display="overlay" data-dismissible="true" > + <a href="#" data-role="button" class="innerbutton"><h4><span class="icon-gauge"></span> Dashboard</h4></a> + <a href="#challengesPage" data-role="button" class="innerbutton"><h4><span class="icon-star"></span> Challenges</h4></a> + <a href="#myTeamPage" reloadPage="true" data-role="button" class="innerbutton"><h4><span class="icon-user"></span> My Team</h4></a> + <a href="#helpPage" data-role="button" class="innerbutton"><h4><span class="icon-question"></span> Help</h4></a> + </div> + <div data-role="header" data-theme="a" class="navbar" data-position="fixed"> + <img width="30px" height="30px" src="https://vcweb.asu.edu/static/images/lighterprints/logo.png" alt="footprint logo">lighter<strong style="color:#b9ed2e;">footprints</strong> + <a href="#defaultpanel2" class="ui-btn-right" data-role="button" data-inline="true" data-iconpos="notext" data-theme="a" data-icon="align-justify"></a> + </div> + <div data-role="content" data-theme="d"> + <div class="ui-bar-d"> + <h4><span class="icon-gauge lighterprints-grey"> Team Dashboard</span></h4> + <div class="ui-grid-a" data-inset="true"> + <div class="ui-block-a"> + <div class="ui-bar ui-bar-e" style="height:90px"> + Today's Score + <br> + <span data-bind="text: averagePoints"></span> + </div> + </div> + <div class="ui-block-b"> + <div class="ui-bar ui-bar-e" style="height:90px"> + Current Level + <div data-bind='if: experimentCompleted'> + <img alt='Experiment Completed' class='group-level' width='120' height='70' src='https://vcweb.asu.edu/static/images/lighterprints/experiment-completed.png'> + </div> + <div data-bind='ifnot: experimentCompleted'> + <img alt='Group Level' class='group-level' width="104" height="65" data-bind="attr: { src: 'https://vcweb.asu.edu/static/images/lighterprints/rank' + groupLevel() + '.png' }"> + </div> + </div> + </div> + </div><!-- /grid-a --> + <div class="ui-grid-a"> + <div class="ui-block-a"> + <div class="ui-bar ui-bar-e" style="height:90px"> + Today's Progress + <br> + Your group progress: <span data-bind="text: averagePoints"></span> / + <span data-bind="text:pointsToNextLevel"></span> + </div> + </div> + <div class="ui-block-b"> + <div class="ui-bar ui-bar-e" style="height:90px"> + Time Remaining + <table> + <tr> + <td> + <span data-bind="text: hoursLeft"></span>h + </td> + <td> + <span data-bind="text: minutesLeft"></span>m + </td> + </tr> + </table> + </div> + </div> + </div></div> + + <div class="ui-bar-d"> + <div data-role="navbar" data-theme="d"> + <h4><span class="lighterprints-grey"> Challenges</span></h4> + <ul id="challengesNavbarList2"> + <li> + <a href="#dashboardPage"><h3><span class="icon-star text-gold "> Unlocked</span></h3></a> + </li> + <li> + <a href="#" class="ui-btn-active"><h3><span class="icon-lock lighterprints-grey"> Locked</span></h3></a> + </li> + </ul> + </div> + <ul id="lockedChallengesList2" data-role="listview" data-inset="true" data-theme="d" data-bind="template: { name: 'challenges-template', foreach: lockedChallenges() }"> + </ul> + </div> + <div class="ui-bar-d"> + <h4><span class="icon-trophy text-gold "></span> Leaderboard</h4> + <ul id="teamList2" data-role="listview" data-bind="template: {name:'leaderboard-template', foreach: groupData}" data-inset="true" data-theme="b"> + </ul> + </div> + <div class="ui-bar-d"> + <h4><span class="icon-user lighterprints-blue"></span> Team Activity</h4> + <div data-bind='ifnot: hasGroupActivity()'> + <div data-bind='template: { name: "no-group-activity-template" }'> + </div> + </div> + <div class='table group-activity'> + <ul id="teamActivityList2" data-role="listview" data-inset="true" data-bind='template: { name: groupActivityTemplate, foreach: groupActivity.slice(0, 6) }'> + </ul> + </div> + </div> + </div> + <div data-role="footer" data-theme="c"> + <div class="ui-bar-b" style="font-size:15px;text-align:center;"> + <div data-role="controlgroup" data-type="horizontal" data-theme="b"> + <a href="#" data-theme="b"> Dashboard</a> + <a href="#challengesPage"> Challenges</a> + <a href="#myTeamPage"> My Team</a> + <a href="#helpPage"> Help</a> + </div> + 2013 Arizona Board Of Regents + </div> + <div class="footerbar"> + <img width="30px" height="30px" src="https://vcweb.asu.edu/static/images/lighterprints/logo.png" alt="footprint logo"> + lighter<strong>footprints</strong> + </div> + </div> + </div> + <!-- /page dashboardLockedChallengesPage--> + <!-- Start of page 3 challengesPage --> + <div data-role="page" id="challengesPage" class="ui-responsive-panel"> + <div data-role="panel" id="defaultpanel3" data-position="left" data-display="overlay" data-dismissible="true" > + <a href="#dashboardPage" data-role="button" class="innerbutton"><h4><span class="icon-gauge"></span> Dashboard</h4></a> + <a href="#" data-role="button" class="innerbutton"><h4><span class="icon-star"></span> Challenges</h4></a> + <a href="#myTeamPage" reloadPage="true" data-role="button" class="innerbutton"><h4><span class="icon-user"></span> My Team</h4></a> + <a href="#helpPage" data-role="button" class="innerbutton"><h4><span class="icon-question"></span> Help</h4></a> + </div> + <div data-role="header" data-theme="a" class="navbar" data-position="fixed"> + <img width="30px" height="30px" src="https://vcweb.asu.edu/static/images/lighterprints/logo.png" alt="footprint logo">lighter<strong style="color:#b9ed2e;">footprints</strong> + <a href="#defaultpanel3" class="ui-btn-right" data-role="button" data-inline="true" data-iconpos="notext" data-theme="a" data-icon="align-justify"></a> + </div> + <div data-role="content" data-theme="d"> + <div class="ui-bar-d"> + <div data-role="navbar" data-theme="d"> + <h4><span class="lighterprints-grey icon-star"> Challenges</span></h4> + <ul id="challengesNavbarList3"> + <li> + <a href="#" class="ui-btn-active" ><h3><span class="icon-star text-gold "> Unlocked</span></h3></a> + </li> + <li> + <a href="#lockedChallengesPage"><h3><span class="icon-lock lighterprints-grey"> Locked</span></h3></a> + </li> + </ul> + </div> + <ul id="challengesList3" data-role="listview" data-inset="true" data-theme="d" data-bind="template: { name: 'challenges-template', foreach: unlockedChallenges() }"> + </ul> + </div> + <div class="ui-bar-d"> + <h4><span class="icon-trophy text-gold "></span> Leaderboard</h4> + <ul id="teamList3" data-role="listview" data-bind="template: {name:'leaderboard-template', foreach: groupData}" data-inset="true" data-theme="b"> + </ul> + </div> + <div class="ui-bar-d"> + <h4><span class="icon-user lighterprints-blue"></span> Team Activity</h4> + <div data-bind='ifnot: hasGroupActivity()'> + <div data-bind='template: { name: "no-group-activity-template" }'> + </div> + </div> + <div class='table group-activity'> + <ul id="teamActivityList3" data-role="listview" data-inset="true" data-bind='template: { name: groupActivityTemplate, foreach: groupActivity.slice(0, 6) }'> + </ul> + </div> + </div> + </div> + <div data-role="footer" data-theme="c"> + <div class="ui-bar-b" style="font-size:15px;text-align:center;"> + <div data-role="controlgroup" data-type="horizontal" data-theme="b"> + <a href="#" data-theme="b"> Dashboard</a> + <a href="#challengesPage"> Challenges</a> + <a href="#myTeamPage"> My Team</a> + <a href="#helpPage"> Help</a> + </div> + 2013 Arizona Board Of Regents + </div> + <div class="footerbar"> + <img width="30px" height="30px" src="https://vcweb.asu.edu/static/images/lighterprints/logo.png" alt="footprint logo"> + lighter<strong>footprints</strong> + </div> + </div> + <div data-role="popup" id="popupDialog3" data-overlay-theme="a" data-theme="c" class="ui-corner-all"> + <div data-role="header" data-theme="a" class="ui-corner-top"> + <h1>Performing Challenge...</h1> + </div> + <div data-role="content" data-theme="d" class="ui-corner-bottom ui-content"> + <div data-bind='with: lastPerformedActivity'> + <img alt='Lighterprints Activity Badge' data-bind='attr: {src: "/static/images/lighterprints/badges/" + name() + ".png" }'> + <h3>You completed a challenge!</h3> + <p><strong><em data-bind='text: display_name'></em></strong> for <span class='lighterprints-green' data-bind='text: points'></span><i class='icon-leaf lighterprints-green'></i> + </p> + <p data-bind='text: summary'></p> + </div> + <a href="#" data-role="button" data-inline="true" data-rel="back" data-theme="c">Continue</a> + </div> + </div> + </div> + <!-- /page challengesPage--> + <!-- Start of page4 #lockedChallengesPage --> + <div data-role="page" id="lockedChallengesPage" class="ui-responsive-panel"> + <div data-role="panel" id="defaultpanel4" data-position="left" data-display="overlay" data-dismissible="true" > + <a href="#dashboard" data-role="button" class="innerbutton"><h4><span class="icon-gauge"></span> Dashboard</h4></a> + <a href="#" data-role="button" class="innerbutton"><h4><span class="icon-star"></span> Challenges</h4></a> + <a href="#myTeamPage" reloadPage="true" data-role="button" class="innerbutton"><h4><span class="icon-user"></span> My Team</h4></a> + <a href="#helpPage" data-role="button" class="innerbutton"><h4><span class="icon-question"></span> Help</h4></a> + </div> + <div data-role="header" data-theme="a" class="navbar" data-position="fixed"> + <img width="30px" height="30px" src="https://vcweb.asu.edu/static/images/lighterprints/logo.png" alt="footprint logo">lighter<strong style="color:#b9ed2e;">footprints</strong> + <a href="#defaultpanel4" class="ui-btn-right" data-role="button" data-inline="true" data-iconpos="notext" data-theme="a" data-icon="align-justify"></a> + </div> + <div data-role="content" data-theme="d"> + <div class="ui-bar-d"> + <div data-role="navbar" data-theme="d"> + <h4><span class="lighterprints-grey"> Challenges</span></h4> + <ul id="challengesNavbarList4"> + <li> + <a href="#challengesPage"><h3><span class="icon-star text-gold "> Unlocked</span></h3></a> + </li> + <li> + <a href="#" class="ui-btn-active"><h3><span class="icon-lock lighterprints-grey"> Locked</span></h3></a> + </li> + </ul> + </div> + <ul id="lockedChallengesList4" data-role="listview" data-inset="true" data-theme="d" data-bind="template: { name: 'challenges-template', foreach: lockedChallenges() }"> + </ul> + </div> + <div class="ui-bar-d"> + <h4><span class="icon-trophy text-gold "></span> Leaderboard</h4> + <ul id="teamList4" data-role="listview" data-bind="template: {name:'leaderboard-template', foreach: groupData}" data-inset="true" data-theme="b"> + </ul> + </div> + <div class="ui-bar-d"> + <h4><span class="icon-user lighterprints-blue"></span> Team Activity</h4> + <div data-bind='ifnot: hasGroupActivity()'> + <div data-bind='template: { name: "no-group-activity-template" }'> + </div> + </div> + <div class='table group-activity'> + <ul id="teamActivityList4" data-role="listview" data-inset="true" data-bind='template: { name: groupActivityTemplate, foreach: groupActivity.slice(0, 6) }'> + </ul> + </div> + </div> + </div> + <div data-role="footer" data-theme="c"> + <div class="ui-bar-b" style="font-size:15px;text-align:center;"> + <div data-role="controlgroup" data-type="horizontal" data-theme="b"> + <a href="#" data-theme="b"> Dashboard</a> + <a href="#challengesPage"> Challenges</a> + <a href="#myTeamPage"> My Team</a> + <a href="#helpPage"> Help</a> + </div> + 2013 Arizona Board Of Regents + </div> + <div class="footerbar"> + <img width="30px" height="30px" src="https://vcweb.asu.edu/static/images/lighterprints/logo.png" alt="footprint logo"> + lighter<strong>footprints</strong> + </div> + </div> + </div> + <!-- /page lockedChallengesPage--> + <!-- Start of page5: #myTeamPage --><div data-role="page" id="myTeamPage" class="ui-responsive-panel"> - <div data-role="panel" id="defaultpanel" data-theme="b" data-position="left" data-display="overlay" data-dismissible="true" > + <div data-role="panel" id="defaultpanel5" data-theme="b" data-position="left" data-display="overlay" data-dismissible="true" ><a href="#dashboardPage" data-theme="c" data-role="button" class="innerbutton"><h4><span class="icon-gauge"></span> Dashboard</h4></a><a href="#challengesPage" data-theme="c" data-role="button" class="innerbutton"><h4><span class="icon-star"></span> Challenges</h4></a><a href="#" data-theme="c" data-role="button" class="innerbutton"><h4><span class="icon-user"></span> My Team</h4></a> @@ -338,20 +649,22 @@ </div><div data-role="header" data-theme="a" class="navbar" data-position="fixed" ><img width="30px" height="30px" src="https://vcweb.asu.edu/static/images/lighterprints/logo.png" alt="footprint logo">lighter<strong style="color:#b9ed2e;">footprints</strong> - <a href="#defaultpanel" class="ui-btn-right" data-role="button" data-inline="true" data-iconpos="notext" data-theme="a" data-icon="align-justify"></a> + <a href="#defaultpanel5" class="ui-btn-right" data-role="button" data-inline="true" data-iconpos="notext" data-theme="a" data-icon="align-justify"></a></div><div data-role="content" data-theme="d"><h4><span class="icon-comment"></span> My Team</h4> - <div class="ui-bar-d" data-role="fieldcontain"> + <div class="ui-bar-c"> + <div data-role="fieldcontain"><input type="hidden" name="participant_group_id" value='{{participant_group_relationship.id}}'><input type="text" id="chatText" name="message" placeholder="Send a message to your group"> - <a href="#" data-inline="true" data-role="button" data-bind='click: $root.send'>Send</a> + <a href="#" data-theme="a" data-inline="true" data-role="button" data-bind='click: $root.send'>Send</a> + </div> - <div data-bind="ifnot: hasChatMessages() " data-inset="true"> + <div data-bind="ifnot: hasChatMessages() " data-inset="true" data-theme="d"> No chat messages have been posted yet. </div><div data-bind="if: hasChatMessages()"> - <ul id="chatMessageList" data-role="listview" data-bind="template: {name:'myTeam-template', foreach: chatMessages}" data-inset="true" style="overflow-y: scroll;"> + <ul id="chatMessageList" data-role="listview" data-bind="template: {name:'myTeam-template', foreach: chatMessages}" data-inset="true" style="overflow-y: scroll;" data-theme="d"></ul></div></div> @@ -372,9 +685,10 @@ </div></div></div> - <!-- /page myTeamPage--><!-- Start of page: #helpPage --> + <!-- /page myTeamPage--> + <!-- Start of page6: #helpPage --><div data-role="page" id="helpPage" class="ui-responsive-panel"> - <div data-role="panel" id="defaultpanel" data-theme="b" data-position="left" data-display="overlay" data-dismissible="true" > + <div data-role="panel" id="defaultpanel6" data-theme="b" data-position="left" data-display="overlay" data-dismissible="true" ><a href="#dashboardPage" data-theme="c" data-role="button" class="innerbutton"><h4><span class="icon-gauge"></span> Dashboard</h4></a><a href="#challengesPage" data-theme="c" data-role="button" class="innerbutton"><h4><span class="icon-star"></span> Challenges</h4></a><a href="#myTeamPage" data-theme="c" data-role="button" class="innerbutton"><h4><span class="icon-user"></span> My Team</h4></a> @@ -382,7 +696,7 @@ </div><div data-role="header" data-theme="a" class="navbar" data-position="fixed" ><img width="30px" height="30px" src="https://vcweb.asu.edu/static/images/lighterprints/logo.png" alt="footprint logo">lighter<strong style="color:#b9ed2e;">footprints</strong> - <a href="#defaultpanel" class="ui-btn-right" data-role="button" data-inline="true" data-iconpos="notext" data-theme="a" data-icon="align-justify"></a> + <a href="#defaultpanel6" class="ui-btn-right" data-role="button" data-inline="true" data-iconpos="notext" data-theme="a" data-icon="align-justify"></a></div><div data-role="content" data-theme="d"><div class="ui-bar-d" data-inset="true"> @@ -457,7 +771,7 @@ <div class="ui-bar-b" style="font-size:15px;text-align:center;"><div data-role="controlgroup" data-type="horizontal" data-theme="b"><a href="#dashboardPage"> Dashboard</a> - <a href="#challengesPage" class="ui-btn-active"> Challenges</a> + <a href="#challengesPage"> Challenges</a><a href="#myTeamPage"> My Team</a><a href="#"> Help</a></div> https://bitbucket.org/virtualcommons/vcweb/commits/eea6018e3fe2/ Changeset: eea6018e3fe2 User: RoleeSinha Date: 2013-05-16 02:33:35 Summary: fixing styling Affected #: 1 file diff -r 4c4b2149ef1d7d09e56b4ecafc5f38c3c34438a4 -r eea6018e3fe21444efbae145b37192e929452ebf vcweb/lighterprints/static/css/lighterprints/mobile/style.css --- a/vcweb/lighterprints/static/css/lighterprints/mobile/style.css +++ b/vcweb/lighterprints/static/css/lighterprints/mobile/style.css @@ -30,8 +30,7 @@ text-align:left; } a.upcoming-challenge, a.expired-challenge, a.perform-challenge, a.completed-challenge { - text-transform: uppercase; - color: #FFF !important; + color: #4d4d4d !important; -webkit-font-smoothing: antialiased; background-repeat: repeat-x; } @@ -46,7 +45,6 @@ background-image: -o-linear-gradient(top, #f4f4f4, #898989); background-image: linear-gradient(#f4f4f4, #898989); border-color: #898989 #898989 hsl(0, 0%, 43.5%); - text-shadow: 0 1px 1px rgba(255, 255, 255, 0.69); } a.expired-challenge { background-color: hsl(0, 100%, 79%) !important; @@ -59,7 +57,6 @@ background-image: -o-linear-gradient(top, #ffbcbc, #ff9393); background-image: linear-gradient(#ffbcbc, #ff9393); border-color: #ff9393 #ff9393 hsl(0, 100%, 77%); - text-shadow: 0 1px 1px rgba(255, 255, 255, 0.13); } a.perform-challenge { background-color: hsl(96, 81%, 42%) !important; @@ -72,7 +69,6 @@ background-image: -o-linear-gradient(top, #66dd17, #59c114); background-image: linear-gradient(#66dd17, #59c114); border-color: #59c114 #59c114 hsl(96, 81%, 40.5%); - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.09); } a.completed-challenge { background-color: hsl(96, 81%, 42%) !important; @@ -85,8 +81,8 @@ background-image: -o-linear-gradient(top, #aed992, #aed992); background-image: linear-gradient(#aed992, #aed992); border-color: #aed992 #aed992 hsl(96, 81%, 40.5%); - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.09); } + .lighterprints-red { color: #FF0066; } Repository URL: https://bitbucket.org/virtualcommons/vcweb/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. |
|
From: <com...@bi...> - 2013-05-14 22:59:12
|
2 new commits in vcweb: https://bitbucket.org/virtualcommons/vcweb/commits/369398f1a4c9/ Changeset: 369398f1a4c9 User: RoleeSinha Date: 2013-05-15 00:58:31 Summary: fixing styling Affected #: 1 file diff -r f9fd2bc64f1001752928ddb3291f0978966ee9be -r 369398f1a4c950e16274c966c28dcf92e3ba8ace vcweb/lighterprints/static/css/lighterprints/mobile/style.css --- a/vcweb/lighterprints/static/css/lighterprints/mobile/style.css +++ b/vcweb/lighterprints/static/css/lighterprints/mobile/style.css @@ -90,6 +90,9 @@ .lighterprints-red { color: #FF0066; } +.lighterprints-grey { + color: #898989; +} .lighterprints-blue { color: #13a5e6; } https://bitbucket.org/virtualcommons/vcweb/commits/ffc25b527893/ Changeset: ffc25b527893 User: RoleeSinha Date: 2013-05-15 00:58:47 Summary: fixing styling Affected #: 1 file diff -r 369398f1a4c950e16274c966c28dcf92e3ba8ace -r ffc25b5278932ee202b68e75cc267014151e8cac vcweb/lighterprints/templates/lighterprints/mobile/index.html --- a/vcweb/lighterprints/templates/lighterprints/mobile/index.html +++ b/vcweb/lighterprints/templates/lighterprints/mobile/index.html @@ -23,49 +23,47 @@ <script> $(document).on('pageinit', function(event){ var viewModelData = $.parseJSON("{{view_model_json|escapejs}}"); - var viewModel = new LighterFootprintsModel(viewModelData); - viewModel.perform = function(challengeModel){ - if (!challengeModel.availableNow()) { - console.debug("tried to perform an activity that's not available right now"); - console.debug(challengeModel); - return; - } - var id = challengeModel.pk(); - var formData = { - participant_group_id: viewModel.participantGroupId(), - activity_id: id - }; - $.post('/lighterprints/api/do-activity', formData, function(data){ - if (data.success) { - console.debug(data); - ko.mapping.fromJSON(data.viewModel, viewModel); - viewModel.lastPerformedActivity(challengeModel); - ko.applyBindings(viewModel); - $("#popupDialog").popup('open'); - console.debug('refreshing lists'); - $('#challengesList').listview('refresh'); - $('#teamList').listview('refresh'); - $('#teamActivityList').listview('refresh'); - } - else { - console.debug("ERROR: " + data.message); - } - }) - }; - - viewModel.send = function(){ - if ($('#chatText').val()) { - var formData = { - participant_group_id: viewModel.participantGroupId(), - message: $('#chatText').val() - }; + var viewModel = new LighterFootprintsModel(viewModelData); + viewModel.perform = function(challengeModel){ + if (!challengeModel.availableNow()) { + console.debug("tried to perform an activity that's not available right now"); + console.debug(challengeModel); + return; + } + var id = challengeModel.pk(); + var formData = { + participant_group_id: viewModel.participantGroupId(), activity_id:id + }; + $.post('/lighterprints/api/do-activity', formData, function(data){ + if (data.success) { + console.debug(data); + //$('#dashboardPage').trigger('pagecreate'); + ko.mapping.fromJSON(data.viewModel, viewModel); + viewModel.lastPerformedActivity(challengeModel); + ko.applyBindings(viewModel); + //$.mobile.changePage("/lighterprints/mobile"); + $("#popupDialog").popup('open'); + console.debug('refreshing lists'); + $('#challengesList').listview('refresh'); + $('#teamList').listview('refresh'); + $('#teamActivityList').listview('refresh'); + } + else { + console.debug("ERROR: " + data.message); + } + }) + }; + + viewModel.send = function(){ + if ($('#chatText').val()) { + var formData = {participant_group_id: viewModel.participantGroupId(), message:$('#chatText').val()}; $.post('/lighterprints/api/message', formData, function(response){ if (response.success) { console.debug("successful post - updated view model: "); ko.mapping.fromJS(response.viewModel, viewModel); - ko.applyBindings(viewModel); - console.debug('refresh chatMessage List'); - $('#chatMessageList').listview('refresh'); + ko.applyBindings(viewModel); + console.debug('refresh chatMessage List'); + $('#chatMessageList').listview('refresh'); } else { console.debug("unable to post message to server"); @@ -74,30 +72,23 @@ }); $('#chatText').val(''); } - }; + }; ko.applyBindings(viewModel); - $("#dashboardPage").on('pageshow', function(event){ - console.debug('dashboardPage pageshow'); - $('#challengesList').listview('refresh'); - $('#teamList').listview('refresh'); - $('#teamActivityList').listview('refresh'); - }); - - $("#myTeamPage").on('pageshow', function(event){ - console.debug('myTeamPage pageshow'); - $('#chatMessageList').listview('refresh'); - }); + $("#dashboardPage").on('pageshow', function(event){ + console.debug('dashboardPage pageshow'); + $('#challengesList').listview('refresh'); + $('#teamList').listview('refresh'); + $('#teamActivityList').listview('refresh'); + }); + + $("#myTeamPage").on('pageshow', function(event){ + console.debug('myTeamPage pageshow'); + $('#chatMessageList').listview('refresh'); + }); }); </script><!-- knockout templates --> - <script type='text/html' id='likeCommentTemplate'> - <div data-bind='if: $root.participantGroupId() != participant_group_id()'> - <span data-bind='ifnot: commented'><a class='comment comment-popover' href='javascript:void(0)' rel="popover" data-placement='left' data-title="Leave a comment" data-bind='popover: { content: "#commentPopoverForm", id: pk()}'><span class='comment lighterprints-gray icon-comment'></span></a></span> - <span data-bind='if: commented'><span class='commented icon-comment'></span></span> - <span data-bind='ifnot: liked'><a href='#' data-bind='click: $root.like'><span class='like lighterprints-gray icon-heart'></span></a></span> - <span data-bind='if: liked'><span class='liked icon-heart'></span></span> - </div> - </script> + <!-- group activity templates, keyed by parameter name --><script type='text/html' id='comment'><li data-bind='if: $root.participantGroupId() != participant_group_id()'> @@ -121,8 +112,6 @@ </small></div></div> - <div data-bind='template: "likeCommentTemplate"'> - </div></span></li></script> @@ -156,8 +145,6 @@ <span class='icon-quote-right'></span></small></div> - <div data-bind="template: 'likeCommentTemplate'"> - </div></span></li></script> @@ -169,23 +156,20 @@ <span data-bind='text: date_created'></span></small><span>earned <span class='lighterprints-green' data-bind='text:points'></span><span class='icon-leaf lighterprints-green'></span>for <span data-bind='text: $root.groupName'></span>by completing <em><span data-bind='text: display_name'></span></em>.</span> - <div data-bind="template: 'likeCommentTemplate'"> - </div> + </span></li></script><script type='text/html' id='challenges-template'><li data-icon="false"> - <a href="#" data-bind='css: status, click: $root.perform'> - <span data-bind='if: availableNow'>Perform</span> + <a href="#" data-bind='css: status, click: $root.perform'> + <span data-bind='if: availableNow'>Perform</span><span data-bind='if: completed'>Completed <span class='icon-check'></span></span><span data-bind='if: expired'>Expired <span class='icon-warning-sign'></span></span><span data-bind='if: upcoming'>Not yet available <span class='icon-time'></span></span><span data-bind='if: locked'>Locked <span class='icon-lock'></span></span> - <img style='padding: 10px 0 0 20px;' data-bind='attr: {src: "https://vcweb.asu.edu/static/images/lighterprints/badges/" + name() + ".png" }'><h4 class='challenge-name' data-bind='css: status, text:display_name'></h4> - <p> - <span data-bind='css: status, text: summary'></span> - </p> + <img style='padding: 10px 0 0 10px; float:left;' data-bind='attr: {src: "https://vcweb.asu.edu/static/images/lighterprints/badges/" + name() + ".png" }'><h4 class='challenge-name' data-bind='css: status, text:display_name'></h4> + <p><span data-bind='css: status, text: summary'></span></p><h4><span data-bind='text: points'></span><span class='lighterprints-green icon-leaf icon-2x'></span><br><span data-bind='text: time_slots'></span> @@ -193,6 +177,7 @@ </a></li></script> + <script type='text/html' id='leaderboard-template'><li><strong>#<span data-bind="text:$index() + 1"></span></strong> @@ -200,7 +185,13 @@ <span data-bind="text: groupName"></span></span></li> - </script> + </script> + <script type='text/html' id='myTeam-template'> + <li> + <span>Participant <span data-bind="text: participant_number"></span>: <span data-bind="text: value"></span> + <span data-bind="text: date_created"></span><br> ago + </li> + </script><script type='text/html' id='no-group-activity-template'> Your group has not had any activity yet. You can <a href='#dashboardPage'>perform challenges in your dashboard</a> or post messages in the <a href='#myTeamPage'>the group wall</a> @@ -211,11 +202,11 @@ <!-- Start of #dashboardPage --><div data-role="page" id="dashboardPage" class="ui-responsive-panel"><!-- defaultpanel --> - <div data-role="panel" id="defaultpanel" data-theme="b" data-position="left" data-display="overlay" data-dismissible="true" > - <a href="#" data-theme="c" data-role="button" class="innerbutton"><h2><span class="icon-gauge"></span> Dashboard</h2></a> - <a href="#challengesPage" data-theme="c" data-role="button" class="innerbutton"><h2><span class="icon-star"></span> Challenges</h2></a> - <a href="#myTeamPage" reloadPage="true" data-theme="c" data-role="button" class="innerbutton"><h2><span class="icon-user"></span> My Team</h2></a> - <a href="#helpPage" data-theme="c" data-role="button" class="innerbutton"><h2><span class="icon-question"></span> Help</h2></a> + <div data-role="panel" id="defaultpanel" data-position="left" data-display="overlay" data-dismissible="true" > + <a href="#" data-role="button" class="innerbutton"><h4><span class="icon-gauge"></span> Dashboard</h4></a> + <a href="#challengesPage" data-role="button" class="innerbutton"><h4><span class="icon-star"></span> Challenges</h4></a> + <a href="#myTeamPage" reloadPage="true" data-role="button" class="innerbutton"><h4><span class="icon-user"></span> My Team</h4></a> + <a href="#helpPage" data-role="button" class="innerbutton"><h4><span class="icon-question"></span> Help</h4></a></div><!-- /defaultpanel --><div data-role="header" data-theme="a" class="navbar" data-position="fixed"> @@ -223,19 +214,18 @@ <a href="#defaultpanel" class="ui-btn-right" data-role="button" data-inline="true" data-iconpos="notext" data-theme="a" data-icon="align-justify"></a></div><div data-role="content" data-theme="d"> - <h2><span class="icon-gauge"></span> Team Dashboard - <div class="ui-bar"> - </div> + <div class="ui-bar-d"> + <h4><span class="icon-gauge lighterprints-grey"> Team Dashboard</span></h4><div class="ui-grid-a" data-inset="true"><div class="ui-block-a"> - <div class="ui-bar ui-bar-e" style="height:70px"> + <div class="ui-bar ui-bar-e" style="height:90px"> Today's Score <br><span data-bind="text: averagePoints"></span></div></div><div class="ui-block-b"> - <div class="ui-bar ui-bar-e" style="height:70px"> + <div class="ui-bar ui-bar-e" style="height:90px"> Current Level <div data-bind='if: experimentCompleted'><img alt='Experiment Completed' class='group-level' width='120' height='70' src='https://vcweb.asu.edu/static/images/lighterprints/experiment-completed.png'> @@ -248,53 +238,52 @@ </div><!-- /grid-a --><div class="ui-grid-a"><div class="ui-block-a"> - <div class="ui-bar ui-bar-e" style="height:70px"> + <div class="ui-bar ui-bar-e" style="height:90px"> Today's Progress <br> - Your group progress: <span data-bind="text: averagePoints"></span> + Your group progress: <span data-bind="text: averagePoints"></span> / <span data-bind="text:pointsToNextLevel"></span></div></div><div class="ui-block-b"> - <div class="ui-bar ui-bar-e" style="height:70px"> + <div class="ui-bar ui-bar-e" style="height:90px"> Time Remaining <table><tr><td> - <span data-bind="text: hoursLeft"></span> h + <span data-bind="text: hoursLeft"></span>h </td><td> - <span data-bind="text: minutesLeft"></span> m + <span data-bind="text: minutesLeft"></span>m </td></tr></table></div></div> - </div></h2> - <h2><span class="icon-star "></span> Challenges - <div class="ui-bar-d"> - <div data-role="navbar"> + </div></div> + + <div class="ui-bar-d"> + <div data-role="navbar" data-theme="d"> + <h4><span class="lighterprints-grey"> Challenges</span></h4><ul id="challengesNavbarList"><li> - <a href="#" class="ui-btn-active"><span class="icon-star text-gold "></span> Unlocked</a> + <a href="#" class="ui-btn-active" ><h3><span class="icon-star text-gold "> Unlocked</span></h3></a></li><li> - <a href="#dashboardLockedChallengePage"><span class="icon-lock"></span> Locked</a> + <a href="#dashboardLockedChallengePage"><h3><span class="icon-lock lighterprints-grey"> Locked</span></h3></a></li></ul></div> - <div class='tab-pane active' id='unlocked-challenges'> - <ul id="challengesList" data-role="listview" data-inset="true" data-theme="d" data-bind="template: { name: 'challenges-template', foreach: unlockedChallenges() }"> - </ul> - </div> - </div></h2> - <h2><span class="icon-trophy text-gold "></span> Leaderboard - <div class="ui-bar-d"> + <ul id="challengesList" data-role="listview" data-inset="true" data-theme="d" data-bind="template: { name: 'challenges-template', foreach: unlockedChallenges() }"> + </ul> + </div> + <div class="ui-bar-d"> + <h4><span class="icon-trophy text-gold "></span> Leaderboard</h4><ul id="teamList" data-role="listview" data-bind="template: {name:'leaderboard-template', foreach: groupData}" data-inset="true" data-theme="b"></ul> - </div></h2> - <h2><span class="icon-user"></span> Team Activity - <div class="ui-bar-d"> + </div> + <div class="ui-bar-d"> + <h4><span class="icon-user lighterprints-blue"></span> Team Activity</h4><div data-bind='ifnot: hasGroupActivity()'><div data-bind='template: { name: "no-group-activity-template" }'></div> @@ -303,7 +292,7 @@ <ul id="teamActivityList" data-role="listview" data-inset="true" data-bind='template: { name: groupActivityTemplate, foreach: groupActivity.slice(0, 6) }'></ul></div> - </div></h2> + </div></div><div data-role="footer" data-theme="c"><div class="ui-bar-b" style="font-size:15px;text-align:center;"> @@ -320,55 +309,51 @@ lighter<strong>footprints</strong></div></div> - <div data-role="popup" id="activityCompletedDialog" data-overlay-theme="a" data-theme="c" class="ui-corner-all"> - <div data-role="header" data-theme="a" class="ui-corner-top"> - <h1>Performing Challenge...</h1> - </div> - <div data-role="content" data-theme="d" class="ui-corner-bottom ui-content"> - <div data-bind='with: lastPerformedActivity'> + <div data-role="popup" id="popupDialog" data-overlay-theme="a" data-theme="c" class="ui-corner-all"> + <div data-role="header" data-theme="a" class="ui-corner-top"> + <h1>Performing Challenge...</h1> + </div> + <div data-role="content" data-theme="d" class="ui-corner-bottom ui-content"> + <div data-bind='with: lastPerformedActivity'><img alt='Lighterprints Activity Badge' data-bind='attr: {src: "/static/images/lighterprints/badges/" + name() + ".png" }'> - <h3>You completed a challenge!</h3> - <p><strong><em data-bind='text: display_name'></em></strong> for <span class='lighterprints-green' data-bind='text: points'></span><i class='icon-leaf lighterprints-green'></i> - </p> - <p data-bind='text: summary'></p> + <h3>You completed a challenge!</h3> + <p><strong><em data-bind='text: display_name'></em></strong> for <span class='lighterprints-green' data-bind='text: points'></span><i class='icon-leaf lighterprints-green'></i> + </p> + <p data-bind='text: summary'></p></div> - <a href="#" data-role="button" data-inline="true" data-rel="back" data-theme="c">Continue</a> - </div> + <a href="#" data-role="button" data-inline="true" data-rel="back" data-theme="c">Continue</a></div> + </div></div> - <!-- /page dashboardPage--><!-- Start of #dashboardLockedChallengePage --> + <!-- /page dashboardPage--> +><!-- Start of #dashboardLockedChallengePage --><!-- /page dashboardLockedChallengePage--><!-- Start of first page: #challengesPage --><!-- /page lockedChallengePage--><!-- Start of page: #myTeamPage --><div data-role="page" id="myTeamPage" class="ui-responsive-panel"><div data-role="panel" id="defaultpanel" data-theme="b" data-position="left" data-display="overlay" data-dismissible="true" > - <a href="#dashboardPage" reloadPage="true" data-theme="c" data-role="button" class="innerbutton"><h2><span class="icon-gauge"></span> Dashboard</h2></a> - <a href="#challengesPage" data-theme="c" data-role="button" class="innerbutton"><h2><span class="icon-star"></span> Challenges</h2></a> - <a href="#" data-theme="c" data-role="button" class="innerbutton"><h2><span class="icon-user"></span> My Team</h2></a> - <a href="#helpPage" data-theme="c" data-role="button" class="innerbutton"><h2><span class="icon-question"></span> Help</h2></a> + <a href="#dashboardPage" data-theme="c" data-role="button" class="innerbutton"><h4><span class="icon-gauge"></span> Dashboard</h4></a> + <a href="#challengesPage" data-theme="c" data-role="button" class="innerbutton"><h4><span class="icon-star"></span> Challenges</h4></a> + <a href="#" data-theme="c" data-role="button" class="innerbutton"><h4><span class="icon-user"></span> My Team</h4></a> + <a href="#helpPage" data-theme="c" data-role="button" class="innerbutton"><h4><span class="icon-question"></span> Help</h4></a></div><div data-role="header" data-theme="a" class="navbar" data-position="fixed" ><img width="30px" height="30px" src="https://vcweb.asu.edu/static/images/lighterprints/logo.png" alt="footprint logo">lighter<strong style="color:#b9ed2e;">footprints</strong><a href="#defaultpanel" class="ui-btn-right" data-role="button" data-inline="true" data-iconpos="notext" data-theme="a" data-icon="align-justify"></a></div><div data-role="content" data-theme="d"> - <h2><span class="icon-comment"></span> My Team</h2> - <div class="ui-bar-d"> + <h4><span class="icon-comment"></span> My Team</h4> + <div class="ui-bar-d" data-role="fieldcontain"> + <input type="hidden" name="participant_group_id" value='{{participant_group_relationship.id}}'> + <input type="text" id="chatText" name="message" placeholder="Send a message to your group"> + <a href="#" data-inline="true" data-role="button" data-bind='click: $root.send'>Send</a> + <div data-bind="ifnot: hasChatMessages() " data-inset="true"> No chat messages have been posted yet. </div><div data-bind="if: hasChatMessages()"> - <ul id="chatMessageList" data-role="listview" data-bind="foreach: chatMessages" data-inset="true" style="overflow-y: scroll;"> - <li> - <span>Participant <span data-bind="text: participant_number"></span>: <span data-bind="text: value"></span> - <span data-bind="text: date_created"></span><br> ago - </li> + <ul id="chatMessageList" data-role="listview" data-bind="template: {name:'myTeam-template', foreach: chatMessages}" data-inset="true" style="overflow-y: scroll;"></ul></div> - <form id="chat-form"> - <div data-role="fieldcontain" class="innerblock"> - <input type="hidden" name="participant_group_id" value='{{participant_group_relationship.id}}'><input type="text" id="chatText" name="message" placeholder="Send a message to your group"> - </div><a href="#" data-role="button" data-bind='click: $root.send'>Send</a> - </form></div></div><div data-role="footer" data-theme="c"> @@ -390,19 +375,19 @@ <!-- /page myTeamPage--><!-- Start of page: #helpPage --><div data-role="page" id="helpPage" class="ui-responsive-panel"><div data-role="panel" id="defaultpanel" data-theme="b" data-position="left" data-display="overlay" data-dismissible="true" > - <a href="#dashboardPage" data-theme="c" data-role="button" class="innerbutton"><h2><span class="icon-gauge"></span> Dashboard</h2></a> - <a href="#challengesPage" data-theme="c" data-role="button" class="innerbutton"><h2><span class="icon-star"></span> Challenges</h2></a> - <a href="#myTeamPage" data-theme="c" data-role="button" class="innerbutton"><h2><span class="icon-user"></span> My Team</h2></a> - <a href="#" data-theme="c" data-role="button" class="innerbutton"><h2><span class="icon-question"></span> Help</h2></a> + <a href="#dashboardPage" data-theme="c" data-role="button" class="innerbutton"><h4><span class="icon-gauge"></span> Dashboard</h4></a> + <a href="#challengesPage" data-theme="c" data-role="button" class="innerbutton"><h4><span class="icon-star"></span> Challenges</h4></a> + <a href="#myTeamPage" data-theme="c" data-role="button" class="innerbutton"><h4><span class="icon-user"></span> My Team</h4></a> + <a href="#" data-theme="c" data-role="button" class="innerbutton"><h4><span class="icon-question"></span> Help</h4></a></div><div data-role="header" data-theme="a" class="navbar" data-position="fixed" ><img width="30px" height="30px" src="https://vcweb.asu.edu/static/images/lighterprints/logo.png" alt="footprint logo">lighter<strong style="color:#b9ed2e;">footprints</strong><a href="#defaultpanel" class="ui-btn-right" data-role="button" data-inline="true" data-iconpos="notext" data-theme="a" data-icon="align-justify"></a></div><div data-role="content" data-theme="d"> - <h2><span class="icon-question"></span> Help</h2><div class="ui-bar-d" data-inset="true"> - <h2>Instructions</h2> + <h4><span class="icon-question lighterprints-grey"> Help</span></h4> + <h4>Instructions</h4><p> You have been randomly placed in a group of <strong>5 participants</strong>. In this experiment you can perform virtual actions that represent green alternatives to some common daily @@ -410,7 +395,7 @@ specific times. You can learn more about them by clicking on the <a href="#challengesPage">Challenges tab</a> and selecting an activity. </p> - <h2>Challenges, Green Points, and Levels</h2> + <h4>Challenges, Green Points, and Levels</h4><p> Each <strong class="text-gold">challenge</strong> is worth a certain number of <strong class="lighterprints-green">green points <span class="icon-leaf"></span></strong>. @@ -428,28 +413,26 @@ In order to reach this target you and a majority of the members of your group must perform high point challenges when they are available. </p> - <h2>How to participate</h2> + <h4>How to participate</h4><p> To participate, simply click on the <a href="#challengesPage">Challenges tab</a>, and select a challenge you"d like to perform. You can leave messages for the other members n your group via the <a href="#myTeamPage">My Group tab</a> or use the <a href="#dashboardPage">Dashboard</a> to view your group"s progress. - <br> - You can also <a href="#dashboardPage">restart the tutorial</a>. </p></div><div class="ui-bar-d"> - <h3>Frequently Asked Questions</h3> + <h4>Frequently Asked Questions</h4><ul data-role="listview" data-inset="true" data-theme="b"><li> - <h2>I performed an activity worth 15 points but only 3 points were added to Today"s Progress and Today"s Score. Why?</h2> + <h4>I performed an activity worth 15 points but only 3 points were added to Today"s Progress and Today"s Score. Why?</h4><p> The numbers in Today"s Score Today"s Progress represent your group"s <b>average number of earned green points</b>. If there are 5 people in your group, performing a 15 point activity adds 3 points to the group average (15 / 5 = 3). </p></li><li> - <h2>Why do the challenges performed in the previous day not count for today?</h2> + <h4>Why do the challenges performed in the previous day not count for today?</h4><p> In order to advance in level and unlock more challenges you must reach an average level of points in your group during one day, starting at 0.00AM. Every day at midnight the server will check your group"s average number of @@ -460,7 +443,7 @@ </p></li><li> - <h2>I don"t have a car or anyone to carpool with, so how can I carpool?</h2> + <h4>I don"t have a car or anyone to carpool with, so how can I carpool?</h4><p> You don"t have to actually perform the activity in the real world to click on "perform". These are just virtual challenges for the time being. In the future we plan to allow participants to gain points by @@ -473,8 +456,8 @@ <div data-role="footer" data-theme="c"><div class="ui-bar-b" style="font-size:15px;text-align:center;"><div data-role="controlgroup" data-type="horizontal" data-theme="b"> - <a href="#dashboardPage" data-theme="b"> Dashboard</a> - <a href="#challengesPage"> Challenges</a> + <a href="#dashboardPage"> Dashboard</a> + <a href="#challengesPage" class="ui-btn-active"> Challenges</a><a href="#myTeamPage"> My Team</a><a href="#"> Help</a></div> @@ -486,6 +469,5 @@ </div></div></div> - <!-- /page helpPage--></body> -</html> +</html> \ No newline at end of file Repository URL: https://bitbucket.org/virtualcommons/vcweb/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. |
|
From: <com...@bi...> - 2013-05-14 21:49:17
|
1 new commit in vcweb: https://bitbucket.org/virtualcommons/vcweb/commits/f9fd2bc64f10/ Changeset: f9fd2bc64f10 User: RoleeSinha Date: 2013-05-14 23:48:53 Summary: fixing KO binding Affected #: 1 file diff -r 0b24e46febd915cd194444646ab3a0d10f700db3 -r f9fd2bc64f1001752928ddb3291f0978966ee9be vcweb/lighterprints/templates/lighterprints/mobile/index.html --- a/vcweb/lighterprints/templates/lighterprints/mobile/index.html +++ b/vcweb/lighterprints/templates/lighterprints/mobile/index.html @@ -23,47 +23,49 @@ <script> $(document).on('pageinit', function(event){ var viewModelData = $.parseJSON("{{view_model_json|escapejs}}"); - var viewModel = new LighterFootprintsModel(viewModelData); - viewModel.perform = function(challengeModel){ - if (!challengeModel.availableNow()) { - console.debug("tried to perform an activity that's not available right now"); - console.debug(challengeModel); - return; - } - var id = challengeModel.pk(); - var formData = { - participant_group_id: viewModel.participantGroupId(), activity_id:id - }; - $.post('/lighterprints/api/do-activity', formData, function(data){ - if (data.success) { - console.debug(data); - //$('#dashboardPage').trigger('pagecreate'); - ko.mapping.fromJSON(data.viewModel, viewModel); - viewModel.lastPerformedActivity(challengeModel); - ko.applyBindings(viewModel); - //$.mobile.changePage("/lighterprints/mobile"); - $("#popupDialog").popup('open'); - console.debug('refreshing lists'); - $('#challengesList').listview('refresh'); - $('#teamList').listview('refresh'); - $('#teamActivityList').listview('refresh'); - } - else { - console.debug("ERROR: " + data.message); - } - }) - }; - - viewModel.send = function(){ - if ($('#chatText').val()) { - var formData = {participant_group_id: viewModel.participantGroupId(), message:$('#chatText').val()}; + var viewModel = new LighterFootprintsModel(viewModelData); + viewModel.perform = function(challengeModel){ + if (!challengeModel.availableNow()) { + console.debug("tried to perform an activity that's not available right now"); + console.debug(challengeModel); + return; + } + var id = challengeModel.pk(); + var formData = { + participant_group_id: viewModel.participantGroupId(), + activity_id: id + }; + $.post('/lighterprints/api/do-activity', formData, function(data){ + if (data.success) { + console.debug(data); + ko.mapping.fromJSON(data.viewModel, viewModel); + viewModel.lastPerformedActivity(challengeModel); + ko.applyBindings(viewModel); + $("#popupDialog").popup('open'); + console.debug('refreshing lists'); + $('#challengesList').listview('refresh'); + $('#teamList').listview('refresh'); + $('#teamActivityList').listview('refresh'); + } + else { + console.debug("ERROR: " + data.message); + } + }) + }; + + viewModel.send = function(){ + if ($('#chatText').val()) { + var formData = { + participant_group_id: viewModel.participantGroupId(), + message: $('#chatText').val() + }; $.post('/lighterprints/api/message', formData, function(response){ if (response.success) { console.debug("successful post - updated view model: "); ko.mapping.fromJS(response.viewModel, viewModel); - ko.applyBindings(viewModel); - console.debug('refresh chatMessage List'); - $('#chatMessageList').listview('refresh'); + ko.applyBindings(viewModel); + console.debug('refresh chatMessage List'); + $('#chatMessageList').listview('refresh'); } else { console.debug("unable to post message to server"); @@ -72,28 +74,19 @@ }); $('#chatText').val(''); } - }; + }; + ko.applyBindings(viewModel); + $("#dashboardPage").on('pageshow', function(event){ + console.debug('dashboardPage pageshow'); + $('#challengesList').listview('refresh'); + $('#teamList').listview('refresh'); + $('#teamActivityList').listview('refresh'); + }); - ko.applyBindings(viewModel); - //ko.applyBindings(globalViewModel, document.getElementById("dashboardPage")); - //ko.applyBindings(globalViewModel, document.getElementById("myTeamPage")); - - //$("#myTeamPage").on("pagebeforeshow", function() { - // ko.applyBindings(globalViewModel); - //}); - $("#dashboardPage").on('pageshow', function(event){ - console.debug('dashboardPage pageshow'); - ko.applyBindings(viewModel); - $('#challengesList').listview('refresh'); - $('#teamList').listview('refresh'); - $('#teamActivityList').listview('refresh'); - }); - $("#myTeamPage").on('pageshow', function(event){ - ko.applyBindings(viewModel); - $('#myTeamPage').trigger('pagecreate'); - console.debug('myTeamPage pageshow'); - $('#chatMessageList').listview('refresh'); - }); + $("#myTeamPage").on('pageshow', function(event){ + console.debug('myTeamPage pageshow'); + $('#chatMessageList').listview('refresh'); + }); }); </script><!-- knockout templates --> Repository URL: https://bitbucket.org/virtualcommons/vcweb/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. |
|
From: <com...@bi...> - 2013-05-14 21:40:14
|
2 new commits in vcweb: https://bitbucket.org/virtualcommons/vcweb/commits/d22a5fd27e52/ Changeset: d22a5fd27e52 User: RoleeSinha Date: 2013-05-14 23:39:34 Summary: fixing KO binding Affected #: 1 file diff -r d3a16688ce7d980d7ed705a329c8c1abfd7ee737 -r d22a5fd27e52026883fd4af89ab2dd4c28f5b905 vcweb/lighterprints/static/js/lighterprints/mobile/controller.js --- a/vcweb/lighterprints/static/js/lighterprints/mobile/controller.js +++ b/vcweb/lighterprints/static/js/lighterprints/mobile/controller.js @@ -39,59 +39,6 @@ return model.availableActivities().length > 0; }); model.lastPerformedActivity = ko.observable(); - - model.perform = function(challengeModel){ - if (!challengeModel.availableNow()) { - console.debug("tried to perform an activity that's not available right now"); - console.debug(challengeModel); - return; - } - var id = challengeModel.pk(); - var formData = { - participant_group_id: model.participantGroupId(), - activity_id: id - }; - $.post('/lighterprints/api/do-activity', formData, function(data){ - if (data.success) { - console.debug(data); - ko.mapping.fromJSON(data.viewModel, model); - model.lastPerformedActivity(challengeModel); - ko.applyBindings(globalViewModel); - $("#activityCompletedDialog").popup('open'); - console.debug('refreshing lists'); - $('#challengesList').listview('refresh'); - $('#teamList').listview('refresh'); - $('#teamActivityList').listview('refresh'); - } - else { - console.debug("ERROR: " + data.message); - } - }); - }; - - model.send = function(){ - - if ($('#chatText').val()) { - var formData = { - participant_group_id: model.participantGroupId(), - message: $('#chatText').val() - }; - $.post('/lighterprints/api/message', formData, function(response){ - if (response.success) { - console.debug("successful post - updated view model: "); - ko.mapping.fromJS(response.viewModel, model); - ko.applyBindings(globalViewModel); - console.debug('refresh chatMessage List'); - $('#chatMessageList').listview('refresh'); - } - else { - console.debug("unable to post message to server"); - console.debug(response); - } - }); - $('#chatText').val(''); - } - }; - + return model; } https://bitbucket.org/virtualcommons/vcweb/commits/0b24e46febd9/ Changeset: 0b24e46febd9 User: RoleeSinha Date: 2013-05-14 23:39:53 Summary: fixing KO binding Affected #: 1 file diff -r d22a5fd27e52026883fd4af89ab2dd4c28f5b905 -r 0b24e46febd915cd194444646ab3a0d10f700db3 vcweb/lighterprints/templates/lighterprints/mobile/index.html --- a/vcweb/lighterprints/templates/lighterprints/mobile/index.html +++ b/vcweb/lighterprints/templates/lighterprints/mobile/index.html @@ -21,27 +21,79 @@ <script src='{% static "js/lighterprints/mobile/controller.js" %}'></script><script> - $(document).live('pageinit', function(event){ + $(document).on('pageinit', function(event){ var viewModelData = $.parseJSON("{{view_model_json|escapejs}}"); - var globalViewModel = new LighterFootprintsModel(viewModelData); - ko.applyBindings(globalViewModel); + var viewModel = new LighterFootprintsModel(viewModelData); + viewModel.perform = function(challengeModel){ + if (!challengeModel.availableNow()) { + console.debug("tried to perform an activity that's not available right now"); + console.debug(challengeModel); + return; + } + var id = challengeModel.pk(); + var formData = { + participant_group_id: viewModel.participantGroupId(), activity_id:id + }; + $.post('/lighterprints/api/do-activity', formData, function(data){ + if (data.success) { + console.debug(data); + //$('#dashboardPage').trigger('pagecreate'); + ko.mapping.fromJSON(data.viewModel, viewModel); + viewModel.lastPerformedActivity(challengeModel); + ko.applyBindings(viewModel); + //$.mobile.changePage("/lighterprints/mobile"); + $("#popupDialog").popup('open'); + console.debug('refreshing lists'); + $('#challengesList').listview('refresh'); + $('#teamList').listview('refresh'); + $('#teamActivityList').listview('refresh'); + } + else { + console.debug("ERROR: " + data.message); + } + }) + }; + + viewModel.send = function(){ + if ($('#chatText').val()) { + var formData = {participant_group_id: viewModel.participantGroupId(), message:$('#chatText').val()}; + $.post('/lighterprints/api/message', formData, function(response){ + if (response.success) { + console.debug("successful post - updated view model: "); + ko.mapping.fromJS(response.viewModel, viewModel); + ko.applyBindings(viewModel); + console.debug('refresh chatMessage List'); + $('#chatMessageList').listview('refresh'); + } + else { + console.debug("unable to post message to server"); + console.debug(response); + } + }); + $('#chatText').val(''); + } + }; - $("#submitChatMessage").click(function(event){ - event.preventDefault(); - }); - - $("#dashboardPage").on('pagebeforeshow', function(event){ - console.debug('dashboardPage pageshow'); - $('#challengesList').listview('refresh'); - $('#teamList').listview('refresh'); - $('#teamActivityList').listview('refresh'); + ko.applyBindings(viewModel); + //ko.applyBindings(globalViewModel, document.getElementById("dashboardPage")); + //ko.applyBindings(globalViewModel, document.getElementById("myTeamPage")); + + //$("#myTeamPage").on("pagebeforeshow", function() { + // ko.applyBindings(globalViewModel); + //}); + $("#dashboardPage").on('pageshow', function(event){ + console.debug('dashboardPage pageshow'); + ko.applyBindings(viewModel); + $('#challengesList').listview('refresh'); + $('#teamList').listview('refresh'); + $('#teamActivityList').listview('refresh'); }); - - $("#myTeamPage").on('pagebeforeshow', function(event){ - console.debug('chatMessageList pageshow'); - $('#chatMessageList').listview('refresh'); + $("#myTeamPage").on('pageshow', function(event){ + ko.applyBindings(viewModel); + $('#myTeamPage').trigger('pagecreate'); + console.debug('myTeamPage pageshow'); + $('#chatMessageList').listview('refresh'); }); - }); </script><!-- knockout templates --> Repository URL: https://bitbucket.org/virtualcommons/vcweb/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. |
|
From: <com...@bi...> - 2013-05-14 21:37:28
|
1 new commit in vcweb: https://bitbucket.org/virtualcommons/vcweb/commits/d3a16688ce7d/ Changeset: d3a16688ce7d User: RoleeSinha Date: 2013-05-14 23:35:02 Summary: fixing KO binding Affected #: 1 file diff -r 96d0ebc11b9c95c1312e88b335527e0e79aacf4b -r d3a16688ce7d980d7ed705a329c8c1abfd7ee737 vcweb/lighterprints/static/js/lighterprints/mobile/controller.js --- a/vcweb/lighterprints/static/js/lighterprints/mobile/controller.js +++ b/vcweb/lighterprints/static/js/lighterprints/mobile/controller.js @@ -56,6 +56,7 @@ console.debug(data); ko.mapping.fromJSON(data.viewModel, model); model.lastPerformedActivity(challengeModel); + ko.applyBindings(globalViewModel); $("#activityCompletedDialog").popup('open'); console.debug('refreshing lists'); $('#challengesList').listview('refresh'); @@ -79,6 +80,7 @@ if (response.success) { console.debug("successful post - updated view model: "); ko.mapping.fromJS(response.viewModel, model); + ko.applyBindings(globalViewModel); console.debug('refresh chatMessage List'); $('#chatMessageList').listview('refresh'); } Repository URL: https://bitbucket.org/virtualcommons/vcweb/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. |
|
From: <com...@bi...> - 2013-05-13 21:08:35
|
5 new commits in vcweb: https://bitbucket.org/virtualcommons/vcweb/commits/4a2e959b8d91/ Changeset: 4a2e959b8d91 User: RoleeSinha Date: 2013-05-13 22:55:57 Summary: fixing styling Affected #: 1 file diff -r df7023bb5d576a581141534fa1d26c963b964306 -r 4a2e959b8d91a9d8129440123d511e89f0245249 vcweb/lighterprints/static/css/lighterprints/mobile/themeroller.css --- a/vcweb/lighterprints/static/css/lighterprints/mobile/themeroller.css +++ b/vcweb/lighterprints/static/css/lighterprints/mobile/themeroller.css @@ -1,5 +1,6 @@ /* -* jQuery Mobile Git Build: SHA1: 9130927464f2d3e0300a9fb36ebfd69448cf3675 <> Date: Wed Feb 20 11:08:42 2013 -0800 +* jQuery Mobile 1.3.1 +* Git HEAD hash: 74b4bec049fd93e4fe40205e6157de16eb64eb46 <> Date: Mon Apr 8 2013 19:41:28 UTC * http://jquerymobile.com * * Copyright 2010, 2013 jQuery Foundation, Inc. and other contributors @@ -10,10 +11,8 @@ /* Swatches */ - /* A -----------------------------------------------------------------------------------------------------------*/ - .ui-bar-a { border: 1px solid #009fe1 /*{a-bar-border}*/; background: #009fe1 /*{a-bar-background-color}*/; @@ -30,30 +29,25 @@ .ui-bar-a .ui-link-inherit { color: #ffffff /*{a-bar-color}*/; } - .ui-bar-a a.ui-link { color: #7cc4e7 /*{a-bar-link-color}*/; font-weight: bold; } - .ui-bar-a a.ui-link:visited { color: #2489ce /*{a-bar-link-visited}*/; } - .ui-bar-a a.ui-link:hover { color: #2489ce /*{a-bar-link-hover}*/; } - .ui-bar-a a.ui-link:active { color: #2489ce /*{a-bar-link-active}*/; } - .ui-bar-a, .ui-bar-a input, .ui-bar-a select, .ui-bar-a textarea, .ui-bar-a button { - font-family: Arial /*{global-font-family}*/; + font-family: Arial /*{global-font-family}*/; } .ui-body-a, .ui-overlay-a { @@ -77,58 +71,53 @@ .ui-body-a select, .ui-body-a textarea, .ui-body-a button { - font-family: Arial /*{global-font-family}*/; + font-family: Arial /*{global-font-family}*/; } .ui-body-a .ui-link-inherit { color: #4d4d4d /*{a-body-color}*/; } - .ui-body-a .ui-link { color: #5F6E77 /*{a-body-link-color}*/; font-weight: bold; } - .ui-body-a .ui-link:visited { color: #5F6E77 /*{a-body-link-visited}*/; } - .ui-body-a .ui-link:hover { color: #5F6E77 /*{a-body-link-hover}*/; } - .ui-body-a .ui-link:active { color: #5F6E77 /*{a-body-link-active}*/; } - .ui-btn-up-a { - border: 1px solid #42545E /*{a-bup-border}*/; - background: #42545E /*{a-bup-background-color}*/; + border: 1px solid #009fe1 /*{a-bup-border}*/; + background: #009fe1 /*{a-bup-background-color}*/; font-weight: bold; color: #ffffff /*{a-bup-color}*/; text-shadow: 0 /*{a-bup-shadow-x}*/ 0 /*{a-bup-shadow-y}*/ 0 /*{a-bup-shadow-radius}*/ #ffffff /*{a-bup-shadow-color}*/; - background-image: -webkit-gradient(linear, left top, left bottom, from( #42545E /*{a-bup-background-start}*/), to( #42545E /*{a-bup-background-end}*/)); /* Saf4+, Chrome */ - background-image: -webkit-linear-gradient( #42545E /*{a-bup-background-start}*/, #42545E /*{a-bup-background-end}*/); /* Chrome 10+, Saf5.1+ */ - background-image: -moz-linear-gradient( #42545E /*{a-bup-background-start}*/, #42545E /*{a-bup-background-end}*/); /* FF3.6 */ - background-image: -ms-linear-gradient( #42545E /*{a-bup-background-start}*/, #42545E /*{a-bup-background-end}*/); /* IE10 */ - background-image: -o-linear-gradient( #42545E /*{a-bup-background-start}*/, #42545E /*{a-bup-background-end}*/); /* Opera 11.10+ */ - background-image: linear-gradient( #42545E /*{a-bup-background-start}*/, #42545E /*{a-bup-background-end}*/); + background-image: -webkit-gradient(linear, left top, left bottom, from( #009fe1 /*{a-bup-background-start}*/), to( #009fe1 /*{a-bup-background-end}*/)); /* Saf4+, Chrome */ + background-image: -webkit-linear-gradient( #009fe1 /*{a-bup-background-start}*/, #009fe1 /*{a-bup-background-end}*/); /* Chrome 10+, Saf5.1+ */ + background-image: -moz-linear-gradient( #009fe1 /*{a-bup-background-start}*/, #009fe1 /*{a-bup-background-end}*/); /* FF3.6 */ + background-image: -ms-linear-gradient( #009fe1 /*{a-bup-background-start}*/, #009fe1 /*{a-bup-background-end}*/); /* IE10 */ + background-image: -o-linear-gradient( #009fe1 /*{a-bup-background-start}*/, #009fe1 /*{a-bup-background-end}*/); /* Opera 11.10+ */ + background-image: linear-gradient( #009fe1 /*{a-bup-background-start}*/, #009fe1 /*{a-bup-background-end}*/); } .ui-btn-up-a:visited, .ui-btn-up-a a.ui-link-inherit { color: #ffffff /*{a-bup-color}*/; } .ui-btn-hover-a { - border: 1px solid #42545E /*{a-bhover-border}*/; - background: #42545E /*{a-bhover-background-color}*/; + border: 1px solid #009fe1 /*{a-bhover-border}*/; + background: #009fe1 /*{a-bhover-background-color}*/; font-weight: bold; color: #ffffff /*{a-bhover-color}*/; text-shadow: 0 /*{a-bhover-shadow-x}*/ 0 /*{a-bhover-shadow-y}*/ 0 /*{a-bhover-shadow-radius}*/ ##ffffff /*{a-bhover-shadow-color}*/; - background-image: -webkit-gradient(linear, left top, left bottom, from( #42545E /*{a-bhover-background-start}*/), to( #42545E /*{a-bhover-background-end}*/)); /* Saf4+, Chrome */ - background-image: -webkit-linear-gradient( #42545E /*{a-bhover-background-start}*/, #42545E /*{a-bhover-background-end}*/); /* Chrome 10+, Saf5.1+ */ - background-image: -moz-linear-gradient( #42545E /*{a-bhover-background-start}*/, #42545E /*{a-bhover-background-end}*/); /* FF3.6 */ - background-image: -ms-linear-gradient( #42545E /*{a-bhover-background-start}*/, #42545E /*{a-bhover-background-end}*/); /* IE10 */ - background-image: -o-linear-gradient( #42545E /*{a-bhover-background-start}*/, #42545E /*{a-bhover-background-end}*/); /* Opera 11.10+ */ - background-image: linear-gradient( #42545E /*{a-bhover-background-start}*/, #42545E /*{a-bhover-background-end}*/); + background-image: -webkit-gradient(linear, left top, left bottom, from( #009fe1 /*{a-bhover-background-start}*/), to( #009fe1 /*{a-bhover-background-end}*/)); /* Saf4+, Chrome */ + background-image: -webkit-linear-gradient( #009fe1 /*{a-bhover-background-start}*/, #009fe1 /*{a-bhover-background-end}*/); /* Chrome 10+, Saf5.1+ */ + background-image: -moz-linear-gradient( #009fe1 /*{a-bhover-background-start}*/, #009fe1 /*{a-bhover-background-end}*/); /* FF3.6 */ + background-image: -ms-linear-gradient( #009fe1 /*{a-bhover-background-start}*/, #009fe1 /*{a-bhover-background-end}*/); /* IE10 */ + background-image: -o-linear-gradient( #009fe1 /*{a-bhover-background-start}*/, #009fe1 /*{a-bhover-background-end}*/); /* Opera 11.10+ */ + background-image: linear-gradient( #009fe1 /*{a-bhover-background-start}*/, #009fe1 /*{a-bhover-background-end}*/); } .ui-btn-hover-a:visited, .ui-btn-hover-a:hover, @@ -141,12 +130,12 @@ font-weight: bold; color: #ffffff /*{a-bdown-color}*/; text-shadow: 0 /*{a-bdown-shadow-x}*/ 0 /*{a-bdown-shadow-y}*/ 0 /*{a-bdown-shadow-radius}*/ ##ffffff /*{a-bdown-shadow-color}*/; - background-image: -webkit-gradient(linear, left top, left bottom, from( #42545E /*{a-bdown-background-start}*/), to( #42545E /*{a-bdown-background-end}*/)); /* Saf4+, Chrome */ - background-image: -webkit-linear-gradient( #42545E /*{a-bdown-background-start}*/, #42545E /*{a-bdown-background-end}*/); /* Chrome 10+, Saf5.1+ */ - background-image: -moz-linear-gradient( #42545E /*{a-bdown-background-start}*/, #42545E /*{a-bdown-background-end}*/); /* FF3.6 */ - background-image: -ms-linear-gradient( #42545E /*{a-bdown-background-start}*/, #42545E /*{a-bdown-background-end}*/); /* IE10 */ - background-image: -o-linear-gradient( #42545E /*{a-bdown-background-start}*/, #42545E /*{a-bdown-background-end}*/); /* Opera 11.10+ */ - background-image: linear-gradient( #42545E /*{a-bdown-background-start}*/, #42545E /*{a-bdown-background-end}*/); + background-image: -webkit-gradient(linear, left top, left bottom, from( #42545e /*{a-bdown-background-start}*/), to( #42545e /*{a-bdown-background-end}*/)); /* Saf4+, Chrome */ + background-image: -webkit-linear-gradient( #42545e /*{a-bdown-background-start}*/, #42545e /*{a-bdown-background-end}*/); /* Chrome 10+, Saf5.1+ */ + background-image: -moz-linear-gradient( #42545e /*{a-bdown-background-start}*/, #42545e /*{a-bdown-background-end}*/); /* FF3.6 */ + background-image: -ms-linear-gradient( #42545e /*{a-bdown-background-start}*/, #42545e /*{a-bdown-background-end}*/); /* IE10 */ + background-image: -o-linear-gradient( #42545e /*{a-bdown-background-start}*/, #42545e /*{a-bdown-background-end}*/); /* Opera 11.10+ */ + background-image: linear-gradient( #42545e /*{a-bdown-background-start}*/, #42545e /*{a-bdown-background-end}*/); } .ui-btn-down-a:visited, .ui-btn-down-a:hover, @@ -156,14 +145,11 @@ .ui-btn-up-a, .ui-btn-hover-a, .ui-btn-down-a { - font-family: Arial /*{global-font-family}*/; + font-family: Arial /*{global-font-family}*/; text-decoration: none; } - - /* B -----------------------------------------------------------------------------------------------------------*/ - .ui-bar-b { border: 1px solid #42545e /*{b-bar-border}*/; background: #42545E /*{b-bar-background-color}*/; @@ -180,30 +166,25 @@ .ui-bar-b .ui-link-inherit { color: #e1e6e9 /*{b-bar-color}*/; } - .ui-bar-b a.ui-link { color: #7cc4e7 /*{b-bar-link-color}*/; font-weight: bold; } - .ui-bar-b a.ui-link:visited { color: #2489ce /*{b-bar-link-visited}*/; } - .ui-bar-b a.ui-link:hover { color: #2489ce /*{b-bar-link-hover}*/; } - .ui-bar-b a.ui-link:active { color: #2489ce /*{b-bar-link-active}*/; } - .ui-bar-b, .ui-bar-b input, .ui-bar-b select, .ui-bar-b textarea, .ui-bar-b button { - font-family: Arial /*{global-font-family}*/; + font-family: Arial /*{global-font-family}*/; } .ui-body-b, .ui-overlay-b { @@ -227,29 +208,24 @@ .ui-body-b select, .ui-body-b textarea, .ui-body-b button { - font-family: Arial /*{global-font-family}*/; + font-family: Arial /*{global-font-family}*/; } .ui-body-b .ui-link-inherit { color: #5F6E77 /*{b-body-color}*/; } - .ui-body-b .ui-link { color: #5F6E77 /*{b-body-link-color}*/; font-weight: bold; } - .ui-body-b .ui-link:visited { color: #5F6E77 /*{b-body-link-visited}*/; } - .ui-body-b .ui-link:hover { color: #5F6E77 /*{b-body-link-hover}*/; } - .ui-body-b .ui-link:active { color: #5F6E77 /*{b-body-link-active}*/; } - .ui-btn-up-b { border: 1px solid #cccccc /*{b-bup-border}*/; background: #ffffff /*{b-bup-background-color}*/; @@ -306,16 +282,13 @@ .ui-btn-up-b, .ui-btn-hover-b, .ui-btn-down-b { - font-family: Arial /*{global-font-family}*/; + font-family: Arial /*{global-font-family}*/; text-decoration: none; } - - /* C -----------------------------------------------------------------------------------------------------------*/ - .ui-bar-c { border: 1px solid #cccccc /*{c-bar-border}*/; background: #ffffff /*{c-bar-background-color}*/; @@ -332,30 +305,25 @@ .ui-bar-c .ui-link-inherit { color: #e1e6e9 /*{c-bar-color}*/; } - .ui-bar-c a.ui-link { color: #7cc4e7 /*{c-bar-link-color}*/; font-weight: bold; } - .ui-bar-c a.ui-link:visited { color: #2489ce /*{c-bar-link-visited}*/; } - .ui-bar-c a.ui-link:hover { color: #2489ce /*{c-bar-link-hover}*/; } - .ui-bar-c a.ui-link:active { color: #2489ce /*{c-bar-link-active}*/; } - .ui-bar-c, .ui-bar-c input, .ui-bar-c select, .ui-bar-c textarea, .ui-bar-c button { - font-family: Arial /*{global-font-family}*/; + font-family: Arial /*{global-font-family}*/; } .ui-body-c, .ui-overlay-c { @@ -379,29 +347,24 @@ .ui-body-c select, .ui-body-c textarea, .ui-body-c button { - font-family: Arial /*{global-font-family}*/; + font-family: Arial /*{global-font-family}*/; } .ui-body-c .ui-link-inherit { color: #5F6E77 /*{c-body-color}*/; } - .ui-body-c .ui-link { color: #5F6E77 /*{c-body-link-color}*/; font-weight: bold; } - .ui-body-c .ui-link:visited { color: #2489ce /*{c-body-link-visited}*/; } - .ui-body-c .ui-link:hover { color: #2489ce /*{c-body-link-hover}*/; } - .ui-body-c .ui-link:active { color: #2489ce /*{c-body-link-active}*/; } - .ui-btn-up-c { border: 1px solid #cccccc /*{c-bup-border}*/; background: #ffffff /*{c-bup-background-color}*/; @@ -458,16 +421,13 @@ .ui-btn-up-c, .ui-btn-hover-c, .ui-btn-down-c { - font-family: Arial /*{global-font-family}*/; + font-family: Arial /*{global-font-family}*/; text-decoration: none; } - - /* D -----------------------------------------------------------------------------------------------------------*/ - .ui-bar-d { border: 1px solid #F7F7F7 /*{d-bar-border}*/; background: #F7F7F7 /*{d-bar-background-color}*/; @@ -484,24 +444,19 @@ .ui-bar-d .ui-link-inherit { color: #5F6E77 /*{d-bar-color}*/; } - .ui-bar-d a.ui-link { color: #7cc4e7 /*{d-bar-link-color}*/; font-weight: bold; } - .ui-bar-d a.ui-link:visited { color: #2489ce /*{d-bar-link-visited}*/; } - .ui-bar-d a.ui-link:hover { color: #2489ce /*{d-bar-link-hover}*/; } - .ui-bar-d a.ui-link:active { color: #2489ce /*{d-bar-link-active}*/; } - .ui-bar-d, .ui-bar-d input, .ui-bar-d select, @@ -536,24 +491,19 @@ .ui-body-d .ui-link-inherit { color: #5F6E77 /*{d-body-color}*/; } - .ui-body-d .ui-link { color: #5F6E77 /*{d-body-link-color}*/; font-weight: bold; } - .ui-body-d .ui-link:visited { color: #2489ce /*{d-body-link-visited}*/; } - .ui-body-d .ui-link:hover { color: #2489ce /*{d-body-link-hover}*/; } - .ui-body-d .ui-link:active { color: #2489ce /*{d-body-link-active}*/; } - .ui-btn-up-d { border: 1px solid #cccccc /*{d-bup-border}*/; background: #eeeeee /*{d-bup-background-color}*/; @@ -615,60 +565,188 @@ } +/* E +-----------------------------------------------------------------------------------------------------------*/ +.ui-bar-e { + border: 1px solid #b8b8b8 /*{e-bar-border}*/; + background: #F7F7F7 /*{e-bar-background-color}*/; + color: #5F6E77 /*{e-bar-color}*/; + font-weight: bold; + text-shadow: 0 /*{e-bar-shadow-x}*/ 0 /*{e-bar-shadow-y}*/ 0 /*{e-bar-shadow-radius}*/ #ffffff /*{e-bar-shadow-color}*/; + background-image: -webkit-gradient(linear, left top, left bottom, from( #f7f7f7 /*{e-bar-background-start}*/), to( #f7f7f7 /*{e-bar-background-end}*/)); /* Saf4+, Chrome */ + background-image: -webkit-linear-gradient( #f7f7f7 /*{e-bar-background-start}*/, #f7f7f7 /*{e-bar-background-end}*/); /* Chrome 10+, Saf5.1+ */ + background-image: -moz-linear-gradient( #f7f7f7 /*{e-bar-background-start}*/, #f7f7f7 /*{e-bar-background-end}*/); /* FF3.6 */ + background-image: -ms-linear-gradient( #f7f7f7 /*{e-bar-background-start}*/, #f7f7f7 /*{e-bar-background-end}*/); /* IE10 */ + background-image: -o-linear-gradient( #f7f7f7 /*{e-bar-background-start}*/, #f7f7f7 /*{e-bar-background-end}*/); /* Opera 11.10+ */ + background-image: linear-gradient( #f7f7f7 /*{e-bar-background-start}*/, #f7f7f7 /*{e-bar-background-end}*/); +} +.ui-bar-e .ui-link-inherit { + color: #5F6E77 /*{e-bar-color}*/; +} +.ui-bar-e a.ui-link { + color: #7cc4e7 /*{e-bar-link-color}*/; + font-weight: bold; +} +.ui-bar-e a.ui-link:visited { + color: #2489ce /*{e-bar-link-visited}*/; +} +.ui-bar-e a.ui-link:hover { + color: #2489ce /*{e-bar-link-hover}*/; +} +.ui-bar-e a.ui-link:active { + color: #2489ce /*{e-bar-link-active}*/; +} +.ui-bar-e, +.ui-bar-e input, +.ui-bar-e select, +.ui-bar-e textarea, +.ui-bar-e button { + font-family: Arial /*{global-font-family}*/; +} +.ui-body-e, +.ui-overlay-e { + border: 1px solid #F7F7F7 /*{e-body-border}*/; + color: #5F6E77 /*{e-body-color}*/; + text-shadow: 0 /*{e-body-shadow-x}*/ 0 /*{e-body-shadow-y}*/ 0 /*{e-body-shadow-radius}*/ /*{e-body-shadow-color}*/; + background: #F7F7F7 /*{e-body-background-color}*/; + background-image: -webkit-gradient(linear, left top, left bottom, from( #f7f7f7 /*{e-body-background-start}*/), to( #f7f7f7 /*{e-body-background-end}*/)); /* Saf4+, Chrome */ + background-image: -webkit-linear-gradient( #f7f7f7 /*{e-body-background-start}*/, #f7f7f7 /*{e-body-background-end}*/); /* Chrome 10+, Saf5.1+ */ + background-image: -moz-linear-gradient( #f7f7f7 /*{e-body-background-start}*/, #f7f7f7 /*{e-body-background-end}*/); /* FF3.6 */ + background-image: -ms-linear-gradient( #f7f7f7 /*{e-body-background-start}*/, #f7f7f7 /*{e-body-background-end}*/); /* IE10 */ + background-image: -o-linear-gradient( #f7f7f7 /*{e-body-background-start}*/, #f7f7f7 /*{e-body-background-end}*/); /* Opera 11.10+ */ + background-image: linear-gradient( #f7f7f7 /*{e-body-background-start}*/, #f7f7f7 /*{e-body-background-end}*/); +} +.ui-overlay-e { + background-image: none; + border-width: 0; +} +.ui-body-e, +.ui-body-e input, +.ui-body-e select, +.ui-body-e textarea, +.ui-body-e button { + font-family: Arial /*{global-font-family}*/; +} +.ui-body-e .ui-link-inherit { + color: #5F6E77 /*{e-body-color}*/; +} +.ui-body-e .ui-link { + color: #5F6E77 /*{e-body-link-color}*/; + font-weight: bold; +} +.ui-body-e .ui-link:visited { + color: #2489ce /*{e-body-link-visited}*/; +} +.ui-body-e .ui-link:hover { + color: #2489ce /*{e-body-link-hover}*/; +} +.ui-body-e .ui-link:active { + color: #2489ce /*{e-body-link-active}*/; +} +.ui-btn-up-e { + border: 1px solid #cccccc /*{e-bup-border}*/; + background: #eeeeee /*{e-bup-background-color}*/; + font-weight: bold; + color: #2f3e46 /*{e-bup-color}*/; + text-shadow: 0 /*{e-bup-shadow-x}*/ 1px /*{e-bup-shadow-y}*/ 0 /*{e-bup-shadow-radius}*/ #ffffff /*{e-bup-shadow-color}*/; + background-image: -webkit-gradient(linear, left top, left bottom, from( #ffffff /*{e-bup-background-start}*/), to( #f1f1f1 /*{e-bup-background-end}*/)); /* Saf4+, Chrome */ + background-image: -webkit-linear-gradient( #ffffff /*{e-bup-background-start}*/, #f1f1f1 /*{e-bup-background-end}*/); /* Chrome 10+, Saf5.1+ */ + background-image: -moz-linear-gradient( #ffffff /*{e-bup-background-start}*/, #f1f1f1 /*{e-bup-background-end}*/); /* FF3.6 */ + background-image: -ms-linear-gradient( #ffffff /*{e-bup-background-start}*/, #f1f1f1 /*{e-bup-background-end}*/); /* IE10 */ + background-image: -o-linear-gradient( #ffffff /*{e-bup-background-start}*/, #f1f1f1 /*{e-bup-background-end}*/); /* Opera 11.10+ */ + background-image: linear-gradient( #ffffff /*{e-bup-background-start}*/, #f1f1f1 /*{e-bup-background-end}*/); +} +.ui-btn-up-e:visited, +.ui-btn-up-e a.ui-link-inherit { + color: #2f3e46 /*{e-bup-color}*/; +} +.ui-btn-hover-e { + border: 1px solid #bbbbbb /*{e-bhover-border}*/; + background: #dfdfdf /*{e-bhover-background-color}*/; + font-weight: bold; + color: #2f3e46 /*{e-bhover-color}*/; + text-shadow: 0 /*{e-bhover-shadow-x}*/ 1px /*{e-bhover-shadow-y}*/ 0 /*{e-bhover-shadow-radius}*/ #ffffff /*{e-bhover-shadow-color}*/; + background-image: -webkit-gradient(linear, left top, left bottom, from( #f6f6f6 /*{e-bhover-background-start}*/), to( #e0e0e0 /*{e-bhover-background-end}*/)); /* Saf4+, Chrome */ + background-image: -webkit-linear-gradient( #f6f6f6 /*{e-bhover-background-start}*/, #e0e0e0 /*{e-bhover-background-end}*/); /* Chrome 10+, Saf5.1+ */ + background-image: -moz-linear-gradient( #f6f6f6 /*{e-bhover-background-start}*/, #e0e0e0 /*{e-bhover-background-end}*/); /* FF3.6 */ + background-image: -ms-linear-gradient( #f6f6f6 /*{e-bhover-background-start}*/, #e0e0e0 /*{e-bhover-background-end}*/); /* IE10 */ + background-image: -o-linear-gradient( #f6f6f6 /*{e-bhover-background-start}*/, #e0e0e0 /*{e-bhover-background-end}*/); /* Opera 11.10+ */ + background-image: linear-gradient( #f6f6f6 /*{e-bhover-background-start}*/, #e0e0e0 /*{e-bhover-background-end}*/); +} +.ui-btn-hover-e:visited, +.ui-btn-hover-e:hover, +.ui-btn-hover-e a.ui-link-inherit { + color: #2f3e46 /*{e-bhover-color}*/; +} +.ui-btn-down-e { + border: 1px solid #bbbbbb /*{e-bdown-border}*/; + background: #d6d6d6 /*{e-bdown-background-color}*/; + font-weight: bold; + color: #2f3e46 /*{e-bdown-color}*/; + text-shadow: 0 /*{e-bdown-shadow-x}*/ 1px /*{e-bdown-shadow-y}*/ 0 /*{e-bdown-shadow-radius}*/ #ffffff /*{e-bdown-shadow-color}*/; + background-image: -webkit-gradient(linear, left top, left bottom, from( #d0d0d0 /*{e-bdown-background-start}*/), to( #dfdfdf /*{e-bdown-background-end}*/)); /* Saf4+, Chrome */ + background-image: -webkit-linear-gradient( #d0d0d0 /*{e-bdown-background-start}*/, #dfdfdf /*{e-bdown-background-end}*/); /* Chrome 10+, Saf5.1+ */ + background-image: -moz-linear-gradient( #d0d0d0 /*{e-bdown-background-start}*/, #dfdfdf /*{e-bdown-background-end}*/); /* FF3.6 */ + background-image: -ms-linear-gradient( #d0d0d0 /*{e-bdown-background-start}*/, #dfdfdf /*{e-bdown-background-end}*/); /* IE10 */ + background-image: -o-linear-gradient( #d0d0d0 /*{e-bdown-background-start}*/, #dfdfdf /*{e-bdown-background-end}*/); /* Opera 11.10+ */ + background-image: linear-gradient( #d0d0d0 /*{e-bdown-background-start}*/, #dfdfdf /*{e-bdown-background-end}*/); +} +.ui-btn-down-e:visited, +.ui-btn-down-e:hover, +.ui-btn-down-e a.ui-link-inherit { + color: #2f3e46 /*{e-bdown-color}*/; +} +.ui-btn-up-e, +.ui-btn-hover-e, +.ui-btn-down-e { + font-family: Arial /*{global-font-family}*/; + text-decoration: none; +} + + /* Structure */ - /* links within "buttons" -----------------------------------------------------------------------------------------------------------*/ - a.ui-link-inherit { text-decoration: none !important; } - - /* Active class used as the "on" state across all themes -----------------------------------------------------------------------------------------------------------*/ .ui-btn-active { border: 1px solid #cccccc /*{global-active-border}*/; - background: #cccccc /*{global-active-background-color}*/; + background: #ffffff /*{global-active-background-color}*/; font-weight: bold; - color: #ffffff /*{global-active-color}*/; + color: #808080 /*{global-active-color}*/; cursor: pointer; text-shadow: 0 /*{global-active-shadow-x}*/ 0 /*{global-active-shadow-y}*/ 0 /*{global-active-shadow-radius}*/ /*{global-active-shadow-color}*/; text-decoration: none; - background-image: -webkit-gradient(linear, left top, left bottom, from( #cccccc /*{global-active-background-start}*/), to( #cccccc /*{global-active-background-end}*/)); /* Saf4+, Chrome */ - background-image: -webkit-linear-gradient( #cccccc /*{global-active-background-start}*/, #cccccc /*{global-active-background-end}*/); /* Chrome 10+, Saf5.1+ */ - background-image: -moz-linear-gradient( #cccccc /*{global-active-background-start}*/, #cccccc /*{global-active-background-end}*/); /* FF3.6 */ - background-image: -ms-linear-gradient( #cccccc /*{global-active-background-start}*/, #cccccc /*{global-active-background-end}*/); /* IE10 */ - background-image: -o-linear-gradient( #cccccc /*{global-active-background-start}*/, #cccccc /*{global-active-background-end}*/); /* Opera 11.10+ */ - background-image: linear-gradient( #cccccc /*{global-active-background-start}*/, #cccccc /*{global-active-background-end}*/); - font-family: Arial /*{global-font-family}*/; + background-image: -webkit-gradient(linear, left top, left bottom, from( #ffffff /*{global-active-background-start}*/), to( #ffffff /*{global-active-background-end}*/)); /* Saf4+, Chrome */ + background-image: -webkit-linear-gradient( #ffffff /*{global-active-background-start}*/, #ffffff /*{global-active-background-end}*/); /* Chrome 10+, Saf5.1+ */ + background-image: -moz-linear-gradient( #ffffff /*{global-active-background-start}*/, #ffffff /*{global-active-background-end}*/); /* FF3.6 */ + background-image: -ms-linear-gradient( #ffffff /*{global-active-background-start}*/, #ffffff /*{global-active-background-end}*/); /* IE10 */ + background-image: -o-linear-gradient( #ffffff /*{global-active-background-start}*/, #ffffff /*{global-active-background-end}*/); /* Opera 11.10+ */ + background-image: linear-gradient( #ffffff /*{global-active-background-start}*/, #ffffff /*{global-active-background-end}*/); + font-family: Arial /*{global-font-family}*/; } .ui-btn-active:visited, .ui-btn-active:hover, .ui-btn-active a.ui-link-inherit { - color: #ffffff /*{global-active-color}*/; + color: #808080 /*{global-active-color}*/; } - - /* button inner top highlight -----------------------------------------------------------------------------------------------------------*/ - .ui-btn-inner { border-top: 1px solid #fff; border-color: rgba(255,255,255,.3); } - - /* corner rounding classes -----------------------------------------------------------------------------------------------------------*/ - .ui-corner-all { -webkit-border-radius: 0em /*{global-radii-blocks}*/; border-radius: 0em /*{global-radii-blocks}*/; } - /* Form field separator -----------------------------------------------------------------------------------------------------------*/ .ui-br { @@ -676,7 +754,6 @@ border-color: rgba(130,130,130,.3); border-style: solid; } - /* Interaction cues -----------------------------------------------------------------------------------------------------------*/ .ui-disabled { @@ -689,23 +766,19 @@ cursor: default !important; pointer-events: none; } - /* Icons -----------------------------------------------------------------------------------------------------------*/ - .ui-icon, .ui-icon-searchfield:after { background-color: #42545E /*{global-icon-color}*/; - background-color: rgba(66,84,94,0.5) /*{global-icon-disc}*/; + background-color: transparent /*{global-icon-disc}*/; background-image: url(images/icons-18-white.png) /*{global-icon-set}*/; background-repeat: no-repeat; -webkit-border-radius: 9px; border-radius: 9px; } - /* Alt icon color -----------------------------------------------------------------------------------------------------------*/ - .ui-icon-alt .ui-icon, .ui-icon-alt .ui-icon-searchfield:after { background-color: #fff; @@ -713,20 +786,16 @@ background-image: url(images/icons-18-black.png); background-repeat: no-repeat; } - /* No disc -----------------------------------------------------------------------------------------------------------*/ - .ui-icon-nodisc .ui-icon, .ui-icon-nodisc .ui-icon-searchfield:after, .ui-icon-nodisc .ui-icon-alt .ui-icon, .ui-icon-nodisc .ui-icon-alt .ui-icon-searchfield:after { background-color: transparent; } - /* Icon sprite -----------------------------------------------------------------------------------------------------------*/ - /* plus minus */ .ui-icon-plus { background-position: -1px -1px; @@ -803,15 +872,12 @@ /* menu edit */ .ui-icon-bars { background-position: -788px -1px; - } .ui-icon-edit { background-position: -824px -1px; } - /* HD/"retina" sprite -----------------------------------------------------------------------------------------------------------*/ - @media only screen and (-webkit-min-device-pixel-ratio: 1.3), only screen and (min--moz-device-pixel-ratio: 1.3), only screen and (min-resolution: 200dpi) { @@ -828,13 +894,11 @@ -webkit-background-size: 864px 18px; background-size: 864px 18px; } - .ui-icon-alt .ui-icon { background-image: url(images/icons-36-black.png); } - .ui-icon-plus { - background-position: 0px 50%; + background-position: 0 50%; } .ui-icon-minus { background-position: -36px 50%; @@ -907,7 +971,6 @@ background-position: -824px 50%; } } - /* checks,radios */ .ui-checkbox .ui-icon, .ui-selectmenu-list .ui-icon { @@ -920,32 +983,27 @@ } .ui-checkbox-on .ui-icon, .ui-radio-on .ui-icon { - background-color: #cccccc /*{global-active-background-color}*/; /* NOTE: this hex should match the active state color. It's repeated here for cascade */ + background-color: #ffffff /*{global-active-background-color}*/; /* NOTE: this hex should match the active state color. It's repeated here for cascade */ } - /* loading icon */ .ui-icon-loading { background: url(images/ajax-loader.gif); background-size: 46px 46px; } - /* Button corner class -----------------------------------------------------------------------------------------------------------*/ .ui-btn-corner-all { -webkit-border-radius: 0em /*{global-radii-buttons}*/; border-radius: 0em /*{global-radii-buttons}*/; } - /* radius clip workaround for cleaning up corner trapping */ .ui-corner-all, .ui-btn-corner-all { -webkit-background-clip: padding; background-clip: padding-box; } - /* Overlay / modal -----------------------------------------------------------------------------------------------------------*/ - .ui-overlay { background: #666; filter: Alpha(Opacity=50); @@ -955,36 +1013,34 @@ height: 100%; } .ui-overlay-shadow { - -moz-box-shadow: 0px 0px 12px rgba(0,0,0,.6); - -webkit-box-shadow: 0px 0px 12px rgba(0,0,0,.6); - box-shadow: 0px 0px 12px rgba(0,0,0,.6); + -moz-box-shadow: 0 0 12px rgba(0,0,0,.6); + -webkit-box-shadow: 0 0 12px rgba(0,0,0,.6); + box-shadow: 0 0 12px rgba(0,0,0,.6); } .ui-shadow { - -moz-box-shadow: 0px 1px 3px /*{global-box-shadow-size}*/ rgba(230,230,230,1) /*{global-box-shadow-color}*/; - -webkit-box-shadow: 0px 1px 3px /*{global-box-shadow-size}*/ rgba(230,230,230,1) /*{global-box-shadow-color}*/; - box-shadow: 0px 1px 3px /*{global-box-shadow-size}*/ rgba(230,230,230,1) /*{global-box-shadow-color}*/; + -moz-box-shadow: 0 1px 3px /*{global-box-shadow-size}*/ rgba(NaN,NaN,NaN,1) /*{global-box-shadow-color}*/; + -webkit-box-shadow: 0 1px 3px /*{global-box-shadow-size}*/ rgba(NaN,NaN,NaN,1) /*{global-box-shadow-color}*/; + box-shadow: 0 1px 3px /*{global-box-shadow-size}*/ rgba(NaN,NaN,NaN,1) /*{global-box-shadow-color}*/ } .ui-bar-a .ui-shadow, .ui-bar-b .ui-shadow , .ui-bar-c .ui-shadow { - -moz-box-shadow: 0px 1px 0 rgba(255,255,255,.3); - -webkit-box-shadow: 0px 1px 0 rgba(255,255,255,.3); - box-shadow: 0px 1px 0 rgba(255,255,255,.3); + -moz-box-shadow: 0 1px 0 rgba(255,255,255,.3); + -webkit-box-shadow: 0 1px 0 rgba(255,255,255,.3); + box-shadow: 0 1px 0 rgba(255,255,255,.3); } .ui-shadow-inset { - -moz-box-shadow: inset 0px 1px 4px rgba(0,0,0,.2); - -webkit-box-shadow: inset 0px 1px 4px rgba(0,0,0,.2); - box-shadow: inset 0px 1px 4px rgba(0,0,0,.2); + -moz-box-shadow: inset 0 1px 4px rgba(0,0,0,.2); + -webkit-box-shadow: inset 0 1px 4px rgba(0,0,0,.2); + box-shadow: inset 0 1px 4px rgba(0,0,0,.2); } .ui-icon-shadow { - -moz-box-shadow: 0px 1px 0 rgba(255,255,255,.4) /*{global-icon-shadow}*/; - -webkit-box-shadow: 0px 1px 0 rgba(255,255,255,.4) /*{global-icon-shadow}*/; - box-shadow: 0px 1px 0 rgba(255,255,255,.4) /*{global-icon-shadow}*/; + -moz-box-shadow: 0 1px 0 transparent /*{global-icon-shadow}*/; + -webkit-box-shadow: 0 1px 0 transparent /*{global-icon-shadow}*/; + box-shadow: 0 1px 0 transparent /*{global-icon-shadow}*/; } - /* Focus state - set here for specificity (note: these classes are added by JavaScript) -----------------------------------------------------------------------------------------------------------*/ - .ui-btn:focus, .ui-link-inherit:focus { outline: 0; } @@ -993,26 +1049,23 @@ } .ui-focus, .ui-btn:focus { - -moz-box-shadow: inset 0px 0px 3px #cccccc /*{global-active-background-color}*/, 0px 0px 9px #cccccc /*{global-active-background-color}*/; - -webkit-box-shadow: inset 0px 0px 3px #cccccc /*{global-active-background-color}*/, 0px 0px 9px #cccccc /*{global-active-background-color}*/; - box-shadow: inset 0px 0px 3px #cccccc /*{global-active-background-color}*/, 0px 0px 9px #cccccc /*{global-active-background-color}*/; + -moz-box-shadow: inset 0 0 3px #ffffff /*{global-active-background-color}*/, 0 0 9px #ffffff /*{global-active-background-color}*/; + -webkit-box-shadow: inset 0 0 3px #ffffff /*{global-active-background-color}*/, 0 0 9px #ffffff /*{global-active-background-color}*/; + box-shadow: inset 0 0 3px #ffffff /*{global-active-background-color}*/, 0 0 9px #ffffff /*{global-active-background-color}*/; } .ui-input-text.ui-focus, .ui-input-search.ui-focus { - -moz-box-shadow: 0px 0px 12px #cccccc /*{global-active-background-color}*/; - -webkit-box-shadow: 0px 0px 12px #cccccc /*{global-active-background-color}*/; - box-shadow: 0px 0px 12px #cccccc /*{global-active-background-color}*/; + -moz-box-shadow: 0 0 12px #ffffff /*{global-active-background-color}*/; + -webkit-box-shadow: 0 0 12px #ffffff /*{global-active-background-color}*/; + box-shadow: 0 0 12px #ffffff /*{global-active-background-color}*/; } - /* unset box shadow in browsers that don't do it right -----------------------------------------------------------------------------------------------------------*/ - .ui-mobile-nosupport-boxshadow * { -moz-box-shadow: none !important; -webkit-box-shadow: none !important; box-shadow: none !important; } - /* ...and bring back focus */ .ui-mobile-nosupport-boxshadow .ui-focus, .ui-mobile-nosupport-boxshadow .ui-btn:focus, @@ -1020,4 +1073,3 @@ outline-width: 1px; outline-style: auto; } - \ No newline at end of file https://bitbucket.org/virtualcommons/vcweb/commits/c3d1a600b2a3/ Changeset: c3d1a600b2a3 User: RoleeSinha Date: 2013-05-13 22:56:47 Summary: adding activity completed popup dialog Affected #: 1 file diff -r 4a2e959b8d91a9d8129440123d511e89f0245249 -r c3d1a600b2a37c1ae939d94b18a3426759b15cfe vcweb/lighterprints/static/js/lighterprints/mobile/controller.js --- a/vcweb/lighterprints/static/js/lighterprints/mobile/controller.js +++ b/vcweb/lighterprints/static/js/lighterprints/mobile/controller.js @@ -4,18 +4,20 @@ model.hasGroupActivity = ko.computed(function(){ return model.groupActivity().length > 0; }); - model.groupActivityTemplate = function(groupActivity) { + model.groupActivityTemplate = function(groupActivity){ return groupActivity.parameter_name(); }; - model.teamActivity = ko.computed(function() { - return ko.utils.arrayFilter(model.groupActivity(), function(groupActivity) { + model.teamActivity = ko.computed(function(){ + return ko.utils.arrayFilter(model.groupActivity(), function(groupActivity){ return groupActivity.parameter_name().indexOf("chat_message") != 0; }); }); - model.chatMessages = ko.computed(function() { - return ko.utils.arrayFilter(model.groupActivity(), function(groupActivity) { return groupActivity.parameter_name().indexOf("chat_message") === 0 }); + model.chatMessages = ko.computed(function(){ + return ko.utils.arrayFilter(model.groupActivity(), function(groupActivity){ + return groupActivity.parameter_name().indexOf("chat_message") === 0 }); - model.hasChatMessages = ko.computed(function() { + }); + model.hasChatMessages = ko.computed(function(){ return model.chatMessages().length > 0; }); model.lockedChallenges = ko.computed(function(){ @@ -36,53 +38,58 @@ model.hasAvailableActivities = ko.computed(function(){ return model.availableActivities().length > 0; }); - model.lastPerformedActivity = ko.observable(); - - model.perform = function(challengeModel){ + model.lastPerformedActivity = ko.observable(); + + model.perform = function(challengeModel){ if (!challengeModel.availableNow()) { console.debug("tried to perform an activity that's not available right now"); console.debug(challengeModel); return; } var id = challengeModel.pk(); - var formData = { - participant_group_id: model.participantGroupId(), activity_id:id - }; + var formData = { + participant_group_id: model.participantGroupId(), + activity_id: id + }; $.post('/lighterprints/api/do-activity', formData, function(data){ if (data.success) { - console.debug(data); + console.debug(data); ko.mapping.fromJSON(data.viewModel, model); - model.lastPerformedActivity(challengeModel); - console.debug('refreshing lists'); - $('#challengesList').listview('refresh'); - $('#teamList').listview('refresh'); - $('#teamActivityList').listview('refresh'); + model.lastPerformedActivity(challengeModel); + $("#popupDialog").popup('open'); + console.debug('refreshing lists'); + $('#challengesList').listview('refresh'); + $('#teamList').listview('refresh'); + $('#teamActivityList').listview('refresh'); } else { console.debug("ERROR: " + data.message); } }); }; - - model.send = function(){ - - if ($('#chatText').val()) { - var formData = {participant_group_id: model.participantGroupId(), message:$('#chatText').val()}; - $.post('/lighterprints/api/message', formData, function(response){ - if (response.success) { - console.debug("successful post - updated view model: "); - ko.mapping.fromJS(response.viewModel, model); - console.debug('refresh chatMessage List'); - $('#chatMessageList').listview('refresh'); - } - else { - console.debug("unable to post message to server"); - console.debug(response); - } - }); - $('#chatText').val(''); - } - }; - + + model.send = function(){ + + if ($('#chatText').val()) { + var formData = { + participant_group_id: model.participantGroupId(), + message: $('#chatText').val() + }; + $.post('/lighterprints/api/message', formData, function(response){ + if (response.success) { + console.debug("successful post - updated view model: "); + ko.mapping.fromJS(response.viewModel, model); + console.debug('refresh chatMessage List'); + $('#chatMessageList').listview('refresh'); + } + else { + console.debug("unable to post message to server"); + console.debug(response); + } + }); + $('#chatText').val(''); + } + }; + return model; -} \ No newline at end of file +} https://bitbucket.org/virtualcommons/vcweb/commits/4ffdcabfd6d0/ Changeset: 4ffdcabfd6d0 User: RoleeSinha Date: 2013-05-13 23:00:42 Summary: adding activity completed popup dialog Affected #: 1 file diff -r c3d1a600b2a37c1ae939d94b18a3426759b15cfe -r 4ffdcabfd6d0a169a506af4b5dea4ddc1d76d5e1 vcweb/lighterprints/static/js/lighterprints/mobile/controller.js --- a/vcweb/lighterprints/static/js/lighterprints/mobile/controller.js +++ b/vcweb/lighterprints/static/js/lighterprints/mobile/controller.js @@ -56,7 +56,7 @@ console.debug(data); ko.mapping.fromJSON(data.viewModel, model); model.lastPerformedActivity(challengeModel); - $("#popupDialog").popup('open'); + $("#activityCompletedDialog").popup('open'); console.debug('refreshing lists'); $('#challengesList').listview('refresh'); $('#teamList').listview('refresh'); https://bitbucket.org/virtualcommons/vcweb/commits/cb32ba09f9ca/ Changeset: cb32ba09f9ca User: RoleeSinha Date: 2013-05-13 23:02:02 Summary: adding activity completed popup dialog Affected #: 1 file diff -r 4ffdcabfd6d0a169a506af4b5dea4ddc1d76d5e1 -r cb32ba09f9ca136ee324e80286af223f06144be8 vcweb/lighterprints/templates/lighterprints/mobile/index.html --- a/vcweb/lighterprints/templates/lighterprints/mobile/index.html +++ b/vcweb/lighterprints/templates/lighterprints/mobile/index.html @@ -131,8 +131,7 @@ </script><script type='text/html' id='challenges-template'><li data-icon="false"> - - <a href="#" data-bind='css: status, click: $root.perform'> + <a href="#" data-bind='css: status, click: $root.perform'><span data-bind='if: availableNow'>Perform</span><span data-bind='if: completed'>Completed <span class='icon-check'></span></span><span data-bind='if: expired'>Expired <span class='icon-warning-sign'></span></span> @@ -178,20 +177,20 @@ <img width="30px" height="30px" src="https://vcweb.asu.edu/static/images/lighterprints/logo.png" alt="footprint logo">lighter<strong style="color:#b9ed2e;">footprints</strong><a href="#defaultpanel" class="ui-btn-right" data-role="button" data-inline="true" data-iconpos="notext" data-theme="a" data-icon="align-justify"></a></div> - <div data-role="content"> + <div data-role="content" data-theme="d"><h2><span class="icon-gauge"></span> Team Dashboard <div class="ui-bar"></div><div class="ui-grid-a" data-inset="true"><div class="ui-block-a"> - <div class="ui-bar ui-bar-d" style="height:70px"> + <div class="ui-bar ui-bar-e" style="height:70px"> Today's Score <br><span data-bind="text: averagePoints"></span></div></div><div class="ui-block-b"> - <div class="ui-bar ui-bar-d" style="height:70px"> + <div class="ui-bar ui-bar-e" style="height:70px"> Current Level <div data-bind='if: experimentCompleted'><img alt='Experiment Completed' class='group-level' width='120' height='70' src='https://vcweb.asu.edu/static/images/lighterprints/experiment-completed.png'> @@ -204,7 +203,7 @@ </div><!-- /grid-a --><div class="ui-grid-a"><div class="ui-block-a"> - <div class="ui-bar ui-bar-d" style="height:70px"> + <div class="ui-bar ui-bar-e" style="height:70px"> Today's Progress <br> Your group progress: <span data-bind="text: averagePoints"></span> @@ -212,7 +211,7 @@ </div></div><div class="ui-block-b"> - <div class="ui-bar ui-bar-d" style="height:70px"> + <div class="ui-bar ui-bar-e" style="height:70px"> Time Remaining <table><tr> @@ -276,6 +275,21 @@ lighter<strong>footprints</strong></div></div> + <div data-role="popup" id="activityCompletedDialog" data-overlay-theme="a" data-theme="c" class="ui-corner-all"> + <div data-role="header" data-theme="a" class="ui-corner-top"> + <h1>Performing Challenge...</h1> + </div> + <div data-role="content" data-theme="d" class="ui-corner-bottom ui-content"> + <div data-bind='with: lastPerformedActivity'> + <img alt='Lighterprints Activity Badge' data-bind='attr: {src: "/static/images/lighterprints/badges/" + name() + ".png" }'> + <h3>You completed a challenge!</h3> + <p><strong><em data-bind='text: display_name'></em></strong> for <span class='lighterprints-green' data-bind='text: points'></span><i class='icon-leaf lighterprints-green'></i> + </p> + <p data-bind='text: summary'></p> + </div> + <a href="#" data-role="button" data-inline="true" data-rel="back" data-theme="c">Continue</a> + </div> + </div></div><!-- /page dashboardPage--><!-- Start of #dashboardLockedChallengePage --><!-- /page dashboardLockedChallengePage--><!-- Start of first page: #challengesPage --> @@ -291,7 +305,7 @@ <img width="30px" height="30px" src="https://vcweb.asu.edu/static/images/lighterprints/logo.png" alt="footprint logo">lighter<strong style="color:#b9ed2e;">footprints</strong><a href="#defaultpanel" class="ui-btn-right" data-role="button" data-inline="true" data-iconpos="notext" data-theme="a" data-icon="align-justify"></a></div> - <div data-role="content" id="myTeam"> + <div data-role="content" data-theme="d"><h2><span class="icon-comment"></span> My Team</h2><div class="ui-bar-d"><div data-bind="ifnot: hasChatMessages() " data-inset="true"> @@ -340,7 +354,7 @@ <img width="30px" height="30px" src="https://vcweb.asu.edu/static/images/lighterprints/logo.png" alt="footprint logo">lighter<strong style="color:#b9ed2e;">footprints</strong><a href="#defaultpanel" class="ui-btn-right" data-role="button" data-inline="true" data-iconpos="notext" data-theme="a" data-icon="align-justify"></a></div> - <div data-role="content"> + <div data-role="content" data-theme="d"><h2><span class="icon-question"></span> Help</h2><div class="ui-bar-d" data-inset="true"><h2>Instructions</h2> @@ -416,7 +430,7 @@ <div data-role="controlgroup" data-type="horizontal" data-theme="b"><a href="#dashboardPage" data-theme="b"> Dashboard</a><a href="#challengesPage"> Challenges</a> - <a href="#myTeam"> My Team</a> + <a href="#myTeamPage"> My Team</a><a href="#"> Help</a></div> 2013 Arizona Board Of Regents @@ -427,26 +441,6 @@ </div></div></div> - <!-- /page helpPage--><!-- Start of page: #modalPage --> - <div data-role="page" id="modalPage"> - <div data-role="header" data-theme="b"> - <h1></h1> - </div> - <div data-role="content"> - <div id='activityPerformedModalText' data-bind='with: lastPerformedActivity'> - <img alt='Lighterprints Activity Badge' data-bind='attr: {src: "https://vcweb.asu.edu/static/images/lighterprints/badges/" + name() + ".png" }'> - <h3>You completed a challenge!</h3> - <p> - <strong><em data-bind='text: display_name'></em></strong> - for <span class='lighterprints-green' data-bind='text: points'></span> - <i class='icon-leaf lighterprints-green'></i> - </p> - <p data-bind='text: summary'> - </p> - <a href="#" data-role="button" data-rel="back" data-theme="b">OK</a> - </div> - </div> - </div> - <!-- /page modalPage--> + <!-- /page helpPage--></body></html> https://bitbucket.org/virtualcommons/vcweb/commits/96d0ebc11b9c/ Changeset: 96d0ebc11b9c User: RoleeSinha Date: 2013-05-13 23:08:22 Summary: fixing styling Affected #: 1 file Diff not available. Repository URL: https://bitbucket.org/virtualcommons/vcweb/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. |
|
From: <com...@bi...> - 2013-05-09 00:07:51
|
2 new commits in vcweb: https://bitbucket.org/virtualcommons/vcweb/commits/b0e9667b02ec/ Changeset: b0e9667b02ec User: RoleeSinha Date: 2013-05-09 02:06:19 Summary: fixing activity perform Affected #: 1 file diff -r 9c412a5a7bd601765617a3ec7a9084c55fb90e05 -r b0e9667b02ecb79148890658d21ee9f9de4a925d vcweb/lighterprints/templates/lighterprints/mobile/index.html --- a/vcweb/lighterprints/templates/lighterprints/mobile/index.html +++ b/vcweb/lighterprints/templates/lighterprints/mobile/index.html @@ -28,34 +28,20 @@ $("#submitChatMessage").click(function(event){ event.preventDefault(); - if ($('#chatText').val()) { - var formData = $('#chat-form').serialize(); - $.post('/lighterprints/api/message', formData, function(response){ - if (response.success) { - console.debug("successful post - updated view model: "); - ko.mapping.fromJS(response.viewModel, globalViewModel); - console.debug('refresh chatMessage List'); - $('#chatMessageList').listview('refresh'); - } - else { - console.debug("unable to post message to server"); - console.debug(response); - } - }); - $('#chatText').val(''); - } - else { - console.debug("No message found!"); - } }); - $("#dashboardPage").on('pageinit', function(event){ - console.debug('dashboardPage pageinit'); + $("#dashboardPage").on('pagebeforeshow', function(event){ + console.debug('dashboardPage pageshow'); $('#challengesList').listview('refresh'); $('#teamList').listview('refresh'); $('#teamActivityList').listview('refresh'); }); + $("#myTeamPage").on('pagebeforeshow', function(event){ + console.debug('chatMessageList pageshow'); + $('#chatMessageList').listview('refresh'); + }); + }); </script><!-- knockout templates --> @@ -163,6 +149,14 @@ </a></li></script> + <script type='text/html' id='leaderboard-template'> + <li> + <strong>#<span data-bind="text:$index() + 1"></span></strong> + <span data-bind='css: { "bold lighterprints-blue": groupName() == $root.groupName()}'> + <span data-bind="text: groupName"></span> + </span> + </li> + </script><script type='text/html' id='no-group-activity-template'> Your group has not had any activity yet. You can <a href='#dashboardPage'>perform challenges in your dashboard</a> or post messages in the <a href='#myTeamPage'>the group wall</a> @@ -252,13 +246,7 @@ </div></h2><h2><span class="icon-trophy text-gold "></span> Leaderboard <div class="ui-bar-d"> - <ul id="teamList" data-role="listview" data-bind="foreach: groupData" data-inset="true" data-theme="b"> - <li> - <strong>#<span data-bind="text:$index() + 1"></span></strong> - <span data-bind='css: { "bold lighterprints-blue": groupName() == $root.groupName()}'> - <span data-bind="text: groupName"></span> - </span> - </li> + <ul id="teamList" data-role="listview" data-bind="template: {name:'leaderboard-template', foreach: groupData}" data-inset="true" data-theme="b"></ul></div></h2><h2><span class="icon-user"></span> Team Activity @@ -320,7 +308,7 @@ <form id="chat-form"><div data-role="fieldcontain" class="innerblock"><input type="hidden" name="participant_group_id" value='{{participant_group_relationship.id}}'><input type="text" id="chatText" name="message" placeholder="Send a message to your group"> - </div><a href="#" data-role="button" id="submitChatMessage" type="submit">Send</a> + </div><a href="#" data-role="button" data-bind='click: $root.send'>Send</a></form></div></div> https://bitbucket.org/virtualcommons/vcweb/commits/df7023bb5d57/ Changeset: df7023bb5d57 User: RoleeSinha Date: 2013-05-09 02:06:27 Summary: fixing activity perform Affected #: 1 file diff -r b0e9667b02ecb79148890658d21ee9f9de4a925d -r df7023bb5d576a581141534fa1d26c963b964306 vcweb/lighterprints/static/js/lighterprints/mobile/controller.js --- a/vcweb/lighterprints/static/js/lighterprints/mobile/controller.js +++ b/vcweb/lighterprints/static/js/lighterprints/mobile/controller.js @@ -63,6 +63,26 @@ } }); }; + + model.send = function(){ + + if ($('#chatText').val()) { + var formData = {participant_group_id: model.participantGroupId(), message:$('#chatText').val()}; + $.post('/lighterprints/api/message', formData, function(response){ + if (response.success) { + console.debug("successful post - updated view model: "); + ko.mapping.fromJS(response.viewModel, model); + console.debug('refresh chatMessage List'); + $('#chatMessageList').listview('refresh'); + } + else { + console.debug("unable to post message to server"); + console.debug(response); + } + }); + $('#chatText').val(''); + } + }; return model; } \ No newline at end of file Repository URL: https://bitbucket.org/virtualcommons/vcweb/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. |
|
From: <com...@bi...> - 2013-05-08 22:47:09
|
2 new commits in vcweb: https://bitbucket.org/virtualcommons/vcweb/commits/3024a734666d/ Changeset: 3024a734666d User: RoleeSinha Date: 2013-05-09 00:46:39 Summary: fixing activity perform Affected #: 1 file diff -r 889250745f4692fe6fdf33187160b83c51590aa8 -r 3024a734666df49b5cd53d3e3adef986aa965ce5 vcweb/lighterprints/static/js/lighterprints/mobile/controller.js --- a/vcweb/lighterprints/static/js/lighterprints/mobile/controller.js +++ b/vcweb/lighterprints/static/js/lighterprints/mobile/controller.js @@ -53,6 +53,7 @@ console.debug(data); ko.mapping.fromJSON(data.viewModel, model); model.lastPerformedActivity(challengeModel); + console.debug('refreshing lists'); $('#challengesList').listview('refresh'); $('#teamList').listview('refresh'); $('#teamActivityList').listview('refresh'); https://bitbucket.org/virtualcommons/vcweb/commits/9c412a5a7bd6/ Changeset: 9c412a5a7bd6 User: RoleeSinha Date: 2013-05-09 00:46:47 Summary: fixing activity perform Affected #: 1 file diff -r 3024a734666df49b5cd53d3e3adef986aa965ce5 -r 9c412a5a7bd601765617a3ec7a9084c55fb90e05 vcweb/lighterprints/templates/lighterprints/mobile/index.html --- a/vcweb/lighterprints/templates/lighterprints/mobile/index.html +++ b/vcweb/lighterprints/templates/lighterprints/mobile/index.html @@ -49,18 +49,13 @@ } }); - $("#dashboardPage").on('pagebeforeshow', function(event){ - console.debug('dashboardPage pageshow'); + $("#dashboardPage").on('pageinit', function(event){ + console.debug('dashboardPage pageinit'); $('#challengesList').listview('refresh'); $('#teamList').listview('refresh'); $('#teamActivityList').listview('refresh'); }); - $("#myTeamPage").on('pagebeforeshow', function(event){ - console.debug('dashboardPage pageshow'); - $('#chatMessageList').listview('refresh'); - }); - }); </script><!-- knockout templates --> @@ -299,7 +294,7 @@ <!-- /page lockedChallengePage--><!-- Start of page: #myTeamPage --><div data-role="page" id="myTeamPage" class="ui-responsive-panel"><div data-role="panel" id="defaultpanel" data-theme="b" data-position="left" data-display="overlay" data-dismissible="true" > - <a href="#dashboardPage" data-theme="c" data-role="button" class="innerbutton"><h2><span class="icon-gauge"></span> Dashboard</h2></a> + <a href="#dashboardPage" reloadPage="true" data-theme="c" data-role="button" class="innerbutton"><h2><span class="icon-gauge"></span> Dashboard</h2></a><a href="#challengesPage" data-theme="c" data-role="button" class="innerbutton"><h2><span class="icon-star"></span> Challenges</h2></a><a href="#" data-theme="c" data-role="button" class="innerbutton"><h2><span class="icon-user"></span> My Team</h2></a><a href="#helpPage" data-theme="c" data-role="button" class="innerbutton"><h2><span class="icon-question"></span> Help</h2></a> @@ -317,19 +312,8 @@ <div data-bind="if: hasChatMessages()"><ul id="chatMessageList" data-role="listview" data-bind="foreach: chatMessages" data-inset="true" style="overflow-y: scroll;"><li> - <div class="ui-grid-d"> - <div class="ui-block-a"> - <i class='icon-user icon-2x'></i> - </div> - <div class="ui-block-b"> - <span>Participant <span data-bind="text: participant_number"></span>: <span data-bind="text: value"></span> - </div> - <div class="ui-block-c"></div> - <div class="ui-block-d"></div> - <div class="ui-block-e"> - <span data-bind="text: date_created"></span><br> ago - </div> - </div + <span>Participant <span data-bind="text: participant_number"></span>: <span data-bind="text: value"></span> + <span data-bind="text: date_created"></span><br> ago </li></ul></div> Repository URL: https://bitbucket.org/virtualcommons/vcweb/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. |
|
From: <com...@bi...> - 2013-05-08 22:26:35
|
1 new commit in vcweb: https://bitbucket.org/virtualcommons/vcweb/commits/889250745f46/ Changeset: 889250745f46 User: RoleeSinha Date: 2013-05-09 00:26:12 Summary: fixing activity perform Affected #: 1 file diff -r 3c80b09b2a402a617ea8a62db7f6c5fdf425c237 -r 889250745f4692fe6fdf33187160b83c51590aa8 vcweb/lighterprints/templates/lighterprints/mobile/index.html --- a/vcweb/lighterprints/templates/lighterprints/mobile/index.html +++ b/vcweb/lighterprints/templates/lighterprints/mobile/index.html @@ -181,7 +181,7 @@ <div data-role="panel" id="defaultpanel" data-theme="b" data-position="left" data-display="overlay" data-dismissible="true" ><a href="#" data-theme="c" data-role="button" class="innerbutton"><h2><span class="icon-gauge"></span> Dashboard</h2></a><a href="#challengesPage" data-theme="c" data-role="button" class="innerbutton"><h2><span class="icon-star"></span> Challenges</h2></a> - <a href="#myTeamPage" data-theme="c" data-role="button" class="innerbutton"><h2><span class="icon-user"></span> My Team</h2></a> + <a href="#myTeamPage" reloadPage="true" data-theme="c" data-role="button" class="innerbutton"><h2><span class="icon-user"></span> My Team</h2></a><a href="#helpPage" data-theme="c" data-role="button" class="innerbutton"><h2><span class="icon-question"></span> Help</h2></a></div><!-- /defaultpanel --> Repository URL: https://bitbucket.org/virtualcommons/vcweb/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. |
|
From: <com...@bi...> - 2013-05-08 22:23:27
|
1 new commit in vcweb: https://bitbucket.org/virtualcommons/vcweb/commits/3c80b09b2a40/ Changeset: 3c80b09b2a40 User: RoleeSinha Date: 2013-05-09 00:22:55 Summary: fixing activity perform Affected #: 1 file diff -r 16b5761bc96537db103954875babf07371e1535d -r 3c80b09b2a402a617ea8a62db7f6c5fdf425c237 vcweb/lighterprints/templates/lighterprints/mobile/index.html --- a/vcweb/lighterprints/templates/lighterprints/mobile/index.html +++ b/vcweb/lighterprints/templates/lighterprints/mobile/index.html @@ -51,6 +51,9 @@ $("#dashboardPage").on('pagebeforeshow', function(event){ console.debug('dashboardPage pageshow'); + $('#challengesList').listview('refresh'); + $('#teamList').listview('refresh'); + $('#teamActivityList').listview('refresh'); }); $("#myTeamPage").on('pagebeforeshow', function(event){ Repository URL: https://bitbucket.org/virtualcommons/vcweb/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. |
|
From: <com...@bi...> - 2013-05-08 22:19:02
|
2 new commits in vcweb: https://bitbucket.org/virtualcommons/vcweb/commits/135598656053/ Changeset: 135598656053 User: RoleeSinha Date: 2013-05-09 00:18:35 Summary: fixing activity perform Affected #: 1 file diff -r c234655828a9d18422ea87a85276a8f17e720d0e -r 135598656053a0096cb9cb0af3f5de670b9d9f15 vcweb/lighterprints/templates/lighterprints/mobile/index.html --- a/vcweb/lighterprints/templates/lighterprints/mobile/index.html +++ b/vcweb/lighterprints/templates/lighterprints/mobile/index.html @@ -34,6 +34,7 @@ if (response.success) { console.debug("successful post - updated view model: "); ko.mapping.fromJS(response.viewModel, globalViewModel); + console.debug('refresh chatMessage List'); $('#chatMessageList').listview('refresh'); } else { @@ -50,9 +51,11 @@ $("#dashboardPage").on('pagebeforeshow', function(event){ console.debug('dashboardPage pageshow'); - $('#challengesList').listview('refresh'); - $('#teamList').listview('refresh'); - $('#teamActivityList').listview('refresh'); + }); + + $("#myTeamPage").on('pagebeforeshow', function(event){ + console.debug('dashboardPage pageshow'); + $('#chatMessageList').listview('refresh'); }); }); @@ -465,7 +468,7 @@ </p><p data-bind='text: summary'></p> - <a href="index.html" data-role="button" data-rel="back" data-theme="b">OK</a> + <a href="#" data-role="button" data-rel="back" data-theme="b">OK</a></div></div></div> https://bitbucket.org/virtualcommons/vcweb/commits/16b5761bc965/ Changeset: 16b5761bc965 User: RoleeSinha Date: 2013-05-09 00:18:42 Summary: fixing activity perform Affected #: 1 file diff -r 135598656053a0096cb9cb0af3f5de670b9d9f15 -r 16b5761bc96537db103954875babf07371e1535d vcweb/lighterprints/static/js/lighterprints/mobile/controller.js --- a/vcweb/lighterprints/static/js/lighterprints/mobile/controller.js +++ b/vcweb/lighterprints/static/js/lighterprints/mobile/controller.js @@ -54,7 +54,8 @@ ko.mapping.fromJSON(data.viewModel, model); model.lastPerformedActivity(challengeModel); $('#challengesList').listview('refresh'); - //$.mobile.changePage('/lighterprints/modal',{transition: 'pop', role: 'dialog'}); + $('#teamList').listview('refresh'); + $('#teamActivityList').listview('refresh'); } else { console.debug("ERROR: " + data.message); Repository URL: https://bitbucket.org/virtualcommons/vcweb/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. |
|
From: <com...@bi...> - 2013-05-08 22:01:07
|
2 new commits in vcweb: https://bitbucket.org/virtualcommons/vcweb/commits/8aa16acd3763/ Changeset: 8aa16acd3763 User: RoleeSinha Date: 2013-05-09 00:00:34 Summary: fixing activity perform Affected #: 1 file diff -r 53fcea81949f2188031487cfbeca4c9bd13a7fa6 -r 8aa16acd376365af6fd6c9e5410dd2c45a4d1991 vcweb/lighterprints/static/js/lighterprints/mobile/controller.js --- a/vcweb/lighterprints/static/js/lighterprints/mobile/controller.js +++ b/vcweb/lighterprints/static/js/lighterprints/mobile/controller.js @@ -53,6 +53,7 @@ console.debug(data); ko.mapping.fromJSON(data.viewModel, model); model.lastPerformedActivity(challengeModel); + $('#challengesList').listview('refresh'); //$.mobile.changePage('/lighterprints/modal',{transition: 'pop', role: 'dialog'}); } else { https://bitbucket.org/virtualcommons/vcweb/commits/c234655828a9/ Changeset: c234655828a9 User: RoleeSinha Date: 2013-05-09 00:00:51 Summary: fixing activity perform Affected #: 1 file diff -r 8aa16acd376365af6fd6c9e5410dd2c45a4d1991 -r c234655828a9d18422ea87a85276a8f17e720d0e vcweb/lighterprints/templates/lighterprints/mobile/index.html --- a/vcweb/lighterprints/templates/lighterprints/mobile/index.html +++ b/vcweb/lighterprints/templates/lighterprints/mobile/index.html @@ -465,7 +465,7 @@ </p><p data-bind='text: summary'></p> - <a href="index.html" reloadPage="true" data-role="button" data-theme="b">OK</a> + <a href="index.html" data-role="button" data-rel="back" data-theme="b">OK</a></div></div></div> Repository URL: https://bitbucket.org/virtualcommons/vcweb/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. |
|
From: <com...@bi...> - 2013-05-08 21:56:06
|
1 new commit in vcweb: https://bitbucket.org/virtualcommons/vcweb/commits/53fcea81949f/ Changeset: 53fcea81949f User: RoleeSinha Date: 2013-05-08 23:55:49 Summary: fixing activity perform dialog Affected #: 1 file diff -r 64783465d8a24d4aa6db76e19b43d123d4567c8a -r 53fcea81949f2188031487cfbeca4c9bd13a7fa6 vcweb/lighterprints/static/js/lighterprints/mobile/controller.js --- a/vcweb/lighterprints/static/js/lighterprints/mobile/controller.js +++ b/vcweb/lighterprints/static/js/lighterprints/mobile/controller.js @@ -53,7 +53,7 @@ console.debug(data); ko.mapping.fromJSON(data.viewModel, model); model.lastPerformedActivity(challengeModel); - $.mobile.changePage('/lighterprints/modal',{transition: 'pop', role: 'dialog'}); + //$.mobile.changePage('/lighterprints/modal',{transition: 'pop', role: 'dialog'}); } else { console.debug("ERROR: " + data.message); Repository URL: https://bitbucket.org/virtualcommons/vcweb/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. |
|
From: <com...@bi...> - 2013-05-08 21:54:00
|
1 new commit in vcweb: https://bitbucket.org/virtualcommons/vcweb/commits/64783465d8a2/ Changeset: 64783465d8a2 User: RoleeSinha Date: 2013-05-08 23:53:43 Summary: fixing activity perform dialog Affected #: 1 file diff -r bcd4a8af6d9db2e36ec35b6b7c6b5d5d5f102609 -r 64783465d8a24d4aa6db76e19b43d123d4567c8a vcweb/lighterprints/static/js/lighterprints/mobile/controller.js --- a/vcweb/lighterprints/static/js/lighterprints/mobile/controller.js +++ b/vcweb/lighterprints/static/js/lighterprints/mobile/controller.js @@ -53,8 +53,7 @@ console.debug(data); ko.mapping.fromJSON(data.viewModel, model); model.lastPerformedActivity(challengeModel); - $.mobile.changePage("/lighterprints/mobile",{reloadPage:'true'}); - //$.mobile.changePage($("#modalPage"),{transition: 'pop', role: 'dialog'}); + $.mobile.changePage('/lighterprints/modal',{transition: 'pop', role: 'dialog'}); } else { console.debug("ERROR: " + data.message); Repository URL: https://bitbucket.org/virtualcommons/vcweb/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. |
|
From: <com...@bi...> - 2013-05-08 21:51:47
|
1 new commit in vcweb: https://bitbucket.org/virtualcommons/vcweb/commits/bcd4a8af6d9d/ Changeset: bcd4a8af6d9d User: RoleeSinha Date: 2013-05-08 23:51:28 Summary: fixing activity perform dialog Affected #: 1 file diff -r 7cbcb3cbb6f1c4f9253e1efe30189173108ac2f1 -r bcd4a8af6d9db2e36ec35b6b7c6b5d5d5f102609 vcweb/lighterprints/templates/lighterprints/mobile/modal.html --- /dev/null +++ b/vcweb/lighterprints/templates/lighterprints/mobile/modal.html @@ -0,0 +1,45 @@ +{% load static from staticfiles %} +<!DOCTYPE html> +<html> + <head> + <title>Lighter Footprints</title> + <meta name="viewport" content="width=device-width, initial-scale=1"> + <link rel="stylesheet" href="{% static 'css/lighterprints/mobile/themeroller.css' %}" /> + <link rel="stylesheet" href="//ajax.aspnetcdn.com/ajax/jquery.mobile/1.3.0/jquery.mobile.structure-1.3.0.min.css" /> + <link rel="stylesheet" href="{% static 'css/lighterprints/font-awesome/jqm-icon-pack-3.0.0-fa.css' %}"/> + <link rel="stylesheet" href="{% static 'css/lighterprints/icons.css' %}" /> + <link rel="stylesheet" href="{% static 'css/lighterprints/mobile/style.css' %}"/> + {% with jquery_version="1.8.3" %} + <script src='//ajax.googleapis.com/ajax/libs/jquery/{{jquery_version}}/jquery.min.js'></script> + {% endwith %} + <script src="//ajax.aspnetcdn.com/ajax/jquery.mobile/1.3.0/jquery.mobile-1.3.0.min.js"> + </script> + <!-- KnockoutJS for MVVM--> + <script src='{% static "js/ko/knockout.min.js" %}'></script> + <script src='{% static "js/ko/knockout.mapping.min.js" %}'></script> + <!--Local JS--> + <script src='{% static "js/lighterprints/mobile/controller.js" %}'> + </script> + </head> + <body> + <div data-role="page"> + <div data-role="header" data-theme="b"> + <h1></h1> + </div> + <div data-role="content"> + <div id='activityPerformedModalText' data-bind='with: lastPerformedActivity'> + <img alt='Lighterprints Activity Badge' data-bind='attr: {src: "https://vcweb.asu.edu/static/images/lighterprints/badges/" + name() + ".png" }'> + <h3>You completed a challenge!</h3> + <p> + <strong><em data-bind='text: display_name'></em></strong> + for <span class='lighterprints-green' data-bind='text: points'></span> + <i class='icon-leaf lighterprints-green'></i> + </p> + <p data-bind='text: summary'> + </p> + <a href="/lighterprints/mobile" data-role="button" reloadPage="true" data-theme="b">OK</a> + </div> + </div> + </div> + </body> +</html> Repository URL: https://bitbucket.org/virtualcommons/vcweb/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. |
|
From: <com...@bi...> - 2013-05-08 21:41:20
|
1 new commit in vcweb: https://bitbucket.org/virtualcommons/vcweb/commits/7cbcb3cbb6f1/ Changeset: 7cbcb3cbb6f1 User: RoleeSinha Date: 2013-05-08 23:41:05 Summary: fixing activity perform dialog Affected #: 1 file diff -r f761e742e582964d79828a0e67ea3582ae07e5fc -r 7cbcb3cbb6f1c4f9253e1efe30189173108ac2f1 vcweb/lighterprints/static/js/lighterprints/mobile/controller.js --- a/vcweb/lighterprints/static/js/lighterprints/mobile/controller.js +++ b/vcweb/lighterprints/static/js/lighterprints/mobile/controller.js @@ -53,7 +53,7 @@ console.debug(data); ko.mapping.fromJSON(data.viewModel, model); model.lastPerformedActivity(challengeModel); - $.mobile.changePage("index.html",{reloadPage:'true'}); + $.mobile.changePage("/lighterprints/mobile",{reloadPage:'true'}); //$.mobile.changePage($("#modalPage"),{transition: 'pop', role: 'dialog'}); } else { Repository URL: https://bitbucket.org/virtualcommons/vcweb/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. |
|
From: <com...@bi...> - 2013-05-08 21:38:06
|
1 new commit in vcweb: https://bitbucket.org/virtualcommons/vcweb/commits/f761e742e582/ Changeset: f761e742e582 User: RoleeSinha Date: 2013-05-08 23:37:51 Summary: fixing activity perform dialog Affected #: 1 file diff -r 750d71fb9e5d2ffce7f91c688e0d00be22952324 -r f761e742e582964d79828a0e67ea3582ae07e5fc vcweb/lighterprints/static/js/lighterprints/mobile/controller.js --- a/vcweb/lighterprints/static/js/lighterprints/mobile/controller.js +++ b/vcweb/lighterprints/static/js/lighterprints/mobile/controller.js @@ -53,7 +53,8 @@ console.debug(data); ko.mapping.fromJSON(data.viewModel, model); model.lastPerformedActivity(challengeModel); - $.mobile.changePage($("#modalPage"),{transition: 'pop', role: 'dialog'}); + $.mobile.changePage("index.html",{reloadPage:'true'}); + //$.mobile.changePage($("#modalPage"),{transition: 'pop', role: 'dialog'}); } else { console.debug("ERROR: " + data.message); Repository URL: https://bitbucket.org/virtualcommons/vcweb/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. |
|
From: <com...@bi...> - 2013-05-08 21:23:50
|
1 new commit in vcweb: https://bitbucket.org/virtualcommons/vcweb/commits/750d71fb9e5d/ Changeset: 750d71fb9e5d User: RoleeSinha Date: 2013-05-08 23:23:24 Summary: fixing activity perform dialog Affected #: 1 file diff -r 4d59bcc353e4a419a3cddb62307b884c2cf844de -r 750d71fb9e5d2ffce7f91c688e0d00be22952324 vcweb/lighterprints/templates/lighterprints/mobile/index.html --- a/vcweb/lighterprints/templates/lighterprints/mobile/index.html +++ b/vcweb/lighterprints/templates/lighterprints/mobile/index.html @@ -450,15 +450,14 @@ </div></div><!-- /page helpPage--><!-- Start of page: #modalPage --> - <div data-role="page" id="modalPage" data-close-btn="right"> + <div data-role="page" id="modalPage"><div data-role="header" data-theme="b"><h1></h1></div><div data-role="content"><div id='activityPerformedModalText' data-bind='with: lastPerformedActivity'> - <div class='row-fluid pagination-centered'> - <img alt='Lighterprints Activity Badge' data-bind='attr: {src: "https://vcweb.asu.edu/static/images/lighterprints/badges/" + name() + ".png" }'> - </div><h3>You completed a challenge!</h3> + <img alt='Lighterprints Activity Badge' data-bind='attr: {src: "https://vcweb.asu.edu/static/images/lighterprints/badges/" + name() + ".png" }'> + <h3>You completed a challenge!</h3><p><strong><em data-bind='text: display_name'></em></strong> for <span class='lighterprints-green' data-bind='text: points'></span> @@ -466,7 +465,7 @@ </p><p data-bind='text: summary'></p> - <a href="#" data-role="button" data-rel="back" data-theme="b">OK</a> + <a href="index.html" reloadPage="true" data-role="button" data-theme="b">OK</a></div></div></div> Repository URL: https://bitbucket.org/virtualcommons/vcweb/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. |
|
From: <com...@bi...> - 2013-05-07 01:08:59
|
1 new commit in vcweb: https://bitbucket.org/virtualcommons/vcweb/commits/4d59bcc353e4/ Changeset: 4d59bcc353e4 User: RoleeSinha Date: 2013-05-07 03:08:38 Summary: fixing ui Affected #: 1 file diff -r 148723e79fa3dd3b74808b4f49db77bd74dda1d3 -r 4d59bcc353e4a419a3cddb62307b884c2cf844de vcweb/lighterprints/static/js/lighterprints/mobile/controller.js --- a/vcweb/lighterprints/static/js/lighterprints/mobile/controller.js +++ b/vcweb/lighterprints/static/js/lighterprints/mobile/controller.js @@ -48,7 +48,6 @@ var formData = { participant_group_id: model.participantGroupId(), activity_id:id }; - var formData = $('#challengeForm' + id).serialize(); $.post('/lighterprints/api/do-activity', formData, function(data){ if (data.success) { console.debug(data); Repository URL: https://bitbucket.org/virtualcommons/vcweb/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. |
|
From: <com...@bi...> - 2013-05-07 01:06:33
|
1 new commit in vcweb: https://bitbucket.org/virtualcommons/vcweb/commits/148723e79fa3/ Changeset: 148723e79fa3 User: RoleeSinha Date: 2013-05-07 03:06:14 Summary: fixing ui Affected #: 1 file diff -r a92b64f6d840b25ddfdde04f657d3b4c67bcbc1a -r 148723e79fa3dd3b74808b4f49db77bd74dda1d3 vcweb/lighterprints/static/js/lighterprints/mobile/controller.js --- a/vcweb/lighterprints/static/js/lighterprints/mobile/controller.js +++ b/vcweb/lighterprints/static/js/lighterprints/mobile/controller.js @@ -46,7 +46,7 @@ } var id = challengeModel.pk(); var formData = { - participant_group_id: participant_group_id(), activity_id:id + participant_group_id: model.participantGroupId(), activity_id:id }; var formData = $('#challengeForm' + id).serialize(); $.post('/lighterprints/api/do-activity', formData, function(data){ Repository URL: https://bitbucket.org/virtualcommons/vcweb/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. |
|
From: <com...@bi...> - 2013-05-07 01:03:49
|
2 new commits in vcweb: https://bitbucket.org/virtualcommons/vcweb/commits/f977d15984dd/ Changeset: f977d15984dd User: RoleeSinha Date: 2013-05-07 03:03:19 Summary: fixing ui Affected #: 1 file diff -r 1a362b24fe7f47b42ff054ed84ae0cc8490d02e4 -r f977d15984ddfed1461d5b52a08d2c77084c6cbf vcweb/lighterprints/static/js/lighterprints/mobile/controller.js --- a/vcweb/lighterprints/static/js/lighterprints/mobile/controller.js +++ b/vcweb/lighterprints/static/js/lighterprints/mobile/controller.js @@ -45,6 +45,9 @@ return; } var id = challengeModel.pk(); + var formData = { + participant_group_id: participant_group_id(), activity_id:id + }; var formData = $('#challengeForm' + id).serialize(); $.post('/lighterprints/api/do-activity', formData, function(data){ if (data.success) { https://bitbucket.org/virtualcommons/vcweb/commits/a92b64f6d840/ Changeset: a92b64f6d840 User: RoleeSinha Date: 2013-05-07 03:03:28 Summary: fixing ui Affected #: 1 file diff -r f977d15984ddfed1461d5b52a08d2c77084c6cbf -r a92b64f6d840b25ddfdde04f657d3b4c67bcbc1a vcweb/lighterprints/templates/lighterprints/mobile/index.html --- a/vcweb/lighterprints/templates/lighterprints/mobile/index.html +++ b/vcweb/lighterprints/templates/lighterprints/mobile/index.html @@ -89,6 +89,8 @@ </small></div></div> + <div data-bind='template: "likeCommentTemplate"'> + </div></span></li></script> @@ -142,26 +144,22 @@ </script><script type='text/html' id='challenges-template'><li data-icon="false"> - <div class='span2'> - <img style='padding: 10px 0 0 20px;' data-bind='attr: {src: "/static/images/lighterprints/badges/" + name() + ".png" }'> - </div> - <div class='span4'> - <h4 class='challenge-name' data-bind='css: status, text:display_name'></h4> - <p> - <span data-bind='css: status, text: summary'></span> - </p> - <form data-bind='attr: { id: "challengeForm" + pk() }' class='form-horizontal' method='post'> - <input data-bind='value: pk' type='hidden' name='activity_id' /> - <input type='hidden' name='participant_group_id' value='{{participant_group_relationship.id}}' /> - <a data-bind='css: status, click: $root.perform' data-role="button"> - <span data-bind='if: availableNow'>Perform</span> - <span data-bind='if: completed'>Completed <i class='icon-check'></i></span> - <span data-bind='if: expired'>Expired <i class='icon-warning-sign'></i></span> - <span data-bind='if: upcoming'>Not yet available <i class='icon-time'></i></span> - <span data-bind='if: locked'>Locked <i class='icon-lock'></i></span> - </a> - - </form> + + <a href="#" data-bind='css: status, click: $root.perform'> + <span data-bind='if: availableNow'>Perform</span> + <span data-bind='if: completed'>Completed <span class='icon-check'></span></span> + <span data-bind='if: expired'>Expired <span class='icon-warning-sign'></span></span> + <span data-bind='if: upcoming'>Not yet available <span class='icon-time'></span></span> + <span data-bind='if: locked'>Locked <span class='icon-lock'></span></span> + <img style='padding: 10px 0 0 20px;' data-bind='attr: {src: "https://vcweb.asu.edu/static/images/lighterprints/badges/" + name() + ".png" }'><h4 class='challenge-name' data-bind='css: status, text:display_name'></h4> + <p> + <span data-bind='css: status, text: summary'></span> + </p> + <h4><span data-bind='text: points'></span><span class='lighterprints-green icon-leaf icon-2x'></span> + <br> + <span data-bind='text: time_slots'></span> + </h4> + </a></li></script><script type='text/html' id='no-group-activity-template'> Repository URL: https://bitbucket.org/virtualcommons/vcweb/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. |
|
From: <com...@bi...> - 2013-05-07 00:53:10
|
1 new commit in vcweb: https://bitbucket.org/virtualcommons/vcweb/commits/1a362b24fe7f/ Changeset: 1a362b24fe7f User: RoleeSinha Date: 2013-05-07 02:52:50 Summary: fixing ui Affected #: 1 file diff -r bc7bc25fe493da21b10f02ce644523cf9f080b6d -r 1a362b24fe7f47b42ff054ed84ae0cc8490d02e4 vcweb/lighterprints/templates/lighterprints/mobile/index.html --- a/vcweb/lighterprints/templates/lighterprints/mobile/index.html +++ b/vcweb/lighterprints/templates/lighterprints/mobile/index.html @@ -89,8 +89,6 @@ </small></div></div> - <div data-bind='template: "likeCommentTemplate"'> - </div></span></li></script> @@ -154,8 +152,8 @@ </p><form data-bind='attr: { id: "challengeForm" + pk() }' class='form-horizontal' method='post'><input data-bind='value: pk' type='hidden' name='activity_id' /> - <input type='hidden' name='participant_group_id' value='1009' /> - <a data-bind='css: status, click: $root.perform' class='btn'> + <input type='hidden' name='participant_group_id' value='{{participant_group_relationship.id}}' /> + <a data-bind='css: status, click: $root.perform' data-role="button"><span data-bind='if: availableNow'>Perform</span><span data-bind='if: completed'>Completed <i class='icon-check'></i></span><span data-bind='if: expired'>Expired <i class='icon-warning-sign'></i></span> Repository URL: https://bitbucket.org/virtualcommons/vcweb/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. |
|
From: <com...@bi...> - 2013-05-07 00:48:00
|
2 new commits in vcweb: https://bitbucket.org/virtualcommons/vcweb/commits/e97353981a39/ Changeset: e97353981a39 User: RoleeSinha Date: 2013-05-07 02:47:22 Summary: fixing ui Affected #: 1 file diff -r a1824fbaacbf8cf348615f433d67bb253d3eb65c -r e97353981a39e286b6859c644aac78d17efb26ec vcweb/lighterprints/static/js/lighterprints/mobile/controller.js --- a/vcweb/lighterprints/static/js/lighterprints/mobile/controller.js +++ b/vcweb/lighterprints/static/js/lighterprints/mobile/controller.js @@ -45,9 +45,7 @@ return; } var id = challengeModel.pk(); - var formData = { - participant_group_id: participant_group_id, activity_id:id - }; + var formData = $('#challengeForm' + id).serialize(); $.post('/lighterprints/api/do-activity', formData, function(data){ if (data.success) { console.debug(data); https://bitbucket.org/virtualcommons/vcweb/commits/bc7bc25fe493/ Changeset: bc7bc25fe493 User: RoleeSinha Date: 2013-05-07 02:47:34 Summary: fixing ui Affected #: 1 file diff -r e97353981a39e286b6859c644aac78d17efb26ec -r bc7bc25fe493da21b10f02ce644523cf9f080b6d vcweb/lighterprints/templates/lighterprints/mobile/index.html --- a/vcweb/lighterprints/templates/lighterprints/mobile/index.html +++ b/vcweb/lighterprints/templates/lighterprints/mobile/index.html @@ -144,21 +144,26 @@ </script><script type='text/html' id='challenges-template'><li data-icon="false"> - <a href="#" data-bind='css: status, click: $root.perform'> - <span data-bind='if: availableNow'>Perform</span> - <span data-bind='if: completed'>Completed <span class='icon-check'></span></span> - <span data-bind='if: expired'>Expired <span class='icon-warning-sign'></span></span> - <span data-bind='if: upcoming'>Not yet available <span class='icon-time'></span></span> - <span data-bind='if: locked'>Locked <span class='icon-lock'></span></span> - <img style='padding: 10px 0 0 20px;' data-bind='attr: {src: "https://vcweb.asu.edu/static/images/lighterprints/badges/" + name() + ".png" }'><h4 class='challenge-name' data-bind='css: status, text:display_name'></h4> - <p> - <span data-bind='css: status, text: summary'></span> - </p> - <h4><span data-bind='text: points'></span><span class='lighterprints-green icon-leaf icon-2x'></span> - <br> - <span data-bind='text: time_slots'></span> - </h4> - </a> + <div class='span2'> + <img style='padding: 10px 0 0 20px;' data-bind='attr: {src: "/static/images/lighterprints/badges/" + name() + ".png" }'> + </div> + <div class='span4'> + <h4 class='challenge-name' data-bind='css: status, text:display_name'></h4> + <p> + <span data-bind='css: status, text: summary'></span> + </p> + <form data-bind='attr: { id: "challengeForm" + pk() }' class='form-horizontal' method='post'> + <input data-bind='value: pk' type='hidden' name='activity_id' /> + <input type='hidden' name='participant_group_id' value='1009' /> + <a data-bind='css: status, click: $root.perform' class='btn'> + <span data-bind='if: availableNow'>Perform</span> + <span data-bind='if: completed'>Completed <i class='icon-check'></i></span> + <span data-bind='if: expired'>Expired <i class='icon-warning-sign'></i></span> + <span data-bind='if: upcoming'>Not yet available <i class='icon-time'></i></span> + <span data-bind='if: locked'>Locked <i class='icon-lock'></i></span> + </a> + + </form></li></script><script type='text/html' id='no-group-activity-template'> Repository URL: https://bitbucket.org/virtualcommons/vcweb/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. |
![https://vcweb.asu.edu/static/images/lighterprints/logo.png"](https://vcweb.asu.edu/static/images/lighterprints/logo.png"){kind=link}
