Skip to content

Commit

Permalink
Revert "Merge pull request #18 from grahamu/gu-fix-branch-hash-string"
Browse files Browse the repository at this point in the history 
This reverts commit 2d9f4c3, reversing
changes made to af680f9.
  • Loading branch information
@grahamu
grahamu committed Sep 18, 2021
1 parent a12da78 commit aac199b
Show file tree
Hide file tree
Showing 2 changed files with 117 additions and 124 deletions.
2 changes: 1 addition & 1 deletion flyingcracker/fc3/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,6 @@ def get_git_tag(join=' ', *args, **kwargs):
git_version = '(Git-Version-Not-Found)'

if branch_name is not None and hash is not None:
git_version = f'({branch_name.decode("UTF-8")} @{hash.decode("UTF-8")})'
git_version = '(%s @ %s)' % (branch_name, hash)

return join.join([get_version(join=join, *args, **kwargs), git_version])
239 changes: 116 additions & 123 deletions flyingcracker/templates/base.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

<!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" xml:lang="en" lang="en">

<head>
<meta name="keywords" content="cracklyfinger, weather, forecast, current conditions, cocktail, webcam" />
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
Expand All @@ -20,48 +19,47 @@
<meta http-equiv="reply-to" content="" />
<meta name="language" content="English" />

<title>CracklyFinger {% block extra_title %}{% endblock %}</title>
<title>CracklyFinger {% block extra_title %}{% endblock %}</title>

<link rel="shortcut icon" type="image/x-icon" href="{% static " img/favicon.ico" %}" />
<link rel="shortcut icon" type="image/x-icon" href="{% static "img/favicon.ico" %}" />

<title>flyingcracker{% block section_title %}{% endblock %}</title>

<!-- Individual YUI CSS files -->
<link rel="stylesheet" type="text/css" href="{{ yui_path }}/build/reset-fonts-grids/reset-fonts-grids.css">
<link rel="stylesheet" type="text/css" href="{{ yui_path }}/build/assets/skins/sam/skin.css">
<!-- Individual YUI CSS files -->
<link rel="stylesheet" type="text/css" href="{{ yui_path }}/build/reset-fonts-grids/reset-fonts-grids.css">
<link rel="stylesheet" type="text/css" href="{{ yui_path }}/build/assets/skins/sam/skin.css">

<link href="{% static 'css/uni-form.css' %}" rel="stylesheet" type="text/css" />
<link href="{% static 'css/uni-form.css' %}" rel="stylesheet" type="text/css" />

{% block extrastyle %}
<link rel="stylesheet" type="text/css" href="{% static " css/f3.css" %}" title="stylesheet" />
<link rel="stylesheet" type="text/css" href="{% static "css/f3.css" %}" title="stylesheet" />
{% endblock extrastyle %}

{% block javascript %}
<!-- jQuery -->
<script type="text/javascript" language="javascript" src="{% static " js/jquery.js" %}"></script>
<script type="text/javascript" language="javascript" src="{% static " js/jquery-ui.min.js" %}"></script>

<!-- Individual YUI JS files -->
<script type="text/javascript" src="{{ yui_path }}/build/utilities/utilities.js"></script>
<script type="text/javascript" src="{{ yui_path }}/build/container/container-min.js"></script>
<script type="text/javascript" src="{{ yui_path }}/build/menu/menu-min.js"></script>
<script type="text/javascript" src="{{ yui_path }}/build/button/button-min.js"></script>
<script type="text/javascript" src="{{ yui_path }}/build/history/history-min.js"></script>
<script type="text/javascript" src="{{ yui_path }}/build/json/json-min.js"></script>
<script type="text/javascript" src="{{ yui_path }}/build/layout/layout-min.js"></script>
<script type="text/javascript" src="{{ yui_path }}/build/tabview/tabview-min.js"></script>
<script type="text/javascript" src="{{ yui_path }}/build/cookie/cookie-min.js"></script>
<!-- jQuery -->
<script type="text/javascript" language="javascript" src="{% static "js/jquery.js" %}"></script>
<script type="text/javascript" language="javascript" src="{% static "js/jquery-ui.min.js" %}"></script>

