[virtualcommons-svn] commit/vcweb: 3 new changesets
Status: Beta
Brought to you by:
alllee
Menu
▾
▴
[virtualcommons-svn] commit/vcweb: 3 new changesets
|
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. |
