Epic-232:Modifying UI changes

the dist package dependency is removed

Change-Id: I9829cdda53326720263f3164d4d0fe2871dcc808
Issue-ID: SDNC-473
Signed-off-by: DushyantSinghThakur <dt00503496@techmahindra.com>

diff --git a/SdncReports/SdncReportsApi/pom.xml b/SdncReports/SdncReportsApi/pom.xml
index 8d3caab..23fc512 100644 (file)
--- a/SdncReports/SdncReportsApi/pom.xml
+++ b/SdncReports/SdncReportsApi/pom.xml
@@ -21,16 +21,13 @@
        </properties>
 
        <dependencies>
-
-               <!-- <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> 
-                       <scope>test</scope> <version>1.4.194</version> </dependency> -->
-
+       
                <dependency>
                        <groupId>ch.vorburger.mariaDB4j</groupId>
                        <artifactId>mariaDB4j</artifactId>
                        <version>2.2.3</version>
                </dependency>
-
+               
                <!-- https://mvnrepository.com/artifact/com.google.code.gson/gson -->
                <dependency>
                        <groupId>com.google.code.gson</groupId>
@@ -38,10 +35,6 @@
                        <version>2.8.2</version>
                </dependency>
 
-               <!-- <dependency> <groupId>com.sdnc.reports</groupId> <artifactId>sdnc_reports_certification</artifactId> 
-                       <version>0.0.1-SNAPSHOT</version> <scope>test</scope> <classifier>exec</classifier> 
-                       </dependency> -->
-
                <dependency>
                        <groupId>${project.groupId}</groupId>
                        <artifactId>SdncReportsDao</artifactId>
@@ -102,8 +95,20 @@
                        <groupId>org.springframework.boot</groupId>
                        <artifactId>spring-boot-starter-log4j2</artifactId>
                </dependency>
+               
+               <!-- Add Web jars, instead of dist folder  -->
+               <dependency>
+                       <groupId>org.webjars</groupId>
+                       <artifactId>bootstrap</artifactId>
+                       <version>3.3.7</version>
+               </dependency>
 
-
+               <dependency>
+                       <groupId>org.webjars</groupId>
+                       <artifactId>bootstrap-datepicker</artifactId>
+                       <version>1.0.1</version>
+               </dependency>
+               
        </dependencies>
 
        <build>
@@ -116,9 +121,7 @@
                                <configuration>
                                        <executable>true</executable>
                                </configuration>
-                               <!-- <configuration> <mainClass>${start-class}</mainClass> <layout>ZIP</layout> 
-                                       </configuration> <executions> <execution> <goals> <goal>repackage</goal> 
-                                       </goals> </execution> </executions> -->
+                               
                        </plugin>
 
                        <plugin>
@@ -133,9 +136,7 @@
                                <groupId>org.jacoco</groupId>
                                <artifactId>jacoco-maven-plugin</artifactId>
                                <version>0.7.5.201505241946</version>
-                               <executions>
-                                       <!-- Prepares the property pointing to the JaCoCo runtime agent which 
-                                               is passed as VM argument when Maven the Surefire plugin is executed. -->
+                               <executions>                                    
                                        <execution>
                                                <id>pre-unit-test</id>
                                                <goals>
@@ -149,8 +150,7 @@
                                                        <propertyName>surefireArgLine</propertyName>
                                                </configuration>
                                        </execution>
-                                       <!-- Ensures that the code coverage report for unit tests is created 
-                                               after unit tests have been run. -->
+                                       
                                        <execution>
                                                <id>post-unit-test</id>
                                                <phase>test</phase>
@@ -188,6 +188,5 @@
                                </configuration>
                        </plugin>
                </plugins>
-
        </build>
 </project>

diff --git a/SdncReports/SdncReportsApi/src/main/resources/static/style/sdnc-style.css b/SdncReports/SdncReportsApi/src/main/resources/static/style/sdnc-style.css
index 361591c..27b1595 100644 (file)
--- a/SdncReports/SdncReportsApi/src/main/resources/static/style/sdnc-style.css
+++ b/SdncReports/SdncReportsApi/src/main/resources/static/style/sdnc-style.css
@@ -130,7 +130,7 @@
 }
  .heading{  
      margin-top:30px;
-     width:100%;
+     width:99.5%;
      height:45px;
      margin-bottom:20px;
      font-family:Trebuchet MS, Arial, Helvetica, sans-serif;

diff --git a/SdncReports/SdncReportsApi/src/main/webapp/WEB-INF/views/index.jsp b/SdncReports/SdncReportsApi/src/main/webapp/WEB-INF/views/index.jsp
index f48a192..3c7be35 100644 (file)
--- a/SdncReports/SdncReportsApi/src/main/webapp/WEB-INF/views/index.jsp
+++ b/SdncReports/SdncReportsApi/src/main/webapp/WEB-INF/views/index.jsp
@@ -26,8 +26,8 @@
       <!-- CSS -->
       <script src="./node_modules/jquery.min.js"></script>
       <script src="./node_modules/tether.min.js" ></script>
-      <link rel="stylesheet" href="./node_modules/bootstrap-3.3.7/dist/css/bootstrap.min.css">
-      <script src="./node_modules/bootstrap-3.3.7/dist/js/bootstrap.min.js"></script>
+      <link rel="stylesheet" href="/webjars/bootstrap/3.3.7/css/bootstrap.min.css">  
+      <script src="/webjars/bootstrap/3.3.7/js/bootstrap.min.js"></script>      
       <link rel="stylesheet" href="/style/sdnc-style.css">
       <!-- JS -->
       <!-- load angular,date-time picker,pagination,growl and ui-router -->