Merge tag 'upstream_keyringer_0.2.6' into debian

Upstream version 0.2.6
author: Silvio Rhatto <rhatto@riseup.net> 2013-10-04 13:05:52 -0300
committer: Silvio Rhatto <rhatto@riseup.net> 2013-10-04 13:05:52 -0300
commit: 35d9b5807510dd9490fdb5f9a7327e9de58644c3 (patch)
tree: 7504b509062f3406a6c5969a53099bd3b91ce234 /templates
parent: 7185eab583383d8eff826755f93e972ce8d3add3 (diff)
parent: 1b1197728cfd029deb46ebbe6ac0a70bcee58510 (diff)
download: keyringer-35d9b5807510dd9490fdb5f9a7327e9de58644c3.tar.gz
keyringer-35d9b5807510dd9490fdb5f9a7327e9de58644c3.tar.bz2
2 files changed, 0 insertions, 336 deletions
diff --git a/templates/inlinepage.tmpl b/templates/inlinepage.tmpl
deleted file mode 100644
index 2a8c1c2..0000000
--- a/templates/inlinepage.tmpl
+++ /dev/null
@@ -1,75 +0,0 @@
-<hr />
-
-<TMPL_IF HTML5><article class="inlinepage"><TMPL_ELSE><div class="inlinepage"></TMPL_IF>
-
-<TMPL_IF HTML5><section class="inlineheader"><TMPL_ELSE><div class="inlineheader"></TMPL_IF>
-<!--<TMPL_IF AUTHOR>
-<span class="author">
-<TMPL_IF AUTHORURL>
-<a href="<TMPL_VAR AUTHORURL>"><TMPL_VAR AUTHOR></a>
-<TMPL_ELSE>
-<TMPL_VAR AUTHOR>
-</TMPL_IF>
-</span>
-</TMPL_IF>-->
-<TMPL_IF HTML5><header class="header"><TMPL_ELSE><span class="header"></TMPL_IF>
-<h2>
-<TMPL_IF PERMALINK>
-<a href="<TMPL_VAR PERMALINK>"><TMPL_VAR TITLE></a>
-<TMPL_ELSE>
-<a href="<TMPL_VAR PAGEURL>"><TMPL_VAR TITLE></a>
-</TMPL_IF>
-</h2>
-<p class="pagedate">
-<strong>Posted <TMPL_VAR CTIME></strong>
-</p>
-<TMPL_IF HTML5></header><TMPL_ELSE></span></TMPL_IF>
-<TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
-
-<TMPL_IF HTML5><section class="inlinecontent"><TMPL_ELSE><div class="inlinecontent"></TMPL_IF>
-<TMPL_VAR CONTENT>
-<TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
-
-<TMPL_IF HTML5><footer class="inlinefooter"><TMPL_ELSE><div class="inlinefooter"></TMPL_IF>
-
-<TMPL_IF TAGS>
-<TMPL_IF HTML5><nav class="tags"><TMPL_ELSE><span class="tags"></TMPL_IF>
-Tags:
-<TMPL_LOOP TAGS>
-<TMPL_VAR LINK>
-</TMPL_LOOP>
-<TMPL_IF HTML5></nav><TMPL_ELSE></span></TMPL_IF>
-</TMPL_IF>
-
-<TMPL_IF COPYRIGHT>
-<div class="pagecopyright">
-<TMPL_VAR COPYRIGHT>
-</div>
-</TMPL_IF>
-
-<TMPL_IF LICENSE>
-<div class="pagelicense">
-License: <TMPL_VAR LICENSE>
-</div>
-</TMPL_IF>
-
-<!--<TMPL_IF HAVE_ACTIONS>
-<TMPL_IF HTML5><nav class="actions"><TMPL_ELSE><div class="actions"></TMPL_IF>
-<ul>
-<TMPL_IF EDITURL>
-<li><a href="<TMPL_VAR EDITURL>" rel="nofollow">Edit</a></li>
-</TMPL_IF>
-<TMPL_IF COMMENTSLINK>
-<li><TMPL_VAR COMMENTSLINK></li>
-<TMPL_ELSE>
-<TMPL_IF DISCUSSIONLINK>
-<li><TMPL_VAR DISCUSSIONLINK></li>
-</TMPL_IF>
-</TMPL_IF>
-</ul>
-<TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
-</TMPL_IF>-->
-
-<TMPL_IF HTML5></footer><TMPL_ELSE></div></TMPL_IF>
-
-<TMPL_IF HTML5></article><TMPL_ELSE></div></TMPL_IF>
diff --git a/templates/page.tmpl b/templates/page.tmpl
deleted file mode 100644
index bc99f64..0000000
--- a/templates/page.tmpl
+++ /dev/null
@@ -1,261 +0,0 @@
-<TMPL_IF HTML5><!DOCTYPE html>
-<html>
-<TMPL_ELSE><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-</TMPL_IF>
-<head>
-<meta name="viewport" content="width=device-width, initial-scale=1.0" />
-<TMPL_IF DYNAMIC>
-<TMPL_IF FORCEBASEURL><base href="<TMPL_VAR FORCEBASEURL>" /><TMPL_ELSE>
-<TMPL_IF BASEURL><base href="<TMPL_VAR BASEURL>" /></TMPL_IF>
-</TMPL_IF>
-</TMPL_IF>
-<TMPL_IF HTML5><meta charset="utf-8" /><TMPL_ELSE><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></TMPL_IF>
-<title><TMPL_VAR TITLE></title>
-<TMPL_IF FAVICON>
-<link rel="icon" href="<TMPL_VAR BASEURL><TMPL_VAR FAVICON>" type="image/x-icon" />
-</TMPL_IF>
-<link rel="stylesheet" href="<TMPL_VAR BASEURL>bootstrap/css/bootstrap.min.css" type="text/css" />
-<link rel="stylesheet" href="<TMPL_VAR BASEURL>bootstrap/css/bootstrap-responsive.css" />
-<TMPL_IF LOCAL_CSS>
-<link rel="stylesheet" href="<TMPL_VAR BASEURL><TMPL_VAR LOCAL_CSS>" type="text/css" />
-<TMPL_ELSE>
-<link rel="stylesheet" href="<TMPL_VAR BASEURL>local.css" type="text/css" />
-</TMPL_IF>
-<TMPL_IF EDITURL>
-<link rel="alternate" type="application/x-wiki" title="Edit this page" href="<TMPL_VAR EDITURL>" />
-</TMPL_IF>
-<TMPL_IF FEEDLINKS><TMPL_VAR FEEDLINKS></TMPL_IF>
-<TMPL_IF RELVCS><TMPL_VAR RELVCS></TMPL_IF>
-<TMPL_IF META><TMPL_VAR META></TMPL_IF>
-<style>
-@media (max-width: 979px) {
-  .navbar-fixed-top {
-    position: fixed;
-    margin-left: 0px;
-    margin-right: 0px;
-  }
-}
-</style>
-</head>
-<body style="padding-top: 60px; padding-bottom: 60px;">
-
-<script src="<TMPL_VAR BASEURL>/js/jquery.min.js" type="text/javascript"></script>
-<script src="<TMPL_VAR BASEURL>bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
-
-<div class="navbar navbar-inverse navbar-fixed-top">
-  <div class="navbar-inner">
-    <div class="container">
-
-      <TMPL_IF HAVE_ACTIONS>
-
-      <TMPL_IF OTHERLANGUAGES>
-      <TMPL_IF HTML5><nav id="otherlanguages"><TMPL_ELSE><div id="otherlanguages"></TMPL_IF>
-      <ul class="nav">
-      <TMPL_LOOP OTHERLANGUAGES>
-      <li>
-      <a href="<TMPL_VAR URL>"><TMPL_VAR LANGUAGE></a>
-      <TMPL_IF MASTER>
-      (master)
-      <TMPL_ELSE>
-      &nbsp;(<TMPL_VAR PERCENT>%)
-      </TMPL_IF>
-      </li>
-      </TMPL_LOOP>
-      </ul>
-      <TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
-      </TMPL_IF>
-
-      <TMPL_IF HTML5><nav class="actions"><TMPL_ELSE><div class="actions"></TMPL_IF>
-      <ul class="nav">
-      <TMPL_IF EDITURL>
-      <li><a href="<TMPL_VAR EDITURL>" rel="nofollow">Edit</a></li>
-      </TMPL_IF>
-      <TMPL_IF RECENTCHANGESURL>
-      <li><a href="<TMPL_VAR RECENTCHANGESURL>">RecentChanges</a></li>
-      </TMPL_IF>
-      <TMPL_IF HISTORYURL>
-      <li><a href="<TMPL_VAR HISTORYURL>">History</a></li>
-      </TMPL_IF>
-      <TMPL_IF GETSOURCEURL>
-      <li><a href="<TMPL_VAR GETSOURCEURL>">Source</a></li>
-      </TMPL_IF>
-      <TMPL_IF PREFSURL>
-      <li><a href="<TMPL_VAR PREFSURL>">Preferences</a></li>
-      </TMPL_IF>
-      <TMPL_IF ACTIONS>
-      <TMPL_LOOP ACTIONS>
-      <li><TMPL_VAR ACTION></li>
-      </TMPL_LOOP>
-      </TMPL_IF>
-      <TMPL_IF COMMENTSLINK>
-      <li><TMPL_VAR COMMENTSLINK></li>
-      <TMPL_ELSE>
-      <TMPL_IF DISCUSSIONLINK>
-      <li><TMPL_VAR DISCUSSIONLINK></li>
-      </TMPL_IF>
-      </TMPL_IF>
-      </ul>
-      <TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
-      </TMPL_IF>
-    </div>
-  </div>
-</div>
-
-<div class="container">
-
-  <!--
-  <div class="row-fluid">
-    <div class="navbar span12">
-      <div class="navbar-inner">
-        <TMPL_IF HAS_PARENTLINKS>
-        <TMPL_LOOP PARENTLINKS>
-          <TMPL_IF NAME="DEPTH_0">
-            <a class="brand" href="<TMPL_VAR URL>"><TMPL_VAR PAGE></a>
-          </TMPL_IF>
-        </TMPL_LOOP>
-        <TMPL_ELSE>
-          <a class="brand" href="<TMPL_VAR BASEURL>"><TMPL_VAR TITLE></a>
-        </TMPL_IF>
-        <ul class="nav">
-          <li><a href="<TMPL_VAR BASEURL>page">Page Title</a></li>
-        </ul>
-      </div>
-    </div>
-  </div>
-  -->
-
-  <!--
-  <div class="row-fluid">
-    <TMPL_IF HTML5><header class="span12"><TMPL_ELSE><div class="span12"></TMPL_IF>
-      <h1><TMPL_IF NAME="DEPTH_0"><TMPL_VAR PAGE></TMPL_IF></h1>
-
-      <ul class="breadcrumb">
-      <TMPL_LOOP PARENTLINKS>
-          <li><a href="<TMPL_VAR URL>"><TMPL_VAR PAGE></a> <span class="divider">/</span> </li>
-      </TMPL_LOOP>
-      <li><TMPL_VAR TITLE></li>
-      </ul>
-    <TMPL_IF HTML5></header><TMPL_ELSE></div></TMPL_IF>
-  </div>
-  -->
-
-  <TMPL_IF HTML5><article class="page row-fluid"><TMPL_ELSE><div class="page row-fluid"></TMPL_IF>
-
-  <div>
-    <TMPL_IF HTML5><section class="pageheader"><TMPL_ELSE><div class="pageheader"></TMPL_IF>
-    <TMPL_IF HTML5><header class="header"><TMPL_ELSE><div class="header"></TMPL_IF>
-    <h1>
-    <TMPL_VAR TITLE>
-    <TMPL_IF ISTRANSLATION>
-    &nbsp;(<TMPL_VAR PERCENTTRANSLATED>%)
-    </TMPL_IF>
-    </h1>
-    <TMPL_IF SEARCHFORM>
-    <TMPL_VAR SEARCHFORM>
-    </TMPL_IF>
-    <TMPL_IF HTML5></header><TMPL_ELSE></div></TMPL_IF>
-
-    <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
-
-    <div id="pagebody">
-
-    <TMPL_IF HTML5><section id="content"><TMPL_ELSE><div id="content"></TMPL_IF>
-    <p class="pagedate">
-    <TMPL_IF HAS_PARENTLINKS><strong>Posted <TMPL_VAR CTIME></strong></TMPL_IF>
-    </p>
-    <TMPL_VAR CONTENT>
-    <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
-
-    <hr />
-
-    <TMPL_UNLESS DYNAMIC>
-    <TMPL_IF COMMENTS>
-    <TMPL_IF HTML5><section id="comments"><TMPL_ELSE><div id="comments"></TMPL_IF>
-    <TMPL_VAR COMMENTS>
-    <TMPL_IF ADDCOMMENTURL>
-    <div class="addcomment">
-    <a href="<TMPL_VAR ADDCOMMENTURL>">Add a comment</a>
-    </div>
-    <TMPL_ELSE>
-    <div class="addcomment">Comments on this page are closed.</div>
-    </TMPL_IF>
-    <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
-    </TMPL_IF>
-    </TMPL_UNLESS>
-
-    </div>
-
-    <TMPL_IF HTML5><footer id="footer" class="pagefooter"><TMPL_ELSE><div id="footer" class="pagefooter"></TMPL_IF>
-    <TMPL_UNLESS DYNAMIC>
-    <TMPL_IF HTML5><nav id="pageinfo"><TMPL_ELSE><div id="pageinfo"></TMPL_IF>
-
-    <TMPL_IF TAGS>
-    <TMPL_IF HTML5><nav class="tags"><TMPL_ELSE><div class="tags"></TMPL_IF>
-    <strong>Tags:</strong>
-    <TMPL_LOOP TAGS>
-    <TMPL_VAR LINK>
-    </TMPL_LOOP>
-    <TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
-    </TMPL_IF>
-
-    <TMPL_IF BACKLINKS>
-    <TMPL_IF HTML5><nav id="backlinks"><TMPL_ELSE><div id="backlinks"></TMPL_IF>
-    Links:
-    <TMPL_LOOP BACKLINKS>
-    <a href="<TMPL_VAR URL>"><TMPL_VAR PAGE></a>
-    </TMPL_LOOP>
-    <TMPL_IF MORE_BACKLINKS>
-    <span class="popup">...
-    <span class="balloon">
-    <TMPL_LOOP MORE_BACKLINKS>
-    <a href="<TMPL_VAR URL>"><TMPL_VAR PAGE></a>
-    </TMPL_LOOP>
-    </span>
-    </span>
-    </TMPL_IF>
-    <TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
-    </TMPL_IF>
-
-    <TMPL_IF COPYRIGHT>
-    <div class="pagecopyright">
-    <a name="pagecopyright"></a>
-    <TMPL_VAR COPYRIGHT>
-    </div>
-    </TMPL_IF>
-
-    <TMPL_IF LICENSE>
-    <div class="pagelicense">
-    <a name="pagelicense"></a>
-    License: <TMPL_VAR LICENSE>
-    </div>
-    </TMPL_IF>
-
-    <!--<div class="pagedate">
-    Last edited <TMPL_VAR MTIME>
-    </div> -->
-
-    <TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
-    <TMPL_IF EXTRAFOOTER><TMPL_VAR EXTRAFOOTER></TMPL_IF>
-    </TMPL_UNLESS>
-    <!-- from <TMPL_VAR WIKINAME> -->
-    <TMPL_IF HTML5></footer><TMPL_ELSE></div></TMPL_IF>
-    
-  </div>
-  
-  <div class="span4">
-
-    <TMPL_IF SIDEBAR>
-    <TMPL_IF HTML5><aside class="sidebar"><TMPL_ELSE><div class="sidebar"></TMPL_IF>
-    <TMPL_VAR SIDEBAR>
-    <TMPL_IF HTML5></aside><TMPL_ELSE></div></TMPL_IF>
-    </TMPL_IF>  
-  
-  </div>
-
-  <TMPL_IF HTML5></article><TMPL_ELSE></div></TMPL_IF>
-</div>
-
-</body>
-</html>
author	Silvio Rhatto <rhatto@riseup.net>	2013-10-04 13:05:52 -0300
committer	Silvio Rhatto <rhatto@riseup.net>	2013-10-04 13:05:52 -0300
commit	35d9b5807510dd9490fdb5f9a7327e9de58644c3 (patch)
tree	7504b509062f3406a6c5969a53099bd3b91ce234 /templates
parent	7185eab583383d8eff826755f93e972ce8d3add3 (diff)
parent	1b1197728cfd029deb46ebbe6ac0a70bcee58510 (diff)
download	keyringer-35d9b5807510dd9490fdb5f9a7327e9de58644c3.tar.gz keyringer-35d9b5807510dd9490fdb5f9a7327e9de58644c3.tar.bz2