comment and extend slider width

ExplorViz-Archive · Jun 3, 2016 · 7f410d4 · 7f410d4
1 parent 97490ff
commit 7f410d4
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 10 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/ExplorViz Server.launch b/ExplorViz Server.launch
@@ -19,7 +19,7 @@
 <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
 <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="com.google.gwt.eclipse.core.moduleClasspathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.DevMode"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-startupUrl ExplorViz.html -war /Users/alexanderkrause/Desktop/ExplorViz/ExplorViz/war -remoteUI &quot;${gwt_remote_ui_server_port}:${unique_id}&quot; -logLevel INFO -port 8888 -codeServerPort 9997 explorviz.ExplorViz"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-startupUrl ExplorViz.html -war /Users/fabian/Documents/code/Masterprojekt/ExplorViz/war -remoteUI &quot;${gwt_remote_ui_server_port}:${unique_id}&quot; -logLevel INFO -port 8888 -codeServerPort 9997 explorviz.ExplorViz"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="ExplorViz"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-XstartOnFirstThread -Xmx4G"/>
 </launchConfiguration>
diff --git a/src/explorviz/visualization/experiment/NewExperiment.xtend b/src/explorviz/visualization/experiment/NewExperiment.xtend
@@ -37,15 +37,15 @@ class NewExperiment implements IPage {
 				    Question Interface
 				  </div>
 				  <div id="expSliderForm">	
-				     «getQuestForm(i)»<br>
-				  	<button id='expBackBtn'>&lt;&lt; Back</button>
-				  	<button id='expSaveBtn'>Save &gt;&gt; </button>	  	  
+				     «getQuestForm(i)»
+				     «getButtonCode()» 	
 				  </div>
 				</div>
 			'''.toString())
 		} else {
 			html.append(''' 
 			«getQuestForm(i)»
+			«getButtonCode()» 	
 			'''.toString())
 		}
 		i++;
@@ -56,6 +56,11 @@ class NewExperiment implements IPage {
 	def static protected setNextQuestion(int next) {
 		i = next;
 	}
+	def static protected getButtonCode(){
+		return 	'''
+		<button id='expBackBtn'>&lt;&lt; Back</button>
+		<button id='expSaveBtn'>Save &gt;&gt; </button>'''.toString()	 
+	}
 
 	def static protected initializeQuestions() {
 		questions = new ArrayList<String>();
@@ -85,11 +90,16 @@ class NewExperiment implements IPage {
 			  <input type='radio' name='gender' value='female'> Female
 			  <br>
 			  <input type='radio' name='gender' value='other'> Other
+			  <br>
 			</form>
 		'''.toString())
 	}
 
 	def static protected getQuestForm(int i) {
 		return questions.get(i)
 	}
+	
+	def static protected createtFreeTextForm(String label){
+		var freeText = '''test'''.toString();
+	}
 }
diff --git a/src/explorviz/visualization/experiment/NewExperimentJS.java b/src/explorviz/visualization/experiment/NewExperimentJS.java
@@ -15,20 +15,20 @@ public static native void init() /*-{
 
 		function slideOut() {
 			$wnd.jQuery('#expSlider').animate({
-				right : "+=250px"
+				right : "+=350px"
 			});
 			$wnd.jQuery('#expSliderForm').animate({
-				right : "+=250px"
+				right : "+=350px"
 			});
 		}
 		;
 
 		function slideIn() {
 			$wnd.jQuery('#expSlider').animate({
-				right : "-=250px"
+				right : "-=350px"
 			})
 			$wnd.jQuery('#expSliderForm').animate({
-				right : "-=250px"
+				right : "-=350px"
 			})
 		}
 		;

diff --git a/war/css/expTools.css b/war/css/expTools.css
@@ -15,9 +15,9 @@
 #expSliderForm {
 	position: fixed;
 	top: 40px;
-	right: -250px;
+	right: -350px;
 	background: rgba(204, 204, 204, 0.8);
-	width: 250px;
+	width: 350px;
 	padding: 25px;
 	height: 75vh;
 	text-align: left;