Merge remote-tracking branch 'upstream/master'

Author: nikitaeverywhere

README.md

@@ -11,7 +11,7 @@ An UML Class explorer for InterSystems Caché.
 
 ## Screenshots
 
-![Demo](https://cloud.githubusercontent.com/assets/4989256/7622499/9cb98048-f9d8-11e4-9c27-4257e53ec70d.png)
+![Demo](https://cloud.githubusercontent.com/assets/4989256/7642972/f2c3e33c-fa9d-11e4-90b4-d35c809c9e60.png)
 
 ## Installation
 

cache/projectTemplate.xml

@@ -3,7 +3,7 @@
 <Class name="UMLExplorer.ClassView">
 <Description>
 Class contains methods that return structured classes/packages data.</Description>
-<TimeChanged>63686,4398.893381</TimeChanged>
+<TimeChanged>63686,85630.818189</TimeChanged>
 <TimeCreated>63653,67019.989197</TimeCreated>
 
 <Method name="getClassTree">
@@ -115,8 +115,8 @@ Return structured data about class.</Description>
     for i=1:1:count {
         set oPar = ##class(%ZEN.proxyObject).%New()
         set p = classDefinition.Parameters.GetAt(i)
+        set oPar.type = p.Type
         do oParameters.%DispatchSetProperty(p.Name, oPar)
-        do oPar.%DispatchSetProperty("type", p.Type)
     }
 
     do ..collectInheritance(oData, classDefinition, package)
@@ -302,7 +302,7 @@ Returns structured package data</Description>
 </Class>
 
 
-<Project name="UMLExplorer" LastModified="2015-05-08 19:38:35.423206">
+<Project name="UMLExplorer" LastModified="2015-05-14 01:35:59.888696">
   <Items>
     <ProjectItem name="UMLExplorer.ClassView" type="CLS"></ProjectItem>
     <ProjectItem name="UMLExplorer.Router" type="CLS"></ProjectItem>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "CacheUMLExplorer",
-  "version": "0.8.0",
+  "version": "0.9.2",
   "description": "An UML Class explorer for InterSystems Caché",
   "directories": {
     "test": "test"

web/css/extras.css

@@ -84,6 +84,18 @@
     box-shadow: 0 0 5px 2px #ffcc1b;
 }
 
+.icon.help:after {
+    content: "?";
+    position: absolute;
+    color: white;
+    display: block;
+    font-size: 21px;
+    font-weight: 900;
+    height: 100%;
+    width: 100%;
+    text-align: center;
+}
+
 .icon.plus:before {
     content: "";
     background-color: #fff;

web/css/interface.css

@@ -32,27 +32,31 @@ html, body {
     padding: .5em;
     font-weight: 600;
     font-size: 18pt;
+    z-index: 1;
 }
 
 .ui-rightBottomToolBar {
     position: absolute;
     bottom: 0;
     right: 0;
     padding: .5em;
+    z-index: 1;
 }
 
 .ui-leftBottomToolBar {
     position: absolute;
     bottom: 0;
     left: 0;
     padding: .5em;
+    z-index: 1;
 }
 
 .ui-topRightToolBar {
     position: absolute;
     top: 0;
     right: 0;
     padding: .5em;
+    z-index: 1;
 }
 
 #className {

web/index.html

@@ -37,6 +37,7 @@
             </div>
             <div class="ui-topRightToolBar">
                 <div id="button.showInfo" class="icon info"></div>
+                <div id="button.showHelp" class="icon help"></div>
             </div>
             <div class="ui-leftBottomToolBar">
                 <div id="button.downloadSVG" class="icon download"></div>

web/js/CacheUMLExplorer.js

@@ -18,6 +18,7 @@ var CacheUMLExplorer = function (treeViewContainer, classViewContainer) {
         zoomInButton: id("button.zoomIn"),
         zoomOutButton: id("button.zoomOut"),
         zoomNormalButton: id("button.zoomNormal"),
+        helpButton: id("button.showHelp"),
         infoButton: id("button.showInfo"),
         methodCodeView: id("methodCodeView"),
         closeMethodCodeView: id("closeMethodCodeView"),
@@ -53,7 +54,11 @@ CacheUMLExplorer.prototype.init = function () {
             this.classView.loadClass(hash.substr(7));
         } else if (hash.indexOf("package:") === 1) {
             this.classView.loadPackage(hash.substr(9));
+        } else {
+            this.classView.renderInfoGraphic();
         }
+    } else {
+        this.classView.renderInfoGraphic();
     }
 
     this.elements.infoButton.addEventListener("click", function () {