Fixing Modals and other GUI tweaks.

Author: jj

src/main/webapp/js/controllers.js

@@ -331,7 +331,7 @@ app.controller('VirtuosoCtrl', function($scope, ConfigurationService, AccountSer
 *
 ***************************************************************************************************/
 
-app.controller('FaceteFormCtrl', function($scope, ConfigurationService, GraphService) {
+app.controller('FaceteFormCtrl', function($scope, ConfigurationService, GraphService, AccountService) {
 	//Settings for Facete
 
 	$scope.namedGraphs = [];

src/main/webapp/partials/authoring/ontology.html

@@ -31,7 +31,6 @@ <h3 class="green bold">
     <button type="button" class="btn btn-primary btn-large" data-toggle="modal" data-target="#modalOntology" ng-click="new();">Add new ontology</button>
 
 <div class="modal fade" id="modalOntology">
-    <div class="modal-dialog">
     <div class="modal-content">
         <div class="modal-header">
             <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
@@ -83,13 +82,11 @@ <h5 class="modal-title green bold">Add ontology</h5>
         </div>
     </div>
     </div>
-    </div>
 
     <div class="modal fade" id="fullModal">
-    <div class="modal-dialog">
     <div class="modal-content">
         <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+            <button type="button" class="close" ng-click="close('#modalLogin')" aria-hidden="true">&times;</button>
             <h5 class="modal-title green bold">MiniDix</h5>
         </div>
         <div class="modal-body">
@@ -98,5 +95,4 @@ <h5 class="modal-title green bold">MiniDix</h5>
     </div>
     </div>
     </div>
-    </div>
 </div>

src/main/webapp/partials/authoring/ontowiki.html

@@ -14,17 +14,15 @@ <h3 class="green bold">{{component.label}}</h3>
   </div>
   <!-- Modal -->
   <div class="modal fade" id="fullModal" >
-  <div class="modal-dialog">
     <div class="modal-content">
     <div class="modal-header">
-      <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+      <button type="button" class="close" ng-click="close('#modalLogin')" aria-hidden="true">&times;</button>
       <h5 class="modal-title green bold">{{component.label}}</h5>
     </div>
     <div class="modal-body">
       <modal-iframe></modal-iframe>
     </div>     
   </div><!-- /.modal -->
   </div>
-  </div>
 </div>
 

src/main/webapp/partials/extraction-and-loading/d2rq-mapping.html

@@ -8,7 +8,7 @@
     <div class="modal-content">
         <form name="mappingGroupForm" class="form-horizontal InputForm" role="form" novalidate>
             <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                <button type="button" class="close" ng-click="close('#modalLogin')" aria-hidden="true">&times;</button>
                 <h5 class="modal-title green bold">Add mapping group</h5>
             </div>
             <div class="modal-body">

src/main/webapp/partials/extraction-and-loading/sparqlify.html

@@ -27,13 +27,15 @@ <h3 class="green bold">{{component.label}}</h3>
 
   <!-- Modal -->
   <div class="modal fade" id="fullModal" >
+  <div class="modal-content">
     <div class="modal-header">
       <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
       <h5 class="modal-title green bold">Sparqlify</h5>
     </div>
     <div class="modal-body">
       <modal-iframe></modal-iframe>
     </div>    
+    </div>
 	</div><!-- /.modal -->
 </div>
 

src/main/webapp/partials/querying-and-exploration/facete.html

@@ -31,14 +31,16 @@ <h3 class="green bold">{{component.label}}</h3>
   </form>
 
   <!-- Modal -->
-  <div class="modal fade" id="fullModal" >
+  <div class="modal fade" id="fullModal">
+  <div class="modal-content">
     <div class="modal-header">
       <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
       <h5 class="modal-title green bold">Facete</h5>
     </div>
     <div class="modal-body">
       <modal-iframe></modal-iframe>
     </div>      
+    </div>
 	</div><!-- /.modal -->
 </div>
 

src/main/webapp/partials/querying-and-exploration/mappify.html

@@ -31,14 +31,16 @@ <h3 class="green bold">{{component.label}}</h3>
   </form>
 
   <!-- Modal -->
-  <div class="modal fade" id="fullModal" >
+  <div class="modal fade" id="fullModal">
+  <div class="modal-content">
     <div class="modal-header">
       <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
       <h5 class="modal-title green bold">Mappify</h5>
     </div>
     <div class="modal-body">
       <modal-iframe></modal-iframe>
     </div>      
+    </div>
 	</div><!-- /.modal -->
 </div>
 

src/main/webapp/partials/querying-and-exploration/virtuoso.html

@@ -37,13 +37,15 @@ <h4>Launch SPARQLEndPoint Services</h4>
   </div>
   <!-- Modal -->
   <div class="modal fade" id="fullModal">
+  <div class="modal-content">
     <div class="modal-header">
       <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
       <h5 class="modal-title green bold">Virtuoso SPARQLEndpoint</h5>
     </div>
     <div class="modal-body">
       <modal-iframe></modal-iframe>
     </div>     
+    </div>
   </div><!-- /.modal -->  
 </div>