[virtualcommons-svn] commit/vcweb: alllee: updating actions available in wait page to just return to the participation page and

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

1 new changeset in vcweb:

http://bitbucket.org/virtualcommons/vcweb/changeset/63c173735052/
changeset:   63c173735052
branches:    
user:        alllee
date:        2011-06-01 21:49:17
summary:     updating actions available in wait page to just return to the participation page and
changing ParameterizedValue.string_value to a TextField; consider adding an
additional field json_value that stores arbitrary JSON-encoded strings (or just use
the string_value for that as well)
affected #:  5 files (97 bytes)

--- a/.hgignore	Wed May 25 14:53:46 2011 -0700
+++ b/.hgignore	Wed Jun 01 12:49:17 2011 -0700
@@ -10,3 +10,5 @@
 .idea
 build
 logs
+tmp
+.orig


--- a/vcweb/core/models.py	Wed May 25 14:53:46 2011 -0700
+++ b/vcweb/core/models.py	Wed Jun 01 12:49:17 2011 -0700
@@ -828,7 +828,7 @@
 
 class ParameterizedValue(models.Model):
     parameter = models.ForeignKey(Parameter)
-    string_value = models.CharField(max_length=512, null=True, blank=True)
+    string_value = models.TextField(null=True, blank=True)
     int_value = models.IntegerField(null=True, blank=True)
     float_value = models.FloatField(null=True, blank=True)
     boolean_value = models.NullBooleanField(null=True, blank=True)


--- a/vcweb/forestry/templates/forestry/wait.html	Wed May 25 14:53:46 2011 -0700
+++ b/vcweb/forestry/templates/forestry/wait.html	Wed Jun 01 12:49:17 2011 -0700
@@ -38,10 +38,9 @@
 <p>
 The facilitator will start the next round when every participant is ready.
 <br/>
-<span class='ui-state-highlight ui-corner-all'>
-    <small><a class='contactIcon' href="#">send a private message to the facilitator</a>
-        | <a href='participate'>return to participation page</a></small>
-</span>
+<div class='ui-state-highlight ui-corner-all'>
+    <small><span class='float-left vcweb-ui-icon ui-icon ui-icon-circle-arrow-w'></span><a href='participate'>return to participation page</a></small>
+</div><br/></p>
 


--- a/vcweb/sanitation/fixtures/initial_data.json	Wed May 25 14:53:46 2011 -0700
+++ b/vcweb/sanitation/fixtures/initial_data.json	Wed Jun 01 12:49:17 2011 -0700
@@ -11,11 +11,11 @@
             "name": "Sanitation Default Configuration"
         },
         "model": "core.experimentconfiguration",
-        "pk": 11 
+        "pk": 3
     },
     {
         "fields": {
-            "authentication_code": "TEST_FORESTRY",
+            "authentication_code": "TEST_SANITATION",
             "current_round_elapsed_time": 0,
             "current_round_sequence_number": 1,
             "duration": "1h",
@@ -31,6 +31,6 @@
             "total_elapsed_time": 0
         },
         "model": "core.experiment",
-        "pk": 11 
+        "pk": 3
     }
 ]


--- a/vcweb/static/css/style.css	Wed May 25 14:53:46 2011 -0700
+++ b/vcweb/static/css/style.css	Wed Jun 01 12:49:17 2011 -0700
@@ -76,6 +76,10 @@
 .float-right {
     float:right;
 }
+.vcweb-ui-icon {
+    display:inline;
+    margin: 7px;
+}
 .vcweb-icon {
     display:inline;
     background-repeat: no-repeat;

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.