[virtualcommons-svn] commit/vcweb: 2 new changesets

[<com...@bi...>]

2 new commits in vcweb:

https://bitbucket.org/virtualcommons/vcweb/commits/f977d15984dd/
Changeset:   f977d15984dd
User:        RoleeSinha
Date:        2013-05-07 03:03:19
Summary:     fixing ui
Affected #:  1 file

diff -r 1a362b24fe7f47b42ff054ed84ae0cc8490d02e4 -r f977d15984ddfed1461d5b52a08d2c77084c6cbf vcweb/lighterprints/static/js/lighterprints/mobile/controller.js
--- a/vcweb/lighterprints/static/js/lighterprints/mobile/controller.js
+++ b/vcweb/lighterprints/static/js/lighterprints/mobile/controller.js
@@ -45,6 +45,9 @@
             return;
         }
         var id = challengeModel.pk();
+		 var formData = {
+			participant_group_id: participant_group_id(), activity_id:id
+		};
         var formData = $('#challengeForm' + id).serialize();
         $.post('/lighterprints/api/do-activity', formData, function(data){
             if (data.success) {


https://bitbucket.org/virtualcommons/vcweb/commits/a92b64f6d840/
Changeset:   a92b64f6d840
User:        RoleeSinha
Date:        2013-05-07 03:03:28
Summary:     fixing ui
Affected #:  1 file

diff -r f977d15984ddfed1461d5b52a08d2c77084c6cbf -r a92b64f6d840b25ddfdde04f657d3b4c67bcbc1a vcweb/lighterprints/templates/lighterprints/mobile/index.html
--- a/vcweb/lighterprints/templates/lighterprints/mobile/index.html
+++ b/vcweb/lighterprints/templates/lighterprints/mobile/index.html
@@ -89,6 +89,8 @@
                             </small></div></div>
+                    <div data-bind='template: "likeCommentTemplate"'>
+                    </div></span></li></script>
@@ -142,26 +144,22 @@
     </script><script type='text/html' id='challenges-template'><li data-icon="false">
-    	        	    <div class='span2'>
-        <img style='padding: 10px 0 0 20px;' data-bind='attr: {src: "/static/images/lighterprints/badges/" + name() + ".png" }'>
-    </div>
-    <div class='span4'>
-        <h4 class='challenge-name' data-bind='css: status, text:display_name'></h4>
-        <p>
-        <span data-bind='css: status, text: summary'></span>
-        </p>
-        <form data-bind='attr: { id: "challengeForm" + pk() }' class='form-horizontal' method='post'>
-            <input data-bind='value: pk' type='hidden' name='activity_id' />
-            <input type='hidden' name='participant_group_id' value='{{participant_group_relationship.id}}' />
-            <a data-bind='css: status, click: $root.perform' data-role="button">
-            <span data-bind='if: availableNow'>Perform</span>
-            <span data-bind='if: completed'>Completed <i class='icon-check'></i></span>
-            <span data-bind='if: expired'>Expired <i class='icon-warning-sign'></i></span>
-            <span data-bind='if: upcoming'>Not yet available <i class='icon-time'></i></span>
-            <span data-bind='if: locked'>Locked <i class='icon-lock'></i></span>
-            </a> 
-            
-        </form>
+    	        	
+            <a href="#" data-bind='css: status, click: $root.perform'>
+            	<span data-bind='if: availableNow'>Perform</span>
+				<span data-bind='if: completed'>Completed <span class='icon-check'></span></span>
+				<span data-bind='if: expired'>Expired <span class='icon-warning-sign'></span></span>
+				<span data-bind='if: upcoming'>Not yet available <span class='icon-time'></span></span>
+				<span data-bind='if: locked'>Locked <span class='icon-lock'></span></span>
+				<img style='padding: 10px 0 0 20px;' data-bind='attr: {src: "https://vcweb.asu.edu/static/images/lighterprints/badges/" + name() + ".png" }'><h4 class='challenge-name' data-bind='css: status, text:display_name'></h4>
+                <p>
+                    <span data-bind='css: status, text: summary'></span>
+                </p>
+                <h4><span data-bind='text: points'></span><span class='lighterprints-green icon-leaf icon-2x'></span>
+                    <br>
+                    <span data-bind='text: time_slots'></span>
+                </h4>
+            </a></li></script><script type='text/html' id='no-group-activity-template'>

Repository URL: https://bitbucket.org/virtualcommons/vcweb/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.