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

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

2 new commits in vcweb:

https://bitbucket.org/virtualcommons/vcweb/commits/397f9f21ccfd/
Changeset:   397f9f21ccfd
User:        alllee
Date:        2013-07-31 02:11:46
Summary:     inlining submit decision button with the harvest decision trees
Affected #:  3 files

diff -r 625673027ce87ccd0c6633646605aceb9182fbcf -r 397f9f21ccfd7bd632853348d9dfaf9d36a4847b vcweb/bound/static/css/bound/style.css
--- a/vcweb/bound/static/css/bound/style.css
+++ b/vcweb/bound/static/css/bound/style.css
@@ -60,6 +60,10 @@
     padding: 0px;
     margin: 0px;
 }
+.submit-decision-button {
+    margin-top: -25px;
+    margin-left: 10px;
+}
 col.current-player {
     background-color: #ffb914;
 }
@@ -69,3 +73,4 @@
 }
 .group-status {
 }
+

diff -r 625673027ce87ccd0c6633646605aceb9182fbcf -r 397f9f21ccfd7bd632853348d9dfaf9d36a4847b vcweb/bound/templates/bound/participate.html
--- a/vcweb/bound/templates/bound/participate.html
+++ b/vcweb/bound/templates/bound/participate.html
@@ -457,7 +457,7 @@
     <div class='span8'><h3>Harvest</h3>
         {% comment %}
-        FIXME: disabled
+        XXX: disabled
         <div data-bind='if: submitHarvestDecisionEnabled'><div class='alert alert-success'><i class='icon-leaf'></i> You have currently <span data-bind='text: submitted ? "submitted" : "selected"'></span> a harvest decision of <span class='badge badge-info' data-bind='text: harvestDecision'></span> trees.  Click the 'Ok I'm ready' button to continue.
@@ -475,7 +475,6 @@
                 {% csrf_token %}
                 <div id='harvestDecisionDiv' class='control-group'><div data-bind='template: { name: "harvest-decision-multiselect-template" }'></div>
-                    <button id='submitDecisionButton' data-bind='enable: submitHarvestDecisionEnabled, click: $root.submitDecision' type='submit' class='btn btn-primary'>Ok, I'm ready</button></div></form></div>
@@ -545,7 +544,8 @@
 </script><script type='text/html' id='harvest-decision-multiselect-template'><table>
-        <tr class='harvest-decision-resources' data-bind='foreach: harvestDecisionOptions'>
+        <tr class='harvest-decision-resources'>
+            <!-- ko foreach: harvestDecisionOptions --><td class='harvest-decision-tree-td' data-bind='attr: { id: "harvest-decision-td-" + $data }'><form data-bind='attr: { id: $root.harvestDecisionFormId($data) }'><input id='participantGroupId' type='hidden' name='participant_group_id' data-bind='value: $root.participantGroupId'/>
@@ -556,6 +556,10 @@
                     </div></form></td>
+            <!-- /ko -->
+            <td>
+                <button id='submitDecisionButton' data-bind='enable: submitHarvestDecisionEnabled, click: $root.submitDecision' type='submit' class='btn btn-primary submit-decision-button'>Ok, I'm ready</button>
+            </td></tr></table></script>

diff -r 625673027ce87ccd0c6633646605aceb9182fbcf -r 397f9f21ccfd7bd632853348d9dfaf9d36a4847b vcweb/core/templates/experimenter/monitor.html
--- a/vcweb/core/templates/experimenter/monitor.html
+++ b/vcweb/core/templates/experimenter/monitor.html
@@ -25,13 +25,15 @@
             </div><div class='btn-toolbar'><div class='btn-group'>
+                    {% comment %}
                     <a class='btn btn-danger' data-bind="click: confirmExperimentControllerAction.bind($data, true)"
-                        data-action='restart_round' data-content='Restart the round.  This will reset timers and perform any additional round started setup logic.'>
+                        data-action='restart_round' data-content='Restart the round.  This will reset timers and perform any additional round started setup logic.' data-original-title='Warning'><i class='icon-repeat'></i> restart round</a>
+                    {% endcomment %}
                     <a class='btn btn-danger' data-bind="click: confirmExperimentControllerAction.bind($data, true)"
-                        data-action='restart' data-content='Restart the entire experiment.  This will reset all data and start the experiment over at round 1.'>
+                        data-action='restart' data-content='Restart the entire experiment.  This will reset all data and start the experiment over at round 1.' data-original-title='Warning'><i class='icon-circle-arrow-up'></i> restart experiment</a>
-                    <a class='btn btn-danger' data-bind='click: confirmExperimentControllerAction.bind($data, false)' data-action='deactivate' data-content='Deactivates this experiment.'><i class='icon-off'></i> deactivate</a>
+                    <a class='btn btn-danger' data-bind='click: confirmExperimentControllerAction.bind($data, false)' data-action='deactivate' data-content='Deactivates this experiment and disables participant logins.'><i class='icon-off'></i> deactivate</a></div></div></div>


https://bitbucket.org/virtualcommons/vcweb/commits/c16380ae1393/
Changeset:   c16380ae1393
User:        alllee
Date:        2013-07-31 02:30:01
Summary:     reducing whitespace in interface
Affected #:  2 files

diff -r 397f9f21ccfd7bd632853348d9dfaf9d36a4847b -r c16380ae139343c422451ac4adf6806acc44c714 vcweb/bound/static/css/bound/style.css
--- a/vcweb/bound/static/css/bound/style.css
+++ b/vcweb/bound/static/css/bound/style.css
@@ -72,5 +72,11 @@
     color: #145bff !important;
 }
 .group-status {
+    margin-bottom: 10px;
+}
+h3.compact {
+    line-height: 10px;
+
 }
 
+.

diff -r 397f9f21ccfd7bd632853348d9dfaf9d36a4847b -r c16380ae139343c422451ac4adf6806acc44c714 vcweb/bound/templates/bound/participate.html
--- a/vcweb/bound/templates/bound/participate.html
+++ b/vcweb/bound/templates/bound/participate.html
@@ -455,7 +455,7 @@
 </div><div class='row' data-bind='ifnot: isResourceEmpty()'><div class='span8'>
-        <h3>Harvest</h3>
+        <h3 class='compact'>Harvest</h3>
         {% comment %}
         XXX: disabled
         <div data-bind='if: submitHarvestDecisionEnabled'>
@@ -490,7 +490,7 @@
 </div><div data-bind='css: { span4: canObserveOtherGroup }'>
-<h4>My Group</h4>
+<h3 class='compact'>My Group</h3><div class='alert alert-message'><strong class='badge badge-success' data-bind='text:resourceLevel'></strong> trees</div><div data-bind="visible: isResourceEmpty"><div class='well'>
@@ -505,7 +505,7 @@
 <div data-bind='style: { width: remainderResourceImageWidth(resourceLevel), height: resourceImageHeight() + "px", background: resourceImageBackgroundUrl }'></div></div><br>
-<table class='table table-bordered table-condensed table-striped'>
+<table class='group-status table table-bordered table-condensed table-striped'><tbody><tr><td>forest</td><td data-bind='text:resourceLevel'></td></tr><tr><td>average harvest</td><td data-bind='text:averageHarvest().toFixed(1)'></td></tr>

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.