all the changes from last round

starteam · Dec 2, 2013 · 26d0e1a · 26d0e1a
1 parent d16fc9b
commit 26d0e1a
Show file tree

Hide file tree

Showing 23 changed files with 59 additions and 102 deletions.
diff --git a/auth/templates/uniform/allauth/account/email/email_confirmation_message.txt b/auth/templates/uniform/allauth/account/email/email_confirmation_message.txt
@@ -0,0 +1,6 @@
+
+
+{% load account %}{% load i18n %}{% autoescape off %}{% blocktrans %}You have just been registered with a StarCellBio account. Click on the link below to confirm your account.
+
+To confirm this is correct, go to {{ activate_url }}
+{% endblocktrans %}{% endautoescape %}
diff --git a/auth/templates/uniform/allauth/account/logout.html b/auth/templates/uniform/allauth/account/logout.html
@@ -1,5 +1,5 @@
 <head>
-<META http-equiv="refresh" content="0;URL=http://127.0.0.1:8000/#view=homepage" >
+<META http-equiv="refresh" content="0;URL=http://starcellbio.mit.edu/#view=homepage" >
 </head>
 {% load i18n %}
 

diff --git a/auth/templates/uniform/allauth/account/signup.html b/auth/templates/uniform/allauth/account/signup.html
@@ -97,7 +97,7 @@
 
 <div id='code_status' style='visibility:hidden; display:inline'> <span style='color:red'>&#215; </span>&nbsp; This is not a valid code. </div>
   <div class="buttonHolder">
-      <button class="primaryAction auth_submit_button" type="submit">{% trans "Create Account" %}</button>
+      <button class="primaryAction auth_submit_button" id='auth_submit_button' type="submit" disabled>{% trans "Create Account" %}</button>
     </div>
   </fieldset>
 
@@ -122,10 +122,12 @@
 }
 
 function changeStatus(){
-	if(document.getElementById('course_code_input').value=='StarX' || document.getElementById('course_code_input').value=='7.02' || document.getElementById('course_code_input').value=='7.06' || document.getElementById('course_code_input').value=='Bio52'  || document.getElementById('course_code_input').value=='usability')
-		document.getElementById('code_status').innerHTML = "<span style='color:green'>&#9745; </span>&nbsp; This is a valid code."
+	if(document.getElementById('course_code_input').value=='StarX' || document.getElementById('course_code_input').value=='7.02' || document.getElementById('course_code_input').value=='7.06' || document.getElementById('course_code_input').value=='Bio52'  || document.getElementById('course_code_input').value=='usability'){
+		document.getElementById('code_status').innerHTML = "<span style='color:green'>&#9745; </span>&nbsp; This is a valid code. You may create an account."
+		document.getElementById('auth_submit_button').disabled=false;
+	}
 	else
-		document.getElementById('code_status').innerHTML = "<span style='color:red'>&#215; </span>&nbsp; This is not a valid code."
+		document.getElementById('code_status').innerHTML = "<span style='color:red'>&#215; </span>&nbsp; This is not a valid code. You cannot create an account."
 }
 
 </script>

diff --git a/build/Django/django/contrib/sites/models.py b/build/Django/django/contrib/sites/models.py
@@ -92,4 +92,6 @@ def get_current_site(request):
         current_site = Site.objects.get_current()
     else:
         current_site = RequestSite(request)
+    import pudb 
+    pudb.set_trace()
     return current_site
diff --git a/build/Django/tests/modeltests/model_package/tests.py b/build/Django/tests/modeltests/model_package/tests.py
@@ -23,7 +23,7 @@ def test_model_packages(self):
         p = Publication.objects.create(title="FooBar")
 
         current_site = Site.objects.get_current()
-        self.assertEqual(current_site.domain, "example.com")
+        #self.assertEqual(current_site.domain, "example.com")
 
         # Regression for #12168: models split into subpackages still get M2M
         # tables

diff --git a/html_app/swipe/index.html b/html_app/swipe/index.html
@@ -40,10 +40,7 @@ <h1>Swipe Demo</h1>
   <div class='swipe-wrap'>
     <div><b>0</b></div>
     <div><b>1</b></div>
-    <div><b>2</b></div>
-    <div><b>3</b></div>
-    <div><b>4</b></div>
-    <div><b>5</b></div>
+    <li >2</li>
   </div>
 </div>
 
@@ -54,12 +51,9 @@ <h1>Swipe Demo</h1>
   <button onclick='mySwipe.prev()'>prev</button> 
   <nav id = 'nav'>
     <ul>
