Merge pull request #86 from com-pas/compare-compas-versions

Compare CoMPAS versions

Author: Rob Tjalma

__snapshots__/compas-versions-plugin.md

@@ -59,72 +59,88 @@
 ####   `looks like the latest snapshot`
 
 ```html
+<h1>
+  <nav>
+    <abbr title="[compas.versions.addVersionButton]">
+      <mwc-icon-button icon="playlist_add">
+      </mwc-icon-button>
+    </abbr>
+  </nav>
+  <nav>
+    <abbr title="[compas.versions.deleteProjectButton]">
+      <mwc-icon-button icon="delete_forever">
+      </mwc-icon-button>
+    </abbr>
+  </nav>
+</h1>
 <div id="containerCompasVersions">
   <section tabindex="0">
     <h1>
       [compas.versions.title]
-      <mwc-icon-button icon="note_add">
-      </mwc-icon-button>
-      <mwc-icon-button icon="delete_forever">
-      </mwc-icon-button>
     </h1>
-    <mwc-list>
-      <mwc-list-item
+    <mwc-list multi="">
+      <mwc-check-list-item
         aria-disabled="false"
-        graphic="control"
+        graphic="icon"
         mwc-list-item=""
         tabindex="0"
+        value="1.0.0"
       >
         demo_station1 (1.0.0)
-        <span
-          slot="graphic"
-          style="width: 90px"
-        >
+        <span slot="graphic">
           <mwc-icon>
             restore
           </mwc-icon>
           <mwc-icon>
             delete
           </mwc-icon>
         </span>
-      </mwc-list-item>
-      <mwc-list-item
+      </mwc-check-list-item>
+      <mwc-check-list-item
         aria-disabled="false"
-        graphic="control"
+        graphic="icon"
         mwc-list-item=""
         tabindex="-1"
+        value="2.0.0"
       >
         demo_station1 (2.0.0)
-        <span
-          slot="graphic"
-          style="width: 90px"
-        >
+        <span slot="graphic">
           <mwc-icon>
             restore
           </mwc-icon>
           <mwc-icon>
             delete
           </mwc-icon>
         </span>
-      </mwc-list-item>
-      <mwc-list-item
+      </mwc-check-list-item>
+      <mwc-check-list-item
         aria-disabled="false"
-        graphic="control"
+        graphic="icon"
         mwc-list-item=""
         tabindex="-1"
+        value="2.1.0"
       >
         3b572a56-51cc-479b-97fd-e404ebf9ae67 (2.1.0)
-        <span
-          slot="graphic"
-          style="width: 90px"
-        >
+        <span slot="graphic">
           <mwc-icon>
             restore
           </mwc-icon>
         </span>
-      </mwc-list-item>
+      </mwc-check-list-item>
     </mwc-list>
   </section>
+  <mwc-fab
+    extended=""
+    icon="compare"
+    label="[compas.versions.compareCurrentButton]"
+  >
+  </mwc-fab>
+  <mwc-fab
+    extended=""
+    icon="compare"
+    label="[compas.versions.compareButton]"
+  >
+  </mwc-fab>
 </div>
 <wizard-dialog>
 </wizard-dialog>

public/md/CoMPAS-Versions-Editor.md

@@ -1,4 +1,5 @@
 In the CoMPAS Editor the different versions of an SCL XML File are shown that are stored in CoMPAS.
+Different actions can be done in this screen.
 
 - <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="#000000"><path d="M0 0h24v24H0V0z" fill="none"/><path d="M13 3c-4.97 0-9 4.03-9 9H1l4 3.99L9 12H6c0-3.87 3.13-7 7-7s7 3.13 7 7-3.13 7-7 7c-1.93 0-3.68-.79-4.94-2.06l-1.42 1.42C8.27 19.99 10.51 21 13 21c4.97 0 9-4.03 9-9s-4.03-9-9-9zm-1 5v5l4.25 2.52.77-1.28-3.52-2.09V8z"/></svg>: 
   Restore a specific version from CoMPAS. <br/>
@@ -8,10 +9,16 @@ In the CoMPAS Editor the different versions of an SCL XML File are shown that ar
 - <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="#000000"><path d="M0 0h24v24H0V0z" fill="none"/><path d="M16 9v10H8V9h8m-1.5-6h-5l-1 1H5v2h14V4h-3.5l-1-1zM18 7H6v12c0 1.1.9 2 2 2h8c1.1 0 2-.9 2-2V7z"/></svg>: 
   Remove a specific version from CoMPAS.<br/>
   By pressing the icon and confirming the action that specific version will be removed from CoMPAS.
-- <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="#000000"><path d="M0 0h24v24H0V0z" fill="none"/><path d="M13 11h-2v3H8v2h3v3h2v-3h3v-2h-3zm1-9H6c-1.1 0-2 .9-2 2v16c0 1.1.89 2 1.99 2H18c1.1 0 2-.9 2-2V8l-6-6zm4 18H6V4h7v5h5v11z"/></svg>:
+- <svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="24px" viewBox="0 0 24 24" width="24px" fill="#000000"><g><rect fill="none" height="24" width="24"/></g><g><path d="M14,10H3v2h11V10z M14,6H3v2h11V6z M18,14v-4h-2v4h-4v2h4v4h2v-4h4v-2H18z M3,16h7v-2H3V16z"/></g></svg>:
   Add version from filesystem.<br/>
   By pressing the icon you can select an XML SCL File from your local system to become the latest version for current SCL XML File loaded from CoMPAS.<br/>
   Remark: The full XML will be replaced, including the history and CoMPAS Extensions, like filename.
 - <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="#000000"><path d="M0 0h24v24H0V0z" fill="none"/><path d="M14.12 10.47L12 12.59l-2.13-2.12-1.41 1.41L10.59 14l-2.12 2.12 1.41 1.41L12 15.41l2.12 2.12 1.41-1.41L13.41 14l2.12-2.12zM15.5 4l-1-1h-5l-1 1H5v2h14V4zM6 19c0 1.1.9 2 2 2h8c1.1 0 2-.9 2-2V7H6v12zM8 9h8v10H8V9z"/></svg>:
   Remove the SCL XML File completely from CoMPAS, all versions.<br/>
   By pressing the icon and confirming the action all versions will be removed from CoMPAS.
+
+Beside these icons to execute actions, it's also possible to compare versions with each other. 
+Select two versions by checking the checkbox and press the button "Compare versions" to see the differences between these two versions. 
+
+The current version opened (and changed) can also be compared to a specific version. 
+Select one version by checking the checkbox and press the button "Compare versions (current)" to see the differences between current version and the selected version.