[virtualcommons-developer] commit/vcweb: 3 new changesets

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

3 new commits in vcweb:

https://bitbucket.org/virtualcommons/vcweb/commits/27196b54d85c/
Changeset:   27196b54d85c
User:        alllee
Date:        2013-03-26 23:21:47
Summary:     adding migrate target to fabfile
Affected #:  1 file

diff -r c3e6e9c956a734fb1ebef8760a2dec9e44fd0238 -r 27196b54d85c928ffc073aa93be4f86bf7b8da73 fabfile.py
--- a/fabfile.py
+++ b/fabfile.py
@@ -39,6 +39,9 @@
         '%(python)s manage.py migrate' % env,
         ]
 
+def migrate():
+    local("{python} manage.py migrate".format(python=env.python), capture=False)
+
 def psh():
     local("{python} manage.py shell_plus".format(python=env.python), capture=False)
 


https://bitbucket.org/virtualcommons/vcweb/commits/765ed0482bff/
Changeset:   765ed0482bff
User:        alllee
Date:        2013-03-26 23:22:15
Summary:     adding move_to_previous_round in DEBUG mode, might make it more widely available if needed
Affected #:  2 files

diff -r 27196b54d85c928ffc073aa93be4f86bf7b8da73 -r 765ed0482bffba1e5bc2c072a2e6752645010ed0 vcweb/core/models.py
--- a/vcweb/core/models.py
+++ b/vcweb/core/models.py
@@ -796,7 +796,7 @@
         self.save()
 
     def invoke(self, action_name):
-        if action_name in ('advance_to_next_round', 'end_round', 'start_round', 'activate', 'deactivate', 'complete'):
+        if action_name in ('advance_to_next_round', 'end_round', 'start_round', 'move_to_previous_round', 'activate', 'deactivate', 'complete'):
             getattr(self, action_name)()
         else:
             raise AttributeError("Invalid experiment action %s requested of experiment %s" % (action_name, self))

diff -r 27196b54d85c928ffc073aa93be4f86bf7b8da73 -r 765ed0482bffba1e5bc2c072a2e6752645010ed0 vcweb/core/templates/experimenter/monitor.html
--- a/vcweb/core/templates/experimenter/monitor.html
+++ b/vcweb/core/templates/experimenter/monitor.html
@@ -12,6 +12,9 @@
             <li><div class='btn-toolbar'><div class='btn-group'>
+                    {% if DEBUG %}
+                    <a class='btn btn-success' data-bind="click: confirmExperimentControllerAction.bind($data, true)" data-action='move_to_previous_round' data-content='Go back to the previous round.'><i class='icon-step-backward'></i> back</a>
+                    {% endif %}
                     <a class='btn btn-success' data-bind="click: confirmExperimentControllerAction.bind($data, true), css: { disabled: isRoundInProgress }" data-action='start_round' data-content='Starts the round.'><i class='icon-play'></i> start</a><a class='btn btn-success' data-bind='click: confirmExperimentControllerAction.bind($data, true)' data-action='advance_to_next_round' data-content='Advances to and starts the next round.'><i class='icon-step-forward'></i> next round</a></div>


https://bitbucket.org/virtualcommons/vcweb/commits/8e7949599709/
Changeset:   8e7949599709
User:        alllee
Date:        2013-03-26 23:31:28
Summary:     adding survival cost to status display
Affected #:  1 file

diff -r 765ed0482bffba1e5bc2c072a2e6752645010ed0 -r 8e7949599709276940715f12b8fddb02f7360ade vcweb/boundaries/templates/boundaries/participate.html
--- a/vcweb/boundaries/templates/boundaries/participate.html
+++ b/vcweb/boundaries/templates/boundaries/participate.html
@@ -240,7 +240,10 @@
             You harvested <strong class='text-success'><span data-bind='text:lastHarvestDecision'></span><i class='icon-leaf'></i></strong> trees last round.
         </div><div class='alert alert-message'>
-            You have <strong class='text-success'><span data-bind='text: storage'></span><i class='icon-leaf'></i></strong> trees stored.
+            You have <strong class='text-success'><span data-bind='text: storage'></span><i class='icon-leaf'></i></strong> trees stored.  
+        </div>
+        <div class='alert alert-error'>
+            <i class='icon-warning-sign'></i> You need at least <strong class='text-success'><span data-bind='text: costOfLiving'></span><i class='icon-leaf'></i></strong> trees to survive each round.
         </div></div><div class='span5'>

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.