From f76ad081ab3b130de0a095efb66cf3a0f2df48af Mon Sep 17 00:00:00 2001
From: andy <bunce.andy@gmail.com>
Date: Fri, 3 Jun 2016 10:07:40 +0100
Subject: [PATCH] tidy

---
 src/graphxq/views/about.xml                       | 11 +++++------
 src/graphxq/views/dotform.xq                      |  2 +-
 src/graphxq/views/dotmlform.xq                    |  2 +-
 src/graphxq/views/toolbar.xml                     | 15 ++++++++++++---
 src/{ => static}/graphxq/viewbox/ViewBox.js       |  0
 .../graphxq/viewbox/junk/jquery-svgpan.js         |  0
 .../graphxq/viewbox/junk/jquery.wrap-svg.js       |  0
 src/{ => static}/graphxq/viewbox/viewBox.svg      |  0
 8 files changed, 19 insertions(+), 11 deletions(-)
 rename src/{ => static}/graphxq/viewbox/ViewBox.js (100%)
 rename src/{ => static}/graphxq/viewbox/junk/jquery-svgpan.js (100%)
 rename src/{ => static}/graphxq/viewbox/junk/jquery.wrap-svg.js (100%)
 rename src/{ => static}/graphxq/viewbox/viewBox.svg (100%)

diff --git a/src/graphxq/views/about.xml b/src/graphxq/views/about.xml
index e43e2c6..c508dda 100644
--- a/src/graphxq/views/about.xml
+++ b/src/graphxq/views/about.xml
@@ -12,7 +12,7 @@
  <div class="fluid-row">
         <div class="span4">
           <h2>Client</h2>
- <p>The client side targets modern browsers with SVG support. It was tested against Firefox 15 and Chrome 21.
+ <p>The client side targets modern browsers with SVG support. It was tested against Firefox 46 and Chrome 50.
     </p>
     
     <p><a href="http://twitter.github.com/bootstrap/index.html"
@@ -26,14 +26,13 @@
        </div>
                <div class="span4">
           <h2>Server</h2>
-  <p>The server side is written entirely in XQuery. It uses the 
+  <p>The server side is written in XQuery. It uses the 
         <a href="http://basex.org" target="_blank">BaseX</a> implementation. <a
             href="http://docs.basex.org/wiki/RESTXQ" target="_blank">RestXQ</a>
         is used to map XQuery annotations to web server behavior.
     </p>
      <p> The graphviz <code>dot</code> executable is used to generate SVG from the DOT source.
-        The resultant SVG is viewed in an interface that provides pan and zoom functionality.
-        The SVG may also be viewed standalone or downloaded.</p>
+      </p>
     <p>This application includes an XSLT transform to convert <code>DotML</code> to 
     <code>dot</code> developed by Martin Loetzsch.
      <a href="http://www.martin-loetzsch.de/DOTML" target="_blank">DotML</a>
@@ -43,7 +42,7 @@
           <h2>Todo</h2>
  <p>The SVG pan and zoom has problems, especially in Firefox. In part this maybe due
 to firefox bugs</p>
-<p>For reference how the SVG <a href="/graphxq/viewbox/viewBox.svg">viewbox</a>
+<p>For reference how the SVG <a href="/static/graphxq/viewbox/viewBox.svg">viewbox</a>
 works. See also <a href="http://www.dotuscomus.com/svg/lib/library.html#autozoom" target="_blank">here</a> 
 for a better way?
 </p>
@@ -55,7 +54,7 @@ for a better way?
    <img style="position: absolute; top: 50px; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_orange_ff7600.png" alt="Fork me on GitHub"/>
    </a>
       <footer>
-        <p>&#169; Andy Bunce 2013 -2015</p>
+        <p>&#169; Andy Bunce 2013 -2016</p>
         <ul class="quick-links">
     <!-- 
         <li><iframe class="github-btn"
diff --git a/src/graphxq/views/dotform.xq b/src/graphxq/views/dotform.xq
index cf2d85d..f464226 100644
--- a/src/graphxq/views/dotform.xq
+++ b/src/graphxq/views/dotform.xq
@@ -23,7 +23,7 @@ node[shape=circle,style=filled,fillcolor=lightblue]
 
 }}</textarea>	
 		</div>
