Created tabbed editor in devtool

Signed-off-by: shiv12095 <shiv12095@iiitd.ac.in>
shiv12095 · Jul 25, 2016 · 8df10b2 · 8df10b2
1 parent 0de6bd7
commit 8df10b2
Show file tree

Hide file tree

Showing 10 changed files with 396 additions and 254 deletions.
diff --git a/server/devtool/pom.xml b/server/devtool/pom.xml
@@ -49,6 +49,7 @@
 
 	<dependencies>
 
+		<!-- Spring Dependencies -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
@@ -59,7 +60,12 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-security</artifactId>
+		</dependency>
 
+		<!-- Swagger Dependencies -->
 		<dependency>
 			<groupId>io.swagger</groupId>
 			<artifactId>swagger-annotations</artifactId>
@@ -71,10 +77,7 @@
 			<version>1.5.6</version>
 		</dependency>
 
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-security</artifactId>
-		</dependency>
+		<!-- Vorto Dependencies -->
 		<dependency>
 			<groupId>org.eclipse.vorto</groupId>
 			<artifactId>org.eclipse.vorto.core</artifactId>
@@ -132,12 +135,16 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+
 		<!-- http://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
 			<version>3.1</version>
 		</dependency>
+
+
+		<!-- Webjar Dependencies -->
 		<dependency>
 			<groupId>org.webjars</groupId>
 			<artifactId>requirejs</artifactId>
@@ -164,14 +171,29 @@
 			<version>1.3.13</version>
 		</dependency>
 		<dependency>
-			<groupId>org.webjars.npm</groupId>
-			<artifactId>angular-smart-table</artifactId>
-			<version>2.1.6</version>
+			<groupId>org.webjars</groupId>
+			<artifactId>angular-ui-bootstrap</artifactId>
+			<version>0.14.3</version>
+		</dependency>
+		<dependency>
+			<groupId>org.webjars.bower</groupId>
+			<artifactId>angular-animate</artifactId>
+			<version>1.3.13</version>
+		</dependency>
+		<dependency>
+			<groupId>org.webjars.bower</groupId>
+			<artifactId>angular-aria</artifactId>
+			<version>1.3.15</version>
 		</dependency>
 		<dependency>
 			<groupId>org.webjars</groupId>
 			<artifactId>font-awesome</artifactId>
 			<version>4.2.0</version>
 		</dependency>
+		<dependency>
+			<groupId>org.webjars.npm</groupId>
+			<artifactId>angular-smart-table</artifactId>
+			<version>2.1.6</version>
+		</dependency>		
 	</dependencies>
 </project>
diff --git a/server/devtool/src/main/java/org/eclipse/vorto/server/devtool/config/XtextConfiguration.java b/server/devtool/src/main/java/org/eclipse/vorto/server/devtool/config/XtextConfiguration.java
@@ -66,8 +66,6 @@ public void apply(final ExecutorService it) {
 
 
 		return Guice.createInjector(
-//				Modules.override(new FunctionblockRuntimeModule())
-//						.with(new FunctionblockWebModule(executorServiceProvider)),
 				Modules.override(new InformationModelRuntimeModule())
 						.with(new InformationModelWebModule(executorServiceProvider)));
 	}

diff --git a/server/devtool/src/main/resources/static/css/style.css b/server/devtool/src/main/resources/static/css/style.css
@@ -786,11 +786,16 @@ th.action
 
 /* Editor Start */
 
-#editor-container {
-	position:relative;
+.custom-xtext-editor {
+	display: block;
+	position: absolute;
+	top: 0;
+	bottom: 0;
+	left: 0;
+	right: 0;
 	padding: 4px;
-	border: 1px solid #aaa;	
-	height: 440px;
+	border: 1px solid #aaa;
+	height: 387px;
 	width: auto;
 }
 
@@ -816,20 +821,38 @@ th.action
 }
 
 .import-button {
+	text-align: center;
 	font-size: 50px;
 	background: none;
 	border: none;
-	position: absolute;
-    top:0;
-    bottom: 0;
-    left: 0;
-    right: 0;
-
+	margin-top: 180px;
+	margin-bottom: 180px;
 }
 
 .search-button {
 	padding: 2px;
 	font-size: 20px;
-	background: none;
 	border: none;
 }
+
+a:hover {
+	cursor: pointer; 
+	cursor: hand;
+}
+
+.nav-tabs > li > a{
+    cursor:pointer;
+}
+
+.nav-tabs li a span:hover {
+    color: red;
+    cursor:pointer;
+}
+
+.editor-ul.nav a {
+	box-shadow: none;
+    background: transparent;
+    color: #000000;
+    text-shadow: none;
+    font-weight: bold;
+}