This commit is contained in:
Andy Bunce 2016-01-08 23:37:47 +00:00
parent c7d97490c6
commit 922e1066ef
9 changed files with 19 additions and 21 deletions

View file

@ -1,5 +1,5 @@
<package abbrev="graphxq" name="https://github.com/apb2006/graphxq"
version="0.1" spec="1.0" xmlns="http://expath.org/ns/pkg">
version="0.6" spec="1.0" xmlns="http://expath.org/ns/pkg">
<title>Graphxq</title>
<dependency name="twitter-bootstrap" version="3.3.1" />
<dependency name="jquery" version="2.0.2" />

View file

@ -18,7 +18,7 @@ declare namespace restxq = 'http://exquery.org/ns/restxq';
(:~ shared page wrapper :)
declare variable $grxq:layout:=fn:resolve-uri("views/layout.xq");
declare variable $grxq:version:=fn:doc("expath-pkg.xml")/*/@version;
(:~
: Home page for app
:)
@ -204,7 +204,8 @@ declare function render($template as xs:string,$locals){
let $path:=request:path()
let $default:=map{ "title": request:path(),
"active-link": active-link($path,?), (: *** FAILS IF request:path() :)
"bodyclass": ""}
"bodyclass": "",
"version":$grxq:version}
let $locals:=map:merge(($default,$locals))
return txq:render(fn:resolve-uri($template),$locals,$grxq:layout)
};

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<meta xmlns="http://basex.org/xquery/repo">
<description>Restxq interface for Graphviz for BaseX 8.0.</description>
<description>Restxq interface for Graphviz for BaseX.</description>
<author>Andy Bunce</author>
<website>https://github.com/apb2006/graphxq</website>
<status>alpha</status>

View file

@ -4,10 +4,7 @@ declare variable $dot external :="{dot}";
declare variable $svgwidget external :="{svg}";
<div class="row">
<div class="row" style="height:24px">
{$toolbar}
</div>
<div class="row">
<div class="col-md-6" id="leftPane">
<div id="dsrc" class="extend ace-container" >

View file

@ -3,9 +3,7 @@ declare variable $dotml external :="{dotml}";
declare variable $svgwidget external :="{svg}";
<div class="row">
<div class="row" style="height:24px">
{$toolbar}
</div>
<div class="row">
<div class="col-md-6" id="leftPane" style="position:relative;height:100%">
<div id="dsrc" class="extend ace-container" >

View file

@ -5,7 +5,7 @@ declare variable $url external;
<a href="{$url($item)}" class="thumbnail"
style="height:128px;width:20em; background-color:#EEEEEE">
<div class="pull-left media-object" style="height:120px;width:120px;">
<img src="/static/graphxq/data/thumbs/{$item/url}.gif"
<img src="/static/graphxq/thumbs/{$item/url}.gif"
style="max-height:100%; max-width:100%;" />
</div>

View file

@ -1,5 +1,7 @@
declare variable $body external :="{body}";
declare variable $title external :="{title}";
(:~ version e.g "0.5" :)
declare variable $version external :="?todo";
declare variable $bodyclass external :="{$bodyclass}";
declare variable $active-link external :=function($_){$_};
@ -53,7 +55,7 @@ declare variable $active-link external :=function($_){$_};
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav">
<li> <a href="/graphxq" class="brand" title="Version 0.5.0">
<li> <a href="/graphxq" class="brand" title="Version {$version}">
<img src="/static/graphxq/graphxq2.png" />
GraphXQ
</a>
@ -99,7 +101,7 @@ declare variable $active-link external :=function($_){$_};
><i class="glyphicon glyphicon-wrench"></i> API</a>
</li>
<li class="divider"></li>
<li><a href="#about">About</a></li>
<li><a href="about">About</a></li>
</ul>
</li>
</ul>

View file

@ -3,7 +3,7 @@ declare variable $partial external ;
<div class="row-fluid">
<h2>Samples ({fn:count($items/item )})</h2>
<ul class=" thumbnails media-list">
<ul class=" thumbnails media-list list-inline">
{$partial("item1.xq","item",$items/item)}
</ul>
</div>

View file

@ -1,4 +1,4 @@
<div>
<div class="row">
<div class="btn-group">
<button id="bnRefresh" class="btn btn-mini"
@ -27,15 +27,15 @@
</div>
<!-- http://stackoverflow.com/questions/12101781/splitter-for-twitter-bootstrap -->
<div class="btn-group " data-toggle="buttons-radio">
<a rel="tooltip" title="Show only the editor" class="btn btn-mini"
<a rel="tooltip" title="Show only the editor" class="btn btn-mini btn-default"
data-action="lDom" data-placement="left">
<i class="glyphicon glyphicon-indent-left"></i>
</a>
<a rel="tooltip" title="Make both sides equal" class="btn btn-mini"
<a rel="tooltip" title="Make both sides equal" class="btn btn-mini btn-default"
data-placement="left" data-action="equality">
<i class="glyphicon glyphicon-resize-horizontal"></i>
</a>
<a rel="tooltip" title="Show only the result" class="btn btn-mini"
<a rel="tooltip" title="Show only the result" class="btn btn-mini btn-default"
data-placement="left" data-action="rDom">
<i class="glyphicon glyphicon-indent-right"></i>
</a>
@ -43,20 +43,20 @@
<a id="infotip" data-original-title="Status from Ajax"
class="btn btn-mini" rel="popover" data-placement="bottom" data-content="nothing yet."
title="Ajax request status">
<i class="glyphicon glyphicon-info-sign" title="Request status, click for more.">></i>
<i class="glyphicon glyphicon-info-sign" title="Request status, click for more."></i>
</a>
<div class="btn-group pull-right">
<button id="bnsvg" class="btn btn-mini" title="Show SVG standalone.">
<button id="bnsvg" class="btn btn-mini btn-default" title="Show SVG standalone.">
<i class="glyphicon glyphicon-fullscreen"></i>
SVG
</button>
<button id="bndn" class="btn btn-mini" title="Download SVG file">
<button id="bndn" class="btn btn-mini btn-default" title="Download SVG file">
<i class="glyphicon glyphicon-download-alt"></i>
download
</button>
</div>
<div class="btn-group pull-right">
<button id="bnxml" class="btn btn-mini" data-toggle="button" title="Toggle SVG graphic and text">
<button id="bnxml" class="btn btn-mini btn-default" data-toggle="button" title="Toggle SVG graphic and text">
<i class="glyphicon glyphicon-eye-close"></i>
SVG text
</button>