virtualcommons-svn Mailing List for Virtual Commons Experiment Software (Page 7)
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-07 00:41:13
|
1 new commit in vcweb: https://bitbucket.org/virtualcommons/vcweb/commits/a1824fbaacbf/ Changeset: a1824fbaacbf User: RoleeSinha Date: 2013-05-07 02:40:58 Summary: fixing ui Affected #: 1 file diff -r 373eba6d887474a0d989c6d346b5458b9f5f0642 -r a1824fbaacbf8cf348615f433d67bb253d3eb65c 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,7 +45,9 @@ return; } var id = challengeModel.pk(); - var formData = $('#challengeForm' + id).serialize(); + var formData = { + participant_group_id: participant_group_id, activity_id:id + }; $.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 00:37:29
|
3 new commits in vcweb: https://bitbucket.org/virtualcommons/vcweb/commits/581342a7834a/ Changeset: 581342a7834a User: RoleeSinha Date: 2013-05-07 02:36:34 Summary: fixing ui Affected #: 1 file diff -r ae9824c2e7168d259e2e03bb7617bc0e0c334029 -r 581342a7834aa154b7b6de8e2c43546a0f23a21c 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 = $('#challengeForm' + id).serialize(); - $.post('http://vcweb.asu.edu/lighterprints/api/do-activity', formData, function(data){ + $.post('/lighterprints/api/do-activity', formData, function(data){ if (data.success) { console.debug(data); ko.mapping.fromJSON(data.viewModel, model); https://bitbucket.org/virtualcommons/vcweb/commits/bdaf5c1f8b70/ Changeset: bdaf5c1f8b70 User: RoleeSinha Date: 2013-05-07 02:36:46 Summary: fixing ui Affected #: 1 file diff -r 581342a7834aa154b7b6de8e2c43546a0f23a21c -r bdaf5c1f8b70f427d2d88ab9bdde406c030f1141 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 @@ -101,4 +101,7 @@ color: #fff !important; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.36); -webkit-font-smoothing: antialiased; +} +.text-gold { + color: #DFB03D; } \ No newline at end of file https://bitbucket.org/virtualcommons/vcweb/commits/373eba6d8874/ Changeset: 373eba6d8874 User: RoleeSinha Date: 2013-05-07 02:37:03 Summary: fixing ui Affected #: 1 file diff -r bdaf5c1f8b70f427d2d88ab9bdde406c030f1141 -r 373eba6d887474a0d989c6d346b5458b9f5f0642 vcweb/lighterprints/templates/lighterprints/mobile/index.html --- a/vcweb/lighterprints/templates/lighterprints/mobile/index.html +++ b/vcweb/lighterprints/templates/lighterprints/mobile/index.html @@ -30,7 +30,7 @@ event.preventDefault(); if ($('#chatText').val()) { var formData = $('#chat-form').serialize(); - $.post('http://vcweb.asu.edu/lighterprints/api/message', formData, function(response){ + $.post('/lighterprints/api/message', formData, function(response){ if (response.success) { console.debug("successful post - updated view model: "); ko.mapping.fromJS(response.viewModel, globalViewModel); @@ -163,7 +163,7 @@ </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='#group' data-bind='click:activateGroupTab'>the group wall</a> + or post messages in the <a href='#myTeamPage'>the group wall</a> . </script></head> @@ -231,12 +231,12 @@ </div></div></div></h2> - <h2><span class="icon-star"></span> Challenges + <h2><span class="icon-star "></span> Challenges <div class="ui-bar-d"><div data-role="navbar"><ul id="challengesNavbarList"><li> - <a href="#" class="ui-btn-active"><span class="icon-star"></span> Unlocked</a> + <a href="#" class="ui-btn-active"><span class="icon-star text-gold "></span> Unlocked</a></li><li><a href="#dashboardLockedChallengePage"><span class="icon-lock"></span> Locked</a> @@ -248,13 +248,14 @@ </ul></div></div></h2> - <h2><span class="icon-trophy"></span> Leaderboard + <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="text: groupName"></span> - <span class="ui-li-count" data-bind="text: totalPoints"></span> + <span data-bind='css: { "bold lighterprints-blue": groupName() == $root.groupName()}'> + <span data-bind="text: groupName"></span> + </span></li></ul></div></h2> @@ -309,13 +310,19 @@ <div data-bind="if: hasChatMessages()"><ul id="chatMessageList" data-role="listview" data-bind="foreach: chatMessages" data-inset="true" style="overflow-y: scroll;"><li> - <i class='icon-user icon-2x'></i> - <span><strong>Participant <span data-bind="text: participant_number"></span></strong> - <br> - <span data-bind="text: value"></span> - <br> - <span data-bind="text: date_created"></span>ago - </span> + <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 </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-06 23:00:48
|
1 new commit in vcweb: https://bitbucket.org/virtualcommons/vcweb/commits/ae9824c2e716/ Changeset: ae9824c2e716 User: RoleeSinha Date: 2013-05-07 01:00:20 Summary: fixing ui Affected #: 1 file diff -r fe8bda5c73eacc1c21970ecee6b7f407df60b73a -r ae9824c2e7168d259e2e03bb7617bc0e0c334029 vcweb/lighterprints/templates/lighterprints/mobile/index.html --- a/vcweb/lighterprints/templates/lighterprints/mobile/index.html +++ b/vcweb/lighterprints/templates/lighterprints/mobile/index.html @@ -48,9 +48,10 @@ } }); - $("#dashboardPage").on('pageshow', function(event){ + $("#dashboardPage").on('pagebeforeshow', function(event){ console.debug('dashboardPage pageshow'); $('#challengesList').listview('refresh'); + $('#teamList').listview('refresh'); $('#teamActivityList').listview('refresh'); }); @@ -142,9 +143,26 @@ </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> + <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'> - Your group has not had any activity yet. You can <a href='#dashboard' data-bind='click:activateDashboardTab' data-toggle='tab'>perform challenges in your dashboard</a> + 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='#group' data-bind='click:activateGroupTab'>the group wall</a> . </script> @@ -165,7 +183,7 @@ <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"> - <h2><span class="icon-gauge"></span> Team Dashboard</h2> + <h2><span class="icon-gauge"></span> Team Dashboard <div class="ui-bar"></div><div class="ui-grid-a" data-inset="true"> @@ -203,19 +221,17 @@ <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> - <br> - <br> - <h2><span class="icon-star"></span> Challenges</h2> + </div></h2> + <h2><span class="icon-star"></span> Challenges <div class="ui-bar-d"><div data-role="navbar"><ul id="challengesNavbarList"> @@ -228,28 +244,21 @@ </ul></div><div class='tab-pane active' id='unlocked-challenges'> - <ul id="challengesList" data-role="listview" data-inset="true" data-theme="d" data-bind='foreach: activities'> - <li> - <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> - </li> - </ul> + <ul id="challengesList" data-role="listview" data-inset="true" data-theme="d" data-bind="template: { name: 'challenges-template', foreach: unlockedChallenges() }"> + </ul></div> - </div> - <br> - <br> - <h2><span class="icon-trophy"></span> Leaderboard</h2> + </div></h2> + <h2><span class="icon-trophy"></span> Leaderboard <div class="ui-bar-d"> - <ul data-role="listview" data-bind="foreach: groupData" data-inset="true" data-theme="b"> + <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="text: groupName"></span><span class="ui-li-count" data-bind="text: totalPoints"></span></li></ul> - </div> - <br> - <br> - <h2><span class="icon-user"></span> Team Activity</h2> + </div></h2> + <h2><span class="icon-user"></span> Team Activity <div class="ui-bar-d"><div data-bind='ifnot: hasGroupActivity()'><div data-bind='template: { name: "no-group-activity-template" }'> @@ -259,7 +268,7 @@ <ul id="teamActivityList" data-role="listview" data-inset="true" data-bind='template: { name: groupActivityTemplate, foreach: groupActivity.slice(0, 6) }'></ul></div> - </div> + </div></h2></div><div data-role="footer" data-theme="c"><div class="ui-bar-b" style="font-size:15px;text-align:center;"> @@ -278,228 +287,7 @@ </div></div><!-- /page dashboardPage--><!-- Start of #dashboardLockedChallengePage --> - <div data-role="page" id="dashboardLockedChallengePage" class="ui-responsive-panel"> - <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="#helpPage" data-theme="c" data-role="button" class="innerbutton"><h2><span class="icon-question"></span> Help</h2></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"> - <h2><span class="icon-gauge"></span> Team Dashboard</h2> - <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"> - 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"> - 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-d" style="height:70px"> - 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-d" style="height:70px"> - 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> - <br> - <br> - <h2><span class="icon-star"></span> Challenges</h2> - <div class="ui-bar-d"> - <div data-role="navbar"> - <ul> - <li> - <a href="#dashboardPage"><span class="icon-star"></span> Unlocked</a> - </li> - <li> - <a href="#" class="ui-btn-active"><span class="icon-lock"></span> Locked</a> - </li> - </ul> - </div> - <!-- /navbar --> - <div class='tab-pane' id='locked-challenges'> - <div data-bind='if: lockedChallenges().length === 0'> - <div style='padding: 10px;' class='alert-block'> - <span class='text-gold icon-star'></span>Congratulations, your group has unlocked all of the challenges. - </div> - </div> - - </div> - </div> - </div> - <br> - <br> - <h2><span class="icon-trophy"></span> Leaderboard</h2> - <div class="ui-bar-d"> - <ul 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="text: groupName"></span> - <span class="ui-li-count" data-bind="text: totalPoints"></span> - </li> - </ul> - </div> - <br> - <br> - <h2><span class="icon-user"></span> Team Activity</h2> - <div class="ui-bar-d"> - <div data-bind='ifnot: hasGroupActivity()'> - <div data-bind='template: { name: "no-group-activity-template" }'> - </div> - </div> - <div class='table group-activity'> - <ul 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 dashboardLockedChallengePage--><!-- Start of first page: #challengesPage --> - <div data-role="page" id="challengesPage" 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="#" 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="#helpPage" data-theme="c" data-role="button" class="innerbutton"><h2><span class="icon-question"></span> Help</h2></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"> - <h2><span class="icon-star"></span> Challenges</h2> - <div class="ui-bar-d"> - <div data-role="navbar"> - <ul> - <li> - <a href="#" class="ui-btn-active"><span class="icon-star"></span> Unlocked</a> - </li> - <li> - <a href="#lockedChallengePage"><span class="icon-lock"></span> Locked</a> - </li> - </ul> - </div> - <div class='tab-pane active' id='unlocked-challenges'> - </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="#dashboardPage" data-theme="b"> Dashboard</a> - <a href="#"> 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 challengesPage--><!-- Start of #lockedChallengePage --> - <div data-role="page" id="lockedChallengePage" 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="#" 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="#helpPage" data-theme="c" data-role="button" class="innerbutton"><h2><span class="icon-question"></span>Help</h2></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"> - <h2><span class="icon-star"></span> Challenges</h2> - <div class="ui-bar-d"> - <div data-role="navbar"> - <ul> - <li> - <a href="#challengesPage"><span class="icon-star"></span> Unlocked</a> - </li> - <li> - <a href="#" class="ui-btn-active"><span class="icon-lock"></span> Locked</a> - </li> - </ul> - </div> - <div class='tab-pane' id='locked-challenges'> - <div data-bind='if: lockedChallenges().length === 0'> - <div style='padding: 10px;' class='alert-block'> - <span class='text-gold icon-star'></span>Congratulations, your group has unlocked all of the challenges. - </div> - </div> - </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="#dashboardPage" data-theme="b"> Dashboard</a> - <a href="#"> 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 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" > 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-04 00:06:51
|
1 new commit in vcweb: https://bitbucket.org/virtualcommons/vcweb/commits/fe8bda5c73ea/ Changeset: fe8bda5c73ea User: RoleeSinha Date: 2013-05-04 02:06:32 Summary: fixing display Affected #: 1 file diff -r 1da19f35106192e14cac4156ecfa2a6febfe664e -r fe8bda5c73eacc1c21970ecee6b7f407df60b73a vcweb/lighterprints/templates/lighterprints/mobile/index.html --- a/vcweb/lighterprints/templates/lighterprints/mobile/index.html +++ b/vcweb/lighterprints/templates/lighterprints/mobile/index.html @@ -142,10 +142,6 @@ </li></script><script type='text/html' id='challenges-template'> - <li> - <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> - </li></script><script type='text/html' id='no-group-activity-template'> Your group has not had any activity yet. You can <a href='#dashboard' data-bind='click:activateDashboardTab' data-toggle='tab'>perform challenges in your dashboard</a> @@ -232,7 +228,10 @@ </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: activities}'> + <ul id="challengesList" data-role="listview" data-inset="true" data-theme="d" data-bind='foreach: activities'> + <li> + <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> + </li></ul></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-04 00:03:28
|
1 new commit in vcweb: https://bitbucket.org/virtualcommons/vcweb/commits/1da19f351061/ Changeset: 1da19f351061 User: RoleeSinha Date: 2013-05-04 02:03:03 Summary: fixing display Affected #: 1 file diff -r 59321471ce28ac43f945013b4dbb4fc8ab7d945a -r 1da19f35106192e14cac4156ecfa2a6febfe664e vcweb/lighterprints/templates/lighterprints/mobile/index.html --- a/vcweb/lighterprints/templates/lighterprints/mobile/index.html +++ b/vcweb/lighterprints/templates/lighterprints/mobile/index.html @@ -232,7 +232,7 @@ </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 id="challengesList" data-role="listview" data-inset="true" data-theme="d" data-bind='template: { name: challenges-template, foreach: activities}'></ul></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-03 23:56:11
|
1 new commit in vcweb: https://bitbucket.org/virtualcommons/vcweb/commits/59321471ce28/ Changeset: 59321471ce28 User: RoleeSinha Date: 2013-05-04 01:55:48 Summary: fixing display Affected #: 1 file diff -r 5e273884ff14a5cf0ebc4133df8b72333019717d -r 59321471ce28ac43f945013b4dbb4fc8ab7d945a vcweb/lighterprints/templates/lighterprints/mobile/index.html --- a/vcweb/lighterprints/templates/lighterprints/mobile/index.html +++ b/vcweb/lighterprints/templates/lighterprints/mobile/index.html @@ -143,36 +143,8 @@ </script><script type='text/html' id='challenges-template'><li> - <div class='row challenge-row'> - <div class='span2'> - <img style='padding: 10px 0 0 20px;' data-bind='attr: {src: "https://vcweb.asu.edu/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 href="#" data-role="button" data-inline="true" 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></a> - </form> - </div> - <div style='margin-top: 10px; padding: 15px 0;' class='span2'> - <table> - <tr> - <td class='lighterprints-scoreboard-xlarge'> - <span data-bind='text: points'></span> - </td> - <td> - <span class='lighterprints-green icon-leaf icon-2x'></span> - </td> - </tr> - </table> - <div style='margin-top: 5px; padding: 5px 0;' data-bind='css: status'> - <span class='icon-time'></span> - <strong><span data-bind='text: time_slots'></span></strong> - </div> - </div> - </div> + <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></li></script><script type='text/html' id='no-group-activity-template'> @@ -460,8 +432,6 @@ </ul></div><div class='tab-pane active' id='unlocked-challenges'> - - </div></div></div></div> @@ -512,8 +482,6 @@ <span class='text-gold icon-star'></span>Congratulations, your group has unlocked all of the challenges. </div></div> - - </div></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-03 23:45:20
|
1 new commit in vcweb: https://bitbucket.org/virtualcommons/vcweb/commits/5e273884ff14/ Changeset: 5e273884ff14 User: RoleeSinha Date: 2013-05-04 01:45:01 Summary: fixing display Affected #: 1 file diff -r ab6d26156f57a7acf0f1451d7a0b0b7b5057e7f9 -r 5e273884ff14a5cf0ebc4133df8b72333019717d vcweb/lighterprints/templates/lighterprints/mobile/index.html --- a/vcweb/lighterprints/templates/lighterprints/mobile/index.html +++ b/vcweb/lighterprints/templates/lighterprints/mobile/index.html @@ -388,7 +388,7 @@ <span class='text-gold icon-star'></span>Congratulations, your group has unlocked all of the challenges. </div></div> - <div data-bind="template: { name: 'challenges-template', data: { challenges: lockedChallenges() } }"> + </div></div></div> @@ -460,7 +460,7 @@ </ul></div><div class='tab-pane active' id='unlocked-challenges'> - <div data-bind="template: { name: 'challenges-template', data: { challenges: unlockedChallenges() } }"> + </div></div></div> @@ -512,7 +512,7 @@ <span class='text-gold icon-star'></span>Congratulations, your group has unlocked all of the challenges. </div></div> - <div data-bind="template: { name: 'challenges-template', data: { challenges: lockedChallenges() } }"> + </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-03 23:35:26
|
1 new commit in vcweb: https://bitbucket.org/virtualcommons/vcweb/commits/ab6d26156f57/ Changeset: ab6d26156f57 User: RoleeSinha Date: 2013-05-04 01:35:06 Summary: fixing display Affected #: 1 file diff -r 8b396b9d979b4223d5f728dc6e0d39afd7cf73d9 -r ab6d26156f57a7acf0f1451d7a0b0b7b5057e7f9 vcweb/lighterprints/templates/lighterprints/mobile/index.html --- a/vcweb/lighterprints/templates/lighterprints/mobile/index.html +++ b/vcweb/lighterprints/templates/lighterprints/mobile/index.html @@ -260,7 +260,7 @@ </ul></div><div class='tab-pane active' id='unlocked-challenges'> - <ul id="challengesList" data-role="listview" data-inset="true" data-theme="d" data-bind='data-bind="template: { name: challenges-template, foreach: unlockedChallenges()}'> + <ul id="challengesList" data-role="listview" data-inset="true" data-theme="d" data-bind='template: { name: challenges-template, foreach: unlockedChallenges()}'></ul></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-03 23:33:17
|
1 new commit in vcweb: https://bitbucket.org/virtualcommons/vcweb/commits/8b396b9d979b/ Changeset: 8b396b9d979b User: RoleeSinha Date: 2013-05-04 01:32:56 Summary: fixing display Affected #: 1 file diff -r e72f05c1910e863e56d518d70b90b901919db5e3 -r 8b396b9d979b4223d5f728dc6e0d39afd7cf73d9 vcweb/lighterprints/templates/lighterprints/mobile/index.html --- a/vcweb/lighterprints/templates/lighterprints/mobile/index.html +++ b/vcweb/lighterprints/templates/lighterprints/mobile/index.html @@ -142,7 +142,6 @@ </li></script><script type='text/html' id='challenges-template'> - <ul id="challengesList" data-role="listview" data-inset="true" data-theme="d" data-bind='foreach: challenges'><li><div class='row challenge-row'><div class='span2'> @@ -175,7 +174,6 @@ </div></div></li> - </ul></script><script type='text/html' id='no-group-activity-template'> Your group has not had any activity yet. You can <a href='#dashboard' data-bind='click:activateDashboardTab' data-toggle='tab'>perform challenges in your dashboard</a> @@ -262,8 +260,8 @@ </ul></div><div class='tab-pane active' id='unlocked-challenges'> - <div data-bind="template: { name: 'challenges-template', data: { challenges: unlockedChallenges() } }"> - </div> + <ul id="challengesList" data-role="listview" data-inset="true" data-theme="d" data-bind='data-bind="template: { name: challenges-template, foreach: unlockedChallenges()}'> + </ul></div></div><br> 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-03 23:28:27
|
1 new commit in vcweb: https://bitbucket.org/virtualcommons/vcweb/commits/e72f05c1910e/ Changeset: e72f05c1910e User: RoleeSinha Date: 2013-05-04 01:28:09 Summary: fixing display Affected #: 1 file diff -r 4fa0d0e4b160bdc228fab86d9eb7e1b1ae1409aa -r e72f05c1910e863e56d518d70b90b901919db5e3 vcweb/lighterprints/templates/lighterprints/mobile/index.html --- a/vcweb/lighterprints/templates/lighterprints/mobile/index.html +++ b/vcweb/lighterprints/templates/lighterprints/mobile/index.html @@ -50,6 +50,7 @@ $("#dashboardPage").on('pageshow', function(event){ console.debug('dashboardPage pageshow'); + $('#challengesList').listview('refresh'); $('#teamActivityList').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-03 23:26:49
|
1 new commit in vcweb: https://bitbucket.org/virtualcommons/vcweb/commits/4fa0d0e4b160/ Changeset: 4fa0d0e4b160 User: RoleeSinha Date: 2013-05-04 01:26:29 Summary: fixing display Affected #: 1 file diff -r 8b0951fb7799104fbe545b85be5e1bb57871cead -r 4fa0d0e4b160bdc228fab86d9eb7e1b1ae1409aa vcweb/lighterprints/templates/lighterprints/mobile/index.html --- a/vcweb/lighterprints/templates/lighterprints/mobile/index.html +++ b/vcweb/lighterprints/templates/lighterprints/mobile/index.html @@ -47,6 +47,12 @@ console.debug("No message found!"); } }); + + $("#dashboardPage").on('pageshow', function(event){ + console.debug('dashboardPage pageshow'); + $('#teamActivityList').listview('refresh'); + }); + }); </script><!-- knockout templates --> @@ -280,7 +286,7 @@ </div></div><div class='table group-activity'> - <ul data-role="listview" data-inset="true" data-bind='template: { name: groupActivityTemplate, foreach: groupActivity.slice(0, 6) }'> + <ul id="teamActivityList" data-role="listview" data-inset="true" data-bind='template: { name: groupActivityTemplate, foreach: groupActivity.slice(0, 6) }'></ul></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-03 23:09:52
|
1 new commit in vcweb: https://bitbucket.org/virtualcommons/vcweb/commits/8b0951fb7799/ Changeset: 8b0951fb7799 User: RoleeSinha Date: 2013-05-04 01:09:06 Summary: fixing display Affected #: 1 file diff -r 747bbfe487f38052781a5b6f14f9c488dda3063c -r 8b0951fb7799104fbe545b85be5e1bb57871cead vcweb/lighterprints/templates/lighterprints/mobile/index.html --- a/vcweb/lighterprints/templates/lighterprints/mobile/index.html +++ b/vcweb/lighterprints/templates/lighterprints/mobile/index.html @@ -25,31 +25,29 @@ var viewModelData = $.parseJSON("{{view_model_json|escapejs}}"); var globalViewModel = new LighterFootprintsModel(viewModelData); ko.applyBindings(globalViewModel); - $.mobile.changePage($("#dashboardPage")); - + $("#submitChatMessage").click(function(event){ event.preventDefault(); if ($('#chatText').val()) { - var formData = $('#chat-form').serialize(); - $.post('http://vcweb.asu.edu/lighterprints/api/message', formData, function(response){ - if (response.success) { - console.debug("successful post - updated view model: "); - ko.mapping.fromJS(response.viewModel, globalViewModel); - $('#chatMessageList').listview('refresh'); - } - else { - console.debug("unable to post message to server"); - console.debug(response); - } - }); - $('#chatText').val(''); - } - else{ - console.debug("No message found!"); - } + var formData = $('#chat-form').serialize(); + $.post('http://vcweb.asu.edu/lighterprints/api/message', formData, function(response){ + if (response.success) { + console.debug("successful post - updated view model: "); + ko.mapping.fromJS(response.viewModel, globalViewModel); + $('#chatMessageList').listview('refresh'); + } + else { + console.debug("unable to post message to server"); + console.debug(response); + } + }); + $('#chatText').val(''); + } + else { + console.debug("No message found!"); + } }); }); - </script><!-- knockout templates --><script type='text/html' id='likeCommentTemplate'> 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-03 20:51:33
|
3 new commits in vcweb: https://bitbucket.org/virtualcommons/vcweb/commits/bdf747d31e29/ Changeset: bdf747d31e29 User: RoleeSinha Date: 2013-05-03 22:49:29 Summary: fixed perform activity Affected #: 1 file diff -r 5ef71cfbadb7dd9a34c25443ceeed1851b97710d -r bdf747d31e29e10850a5f0a08f262cdb3e66b877 vcweb/lighterprints/templates/lighterprints/mobile/index.html --- a/vcweb/lighterprints/templates/lighterprints/mobile/index.html +++ b/vcweb/lighterprints/templates/lighterprints/mobile/index.html @@ -23,17 +23,19 @@ <script> $(document).live('pageinit', function(event){ var viewModelData = $.parseJSON("{{view_model_json|escapejs}}"); - globalViewModel = new LighterFootprintsModel(viewModelData); + var globalViewModel = new LighterFootprintsModel(viewModelData); ko.applyBindings(globalViewModel); $.mobile.changePage($("#dashboardPage")); + $("#submitChatMessage").click(function(event){ event.preventDefault(); - + if ($('#chatText').val()) { var formData = $('#chat-form').serialize(); $.post('http://vcweb.asu.edu/lighterprints/api/message', formData, function(response){ if (response.success) { console.debug("successful post - updated view model: "); ko.mapping.fromJS(response.viewModel, globalViewModel); + $('#chatMessageList').listview('refresh'); } else { console.debug("unable to post message to server"); @@ -41,23 +43,11 @@ } }); $('#chatText').val(''); + } + else{ + console.debug("No message found!"); + } }); - $("#dashboardPage").bind('pageaftershow', function(event){ - $('#challengesList').listview('refresh'); - //$('#challengesNavbarList').listview('refresh'); - }); - $("#myTeamPage").bind('pagebeforeshow', function(event){ - $('#chatMessageList').listview('refresh'); - }); - - $("#popupPanel").on({ - popupbeforeposition: function(){ - var h = $(window).height(); - - $("#popupPanel").css("height", h); - } - }); - }); </script> @@ -159,7 +149,7 @@ <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='1005' /><a href="#" data-role="button" data-inline="true" 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></a> + <input data-bind='value: pk' type='hidden' name='activity_id' /><input type='hidden' name='participant_group_id' value='{{participant_group_relationship.id}}' /><a href="#" data-role="button" data-inline="true" 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></a></form></div><div style='margin-top: 10px; padding: 15px 0;' class='span2'> @@ -189,10 +179,10 @@ </script></head><body> - <!-- /pageloginPage--><!-- Start of #dashboardPage --> + <!-- Start of #dashboardPage --><div data-role="page" id="dashboardPage" class="ui-responsive-panel"><!-- defaultpanel --> - <div data-role="panel" id="defaultpanel" data-theme="b"> + <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> @@ -297,7 +287,7 @@ </div></div></div> - <div data-role="footer" data-position="fixed" 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> @@ -315,7 +305,7 @@ </div><!-- /page dashboardPage--><!-- Start of #dashboardLockedChallengePage --><div data-role="page" id="dashboardLockedChallengePage" class="ui-responsive-panel"> - <div data-role="panel" id="defaultpanel" data-theme="b"> + <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> @@ -425,7 +415,7 @@ </div></div></div> - <div data-role="footer" data-position="fixed" 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> @@ -443,7 +433,7 @@ </div><!-- /page dashboardLockedChallengePage--><!-- Start of first page: #challengesPage --><div data-role="page" id="challengesPage" class="ui-responsive-panel"> - <div data-role="panel" id="defaultpanel" data-theme="b"> + <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="#" 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> @@ -472,7 +462,7 @@ </div></div></div> - <div data-role="footer" data-position="fixed" 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="#dashboardPage" data-theme="b"> Dashboard</a> @@ -490,7 +480,7 @@ </div><!-- /page challengesPage--><!-- Start of #lockedChallengePage --><div data-role="page" id="lockedChallengePage" class="ui-responsive-panel"> - <div data-role="panel" id="defaultpanel" data-theme="b"> + <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="#" 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> @@ -524,7 +514,7 @@ </div></div></div> - <div data-role="footer" data-position="fixed" 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="#dashboardPage" data-theme="b"> Dashboard</a> @@ -542,7 +532,7 @@ </div><!-- /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"> + <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="#" data-theme="c" data-role="button" class="innerbutton"><h2><span class="icon-user"></span> My Team</h2></a> @@ -573,12 +563,12 @@ </div><form id="chat-form"><div data-role="fieldcontain" class="innerblock"> - <input type="hidden" name="participant_group_id" value="1005"><input type="text" id="chatText" name="message" placeholder="Send a message to your group"> + <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></form></div></div> - <div data-role="footer" data-position="fixed" 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="#dashboardPage" data-theme="b"> Dashboard</a> @@ -596,7 +586,7 @@ </div><!-- /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"> + <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> @@ -677,7 +667,7 @@ </ul></div></div> - <div data-role="footer" data-position="fixed" 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="#dashboardPage" data-theme="b"> Dashboard</a> @@ -695,7 +685,7 @@ </div><!-- /page helpPage--><!-- Start of page: #modalPage --><div data-role="page" id="modalPage" data-close-btn="right"> - <div data-role="header"> + <div data-role="header" data-theme="b"><h1></h1></div><div data-role="content"> https://bitbucket.org/virtualcommons/vcweb/commits/dcb5b1ed93ac/ Changeset: dcb5b1ed93ac User: RoleeSinha Date: 2013-05-03 22:50:38 Summary: removed unused variables Affected #: 1 file diff -r bdf747d31e29e10850a5f0a08f262cdb3e66b877 -r dcb5b1ed93acbe9593d8287826160acf32cbc418 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 @@ -1,6 +1,3 @@ -var participant_group_id = ''; -var globalViewModel; - function LighterFootprintsModel(modelJson){ var self = this; var model = ko.mapping.fromJS(modelJson); @@ -58,8 +55,6 @@ } else { console.debug("ERROR: " + data.message); - globalViewModel.errorMessage("Unable to perform activity: " + data.message); - $('#activityUnavailableModal').modal(); } }); }; https://bitbucket.org/virtualcommons/vcweb/commits/747bbfe487f3/ Changeset: 747bbfe487f3 User: RoleeSinha Date: 2013-05-03 22:51:03 Summary: fixed header padding Affected #: 1 file diff -r dcb5b1ed93acbe9593d8287826160acf32cbc418 -r 747bbfe487f38052781a5b6f14f9c488dda3063c 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 @@ -2,8 +2,8 @@ text-align: left; } .navbar{ - padding-left: 2px; - padding-top: 2px; + padding-left: 5px; + padding-top: 5px; text-align: left; font-size:20px; } 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-03 00:52:07
|
1 new commit in vcweb: https://bitbucket.org/virtualcommons/vcweb/commits/5ef71cfbadb7/ Changeset: 5ef71cfbadb7 User: alllee Date: 2013-05-03 02:52:05 Summary: escaping view model json Affected #: 1 file diff -r 0691543a814944a47d3b78c4bb551bbe40fd1aad -r 5ef71cfbadb7dd9a34c25443ceeed1851b97710d vcweb/lighterprints/templates/lighterprints/mobile/index.html --- a/vcweb/lighterprints/templates/lighterprints/mobile/index.html +++ b/vcweb/lighterprints/templates/lighterprints/mobile/index.html @@ -21,24 +21,8 @@ <script src='{% static "js/lighterprints/mobile/controller.js" %}'></script><script> - function initKOModel(response){ - var groupURL = "/lighterprints/api/view-model/" + participant_group_id; - $.ajax({ - type: "GET", - url: groupURL, - dataType: "json", - cache: false, - success: function(response){ - - }, - error: function(form, response){ - alert(response.message); - } - }); - } - $(document).live('pageinit', function(event){ - var viewModelData = $.parseJSON({{view_model_json}}); + var viewModelData = $.parseJSON("{{view_model_json|escapejs}}"); globalViewModel = new LighterFootprintsModel(viewModelData); ko.applyBindings(globalViewModel); $.mobile.changePage($("#dashboardPage")); 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-03 00:50:44
|
1 new commit in vcweb: https://bitbucket.org/virtualcommons/vcweb/commits/0691543a8149/ Changeset: 0691543a8149 User: alllee Date: 2013-05-03 02:49:32 Summary: fixing view model initialization to use django interpolation properly Affected #: 0 files 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-03 00:47:12
|
1 new commit in vcweb: https://bitbucket.org/virtualcommons/vcweb/commits/b1494649ffa7/ Changeset: b1494649ffa7 User: RoleeSinha Date: 2013-05-03 02:46:48 Summary: fixing the {{}} Affected #: 1 file diff -r c4a5ee6c1c26a1e7dfb7d7a7d57a65049a065274 -r b1494649ffa72963a5ef4b156bebf22f95413147 vcweb/lighterprints/templates/lighterprints/mobile/index.html --- a/vcweb/lighterprints/templates/lighterprints/mobile/index.html +++ b/vcweb/lighterprints/templates/lighterprints/mobile/index.html @@ -38,7 +38,7 @@ } $(document).live('pageinit', function(event){ - var viewModelData = $.parseJSON(view_model_json); + var viewModelData = $.parseJSON({{view_model_json}}); globalViewModel = new LighterFootprintsModel(viewModelData); ko.applyBindings(globalViewModel); $.mobile.changePage($("#dashboardPage")); @@ -205,8 +205,7 @@ </script></head><body> - - <!-- /pageloginPage--><!-- Start of #dashboardPage --> + <!-- /pageloginPage--><!-- Start of #dashboardPage --><div data-role="page" id="dashboardPage" class="ui-responsive-panel"><!-- defaultpanel --><div data-role="panel" id="defaultpanel" data-theme="b"> 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-03 00:35:52
|
2 new commits in vcweb: https://bitbucket.org/virtualcommons/vcweb/commits/12517169b252/ Changeset: 12517169b252 User: RoleeSinha Date: 2013-05-03 02:35:04 Summary: seperate the login Affected #: 1 file diff -r c1c4948db88ab953d10bda24843a454f39db96e1 -r 12517169b2529833f4e16ffb4f11987b8371cb13 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 @@ -65,60 +65,4 @@ }; return model; -} - -function initKOModel(response){ - var groupURL = "/lighterprints/api/view-model/" + participant_group_id; - $.ajax({ - type: "GET", - url: groupURL, - dataType: "json", - cache: false, - success: function(response){ - var viewModelData = $.parseJSON(response.view_model_json); - globalViewModel = new LighterFootprintsModel(viewModelData); - ko.applyBindings(globalViewModel); - $.mobile.changePage($("#dashboardPage")); - }, - error: function(form, response){ - alert(response.message); - } - }); -} - -$(document).live('pageinit', function(event){ - $("#submitChatMessage").click(function(event){ - event.preventDefault(); - - var formData = $('#chat-form').serialize(); - $.post('http://vcweb.asu.edu/lighterprints/api/message', formData, function(response) { - if (response.success) { - console.debug("successful post - updated view model: "); - ko.mapping.fromJS(response.viewModel, globalViewModel); - } - else { - console.debug("unable to post message to server"); - console.debug(response); - } - }); - $('#chatText').val(''); - }); - $("#dashboardPage").bind('pageaftershow', function(event) { - $('#challengesList').listview('refresh'); - //$('#challengesNavbarList').listview('refresh'); - }); - $("#myTeamPage").bind('pagebeforeshow', function(event) { - $('#chatMessageList').listview('refresh'); - }); - - $( "#popupPanel" ).on({ - popupbeforeposition: function() { - var h = $( window ).height(); - - $( "#popupPanel" ) - .css( "height", h ); - } - }); - -}); - +} \ No newline at end of file https://bitbucket.org/virtualcommons/vcweb/commits/c4a5ee6c1c26/ Changeset: c4a5ee6c1c26 User: RoleeSinha Date: 2013-05-03 02:35:22 Summary: seperate the login Affected #: 1 file diff -r 12517169b2529833f4e16ffb4f11987b8371cb13 -r c4a5ee6c1c26a1e7dfb7d7a7d57a65049a065274 vcweb/lighterprints/templates/lighterprints/mobile/index.html --- a/vcweb/lighterprints/templates/lighterprints/mobile/index.html +++ b/vcweb/lighterprints/templates/lighterprints/mobile/index.html @@ -20,6 +20,63 @@ <!--Local JS--><script src='{% static "js/lighterprints/mobile/controller.js" %}'></script> + <script> + function initKOModel(response){ + var groupURL = "/lighterprints/api/view-model/" + participant_group_id; + $.ajax({ + type: "GET", + url: groupURL, + dataType: "json", + cache: false, + success: function(response){ + + }, + error: function(form, response){ + alert(response.message); + } + }); + } + + $(document).live('pageinit', function(event){ + var viewModelData = $.parseJSON(view_model_json); + globalViewModel = new LighterFootprintsModel(viewModelData); + ko.applyBindings(globalViewModel); + $.mobile.changePage($("#dashboardPage")); + $("#submitChatMessage").click(function(event){ + event.preventDefault(); + + var formData = $('#chat-form').serialize(); + $.post('http://vcweb.asu.edu/lighterprints/api/message', formData, function(response){ + if (response.success) { + console.debug("successful post - updated view model: "); + ko.mapping.fromJS(response.viewModel, globalViewModel); + } + else { + console.debug("unable to post message to server"); + console.debug(response); + } + }); + $('#chatText').val(''); + }); + $("#dashboardPage").bind('pageaftershow', function(event){ + $('#challengesList').listview('refresh'); + //$('#challengesNavbarList').listview('refresh'); + }); + $("#myTeamPage").bind('pagebeforeshow', function(event){ + $('#chatMessageList').listview('refresh'); + }); + + $("#popupPanel").on({ + popupbeforeposition: function(){ + var h = $(window).height(); + + $("#popupPanel").css("height", h); + } + }); + + }); + + </script><!-- knockout templates --><script type='text/html' id='likeCommentTemplate'><div data-bind='if: $root.participantGroupId() != participant_group_id()'> @@ -148,27 +205,7 @@ </script></head><body> - <!-- Start of first page: #loginPage --> - <div data-role="page" id="loginPage"> - <div data-role="header" data-theme="a" class="navbar"> - <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> - </div> - <div data-role="content"> - <form id="loginForm" class="ui-body"> - <div data-role="fieldcontain"> - <label for="email"> - Email: - </label> - <input type="email" name="email" id="email" value="" placeholder="Email"> - <label for="password"> - Password: - </label> - <input type="password" name="password" id="password" value="" placeholder="Password"> - </div><a href="#" data-theme="c" data-role="button" id="submitLogin" type="submit" class="center-button"> - <span class="icon-user"></span> Login</a> - </form> - </div> - </div> + <!-- /pageloginPage--><!-- Start of #dashboardPage --><div data-role="page" id="dashboardPage" class="ui-responsive-panel"><!-- 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-03 00:22:45
|
2 new commits in vcweb: https://bitbucket.org/virtualcommons/vcweb/commits/12a769724306/ Changeset: 12a769724306 User: alllee Date: 2013-05-03 02:18:29 Summary: adding basic login.html page for the mobile app Affected #: 3 files diff -r 0c89885e0e77bfe7e0067359aeee711b9b04c6ee -r 12a7697243061c2a341a98e0f53be575a341eb9e vcweb/lighterprints/templates/lighterprints/mobile/login.html --- /dev/null +++ b/vcweb/lighterprints/templates/lighterprints/mobile/login.html @@ -0,0 +1,47 @@ +{% 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> + <!-- Start of first page: #loginPage --> + <div data-role="page" id="loginPage"> + <div data-role="header" data-theme="a" class="navbar"> + <img width="30px" height="30px" src="{% static 'images/lighterprints/logo.png' %}" alt="footprint logo">lighter<strong style="color:#b9ed2e;">footprints</strong> + </div> + <div data-role="content"> + <form action='' method='POST' id="loginForm" class="ui-body"> + <div data-role="fieldcontain"> + <label for="email"> + Email: + </label> + <input type="email" name="email" id="email" value="" placeholder="Email"> + <label for="password"> + Password: + </label> + <input type="password" name="password" id="password" value="" placeholder="Password"> + </div><a href="#" data-theme="c" data-role="button" id="submitLogin" type="submit" class="center-button"> + <span class="icon-user"></span> Login</a> + </form> + </div> + </div> + </body> +</html> diff -r 0c89885e0e77bfe7e0067359aeee711b9b04c6ee -r 12a7697243061c2a341a98e0f53be575a341eb9e vcweb/lighterprints/urls.py --- a/vcweb/lighterprints/urls.py +++ b/vcweb/lighterprints/urls.py @@ -3,7 +3,7 @@ from vcweb.lighterprints.views import (post_chat_message, post_comment, perform_activity, participate, group_activity, like, get_notifications, update_notifications_since, group_score, CsvExportView, checkin, - activity_performed_counts, get_view_model, mobile_participate) + activity_performed_counts, get_view_model, mobile_participate, mobile_login) # handles all /lighterprints/* URL requests urlpatterns = patterns('vcweb.lighterprints.views', @@ -21,5 +21,6 @@ url(r'^api/notifications/(?P<participant_group_id>\d+)', get_notifications), url(r'^api/checkin', checkin), url(r'^api/activity-performed-counts/(?P<participant_group_id>\d+)', activity_performed_counts), - url(r'^(?P<experiment_id>\d+)/mobile/?$', mobile_participate, name='mobile_participate'), + url(r'^mobile/login?$', mobile_login, name='mobile_login'), + url(r'^mobile/?$', mobile_participate, name='mobile_participate'), ) diff -r 0c89885e0e77bfe7e0067359aeee711b9b04c6ee -r 12a7697243061c2a341a98e0f53be575a341eb9e vcweb/lighterprints/views.py --- a/vcweb/lighterprints/views.py +++ b/vcweb/lighterprints/views.py @@ -1,19 +1,20 @@ from datetime import datetime, timedelta +from django.contrib import auth from django.contrib.auth.decorators import login_required from django.core.exceptions import PermissionDenied from django.http import Http404 -from django.shortcuts import get_object_or_404, render +from django.shortcuts import get_object_or_404, render, redirect from django.views.decorators.csrf import csrf_exempt from django.views.generic.detail import BaseDetailView from django.views.generic.list import BaseListView, MultipleObjectTemplateResponseMixin from vcweb.core import unicodecsv from vcweb.core.decorators import participant_required -from vcweb.core.forms import (ChatForm, CommentForm, LikeForm, ParticipantGroupIdForm, GeoCheckinForm) +from vcweb.core.forms import (ChatForm, CommentForm, LikeForm, ParticipantGroupIdForm, GeoCheckinForm, LoginForm) from vcweb.core.http import JsonResponse from vcweb.core.models import (ChatMessage, Comment, Experiment, ParticipantGroupRelationship, ParticipantRoundDataValue, Like) from vcweb.core.services import foursquare_venue_search -from vcweb.core.views import JSONResponseMixin, DataExportMixin, dumps, json_response +from vcweb.core.views import JSONResponseMixin, DataExportMixin, dumps, json_response, get_active_experiment, set_authentication_token from vcweb.lighterprints.forms import ActivityForm from vcweb.lighterprints.models import (Activity, get_all_activities_tuple, do_activity, get_group_activity, can_view_other_groups, get_lighterprints_experiment_metadata, is_experiment_completed, @@ -371,10 +372,24 @@ view_model_json = get_view_model_json(pgr, experiment=pgr.group.experiment) return JsonResponse(dumps({'success': True, 'view_model_json': view_model_json})) +def mobile_login(request): + form = LoginForm(request.POST or None) + try: + if form.is_valid(): + user = form.user_cache + logger.debug("user was authenticated as %s, attempting to login", user) + auth.login(request, user) + set_authentication_token(user, request.session.session_key) + return redirect('lighterprints:mobile_participate') + except Exception as e: + logger.debug("Invalid login: %s", e) + return render(request, 'lighterprints/mobile/login.html') + + @participant_required def mobile_participate(request, experiment_id=None): participant = request.user.participant - experiment = get_object_or_404(Experiment, pk=experiment_id) + experiment = get_active_experiment(participant, experiment_metadata=get_lighterprints_experiment_metadata()) pgr = experiment.get_participant_group_relationship(participant) all_activities = Activity.objects.all() view_model_json = get_view_model_json(pgr, all_activities, experiment) https://bitbucket.org/virtualcommons/vcweb/commits/c1c4948db88a/ Changeset: c1c4948db88a User: alllee Date: 2013-05-03 02:22:26 Summary: removing click binding for submitLogin since we're using a standard form POST, still need to remove login page logic from index.html Affected #: 2 files diff -r 12a7697243061c2a341a98e0f53be575a341eb9e -r c1c4948db88ab953d10bda24843a454f39db96e1 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 @@ -87,32 +87,6 @@ } $(document).live('pageinit', function(event){ - - $("#submitLogin").click(function(event){ - event.preventDefault(); - - var formData = $("#loginForm").serialize(); - $.ajax({ - type: "POST", - url: "/api/login", - cache: false, - data: formData, - dataType: "json", - success: function(data){ - if (data.success == false) { - alert("Invalid login!"); - } - else if (data.success == true) { - participant_group_id = data.participant_group_id; - initKOModel(); - } - }, - error: function(form, response){ - alert(response.message); - } - }); - }); - $("#submitChatMessage").click(function(event){ event.preventDefault(); diff -r 12a7697243061c2a341a98e0f53be575a341eb9e -r c1c4948db88ab953d10bda24843a454f39db96e1 vcweb/lighterprints/templates/lighterprints/mobile/login.html --- a/vcweb/lighterprints/templates/lighterprints/mobile/login.html +++ b/vcweb/lighterprints/templates/lighterprints/mobile/login.html @@ -28,7 +28,7 @@ <img width="30px" height="30px" src="{% static 'images/lighterprints/logo.png' %}" alt="footprint logo">lighter<strong style="color:#b9ed2e;">footprints</strong></div><div data-role="content"> - <form action='' method='POST' id="loginForm" class="ui-body"> + <form action='/lighterprints/mobile/login' method='POST' id="loginForm" class="ui-body" data-ajax="false" ><div data-role="fieldcontain"><label for="email"> Email: @@ -38,7 +38,7 @@ Password: </label><input type="password" name="password" id="password" value="" placeholder="Password"> - </div><a href="#" data-theme="c" data-role="button" id="submitLogin" type="submit" class="center-button"> + </div><button data-theme="c" data-role="button" id="submitLogin" type="submit" class="center-button"><span class="icon-user"></span> Login</a></form></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-02 23:41:27
|
1 new commit in vcweb: https://bitbucket.org/virtualcommons/vcweb/commits/0c89885e0e77/ Changeset: 0c89885e0e77 User: alllee Date: 2013-05-03 01:41:23 Summary: moving jquery mobile themeroller into mobile directory, removing defunct assets Affected #: 32 files diff -r 85ee0af5da41af920ac6b09f36ed49819f919bc0 -r 0c89885e0e77bfe7e0067359aeee711b9b04c6ee vcweb/lighterprints/static/css/lighterprints/mobile/images/ajax-loader.gif Binary file vcweb/lighterprints/static/css/lighterprints/mobile/images/ajax-loader.gif has changed diff -r 85ee0af5da41af920ac6b09f36ed49819f919bc0 -r 0c89885e0e77bfe7e0067359aeee711b9b04c6ee vcweb/lighterprints/static/css/lighterprints/mobile/images/icons-18-black.png Binary file vcweb/lighterprints/static/css/lighterprints/mobile/images/icons-18-black.png has changed diff -r 85ee0af5da41af920ac6b09f36ed49819f919bc0 -r 0c89885e0e77bfe7e0067359aeee711b9b04c6ee vcweb/lighterprints/static/css/lighterprints/mobile/images/icons-18-white.png Binary file vcweb/lighterprints/static/css/lighterprints/mobile/images/icons-18-white.png has changed diff -r 85ee0af5da41af920ac6b09f36ed49819f919bc0 -r 0c89885e0e77bfe7e0067359aeee711b9b04c6ee vcweb/lighterprints/static/css/lighterprints/mobile/images/icons-36-black.png Binary file vcweb/lighterprints/static/css/lighterprints/mobile/images/icons-36-black.png has changed diff -r 85ee0af5da41af920ac6b09f36ed49819f919bc0 -r 0c89885e0e77bfe7e0067359aeee711b9b04c6ee vcweb/lighterprints/static/css/lighterprints/mobile/images/icons-36-white.png Binary file vcweb/lighterprints/static/css/lighterprints/mobile/images/icons-36-white.png has changed diff -r 85ee0af5da41af920ac6b09f36ed49819f919bc0 -r 0c89885e0e77bfe7e0067359aeee711b9b04c6ee vcweb/lighterprints/static/css/lighterprints/mobile/themeroller.css --- /dev/null +++ b/vcweb/lighterprints/static/css/lighterprints/mobile/themeroller.css @@ -0,0 +1,1023 @@ +/* +* jQuery Mobile Git Build: SHA1: 9130927464f2d3e0300a9fb36ebfd69448cf3675 <> Date: Wed Feb 20 11:08:42 2013 -0800 +* http://jquerymobile.com +* +* Copyright 2010, 2013 jQuery Foundation, Inc. and other contributors +* Released under the MIT license. +* http://jquery.org/license +* +*/ + + +/* Swatches */ + +/* A +-----------------------------------------------------------------------------------------------------------*/ + +.ui-bar-a { + border: 1px solid #009fe1 /*{a-bar-border}*/; + background: #009fe1 /*{a-bar-background-color}*/; + color: #ffffff /*{a-bar-color}*/; + font-weight: bold; + text-shadow: 0 /*{a-bar-shadow-x}*/ 0 /*{a-bar-shadow-y}*/ 0 /*{a-bar-shadow-radius}*/ #ffffff /*{a-bar-shadow-color}*/; + background-image: -webkit-gradient(linear, left top, left bottom, from( #009fe1 /*{a-bar-background-start}*/), to( #009fe1 /*{a-bar-background-end}*/)); /* Saf4+, Chrome */ + background-image: -webkit-linear-gradient( #009fe1 /*{a-bar-background-start}*/, #009fe1 /*{a-bar-background-end}*/); /* Chrome 10+, Saf5.1+ */ + background-image: -moz-linear-gradient( #009fe1 /*{a-bar-background-start}*/, #009fe1 /*{a-bar-background-end}*/); /* FF3.6 */ + background-image: -ms-linear-gradient( #009fe1 /*{a-bar-background-start}*/, #009fe1 /*{a-bar-background-end}*/); /* IE10 */ + background-image: -o-linear-gradient( #009fe1 /*{a-bar-background-start}*/, #009fe1 /*{a-bar-background-end}*/); /* Opera 11.10+ */ + background-image: linear-gradient( #009fe1 /*{a-bar-background-start}*/, #009fe1 /*{a-bar-background-end}*/); +} +.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}*/; +} +.ui-body-a, +.ui-overlay-a { + border: 1px solid #aaaaaa /*{a-body-border}*/; + color: #4d4d4d /*{a-body-color}*/; + text-shadow: 0 /*{a-body-shadow-x}*/ 0 /*{a-body-shadow-y}*/ 0 /*{a-body-shadow-radius}*/ #ffffff /*{a-body-shadow-color}*/; + background: #F7F7F7 /*{a-body-background-color}*/; + background-image: -webkit-gradient(linear, left top, left bottom, from( #f7f7f7 /*{a-body-background-start}*/), to( #f7f7f7 /*{a-body-background-end}*/)); /* Saf4+, Chrome */ + background-image: -webkit-linear-gradient( #f7f7f7 /*{a-body-background-start}*/, #f7f7f7 /*{a-body-background-end}*/); /* Chrome 10+, Saf5.1+ */ + background-image: -moz-linear-gradient( #f7f7f7 /*{a-body-background-start}*/, #f7f7f7 /*{a-body-background-end}*/); /* FF3.6 */ + background-image: -ms-linear-gradient( #f7f7f7 /*{a-body-background-start}*/, #f7f7f7 /*{a-body-background-end}*/); /* IE10 */ + background-image: -o-linear-gradient( #f7f7f7 /*{a-body-background-start}*/, #f7f7f7 /*{a-body-background-end}*/); /* Opera 11.10+ */ + background-image: linear-gradient( #f7f7f7 /*{a-body-background-start}*/, #f7f7f7 /*{a-body-background-end}*/); +} +.ui-overlay-a { + background-image: none; + border-width: 0; +} +.ui-body-a, +.ui-body-a input, +.ui-body-a select, +.ui-body-a textarea, +.ui-body-a button { + 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}*/; + 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}*/); +} +.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}*/; + 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}*/); +} +.ui-btn-hover-a:visited, +.ui-btn-hover-a:hover, +.ui-btn-hover-a a.ui-link-inherit { + color: #ffffff /*{a-bhover-color}*/; +} +.ui-btn-down-a { + border: 1px solid #42545E /*{a-bdown-border}*/; + background: #42545E /*{a-bdown-background-color}*/; + 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}*/); +} +.ui-btn-down-a:visited, +.ui-btn-down-a:hover, +.ui-btn-down-a a.ui-link-inherit { + color: #ffffff /*{a-bdown-color}*/; +} +.ui-btn-up-a, +.ui-btn-hover-a, +.ui-btn-down-a { + 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}*/; + color: #e1e6e9 /*{b-bar-color}*/; + font-weight: bold; + text-shadow: 0 /*{b-bar-shadow-x}*/ 0 /*{b-bar-shadow-y}*/ 0 /*{b-bar-shadow-radius}*/ #ffffff /*{b-bar-shadow-color}*/; + background-image: -webkit-gradient(linear, left top, left bottom, from( #42545e /*{b-bar-background-start}*/), to( #42545e /*{b-bar-background-end}*/)); /* Saf4+, Chrome */ + background-image: -webkit-linear-gradient( #42545e /*{b-bar-background-start}*/, #42545e /*{b-bar-background-end}*/); /* Chrome 10+, Saf5.1+ */ + background-image: -moz-linear-gradient( #42545e /*{b-bar-background-start}*/, #42545e /*{b-bar-background-end}*/); /* FF3.6 */ + background-image: -ms-linear-gradient( #42545e /*{b-bar-background-start}*/, #42545e /*{b-bar-background-end}*/); /* IE10 */ + background-image: -o-linear-gradient( #42545e /*{b-bar-background-start}*/, #42545e /*{b-bar-background-end}*/); /* Opera 11.10+ */ + background-image: linear-gradient( #42545e /*{b-bar-background-start}*/, #42545e /*{b-bar-background-end}*/); +} +.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}*/; +} +.ui-body-b, +.ui-overlay-b { + border: 1px solid #aaaaaa /*{b-body-border}*/; + color: #5F6E77 /*{b-body-color}*/; + text-shadow: 0 /*{b-body-shadow-x}*/ 0 /*{b-body-shadow-y}*/ 0 /*{b-body-shadow-radius}*/ #ffffff /*{b-body-shadow-color}*/; + background: #f9f9f9 /*{b-body-background-color}*/; + background-image: -webkit-gradient(linear, left top, left bottom, from( #f9f9f9 /*{b-body-background-start}*/), to( #f9f9f9 /*{b-body-background-end}*/)); /* Saf4+, Chrome */ + background-image: -webkit-linear-gradient( #f9f9f9 /*{b-body-background-start}*/, #f9f9f9 /*{b-body-background-end}*/); /* Chrome 10+, Saf5.1+ */ + background-image: -moz-linear-gradient( #f9f9f9 /*{b-body-background-start}*/, #f9f9f9 /*{b-body-background-end}*/); /* FF3.6 */ + background-image: -ms-linear-gradient( #f9f9f9 /*{b-body-background-start}*/, #f9f9f9 /*{b-body-background-end}*/); /* IE10 */ + background-image: -o-linear-gradient( #f9f9f9 /*{b-body-background-start}*/, #f9f9f9 /*{b-body-background-end}*/); /* Opera 11.10+ */ + background-image: linear-gradient( #f9f9f9 /*{b-body-background-start}*/, #f9f9f9 /*{b-body-background-end}*/); +} +.ui-overlay-b { + background-image: none; + border-width: 0; +} +.ui-body-b, +.ui-body-b input, +.ui-body-b select, +.ui-body-b textarea, +.ui-body-b button { + 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}*/; + font-weight: bold; + color: #5F6E77 /*{b-bup-color}*/; + text-shadow: 0 /*{b-bup-shadow-x}*/ 0 /*{b-bup-shadow-y}*/ 0 /*{b-bup-shadow-radius}*/ #ffffff /*{b-bup-shadow-color}*/; + background-image: -webkit-gradient(linear, left top, left bottom, from( #ffffff /*{b-bup-background-start}*/), to( #ffffff /*{b-bup-background-end}*/)); /* Saf4+, Chrome */ + background-image: -webkit-linear-gradient( #ffffff /*{b-bup-background-start}*/, #ffffff /*{b-bup-background-end}*/); /* Chrome 10+, Saf5.1+ */ + background-image: -moz-linear-gradient( #ffffff /*{b-bup-background-start}*/, #ffffff /*{b-bup-background-end}*/); /* FF3.6 */ + background-image: -ms-linear-gradient( #ffffff /*{b-bup-background-start}*/, #ffffff /*{b-bup-background-end}*/); /* IE10 */ + background-image: -o-linear-gradient( #ffffff /*{b-bup-background-start}*/, #ffffff /*{b-bup-background-end}*/); /* Opera 11.10+ */ + background-image: linear-gradient( #ffffff /*{b-bup-background-start}*/, #ffffff /*{b-bup-background-end}*/); +} +.ui-btn-up-b:visited, +.ui-btn-up-b a.ui-link-inherit { + color: #5F6E77 /*{b-bup-color}*/; +} +.ui-btn-hover-b { + border: 1px solid #cccccc /*{b-bhover-border}*/; + background: #ffffff /*{b-bhover-background-color}*/; + font-weight: bold; + color: #5F6E77 /*{b-bhover-color}*/; + text-shadow: 0 /*{b-bhover-shadow-x}*/ 0 /*{b-bhover-shadow-y}*/ 0 /*{b-bhover-shadow-radius}*/ #ffffff /*{b-bhover-shadow-color}*/; + background-image: -webkit-gradient(linear, left top, left bottom, from( #ffffff /*{b-bhover-background-start}*/), to( #ffffff /*{b-bhover-background-end}*/)); /* Saf4+, Chrome */ + background-image: -webkit-linear-gradient( #ffffff /*{b-bhover-background-start}*/, #ffffff /*{b-bhover-background-end}*/); /* Chrome 10+, Saf5.1+ */ + background-image: -moz-linear-gradient( #ffffff /*{b-bhover-background-start}*/, #ffffff /*{b-bhover-background-end}*/); /* FF3.6 */ + background-image: -ms-linear-gradient( #ffffff /*{b-bhover-background-start}*/, #ffffff /*{b-bhover-background-end}*/); /* IE10 */ + background-image: -o-linear-gradient( #ffffff /*{b-bhover-background-start}*/, #ffffff /*{b-bhover-background-end}*/); /* Opera 11.10+ */ + background-image: linear-gradient( #ffffff /*{b-bhover-background-start}*/, #ffffff /*{b-bhover-background-end}*/); +} +.ui-btn-hover-b:visited, +.ui-btn-hover-b:hover, +.ui-btn-hover-b a.ui-link-inherit { + color: #5F6E77 /*{b-bhover-color}*/; +} +.ui-btn-down-b { + border: 1px solid #cccccc /*{b-bdown-border}*/; + background: #ffffff /*{b-bdown-background-color}*/; + font-weight: bold; + color: #5F6E77 /*{b-bdown-color}*/; + text-shadow: 0 /*{b-bdown-shadow-x}*/ 0 /*{b-bdown-shadow-y}*/ 0 /*{b-bdown-shadow-radius}*/ #ffffff /*{b-bdown-shadow-color}*/; + background-image: -webkit-gradient(linear, left top, left bottom, from( #ffffff /*{b-bdown-background-start}*/), to( #ffffff /*{b-bdown-background-end}*/)); /* Saf4+, Chrome */ + background-image: -webkit-linear-gradient( #ffffff /*{b-bdown-background-start}*/, #ffffff /*{b-bdown-background-end}*/); /* Chrome 10+, Saf5.1+ */ + background-image: -moz-linear-gradient( #ffffff /*{b-bdown-background-start}*/, #ffffff /*{b-bdown-background-end}*/); /* FF3.6 */ + background-image: -ms-linear-gradient( #ffffff /*{b-bdown-background-start}*/, #ffffff /*{b-bdown-background-end}*/); /* IE10 */ + background-image: -o-linear-gradient( #ffffff /*{b-bdown-background-start}*/, #ffffff /*{b-bdown-background-end}*/); /* Opera 11.10+ */ + background-image: linear-gradient( #ffffff /*{b-bdown-background-start}*/, #ffffff /*{b-bdown-background-end}*/); +} +.ui-btn-down-b:visited, +.ui-btn-down-b:hover, +.ui-btn-down-b a.ui-link-inherit { + color: #5F6E77 /*{b-bdown-color}*/; +} +.ui-btn-up-b, +.ui-btn-hover-b, +.ui-btn-down-b { + 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}*/; + color: #e1e6e9 /*{c-bar-color}*/; + font-weight: bold; + text-shadow: 0 /*{c-bar-shadow-x}*/ 0 /*{c-bar-shadow-y}*/ 0 /*{c-bar-shadow-radius}*/ #ffffff /*{c-bar-shadow-color}*/; + background-image: -webkit-gradient(linear, left top, left bottom, from( #ffffff /*{c-bar-background-start}*/), to( #ffffff /*{c-bar-background-end}*/)); /* Saf4+, Chrome */ + background-image: -webkit-linear-gradient( #ffffff /*{c-bar-background-start}*/, #ffffff /*{c-bar-background-end}*/); /* Chrome 10+, Saf5.1+ */ + background-image: -moz-linear-gradient( #ffffff /*{c-bar-background-start}*/, #ffffff /*{c-bar-background-end}*/); /* FF3.6 */ + background-image: -ms-linear-gradient( #ffffff /*{c-bar-background-start}*/, #ffffff /*{c-bar-background-end}*/); /* IE10 */ + background-image: -o-linear-gradient( #ffffff /*{c-bar-background-start}*/, #ffffff /*{c-bar-background-end}*/); /* Opera 11.10+ */ + background-image: linear-gradient( #ffffff /*{c-bar-background-start}*/, #ffffff /*{c-bar-background-end}*/); +} +.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}*/; +} +.ui-body-c, +.ui-overlay-c { + border: 1px solid #cccccc /*{c-body-border}*/; + color: #5F6E77 /*{c-body-color}*/; + text-shadow: 0 /*{c-body-shadow-x}*/ 0 /*{c-body-shadow-y}*/ 0 /*{c-body-shadow-radius}*/ /*{c-body-shadow-color}*/; + background: #ffffff /*{c-body-background-color}*/; + background-image: -webkit-gradient(linear, left top, left bottom, from( #FFFFFF /*{c-body-background-start}*/), to( #ffffff /*{c-body-background-end}*/)); /* Saf4+, Chrome */ + background-image: -webkit-linear-gradient( #FFFFFF /*{c-body-background-start}*/, #ffffff /*{c-body-background-end}*/); /* Chrome 10+, Saf5.1+ */ + background-image: -moz-linear-gradient( #FFFFFF /*{c-body-background-start}*/, #ffffff /*{c-body-background-end}*/); /* FF3.6 */ + background-image: -ms-linear-gradient( #FFFFFF /*{c-body-background-start}*/, #ffffff /*{c-body-background-end}*/); /* IE10 */ + background-image: -o-linear-gradient( #FFFFFF /*{c-body-background-start}*/, #ffffff /*{c-body-background-end}*/); /* Opera 11.10+ */ + background-image: linear-gradient( #FFFFFF /*{c-body-background-start}*/, #ffffff /*{c-body-background-end}*/); +} +.ui-overlay-c { + background-image: none; + border-width: 0; +} +.ui-body-c, +.ui-body-c input, +.ui-body-c select, +.ui-body-c textarea, +.ui-body-c button { + 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}*/; + font-weight: bold; + color: #009fe1 /*{c-bup-color}*/; + text-shadow: 0 /*{c-bup-shadow-x}*/ 0 /*{c-bup-shadow-y}*/ 0 /*{c-bup-shadow-radius}*/ #ffffff /*{c-bup-shadow-color}*/; + background-image: -webkit-gradient(linear, left top, left bottom, from( #ffffff /*{c-bup-background-start}*/), to( #ffffff /*{c-bup-background-end}*/)); /* Saf4+, Chrome */ + background-image: -webkit-linear-gradient( #ffffff /*{c-bup-background-start}*/, #ffffff /*{c-bup-background-end}*/); /* Chrome 10+, Saf5.1+ */ + background-image: -moz-linear-gradient( #ffffff /*{c-bup-background-start}*/, #ffffff /*{c-bup-background-end}*/); /* FF3.6 */ + background-image: -ms-linear-gradient( #ffffff /*{c-bup-background-start}*/, #ffffff /*{c-bup-background-end}*/); /* IE10 */ + background-image: -o-linear-gradient( #ffffff /*{c-bup-background-start}*/, #ffffff /*{c-bup-background-end}*/); /* Opera 11.10+ */ + background-image: linear-gradient( #ffffff /*{c-bup-background-start}*/, #ffffff /*{c-bup-background-end}*/); +} +.ui-btn-up-c:visited, +.ui-btn-up-c a.ui-link-inherit { + color: #009fe1 /*{c-bup-color}*/; +} +.ui-btn-hover-c { + border: 1px solid #cccccc /*{c-bhover-border}*/; + background: #ffffff /*{c-bhover-background-color}*/; + font-weight: bold; + color: #009fe1 /*{c-bhover-color}*/; + text-shadow: 0 /*{c-bhover-shadow-x}*/ 0 /*{c-bhover-shadow-y}*/ 0 /*{c-bhover-shadow-radius}*/ #ffffff /*{c-bhover-shadow-color}*/; + background-image: -webkit-gradient(linear, left top, left bottom, from( #ffffff /*{c-bhover-background-start}*/), to( #ffffff /*{c-bhover-background-end}*/)); /* Saf4+, Chrome */ + background-image: -webkit-linear-gradient( #ffffff /*{c-bhover-background-start}*/, #ffffff /*{c-bhover-background-end}*/); /* Chrome 10+, Saf5.1+ */ + background-image: -moz-linear-gradient( #ffffff /*{c-bhover-background-start}*/, #ffffff /*{c-bhover-background-end}*/); /* FF3.6 */ + background-image: -ms-linear-gradient( #ffffff /*{c-bhover-background-start}*/, #ffffff /*{c-bhover-background-end}*/); /* IE10 */ + background-image: -o-linear-gradient( #ffffff /*{c-bhover-background-start}*/, #ffffff /*{c-bhover-background-end}*/); /* Opera 11.10+ */ + background-image: linear-gradient( #ffffff /*{c-bhover-background-start}*/, #ffffff /*{c-bhover-background-end}*/); +} +.ui-btn-hover-c:visited, +.ui-btn-hover-c:hover, +.ui-btn-hover-c a.ui-link-inherit { + color: #009fe1 /*{c-bhover-color}*/; +} +.ui-btn-down-c { + border: 1px solid #cccccc /*{c-bdown-border}*/; + background: #ffffff /*{c-bdown-background-color}*/; + font-weight: bold; + color: #009fe1 /*{c-bdown-color}*/; + text-shadow: 0 /*{c-bdown-shadow-x}*/ 0 /*{c-bdown-shadow-y}*/ 0 /*{c-bdown-shadow-radius}*/ #ffffff /*{c-bdown-shadow-color}*/; + background-image: -webkit-gradient(linear, left top, left bottom, from( #ffffff /*{c-bdown-background-start}*/), to( #ffffff /*{c-bdown-background-end}*/)); /* Saf4+, Chrome */ + background-image: -webkit-linear-gradient( #ffffff /*{c-bdown-background-start}*/, #ffffff /*{c-bdown-background-end}*/); /* Chrome 10+, Saf5.1+ */ + background-image: -moz-linear-gradient( #ffffff /*{c-bdown-background-start}*/, #ffffff /*{c-bdown-background-end}*/); /* FF3.6 */ + background-image: -ms-linear-gradient( #ffffff /*{c-bdown-background-start}*/, #ffffff /*{c-bdown-background-end}*/); /* IE10 */ + background-image: -o-linear-gradient( #ffffff /*{c-bdown-background-start}*/, #ffffff /*{c-bdown-background-end}*/); /* Opera 11.10+ */ + background-image: linear-gradient( #ffffff /*{c-bdown-background-start}*/, #ffffff /*{c-bdown-background-end}*/); +} +.ui-btn-down-c:visited, +.ui-btn-down-c:hover, +.ui-btn-down-c a.ui-link-inherit { + color: #009fe1 /*{c-bdown-color}*/; +} +.ui-btn-up-c, +.ui-btn-hover-c, +.ui-btn-down-c { + 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}*/; + color: #5F6E77 /*{d-bar-color}*/; + font-weight: bold; + text-shadow: 0 /*{d-bar-shadow-x}*/ 0 /*{d-bar-shadow-y}*/ 0 /*{d-bar-shadow-radius}*/ #ffffff /*{d-bar-shadow-color}*/; + background-image: -webkit-gradient(linear, left top, left bottom, from( #f7f7f7 /*{d-bar-background-start}*/), to( #f7f7f7 /*{d-bar-background-end}*/)); /* Saf4+, Chrome */ + background-image: -webkit-linear-gradient( #f7f7f7 /*{d-bar-background-start}*/, #f7f7f7 /*{d-bar-background-end}*/); /* Chrome 10+, Saf5.1+ */ + background-image: -moz-linear-gradient( #f7f7f7 /*{d-bar-background-start}*/, #f7f7f7 /*{d-bar-background-end}*/); /* FF3.6 */ + background-image: -ms-linear-gradient( #f7f7f7 /*{d-bar-background-start}*/, #f7f7f7 /*{d-bar-background-end}*/); /* IE10 */ + background-image: -o-linear-gradient( #f7f7f7 /*{d-bar-background-start}*/, #f7f7f7 /*{d-bar-background-end}*/); /* Opera 11.10+ */ + background-image: linear-gradient( #f7f7f7 /*{d-bar-background-start}*/, #f7f7f7 /*{d-bar-background-end}*/); +} +.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, +.ui-bar-d textarea, +.ui-bar-d button { + font-family: Arial /*{global-font-family}*/; +} +.ui-body-d, +.ui-overlay-d { + border: 1px solid #F7F7F7 /*{d-body-border}*/; + color: #5F6E77 /*{d-body-color}*/; + text-shadow: 0 /*{d-body-shadow-x}*/ 0 /*{d-body-shadow-y}*/ 0 /*{d-body-shadow-radius}*/ /*{d-body-shadow-color}*/; + background: #F7F7F7 /*{d-body-background-color}*/; + background-image: -webkit-gradient(linear, left top, left bottom, from( #f7f7f7 /*{d-body-background-start}*/), to( #f7f7f7 /*{d-body-background-end}*/)); /* Saf4+, Chrome */ + background-image: -webkit-linear-gradient( #f7f7f7 /*{d-body-background-start}*/, #f7f7f7 /*{d-body-background-end}*/); /* Chrome 10+, Saf5.1+ */ + background-image: -moz-linear-gradient( #f7f7f7 /*{d-body-background-start}*/, #f7f7f7 /*{d-body-background-end}*/); /* FF3.6 */ + background-image: -ms-linear-gradient( #f7f7f7 /*{d-body-background-start}*/, #f7f7f7 /*{d-body-background-end}*/); /* IE10 */ + background-image: -o-linear-gradient( #f7f7f7 /*{d-body-background-start}*/, #f7f7f7 /*{d-body-background-end}*/); /* Opera 11.10+ */ + background-image: linear-gradient( #f7f7f7 /*{d-body-background-start}*/, #f7f7f7 /*{d-body-background-end}*/); +} +.ui-overlay-d { + background-image: none; + border-width: 0; +} +.ui-body-d, +.ui-body-d input, +.ui-body-d select, +.ui-body-d textarea, +.ui-body-d button { + font-family: Arial /*{global-font-family}*/; +} +.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}*/; + font-weight: bold; + color: #2f3e46 /*{d-bup-color}*/; + text-shadow: 0 /*{d-bup-shadow-x}*/ 1px /*{d-bup-shadow-y}*/ 0 /*{d-bup-shadow-radius}*/ #ffffff /*{d-bup-shadow-color}*/; + background-image: -webkit-gradient(linear, left top, left bottom, from( #ffffff /*{d-bup-background-start}*/), to( #f1f1f1 /*{d-bup-background-end}*/)); /* Saf4+, Chrome */ + background-image: -webkit-linear-gradient( #ffffff /*{d-bup-background-start}*/, #f1f1f1 /*{d-bup-background-end}*/); /* Chrome 10+, Saf5.1+ */ + background-image: -moz-linear-gradient( #ffffff /*{d-bup-background-start}*/, #f1f1f1 /*{d-bup-background-end}*/); /* FF3.6 */ + background-image: -ms-linear-gradient( #ffffff /*{d-bup-background-start}*/, #f1f1f1 /*{d-bup-background-end}*/); /* IE10 */ + background-image: -o-linear-gradient( #ffffff /*{d-bup-background-start}*/, #f1f1f1 /*{d-bup-background-end}*/); /* Opera 11.10+ */ + background-image: linear-gradient( #ffffff /*{d-bup-background-start}*/, #f1f1f1 /*{d-bup-background-end}*/); +} +.ui-btn-up-d:visited, +.ui-btn-up-d a.ui-link-inherit { + color: #2f3e46 /*{d-bup-color}*/; +} +.ui-btn-hover-d { + border: 1px solid #bbbbbb /*{d-bhover-border}*/; + background: #dfdfdf /*{d-bhover-background-color}*/; + font-weight: bold; + color: #2f3e46 /*{d-bhover-color}*/; + text-shadow: 0 /*{d-bhover-shadow-x}*/ 1px /*{d-bhover-shadow-y}*/ 0 /*{d-bhover-shadow-radius}*/ #ffffff /*{d-bhover-shadow-color}*/; + background-image: -webkit-gradient(linear, left top, left bottom, from( #f6f6f6 /*{d-bhover-background-start}*/), to( #e0e0e0 /*{d-bhover-background-end}*/)); /* Saf4+, Chrome */ + background-image: -webkit-linear-gradient( #f6f6f6 /*{d-bhover-background-start}*/, #e0e0e0 /*{d-bhover-background-end}*/); /* Chrome 10+, Saf5.1+ */ + background-image: -moz-linear-gradient( #f6f6f6 /*{d-bhover-background-start}*/, #e0e0e0 /*{d-bhover-background-end}*/); /* FF3.6 */ + background-image: -ms-linear-gradient( #f6f6f6 /*{d-bhover-background-start}*/, #e0e0e0 /*{d-bhover-background-end}*/); /* IE10 */ + background-image: -o-linear-gradient( #f6f6f6 /*{d-bhover-background-start}*/, #e0e0e0 /*{d-bhover-background-end}*/); /* Opera 11.10+ */ + background-image: linear-gradient( #f6f6f6 /*{d-bhover-background-start}*/, #e0e0e0 /*{d-bhover-background-end}*/); +} +.ui-btn-hover-d:visited, +.ui-btn-hover-d:hover, +.ui-btn-hover-d a.ui-link-inherit { + color: #2f3e46 /*{d-bhover-color}*/; +} +.ui-btn-down-d { + border: 1px solid #bbbbbb /*{d-bdown-border}*/; + background: #d6d6d6 /*{d-bdown-background-color}*/; + font-weight: bold; + color: #2f3e46 /*{d-bdown-color}*/; + text-shadow: 0 /*{d-bdown-shadow-x}*/ 1px /*{d-bdown-shadow-y}*/ 0 /*{d-bdown-shadow-radius}*/ #ffffff /*{d-bdown-shadow-color}*/; + background-image: -webkit-gradient(linear, left top, left bottom, from( #d0d0d0 /*{d-bdown-background-start}*/), to( #dfdfdf /*{d-bdown-background-end}*/)); /* Saf4+, Chrome */ + background-image: -webkit-linear-gradient( #d0d0d0 /*{d-bdown-background-start}*/, #dfdfdf /*{d-bdown-background-end}*/); /* Chrome 10+, Saf5.1+ */ + background-image: -moz-linear-gradient( #d0d0d0 /*{d-bdown-background-start}*/, #dfdfdf /*{d-bdown-background-end}*/); /* FF3.6 */ + background-image: -ms-linear-gradient( #d0d0d0 /*{d-bdown-background-start}*/, #dfdfdf /*{d-bdown-background-end}*/); /* IE10 */ + background-image: -o-linear-gradient( #d0d0d0 /*{d-bdown-background-start}*/, #dfdfdf /*{d-bdown-background-end}*/); /* Opera 11.10+ */ + background-image: linear-gradient( #d0d0d0 /*{d-bdown-background-start}*/, #dfdfdf /*{d-bdown-background-end}*/); +} +.ui-btn-down-d:visited, +.ui-btn-down-d:hover, +.ui-btn-down-d a.ui-link-inherit { + color: #2f3e46 /*{d-bdown-color}*/; +} +.ui-btn-up-d, +.ui-btn-hover-d, +.ui-btn-down-d { + 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}*/; + font-weight: bold; + color: #ffffff /*{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}*/; +} +.ui-btn-active:visited, +.ui-btn-active:hover, +.ui-btn-active a.ui-link-inherit { + color: #ffffff /*{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 { + border-color: rgb(130,130,130); + border-color: rgba(130,130,130,.3); + border-style: solid; +} + +/* Interaction cues +-----------------------------------------------------------------------------------------------------------*/ +.ui-disabled { + filter: Alpha(Opacity=30); + opacity: .3; + zoom: 1; +} +.ui-disabled, +.ui-disabled a { + 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-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; + background-color: rgba(255,255,255,.3); + 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; +} +.ui-icon-minus { + background-position: -37px -1px; +} +/* delete/close */ +.ui-icon-delete { + background-position: -73px -1px; +} +/* arrows */ +.ui-icon-arrow-r { + background-position: -108px -1px; +} +.ui-icon-arrow-l { + background-position: -144px -1px; +} +.ui-icon-arrow-u { + background-position: -180px -1px; +} +.ui-icon-arrow-d { + background-position: -216px -1px; +} +/* misc */ +.ui-icon-check { + background-position: -252px -1px; +} +.ui-icon-gear { + background-position: -288px -1px; +} +.ui-icon-refresh { + background-position: -323px -1px; +} +.ui-icon-forward { + background-position: -360px -1px; +} +.ui-icon-back { + background-position: -396px -1px; +} +.ui-icon-grid { + background-position: -432px -1px; +} +.ui-icon-star { + background-position: -467px -1px; +} +.ui-icon-alert { + background-position: -503px -1px; +} +.ui-icon-info { + background-position: -539px -1px; +} +.ui-icon-home { + background-position: -575px -1px; +} +/* search */ +.ui-icon-search, +.ui-icon-searchfield:after { + background-position: -611px -1px; +} +/* checkbox radio */ +.ui-icon-checkbox-on { + background-position: -647px -1px; +} +.ui-icon-checkbox-off { + background-position: -683px -1px; +} +.ui-icon-radio-on { + background-position: -718px -1px; +} +.ui-icon-radio-off { + background-position: -754px -1px; +} +/* 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) { + + .ui-icon-plus, .ui-icon-minus, .ui-icon-delete, .ui-icon-arrow-r, + .ui-icon-arrow-l, .ui-icon-arrow-u, .ui-icon-arrow-d, .ui-icon-check, + .ui-icon-gear, .ui-icon-refresh, .ui-icon-forward, .ui-icon-back, + .ui-icon-grid, .ui-icon-star, .ui-icon-alert, .ui-icon-info, .ui-icon-home, .ui-icon-bars, .ui-icon-edit, + .ui-icon-search, .ui-icon-searchfield:after, + .ui-icon-checkbox-off, .ui-icon-checkbox-on, .ui-icon-radio-off, .ui-icon-radio-on { + background-image: url(images/icons-36-white.png); + -moz-background-size: 864px 18px; + -o-background-size: 864px 18px; + -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%; + } + .ui-icon-minus { + background-position: -36px 50%; + } + .ui-icon-delete { + background-position: -72px 50%; + } + .ui-icon-arrow-r { + background-position: -108px 50%; + } + .ui-icon-arrow-l { + background-position: -144px 50%; + } + .ui-icon-arrow-u { + background-position: -179px 50%; + } + .ui-icon-arrow-d { + background-position: -215px 50%; + } + .ui-icon-check { + background-position: -252px 50%; + } + .ui-icon-gear { + background-position: -287px 50%; + } + .ui-icon-refresh { + background-position: -323px 50%; + } + .ui-icon-forward { + background-position: -360px 50%; + } + .ui-icon-back { + background-position: -395px 50%; + } + .ui-icon-grid { + background-position: -431px 50%; + } + .ui-icon-star { + background-position: -467px 50%; + } + .ui-icon-alert { + background-position: -503px 50%; + } + .ui-icon-info { + background-position: -538px 50%; + } + .ui-icon-home { + background-position: -575px 50%; + } + .ui-icon-search, + .ui-icon-searchfield:after { + background-position: -611px 50%; + } + .ui-icon-checkbox-on { + background-position: -647px 50%; + } + .ui-icon-checkbox-off { + background-position: -683px 50%; + } + .ui-icon-radio-on { + background-position: -718px 50%; + } + .ui-icon-radio-off { + background-position: -754px 50%; + } + .ui-icon-bars { + background-position: -788px 50%; + + }.ui-icon-edit { + background-position: -824px 50%; + } +} + +/* checks,radios */ +.ui-checkbox .ui-icon, +.ui-selectmenu-list .ui-icon { + -webkit-border-radius: 3px; + border-radius: 3px; +} +.ui-icon-checkbox-off, +.ui-icon-radio-off { + background-color: transparent; +} +.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 */ +} + +/* 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); + opacity: .5; + position: absolute; + width: 100%; + 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); +} +.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}*/; +} +.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); +} +.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); +} +.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}*/; +} + +/* Focus state - set here for specificity (note: these classes are added by JavaScript) +-----------------------------------------------------------------------------------------------------------*/ + +.ui-btn:focus, .ui-link-inherit:focus { + outline: 0; +} +.ui-btn.ui-focus { + z-index: 1; +} +.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}*/; +} +.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}*/; +} + +/* 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, +.ui-mobile-nosupport-boxshadow .ui-link-inherit:focus { + outline-width: 1px; + outline-style: auto; +} + \ No newline at end of file This diff is so big that we needed to truncate the remainder. 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-02 23:37:23
|
8 new commits in vcweb: https://bitbucket.org/virtualcommons/vcweb/commits/1ffde66ad0db/ Changeset: 1ffde66ad0db User: RoleeSinha Date: 2013-05-03 01:26:32 Summary: added activity button styling Affected #: 1 file diff -r 334b905c2d77dd5732ecd9981955c224e8252d30 -r 1ffde66ad0dbaf37e8ce278cb3be64976b25ddb5 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 @@ -29,17 +29,76 @@ .innerbutton{ text-align:left; } -#popupPanel-popup { - left: 0 !important; - right: auto !important; +a.upcoming-challenge, a.expired-challenge, a.perform-challenge, a.completed-challenge { + text-transform: uppercase; + color: #FFF !important; + -webkit-font-smoothing: antialiased; + background-repeat: repeat-x; } -#popupPanel { - width: 200px; - border: 1px solid #000; - border-right: none; - background: rgba(0,0,0,.5); - margin: -1px 0; +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%); + text-shadow: 0 1px 1px rgba(255, 255, 255, 0.69); } -#popupPanel .ui-btn { - margin: 2em 15px; +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); + border-color: #ff9393 #ff9393 hsl(0, 100%, 77%); + text-shadow: 0 1px 1px rgba(255, 255, 255, 0.13); +} +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)); + background-image: -moz-linear-gradient(top, #66dd17, #59c114); + background-image: -ms-linear-gradient(top, #66dd17, #59c114); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #66dd17), color-stop(100%, #59c114)); + background-image: -webkit-linear-gradient(top, #66dd17, #59c114); + 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); +} +.lighterprints-red { + color: #FF0066; +} +.lighterprints-blue { + color: #13a5e6; +} +.lighterprints-green { + color: #95CB29; +} +.badge-lighterprints-green { + background-color: #95CB29; + color: #FFFFFF; +} +.btn-lighterprints-blue { + background-color: #13a6e7 !important; + background-repeat: repeat-x; + background-image: -khtml-gradient(linear, left top, left bottom, from(#39bef3), to(#0a82b2)); + background-image: -moz-linear-gradient(top, #39bef3, #0a82b2); + background-image: -ms-linear-gradient(top, #39bef3, #0a82b2); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #39bef3), color-stop(100%, #0a82b2)); + background-image: -webkit-linear-gradient(top, #39bef3, #0a82b2); + background-image: -o-linear-gradient(top, #39bef3, #0a82b2); + background-image: linear-gradient(#39bef3, #0a82b2); + border-color: #0a82b2 #0a82b2 hsl(197, 89%, 31.5%); + color: #fff !important; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.36); + -webkit-font-smoothing: antialiased; } \ No newline at end of file https://bitbucket.org/virtualcommons/vcweb/commits/02070ee93906/ Changeset: 02070ee93906 User: RoleeSinha Date: 2013-05-03 01:27:01 Summary: JQM listview refresh Affected #: 1 file diff -r 1ffde66ad0dbaf37e8ce278cb3be64976b25ddb5 -r 02070ee939066e62c74bedea6e886a34ed8b421d vcweb/lighterprints/templates/lighterprints/mobile/app/controller.js --- a/vcweb/lighterprints/templates/lighterprints/mobile/app/controller.js +++ b/vcweb/lighterprints/templates/lighterprints/mobile/app/controller.js @@ -54,12 +54,11 @@ console.debug(data); ko.mapping.fromJSON(data.viewModel, model); model.lastPerformedActivity(challengeModel); - $.mobile.changePage($("#modalPage"),{transition: 'pop', role: 'dialog'}); + $.mobile.changePage($("#modalPage"),{transition: 'pop', role: 'dialog'}); + $('#challengesList').listview('refresh'); } else { - console.debug("ERROR: " + data.message); - globalViewModel.errorMessage("Unable to perform activity: " + data.message); - $('#activityUnavailableModal').modal(); + console.debug("ERROR: Unable to perform activity: " + data.message); } }); }; @@ -122,6 +121,7 @@ if (response.success) { console.debug("successful post - updated view model: "); ko.mapping.fromJS(response.viewModel, globalViewModel); + $('#chatMessageList').listview('refresh'); } else { console.debug("unable to post message to server"); @@ -130,22 +130,5 @@ }); $('#chatText').val(''); }); - $("#dashboardPage").bind('pageaftershow', function(event) { - $('#challengesList').listview('refresh'); - //$('#challengesNavbarList').listview('refresh'); - }); - $("#myTeamPage").bind('pagebeforeshow', function(event) { - $('#chatMessageList').listview('refresh'); - }); - - $( "#popupPanel" ).on({ - popupbeforeposition: function() { - var h = $( window ).height(); - - $( "#popupPanel" ) - .css( "height", h ); - } - }); - }); https://bitbucket.org/virtualcommons/vcweb/commits/20cf47680056/ Changeset: 20cf47680056 User: RoleeSinha Date: 2013-05-03 01:27:22 Summary: navigation panel Affected #: 1 file diff -r 02070ee939066e62c74bedea6e886a34ed8b421d -r 20cf47680056b102315a5c38b9fa307b14adbf94 vcweb/lighterprints/templates/lighterprints/mobile/index.html --- a/vcweb/lighterprints/templates/lighterprints/mobile/index.html +++ b/vcweb/lighterprints/templates/lighterprints/mobile/index.html @@ -172,7 +172,7 @@ <!-- /pageloginPage--><!-- Start of #dashboardPage --><div data-role="page" id="dashboardPage" class="ui-responsive-panel"><!-- defaultpanel --> - <div data-role="panel" id="defaultpanel" data-theme="b"> + <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> @@ -277,10 +277,10 @@ </div></div></div> - <div data-role="footer" data-position="fixed" 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="#"> Dashboard</a><a href="#challengesPage"> Challenges</a><a href="#myTeamPage"> My Team</a><a href="#helpPage"> Help</a> @@ -295,7 +295,7 @@ </div><!-- /page dashboardPage--><!-- Start of #dashboardLockedChallengePage --><div data-role="page" id="dashboardLockedChallengePage" class="ui-responsive-panel"> - <div data-role="panel" id="defaultpanel" data-theme="b"> + <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> @@ -405,10 +405,10 @@ </div></div></div> - <div data-role="footer" data-position="fixed" 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="#"> Dashboard</a><a href="#challengesPage"> Challenges</a><a href="#myTeamPage"> My Team</a><a href="#helpPage"> Help</a> @@ -423,7 +423,7 @@ </div><!-- /page dashboardLockedChallengePage--><!-- Start of first page: #challengesPage --><div data-role="page" id="challengesPage" class="ui-responsive-panel"> - <div data-role="panel" id="defaultpanel" data-theme="b"> + <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="#" 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> @@ -470,7 +470,7 @@ </div><!-- /page challengesPage--><!-- Start of #lockedChallengePage --><div data-role="page" id="lockedChallengePage" class="ui-responsive-panel"> - <div data-role="panel" id="defaultpanel" data-theme="b"> + <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="#" 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> @@ -507,7 +507,7 @@ <div data-role="footer" data-position="fixed" 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="#dashboardPage"> Dashboard</a><a href="#"> Challenges</a><a href="#myTeamPage"> My Team</a><a href="#helpPage"> Help</a> @@ -522,7 +522,7 @@ </div><!-- /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"> + <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="#" data-theme="c" data-role="button" class="innerbutton"><h2><span class="icon-user"></span> My Team</h2></a> @@ -558,10 +558,10 @@ </form></div></div> - <div data-role="footer" data-position="fixed" 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="#dashboardPage" data-theme="b"> Dashboard</a> + <a href="#dashboardPage"> Dashboard</a><a href="#challengesPage"> Challenges</a><a href="#"> My Team</a><a href="#helpPage"> Help</a> @@ -576,7 +576,7 @@ </div><!-- /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"> + <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> @@ -657,10 +657,10 @@ </ul></div></div> - <div data-role="footer" data-position="fixed" 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="#dashboardPage" data-theme="b"> Dashboard</a> + <a href="#dashboardPage"> Dashboard</a><a href="#challengesPage"> Challenges</a><a href="#myTeam"> My Team</a><a href="#"> Help</a> https://bitbucket.org/virtualcommons/vcweb/commits/614ccf8787a1/ Changeset: 614ccf8787a1 User: RoleeSinha Date: 2013-05-03 01:33:27 Summary: navigation panel Affected #: 1 file diff -r 20cf47680056b102315a5c38b9fa307b14adbf94 -r 614ccf8787a13bdc9b5d2657f1561b4a2fcac1aa vcweb/lighterprints/static/css/lighterprints/mobile/style.css --- a/vcweb/lighterprints/static/css/lighterprints/mobile/style.css +++ /dev/null @@ -1,104 +0,0 @@ -body{ - text-align: left; -} -.navbar{ - padding-left: 2px; - padding-top: 2px; - text-align: left; - font-size:20px; -} - -.footerbar{ - padding-top: 5px; - padding-bottom: 5px; - text-align:center; -} -.innerblock{ - padding-left: 10px; - padding-right: 10px; - display: block; -} -.innerleft{ - text-align:left; - padding-left: 2px; - padding-right: 10px; - padding-top: 10px; - padding-bottom: 10px; - display: block; -} -.innerbutton{ - text-align:left; -} -a.upcoming-challenge, a.expired-challenge, a.perform-challenge, a.completed-challenge { - text-transform: uppercase; - color: #FFF !important; - -webkit-font-smoothing: antialiased; - background-repeat: repeat-x; -} -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%); - 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); - border-color: #ff9393 #ff9393 hsl(0, 100%, 77%); - text-shadow: 0 1px 1px rgba(255, 255, 255, 0.13); -} -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)); - background-image: -moz-linear-gradient(top, #66dd17, #59c114); - background-image: -ms-linear-gradient(top, #66dd17, #59c114); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #66dd17), color-stop(100%, #59c114)); - background-image: -webkit-linear-gradient(top, #66dd17, #59c114); - 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); -} -.lighterprints-red { - color: #FF0066; -} -.lighterprints-blue { - color: #13a5e6; -} -.lighterprints-green { - color: #95CB29; -} -.badge-lighterprints-green { - background-color: #95CB29; - color: #FFFFFF; -} -.btn-lighterprints-blue { - background-color: #13a6e7 !important; - background-repeat: repeat-x; - background-image: -khtml-gradient(linear, left top, left bottom, from(#39bef3), to(#0a82b2)); - background-image: -moz-linear-gradient(top, #39bef3, #0a82b2); - background-image: -ms-linear-gradient(top, #39bef3, #0a82b2); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #39bef3), color-stop(100%, #0a82b2)); - background-image: -webkit-linear-gradient(top, #39bef3, #0a82b2); - background-image: -o-linear-gradient(top, #39bef3, #0a82b2); - background-image: linear-gradient(#39bef3, #0a82b2); - border-color: #0a82b2 #0a82b2 hsl(197, 89%, 31.5%); - color: #fff !important; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.36); - -webkit-font-smoothing: antialiased; -} \ No newline at end of file https://bitbucket.org/virtualcommons/vcweb/commits/e3868f9885c5/ Changeset: e3868f9885c5 User: RoleeSinha Date: 2013-05-03 01:33:43 Summary: navigation panel Affected #: 1 file Diff not available. https://bitbucket.org/virtualcommons/vcweb/commits/020a43acf5fb/ Changeset: 020a43acf5fb User: RoleeSinha Date: 2013-05-03 01:35:41 Summary: navigation panel Affected #: 1 file Diff not available. https://bitbucket.org/virtualcommons/vcweb/commits/a8d801139fee/ Changeset: a8d801139fee User: RoleeSinha Date: 2013-05-03 01:36:00 Summary: JQM listview refresh Affected #: 1 file Diff not available. https://bitbucket.org/virtualcommons/vcweb/commits/85ee0af5da41/ Changeset: 85ee0af5da41 User: RoleeSinha Date: 2013-05-03 01:36:57 Summary: Merge with bdeba59cc2fb3bea1d11c6488d32430977db39f5 Affected #: 2 files 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-02 22:35:10
|
1 new commit in vcweb: https://bitbucket.org/virtualcommons/vcweb/commits/bdeba59cc2fb/ Changeset: bdeba59cc2fb User: alllee Date: 2013-05-03 00:35:06 Summary: removing local mobile app KO references Affected #: 2 files diff -r 334b905c2d77dd5732ecd9981955c224e8252d30 -r bdeba59cc2fb3bea1d11c6488d32430977db39f5 vcweb/lighterprints/templates/lighterprints/mobile/app/knockout-2.2.0.js --- a/vcweb/lighterprints/templates/lighterprints/mobile/app/knockout-2.2.0.js +++ /dev/null @@ -1,85 +0,0 @@ -// Knockout JavaScript library v2.2.0 -// (c) Steven Sanderson - http://knockoutjs.com/ -// License: MIT (http://www.opensource.org/licenses/mit-license.php) - -(function() {function i(v){throw v;}var l=!0,n=null,q=!1;function t(v){return function(){return v}};var w=window,x=document,fa=navigator,E=window.jQuery,H=void 0; -function K(v){function ga(a,d,c,e,f){var g=[],a=b.j(function(){var a=d(c,f)||[];0<g.length&&(b.a.Xa(L(g),a),e&&b.r.K(e,n,[c,a,f]));g.splice(0,g.length);b.a.P(g,a)},n,{W:a,Ja:function(){return 0==g.length||!b.a.X(g[0])}});return{M:g,j:a.oa()?a:H}}function L(a){for(;a.length&&!b.a.X(a[0]);)a.splice(0,1);if(1<a.length){for(var d=a[0],c=a[a.length-1],e=[d];d!==c;){d=d.nextSibling;if(!d)return;e.push(d)}Array.prototype.splice.apply(a,[0,a.length].concat(e))}return a}function R(a,b,c,e,f){var g=Math.min, -h=Math.max,j=[],k,m=a.length,p,r=b.length,u=r-m||1,F=m+r+1,I,z,y;for(k=0;k<=m;k++){z=I;j.push(I=[]);y=g(r,k+u);for(p=h(0,k-1);p<=y;p++)I[p]=p?k?a[k-1]===b[p-1]?z[p-1]:g(z[p]||F,I[p-1]||F)+1:p+1:k+1}g=[];h=[];u=[];k=m;for(p=r;k||p;)r=j[k][p]-1,p&&r===j[k][p-1]?h.push(g[g.length]={status:c,value:b[--p],index:p}):k&&r===j[k-1][p]?u.push(g[g.length]={status:e,value:a[--k],index:k}):(g.push({status:"retained",value:b[--p]}),--k);if(h.length&&u.length)for(var a=10*m,s,b=c=0;(f||b<a)&&(s=h[c]);c++){for(e= -0;j=u[e];e++)if(s.value===j.value){s.moved=j.index;j.moved=s.index;u.splice(e,1);b=e=0;break}b+=e}return g.reverse()}function S(a,d,c,e,f){var f=f||{},g=a&&M(a),g=g&&g.ownerDocument,h=f.templateEngine||N;b.ya.ub(c,h,g);c=h.renderTemplate(c,e,f,g);("number"!=typeof c.length||0<c.length&&"number"!=typeof c[0].nodeType)&&i(Error("Template engine must return an array of DOM nodes"));g=q;switch(d){case "replaceChildren":b.e.N(a,c);g=l;break;case "replaceNode":b.a.Xa(a,c);g=l;break;case "ignoreTargetNode":break; -default:i(Error("Unknown renderMode: "+d))}g&&(T(c,e),f.afterRender&&b.r.K(f.afterRender,n,[c,e.$data]));return c}function M(a){return a.nodeType?a:0<a.length?a[0]:n}function T(a,d){if(a.length){var c=a[0],e=a[a.length-1];U(c,e,function(a){b.Ca(d,a)});U(c,e,function(a){b.s.hb(a,[d])})}}function U(a,d,c){for(var e,d=b.e.nextSibling(d);a&&(e=a)!==d;)a=b.e.nextSibling(e),(1===e.nodeType||8===e.nodeType)&&c(e)}function V(a,d,c){for(var a=b.g.aa(a),e=b.g.Q,f=0;f<a.length;f++){var g=a[f].key;if(e.hasOwnProperty(g)){var h= -e[g];"function"===typeof h?(g=h(a[f].value))&&i(Error(g)):h||i(Error("This template engine does not support the '"+g+"' binding within its templates"))}}a="ko.__tr_ambtns(function($context,$element){return(function(){return{ "+b.g.ba(a)+" } })()})";return c.createJavaScriptEvaluatorBlock(a)+d}function W(a,d,c,e){function f(a){return function(){return j[a]}}function g(){return j}var h=0,j,k;b.j(function(){var m=c&&c instanceof b.z?c:new b.z(b.a.d(c)),p=m.$data;e&&b.cb(a,m);if(j=("function"==typeof d? -d(m,a):d)||b.J.instance.getBindings(a,m)){if(0===h){h=1;for(var r in j){var u=b.c[r];u&&8===a.nodeType&&!b.e.I[r]&&i(Error("The binding '"+r+"' cannot be used with virtual elements"));if(u&&"function"==typeof u.init&&(u=(0,u.init)(a,f(r),g,p,m))&&u.controlsDescendantBindings)k!==H&&i(Error("Multiple bindings ("+k+" and "+r+") are trying to control descendant bindings of the same element. You cannot use these bindings together on the same element.")),k=r}h=2}if(2===h)for(r in j)(u=b.c[r])&&"function"== -typeof u.update&&(0,u.update)(a,f(r),g,p,m)}},n,{W:a});return{Mb:k===H}}function X(a,d,c){var e=l,f=1===d.nodeType;f&&b.e.Sa(d);if(f&&c||b.J.instance.nodeHasBindings(d))e=W(d,n,a,c).Mb;e&&Y(a,d,!f)}function Y(a,d,c){for(var e=b.e.firstChild(d);d=e;)e=b.e.nextSibling(d),X(a,d,c)}function Z(a,b){var c=$(a,b);return c?0<c.length?c[c.length-1].nextSibling:a.nextSibling:n}function $(a,b){for(var c=a,e=1,f=[];c=c.nextSibling;){if(G(c)&&(e--,0===e))return f;f.push(c);A(c)&&e++}b||i(Error("Cannot find closing comment tag to match: "+ -a.nodeValue));return n}function G(a){return 8==a.nodeType&&(J?a.text:a.nodeValue).match(ha)}function A(a){return 8==a.nodeType&&(J?a.text:a.nodeValue).match(ia)}function O(a,b){for(var c=n;a!=c;)c=a,a=a.replace(ja,function(a,c){return b[c]});return a}function ka(){var a=[],d=[];this.save=function(c,e){var f=b.a.i(a,c);0<=f?d[f]=e:(a.push(c),d.push(e))};this.get=function(c){c=b.a.i(a,c);return 0<=c?d[c]:H}}function aa(a,b,c){function e(e){var g=b(a[e]);switch(typeof g){case "boolean":case "number":case "string":case "function":f[e]= -g;break;case "object":case "undefined":var h=c.get(g);f[e]=h!==H?h:aa(g,b,c)}}c=c||new ka;a=b(a);if(!("object"==typeof a&&a!==n&&a!==H&&!(a instanceof Date)))return a;var f=a instanceof Array?[]:{};c.save(a,f);var g=a;if(g instanceof Array){for(var h=0;h<g.length;h++)e(h);"function"==typeof g.toJSON&&e("toJSON")}else for(h in g)e(h);return f}function ba(a,d){if(a)if(8==a.nodeType){var c=b.s.Ta(a.nodeValue);c!=n&&d.push({rb:a,Eb:c})}else if(1==a.nodeType)for(var c=0,e=a.childNodes,f=e.length;c<f;c++)ba(e[c], -d)}function P(a,d,c,e){b.c[a]={init:function(a){b.a.f.set(a,ca,{});return{controlsDescendantBindings:l}},update:function(a,g,h,j,k){var h=b.a.f.get(a,ca),g=b.a.d(g()),j=!c!==!g,m=!h.Ya;if(m||d||j!==h.pb)m&&(h.Ya=b.a.Ha(b.e.childNodes(a),l)),j?(m||b.e.N(a,b.a.Ha(h.Ya)),b.Da(e?e(k,g):k,a)):b.e.Y(a),h.pb=j}};b.g.Q[a]=q;b.e.I[a]=l}function da(a,d,c){c&&d!==b.k.q(a)&&b.k.T(a,d);d!==b.k.q(a)&&b.r.K(b.a.Aa,n,[a,"change"])}var b="undefined"!==typeof v?v:{};b.b=function(a,d){for(var c=a.split("."),e=b,f=0;f< -c.length-1;f++)e=e[c[f]];e[c[c.length-1]]=d};b.p=function(a,b,c){a[b]=c};b.version="2.2.0";b.b("version",b.version);b.a=new function(){function a(a,d){if("input"!==b.a.u(a)||!a.type||"click"!=d.toLowerCase())return q;var c=a.type;return"checkbox"==c||"radio"==c}var d=/^(\s|\u00A0)+|(\s|\u00A0)+$/g,c={},e={};c[/Firefox\/2/i.test(fa.userAgent)?"KeyboardEvent":"UIEvents"]=["keyup","keydown","keypress"];c.MouseEvents="click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave".split(" "); -for(var f in c){var g=c[f];if(g.length)for(var h=0,j=g.length;h<j;h++)e[g[h]]=f}var k={propertychange:l},m,c=3;f=x.createElement("div");for(g=f.getElementsByTagName("i");f.innerHTML="<\!--[if gt IE "+ ++c+"]><i></i><![endif]--\>",g[0];);m=4<c?c:H;return{Ma:["authenticity_token",/^__RequestVerificationToken(_.*)?$/],o:function(a,b){for(var d=0,c=a.length;d<c;d++)b(a[d])},i:function(a,b){if("function"==typeof Array.prototype.indexOf)return Array.prototype.indexOf.call(a,b);for(var d=0,c=a.length;d< -c;d++)if(a[d]===b)return d;return-1},kb:function(a,b,d){for(var c=0,e=a.length;c<e;c++)if(b.call(d,a[c]))return a[c];return n},ga:function(a,d){var c=b.a.i(a,d);0<=c&&a.splice(c,1)},Fa:function(a){for(var a=a||[],d=[],c=0,e=a.length;c<e;c++)0>b.a.i(d,a[c])&&d.push(a[c]);return d},V:function(a,b){for(var a=a||[],d=[],c=0,e=a.length;c<e;c++)d.push(b(a[c]));return d},fa:function(a,b){for(var a=a||[],d=[],c=0,e=a.length;c<e;c++)b(a[c])&&d.push(a[c]);return d},P:function(a,b){if(b instanceof Array)a.push.apply(a, -b);else for(var d=0,c=b.length;d<c;d++)a.push(b[d]);return a},extend:function(a,b){if(b)for(var d in b)b.hasOwnProperty(d)&&(a[d]=b[d]);return a},ka:function(a){for(;a.firstChild;)b.removeNode(a.firstChild)},Gb:function(a){for(var a=b.a.L(a),d=x.createElement("div"),c=0,e=a.length;c<e;c++)d.appendChild(b.A(a[c]));return d},Ha:function(a,d){for(var c=0,e=a.length,g=[];c<e;c++){var f=a[c].cloneNode(l);g.push(d?b.A(f):f)}return g},N:function(a,d){b.a.ka(a);if(d)for(var c=0,e=d.length;c<e;c++)a.appendChild(d[c])}, -Xa:function(a,d){var c=a.nodeType?[a]:a;if(0<c.length){for(var e=c[0],g=e.parentNode,f=0,h=d.length;f<h;f++)g.insertBefore(d[f],e);f=0;for(h=c.length;f<h;f++)b.removeNode(c[f])}},ab:function(a,b){7>m?a.setAttribute("selected",b):a.selected=b},D:function(a){return(a||"").replace(d,"")},Qb:function(a,d){for(var c=[],e=(a||"").split(d),f=0,g=e.length;f<g;f++){var h=b.a.D(e[f]);""!==h&&c.push(h)}return c},Nb:function(a,b){a=a||"";return b.length>a.length?q:a.substring(0,b.length)===b},sb:function(a,b){if(b.compareDocumentPosition)return 16== -(b.compareDocumentPosition(a)&16);for(;a!=n;){if(a==b)return l;a=a.parentNode}return q},X:function(a){return b.a.sb(a,a.ownerDocument)},u:function(a){return a&&a.tagName&&a.tagName.toLowerCase()},n:function(b,d,c){var e=m&&k[d];if(!e&&"undefined"!=typeof E){if(a(b,d))var f=c,c=function(a,b){var d=this.checked;b&&(this.checked=b.mb!==l);f.call(this,a);this.checked=d};E(b).bind(d,c)}else!e&&"function"==typeof b.addEventListener?b.addEventListener(d,c,q):"undefined"!=typeof b.attachEvent?b.attachEvent("on"+ -d,function(a){c.call(b,a)}):i(Error("Browser doesn't support addEventListener or attachEvent"))},Aa:function(b,d){(!b||!b.nodeType)&&i(Error("element must be a DOM node when calling triggerEvent"));if("undefined"!=typeof E){var c=[];a(b,d)&&c.push({mb:b.checked});E(b).trigger(d,c)}else"function"==typeof x.createEvent?"function"==typeof b.dispatchEvent?(c=x.createEvent(e[d]||"HTMLEvents"),c.initEvent(d,l,l,w,0,0,0,0,0,q,q,q,q,0,b),b.dispatchEvent(c)):i(Error("The supplied element doesn't support dispatchEvent")): -"undefined"!=typeof b.fireEvent?(a(b,d)&&(b.checked=b.checked!==l),b.fireEvent("on"+d)):i(Error("Browser doesn't support triggering events"))},d:function(a){return b.$(a)?a():a},ta:function(a){return b.$(a)?a.t():a},da:function(a,d,c){if(d){var e=/[\w-]+/g,f=a.className.match(e)||[];b.a.o(d.match(e),function(a){var d=b.a.i(f,a);0<=d?c||f.splice(d,1):c&&f.push(a)});a.className=f.join(" ")}},bb:function(a,d){var c=b.a.d(d);if(c===n||c===H)c="";if(3===a.nodeType)a.data=c;else{var e=b.e.firstChild(a); -!e||3!=e.nodeType||b.e.nextSibling(e)?b.e.N(a,[x.createTextNode(c)]):e.data=c;b.a.vb(a)}},$a:function(a,b){a.name=b;if(7>=m)try{a.mergeAttributes(x.createElement("<input name='"+a.name+"'/>"),q)}catch(d){}},vb:function(a){9<=m&&(a=1==a.nodeType?a:a.parentNode,a.style&&(a.style.zoom=a.style.zoom))},tb:function(a){if(9<=m){var b=a.style.width;a.style.width=0;a.style.width=b}},Kb:function(a,d){for(var a=b.a.d(a),d=b.a.d(d),c=[],e=a;e<=d;e++)c.push(e);return c},L:function(a){for(var b=[],d=0,c=a.length;d< -c;d++)b.push(a[d]);return b},Ob:6===m,Pb:7===m,Z:m,Na:function(a,d){for(var c=b.a.L(a.getElementsByTagName("input")).concat(b.a.L(a.getElementsByTagName("textarea"))),e="string"==typeof d?function(a){return a.name===d}:function(a){return d.test(a.name)},f=[],g=c.length-1;0<=g;g--)e(c[g])&&f.push(c[g]);return f},Hb:function(a){return"string"==typeof a&&(a=b.a.D(a))?w.JSON&&w.JSON.parse?w.JSON.parse(a):(new Function("return "+a))():n},wa:function(a,d,c){("undefined"==typeof JSON||"undefined"==typeof JSON.stringify)&& -i(Error("Cannot find JSON.stringify(). Some browsers (e.g., IE < 8) don't support it natively, but you can overcome this by adding a script reference to json2.js, downloadable from http://www.json.org/json2.js"));return JSON.stringify(b.a.d(a),d,c)},Ib:function(a,d,c){var c=c||{},e=c.params||{},f=c.includeFields||this.Ma,g=a;if("object"==typeof a&&"form"===b.a.u(a))for(var g=a.action,h=f.length-1;0<=h;h--)for(var j=b.a.Na(a,f[h]),k=j.length-1;0<=k;k--)e[j[k].name]=j[k].value;var d=b.a.d(d),m=x.createElement("form"); -m.style.display="none";m.action=g;m.method="post";for(var v in d)a=x.createElement("input"),a.name=v,a.value=b.a.wa(b.a.d(d[v])),m.appendChild(a);for(v in e)a=x.createElement("input"),a.name=v,a.value=e[v],m.appendChild(a);x.body.appendChild(m);c.submitter?c.submitter(m):m.submit();setTimeout(function(){m.parentNode.removeChild(m)},0)}}};b.b("utils",b.a);b.b("utils.arrayForEach",b.a.o);b.b("utils.arrayFirst",b.a.kb);b.b("utils.arrayFilter",b.a.fa);b.b("utils.arrayGetDistinctValues",b.a.Fa);b.b("utils.arrayIndexOf", -b.a.i);b.b("utils.arrayMap",b.a.V);b.b("utils.arrayPushAll",b.a.P);b.b("utils.arrayRemoveItem",b.a.ga);b.b("utils.extend",b.a.extend);b.b("utils.fieldsIncludedWithJsonPost",b.a.Ma);b.b("utils.getFormFields",b.a.Na);b.b("utils.peekObservable",b.a.ta);b.b("utils.postJson",b.a.Ib);b.b("utils.parseJson",b.a.Hb);b.b("utils.registerEventHandler",b.a.n);b.b("utils.stringifyJson",b.a.wa);b.b("utils.range",b.a.Kb);b.b("utils.toggleDomNodeCssClass",b.a.da);b.b("utils.triggerEvent",b.a.Aa);b.b("utils.unwrapObservable", -b.a.d);Function.prototype.bind||(Function.prototype.bind=function(a){var b=this,c=Array.prototype.slice.call(arguments),a=c.shift();return function(){return b.apply(a,c.concat(Array.prototype.slice.call(arguments)))}});b.a.f=new function(){var a=0,d="__ko__"+(new Date).getTime(),c={};return{get:function(a,d){var c=b.a.f.getAll(a,q);return c===H?H:c[d]},set:function(a,d,c){c===H&&b.a.f.getAll(a,q)===H||(b.a.f.getAll(a,l)[d]=c)},getAll:function(b,f){var g=b[d];if(!g||!("null"!==g&&c[g])){if(!f)return H; -g=b[d]="ko"+a++;c[g]={}}return c[g]},clear:function(a){var b=a[d];return b?(delete c[b],a[d]=n,l):q}}};b.b("utils.domData",b.a.f);b.b("utils.domData.clear",b.a.f.clear);b.a.F=new function(){function a(a,d){var e=b.a.f.get(a,c);e===H&&d&&(e=[],b.a.f.set(a,c,e));return e}function d(c){var e=a(c,q);if(e)for(var e=e.slice(0),j=0;j<e.length;j++)e[j](c);b.a.f.clear(c);"function"==typeof E&&"function"==typeof E.cleanData&&E.cleanData([c]);if(f[c.nodeType])for(e=c.firstChild;c=e;)e=c.nextSibling,8===c.nodeType&& -d(c)}var c="__ko_domNodeDisposal__"+(new Date).getTime(),e={1:l,8:l,9:l},f={1:l,9:l};return{Ba:function(b,d){"function"!=typeof d&&i(Error("Callback must be a function"));a(b,l).push(d)},Wa:function(d,e){var f=a(d,q);f&&(b.a.ga(f,e),0==f.length&&b.a.f.set(d,c,H))},A:function(a){if(e[a.nodeType]&&(d(a),f[a.nodeType])){var c=[];b.a.P(c,a.getElementsByTagName("*"));for(var j=0,k=c.length;j<k;j++)d(c[j])}return a},removeNode:function(a){b.A(a);a.parentNode&&a.parentNode.removeChild(a)}}};b.A=b.a.F.A; -b.removeNode=b.a.F.removeNode;b.b("cleanNode",b.A);b.b("removeNode",b.removeNode);b.b("utils.domNodeDisposal",b.a.F);b.b("utils.domNodeDisposal.addDisposeCallback",b.a.F.Ba);b.b("utils.domNodeDisposal.removeDisposeCallback",b.a.F.Wa);b.a.sa=function(a){var d;if("undefined"!=typeof E){if((d=E.clean([a]))&&d[0]){for(a=d[0];a.parentNode&&11!==a.parentNode.nodeType;)a=a.parentNode;a.parentNode&&a.parentNode.removeChild(a)}}else{var c=b.a.D(a).toLowerCase();d=x.createElement("div");c=c.match(/^<(thead|tbody|tfoot)/)&& -[1,"<table>","</table>"]||!c.indexOf("<tr")&&[2,"<table><tbody>","</tbody></table>"]||(!c.indexOf("<td")||!c.indexOf("<th"))&&[3,"<table><tbody><tr>","</tr></tbody></table>"]||[0,"",""];a="ignored<div>"+c[1]+a+c[2]+"</div>";for("function"==typeof w.innerShiv?d.appendChild(w.innerShiv(a)):d.innerHTML=a;c[0]--;)d=d.lastChild;d=b.a.L(d.lastChild.childNodes)}return d};b.a.ca=function(a,d){b.a.ka(a);d=b.a.d(d);if(d!==n&&d!==H)if("string"!=typeof d&&(d=d.toString()),"undefined"!=typeof E)E(a).html(d);else for(var c= -b.a.sa(d),e=0;e<c.length;e++)a.appendChild(c[e])};b.b("utils.parseHtmlFragment",b.a.sa);b.b("utils.setHtml",b.a.ca);var Q={};b.s={qa:function(a){"function"!=typeof a&&i(Error("You can only pass a function to ko.memoization.memoize()"));var b=(4294967296*(1+Math.random())|0).toString(16).substring(1)+(4294967296*(1+Math.random())|0).toString(16).substring(1);Q[b]=a;return"<\!--[ko_memo:"+b+"]--\>"},gb:function(a,b){var c=Q[a];c===H&&i(Error("Couldn't find any memo with ID "+a+". Perhaps it's already been unmemoized.")); -try{return c.apply(n,b||[]),l}finally{delete Q[a]}},hb:function(a,d){var c=[];ba(a,c);for(var e=0,f=c.length;e<f;e++){var g=c[e].rb,h=[g];d&&b.a.P(h,d);b.s.gb(c[e].Eb,h);g.nodeValue="";g.parentNode&&g.parentNode.removeChild(g)}},Ta:function(a){return(a=a.match(/^\[ko_memo\:(.*?)\]$/))?a[1]:n}};b.b("memoization",b.s);b.b("memoization.memoize",b.s.qa);b.b("memoization.unmemoize",b.s.gb);b.b("memoization.parseMemoText",b.s.Ta);b.b("memoization.unmemoizeDomNodeAndDescendants",b.s.hb);b.La={throttle:function(a, -d){a.throttleEvaluation=d;var c=n;return b.j({read:a,write:function(b){clearTimeout(c);c=setTimeout(function(){a(b)},d)}})},notify:function(a,d){a.equalityComparer="always"==d?t(q):b.m.fn.equalityComparer;return a}};b.b("extenders",b.La);b.eb=function(a,d,c){this.target=a;this.ha=d;this.qb=c;b.p(this,"dispose",this.B)};b.eb.prototype.B=function(){this.Bb=l;this.qb()};b.S=function(){this.w={};b.a.extend(this,b.S.fn);b.p(this,"subscribe",this.xa);b.p(this,"extend",this.extend);b.p(this,"getSubscriptionsCount", -this.xb)};b.S.fn={xa:function(a,d,c){var c=c||"change",a=d?a.bind(d):a,e=new b.eb(this,a,function(){b.a.ga(this.w[c],e)}.bind(this));this.w[c]||(this.w[c]=[]);this.w[c].push(e);return e},notifySubscribers:function(a,d){d=d||"change";this.w[d]&&b.r.K(function(){b.a.o(this.w[d].slice(0),function(b){b&&b.Bb!==l&&b.ha(a)})},this)},xb:function(){var a=0,b;for(b in this.w)this.w.hasOwnProperty(b)&&(a+=this.w[b].length);return a},extend:function(a){var d=this;if(a)for(var c in a){var e=b.La[c];"function"== -typeof e&&(d=e(d,a[c]))}return d}};b.Pa=function(a){return"function"==typeof a.xa&&"function"==typeof a.notifySubscribers};b.b("subscribable",b.S);b.b("isSubscribable",b.Pa);var B=[];b.r={lb:function(a){B.push({ha:a,Ka:[]})},end:function(){B.pop()},Va:function(a){b.Pa(a)||i(Error("Only subscribable things can act as dependencies"));if(0<B.length){var d=B[B.length-1];d&&!(0<=b.a.i(d.Ka,a))&&(d.Ka.push(a),d.ha(a))}},K:function(a,b,c){try{return B.push(n),a.apply(b,c||[])}finally{B.pop()}}};var la={undefined:l, -"boolean":l,number:l,string:l};b.m=function(a){function d(){if(0<arguments.length){if(!d.equalityComparer||!d.equalityComparer(c,arguments[0]))d.H(),c=arguments[0],d.G();return this}b.r.Va(d);return c}var c=a;b.S.call(d);d.t=function(){return c};d.G=function(){d.notifySubscribers(c)};d.H=function(){d.notifySubscribers(c,"beforeChange")};b.a.extend(d,b.m.fn);b.p(d,"peek",d.t);b.p(d,"valueHasMutated",d.G);b.p(d,"valueWillMutate",d.H);return d};b.m.fn={equalityComparer:function(a,b){return a===n||typeof a in -la?a===b:q}};var D=b.m.Jb="__ko_proto__";b.m.fn[D]=b.m;b.la=function(a,d){return a===n||a===H||a[D]===H?q:a[D]===d?l:b.la(a[D],d)};b.$=function(a){return b.la(a,b.m)};b.Qa=function(a){return"function"==typeof a&&a[D]===b.m||"function"==typeof a&&a[D]===b.j&&a.yb?l:q};b.b("observable",b.m);b.b("isObservable",b.$);b.b("isWriteableObservable",b.Qa);b.R=function(a){0==arguments.length&&(a=[]);a!==n&&(a!==H&&!("length"in a))&&i(Error("The argument passed when initializing an observable array must be an array, or null, or undefined.")); -var d=b.m(a);b.a.extend(d,b.R.fn);return d};b.R.fn={remove:function(a){for(var b=this.t(),c=[],e="function"==typeof a?a:function(b){return b===a},f=0;f<b.length;f++){var g=b[f];e(g)&&(0===c.length&&this.H(),c.push(g),b.splice(f,1),f--)}c.length&&this.G();return c},removeAll:function(a){if(a===H){var d=this.t(),c=d.slice(0);this.H();d.splice(0,d.length);this.G();return c}return!a?[]:this.remove(function(d){return 0<=b.a.i(a,d)})},destroy:function(a){var b=this.t(),c="function"==typeof a?a:function(b){return b=== -a};this.H();for(var e=b.length-1;0<=e;e--)c(b[e])&&(b[e]._destroy=l);this.G()},destroyAll:function(a){return a===H?this.destroy(t(l)):!a?[]:this.destroy(function(d){return 0<=b.a.i(a,d)})},indexOf:function(a){var d=this();return b.a.i(d,a)},replace:function(a,b){var c=this.indexOf(a);0<=c&&(this.H(),this.t()[c]=b,this.G())}};b.a.o("pop push reverse shift sort splice unshift".split(" "),function(a){b.R.fn[a]=function(){var b=this.t();this.H();b=b[a].apply(b,arguments);this.G();return b}});b.a.o(["slice"], -function(a){b.R.fn[a]=function(){var b=this();return b[a].apply(b,arguments)}});b.b("observableArray",b.R);b.j=function(a,d,c){function e(){b.a.o(y,function(a){a.B()});y=[]}function f(){var a=h.throttleEvaluation;a&&0<=a?(clearTimeout(s),s=setTimeout(g,a)):g()}function g(){if(!p)if(m&&v())z();else{p=l;try{var a=b.a.V(y,function(a){return a.target});b.r.lb(function(c){var d;0<=(d=b.a.i(a,c))?a[d]=H:y.push(c.xa(f))});for(var c=r.call(d),e=a.length-1;0<=e;e--)a[e]&&y.splice(e,1)[0].B();m=l;h.notifySubscribers(k, -"beforeChange");k=c}finally{b.r.end()}h.notifySubscribers(k);p=q;y.length||z()}}function h(){if(0<arguments.length)return"function"===typeof u?u.apply(d,arguments):i(Error("Cannot write a value to a ko.computed unless you specify a 'write' option. If you wish to read the current value, don't pass any parameters.")),this;m||g();b.r.Va(h);return k}function j(){return!m||0<y.length}var k,m=q,p=q,r=a;r&&"object"==typeof r?(c=r,r=c.read):(c=c||{},r||(r=c.read));"function"!=typeof r&&i(Error("Pass a function that returns the value of the ko.computed")); -var u=c.write,F=c.disposeWhenNodeIsRemoved||c.W||n,v=c.disposeWhen||c.Ja||t(q),z=e,y=[],s=n;d||(d=c.owner);h.t=function(){m||g();return k};h.wb=function(){return y.length};h.yb="function"===typeof c.write;h.B=function(){z()};h.oa=j;b.S.call(h);b.a.extend(h,b.j.fn);b.p(h,"peek",h.t);b.p(h,"dispose",h.B);b.p(h,"isActive",h.oa);b.p(h,"getDependenciesCount",h.wb);c.deferEvaluation!==l&&g();if(F&&j()){z=function(){b.a.F.Wa(F,arguments.callee);e()};b.a.F.Ba(F,z);var C=v,v=function(){return!b.a.X(F)||C()}}return h}; -b.Ab=function(a){return b.la(a,b.j)};v=b.m.Jb;b.j[v]=b.m;b.j.fn={};b.j.fn[v]=b.j;b.b("dependentObservable",b.j);b.b("computed",b.j);b.b("isComputed",b.Ab);b.fb=function(a){0==arguments.length&&i(Error("When calling ko.toJS, pass the object you want to convert."));return aa(a,function(a){for(var c=0;b.$(a)&&10>c;c++)a=a();return a})};b.toJSON=function(a,d,c){a=b.fb(a);return b.a.wa(a,d,c)};b.b("toJS",b.fb);b.b("toJSON",b.toJSON);b.k={q:function(a){switch(b.a.u(a)){case "option":return a.__ko__hasDomDataOptionValue__=== -l?b.a.f.get(a,b.c.options.ra):7>=b.a.Z?a.getAttributeNode("value").specified?a.value:a.text:a.value;case "select":return 0<=a.selectedIndex?b.k.q(a.options[a.selectedIndex]):H;default:return a.value}},T:function(a,d){switch(b.a.u(a)){case "option":switch(typeof d){case "string":b.a.f.set(a,b.c.options.ra,H);"__ko__hasDomDataOptionValue__"in a&&delete a.__ko__hasDomDataOptionValue__;a.value=d;break;default:b.a.f.set(a,b.c.options.ra,d),a.__ko__hasDomDataOptionValue__=l,a.value="number"===typeof d? -d:""}break;case "select":for(var c=a.options.length-1;0<=c;c--)if(b.k.q(a.options[c])==d){a.selectedIndex=c;break}break;default:if(d===n||d===H)d="";a.value=d}}};b.b("selectExtensions",b.k);b.b("selectExtensions.readValue",b.k.q);b.b("selectExtensions.writeValue",b.k.T);var ja=/\@ko_token_(\d+)\@/g,ma=["true","false"],na=/^(?:[$_a-z][$\w]*|(.+)(\.\s*[$_a-z][$\w]*|\[.+\]))$/i;b.g={Q:[],aa:function(a){var d=b.a.D(a);if(3>d.length)return[];"{"===d.charAt(0)&&(d=d.substring(1,d.length-1));for(var a=[], -c=n,e,f=0;f<d.length;f++){var g=d.charAt(f);if(c===n)switch(g){case '"':case "'":case "/":c=f,e=g}else if(g==e&&"\\"!==d.charAt(f-1)){g=d.substring(c,f+1);a.push(g);var h="@ko_token_"+(a.length-1)+"@",d=d.substring(0,c)+h+d.substring(f+1),f=f-(g.length-h.length),c=n}}e=c=n;for(var j=0,k=n,f=0;f<d.length;f++){g=d.charAt(f);if(c===n)switch(g){case "{":c=f;k=g;e="}";break;case "(":c=f;k=g;e=")";break;case "[":c=f,k=g,e="]"}g===k?j++:g===e&&(j--,0===j&&(g=d.substring(c,f+1),a.push(g),h="@ko_token_"+(a.length- -1)+"@",d=d.substring(0,c)+h+d.substring(f+1),f-=g.length-h.length,c=n))}e=[];d=d.split(",");c=0;for(f=d.length;c<f;c++)j=d[c],k=j.indexOf(":"),0<k&&k<j.length-1?(g=j.substring(k+1),e.push({key:O(j.substring(0,k),a),value:O(g,a)})):e.push({unknown:O(j,a)});return e},ba:function(a){for(var d="string"===typeof a?b.g.aa(a):a,c=[],a=[],e,f=0;e=d[f];f++)if(0<c.length&&c.push(","),e.key){var g;a:{g=e.key;var h=b.a.D(g);switch(h.length&&h.charAt(0)){case "'":case '"':break a;default:g="'"+h+"'"}}e=e.value; -c.push(g);c.push(":");c.push(e);e=b.a.D(e);0<=b.a.i(ma,b.a.D(e).toLowerCase())?e=q:(h=e.match(na),e=h===n?q:h[1]?"Object("+h[1]+")"+h[2]:e);e&&(0<a.length&&a.push(", "),a.push(g+" : function(__ko_value) { "+e+" = __ko_value; }"))}else e.unknown&&c.push(e.unknown);d=c.join("");0<a.length&&(d=d+", '_ko_property_writers' : { "+a.join("")+" } ");return d},Db:function(a,d){for(var c=0;c<a.length;c++)if(b.a.D(a[c].key)==d)return l;return q},ea:function(a,d,c,e,f){if(!a||!b.Qa(a)){if((a=d()._ko_property_writers)&& -a[c])a[c](e)}else(!f||a.t()!==e)&&a(e)}};b.b("expressionRewriting",b.g);b.b("expressionRewriting.bindingRewriteValidators",b.g.Q);b.b("expressionRewriting.parseObjectLiteral",b.g.aa);b.b("expressionRewriting.preProcessBindings",b.g.ba);b.b("jsonExpressionRewriting",b.g);b.b("jsonExpressionRewriting.insertPropertyAccessorsIntoJson",b.g.ba);var J="<\!--test--\>"===x.createComment("test").text,ia=J?/^<\!--\s*ko(?:\s+(.+\s*\:[\s\S]*))?\s*--\>$/:/^\s*ko(?:\s+(.+\s*\:[\s\S]*))?\s*$/,ha=J?/^<\!--\s*\/ko\s*--\>$/: -/^\s*\/ko\s*$/,oa={ul:l,ol:l};b.e={I:{},childNodes:function(a){return A(a)?$(a):a.childNodes},Y:function(a){if(A(a))for(var a=b.e.childNodes(a),d=0,c=a.length;d<c;d++)b.removeNode(a[d]);else b.a.ka(a)},N:function(a,d){if(A(a)){b.e.Y(a);for(var c=a.nextSibling,e=0,f=d.length;e<f;e++)c.parentNode.insertBefore(d[e],c)}else b.a.N(a,d)},Ua:function(a,b){A(a)?a.parentNode.insertBefore(b,a.nextSibling):a.firstChild?a.insertBefore(b,a.firstChild):a.appendChild(b)},Oa:function(a,d,c){c?A(a)?a.parentNode.insertBefore(d, -c.nextSibling):c.nextSibling?a.insertBefore(d,c.nextSibling):a.appendChild(d):b.e.Ua(a,d)},firstChild:function(a){return!A(a)?a.firstChild:!a.nextSibling||G(a.nextSibling)?n:a.nextSibling},nextSibling:function(a){A(a)&&(a=Z(a));return a.nextSibling&&G(a.nextSibling)?n:a.nextSibling},ib:function(a){return(a=A(a))?a[1]:n},Sa:function(a){if(oa[b.a.u(a)]){var d=a.firstChild;if(d){do if(1===d.nodeType){var c;c=d.firstChild;var e=n;if(c){do if(e)e.push(c);else if(A(c)){var f=Z(c,l);f?c=f:e=[c]}else G(c)&& -(e=[c]);while(c=c.nextSibling)}if(c=e){e=d.nextSibling;for(f=0;f<c.length;f++)e?a.insertBefore(c[f],e):a.appendChild(c[f])}}while(d=d.nextSibling)}}}};b.b("virtualElements",b.e);b.b("virtualElements.allowedBindings",b.e.I);b.b("virtualElements.emptyNode",b.e.Y);b.b("virtualElements.insertAfter",b.e.Oa);b.b("virtualElements.prepend",b.e.Ua);b.b("virtualElements.setDomNodeChildren",b.e.N);b.J=function(){this.Ga={}};b.a.extend(b.J.prototype,{nodeHasBindings:function(a){switch(a.nodeType){case 1:return a.getAttribute("data-bind")!= -n;case 8:return b.e.ib(a)!=n;default:return q}},getBindings:function(a,b){var c=this.getBindingsString(a,b);return c?this.parseBindingsString(c,b,a):n},getBindingsString:function(a){switch(a.nodeType){case 1:return a.getAttribute("data-bind");case 8:return b.e.ib(a);default:return n}},parseBindingsString:function(a,d,c){try{var e;if(!(e=this.Ga[a])){var f=this.Ga,g="with($context){with($data||{}){return{"+b.g.ba(a)+"}}}";e=f[a]=new Function("$context","$element",g)}return e(d,c)}catch(h){i(Error("Unable to parse bindings.\nMessage: "+ -h+";\nBindings value: "+a))}}});b.J.instance=new b.J;b.b("bindingProvider",b.J);b.c={};b.z=function(a,d,c){d?(b.a.extend(this,d),this.$parentContext=d,this.$parent=d.$data,this.$parents=(d.$parents||[]).slice(0),this.$parents.unshift(this.$parent)):(this.$parents=[],this.$root=a,this.ko=b);this.$data=a;c&&(this[c]=a)};b.z.prototype.createChildContext=function(a,d){return new b.z(a,this,d)};b.z.prototype.extend=function(a){var d=b.a.extend(new b.z,this);return b.a.extend(d,a)};b.cb=function(a,d){if(2== -arguments.length)b.a.f.set(a,"__ko_bindingContext__",d);else return b.a.f.get(a,"__ko_bindingContext__")};b.Ea=function(a,d,c){1===a.nodeType&&b.e.Sa(a);return W(a,d,c,l)};b.Da=function(a,b){(1===b.nodeType||8===b.nodeType)&&Y(a,b,l)};b.Ca=function(a,b){b&&(1!==b.nodeType&&8!==b.nodeType)&&i(Error("ko.applyBindings: first parameter should be your view model; second parameter should be a DOM node"));b=b||w.document.body;X(a,b,l)};b.ja=function(a){switch(a.nodeType){case 1:case 8:var d=b.cb(a);if(d)return d; -if(a.parentNode)return b.ja(a.parentNode)}return H};b.ob=function(a){return(a=b.ja(a))?a.$data:H};b.b("bindingHandlers",b.c);b.b("applyBindings",b.Ca);b.b("applyBindingsToDescendants",b.Da);b.b("applyBindingsToNode",b.Ea);b.b("contextFor",b.ja);b.b("dataFor",b.ob);var ea={"class":"className","for":"htmlFor"};b.c.attr={update:function(a,d){var c=b.a.d(d())||{},e;for(e in c)if("string"==typeof e){var f=b.a.d(c[e]),g=f===q||f===n||f===H;g&&a.removeAttribute(e);8>=b.a.Z&&e in ea?(e=ea[e],g?a.removeAttribute(e): -a[e]=f):g||a.setAttribute(e,f.toString());"name"===e&&b.a.$a(a,g?"":f.toString())}}};b.c.checked={init:function(a,d,c){b.a.n(a,"click",function(){var e;if("checkbox"==a.type)e=a.checked;else if("radio"==a.type&&a.checked)e=a.value;else return;var f=d(),g=b.a.d(f);"checkbox"==a.type&&g instanceof Array?(e=b.a.i(g,a.value),a.checked&&0>e?f.push(a.value):!a.checked&&0<=e&&f.splice(e,1)):b.g.ea(f,c,"checked",e,l)});"radio"==a.type&&!a.name&&b.c.uniqueName.init(a,t(l))},update:function(a,d){var c=b.a.d(d()); -"checkbox"==a.type?a.checked=c instanceof Array?0<=b.a.i(c,a.value):c:"radio"==a.type&&(a.checked=a.value==c)}};b.c.css={update:function(a,d){var c=b.a.d(d());if("object"==typeof c)for(var e in c){var f=b.a.d(c[e]);b.a.da(a,e,f)}else c=String(c||""),b.a.da(a,a.__ko__cssValue,q),a.__ko__cssValue=c,b.a.da(a,c,l)}};b.c.enable={update:function(a,d){var c=b.a.d(d());c&&a.disabled?a.removeAttribute("disabled"):!c&&!a.disabled&&(a.disabled=l)}};b.c.disable={update:function(a,d){b.c.enable.update(a,function(){return!b.a.d(d())})}}; -b.c.event={init:function(a,d,c,e){var f=d()||{},g;for(g in f)(function(){var f=g;"string"==typeof f&&b.a.n(a,f,function(a){var g,m=d()[f];if(m){var p=c();try{var r=b.a.L(arguments);r.unshift(e);g=m.apply(e,r)}finally{g!==l&&(a.preventDefault?a.preventDefault():a.returnValue=q)}p[f+"Bubble"]===q&&(a.cancelBubble=l,a.stopPropagation&&a.stopPropagation())}})})()}};b.c.foreach={Ra:function(a){return function(){var d=a(),c=b.a.ta(d);if(!c||"number"==typeof c.length)return{foreach:d,templateEngine:b.C.na}; -b.a.d(d);return{foreach:c.data,as:c.as,includeDestroyed:c.includeDestroyed,afterAdd:c.afterAdd,beforeRemove:c.beforeRemove,afterRender:c.afterRender,beforeMove:c.beforeMove,afterMove:c.afterMove,templateEngine:b.C.na}}},init:function(a,d){return b.c.template.init(a,b.c.foreach.Ra(d))},update:function(a,d,c,e,f){return b.c.template.update(a,b.c.foreach.Ra(d),c,e,f)}};b.g.Q.foreach=q;b.e.I.foreach=l;b.c.hasfocus={init:function(a,d,c){function e(e){a.__ko_hasfocusUpdating=l;var f=a.ownerDocument;"activeElement"in -f&&(e=f.activeElement===a);f=d();b.g.ea(f,c,"hasfocus",e,l);a.__ko_hasfocusUpdating=q}var f=e.bind(n,l),g=e.bind(n,q);b.a.n(a,"focus",f);b.a.n(a,"focusin",f);b.a.n(a,"blur",g);b.a.n(a,"focusout",g)},update:function(a,d){var c=b.a.d(d());a.__ko_hasfocusUpdating||(c?a.focus():a.blur(),b.r.K(b.a.Aa,n,[a,c?"focusin":"focusout"]))}};b.c.html={init:function(){return{controlsDescendantBindings:l}},update:function(a,d){b.a.ca(a,d())}};var ca="__ko_withIfBindingData";P("if");P("ifnot",q,l);P("with",l,q,function(a, -b){return a.createChildContext(b)});b.c.options={update:function(a,d,c){"select"!==b.a.u(a)&&i(Error("options binding applies only to SELECT elements"));for(var e=0==a.length,f=b.a.V(b.a.fa(a.childNodes,function(a){return a.tagName&&"option"===b.a.u(a)&&a.selected}),function(a){return b.k.q(a)||a.innerText||a.textContent}),g=a.scrollTop,h=b.a.d(d());0<a.length;)b.A(a.options[0]),a.remove(0);if(h){var c=c(),j=c.optionsIncludeDestroyed;"number"!=typeof h.length&&(h=[h]);if(c.optionsCaption){var k=x.createElement("option"); -b.a.ca(k,c.optionsCaption);b.k.T(k,H);a.appendChild(k)}for(var d=0,m=h.length;d<m;d++){var p=h[d];if(!p||!p._destroy||j){var k=x.createElement("option"),r=function(a,b,c){var d=typeof b;return"function"==d?b(a):"string"==d?a[b]:c},u=r(p,c.optionsValue,p);b.k.T(k,b.a.d(u));p=r(p,c.optionsText,u);b.a.bb(k,p);a.appendChild(k)}}h=a.getElementsByTagName("option");d=j=0;for(m=h.length;d<m;d++)0<=b.a.i(f,b.k.q(h[d]))&&(b.a.ab(h[d],l),j++);a.scrollTop=g;e&&"value"in c&&da(a,b.a.ta(c.value),l);b.a.tb(a)}}}; -b.c.options.ra="__ko.optionValueDomData__";b.c.selectedOptions={init:function(a,d,c){b.a.n(a,"change",function(){var e=d(),f=[];b.a.o(a.getElementsByTagName("option"),function(a){a.selected&&f.push(b.k.q(a))});b.g.ea(e,c,"value",f)})},update:function(a,d){"select"!=b.a.u(a)&&i(Error("values binding applies only to SELECT elements"));var c=b.a.d(d());c&&"number"==typeof c.length&&b.a.o(a.getElementsByTagName("option"),function(a){var d=0<=b.a.i(c,b.k.q(a));b.a.ab(a,d)})}};b.c.style={update:function(a, -d){var c=b.a.d(d()||{}),e;for(e in c)if("string"==typeof e){var f=b.a.d(c[e]);a.style[e]=f||""}}};b.c.submit={init:function(a,d,c,e){"function"!=typeof d()&&i(Error("The value for a submit binding must be a function"));b.a.n(a,"submit",function(b){var c,h=d();try{c=h.call(e,a)}finally{c!==l&&(b.preventDefault?b.preventDefault():b.returnValue=q)}})}};b.c.text={update:function(a,d){b.a.bb(a,d())}};b.e.I.text=l;b.c.uniqueName={init:function(a,d){if(d()){var c="ko_unique_"+ ++b.c.uniqueName.nb;b.a.$a(a, -c)}}};b.c.uniqueName.nb=0;b.c.value={init:function(a,d,c){function e(){h=q;var e=d(),f=b.k.q(a);b.g.ea(e,c,"value",f)}var f=["change"],g=c().valueUpdate,h=q;g&&("string"==typeof g&&(g=[g]),b.a.P(f,g),f=b.a.Fa(f));if(b.a.Z&&("input"==a.tagName.toLowerCase()&&"text"==a.type&&"off"!=a.autocomplete&&(!a.form||"off"!=a.form.autocomplete))&&-1==b.a.i(f,"propertychange"))b.a.n(a,"propertychange",function(){h=l}),b.a.n(a,"blur",function(){h&&e()});b.a.o(f,function(c){var d=e;b.a.Nb(c,"after")&&(d=function(){setTimeout(e, -0)},c=c.substring(5));b.a.n(a,c,d)})},update:function(a,d){var c="select"===b.a.u(a),e=b.a.d(d()),f=b.k.q(a),g=e!=f;0===e&&(0!==f&&"0"!==f)&&(g=l);g&&(f=function(){b.k.T(a,e)},f(),c&&setTimeout(f,0));c&&0<a.length&&da(a,e,q)}};b.c.visible={update:function(a,d){var c=b.a.d(d()),e="none"!=a.style.display;c&&!e?a.style.display="":!c&&e&&(a.style.display="none")}};b.c.click={init:function(a,d,c,e){return b.c.event.init.call(this,a,function(){var a={};a.click=d();return a},c,e)}};b.v=function(){};b.v.prototype.renderTemplateSource= -function(){i(Error("Override renderTemplateSource"))};b.v.prototype.createJavaScriptEvaluatorBlock=function(){i(Error("Override createJavaScriptEvaluatorBlock"))};b.v.prototype.makeTemplateSource=function(a,d){if("string"==typeof a){var d=d||x,c=d.getElementById(a);c||i(Error("Cannot find template with ID "+a));return new b.l.h(c)}if(1==a.nodeType||8==a.nodeType)return new b.l.O(a);i(Error("Unknown template type: "+a))};b.v.prototype.renderTemplate=function(a,b,c,e){a=this.makeTemplateSource(a,e); -return this.renderTemplateSource(a,b,c)};b.v.prototype.isTemplateRewritten=function(a,b){return this.allowTemplateRewriting===q?l:this.makeTemplateSource(a,b).data("isRewritten")};b.v.prototype.rewriteTemplate=function(a,b,c){a=this.makeTemplateSource(a,c);b=b(a.text());a.text(b);a.data("isRewritten",l)};b.b("templateEngine",b.v);var pa=/(<[a-z]+\d*(\s+(?!data-bind=)[a-z0-9\-]+(=(\"[^\"]*\"|\'[^\']*\'))?)*\s+)data-bind=(["'])([\s\S]*?)\5/gi,qa=/<\!--\s*ko\b\s*([\s\S]*?)\s*--\>/g;b.ya={ub:function(a, -d,c){d.isTemplateRewritten(a,c)||d.rewriteTemplate(a,function(a){return b.ya.Fb(a,d)},c)},Fb:function(a,b){return a.replace(pa,function(a,e,f,g,h,j,k){return V(k,e,b)}).replace(qa,function(a,e){return V(e,"<\!-- ko --\>",b)})},jb:function(a){return b.s.qa(function(d,c){d.nextSibling&&b.Ea(d.nextSibling,a,c)})}};b.b("__tr_ambtns",b.ya.jb);b.l={};b.l.h=function(a){this.h=a};b.l.h.prototype.text=function(){var a=b.a.u(this.h),a="script"===a?"text":"textarea"===a?"value":"innerHTML";if(0==arguments.length)return this.h[a]; -var d=arguments[0];"innerHTML"===a?b.a.ca(this.h,d):this.h[a]=d};b.l.h.prototype.data=function(a){if(1===arguments.length)return b.a.f.get(this.h,"templateSourceData_"+a);b.a.f.set(this.h,"templateSourceData_"+a,arguments[1])};b.l.O=function(a){this.h=a};b.l.O.prototype=new b.l.h;b.l.O.prototype.text=function(){if(0==arguments.length){var a=b.a.f.get(this.h,"__ko_anon_template__")||{};a.za===H&&a.ia&&(a.za=a.ia.innerHTML);return a.za}b.a.f.set(this.h,"__ko_anon_template__",{za:arguments[0]})};b.l.h.prototype.nodes= -function(){if(0==arguments.length)return(b.a.f.get(this.h,"__ko_anon_template__")||{}).ia;b.a.f.set(this.h,"__ko_anon_template__",{ia:arguments[0]})};b.b("templateSources",b.l);b.b("templateSources.domElement",b.l.h);b.b("templateSources.anonymousTemplate",b.l.O);var N;b.va=function(a){a!=H&&!(a instanceof b.v)&&i(Error("templateEngine must inherit from ko.templateEngine"));N=a};b.ua=function(a,d,c,e,f){c=c||{};(c.templateEngine||N)==H&&i(Error("Set a template engine before calling renderTemplate")); -f=f||"replaceChildren";if(e){var g=M(e);return b.j(function(){var h=d&&d instanceof b.z?d:new b.z(b.a.d(d)),j="function"==typeof a?a(h.$data,h):a,h=S(e,f,j,h,c);"replaceNode"==f&&(e=h,g=M(e))},n,{Ja:function(){return!g||!b.a.X(g)},W:g&&"replaceNode"==f?g.parentNode:g})}return b.s.qa(function(e){b.ua(a,d,c,e,"replaceNode")})};b.Lb=function(a,d,c,e,f){function g(a,b){T(b,j);c.afterRender&&c.afterRender(b,a)}function h(d,e){j=f.createChildContext(b.a.d(d),c.as);j.$index=e;var g="function"==typeof a? -a(d,j):a;return S(n,"ignoreTargetNode",g,j,c)}var j;return b.j(function(){var a=b.a.d(d)||[];"undefined"==typeof a.length&&(a=[a]);a=b.a.fa(a,function(a){return c.includeDestroyed||a===H||a===n||!b.a.d(a._destroy)});b.r.K(b.a.Za,n,[e,a,h,c,g])},n,{W:e})};b.c.template={init:function(a,d){var c=b.a.d(d());if("string"!=typeof c&&!c.name&&(1==a.nodeType||8==a.nodeType))c=1==a.nodeType?a.childNodes:b.e.childNodes(a),c=b.a.Gb(c),(new b.l.O(a)).nodes(c);return{controlsDescendantBindings:l}},update:function(a, -d,c,e,f){var d=b.a.d(d()),c={},e=l,g,h=n;"string"!=typeof d&&(c=d,d=c.name,"if"in c&&(e=b.a.d(c["if"])),e&&"ifnot"in c&&(e=!b.a.d(c.ifnot)),g=b.a.d(c.data));"foreach"in c?h=b.Lb(d||a,e&&c.foreach||[],c,a,f):e?(f="data"in c?f.createChildContext(g,c.as):f,h=b.ua(d||a,f,c,a)):b.e.Y(a);f=h;(g=b.a.f.get(a,"__ko__templateComputedDomDataKey__"))&&"function"==typeof g.B&&g.B();b.a.f.set(a,"__ko__templateComputedDomDataKey__",f&&f.oa()?f:H)}};b.g.Q.template=function(a){a=b.g.aa(a);return 1==a.length&&a[0].unknown|| -b.g.Db(a,"name")?n:"This template engine does not support anonymous templates nested within its templates"};b.e.I.template=l;b.b("setTemplateEngine",b.va);b.b("renderTemplate",b.ua);b.a.Ia=function(a,b,c){a=a||[];b=b||[];return a.length<=b.length?R(a,b,"added","deleted",c):R(b,a,"deleted","added",c)};b.b("utils.compareArrays",b.a.Ia);b.a.Za=function(a,d,c,e,f){function g(a,b){s=k[b];v!==b&&(y[a]=s);s.ma(v++);L(s.M);r.push(s);z.push(s)}function h(a,c){if(a)for(var d=0,e=c.length;d<e;d++)c[d]&&b.a.o(c[d].M, -function(b){a(b,d,c[d].U)})}for(var d=d||[],e=e||{},j=b.a.f.get(a,"setDomNodeChildrenFromArrayMapping_lastMappingResult")===H,k=b.a.f.get(a,"setDomNodeChildrenFromArrayMapping_lastMappingResult")||[],m=b.a.V(k,function(a){return a.U}),p=b.a.Ia(m,d),r=[],u=0,v=0,A=[],z=[],d=[],y=[],m=[],s,C=0,B,D;B=p[C];C++)switch(D=B.moved,B.status){case "deleted":D===H&&(s=k[u],s.j&&s.j.B(),A.push.apply(A,L(s.M)),e.beforeRemove&&(d[C]=s,z.push(s)));u++;break;case "retained":g(C,u++);break;case "added":D!==H?g(C, -D):(s={U:B.value,ma:b.m(v++)},r.push(s),z.push(s),j||(m[C]=s))}h(e.beforeMove,y);b.a.o(A,e.beforeRemove?b.A:b.removeNode);for(var C=0,j=b.e.firstChild(a),G;s=z[C];C++){s.M||b.a.extend(s,ga(a,c,s.U,f,s.ma));for(u=0;p=s.M[u];j=p.nextSibling,G=p,u++)p!==j&&b.e.Oa(a,p,G);!s.zb&&f&&(f(s.U,s.M,s.ma),s.zb=l)}h(e.beforeRemove,d);h(e.afterMove,y);h(e.afterAdd,m);b.a.f.set(a,"setDomNodeChildrenFromArrayMapping_lastMappingResult",r)};b.b("utils.setDomNodeChildrenFromArrayMapping",b.a.Za);b.C=function(){this.allowTemplateRewriting= -q};b.C.prototype=new b.v;b.C.prototype.renderTemplateSource=function(a){var d=!(9>b.a.Z)&&a.nodes?a.nodes():n;if(d)return b.a.L(d.cloneNode(l).childNodes);a=a.text();return b.a.sa(a)};b.C.na=new b.C;b.va(b.C.na);b.b("nativeTemplateEngine",b.C);b.pa=function(){var a=this.Cb=function(){if("undefined"==typeof E||!E.tmpl)return 0;try{if(0<=E.tmpl.tag.tmpl.open.toString().indexOf("__"))return 2}catch(a){}return 1}();this.renderTemplateSource=function(b,c,e){e=e||{};2>a&&i(Error("Your version of jQuery.tmpl is too old. Please upgrade to jQuery.tmpl 1.0.0pre or later.")); -var f=b.data("precompiled");f||(f=b.text()||"",f=E.template(n,"{{ko_with $item.koBindingContext}}"+f+"{{/ko_with}}"),b.data("precompiled",f));b=[c.$data];c=E.extend({koBindingContext:c},e.templateOptions);c=E.tmpl(f,b,c);c.appendTo(x.createElement("div"));E.fragments={};return c};this.createJavaScriptEvaluatorBlock=function(a){return"{{ko_code ((function() { return "+a+" })()) }}"};this.addTemplate=function(a,b){x.write("<script type='text/html' id='"+a+"'>"+b+"<\/script>")};0<a&&(E.tmpl.tag.ko_code= -{open:"__.push($1 || '');"},E.tmpl.tag.ko_with={open:"with($1) {",close:"} "})};b.pa.prototype=new b.v;v=new b.pa;0<v.Cb&&b.va(v);b.b("jqueryTmplTemplateEngine",b.pa)}"function"===typeof require&&"object"===typeof exports&&"object"===typeof module?K(module.exports||exports):"function"===typeof define&&define.amd?define(["exports"],K):K(w.ko={});l; -})(); diff -r 334b905c2d77dd5732ecd9981955c224e8252d30 -r bdeba59cc2fb3bea1d11c6488d32430977db39f5 vcweb/lighterprints/templates/lighterprints/mobile/app/knockout.mapping-latest.js --- a/vcweb/lighterprints/templates/lighterprints/mobile/app/knockout.mapping-latest.js +++ /dev/null @@ -1,21 +0,0 @@ -/// Knockout Mapping plugin v2.3.5 -/// (c) 2012 Steven Sanderson, Roy Jacobs - http://knockoutjs.com/ -/// License: MIT (http://www.opensource.org/licenses/mit-license.php) -(function(e){"function"===typeof require&&"object"===typeof exports&&"object"===typeof module?e(require("knockout"),exports):"function"===typeof define&&define.amd?define(["knockout","exports"],e):e(ko,ko.mapping={})})(function(e,f){function x(b,c){var a,d;for(d in c)if(c.hasOwnProperty(d)&&c[d])if(a=f.getType(b[d]),d&&b[d]&&"array"!==a&&"string"!==a)x(b[d],c[d]);else if("array"===f.getType(b[d])&&"array"===f.getType(c[d])){a=b;for(var e=d,k=b[d],m=c[d],s={},g=k.length-1;0<=g;--g)s[k[g]]=k[g];for(g= -m.length-1;0<=g;--g)s[m[g]]=m[g];k=[];m=void 0;for(m in s)k.push(s[m]);a[e]=k}else b[d]=c[d]}function D(b,c){var a={};x(a,b);x(a,c);return a}function y(b,c){for(var a=D({},b),e=K.length-1;0<=e;e--){var f=K[e];a[f]&&(a[""]instanceof Object||(a[""]={}),a[""][f]=a[f],delete a[f])}c&&(a.ignore=h(c.ignore,a.ignore),a.include=h(c.include,a.include),a.copy=h(c.copy,a.copy),a.observe=h(c.observe,a.observe));a.ignore=h(a.ignore,i.ignore);a.include=h(a.include,i.include);a.copy=h(a.copy,i.copy);a.observe=h(a.observe, -i.observe);a.mappedProperties=a.mappedProperties||{};a.copiedProperties=a.copiedProperties||{};return a}function h(b,c){"array"!==f.getType(b)&&(b="undefined"===f.getType(b)?[]:[b]);"array"!==f.getType(c)&&(c="undefined"===f.getType(c)?[]:[c]);return e.utils.arrayGetDistinctValues(b.concat(c))}function E(b,c,a,d,j,k,m){var s="array"===f.getType(e.utils.unwrapObservable(c)),k=k||"";if(f.isMapped(b))var g=e.utils.unwrapObservable(b)[n],a=D(g,a);var i=m||j,h=function(){return a[d]&&a[d].create instanceof -Function},w=function(b){var f=F,g=e.dependentObservable;e.dependentObservable=function(a,b,c){c=c||{};a&&"object"==typeof a&&(c=a);var d=c.deferEvaluation,L=!1;c.deferEvaluation=!0;a=new G(a,b,c);if(!d){var g=a,d=e.dependentObservable;e.dependentObservable=G;a=e.isWriteableObservable(g);e.dependentObservable=d;a=G({read:function(){L||(e.utils.arrayRemoveItem(f,g),L=!0);return g.apply(g,arguments)},write:a&&function(a){return g(a)},deferEvaluation:!0});f.push(a)}return a};e.dependentObservable.fn= -G.fn;e.computed=e.dependentObservable;b=e.utils.unwrapObservable(j)instanceof Array?a[d].create({data:b||c,parent:i,skip:M}):a[d].create({data:b||c,parent:i});e.dependentObservable=g;e.computed=e.dependentObservable;return b},t=function(){return a[d]&&a[d].update instanceof Function},u=function(b,f){var g={data:f||c,parent:i,target:e.utils.unwrapObservable(b)};e.isWriteableObservable(b)&&(g.observable=b);return a[d].update(g)};if(m=H.get(c))return m;d=d||"";if(s){var s=[],r=!1,l=function(a){return a}; -a[d]&&a[d].key&&(l=a[d].key,r=!0);e.isObservable(b)||(b=e.observableArray([]),b.mappedRemove=function(a){var c="function"==typeof a?a:function(b){return b===l(a)};return b.remove(function(a){return c(l(a))})},b.mappedRemoveAll=function(a){var c=B(a,l);return b.remove(function(a){return-1!=e.utils.arrayIndexOf(c,l(a))})},b.mappedDestroy=function(a){var c="function"==typeof a?a:function(b){return b===l(a)};return b.destroy(function(a){return c(l(a))})},b.mappedDestroyAll=function(a){var c=B(a,l);return b.destroy(function(a){return-1!= -e.utils.arrayIndexOf(c,l(a))})},b.mappedIndexOf=function(a){var c=B(b(),l),a=l(a);return e.utils.arrayIndexOf(c,a)},b.mappedCreate=function(a){if(-1!==b.mappedIndexOf(a))throw Error("There already is an object with the key that you specified.");var c=h()?w(a):a;t()&&(a=u(c,a),e.isWriteableObservable(c)?c(a):c=a);b.push(c);return c});m=B(e.utils.unwrapObservable(b),l).sort();g=B(c,l);r&&g.sort();var r=e.utils.compareArrays(m,g),m={},I,z=e.utils.unwrapObservable(c),x={},y=!0,g=0;for(I=z.length;g<I;g++){var q= -l(z[g]);if(void 0===q||q instanceof Object){y=!1;break}x[q]=z[g]}var z=[],A=0,g=0;for(I=r.length;g<I;g++){var q=r[g],p,v=k+"["+g+"]";switch(q.status){case "added":var C=y?x[q.value]:J(e.utils.unwrapObservable(c),q.value,l);p=E(void 0,C,a,d,b,v,j);h()||(p=e.utils.unwrapObservable(p));v=N(e.utils.unwrapObservable(c),C,m);p===M?A++:z[v-A]=p;m[v]=!0;break;case "retained":C=y?x[q.value]:J(e.utils.unwrapObservable(c),q.value,l);p=J(b,q.value,l);E(p,C,a,d,b,v,j);v=N(e.utils.unwrapObservable(c),C,m);z[v]= -p;m[v]=!0;break;case "deleted":p=J(b,q.value,l)}s.push({event:q.status,item:p})}b(z);a[d]&&a[d].arrayChanged&&e.utils.arrayForEach(s,function(b){a[d].arrayChanged(b.event,b.item)})}else if(O(c)){b=e.utils.unwrapObservable(b);if(!b){if(h())return r=w(),t()&&(r=u(r)),r;if(t())return u(r);b={}}t()&&(b=u(b));H.save(c,b);if(t())return b;P(c,function(d){var f=k.length?k+"."+d:d;if(-1==e.utils.arrayIndexOf(a.ignore,f))if(-1!=e.utils.arrayIndexOf(a.copy,f))b[d]=c[d];else if("object"!=typeof c[d]&&"array"!= -typeof c[d]&&0<a.observe.length&&-1==e.utils.arrayIndexOf(a.observe,f))b[d]=c[d],a.copiedProperties[f]=!0;else{var g=H.get(c[d]),j=E(b[d],c[d],a,d,b,f,b),g=g||j;if(0<a.observe.length&&-1==e.utils.arrayIndexOf(a.observe,f))b[d]=g(),a.copiedProperties[f]=!0;else{if(e.isWriteableObservable(b[d]))b[d](e.utils.unwrapObservable(g));else g=void 0===b[d]?g:e.utils.unwrapObservable(g),b[d]=g;a.mappedProperties[f]=!0}}})}else switch(f.getType(c)){case "function":t()?e.isWriteableObservable(c)?(c(u(c)),b=c): -b=u(c):b=c;break;default:if(e.isWriteableObservable(b))return p=t()?u(b):e.utils.unwrapObservable(c),b(p),p;h()||t();b=h()?w():e.observable(e.utils.unwrapObservable(c));t()&&b(u(b))}return b}function N(b,c,a){for(var d=0,e=b.length;d<e;d++)if(!0!==a[d]&&b[d]===c)return d;return null}function Q(b,c){var a;c&&(a=c(b));"undefined"===f.getType(a)&&(a=b);return e.utils.unwrapObservable(a)}function J(b,c,a){for(var b=e.utils.unwrapObservable(b),d=0,f=b.length;d<f;d++){var k=b[d];if(Q(k,a)===c)return k}throw Error("When calling ko.update*, the key '"+ -c+"' was not found!");}function B(b,c){return e.utils.arrayMap(e.utils.unwrapObservable(b),function(a){return c?Q(a,c):a})}function P(b,c){if("array"===f.getType(b))for(var a=0;a<b.length;a++)c(a);else for(a in b)c(a)}function O(b){var c=f.getType(b);return("object"===c||"array"===c)&&null!==b}function S(){var b=[],c=[];this.save=function(a,d){var f=e.utils.arrayIndexOf(b,a);0<=f?c[f]=d:(b.push(a),c.push(d))};this.get=function(a){a=e.utils.arrayIndexOf(b,a);return 0<=a?c[a]:void 0}}function R(){var b= -{},c=function(a){var c;try{c=a}catch(e){c="$$$"}a=b[c];void 0===a&&(a=new S,b[c]=a);return a};this.save=function(a,b){c(a).save(a,b)};this.get=function(a){return c(a).get(a)}}var n="__ko_mapping__",G=e.dependentObservable,A=0,F,H,K=["create","update","key","arrayChanged"],M={},w={include:["_destroy"],ignore:[],copy:[],observe:[]},i=w;f.isMapped=function(b){return(b=e.utils.unwrapObservable(b))&&b[n]};f.fromJS=function(b){if(0==arguments.length)throw Error("When calling ko.fromJS, pass the object you want to convert."); -window.setTimeout(function(){A=0},0);A++||(F=[],H=new R);var c,a;2==arguments.length&&(arguments[1][n]?a=arguments[1]:c=arguments[1]);3==arguments.length&&(c=arguments[1],a=arguments[2]);a&&(c=D(c,a[n]));c=y(c);var d=E(a,b,c);a&&(d=a);--A||window.setTimeout(function(){for(;F.length;){var a=F.pop();a&&a()}},0);d[n]=D(d[n],c);return d};f.fromJSON=function(b){var c=e.utils.parseJson(b);arguments[0]=c;return f.fromJS.apply(this,arguments)};f.updateFromJS=function(){throw Error("ko.mapping.updateFromJS, use ko.mapping.fromJS instead. Please note that the order of parameters is different!"); -};f.updateFromJSON=function(){throw Error("ko.mapping.updateFromJSON, use ko.mapping.fromJSON instead. Please note that the order of parameters is different!");};f.toJS=function(b,c){i||f.resetDefaultOptions();if(0==arguments.length)throw Error("When calling ko.mapping.toJS, pass the object you want to convert.");if("array"!==f.getType(i.ignore))throw Error("ko.mapping.defaultOptions().ignore should be an array.");if("array"!==f.getType(i.include))throw Error("ko.mapping.defaultOptions().include should be an array."); -if("array"!==f.getType(i.copy))throw Error("ko.mapping.defaultOptions().copy should be an array.");c=y(c,b[n]);return f.visitModel(b,function(a){return e.utils.unwrapObservable(a)},c)};f.toJSON=function(b,c){var a=f.toJS(b,c);return e.utils.stringifyJson(a)};f.defaultOptions=function(){if(0<arguments.length)i=arguments[0];else return i};f.resetDefaultOptions=function(){i={include:w.include.slice(0),ignore:w.ignore.slice(0),copy:w.copy.slice(0)}};f.getType=function(b){if(b&&"object"===typeof b){if(b.constructor== -(new Date).constructor)return"date";if("[object Array]"===Object.prototype.toString.call(b))return"array"}return typeof b};f.visitModel=function(b,c,a){a=a||{};a.visitedObjects=a.visitedObjects||new R;var d,j=e.utils.unwrapObservable(b);if(O(j))a=y(a,j[n]),c(b,a.parentName),d="array"===f.getType(j)?[]:{};else return c(b,a.parentName);a.visitedObjects.save(b,d);var k=a.parentName;P(j,function(b){if(!(a.ignore&&-1!=e.utils.arrayIndexOf(a.ignore,b))){var i=j[b],g=a,h=k||"";"array"===f.getType(j)?k&& -(h+="["+b+"]"):(k&&(h+="."),h+=b);g.parentName=h;if(!(-1===e.utils.arrayIndexOf(a.copy,b)&&-1===e.utils.arrayIndexOf(a.include,b)&&j[n]&&j[n].mappedProperties&&!j[n].mappedProperties[b]&&j[n].copiedProperties&&!j[n].copiedProperties[b]&&"array"!==f.getType(j)))switch(f.getType(e.utils.unwrapObservable(i))){case "object":case "array":case "undefined":g=a.visitedObjects.get(i);d[b]="undefined"!==f.getType(g)?g:f.visitModel(i,c,a);break;default:d[b]=c(i,a.parentName)}}});return d}}); 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-02 22:07:32
|
1 new commit in vcweb: https://bitbucket.org/virtualcommons/vcweb/commits/334b905c2d77/ Changeset: 334b905c2d77 User: alllee Date: 2013-05-03 00:07:31 Summary: adding mobile style.css Affected #: 2 files diff -r 02e3b7c872f8dd80b380931783ca87ff1b055639 -r 334b905c2d77dd5732ecd9981955c224e8252d30 vcweb/lighterprints/static/css/lighterprints/mobile/style.css --- /dev/null +++ b/vcweb/lighterprints/static/css/lighterprints/mobile/style.css @@ -0,0 +1,45 @@ +body{ + text-align: left; +} +.navbar{ + padding-left: 2px; + padding-top: 2px; + text-align: left; + font-size:20px; +} + +.footerbar{ + padding-top: 5px; + padding-bottom: 5px; + text-align:center; +} +.innerblock{ + padding-left: 10px; + padding-right: 10px; + display: block; +} +.innerleft{ + text-align:left; + padding-left: 2px; + padding-right: 10px; + padding-top: 10px; + padding-bottom: 10px; + display: block; +} +.innerbutton{ + text-align:left; +} +#popupPanel-popup { + left: 0 !important; + right: auto !important; +} +#popupPanel { + width: 200px; + border: 1px solid #000; + border-right: none; + background: rgba(0,0,0,.5); + margin: -1px 0; +} +#popupPanel .ui-btn { + margin: 2em 15px; +} \ No newline at end of file diff -r 02e3b7c872f8dd80b380931783ca87ff1b055639 -r 334b905c2d77dd5732ecd9981955c224e8252d30 vcweb/lighterprints/templates/lighterprints/mobile/index.html --- a/vcweb/lighterprints/templates/lighterprints/mobile/index.html +++ b/vcweb/lighterprints/templates/lighterprints/mobile/index.html @@ -8,7 +8,7 @@ <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/style.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 %} 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-02 22:04:24
|
1 new commit in vcweb: https://bitbucket.org/virtualcommons/vcweb/commits/02e3b7c872f8/ Changeset: 02e3b7c872f8 User: alllee Date: 2013-05-03 00:04:13 Summary: merging rolee's work into vcweb proper, moving css, font, and javascript assets into the lighterprints static directory structure Affected #: 24 files diff -r d9fd76c96f2c46ccdc7f4e6fd30ac535b0d5dd82 -r 02e3b7c872f8dd80b380931783ca87ff1b055639 vcweb/lighterprints/static/css/lighterprints/font-awesome/README.md --- /dev/null +++ b/vcweb/lighterprints/static/css/lighterprints/font-awesome/README.md @@ -0,0 +1,4 @@ +Font Awesome, the iconic font designed for use with Twitter Bootstrap + +The full suite of pictographic icons, examples, and documentation can be found at: +http://fortawesome.github.com/Font-Awesome/ diff -r d9fd76c96f2c46ccdc7f4e6fd30ac535b0d5dd82 -r 02e3b7c872f8dd80b380931783ca87ff1b055639 vcweb/lighterprints/static/css/lighterprints/font-awesome/faicons-v2.png Binary file vcweb/lighterprints/static/css/lighterprints/font-awesome/faicons-v2.png has changed diff -r d9fd76c96f2c46ccdc7f4e6fd30ac535b0d5dd82 -r 02e3b7c872f8dd80b380931783ca87ff1b055639 vcweb/lighterprints/static/css/lighterprints/font-awesome/faicons.png Binary file vcweb/lighterprints/static/css/lighterprints/font-awesome/faicons.png has changed diff -r d9fd76c96f2c46ccdc7f4e6fd30ac535b0d5dd82 -r 02e3b7c872f8dd80b380931783ca87ff1b055639 vcweb/lighterprints/static/css/lighterprints/font-awesome/font/FontAwesome.otf Binary file vcweb/lighterprints/static/css/lighterprints/font-awesome/font/FontAwesome.otf has changed diff -r d9fd76c96f2c46ccdc7f4e6fd30ac535b0d5dd82 -r 02e3b7c872f8dd80b380931783ca87ff1b055639 vcweb/lighterprints/static/css/lighterprints/font-awesome/font/fontawesome-webfont.eot Binary file vcweb/lighterprints/static/css/lighterprints/font-awesome/font/fontawesome-webfont.eot has changed diff -r d9fd76c96f2c46ccdc7f4e6fd30ac535b0d5dd82 -r 02e3b7c872f8dd80b380931783ca87ff1b055639 vcweb/lighterprints/static/css/lighterprints/font-awesome/font/fontawesome-webfont.ttf Binary file vcweb/lighterprints/static/css/lighterprints/font-awesome/font/fontawesome-webfont.ttf has changed diff -r d9fd76c96f2c46ccdc7f4e6fd30ac535b0d5dd82 -r 02e3b7c872f8dd80b380931783ca87ff1b055639 vcweb/lighterprints/static/css/lighterprints/font-awesome/font/fontawesome-webfont.woff Binary file vcweb/lighterprints/static/css/lighterprints/font-awesome/font/fontawesome-webfont.woff has changed diff -r d9fd76c96f2c46ccdc7f4e6fd30ac535b0d5dd82 -r 02e3b7c872f8dd80b380931783ca87ff1b055639 vcweb/lighterprints/static/css/lighterprints/font-awesome/images/ajax-loader.png Binary file vcweb/lighterprints/static/css/lighterprints/font-awesome/images/ajax-loader.png has changed diff -r d9fd76c96f2c46ccdc7f4e6fd30ac535b0d5dd82 -r 02e3b7c872f8dd80b380931783ca87ff1b055639 vcweb/lighterprints/static/css/lighterprints/font-awesome/images/icons-18-black-pack.png Binary file vcweb/lighterprints/static/css/lighterprints/font-awesome/images/icons-18-black-pack.png has changed diff -r d9fd76c96f2c46ccdc7f4e6fd30ac535b0d5dd82 -r 02e3b7c872f8dd80b380931783ca87ff1b055639 vcweb/lighterprints/static/css/lighterprints/font-awesome/images/icons-18-white-pack.png Binary file vcweb/lighterprints/static/css/lighterprints/font-awesome/images/icons-18-white-pack.png has changed diff -r d9fd76c96f2c46ccdc7f4e6fd30ac535b0d5dd82 -r 02e3b7c872f8dd80b380931783ca87ff1b055639 vcweb/lighterprints/static/css/lighterprints/font-awesome/images/icons-36-black-pack.png Binary file vcweb/lighterprints/static/css/lighterprints/font-awesome/images/icons-36-black-pack.png has changed diff -r d9fd76c96f2c46ccdc7f4e6fd30ac535b0d5dd82 -r 02e3b7c872f8dd80b380931783ca87ff1b055639 vcweb/lighterprints/static/css/lighterprints/font-awesome/images/icons-36-white-pack.png Binary file vcweb/lighterprints/static/css/lighterprints/font-awesome/images/icons-36-white-pack.png has changed diff -r d9fd76c96f2c46ccdc7f4e6fd30ac535b0d5dd82 -r 02e3b7c872f8dd80b380931783ca87ff1b055639 vcweb/lighterprints/static/css/lighterprints/font-awesome/jqm-icon-pack-3.0.0-fa.css --- /dev/null +++ b/vcweb/lighterprints/static/css/lighterprints/font-awesome/jqm-icon-pack-3.0.0-fa.css @@ -0,0 +1,1 @@ +.ui-icon{width:20px;height:20px;-moz-border-radius:10px;-webkit-border-radius:10px;border-radius:10px;margin-top:-10px !important;line-height:20px}.ui-icon:before{margin-left:3px}.ui-btn-icon-notext .ui-btn-inner .ui-icon{margin:1px 1px 2px 2px !important}.ui-li-link-alt .ui-btn-inner .ui-icon{margin:-10px -10px auto auto !important}.ui-icon-plus,.ui-icon-minus,.ui-icon-delete,.ui-icon-arrow-r,.ui-icon-arrow-l,.ui-icon-arrow-u,.ui-icon-arrow-d,.ui-icon-check,.ui-icon-gear,.ui-icon-refresh,.ui-icon-forward,.ui-icon-back,.ui-icon-grid,.ui-icon-star,.ui-icon-alert,.ui-icon-info,.ui-icon-home,.ui-icon-search,.ui-icon-searchfield:after,.ui-icon-checkbox-off,.ui-icon-checkbox-on,.ui-icon-radio-off,.ui-icon-radio-on,.ui-icon-email,.ui-icon-page,.ui-icon-question,.ui-icon-foursquare,.ui-icon-dollar,.ui-icon-euro,.ui-icon-pound,.ui-icon-apple,.ui-icon-chat,.ui-icon-trash,.ui-icon-mappin,.ui-icon-direction,.ui-icon-heart,.ui-icon-wrench,.ui-icon-play,.ui-icon-pause,.ui-icon-stop,.ui-icon-person,.ui-icon-music,.ui-icon-wifi,.ui-icon-phone,.ui-icon-power,.ui-icon-lightning,.ui-icon-drink,.ui-icon-android{background-image:url("images/icons-18-white-pack.png") !important}@media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min--moz-device-pixel-ratio: 1.5), only screen and (min-resolution: 240dpi){.ui-icon-plus,.ui-icon-minus,.ui-icon-delete,.ui-icon-arrow-r,.ui-icon-arrow-l,.ui-icon-arrow-u,.ui-icon-arrow-d,.ui-icon-check,.ui-icon-gear,.ui-icon-refresh,.ui-icon-forward,.ui-icon-back,.ui-icon-grid,.ui-icon-star,.ui-icon-alert,.ui-icon-info,.ui-icon-home,.ui-icon-search,.ui-icon-searchfield:after,.ui-icon-checkbox-off,.ui-icon-checkbox-on,.ui-icon-radio-off,.ui-icon-radio-on,.ui-icon-email,.ui-icon-page,.ui-icon-question,.ui-icon-foursquare,.ui-icon-dollar,.ui-icon-euro,.ui-icon-pound,.ui-icon-apple,.ui-icon-chat,.ui-icon-trash,.ui-icon-mappin,.ui-icon-direction,.ui-icon-heart,.ui-icon-wrench,.ui-icon-play,.ui-icon-pause,.ui-icon-stop,.ui-icon-person,.ui-icon-music,.ui-icon-wifi,.ui-icon-phone,.ui-icon-power,.ui-icon-lightning,.ui-icon-drink,.ui-icon-android{background-image:url("images/icons-36-white-pack.png");-moz-background-size:774px 54px;-o-background-size:774px 54px;-webkit-background-size:774px 54px;background-size:774px 54px}.ui-icon-alt{background-image:url("images/icons-36-black-pack.png")}}.ui-icon-plus{background-position:0px 1px !important}.ui-icon-minus{background-position:-36px 1px !important}.ui-icon-delete{background-position:-71px 1px !important}.ui-icon-arrow-r{background-position:-107px 1px !important}.ui-icon-arrow-l{background-position:-143px 1px !important}.ui-icon-arrow-u{background-position:-179px 1px !important}.ui-icon-arrow-d{background-position:-215px 1px !important}.ui-icon-check{background-position:-251px 1px !important}.ui-icon-gear{background-position:-287px 1px !important}.ui-icon-refresh{background-position:-323px 1px !important}.ui-icon-forward{background-position:-359px 1px !important}.ui-icon-back{background-position:-396px 0 !important}.ui-icon-grid{background-position:-431px 1px !important}.ui-icon-star{background-position:-467px 1px !important}.ui-icon-alert{background-position:-503px 1px !important}.ui-icon-info{background-position:-539px 1px !important}.ui-icon-home{background-position:-575px 1px !important}.ui-icon-search,.ui-icon-searchfield:after{background-position:-611px 0px !important}.ui-icon-checkbox-off{background-position:-681px 1px !important}.ui-icon-checkbox-on{background-position:-647px 1px !important}.ui-icon-radio-off{background-position:-752px 1px !important}.ui-icon-radio-on{background-position:-717px 1px !important}.ui-icon-email{background-position:1px -17px !important}.ui-icon-page{background-position:-36px -17px !important}.ui-icon-question{background-position:-71px -17px !important}.ui-icon-foursquare{background-position:-107px -17px !important}.ui-icon-dollar{background-position:-215px -17px !important}.ui-icon-euro{background-position:-251px -17px !important}.ui-icon-pound{background-position:-287px -17px !important}.ui-icon-apple{background-position:-323px -17px !important}.ui-icon-chat{background-position:-359px -17px !important}.ui-icon-trash{background-position:-395px -17px !important}.ui-icon-mappin{background-position:-467px -17px !important}.ui-icon-direction{background-position:-503px -17px !important}.ui-icon-heart{background-position:-539px -17px !important}.ui-icon-wrench{background-position:-575px -17px !important}.ui-icon-play{background-position:-611px -17px !important}.ui-icon-pause{background-position:-647px -17px !important}.ui-icon-stop{background-position:-683px -17px !important}.ui-icon-person{background-position:-719px -17px !important}.ui-icon-music{background-position:-755px -17px !important}.ui-icon-wifi{background-position:-35px -34px !important}.ui-icon-phone{background-position:-72px -36px !important}.ui-icon-power{background-position:-107px -35px !important}.ui-icon-lightning{background-position:-251px -35px !important}.ui-icon-android{background-position:-323px -35px !important}@font-face{font-family:'FontAwesome';src:url("font/fontawesome-webfont.eot");src:url("font/fontawesome-webfont.eot?#iefix") format("embedded-opentype"),url("font/fontawesome-webfont.woff") format("woff"),url("font/fontawesome-webfont.ttf") format("truetype");font-weight:normal;font-style:normal}[class^="ui-icon-"]:before,[class*=" ui-icon-"]:before{font-family:FontAwesome !important;font-weight:normal;font-style:normal;display:inline-block}.ui-icon:not(.ui-icon-loading),.ui-icon-searchfield::after{background:#666666;background:rgba(0,0,0,0.4);color:#ffffff;font-weight:normal;text-shadow:none}.ui-icon-cloud-download:before{content:"\f0ed";margin-left:2px}.ui-icon-cloud-upload:before{content:"\f0ee";margin-left:2px}.ui-icon-lightbulb:before{content:"\f0eb";margin-top:1px;margin-left:3px}.ui-icon-exchange:before{content:"\f0ec"}.ui-icon-bell-alt:before{content:"\f0f3"}.ui-icon-file-alt:before{content:"\f0f6"}.ui-icon-beer:before{content:"\f0fc";margin-top:1px;margin-left:2px}.ui-icon-coffee:before{content:"\f0f4";margin-left:2px}.ui-icon-food:before{content:"\f0f5";margin-top:1px;margin-left:4px}.ui-icon-fighter-jet:before{content:"\f0fb";margin-top:1px;margin-left:2px}.ui-icon-user-md:before{content:"\f0f0"}.ui-icon-stethoscope:before{content:"\f0f1";margin-top:1px;margin-left:4px}.ui-icon-suitcase:before{content:"\f0f2";margin-left:2px}.ui-icon-building:before{content:"\f0f7"}.ui-icon-hospital:before{content:"\f0f8";margin-left:4px}.ui-icon-ambulance:before{content:"\f0f9";margin-top:1px;margin-left:1px}.ui-icon-medkit:before{content:"\f0fa";margin-top:0px;margin-left:2px}.ui-icon-h-sign:before{content:"\f0fd"}.ui-icon-plus-sign-alt:before{content:"\f0fe"}.ui-icon-spinner:before{content:"\f110"}.ui-icon-angle-left:before{content:"\f104"}.ui-icon-angle-right:before{content:"\f105"}.ui-icon-angle-up:before{content:"\f106"}.ui-icon-angle-down:before{content:"\f107"}.ui-icon-double-angle-left:before{content:"\f100"}.ui-icon-double-angle-right:before{content:"\f101";margin-left:4px}.ui-icon-double-angle-up:before{content:"\f102"}.ui-icon-double-angle-down:before{content:"\f103";margin-top:1px}.ui-icon-circle-blank:before{content:"\f10c"}.ui-icon-circle:before{content:"\f111"}.ui-icon-desktop:before{content:"\f108";margin-top:1px;margin-left:2px}.ui-icon-laptop:before{content:"\f109";margin-top:1px;margin-left:2px}.ui-icon-tablet:before{content:"\f10a";margin-top:1px}.ui-icon-mobile-phone:before{content:"\f10b"}.ui-icon-quote-left:before{content:"\f10d"}.ui-icon-quote-right:before{content:"\f10e"}.ui-icon-github-alt:before{content:"\f113"}.ui-icon-folder-close-alt:before{content:"\f114"}.ui-icon-folder-open-alt:before{content:"\f115"}.ui-icon-glass:before{content:"\f000";margin-top:2px}.ui-icon-music:before{content:"\f001";margin-left:1px;margin-top:2px}.ui-icon-fasearch:before{content:"\f002"}.ui-icon-envelope:before{content:"\f003";margin-left:-1px;margin-left:2px;margin-top:1px}.ui-icon-heart:before{content:"\f004";margin-left:3px;margin-top:2px}.ui-icon-fastar:before{content:"\f005"}.ui-icon-star-empty:before{content:"\f006"}.ui-icon-user:before{content:"\f007";margin-left:4px}.ui-icon-film:before{content:"\f008";margin-left:2px}.ui-icon-th-large:before{content:"\f009";margin-left:2px;margin-top:2px}.ui-icon-th:before{content:"\f00a";margin-left:3px;margin-top:2px}.ui-icon-th-list:before{content:"\f00b";margin-left:3px;margin-top:2px}.ui-icon-ok:before{content:"\f00c";margin-left:2px}.ui-icon-remove:before{content:"\f00d";margin-left:3px;margin-top:2px}.ui-icon-zoom-in:before{content:"\f00e"}.ui-icon-zoom-out:before{content:"\f010"}.ui-icon-off:before{content:"\f011"}.ui-icon-signal:before{content:"\f012";margin-left:-1px}.ui-icon-cog:before{content:"\f013";margin-left:3px;margin-top:2px}.ui-icon-trash:before{content:"\f014"}.ui-icon-fahome:before{content:"\f015"}.ui-icon-file:before{content:"\f016"}.ui-icon-time:before{content:"\f017";margin-top:2px}.ui-icon-road:before{content:"\f018"}.ui-icon-download-alt:before{content:"\f019"}.ui-icon-download:before{content:"\f01a";margin-top:2px}.ui-icon-upload:before{content:"\f01b";margin-top:2px}.ui-icon-inbox:before{content:"\f01c"}.ui-icon-play-circle:before{content:"\f01d";margin-top:2px}.ui-icon-repeat:before{content:"\f01e";margin-top:2px}.ui-icon-farefresh:before{content:"\f021";margin-top:2px}.ui-icon-list-alt:before{content:"\f022";margin-left:3px;margin-top:2px}.ui-icon-lock:before{content:"\f023"}.ui-icon-flag:before{content:"\f024";margin-top:2px}.ui-icon-headphones:before{content:"\f025"}.ui-icon-volume-off:before{content:"\f026"}.ui-icon-volume-down:before{content:"\f027"}.ui-icon-volume-up:before{content:"\f028"}.ui-icon-qrcode:before{content:"\f029"}.ui-icon-barcode:before{content:"\f02a"}.ui-icon-tag:before{content:"\f02b"}.ui-icon-tags:before{content:"\f02c"}.ui-icon-book:before{content:"\f02d"}.ui-icon-bookmark:before{content:"\f02e"}.ui-icon-print:before{content:"\f02f"}.ui-icon-camera:before{content:"\f030"}.ui-icon-font:before{content:"\f031";margin-left:2px}.ui-icon-bold:before{content:"\f032";margin-left:2px}.ui-icon-italic:before{content:"\f033"}.ui-icon-text-height:before{content:"\f034"}.ui-icon-text-width:before{content:"\f035"}.ui-icon-align-left:before{content:"\f036"}.ui-icon-align-center:before{content:"\f037"}.ui-icon-align-right:before{content:"\f038"}.ui-icon-align-justify:before{content:"\f039"}.ui-icon-list:before{content:"\f03a"}.ui-icon-indent-left:before{content:"\f03b";margin-left:0px;margin-top:2px}.ui-icon-indent-right:before{content:"\f03c"}.ui-icon-facetime-video:before{content:"\f03d"}.ui-icon-picture:before{content:"\f03e"}.ui-icon-pencil:before{content:"\f040"}.ui-icon-map-marker:before{content:"\f041";margin-left:3px;margin-top:2px}.ui-icon-adjust:before{content:"\f042";margin-top:2px}.ui-icon-tint:before{content:"\f043"}.ui-icon-edit:before{content:"\f044"}.ui-icon-share:before{content:"\f045"}.ui-icon-facheck:before{content:"\f046"}.ui-icon-move:before{content:"\f047"}.ui-icon-step-backward:before{content:"\f048"}.ui-icon-fast-backward:before{content:"\f049"}.ui-icon-backward:before{content:"\f04a"}.ui-icon-play:before{content:"\f04b";margin-left:6px;margin-top:2px}.ui-icon-pause:before{content:"\f04c";margin-top:2px}.ui-icon-stop:before{content:"\f04d";margin-top:2px}.ui-icon-faforward:before{content:"\f04e"}.ui-icon-fast-forward:before{content:"\f050"}.ui-icon-step-forward:before{content:"\f051"}.ui-icon-eject:before{content:"\f052"}.ui-icon-chevron-left:before{content:"\f053";margin-top:2px}.ui-icon-chevron-right:before{content:"\f054";margin-top:2px}.ui-icon-plus-sign:before{content:"\f055";margin-top:2px}.ui-icon-minus-sign:before{content:"\f056";margin-top:2px}.ui-icon-remove-sign:before{content:"\f057";margin-top:2px}.ui-icon-ok-sign:before{content:"\f058";margin-top:2px}.ui-icon-question-sign:before{content:"\f059";margin-top:2px}.ui-icon-info-sign:before{content:"\f05a";margin-top:2px}.ui-icon-screenshot:before{content:"\f05b"}.ui-icon-remove-circle:before{content:"\f05c";margin-top:2px}.ui-icon-ok-circle:before{content:"\f05d";margin-top:2px}.ui-icon-ban-circle:before{content:"\f05e";margin-top:2px}.ui-icon-arrow-left:before{content:"\f060"}.ui-icon-arrow-right:before{content:"\f061"}.ui-icon-arrow-up:before{content:"\f062"}.ui-icon-arrow-down:before{content:"\f063"}.ui-icon-share-alt:before{content:"\f064"}.ui-icon-resize-full:before{content:"\f065"}.ui-icon-resize-small:before{content:"\f066"}.ui-icon-faplus:before{content:"\f067"}.ui-icon-faminus:before{content:"\f068"}.ui-icon-asterisk:before{content:"\f069";margin-top:2px}.ui-icon-exclamation-sign:before{content:"\f06a";margin-top:2px}.ui-icon-gift:before{content:"\f06b"}.ui-icon-leaf:before{content:"\f06c"}.ui-icon-fire:before{content:"\f06d"}.ui-icon-eye-open:before{content:"\f06e"}.ui-icon-eye-close:before{content:"\f070"}.ui-icon-warning-sign:before{content:"\f071"}.ui-icon-plane:before{content:"\f072"}.ui-icon-calendar:before{content:"\f073"}.ui-icon-random:before{content:"\f074"}.ui-icon-comment:before{content:"\f075";margin-top:2px}.ui-icon-magnet:before{content:"\f076";margin-top:2px}.ui-icon-chevron-up:before{content:"\f077"}.ui-icon-chevron-down:before{content:"\f078"}.ui-icon-retweet:before{content:"\f079"}.ui-icon-shopping-cart:before{content:"\f07a"}.ui-icon-folder-close:before{content:"\f07b"}.ui-icon-folder-open:before{content:"\f07c"}.ui-icon-resize-vertical:before{content:"\f07d"}.ui-icon-resize-horizontal:before{content:"\f07e"}.ui-icon-bar-chart:before{content:"\f080"}.ui-icon-twitter-sign:before{content:"\f081"}.ui-icon-facebook-sign:before{content:"\f082"}.ui-icon-camera-retro:before{content:"\f083"}.ui-icon-key:before{content:"\f084"}.ui-icon-cogs:before{content:"\f085"}.ui-icon-comments:before{content:"\f086"}.ui-icon-thumbs-up:before{content:"\f087"}.ui-icon-thumbs-down:before{content:"\f088"}.ui-icon-star-half:before{content:"\f089"}.ui-icon-heart-empty:before{content:"\f08a";margin-top:2px}.ui-icon-signout:before{content:"\f08b"}.ui-icon-linkedin-sign:before{content:"\f08c"}.ui-icon-pushpin:before{content:"\f08d"}.ui-icon-external-link:before{content:"\f08e"}.ui-icon-signin:before{content:"\f090"}.ui-icon-trophy:before{content:"\f091"}.ui-icon-github-sign:before{content:"\f092"}.ui-icon-upload-alt:before{content:"\f093"}.ui-icon-lemon:before{content:"\f094"}.ui-icon-phone:before{content:"\f095"}.ui-icon-check-empty:before{content:"\f096"}.ui-icon-bookmark-empty:before{content:"\f097"}.ui-icon-phone-sign:before{content:"\f098"}.ui-icon-twitter:before{content:"\f099"}.ui-icon-facebook:before{content:"\f09a"}.ui-icon-github:before{content:"\f09b";margin-top:2px}.ui-icon-unlock:before{content:"\f09c"}.ui-icon-credit-card:before{content:"\f09d"}.ui-icon-rss:before{content:"\f09e"}.ui-icon-hdd:before{content:"\f0a0"}.ui-icon-bullhorn:before{content:"\f0a1"}.ui-icon-bell:before{content:"\f0a2"}.ui-icon-certificate:before{content:"\f0a3";margin-top:2px}.ui-icon-hand-right:before{content:"\f0a4"}.ui-icon-hand-left:before{content:"\f0a5"}.ui-icon-hand-up:before{content:"\f0a6"}.ui-icon-hand-down:before{content:"\f0a7"}.ui-icon-circle-arrow-left:before{content:"\f0a8";margin-top:2px}.ui-icon-circle-arrow-right:before{content:"\f0a9";margin-top:2px}.ui-icon-circle-arrow-up:before{content:"\f0aa";margin-top:2px}.ui-icon-circle-arrow-down:before{content:"\f0ab";margin-top:2px}.ui-icon-globe:before{content:"\f0ac";margin-top:2px}.ui-icon-wrench:before{content:"\f0ad"}.ui-icon-tasks:before{content:"\f0ae"}.ui-icon-filter:before{content:"\f0b0"}.ui-icon-briefcase:before{content:"\f0b1"}.ui-icon-fullscreen:before{content:"\f0b2"}.ui-icon-group:before{content:"\f0c0"}.ui-icon-link:before{content:"\f0c1"}.ui-icon-cloud:before{content:"\f0c2"}.ui-icon-beaker:before{content:"\f0c3"}.ui-icon-cut:before{content:"\f0c4"}.ui-icon-copy:before{content:"\f0c5"}.ui-icon-paper-clip:before{content:"\f0c6"}.ui-icon-save:before{content:"\f0c7"}.ui-icon-sign-blank:before{content:"\f0c8"}.ui-icon-reorder:before{content:"\f0c9"}.ui-icon-list-ul:before{content:"\f0ca"}.ui-icon-list-ol:before{content:"\f0cb"}.ui-icon-strikethrough:before{content:"\f0cc"}.ui-icon-underline:before{content:"\f0cd"}.ui-icon-table:before{content:"\f0ce"}.ui-icon-magic:before{content:"\f0d0"}.ui-icon-truck:before{content:"\f0d1"}.ui-icon-pinterest:before{content:"\f0d2";margin-top:2px}.ui-icon-pinterest-sign:before{content:"\f0d3";margin-top:2px}.ui-icon-google-plus-sign:before{content:"\f0d4"}.ui-icon-google-plus:before{content:"\f0d5"}.ui-icon-money:before{content:"\f0d6"}.ui-icon-caret-down:before{content:"\f0d7";margin-top:2px}.ui-icon-caret-up:before{content:"\f0d8"}.ui-icon-caret-left:before{content:"\f0d9";margin-top:2px}.ui-icon-caret-right:before{content:"\f0da";margin-top:2px}.ui-icon-columns:before{content:"\f0db"}.ui-icon-sort:before{content:"\f0dc";margin-top:2px}.ui-icon-sort-down:before{content:"\f0dd"}.ui-icon-sort-up:before{content:"\f0de"}.ui-icon-envelope-alt:before{content:"\f0e0"}.ui-icon-linkedin:before{content:"\f0e1"}.ui-icon-undo:before{content:"\f0e2";margin-top:2px}.ui-icon-legal:before{content:"\f0e3"}.ui-icon-dashboard:before{content:"\f0e4"}.ui-icon-comment-alt:before{content:"\f0e5"}.ui-icon-comments-alt:before{content:"\f0e6"}.ui-icon-bolt:before{content:"\f0e7"}.ui-icon-sitemap:before{content:"\f0e8"}.ui-icon-umbrella:before{content:"\f0e9"}.ui-icon-paste:before{content:"\f0ea"}.ui-icon-user-md:before{content:"\f200"}.ui-icon-trophy { color: orange;}.ui-icon-heart { color: magenta;}.ui-icon-comment { color:blue;}.ui-icon-fastar { color:gold;} diff -r d9fd76c96f2c46ccdc7f4e6fd30ac535b0d5dd82 -r 02e3b7c872f8dd80b380931783ca87ff1b055639 vcweb/lighterprints/static/css/lighterprints/font-awesome/jqm-icon-pack-3.0.0-fa.scss --- /dev/null +++ b/vcweb/lighterprints/static/css/lighterprints/font-awesome/jqm-icon-pack-3.0.0-fa.scss @@ -0,0 +1,419 @@ +/* + The following declaration increase the size of the "dot" which contains the icon + This is because some of the font awesome icons are larger than jQuery Mobile icons + It applies to ALL occurrences, but can be commented out or removed if necessary +*/ +.ui-icon { + width: 20px; + height: 20px; + -moz-border-radius: 10px; + -webkit-border-radius: 10px; + border-radius: 10px; + margin-top: -10px !important; + line-height: 20px; +} +.ui-icon:before { margin-left: 3px; } + +/* fix for Github issue #6 */ +.ui-btn-icon-notext .ui-btn-inner .ui-icon { + margin: 1px 1px 2px 2px !important; +} +.ui-li-link-alt .ui-btn-inner .ui-icon { + margin: -10px -10px auto auto !important; +} + +/* supporting original icons */ +.ui-icon-plus, .ui-icon-minus, .ui-icon-delete, .ui-icon-arrow-r, +.ui-icon-arrow-l, .ui-icon-arrow-u, .ui-icon-arrow-d, .ui-icon-check, +.ui-icon-gear, .ui-icon-refresh, .ui-icon-forward, .ui-icon-back, +.ui-icon-grid, .ui-icon-star, .ui-icon-alert, .ui-icon-info, .ui-icon-home, .ui-icon-search, .ui-icon-searchfield:after, +.ui-icon-checkbox-off, .ui-icon-checkbox-on, .ui-icon-radio-off, .ui-icon-radio-on, .ui-icon-email , .ui-icon-page, +.ui-icon-question , .ui-icon-foursquare, .ui-icon-dollar , .ui-icon-euro, +.ui-icon-pound , .ui-icon-apple , .ui-icon-chat , .ui-icon-trash , .ui-icon-mappin , .ui-icon-direction, +.ui-icon-heart , .ui-icon-wrench , .ui-icon-play , .ui-icon-pause , .ui-icon-stop , .ui-icon-person , .ui-icon-music, +.ui-icon-wifi , .ui-icon-phone , .ui-icon-power , +.ui-icon-lightning , .ui-icon-drink , .ui-icon-android { + background-image: url('images/icons-18-white-pack.png') !important; +} + +@media only screen and (-webkit-min-device-pixel-ratio: 1.3), + only screen and (-o-min-device-pixel-ratio: 3/2), + only screen and (min--moz-device-pixel-ratio: 1.3), + only screen and (min-device-pixel-ratio: 1.3), + only screen and (min-resolution: 1.3dppx) { + + .ui-icon-plus, .ui-icon-minus, .ui-icon-delete, .ui-icon-arrow-r, + .ui-icon-arrow-l, .ui-icon-arrow-u, .ui-icon-arrow-d, .ui-icon-check, + .ui-icon-gear, .ui-icon-refresh, .ui-icon-forward, .ui-icon-back, + .ui-icon-grid, .ui-icon-star, .ui-icon-alert, .ui-icon-info, .ui-icon-home, .ui-icon-search, .ui-icon-searchfield:after, + .ui-icon-checkbox-off, .ui-icon-checkbox-on, .ui-icon-radio-off, .ui-icon-radio-on, .ui-icon-email , .ui-icon-page, + .ui-icon-question , .ui-icon-foursquare, .ui-icon-dollar , .ui-icon-euro, + .ui-icon-pound , .ui-icon-apple , .ui-icon-chat , .ui-icon-trash , .ui-icon-mappin , .ui-icon-direction, + .ui-icon-heart , .ui-icon-wrench , .ui-icon-play , .ui-icon-pause , .ui-icon-stop , .ui-icon-person , .ui-icon-music, + .ui-icon-wifi , .ui-icon-phone , .ui-icon-power , + .ui-icon-lightning , .ui-icon-drink , .ui-icon-android { + background-image: url('images/icons-36-white-pack.png') !important; + -moz-background-size: 774px 54px; + -o-background-size: 774px 54px; + -webkit-background-size: 774px 54px; + background-size: 774px 54px; + } + .ui-icon-alt { + background-image: url('images/icons-36-black-pack.png'); + } +} + +/* first row */ +.ui-icon-plus { background-position: 0px 1px !important; } +.ui-icon-minus { background-position: -36px 1px !important; } +.ui-icon-delete { background-position: -71px 1px !important; } +.ui-icon-arrow-r { background-position: -107px 1px !important; } +.ui-icon-arrow-l { background-position: -143px 1px !important; } +.ui-icon-arrow-u { background-position: -179px 1px !important; } +.ui-icon-arrow-d { background-position: -215px 1px !important; } +.ui-icon-check { background-position: -251px 1px !important; } +.ui-icon-gear { background-position: -287px 1px !important; } +.ui-icon-refresh { background-position: -323px 1px !important; } +.ui-icon-forward { background-position: -359px 1px !important; } +.ui-icon-back { background-position: -396px -0 !important; } +.ui-icon-grid { background-position: -431px 1px !important; } +.ui-icon-star { background-position: -467px 1px !important; } +.ui-icon-alert { background-position: -503px 1px !important; } +.ui-icon-info { background-position: -539px 1px !important; } +.ui-icon-home { background-position: -575px 1px !important; } +.ui-icon-search,.ui-icon-searchfield:after { background-position: -611px 0px !important; } +.ui-icon-checkbox-off { background-position: -681px 1px !important; } +.ui-icon-checkbox-on { background-position: -647px 1px !important; } +.ui-icon-radio-off { background-position: -752px 1px !important; } +.ui-icon-radio-on { background-position: -717px 1px !important; } + +/* begin icon pack definitions */ +/* second row */ +.ui-icon-email { background-position: 1px -17px !important; } +.ui-icon-page { background-position: -36px -17px !important; } +.ui-icon-question { background-position: -71px -17px !important; } +.ui-icon-foursquare { background-position: -107px -17px !important; } +.ui-icon-dollar { background-position: -215px -17px !important; } +.ui-icon-euro { background-position: -251px -17px !important; } +.ui-icon-pound { background-position: -287px -17px !important; } +.ui-icon-apple { background-position: -323px -17px !important; } +.ui-icon-chat { background-position: -359px -17px !important; } +.ui-icon-trash { background-position: -395px -17px !important; } +.ui-icon-mappin { background-position: -467px -17px !important; } +.ui-icon-direction { background-position: -503px -17px !important; } +.ui-icon-heart { background-position: -539px -17px !important; } +.ui-icon-wrench { background-position: -575px -17px !important; } +.ui-icon-play { background-position: -611px -17px !important; } +.ui-icon-pause { background-position: -647px -17px !important; } +.ui-icon-stop { background-position: -683px -17px !important; } +.ui-icon-person { background-position: -719px -17px !important; } +.ui-icon-music { background-position: -755px -17px !important; } + +/* third row */ +.ui-icon-wifi { background-position: -35px -34px !important; } +.ui-icon-phone { background-position: -72px -36px !important; } +.ui-icon-power { background-position: -107px -35px !important; } +.ui-icon-lightning { background-position: -251px -35px !important; } +.ui-icon-android { background-position: -323px -35px !important; } + + + + +/* begin primary declarations */ +@font-face { + font-family: 'FontAwesome'; + src: url('font/fontawesome-webfont.eot'); + src: url('font/fontawesome-webfont.eot?#iefix') format('embedded-opentype'), + url('font/fontawesome-webfont.woff') format('woff'), + url('font/fontawesome-webfont.ttf') format('truetype'); + font-weight: normal; + font-style: normal; +} +[class^="ui-icon-"]:before, [class*=" ui-icon-"]:before { + font-family: FontAwesome !important; + font-weight: normal; + font-style: normal; + display: inline-block; +} +.ui-icon:not(.ui-icon-loading), .ui-icon-searchfield::after { + background: #666666; + background: rgba(0, 0, 0, .4); + color: #ffffff; + font-weight: normal; + text-shadow: none; +} +/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen + readers do not read off random characters that represent icons */ +.ui-icon-cloud-download:before { content: "\f0ed"; margin-left: 2px; } +.ui-icon-cloud-upload:before { content: "\f0ee"; margin-left: 2px; } +.ui-icon-lightbulb:before { content: "\f0eb"; margin-top: 1px; margin-left: 3px; } +.ui-icon-exchange:before { content: "\f0ec"; } +.ui-icon-bell-alt:before { content: "\f0f3"; } +.ui-icon-file-alt:before { content: "\f0f6"; } +.ui-icon-beer:before { content: "\f0fc"; margin-top: 1px; margin-left: 2px; } +.ui-icon-coffee:before { content: "\f0f4"; margin-left: 2px; } +.ui-icon-food:before { content: "\f0f5"; margin-top: 1px; margin-left: 4px; } +.ui-icon-fighter-jet:before { content: "\f0fb"; margin-top: 1px; margin-left: 2px; } +.ui-icon-user-md:before { content: "\f0f0"; } +.ui-icon-stethoscope:before { content: "\f0f1"; margin-top: 1px; margin-left: 4px; } +.ui-icon-suitcase:before { content: "\f0f2";; margin-left: 2px; } +.ui-icon-building:before { content: "\f0f7"; } +.ui-icon-hospital:before { content: "\f0f8"; margin-left: 4px; } +.ui-icon-ambulance:before { content: "\f0f9"; margin-top: 1px; margin-left: 1px; } +.ui-icon-medkit:before { content: "\f0fa"; margin-top: 0px; margin-left: 2px; } +.ui-icon-h-sign:before { content: "\f0fd"; } +.ui-icon-plus-sign-alt:before { content: "\f0fe"; } +.ui-icon-spinner:before { content: "\f110"; } +.ui-icon-angle-left:before { content: "\f104"; } +.ui-icon-angle-right:before { content: "\f105"; } +.ui-icon-angle-up:before { content: "\f106"; } +.ui-icon-angle-down:before { content: "\f107"; } +.ui-icon-double-angle-left:before { content: "\f100"; } +.ui-icon-double-angle-right:before { content: "\f101"; margin-left: 4px; } +.ui-icon-double-angle-up:before { content: "\f102"; } +.ui-icon-double-angle-down:before { content: "\f103"; margin-top: 1px; } +.ui-icon-circle-blank:before { content: "\f10c"; } +.ui-icon-circle:before { content: "\f111"; } +.ui-icon-desktop:before { content: "\f108"; margin-top: 1px; margin-left: 2px; } +.ui-icon-laptop:before { content: "\f109"; margin-top: 1px; margin-left: 2px; } +.ui-icon-tablet:before { content: "\f10a"; margin-top: 1px; } +.ui-icon-mobile-phone:before { content: "\f10b"; } +.ui-icon-quote-left:before { content: "\f10d"; } +.ui-icon-quote-right:before { content: "\f10e"; } +.ui-icon-github-alt:before { content: "\f113"; } +.ui-icon-folder-close-alt:before { content: "\f114"; } +.ui-icon-folder-open-alt:before { content: "\f115"; } + +.ui-icon-glass:before { content: "\f000"; margin-top: 2px; } +.ui-icon-music:before { content: "\f001"; margin-left: 1px; margin-top: 2px; } +.ui-icon-fasearch:before { content: "\f002"; } +.ui-icon-envelope:before { content: "\f003"; + margin-left: -1px; + margin-left: 2px; + margin-top: 1px; + } +.ui-icon-heart:before { content: "\f004"; + margin-left: 3px; + margin-top: 2px; + } +.ui-icon-fastar:before { content: "\f005"; } +.ui-icon-star-empty:before { content: "\f006"; } +.ui-icon-user:before { content: "\f007"; margin-left: 4px; } +.ui-icon-film:before { content: "\f008"; margin-left: 2px; } +.ui-icon-th-large:before { content: "\f009"; margin-left: 2px; margin-top: 2px; } +.ui-icon-th:before { content: "\f00a"; margin-left: 3px; margin-top: 2px; } +.ui-icon-th-list:before { content: "\f00b"; margin-left: 3px; margin-top: 2px; } +.ui-icon-ok:before { content: "\f00c"; margin-left: 2px; } +.ui-icon-remove:before { content: "\f00d"; margin-left: 3px; margin-top: 2px; } +.ui-icon-zoom-in:before { content: "\f00e"; } + +.ui-icon-zoom-out:before { content: "\f010"; } +.ui-icon-off:before { content: "\f011"; } +.ui-icon-signal:before { content: "\f012"; margin-left: -1px; } +.ui-icon-cog:before { content: "\f013"; margin-left: 3px; margin-top: 2px; } +.ui-icon-trash:before { content: "\f014"; } +.ui-icon-fahome:before { content: "\f015"; } +.ui-icon-file:before { content: "\f016"; } +.ui-icon-time:before { content: "\f017"; margin-top: 2px; } +.ui-icon-road:before { content: "\f018"; } +.ui-icon-download-alt:before { content: "\f019"; } +.ui-icon-download:before { content: "\f01a"; margin-top: 2px; } +.ui-icon-upload:before { content: "\f01b"; margin-top: 2px; } +.ui-icon-inbox:before { content: "\f01c"; } +.ui-icon-play-circle:before { content: "\f01d"; margin-top: 2px; } +.ui-icon-repeat:before { content: "\f01e"; margin-top: 2px; } + +/* \f020 is not a valid unicode character. all shifted one down */ +.ui-icon-farefresh:before { content: "\f021"; margin-top: 2px; } +.ui-icon-list-alt:before { content: "\f022"; margin-left: 3px; margin-top: 2px; } +.ui-icon-lock:before { content: "\f023"; } +.ui-icon-flag:before { content: "\f024"; margin-top: 2px; } +.ui-icon-headphones:before { content: "\f025"; } +.ui-icon-volume-off:before { content: "\f026"; } +.ui-icon-volume-down:before { content: "\f027"; } +.ui-icon-volume-up:before { content: "\f028"; } +.ui-icon-qrcode:before { content: "\f029"; } +.ui-icon-barcode:before { content: "\f02a"; } +.ui-icon-tag:before { content: "\f02b"; } +.ui-icon-tags:before { content: "\f02c"; } +.ui-icon-book:before { content: "\f02d"; } +.ui-icon-bookmark:before { content: "\f02e"; } +.ui-icon-print:before { content: "\f02f"; } + +.ui-icon-camera:before { content: "\f030"; } +.ui-icon-font:before { content: "\f031"; margin-left: 2px; } +.ui-icon-bold:before { content: "\f032"; margin-left: 2px; } +.ui-icon-italic:before { content: "\f033"; } +.ui-icon-text-height:before { content: "\f034"; } +.ui-icon-text-width:before { content: "\f035"; } +.ui-icon-align-left:before { content: "\f036"; } +.ui-icon-align-center:before { content: "\f037"; } +.ui-icon-align-right:before { content: "\f038"; } +.ui-icon-align-justify:before { content: "\f039"; } +.ui-icon-list:before { content: "\f03a"; } +.ui-icon-indent-left:before { content: "\f03b"; margin-left: 0px; margin-top: 2px; } +.ui-icon-indent-right:before { content: "\f03c"; } +.ui-icon-facetime-video:before { content: "\f03d"; } +.ui-icon-picture:before { content: "\f03e"; } + +.ui-icon-pencil:before { content: "\f040"; } +.ui-icon-map-marker:before { content: "\f041"; margin-left: 3px; margin-top: 2px; } +.ui-icon-adjust:before { content: "\f042"; margin-top: 2px; } +.ui-icon-tint:before { content: "\f043"; } +.ui-icon-edit:before { content: "\f044"; } +.ui-icon-share:before { content: "\f045"; } +.ui-icon-facheck:before { content: "\f046"; } +.ui-icon-move:before { content: "\f047"; } +.ui-icon-step-backward:before { content: "\f048"; } +.ui-icon-fast-backward:before { content: "\f049"; } +.ui-icon-backward:before { content: "\f04a"; } +.ui-icon-play:before { content: "\f04b"; margin-left: 6px; margin-top: 2px; } +.ui-icon-pause:before { content: "\f04c"; margin-top: 2px; } +.ui-icon-stop:before { content: "\f04d"; margin-top: 2px; } +.ui-icon-faforward:before { content: "\f04e"; } + +.ui-icon-fast-forward:before { content: "\f050"; } +.ui-icon-step-forward:before { content: "\f051"; } +.ui-icon-eject:before { content: "\f052"; } +.ui-icon-chevron-left:before { content: "\f053"; margin-top: 2px; } +.ui-icon-chevron-right:before { content: "\f054"; margin-top: 2px; } +.ui-icon-plus-sign:before { content: "\f055"; margin-top: 2px; } +.ui-icon-minus-sign:before { content: "\f056"; margin-top: 2px; } +.ui-icon-remove-sign:before { content: "\f057"; margin-top: 2px; } +.ui-icon-ok-sign:before { content: "\f058"; margin-top: 2px; } +.ui-icon-question-sign:before { content: "\f059"; margin-top: 2px; } +.ui-icon-info-sign:before { content: "\f05a"; margin-top: 2px; } +.ui-icon-screenshot:before { content: "\f05b"; } +.ui-icon-remove-circle:before { content: "\f05c"; margin-top: 2px; } +.ui-icon-ok-circle:before { content: "\f05d"; margin-top: 2px; } +.ui-icon-ban-circle:before { content: "\f05e"; margin-top: 2px; } + +.ui-icon-arrow-left:before { content: "\f060"; } +.ui-icon-arrow-right:before { content: "\f061"; } +.ui-icon-arrow-up:before { content: "\f062"; } +.ui-icon-arrow-down:before { content: "\f063"; } +.ui-icon-share-alt:before { content: "\f064"; } +.ui-icon-resize-full:before { content: "\f065"; } +.ui-icon-resize-small:before { content: "\f066"; } +.ui-icon-faplus:before { content: "\f067"; } +.ui-icon-faminus:before { content: "\f068"; } +.ui-icon-asterisk:before { content: "\f069"; margin-top: 2px; } +.ui-icon-exclamation-sign:before { content: "\f06a"; margin-top: 2px; } +.ui-icon-gift:before { content: "\f06b"; } +.ui-icon-leaf:before { content: "\f06c"; } +.ui-icon-fire:before { content: "\f06d"; } +.ui-icon-eye-open:before { content: "\f06e"; } + +.ui-icon-eye-close:before { content: "\f070"; } +.ui-icon-warning-sign:before { content: "\f071"; } +.ui-icon-plane:before { content: "\f072"; } +.ui-icon-calendar:before { content: "\f073"; } +.ui-icon-random:before { content: "\f074"; } +.ui-icon-comment:before { content: "\f075"; margin-top: 2px; } +.ui-icon-magnet:before { content: "\f076"; margin-top: 2px; } +.ui-icon-chevron-up:before { content: "\f077"; } +.ui-icon-chevron-down:before { content: "\f078"; } +.ui-icon-retweet:before { content: "\f079"; } +.ui-icon-shopping-cart:before { content: "\f07a"; } +.ui-icon-folder-close:before { content: "\f07b"; } +.ui-icon-folder-open:before { content: "\f07c"; } +.ui-icon-resize-vertical:before { content: "\f07d"; } +.ui-icon-resize-horizontal:before { content: "\f07e"; } + +.ui-icon-bar-chart:before { content: "\f080"; } +.ui-icon-twitter-sign:before { content: "\f081"; } +.ui-icon-facebook-sign:before { content: "\f082"; } +.ui-icon-camera-retro:before { content: "\f083"; } +.ui-icon-key:before { content: "\f084"; } +.ui-icon-cogs:before { content: "\f085"; } +.ui-icon-comments:before { content: "\f086"; } +.ui-icon-thumbs-up:before { content: "\f087"; } +.ui-icon-thumbs-down:before { content: "\f088"; } +.ui-icon-star-half:before { content: "\f089"; } +.ui-icon-heart-empty:before { content: "\f08a"; margin-top: 2px; } +.ui-icon-signout:before { content: "\f08b"; } +.ui-icon-linkedin-sign:before { content: "\f08c"; } +.ui-icon-pushpin:before { content: "\f08d"; } +.ui-icon-external-link:before { content: "\f08e"; } + +.ui-icon-signin:before { content: "\f090"; } +.ui-icon-trophy:before { content: "\f091"; } +.ui-icon-github-sign:before { content: "\f092"; } +.ui-icon-upload-alt:before { content: "\f093"; } +.ui-icon-lemon:before { content: "\f094"; } +.ui-icon-phone:before { content: "\f095"; } +.ui-icon-check-empty:before { content: "\f096"; } +.ui-icon-bookmark-empty:before { content: "\f097"; } +.ui-icon-phone-sign:before { content: "\f098"; } +.ui-icon-twitter:before { content: "\f099"; } +.ui-icon-facebook:before { content: "\f09a"; } +.ui-icon-github:before { content: "\f09b"; margin-top: 2px; } +.ui-icon-unlock:before { content: "\f09c"; } +.ui-icon-credit-card:before { content: "\f09d"; } +.ui-icon-rss:before { content: "\f09e"; } + +.ui-icon-hdd:before { content: "\f0a0"; } +.ui-icon-bullhorn:before { content: "\f0a1"; } +.ui-icon-bell:before { content: "\f0a2"; } +.ui-icon-certificate:before { content: "\f0a3"; margin-top: 2px; } +.ui-icon-hand-right:before { content: "\f0a4"; } +.ui-icon-hand-left:before { content: "\f0a5"; } +.ui-icon-hand-up:before { content: "\f0a6"; } +.ui-icon-hand-down:before { content: "\f0a7"; } +.ui-icon-circle-arrow-left:before { content: "\f0a8"; margin-top: 2px; } +.ui-icon-circle-arrow-right:before { content: "\f0a9"; margin-top: 2px; } +.ui-icon-circle-arrow-up:before { content: "\f0aa"; margin-top: 2px; } +.ui-icon-circle-arrow-down:before { content: "\f0ab"; margin-top: 2px; } +.ui-icon-globe:before { content: "\f0ac"; margin-top: 2px; } +.ui-icon-wrench:before { content: "\f0ad"; } +.ui-icon-tasks:before { content: "\f0ae"; } + +.ui-icon-filter:before { content: "\f0b0"; } +.ui-icon-briefcase:before { content: "\f0b1"; } +.ui-icon-fullscreen:before { content: "\f0b2"; } + +.ui-icon-group:before { content: "\f0c0"; } +.ui-icon-link:before { content: "\f0c1"; } +.ui-icon-cloud:before { content: "\f0c2"; } +.ui-icon-beaker:before { content: "\f0c3"; } +.ui-icon-cut:before { content: "\f0c4"; } +.ui-icon-copy:before { content: "\f0c5"; } +.ui-icon-paper-clip:before { content: "\f0c6"; } +.ui-icon-save:before { content: "\f0c7"; } +.ui-icon-sign-blank:before { content: "\f0c8"; } +.ui-icon-reorder:before { content: "\f0c9"; } +.ui-icon-list-ul:before { content: "\f0ca"; } +.ui-icon-list-ol:before { content: "\f0cb"; } +.ui-icon-strikethrough:before { content: "\f0cc"; } +.ui-icon-underline:before { content: "\f0cd"; } +.ui-icon-table:before { content: "\f0ce"; } + +.ui-icon-magic:before { content: "\f0d0"; } +.ui-icon-truck:before { content: "\f0d1"; } +.ui-icon-pinterest:before { content: "\f0d2"; margin-top: 2px; } +.ui-icon-pinterest-sign:before { content: "\f0d3"; margin-top: 2px; } +.ui-icon-google-plus-sign:before { content: "\f0d4"; } +.ui-icon-google-plus:before { content: "\f0d5"; } +.ui-icon-money:before { content: "\f0d6"; } +.ui-icon-caret-down:before { content: "\f0d7"; margin-top: 2px; } +.ui-icon-caret-up:before { content: "\f0d8"; } +.ui-icon-caret-left:before { content: "\f0d9"; margin-top: 2px; } +.ui-icon-caret-right:before { content: "\f0da"; margin-top: 2px; } +.ui-icon-columns:before { content: "\f0db"; } +.ui-icon-sort:before { content: "\f0dc"; margin-top: 2px; } +.ui-icon-sort-down:before { content: "\f0dd"; } +.ui-icon-sort-up:before { content: "\f0de"; } + +.ui-icon-envelope-alt:before { content: "\f0e0"; } +.ui-icon-linkedin:before { content: "\f0e1"; } +.ui-icon-undo:before { content: "\f0e2"; margin-top: 2px; } +.ui-icon-legal:before { content: "\f0e3"; } +.ui-icon-dashboard:before { content: "\f0e4"; } +.ui-icon-comment-alt:before { content: "\f0e5"; } +.ui-icon-comments-alt:before { content: "\f0e6"; } +.ui-icon-bolt:before { content: "\f0e7"; } +.ui-icon-sitemap:before { content: "\f0e8"; } +.ui-icon-umbrella:before { content: "\f0e9"; } +.ui-icon-paste:before { content: "\f0ea"; } + +.ui-icon-user-md:before { content: "\f200"; } diff -r d9fd76c96f2c46ccdc7f4e6fd30ac535b0d5dd82 -r 02e3b7c872f8dd80b380931783ca87ff1b055639 vcweb/lighterprints/static/css/lighterprints/fonts/lighterfootprints.dev.svg --- /dev/null +++ b/vcweb/lighterprints/static/css/lighterprints/fonts/lighterfootprints.dev.svg @@ -0,0 +1,67 @@ +<?xml version="1.0" standalone="no"?> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" > +<svg xmlns="http://www.w3.org/2000/svg"> +<metadata> +This is a custom SVG font generated by IcoMoon. +<iconset grid="20"></iconset> +</metadata> +<defs> +<font id="lighterfootprints" horiz-adv-x="640" > +<font-face units-per-em="640" ascent="608" descent="-32" /> +<missing-glyph horiz-adv-x="640" /> +<glyph unicode="" d="M 260.096,166.336c-22.08-38.272-7.232-69.76, 23.392-87.424s 65.344-14.848, 87.424,23.424c 22.08,38.24, 161.504,379.712, 149.376,386.72 + C 508.192,496.064, 282.176,204.608, 260.096,166.336z M 320.00,409.536c 14.016,0.00, 27.68-1.216, 40.992-3.456c 14.016,17.536, 29.728,36.864, 44.992,55.264 + C 378.72,469.248, 349.952,473.536, 320.00,473.536c-179.424,0.00-320.00-151.296-320.00-344.448c0.00-11.904, 0.544-23.776, 1.568-35.36 + c 1.568-17.60, 17.28-30.56, 34.72-29.024c 17.60,1.60, 30.592,17.12, 29.024,34.72C 64.448,109.12, 64.00,119.104, 64.00,129.088 + C 64.00,286.336, 176.48,409.536, 320.00,409.536z M 551.008,369.568c-8.928-24.00-18.368-48.448-26.688-69.60C 556.864,252.928, 576.00,193.952, 576.00,129.088 + c0.00-10.144-0.448-20.352-1.344-30.24c-1.60-17.60, 11.36-33.152, 28.96-34.784c 0.992-0.096, 1.952-0.128, 2.944-0.128 + c 16.352,0.00, 30.304,12.512, 31.808,29.088C 639.456,104.864, 640.00,116.992, 640.00,129.088C 640.00,223.52, 606.336,307.936, 551.008,369.568z" data-tags="gauge, meter, dashboard, speed, fast" /> +<glyph unicode="" d="M 450.88,536.512C 414.368,562.848, 368.576,576.00, 313.408,576.00C 271.424,576.00, 236.032,566.72, 207.264,548.224C 161.60,519.232, 137.344,470.016, 134.40,400.576l 105.792,0.00 + c0.00,20.224, 5.888,39.712, 17.696,58.464s 31.84,28.128, 60.096,28.128c 28.704,0.00, 48.512-7.616, 59.328-22.816c 10.848-15.264, 16.256-32.128, 16.256-50.624 + c0.00-16.096-8.064-30.816-17.792-44.224c-5.344-7.808-12.416-14.976-21.152-21.568c0.00,0.00-57.376-36.80-82.592-66.368 + c-14.624-17.152-15.936-42.816-17.216-79.648c-0.096-2.624, 0.896-8.032, 10.08-8.032s 74.144,0.00, 82.304,0.00s 9.856,6.048, 9.984,8.704 + c 0.576,13.408, 2.08,20.256, 4.544,28.00c 4.64,14.624, 17.184,27.392, 31.328,38.368l 29.12,20.096c 26.272,20.48, 47.264,37.28, 56.512,50.464 + C 494.496,361.216, 505.60,387.904, 505.60,419.552C 505.60,471.232, 487.328,510.208, 450.88,536.512z M 311.712,130.432c-36.48,1.088-66.56-24.128-67.712-63.68 + c-1.152-39.52, 27.456-65.632, 63.936-66.72c 38.08-1.12, 67.36,23.296, 68.512,62.816C 377.568,102.40, 349.792,129.312, 311.712,130.432z" data-tags="question, help" /> +<glyph unicode="" d="M 512.00,512.00L 128.00,512.00 C 92.80,512.00, 64.00,483.20, 64.00,448.00l0.00-224.00 c0.00-35.20, 28.80-64.00, 64.00-64.00l 128.00,0.00 l 128.00-96.00l0.00,96.00 l 128.00,0.00 c 35.20,0.00, 64.00,28.80, 64.00,64.00L 576.00,448.00 C 576.00,483.20, 547.20,512.00, 512.00,512.00z" data-tags="comment, bubble, chat, talk, discussion, conversation" /> +<glyph unicode="" d="M 320.00,569.60L 396.416,354.496L 601.60,354.496L 434.176,228.16L 494.016,6.40L 320.00,139.328L 145.984,6.40L 205.824,228.16L 38.40,354.496L 243.584,354.496 z" data-tags="star, favorite, rate, bookmark" /> +<glyph unicode="" d="M 520.00,500.309 C 567.791,500.309 610.683,526.323 640.00,546.00 L 640.00,173.694 C 610.683,154.015 567.791,128.00 520.00,128.00 C 472.209,128.00 429.317,142.169 400.00,161.847 C 370.683,181.522 327.791,195.691 280.00,195.691 C 232.209,195.691 189.319,171.369 160.00,151.694 L 160.00,524.00 C 189.319,543.678 232.209,568.00 280.00,568.00 C 327.791,568.00 370.683,553.832 400.00,534.155 C 429.317,514.478 472.209,500.309 520.00,500.309 ZM 80.00,608.00 C 102.091,608.00 120.00,590.091 120.00,568.00 L 120.00-32.00 L 40.00-32.00 L 40.00,568.00 C 40.00,590.091 57.909,608.00 80.00,608.00 Z" data-tags="flag, report, mark" /> +<glyph unicode="" d="M 365.714,288.00q0.00,37.857 -26.786,64.643t-64.643,26.786t-64.643-26.786t-26.786-64.643t 26.786-64.643t 64.643-26.786t 64.643,26.786t 26.786,64.643zM 548.571,326.929l0.00-79.286 q0.00-4.286 -2.857-8.214t-7.143-4.643l-66.071-10.00q-6.786-19.286 -13.929-32.50q 12.50-17.857 38.214-49.286q 3.571-4.286 3.571-8.929t-3.214-8.214q-9.643-13.214 -35.357-38.571t-33.571-25.357q-4.286,0.00 -9.286,3.214l-49.286,38.571q-15.714-8.214 -32.50-13.571 q-5.714-48.571 -10.357-66.429q-2.50-10.00 -12.857-10.00l-79.286,0.00 q-5.00,0.00 -8.75,3.036t-4.107,7.679l-10.00,65.714q-17.50,5.714 -32.143,13.214l-50.357-38.214q-3.571-3.214 -8.929-3.214q-5.00,0.00 -8.929,3.929q-45.00,40.714 -58.929,60.00q-2.50,3.571 -2.50,8.214q0.00,4.286 2.857,8.214q 5.357,7.50 18.214,23.75t 19.286,25.179q-9.643,17.857 -14.643,35.357l-65.357,9.643q-4.643,0.714 -7.50,4.464t-2.857,8.393l0.00,79.286 q0.00,4.286 2.857,8.214t 6.786,4.643 l 66.429,10.00q 5.00,16.429 13.929,32.857q-14.286,20.357 -38.214,49.286q-3.571,4.286 -3.571,8.571q0.00,3.571 3.214,8.214q 9.286,12.857 35.179,38.393t 33.75,25.536q 4.643,0.00 9.286-3.571l 49.286-38.214q 15.714,8.214 32.50,13.571q 5.714,48.571 10.357,66.429q 2.50,10.00 12.857,10.00l 79.286,0.00 q 5.00,0.00 8.75-3.036t 4.107-7.679l 10.00-65.714q 17.50-5.714 32.143-13.214l 50.714,38.214q 3.214,3.214 8.571,3.214q 4.643,0.00 8.929-3.571q 46.071-42.50 58.929-60.714q 2.50-2.857 2.50-7.857 q0.00-4.286 -2.857-8.214q-5.357-7.50 -18.214-23.75t-19.286-25.179q 9.286-17.857 14.643-35.00l 65.357-10.00q 4.643-0.714 7.50-4.464t 2.857-8.393z" horiz-adv-x="548" data-tags="cog, settings, options, gear, preferences" /> +<glyph unicode="" d="M 170.24,476.672C 47.936,405.696, 54.976,290.112, 59.20,247.36c 157.984,187.104, 394.272,178.016, 394.272,178.016S 118.496,310.528, 20.096,80.128 + c-7.744-18.24, 36.48-41.888, 46.56-20.384c 30.112,64.064, 72.096,112.128, 72.096,112.128c 61.952-23.072, 169.056-50.048, 245.024,3.36 + c 100.832,71.008, 90.528,228.352, 234.528,304.96C 651.936,498.112, 336.064,572.896, 170.24,476.672z" data-tags="leaf, nature, green, plant" /> +<glyph unicode="" d="M 550.048,475.168c-53.504,49.12-140.256,49.12-193.76,0.00L 320.00,441.824L 283.68,475.168c-53.504,49.12-140.224,49.12-193.728,0.00 + c-60.192-55.232-60.192-144.768,0.00-200.032L 320.00,64.00l 230.048,211.136C 610.24,330.40, 610.24,419.936, 550.048,475.168z" data-tags="heart, love, like, favorite" /> +<glyph unicode="" d="M 624.384,32.576L 339.328,532.768C 335.392,539.68, 328.00,543.936, 320.00,543.936c-8.00,0.00-15.36-4.256-19.328-11.168L 15.648,32.576 + c-3.872-6.784-3.808-15.072, 0.16-21.792s 11.264-10.848, 19.136-10.848l 570.08,0.00 c 7.808,0.00, 15.136,4.128, 19.136,10.848 + C 628.128,17.504, 628.192,25.792, 624.384,32.576z M 355.20,63.936L 284.80,63.936 l0.00,64.00 l 70.40,0.00 L 355.20,63.936 z M 355.20,175.936L 284.80,175.936 l0.00,192.00 l 70.40,0.00 L 355.20,175.936 z" data-tags="warning, alert, exclamation" /> +<glyph unicode="" d="M 474.24,145.664c-78.88,28.736-104.096,52.992-104.096,104.928c0.00,31.168, 24.096,20.992, 34.656,78.08c 4.384,23.68, 25.664,0.384, 29.76,54.432 + c0.00,21.536-11.616,26.912-11.616,26.912s 5.92,31.904, 8.224,56.416C 433.984,497.024, 413.504,576.00, 304.00,576.00C 194.528,576.00, 173.984,497.024, 176.864,466.432 + C 179.168,441.92, 185.088,410.016, 185.088,410.016S 173.44,404.672, 173.44,383.104c 4.064-54.048, 25.344-30.752, 29.728-54.432 + c 10.592-57.088, 34.688-46.912, 34.688-78.08c0.00-51.936-25.216-76.192-104.096-104.928c-79.168-28.80-130.56-58.208-130.56-78.272c0.00-20.032,0.00-67.36,0.00-67.36 + l 300.80,0.00 l 300.80,0.00 c0.00,0.00,0.00,47.328,0.00,67.36C 604.80,87.424, 553.376,116.832, 474.24,145.664z" data-tags="user, group, profile, avatar, persona" /> +<glyph unicode="" d="M 505.632,351.936L 448.00,351.936 l0.00,44.80 c0.00,92.704-42.688,147.20-128.00,147.20c-85.28,0.00-128.00-54.496-128.00-147.20l0.00-44.80 L 128.00,351.936 c-17.664,0.00-32.00-20.704-32.00-38.40l0.00-249.60 + c0.00-17.60, 13.728-36.448, 30.464-41.824l 38.272-12.384c 16.736-5.408, 44.832-9.824, 62.464-9.824l 185.60,0.00 c 17.60,0.00, 45.728,4.416, 62.464,9.824l 38.272,12.384 + C 530.304,27.488, 544.00,46.336, 544.00,63.936l0.00,249.60 C 544.00,331.232, 523.296,351.936, 505.632,351.936z M 256.00,409.536c0.00,46.24, 25.536,70.40, 64.00,70.40 + c 38.496,0.00, 64.00-24.16, 64.00-70.40l0.00-57.60 L 256.00,351.936 L 256.00,409.536 z" data-tags="lock, password, encrypted, secure" /> +<glyph unicode="" d="M 320.00,582.40c-162.592,0.00-294.40-131.84-294.40-294.40c0.00-162.592, 131.808-294.40, 294.40-294.40s 294.40,131.808, 294.40,294.40C 614.40,450.592, 482.592,582.40, 320.00,582.40z M 320.00,57.60 + c-127.264,0.00-230.40,103.168-230.40,230.40S 192.736,518.40, 320.00,518.40s 230.40-103.168, 230.40-230.40S 447.264,57.60, 320.00,57.60zM 342.40,454.40L 297.60,454.40L 297.60,278.72L 406.56,169.76L 438.24,201.44L 342.40,297.28 z" data-tags="clock, time, history" /> +<glyph unicode="" d="M 357.792,148.672c0.00,46.432, 35.20,72.096, 92.608,110.112C 520.64,305.344, 608.00,363.264, 608.00,500.672c0.00,12.384-10.112,22.40-22.624,22.40l-109.792,0.00 + C 460.064,551.744, 413.888,582.40, 320.00,582.40c-93.856,0.00-140.064-30.656-155.552-59.328L 54.656,523.072 C 42.144,523.072, 32.00,513.056, 32.00,500.672 + c0.00-137.408, 87.392-195.328, 157.632-241.856c 57.44-38.016, 92.64-63.68, 92.64-110.112l0.00-41.952 c-60.32-6.72-104.64-29.024-104.64-55.552 + c0.00-31.808, 63.744-57.60, 142.368-57.60c 78.656,0.00, 142.40,25.792, 142.40,57.60c0.00,26.528-44.32,48.832-104.64,55.552L 357.76,148.672 z M 446.624,310.40 + c 18.176,38.40, 32.544,90.464, 34.848,167.872l 80.288,0.00 C 554.112,391.904, 502.176,348.256, 446.624,310.40z M 320.00,543.168c 87.424,0.032, 121.60-35.712, 121.568-48.96 + c0.00-13.344-34.08-49.056-121.568-49.12C 232.576,445.184, 198.464,480.864, 198.464,494.208C 198.432,507.456, 232.576,543.232, 320.00,543.168z M 78.272,478.272l 80.256,0.00 + C 160.864,400.864, 175.232,348.80, 193.376,310.40C 137.824,348.256, 85.92,391.904, 78.272,478.272z" data-tags="trophy, winner, cup" /> +<glyph unicode="" d="M 320.00,608.00C 143.269,608.00,0.00,464.731,0.00,288.00s 143.269-320.00, 320.00-320.00s 320.00,143.269, 320.00,320.00S 496.731,608.00, 320.00,608.00z M 280.00,488.00l 80.00,0.00 l0.00-80.00 l-80.00,0.00 L 280.00,488.00 z + M 400.00,88.00L 240.00,88.00 l0.00,40.00 l 40.00,0.00 L 280.00,288.00 l-40.00,0.00 l0.00,40.00 l 120.00,0.00 l0.00-200.00 l 40.00,0.00 L 400.00,88.00 z" data-tags="info, information" /> +<glyph unicode="" d="M 548.571,516.571l0.00-160.00 q0.00-9.286 -6.786-16.071t-16.071-6.786l-160.00,0.00 q-15.00,0.00 -21.071,14.286q-6.071,13.929 5.00,24.643l 49.286,49.286q-52.857,48.929 -124.643,48.929q-37.143,0.00 -70.893-14.464t-58.393-39.107t-39.107-58.393t-14.464-70.893t 14.464-70.893t 39.107-58.393t 58.393-39.107t 70.893-14.464q 60.357,0.00 108.571,35.536t 66.071,93.393q 2.50,8.214 10.714,8.214l 71.071,0.00 q 5.714,0.00 8.929-4.286q 3.571-4.643 2.50-9.643q-13.929-62.50 -52.679-111.429t-95.00-76.071t-120.179-27.143q-55.714,0.00 -106.429,21.786t-87.50,58.571t-58.571,87.50t-21.786,106.429t 21.786,106.429t 58.571,87.50t 87.50,58.571t 106.429,21.786q 52.50,0.00 101.607-19.821t 87.321-55.893l 46.429,46.071q 10.357,11.071 25.00,5.00q 13.929-6.071 13.929-21.071z" horiz-adv-x="548" data-tags="repeat, loop, reload, refresh, synchronize" /> +<glyph unicode="" d="M 265.44,64.00c-13.92,0.00-27.104,6.496-35.552,17.696L 115.52,232.672c-14.88,19.648-11.008,47.616, 8.64,62.496 + c 19.68,14.912, 47.616,11.008, 62.496-8.64l 75.232-99.328l 189.184,303.712c 13.024,20.896, 40.544,27.296, 61.472,14.272 + c 20.896-12.992, 27.296-40.544, 14.24-61.44L 303.328,85.024c-7.776-12.512-21.184-20.352-35.872-20.992C 266.784,64.00, 266.112,64.00, 265.44,64.00z" data-tags="checkmark, tick, correct" /> +<glyph unicode="" d="M 320.00,556.80c-148.48,0.00-268.80-120.384-268.80-268.80c0.00-148.48, 120.352-268.80, 268.80-268.80c 148.448,0.00, 268.80,120.352, 268.80,268.80C 588.80,436.448, 468.448,556.80, 320.00,556.80z + M 375.328,288.00l 97.952-97.952l-55.328-55.328L 320.00,232.672l-97.952-97.952l-55.296,55.328L 264.672,288.00l-97.92,97.92l 55.296,55.328L 320.00,343.328l 97.952,97.92 + l 55.328-55.296L 375.328,288.00z" data-tags="cross, cancel, close, remove, delete" /> +<glyph unicode=" " horiz-adv-x="320" /> +<glyph class="hidden" unicode="" d="M0,608L 640 -32L0 -32 z" horiz-adv-x="0" /> +</font></defs></svg> \ No newline at end of file diff -r d9fd76c96f2c46ccdc7f4e6fd30ac535b0d5dd82 -r 02e3b7c872f8dd80b380931783ca87ff1b055639 vcweb/lighterprints/static/css/lighterprints/fonts/lighterfootprints.eot Binary file vcweb/lighterprints/static/css/lighterprints/fonts/lighterfootprints.eot has changed diff -r d9fd76c96f2c46ccdc7f4e6fd30ac535b0d5dd82 -r 02e3b7c872f8dd80b380931783ca87ff1b055639 vcweb/lighterprints/static/css/lighterprints/fonts/lighterfootprints.svg --- /dev/null +++ b/vcweb/lighterprints/static/css/lighterprints/fonts/lighterfootprints.svg @@ -0,0 +1,67 @@ +<?xml version="1.0" standalone="no"?> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" > +<svg xmlns="http://www.w3.org/2000/svg"> +<metadata> +This is a custom SVG font generated by IcoMoon. +<iconset grid="20"></iconset> +</metadata> +<defs> +<font id="lighterfootprints" horiz-adv-x="640" > +<font-face units-per-em="640" ascent="608" descent="-32" /> +<missing-glyph horiz-adv-x="640" /> +<glyph unicode="" d="M 260.096,166.336c-22.08-38.272-7.232-69.76, 23.392-87.424s 65.344-14.848, 87.424,23.424c 22.08,38.24, 161.504,379.712, 149.376,386.72 + C 508.192,496.064, 282.176,204.608, 260.096,166.336z M 320.00,409.536c 14.016,0.00, 27.68-1.216, 40.992-3.456c 14.016,17.536, 29.728,36.864, 44.992,55.264 + C 378.72,469.248, 349.952,473.536, 320.00,473.536c-179.424,0.00-320.00-151.296-320.00-344.448c0.00-11.904, 0.544-23.776, 1.568-35.36 + c 1.568-17.60, 17.28-30.56, 34.72-29.024c 17.60,1.60, 30.592,17.12, 29.024,34.72C 64.448,109.12, 64.00,119.104, 64.00,129.088 + C 64.00,286.336, 176.48,409.536, 320.00,409.536z M 551.008,369.568c-8.928-24.00-18.368-48.448-26.688-69.60C 556.864,252.928, 576.00,193.952, 576.00,129.088 + c0.00-10.144-0.448-20.352-1.344-30.24c-1.60-17.60, 11.36-33.152, 28.96-34.784c 0.992-0.096, 1.952-0.128, 2.944-0.128 + c 16.352,0.00, 30.304,12.512, 31.808,29.088C 639.456,104.864, 640.00,116.992, ... [truncated message content] |
|
From: <com...@bi...> - 2013-05-02 20:17:44
|
1 new commit in vcweb: https://bitbucket.org/virtualcommons/vcweb/commits/d9fd76c96f2c/ Changeset: d9fd76c96f2c User: RoleeSinha Date: 2013-05-02 22:17:18 Summary: nav panel added Affected #: 3 files diff -r 520ab98ca2f4176b6892531836dbae358d367830 -r d9fd76c96f2c46ccdc7f4e6fd30ac535b0d5dd82 vcweb/lighterprints/templates/lighterprints/mobile/app/controller.js --- a/vcweb/lighterprints/templates/lighterprints/mobile/app/controller.js +++ b/vcweb/lighterprints/templates/lighterprints/mobile/app/controller.js @@ -137,5 +137,15 @@ $("#myTeamPage").bind('pagebeforeshow', function(event) { $('#chatMessageList').listview('refresh'); }); + + $( "#popupPanel" ).on({ + popupbeforeposition: function() { + var h = $( window ).height(); + + $( "#popupPanel" ) + .css( "height", h ); + } + }); }); + diff -r 520ab98ca2f4176b6892531836dbae358d367830 -r d9fd76c96f2c46ccdc7f4e6fd30ac535b0d5dd82 vcweb/lighterprints/templates/lighterprints/mobile/app/mobile.css --- a/vcweb/lighterprints/templates/lighterprints/mobile/app/mobile.css +++ b/vcweb/lighterprints/templates/lighterprints/mobile/app/mobile.css @@ -2,23 +2,16 @@ text-align: left; } .navbar{ - padding-left: 20px; - padding-top: 10px; - padding-bottom: 10px; - display: block; - - font-size:25px; - font-weight:normal; + padding-left: 2px; + padding-top: 2px; + text-align: left; + font-size:20px; } .footerbar{ - padding-left: 20px; - padding-top: 10px; - padding-bottom: 10px; - display: block; + padding-top: 5px; + padding-bottom: 5px; text-align:center; - font-size:25px; - font-weight:normal; } .innerblock{ padding-left: 10px; @@ -27,7 +20,7 @@ } .innerleft{ text-align:left; - padding-left: 10px; + padding-left: 2px; padding-right: 10px; padding-top: 10px; padding-bottom: 10px; @@ -35,4 +28,18 @@ } .innerbutton{ text-align:left; +} +#popupPanel-popup { + left: 0 !important; + right: auto !important; +} +#popupPanel { + width: 200px; + border: 1px solid #000; + border-right: none; + background: rgba(0,0,0,.5); + margin: -1px 0; +} +#popupPanel .ui-btn { + margin: 2em 15px; } \ No newline at end of file diff -r 520ab98ca2f4176b6892531836dbae358d367830 -r d9fd76c96f2c46ccdc7f4e6fd30ac535b0d5dd82 vcweb/lighterprints/templates/lighterprints/mobile/index.html --- a/vcweb/lighterprints/templates/lighterprints/mobile/index.html +++ b/vcweb/lighterprints/templates/lighterprints/mobile/index.html @@ -4,17 +4,19 @@ <title>Lighter Footprints</title><meta name="viewport" content="width=device-width, initial-scale=1"><link rel="stylesheet" href="themes/LFPTheme1.min.css" /> - <link rel="stylesheet" href="http://code.jquery.com/mobile/1.2.0/jquery.mobile.structure-1.2.0.min.css" /> + <link rel="stylesheet" href="http://code.jquery.com/mobile/1.3.0-beta.1/jquery.mobile.structure-1.3.0-beta.1.min.css" /><link rel="stylesheet" href="font-awesome/jqm-icon-pack-3.0.0-fa.css"/><link rel="stylesheet" href="lighterfootprints-icon-kit/style.css" /><link rel="stylesheet" href="app/mobile.css"/> - <script src="http://code.jquery.com/jquery-1.8.2.min.js"> + <script src="http://code.jquery.com/jquery-1.8.3.min.js"></script> - <script src="http://code.jquery.com/mobile/1.2.0/jquery.mobile-1.2.0.min.js"> + <script src="http://code.jquery.com/mobile/1.3.0-beta.1/jquery.mobile-1.3.0-beta.1.min.js"></script><!-- KnockoutJS for MVVM--> - <script src="app/knockout-2.2.0.js"></script> - <script src="app/knockout.mapping-latest.js"></script> + <script src="app/knockout-2.2.0.js"> + </script> + <script src="app/knockout.mapping-latest.js"> + </script><!--Local JS--><script src="app/controller.js"></script> @@ -33,8 +35,7 @@ <div class='group-activity-icon'><span class='icon-comment lighterprints-blue'></span></div> - <span class='group-activity'> - Participant <strong data-bind='text: participant_number'></strong> + <span class='group-activity'>Participant <strong data-bind='text: participant_number'></strong><small class='pull-right muted'><span data-bind='text: date_created'></span></small> @@ -58,11 +59,8 @@ </script><script type='text/html' id='like'><li data-bind='if: $root.participantGroupId() != participant_group_id()'> - <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> + <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></small> @@ -75,141 +73,131 @@ </script><script type='text/html' id='chat_message'><li> - <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> - <div data-bind="template: 'likeCommentTemplate'"> - </div> - </span> - </li> + <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> + <div data-bind="template: 'likeCommentTemplate'"> + </div> + </span> + </li></script><script type='text/html' id='activity_performed'><li> - <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> - 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'"> + <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>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'> + <ul id="challengesList" data-role="listview" data-inset="true" data-theme="d" data-bind='foreach: challenges'> + <li> + <div class='row challenge-row'> + <div class='span2'> + <img style='padding: 10px 0 0 20px;' data-bind='attr: {src: "https://vcweb.asu.edu/static/images/lighterprints/badges/" + name() + ".png" }'></div> - </span> - </li> - </script> - <script type='text/html' id='challenges-template'> - <ul id="challengesList" data-role="listview" data-inset="true" data-theme="d" data-bind='foreach: challenges'> - <li> - <div class='row challenge-row'> - <div class='span2'> - <img style='padding: 10px 0 0 20px;' data-bind='attr: {src: "https://vcweb.asu.edu/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='1005' /> - <a href="#" data-role="button" data-inline="true" 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></a> - </form> - </div> - <div style='margin-top: 10px; padding: 15px 0;' class='span2'> - <table> - <tr> - <td class='lighterprints-scoreboard-xlarge'> - <span data-bind='text: points'></span> - </td> - <td> - <span class='lighterprints-green icon-leaf icon-2x'></span> - </td> - </tr> - </table> - <div style='margin-top: 5px; padding: 5px 0;' data-bind='css: status'> - <span class='icon-time'></span> - <strong><span data-bind='text: time_slots'></span></strong> - </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='1005' /><a href="#" data-role="button" data-inline="true" 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></a> + </form> + </div> + <div style='margin-top: 10px; padding: 15px 0;' class='span2'> + <table> + <tr> + <td class='lighterprints-scoreboard-xlarge'> + <span data-bind='text: points'></span> + </td> + <td> + <span class='lighterprints-green icon-leaf icon-2x'></span> + </td> + </tr> + </table> + <div style='margin-top: 5px; padding: 5px 0;' data-bind='css: status'> + <span class='icon-time'></span> + <strong><span data-bind='text: time_slots'></span></strong></div></div> - </li> - </ul> - </script> - <script type='text/html' id='no-group-activity-template'> - Your group has not had any activity yet. You can <a href='#dashboard' data-bind='click:activateDashboardTab' data-toggle='tab'>perform challenges in your dashboard</a> - or post messages in the <a href='#group' data-bind='click:activateGroupTab'>the group wall</a> - . - </script> + </div> + </li> + </ul> + </script> + <script type='text/html' id='no-group-activity-template'> + Your group has not had any activity yet. You can <a href='#dashboard' data-bind='click:activateDashboardTab' data-toggle='tab'>perform challenges in your dashboard</a> + or post messages in the <a href='#group' data-bind='click:activateGroupTab'>the group wall</a> + . + </script></head><body><!-- Start of first page: #loginPage --><div data-role="page" id="loginPage"> - <div data-role="header" data-theme="a"> - <div class="navbar"> - <img width="40px" height="40px" src="https://vcweb.asu.edu/static/images/lighterprints/logo.png" alt="footprint logo"> - lighter<strong style="color:#b9ed2e;">footprints</strong> - </div> + <div data-role="header" data-theme="a" class="navbar"> + <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></div><div data-role="content"><form id="loginForm" class="ui-body"><div data-role="fieldcontain"> - <label for="email">Email:</label> + <label for="email"> + Email: + </label><input type="email" name="email" id="email" value="" placeholder="Email"> - <label for="password">Password:</label> + <label for="password"> + Password: + </label><input type="password" name="password" id="password" value="" placeholder="Password"></div><a href="#" data-theme="c" data-role="button" id="submitLogin" type="submit" class="center-button"><span class="icon-user"></span> Login</a></form></div></div> - <!-- /page loginPage--><!-- Start of #dashboardPage --> - <div data-role="page" id="dashboardPage"> - <div data-role="header" data-theme="a" data-position="fixed"> - <div class="navbar"> - <img width="40px" height="40px" src="https://vcweb.asu.edu/static/images/lighterprints/logo.png" alt="footprint logo">lighter<strong style="color:#b9ed2e;">footprints</strong> - <a href="#popupMenu" style="float:right;" data-rel="popup" data-role="button" data-inline="true" data-icon="align-justify" data-iconpos="notext" data-theme="a"></a> - <div data-role="popup" id="popupMenu" data-theme="a"> - <ul data-role="listview" data-inset="true" data-theme="a"> - <li><a href="#dashboardPage" class="icon-gauge"> Dashboard</a></li> - <li><a href="#challengesPage" class="icon-star"> Challenges</a></li> - <li><a href="#myTeamPage" class="icon-user"> My Team</a></li> - <li><a href="#helpPage" class="icon-question"> Help</a></li> - </ul> - </div> - </div> + <!-- /pageloginPage--><!-- Start of #dashboardPage --> + <div data-role="page" id="dashboardPage" class="ui-responsive-panel"> + <!-- defaultpanel --> + <div data-role="panel" id="defaultpanel" data-theme="b"> + <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="#helpPage" data-theme="c" data-role="button" class="innerbutton"><h2><span class="icon-question"></span> Help</h2></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></div><div data-role="content"> - - <h2><span class="icon-gauge"></span> Team Dashboard</h2> + <h2><span class="icon-gauge"></span> Team Dashboard</h2><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:120px">TODAY'S SCORE<br> + <div class="ui-bar ui-bar-d" 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:120px">CURRENT LEVEL + <div class="ui-bar ui-bar-d" 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'></div> @@ -221,15 +209,25 @@ </div><!-- /grid-a --><div class="ui-grid-a"><div class="ui-block-a"> - <div class="ui-bar ui-bar-d" style="height:120px">TODAY'S PROGRESS<br> + <div class="ui-bar ui-bar-d" style="height:70px"> + 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-d" style="height:120px">TIME REMAINING - <table><tr><td><span data-bind="text: hoursLeft"></span>h</td> - <td><span data-bind="text: minutesLeft"></span>m</td></tr> + <div class="ui-bar ui-bar-d" style="height:70px"> + 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> @@ -240,9 +238,11 @@ <div class="ui-bar-d"><div data-role="navbar"><ul id="challengesNavbarList"> - <li><a href="#" class="ui-btn-active"><span class="icon-star"></span>Unlocked</a> + <li> + <a href="#" class="ui-btn-active"><span class="icon-star"></span> Unlocked</a></li> - <li><a href="#dashboardLockedChallengePage"><span class="icon-lock"></span>Locked</a> + <li> + <a href="#dashboardLockedChallengePage"><span class="icon-lock"></span> Locked</a></li></ul></div> @@ -277,51 +277,222 @@ </div></div></div> + <div data-role="footer" data-position="fixed" 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 dashboardPage--><!-- Start of #dashboardLockedChallengePage --> + <div data-role="page" id="dashboardLockedChallengePage" class="ui-responsive-panel"> + <div data-role="panel" id="defaultpanel" data-theme="b"> + <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="#helpPage" data-theme="c" data-role="button" class="innerbutton"><h2><span class="icon-question"></span> Help</h2></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"> + <h2><span class="icon-gauge"></span> Team Dashboard</h2> + <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"> + 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"> + 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-d" style="height:70px"> + 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-d" style="height:70px"> + 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> + <br> + <br> + <h2><span class="icon-star"></span> Challenges</h2> + <div class="ui-bar-d"> + <div data-role="navbar"> + <ul> + <li> + <a href="#dashboardPage"><span class="icon-star"></span> Unlocked</a> + </li> + <li> + <a href="#" class="ui-btn-active"><span class="icon-lock"></span> Locked</a> + </li> + </ul> + </div> + <!-- /navbar --> + <div class='tab-pane' id='locked-challenges'> + <div data-bind='if: lockedChallenges().length === 0'> + <div style='padding: 10px;' class='alert-block'> + <span class='text-gold icon-star'></span>Congratulations, your group has unlocked all of the challenges. + </div> + </div> + <div data-bind="template: { name: 'challenges-template', data: { challenges: lockedChallenges() } }"> + </div> + </div> + </div> + <br> + <br> + <h2><span class="icon-trophy"></span> Leaderboard</h2> + <div class="ui-bar-d"> + <ul 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="text: groupName"></span> + <span class="ui-li-count" data-bind="text: totalPoints"></span> + </li> + </ul> + </div> + <br> + <br> + <h2><span class="icon-user"></span> Team Activity</h2> + <div class="ui-bar-d"> + <div data-bind='ifnot: hasGroupActivity()'> + <div data-bind='template: { name: "no-group-activity-template" }'> + </div> + </div> + <div class='table group-activity'> + <ul 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-position="fixed" data-theme="c"> - <div class="ui-bar-b" style="text-align: center;padding-top: 10px;padding-bottom: 10px;"> + <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="#myTeamPage">My Team</a> - <a href="#helpPage">Help</a> + <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="50px" height="50px" src="https://vcweb.asu.edu/static/images/lighterprints/logo.png" alt="footprint logo">lighter<strong>footprints</strong> + <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 dashboardPage--><!-- Start of #dashboardLockedChallengePage --> - <div data-role="page" id="dashboardLockedChallengePage"> - <div data-role="header" data-theme="a" data-position="fixed"> - <div class="navbar"> - <img width="40px" height="40px" src="https://vcweb.asu.edu/static/images/lighterprints/logo.png" alt="footprint logo">lighter<strong style="color:#b9ed2e;">footprints</strong> - <a href="#popupMenu" style="float:right;" data-rel="popup" data-role="button" data-inline="true" data-icon="align-justify" data-iconpos="notext" data-theme="a"></a> - <div data-role="popup" id="popupMenu" data-theme="a"> - <ul data-role="listview" data-inset="true" data-theme="a"> - <li><a href="#dashboardPage" class="icon-gauge"> Dashboard</a></li> - <li><a href="#challengesPage" class="icon-star"> Challenges</a></li> - <li><a href="#myTeamPage" class="icon-user"> My Team</a></li> - <li><a href="#helpPage" class="icon-question"> Help</a></li> - </ul> - </div> - </div> + <!-- /page dashboardLockedChallengePage--><!-- Start of first page: #challengesPage --> + <div data-role="page" id="challengesPage" class="ui-responsive-panel"> + <div data-role="panel" id="defaultpanel" data-theme="b"> + <a href="#dashboardPage" data-theme="c" data-role="button" class="innerbutton"><h2><span class="icon-gauge"></span> Dashboard</h2></a> + <a href="#" 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="#helpPage" data-theme="c" data-role="button" class="innerbutton"><h2><span class="icon-question"></span> Help</h2></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"> - <h2><span class="icon-star"></span>Challenges</h2> + <h2><span class="icon-star"></span> Challenges</h2><div class="ui-bar-d"><div data-role="navbar"><ul><li> - <a href="#dashboardPage"><span class="icon-star"></span>Unlocked</a> + <a href="#" class="ui-btn-active"><span class="icon-star"></span> Unlocked</a></li><li> - <a href="#" class="ui-btn-active"><span class="icon-lock"></span>Locked</a> + <a href="#lockedChallengePage"><span class="icon-lock"></span> Locked</a></li></ul></div> - <!-- /navbar --> + <div class='tab-pane active' id='unlocked-challenges'> + <div data-bind="template: { name: 'challenges-template', data: { challenges: unlockedChallenges() } }"> + </div> + </div> + </div> + </div> + <div data-role="footer" data-position="fixed" 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="#"> 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 challengesPage--><!-- Start of #lockedChallengePage --> + <div data-role="page" id="lockedChallengePage" class="ui-responsive-panel"> + <div data-role="panel" id="defaultpanel" data-theme="b"> + <a href="#dashboardPage" data-theme="c" data-role="button" class="innerbutton"><h2><span class="icon-gauge"></span>Dashboard</h2></a> + <a href="#" 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="#helpPage" data-theme="c" data-role="button" class="innerbutton"><h2><span class="icon-question"></span>Help</h2></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"> + <h2><span class="icon-star"></span> Challenges</h2> + <div class="ui-bar-d"> + <div data-role="navbar"> + <ul> + <li> + <a href="#challengesPage"><span class="icon-star"></span> Unlocked</a> + </li> + <li> + <a href="#" class="ui-btn-active"><span class="icon-lock"></span> Locked</a> + </li> + </ul> + </div><div class='tab-pane' id='locked-challenges'><div data-bind='if: lockedChallenges().length === 0'><div style='padding: 10px;' class='alert-block'> @@ -333,145 +504,36 @@ </div></div></div> - <div data-role="footer" data-position="fixed" data-theme="c"> - <div class="ui-bar-b" style="text-align: center;padding-top: 10px;padding-bottom: 10px;"> + <div data-role="footer" data-position="fixed" 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="#myTeamPage">My Team</a> - <a href="#helpPage">Help</a> + <a href="#dashboardPage" data-theme="b"> Dashboard</a> + <a href="#"> 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="50px" height="50px" src="https://vcweb.asu.edu/static/images/lighterprints/logo.png" alt="footprint logo">lighter<strong>footprints</strong> - </div> - </div> - </div> - <!-- /page dashboardLockedChallengePage--><!-- Start of first page: #challengesPage --> - <div data-role="page" id="challengesPage"> - <div data-role="header" data-theme="a" data-position="fixed"> - <div class="navbar"> - <img width="40px" height="40px" src="https://vcweb.asu.edu/static/images/lighterprints/logo.png" alt="footprint logo">lighter<strong style="color:#b9ed2e;">footprints</strong> - <a href="#popupMenu" style="float:right;" data-rel="popup" data-role="button" data-inline="true" data-icon="align-justify" data-iconpos="notext" data-theme="a"></a> - <div data-role="popup" id="popupMenu" data-theme="a"> - <ul data-role="listview" data-inset="true" data-theme="a"> - <li><a href="#dashboardPage" class="icon-gauge"> Dashboard</a></li> - <li><a href="#challengesPage" class="icon-star"> Challenges</a></li> - <li><a href="#myTeamPage" class="icon-user"> My Team</a></li> - <li><a href="#helpPage" class="icon-question"> Help</a></li> - </ul> - </div> - </div> - </div> - <div data-role="content"> - <h2><span class="icon-star"></span>Challenges</h2> - <div class="ui-bar-d"> - <div data-role="navbar"> - <ul> - <li> - <a href="#" class="ui-btn-active"><span class="icon-star"></span>Unlocked</a> - </li> - <li> - <a href="#lockedChallengePage"><span class="icon-lock"></span>Locked</a> - </li> - </ul> - </div> - <div class='tab-pane active' id='unlocked-challenges'> - <div data-bind="template: { name: 'challenges-template', data: { challenges: unlockedChallenges() } }"> - </div> - </div> - </div> - </div> - <div data-role="footer" data-position="fixed" data-theme="c"> - <div class="ui-bar-b" style="text-align: center;padding-top: 10px;padding-bottom: 10px;"> - <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="#myTeamPage">My Team</a> - <a href="#helpPage">Help</a> - </div> - 2013 Arizona Board Of Regents - </div> - <div class="footerbar"> - <img width="50px" height="50px" src="https://vcweb.asu.edu/static/images/lighterprints/logo.png" alt="footprint logo">lighter<strong>footprints</strong> - </div> - </div> - </div> - <!-- /page challengesPage--><!-- Start of #lockedChallengePage --> - <div data-role="page" id="lockedChallengePage"> - <div data-role="header" data-theme="a" data-position="fixed"> - <div class="navbar"> - <img width="40px" height="40px" src="https://vcweb.asu.edu/static/images/lighterprints/logo.png" alt="footprint logo">lighter<strong style="color:#b9ed2e;">footprints</strong> - <a href="#popupMenu" style="float:right;" data-rel="popup" data-role="button" data-inline="true" data-icon="align-justify" data-iconpos="notext" data-theme="a"></a> - <div data-role="popup" id="popupMenu" data-theme="a"> - <ul data-role="listview" data-inset="true" data-theme="a"> - <li><a href="#dashboardPage" class="icon-gauge"> Dashboard</a></li> - <li><a href="#challengesPage" class="icon-star"> Challenges</a></li> - <li><a href="#myTeamPage" class="icon-user"> My Team</a></li> - <li><a href="#helpPage" class="icon-question"> Help</a></li> - </ul> - </div> - </div> - </div> - <div data-role="content"> - <h2><span class="icon-star"></span>Challenges</h2> - <div class="ui-bar-d"> - <div data-role="navbar"> - <ul> - <li> - <a href="#challengesPage"><span class="icon-star"></span>Unlocked</a> - </li> - <li> - <a href="#" class="ui-btn-active"><span class="icon-lock"></span>Locked</a> - </li> - </ul> - </div> - <!-- /navbar --> - <div class='tab-pane' id='locked-challenges'> - <div data-bind='if: lockedChallenges().length === 0'> - <div style='padding: 10px;' class='alert-block'> - <span class='text-gold icon-star'></span>Congratulations, your group has unlocked all of the challenges. - </div> - </div> - <div data-bind="template: { name: 'challenges-template', data: { challenges: lockedChallenges() } }"> - </div> - </div> - </div> - </div> - <div data-role="footer" data-position="fixed" data-theme="c"> - <div class="ui-bar-b" style="text-align: center;padding-top: 10px;padding-bottom: 10px;"> - <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="#myTeamPage">My Team</a> - <a href="#helpPage">Help</a> - </div> - 2013 Arizona Board Of Regents - </div> - <div class="footerbar"> - <img width="50px" height="50px" src="https://vcweb.asu.edu/static/images/lighterprints/logo.png" alt="footprint logo">lighter<strong>footprints</strong> + <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 lockedChallengePage--><!-- Start of page: #myTeamPage --> - <div data-role="page" id="myTeamPage"> - <div data-role="header" data-theme="a" data-position="fixed"> - <div class="navbar"> - <img width="40px" height="40px" src="https://vcweb.asu.edu/static/images/lighterprints/logo.png" alt="footprint logo">lighter<strong style="color:#b9ed2e;">footprints</strong> - <a href="#popupMenu" style="float:right;" data-rel="popup" data-role="button" data-inline="true" data-icon="align-justify" data-iconpos="notext" data-theme="a"></a> - <div data-role="popup" id="popupMenu" data-theme="a"> - <ul data-role="listview" data-inset="true" data-theme="a"> - <li><a href="#dashboardPage" class="icon-gauge"> Dashboard</a></li> - <li><a href="#challengesPage" class="icon-star"> Challenges</a></li> - <li><a href="#myTeamPage" class="icon-user"> My Team</a></li> - <li><a href="#helpPage" class="icon-question"> Help</a></li> - </ul> - </div> - </div> + <div data-role="page" id="myTeamPage" class="ui-responsive-panel"> + <div data-role="panel" id="defaultpanel" data-theme="b"> + <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="#" 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> + <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" id="myTeam"> - <h2><span class="icon-comment"></span>My Team</h2> + <h2><span class="icon-comment"></span> My Team</h2><div class="ui-bar-d"><div data-bind="ifnot: hasChatMessages() " data-inset="true"> No chat messages have been posted yet. @@ -484,7 +546,7 @@ <br><span data-bind="text: value"></span><br> - <span data-bind="text: date_created"></span> ago + <span data-bind="text: date_created"></span>ago </span></li></ul> @@ -492,44 +554,40 @@ <form id="chat-form"><div data-role="fieldcontain" class="innerblock"><input type="hidden" name="participant_group_id" value="1005"><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" id="submitChatMessage" type="submit">Send</a></form></div></div> - <div data-role="footer" data-position="fixed" data-theme="c"> - <div class="ui-bar-b" style="text-align: center;padding-top: 10px;padding-bottom: 10px;"> + <div data-role="footer" data-position="fixed" 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="#myTeamPage">My Team</a> - <a href="#helpPage">Help</a> + <a href="#dashboardPage" data-theme="b"> Dashboard</a> + <a href="#challengesPage"> Challenges</a> + <a href="#"> My Team</a> + <a href="#helpPage"> Help</a></div> 2013 Arizona Board Of Regents </div><div class="footerbar"> - <img width="50px" height="50px" src="https://vcweb.asu.edu/static/images/lighterprints/logo.png" alt="footprint logo">lighter<strong>footprints</strong> + <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 myTeamPage--> - <!-- Start of page: #helpPage --> - <div data-role="page" id="helpPage"> - <div data-role="header" data-theme="a" data-position="fixed"> - <div class="navbar"> - <img width="40px" height="40px" src="https://vcweb.asu.edu/static/images/lighterprints/logo.png" alt="footprint logo">lighter<strong style="color:#b9ed2e;">footprints</strong> - <a href="#popupMenu" style="float:right;" data-rel="popup" data-role="button" data-inline="true" data-icon="align-justify" data-iconpos="notext" data-theme="a"></a> - <div data-role="popup" id="popupMenu" data-theme="a"> - <ul data-role="listview" data-inset="true" data-theme="a"> - <li><a href="#dashboardPage" class="icon-gauge"> Dashboard</a></li> - <li><a href="#challengesPage" class="icon-star"> Challenges</a></li> - <li><a href="#myTeamPage" class="icon-user"> My Team</a></li> - <li><a href="#helpPage" class="icon-question"> Help</a></li> - </ul> - </div> - </div> + <!-- /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"> + <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> + </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"> - <h2><span class="icon-question"></span>Help</h2> + <h2><span class="icon-question"></span> Help</h2><div class="ui-bar-d" data-inset="true"><h2>Instructions</h2><p> @@ -568,7 +626,7 @@ </p></div><div class="ui-bar-d"> - <h2>Frequently Asked Questions</h2> + <h3>Frequently Asked Questions</h3><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> @@ -599,23 +657,23 @@ </ul></div></div> - <div data-role="footer" data-position="fixed" data-theme="c"> - <div class="ui-bar-b" style="text-align: center;padding-top: 10px;padding-bottom: 10px;"> + <div data-role="footer" data-position="fixed" 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="#myTeamPage">My Team</a> - <a href="#helpPage">Help</a> + <a href="#dashboardPage" data-theme="b"> Dashboard</a> + <a href="#challengesPage"> Challenges</a> + <a href="#myTeam"> My Team</a> + <a href="#"> Help</a></div> 2013 Arizona Board Of Regents </div><div class="footerbar"> - <img width="50px" height="50px" src="https://vcweb.asu.edu/static/images/lighterprints/logo.png" alt="footprint logo">lighter<strong>footprints</strong> + <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 helpPage--> - <!-- Start of page: #modalPage --> + <!-- /page helpPage--><!-- Start of page: #modalPage --><div data-role="page" id="modalPage" data-close-btn="right"><div data-role="header"><h1></h1> @@ -635,6 +693,7 @@ <a href="#" data-role="button" data-rel="back" data-theme="b">OK</a></div></div> - </div><!-- /page modalPage--> + </div> + <!-- /page modalPage--></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-02 00:37:04
|
3 new commits in vcweb: https://bitbucket.org/virtualcommons/vcweb/commits/6d402266820c/ Changeset: 6d402266820c User: RoleeSinha Date: 2013-05-02 02:30:04 Summary: lighterprints mobile Affected #: 1 file diff -r 82bc16b1b4e9ff4bbc4a554bb8ab14577b42821c -r 6d402266820cc55b38e3df5411150bf0854f8ad4 vcweb/lighterprints/templates/lighterprints/mobile/app/controller.js --- a/vcweb/lighterprints/templates/lighterprints/mobile/app/controller.js +++ b/vcweb/lighterprints/templates/lighterprints/mobile/app/controller.js @@ -40,15 +40,8 @@ return model.availableActivities().length > 0; }); model.lastPerformedActivity = ko.observable(); - - return model; -} - -function initKOModel(response){ - var viewModelData = $.parseJSON(response.view_model_json); - globalViewModel = new LighterFootprintsModel(viewModelData); - // custom view model methods, some of these may be lifted into the model itself - globalViewModel.perform = function(challengeModel){ + + model.perform = function(challengeModel){ if (!challengeModel.availableNow()) { console.debug("tried to perform an activity that's not available right now"); console.debug(challengeModel); @@ -58,8 +51,9 @@ var formData = $('#challengeForm' + id).serialize(); $.post('http://vcweb.asu.edu/lighterprints/api/do-activity', formData, function(data){ if (data.success) { - ko.mapping.fromJSON(data.globalViewModel, globalViewModel); - globalViewModel.lastPerformedActivity(challengeModel); + console.debug(data); + ko.mapping.fromJSON(data.viewModel, model); + model.lastPerformedActivity(challengeModel); $.mobile.changePage($("#modalPage"),{transition: 'pop', role: 'dialog'}); } else { @@ -69,9 +63,27 @@ } }); }; - - ko.applyBindings(globalViewModel); - + + return model; +} + +function initKOModel(response){ + var groupURL = "http://vcweb.asu.edu/lighterprints/api/view-model/" + participant_group_id; + $.ajax({ + type: "GET", + url: groupURL, + dataType: "json", + cache: false, + success: function(response){ + var viewModelData = $.parseJSON(response.view_model_json); + globalViewModel = new LighterFootprintsModel(viewModelData); + ko.applyBindings(globalViewModel); + $.mobile.changePage($("#dashboardPage")); + }, + error: function(form, response){ + alert(response.message); + } + }); } $(document).live('pageinit', function(event){ @@ -82,7 +94,7 @@ var formData = $("#loginForm").serialize(); $.ajax({ type: "POST", - url: "http://vcweb.asu.edu/lighterprints/api/view-model/1005", + url: "http://vcweb.asu.edu/lighterprints/api/login", cache: false, data: formData, dataType: "json", @@ -92,9 +104,8 @@ } else if (data.success == true) { - initKOModel(data); - console.debug(data); - $.mobile.changePage($("#dashboardPage")); + participant_group_id = data.participant_group_id; + initKOModel(); } }, error: function(form, response){ @@ -107,7 +118,7 @@ event.preventDefault(); var formData = $('#chat-form').serialize(); - $.post('https://vcweb.asu.edu/lighterprints/api/message', formData, function(response) { + $.post('http://vcweb.asu.edu/lighterprints/api/message', formData, function(response) { if (response.success) { console.debug("successful post - updated view model: "); ko.mapping.fromJS(response.viewModel, globalViewModel); @@ -118,7 +129,13 @@ } }); $('#chatText').val(''); - return false; }); + $("#dashboardPage").bind('pageaftershow', function(event) { + $('#challengesList').listview('refresh'); + //$('#challengesNavbarList').listview('refresh'); + }); + $("#myTeamPage").bind('pagebeforeshow', function(event) { + $('#chatMessageList').listview('refresh'); + }); }); https://bitbucket.org/virtualcommons/vcweb/commits/050cc082ef1f/ Changeset: 050cc082ef1f User: RoleeSinha Date: 2013-05-02 02:30:25 Summary: lighterprints mobile Affected #: 1 file diff -r 6d402266820cc55b38e3df5411150bf0854f8ad4 -r 050cc082ef1f0a590f455499ec8923c29dae79ed vcweb/lighterprints/templates/lighterprints/mobile/index.html --- a/vcweb/lighterprints/templates/lighterprints/mobile/index.html +++ b/vcweb/lighterprints/templates/lighterprints/mobile/index.html @@ -29,11 +29,11 @@ </script><!-- group activity templates, keyed by parameter name --><script type='text/html' id='comment'> - <tr data-bind='if: $root.participantGroupId() != participant_group_id()'> - <td class='group-activity-icon'> + <li data-bind='if: $root.participantGroupId() != participant_group_id()'> + <div class='group-activity-icon'><span class='icon-comment lighterprints-blue'></span> - </td> - <td class='group-activity'> + </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> @@ -53,15 +53,15 @@ </div><div data-bind='template: "likeCommentTemplate"'></div> - </td> - </tr> + </span> + </li></script><script type='text/html' id='like'> - <tr data-bind='if: $root.participantGroupId() != participant_group_id()'> - <td class='group-activity-icon'> + <li data-bind='if: $root.participantGroupId() != participant_group_id()'> + <span class='group-activity-icon'><span class='icon-heart lighterprints-red'></span> - </td> - <td class='group-activity'> + </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> @@ -70,17 +70,14 @@ liked your<span data-bind='if: target_parameter_name() === "activity_performed"'>completed challenge, <em data-bind='text: target_data_value'></em></span><span data-bind='if: target_parameter_name() === "chat_message" || target_parameter_name() === "comment"'>message, "<em data-bind='text: target_data_value'></em>"</span></div> - </td> - </tr> + </span> + </li></script><script type='text/html' id='chat_message'> - <tr> - <td class='group-activity-icon'> - <span class='icon-comment lighterprints-blue'></span> - </td> - <td class='group-activity'> + <li> + <span class='icon-comment lighterprints-blue'></span><strong>Participant <span data-bind='text: participant_number'></span></strong> - <small class='pull-right muted'> + <small><span data-bind='text: date_created'></span></small><div> @@ -94,32 +91,29 @@ </div><div data-bind="template: 'likeCommentTemplate'"></div> - </td> - </tr> + </span> + </li></script><script type='text/html' id='activity_performed'> - <tr> - <td class='group-activity-icon'> - <span class='icon-star text-gold'></span> - </td> - <td class='group-activity'> + <li> + <span class='icon-star text-gold'></span><strong>Participant <span data-bind='text: participant_number'></span></strong> - <small class='pull-right muted'> + <small><span data-bind='text: date_created'></span></small> - <div> + <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>. - </div> + </span><div data-bind="template: 'likeCommentTemplate'"></div> - </td> - </tr> + </span> + </li></script><script type='text/html' id='challenges-template'> - <ul data-role="listview" data-inset="true" data-theme="d" data-bind='foreach: challenges'> + <ul id="challengesList" data-role="listview" data-inset="true" data-theme="d" data-bind='foreach: challenges'><li><div class='row challenge-row'><div class='span2'> @@ -178,52 +172,44 @@ <div data-role="content"><form id="loginForm" class="ui-body"><div data-role="fieldcontain"> - <label for="email"> - Email: - </label> + <label for="email">Email:</label><input type="email" name="email" id="email" value="" placeholder="Email"> - <label for="password"> - Password: - </label> + <label for="password">Password:</label><input type="password" name="password" id="password" value="" placeholder="Password"></div><a href="#" data-theme="c" data-role="button" id="submitLogin" type="submit" class="center-button"> - <span class="icon-user"></span>Login</a> + <span class="icon-user"></span> Login</a></form></div></div><!-- /page loginPage--><!-- Start of #dashboardPage --><div data-role="page" id="dashboardPage"> - <div data-role="header" data-theme="a"> - <div class="navbar"> - <img width="40px" height="40px" src="https://vcweb.asu.edu/static/images/lighterprints/logo.png" alt="footprint logo">lighter<strong style="color:#b9ed2e;">footprints</strong> - <a href="#popupMenu" style="float:right;" data-rel="popup" data-role="button" data-inline="true" data-icon="align-justify" data-iconpos="notext" data-theme="a"></a> - <div data-role="popup" id="popupMenu" data-theme="a"> - <ul data-role="listview" data-inset="true" data-theme="a"> - <li> - <a href="#navPage">Navigate</a> - </li> - <li> - <a href="index.html" rel="external" data-role="button">logout</a> - </li> - </ul> - </div> + <div data-role="header" data-theme="a" data-position="fixed"> + <div class="navbar"> + <img width="40px" height="40px" src="https://vcweb.asu.edu/static/images/lighterprints/logo.png" alt="footprint logo">lighter<strong style="color:#b9ed2e;">footprints</strong> + <a href="#popupMenu" style="float:right;" data-rel="popup" data-role="button" data-inline="true" data-icon="align-justify" data-iconpos="notext" data-theme="a"></a> + <div data-role="popup" id="popupMenu" data-theme="a"> + <ul data-role="listview" data-inset="true" data-theme="a"> + <li><a href="#dashboardPage" class="icon-gauge"> Dashboard</a></li> + <li><a href="#challengesPage" class="icon-star"> Challenges</a></li> + <li><a href="#myTeamPage" class="icon-user"> My Team</a></li> + <li><a href="#helpPage" class="icon-question"> Help</a></li> + </ul></div> + </div></div><div data-role="content"> + + <h2><span class="icon-gauge"></span> Team Dashboard</h2><div class="ui-bar"> - <h2><span class="icon-gauge"></span>Team Dashboard</h2></div><div class="ui-grid-a" data-inset="true"><div class="ui-block-a"> - <div class="ui-bar ui-bar-d" style="height:120px"> - TODAY'S SCORE - <br> + <div class="ui-bar ui-bar-d" style="height:120px">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:120px"> - CURRENT LEVEL + <div class="ui-bar ui-bar-d" style="height:120px">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> @@ -235,40 +221,28 @@ </div><!-- /grid-a --><div class="ui-grid-a"><div class="ui-block-a"> - <div class="ui-bar ui-bar-d" style="height:120px"> - TODAY"S PROGRESS - <br> + <div class="ui-bar ui-bar-d" style="height:120px">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-d" style="height:120px"> - TIME REMAINING - <table> - <tr> - <td> - <span data-bind="text: hoursLeft"></span>h - </td> - <td> - <span data-bind="text: minutesLeft"></span>m - </td> - </tr> + <div class="ui-bar ui-bar-d" style="height:120px">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><br><br> - <h2><span class="icon-star"></span>Challenges</h2> + <h2><span class="icon-star"></span> Challenges</h2><div class="ui-bar-d"><div data-role="navbar"> - <ul> - <li> - <a href="#" class="ui-btn-active"><span class="icon-star"></span>Unlocked</a> + <ul id="challengesNavbarList"> + <li><a href="#" class="ui-btn-active"><span class="icon-star"></span>Unlocked</a></li> - <li> - <a href="#dashboardLockedChallengePage"><span class="icon-lock"></span>Locked</a> + <li><a href="#dashboardLockedChallengePage"><span class="icon-lock"></span>Locked</a></li></ul></div> @@ -279,7 +253,7 @@ </div><br><br> - <h2><span class="icon-trophy"></span>Leaderboard</h2> + <h2><span class="icon-trophy"></span> Leaderboard</h2><div class="ui-bar-d"><ul data-role="listview" data-bind="foreach: groupData" data-inset="true" data-theme="b"><li> @@ -291,25 +265,25 @@ </div><br><br> - <h2><span class="icon-user"></span>Team Activity</h2> + <h2><span class="icon-user"></span> Team Activity</h2><div class="ui-bar-d"><div data-bind='ifnot: hasGroupActivity()'><div data-bind='template: { name: "no-group-activity-template" }'></div></div> - <table class='table group-activity'> - <tbody data-bind='template: { name: groupActivityTemplate, foreach: groupActivity.slice(0, 6) }'> - </tbody> - </table> + <div class='table group-activity'> + <ul 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-position="fixed" data-theme="c"><div class="ui-bar-b" style="text-align: center;padding-top: 10px;padding-bottom: 10px;"><div data-role="controlgroup" data-type="horizontal" data-theme="b"> - <a href="#" data-theme="b">Dashboard</a> - <a href="#">Challenges</a> - <a href="#">My Team</a> - <a href="#">Help</a> + <a href="#dashboardPage" 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> @@ -318,22 +292,22 @@ </div></div></div> - <!-- /page dashboardPage--><!-- /page loginPage--><!-- Start of #navPage --> - <div data-role="page" id="navPage" data-position="fixed"> - <div data-role="content"> - <div class="ui-bar-d"> - <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="#helpPage" data-theme="c" data-role="button" class="innerbutton"><h2><span class="icon-question"></span>Help</h2></a> - <a href="#" data-theme="c" data-role="button" class="innerbutton"><h2><span class="icon-cog"></span>Settings</h2></a> + <!-- /page dashboardPage--><!-- Start of #dashboardLockedChallengePage --> + <div data-role="page" id="dashboardLockedChallengePage"> + <div data-role="header" data-theme="a" data-position="fixed"> + <div class="navbar"> + <img width="40px" height="40px" src="https://vcweb.asu.edu/static/images/lighterprints/logo.png" alt="footprint logo">lighter<strong style="color:#b9ed2e;">footprints</strong> + <a href="#popupMenu" style="float:right;" data-rel="popup" data-role="button" data-inline="true" data-icon="align-justify" data-iconpos="notext" data-theme="a"></a> + <div data-role="popup" id="popupMenu" data-theme="a"> + <ul data-role="listview" data-inset="true" data-theme="a"> + <li><a href="#dashboardPage" class="icon-gauge"> Dashboard</a></li> + <li><a href="#challengesPage" class="icon-star"> Challenges</a></li> + <li><a href="#myTeamPage" class="icon-user"> My Team</a></li> + <li><a href="#helpPage" class="icon-question"> Help</a></li> + </ul></div> - <br> - <br> + </div></div> - </div> - <!-- /page navPage--><!-- /page dashboardPage--><!-- Start of #dashboardLockedChallengePage --> - <div data-role="page" id="dashboardLockedChallengePage"><div data-role="content"><h2><span class="icon-star"></span>Challenges</h2><div class="ui-bar-d"> @@ -359,9 +333,37 @@ </div></div></div> + <div data-role="footer" data-position="fixed" data-theme="c"> + <div class="ui-bar-b" style="text-align: center;padding-top: 10px;padding-bottom: 10px;"> + <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="#myTeamPage">My Team</a> + <a href="#helpPage">Help</a> + </div> + 2013 Arizona Board Of Regents + </div> + <div class="footerbar"> + <img width="50px" height="50px" src="https://vcweb.asu.edu/static/images/lighterprints/logo.png" alt="footprint logo">lighter<strong>footprints</strong> + </div> + </div></div><!-- /page dashboardLockedChallengePage--><!-- Start of first page: #challengesPage --><div data-role="page" id="challengesPage"> + <div data-role="header" data-theme="a" data-position="fixed"> + <div class="navbar"> + <img width="40px" height="40px" src="https://vcweb.asu.edu/static/images/lighterprints/logo.png" alt="footprint logo">lighter<strong style="color:#b9ed2e;">footprints</strong> + <a href="#popupMenu" style="float:right;" data-rel="popup" data-role="button" data-inline="true" data-icon="align-justify" data-iconpos="notext" data-theme="a"></a> + <div data-role="popup" id="popupMenu" data-theme="a"> + <ul data-role="listview" data-inset="true" data-theme="a"> + <li><a href="#dashboardPage" class="icon-gauge"> Dashboard</a></li> + <li><a href="#challengesPage" class="icon-star"> Challenges</a></li> + <li><a href="#myTeamPage" class="icon-user"> My Team</a></li> + <li><a href="#helpPage" class="icon-question"> Help</a></li> + </ul> + </div> + </div> + </div><div data-role="content"><h2><span class="icon-star"></span>Challenges</h2><div class="ui-bar-d"> @@ -381,9 +383,37 @@ </div></div></div> + <div data-role="footer" data-position="fixed" data-theme="c"> + <div class="ui-bar-b" style="text-align: center;padding-top: 10px;padding-bottom: 10px;"> + <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="#myTeamPage">My Team</a> + <a href="#helpPage">Help</a> + </div> + 2013 Arizona Board Of Regents + </div> + <div class="footerbar"> + <img width="50px" height="50px" src="https://vcweb.asu.edu/static/images/lighterprints/logo.png" alt="footprint logo">lighter<strong>footprints</strong> + </div> + </div></div><!-- /page challengesPage--><!-- Start of #lockedChallengePage --><div data-role="page" id="lockedChallengePage"> + <div data-role="header" data-theme="a" data-position="fixed"> + <div class="navbar"> + <img width="40px" height="40px" src="https://vcweb.asu.edu/static/images/lighterprints/logo.png" alt="footprint logo">lighter<strong style="color:#b9ed2e;">footprints</strong> + <a href="#popupMenu" style="float:right;" data-rel="popup" data-role="button" data-inline="true" data-icon="align-justify" data-iconpos="notext" data-theme="a"></a> + <div data-role="popup" id="popupMenu" data-theme="a"> + <ul data-role="listview" data-inset="true" data-theme="a"> + <li><a href="#dashboardPage" class="icon-gauge"> Dashboard</a></li> + <li><a href="#challengesPage" class="icon-star"> Challenges</a></li> + <li><a href="#myTeamPage" class="icon-user"> My Team</a></li> + <li><a href="#helpPage" class="icon-question"> Help</a></li> + </ul> + </div> + </div> + </div><div data-role="content"><h2><span class="icon-star"></span>Challenges</h2><div class="ui-bar-d"> @@ -409,9 +439,37 @@ </div></div></div> + <div data-role="footer" data-position="fixed" data-theme="c"> + <div class="ui-bar-b" style="text-align: center;padding-top: 10px;padding-bottom: 10px;"> + <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="#myTeamPage">My Team</a> + <a href="#helpPage">Help</a> + </div> + 2013 Arizona Board Of Regents + </div> + <div class="footerbar"> + <img width="50px" height="50px" src="https://vcweb.asu.edu/static/images/lighterprints/logo.png" alt="footprint logo">lighter<strong>footprints</strong> + </div> + </div></div><!-- /page lockedChallengePage--><!-- Start of page: #myTeamPage --><div data-role="page" id="myTeamPage"> + <div data-role="header" data-theme="a" data-position="fixed"> + <div class="navbar"> + <img width="40px" height="40px" src="https://vcweb.asu.edu/static/images/lighterprints/logo.png" alt="footprint logo">lighter<strong style="color:#b9ed2e;">footprints</strong> + <a href="#popupMenu" style="float:right;" data-rel="popup" data-role="button" data-inline="true" data-icon="align-justify" data-iconpos="notext" data-theme="a"></a> + <div data-role="popup" id="popupMenu" data-theme="a"> + <ul data-role="listview" data-inset="true" data-theme="a"> + <li><a href="#dashboardPage" class="icon-gauge"> Dashboard</a></li> + <li><a href="#challengesPage" class="icon-star"> Challenges</a></li> + <li><a href="#myTeamPage" class="icon-user"> My Team</a></li> + <li><a href="#helpPage" class="icon-question"> Help</a></li> + </ul> + </div> + </div> + </div><div data-role="content" id="myTeam"><h2><span class="icon-comment"></span>My Team</h2><div class="ui-bar-d"> @@ -419,33 +477,57 @@ No chat messages have been posted yet. </div><div data-bind="if: hasChatMessages()"> - <ul data-role="listview" data-bind="foreach: chatMessages" data-inset="true" style="overflow-y: scroll;"> + <ul id="chatMessageList" data-role="listview" data-bind="foreach: chatMessages" data-inset="true" style="overflow-y: scroll;"><li><i class='icon-user icon-2x'></i><span><strong>Participant <span data-bind="text: participant_number"></span></strong><br><span data-bind="text: value"></span><br> - <span data-bind="text: date_created"></span>ago + <span data-bind="text: date_created"></span> ago </span></li></ul></div><form id="chat-form"> - <div class="innerblock"> + <div data-role="fieldcontain" class="innerblock"><input type="hidden" name="participant_group_id" value="1005"><input type="text" id="chatText" name="message" placeholder="Send a message to your group"> - <fieldset> - <div> - <a href="#" data-role="button" id="submitChatMessage" type="submit">SEND</a> - </div> - </fieldset> - </div> + </div><a href="#" data-role="button" id="submitChatMessage" type="submit">SEND</a></form></div></div> + <div data-role="footer" data-position="fixed" data-theme="c"> + <div class="ui-bar-b" style="text-align: center;padding-top: 10px;padding-bottom: 10px;"> + <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="#myTeamPage">My Team</a> + <a href="#helpPage">Help</a> + </div> + 2013 Arizona Board Of Regents + </div> + <div class="footerbar"> + <img width="50px" height="50px" src="https://vcweb.asu.edu/static/images/lighterprints/logo.png" alt="footprint logo">lighter<strong>footprints</strong> + </div> + </div></div> - <!-- /page myTeamPage--><!-- Start of page: #modalPage --><!-- /page modalPage--><!-- Start of page: #helpPage --> - <div data-role="page" id="helpPage" data-close-btn="right"> + <!-- /page myTeamPage--> + <!-- Start of page: #helpPage --> + <div data-role="page" id="helpPage"> + <div data-role="header" data-theme="a" data-position="fixed"> + <div class="navbar"> + <img width="40px" height="40px" src="https://vcweb.asu.edu/static/images/lighterprints/logo.png" alt="footprint logo">lighter<strong style="color:#b9ed2e;">footprints</strong> + <a href="#popupMenu" style="float:right;" data-rel="popup" data-role="button" data-inline="true" data-icon="align-justify" data-iconpos="notext" data-theme="a"></a> + <div data-role="popup" id="popupMenu" data-theme="a"> + <ul data-role="listview" data-inset="true" data-theme="a"> + <li><a href="#dashboardPage" class="icon-gauge"> Dashboard</a></li> + <li><a href="#challengesPage" class="icon-star"> Challenges</a></li> + <li><a href="#myTeamPage" class="icon-user"> My Team</a></li> + <li><a href="#helpPage" class="icon-question"> Help</a></li> + </ul> + </div> + </div> + </div><div data-role="content"><h2><span class="icon-question"></span>Help</h2><div class="ui-bar-d" data-inset="true"> @@ -517,8 +599,23 @@ </ul></div></div> + <div data-role="footer" data-position="fixed" data-theme="c"> + <div class="ui-bar-b" style="text-align: center;padding-top: 10px;padding-bottom: 10px;"> + <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="#myTeamPage">My Team</a> + <a href="#helpPage">Help</a> + </div> + 2013 Arizona Board Of Regents + </div> + <div class="footerbar"> + <img width="50px" height="50px" src="https://vcweb.asu.edu/static/images/lighterprints/logo.png" alt="footprint logo">lighter<strong>footprints</strong> + </div> + </div></div><!-- /page helpPage--> + <!-- Start of page: #modalPage --><div data-role="page" id="modalPage" data-close-btn="right"><div data-role="header"><h1></h1> @@ -538,6 +635,6 @@ <a href="#" data-role="button" data-rel="back" data-theme="b">OK</a></div></div> - </div> + </div><!-- /page modalPage--></body></html> https://bitbucket.org/virtualcommons/vcweb/commits/520ab98ca2f4/ Changeset: 520ab98ca2f4 User: RoleeSinha Date: 2013-05-02 02:36:44 Summary: Merge with 5812d8de087899fbe9a7a2b5078b7436a5fc80f3 Affected #: 5 files diff -r 050cc082ef1f0a590f455499ec8923c29dae79ed -r 520ab98ca2f4176b6892531836dbae358d367830 vcweb/core/tests.py --- a/vcweb/core/tests.py +++ b/vcweb/core/tests.py @@ -48,7 +48,7 @@ @property def participant_group_relationships(self): - return ParticipantGroupRelationship.objects.filter(group__experiment=self.experiment) + return self.experiment.participant_group_relationships def create_new_experiment(self, experiment_metadata, experimenter=None): if experimenter is None: diff -r 050cc082ef1f0a590f455499ec8923c29dae79ed -r 520ab98ca2f4176b6892531836dbae358d367830 vcweb/core/urls.py --- a/vcweb/core/urls.py +++ b/vcweb/core/urls.py @@ -3,7 +3,8 @@ from vcweb import settings from vcweb.core.views import (Dashboard, LoginView, LogoutView, RegistrationView, monitor, CloneExperimentView, RegisterEmailListView, RegisterTestParticipantsView, ClearParticipantsExperimentView, add_experiment, - Participate, download_data, export_configuration, api_logger, participant_ready, get_number_of_ready_participants, deactivate) + Participate, download_data, export_configuration, api_logger, participant_api_login, api_logout, + participant_ready, get_number_of_ready_participants, deactivate) import logging import urllib @@ -35,6 +36,8 @@ # experiment controller actions are the most general, needs to be matched at the very end # deliberately match any prefix to api/2525/log url(r'api/log/(?P<participant_group_id>\d+)$', api_logger, name='api-logger'), + url(r'api/login', participant_api_login, name='participant_api_login'), + url(r'api/logout', api_logout, name='api_logout'), ) def foursquare_auth_dict(**kwargs): diff -r 050cc082ef1f0a590f455499ec8923c29dae79ed -r 520ab98ca2f4176b6892531836dbae358d367830 vcweb/core/views.py --- a/vcweb/core/views.py +++ b/vcweb/core/views.py @@ -129,6 +129,33 @@ return pers[0].experiment return None +# FIXME: merge these with LogoutView / LoginView +def api_logout(request): + user = request.user + set_authentication_token(user) + auth.logout(request) + return JsonResponse(dumps({'success': True})) + +# FIXME: assumes participant login +def participant_api_login(request): + form = LoginForm(request.POST or None) + try: + if form.is_valid(): + user = form.user_cache + logger.debug("user was authenticated as %s, attempting to login", user) + auth.login(request, user) + set_authentication_token(user, request.session.session_key) + participant = user.participant +# FIXME: defaulting to first active experiment... need to revisit this. + active_experiment = get_active_experiment(participant) + participant_group_relationship = active_experiment.get_participant_group_relationship(participant) + return JsonResponse(dumps({'success': True, 'participant_group_id': participant_group_relationship.pk})) + else: + logger.debug("invalid form %s", form) + except Exception as e: + logger.debug("Invalid login: %s", e) + return JsonResponse(dumps({'success': False, 'message': "Invalid login"})) + class LoginView(FormView, AnonymousMixin): form_class = LoginForm diff -r 050cc082ef1f0a590f455499ec8923c29dae79ed -r 520ab98ca2f4176b6892531836dbae358d367830 vcweb/lighterprints/urls.py --- a/vcweb/lighterprints/urls.py +++ b/vcweb/lighterprints/urls.py @@ -1,7 +1,7 @@ from django.conf.urls.defaults import url, patterns from django.views.generic.base import TemplateView -from vcweb.lighterprints.views import (post_chat_message, post_comment, perform_activity, login, participate, +from vcweb.lighterprints.views import (post_chat_message, post_comment, perform_activity, participate, group_activity, like, get_notifications, update_notifications_since, group_score, CsvExportView, checkin, activity_performed_counts, get_view_model, mobile_participate) @@ -16,7 +16,6 @@ url(r'^api/message', post_chat_message), url(r'^api/comment', post_comment), url(r'^api/like', like), - url(r'^api/login', login), url(r'^api/group-score/(?P<participant_group_id>\d+)', group_score), url(r'^api/notifications/clear', update_notifications_since), url(r'^api/notifications/(?P<participant_group_id>\d+)', get_notifications), diff -r 050cc082ef1f0a590f455499ec8923c29dae79ed -r 520ab98ca2f4176b6892531836dbae358d367830 vcweb/lighterprints/views.py --- a/vcweb/lighterprints/views.py +++ b/vcweb/lighterprints/views.py @@ -1,21 +1,19 @@ from datetime import datetime, timedelta -from django.contrib import auth from django.contrib.auth.decorators import login_required from django.core.exceptions import PermissionDenied -from django.http import HttpResponse, Http404 -from django.shortcuts import get_object_or_404, render, redirect -from django.utils.html import escape +from django.http import Http404 +from django.shortcuts import get_object_or_404, render from django.views.decorators.csrf import csrf_exempt -from django.views.generic.detail import DetailView, BaseDetailView +from django.views.generic.detail import BaseDetailView from django.views.generic.list import BaseListView, MultipleObjectTemplateResponseMixin from vcweb.core import unicodecsv from vcweb.core.decorators import participant_required -from vcweb.core.forms import (ChatForm, LoginForm, CommentForm, LikeForm, ParticipantGroupIdForm, GeoCheckinForm) +from vcweb.core.forms import (ChatForm, CommentForm, LikeForm, ParticipantGroupIdForm, GeoCheckinForm) from vcweb.core.http import JsonResponse from vcweb.core.models import (ChatMessage, Comment, Experiment, ParticipantGroupRelationship, ParticipantRoundDataValue, Like) from vcweb.core.services import foursquare_venue_search -from vcweb.core.views import JSONResponseMixin, DataExportMixin, dumps, set_authentication_token, json_response, get_active_experiment +from vcweb.core.views import JSONResponseMixin, DataExportMixin, dumps, json_response from vcweb.lighterprints.forms import ActivityForm from vcweb.lighterprints.models import (Activity, get_all_activities_tuple, do_activity, get_group_activity, can_view_other_groups, get_lighterprints_experiment_metadata, is_experiment_completed, @@ -266,26 +264,6 @@ logger.debug("invalid form: %s from request: %s", form, request) return JsonResponse(dumps({'success': False, 'message': 'Invalid post comment'})) -@csrf_exempt -def login(request): - form = LoginForm(request.POST or None) - try: - if form.is_valid(): - user = form.user_cache - logger.debug("user was authenticated as %s, attempting to login", user) - auth.login(request, user) - set_authentication_token(user, request.session.session_key) - participant = user.participant -# FIXME: defaulting to first active experiment... need to revisit this. - active_experiment = get_active_experiment(participant, experiment_metadata=get_lighterprints_experiment_metadata()) - participant_group_relationship = participant.get_participant_group_relationship(active_experiment) - return JsonResponse(dumps({'success': True, 'participant_group_id': participant_group_relationship.id})) - else: - logger.debug("invalid form %s", form) - except Exception as e: - logger.debug("Invalid login: %s", e) - return JsonResponse(dumps({'success': False, 'message': "Invalid login"})) - class CsvExportView(DataExportMixin, BaseDetailView): def export_data(self, response, experiment): logger.debug("exporting data for %s", experiment) 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}
