Lot's of skinning. New row default values

starteam · Feb 1, 2013 · 1b55bd0 · 1b55bd0
1 parent 52a1178
commit 1b55bd0
Show file tree

Hide file tree

Showing 21 changed files with 319 additions and 170 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/html_app/images/setup/.DS_Store b/html_app/images/setup/.DS_Store
diff --git a/html_app/images/setup/setup_line.png b/html_app/images/setup/setup_line.png
diff --git a/html_app/master_model.js b/html_app/master_model.js
@@ -1334,7 +1334,7 @@ var __usability_test = {
     description:'Biochemical approach to analyzing vulva development in <i>C. elegans.</i>',
     experiments:{},
     template:{
-        instructions:'$DISPLAY_ASSIGNMENT_INSTRUCTIONS$',
+        instructions:'',
 
         ui:{
             experimental_design:{

diff --git a/html_app/starcellbio.app.css b/html_app/starcellbio.app.css
@@ -92,7 +92,7 @@ table {
    -------------------------------- */
 
 body {
-	font-family: SourceSansPro,"Trebuchet MS", "Helvetica", "Arial",  "Verdana", "sans-serif";
+	font-family: "sourcesanspro-regular","Trebuchet MS", "Helvetica", "Arial",  "Verdana", "sans-serif";
 }
 
 /* Layout

diff --git a/html_app/ui/ExperimentSetupView.js b/html_app/ui/ExperimentSetupView.js
@@ -314,6 +314,13 @@ scb.ui.static.ExperimentSetupView.rows = function (cell_treatment_list, headings
     return rows;
 }
 
+scb.ui.static.ExperimentSetupView.new_rows = function (new_row, headings, template) {
+    var rows = [];
+    scb.ui.static.ExperimentSetupView.row(new_row, headings, template, rows);
+    return rows;
+}
+
+
 scb.ui.static.ExperimentSetupView.ensure_save = function () {
     var container = $(".scb_s_experiment_setup_table_row", $(document));
     $(container).each(
@@ -619,7 +626,7 @@ scb.ui.ExperimentSetupView = function scb_ui_ExperimentSetupView(gstate) {
         var template = state.assignment.template;
         var headings = scb.ui.static.ExperimentSetupView.headings(template.ui.experiment_setup.table);
         var rows = scb.ui.static.ExperimentSetupView.rows(experiment.cell_treatment_list.list, headings, template);
-
+        var new_rows = scb.ui.static.ExperimentSetupView.new_rows( new scb.CellTreatment(template.ui.experiment_setup.new_row,gstate.context), headings, template);
         if (experiment.setup_finished) {
             state.mode = 'readonly';
             state.last_view = 'experiment_run';
@@ -632,6 +639,7 @@ scb.ui.ExperimentSetupView = function scb_ui_ExperimentSetupView(gstate) {
             experiment:state.experiment,
             headings:headings,
             rows:rows,
+            new_rows:new_rows,
             kind:state.mode
         }));
         state.experiment.last_view = state.last_view;

diff --git a/html_app/ui/assignments.gss b/html_app/ui/assignments.gss
@@ -62,8 +62,8 @@
     background-color: white;
 }
 .scb_s_assignments_sidebar_title {
-    font-size: 18px;
-    font-weight: bold;
+    font-size: 16pt;
+    font-family: "sourcesanspro-bold";
 }
 
 .scb_s_assignments_sidebar_name {

diff --git a/html_app/ui/common.gss b/html_app/ui/common.gss
@@ -28,9 +28,10 @@ body {
 }
 
 .scb_s_experiment_step_circle {
-    width: 24px;
-    height: 24px;
-    border-radius: 12px;
+    box-shadow:0px 0px 6px #a9a9a9;
+    width: 36px;
+    height: 36px;
+    border-radius: 18px;
     text-align: center;
     vertical-align: 90%;
     color: white;
@@ -41,8 +42,9 @@ body {
 }
 
 .scb_s_experiment_step_number {
-    padding: .4em .25em .25em .25em;
+    padding: .25em .25em .25em .25em;
     vertical-align: top;
+    font-size:16pt;
 }
 
 .scb_experiment_step_selected {
@@ -51,38 +53,38 @@ body {
 
 .scb_s_experiment_step_horizontal_line_12 {
     position:absolute;
-    width:66px;
+    width:55px;
     background-color: #696969;
     height:1px;
-    top:16px;
-    left:53px;
+    top:23px;
+    left:65px;
 }
 
 .scb_s_experiment_step_horizontal_line_23 {
     position:absolute;
-    width:66px;
+    width:55px;
     background-color: #696969;
     height:1px;
-    top:16px;
-    left:143px;
+    top:23px;
+    left:155px;
 }
 
 .scb_s_experiment_step_horizontal_line_34 {
     position:absolute;
-    width:66px;
+    width:55px;
     background-color: #696969;
     height:1px;
-    top:16px;
-    left:233px;
+    top:23px;
+    left:245px;
 }
 
 .scb_s_experiment_step_horizontal_line_45 {
     position:absolute;
-    width:66px;
+    width:55px;
     background-color: #696969;
     height:1px;
-    top:16px;
-    left:323px;
+    top:23px;
+    left:335px;
 }
 
 

diff --git a/html_app/ui/experiment_design.gss b/html_app/ui/experiment_design.gss
@@ -20,6 +20,7 @@
 .scb_s_experiment_design_techniques_container {
     text-align: center;
     position: relative;
+    min-height: 200px;
 }
 .scb_s_design_description>.scb_f_open_assignment {
     position: absolute;
@@ -36,3 +37,7 @@
 .scb_s_experiment_design_objective,.scb_s_experiment_design_hypothesis {
     width:864px;
 }
+
+.scb_s_experiment_design_techniques_text {
+    text-align: left;
+}
diff --git a/html_app/ui/experiment_design.soy b/html_app/ui/experiment_design.soy
@@ -42,12 +42,13 @@ Experiment active area
         {call scb_common.experiment_step}
             {param step:1/}
         {/call}
-        <b>
+            <div class='experiment_name_header'>Experiment name:</div>
             <input type='text' class='scb_s_experiment_name_edit' maxlength="20" assignment_id='{$assignment.id}' experiment_id='{$experiment.id}' value='{$experiment.name}'>
-        </b>
         <br/>
+    <!--
         {$assignment.description |noAutoescape}
         {$t.instructions |noAutoescape}
+    -->
         <br/>
         <div class='scb_s_experiment_design_objective_container'>
             <div class='scb_s_experiment_design_objective_text'>What objective or question is your experiment going to address?</div>
@@ -60,6 +61,7 @@ Experiment active area
         </div>
 
         <div class='scb_s_experiment_design_techniques_container'>
+            <div class='scb_s_experiment_design_techniques_text'>What technique(s) might be best suited for the analysis of this experiment?</div>
         {call scb_homepage.display_techniques}
             {param techniques:$t.ui.experimental_design.techniques/}
         {/call}

diff --git a/html_app/ui/experiment_setup.gss b/html_app/ui/experiment_setup.gss
@@ -43,7 +43,7 @@
 
 
 .scb_s_experiment_setup_choose_template {
-    height: 200px;
+    height: 155px;
     width: 600px;
     display: block;
 }
@@ -92,4 +92,39 @@ table.scb_s_experiment_setup_table {
 
 .scb_s_experiment_setup_new_row_gray {
     opacity: .25;
+}
+
+.scb_s_experiment_setup_video_box_wrapper {
+    width: 266px;
+    height:238px;
+    float:right;
+    background-color: #e1e3e8;
+    border-radius: 1px;
+    border: 1px solid #e1e3e8;
+    position: absolute;
+    top:0px;
+    right:0px;
+    box-shadow: 0px 0px 6px gray;
+
+}
+
+.scb_s_experiment_setup_video_box {
+    width: 233px;
+    height:188px;
+    background-color: #525252;
+    margin-left:12px;
+    margin-top:27px;
+}
+
+.scb_s_warning {
+    background: #e0e0e0;
+    border: 1px solid #d0d0d0;
+    border-radius: 10px;
+    margin-bottom: 10px;
+    padding: 5px;
+    width:540px;
+}
+
+.scb_s_warning>h1 {
+    color:red;
 }
diff --git a/html_app/ui/experiment_setup.soy b/html_app/ui/experiment_setup.soy
@@ -6,7 +6,7 @@
 * @param global_template
 * @param assignment AssignmentView
 * @param experiment ExperimentView
-
+  @param new_rows
 */
 {template .main}
 <div class='scb_s_experiment_setup_view'>
@@ -24,6 +24,7 @@
     {param t:$t/}
     {param global_template:$global_template /}
     {param assignment:$assignment/}
+    {param new_rows:$new_rows/}
     {/call}
     {call scb_homepage.display_footer}
     {param t:$t /}
@@ -39,29 +40,56 @@ Experiment active area
 @param headings
 @param rows
 @param kind
+@param new_rows
 */
 {template .display_details}
 <div class='scb_s_experiment_setup_details_view'>
 
+    <div class='scb_s_experiment_setup_top'>
+
     {if $kind == 'readwrite'}
         {call scb_common.experiment_step}
             {param step:2/}
         {/call}
         <div class='scb_s_experiment_setup_choose_template'>
-            THIS NEEDS A BIT MORE THINKING!
-            <input class='scb_s_experiment_setup_choose_template_kind' type="radio" name="setup_kind">Create new set-up</input><br>
-            <input class='scb_s_experiment_setup_choose_template_kind' type="radio" name="setup_kind">Select pre-existing set-up as a template</input>
-            <select class='scb_s_experiment_setup_choose_template_id'>
+            <input class='scb_s_experiment_setup_choose_template_kind' type="radio" name="setup_kind" checked="checked" disabled="disabled">Create new set-up</input><br>
+            <input class='scb_s_experiment_setup_choose_template_kind' type="radio" name="setup_kind" disabled="disabled">Select pre-existing set-up as a template</input>
+            <!-- <select class='scb_s_experiment_setup_choose_template_id' disabled="disabled">
                 <option>Experiment 1</option>
                 <option>Experiment 1</option>
-            </select><br>
+            </select>
+            -->
+            <br>
+            <img src='images/setup/setup_line.png'/>
+            <ul class='scb_s_experiment_setup_list'>
+                <li>For each treatment protocol, select the strain, treatments(s), and treatment dose.</li>
+                <li>For all of your treatments, select start, duration and collection time.</li>
+                <li>Once you finish setting up your experiment treatment, select Run Experiment.</li>
+            </ul>
+        </div>
+        <div class='scb_s_experiment_setup_video_box_wrapper'>
+            <div class='scb_s_experiment_setup_video_box'>
+
+            </div>
         </div>
     {else}
         {call scb_common.experiment_step}
             {param step:3/}
         {/call}
+        <div class='scb_s_warning'>
+            <h1>WARNING!</h1>
+            <p>Below is your set up for {$experiment.name}.<br>
+            Once you run your experiment, you can not go bck and make changes to your set-up.
+                Please carefully review the summary of your experimental set-up and then either go back to edit your set-up o click on Confirm Set-up Select Technique button to run your experiment.
+            </p>
+        </div>
+        <div class='scb_s_experiment_setup_video_box_wrapper'>
+                   <div class='scb_s_experiment_setup_video_box'>
 
+                   </div>
+               </div>
     {/if}
+    </div>
     <table class="scb_s_experiment_setup_table {if $kind == 'readwrite'}scb_s_experiment_setup_table_editable{else}scb_s_experiment_setup_table_readonly{/if}">
         <thead class='scb_s_experiment_setup_table_head'>
         {foreach $h in $headings}
@@ -92,8 +120,9 @@ Experiment active area
         </tr>
         {/foreach}
         {if $kind == 'readwrite'}
+        {foreach $r in $new_rows}
         <tr class='scb_s_experiment_setup_new_row scb_s_experiment_setup_new_row_gray' assignment_id='{$assignment.id}' experiment_id='{$experiment.id}'>
-            {foreach $c in $headings}
+            {foreach $c in $r.columns}
             <td class='scb_s_experiment_setup_table_element {if $c.first_row}scb_s_experiment_setup_table_border{/if} scb_s_experiment_setup_td' kind='{$c.kind}' rowspan="1">
                 {if $c.kind == 'actions'}
                     {if $kind == 'readwrite'} <!--
@@ -110,6 +139,7 @@ Experiment active area
             </td>
             {/foreach}
         </tr>
+        {/foreach}
             {if $t.ui.experiment_setup.actions.length > 0}
         <tr>
             <td colspan="{$headings.length+1}">

diff --git a/html_app/ui/gen/assignments.gss.css b/html_app/ui/gen/assignments.gss.css
@@ -52,8 +52,8 @@
   background-color: white;
 }
 .scb_s_assignments_sidebar_title {
-  font-size: 18px;
-  font-weight: bold;
+  font-size: 16pt;
+  font-family: "sourcesanspro-bold";
 }
 .scb_s_assignments_sidebar_name {
   font-size: 12px;
-Original file line number
+Diff line change
@@ Expand Up / @@ -92,7 +92,7 @@ table { @@
        -------------------------------- */
     body {
-    	font-family: SourceSansPro,"Trebuchet MS", "Helvetica", "Arial",  "Verdana", "sans-serif";
+    	font-family: "sourcesanspro-regular","Trebuchet MS", "Helvetica", "Arial",  "Verdana", "sans-serif";
     }
     /* Layout
@@ Expand Down @@