<!-- Individual YUI JS files -->
<script type="text/javascript" src="{{ yui_path }}/build/utilities/utilities.js"></script>
<script type="text/javascript" src="{{ yui_path }}/build/container/container-min.js"></script>
<script type="text/javascript" src="{{ yui_path }}/build/menu/menu-min.js"></script>
<script type="text/javascript" src="{{ yui_path }}/build/button/button-min.js"></script>
<script type="text/javascript" src="{{ yui_path }}/build/history/history-min.js"></script>
<script type="text/javascript" src="{{ yui_path }}/build/json/json-min.js"></script>
<script type="text/javascript" src="{{ yui_path }}/build/layout/layout-min.js"></script>
<script type="text/javascript" src="{{ yui_path }}/build/tabview/tabview-min.js"></script>
<script type="text/javascript" src="{{ yui_path }}/build/cookie/cookie-min.js"></script>
{% endblock %}

{% comment %}
The YUI CSS and Javascript files shown above were generated by the following URL:
http://developer.yahoo.com/yui/articles/hosting/?button&connection&container&dom&element&event&history&json&layout&menu&reset-fonts-grids&utilities&yahoo&MIN&nocombine&basepath&tabview&{{
yui_path }}/build/
{% endcomment %}
{% comment %}
The YUI CSS and Javascript files shown above were generated by the following URL:
http://developer.yahoo.com/yui/articles/hosting/?button&connection&container&dom&element&event&history&json&layout&menu&reset-fonts-grids&utilities&yahoo&MIN&nocombine&basepath&tabview&{{ yui_path }}/build/
{% endcomment %}

{% block my_source %}
<!-- My source - always after standard javascript block -->
<script type="text/javascript" src="{% static " js/doc_utils.js" %}"></script>
<script type="text/javascript" src="{% static "js/doc_utils.js" %}"></script>
{% endblock my_source %}

{% block extrahead %}
Expand All @@ -79,112 +77,107 @@
</script>
{% endblock analytics %}

<script type="text/javascript">
// Initialize and render the menu bar when it is available in the DOM
YAHOO.util.Event.onContentReady("main-menu", function () {
// Instantiate and render the menu bar
var oMenuBar = new YAHOO.widget.MenuBar("main-menu", { autosubmenudisplay: true, hidedelay: 750, lazyload: true });
oMenuBar.render();
});
</script>
<script type="text/javascript">
// Initialize and render the menu bar when it is available in the DOM
YAHOO.util.Event.onContentReady("main-menu", function () {
// Instantiate and render the menu bar
var oMenuBar = new YAHOO.widget.MenuBar("main-menu", { autosubmenudisplay: true, hidedelay: 750, lazyload: true });
oMenuBar.render();
});
</script>

</head>

<body onload="if (self != top) top.location = self.location" class=" yui-skin-sam">

<div id="doc3" class="yui-t2">
<div id="hd" class="top1">
{% block header %}
<div id="user-tools">
{% block user %}
{% endblock user %}
</div> <!-- user-tools -->

<div id="branding">
<h1 id="site-name">{% block branding %}{{ system_name }} <span class="subtitle"> - test site for <a
href="http://www.flyingcracker.com">flyingcracker.com</a></span>{% endblock %}</h1>
</div>
{% endblock header %}
<div id="doc3" class="yui-t2">
<div id="hd" class="top1">
{% block header %}
<div id="user-tools">
{% block user %}
{% endblock user %}
</div> <!-- user-tools -->

<div id="branding">
<h1 id="site-name">{% block branding %}{{ system_name }} <span class="subtitle"> - test site for <a href="http://www.flyingcracker.com">flyingcracker.com</a></span>{% endblock %}</h1>
</div>
<div id="bd" class="center1">

<!-- Preset Templates control the width and alignment of the two blocks (div.yui-b). -->
<!-- The wide column is wrapped in div#yui-main -->
<div id="yui-main">
<div class="yui-b">
<div id="main-menu" class="yuimenubar yuimenubarnav">
<div class="bd">
<ul class="first-of-type">
{% block navmenu %}
<li class="yuimenubaritem first-of-type"><a class="yuimenubaritemlabel"
href="{% url 'weather:root' %}">Weather</a></li>
<li class="yuimenubaritem"><a class="yuimenubaritemlabel"
href="{% url 'cam:root' %}">WebCams</a></li>
<li class="yuimenubaritem"><a class="yuimenubaritemlabel"
href="{% url 'food:recipe-list' recipe_type=" drink" %}">Drink</a></li>
<li class="yuimenubaritem"><a class="yuimenubaritemlabel"
href="{% url 'food:recipe-list' recipe_type=" food" %}">Food</a></li>
{% endblock %}
</ul>
</div>
{% endblock header %}
</div>
<div id="bd" class="center1">

