Merge pull request #1315 from MetadataConsulting/MET-2421-D3-data-mod…

…el-view-like-shrimp MET-2421 D3 data model view like shrimp
MetadataConsulting · Jun 15, 2018 · 2b8768b · 2b8768b
2 parents 7301c54 + 0afcaa0
commit 2b8768b
Show file tree

Hide file tree

Showing 19 changed files with 1,585 additions and 390 deletions.
diff --git a/ModelCatalogueCorePluginTestApp/bower.json b/ModelCatalogueCorePluginTestApp/bower.json
@@ -50,9 +50,11 @@
     "core.js": "~2.3.0",
     "validator-js": "^10.2.0",
     "d3": "3.0.0",
-    "underscore": "1.9.0"
+    "underscore": "1.9.0",
+    "jquery-resizable": "^0.20.0"
   },
   "resolutions": {
-    "angular": "1.4.10"
+    "angular": "1.4.10",
+    "jquery-resizable": "^0.20.0"
   }
 }
diff --git a/...ueCorePluginTestApp/grails-app/assets/javascripts/templates/mc/core/ui/states/mc.tpl.html b/...ueCorePluginTestApp/grails-app/assets/javascripts/templates/mc/core/ui/states/mc.tpl.html
@@ -5,7 +5,7 @@
     <div class="split-view-content">
 
       <!-- link to basic view -->
-      <a href="/dataModel/basicView/{{currentDataModel.id}}" target="_blank" class="btn btn-default"><i class="fa fa-arrow-left"></i>   Basic Data Model View</a>
+      <a href="/dataModel/basicView/{{currentDataModel.id}}" target="_blank"> Basic View</a> | <b>Advanced View</b>
       <br/><br/>
 
       <catalogue-element-treeview list="elementAsList" descend="content" on-select="onTreeviewSelected($element, $descendPath)"