first tool supported: xmllint

6 files changed, 104 insertions, 51 deletions

diff --git a/data/config.default.php b/data/config.default.php
index 804ff5e..443328d 100644
--- a/data/config.default.php
+++ b/data/config.default.php
@@ -6,6 +6,9 @@ $GLOBALS['phorkie']['cfg'] = array(
     'tpl'     => __DIR__ . '/templates/',
     'css'     => 'http://twitter.github.com/bootstrap/assets/css/bootstrap.css',
 );
+$GLOBALS['phorkie']['tools'] = array(
+    '\\phorkie\\Tool_Xmllint'
+);
 /**
  * Array of supported file types / languages.
  * Key is the file extension
diff --git a/data/templates/display-file.htm b/data/templates/display-file.htm
new file mode 100644
index 0000000..d06c365
--- /dev/null
+++ b/data/templates/display-file.htm
@@ -0,0 +1,12 @@
+<div class="file">
+ <div class="header">
+  <a class="btn btn-mini" href="{{file.getLink('raw')}}" style="float: right;">raw</a>
+  {% for toolinfo in file.getToolInfos %}
+  <a class="btn btn-mini" href="{{toolinfo.getLink(file)}}" style="float: right;">{{toolinfo.getTitle}}</a>
+  {% endfor %}
+  <h3 id="{{file.getFilename}}">{{file.getFilename}}<a class="anchorlink" href="#{{file.getFilename}}"></a></h3>
+ </div>
+ <div class="code">
+  {{file.getHighlightedContent|raw}}
+ </div>
+</div>
diff --git a/data/templates/display-foot.htm b/data/templates/display-foot.htm
new file mode 100644
index 0000000..9f2451f
--- /dev/null
+++ b/data/templates/display-foot.htm
@@ -0,0 +1,7 @@
+<div class="row-fluid" style="margin-top: 5ex">
+ <div class="span12" style="text-align: right;">
+  <a class="btn" href="{{repo.getLink('delete')}}">
+   <i class="icon-trash"></i> Delete
+  </a>
+ </div>
+</div>
diff --git a/data/templates/display-head.htm b/data/templates/display-head.htm
new file mode 100644
index 0000000..7ce5160
--- /dev/null
+++ b/data/templates/display-head.htm
@@ -0,0 +1,35 @@
+<h1>{{repo.getDescription}}</h1>
+<div class="row-fluid repo-info">
+ <div class="span4">
+  <a class="btn" href="{{repo.getLink('edit')}}"><i class="icon-edit"></i> edit</a>
+ </div>
+ <div class="span4" style="text-align: center">
+  <h3>Paste #{{repo.id}}</h3>
+ </div>
+ <div class="span4" style="text-align: right">
+  <form method="post" action="{{repo.getLink('fork')}}">
+    <button type="submit" class="btn"><i class="icon-share"></i> fork</button>
+  </form>
+ </div>
+</div>
+
+{% if repo.getCloneURL(true) or repo.getCloneURL(false) %}
+<div class="well">
+ {% if repo.getCloneURL(true) %}
+ <div class="row-fluid">
+  <div class="span3">Public clone URL</div>
+  <div class="span9">
+   <a href="{{repo.getCloneURL(true)}}">{{repo.getCloneURL(true)}}</a>
+  </div>
+ </div>
+ {% endif %}
+ {% if repo.getCloneURL(false) %}
+ <div class="row-fluid">
+  <div class="span3">Private clone URL</div>
+  <div class="span9">
+   <a href="{{repo.getCloneURL(false)}}">{{repo.getCloneURL(false)}}</a>
+  </div>
+ </div>
+ {% endif %}
+</div>
+{% endif %}
diff --git a/data/templates/display.htm b/data/templates/display.htm
index da75cd9..e021296 100644
--- a/data/templates/display.htm
+++ b/data/templates/display.htm
@@ -8,61 +8,13 @@
 {% endblock %}
 
 {% block content %}
-<h1>{{repo.getDescription}}</h1>
-<div class="row-fluid">
- <div class="span4">
-  <a class="btn" href="{{repo.getLink('edit')}}"><i class="icon-edit"></i> edit</a>
- </div>
- <div class="span4" style="text-align: center">
-  <h3>Paste #{{repo.id}}</h3>
- </div>
- <div class="span4" style="text-align: right">
-  <form method="post" action="{{repo.getLink('fork')}}">
-    <button type="submit" class="btn"><i class="icon-share"></i> fork</button>
-  </form>
- </div>
-</div>
-
-{% if repo.getCloneURL(true) or repo.getCloneURL(false) %}
-<div class="well">
- {% if repo.getCloneURL(true) %}
- <div class="row-fluid">
-  <div class="span3">Public clone URL</div>
-  <div class="span9">
-   <a href="{{repo.getCloneURL(true)}}">{{repo.getCloneURL(true)}}</a>
-  </div>
- </div>
- {% endif %}
- {% if repo.getCloneURL(false) %}
- <div class="row-fluid">
-  <div class="span3">Private clone URL</div>
-  <div class="span9">
-   <a href="{{repo.getCloneURL(false)}}">{{repo.getCloneURL(false)}}</a>
-  </div>
- </div>
- {% endif %}
-</div>
-{% endif %}
+ {% include 'display-head.htm' %}
 
 {% for file in repo.getFiles %}
-<div class="file">
- <div class="header">
-  <a class="btn btn-mini" href="{{file.getLink('raw')}}" style="float: right;">raw</a>
-  <h3 id="{{file.getFilename}}">{{file.getFilename}}<a class="anchorlink" href="#{{file.getFilename}}"></a></h3>
- </div>
- <div class="code">
-  {{file.getHighlightedContent|raw}}
- </div>
-</div>
+ {% include 'display-file.htm' %}
 {% endfor %}
 
-<div class="row-fluid" style="margin-top: 5ex">
- <div class="span12" style="text-align: right;">
-  <a class="btn" href="{{repo.getLink('delete')}}">
-   <i class="icon-trash"></i> Delete
-  </a>
- </div>
-</div>
+ {% include 'display-foot.htm' %}
 {% endblock %}
 
 {% block sidebar %}
diff --git a/data/templates/tool.htm b/data/templates/tool.htm
new file mode 100644
index 0000000..ef8e5e0
--- /dev/null
+++ b/data/templates/tool.htm
@@ -0,0 +1,44 @@
+{% extends "base.htm" %}
+{% block title %}
+ Tool results: 
+ {%if repo.getDescription %}
+  {{repo.getDescription}}
+ {%else%}
+  {{repo.id}}
+ {%endif%}
+{% endblock %}
+
+{% block content %}
+<h1>Tool results:  {{repo.getDescription}}</h1>
+<div class="row-fluid repo-info">
+ <div class="span4">
+  <a class="btn" href="{{repo.getLink('edit')}}"><i class="icon-edit"></i> edit</a>
+  <a class="btn" href="{{repo.getLink('display')}}"><i class="icon-arrow-left"></i> back</a>
+ </div>
+ <div class="span4" style="text-align: center">
+  <h3>Paste #{{repo.id}}</h3>
+ </div>
+</div>
+
+ {% for line in toolres.annotations.general %}
+  <div class="alert {{line.getAlertLevel}}">
+   {{line.message}}
+  </div>
+ {% endfor %}
+
+ {% include 'display-file.htm' %}
+
+ {% for number,lineinfos in toolres.annotations if number != 'general' %}
+  {% for line in lineinfos %}
+   <div class="alert {{line.getAlertLevel}}">
+    Line #{{number}}: {{line.message}}
+   </div>
+  {% endfor %}
+ {% endfor %}
+
+ {% include 'display-foot.htm' %}
+{% endblock %}
+
+{% block sidebar %}
+sidebar FIXME
+{% endblock %}