<!-- Preset Templates control the width and alignment of the two blocks (div.yui-b). -->
<!-- The wide column is wrapped in div#yui-main -->
<div id="yui-main">
<div class="yui-b">
<div id="main-menu" class="yuimenubar yuimenubarnav">
<div class="bd">
<ul class="first-of-type">
{% block navmenu %}
<li class="yuimenubaritem first-of-type"><a class="yuimenubaritemlabel" href="{% url 'weather:root' %}">Weather</a></li>
<li class="yuimenubaritem"><a class="yuimenubaritemlabel" href="{% url 'cam:root' %}">WebCams</a></li>
<li class="yuimenubaritem"><a class="yuimenubaritemlabel" href="{% url 'food:recipe-list' recipe_type="drink" %}">Drink</a></li>
<li class="yuimenubaritem"><a class="yuimenubaritemlabel" href="{% url 'food:recipe-list' recipe_type="food" %}">Food</a></li>
{% endblock %}
</ul>
</div>

<div id="content">
{% block body %}
<p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Suspendisse justo nibh, pharetra
at, .</p>
{% endblock %}
</div> <!-- content -->
</div>
</div>

<!-- the unwrapped div.yui-b takes a fixed width and alignment based on the class of the top-level containing node -->
<div class="yui-b left1">
{% block leftbar %}
{% endblock leftbar %}
</div>

<div id="content">
{% block body %}
<p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Suspendisse justo nibh, pharetra at, .</p>
{% endblock %}
</div> <!-- content -->
</div>
</div>

<!-- the unwrapped div.yui-b takes a fixed width and alignment based on the class of the top-level containing node -->
<div class="yui-b left1">
{% block leftbar %}
{% endblock leftbar %}
</div>

<div id="ft" class="bottom1">
<p>[{{ system_name }} v{{ system_version }} Django v{{ django_version }}]</p>
{% if debug %}
<div id="debug">
<h2>Queries</h2>
<p>
{{ sql_queries|length }} Quer{{ sql_queries|pluralize:"y,ies" }}
{% ifnotequal sql_queries|length 0 %}
(<span style="cursor: pointer;"
onclick="var s=document.getElementById('debugQueryTable').style;s.display=s.display=='none'?'':'none';this.innerHTML=this.innerHTML=='Show'?'Hide':'Show';">Show</span>)
{% endifnotequal %}
</p>
<table id="debugQueryTable" style="display: none;">
<col width="1">
</col>
<col>
</col>
<col width="1">
</col>
<thead>
<tr>
<th scope="col">#</th>
<th scope="col">SQL</th>
<th scope="col">Time</th>
</tr>
</thead>
<tbody>
{% for query in sql_queries %}<tr class="{% cycle 'odd' 'even' %}">
<td>{{ forloop.counter }}</td>
<td>{{ query.sql|escape }}</td>
<td>{{ query.time }}</td>
</tr>{% endfor %}
</tbody>
</table>
</div>
{% endif %}
</div>
</div>
</div>

<div id="ft" class="bottom1">
<p>This site represents the next generation of flyingcracker.com. This is a work in progress.
Not all functionality may be available, not all pages may work, not all buttons may operate.
Nevertheless we feel that flyingcracker fans may appreciate some of the newer features found herein
and enjoy watching the site development process. If you have a suggestion please email it to:
[email protected]. Thanks for participating!</p>
<p>[{{ system_name }} v{{ system_version }} Django v{{ django_version }}]</p>
{% if debug %}
<div id="debug">
<h2>Queries</h2>
<p>
{{ sql_queries|length }} Quer{{ sql_queries|pluralize:"y,ies" }}
{% ifnotequal sql_queries|length 0 %}
(<span style="cursor: pointer;" onclick="var s=document.getElementById('debugQueryTable').style;s.display=s.display=='none'?'':'none';this.innerHTML=this.innerHTML=='Show'?'Hide':'Show';">Show</span>)
{% endifnotequal %}
</p>
<table id="debugQueryTable" style="display: none;">
<col width="1"></col>
<col></col>
<col width="1"></col>
<thead>
<tr>
<th scope="col">#</th>
<th scope="col">SQL</th>
<th scope="col">Time</th>
</tr>
</thead>
<tbody>
{% for query in sql_queries %}<tr class="{% cycle 'odd' 'even' %}">
<td>{{ forloop.counter }}</td>
<td>{{ query.sql|escape }}</td>
<td>{{ query.time }}</td>
</tr>{% endfor %}
</tbody>
</table>
</div>
{% endif %}
</div>
</div>

</body>

</html>
</html>

0 comments on commit aac199b

Please sign in to comment.