-		<div class="col-md-6" id="rightPane" style="background-color:red;">
+		<div class="col-md-6" id="rightPane" style="background-color:#F5ECCE;">
 			<div id="svgdiv" class="extend">
 			<div id="canvasQwpYZa" class="canvas" style="width:100%;height:100%;"></div>
 			<script>
diff --git a/src/graphxq/views/dotmlform.xq b/src/graphxq/views/dotmlform.xq
index b1c5844..8bb1f67 100644
--- a/src/graphxq/views/dotmlform.xq
+++ b/src/graphxq/views/dotmlform.xq
@@ -19,7 +19,7 @@ declare variable $svgwidget external :="{svg}";
   &lt;node id="test"/&gt;
 &lt;/graph&gt;</textarea>   
 		</div>
-		<div class="col-md-6" id="rightPane">
+		<div class="col-md-6" id="rightPane"  style="background-color:#F5ECCE;">
 			         <div id="svgdiv" class="extend">
             <div id="canvasQwpYZa" class="canvas" style="width:100%;height:100%;"></div>
             <script>
diff --git a/src/graphxq/views/toolbar.xml b/src/graphxq/views/toolbar.xml
index bd7975f..4ce7884 100644
--- a/src/graphxq/views/toolbar.xml
+++ b/src/graphxq/views/toolbar.xml
@@ -45,13 +45,21 @@
                title="Ajax request status">
                  <i class="glyphicon glyphicon-info-sign" title="Request status, click for more."></i>  
   </a>
-    <div class="btn-group pull-right">
+  <div class="pull-right">
+    <div class="btn-group ">
     <button id="resetButtonQwpYZa" class="btn btn-mini btn-default" data-toggle="button" title="Zoom to fit">
             <i class="glyphicon glyphicon-screenshot"></i>
-            Fit
         </button>
+      <button id="resetButtonQwpYZa" class="btn btn-mini btn-default" data-toggle="button" title="Zoom in">
+            <i class="glyphicon glyphicon-plus-sign"></i>
+        </button>
+         <button id="resetButtonQwpYZa" class="btn btn-mini btn-default" data-toggle="button" title="Zoom out">
+            <i class="glyphicon glyphicon-minus-sign"></i>
+        </button>
+        </div>
+     <div class="btn-group ">      
     <button id="bnsvg" class="btn btn-mini btn-default" title="Show SVG standalone.">
-			<i class="glyphicon glyphicon-fullscreen"></i>
+			<i class="glyphicon glyphicon-share"></i>
 			SVG
 		</button>
 		<button id="bndn" class="btn btn-mini btn-default" title="Download SVG file">
@@ -65,4 +73,5 @@
 		</button>
 		
     </div>
+    </div>
 </div>
\ No newline at end of file
diff --git a/src/graphxq/viewbox/ViewBox.js b/src/static/graphxq/viewbox/ViewBox.js
similarity index 100%
rename from src/graphxq/viewbox/ViewBox.js
rename to src/static/graphxq/viewbox/ViewBox.js
diff --git a/src/graphxq/viewbox/junk/jquery-svgpan.js b/src/static/graphxq/viewbox/junk/jquery-svgpan.js
similarity index 100%
rename from src/graphxq/viewbox/junk/jquery-svgpan.js
rename to src/static/graphxq/viewbox/junk/jquery-svgpan.js
diff --git a/src/graphxq/viewbox/junk/jquery.wrap-svg.js b/src/static/graphxq/viewbox/junk/jquery.wrap-svg.js
similarity index 100%
rename from src/graphxq/viewbox/junk/jquery.wrap-svg.js
rename to src/static/graphxq/viewbox/junk/jquery.wrap-svg.js
diff --git a/src/graphxq/viewbox/viewBox.svg b/src/static/graphxq/viewbox/viewBox.svg
similarity index 100%
rename from src/graphxq/viewbox/viewBox.svg
rename to src/static/graphxq/viewbox/viewBox.svg