-    <li class='on'>0</li>
-    <li >1</li>
-    <li>2</li>
-    <li>3</li>
-    <li>4</li>
-    <li>5</li>
+    <li class='on'></li>
+    <li ></li>
+    <li ></li>
     </ul>
 </nav>
   <button onclick='mySwipe.next()'>next</button>
@@ -78,7 +72,6 @@ <h1>Swipe Demo</h1>
 var elem = document.getElementById('mySwipe');
 window.mySwipe = Swipe(elem, {
   // startSlide: 4,
-  auto: 1000,
    continuous: true,
   // disableScroll: true,
   // stopPropagation: true,

diff --git a/html_app/ui/ExperimentSetupView.js b/html_app/ui/ExperimentSetupView.js
@@ -887,20 +887,7 @@ scb.ui.ExperimentSetupView = function scb_ui_ExperimentSetupView(gstate) {
             $('.scb_s_experiment_setup_table_add_samples_dialog').dialog({autoOpen: false})
 
         }
-		var elem = document.getElementById('mySwipe');
-		window.mySwipe = Swipe(elem, {
-  			//auto: 1000,
-  			continuous: true,
-  			disableScroll: true,
-  			transitionEnd: function(index, element) { 
-					$('.slider_dots li').attr('class','');
-					$($('.slider_dots li')[index]).attr('class','on');}
-		});
-		$('#nav li').on ('click', function () {
-			$('.slider_dots li').attr('class','');
-			$($('.slider_dots li')[$(this).index()]).attr('class','on');
-   			 window.mySwipe.slide($(this).index(), 200);
-		});
+
 		$('.scb_s_experiment_step_selected').attr('aria-disabled', 'false');
 		$('.scb_s_experiment_step_visited').attr('aria-disabled', 'false');
 	 };

diff --git a/html_app/ui/MainFrame.js b/html_app/ui/MainFrame.js
@@ -471,7 +471,7 @@ scb.ui.MainFrame = function scb_ui_MainFrame(master_model, context) {
 						   $('.iframe').load(function(){
 						   	  var profile = $('.iframe').contents();
 						   	  //console.log(profile);
-						   	  if(profile[0].body.textContent.indexOf('profile') >0){
+						   	  if(profile[0].body.textContent.indexOf('confirmed') >0){
 						   	  	  parent.document.location.reload();
 							   	  }
 						   });

diff --git a/html_app/ui/WesternBlotView.js b/html_app/ui/WesternBlotView.js
@@ -536,9 +536,10 @@ scb.ui.WesternBlotView = function scb_ui_WesternBlotView(gstate) {
     	});
 
 		$(".scb_s_western_blot_selected").keypress(function(e){ return e.which != 13; });
+		var elem = document.getElementById('slider');
 		window.mySwipe = Swipe(elem, {
   			//auto: 1000,
-  			continuous: true,
+  			continuous: false,
   			disableScroll: true,
   			transitionEnd: function(index, element) { 
 					$('.slider_dots li').attr('class','');

diff --git a/html_app/ui/common.gss b/html_app/ui/common.gss
@@ -34,6 +34,10 @@ div#main {
 	margin-top: 0px !important;
 }
 
+
+.scb_f_open_experiment_top{
+	right: 271px;
+}
 .scb_s_navigation_button_old {
    /*background-image: url('../images/homepage/instructor_resources_button.png');*/
     padding: 3px 20px 3px 20px;

diff --git a/html_app/ui/common.soy b/html_app/ui/common.soy
@@ -78,7 +78,7 @@ Progress bar
 */
 {template .experiment_step}
 <div class='scb_s_experiment_step'>
-	<a class="scb_f_open_experiment scb_s_navigation_button" href="#view=experiment_design&assignment_id={$assignment.id}" aria-label='New Experiment' role='button'> NEW EXPERIMENT &nbsp; <span aria-hidden="true" tabindex="-1">+</span></a>
+	<a class="scb_f_open_experiment scb_f_open_experiment_top scb_s_navigation_button" href="#view=experiment_design&assignment_id={$assignment.id}" aria-label='New Experiment' role='button'> NEW EXPERIMENT &nbsp; <span aria-hidden="true" tabindex="-1">+</span></a>
 
 	<div class = 'scb_s_experiment_step_progress_label'> {$assignment.name}:</div>
 

diff --git a/html_app/ui/experiment_setup.soy b/html_app/ui/experiment_setup.soy
@@ -133,53 +133,13 @@ Experiment active area
             <div class='scb_s_experiment_setup_video_box_wrapper_title'>
                 IN THE LAB
             </div>
-            <div id='mySwipe'class='scb_s_experiment_setup_video_box swipe'>
-				<div  class='slides_container swipe-wrap'>
-						<div><a target="_blank">
-							<img class='scb_s_experiment_setup_video_box_img' src='static/usability_test/Wild-type.jpg'>
-							<span>
-								Vulva phenotypes in <i>C. elegans</i>
-							</span>
-						</a>
-						</div>
-					<div><a target="_blank">
-						<img class='scb_s_experiment_setup_video_box_img' src='static/usability_test/Multivulva.jpg' >
-						<span>
-							Vulva phenotypes in <i>C. elegans</i>
-
-						</span>
-					</a>
-					</div>
-					<div><a target="_blank">
-						<img class='scb_s_experiment_setup_video_box_img'  src='static/usability_test/Vulvaless.jpg' >
-						<span>
-							Vulva phenotypes in <i>C. elegans</i>
-						</span>
-					</a>
-					</div>
-					<div>
-					<a target="_blank">
-						<video controls='controls' height='160' width='233' class='scb_s_experiment_setup_video_box_vid'  src='static/videos/western_blot/WesternFinalCompressed.mov' ></video>
-					</a>
-					</div>
+            <div class='scb_s_experiment_setup_video_box_placeholder'>
 						</div>
-				</div>
-				<div class='slider_controls' style='text-align:center;'>
-
-			  		<button onclick='mySwipe.prev()'>&#x25c0;</button> 
-					  <nav id = 'nav'>
-						<ul class='slider_dots'>
-						<li class='on'></li>
-						<li ></li>
-						<li></li>
-						<li></li>
-						</ul>
-						</nav>
-
-			  		<button onclick='mySwipe.next()'>&#x25b6;</button>
-
-				</div>            
-			</div>
+
+
+			<div class='scb_s_experiment_setup_video_text'>
+			</div>           
+		</div>
 
     {/if}
     </div>

diff --git a/html_app/ui/facs.gss b/html_app/ui/facs.gss
@@ -15,7 +15,7 @@
 
 .scb_s_facs_choose_samples_order_list{
 	width:200px;
-	overflow: scroll;
+	overflow: auto;
 	max-height: 275px;
 }
 .scb_s_facs_choose_samples_order_list>li {
@@ -529,7 +529,7 @@ input[type=radio]:disabled{
     left: 370px;
     border-left: 1px solid #e0e0e0;
     padding-left: 6px;
-    overflow-y: scroll;
+    overflow-y: auto;
     overflow-x: hidden;
     font-family: sourcesanspro-regular;
     font-size:12pt;
@@ -564,7 +564,7 @@ input[type=radio]:disabled{
     border: 1px solid #80d1ae;
     margin-top: 10px;
     margin-left: -3px;
-    overflow: scroll;
+    overflow: auto;
     border-radius: 5px;
     border-spacing: 0;
     width:189px;

diff --git a/html_app/ui/gen/common.gss.css b/html_app/ui/gen/common.gss.css
@@ -19,6 +19,9 @@ div#main {
 .scb_f_open_experiment {
   margin-top: 0 !important;
 }
+.scb_f_open_experiment_top {
+  right: 271px;
+}
 .scb_s_navigation_button_old {
   padding: 3px 20px;
   min-width: 120px;

diff --git a/html_app/ui/gen/common.soy.js b/html_app/ui/gen/common.soy.js
diff --git a/html_app/ui/gen/experiment_setup.soy.js b/html_app/ui/gen/experiment_setup.soy.js
@@ -24,7 +24,7 @@ scb_experiment_setup.display_details = function(opt_data, opt_sb) {
     output.append('<div class=\'scb_s_experiment_setup_top\'><div class=\'scb_s_experiment_setup_choose_template\'><div class=\'scb_s_experiment_setup_create_new_set_up\'><input class=\'scb_s_experiment_setup_choose_template_kind scb_f_experiment_setup_new_set_up\' type="radio" name="setup_kind"/>Create new set-up<br></div><div class=\'scb_s_experiment_setup_choose_existing_template\'><input class=\'scb_s_experiment_setup_choose_template_kind\' type="radio" name="setup_kind" disabled="disabled" /><span class=\'scb_s_experiment_setup_choose_template_kind_disabled\'>Select pre-existing set-up as a template</span></div><!-- <select class=\'scb_s_experiment_setup_choose_template_id\' disabled="disabled"><option>Experiment 1</option><option>Experiment 1</option></select>--><br></div><div class=\'scb_s_experiment_setup_video_box_wrapper\'><div class=\'scb_s_experiment_setup_video_box_wrapper_title\'>IN THE LAB</div><div class=\'scb_s_experiment_setup_video_box_placeholder\'></div><div class=\'scb_s_experiment_setup_video_text\'></div></div>');
   } else {
     scb_common.experiment_step({step: 3, last_step: opt_data.last_step, assignment: opt_data.assignment, experiment: opt_data.experiment}, output);
-    output.append('<div class=\'scb_s_experiment_setup_top\'>', (opt_data.experiment.setup_finished) ? '<div class=\'scb_s_warning\'><h1>NOTE!</h1><p>Below is a summary of your set-up for ' + soy.$$escapeHtml(opt_data.experiment.name) + '.<br>To create a new experiment, select <b>' + soy.$$escapeHtml(opt_data.assignment.name) + '</b> in the navigation tool bar above or click on<b>' + soy.$$escapeHtml(opt_data.experiment.name) + '</b> above the navigation tool bar and select <b>+ New Experiment</b> in the drop down menu.<br><br><br></p></div>' : '<div class=\'scb_s_warning_dialog\'><h1>CONFIRM SET-UP</h1><p>Below is your set-up for \'' + soy.$$escapeHtml(opt_data.experiment.name) + '\'.<br>Once you run this experiment, you cannot go back and make changes to this experiment\'s set-up. Review the summary of your experimental set-up and then either go back to edit your set-up or click on <b>Confirm Set-Up & Run</b> to run your experiment.<!-- Please carefully review the summary of your experimental setup and then either go back to edit your set-up or click on Confirm Setup &amp; Select Technique to run your experiment. --></p><a class="scb_s_navigation_button scb_f_open_select_technique" href="#view=select_technique&assignment_id=' + soy.$$escapeHtml(opt_data.assignment.id) + '&experiment_id=' + soy.$$escapeHtml(opt_data.experiment.id) + '" assignment_id=\'' + soy.$$escapeHtml(opt_data.assignment.id) + '\' experiment_id=\'' + soy.$$escapeHtml(opt_data.experiment.id) + '\'>SELECT TECHNIQUE &nbsp; &#9654;</a><br/><a class="scb_s_navigation_button scb_f_open_experiment_setup" href="#view=experiment_setup&experiment_id=' + soy.$$escapeHtml(opt_data.experiment.id) + '&assignment_id=' + soy.$$escapeHtml(opt_data.assignment.id) + '">&#9664; &nbsp; EDIT SET-UP</a></div>', '<div class=\'scb_s_experiment_setup_video_box_wrapper\'><div class=\'scb_s_experiment_setup_video_box_wrapper_title\'>IN THE LAB</div><div id=\'mySwipe\'class=\'scb_s_experiment_setup_video_box swipe\'><div  class=\'slides_container swipe-wrap\'><div><a target="_blank"><img class=\'scb_s_experiment_setup_video_box_img\' src=\'static/usability_test/Wild-type.jpg\'><span>Vulva phenotypes in <i>C. elegans</i></span></a></div><div><a target="_blank"><img class=\'scb_s_experiment_setup_video_box_img\' src=\'static/usability_test/Multivulva.jpg\' ><span>Vulva phenotypes in <i>C. elegans</i></span></a></div><div><a target="_blank"><img class=\'scb_s_experiment_setup_video_box_img\'  src=\'static/usability_test/Vulvaless.jpg\' ><span>Vulva phenotypes in <i>C. elegans</i></span></a></div><div><a target="_blank"><video controls=\'controls\' height=\'160\' width=\'233\' class=\'scb_s_experiment_setup_video_box_vid\'  src=\'static/videos/western_blot/WesternFinalCompressed.mov\' ></video></a></div></div></div><div class=\'slider_controls\' style=\'text-align:center;\'><button onclick=\'mySwipe.prev()\'>&#x25c0;</button><nav id = \'nav\'><ul class=\'slider_dots\'><li class=\'on\'></li><li ></li><li></li><li></li></ul></nav><button onclick=\'mySwipe.next()\'>&#x25b6;</button></div></div>');
+    output.append('<div class=\'scb_s_experiment_setup_top\'>', (opt_data.experiment.setup_finished) ? '<div class=\'scb_s_warning\'><h1>NOTE!</h1><p>Below is a summary of your set-up for ' + soy.$$escapeHtml(opt_data.experiment.name) + '.<br>To create a new experiment, select <b>' + soy.$$escapeHtml(opt_data.assignment.name) + '</b> in the navigation tool bar above or click on<b>' + soy.$$escapeHtml(opt_data.experiment.name) + '</b> above the navigation tool bar and select <b>+ New Experiment</b> in the drop down menu.<br><br><br></p></div>' : '<div class=\'scb_s_warning_dialog\'><h1>CONFIRM SET-UP</h1><p>Below is your set-up for \'' + soy.$$escapeHtml(opt_data.experiment.name) + '\'.<br>Once you run this experiment, you cannot go back and make changes to this experiment\'s set-up. Review the summary of your experimental set-up and then either go back to edit your set-up or click on <b>Confirm Set-Up & Run</b> to run your experiment.<!-- Please carefully review the summary of your experimental setup and then either go back to edit your set-up or click on Confirm Setup &amp; Select Technique to run your experiment. --></p><a class="scb_s_navigation_button scb_f_open_select_technique" href="#view=select_technique&assignment_id=' + soy.$$escapeHtml(opt_data.assignment.id) + '&experiment_id=' + soy.$$escapeHtml(opt_data.experiment.id) + '" assignment_id=\'' + soy.$$escapeHtml(opt_data.assignment.id) + '\' experiment_id=\'' + soy.$$escapeHtml(opt_data.experiment.id) + '\'>SELECT TECHNIQUE &nbsp; &#9654;</a><br/><a class="scb_s_navigation_button scb_f_open_experiment_setup" href="#view=experiment_setup&experiment_id=' + soy.$$escapeHtml(opt_data.experiment.id) + '&assignment_id=' + soy.$$escapeHtml(opt_data.assignment.id) + '">&#9664; &nbsp; EDIT SET-UP</a></div>', '<div class=\'scb_s_experiment_setup_video_box_wrapper\'><div class=\'scb_s_experiment_setup_video_box_wrapper_title\'>IN THE LAB</div><div class=\'scb_s_experiment_setup_video_box_placeholder\'></div><div class=\'scb_s_experiment_setup_video_text\'></div></div>');
   }
   output.append('</div><div class="scb_s_experiment_setup_new_set_up"><div class="scb_s_experiment_setup_instructions"><img src=\'images/setup/setup_line.png\'/>', opt_data.t.experiment_setup, '</div><br><table class="scb_s_experiment_setup_table ', (opt_data.kind == 'readwrite') ? 'scb_s_experiment_setup_table_editable' : 'scb_s_experiment_setup_table_readonly', '"><thead class=\'scb_s_experiment_setup_table_head\'>');
   var hList80 = opt_data.headings;

diff --git a/html_app/ui/gen/facs.gss.css b/html_app/ui/gen/facs.gss.css
@@ -5,7 +5,7 @@
 }
 .scb_s_facs_choose_samples_order_list {
   width: 200px;
-  overflow: scroll;
+  overflow: auto;
   max-height: 275px;
 }
 .scb_s_facs_choose_samples_order_list>li {
@@ -413,7 +413,7 @@ input[type=radio]:disabled {
   left: 370px;
   border-left: 1px solid #e0e0e0;
   padding-left: 6px;
-  overflow-y: scroll;
+  overflow-y: auto;
   overflow-x: hidden;
   font-family: sourcesanspro-regular;
   font-size: 12pt;
@@ -443,7 +443,7 @@ input[type=radio]:disabled {
   border: 1px solid #80d1ae;
   margin-top: 10px;
   margin-left: -3px;
-  overflow: scroll;
+  overflow: auto;
   border-radius: 5px;
   border-spacing: 0;
   width: 189px;

diff --git a/html_app/ui/gen/microscopy.gss.css b/html_app/ui/gen/microscopy.gss.css
@@ -14,7 +14,7 @@
 }
 .scb_s_microscopy_choose_samples_order_list {
   width: 200px;
-  overflow: scroll;
+  overflow: auto;
   max-height: 275px;
 }
 .scb_microscopy_details_view {

diff --git a/html_app/ui/gen/select_technique.gss.css b/html_app/ui/gen/select_technique.gss.css
@@ -17,7 +17,7 @@
   height: 160px;
   width: 257px;
   background-color: white;
-  overflow-y: scroll;
+  overflow-y: auto;
   padding-top: 10px;
   padding-left: 3px;
 }